| Left: | ||
| Right: |
| OLD | NEW |
|---|---|
| 1 {% set index_page = (pagedata == "<? include index ?>\n") %} | |
| 1 <!DOCTYPE html> | 2 <!DOCTYPE html> |
| 2 <html lang="{{locale}}" dir="{{"rtl" if config.has_option("rtl", locale) else "l tr"}}" itemscope="itemscope" itemtype="http://schema.org/WebPage"> | 3 <html lang="{{locale}}" dir="{{"rtl" if config.has_option("rtl", locale) else "l tr"}}" itemscope="itemscope" itemtype="http://schema.org/WebPage"> |
| 3 <head> | 4 <head> |
| 4 <title>{{title|translate}}</title> | 5 <title>{{title|translate}}</title> |
| 5 | 6 |
| 6 <meta name="viewport" content="width=device-width, initial-scale=1"> | 7 <meta name="viewport" content="width=device-width, initial-scale=1"> |
| 7 <link rel="stylesheet" href="/css/main.css" class="cssfx"> | 8 <link rel="stylesheet" href="/css/main.css" class="cssfx"> |
| 8 <link rel="stylesheet" href="/css/main-desktop.css" media="(min-width: 40.5e m)" class="cssfx"> | 9 <link rel="stylesheet" href="/css/main-desktop.css" media="(min-width: 40.5e m)" class="cssfx"> |
| 9 <link rel="stylesheet" href="/css/main-mobile.css" media="screen and (max-wi dth: 40.5em)"> | 10 <link rel="stylesheet" href="/css/main-mobile.css" media="screen and (max-wi dth: 40.5em)"> |
| 10 <noscript> | 11 <noscript> |
| 11 <link rel="stylesheet" href="/css/noscript-desktop.css" media="(min-width: 40.5em)"/> | 12 <link rel="stylesheet" href="/css/noscript-desktop.css" media="(min-width: 40.5em)"/> |
| 12 <link rel="stylesheet" href="/css/noscript-mobile.css" media="screen and ( max-width: 40.5em)"/> | 13 <link rel="stylesheet" href="/css/noscript-mobile.css" media="screen and ( max-width: 40.5em)"/> |
| 13 </noscript> | 14 </noscript> |
| 14 | 15 |
| 15 <link rel="canonical" href="https://adblockplus.org/{{page}}"> | 16 <link rel="canonical" href="https://adblockplus.org/{{not index_page and pag e or ""}}"> |
|
Sebastian Noack
2015/02/13 17:51:49
I'd rather use if/else instead and/or here. This m
kzar
2015/02/20 14:55:18
Done.
| |
| 16 | 17 |
| 17 <!--[if lt IE 7]> | 18 <!--[if lt IE 7]> |
| 18 <script src="/js/vendor/DD_belatedPNG.js"></script> | 19 <script src="/js/vendor/DD_belatedPNG.js"></script> |
| 19 <script>DD_belatedPNG.fix(".sprite");</script> | 20 <script>DD_belatedPNG.fix(".sprite");</script> |
| 20 <![endif]--> | 21 <![endif]--> |
| 21 <!--[if lt IE 9]> | 22 <!--[if lt IE 9]> |
| 22 <script src="/js/vendor/html5shiv.js"></script> | 23 <script src="/js/vendor/html5shiv.js"></script> |
| 23 <script src="/js/vendor/respond.min.js"></script> | 24 <script src="/js/vendor/respond.min.js"></script> |
| 24 <![endif]--> | 25 <![endif]--> |
| 25 <!--[if lt IE 10]><script src="/js/vendor/cssfx.min.js"></script><![endif]-- > | 26 <!--[if lt IE 10]><script src="/js/vendor/cssfx.min.js"></script><![endif]-- > |
| 26 <!-- Fixes cssfx issues in IE8. --> | 27 <!-- Fixes cssfx issues in IE8. --> |
| 27 <!--[if IE 8]> | 28 <!--[if IE 8]> |
| 28 <link rel="stylesheet" href="/css/empty.css" class="cssfx"/> | 29 <link rel="stylesheet" href="/css/empty.css" class="cssfx"/> |
| 29 <![endif]--> | 30 <![endif]--> |
| 30 | 31 |
| 32 {% block head %} | |
| 31 {{head|safe}} | 33 {{head|safe}} |
| 34 {% endblock %} | |
| 32 </head> | 35 </head> |
| 33 | 36 |
| 34 <body> | 37 <body> |
| 35 {% macro pageitem(name) %} | 38 {% macro pageitem(name) %} |
| 36 {% if name == page %} | 39 {% if name == page %} |
| 37 <li class="selected">{{"title"|translate(name)}}</li> | 40 <li class="selected">{{name|translate("menu")}}</li> |
| 38 {% else %} | 41 {% else %} |
| 39 <li>{{name|linkify}}{{"title"|translate(name)}}</a></li> | 42 <li>{{name|linkify}}{{name|translate("menu")}}</a></li> |
| 40 {% endif %} | 43 {% endif %} |
| 41 {% endmacro %} | 44 {% endmacro %} |
| 42 | 45 |
| 43 <header> | 46 <header> |
| 44 <a id="logo" class="sprite" itemprop="image" href="/"></a> | 47 <a id="logo" class="sprite" itemprop="image" href="/"></a> |
| 45 <nav> | 48 <nav> |
| 46 <ul> | 49 <ul> |
| 47 {% if localefile == "index" %} | 50 {% if index_page %} |
| 48 <li class="selected first">{{"installation"|translate("menu")}}</li> | 51 <li class="selected first">{{"installation"|translate("menu")}}</li> |
| 49 {% else %} | 52 {% else %} |
| 50 <li class="install-link first">{{"index"|linkify}}{{"installation"|t ranslate("menu")}} <span class="sprite install-link-icon"></span></a></li> | 53 <li class="install-link first">{{"index"|linkify}}{{"installation"|t ranslate("menu")}} <span class="sprite install-link-icon"></span></a></li> |
| 51 {% endif %} | 54 {% endif %} |
| 52 {% for name in ["about", "features", "bugs", "contribute"] %} | 55 {% for name in ["about", "features", "bugs", "contribute"] %} |
| 53 {{pageitem(name)}} | 56 {{pageitem(name)}} |
| 54 {% endfor %} | 57 {% endfor %} |
| 55 <li id="search"> | 58 <li id="search"> |
| 56 <form action="https://www.google.com/cse" id="search-box"> | 59 <form action="https://www.google.com/cse" id="search-box"> |
| 57 <input name="cx" value="001104437084080304350:n8odfuv0gvi" type="h idden"> | 60 <input name="cx" value="001104437084080304350:n8odfuv0gvi" type="h idden"> |
| (...skipping 17 matching lines...) Expand all Loading... | |
| 75 <div id="flag-{{lang}}" class="flag sprite"></div>{{config.g et("langnames", lang)}} | 78 <div id="flag-{{lang}}" class="flag sprite"></div>{{config.g et("langnames", lang)}} |
| 76 </a> | 79 </a> |
| 77 </li> | 80 </li> |
| 78 {% endfor %} | 81 {% endfor %} |
| 79 </ul> | 82 </ul> |
| 80 </li> | 83 </li> |
| 81 </ul> | 84 </ul> |
| 82 </nav> | 85 </nav> |
| 83 </header> | 86 </header> |
| 84 | 87 |
| 85 <div id="content"> | 88 <div id="content" class="{{page}}"> |
| 86 {% if not noheading %} | 89 {% if not noheading %} |
| 87 <h1>{{title|translate}}</h1> | 90 <h1>{{title|translate}}</h1> |
| 88 {% endif %} | 91 {% endif %} |
| 89 | 92 |
| 90 {% if not notoc %} | 93 {% if not notoc %} |
| 91 {% macro toc(toclist) %} | 94 {% macro toc(toclist) %} |
| 92 <ul> | 95 <ul> |
| 93 {% for item in toclist %} | 96 {% for item in toclist %} |
| 94 <li> | 97 <li> |
| 95 <a href="#{{item.anchor}}">{{item.title}}</a> | 98 <a href="#{{item.anchor}}">{{item.title}}</a> |
| 96 {% if item.subitems %}{{toc(item.subitems)}}{% endif %} | 99 {% if item.subitems %}{{toc(item.subitems)}}{% endif %} |
| 97 </li> | 100 </li> |
| 98 {% endfor %} | 101 {% endfor %} |
| 99 </ul> | 102 </ul> |
| 100 {% endmacro %} | 103 {% endmacro %} |
| 101 | 104 |
| 102 {% set toclist = body|toclist %} | 105 {% set toclist = body|toclist %} |
| 103 {% if toclist %} | 106 {% if toclist %} |
| 104 <div class="toc"> | 107 <div class="toc"> |
| 105 {{toc(toclist)}} | 108 {{toc(toclist)}} |
| 106 </div> | 109 </div> |
| 107 {% endif %} | 110 {% endif %} |
| 108 {% endif %} | 111 {% endif %} |
| 109 | 112 |
| 113 {% block body %} | |
| 110 {{body|safe}} | 114 {{body|safe}} |
| 115 {% endblock %} | |
| 111 </div> | 116 </div> |
| 112 | 117 |
| 113 <footer> | 118 <footer> |
| 114 <div id="footer-content"> | 119 <div id="footer-content"> |
| 115 <nav> | 120 <nav> |
| 116 <section class="first"> | 121 <section class="first"> |
| 117 <h1>{{"resources"|translate("menu")}}</h1> | 122 <h1>{{"resources"|translate("menu")}}</h1> |
| 118 <ul> | 123 <ul> |
| 119 {% for name in ["screenshots", "documentation", "privacy", "impres sum"] %} | 124 {% for name in ["acceptable-ads", "documentation", "deployments", "privacy", "impressum"] %} |
| 120 {{pageitem(name)}} | 125 {{pageitem(name)}} |
| 121 {% endfor %} | 126 {% endfor %} |
| 122 </ul> | 127 </ul> |
| 123 </section> | 128 </section> |
| 124 | 129 |
| 125 <section> | 130 <section> |
| 126 <h1>{{"community"|translate("menu")}}</h1> | 131 <h1>{{"community"|translate("menu")}}</h1> |
| 127 <ul> | 132 <ul> |
| 128 <li><a href="/releases/" hreflang="en">{{"releases"|translate("men u")}}</a></li> | 133 <li><a href="/releases/" hreflang="en">{{"releases"|translate("men u")}}</a></li> |
| 129 <li><a href="/blog/" hreflang="en">{{"blog"|translate("menu")}}</a ></li> | 134 <li><a href="/blog/" hreflang="en">{{"blog"|translate("menu")}}</a ></li> |
| 130 <li><a href="/forum/" hreflang="en">{{"forum"|translate("menu")}}< /a></li> | 135 <li><a href="/forum/" hreflang="en">{{"forum"|translate("menu")}}< /a></li> |
| 131 {{pageitem("development-builds")}} | 136 {{pageitem("development-builds")}} |
| 132 </ul> | 137 </ul> |
| 133 </section> | 138 </section> |
| 134 | 139 |
| 135 <section> | 140 <section> |
| 136 <h1>{{"development"|translate("menu")}}</h1> | 141 <h1>{{"development"|translate("menu")}}</h1> |
| 137 <ul> | 142 <ul> |
| 138 {{pageitem("source")}} | 143 {{pageitem("source")}} |
| 139 <li><a href="/forum/viewforum.php?f=11" hreflang="en">{{"bugs"|tra nslate("menu")}}</a></li> | |
| 140 <li><a href="/category/roadmap/" hreflang="en">{{"roadmap"|transla te("menu")}}</a></li> | 144 <li><a href="/category/roadmap/" hreflang="en">{{"roadmap"|transla te("menu")}}</a></li> |
| 141 {{pageitem("tools")}} | 145 {{pageitem("tools")}} |
| 142 </ul> | 146 </ul> |
| 143 </section> | 147 </section> |
| 144 </nav> | 148 </nav> |
| 145 | 149 |
| 146 <section id="social"> | 150 <section id="social"> |
| 147 <h1>{{"follow-us"|translate("menu")}}</h1> | 151 <h1>{{"follow-us"|translate("menu")}}</h1> |
| 148 <ul id="social-list"> | 152 <ul id="social-list"> |
| 149 <li class="social-entry"> | 153 <li class="social-entry"> |
| 150 <a rel="nofollow" id="social-facebook" class="sprite" href="https: //www.facebook.com/adblockplus"></a> | 154 <a rel="nofollow" id="social-facebook" class="sprite" href="https: //www.facebook.com/adblockplus"></a> |
| 151 </li> | 155 </li> |
| 152 <li class="social-entry"> | 156 <li class="social-entry"> |
| 153 <a rel="nofollow" id="social-twitter" class="sprite" href="https:/ /twitter.com/adblockplus"></a> | 157 <a rel="nofollow" id="social-twitter" class="sprite" href="https:/ /twitter.com/adblockplus"></a> |
| 154 </li> | 158 </li> |
| 155 <li class="social-entry"> | 159 <li class="social-entry"> |
| 156 <a rel="nofollow" id="social-gplus" class="sprite" href="https://p lus.google.com/110020691898167279887"></a> | 160 <a rel="nofollow" id="social-gplus" class="sprite" href="https://p lus.google.com/110020691898167279887"></a> |
| 157 </li> | 161 </li> |
| 158 </ul> | 162 </ul> |
| 159 </section> | 163 </section> |
| 160 </div> | 164 </div> |
| 161 </footer> | 165 </footer> |
| 162 | 166 |
| 163 <script src="/js/main.js"></script> | 167 <script src="/js/main.js"></script> |
| 164 </body> | 168 </body> |
| 165 </html> | 169 </html> |
| OLD | NEW |