Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Unified Diff: pages/committee/members.tmpl

Issue 29471608: Issue 5043 - Update member page layout (Closed) Base URL: https://hg.adblockplus.org/web.acceptableads.com
Patch Set: Fixed regression Created July 17, 2017, 10:36 a.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pages/committee/members.tmpl
===================================================================
--- a/pages/committee/members.tmpl
+++ b/pages/committee/members.tmpl
@@ -5,17 +5,17 @@
{% block head %}
<style>
@media(min-width: 768px)
{
#committee-structure
{
padding-top: 25%;
- margin: 0 auto;
+ margin: 0px auto;
max-width: 70%;
}
}
.group-list h4
{
margin-top: 40px;
padding: 8px 22px;
@@ -24,31 +24,31 @@
.group-list dl
{
margin: 22px;
}
.group-list dt
{
- margin: 32px 0 26px 0;
+ margin: 32px 0px 26px 0px;
color: #424242;
text-transform: none;
}
.group-list dd
{
- margin: 0;
+ margin: 0px;
}
.member-list
{
display: block;
width: 100%;
- margin: 0;
+ margin: 0px;
overflow: auto;
}
.member-list li
{
width: 100%;
float: left;
padding-left: 0px;
@@ -76,36 +76,36 @@
{
display: none;
}
</style>
{% endblock %}
{% set coalitions = {
"for-profit": {
- "title": "FOR-PROFIT COALITION",
+ "title": "For-Profit Coalition",
"description": "This Coalition consists of stakeholders that can be classified as organizations primarily driven by generating profits. The following groups form the For-Profit Coalition: Advertisers, Ad-Tech Agencies, Advertising Agencies, and Publishers and Content Creators.",
"groups": [
"Advertisers",
"Ad Tech Agencies",
"Advertising Agencies",
"Publishers & Content Creators",
],
},
"expert": {
- "title": "EXPERT COALITION",
+ "title": "Expert Coalition",
"description": "This Coalition consists of stakeholders who primarily focus on specific issues relevant to their area of expertise. These experts bring a unique and objective perspective to the AAC. The following groups form the Expert Coalition: Creative Agents, Researchers and Academics and User Agents.",
"groups": [
"Creative Agents",
"Researchers & Academics",
"User Agents",
],
},
"user-advocate": {
- "title": "USER ADVOCATE COALITION",
+ "title": "User Advocate Coalition",
"description": "This Coalition consists of stakeholders that can be classified as entities primarily driven by protecting the rights of online users. The following Member Groups form the User Advocate Coalition: Digital Rights Organizations and Individual Users.",
"groups": [
"Digital Rights Organizations",
"Users",
],
},
} %}
@@ -394,46 +394,46 @@
{% if (count | length) > 0 %}
</ul>
{% endif %}
{% if position == "Member" or (count | length) < 1 %}
<p><a class="btn-primary" href="committee/apply">{{ "Apply" | translate("apply-button", "button label") }}</a></p>
{% endif %}
{% endmacro %}
-{% macro group_list(group) -%}
+{% macro group_list(id, group) -%}
<section class="group-list">
- <h4>{{ group | translate("group-name-heading", "heading") }}</h4>
+ <h4>{{ group | translate(id + "-heading", "heading") }}</h4>
<dl>
<dt>{{ "Representative" | translate("representative-heading", "heading") }}</dt>
<dd>{{ member_list(group, "Representative") }}</dd>
</dl>
<dl>
<dt>{{ "Members" | translate("members-heading", "heading") }}</dt>
<dd>{{ member_list(group, "Member") }}</dd>
</dl>
</section>
{%- endmacro %}
{% macro coalition_section(id) -%}
<section class="section">
<h3 class="h2">{{ coalitions[id].title | translate("{{ id }}-heading", "heading") }}</h3>
<p class="col-6">{{ coalitions[id].description | translate("{{ id }}-intro") }}</p>
{% for group in coalitions[id].groups %}
- {{ group_list(group) }}
+ {{ group_list(id, group) }}
{% endfor %}
</section>
{% endmacro %}
<section class="container">
<div class="row section">
<div class="col-6">
<h1>{{ "Members" | translate("members-heading", "heading") }}</h1>
<hr>
- <p>{{ "The Acceptable Ads Committee is divided into three Coalitions, with each faction consisting of several Members. Each group includes a Representative and multiple supporting Members." | translate("members-intro-2") }}</p>
+ <p>{{ "The Acceptable Ads Committee is divided into three Coalitions, with each faction consisting of several Members. Each group includes a Representative and multiple supporting Members." | translate("members-intro-1") }}</p>
<p>{{ "Below is a list of all current Representatives and supporting Members, broken down by Coalition." | translate("members-intro-2") }}</p>
</div>
<aside class="col-6">
<img id="committee-structure" class="block" alt="{{ "Acceptable Ads Committee Structure" | translate("featured-image-alt", "Image alt text") }}" src="/img/png/blog/acceptable-ads-committee-structure.png" />
</aside>
</div>
</section>
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld