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

Delta Between Two Patch Sets: templates/default.tmpl

Issue 29589609: Issue 5636 - Changed navbar contents (Closed) Base URL: https://bitbucket.org/adblockplus/adblockplus.org
Left Patch Set: Created Oct. 26, 2017, 11:53 a.m.
Right Patch Set: Rebased, Changed documentation link, added globe icon, removed locale code Created Nov. 27, 2017, 5:30 p.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 | « static/img/globe.svg ('k') | 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 {# 1 {#
2 # This file is part of the Adblock Plus website, 2 # This file is part of the Adblock Plus website,
3 # Copyright (C) 2006-present eyeo GmbH 3 # Copyright (C) 2006-present eyeo GmbH
4 # 4 #
5 # Adblock Plus is free software: you can redistribute it and/or modify 5 # Adblock Plus is free software: you can redistribute it and/or modify
6 # it under the terms of the GNU General Public License version 3 as 6 # it under the terms of the GNU General Public License version 3 as
7 # published by the Free Software Foundation. 7 # published by the Free Software Foundation.
8 # 8 #
9 # Adblock Plus is distributed in the hope that it will be useful, 9 # Adblock Plus is distributed in the hope that it will be useful,
10 # but WITHOUT ANY WARRANTY; without even the implied warranty of 10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 # GNU General Public License for more details. 12 # GNU General Public License for more details.
13 # 13 #
14 # You should have received a copy of the GNU General Public License 14 # You should have received a copy of the GNU General Public License
15 # along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. 15 # along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>.
16 #} 16 #}
17 17
18 <!DOCTYPE html> 18 <!DOCTYPE html>
19 <html lang="{{locale}}" dir="{{"rtl" if config.has_option("rtl", locale) else "l tr"}}" itemscope="itemscope" itemtype="http://schema.org/WebPage"> 19 <html lang="{{locale}}" dir="{{"rtl" if config.has_option("rtl", locale) else "l tr"}}" itemscope="itemscope" itemtype="http://schema.org/WebPage" class="no-js">
20 <head> 20 <head>
21 <meta charset="utf-8"> 21 <meta charset="utf-8">
22 <meta name="viewport" content="width=device-width, initial-scale=1"> 22 <meta name="viewport" content="width=device-width, initial-scale=1">
23 23
24 <title>{{title|translate("title", "meta")}}</title> 24 <title>{{title|translate("title", "meta")}}</title>
25 {% if description %} 25 {% if description %}
26 <meta name="description" content="{{description|translate("description", "me ta")}}"> 26 <meta name="description" content="{{description|translate("description", "me ta")}}">
27 {% endif %} 27 {% endif %}
28 <link rel="canonical" href="{{ get_canonical_url(page | ignore_browsers) }}" > 28 <link rel="canonical" href="{{ get_canonical_url(page | ignore_browsers) }}" >
29 29
30 {# facebook / Open Graph http://ogp.me/ #} 30 {# facebook / Open Graph http://ogp.me/ #}
31 <meta property="og:image" content="{{og_image if og_image else '/img/adblock plus_promo.png'}}" /> 31 <meta property="og:image" content="{{og_image if og_image else '/img/adblock plus_promo.png'}}" />
32 <meta property="og:title" content="{{ title | translate("title") }}"> 32 <meta property="og:title" content="{{ title | translate("title") }}">
33 {% if description %} 33 {% if description %}
34 <meta property="og:description" content="{{ description | translate("descr iption") }}"> 34 <meta property="og:description" content="{{ description | translate("descr iption") }}">
35 {% endif %} 35 {% endif %}
36 <meta property="og:locale" content="{{ locale | to_og_locale }}"> 36 <meta property="og:locale" content="{{ locale | to_og_locale }}">
37 {% for alternate_locale in available_locales %} 37 {% for alternate_locale in available_locales %}
38 {% if alternate_locale != locale %} 38 {% if alternate_locale != locale %}
39 <meta property="og:locale:alternate" content="{{ alternate_locale | to_o g_locale }}"> 39 <meta property="og:locale:alternate" content="{{ alternate_locale | to_o g_locale }}">
40 {% endif %} 40 {% endif %}
41 {% endfor %} 41 {% endfor %}
42 <meta property="og:url" content="{{ get_canonical_url(page | ignore_browsers ) }}"> 42 <meta property="og:url" content="{{ config.get("general", "siteurl") }}{{ so urce.resolve_link(page | ignore_browsers, locale)[1] }}">
43 43
44 {# twitter https://dev.twitter.com/cards/markup #} 44 {# twitter https://dev.twitter.com/cards/markup #}
45 <meta name="twitter:site" content="@AdblockPlus" /> 45 <meta name="twitter:site" content="@AdblockPlus" />
46 <meta name="twitter:creator" content="@AdblockPlus" /> 46 <meta name="twitter:creator" content="@AdblockPlus" />
47 47
48 <link rel="stylesheet" href="/css/defaults.css" class="cssfx"> 48 <link rel="stylesheet" href="/css/defaults.css" class="cssfx">
49 <link rel="stylesheet" href="/css/main.css" class="cssfx"> 49 <link rel="stylesheet" href="/css/main.css" class="cssfx">
50 <link rel="apple-touch-icon" href="/img/favicon-large.png" /> 50 <link rel="apple-touch-icon" href="/img/favicon-large.png" />
51 51
52 <!--[if IE 8]> 52 <!--[if IE 8]>
(...skipping 20 matching lines...) Expand all
73 <body> 73 <body>
74 {% macro pageitem(name) %} 74 {% macro pageitem(name) %}
75 {% if name == page %} 75 {% if name == page %}
76 <li class="selected">{{get_string(name, "menu")}}</li> 76 <li class="selected">{{get_string(name, "menu")}}</li>
77 {% else %} 77 {% else %}
78 <li>{{name|linkify}}{{get_string(name, "menu")}}</a></li> 78 <li>{{name|linkify}}{{get_string(name, "menu")}}</a></li>
79 {% endif %} 79 {% endif %}
80 {% endmacro %} 80 {% endmacro %}
81 81
82 <nav id="navbar"> 82 <nav id="navbar">
83 <div class="navbar-container"> 83 <div class="container">
84 {{ "index" | linkify(id="navbar-logo") }} 84 {{ "index" | linkify(id="navbar-logo") }}
85 <img 85 <img
86 src="/img/navbar-logo.png" 86 src="/img/navbar-logo.png"
87 srcset="/img/navbar-logo.svg 2x"> 87 srcset="/img/navbar-logo.svg 2x">
88 <span>{{ "Adblock <strong>Plus</strong>" | translate("navbar-logo-text ", "Navbar logo text") }}</span> 88 <span>{{ "Adblock <strong>Plus</strong>" | translate("navbar-logo-text ", "Navbar logo text") }}</span>
89 </a> 89 </a>
90 <a href="#" id="navbar-menu-toggle"> 90 <a href="#" id="navbar-menu-toggle">
91 <img 91 <img
92 src="/img/menu-toggle.png" 92 src="/img/menu-toggle.png"
93 srcset="/img/menu-toggle.svg 2x"> 93 srcset="/img/menu-toggle.svg 2x">
94 </a> 94 </a>
95 <ul id="navbar-menu"> 95 <ul id="navbar-menu">
96 {% for pagename in ["contribute", "about"] %} 96 {% for pagename in ["about", "contribute"] %}
ire 2017/10/27 12:47:27 In the spec, the order is ["about", "contribute"]
juliandoucette 2017/10/28 11:35:16 See https://bitbucket.org/adblockplus/spec/pull-re
97 <li> 97 <li>
98 {{ pagename | linkify }}{{ get_string(pagename, "menu") }}</a> 98 {{ pagename | linkify }}{{ get_string(pagename, "menu") }}</a>
99 </li> 99 </li>
100 {% endfor %} 100 {% endfor %}
101 <li> 101 <li>
102 <a href="https://help.eyeo.com/adblockplus">{{ get_string("help", "m enu") }}</a> 102 <a href="documentation">{{ get_string("help", "menu") }}</a>
103 </li> 103 </li>
104 <li id="navbar-locale-menubar"> 104 <li id="navbar-locale-menubar">
105 <a href="#" id="navbar-locale-selected"> 105 <a id="navbar-locale-selected" href="#">
106 {{ config.get("langnames", locale) }} ({{ locale | to_og_locale | to_og_location }}) 106 <img
107 id="locale-icon"
108 src="/img/globe.png"
109 srcset="/img/globe.svg 2x"
110 aria-hidden="true" />
111 {{ config.get("langnames", locale) }}
107 </a> 112 </a>
108 <ul id="navbar-locale-menu"> 113 <ul id="navbar-locale-menu">
109 {% for available_locale in available_locales %} 114 {% for available_locale in available_locales %}
110 <li> 115 <li>
111 {{ page | linkify(available_locale) }} 116 {{ page | linkify(available_locale) }}
112 {{ config.get("langnames", available_locale) }} ({{ availabl e_locale | to_og_locale | to_og_location }}) 117 {{ config.get("langnames", available_locale) }}
113 </a> 118 </a>
114 </li> 119 </li>
115 {% endfor %} 120 {% endfor %}
116 </ul>{# #navbar-locale-menu #} 121 </ul>{# #navbar-locale-menu #}
117 </li> 122 </li>
118 </ul>{# #navbar-menu #} 123 </ul>{# #navbar-menu #}
119 </div>{# .container #} 124 </div>{# .container #}
120 </nav>{# #navbar #} 125 </nav>{# #navbar #}
121 126
122 <div id="content" class="container content {{ localefile == "index" and page }}"> 127 <div id="content" class="container content {{ localefile == "index" and page }}">
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
216 <li>{{ pagename | linkify }}{{ get_string(pagename, "menu") }}</a> </li> 221 <li>{{ pagename | linkify }}{{ get_string(pagename, "menu") }}</a> </li>
217 {% endfor %} 222 {% endfor %}
218 </ul> 223 </ul>
219 </div> {# #footer-legal #} 224 </div> {# #footer-legal #}
220 </div> {# .container #} 225 </div> {# .container #}
221 </footer> {# #footer #} 226 </footer> {# #footer #}
222 227
223 <script src="/js/main.js"></script> 228 <script src="/js/main.js"></script>
224 </body> 229 </body>
225 </html> 230 </html>
LEFTRIGHT
« static/img/globe.svg ('k') | 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