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

Delta Between Two Patch Sets: pages/committee/members.tmpl

Issue 29471608: Issue 5043 - Update member page layout (Closed) Base URL: https://hg.adblockplus.org/web.acceptableads.com
Left Patch Set: Fixed capitilization and 0px Created July 14, 2017, 12:10 p.m.
Right Patch Set: Fixed regression Created July 17, 2017, 10:36 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « no previous file | no next file » | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 title=Members | The Acceptable Ads Committee 1 title=Members | The Acceptable Ads Committee
2 description=A list of all Representatives and supporting Members that make up th e Acceptable Ads Committee. 2 description=A list of all Representatives and supporting Members that make up th e Acceptable Ads Committee.
3 parent=committee/index 3 parent=committee/index
4 custom=1 4 custom=1
5 5
6 {% block head %} 6 {% block head %}
7 <style> 7 <style>
8 @media(min-width: 768px) 8 @media(min-width: 768px)
9 { 9 {
10 #committee-structure 10 #committee-structure
(...skipping 381 matching lines...) Expand 10 before | Expand all | Expand 10 after
392 {% endif %} 392 {% endif %}
393 {% endfor %} 393 {% endfor %}
394 {% if (count | length) > 0 %} 394 {% if (count | length) > 0 %}
395 </ul> 395 </ul>
396 {% endif %} 396 {% endif %}
397 {% if position == "Member" or (count | length) < 1 %} 397 {% if position == "Member" or (count | length) < 1 %}
398 <p><a class="btn-primary" href="committee/apply">{{ "Apply" | translate("app ly-button", "button label") }}</a></p> 398 <p><a class="btn-primary" href="committee/apply">{{ "Apply" | translate("app ly-button", "button label") }}</a></p>
399 {% endif %} 399 {% endif %}
400 {% endmacro %} 400 {% endmacro %}
401 401
402 {% macro group_list(group) -%} 402 {% macro group_list(id, group) -%}
403 <section class="group-list"> 403 <section class="group-list">
404 <h4>{{ group | translate("group-name-heading", "heading") }}</h4> 404 <h4>{{ group | translate(id + "-heading", "heading") }}</h4>
ire 2017/07/17 07:27:49 This is back to not using an ID
juliandoucette 2017/07/17 10:37:39 Done.
405 <dl> 405 <dl>
406 <dt>{{ "Representative" | translate("representative-heading", "heading") } }</dt> 406 <dt>{{ "Representative" | translate("representative-heading", "heading") } }</dt>
407 <dd>{{ member_list(group, "Representative") }}</dd> 407 <dd>{{ member_list(group, "Representative") }}</dd>
408 </dl> 408 </dl>
409 <dl> 409 <dl>
410 <dt>{{ "Members" | translate("members-heading", "heading") }}</dt> 410 <dt>{{ "Members" | translate("members-heading", "heading") }}</dt>
411 <dd>{{ member_list(group, "Member") }}</dd> 411 <dd>{{ member_list(group, "Member") }}</dd>
412 </dl> 412 </dl>
413 </section> 413 </section>
414 {%- endmacro %} 414 {%- endmacro %}
415 415
416 {% macro coalition_section(id) -%} 416 {% macro coalition_section(id) -%}
417 <section class="section"> 417 <section class="section">
418 <h3 class="h2">{{ coalitions[id].title | translate("{{ id }}-heading", "head ing") }}</h3> 418 <h3 class="h2">{{ coalitions[id].title | translate("{{ id }}-heading", "head ing") }}</h3>
419 <p class="col-6">{{ coalitions[id].description | translate("{{ id }}-intro") }}</p> 419 <p class="col-6">{{ coalitions[id].description | translate("{{ id }}-intro") }}</p>
420 {% for group in coalitions[id].groups %} 420 {% for group in coalitions[id].groups %}
421 {{ group_list(group) }} 421 {{ group_list(id, group) }}
422 {% endfor %} 422 {% endfor %}
423 </section> 423 </section>
424 {% endmacro %} 424 {% endmacro %}
425 425
426 <section class="container"> 426 <section class="container">
427 <div class="row section"> 427 <div class="row section">
428 <div class="col-6"> 428 <div class="col-6">
429 <h1>{{ "Members" | translate("members-heading", "heading") }}</h1> 429 <h1>{{ "Members" | translate("members-heading", "heading") }}</h1>
430 <hr> 430 <hr>
431 <p>{{ "The Acceptable Ads Committee is divided into three Coalitions, with each faction consisting of several Members. Each group includes a Representativ e and multiple supporting Members." | translate("members-intro-2") }}</p> 431 <p>{{ "The Acceptable Ads Committee is divided into three Coalitions, with each faction consisting of several Members. Each group includes a Representativ e and multiple supporting Members." | translate("members-intro-1") }}</p>
ire 2017/07/17 07:27:49 This should be members-intro-1
juliandoucette 2017/07/17 10:37:40 Done.
432 <p>{{ "Below is a list of all current Representatives and supporting Membe rs, broken down by Coalition." | translate("members-intro-2") }}</p> 432 <p>{{ "Below is a list of all current Representatives and supporting Membe rs, broken down by Coalition." | translate("members-intro-2") }}</p>
433 </div> 433 </div>
434 <aside class="col-6"> 434 <aside class="col-6">
435 <img id="committee-structure" class="block" alt="{{ "Acceptable Ads Commit tee Structure" | translate("featured-image-alt", "Image alt text") }}" src="/img /png/blog/acceptable-ads-committee-structure.png" /> 435 <img id="committee-structure" class="block" alt="{{ "Acceptable Ads Commit tee Structure" | translate("featured-image-alt", "Image alt text") }}" src="/img /png/blog/acceptable-ads-committee-structure.png" />
436 </aside> 436 </aside>
437 </div> 437 </div>
438 </section> 438 </section>
439 439
440 <section> 440 <section>
441 441
442 <div class="bg-accent"> 442 <div class="bg-accent">
443 <h2 class="center h3 p-y-md m-a-md">{{ "Meet the Acceptable Ads Committee" | translate("committee-heading", "heading") }}</h2> 443 <h2 class="center h3 p-y-md m-a-md">{{ "Meet the Acceptable Ads Committee" | translate("committee-heading", "heading") }}</h2>
444 </div> 444 </div>
445 445
446 <div class="container"> 446 <div class="container">
447 {% for coalition in ["for-profit", "expert", "user-advocate"] %} 447 {% for coalition in ["for-profit", "expert", "user-advocate"] %}
448 {{ coalition_section(coalition) }} 448 {{ coalition_section(coalition) }}
449 {% endfor %} 449 {% endfor %}
450 </div> 450 </div>
451 451
452 </section> 452 </section>
LEFTRIGHT
« no previous file | no next file » | Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Toggle Comments ('s')

Powered by Google App Engine
This is Rietveld