Side by Side Diff: includes/navbar.tmpl
Issue 29841563:
Noissue - Merged index_page into master (Closed)
Base URL: https://hg.adblockplus.org/web.adblockplus.org
Patch Set: Fixed more misc issues discussed in IRC
Created July 30, 2018, 4:40 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« includes/install-button-templates.tmpl ('K')
|
« includes/install-button-templates.tmpl ('k')
|
includes/styles.tmpl » ('j')
|
locales/en/install-button.json » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| OLD | NEW |
|---|---|
| 1 {% from "macros/pageitem" import pageitem %} | 1 {% from "macros/pageitem" import pageitem %} |
| 2 | 2 |
| 3 <nav id="navbar"> | 3 <nav id="navbar"> |
| 4 <div class="container"> | 4 <div class="container"> |
| 5 {{ "index" | linkify(id="navbar-logo") }} | 5 {{ "index" | linkify(id="navbar-logo") }} |
| 6 <img | 6 <img |
| 7 src="/img/navbar-logo.png" | 7 src="/img/navbar-logo.png" |
| 8 srcset="/img/navbar-logo.svg 2x"> | 8 srcset="/img/navbar-logo.svg 2x"> |
| 9 <span>{{ "Adblock <strong>Plus</strong>" | translate("navbar-logo-text", " Navbar logo text") }}</span> | 9 <span>{{ "Adblock <strong>Plus</strong>" | translate("navbar-logo-text", " Navbar logo text") }}</span> |
| 10 </a> | 10 </a> |
| 11 <a href="#" id="navbar-menu-toggle"> | 11 <a href="#" id="navbar-menu-toggle"> |
| 12 <img | 12 <img |
| 13 src="/img/menu-toggle.png" | 13 src="/img/menu-toggle.png" |
| 14 srcset="/img/menu-toggle.svg 2x"> | 14 srcset="/img/menu-toggle.svg 2x"> |
| 15 </a> | 15 </a> |
| 16 <ul id="navbar-menu"> | 16 <ul id="navbar-menu"> |
| 17 {% for pagename in ["about", "features", "bugs", "contribute"] %} | 17 {% for pagename in ["about", "contribute"] %} |
| 18 <li> | 18 <li> |
| 19 {{ pagename | linkify }}{{ get_string(pagename, "menu") }}</a> | 19 {{ pagename | linkify }}{{ get_string(pagename, "menu") }}</a> |
| 20 </li> | 20 </li> |
| 21 {% endfor %} | 21 {% endfor %} |
| 22 <li> | |
| 23 {{ "documentation" | linkify }}{{ get_string("help", "menu") }}</a> | |
| 24 </li> | |
| 22 <li id="navbar-locale-menubar"> | 25 <li id="navbar-locale-menubar"> |
| 23 <a id="navbar-locale-selected"> | 26 <a id="navbar-locale-selected"> |
| 24 {{ config.get("langnames", locale) }} ({{ locale | to_og_locale | to_o g_location }}) | 27 {{ config.get("langnames", locale) }} ({{ locale | to_og_locale | to_o g_location }}) |
| 25 </a> | 28 </a> |
| 26 <ul id="navbar-locale-menu"> | 29 <ul id="navbar-locale-menu"> |
| 27 {% for available_locale in available_locales %} | 30 {% for available_locale in available_locales %} |
| 28 <li> | 31 <li> |
| 29 {{ page | linkify(available_locale) }} | 32 {{ page | linkify(available_locale) }} |
| 30 {{ config.get("langnames", available_locale) }} ({{ available_lo cale | to_og_locale | to_og_location }}) | 33 {{ config.get("langnames", available_locale) }} ({{ available_lo cale | to_og_locale | to_og_location }}) |
| 31 </a> | 34 </a> |
| 32 </li> | 35 </li> |
| 33 {% endfor %} | 36 {% endfor %} |
| 34 </ul>{# #navbar-locale-menu #} | 37 </ul>{# #navbar-locale-menu #} |
| 35 </li> | 38 </li> |
| 36 </ul>{# #navbar-menu #} | 39 </ul>{# #navbar-menu #} |
| 37 </div>{# .container #} | 40 </div>{# .container #} |
| 38 </nav>{# #navbar #} | 41 </nav>{# #navbar #} |
| OLD | NEW |
