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

Side by Side Diff: pages/uninstalled.tmpl

Issue 29348067: Issue 4049 - reinstall button and adbockers list added to uninstallation page (Closed)
Patch Set: And again addressed comments Created Sept. 27, 2016, 12:02 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | static/css/simple.css » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 title=Adblock Plus has been uninstalled 1 title=Adblock Plus has been uninstalled
2 template=simple 2 template=simple
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."), 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 ] %} 11 ] %}
12 12
13 <head> 13 <head>
14 <meta name="robots" content="noindex" /> 14 <meta name="robots" content="noindex" />
15 <script type="text/javascript"> 15 <script type="text/javascript">
16 (function() 16 (function()
17 { 17 {
18 var adblockersList = null;
19 function toggleView(element)
20 {
21 var targetId = element.getAttribute("data-toggle-view");
22 if (targetId)
23 document.getElementById(targetId).classList.toggle("hidden");
24 }
25
26 function checkSelectedAdblocker()
27 {
28 var selectedOption = adblockersList[adblockersList.selectedIndex];
29 var element = selectedOption.getAttribute("data-show-element");
30 if (element)
31 document.getElementById(element).classList.remove("hidden");
32 else
33 {
34 element = selectedOption.getAttribute("data-hide-element");
35 document.getElementById(element).classList.add("hidden");
36 }
37 }
38
18 function init() 39 function init()
19 { 40 {
20 var form = document.getElementById("reasons-form"); 41 var form = document.getElementById("reasons-form");
21 42
22 // Create hidden input for GET parameters 43 // Create hidden input for GET parameters
23 window.location.search.substr(1).split("&").forEach(function(param) 44 window.location.search.substr(1).split("&").forEach(function(param)
24 { 45 {
25 if (!/.=./.test(param)) 46 if (!/.=./.test(param))
26 return; 47 return;
27 48
28 var paramSplit = param.split("="); 49 var paramSplit = param.split("=");
29 var input = document.createElement("input"); 50 var input = document.createElement("input");
30 input.setAttribute("type", "hidden"); 51 input.setAttribute("type", "hidden");
31 input.setAttribute("name", decodeURIComponent(paramSplit[0])); 52 input.setAttribute("name", decodeURIComponent(paramSplit[0]));
32 input.setAttribute("value", decodeURIComponent(paramSplit[1])); 53 input.setAttribute("value", decodeURIComponent(paramSplit[1]));
33 form.appendChild(input); 54 form.appendChild(input);
34 }); 55 });
35 56
36 // Randomly add reasons 57 // Randomly add reasons
37 var reasonsContainer = document.getElementById("reasons"); 58 var reasonsContainer = document.getElementById("reasons");
38 var reasons = reasonsContainer.getElementsByTagName("li"); 59 var reasons = document.querySelectorAll("#reasons > li");
39 reasons = Array.prototype.slice.call(reasons); 60 reasons = Array.prototype.slice.call(reasons);
40 reasonsContainer.innerHTML = ""; 61 reasonsContainer.innerHTML = "";
41 while (reasons.length) 62 while (reasons.length)
42 { 63 {
43 var randomIndex = Math.floor(Math.random() * (reasons.length -1)); 64 var randomIndex = Math.floor(Math.random() * (reasons.length -1));
44 var reasonElement = reasons.splice(randomIndex, 1)[0]; 65 var reasonElement = reasons.splice(randomIndex, 1)[0];
45 reasonsContainer.appendChild(reasonElement); 66 reasonsContainer.appendChild(reasonElement);
67 var checkbox = reasonElement.querySelector("input[type=checkbox]");
68 if (checkbox.checked)
69 toggleView(checkbox);
70
71 checkbox.addEventListener("change", function(event)
72 {
73 toggleView(event.target);
74 }, false);
46 } 75 }
47 76
48 var reasonOtherCheckbox = document.getElementById("reason-other"); 77 adblockersList = document.querySelector("#adblockers select");
49 var reasonOther = document.getElementById("reason-other-container"); 78 adblockersList.addEventListener("change", function()
50 reasonOtherCheckbox.addEventListener("change", function()
51 { 79 {
52 reasonOther.classList.toggle("hidden"); 80 checkSelectedAdblocker();
53 }, false); 81 }, false);
82 checkSelectedAdblocker();
54 83
55 var reasonOtherInput = document.getElementById("reason-other-input"); 84 var reasonOtherInput = document.getElementById("reason-other-input");
56 var maxLength = reasonOtherInput.getAttribute("maxlength"); 85 var maxLength = reasonOtherInput.getAttribute("maxlength");
57 var charCounter = document.getElementById("characters-countdown"); 86 var charCounter = document.getElementById("characters-countdown");
58 charCounter.textContent = maxLength; 87 charCounter.textContent = maxLength;
59 reasonOtherInput.addEventListener("keyup", function() 88 reasonOtherInput.addEventListener("keyup", function()
60 { 89 {
61 charCounter.textContent = maxLength - reasonOtherInput.value.length; 90 charCounter.textContent = maxLength - reasonOtherInput.value.length;
62 }, false); 91 }, false);
63 92
64 var submitButton = document.getElementById("submit-form"); 93 var submitButton = document.getElementById("submit-form");
65 submitButton.addEventListener("click", function(event) 94 submitButton.addEventListener("click", function(event)
66 { 95 {
67 if (!document.querySelector("ul input:checked")) 96 if (!document.querySelector("ul input:checked"))
68 { 97 {
69 event.preventDefault(); 98 event.preventDefault();
70 form.setAttribute("class", "error"); 99 form.setAttribute("class", "error");
71 } 100 }
72 else 101 else
73 { 102 {
74 form.submit(); 103 form.submit();
75 } 104 }
76 }, false); 105 }, false);
77 } 106 }
78 document.addEventListener("DOMContentLoaded", init, false); 107 document.addEventListener("DOMContentLoaded", init, false);
79 })(); 108 })();
80 </script> 109 </script>
81 </head> 110 </head>
82 111
112 <div class="notification">
113 <strong>{{"Did you uninstall Adblock Plus by accident?"|translate("reinstall-h eadline", "Text next to the Reinstallation button")}}</strong>
114 {{"index"|linkify}}{{"Reinstall Now"|translate("reinstall", "Reinstall button text")}}</a>
115 </div>
83 <section class="highlighted"> 116 <section class="highlighted">
84 <h1>{{"Please select the reason(s) why you uninstalled Adblock Plus:"|translat e("reasons-header", "Form heading")}}</h1> 117 <h1>{{"Please select the reason(s) why you uninstalled Adblock Plus:"|translat e("reasons-header", "Form heading")}}</h1>
85 <form id="reasons-form" action="uninstalled-submit" method="get"> 118 <form id="reasons-form" action="uninstalled-submit" method="get">
86 <ul id="reasons"> 119 <fieldset>
87 {%- for reasonId, stringId, value in reasons %} 120 <ul id="reasons">
88 <li> 121 {%- for reasonId, stringId, value, adblockers in reasons %}
89 <label> 122 <li>
90 <input type="checkbox" name="reason" value="{{reasonId}}" /> 123 <label>
91 {{value|translate(stringId, "Uninstallation reason")}} 124 <input type="checkbox" name="reason" {% if adblockers %} data-toggle -view="adblockers" {% endif %} value="{{reasonId}}" />
92 </label> 125 {{value|translate(stringId, "Uninstallation reason")}}
93 </li> 126 </label>
94 {%- endfor %} 127 {%- if adblockers %}
95 <li> 128 <fieldset class="hidden" id="adblockers">
96 <label> 129 <select>
97 <input id="reason-other" type="checkbox" name="reason" value="0v0" /> 130 {%- for name in adblockers %}
98 {{"Other, namely..."|translate("reason-other", "Last uninstallation re ason")}} 131 <option name="otherAdblockerPredefined" data-hide-element="other-a dblocker" value="{{name}}">{{name}}</option>
99 </label> 132 {%- endfor %}
100 <div id="reason-other-container" class="hidden"> 133 <option name="otherAdblockerPredefined" data-show-element="other-a dblocker" value="Other">{{"Other"|translate("other", "Option in list of Adblocke rs")}}</option>
101 <textarea id="reason-other-input" name="reasonOther" maxlength="300" p laceholder="{{"Please explain why you are uninstalling Adblock Plus"|translate(" reason-other-placeholder", "Textarea placeholder text, appears after selecting ' Other, namely...' option")}}"></textarea> 134 </select>
102 <div> 135 <input id="other-adblocker" class="hidden" type="text" name="otherAd blocker" />
103 {{"Characters remaining:"|translate("countdown-text", "Text of char acter limit counter appears after selecting 'Other, namely...' option")}} 136 </fieldset>
104 <span id="characters-countdown"></span> 137 {%- endif %}
105 </div> 138 </li>
106 </div> 139 {%- endfor %}
107 </li> 140 <li>
108 </ul> 141 <label>
142 <input id="reason-other" data-toggle-view="reason-other-container" t ype="checkbox" name="reason" value="0v0" />
143 {{"Other, namely..."|translate("reason-other", "Last uninstallation reason")}}
144 </label>
145 <fieldset id="reason-other-container" class="hidden">
146 <textarea id="reason-other-input" name="reasonOther" maxlength="300" placeholder="{{"Please explain why you are uninstalling Adblock Plus"|translate ("reason-other-placeholder", "Textarea placeholder text, appears after selecting 'Other, namely...' option")}}"></textarea>
147 <div>
148 {{"Characters remaining:"|translate("countdown-text", "Text of ch aracter limit counter appears after selecting 'Other, namely...' option")}}
149 <span id="characters-countdown"></span>
150 </div>
151 </fieldset>
152 </li>
153 </ul>
154 </fieldset>
109 <button id="submit-form">{{"Submit"|translate("submit", "Submit button text" )}}</button> 155 <button id="submit-form">{{"Submit"|translate("submit", "Submit button text" )}}</button>
110 <span class="error-label">{{"Please select at least one of the options above "|translate("error-msg", "Error message, is being shown after submission if no i tem selected")}}</span> 156 <span class="error-label">{{"Please select at least one of the options above "|translate("error-msg", "Error message, is being shown after submission if no i tem selected")}}</span>
111 </form> 157 </form>
112 <p class="disclaimer"> 158 <p class="disclaimer">
113 {{"By clicking Submit, you are sending your response to Adblock Plus. Please see our <a href='/privacy'>privacy policy</a>."|translate("disclaimer", "Discla imer below form")}} 159 {{"By clicking Submit, you are sending your response to Adblock Plus. Please see our <a href='/privacy'>privacy policy</a>."|translate("disclaimer", "Discla imer below form")}}
114 </p> 160 </p>
115 </section> 161 </section>
OLDNEW
« no previous file with comments | « no previous file | static/css/simple.css » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld