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

Side by Side Diff: templates/default.tmpl

Issue 5636796054503424: Issue 1170 - [adblockplus.org Anwiki to CMS migration] Migrate content (Closed)
Patch Set: Removed redundant safe filters Created Feb. 23, 2015, 7:43 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« includes/subscriptions.tmpl ('K') | « static/img/sprite-index.png ('k') | templates/minimal.tmpl » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 {#
2 # This file is part of the Adblock Plus website,
3 # Copyright (C) 2006-2015 Eyeo GmbH
4 #
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
7 # published by the Free Software Foundation.
8 #
9 # Adblock Plus is distributed in the hope that it will be useful,
10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 # GNU General Public License for more details.
13 #
14 # You should have received a copy of the GNU General Public License
15 # along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>.
16 #}
17
18 {% set index_page = (pagedata == "<? include index ?>\n") %}
1 <!DOCTYPE html> 19 <!DOCTYPE html>
2 <html lang="{{locale}}" dir="{{"rtl" if config.has_option("rtl", locale) else "l tr"}}" itemscope="itemscope" itemtype="http://schema.org/WebPage"> 20 <html lang="{{locale}}" dir="{{"rtl" if config.has_option("rtl", locale) else "l tr"}}" itemscope="itemscope" itemtype="http://schema.org/WebPage">
3 <head> 21 <head>
4 <title>{{title|translate}}</title> 22 <title>{{title|translate}}</title>
5 23
6 <meta name="viewport" content="width=device-width, initial-scale=1"> 24 <meta name="viewport" content="width=device-width, initial-scale=1">
7 <link rel="stylesheet" href="/css/main.css" class="cssfx"> 25 <link rel="stylesheet" href="/css/main.css" class="cssfx">
8 <link rel="stylesheet" href="/css/main-desktop.css" media="(min-width: 40.5e m)" class="cssfx"> 26 <link rel="stylesheet" href="/css/main-desktop.css" media="(min-width: 40.5e m)" class="cssfx">
9 <link rel="stylesheet" href="/css/main-mobile.css" media="screen and (max-wi dth: 40.5em)"> 27 <link rel="stylesheet" href="/css/main-mobile.css" media="screen and (max-wi dth: 40.5em)">
10 <noscript> 28 <noscript>
11 <link rel="stylesheet" href="/css/noscript-desktop.css" media="(min-width: 40.5em)"/> 29 <link rel="stylesheet" href="/css/noscript-desktop.css" media="(min-width: 40.5em)"/>
12 <link rel="stylesheet" href="/css/noscript-mobile.css" media="screen and ( max-width: 40.5em)"/> 30 <link rel="stylesheet" href="/css/noscript-mobile.css" media="screen and ( max-width: 40.5em)"/>
13 </noscript> 31 </noscript>
14 32
15 <link rel="canonical" href="https://adblockplus.org/{{page}}"> 33 <link rel="canonical" href="https://adblockplus.org/{{page if not index_page }}">
Wladimir Palant 2015/02/24 20:19:40 No, we should have https://adblockplus.org/firefox
kzar 2015/02/26 19:50:17 Done.
16 34
17 <!--[if lt IE 7]> 35 <!--[if lt IE 7]>
18 <script src="/js/vendor/DD_belatedPNG.js"></script> 36 <script src="/js/vendor/DD_belatedPNG.js"></script>
19 <script>DD_belatedPNG.fix(".sprite");</script> 37 <script>DD_belatedPNG.fix(".sprite");</script>
20 <![endif]--> 38 <![endif]-->
21 <!--[if lt IE 9]> 39 <!--[if lt IE 9]>
22 <script src="/js/vendor/html5shiv.js"></script> 40 <script src="/js/vendor/html5shiv.js"></script>
23 <script src="/js/vendor/respond.min.js"></script> 41 <script src="/js/vendor/respond.min.js"></script>
24 <![endif]--> 42 <![endif]-->
25 <!--[if lt IE 10]><script src="/js/vendor/cssfx.min.js"></script><![endif]-- > 43 <!--[if lt IE 10]><script src="/js/vendor/cssfx.min.js"></script><![endif]-- >
26 <!-- Fixes cssfx issues in IE8. --> 44 <!-- Fixes cssfx issues in IE8. -->
27 <!--[if IE 8]> 45 <!--[if IE 8]>
28 <link rel="stylesheet" href="/css/empty.css" class="cssfx"/> 46 <link rel="stylesheet" href="/css/empty.css" class="cssfx"/>
29 <![endif]--> 47 <![endif]-->
30 48
49 {% block head %}
31 {{head|safe}} 50 {{head|safe}}
51 {% endblock %}
32 </head> 52 </head>
33 53
34 <body> 54 <body>
35 {% macro pageitem(name) %} 55 {% macro pageitem(name) %}
36 {% if name == page %} 56 {% if name == page %}
37 <li class="selected">{{"title"|translate(name)}}</li> 57 <li class="selected">{{name|translate("menu")}}</li>
38 {% else %} 58 {% else %}
39 <li>{{name|linkify}}{{"title"|translate(name)}}</a></li> 59 <li>{{name|linkify}}{{name|translate("menu")}}</a></li>
40 {% endif %} 60 {% endif %}
41 {% endmacro %} 61 {% endmacro %}
42 62
43 <header> 63 <header>
44 <a id="logo" class="sprite" itemprop="image" href="/"></a> 64 <a id="logo" class="sprite" itemprop="image" href="/"></a>
45 <nav> 65 <nav>
46 <ul> 66 <ul>
47 {% if localefile == "index" %} 67 {% if index_page %}
Wladimir Palant 2015/02/24 20:19:40 Where is that variable being defined?
kzar 2015/02/26 19:50:17 At the top of this page.
48 <li class="selected first">{{"installation"|translate("menu")}}</li> 68 <li class="selected first">{{"installation"|translate("menu")}}</li>
49 {% else %} 69 {% else %}
50 <li class="install-link first">{{"index"|linkify}}{{"installation"|t ranslate("menu")}} <span class="sprite install-link-icon"></span></a></li> 70 <li class="install-link first">{{"index"|linkify}}{{"installation"|t ranslate("menu")}} <span class="sprite install-link-icon"></span></a></li>
51 {% endif %} 71 {% endif %}
52 {% for name in ["about", "features", "bugs", "contribute"] %} 72 {% for name in ["about", "features", "bugs", "contribute"] %}
53 {{pageitem(name)}} 73 {{pageitem(name)}}
54 {% endfor %} 74 {% endfor %}
55 <li id="search"> 75 <li id="search">
56 <form action="https://www.google.com/cse" id="search-box"> 76 <form action="https://www.google.com/cse" id="search-box">
57 <input name="cx" value="001104437084080304350:n8odfuv0gvi" type="h idden"> 77 <input name="cx" value="001104437084080304350:n8odfuv0gvi" type="h idden">
(...skipping 17 matching lines...) Expand all
75 <div id="flag-{{lang}}" class="flag sprite"></div>{{config.g et("langnames", lang)}} 95 <div id="flag-{{lang}}" class="flag sprite"></div>{{config.g et("langnames", lang)}}
76 </a> 96 </a>
77 </li> 97 </li>
78 {% endfor %} 98 {% endfor %}
79 </ul> 99 </ul>
80 </li> 100 </li>
81 </ul> 101 </ul>
82 </nav> 102 </nav>
83 </header> 103 </header>
84 104
85 <div id="content"> 105 <div id="content" class="{{page}}">
Wladimir Palant 2015/02/24 20:19:40 Please remove that class tag - this can easily tur
kzar 2015/02/26 19:50:17 The current site adds a class like that to the div
Wladimir Palant 2015/02/26 20:35:03 I see. Setting this on the content tag is a limita
86 {% if not noheading %} 106 {% if not noheading %}
87 <h1>{{title|translate}}</h1> 107 <h1>{{title|translate}}</h1>
88 {% endif %} 108 {% endif %}
89 109
90 {% if not notoc %} 110 {% if not notoc %}
91 {% macro toc(toclist) %} 111 {% macro toc(toclist) %}
92 <ul> 112 <ul>
93 {% for item in toclist %} 113 {% for item in toclist %}
94 <li> 114 <li>
95 <a href="#{{item.anchor}}">{{item.title}}</a> 115 <a href="#{{item.anchor}}">{{item.title}}</a>
96 {% if item.subitems %}{{toc(item.subitems)}}{% endif %} 116 {% if item.subitems %}{{toc(item.subitems)}}{% endif %}
97 </li> 117 </li>
98 {% endfor %} 118 {% endfor %}
99 </ul> 119 </ul>
100 {% endmacro %} 120 {% endmacro %}
101 121
102 {% set toclist = body|toclist %} 122 {% set toclist = body|toclist %}
103 {% if toclist %} 123 {% if toclist %}
104 <div class="toc"> 124 <div class="toc">
105 {{toc(toclist)}} 125 {{toc(toclist)}}
106 </div> 126 </div>
107 {% endif %} 127 {% endif %}
108 {% endif %} 128 {% endif %}
109 129
130 {% block body %}
110 {{body|safe}} 131 {{body|safe}}
132 {% endblock %}
111 </div> 133 </div>
112 134
113 <footer> 135 <footer>
114 <div id="footer-content"> 136 <div id="footer-content">
115 <nav> 137 <nav>
116 <section class="first"> 138 <section class="first">
117 <h1>{{"resources"|translate("menu")}}</h1> 139 <h1>{{"resources"|translate("menu")}}</h1>
118 <ul> 140 <ul>
119 {% for name in ["screenshots", "documentation", "privacy", "impres sum"] %} 141 {% for name in ["acceptable-ads", "documentation", "deployments", "privacy", "impressum"] %}
120 {{pageitem(name)}} 142 {{pageitem(name)}}
121 {% endfor %} 143 {% endfor %}
122 </ul> 144 </ul>
123 </section> 145 </section>
124 146
125 <section> 147 <section>
126 <h1>{{"community"|translate("menu")}}</h1> 148 <h1>{{"community"|translate("menu")}}</h1>
127 <ul> 149 <ul>
128 <li><a href="/releases/" hreflang="en">{{"releases"|translate("men u")}}</a></li> 150 <li><a href="/releases/" hreflang="en">{{"releases"|translate("men u")}}</a></li>
129 <li><a href="/blog/" hreflang="en">{{"blog"|translate("menu")}}</a ></li> 151 <li><a href="/blog/" hreflang="en">{{"blog"|translate("menu")}}</a ></li>
130 <li><a href="/forum/" hreflang="en">{{"forum"|translate("menu")}}< /a></li> 152 <li><a href="/forum/" hreflang="en">{{"forum"|translate("menu")}}< /a></li>
131 {{pageitem("development-builds")}} 153 {{pageitem("development-builds")}}
132 </ul> 154 </ul>
133 </section> 155 </section>
134 156
135 <section> 157 <section>
136 <h1>{{"development"|translate("menu")}}</h1> 158 <h1>{{"development"|translate("menu")}}</h1>
137 <ul> 159 <ul>
138 {{pageitem("source")}} 160 {{pageitem("source")}}
139 <li><a href="/forum/viewforum.php?f=11" hreflang="en">{{"bugs"|tra nslate("menu")}}</a></li>
140 <li><a href="/category/roadmap/" hreflang="en">{{"roadmap"|transla te("menu")}}</a></li> 161 <li><a href="/category/roadmap/" hreflang="en">{{"roadmap"|transla te("menu")}}</a></li>
141 {{pageitem("tools")}} 162 {{pageitem("tools")}}
142 </ul> 163 </ul>
143 </section> 164 </section>
144 </nav> 165 </nav>
145 166
146 <section id="social"> 167 <section id="social">
147 <h1>{{"follow-us"|translate("menu")}}</h1> 168 <h1>{{"follow-us"|translate("menu")}}</h1>
148 <ul id="social-list"> 169 <ul id="social-list">
149 <li class="social-entry"> 170 <li class="social-entry">
150 <a rel="nofollow" id="social-facebook" class="sprite" href="https: //www.facebook.com/adblockplus"></a> 171 <a rel="nofollow" id="social-facebook" class="sprite" href="https: //www.facebook.com/adblockplus"></a>
151 </li> 172 </li>
152 <li class="social-entry"> 173 <li class="social-entry">
153 <a rel="nofollow" id="social-twitter" class="sprite" href="https:/ /twitter.com/adblockplus"></a> 174 <a rel="nofollow" id="social-twitter" class="sprite" href="https:/ /twitter.com/adblockplus"></a>
154 </li> 175 </li>
155 <li class="social-entry"> 176 <li class="social-entry">
156 <a rel="nofollow" id="social-gplus" class="sprite" href="https://p lus.google.com/110020691898167279887"></a> 177 <a rel="nofollow" id="social-gplus" class="sprite" href="https://p lus.google.com/110020691898167279887"></a>
157 </li> 178 </li>
158 </ul> 179 </ul>
159 </section> 180 </section>
160 </div> 181 </div>
161 </footer> 182 </footer>
162 183
163 <script src="/js/main.js"></script> 184 <script src="/js/main.js"></script>
164 </body> 185 </body>
165 </html> 186 </html>
OLDNEW
« includes/subscriptions.tmpl ('K') | « static/img/sprite-index.png ('k') | templates/minimal.tmpl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld