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

Delta Between Two Patch Sets: templates/default.tmpl

Issue 29558641: Issue 5740 - Implemented new abp.org footer styles (Closed) Base URL: https://bitbucket.org/adblockplus/adblockplus.org
Left Patch Set: Rebased on top of #5742 Created Oct. 5, 2017, 3:35 p.m.
Right Patch Set: Addressed comments Created Oct. 11, 2017, 1:11 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/js/main.js ('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
(...skipping 27 matching lines...) Expand all
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="{{ get_canonical_url(page | ignore_browsers ) }}">
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/main.css" class="cssfx"> 49 <link rel="stylesheet" href="/css/main.css" class="cssfx">
49 <link rel="stylesheet" href="/css/main-desktop.css" media="(min-width: 1000p x)" class="cssfx"> 50 <link rel="stylesheet" href="/css/main-desktop.css" media="(min-width: 1000p x)" class="cssfx">
50 <link rel="stylesheet" href="/css/main-mobile.css" media="(max-width: 1000px )"> 51 <link rel="stylesheet" href="/css/main-mobile.css" media="(max-width: 1000px )">
51 <link rel="apple-touch-icon" href="/img/favicon-large.png" /> 52 <link rel="apple-touch-icon" href="/img/favicon-large.png" />
52 53
53 <!--[if IE 8]> 54 <!--[if IE 8]>
54 <script src="/js/vendor/ie8.js"></script> 55 <script src="/js/vendor/ie8.js"></script>
55 <![endif]--> 56 <![endif]-->
56 57
57 {% block head %} 58 {% block head %}
(...skipping 19 matching lines...) Expand all
77 </noscript> 78 </noscript>
78 79
79 {% macro pageitem(name) %} 80 {% macro pageitem(name) %}
80 {% if name == page %} 81 {% if name == page %}
81 <li class="selected">{{get_string(name, "menu")}}</li> 82 <li class="selected">{{get_string(name, "menu")}}</li>
82 {% else %} 83 {% else %}
83 <li>{{name|linkify}}{{get_string(name, "menu")}}</a></li> 84 <li>{{name|linkify}}{{get_string(name, "menu")}}</a></li>
84 {% endif %} 85 {% endif %}
85 {% endmacro %} 86 {% endmacro %}
86 87
87 <header> 88 <nav id="navbar">
88 {{"index"|linkify(id="logo", class="sprite", itemprop="image")}}</a> 89 <div class="navbar-container">
89 <nav> 90 {{ "index" | linkify(id="navbar-logo") }}
90 <ul> 91 <img
91 {% if localefile == "index" %} 92 src="/img/navbar-logo.png"
92 <li class="selected first">{{get_string("installation", "menu")}}</l i> 93 srcset="/img/navbar-logo.svg 2x">
93 {% else %} 94 <span>{{ "Adblock <strong>Plus</strong>" | translate("navbar-logo-text ", "Navbar logo text") }}</span>
94 <li class="install-link first">{{"index"|linkify}}{{get_string("inst allation", "menu")}} <span class="sprite install-link-icon"></span></a></li> 95 </a>
95 {% endif %} 96 <a href="#" id="navbar-menu-toggle">
96 {% for name in ["about", "features", "bugs", "contribute"] %} 97 <img
97 {{pageitem(name)}} 98 src="/img/menu-toggle.png"
99 srcset="/img/menu-toggle.svg 2x">
100 </a>
101 <ul id="navbar-menu">
102 {% for pagename in ["about", "features", "bugs", "contribute"] %}
103 <li>
104 {{ pagename | linkify }}{{ get_string(pagename, "menu") }}</a>
105 </li>
98 {% endfor %} 106 {% endfor %}
99 <li id="language"> 107 <li id="navbar-locale-menubar">
100 <div id="current-language"> 108 <a href="#" id="navbar-locale-selected">
101 {{ config.get("langnames", locale) }} ({{ locale | to_og_locale | to_og_location }}) 109 {{ config.get("langnames", locale) }} ({{ locale | to_og_locale | to_og_location }})
102 <span id="language-arrow" class="sprite"></span> 110 </a>
103 </div> 111 <ul id="navbar-locale-menu">
104 <ul id="language-selector">
105 {% for available_locale in available_locales %} 112 {% for available_locale in available_locales %}
106 <li class="language-entry"> 113 <li>
107 {{ page | linkify(available_locale) }} 114 {{ page | linkify(available_locale) }}
108 {{ config.get("langnames", available_locale) }} ({{ availabl e_locale | to_og_locale | to_og_location }}) 115 {{ config.get("langnames", available_locale) }} ({{ availabl e_locale | to_og_locale | to_og_location }})
109 </a> 116 </a>
110 </li> 117 </li>
111 {% endfor %} 118 {% endfor %}
112 </ul> 119 </ul>{# #navbar-locale-menu #}
113 </li> 120 </li>
114 </ul> 121 </ul>{# #navbar-menu #}
115 <a href="#" id="hamburger"></a> 122 </div>{# .container #}
116 </nav> 123 </nav>{# #navbar #}
117 </header> 124
118 125 <div id="content" class="container content {{ localefile == "index" and page }}">
119 <div id="content" class="container {{ localefile == "index" and page }}">
120 {% if abbnotification %} 126 {% if abbnotification %}
121 <? include abb-notification ?> 127 <? include abb-notification ?>
122 {% endif %} 128 {% endif %}
123 {% if not noheading %} 129 {% if not noheading %}
124 <h1>{{title|translate("title")}}</h1> 130 <h1>{{title|translate("title")}}</h1>
125 {% endif %} 131 {% endif %}
126 132
127 {% if not notoc %} 133 {% if not notoc %}
128 {% macro toc(toclist) %} 134 {% macro toc(toclist) %}
129 <ul> 135 <ul>
(...skipping 12 matching lines...) Expand all
142 {{toc(toclist)}} 148 {{toc(toclist)}}
143 </div> 149 </div>
144 {% endif %} 150 {% endif %}
145 {% endif %} 151 {% endif %}
146 152
147 {% block body %} 153 {% block body %}
148 {{body|safe}} 154 {{body|safe}}
149 {% endblock %} 155 {% endblock %}
150 </div> 156 </div>
151 157
152 <footer id="site-footer"> 158 <footer id="footer" class="content">
153 <div class="container"> 159 <div class="container">
154 <div class="row"> 160 <div class="row">
155 <nav class="column one-fourth"> 161 <nav class="column one-fourth">
156 <h5>{{ get_string("resources", "menu") }}</h5> 162 <h5>{{ get_string("resources", "menu") }}</h5>
157 <ul> 163 <ul>
158 {% for name in ["acceptable-ads", "documentation", "deployments"] %} 164 {% for pagename in ["acceptable-ads", "documentation", "deployment s"] %}
159 {{ pageitem(name) }} 165 <li>{{ pagename | linkify }}{{ get_string(pagename, "menu") }}</ a></li>
160 {% endfor %} 166 {% endfor %}
161 </ul> 167 </ul>
162 </nav> 168 </nav>
163 <nav class="column one-fourth"> 169 <nav class="column one-fourth">
164 <h5>{{ get_string("community", "menu") }}</h5> 170 <h5>{{ get_string("community", "menu") }}</h5>
165 <ul> 171 <ul>
166 <li><a href="/releases/" hreflang="en">{{get_string("releases", "m enu")}}</a></li> 172 <li><a href="/releases/" hreflang="en">{{get_string("releases", "m enu")}}</a></li>
167 <li><a href="/blog/" hreflang="en">{{get_string("blog", "menu")}}< /a></li> 173 <li><a href="/blog/" hreflang="en">{{get_string("blog", "menu")}}< /a></li>
168 <li><a href="/forum/" hreflang="en">{{get_string("forum", "menu")} }</a></li> 174 <li><a href="/forum/" hreflang="en">{{get_string("forum", "menu")} }</a></li>
169 {{ pageitem("development-builds") }} 175 {{ pageitem("development-builds") }}
170 </ul> 176 </ul>
171 </nav> 177 </nav>
172 <nav class="column one-fourth"> 178 <nav class="column one-fourth">
173 <h5>{{get_string("development", "menu")}}</h5> 179 <h5>{{get_string("development", "menu")}}</h5>
174 <ul> 180 <ul>
175 {{ pageitem("source") }} 181 {{ pageitem("source") }}
176 <li><a href="https://issues.adblockplus.org/report/13" hreflang="e n">{{ get_string("roadmap", "menu") }}</a></li> 182 <li><a href="https://issues.adblockplus.org/report/13" hreflang="e n">{{ get_string("roadmap", "menu") }}</a></li>
177 {{ pageitem("tools") }} 183 {{ pageitem("tools") }}
178 <li><a href="https://eyeo.com/jobs/" hreflang="en">{{ get_string(" jobs", "menu") }}</a></li> 184 <li><a href="https://eyeo.com/jobs/" hreflang="en">{{ get_string(" jobs", "menu") }}</a></li>
179 </ul> 185 </ul>
180 </nav> 186 </nav>
181 <nav id="social-list" class="column one-fourth"> 187 <nav id="social-list" class="column one-fourth">
182 <h5>{{get_string("follow-us", "menu")}}</h5> 188 <h5>{{get_string("follow-us", "menu")}}</h5>
183 <ul> 189 <ul>
184 <li> 190 <li>
185 <a rel="nofollow" href="https://twitter.com/AdblockPlus" target= "_blank"> 191 <a href="https://twitter.com/AdblockPlus" target="_blank">
186 <img 192 <img
187 src="/img/footer-twitter-glyphicon.png" 193 src="/img/footer-twitter-glyphicon.png"
188 alt="{{ "Twitter" | translate("twitter-alt", "Twitter glyphi con alt text")}}"> 194 alt="{{ "Twitter" | translate("twitter-alt", "Twitter glyphi con alt text")}}">
189 </a> 195 </a>
190 </li> 196 </li>
191 <li> 197 <li>
192 <a rel="nofollow" href="https://www.youtube.com/user/AdblockPlus Official" target="_blank"> 198 <a href="https://www.youtube.com/user/AdblockPlusOfficial" targe t="_blank">
193 <img 199 <img src="/img/footer-youtube-glyphicon.png">
194 src="/img/footer-youtube-glyphicon.png" 200 </a>
195 alt="{{ "YouTube" | translate("youtube-alt", "YouTube glyphi con alt text")}}"> 201 </li>
196 </a> 202 <li>
197 </li> 203 <a href="https://www.facebook.com/adblockplus" target="_blank">
198 <li> 204 <img src="/img/footer-facebook-glyphicon.png">
199 <a rel="nofollow" href="https://www.facebook.com/adblockplus" ta rget="_blank"> 205 </a>
200 <img 206 </li>
201 src="/img/footer-facebook-glyphicon.png" 207 <li>
202 alt="{{ "Facebook" | translate("facebook-alt", "Facebook gly phicon alt text")}}"> 208 <a href="https://www.instagram.com/adblockplus/" target="_blank" >
203 </a> 209 <img src="/img/footer-instagram-glyphicon.png">
204 </li> 210 </a>
205 <li> 211 </li>
206 <a rel="nofollow" href="https://www.instagram.com/adblockplus/" target="_blank"> 212 </ul>
207 <img 213 </nav>
208 src="/img/footer-instagram-glyphicon.png" 214 </div> {# .row #}
209 alt="{{ "Instagram" | translate("instagram-alt", "Instagram glyphicon alt text")}}">
210 </a>
211 </li>
212 </ul>
213 </nav>
214 </div><!-- .row -->
215 <div id="footer-legal"> 215 <div id="footer-legal">
216 <p id="copyright-notice">{{ "Copyright © 2017 All rights reserved. Adb lock Plus® is a registered trademark of <a href='https://eyeo.com'>eyeo GmbH</a> ." | translate("copyright-notice", "Footer copyright notice") }}</p> 216 <p id="copyright-notice">{{ "Copyright © 2017 All rights reserved. Adb lock Plus<sup>®</sup> is a registered trademark of <a href='https://eyeo.com'>ey eo GmbH</a>." | translate("copyright-notice", "Footer copyright notice") }}</p>
217 <ul id="legal-list"> 217 <ul id="legal-list">
218 {% for pagename in ["terms", "privacy", "impressum"] %} 218 {% for pagename in ["terms", "privacy", "impressum"] %}
219 {{ pageitem(pagename) }} 219 <li>{{ pagename | linkify }}{{ get_string(pagename, "menu") }}</a> </li>
220 {% endfor %} 220 {% endfor %}
221 </ul> 221 </ul>
222 </div> 222 </div> {# #footer-legal #}
223 </div><!-- .container --> 223 </div> {# .container #}
224 </footer> 224 </footer> {# #footer #}
225 225
226 <script src="/js/main.js"></script> 226 <script src="/js/main.js"></script>
227 </body> 227 </body>
228 </html> 228 </html>
LEFTRIGHT
« static/js/main.js ('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