Unified 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.
Use n/p to move between diff chunks;
N/P to move between comments.
« locales/en/menu.json ('K')
|
« locales/en/menu.json ('k')
|
no next file »
|
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 |
| @@ -9,17 +9,16 @@ |
| # Adblock Plus is distributed in the hope that it will be useful, |
| # but WITHOUT ANY WARRANTY; without even the implied warranty of |
| # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| # GNU General Public License for more details. |
| # |
| # You should have received a copy of the GNU General Public License |
| # along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. |
| #} |
| - |
|
ire
2017/11/07 08:36:16
NIT: Why remove this space?
juliandoucette
2017/11/07 13:08:56
Mistake.
|
| <!DOCTYPE html> |
| <html lang="{{locale}}" dir="{{"rtl" if config.has_option("rtl", locale) else "ltr"}}" itemscope="itemscope" itemtype="http://schema.org/WebPage"> |
| <head> |
| <meta charset="utf-8"> |
| <meta name="viewport" content="width=device-width, initial-scale=1"> |
| <title>{{title|translate("title", "meta")}}</title> |
| {% if description %} |
| @@ -66,22 +65,24 @@ |
| <script src="/js/vendor/cssfx.min.js"></script> |
| <![endif]--> |
| <!--[if IE 8]> |
| <link rel="stylesheet" href="/css/empty.css" class="cssfx"/> |
| <![endif]--> |
| </head> |
| <body> |
| - {% macro pageitem(name) %} |
| - {% if name == page %} |
| - <li class="selected">{{get_string(name, "menu")}}</li> |
| - {% else %} |
| - <li>{{name|linkify}}{{get_string(name, "menu")}}</a></li> |
| - {% endif %} |
| + {% macro menuitem(sid, href=false) %} |
| + <li> |
| + <a |
| + href="{{ href if href else sid }}" |
| + {{ '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.
|
| + {{ get_string(sid, "menu") }} |
| + </a> |
| + </li> |
| {% endmacro %} |
| <nav id="navbar"> |
| <div class="container"> |
| {{ "index" | linkify(id="navbar-logo") }} |
| <img |
| src="/img/navbar-logo.png" |
| srcset="/img/navbar-logo.svg 2x"> |
| @@ -148,43 +149,56 @@ |
| {{body|safe}} |
| {% endblock %} |
| </div> |
| <footer id="footer" class="content"> |
| <div class="container"> |
| <div class="row"> |
| <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
|
| - <h5>{{ get_string("resources", "menu") }}</h5> |
| + <h5>{{ get_string("abp-nav-heading", "menu") }}</h5> |
| <ul> |
| - {% for pagename in ["acceptable-ads", "documentation", "deployments"] %} |
| - <li>{{ pagename | linkify }}{{ get_string(pagename, "menu") }}</a></li> |
| + {% for sid, href in [ |
| + ("help-centre-link", "https://help.eyeo.com"), |
| + ("contribute-link", "contribute"), |
| + ("subscriptions-link", "subscriptions"), |
| + ("report-link", "report"), |
| + ("blog-link", "blog"), |
| + ] %} |
| + {{ menuitem(sid, href) }} |
| {% endfor %} |
| </ul> |
| </nav> |
| <nav class="column one-fourth"> |
| - <h5>{{ get_string("community", "menu") }}</h5> |
| + <h5>{{ get_string("developers-nav-heading", "menu") }}</h5> |
| <ul> |
| - <li><a href="/releases/" hreflang="en">{{get_string("releases", "menu")}}</a></li> |
| - <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") }} |
| + {% for sid, href in [ |
| + ("documentation-link", "documentation"), |
| + ("development-link", "development-builds"), |
| + ("source-code-link", "source"), |
| + ("roadmap-link", "https://issues.adblockplus.org/query?keywords=~2015q4&col=id&col=summary&col=keywords&col=owner&col=type&col=status&col=priority&col=milestone&col=component&report=13&desc=1&order=keywords"), |
| + ] %} |
| + {{ menuitem(sid, href) }} |
| + {% endfor %} |
| </ul> |
| </nav> |
| <nav class="column one-fourth"> |
| - <h5>{{get_string("development", "menu")}}</h5> |
| + <h5>{{ get_string("company-nav-heading", "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> |
| + {% for sid, href in [ |
| + ("eyeo-link", "https://eyeo.com"), |
| + ("jobs-link", "https://eyeo.com/jobs"), |
| + ("press-link", "https://eyeo.com/press"), |
| + ] %} |
| + {{ menuitem(sid, href) }} |
| + {% endfor %} |
| </ul> |
| </nav> |
| <nav id="social-list" class="column one-fourth"> |
| - <h5>{{get_string("follow-us", "menu")}}</h5> |
| + <h5>{{get_string("contact-nav-heading", "menu")}}</h5> |
| <ul> |
| <li> |
| <a href="https://twitter.com/AdblockPlus" target="_blank"> |
| <img |
| src="/img/footer-twitter-glyphicon.png" |
| alt="{{ "Twitter" | translate("twitter-alt", "Twitter glyphicon alt text")}}"> |
| </a> |
| </li> |
« locales/en/menu.json ('K')
|
« locales/en/menu.json ('k')
|
no next file »
|
no next file with comments »
