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

Delta Between Two Patch Sets: desktop-options.html

Issue 29609587: Issue 6031 - Implement Acceptable Ads notification (Closed)
Left Patch Set: Created Nov. 15, 2017, 5:01 p.m.
Right Patch Set: Created Nov. 21, 2017, 6:15 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 | « background.js ('k') | desktop-options.js » ('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 <!DOCTYPE html> 1 <!DOCTYPE html>
2 <!-- 2 <!--
3 - This file is part of Adblock Plus <https://adblockplus.org/>, 3 - This file is part of Adblock Plus <https://adblockplus.org/>,
4 - Copyright (C) 2006-present eyeo GmbH 4 - Copyright (C) 2006-present eyeo GmbH
5 - 5 -
6 - Adblock Plus is free software: you can redistribute it and/or modify 6 - Adblock Plus is free software: you can redistribute it and/or modify
7 - it under the terms of the GNU General Public License version 3 as 7 - it under the terms of the GNU General Public License version 3 as
8 - published by the Free Software Foundation. 8 - published by the Free Software Foundation.
9 - 9 -
10 - Adblock Plus is distributed in the hope that it will be useful, 10 - Adblock Plus is distributed in the hope that it will be useful,
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 <span data-tooltip="options_protection_%value%_tooltip"></span> 90 <span data-tooltip="options_protection_%value%_tooltip"></span>
91 </template> 91 </template>
92 </ul> 92 </ul>
93 </section> 93 </section>
94 <section class="cols"> 94 <section class="cols">
95 <header> 95 <header>
96 <h2 class="i18n_options_acceptableAds_header"></h2> 96 <h2 class="i18n_options_acceptableAds_header"></h2>
97 <p class="i18n_options_acceptableAds_description"></p> 97 <p class="i18n_options_acceptableAds_description"></p>
98 </header> 98 </header>
99 <form id="acceptable-ads"> 99 <form id="acceptable-ads">
100 <div id="tracking-notification"> 100 <div id="tracking-warning">
Thomas Greiner 2017/11/16 19:25:05 Suggestion: The naming is inconsistent. Here are t
saroyanm 2017/11/17 16:10:38 Agree, done.
101 <button id="hide-tracking-notification" type="button" data-pref="u i_warn_tracking" data-action="toggle-pref,hide-tracking-notification"> 101 <button id="hide-tracking-warning" type="button" data-pref="ui_war n_tracking" data-action="toggle-pref">
102 <span class="i18n_options_notification_hide sr-only"></span> 102 <span class="i18n_options_notification_hide sr-only"></span>
103 </button> 103 </button>
104 <p class="i18n_options_tracking_notification_1"></p> 104 <p id="tracking-warning-1"></p>
105 <p class="i18n_options_tracking_notification_2"></p> 105 <p class="i18n_options_tracking_warning_2"></p>
106 <p class="i18n_options_tracking_notification_3"></p> 106 <p id="tracking-warning-3"></p>
107 <button class="i18n_options_tracking_notification_acknowledgment l ink" type="button" data-pref="ui_warn_tracking" data-action="toggle-pref,hide-tr acking-notification"></button> 107 <button class="i18n_options_tracking_warning_acknowledgment link" type="button" data-pref="ui_warn_tracking" data-action="toggle-pref"></button>
108 </div> 108 </div>
109 <ul> 109 <ul>
110 <li> 110 <li>
111 <button id="acceptable-ads-allow" data-action="switch-acceptable -ads" type="button" role="checkbox" name="acceptable-ads" value="ads"></button> 111 <button id="acceptable-ads-allow" data-action="switch-acceptable -ads" type="button" role="checkbox" name="acceptable-ads" value="ads"></button>
112 <label for="acceptable-ads-allow" class="i18n_options_acceptable Ads_ads_label"></label> 112 <label for="acceptable-ads-allow" class="i18n_options_acceptable Ads_ads_label"></label>
113 <p id="enable-acceptable-ads-description" class="i18n_options_ac ceptableAds_ads_description_1"></p> 113 <p id="enable-acceptable-ads-description" class="i18n_options_ac ceptableAds_ads_description_1"></p>
114 </li> 114 </li>
115 <ul> 115 <ul>
116 <li> 116 <li>
117 <button id="acceptable-ads-privacy-allow" data-action="switch- acceptable-ads" type="button" role="checkbox" name="acceptable-ads" value="priva cy"></button> 117 <button id="acceptable-ads-privacy-allow" data-action="switch- acceptable-ads" type="button" role="checkbox" name="acceptable-ads" value="priva cy"></button>
118 <label for="acceptable-ads-privacy-allow" class="i18n_options_ acceptableAds_privacy_label"></label> 118 <label for="acceptable-ads-privacy-allow" class="i18n_options_ acceptableAds_privacy_label"></label>
119 <span class="i18n_options_new_label new"></span> 119 <span class="i18n_options_new_label new"></span>
120 <p> 120 <p>
121 <a id="enable-acceptable-ads-privacy-description" class="i18 n_options_learn_more" target="_blank"></a> 121 <a id="enable-acceptable-ads-privacy-description" class="i18 n_options_learn_more" target="_blank"></a>
122 </p> 122 </p>
123 <p id="dnt" class="i18n_options_acceptableAds_dnt_notification "></p> 123 <p id="dnt" class="i18n_options_acceptableAds_dnt_notification "></p>
124 </li> 124 </li>
125 </ul> 125 </ul>
126 </ul> 126 </ul>
127 </form> 127 </form>
128 </section> 128 </section>
129 <section class="cols"> 129 <section class="cols">
130 <header> 130 <header>
131 <h2 class="i18n_options_language_header"></h2> 131 <h2 class="i18n_options_language_header"></h2>
132 <p class="i18n_options_language_description"></p> 132 <p class="i18n_options_language_description"></p>
133 </header> 133 </header>
134 <div id="blocking-languages"> 134 <div id="blocking-languages">
135 <ul id="blocking-languages-table" class="table list"> 135 <ul id="blocking-languages-table" class="table list bottom-control">
136 <template> 136 <template>
137 <label class="display"></label> 137 <label class="display"></label>
138 <button data-single="hidden" data-action="remove-subscription" c lass="delete control" title="options_control_remove_title"></button> 138 <button data-single="hidden" data-action="remove-subscription" c lass="delete control" title="options_control_remove_title"></button>
139 <button data-single="visible" data-action="open-dialog" data-dia log="language-change" class="i18n_options_language_change link"></button> 139 <button data-single="visible" data-action="open-dialog" data-dia log="language-change" class="i18n_options_language_change link"></button>
140 </template> 140 </template>
141 </ul> 141 </ul>
142 <button class="i18n_options_language_add list" data-action="open-dia log" data-dialog="language-add"></button> 142 <button class="i18n_options_language_add list" data-action="open-dia log" data-dialog="language-add"></button>
143 <p class="i18n_options_language_tip"></p> 143 <p class="i18n_options_language_tip"></p>
144 </div> 144 </div>
145 </section> 145 </section>
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
218 <section> 218 <section>
219 <header> 219 <header>
220 <h2 class="i18n_options_filterList_title"></h2> 220 <h2 class="i18n_options_filterList_title"></h2>
221 <p> 221 <p>
222 <span class="i18n_options_filterList_description"></span> 222 <span class="i18n_options_filterList_description"></span>
223 <a id="filter-lists-learn-more" class="i18n_options_learn_more" ta rget="_blank"></a> 223 <a id="filter-lists-learn-more" class="i18n_options_learn_more" ta rget="_blank"></a>
224 </p> 224 </p>
225 </header> 225 </header>
226 226
227 <div id="all-filter-lists-table-header" class="th"> 227 <div id="all-filter-lists-table-header" class="th">
228 <h3 class="i18n_options_filterList_column_status col4"></h3> 228 <h3 class="i18n_options_filterList_column_status col5"></h3>
229 <h3 class="i18n_options_filterList_column_name col4"></h3> 229 <h3 class="i18n_options_filterList_column_name col5"></h3>
230 <h3 class="i18n_options_filterList_column_update col4"></h3> 230 <h3 class="i18n_options_filterList_column_update col5"></h3>
231 <h3 class="col4"></h3> 231 <h3 class="col5"></h3>
232 <h3 class="col5"></h3>
232 </div> 233 </div>
233 <ul class="table cols" id="all-filter-lists-table"> 234 <ul class="table cols" id="all-filter-lists-table">
234 <template> 235 <template>
235 <div class="col4"> 236 <div class="col5">
236 <button data-action="toggle-disable-subscription" role="checkbox " class="control toggle"> 237 <button data-action="toggle-disable-subscription" role="checkbox " class="control toggle">
237 </button> 238 </button>
238 <div class="state"> 239 <div class="state">
239 <span class="i18n_options_filterList_state_active" id="state-a ctive"></span> 240 <span class="i18n_options_filterList_state_active" id="state-a ctive"></span>
240 <span class="i18n_options_filterList_state_disabled" id="state -disabled"></span> 241 <span class="i18n_options_filterList_state_disabled" id="state -disabled"></span>
241 </div> 242 </div>
242 </div> 243 </div>
243 <div class="col4"> 244 <div class="col5">
244 <label class="display"></label> 245 <label class="display"></label>
245 </div> 246 </div>
246 <div class="col4"> 247 <div class="col5">
247 <span class="last-update"></span> 248 <span class="last-update"></span>
248 <span class="message"></span> 249 <span class="message"></span>
249 </div> 250 </div>
250 <div class="col4"> 251 <div class="col5">
251 <button data-action="open-context-menu" class="gear"></button> 252 <button data-action="open-context-menu" class="gear"></button>
252 <div role="menubar" class="context-menu-wrapper"> 253 <div role="menubar" class="context-menu-wrapper">
253 <div class="context-menu"> 254 <div class="context-menu">
254 <ul class="content" role="menu"> 255 <ul class="content" role="menu">
255 <li role="menuitem"> 256 <li role="menuitem">
256 <button class="i18n_options_filterList_updateNow update- subscription" data-action="update-subscription"></button> 257 <button class="i18n_options_filterList_updateNow update- subscription" data-action="update-subscription"></button>
257 </li> 258 </li>
258 <li role="menuitem"> 259 <li role="menuitem">
259 <a class="i18n_options_filterList_website website" targe t="_blank"></a> 260 <a class="i18n_options_filterList_website website" targe t="_blank"></a>
260 </li> 261 </li>
261 <li role="menuitem"> 262 <li role="menuitem">
262 <a class="i18n_options_filterList_source source" target= "_blank"></a> 263 <a class="i18n_options_filterList_source source" target= "_blank"></a>
263 </li> 264 </li>
264 <li role="menuitem"> 265 <li role="menuitem">
265 <button class="i18n_options_control_remove_title delete" data-action="remove-subscription"></button> 266 <button class="i18n_options_control_remove_title delete" data-action="remove-subscription"></button>
266 </li> 267 </li>
267 </ul> 268 </ul>
268 </div> 269 </div>
269 </div> 270 </div>
271 </div>
272 <div class="col5">
270 <button data-action="remove-subscription" class="control delete" ></button> 273 <button data-action="remove-subscription" class="control delete" ></button>
271 </div> 274 </div>
272 </template> 275 </template>
273 </ul> 276 </ul>
274 <div class="side-controls wrap"> 277 <div class="side-controls wrap">
275 <button class="i18n_options_filterList_add primary" data-action="ope n-dialog" data-dialog="import"></button> 278 <button class="i18n_options_filterList_add primary" data-action="ope n-dialog" data-dialog="import"></button>
276 <button id="update" class="i18n_options_filterList_update secondary" data-action="update-all-subscriptions"></button> 279 <button id="update" class="i18n_options_filterList_update secondary" data-action="update-all-subscriptions"></button>
277 </div> 280 </div>
278 </section> 281 </section>
279 282
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
415 </div> 418 </div>
416 <!-- Notification --> 419 <!-- Notification -->
417 <div id="notification" aria-hidden="true" aria-live="polite"> 420 <div id="notification" aria-hidden="true" aria-live="polite">
418 <strong id="notification-text"></strong> 421 <strong id="notification-text"></strong>
419 <button id="hide-notification" data-action="hide-notification"> 422 <button id="hide-notification" data-action="hide-notification">
420 <span class="i18n_options_notification_hide sr-only"></span> 423 <span class="i18n_options_notification_hide sr-only"></span>
421 </button> 424 </button>
422 </div> 425 </div>
423 </body> 426 </body>
424 </html> 427 </html>
LEFTRIGHT
« background.js ('k') | desktop-options.js » ('j') | Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Toggle Comments ('s')

Powered by Google App Engine
This is Rietveld