Unified Diff: templates/default.tmpl
Issue 6021528219025408:
Issue #1170 More progress migrating adblockplus.org to our CMS. (Closed)
Patch Set:
Created Sept. 1, 2014, 10:45 a.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« subscriptions.html ('k')
|
templates/interface.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 |
| @@ -12,7 +12,7 @@ |
| <link rel="stylesheet" href="/css/noscript-mobile.css" media="screen and (max-width: 40.5em)"/> |
| </noscript> |
| - <link rel="canonical" href="https://adblockplus.org/{{page}}"> |
| + <link rel="canonical" href="https://adblockplus.org/{{localefile != "index" and page or ""}}"> |
| <!--[if lt IE 7]> |
| <script src="/js/vendor/DD_belatedPNG.js"></script> |
| @@ -28,15 +28,17 @@ |
| <link rel="stylesheet" href="/css/empty.css" class="cssfx"/> |
| <![endif]--> |
| + {% block head %} |
| {{head|safe}} |
| + {% endblock %} |
| </head> |
| <body> |
| {% macro pageitem(name) %} |
| {% if name == page %} |
| - <li class="selected">{{"title"|translate(name)}}</li> |
| + <li class="selected">{{name|translate("menu")}}</li> |
| {% else %} |
| - <li>{{name|linkify}}{{"title"|translate(name)}}</a></li> |
| + <li>{{name|linkify}}{{name|translate("menu")}}</a></li> |
| {% endif %} |
| {% endmacro %} |
| @@ -82,7 +84,7 @@ |
| </nav> |
| </header> |
| - <div id="content"> |
| + <div id="content" class="{{page}}"> |
| {% if not noheading %} |
| <h1>{{title|translate}}</h1> |
| {% endif %} |
| @@ -107,7 +109,9 @@ |
| {% endif %} |
| {% endif %} |
| + {% block body %} |
| {{body|safe}} |
| + {% endblock %} |
| </div> |
| <footer> |
| @@ -116,7 +120,7 @@ |
| <section class="first"> |
| <h1>{{"resources"|translate("menu")}}</h1> |
| <ul> |
| - {% for name in ["screenshots", "documentation", "privacy", "impressum"] %} |
| + {% for name in ["acceptable-ads", "documentation", "privacy", "impressum"] %} |
| {{pageitem(name)}} |
| {% endfor %} |
| </ul> |
| @@ -136,7 +140,6 @@ |
| <h1>{{"development"|translate("menu")}}</h1> |
| <ul> |
| {{pageitem("source")}} |
| - <li><a href="/forum/viewforum.php?f=11" hreflang="en">{{"bugs"|translate("menu")}}</a></li> |
| <li><a href="/category/roadmap/" hreflang="en">{{"roadmap"|translate("menu")}}</a></li> |
| {{pageitem("tools")}} |
| </ul> |
« no previous file with comments
|
« subscriptions.html ('k')
|
templates/interface.tmpl » ('j')
|
no next file with comments »
