templates/default.tmpl - Issue 5636796054503424: Issue 1170 - [adblockplus.org Anwiki to CMS migration] Migrate content

Delta Between Two Patch Sets: templates/default.tmpl

Issue 5636796054503424: Issue 1170 - [adblockplus.org Anwiki to CMS migration] Migrate content (Closed)

Left Patch Set: Removed redundant safe filters Created Feb. 23, 2015, 7:43 p.m.

Right Patch Set: Remove includes/common.tmpl which is no longer required. Created March 7, 2015, 7:01 p.m.

Left:
Right:

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

Left: Side by side diff | Download
Right: Side by side diff | Download

LEFT	RIGHT
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-2015 Eyeo GmbH	3 # Copyright (C) 2006-2015 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 {% set index_page = (pagedata == "<? include index ?>\n") %}

19 <!DOCTYPE html>	18 <!DOCTYPE html>

20 <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">

21 <head>	20 <head>

22 <title>{{title\|translate}}</title>	21 <title>{{title\|translate}}</title>

23	22

24 <meta name="viewport" content="width=device-width, initial-scale=1">	23 <meta name="viewport" content="width=device-width, initial-scale=1">

25 <link rel="stylesheet" href="/css/main.css" class="cssfx">	24 <link rel="stylesheet" href="/css/main.css" class="cssfx">

26 <link rel="stylesheet" href="/css/main-desktop.css" media="(min-width: 40.5e m)" class="cssfx">	25 <link rel="stylesheet" href="/css/main-desktop.css" media="(min-width: 40.5e m)" class="cssfx">

27 <link rel="stylesheet" href="/css/main-mobile.css" media="screen and (max-wi dth: 40.5em)">	26 <link rel="stylesheet" href="/css/main-mobile.css" media="screen and (max-wi dth: 40.5em)">

28 <noscript>	27 <noscript>

29 <link rel="stylesheet" href="/css/noscript-desktop.css" media="(min-width: 40.5em)"/>	28 <link rel="stylesheet" href="/css/noscript-desktop.css" media="(min-width: 40.5em)"/>

30 <link rel="stylesheet" href="/css/noscript-mobile.css" media="screen and ( max-width: 40.5em)"/>	29 <link rel="stylesheet" href="/css/noscript-mobile.css" media="screen and ( max-width: 40.5em)"/>

31 </noscript>	30 </noscript>

32	31

33 <link rel="canonical" href="https://adblockplus.org/{{page if not index_page }}">	32 <link rel="canonical" href="https://adblockplus.org/{{page}}">
Wladimir Palant 2015/02/24 20:19:40 No, we should have https://adblockplus.org/firefox No, we should have https://adblockplus.org/firefox and https://adblockplus.org/chrome as canonical links - this is different from our current website as the content of these pages can be different now. kzar 2015/02/26 19:50:17 Done. Show quoted text On 2015/02/24 20:19:40, Wladimir Palant wrote: > No, we should have https://adblockplus.org/firefox and > https://adblockplus.org/chrome as canonical links - this is different from our > current website as the content of these pages can be different now. Done.
34	33

35 <!--[if lt IE 7]>	34 <!--[if lt IE 7]>

36 <script src="/js/vendor/DD_belatedPNG.js"></script>	35 <script src="/js/vendor/DD_belatedPNG.js"></script>

37 <script>DD_belatedPNG.fix(".sprite");</script>	36 <script>DD_belatedPNG.fix(".sprite");</script>

38 <![endif]-->	37 <![endif]-->

39 <!--[if lt IE 9]>	38 <!--[if lt IE 9]>

40 <script src="/js/vendor/html5shiv.js"></script>	39 <script src="/js/vendor/html5shiv.js"></script>

41 <script src="/js/vendor/respond.min.js"></script>	40 <script src="/js/vendor/respond.min.js"></script>

42 <![endif]-->	41 <![endif]-->

43 <!--[if lt IE 10]><script src="/js/vendor/cssfx.min.js"></script><![endif]-- >	42 <!--[if lt IE 10]><script src="/js/vendor/cssfx.min.js"></script><![endif]-- >

(...skipping 13 matching lines...) Expand all Loading...
57 <li class="selected">{{name\|translate("menu")}}</li>	56 <li class="selected">{{name\|translate("menu")}}</li>

58 {% else %}	57 {% else %}

59 <li>{{name\|linkify}}{{name\|translate("menu")}}</a></li>	58 <li>{{name\|linkify}}{{name\|translate("menu")}}</a></li>

60 {% endif %}	59 {% endif %}

61 {% endmacro %}	60 {% endmacro %}

62	61

63 <header>	62 <header>

64 <a id="logo" class="sprite" itemprop="image" href="/"></a>	63 <a id="logo" class="sprite" itemprop="image" href="/"></a>

65 <nav>	64 <nav>

66 <ul>	65 <ul>

67 {% if index_page %}	66 {% if localefile == "index" %}
Wladimir Palant 2015/02/24 20:19:40 Where is that variable being defined? Where is that variable being defined? kzar 2015/02/26 19:50:17 At the top of this page. Show quoted text On 2015/02/24 20:19:40, Wladimir Palant wrote: > Where is that variable being defined? At the top of this page.
68 <li class="selected first">{{"installation"\|translate("menu")}}</li>	67 <li class="selected first">{{"installation"\|translate("menu")}}</li>

69 {% else %}	68 {% else %}

70 <li class="install-link first">{{"index"\|linkify}}{{"installation"\|t ranslate("menu")}} <span class="sprite install-link-icon"></span></a></li>	69 <li class="install-link first">{{"index"\|linkify}}{{"installation"\|t ranslate("menu")}} <span class="sprite install-link-icon"></span></a></li>

71 {% endif %}	70 {% endif %}

72 {% for name in ["about", "features", "bugs", "contribute"] %}	71 {% for name in ["about", "features", "bugs", "contribute"] %}

73 {{pageitem(name)}}	72 {{pageitem(name)}}

74 {% endfor %}	73 {% endfor %}

75 <li id="search">	74 <li id="search">

76 <form action="https://www.google.com/cse" id="search-box">	75 <form action="https://www.google.com/cse" id="search-box">

77 <input name="cx" value="001104437084080304350:n8odfuv0gvi" type="h idden">	76 <input name="cx" value="001104437084080304350:n8odfuv0gvi" type="h idden">

(...skipping 17 matching lines...) Expand all Loading...
95 <div id="flag-{{lang}}" class="flag sprite"></div>{{config.g et("langnames", lang)}}	94 <div id="flag-{{lang}}" class="flag sprite"></div>{{config.g et("langnames", lang)}}

96 </a>	95 </a>

97 </li>	96 </li>

98 {% endfor %}	97 {% endfor %}

99 </ul>	98 </ul>

100 </li>	99 </li>

101 </ul>	100 </ul>

102 </nav>	101 </nav>

103 </header>	102 </header>

104	103

105 <div id="content" class="{{page}}">	104 <div id="content" {% if localefile == "index" %}class="{{page}}"{% endif %}>
Wladimir Palant 2015/02/24 20:19:40 Please remove that class tag - this can easily tur Please remove that class tag - this can easily turn into a footgun if we accidentally name a page like a class we are using. kzar 2015/02/26 19:50:17 The current site adds a class like that to the div Show quoted text On 2015/02/24 20:19:40, Wladimir Palant wrote: > Please remove that class tag - this can easily turn into a footgun if we > accidentally name a page like a class we are using. The current site adds a class like that to the div, I tried removing it just now and some of the layout breaks. Best I can do is only add the class for index pages, that OK? (Actually that is a closer emulation of how the current site works.) Wladimir Palant 2015/02/26 20:35:03 I see. Setting this on the content tag is a limita Show quoted text On 2015/02/26 19:50:17, kzar wrote: > The current site adds a class like that to the div, I see. Setting this on the content tag is a limitation of our current setup - I moved that class to the install-container element in includes/index.tmpl. However, that approach requires CSS changes so I am fine with keeping this hack for now.
106 {% if not noheading %}	105 {% if not noheading %}

107 <h1>{{title\|translate}}</h1>	106 <h1>{{title\|translate}}</h1>

108 {% endif %}	107 {% endif %}

109	108

110 {% if not notoc %}	109 {% if not notoc %}

111 {% macro toc(toclist) %}	110 {% macro toc(toclist) %}

112 <ul>	111 <ul>

113 {% for item in toclist %}	112 {% for item in toclist %}

114 <li>	113 <li>

115 <a href="#{{item.anchor}}">{{item.title}}</a>	114 <a href="#{{item.anchor}}">{{item.title}}</a>

(...skipping 61 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
177 <a rel="nofollow" id="social-gplus" class="sprite" href="https://p lus.google.com/110020691898167279887"></a>	176 <a rel="nofollow" id="social-gplus" class="sprite" href="https://p lus.google.com/110020691898167279887"></a>

178 </li>	177 </li>

179 </ul>	178 </ul>

180 </section>	179 </section>

181 </div>	180 </div>

182 </footer>	181 </footer>

183	182

184 <script src="/js/main.js"></script>	183 <script src="/js/main.js"></script>

185 </body>	184 </body>

186 </html>	185 </html>

LEFT	RIGHT