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

Delta Between Two Patch Sets: pages/download.tmpl

Issue 29722640: Fixes #22 - Add download page (Closed) Base URL: https://hg.adblockplus.org/web.adblockplus.org
Left Patch Set: Created March 14, 2018, 1:31 p.m.
Right Patch Set: Addressed comments #17 Created April 3, 2018, 3:19 p.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
« no previous file with change/comment | « no previous file | static/css/main.css » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 title=Download Adblock Plus 1 title=Download Adblock Plus
2 description=Get Adblock Plus for free on Firefox, Chrome, Opera, Safari, Android and iOS 2 description=Get Adblock Plus for free on Firefox, Chrome, Opera, Safari, Android and iOS
ire 2018/03/14 13:34:37 The title & description aren't in the spec yet.
juliandoucette 2018/03/14 17:54:53 Acknowledged.
3 template=minimal 3 template=minimal
4 4
5 <head> 5 <head>
6 <style> 6 <style>
7 header img { 7 header img {
8 width: 4em; 8 width: 4em;
9 height: auto; 9 height: auto;
10 } 10 }
11 </style> 11 </style>
12 </head> 12 </head>
13 13
14 {% set supported_devices = [ 14 {% set supported_devices = [
15 { 15 {
16 "icons": ["device-desktop.png", "device-desktop-2x.png"], 16 "id": "desktop",
17 "icons": { "1x": "device-desktop.png", "2x": "device-desktop-2x.png" },
17 "icon_alt": "Computer monitor and mouse icon", 18 "icon_alt": "Computer monitor and mouse icon",
18 "title": "Block ads on any desktop browser", 19 "title": "Block ads on any desktop browser",
19 "description": "By clicking any of the links below, you agree to our <a href =\"terms\">Terms of Use</a>", 20 "description": "By clicking any of the links below, you agree to our " + "t erms" | linkify + "Terms of Use</a>.",
juliandoucette 2018/03/14 17:54:53 Missing period.
ire 2018/03/15 09:38:12 Done.
20 "platforms": [ 21 "platforms": [
21 { "name": "Chrome", "url": "https://chrome.google.com/webstore/detail/cfhd ojbkjhnklbpkdaibdccddilifddb" }, 22 { "name": "Chrome", "url": "https://chrome.google.com/webstore/detail/cfhd ojbkjhnklbpkdaibdccddilifddb" },
22 { "name": "Firefox", "url": "https://update.adblockplus.org/latest/adblock plusfirefox.xpi" }, 23 { "name": "Firefox", "url": "https://update.adblockplus.org/latest/adblock plusfirefox.xpi" },
23 { "name": "Internet Explorer", "url": "https://update.adblockplus.org/late st/adblockplusie.exe" }, 24 { "name": "Internet Explorer", "url": "https://update.adblockplus.org/late st/adblockplusie.exe" },
24 { "name": "Safari", "url": "https://update.adblockplus.org/latest/adblockp lussafari.safariextz" }, 25 { "name": "Safari", "url": "https://update.adblockplus.org/latest/adblockp lussafari.safariextz" },
25 { "name": "Edge (beta)", "url": "https://www.microsoft.com/store/p/adblock -plus/9nblggh4r9nz" }, 26 { "name": "Edge (beta)", "url": "https://www.microsoft.com/store/p/adblock -plus/9nblggh4r9nz" },
26 { "name": "Opera", "url": "https://addons.opera.com/extensions/details/ope ra-adblock/?display=en-US" }, 27 { "name": "Opera", "url": "https://addons.opera.com/extensions/details/ope ra-adblock/" },
27 { "name": "Maxthon", "url": "http://www.maxthon.com/mx5/features/ad-blocke r/" }, 28 { "name": "Maxthon", "url": "http://www.maxthon.com/mx5/features/ad-blocke r/" },
28 { "name": "Yandex Browser", "url": "https://chrome.google.com/webstore/det ail/cfhdojbkjhnklbpkdaibdccddilifddb" } 29 { "name": "Yandex Browser", "url": "https://chrome.google.com/webstore/det ail/cfhdojbkjhnklbpkdaibdccddilifddb" }
29 ] 30 ]
30 }, 31 },
31 { 32 {
32 "icons": ["device-mobile.png", "device-mobile.svg"], 33 "id": "mobile",
34 "icons": { "1x": "device-mobile.png", "2x": "device-mobile.svg" },
33 "icon_alt": "Mobile icon", 35 "icon_alt": "Mobile icon",
34 "title": "Block ads on your mobile browser", 36 "title": "Block ads in your mobile browser",
35 "platforms": [ 37 "platforms": [
36 { "name": "Samsung Internet (Android)", "url": "https://play.google.com/st ore/apps/details?id=org.adblockplus.adblockplussbrowser&hl" }, 38 { "name": "Samsung Internet (Android)", "url": "https://play.google.com/st ore/apps/details?id=org.adblockplus.adblockplussbrowser&hl" },
37 { "name": "Safari (iOS)", "url": "https://itunes.apple.com/app/adblock-plu s-abp-remove-ads-browse-faster-without-tracking/id1028871868?mt=8" }, 39 { "name": "Safari (iOS)", "url": "https://itunes.apple.com/app/adblock-plu s-abp-remove-ads-browse-faster-without-tracking/id1028871868?mt=8" },
38 { "name": "Firefox", "url": "https://addons.mozilla.org/android/addon/adbl ock-plus/" } 40 { "name": "Firefox", "url": "https://addons.mozilla.org/android/addon/adbl ock-plus/" }
39 ] 41 ]
40 }, 42 },
41 { 43 {
42 "icons": ["abb-icon.png", "abb-icon-2x.png"], 44 "id": "abb",
45 "icons": { "1x": "abb-icon.png", "2x": "abb-icon-2x.png" },
43 "icon_alt": "Adblock Browser logo", 46 "icon_alt": "Adblock Browser logo",
44 "title": "Block ads in a dedicated ad-blocking browser", 47 "title": "Block ads in a dedicated ad-blocking browser",
45 "platforms": [ 48 "platforms": [
46 { "name": "Adblock Browser (Android)", "url": "https://play.google.com/sto re/apps/details?id=org.adblockplus.browser" }, 49 { "name": "Adblock Browser (Android)", "url": "https://play.google.com/sto re/apps/details?id=org.adblockplus.browser" },
47 { "name": "Adblock Browser (iOS)", "url": "https://itunes.apple.com/my/app /adblock-browser/id1015653330?mt=8&ign-itsct=1015653330-1015653330&ign-itscg=017 6&ign-mpt=uo%3D4" } 50 { "name": "Adblock Browser (iOS)", "url": "https://itunes.apple.com/my/app /adblock-browser/id1015653330?mt=8&ign-itsct=1015653330-1015653330&ign-itscg=017 6&ign-mpt=uo%3D4" }
48 ] 51 ]
49 } 52 }
50 ] %} 53 ] %}
51 54
52 <header class="bg-primary section content text-center"> 55 <header class="bg-primary section content text-center">
53 <div class="container"> 56 <div class="container">
54 <img height="90px" 57 <img height="90px"
55 width="90px" 58 width="90px"
56 src="/img/download-icon.png" 59 src="/img/download-icon.png"
57 srcset="/img/download-icon.svg 2x" 60 srcset="/img/download-icon.svg 2x"
58 alt="White down arrow"> 61 alt="{{ "White down arrow" | translate("download-icon", "Alt text") }}" >
juliandoucette 2018/03/14 17:54:52 Missing translation.
ire 2018/03/15 09:38:11 Done.
59 <h1>{{ "Get Adblock Plus products on these devices" | translate("download-he ading") }}</h1> 62 <h1>{{ "Get Adblock Plus products on these devices" | translate("download-he ading", "Heading") }}</h1>
juliandoucette 2018/03/14 17:54:52 Missing string context (heading).
ire 2018/03/15 09:38:12 Done.
60 <p>{{ "Supported platforms" | translate("download-subheading") }}</p> 63 <p>{{ "Supported platforms" | translate("download-subheading", "Subheading") }}</p>
juliandoucette 2018/03/14 17:54:52 Missing string context (subheading).
ire 2018/03/15 09:38:12 Done.
61 </div> 64 </div>
62 </header> 65 </header>
63 66
64 <div class="container text-center content"> 67 <div id="supported-devices" class="item-group container text-center content">
juliandoucette 2018/03/14 17:54:52 Suggest: section class?
ire 2018/03/15 09:38:11 That would create a different sectioning context.
65 <div class="row item-group"> 68 <div class="row">
ire 2018/03/14 13:34:37 Until we push your features review, I'm using the
juliandoucette 2018/03/14 17:54:52 Acknowledged.
66 {% for device in supported_devices %} 69 {% for device in supported_devices %}
67 <div class="column one-third item"> 70 <div class="column one-third">
68 <img 71 <img
69 height="90px" 72 height="90px"
70 width="90px" 73 width="90px"
71 src="/img/{{ device.icons[0] }}" 74 src="/img/{{ device.icons['1x'] }}"
72 srcset="/img/{{ device.icons[1] }} 2x" 75 srcset="/img/{{ device.icons['2x'] }} 2x"
73 alt="{{ device.icon_alt }}"> 76 alt="{{ device.icon_alt | translate(device.id + "-icon-alt", "Alt text") }}">
juliandoucette 2018/03/14 17:54:53 Missing translation.
ire 2018/03/15 09:38:11 Done.
74 <h2 class="item-heading">{{ device.title }}</h2> 77 <h2>{{ device.title | translate(device.id + "-title", "Heading") }}</h2>
juliandoucette 2018/03/14 17:54:52 Missing translation.
ire 2018/03/15 09:38:11 Done.
75 <div class="item-body"> 78 <div>
76 <p>{{ device.description | safe }}</p> 79 {% if device.description %}
juliandoucette 2018/03/14 17:54:52 Missing translation. I didn't know "| safe" was a
ire 2018/03/15 09:38:11 Done.
80 <p><small>{{ device.description | safe | translate(device.id + "-descrip tion", "Paragraph") }}</small></p>
81 {% endif %}
77 <ul class="horizontal-list"> 82 <ul class="horizontal-list">
juliandoucette 2018/03/14 17:54:53 Detail: We may consider optimizing these links usi
78 {% for platform in device.platforms %} 83 {% for platform in device.platforms %}
79 <li> 84 <li>
juliandoucette 2018/03/14 17:54:53 See https://gitlab.com/eyeo/specs/spec/merge_reque
ire 2018/03/15 09:38:12 Done.
80 <a href="{{ platform.url }}">{{ platform.name }}</a>{{ ", " if loo p.index != loop.length }} 85 {% set platform_identifier = device.id + "-product-name-" + loop.i ndex | string %}
juliandoucette 2018/03/14 17:54:52 Missing translation.
juliandoucette 2018/03/14 17:54:52 Detail: We may consider optimizing these link labe
ire 2018/03/15 09:38:11 Done.
86 <a href="{{ platform.url }}">{{ platform.name | translate(platform _identifier, "Product name") }}</a>{{ ", " if loop.index != loop.length }}
81 </li> 87 </li>
82 {% endfor %} 88 {% endfor %}
83 </ul> 89 </ul>
84 </div> 90 </div>
85 </div> 91 </div>
86 {% endfor %} 92 {% endfor %}
87 </div> 93 </div>
88 </div> 94 </div>
LEFTRIGHT
« no previous file | static/css/main.css » ('j') | Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Toggle Comments ('s')

Powered by Google App Engine
This is Rietveld