Delta Between Two Patch Sets: templates/article.tmpl
Issue 29559620:
Issue 5692 - Create Browser Selector with Browser Detection Component for help.eyeo.com (Closed)
Base URL: https://hg.adblockplus.org/help.eyeo.com
Left Patch Set: Remove test class names from body
Created Oct. 23, 2017, 4:14 p.m.
Right Patch Set: Re-add browser-select include, add scripts block
Created Nov. 2, 2017, 2:29 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« static/scss/components/_select.scss ('K')
|
« static/scss/main.scss ('k')
|
templates/minimal.tmpl » ('j')
|
no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| LEFT | RIGHT |
|---|---|
| 1 {% extends "templates/default" %} | 1 {% extends "templates/minimal" %} |
| 2 | 2 |
| 3 {% set product = products[product_id] %} | 3 {% set product = products[product_id] %} |
| 4 | 4 |
| 5 {% block body %} | 5 {% block body %} |
| 6 [Breadcrumbs] | 6 <nav aria-label="{{ "Breadcrumb" | translate("breadcrumb-label", "Label") }}" cl ass="breadcrumb"> |
| 7 <ol class="container large-desktop-width clearfix" itemscope itemtype="http:// schema.org/BreadcrumbList"> | |
| 8 <li itemprop="itemListElement" itemscope itemtype="http://schema.org/ListIte m"> | |
| 9 <a class="has-pre-icon" itemscope itemtype="http://schema.org/Thing" itemp rop="item" href="{{ product.slug }}"> | |
| 10 <span class="pre-icon" style="{{ get_inline_bg('logo-'+product_id) }}">< /span> | |
| 11 <span itemprop="name">{{ product.full_name | translate(product_id+"-name ", "Product name") }}</span> | |
| 12 </a> | |
| 13 <meta itemprop="position" content="1" /> | |
| 14 </li> | |
| 15 <li itemprop="itemListElement" itemscope itemtype="http://schema.org/ListIte m"> | |
| 16 <a itemscope itemtype="http://schema.org/Thing" itemprop="item" href="{{ p age }}" aria-current="page"> | |
| 17 <span itemprop="name">{{ title | translate(get_page_name(page) + "-title ", "Article title") }}</span> | |
| 18 </a> | |
| 19 <meta itemprop="position" content="2" /> | |
| 20 </li> | |
| 21 </ol> | |
| 22 </nav> | |
| 7 | 23 |
| 8 <main id="main" class="container clearfix"> | 24 <main id="main" class="container clearfix"> |
| 9 <article class="article card {{ product_id }}-card section column two-thirds"> | 25 <div class="row"> |
| 10 <h1 class="article-heading"> | 26 <div class="column two-thirds"> |
| 11 <img class="heading-icon" src="/img/png/logo-{{ product_id }}.png" srcse t="/img/svg/logo-{{ product_id }}.svg 2x" alt="{{ product.full_name+" Logo" | tr anslate( product_id+"-logo-alt", "Image alt text") }}"> | 27 <article class="article card {{ product_id }}-card section"> |
| 28 <header class="article-heading"> | |
| 29 <h1 class="has-pre-icon"> | |
| 30 <span class="pre-icon" style="{{ get_inline_bg('logo-'+product_id) } }"></span> | |
| 31 {{ title | translate( get_page_name(page) + "-title", "Article title ") }} | |
| 32 </h1> | |
| 33 </header> | |
| 12 | 34 |
| 13 {{ title | translate( get_page_name(page) + "-title", "Article title") } } | 35 {% if hide_browser_selector is not defined %} |
| 14 </h1> | 36 <div class="article-browser-selector"> |
| 15 | 37 <? include browser-select ?> |
| 16 {% if hide_browser_selector is not defined %} | 38 </div> |
| 17 <div class="article-browser-selector clearfix"> | 39 {% endif %} |
|
juliandoucette
2017/10/24 12:12:30
NIT: Why not @extend .clearfix?
ire
2017/10/27 10:22:59
Done.
| |
| 18 <? include browser-select ?> | |
| 19 </div> | |
| 20 {% endif %} | |
| 21 | 40 |
| 22 <div class="article-body content"> | 41 <div class="article-body content"> |
| 23 {{ body | safe }} | 42 {{ body | safe }} |
| 24 </div> | 43 </div> |
| 25 </article> | 44 </article> |
| 26 <aside class="section column one-third"> | 45 </div> |
| 27 <? include product-topics-accordion ?> | 46 <aside class="section column one-third"> |
| 28 </aside> | 47 <? include product-topics-accordion ?> |
| 48 </aside> | |
| 49 </div> | |
| 29 </main> | 50 </main> |
| 30 | 51 |
| 31 <script id="no-content-for-platform-message" type="text/template"> | 52 <script id="no-content-for-platform-message" type="text/template"> |
| 32 <p>{{ "Unfortunately, there is no content specific for your current browser. P lease use the dropdown menu above to choose a different browser." | translate("n o-content-for-platform-message", "paragraph") }}</p> | 53 <p>{{ "Unfortunately, there is no content specific for your current browser. P lease use the dropdown menu above to choose a different browser." | translate("n o-content-for-platform-message", "paragraph") }}</p> |
| 33 </script> | 54 </script> |
| 55 {% endblock %} | |
| 34 | 56 |
| 57 {% block footer %} | |
| 58 <? include contact ?> | |
| 59 {% endblock %} | |
| 60 | |
| 61 {% block scripts %} | |
| 35 <script src="/js/vendor/bowser.js"></script> | 62 <script src="/js/vendor/bowser.js"></script> |
| 36 {% endblock %} | 63 {% endblock %} |
| LEFT | RIGHT |
« static/scss/main.scss ('k')
|
templates/minimal.tmpl » ('j')
|
Toggle Intra-line Diffs ('i')
|
Expand Comments ('e')
|
Collapse Comments ('c')
|
Toggle Comments ('s')
