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

Side by Side Diff: templates/default.tmpl

Issue 29340844: Issue 3802 - Create page to inform users about adware on web.adblockplus.org (Closed)
Patch Set: Fixed styles, moved styles back to page, fixed translation error Created May 31, 2016, 7:25 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
« pages/adware.md ('K') | « static/img/cross.png ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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-2016 Eyeo GmbH 3 # Copyright (C) 2006-2016 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
11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 # GNU General Public License for more details. 12 # GNU General Public License for more details.
13 # 13 #
14 # You should have received a copy of the GNU General Public License 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/>. 15 # along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>.
16 #} 16 #}
17 17
18 <!DOCTYPE html> 18 <!DOCTYPE html>
19 <html lang="{{locale}}" dir="{{"rtl" if config.has_option("rtl", locale) else "l tr"}}" itemscope="itemscope" itemtype="http://schema.org/WebPage"> 19 <html lang="{{locale}}" dir="{{"rtl" if config.has_option("rtl", locale) else "l tr"}}" itemscope="itemscope" itemtype="http://schema.org/WebPage">
20 <head> 20 <head>
21 <title>{{title|translate("title")}}</title>
22
23 <meta charset="utf-8"> 21 <meta charset="utf-8">
24 <meta name="viewport" content="width=device-width, initial-scale=1"> 22 <meta name="viewport" content="width=device-width, initial-scale=1">
23
24 <title>{{title|translate("title")}}</title>
25 <meta name="author" content="{{author|translate("author") if author else "Ey eo GmbH / Adblock Plus"|translate("meta")}}" />
26 {% if description %}
27 <meta name="description" content="{{description|translate("description")}}">
28 {% endif %}
29
30 {# facebook / Open Graph http://ogp.me/ #}
31 {% if og_title %}
32 <meta property="og:title" content="{{og_title|translate("og_title")}}" />
33 {% endif %}
34 <meta property="og:type" content="{{og_type if og_type else 'website'}}" />
35 {% if og_url %}
saroyanm 2016/06/01 14:38:01 This is not being used anywhere, we can add it as
juliandoucette 2016/06/01 15:56:38 It is like a canonical URL. I chose to include it
saroyanm 2016/06/01 15:59:28 So maybe in this case we can have something like:
juliandoucette 2016/06/01 16:09:50 ~no See: https://developers.facebook.com/docs/sha
saroyanm 2016/06/02 15:05:11 Same goes here as my previous comment, we need to
juliandoucette 2016/06/13 18:12:51 Done.
36 <meta property="og:url" content="{{og_url}}" />
37 {% endif %}
38 {% if og_description %}
39 <meta property="og:description" content="{{og_description|translate("og_desc ription")}}" />
40 {% endif %}
41 <meta property="og:image" content="{{og_image if og_image else '/img/adblock plus_promo.png'}}" />
42
43 {# twitter https://dev.twitter.com/cards/markup #}
44 <meta name="twitter:card" content="{{twitter_card if twitter_card else 'summ ary'}}" />
saroyanm 2016/06/21 14:58:03 Shouldn't we also include twitter:card ? Why was i
juliandoucette 2016/06/23 16:10:56 I removed twitter:card because we were not using i
45 <meta name="twitter:site" content="{{twitter_site if twitter_site else '@Adb lockPlus'}}" />
46 <meta name="twitter:creator" content="{{twitter_creator if twitter_creator e lse '@AdblockPlus'}}" />
47
25 <link rel="stylesheet" href="/css/main.css" class="cssfx"> 48 <link rel="stylesheet" href="/css/main.css" class="cssfx">
26 <link rel="stylesheet" href="/css/main-desktop.css" media="(min-width: 1000p x)" class="cssfx"> 49 <link rel="stylesheet" href="/css/main-desktop.css" media="(min-width: 1000p x)" class="cssfx">
27 <link rel="stylesheet" href="/css/main-mobile.css" media="(max-width: 1000px )"> 50 <link rel="stylesheet" href="/css/main-mobile.css" media="(max-width: 1000px )">
28 51
29 <link rel="canonical" href="https://adblockplus.org/{{page}}"> 52 <link rel="canonical" href="https://adblockplus.org/{{page}}">
30 <link rel="apple-touch-icon" href="/img/favicon-large.png" /> 53 <link rel="apple-touch-icon" href="/img/favicon-large.png" />
31 54
32 <!--[if IE 8]> 55 <!--[if IE 8]>
33 <script src="/js/vendor/ie8.js"></script> 56 <script src="/js/vendor/ie8.js"></script>
34 <![endif]--> 57 <![endif]-->
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
188 <a rel="nofollow" id="social-gplus" class="sprite" href="https://p lus.google.com/110020691898167279887"></a> 211 <a rel="nofollow" id="social-gplus" class="sprite" href="https://p lus.google.com/110020691898167279887"></a>
189 </li> 212 </li>
190 </ul> 213 </ul>
191 </section> 214 </section>
192 </div> 215 </div>
193 </footer> 216 </footer>
194 217
195 <script src="/js/main.js"></script> 218 <script src="/js/main.js"></script>
196 </body> 219 </body>
197 </html> 220 </html>
OLDNEW
« pages/adware.md ('K') | « static/img/cross.png ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld