pages/uninstalled.tmpl - Issue 29611624: Issue 6047 - Updated templates and uninstalled pages

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: Addressed comments Created Dec. 6, 2017, 4:30 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

LEFT	RIGHT
1 title=Adblock Plus has been uninstalled	1 title=Adblock Plus has been uninstalled

2 template=minimal	2 template=minimal

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 href="/css/uninstalled.css" rel="stylesheet">	16 <link href="/css/uninstalled.css" rel="stylesheet">

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">
ire 2017/12/07 12:36:26 Looks like this element is missing the #content ID Looks like this element is missing the #content ID. It seems like there should be more space between the end of the content and the reinstall banner juliandoucette 2017/12/08 16:49:51 Done. Good catch. Show quoted text On 2017/12/07 12:36:26, ire wrote: > Looks like this element is missing the #content ID. It seems like there should > be more space between the end of the content and the reinstall banner Done. Good catch.
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">	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") }}

(...skipping 15 matching lines...) Expand all Loading...
46 {%- endfor %}	46 {%- endfor %}

47 <li>	47 <li>

48 <label>	48 <label>

49 <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" />

50 {{ "Other, namely..." \| translate("reason-other", "Last uninstalla tion reason") }}	50 {{ "Other, namely..." \| translate("reason-other", "Last uninstalla tion reason") }}

51 </label>	51 </label>

52 <fieldset id="reason-other-container" class="hidden">	52 <fieldset id="reason-other-container" class="hidden">

53 <textarea	53 <textarea

54 id="reason-other-input"	54 id="reason-other-input"

55 name="reasonOther"	55 name="reasonOther"

56 cols="60"

57 rows="4"	56 rows="4"

58 maxlength="300"	57 maxlength="300"

59 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>

60 <div>	59 <div>

61 {{ "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") }}

62 <span id="characters-countdown"></span>	61 <span id="characters-countdown"></span>

63 </div>	62 </div>

64 </fieldset>	63 </fieldset>

65 </li>	64 </li>

66 </ul>	65 </ul>

67 </fieldset>	66 </fieldset>

68 <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>

69 <p>	68 <p>

70 <button class="button primary">{{ "Submit" \| translate("submit", "Submit button text") }}</button>	69 <button class="button primary">{{ "Submit" \| translate("submit", "Submit button text") }}</button>

71 </p>	70 </p>

72 </form>	71 </form>

73 <p class="disclaimer">	72 <p class="disclaimer">

74 <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>

75 </p>	74 </p>

76 </div>	75 </div>

77 </section>	76 </section>

78	77

79 <aside id="reinstall" class="bg-accent" >	78 <? include reinstall ?>

80 <div class="container content">

81 <p class="lead">

82 {{ "Did you uninstall Adblock Plus by accident?" \| translate("reinstall-head line", "Text next to the Reinstallation button") }}

83 {{ "index" \| linkify(class="button secondary") }}{{ "Reinstall Now" \| transl ate("reinstall", "Reinstall button text") }}</a>

84 </div>

85 </aside>

86	79

87 <script src="/js/uninstalled.js"></script>	80 <script src="/js/uninstalled.js"></script>
ire 2017/12/07 12:36:26 Suggest: Implement a scripts block? Suggest: Implement a scripts block? juliandoucette 2017/12/08 16:49:52 Acknowledged. Separately. Show quoted text On 2017/12/07 12:36:26, ire wrote: > Suggest: Implement a scripts block? Acknowledged. Separately.
LEFT	RIGHT