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

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: Removed merge artifact Created Oct. 6, 2017, 4:19 p.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 | « static/js/main.js ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: templates/default.tmpl
===================================================================
--- a/templates/default.tmpl
+++ b/templates/default.tmpl
@@ -71,55 +71,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) %}
+ <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") }}
+ <img
+ alt="{{ "ABP" | translate("navbar-logo-alt", "Navbar logo alt text") }}"
+ 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">
+ <img
+ height="25px"
+ src="/img/menu-toggle.png"
+ srcset="/img/menu-toggle.svg 2x"
+ alt="{{ "Menu icon" | translate("navbar-menu-logo", "Navbar menu logo alt text") }}">
+ </a>
+ <ul id="navbar-menu">
+ {% for pagename in ["about", "features", "bugs", "contribute"] %}
+ {{ pageitem(pagename) }}
{% 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 }})
- <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 {{ localefile == "index" and page }}">
{% if abbnotification %}
<? include abb-notification ?>
{% endif %}
{% if not noheading %}
<h1>{{title|translate("title")}}</h1>
{% endif %}
« no previous file with comments | « static/js/main.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld