templates/default.tmpl - Issue 29340844: Issue 3802 - Create page to inform users about adware on web.adblockplus.org

Delta Between Two Patch Sets: templates/default.tmpl

Issue 29340844: Issue 3802 - Create page to inform users about adware on web.adblockplus.org (Closed)

Left Patch Set: Fixed styles, moved styles back to page, fixed translation error Created May 31, 2016, 7:25 p.m.

Right Patch Set: Refactored away obsolute HTML tags in markdown Created July 4, 2016, 7:27 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-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 <meta charset="utf-8">	21 <meta charset="utf-8">

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

23	23

24 <title>{{title\|translate("title")}}</title>	24 <title>{{title\|translate("title", "meta")}}</title>

25 <meta name="author" content="{{author\|translate("author") if author else "Ey eo GmbH / Adblock Plus"\|translate("meta")}}" />

26 {% if description %}	25 {% if description %}

27 <meta name="description" content="{{description\|translate("description")}}">	26 <meta name="description" content="{{description\|translate("description", "me ta")}}">

28 {% endif %}	27 {% endif %}

29	28

30 {# facebook / Open Graph http://ogp.me/ #}	29 {# 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 This is not being used anywhere, we can add it as soon we will use og:url, or maybe this should be same as our canonical URL ? I'm not really sure what og:url meta tag used for. juliandoucette 2016/06/01 15:56:38 It is like a canonical URL. I chose to include it Show quoted text On 2016/06/01 14:38:01, saroyanm wrote: > This is not being used anywhere, we can add it as soon we will use og:url, or > maybe this should be same as our canonical URL ? I'm not really sure what og:url > meta tag used for. It is like a canonical URL. I chose to include it because: "The four required properties for every page are:" (http://ogp.me/) Something to consider: http://stackoverflow.com/questions/7830846/ogurl-is-driving-me-crazy I think: - this is a feature - this is standard - this should default to the shared url Thus: - I have no problem removing it saroyanm 2016/06/01 15:59:28 So maybe in this case we can have something like: Show quoted text On 2016/06/01 15:56:38, juliandoucette wrote: > On 2016/06/01 14:38:01, saroyanm wrote: > > This is not being used anywhere, we can add it as soon we will use og:url, or > > maybe this should be same as our canonical URL ? I'm not really sure what > og:url > > meta tag used for. > > It is like a canonical URL. I chose to include it because: > "The four required properties for every page are:" (http://ogp.me/) > > Something to consider: > http://stackoverflow.com/questions/7830846/ogurl-is-driving-me-crazy > > I think: > - this is a feature > - this is standard > - this should default to the shared url > > Thus: > - I have no problem removing it So maybe in this case we can have something like: <meta property="og:url" content="{{og_url if og_url else https://adblockplus.org/{{page}}}}" /> ? juliandoucette 2016/06/01 16:09:50 ~no See: https://developers.facebook.com/docs/sha Show quoted text On 2016/06/01 15:59:28, saroyanm wrote: > On 2016/06/01 15:56:38, juliandoucette wrote: > > On 2016/06/01 14:38:01, saroyanm wrote: > > > This is not being used anywhere, we can add it as soon we will use og:url, > or > > > maybe this should be same as our canonical URL ? I'm not really sure what > > og:url > > > meta tag used for. > > > > It is like a canonical URL. I chose to include it because: > > "The four required properties for every page are:" (http://ogp.me/) > > > > Something to consider: > > http://stackoverflow.com/questions/7830846/ogurl-is-driving-me-crazy > > > > I think: > > - this is a feature > > - this is standard > > - this should default to the shared url > > > > Thus: > > - I have no problem removing it > > So maybe in this case we can have something like: > <meta property="og:url" content="{{og_url if og_url else > https://adblockplus.org/%7B%7Bpage%7D%7D%7D%7D%22 /> ? ~no See: https://developers.facebook.com/docs/sharing/best-practices#tags We could use something like that in the future to handle locale better. But, today, we don't have additional query params, so the correct url (unless we specify otherwise) is the default url (the one being shared / the one that will be used if none is provided). saroyanm 2016/06/02 15:05:11 Same goes here as my previous comment, we need to Show quoted text On 2016/06/01 16:09:50, juliandoucette wrote: > On 2016/06/01 15:59:28, saroyanm wrote: > > On 2016/06/01 15:56:38, juliandoucette wrote: > > > On 2016/06/01 14:38:01, saroyanm wrote: > > > > This is not being used anywhere, we can add it as soon we will use og:url, > > or > > > > maybe this should be same as our canonical URL ? I'm not really sure what > > > og:url > > > > meta tag used for. > > > > > > It is like a canonical URL. I chose to include it because: > > > "The four required properties for every page are:" (http://ogp.me/) > > > > > > Something to consider: > > > http://stackoverflow.com/questions/7830846/ogurl-is-driving-me-crazy > > > > > > I think: > > > - this is a feature > > > - this is standard > > > - this should default to the shared url > > > > > > Thus: > > > - I have no problem removing it > > > > So maybe in this case we can have something like: > > <meta property="og:url" content="{{og_url if og_url else > > https://adblockplus.org/%7B%7Bpage%7D%7D%7D%7D%22 /> ? > > ~no > > See: > https://developers.facebook.com/docs/sharing/best-practices#tags > > We could use something like that in the future to handle locale better. > > But, today, we don't have additional query params, so the correct url (unless we > specify otherwise) is the default url (the one being shared / the one that will > be used if none is provided). Same goes here as my previous comment, we need to use this to implement in this review, we can add this condition as soon we will use this condition in the page, currently we do not use it anywhere, so it's can't be part of this review unfortunately. juliandoucette 2016/06/13 18:12:51 Done. Show quoted text On 2016/06/02 15:05:11, saroyanm wrote: > On 2016/06/01 16:09:50, juliandoucette wrote: > > On 2016/06/01 15:59:28, saroyanm wrote: > > > On 2016/06/01 15:56:38, juliandoucette wrote: > > > > On 2016/06/01 14:38:01, saroyanm wrote: > > > > > This is not being used anywhere, we can add it as soon we will use > og:url, > > > or > > > > > maybe this should be same as our canonical URL ? I'm not really sure > what > > > > og:url > > > > > meta tag used for. > > > > > > > > It is like a canonical URL. I chose to include it because: > > > > "The four required properties for every page are:" (http://ogp.me/) > > > > > > > > Something to consider: > > > > http://stackoverflow.com/questions/7830846/ogurl-is-driving-me-crazy > > > > > > > > I think: > > > > - this is a feature > > > > - this is standard > > > > - this should default to the shared url > > > > > > > > Thus: > > > > - I have no problem removing it > > > > > > So maybe in this case we can have something like: > > > <meta property="og:url" content="{{og_url if og_url else > > > https://adblockplus.org/%7B%7Bpage%7D%7D%7D%7D%22 /> ? > > > > ~no > > > > See: > > https://developers.facebook.com/docs/sharing/best-practices#tags > > > > We could use something like that in the future to handle locale better. > > > > But, today, we don't have additional query params, so the correct url (unless > we > > specify otherwise) is the default url (the one being shared / the one that > will > > be used if none is provided). > > Same goes here as my previous comment, we need to use this to implement in this > review, we can add this condition as soon we will use this condition in the > page, currently we do not use it anywhere, so it's can't be part of this review > unfortunately. 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'}}" />	30 <meta property="og:image" content="{{og_image if og_image else '/img/adblock plus_promo.png'}}" />

42	31

43 {# twitter https://dev.twitter.com/cards/markup #}	32 {# twitter https://dev.twitter.com/cards/markup #}

44 <meta name="twitter:card" content="{{twitter_card if twitter_card else 'summ ary'}}" />	33 <meta name="twitter:site" content="@AdblockPlus" />
saroyanm 2016/06/21 14:58:03 Shouldn't we also include twitter:card ? Why was i Shouldn't we also include twitter:card ? Why was it removed ? juliandoucette 2016/06/23 16:10:56 I removed twitter:card because we were not using i Show quoted text On 2016/06/21 14:58:03, saroyanm wrote: > Shouldn't we also include twitter:card ? Why was it removed ? I removed twitter:card because we were not using it. The default value "summary" is appropriate.
45 <meta name="twitter:site" content="{{twitter_site if twitter_site else '@Adb lockPlus'}}" />	34 <meta name="twitter:creator" content="@AdblockPlus" />

46 <meta name="twitter:creator" content="{{twitter_creator if twitter_creator e lse '@AdblockPlus'}}" />

47	35

48 <link rel="stylesheet" href="/css/main.css" class="cssfx">	36 <link rel="stylesheet" href="/css/main.css" class="cssfx">

49 <link rel="stylesheet" href="/css/main-desktop.css" media="(min-width: 1000p x)" class="cssfx">	37 <link rel="stylesheet" href="/css/main-desktop.css" media="(min-width: 1000p x)" class="cssfx">

50 <link rel="stylesheet" href="/css/main-mobile.css" media="(max-width: 1000px )">	38 <link rel="stylesheet" href="/css/main-mobile.css" media="(max-width: 1000px )">

51	39

52 <link rel="canonical" href="https://adblockplus.org/{{page}}">	40 <link rel="canonical" href="https://adblockplus.org/{{page}}">

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

54	42

55 <!--[if IE 8]>	43 <!--[if IE 8]>

56 <script src="/js/vendor/ie8.js"></script>	44 <script src="/js/vendor/ie8.js"></script>

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

212 </li>	200 </li>

213 </ul>	201 </ul>

214 </section>	202 </section>

215 </div>	203 </div>

216 </footer>	204 </footer>

217	205

218 <script src="/js/main.js"></script>	206 <script src="/js/main.js"></script>

219 </body>	207 </body>

220 </html>	208 </html>

LEFT	RIGHT