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

Side by Side Diff: templates/default.tmpl

Issue 29599635: Issue 5717 - Update footer contents (Closed) Base URL: https://bitbucket.org/adblockplus/adblockplus.org
Patch Set: Created Nov. 6, 2017, 5:16 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« locales/en/menu.json ('K') | « locales/en/menu.json ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
ire 2017/11/07 08:36:16 NIT: Why remove this space?
juliandoucette 2017/11/07 13:08:56 Mistake.
18 <!DOCTYPE html> 17 <!DOCTYPE html>
19 <html lang="{{locale}}" dir="{{"rtl" if config.has_option("rtl", locale) else "l tr"}}" itemscope="itemscope" itemtype="http://schema.org/WebPage"> 18 <html lang="{{locale}}" dir="{{"rtl" if config.has_option("rtl", locale) else "l tr"}}" itemscope="itemscope" itemtype="http://schema.org/WebPage">
20 <head> 19 <head>
21 <meta charset="utf-8"> 20 <meta charset="utf-8">
22 <meta name="viewport" content="width=device-width, initial-scale=1"> 21 <meta name="viewport" content="width=device-width, initial-scale=1">
23 22
24 <title>{{title|translate("title", "meta")}}</title> 23 <title>{{title|translate("title", "meta")}}</title>
25 {% if description %} 24 {% if description %}
26 <meta name="description" content="{{description|translate("description", "me ta")}}"> 25 <meta name="description" content="{{description|translate("description", "me ta")}}">
27 {% endif %} 26 {% endif %}
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 <![endif]--> 63 <![endif]-->
65 <!--[if lt IE 10]> 64 <!--[if lt IE 10]>
66 <script src="/js/vendor/cssfx.min.js"></script> 65 <script src="/js/vendor/cssfx.min.js"></script>
67 <![endif]--> 66 <![endif]-->
68 <!--[if IE 8]> 67 <!--[if IE 8]>
69 <link rel="stylesheet" href="/css/empty.css" class="cssfx"/> 68 <link rel="stylesheet" href="/css/empty.css" class="cssfx"/>
70 <![endif]--> 69 <![endif]-->
71 </head> 70 </head>
72 71
73 <body> 72 <body>
74 {% macro pageitem(name) %} 73 {% macro menuitem(sid, href=false) %}
75 {% if name == page %} 74 <li>
76 <li class="selected">{{get_string(name, "menu")}}</li> 75 <a
77 {% else %} 76 href="{{ href if href else sid }}"
78 <li>{{name|linkify}}{{get_string(name, "menu")}}</a></li> 77 {{ 'target="_blank"' if href }}>
ire 2017/11/07 08:36:16 This is applied to all links because all of them a
juliandoucette 2017/11/07 13:08:56 Good catch.
79 {% endif %} 78 {{ get_string(sid, "menu") }}
79 </a>
80 </li>
80 {% endmacro %} 81 {% endmacro %}
81 82
82 <nav id="navbar"> 83 <nav id="navbar">
83 <div class="container"> 84 <div class="container">
84 {{ "index" | linkify(id="navbar-logo") }} 85 {{ "index" | linkify(id="navbar-logo") }}
85 <img 86 <img
86 src="/img/navbar-logo.png" 87 src="/img/navbar-logo.png"
87 srcset="/img/navbar-logo.svg 2x"> 88 srcset="/img/navbar-logo.svg 2x">
88 <span>{{ "Adblock <strong>Plus</strong>" | translate("navbar-logo-text ", "Navbar logo text") }}</span> 89 <span>{{ "Adblock <strong>Plus</strong>" | translate("navbar-logo-text ", "Navbar logo text") }}</span>
89 </a> 90 </a>
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 {% endif %} 146 {% endif %}
146 147
147 {% block body %} 148 {% block body %}
148 {{body|safe}} 149 {{body|safe}}
149 {% endblock %} 150 {% endblock %}
150 </div> 151 </div>
151 152
152 <footer id="footer" class="content"> 153 <footer id="footer" class="content">
153 <div class="container"> 154 <div class="container">
154 <div class="row"> 155 <div class="row">
155 <nav class="column one-fourth"> 156 <nav class="column one-fourth">
ire 2017/11/07 08:36:16 NIT: I think this whole <nav> could also be a macr
juliandoucette 2017/11/07 13:08:56 Detail: I chose to place *just* the `<li>` in the
156 <h5>{{ get_string("resources", "menu") }}</h5> 157 <h5>{{ get_string("abp-nav-heading", "menu") }}</h5>
157 <ul> 158 <ul>
158 {% for pagename in ["acceptable-ads", "documentation", "deployment s"] %} 159 {% for sid, href in [
159 <li>{{ pagename | linkify }}{{ get_string(pagename, "menu") }}</ a></li> 160 ("help-centre-link", "https://help.eyeo.com"),
161 ("contribute-link", "contribute"),
162 ("subscriptions-link", "subscriptions"),
163 ("report-link", "report"),
164 ("blog-link", "blog"),
165 ] %}
166 {{ menuitem(sid, href) }}
160 {% endfor %} 167 {% endfor %}
161 </ul> 168 </ul>
162 </nav> 169 </nav>
163 <nav class="column one-fourth"> 170 <nav class="column one-fourth">
164 <h5>{{ get_string("community", "menu") }}</h5> 171 <h5>{{ get_string("developers-nav-heading", "menu") }}</h5>
165 <ul> 172 <ul>
166 <li><a href="/releases/" hreflang="en">{{get_string("releases", "m enu")}}</a></li> 173 {% for sid, href in [
167 <li><a href="/blog/" hreflang="en">{{get_string("blog", "menu")}}< /a></li> 174 ("documentation-link", "documentation"),
168 <li><a href="/forum/" hreflang="en">{{get_string("forum", "menu")} }</a></li> 175 ("development-link", "development-builds"),
169 {{ pageitem("development-builds") }} 176 ("source-code-link", "source"),
177 ("roadmap-link", "https://issues.adblockplus.org/query?keywords= ~2015q4&col=id&col=summary&col=keywords&col=owner&col=type&col=status&col=priori ty&col=milestone&col=component&report=13&desc=1&order=keywords"),
178 ] %}
179 {{ menuitem(sid, href) }}
180 {% endfor %}
170 </ul> 181 </ul>
171 </nav> 182 </nav>
172 <nav class="column one-fourth"> 183 <nav class="column one-fourth">
173 <h5>{{get_string("development", "menu")}}</h5> 184 <h5>{{ get_string("company-nav-heading", "menu") }}</h5>
174 <ul> 185 <ul>
175 {{ pageitem("source") }} 186 {% for sid, href in [
176 <li><a href="https://issues.adblockplus.org/report/13" hreflang="e n">{{ get_string("roadmap", "menu") }}</a></li> 187 ("eyeo-link", "https://eyeo.com"),
177 {{ pageitem("tools") }} 188 ("jobs-link", "https://eyeo.com/jobs"),
178 <li><a href="https://eyeo.com/jobs/" hreflang="en">{{ get_string(" jobs", "menu") }}</a></li> 189 ("press-link", "https://eyeo.com/press"),
190 ] %}
191 {{ menuitem(sid, href) }}
192 {% endfor %}
179 </ul> 193 </ul>
180 </nav> 194 </nav>
181 <nav id="social-list" class="column one-fourth"> 195 <nav id="social-list" class="column one-fourth">
182 <h5>{{get_string("follow-us", "menu")}}</h5> 196 <h5>{{get_string("contact-nav-heading", "menu")}}</h5>
183 <ul> 197 <ul>
184 <li> 198 <li>
185 <a href="https://twitter.com/AdblockPlus" target="_blank"> 199 <a href="https://twitter.com/AdblockPlus" target="_blank">
186 <img 200 <img
187 src="/img/footer-twitter-glyphicon.png" 201 src="/img/footer-twitter-glyphicon.png"
188 alt="{{ "Twitter" | translate("twitter-alt", "Twitter glyphi con alt text")}}"> 202 alt="{{ "Twitter" | translate("twitter-alt", "Twitter glyphi con alt text")}}">
189 </a> 203 </a>
190 </li> 204 </li>
191 <li> 205 <li>
192 <a href="https://www.youtube.com/user/AdblockPlusOfficial" targe t="_blank"> 206 <a href="https://www.youtube.com/user/AdblockPlusOfficial" targe t="_blank">
(...skipping 20 matching lines...) Expand all
213 <li>{{ pagename | linkify }}{{ get_string(pagename, "menu") }}</a> </li> 227 <li>{{ pagename | linkify }}{{ get_string(pagename, "menu") }}</a> </li>
214 {% endfor %} 228 {% endfor %}
215 </ul> 229 </ul>
216 </div> {# #footer-legal #} 230 </div> {# #footer-legal #}
217 </div> {# .container #} 231 </div> {# .container #}
218 </footer> {# #footer #} 232 </footer> {# #footer #}
219 233
220 <script src="/js/main.js"></script> 234 <script src="/js/main.js"></script>
221 </body> 235 </body>
222 </html> 236 </html>
OLDNEW
« locales/en/menu.json ('K') | « locales/en/menu.json ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld