Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Delta Between Two Patch Sets: includes/index.tmpl

Issue 29690912: Fixes #9 - Update cross-promotional section (Closed) Base URL: https://hg.adblockplus.org/web.adblockplus.org
Left Patch Set: Created Feb. 6, 2018, 4:24 p.m.
Right Patch Set: Change background image to solid colour Created Feb. 28, 2018, 8:40 a.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
LEFTRIGHT
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">
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 </a> 173 </a>
136 <p id="video-disclaimer"> 174 <p id="video-disclaimer">
137 {{ "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") }} 175 {{ "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") }}
138 </p> 176 </p>
139 </div> 177 </div>
140 178
141 <img id="maxthon-instruction" src="/img/maxthon-instruction.png" alt="{{"Activ ate Adblock Plus in Maxthon"|translate("maxthon-instruction")}}"> 179 <img id="maxthon-instruction" src="/img/maxthon-instruction.png" alt="{{"Activ ate Adblock Plus in Maxthon"|translate("maxthon-instruction")}}">
142 <img id="edge-teaser" src="/img/edge_teaser.png" alt="{{"Comming soon image of Adblock Plus for Microsoft Edge"|translate("edge-teaser")}}" /> 180 <img id="edge-teaser" src="/img/edge_teaser.png" alt="{{"Comming soon image of Adblock Plus for Microsoft Edge"|translate("edge-teaser")}}" />
143 </div> 181 </div>
144 182
183 <div id="media-section" class="bg-primary section">
184 <div class="container">
185 <div id="media">
186 <header id="media-header">
187 <h2>As Mentioned On:</h2>
188 <small>(Links open in a new window)</small>
189 </header>
190 <ul id="media-list" class="unstyled">
191 {% for item in media_coverage %}
192 <li>
193 <a href="{{ item.link }}" target="_blank" title="{{ item.link_title }} ">
194 <img src="/img/media/{{ item.image }}.png" srcset="/img/media/{{ ite m.image }}-2x.png 2x" alt="{{ item.image_alt }}">
195 </a>
196 </li>
197 {% endfor %}
198 </ul>
199 </div>
200 </div>
201 </div>
202
145 <div id="key-facts"> 203 <div id="key-facts">
146 <section class="first"> 204 <section class="first">
147 <div class="sprite" id="facts-open-source"></div> 205 <div class="sprite" id="facts-open-source"></div>
148 <h1>{{"Open Source"|translate("s44")}}</h1> 206 <h1>{{"Open Source"|translate("s44")}}</h1>
149 <p> 207 <p>
150 {{"Adblock Plus is an open source project.\n <a href=\"contribute\" >Join us!</a>"|translate("s45")}} 208 {{"Adblock Plus is an open source project.\n <a href=\"contribute\" >Join us!</a>"|translate("s45")}}
151 </p> 209 </p>
152 </section> 210 </section>
153 211
154 <section> 212 <section>
155 <div class="sprite" id="facts-downloads"></div> 213 <div class="sprite" id="facts-downloads"></div>
156 <h1>{{"Active on <fix>100</fix> million devices"|translate("s46")}}</h1> 214 <h1>{{"Active on <fix>100</fix> million devices"|translate("s46")}}</h1>
157 <p> 215 <p>
158 {{"<fix>Adblock Plus</fix> is the world’s most popular browser extension."|trans late("s47")}} 216 {{"<fix>Adblock Plus</fix> is the world’s most popular browser extension."|trans late("s47")}}
159 </p> 217 </p>
160 </section> 218 </section>
161 219
162 <section> 220 <section>
163 <div class="sprite" id="facts-privacy"></div> 221 <div class="sprite" id="facts-privacy"></div>
164 <h1>{{"Privacy Guaranteed"|translate("s48")}}</h1> 222 <h1>{{"Privacy Guaranteed"|translate("s48")}}</h1>
165 <p> 223 <p>
166 {{"Adblock Plus will never collect your <a href=\"privacy\">personal data< /a>."|translate("privacy-policy-note")}} 224 {{"Adblock Plus will never collect your <a href=\"privacy\">personal data< /a>."|translate("privacy-policy-note")}}
167 </p> 225 </p>
168
169 </section> 226 </section>
170 </div> 227 </div>
171 228
172 {% if page == "internet-explorer" %} 229 {% if page == "internet-explorer" %}
173 <p id="ready-for-windows-notice" class="notice"> 230 <p id="ready-for-windows-notice" class="notice">
174 {{"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")}} 231 {{"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")}}
175 </p> 232 </p>
176 {% endif %} 233 {% endif %}
177 234
178 <hr> 235 <hr>
179 <div id="footnote"> 236 <div id="footnote">
180 [1] {{"The following rules <strong>have</strong> and <strong>always will</stro ng> apply to everyone, without exception:"|translate("footnote-headline")}} 237 [1] {{"The following rules <strong>have</strong> and <strong>always will</stro ng> apply to everyone, without exception:"|translate("footnote-headline")}}
181 <ul> 238 <ul>
182 <li> 239 <li>
183 {{"Participants cannot pay to avoid the <a href=\"acceptable-ads#criteria- general\">criteria</a>. Every ad must comply."|translate("footnote-must-comply") }} 240 {{"Participants cannot pay to avoid the <a href=\"acceptable-ads#criteria- general\">criteria</a>. Every ad must comply."|translate("footnote-must-comply") }}
184 </li> 241 </li>
185 <li> 242 <li>
186 {{"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")}} 243 {{"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")}}
187 </li> 244 </li>
188 <li> 245 <li>
189 {{"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")}} 246 {{"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")}}
190 </li> 247 </li>
191 <li> 248 <li>
192 {{"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")}} 249 {{"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")}}
193 </li> 250 </li>
194 </ul> 251 </ul>
195 </div> 252 </div>
196 253
197 <script src="/js/index.js"></script> 254 <script src="/js/index.js"></script>
LEFTRIGHT

Powered by Google App Engine
This is Rietveld