Unified Diff: templates/default.tmpl
Issue 29551738:
Issue 5634 - Replaced logo and refactored navbar width and colors (Closed)
Base URL: https://hg.adblockplus.org/web.adblockplus.org
Patch Set: Rebased
Created Oct. 10, 2017, 11:29 a.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« static/css/main-desktop.css ('K')
|
« static/js/main.js ('k')
|
no next file »
|
no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: templates/default.tmpl |
| =================================================================== |
| --- a/templates/default.tmpl |
| +++ b/templates/default.tmpl |
| @@ -72,55 +72,59 @@ |
| </head> |
| <body> |
| <noscript> |
| <link rel="stylesheet" href="/css/noscript-desktop.css" media="(min-width: 1000px)"/> |
| <link rel="stylesheet" href="/css/noscript-mobile.css" media="(max-width: 1000px)"/> |
| </noscript> |
| - {% macro pageitem(name) %} |
| - {% if name == page %} |
| - <li class="selected">{{get_string(name, "menu")}}</li> |
| - {% else %} |
| - <li>{{name|linkify}}{{get_string(name, "menu")}}</a></li> |
| - {% endif %} |
| + {% macro pageitem(pagename) %} |
|
juliandoucette
2017/10/10 17:35:10
Removed from PatchSet (I will remove this after la
ire
2017/10/11 08:09:06
Acknowledged.
|
| + <li> |
| + {{ pagename | linkify }}{{ get_string(pagename, "menu") }}</a> |
| + </li> |
| {% endmacro %} |
| - <header> |
| - {{"index"|linkify(id="logo", class="sprite", itemprop="image")}}</a> |
| - <nav> |
| - <ul> |
| - {% if localefile == "index" %} |
| - <li class="selected first">{{get_string("installation", "menu")}}</li> |
| - {% else %} |
| - <li class="install-link first">{{"index"|linkify}}{{get_string("installation", "menu")}} <span class="sprite install-link-icon"></span></a></li> |
| - {% endif %} |
| - {% for name in ["about", "features", "bugs", "contribute"] %} |
| - {{pageitem(name)}} |
| + <nav id="navbar"> |
| + <div class="container"> |
| + {{ "index" | linkify(id="logo") }} |
|
juliandoucette
2017/10/10 17:35:11
Changed to #navbar-logo
ire
2017/10/11 08:09:04
Acknowledged.
|
| + <img |
| + alt="{{ "ABP" | translate("navbar-logo-alt", "Navbar logo alt text") }}" |
|
juliandoucette
2017/10/10 17:35:10
Removed alt, will re-add separately
ire
2017/10/11 08:09:06
Acknowledged.
|
| + src="/img/navbar-logo.png" |
| + srcset="/img/navbar-logo.svg 2x"> |
| + <span>{{ "Adblock <strong>Plus</strong>" | translate("navbar-logo-text", "Navbar logo text") }}</span> |
| + </a> |
| + <a href="#" id="menu-toggle"> |
|
juliandoucette
2017/10/10 17:35:10
Changed to #navbar-menu-toggle
ire
2017/10/11 08:09:04
Acknowledged.
|
| + <img |
| + height="25px" |
|
juliandoucette
2017/10/10 17:35:09
Removed height set via css
ire
2017/10/11 08:09:05
Acknowledged.
|
| + src="/img/menu-toggle.png" |
| + srcset="/img/menu-toggle.svg 2x" |
| + alt="{{ "Menu icon" | translate("navbar-menu-logo", "Navbar menu logo alt text") }}"> |
|
juliandoucette
2017/10/10 17:35:09
Removed alt, will re-add separately.
ire
2017/10/11 08:09:05
Acknowledged.
|
| + </a> |
| + <ul id="navbar-menu"> |
| + {% for pagename in ["about", "features", "bugs", "contribute"] %} |
| + {{ pageitem(pagename) }} |
|
juliandoucette
2017/10/10 17:35:10
Replaced pageitem usage with code above.
ire
2017/10/11 08:09:06
Acknowledged.
|
| {% endfor %} |
| - <li id="language"> |
| - <div id="current-language"> |
| + <li id="locale-menubar"> |
| + <a href="#" id="locale-selected"> |
| {{ config.get("langnames", locale) }} ({{ locale | to_og_locale | to_og_location }}) |
|
juliandoucette
2017/10/10 17:35:09
Added "navbar-" before "locale" in these ids
ire
2017/10/11 08:09:05
Acknowledged.
|
| - <span id="language-arrow" class="sprite"></span> |
| - </div> |
| - <ul id="language-selector"> |
| + </a> |
| + <ul id="locale-menu"> |
| {% for available_locale in available_locales %} |
| - <li class="language-entry"> |
| + <li> |
| {{ page | linkify(available_locale) }} |
| {{ config.get("langnames", available_locale) }} ({{ available_locale | to_og_locale | to_og_location }}) |
| </a> |
| </li> |
| {% endfor %} |
| </ul> |
| </li> |
| </ul> |
| - <a href="#" id="hamburger"></a> |
| - </nav> |
| - </header> |
| + </div><!-- .container --> |
| + </nav> |
| <div id="content" class="container content {{ localefile == "index" and page }}"> |
| {% if abbnotification %} |
| <? include abb-notification ?> |
| {% endif %} |
| {% if not noheading %} |
| <h1>{{title|translate("title")}}</h1> |
| {% endif %} |
« static/css/main-desktop.css ('K')
|
« static/js/main.js ('k')
|
no next file »
|
no next file with comments »
