Side by Side Diff: templates/default.tmpl
Issue 29558641:
Issue 5740 - Implemented new abp.org footer styles (Closed)
Base URL: https://bitbucket.org/adblockplus/adblockplus.org
Patch Set: Refactored
Created Oct. 6, 2017, 12:47 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« static/css/main.css ('K')
|
« static/js/main.js ('k')
|
templates/simple.tmpl » ('j')
|
no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| OLD | NEW |
|---|---|
| 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 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 142 {{toc(toclist)}} | 142 {{toc(toclist)}} |
| 143 </div> | 143 </div> |
| 144 {% endif %} | 144 {% endif %} |
| 145 {% endif %} | 145 {% endif %} |
| 146 | 146 |
| 147 {% block body %} | 147 {% block body %} |
| 148 {{body|safe}} | 148 {{body|safe}} |
| 149 {% endblock %} | 149 {% endblock %} |
| 150 </div> | 150 </div> |
| 151 | 151 |
| 152 <footer id="footer-main"> | 152 <footer id="site-footer"> |
| 153 <div id="footer-content"> | 153 <div class="container"> |
| 154 <nav> | 154 <div class="row"> |
| 155 <section class="first"> | 155 <nav class="column one-fourth"> |
| 156 <h1>{{get_string("resources", "menu")}}</h1> | 156 <h5>{{ get_string("resources", "menu") }}</h5> |
| 157 <ul> | 157 <ul> |
| 158 {% for name in ["acceptable-ads", "documentation", "deployments", "terms", "privacy", "impressum"] %} | 158 {% for name in ["acceptable-ads", "documentation", "deployments"] %} |
| 159 {{pageitem(name)}} | 159 {{ pageitem(name) }} |
| 160 {% endfor %} | 160 {% endfor %} |
| 161 </ul> | 161 </ul> |
| 162 </section> | 162 </nav> |
| 163 | 163 <nav class="column one-fourth"> |
| 164 <section> | 164 <h5>{{ get_string("community", "menu") }}</h5> |
| 165 <h1>{{get_string("community", "menu")}}</h1> | |
| 166 <ul> | 165 <ul> |
| 167 <li><a href="/releases/" hreflang="en">{{get_string("releases", "m enu")}}</a></li> | 166 <li><a href="/releases/" hreflang="en">{{get_string("releases", "m enu")}}</a></li> |
|
ire
2017/10/09 10:38:04
NIT: There's no whitespace around the "{{" and con
| |
| 168 <li><a href="/blog/" hreflang="en">{{get_string("blog", "menu")}}< /a></li> | 167 <li><a href="/blog/" hreflang="en">{{get_string("blog", "menu")}}< /a></li> |
| 169 <li><a href="/forum/" hreflang="en">{{get_string("forum", "menu")} }</a></li> | 168 <li><a href="/forum/" hreflang="en">{{get_string("forum", "menu")} }</a></li> |
| 170 {{pageitem("development-builds")}} | 169 {{ pageitem("development-builds") }} |
| 171 </ul> | 170 </ul> |
| 172 </section> | 171 </nav> |
| 173 | 172 <nav class="column one-fourth"> |
| 174 <section> | 173 <h5>{{get_string("development", "menu")}}</h5> |
| 175 <h1>{{get_string("development", "menu")}}</h1> | |
| 176 <ul> | 174 <ul> |
| 177 {{pageitem("source")}} | 175 {{ pageitem("source") }} |
| 178 <li><a href="https://issues.adblockplus.org/report/13" hreflang="e n">{{get_string("roadmap", "menu")}}</a></li> | 176 <li><a href="https://issues.adblockplus.org/report/13" hreflang="e n">{{ get_string("roadmap", "menu") }}</a></li> |
| 179 {{pageitem("tools")}} | 177 {{ pageitem("tools") }} |
| 180 <li><a href="https://eyeo.com/jobs/" hreflang="en">{{get_string("j obs", "menu")}}</a></li> | 178 <li><a href="https://eyeo.com/jobs/" hreflang="en">{{ get_string(" jobs", "menu") }}</a></li> |
| 181 </ul> | 179 </ul> |
| 182 </section> | 180 </nav> |
| 183 </nav> | 181 <nav id="social-list" class="column one-fourth"> |
| 184 | 182 <h5>{{get_string("follow-us", "menu")}}</h5> |
| 185 <section id="social"> | 183 <ul> |
| 186 <h1>{{get_string("follow-us", "menu")}}</h1> | 184 <li> |
| 187 <ul id="social-list"> | 185 <a rel="nofollow" href="https://twitter.com/AdblockPlus" target= "_blank"> |
|
ire
2017/10/09 10:38:04
I thought we agreed to not include the `rel=nofoll
juliandoucette
2017/10/11 13:12:08
I forgot / it was there already.
ire
2017/10/11 16:28:30
Acknowledged.
| |
| 188 <li class="social-entry"> | 186 <img |
| 189 <a rel="nofollow" id="social-facebook" class="sprite" href="https: //www.facebook.com/adblockplus"></a> | 187 src="/img/footer-twitter-glyphicon.png" |
| 190 </li> | 188 alt="{{ "Twitter" | translate("twitter-alt", "Twitter glyphi con alt text")}}"> |
| 191 <li class="social-entry"> | 189 </a> |
| 192 <a rel="nofollow" id="social-twitter" class="sprite" href="https:/ /twitter.com/adblockplus"></a> | 190 </li> |
| 193 </li> | 191 <li> |
| 194 <li class="social-entry"> | 192 <a rel="nofollow" href="https://www.youtube.com/user/AdblockPlus Official" target="_blank"> |
| 195 <a rel="nofollow" id="social-gplus" class="sprite" href="https://p lus.google.com/110020691898167279887"></a> | 193 <img |
| 196 </li> | 194 src="/img/footer-youtube-glyphicon.png" |
| 195 alt="{{ "YouTube" | translate("youtube-alt", "YouTube glyphi con alt text")}}"> | |
| 196 </a> | |
| 197 </li> | |
| 198 <li> | |
| 199 <a rel="nofollow" href="https://www.facebook.com/adblockplus" ta rget="_blank"> | |
| 200 <img | |
| 201 src="/img/footer-facebook-glyphicon.png" | |
|
ire
2017/10/09 10:38:04
The images need to be optimised
juliandoucette
2017/10/11 13:12:07
Thank you for the reminder (I just optimized the h
ire
2017/10/11 16:28:30
Acknowledged.
| |
| 202 alt="{{ "Facebook" | translate("facebook-alt", "Facebook gly phicon alt text")}}"> | |
| 203 </a> | |
| 204 </li> | |
| 205 <li> | |
| 206 <a rel="nofollow" href="https://www.instagram.com/adblockplus/" target="_blank"> | |
| 207 <img | |
| 208 src="/img/footer-instagram-glyphicon.png" | |
| 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"> | |
| 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> | |
|
ire
2017/10/09 10:38:04
The ® could be wrapped in a <sup> and made a but s
juliandoucette
2017/10/11 13:12:08
Done.
| |
| 217 <ul id="legal-list"> | |
| 218 {% for pagename in ["terms", "privacy", "impressum"] %} | |
| 219 {{ pageitem(pagename) }} | |
| 220 {% endfor %} | |
| 197 </ul> | 221 </ul> |
| 198 </section> | 222 </div> |
| 199 </div> | 223 </div><!-- .container --> |
| 200 </footer> | 224 </footer> |
| 201 | 225 |
| 202 <script src="/js/main.js"></script> | 226 <script src="/js/main.js"></script> |
| 203 </body> | 227 </body> |
| 204 </html> | 228 </html> |
| OLD | NEW |
« static/css/main.css ('K')
|
« static/js/main.js ('k')
|
templates/simple.tmpl » ('j')
|
no next file with comments »
