Unified Diff: includes/index.tmpl
Issue 6021528219025408:
Issue #1170 More progress migrating adblockplus.org to our CMS. (Closed)
Patch Set:
Created Sept. 1, 2014, 10:45 a.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« filters/unescape.py ('k')
|
locales/ar/acceptable-ads-manifesto.json » ('j')
|
no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: includes/index.tmpl |
| =================================================================== |
| --- a/includes/index.tmpl |
| +++ b/includes/index.tmpl |
| @@ -1,4 +1,5 @@ |
| noheading=True |
| +localefile=index |
| <head> |
| <link class="cssfx" href="/css/index.css" rel="stylesheet"> |
| @@ -11,10 +12,10 @@ |
| <meta content="http://adblockplus.org/img/adblockplus_128.png" property="og:image"> |
| <meta content="http://adblockplus.org/" property="og:url"> |
| </head> |
| -<meta name="title" content="{{"s1"|translate}}"> |
| +<meta name="title" content="{{"title"|translate}}"> |
| <meta name="description" content="{{"s2"|translate}}"> |
| -<meta property="og:title" content="{{"s3"|translate}}"> |
| -<meta property="og:description" content="{{"s4"|translate}}"> |
| +<meta property="og:title" content="{{"title"|translate}}"> |
| +<meta property="og:description" content="{{"s2"|translate}}"> |
| <div class="{{page}}" id="install-container" itemscope="itemscope" itemtype="http://schema.org/SoftwareApplication"> |
| @@ -30,25 +31,22 @@ |
| </li> |
| <li itemprop="featureList"> |
| <div class="sprite"></div> |
| -{{"s8"|translate}} |
| - </li> |
| - <li itemprop="featureList"> |
| - <div class="sprite"></div> |
| -{{"s9"|translate}} |
| +{{"s8"|translate(links=["acceptable-ads"])}} |
| </li> |
| <li class="emphasized" itemprop="featureList"> |
| <div class="sprite"></div> |
| -{{"s10"|translate}} |
| +{{"s9"|translate}} |
| </li> |
| </ul> |
| </div> |
| <div id="install"> |
| - <a class="install-button" href="%EXTENSION(abp,downloadurl)%" id="install-firefox">{{"s11"|translate}}</a> |
| - <a class="install-button" href="https://clients2.google.com/service/update2/crx?response=redirect&x=id%3Dcfhdojbkjhnklbpkdaibdccddilifddb%26uc" id="install-chrome" onclick="chrome.webstore.install(); return false;">{{"s12"|translate}}</a> |
| - <a class="install-button" href="https://addons.opera.com/extensions/download/opera-adblock/" id="install-opera">{{"s13"|translate}}</a> |
| - <a class="install-button" href="/en/android-install" id="install-android">{{"s14"|translate}}</a> |
| - <a class="install-button" href="https://downloads.adblockplus.org/adblockplusie-1.1.exe" id="install-internet-explorer">{{"s15"|translate}}</a> |
| + <a class="install-button" href="%EXTENSION(abp,downloadurl)%" id="install-firefox">{{"s10"|translate}}</a> |
| + <a class="install-button" href="https://clients2.google.com/service/update2/crx?response=redirect&x=id%3Dcfhdojbkjhnklbpkdaibdccddilifddb%26uc" id="install-chrome" onclick="chrome.webstore.install(); return false;">{{"s11"|translate}}</a> |
| + <a class="install-button" href="https://addons.opera.com/extensions/details/opera-adblock/?display=en-US" id="install-opera">{{"s12"|translate}}</a> |
| + <a class="install-button" href="/en/android-install" id="install-android">{{"s13"|translate}}</a> |
| + <a class="install-button" href="%EXTENSION(abpie,downloadurl)%" id="install-internet-explorer">{{"s14"|translate}}</a> |
| + <a class="install-button" href="%EXTENSION(abpsafari,downloadurl)%" id="install-safari">{{"s15"|translate}}</a> |
| <ul> |
| <li> |
| <a class="sprite" href="firefox" id="platform-firefox" title="{{"s16"|translate}}"></a> |
| @@ -61,19 +59,23 @@ |
| </li> |
| <li> |
| <a class="sprite" href="opera" id="platform-opera" title="{{"s19"|translate}}"></a> |
| - </li> |
| + </li> |
| <li> |
| <a class="sprite" href="internet-explorer" id="platform-internet-explorer" title="{{"s20"|translate}}"></a> |
| </li> |
| + <li> |
| + <a class="sprite" href="safari" id="platform-safari" title="{{"s21"|translate}}"></a> |
| + </li> |
| </ul> |
| </div> |
| </section> |
| - <div class="warning-platform firefox">{{"s21"|translate}} <a href="firefox">{{"s22"|translate}}</a></div> |
| - <div class="warning-platform chrome">{{"s23"|translate}} <a href="chrome">{{"s24"|translate}}</a></div> |
| - <div class="warning-platform android">{{"s25"|translate}} <a href="android">{{"s26"|translate}}</a></div> |
| - <div class="warning-platform opera">{{"s27"|translate}} <a href="opera">{{"s28"|translate}}</a></div> |
| - <div class="warning-platform internet-explorer">{{"s29"|translate}} <a href="internet-explorer">{{"s30"|translate}}</a></div> |
| + <div class="warning-platform firefox">{{"s22"|translate(links=["firefox"])}}</div> |
| + <div class="warning-platform chrome">{{"s23"|translate(links=["chrome"])}}</div> |
| + <div class="warning-platform android">{{"s24"|translate(links=["android"])}}</div> |
| + <div class="warning-platform opera">{{"s25"|translate(links=["opera"])}}</div> |
| + <div class="warning-platform internet-explorer">{{"s26"|translate(links=["internet-explorer"])}}</div> |
| + <div class="warning-platform safari">{{"s27"|translate(links=["safari"])}}</div> |
| <iframe frameborder="0" height="285" id="video" itemprop="video" src="//www.youtube-nocookie.com/embed/pVYtzF5SemU?html5=1&autohide=1&enablejsapi=1&controls=2&fs=1&modestbranding=1&rel=0&showinfo=0&theme=light" width="520"></iframe> |
| </div> |
| @@ -81,25 +83,25 @@ |
| <div id="key-facts"> |
| <section class="first"> |
| <div class="sprite" id="facts-open-source"></div> |
| - <h1>{{"s31"|translate}}</h1> |
| + <h1>{{"s28"|translate}}</h1> |
| <p> |
| - {{"s32"|translate(links=["contribute"])}} |
| + {{"s29"|translate(links=["contribute"])}} |
| </p> |
| </section> |
| <section> |
| <div class="sprite" id="facts-downloads"></div> |
| - <h1>{{"s33"|translate}} 200 {{"s34"|translate}}</h1> |
| + <h1>{{"s30"|translate}}</h1> |
| <p> |
| -{{"s35"|translate}} |
| +{{"s31"|translate}} |
| </p> |
| </section> |
| <section> |
| - <div class="sprite" id="facts-acceptable-ads"></div> |
| - <h1>{{"s36"|translate}}</h1> |
| + <div class="sprite" id="facts-privacy"></div> |
| + <h1>{{"s32"|translate}}</h1> |
| <p> |
| - {{"s37"|translate(links=["acceptable-ads"])}} |
| + {{"s33"|translate}} |
| </p> |
| </section> |
| @@ -108,137 +110,164 @@ |
| <section class="hidden" id="more-container"> |
| <div class="noscript-hidden"> |
| <button id="more" onclick="toggleMore();return false;"> |
| - {{"s38"|translate}} |
| + {{"s34"|translate}} |
| </button> |
| <button id="less" onclick="toggleMore();return false;"> |
| - {{"s39"|translate}} |
| + {{"s35"|translate}} |
| </button> |
| </div> |
| - |
| + |
| <div id="more-tabs"> |
| <div id="sidebar"> |
| <button id="more-firefox" onclick="showTab(this);return false;"> |
| + {{"s36"|translate}} |
| + </button> |
| + <button id="more-chrome" onclick="showTab(this);return false;"> |
| + {{"s37"|translate}} |
| + </button> |
| + <button id="more-opera" onclick="showTab(this);return false;"> |
| + {{"s38"|translate}} |
| + </button> |
| + <button id="more-android" onclick="showTab(this);return false;"> |
| + {{"s39"|translate}} |
| + </button> |
| + <button id="more-internet-explorer" onclick="showTab(this);return false;"> |
| {{"s40"|translate}} |
| </button> |
| - <button id="more-chrome" onclick="showTab(this);return false;"> |
| + <button id="more-safari" onclick="showTab(this);return false;"> |
| {{"s41"|translate}} |
| </button> |
| - <button id="more-opera" onclick="showTab(this);return false;"> |
| - {{"s42"|translate}} |
| - </button> |
| - <button id="more-android" onclick="showTab(this);return false;"> |
| + </div> |
| + |
| + <div class="more-tab" id="tab-firefox"> |
| + <h2>{{"s42"|translate}}</h2> |
| + |
| + <p> |
| {{"s43"|translate}} |
| - </button> |
| - <button id="more-internet-explorer" onclick="showTab(this);return false;"> |
| - {{"s44"|translate}} |
| - </button> |
| + </p> |
| + |
| + <p> |
| + {{"s44"|translate(links=["filters"])}} |
| + </p> |
| + |
| + <p> |
| + {{"s45"|translate}} |
| + </p> |
| </div> |
| - |
| - <div class="more-tab" id="tab-firefox"> |
| - <h2>{{"s45"|translate}}</h2> |
| - |
| + |
| + <div class="more-tab" id="tab-chrome"> |
| + <h2>{{"s46"|translate}}</h2> |
| + |
| <p> |
| - {{"s46"|translate}} |
| + {{"s47"|translate(links=["features"])}} |
| </p> |
| - |
| - <p> |
| - {{"s47"|translate(links=["filters"])}} |
| - </p> |
| - |
| + |
| <p> |
| {{"s48"|translate}} |
| </p> |
| - </div> |
| - |
| - <div class="more-tab" id="tab-chrome"> |
| - <h2>{{"s49"|translate}}</h2> |
| - |
| + |
| <p> |
| - {{"s50"|translate(links=["features"])}} |
| - </p> |
| - |
| - <p> |
| - {{"s51"|translate}} |
| - </p> |
| - |
| - <p> |
| - {{"s52"|translate}} 10 {{"s53"|translate}} |
| + {{"s49"|translate}} |
| <ul> |
| <li> |
| <blockquote cite="http://download.cnet.com/Adblock-Plus-for-Chrome/3000-33362_4-75118867.html?tag=mncol;3"> |
| - {{"s54"|translate}} |
| + {{"s50"|translate}} |
| </blockquote> |
| - <a href="http://download.cnet.com/Adblock-Plus-for-Chrome/3000-33362_4-75118867.html?tag=mncol;3">{{"s55"|translate}}</a> |
| + <a href="http://download.cnet.com/Adblock-Plus-for-Chrome/3000-33362_4-75118867.html?tag=mncol;3">{{"s51"|translate}}</a> |
| </li> |
| <li> |
| <blockquote cite="http://adblock-plus.en.softonic.com/"> |
| - {{"s56"|translate}} |
| + {{"s52"|translate}} |
| </blockquote> |
| - <a href="http://adblock-plus.en.softonic.com/" rel="nofollow">{{"s57"|translate}}</a> |
| + <a href="http://adblock-plus.en.softonic.com/" rel="nofollow">{{"s53"|translate}}</a> |
| </li> |
| </ul> |
| </p> |
| </div> |
| - |
| + |
| <div class="more-tab" id="tab-opera"> |
| - <h2>{{"s58"|translate}}</h2> |
| - |
| + <h2>{{"s54"|translate}}</h2> |
| + |
| <p> |
| - {{"s59"|translate}} 4 {{"s60"|translate}} |
| + {{"s55"|translate}} |
| </p> |
| - |
| + |
| + <p> |
| + {{"s56"|translate}} |
| + </p> |
| + |
| + <p> |
| + {{"s57"|translate}} |
| + </p> |
| + |
| + <p> |
| + {{"s58"|translate}} |
| + </p> |
| + </div> |
| + |
| + <div class="more-tab" id="tab-android"> |
| + <h2>{{"s59"|translate}}</h2> |
| + |
| + <p> |
| + {{"s60"|translate}} |
| + </p> |
| + |
| <p> |
| {{"s61"|translate}} |
| </p> |
| - |
| + |
| <p> |
| {{"s62"|translate}} |
| </p> |
| - |
| - <p> |
| - {{"s63"|translate}} |
| - </p> |
| - </div> |
| - |
| - <div class="more-tab" id="tab-android"> |
| - <h2>{{"s64"|translate}}</h2> |
| - |
| - <p> |
| - {{"s65"|translate}} 1 {{"s66"|translate}} |
| - </p> |
| - |
| - <p> |
| - {{"s67"|translate}} |
| - </p> |
| - |
| - <p> |
| - {{"s68"|translate}} |
| - </p> |
| </div> |
| <div class="more-tab" id="tab-internet-explorer"> |
| - <h2>{{"s69"|translate}}</h2> |
| + <h2>{{"s20"|translate}}</h2> |
| <p> |
| - {{"s70"|translate}} |
| + {{"s64"|translate}} |
| </p> |
| <p> |
| - {{"s71"|translate}} |
| + {{"s65"|translate}} |
| </p> |
| <p> |
| - {{"s72"|translate}} |
| + {{"s66"|translate}} |
| </p> |
| <ul> |
| - <li>{{"s73"|translate}}</li> |
| - <li>{{"s74"|translate}}</li> |
| - <li>{{"s75"|translate}}</li> |
| + <li>{{"s67"|translate}}</li> |
| + <li>{{"s68"|translate}}</li> |
| + <li>{{"s69"|translate}}</li> |
| </ul> |
| <p> |
| - {{"s76"|translate}} |
| + {{"s70"|translate}} |
| + </p> |
| + </div> |
| + |
| + <div class="more-tab" id="tab-safari"> |
| + <h2>{{"s21"|translate}}</h2> |
| + |
| + <p> |
| + {{"s72"|translate}} |
| + </p> |
| + |
| + <p> |
| + {{"s73"|translate}} |
| + </p> |
| + |
| + <p> |
| + {{"s74"|translate}} |
| + </p> |
| + |
| + <p> |
| + {{"s75"|translate}} |
| + </p> |
| + |
| + <p> |
| + {{"s76"|translate}} |
| </p> |
| </div> |
| </div> |
« no previous file with comments
|
« filters/unescape.py ('k')
|
locales/ar/acceptable-ads-manifesto.json » ('j')
|
no next file with comments »
