templates/simple.tmpl - Issue 29329984: Issue 3257 - Create uninstallation page in adblockplus.org

Delta Between Two Patch Sets: templates/simple.tmpl

Issue 29329984: Issue 3257 - Create uninstallation page in adblockplus.org (Closed)

Left Patch Set: Created Nov. 11, 2015, 5:43 p.m.

Right Patch Set: Convert to array instead of cloning Created Dec. 3, 2015, 1:55 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 <!DOCTYPE html>	18 <!DOCTYPE html>

19 <html lang="{{locale}}" dir="{{"rtl" if config.has_option("rtl", locale) else "l tr"}}">	19 <html lang="{{locale}}" dir="{{"rtl" if config.has_option("rtl", locale) else "l tr"}}">

20 <head>	20 <head>

21 <title>{{title\|translate("title")}}</title>	21 <title>{{title\|translate("title")}}</title>

22 <link rel="stylesheet" href="/css/simple.css" type="text/css" media="all" />	22 <link rel="stylesheet" href="/css/simple.css" type="text/css" media="all" />

23 <link rel="apple-touch-icon" href="/img/favicon-large.png" />	23 <link rel="apple-touch-icon" href="/img/favicon-large.png" />

24 {{head\|safe}}	24 {{head\|safe}}

25 </head>	25 </head>

26 <body>	26 <body>

27 <header>	27 <header>

28 <img id="logo" src="/img/adblockplus_new_100.png" alt="{{"Adblock Plus log o"\|translate("abp-logo", "Alternative text for Adblock Plus logo image")}}" />	28 <img id="logo" src="/img/adblockplus_100.png" alt="{{"Adblock Plus logo"\|t ranslate("abp-logo", "Alternative text for Adblock Plus logo image")}}" />
Thomas Greiner 2015/11/11 19:08:29 Detail: I'd strongly advise against using relative Detail: I'd strongly advise against using relative words such as "new" in file names since whatever is new today may not be new anymore the next time we update the logo. Therefore using "/img/adblockplus_100.png" should be sufficient. Also I noticed that we have a "adblockplus_128.png" image in that repository (see https://adblockplus.org/img/adblockplus_128.png) so I wonder whether we could simply reuse or even update that one. saroyanm 2015/11/12 15:50:25 Aligned with designer before implementing, seems l Show quoted text On 2015/11/11 19:08:29, Thomas Greiner wrote: > Detail: I'd strongly advise against using relative words such as "new" in file > names since whatever is new today may not be new anymore the next time we update > the logo. > > Therefore using "/img/adblockplus_100.png" should be sufficient. Also I noticed > that we have a "adblockplus_128.png" image in that repository (see > https://adblockplus.org/img/adblockplus_128.png) so I wonder whether we could > simply reuse or even update that one. Aligned with designer before implementing, seems like they are not sure about final look of the logo in adblockplus.org and would prefer to tackle that topic later. While the logos are different it make sense to somehow separate them, what about "adblockplus_clean_100.png" or "adblockplus_smooth_100.png" ? saroyanm 2015/11/12 16:11:16 My bad, noticed that the logo you mentioned is sep Show quoted text On 2015/11/12 15:50:25, saroyanm wrote: > On 2015/11/11 19:08:29, Thomas Greiner wrote: > > Detail: I'd strongly advise against using relative words such as "new" in file > > names since whatever is new today may not be new anymore the next time we > update > > the logo. > > > > Therefore using "/img/adblockplus_100.png" should be sufficient. Also I > noticed > > that we have a "adblockplus_128.png" image in that repository (see > > https://adblockplus.org/img/adblockplus_128.png) so I wonder whether we could > > simply reuse or even update that one. > > Aligned with designer before implementing, seems like they are not sure about > final look of the logo in http://adblockplus.org and would prefer to tackle that topic > later. > While the logos are different it make sense to somehow separate them, what about > "adblockplus_clean_100.png" or "adblockplus_smooth_100.png" ? My bad, noticed that the logo you mentioned is separate from the one we are using on homepage, will check if we even using the "adblockplus_128.png" and update it in separate ticket. Currently renamed the new one.
29 <h1>{{title\|translate("title")}}</h1>	29 <h1>{{title\|translate("title")}}</h1>

30 </header>	30 </header>

31 <div id="content">	31 <div id="content">

32 {{body\|safe}}	32 {{body\|safe}}

33 </div>	33 </div>

34 <footer>	34 <footer>

35 {{"impressum"\|linkify}}{{"Legal notice"\|translate("legal-notice", "Legal n otice in the footer")}}</a>	35 {{"impressum"\|linkify}}{{"Legal notice"\|translate("legal-notice", "Legal n otice in the footer")}}</a>

36 </footer>	36 </footer>

37 </body>	37 </body>

38 </html>	38 </html>

LEFT	RIGHT