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

Delta Between Two Patch Sets: pages/uninstalled.tmpl

Issue 29611624: Issue 6047 - Updated templates and uninstalled pages (Closed) Base URL: https://hg.adblockplus.org/web.adblockplus.org
Left Patch Set: Changed document macro in html-attribute include, removed simple template, and removed temporary/unused resources include Created Nov. 25, 2017, 1:35 p.m.
Right Patch Set: Addressed comments in #15 Created Dec. 18, 2017, 12:55 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 | « pages/index.tmpl ('k') | pages/uninstalled-submit.html » ('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=Adblock Plus has been uninstalled 1 title=Adblock Plus has been uninstalled
2 template=minimal 2 template=minimal
ire 2017/11/27 19:48:21 Suggestion: This page could have a similar to desi
juliandoucette 2017/12/04 13:34:05 I agree and I've tried this already myself; unsucc
ire 2017/12/05 10:28:00 Here's my attempt - https://codereview.adblockplus
juliandoucette 2017/12/06 16:30:52 That's a good start.
3 3
4 {% set reasons = [ 4 {% set reasons = [
5 ("1v0", "reason-not-installed", "I didn't install Adblock Plus.", ""), 5 ("1v0", "reason-not-installed", "I didn't install Adblock Plus.", ""),
6 ("2v0", "reason-slowing-down", "Adblock Plus slowed down my browser.", ""), 6 ("2v0", "reason-slowing-down", "Adblock Plus slowed down my browser.", ""),
7 ("3v0", "reason-acceptable-ads", "I don't like the Acceptable Ads program.", " "), 7 ("3v0", "reason-acceptable-ads", "I don't like the Acceptable Ads program.", " "),
8 ("4v0", "reason-see-ads", "Adblock Plus didn't block all ads.", ""), 8 ("4v0", "reason-see-ads", "Adblock Plus didn't block all ads.", ""),
9 ("5v0", "reason-better-adblocker", "I found better ad blocking software.", ["A dBlock", "uBlock", "uBlock Origin", "Ghostery"]), 9 ("5v0", "reason-better-adblocker", "I found better ad blocking software.", ["A dBlock", "uBlock", "uBlock Origin", "Ghostery"]),
10 ("6v0", "reason-break-websites", "Adblock Plus breaks websites that I visit.", ""), 10 ("6v0", "reason-break-websites", "Adblock Plus breaks websites that I visit.", ""),
11 ("7v0", "reason-difficult", "I find it difficult to use Adblock Plus.", ""), 11 ("7v0", "reason-difficult", "I find it difficult to use Adblock Plus.", ""),
12 ] %} 12 ] %}
13 13
14 <head> 14 <head>
15 <meta name="robots" content="noindex" /> 15 <meta name="robots" content="noindex" />
16 <link rel="stylesheet" href="/css/uninstalled.css" type="text/css" media="all" > 16 <link href="/css/uninstalled.css" rel="stylesheet">
ire 2017/11/27 19:48:22 NIT: media="all" is the default, I don't think you
juliandoucette 2017/12/04 13:34:04 I must have copy/pasted :(
juliandoucette 2017/12/06 16:30:53 Done.
17 </head> 17 </head>
18 18
19 <section id="uninstall-reasons"> 19 <section id="uninstall-reasons">
20 <div class="container content"> 20 <div id="content" class="container content">
21 <h1>{{ title | translate("title") }}</h1> 21 <h1>{{ title | translate("title") }}</h1>
22 <p class="lead">{{ "Please select the reason(s) why you uninstalled Adblock Plus:" | translate("reasons-header", "Form heading") }}</p> 22 <p class="lead">{{ "Please select the reason(s) why you uninstalled Adblock Plus:" | translate("reasons-header", "Form heading") }}</p>
23 <form id="reasons-form" action="uninstalled-submit" method="get"> 23 <form id="reasons-form" action="uninstalled-submit" method="get">
24 <fieldset> 24 <fieldset>
25 <ul id="reasons" class="unstyled"> 25 <ul id="reasons">
26 {%- for reasonId, stringId, value, adblockers in reasons %} 26 {%- for reasonId, stringId, value, adblockers in reasons %}
27 <li> 27 <li>
28 <label> 28 <label>
29 <input type="checkbox" name="reason" {% if adblockers %} data-to ggle-view="adblockers" {% endif %} value="{{ reasonId }}" /> 29 <input type="checkbox" name="reason" {% if adblockers %} data-to ggle-view="adblockers" {% endif %} value="{{ reasonId }}" />
30 {{ value | translate(stringId, "Uninstallation reason") }} 30 {{ value | translate(stringId, "Uninstallation reason") }}
31 </label> 31 </label>
32 {%- if adblockers %} 32 {%- if adblockers %}
33 <fieldset class="hidden" id="adblockers"> 33 <fieldset class="hidden" id="adblockers">
34 <select name="otherAdblockerPredefined"> 34 <p>
ire 2017/11/27 19:48:21 This select is also unstyled like the textarea. Th
juliandoucette 2017/12/06 16:30:53 Done. Good catch.
35 {%- for adblocker in adblockers %} 35 <select name="otherAdblockerPredefined">
36 <option data-hide-element="other-adblocker" value="{{ adbl ocker }}">{{ adblocker }}</option> 36 {%- for adblocker in adblockers %}
37 {%- endfor %} 37 <option data-hide-element="other-adblocker" value="{{ ad blocker }}">{{ adblocker }}</option>
38 <option data-show-element="other-adblocker" value="Other">{{ "Other" | translate("other", "Option in list of Adblockers") }}</option> 38 {%- endfor %}
39 </select> 39 <option data-show-element="other-adblocker" value="Other"> {{ "Other" | translate("other", "Option in list of Adblockers") }}</option>
40 <input id="other-adblocker" class="hidden" type="text" name="o therAdblocker" /> 40 </select>
41 <input id="other-adblocker" class="hidden" type="text" name= "otherAdblocker" />
42 </p>
41 </fieldset> 43 </fieldset>
42 {%- endif %} 44 {%- endif %}
43 </li> 45 </li>
44 {%- endfor %} 46 {%- endfor %}
45 <li> 47 <li>
46 <label> 48 <label>
47 <input id="reason-other" data-toggle-view="reason-other-container" type="checkbox" name="reason" value="0v0" /> 49 <input id="reason-other" data-toggle-view="reason-other-container" type="checkbox" name="reason" value="0v0" />
48 {{ "Other, namely..." | translate("reason-other", "Last uninstalla tion reason") }} 50 {{ "Other, namely..." | translate("reason-other", "Last uninstalla tion reason") }}
49 </label> 51 </label>
50 <fieldset id="reason-other-container" class="hidden"> 52 <fieldset id="reason-other-container" class="hidden">
51 <textarea 53 <textarea
ire 2017/11/27 19:48:21 The textarea has a fixed width so doesn't fit the
ire 2017/11/27 19:48:21 There is no border around this textarea, and since
juliandoucette 2017/12/06 16:30:53 Done. Good catch.
ire 2017/12/07 12:36:26 This hasn't been fixed yet.
juliandoucette 2017/12/14 18:35:22 Done.
52 id="reason-other-input" 54 id="reason-other-input"
53 name="reasonOther" 55 name="reasonOther"
54 cols="60"
55 rows="4" 56 rows="4"
56 maxlength="300" 57 maxlength="300"
57 placeholder="{{ "Please explain why you are uninstalling Adblock Plus" | translate("reason-other-placeholder", "Textarea placeholder text, appea rs after selecting 'Other, namely...' option") }}"></textarea> 58 placeholder="{{ "Please explain why you are uninstalling Adblock Plus" | translate("reason-other-placeholder", "Textarea placeholder text, appea rs after selecting 'Other, namely...' option") }}"></textarea>
58 <div> 59 <div>
59 {{ "Characters remaining:" | translate("countdown-text", "Text o f character limit counter appears after selecting 'Other, namely...' option") }} 60 {{ "Characters remaining:" | translate("countdown-text", "Text o f character limit counter appears after selecting 'Other, namely...' option") }}
60 <span id="characters-countdown"></span> 61 <span id="characters-countdown"></span>
61 </div> 62 </div>
62 </fieldset> 63 </fieldset>
63 </li> 64 </li>
64 </ul> 65 </ul>
65 </fieldset> 66 </fieldset>
66 <p id="reason-error">{{ "Please select at least one of the options above" | translate("error-msg", "Error message, is being shown after submission if no i tem selected")}}</p> 67 <p id="reason-error">{{ "Please select at least one of the options above" | translate("error-msg", "Error message, is being shown after submission if no i tem selected")}}</p>
67 <p> 68 <p>
68 <button class="button primary">{{ "Submit" | translate("submit", "Submit button text") }}</button> 69 <button class="button primary">{{ "Submit" | translate("submit", "Submit button text") }}</button>
69 </p> 70 </p>
70 </form> 71 </form>
71 <p class="disclaimer"> 72 <p class="disclaimer">
72 <small>{{ "By clicking Submit, you are sending your response to Adblock Pl us. Please see our <a href='/privacy'>privacy policy</a>." | translate("disclaim er", "Disclaimer below form") }}</small> 73 <small>{{ "By clicking Submit, you are sending your response to Adblock Pl us. Please see our <a href='/privacy'>privacy policy</a>." | translate("disclaim er", "Disclaimer below form") }}</small>
73 </p> 74 </p>
74 </div> 75 </div>
75 </section> 76 </section>
76 77
77 <aside id="reinstall" class="bg-accent" > 78 <? include reinstall ?>
78 <div class="container content">
79 <p class="lead">
80 {{ "Did you uninstall Adblock Plus by accident?" | translate("reinstall-head line", "Text next to the Reinstallation button") }}
81 {{ "index" | linkify(class="button secondary") }}{{ "Reinstall Now" | transl ate("reinstall", "Reinstall button text") }}</a>
ire 2017/11/27 19:48:21 The text in this button is not aligned center (see
juliandoucette 2017/12/06 16:30:53 Done. Good catch.
82 </div>
83 </aside>
84 79
85 <script src="/js/uninstalled.js"></script> 80 <script src="/js/uninstalled.js"></script>
LEFTRIGHT
« pages/index.tmpl ('k') | pages/uninstalled-submit.html » ('j') | Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Toggle Comments ('s')

Powered by Google App Engine
This is Rietveld