Unified 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.
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 »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: templates/default.tmpl |
| =================================================================== |
| --- a/templates/default.tmpl |
| +++ b/templates/default.tmpl |
| @@ -144,61 +144,85 @@ |
| {% endif %} |
| {% endif %} |
| {% block body %} |
| {{body|safe}} |
| {% endblock %} |
| </div> |
| - <footer id="footer-main"> |
| - <div id="footer-content"> |
| - <nav> |
| - <section class="first"> |
| - <h1>{{get_string("resources", "menu")}}</h1> |
| + <footer id="site-footer"> |
| + <div class="container"> |
| + <div class="row"> |
| + <nav class="column one-fourth"> |
| + <h5>{{ get_string("resources", "menu") }}</h5> |
| <ul> |
| - {% for name in ["acceptable-ads", "documentation", "deployments", "terms", "privacy", "impressum"] %} |
| - {{pageitem(name)}} |
| + {% for name in ["acceptable-ads", "documentation", "deployments"] %} |
| + {{ pageitem(name) }} |
| {% endfor %} |
| </ul> |
| - </section> |
| - |
| - <section> |
| - <h1>{{get_string("community", "menu")}}</h1> |
| + </nav> |
| + <nav class="column one-fourth"> |
| + <h5>{{ get_string("community", "menu") }}</h5> |
| <ul> |
| <li><a href="/releases/" hreflang="en">{{get_string("releases", "menu")}}</a></li> |
|
ire
2017/10/09 10:38:04
NIT: There's no whitespace around the "{{" and con
|
| <li><a href="/blog/" hreflang="en">{{get_string("blog", "menu")}}</a></li> |
| <li><a href="/forum/" hreflang="en">{{get_string("forum", "menu")}}</a></li> |
| - {{pageitem("development-builds")}} |
| + {{ pageitem("development-builds") }} |
| </ul> |
| - </section> |
| - |
| - <section> |
| - <h1>{{get_string("development", "menu")}}</h1> |
| + </nav> |
| + <nav class="column one-fourth"> |
| + <h5>{{get_string("development", "menu")}}</h5> |
| <ul> |
| - {{pageitem("source")}} |
| - <li><a href="https://issues.adblockplus.org/report/13" hreflang="en">{{get_string("roadmap", "menu")}}</a></li> |
| - {{pageitem("tools")}} |
| - <li><a href="https://eyeo.com/jobs/" hreflang="en">{{get_string("jobs", "menu")}}</a></li> |
| + {{ pageitem("source") }} |
| + <li><a href="https://issues.adblockplus.org/report/13" hreflang="en">{{ get_string("roadmap", "menu") }}</a></li> |
| + {{ pageitem("tools") }} |
| + <li><a href="https://eyeo.com/jobs/" hreflang="en">{{ get_string("jobs", "menu") }}</a></li> |
| </ul> |
| - </section> |
| - </nav> |
| - |
| - <section id="social"> |
| - <h1>{{get_string("follow-us", "menu")}}</h1> |
| - <ul id="social-list"> |
| - <li class="social-entry"> |
| - <a rel="nofollow" id="social-facebook" class="sprite" href="https://www.facebook.com/adblockplus"></a> |
| - </li> |
| - <li class="social-entry"> |
| - <a rel="nofollow" id="social-twitter" class="sprite" href="https://twitter.com/adblockplus"></a> |
| - </li> |
| - <li class="social-entry"> |
| - <a rel="nofollow" id="social-gplus" class="sprite" href="https://plus.google.com/110020691898167279887"></a> |
| - </li> |
| + </nav> |
| + <nav id="social-list" class="column one-fourth"> |
| + <h5>{{get_string("follow-us", "menu")}}</h5> |
| + <ul> |
| + <li> |
| + <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.
|
| + <img |
| + src="/img/footer-twitter-glyphicon.png" |
| + alt="{{ "Twitter" | translate("twitter-alt", "Twitter glyphicon alt text")}}"> |
| + </a> |
| + </li> |
| + <li> |
| + <a rel="nofollow" href="https://www.youtube.com/user/AdblockPlusOfficial" target="_blank"> |
| + <img |
| + src="/img/footer-youtube-glyphicon.png" |
| + alt="{{ "YouTube" | translate("youtube-alt", "YouTube glyphicon alt text")}}"> |
| + </a> |
| + </li> |
| + <li> |
| + <a rel="nofollow" href="https://www.facebook.com/adblockplus" target="_blank"> |
| + <img |
| + 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.
|
| + alt="{{ "Facebook" | translate("facebook-alt", "Facebook glyphicon alt text")}}"> |
| + </a> |
| + </li> |
| + <li> |
| + <a rel="nofollow" href="https://www.instagram.com/adblockplus/" target="_blank"> |
| + <img |
| + src="/img/footer-instagram-glyphicon.png" |
| + alt="{{ "Instagram" | translate("instagram-alt", "Instagram glyphicon alt text")}}"> |
| + </a> |
| + </li> |
| + </ul> |
| + </nav> |
| + </div><!-- .row --> |
| + <div id="footer-legal"> |
| + <p id="copyright-notice">{{ "Copyright © 2017 All rights reserved. Adblock 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.
|
| + <ul id="legal-list"> |
| + {% for pagename in ["terms", "privacy", "impressum"] %} |
| + {{ pageitem(pagename) }} |
| + {% endfor %} |
| </ul> |
| - </section> |
| - </div> |
| + </div> |
| + </div><!-- .container --> |
| </footer> |
| <script src="/js/main.js"></script> |
| </body> |
| </html> |
« static/css/main.css ('K')
|
« static/js/main.js ('k')
|
templates/simple.tmpl » ('j')
|
no next file with comments »
