includes/index.tmpl - Issue 29695555: Fixes #6 - Add media mention banner

Side by Side Diff: includes/index.tmpl

Issue 29695555: Fixes #6 - Add media mention banner (Closed) Base URL: https://hg.adblockplus.org/web.adblockplus.org

Patch Set: Created Feb. 12, 2018, 11:26 a.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 title=Adblock Plus - Surf the web without annoying ads!	1 title=Adblock Plus - Surf the web without annoying ads!

2 noheading=True	2 noheading=True

3 localefile=index	3 localefile=index

4	4

5 {#	5 {#

6 # This file is part of the Adblock Plus website,	6 # This file is part of the Adblock Plus website,

7 # Copyright (C) 2006-present eyeo GmbH	7 # Copyright (C) 2006-present eyeo GmbH

8 #	8 #

9 # Adblock Plus is free software: you can redistribute it and/or modify	9 # Adblock Plus is free software: you can redistribute it and/or modify

10 # it under the terms of the GNU General Public License version 3 as	10 # it under the terms of the GNU General Public License version 3 as

11 # published by the Free Software Foundation.	11 # published by the Free Software Foundation.

12 #	12 #

13 # Adblock Plus is distributed in the hope that it will be useful,	13 # Adblock Plus is distributed in the hope that it will be useful,

14 # but WITHOUT ANY WARRANTY; without even the implied warranty of	14 # but WITHOUT ANY WARRANTY; without even the implied warranty of

15 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

16 # GNU General Public License for more details.	16 # GNU General Public License for more details.

17 #	17 #

18 # You should have received a copy of the GNU General Public License	18 # You should have received a copy of the GNU General Public License

19 # along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>.	19 # along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>.

20 #}	20 #}

21	21

	22 {% set media_coverage = [

	23 {

	24 "publisher": "Media Post",

	25 "link": "http://www.mediapost.com/publications/article/289691/adblock-plus-c omes-to-new-york.html",

	26 "link_title": "Media Post article about Adblock Plus",

	27 "image": "mediapost",

	28 "image_alt": "Media Post logo"

	29 },

	30 {

	31 "publisher": "NY Times",

	32 "link": "https://www.nytimes.com/2015/08/20/technology/personaltech/ad-block ers-and-the-nuisance-at-the-heart-of-the-modern-web.html",

	33 "link_title": "New York Times article about Adblock Plus",

	34 "image": "nyt",

	35 "image_alt": "New York Times logo"

	36 },

	37 {

	38 "publisher": "Wall St. Journal",

	39 "link": "https://www.wsj.com/articles/adblock-plus-chief-till-faida-says-con sumers-are-fed-up-with-current-online-ads-1462981668",

	40 "link_title": "Wall St. Journal article about Adblock Plus",

	41 "image": "wsj",

	42 "image_alt": "Wall St. Journal logo"

	43 },

	44 {

	45 "publisher": "TechCrunch",

	46 "link": "https://techcrunch.com/2016/05/09/adblock-plus-closes-in-on-a-billi on-downloads/",

	47 "link_title": "Tech Crunch article about Adblock Plus",

	48 "image": "techcrunch",

	49 "image_alt": "Tech Crunch logo"

	50 },

	51 {

	52 "publisher": "BusinessInsider",

	53 "link": "http://www.businessinsider.com/theres-nothing-wrong-about-the-way-a dblock-plus-makes-money-2015-9",

	54 "link_title": "Business Insider article about Adblock Plus",

	55 "image": "business-insider",

	56 "image_alt": "Business Insider logo"

	57 }

	58 ] %}

	59

22 <head>	60 <head>

23 <link href="/css/index.css" rel="stylesheet">	61 <link href="/css/index.css" rel="stylesheet">

24 <link href="/css/index-desktop.css" media="(min-width: 1000px)" rel="stylesheet" >	62 <link href="/css/index-desktop.css" media="(min-width: 1000px)" rel="stylesheet" >

25 <link href="/css/index-mobile.css" media="(max-width: 1000px)" rel="stylesheet">	63 <link href="/css/index-mobile.css" media="(max-width: 1000px)" rel="stylesheet">

26	64

27 <link href="https://adblockplus.org/" rel="canonical">	65 <link href="https://adblockplus.org/" rel="canonical">

28 <link href="https://chrome.google.com/webstore/detail/cfhdojbkjhnklbpkdaibdccddi lifddb" rel="chrome-webstore-item">	66 <link href="https://chrome.google.com/webstore/detail/cfhdojbkjhnklbpkdaibdccddi lifddb" rel="chrome-webstore-item">

29 <meta content="website" property="og:type">	67 <meta content="website" property="og:type">

30 <meta content="https://adblockplus.org/img/adblockplus_promo.png" property="og:i mage">	68 <meta content="https://adblockplus.org/img/adblockplus_promo.png" property="og:i mage">

31 <meta content="{{"<fix>Adblock Plus</fix> is the most popular ad blocker availab le for <fix>Firefox</fix>, <fix>Chrome</fix>, <fix>Opera</fix>, <fix>Safari</fix >, <fix>Android</fix> and <fix>Internet Explorer</fix>. Block all annoying ads a ll over the web: remove video ads on <fix>YouTube</fix>, block <fix>Facebook</fi x> ads, get rid of pop-ups and much more. On <fix>Google Chrome</fix>, <fix>Adbl ock Plus</fix> is one of the fastest growing extensions ever. <fix>Adblock Plus< /fix> is used on over <fix>100</fix> million devices. Download online for free n ow!"\|translate("s2")}}" name="description">	69 <meta content="{{"<fix>Adblock Plus</fix> is the most popular ad blocker availab le for <fix>Firefox</fix>, <fix>Chrome</fix>, <fix>Opera</fix>, <fix>Safari</fix >, <fix>Android</fix> and <fix>Internet Explorer</fix>. Block all annoying ads a ll over the web: remove video ads on <fix>YouTube</fix>, block <fix>Facebook</fi x> ads, get rid of pop-ups and much more. On <fix>Google Chrome</fix>, <fix>Adbl ock Plus</fix> is one of the fastest growing extensions ever. <fix>Adblock Plus< /fix> is used on over <fix>100</fix> million devices. Download online for free n ow!"\|translate("s2")}}" name="description">

32 <meta content="{{"<fix>Adblock Plus</fix> is the most popular ad blocker availab le for <fix>Firefox</fix>, <fix>Chrome</fix>, <fix>Opera</fix>, <fix>Safari</fix >, <fix>Android</fix> and <fix>Internet Explorer</fix>. Block all annoying ads a ll over the web: remove video ads on <fix>YouTube</fix>, block <fix>Facebook</fi x> ads, get rid of pop-ups and much more. On <fix>Google Chrome</fix>, <fix>Adbl ock Plus</fix> is one of the fastest growing extensions ever. <fix>Adblock Plus< /fix> is used on over <fix>100</fix> million devices. Download online for free n ow!"\|translate("s2")}}" property="og:description">	70 <meta content="{{"<fix>Adblock Plus</fix> is the most popular ad blocker availab le for <fix>Firefox</fix>, <fix>Chrome</fix>, <fix>Opera</fix>, <fix>Safari</fix >, <fix>Android</fix> and <fix>Internet Explorer</fix>. Block all annoying ads a ll over the web: remove video ads on <fix>YouTube</fix>, block <fix>Facebook</fi x> ads, get rid of pop-ups and much more. On <fix>Google Chrome</fix>, <fix>Adbl ock Plus</fix> is one of the fastest growing extensions ever. <fix>Adblock Plus< /fix> is used on over <fix>100</fix> million devices. Download online for free n ow!"\|translate("s2")}}" property="og:description">

33 </head>	71 </head>

34	72

35 <div id="abb-banner" class="notice">	73 <div id="content">
	juliandoucette 2018/02/19 14:15:56 Did you intend to include this change in this patc Did you intend to include this change in this patchset? If so, why? Detail: This causes there to be a large space between the main video and download button. (I'm not talking about this div specifically. I'm talking about the changes on this page besides the media section.) ire 2018/02/20 10:49:04 Yes. We can't have the #content on the same level Show quoted text On 2018/02/19 14:15:56, juliandoucette wrote: > Did you intend to include this change in this patchset? If so, why? Yes. We can't have the #content on the same level as the .content class anymore because elements on the homepage span full width. So I moved it here instead Show quoted text > Detail: This causes there to be a large space between the main video and > download button. > > (I'm not talking about this div specifically. I'm talking about the changes on > this page besides the media section.) Yes, this isn't because I moved #content element here. It's because I changed the overriding of the #content width to be restricted to a smaller size. Although this change does affect more that the media section, it is a change that should be made because we no longer want the #content of the homepage to not span the full width possible. Since none of these changes will be pushed until the rest of the page is fixed, I didn't think it made sense to patch that particular issue now. Do you think I should? juliandoucette 2018/02/21 11:22:53 I'd prefer to fix the #content issue separately be Show quoted text On 2018/02/20 10:49:04, ire wrote: > Since none of these changes will be pushed until the rest of the page is fixed, > I didn't think it made sense to patch that particular issue now. Do you think I > should? I'd prefer to fix the #content issue separately before pushing this solution. But that's not a blocking preference. ire 2018/02/22 08:43:52 Ack. I'll keep it in this issue because 1) I'm bei Show quoted text On 2018/02/21 11:22:53, juliandoucette wrote: > On 2018/02/20 10:49:04, ire wrote: > > Since none of these changes will be pushed until the rest of the page is > fixed, > > I didn't think it made sense to patch that particular issue now. Do you think > I > > should? > > I'd prefer to fix the #content issue separately before pushing this solution. > But that's not a blocking preference. Ack. I'll keep it in this issue because 1) I'm being lazy and 2) I think it is relevant to this issue as the change is required for this implementation to work
36 <h2>{{"Want to block ads on your smartphone or tablet?"\|translate("abb-banner- headline")}}</h2>	74 <div class="container clearfix">

37 <img src="/img/abb-promo-image.png" alt="{{"Adblock Browser promotional image" \|translate("abb-promotion-alt")}}" />	75 <div id="abb-banner" class="notice">

38 <a id="abb-android-download" href="https://adblockplus.org/redirect?link=adblo ck_browser_android_store">{{"Download Adblock Browser"\|translate("abb-banner-but ton-text")}}</a>	76 <h2>{{"Want to block ads on your smartphone or tablet?"\|translate("abb-ban ner-headline")}}</h2>

39 <a id="abb-ios-download" href="https://adblockplus.org/redirect?link=adblock_b rowser_ios_store">{{"Download Adblock Browser"\|translate("abb-banner-button-text ")}}</a>	77 <img src="/img/abb-promo-image.png" alt="{{"Adblock Browser promotional im age"\|translate("abb-promotion-alt")}}" />

40 </div>	78 <a id="abb-android-download" href="https://adblockplus.org/redirect?link=a dblock_browser_android_store">{{"Download Adblock Browser"\|translate("abb-banner -button-text")}}</a>

41 <div itemscope="itemscope" itemtype="http://schema.org/SoftwareApplication">	79 <a id="abb-ios-download" href="https://adblockplus.org/redirect?link=adblo ck_browser_ios_store">{{"Download Adblock Browser"\|translate("abb-banner-button- text")}}</a>

42 <section id="main">	80 </div>

43 <div id="summary">	81

44 <h1 itemprop="name">{{"Adblock Plus"\|translate("s5")}}</h1>	82 <div itemscope="itemscope" itemtype="http://schema.org/SoftwareApplication">

45 <h2 itemprop="description">{{"Surf the web without annoying ads!"\|translat e("s6")}}</h2>	83 <section id="main">

46	84 <div id="summary">

47 <ul id="features">	85 <h1 itemprop="name">{{"Adblock Plus"\|translate("s5")}}</h1>

48 <li itemprop="featureList">	86 <h2 itemprop="description">{{"Surf the web without annoying ads!"\|tran slate("s6")}}</h2>

49 <div class="sprite"></div>	87

50 {{"Blocks banners, pop-ups, tracking, malware and more"\|translate("blo cking-features")}}	88 <ul id="features">

51 </li>	89 <li itemprop="featureList">

52 <li itemprop="featureList">	90 <div class="sprite"></div>

53 <div class="sprite"></div>	91 {{"Blocks banners, pop-ups, tracking, malware and more"\|translate( "blocking-features")}}

54 {{"By default, nonintrusive ads aren't blocked in order to support web sites <a href=\"acceptable-ads\">(learn more)</a>"\|translate("opt-out-acceptable -ads")}} <sup><a href="#footnote">[1]</a></sup>	92 </li>

55 </li>	93 <li itemprop="featureList">

56 <li class="emphasized" id="feature-free" itemprop="featureList">	94 <div class="sprite"></div>

57 <div class="sprite"></div>	95 {{"By default, nonintrusive ads aren't blocked in order to support websites <a href=\"acceptable-ads\">(learn more)</a>"\|translate("opt-out-accept able-ads")}} <sup><a href="#footnote">[1]</a></sup>

58 {{"It's free for users and open source (<a href=\"https://www.gnu.org/ licenses/gpl.html\">GPLv3</a>)"\|translate("gplv3-license")}}	96 </li>

59 </li>	97 <li class="emphasized" id="feature-free" itemprop="featureList">

60 <li id="feature-maxthon" itemprop="featureList">	98 <div class="sprite"></div>

61 <div class="sprite"></div>	99 {{"It's free for users and open source (<a href=\"https://www.gnu. org/licenses/gpl.html\">GPLv3</a>)"\|translate("gplv3-license")}}

62 {{"Integrated by default in"\|translate("s11")}} <a href="http://www.ma xthon.com/" target="_blank">{{"Maxthon Cloud Browser"\|translate("s12")}}</a>	100 </li>

63 </li>	101 <li id="feature-maxthon" itemprop="featureList">

64 </ul>	102 <div class="sprite"></div>

65 </div>	103 {{"Integrated by default in"\|translate("s11")}} <a href="http://ww w.maxthon.com/" target="_blank">{{"Maxthon Cloud Browser"\|translate("s12")}}</a>

66	104 </li>

67 <p id="terms-message">	105 </ul>

68 {{ "By clicking the Agree and Install button below, you agree to our <a hr ef=\"terms\">Terms of Use</a>." \| translate("terms-message", "Terms of use messa ge") }}	106 </div>

69 </p>	107

70	108 <p id="terms-message">

71 <div id="install">	109 {{ "By clicking the Agree and Install button below, you agree to our < a href=\"terms\">Terms of Use</a>." \| translate("terms-message", "Terms of use m essage") }}

72 <a class="install-button" href="https://update.adblockplus.org/latest/adbl ockplusfirefox.xpi" id="install-firefox">{{"Agree and Install for Firefox"\|trans late("s13")}}</a>	110 </p>

73 <a class="install-button" href="https://chrome.google.com/webstore/detail/ cfhdojbkjhnklbpkdaibdccddilifddb" id="install-chrome" onclick="chrome.webstore.i nstall(); return false;">{{"Agree and Install for Chrome"\|translate("s14")}}</a>	111

74 <a class="install-button" href="https://addons.opera.com/extensions/detail s/opera-adblock/?display=en-US" id="install-opera">{{"Agree and Install for Oper a"\|translate("s15")}}</a>	112 <div id="install">

75 <a class="install-button" href="android-install" id="install-android">{{"A gree and Install for Android"\|translate("s16")}}</a>	113 <a class="install-button" href="https://update.adblockplus.org/latest/ adblockplusfirefox.xpi" id="install-firefox">{{"Agree and Install for Firefox"\|t ranslate("s13")}}</a>

76 <a class="install-button" href="https://update.adblockplus.org/latest/adbl ockplusie.exe" id="install-internet-explorer">{{"Agree and Install for Internet Explorer"\|translate("s17")}}</a>	114 <a class="install-button" href="https://chrome.google.com/webstore/det ail/cfhdojbkjhnklbpkdaibdccddilifddb" id="install-chrome" onclick="chrome.websto re.install(); return false;">{{"Agree and Install for Chrome"\|translate("s14")}} </a>

77 <a class="install-button" href="https://update.adblockplus.org/latest/adbl ockplussafari.safariextz" id="install-safari">{{"Agree and Install for Safari"\|t ranslate("s18")}}</a>	115 <a class="install-button" href="https://addons.opera.com/extensions/de tails/opera-adblock/?display=en-US" id="install-opera">{{"Agree and Install for Opera"\|translate("s15")}}</a>

78 <a class="install-button" href="https://chrome.google.com/webstore/detail/ cfhdojbkjhnklbpkdaibdccddilifddb" id="install-yandex-browser" onclick="chrome.we bstore.install(); return false;">{{"Agree and Install for Yandex Browser"\|transl ate("s19")}}</a>	116 <a class="install-button" href="android-install" id="install-android"> {{"Agree and Install for Android"\|translate("s16")}}</a>

79 <a class="install-button" href="https://www.microsoft.com/store/p/adblock- plus/9nblggh4r9nz" id="install-edge">{{"Agree and Install for Microsoft Edge"\|tr anslate("install-edge")}}</a>	117 <a class="install-button" href="https://update.adblockplus.org/latest/ adblockplusie.exe" id="install-internet-explorer">{{"Agree and Install for Inter net Explorer"\|translate("s17")}}</a>

80 </div>	118 <a class="install-button" href="https://update.adblockplus.org/latest/ adblockplussafari.safariextz" id="install-safari">{{"Agree and Install for Safar i"\|translate("s18")}}</a>

81	119 <a class="install-button" href="https://chrome.google.com/webstore/det ail/cfhdojbkjhnklbpkdaibdccddilifddb" id="install-yandex-browser" onclick="chrom e.webstore.install(); return false;">{{"Agree and Install for Yandex Browser"\|tr anslate("s19")}}</a>

82 <div id="other-platform">	120 <a class="install-button" href="https://www.microsoft.com/store/p/adbl ock-plus/9nblggh4r9nz" id="install-edge">{{"Agree and Install for Microsoft Edge "\|translate("install-edge")}}</a>

83 <div>{{"Download Adblock Plus for another platform"\|translate("other-pla tform")}}</div>	121 </div>

84 <ul>	122

	123 <div id="other-platform">

	124 <div>{{"Download Adblock Plus for another platform"\|translate("other -platform")}}</div>

	125 <ul>

	126 <li>

	127 <a class="sprite" href="firefox" id="platform-firefox" title="{{ "Adblock Plus for Firefox"\|translate("s20")}}"></a>

	128 </li>

	129 <li>

	130 <a class="sprite" href="chrome" id="platform-chrome" title="{{"A dblock Plus for Chrome"\|translate("s21")}}"></a>

	131 </li>

	132 <li>

	133 <a class="sprite" href="android" id="platform-android" title="{{ "Adblock Plus for Android"\|translate("s22")}}"></a>

	134 </li>

	135 <li>

	136 <a class="sprite" href="opera" id="platform-opera" title="{{"Adb lock Plus for Opera"\|translate("s23")}}"></a>

	137 </li>

	138 <li>

	139 <a class="sprite" href="internet-explorer" id="platform-internet -explorer" title="{{"Adblock Plus for Internet Explorer"\|translate("s24")}}"></a >

	140 </li>

	141 <li>

	142 <a class="sprite" href="safari" id="platform-safari" title="{{"A dblock Plus for Safari"\|translate("s25")}}"></a>

	143 </li>

	144 <li>

	145 <a class="sprite" href="yandex-browser" id="platform-yandex-brow ser" title="{{"Adblock Plus for Yandex Browser"\|translate("s26")}}"></a>

	146 </li>

	147 <li>

	148 <a class="sprite" href="maxthon" id="platform-maxthon" title="{{ "Adblock Plus for Maxthon"\|translate("s27")}}"></a>

	149 </li>

	150 <li>

	151 <a class="sprite" href="edge" id="platform-edge" title="{{"Adblo ck Plus for Microsoft Edge"\|translate("abp-microsoft-edge")}}"></a>

	152 </li>

	153 </ul>

	154 </div>

	155 </section>

	156

	157 <div id="messages-wrapper">

	158 <? include abb-notification ?>

	159 <? include fr-download-disclaimer ?>

	160 <div id="maxthon-notification">

	161 使用傲游云浏览器，享受最好的广告过滤体验. (内置Adblock Plus) <a href="http://www.maxthon.cn" target="_blank">下载傲游云浏览器</a>

	162 </div>

	163 <div class="warning-platform firefox">{{"It appears that you are using M ozilla Firefox."\|translate("s28")}} <a href="firefox">{{"Switch to Adblock Plus for Firefox."\|translate("s29")}}</a></div>

	164 <div class="warning-platform chrome">{{"It appears that you are using Go ogle Chrome."\|translate("s30")}} <a href="chrome">{{"Switch to Adblock Plus for Chrome."\|translate("s31")}}</a></div>

	165 <div class="warning-platform android">{{"It appears that you are using A ndroid."\|translate("s32")}} <a href="android">{{"Switch to Adblock Plus for Andr oid."\|translate("s33")}}</a></div>

	166 <div class="warning-platform opera">{{"It appears that you are using Ope ra."\|translate("s34")}} <a href="opera">{{"Switch to Adblock Plus for Opera."\|tr anslate("s35")}}</a></div>

	167 <div class="warning-platform internet-explorer">{{"It appears that you a re using Internet Explorer."\|translate("s36")}} <a href="internet-explorer">{{"S witch to Adblock Plus for Internet Explorer."\|translate("s37")}}</a></div>

	168 <div class="warning-platform safari">{{"It appears that you are using Sa fari."\|translate("s38")}} <a href="safari">{{"Switch to Adblock Plus for Safari. "\|translate("s39")}}</a></div>

	169 <div class="warning-platform yandex-browser">{{"It appears that you are using Yandex Browser."\|translate("s40")}} <a href="yandex-browser">{{"Switch to Adblock Plus for Yandex Browser."\|translate("s41")}}</a></div>

	170 <div class="warning-platform maxthon">{{"It appears that you are using M axthon."\|translate("s42")}} <a href="maxthon">{{"Switch to Adblock Plus for Maxt hon."\|translate("s43")}}</a></div>

	171 </div>

	172

	173 <div id="video-container">

	174 <a id="video" target="_blank" href="https://www.youtube-nocookie.com/emb ed/pVYtzF5SemU?html5=1&autohide=1&enablejsapi=1&controls=2&fs=1& amp;modestbranding=1&rel=0&showinfo=0&theme=light&autoplay=1">

	175 <img id="video-thumbnail" src="/img/video-thumbnail.jpg" alt="{{ "Intr oduction to Adblock Plus video thumbnail" \| translate("video-alt-text") }}">

	176 <img id="video-play" src="/img/video-external.png" alt="{{ "Play Video " \| translate("video-play-alt-text") }}">

	177 </a>

	178 <p id="video-disclaimer">

	179 {{ "Click to play this video. Please note that this video is hosted by YouTube. When this video is played, some personal data is transferred to YouTub e. For more information, please review YouTube's <a href='https://www.google.com /intl/en/policies/privacy/' target='_blank'>privacy policy</a>." \| translate("vi deo-disclaimer") }}

	180 </p>

	181 </div>

	182

	183 <img id="maxthon-instruction" src="/img/maxthon-instruction.png" alt="{{"A ctivate Adblock Plus in Maxthon"\|translate("maxthon-instruction")}}">

	184 <img id="edge-teaser" src="/img/edge_teaser.png" alt="{{"Comming soon imag e of Adblock Plus for Microsoft Edge"\|translate("edge-teaser")}}" />

	185 </div>

	186 </div>

	187

	188 <div class="bg-primary section">
	juliandoucette 2018/02/19 14:15:56 The video is currently overlapping this section on The video is currently overlapping this section on small screens :/ (it should be above the download button, not below it?) ire 2018/02/20 10:49:04 It doesn't appear to be overlapping for me which i Show quoted text On 2018/02/19 14:15:56, juliandoucette wrote: > The video is currently overlapping this section on small screens :/ It doesn't appear to be overlapping for me which is strange. It just rests directly at the edge of the media section. Nothing has actually changed with the spacing, the reason there was previously space between he video and #key-facts was because there was padding on the #key-facts element. I will apply some margin below the video to fix this, but I don't think (as I mentioned in my comment below) that adding more code to fix it is necessary since it will very soon change as well and this change is only about the #media section. Show quoted text > (it should > be above the download button, not below it?) The video should be below the download button. ire 2018/02/20 10:49:04 Done. Show quoted text On 2018/02/19 14:15:56, juliandoucette wrote: > The video is currently overlapping this section on small screens :/ (it should > be above the download button, not below it?) Done.
	189 <div class="container">

	190 <div id="media">

	191 <header id="media-header">

	192 <h2>As Mentioned On:</h2>

	193 <small>(Links open in a new window)</small>
	juliandoucette 2018/02/19 14:15:56 NIT: aria-hidden? NIT: aria-hidden? ire 2018/02/20 10:49:04 Why would we use aria-hidden? It is displayed on s Show quoted text On 2018/02/19 14:15:56, juliandoucette wrote: > NIT: aria-hidden? Why would we use aria-hidden? It is displayed on smaller screens. juliandoucette 2018/02/21 11:22:53 It should be hidden aria-hidden on large screens b Show quoted text On 2018/02/20 10:49:04, ire wrote: > On 2018/02/19 14:15:56, juliandoucette wrote: > > NIT: aria-hidden? > > Why would we use aria-hidden? It is displayed on smaller screens. It should be hidden aria-hidden on large screens because it's hidden on large screens (and not on small)? ire 2018/02/22 08:43:52 I don't think `aria-hidden` is suitable here becau Show quoted text On 2018/02/21 11:22:53, juliandoucette wrote: > On 2018/02/20 10:49:04, ire wrote: > > On 2018/02/19 14:15:56, juliandoucette wrote: > > > NIT: aria-hidden? > > > > Why would we use aria-hidden? It is displayed on smaller screens. > > It should be hidden aria-hidden on large screens because it's hidden on large > screens (and not on small)? I don't think `aria-hidden` is suitable here because this isn't something that is hidden only for screen-reader users. It is hidden using `display: none` on larger screens for all users, not just screen reader users. Maybe I'm missing something here but I don't see how `aria-hidden` is relevant in this case. juliandoucette 2018/02/23 13:46:17 On second thought, I think you're right. Thank you Show quoted text On 2018/02/22 08:43:52, ire wrote: > I don't think `aria-hidden` is suitable here because this isn't something that > is hidden only for screen-reader users. It is hidden using `display: none` on > larger screens for all users, not just screen reader users. Maybe I'm missing > something here but I don't see how `aria-hidden` is relevant in this case. On second thought, I think you're right. Thank you for explaining / pushing back. ire 2018/02/26 08:32:11 You're welcome :) Show quoted text On 2018/02/23 13:46:17, juliandoucette wrote: > On 2018/02/22 08:43:52, ire wrote: > > I don't think `aria-hidden` is suitable here because this isn't something that > > is hidden only for screen-reader users. It is hidden using `display: none` on > > larger screens for all users, not just screen reader users. Maybe I'm missing > > something here but I don't see how `aria-hidden` is relevant in this case. > > On second thought, I think you're right. Thank you for explaining / pushing > back. You're welcome :)
	194 </header>

	195 <ul id="media-list" class="unstyled">

	196 {% for item in media_coverage %}

85 <li>	197 <li>

86 <a class="sprite" href="firefox" id="platform-firefox" title="{{"Adb lock Plus for Firefox"\|translate("s20")}}"></a>	198 <a href="{{ item.link }}" target="_blank" title="{{ item.link_title }}">

	199 <img src="/img/media/{{ item.image }}.png" srcset="/img/{{ item.im age }}-2x.png 2x" alt="{{ item.image_alt }}">
	juliandoucette 2018/02/19 14:15:56 You forgot "media/" in srcset. You forgot "media/" in srcset. ire 2018/02/20 10:49:04 Thanks! Done. Show quoted text On 2018/02/19 14:15:56, juliandoucette wrote: > You forgot "media/" in srcset. Thanks! Done.
	200 </a>

87 </li>	201 </li>

88 <li>	202 {% endfor %}

89 <a class="sprite" href="chrome" id="platform-chrome" title="{{"Adblo ck Plus for Chrome"\|translate("s21")}}"></a>

90 </li>

91 <li>

92 <a class="sprite" href="android" id="platform-android" title="{{"Adb lock Plus for Android"\|translate("s22")}}"></a>

93 </li>

94 <li>

95 <a class="sprite" href="opera" id="platform-opera" title="{{"Adblock Plus for Opera"\|translate("s23")}}"></a>

96 </li>

97 <li>

98 <a class="sprite" href="internet-explorer" id="platform-internet-exp lorer" title="{{"Adblock Plus for Internet Explorer"\|translate("s24")}}"></a>

99 </li>

100 <li>

101 <a class="sprite" href="safari" id="platform-safari" title="{{"Adblo ck Plus for Safari"\|translate("s25")}}"></a>

102 </li>

103 <li>

104 <a class="sprite" href="yandex-browser" id="platform-yandex-browser" title="{{"Adblock Plus for Yandex Browser"\|translate("s26")}}"></a>

105 </li>

106 <li>

107 <a class="sprite" href="maxthon" id="platform-maxthon" title="{{"Adb lock Plus for Maxthon"\|translate("s27")}}"></a>

108 </li>

109 <li>

110 <a class="sprite" href="edge" id="platform-edge" title="{{"Adblock P lus for Microsoft Edge"\|translate("abp-microsoft-edge")}}"></a>

111 </li>

112 </ul>	203 </ul>

113 </div>	204 </div>

114 </section>	205 </div>

115

116 <div id="messages-wrapper">

117 <? include abb-notification ?>

118 <? include fr-download-disclaimer ?>

119 <div id="maxthon-notification">

120 使用傲游云浏览器，享受最好的广告过滤体验. (内置Adblock Plus) <a href="http://www.maxthon.cn" tar get="_blank">下载傲游云浏览器</a>

121 </div>

122 <div class="warning-platform firefox">{{"It appears that you are using Mozil la Firefox."\|translate("s28")}} <a href="firefox">{{"Switch to Adblock Plus for Firefox."\|translate("s29")}}</a></div>

123 <div class="warning-platform chrome">{{"It appears that you are using Google Chrome."\|translate("s30")}} <a href="chrome">{{"Switch to Adblock Plus for Chro me."\|translate("s31")}}</a></div>

124 <div class="warning-platform android">{{"It appears that you are using Andro id."\|translate("s32")}} <a href="android">{{"Switch to Adblock Plus for Android. "\|translate("s33")}}</a></div>

125 <div class="warning-platform opera">{{"It appears that you are using Opera." \|translate("s34")}} <a href="opera">{{"Switch to Adblock Plus for Opera."\|transl ate("s35")}}</a></div>

126 <div class="warning-platform internet-explorer">{{"It appears that you are u sing Internet Explorer."\|translate("s36")}} <a href="internet-explorer">{{"Switc h to Adblock Plus for Internet Explorer."\|translate("s37")}}</a></div>

127 <div class="warning-platform safari">{{"It appears that you are using Safari ."\|translate("s38")}} <a href="safari">{{"Switch to Adblock Plus for Safari."\|tr anslate("s39")}}</a></div>

128 <div class="warning-platform yandex-browser">{{"It appears that you are usin g Yandex Browser."\|translate("s40")}} <a href="yandex-browser">{{"Switch to Adbl ock Plus for Yandex Browser."\|translate("s41")}}</a></div>

129 <div class="warning-platform maxthon">{{"It appears that you are using Maxth on."\|translate("s42")}} <a href="maxthon">{{"Switch to Adblock Plus for Maxthon. "\|translate("s43")}}</a></div>

130 </div>	206 </div>

131	207

132 <div id="video-container">	208 <div class="container">

133 <a id="video" target="_blank" href="https://www.youtube-nocookie.com/embed/p VYtzF5SemU?html5=1&autohide=1&enablejsapi=1&controls=2&fs=1& modestbranding=1&rel=0&showinfo=0&theme=light&autoplay=1">	209 <div id="key-facts">

134 <img id="video-thumbnail" src="/img/video-thumbnail.jpg" alt="{{ "Introduc tion to Adblock Plus video thumbnail" \| translate("video-alt-text") }}">	210 <section class="first">

135 <img id="video-play" src="/img/video-external.png" alt="{{ "Play Video" \| translate("video-play-alt-text") }}">	211 <div class="sprite" id="facts-open-source"></div>

136 </a>	212 <h1>{{"Open Source"\|translate("s44")}}</h1>

137 <p id="video-disclaimer">	213 <p>

138 {{ "Click to play this video. Please note that this video is hosted by You Tube. When this video is played, some personal data is transferred to YouTube. F or more information, please review YouTube's <a href='https://www.google.com/int l/en/policies/privacy/' target='_blank'>privacy policy</a>." \| translate("video- disclaimer") }}	214 {{"Adblock Plus is an open source project.\n <a href=\"contribu te\">Join us!</a>"\|translate("s45")}}

	215 </p>

	216 </section>

	217

	218 <section>

	219 <div class="sprite" id="facts-downloads"></div>

	220 <h1>{{"Active on <fix>100</fix> million devices"\|translate("s46")}}</h1>

	221 <p>

	222 {{"<fix>Adblock Plus</fix> is the world’s most popular browser extension."\|t ranslate("s47")}}

	223 </p>

	224 </section>

	225

	226 <section>

	227 <div class="sprite" id="facts-privacy"></div>

	228 <h1>{{"Privacy Guaranteed"\|translate("s48")}}</h1>

	229 <p>

	230 {{"Adblock Plus will never collect your <a href=\"privacy\">personal d ata</a>."\|translate("privacy-policy-note")}}

	231 </p>

	232

	233 </section>

	234 </div>

	235

	236

	237 {% if page == "internet-explorer" %}

	238 <p id="ready-for-windows-notice" class="notice">

	239 {{"Adblock Plus for Internet Explorer is supported by eyeo GmbH on the fol lowing editions of Windows 10 – Windows 10 Pro, Windows 10 Education and Windows 10 Enterprise. Adblock Plus for Internet Explorer is supported on the in-market supported servicing branches of Windows 10 including - Current Branch, Current Branch for Business and the following Long-Term Servicing branch: Windows 10."\|t ranslate("ready-for-windows-notice")}}

139 </p>	240 </p>

	241 {% endif %}

	242

	243 <hr>

	244 <div id="footnote">

	245 [1] {{"The following rules <strong>have</strong> and <strong>always will</ strong> apply to everyone, without exception:"\|translate("footnote-headline")}}

	246 <ul>

	247 <li>

	248 {{"Participants cannot pay to avoid the <a href=\"acceptable-ads#crite ria-general\">criteria</a>. Every ad must comply."\|translate("footnote-must-comp ly")}}

	249 </li>

	250 <li>

	251 {{"For transparency, we add all Acceptable Ads to our <a href=\"https: //adblockplus.org/forum/viewforum.php?f=12\">forum</a> so that our community of users can provide feedback."\|translate("footnote-forum")}}

	252 </li>

	253 <li>

	254 {{"We listen to our users. If an Acceptable Ads proposal is flagged by our community for a legitimate reason, we will remove it from the whitelist."\|t ranslate("footnote-value-users")}}

	255 </li>

	256 <li>

	257 {{"We are able to keep our open source product free by charging large entities a fee for whitelisting services. For the other roughly 90 percent of ou r partners, these services are offered free of charge."\|translate("footnote-keep -free")}}

	258 </li>

	259 </ul>

	260 </div>

	261

140 </div>	262 </div>

141	263 </div><!-- #content -->

142 <img id="maxthon-instruction" src="/img/maxthon-instruction.png" alt="{{"Activ ate Adblock Plus in Maxthon"\|translate("maxthon-instruction")}}">

143 <img id="edge-teaser" src="/img/edge_teaser.png" alt="{{"Comming soon image of Adblock Plus for Microsoft Edge"\|translate("edge-teaser")}}" />

144 </div>

145

146 <div id="key-facts">

147 <section class="first">

148 <div class="sprite" id="facts-open-source"></div>

149 <h1>{{"Open Source"\|translate("s44")}}</h1>

150 <p>

151 {{"Adblock Plus is an open source project.\n <a href=\"contribute\" >Join us!</a>"\|translate("s45")}}

152 </p>

153 </section>

154

155 <section>

156 <div class="sprite" id="facts-downloads"></div>

157 <h1>{{"Active on <fix>100</fix> million devices"\|translate("s46")}}</h1>

158 <p>

159 {{"<fix>Adblock Plus</fix> is the world’s most popular browser extension."\|trans late("s47")}}

160 </p>

161 </section>

162

163 <section>

164 <div class="sprite" id="facts-privacy"></div>

165 <h1>{{"Privacy Guaranteed"\|translate("s48")}}</h1>

166 <p>

167 {{"Adblock Plus will never collect your <a href=\"privacy\">personal data< /a>."\|translate("privacy-policy-note")}}

168 </p>

169

170 </section>

171 </div>

172

173 {% if page == "internet-explorer" %}

174 <p id="ready-for-windows-notice" class="notice">

175 {{"Adblock Plus for Internet Explorer is supported by eyeo GmbH on the followi ng editions of Windows 10 – Windows 10 Pro, Windows 10 Education and Windows 10 Enterprise. Adblock Plus for Internet Explorer is supported on the in-market sup ported servicing branches of Windows 10 including - Current Branch, Current Bran ch for Business and the following Long-Term Servicing branch: Windows 10."\|trans late("ready-for-windows-notice")}}

176 </p>

177 {% endif %}

178

179 <hr>

180 <div id="footnote">

181 [1] {{"The following rules <strong>have</strong> and <strong>always will</stro ng> apply to everyone, without exception:"\|translate("footnote-headline")}}

182 <ul>

183 <li>

184 {{"Participants cannot pay to avoid the <a href=\"acceptable-ads#criteria- general\">criteria</a>. Every ad must comply."\|translate("footnote-must-comply") }}

185 </li>

186 <li>

187 {{"For transparency, we add all Acceptable Ads to our <a href=\"https://ad blockplus.org/forum/viewforum.php?f=12\">forum</a> so that our community of user s can provide feedback."\|translate("footnote-forum")}}

188 </li>

189 <li>

190 {{"We listen to our users. If an Acceptable Ads proposal is flagged by our community for a legitimate reason, we will remove it from the whitelist."\|trans late("footnote-value-users")}}

191 </li>

192 <li>

193 {{"We are able to keep our open source product free by charging large enti ties a fee for whitelisting services. For the other roughly 90 percent of our pa rtners, these services are offered free of charge."\|translate("footnote-keep-fre e")}}

194 </li>

195 </ul>

196 </div>

197	264

198 <script src="/js/index.js"></script>	265 <script src="/js/index.js"></script>

OLD	NEW

« no previous file with comments | « no previous file | static/css/index.css » ('j') | static/css/index.css » ('J')