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

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 meta translations Created May 24, 2016, 12:12 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

OLD	NEW
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>
	saroyanm 2016/05/31 15:23:36 What was the reason of moving the title here ? What was the reason of moving the title here ? juliandoucette 2016/05/31 19:27:46 I grouped these tags based on what kind of data t Show quoted text On 2016/05/31 15:23:36, saroyanm wrote: > What was the reason of moving the title here ? I grouped these tags based on what kind of data they describe*. In this grouping: - meta and viewport describe the rendering of the document - title, author, description, ... describe the content of the document
	25 <meta name="author" content="{{author\|translate("author") if author else get _string("Eyeo GmbH / Adblock Plus", "meta")}}" />
	saroyanm 2016/05/31 15:23:35 This is not how get_string is being used, this cau This is not how get_string is being used, this causes error: https://hg.adblockplus.org/cms/file/tip/README.md#l288 I assume your intention was to use translate filter: https://hg.adblockplus.org/cms/file/tip/README.md#l273 juliandoucette 2016/05/31 19:27:46 Thanks! Show quoted text On 2016/05/31 15:23:35, saroyanm wrote: > This is not how get_string is being used, this causes error: > https://hg.adblockplus.org/cms/file/tip/README.md#l288 > I assume your intention was to use translate filter: > https://hg.adblockplus.org/cms/file/tip/README.md#l273 Thanks!
	26 {% if description %}
	saroyanm 2016/05/31 15:23:36 I'm not sure if introduction of this conditions ar I'm not sure if introduction of this conditions are good idea seems like you only using description variable in adware.md, but not "og_title", "og:type", "og:url", so I think it make sense to only introduce twitter cards here and also without check for the "twitter_card", "twitter_site" and "twitter_creator" variables, we will add them when we will use them elsewhere, also probably doesn't make sense to devide "title" and "og:title", "description" and "og:description" because mostly I think they should have same content and doesn't make sense to translate them separately, anyway we can align regarding that in separate review, let's leave it for later. juliandoucette 2016/05/31 19:27:46 - I made description conditional because some page Show quoted text On 2016/05/31 15:23:36, saroyanm wrote: > I'm not sure if introduction of this conditions are good idea seems like you > only using description variable in adware.md, but not "og_title", "og:type", > "og:url", so I think it make sense to only introduce twitter cards here and also > without check for the "twitter_card", "twitter_site" and "twitter_creator" > variables, we will add them when we will use them elsewhere, also probably > doesn't make sense to devide "title" and "og:title", "description" and > "og:description" because mostly I think they should have same content and > doesn't make sense to translate them separately, anyway we can align regarding > that in separate review, let's leave it for later. - I made description conditional because some pages already define it inside of their <head> - I made title/og:title and description/og:description in case we want to target social media differently than search enignes. EG: Providing a description with less than 140 characters for twitter OR providing a more provocative description for Facebook OR providing a a better targeted description for specific search results. You give the word, and I'll remove them, just thought I would explain a little better. saroyanm 2016/06/01 14:38:01 What about updating the logic to something like: { Show quoted text On 2016/05/31 19:27:46, juliandoucette wrote: > On 2016/05/31 15:23:36, saroyanm wrote: > > I'm not sure if introduction of this conditions are good idea seems like you > > only using description variable in adware.md, but not "og_title", "og:type", > > "og:url", so I think it make sense to only introduce twitter cards here and > also > > without check for the "twitter_card", "twitter_site" and "twitter_creator" > > variables, we will add them when we will use them elsewhere, also probably > > doesn't make sense to devide "title" and "og:title", "description" and > > "og:description" because mostly I think they should have same content and > > doesn't make sense to translate them separately, anyway we can align regarding > > that in separate review, let's leave it for later. > > - I made description conditional because some pages already define it inside of > their <head> > - I made title/og:title and description/og:description in case we want to target > social media differently than search enignes. EG: Providing a description with > less than 140 characters for twitter OR providing a more provocative description > for Facebook OR providing a a better targeted description for specific search > results. > You give the word, and I'll remove them, just thought I would explain a little > better. What about updating the logic to something like: {% if description %} <meta name="description" content="{{description\|translate("description")}}" /> {% if og_description %} <meta property="og:description" content="{{og_description\|translate("og_description")}}" /> {% else %} <meta property="og:description" content="{{description}}" /> {% endif %} {% endif %} I think same can work for the title, not sure if we are planing to provide og:title separately too often. We mostly used to have same description for general description and open graph, so we need to try not to have duplicated translations, otherwise the translation needs to be done for the same string separately juliandoucette 2016/06/01 16:23:19 I don't see the benefit in this change? - it break Show quoted text On 2016/06/01 14:38:01, saroyanm wrote: > On 2016/05/31 19:27:46, juliandoucette wrote: > > On 2016/05/31 15:23:36, saroyanm wrote: > > > I'm not sure if introduction of this conditions are good idea seems like you > > > only using description variable in adware.md, but not "og_title", "og:type", > > > "og:url", so I think it make sense to only introduce twitter cards here and > > also > > > without check for the "twitter_card", "twitter_site" and "twitter_creator" > > > variables, we will add them when we will use them elsewhere, also probably > > > doesn't make sense to devide "title" and "og:title", "description" and > > > "og:description" because mostly I think they should have same content and > > > doesn't make sense to translate them separately, anyway we can align > regarding > > > that in separate review, let's leave it for later. > > > > - I made description conditional because some pages already define it inside > of > > their <head> > > - I made title/og:title and description/og:description in case we want to > target > > social media differently than search enignes. EG: Providing a description with > > less than 140 characters for twitter OR providing a more provocative > description > > for Facebook OR providing a a better targeted description for specific search > > results. > > You give the word, and I'll remove them, just thought I would explain a little > > better. > > What about updating the logic to something like: > {% if description %} > <meta name="description" content="{{description\|translate("description")}}" /> > {% if og_description %} > <meta property="og:description" > content="{{og_description\|translate("og_description")}}" /> > {% else %} > <meta property="og:description" content="{{description}}" /> > {% endif %} > {% endif %} > > I think same can work for the title, not sure if we are planing to provide > og:title separately too often. > > We mostly used to have same description for general description and open graph, > so we need to try not to have duplicated translations, otherwise the translation > needs to be done for the same string separately I don't see the benefit in this change? - it breaks the grouping html/open graph/twitter - og:description defaults to html5 description by default saroyanm 2016/06/02 15:05:11 Yes you are right, in that case we will need to ad Show quoted text On 2016/06/01 16:23:19, juliandoucette wrote: > On 2016/06/01 14:38:01, saroyanm wrote: > > On 2016/05/31 19:27:46, juliandoucette wrote: > > > On 2016/05/31 15:23:36, saroyanm wrote: > > > > I'm not sure if introduction of this conditions are good idea seems like > you > > > > only using description variable in adware.md, but not "og_title", > "og:type", > > > > "og:url", so I think it make sense to only introduce twitter cards here > and > > > also > > > > without check for the "twitter_card", "twitter_site" and "twitter_creator" > > > > variables, we will add them when we will use them elsewhere, also probably > > > > doesn't make sense to devide "title" and "og:title", "description" and > > > > "og:description" because mostly I think they should have same content and > > > > doesn't make sense to translate them separately, anyway we can align > > regarding > > > > that in separate review, let's leave it for later. > > > > > > - I made description conditional because some pages already define it inside > > of > > > their <head> > > > - I made title/og:title and description/og:description in case we want to > > target > > > social media differently than search enignes. EG: Providing a description > with > > > less than 140 characters for twitter OR providing a more provocative > > description > > > for Facebook OR providing a a better targeted description for specific > search > > > results. > > > You give the word, and I'll remove them, just thought I would explain a > little > > > better. > > > > What about updating the logic to something like: > > {% if description %} > > <meta name="description" content="{{description\|translate("description")}}" > /> > > {% if og_description %} > > <meta property="og:description" > > content="{{og_description\|translate("og_description")}}" /> > > {% else %} > > <meta property="og:description" content="{{description}}" /> > > {% endif %} > > {% endif %} > > > > I think same can work for the title, not sure if we are planing to provide > > og:title separately too often. > > > > We mostly used to have same description for general description and open > graph, > > so we need to try not to have duplicated translations, otherwise the > translation > > needs to be done for the same string separately > > I don't see the benefit in this change? > - it breaks the grouping html/open graph/twitter > - og:description defaults to html5 description by default Yes you are right, in that case we will need to add them as soon we will use in the page, so currently I think we only can have a description here and add other tags as soon we will use them in this conditional fashion as you have presented here. juliandoucette 2016/06/13 18:12:49 Done. Show quoted text On 2016/06/02 15:05:11, saroyanm wrote: > On 2016/06/01 16:23:19, juliandoucette wrote: > > On 2016/06/01 14:38:01, saroyanm wrote: > > > On 2016/05/31 19:27:46, juliandoucette wrote: > > > > On 2016/05/31 15:23:36, saroyanm wrote: > > > > > I'm not sure if introduction of this conditions are good idea seems like > > you > > > > > only using description variable in adware.md, but not "og_title", > > "og:type", > > > > > "og:url", so I think it make sense to only introduce twitter cards here > > and > > > > also > > > > > without check for the "twitter_card", "twitter_site" and > "twitter_creator" > > > > > variables, we will add them when we will use them elsewhere, also > probably > > > > > doesn't make sense to devide "title" and "og:title", "description" and > > > > > "og:description" because mostly I think they should have same content > and > > > > > doesn't make sense to translate them separately, anyway we can align > > > regarding > > > > > that in separate review, let's leave it for later. > > > > > > > > - I made description conditional because some pages already define it > inside > > > of > > > > their <head> > > > > - I made title/og:title and description/og:description in case we want to > > > target > > > > social media differently than search enignes. EG: Providing a description > > with > > > > less than 140 characters for twitter OR providing a more provocative > > > description > > > > for Facebook OR providing a a better targeted description for specific > > search > > > > results. > > > > You give the word, and I'll remove them, just thought I would explain a > > little > > > > better. > > > > > > What about updating the logic to something like: > > > {% if description %} > > > <meta name="description" > content="{{description\|translate("description")}}" > > /> > > > {% if og_description %} > > > <meta property="og:description" > > > content="{{og_description\|translate("og_description")}}" /> > > > {% else %} > > > <meta property="og:description" content="{{description}}" /> > > > {% endif %} > > > {% endif %} > > > > > > I think same can work for the title, not sure if we are planing to provide > > > og:title separately too often. > > > > > > We mostly used to have same description for general description and open > > graph, > > > so we need to try not to have duplicated translations, otherwise the > > translation > > > needs to be done for the same string separately > > > > I don't see the benefit in this change? > > - it breaks the grouping html/open graph/twitter > > - og:description defaults to html5 description by default > > Yes you are right, in that case we will need to add them as soon we will use in > the page, so currently I think we only can have a description here and add other > tags as soon we will use them in this conditional fashion as you have presented > here. Done.
	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 %}

	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'}}" />

	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 Loading...
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>

OLD	NEW

« static/css/main.css ('K') | « static/img/cross.png ('k') | no next file » | no next file with comments »