Delta Between Two Patch Sets: new-options.html
Issue 29519669:
Issue 5539 - Implement "Acceptable Ads notification" (Closed)
Left Patch Set: Rebased
Created Sept. 14, 2017, 2:29 p.m.
Right Patch Set: Addressed Thomas comment from patchset 6
Created Sept. 22, 2017, 10:28 a.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with change/comment
|
« locale/en-US/new-options.json ('k')
|
new-options.js » ('j')
|
no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| LEFT | RIGHT |
|---|---|
| 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 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 130 <button class="i18n_options_language_add list" data-action="open-dia log" data-dialog="language-add"></button> | 130 <button class="i18n_options_language_add list" data-action="open-dia log" data-dialog="language-add"></button> |
| 131 <p class="i18n_options_language_tip"></p> | 131 <p class="i18n_options_language_tip"></p> |
| 132 </div> | 132 </div> |
| 133 </section> | 133 </section> |
| 134 <section class="cols"> | 134 <section class="cols"> |
| 135 <header> | 135 <header> |
| 136 <h2 class="i18n_options_more_filters_header"></h2> | 136 <h2 class="i18n_options_more_filters_header"></h2> |
| 137 <p class="i18n_options_more_filters_description"></p> | 137 <p class="i18n_options_more_filters_description"></p> |
| 138 </header> | 138 </header> |
| 139 <div> | 139 <div> |
| 140 <ul id="custom-list-table" class="table list"> | 140 <ul id="more-list-table" class="table list"> |
| 141 <template> | 141 <template> |
| 142 <label class="display"></label> | 142 <label class="display"></label> |
| 143 <button data-action="remove-subscription" class="i18n_options_co ntrol_remove_title link control" title="options_control_remove_title"></button> | 143 <button data-action="remove-subscription" class="i18n_options_co ntrol_remove_title link control" title="options_control_remove_title"></button> |
| 144 </template> | 144 </template> |
| 145 </ul> | 145 </ul> |
| 146 <p class="i18n_options_more_filters_note"></p> | 146 <p class="i18n_options_more_filters_note"></p> |
| 147 </div> | 147 </div> |
| 148 </section> | 148 </section> |
| 149 </div> | 149 </div> |
| 150 | 150 |
| (...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 246 <li role="menuitem"> | 246 <li role="menuitem"> |
| 247 <button class="i18n_options_filterList_delete delete" da ta-action="remove-subscription"></button> | 247 <button class="i18n_options_filterList_delete delete" da ta-action="remove-subscription"></button> |
| 248 </li> | 248 </li> |
| 249 </ul> | 249 </ul> |
| 250 </div> | 250 </div> |
| 251 </div> | 251 </div> |
| 252 <button data-action="remove-subscription" class="control delete" ></button> | 252 <button data-action="remove-subscription" class="control delete" ></button> |
| 253 </div> | 253 </div> |
| 254 </template> | 254 </template> |
| 255 </ul> | 255 </ul> |
| 256 <div class="side-controls"> | 256 <div class="side-controls wrap"> |
| 257 <button class="i18n_options_filterList_add primary" data-action="ope n-dialog" data-dialog="custom"></button> | 257 <button class="i18n_options_filterList_add primary" data-action="ope n-dialog" data-dialog="import"></button> |
| 258 <button id="update" class="i18n_options_filterList_update secondary" data-action="update-all-subscriptions"></button> | 258 <button id="update" class="i18n_options_filterList_update secondary" data-action="update-all-subscriptions"></button> |
| 259 </div> | 259 </div> |
| 260 </section> | 260 </section> |
| 261 | 261 |
| 262 <section class="cols"> | 262 <section class="cols"> |
| 263 <header> | 263 <header> |
| 264 <h2 class="i18n_options_customFilters_title"></h2> | 264 <h2 class="i18n_options_customFilters_title"></h2> |
| 265 <p class="i18n_options_customFilters_description"></p> | 265 <p class="i18n_options_customFilters_description"></p> |
| 266 </header> | 266 </header> |
| 267 <div id="custom-filters"> | 267 <div id="custom-filters"> |
| 268 <h3 class="i18n_options_customFilters_widget_title"></h3> | 268 <h3 class="i18n_options_customFilters_widget_title"></h3> |
| 269 <div id="empty-custom-filters"> | 269 <div id="empty-custom-filters"> |
| 270 <p class="i18n_options_customFilters_tip"></p> | 270 <p class="i18n_options_customFilters_tip"></p> |
| 271 <button class="i18n_options_customFilters_start primary" data-acti on="edit-custom-filters"> | 271 <button class="i18n_options_customFilters_start primary" data-acti on="edit-custom-filters"> |
| 272 </button> | 272 </button> |
| 273 <p> | 273 <p> |
| 274 <a class="i18n_options_customFilters_learn" id="link-filters" ta rget="_blank"></a> | 274 <a class="i18n_options_customFilters_learn" id="link-filters" ta rget="_blank"></a> |
| 275 </p> | 275 </p> |
| 276 </div> | 276 </div> |
| 277 <textarea id="custom-filters-raw" rows="15"></textarea> | 277 <textarea id="custom-filters-raw" rows="15"></textarea> |
| 278 <div class="side-controls"> | 278 <div class="side-controls wrap"> |
| 279 <button id="custom-filters-edit" class="i18n_options_customFilter_ edit secondary" data-action="edit-custom-filters"> | 279 <button id="custom-filters-edit" class="i18n_options_customFilter_ edit secondary" data-action="edit-custom-filters"> |
| 280 </button> | 280 </button> |
| 281 <div id="custom-filters-raw-controls"> | 281 <div class="side-controls" id="custom-filters-raw-controls"> |
| 282 <button class="i18n_options_customFilter_cancel secondary" data- action="cancel-custom-filters"></button> | 282 <button class="i18n_options_customFilter_cancel secondary" data- action="cancel-custom-filters"></button> |
| 283 <button class="i18n_options_customFilter_save primary" data-acti on="save-custom-filters"></button> | 283 <button class="i18n_options_customFilter_save primary" data-acti on="save-custom-filters"></button> |
| 284 </div> | 284 </div> |
| 285 </div> | 285 </div> |
| 286 </div> | 286 </div> |
| 287 </section> | 287 </section> |
| 288 </div> | 288 </div> |
| 289 | 289 |
| 290 <!-- Help tab content --> | 290 <!-- Help tab content --> |
| 291 <div id="content-help" role="tabpanel" aria-labelledby="tab-help"> | 291 <div id="content-help" role="tabpanel" aria-labelledby="tab-help"> |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 325 </div> | 325 </div> |
| 326 </section> | 326 </section> |
| 327 </div> | 327 </div> |
| 328 </main> | 328 </main> |
| 329 | 329 |
| 330 <!-- Dialog --> | 330 <!-- Dialog --> |
| 331 <div id="dialog" role="dialog" aria-hidden="true"> | 331 <div id="dialog" role="dialog" aria-hidden="true"> |
| 332 <header> | 332 <header> |
| 333 <span id="dialog-title"> | 333 <span id="dialog-title"> |
| 334 <h3 id="dialog-title-about" class="i18n_options_dialog_about_title"></ h3> | 334 <h3 id="dialog-title-about" class="i18n_options_dialog_about_title"></ h3> |
| 335 <h3 id="dialog-title-custom" class="i18n_options_dialog_custom_title"> </h3> | 335 <h3 id="dialog-title-import" class="i18n_options_dialog_import_title"> </h3> |
| 336 <h3 id="dialog-title-language-add" class="i18n_options_dialog_language _title"></h3> | 336 <h3 id="dialog-title-language-add" class="i18n_options_dialog_language _title"></h3> |
| 337 <h3 id="dialog-title-language-change" class="i18n_options_dialog_langu age_title"></h3> | 337 <h3 id="dialog-title-language-change" class="i18n_options_dialog_langu age_title"></h3> |
| 338 <h3 id="dialog-title-predefined" class="i18n_options_dialog_predefined _title"></h3> | 338 <h3 id="dialog-title-predefined" class="i18n_options_dialog_predefined _title"></h3> |
| 339 <span id="dialog-title-tracking" class="i18n_options_dialog_tracking_t itle"></span> | 339 <h3 id="dialog-title-tracking" class="i18n_options_dialog_tracking_tit le"></h3> |
|
saroyanm
2017/09/14 14:31:18
This needs to be switched to h3
saroyanm
2017/09/14 21:56:14
Done.
| |
| 340 </span> | 340 </span> |
| 341 <button id="dialog-close" data-action="close-dialog"></button> | 341 <button id="dialog-close" data-action="close-dialog"></button> |
| 342 </header> | 342 </header> |
| 343 <div id="dialog-body" class="content"> | 343 <div id="dialog-body" class="content"> |
| 344 <!-- About Adblock Plus --> | 344 <!-- About Adblock Plus --> |
| 345 <div id="dialog-content-about" class="dialog-content"> | 345 <div id="dialog-content-about" class="dialog-content"> |
| 346 <p id="abp-version"></p> | 346 <p id="abp-version"></p> |
| 347 <p class="i18n_options_dialog_about_copyright"></p> | 347 <p class="i18n_options_dialog_about_copyright"></p> |
| 348 <p class="i18n_options_dialog_about_trademark"></p> | 348 <p class="i18n_options_dialog_about_trademark"></p> |
| 349 <p> | 349 <p> |
| 350 <button class="i18n_options_close primary" data-action="close-dialog "></button> | 350 <button class="i18n_options_close primary" data-action="close-dialog "></button> |
| 351 </p> | 351 </p> |
| 352 </div> | 352 </div> |
| 353 <!-- Add language subscription --> | 353 <!-- Add language subscription --> |
| 354 <div id="dialog-content-language-add" class="dialog-content"> | 354 <div id="dialog-content-language-add" class="dialog-content"> |
| 355 <ul id="all-lang-table-add" class="table list"> | 355 <ul id="all-lang-table-add" class="table list"> |
| 356 <template> | 356 <template> |
| 357 <button data-action="add-language-subscription,close-dialog" class ="control add" role="checkbox"> | 357 <button data-action="add-language-subscription,close-dialog" class ="control add" role="checkbox"> |
| 358 <label class="display"></label> | 358 <label class="display"></label> |
| 359 </button> | 359 </button> |
| 360 <button data-action="change-language-subscription,close-dialog" cl ass="control change" role="checkbox"> | 360 <button data-action="change-language-subscription,close-dialog" cl ass="control change" role="checkbox"> |
| 361 <label class="display"></label> | 361 <label class="display"></label> |
| 362 </button> | 362 </button> |
| 363 </template> | 363 </template> |
| 364 </ul> | 364 </ul> |
| 365 </div> | 365 </div> |
| 366 <!-- Add custom subscription --> | 366 <!-- Add import subscription --> |
| 367 <div id="dialog-content-custom" class="dialog-content"> | 367 <div id="dialog-content-import" class="dialog-content"> |
| 368 <div> | 368 <form data-validation="custom" novalidate> |
| 369 <label for="blockingList-textbox" class="i18n_options_dialog_custom_ subscription_title"></label> | 369 <p class="floating-input"> |
| 370 <input id="blockingList-textbox" type="text" class="default-focus" p laceholder="https://website.com/filterlist.txt" /> | 370 <input placeholder=" " id="import-list-title" type="text" class="d efault-focus" required /> |
| 371 </div> | 371 <label for="import-list-title" class="i18n_options_dialog_import_s ubscription_title"></label> |
| 372 <p> | 372 <span class="attention"></span> |
| 373 <button class="i18n_options_dialog_custom_import primary" data-actio n="import-subscription"></button> | 373 <span class="i18n_options_dialog_import_subscription_title_error e rror-msg"></span> |
| 374 </p> | 374 </p> |
| 375 <p class="floating-input"> | |
| 376 <input placeholder=" " id="import-list-url" type="url" class="defa ult-focus" required/> | |
| 377 <label for="import-list-url" class="i18n_options_dialog_import_sub scription_location"></label> | |
| 378 <span class="attention"></span> | |
| 379 <span class="i18n_options_dialog_import_subscription_location_erro r error-msg"></span> | |
| 380 </p> | |
| 381 <p class="side-controls"> | |
| 382 <button class="i18n_options_customFilter_cancel secondary" type="r eset" data-action="close-dialog"></button> | |
| 383 <button type="button" class="i18n_options_dialog_import_title prim ary" data-action="validate-import-subscription"></button> | |
| 384 </p> | |
| 385 </form> | |
| 375 </div> | 386 </div> |
| 376 <!-- Add predefined subscription --> | 387 <!-- Add predefined subscription --> |
| 377 <div id="dialog-content-predefined" class="dialog-content"> | 388 <div id="dialog-content-predefined" class="dialog-content"> |
| 378 <div class="dialog-content-block"> | 389 <div class="dialog-content-block"> |
| 379 <h3></h3> | 390 <h3></h3> |
| 380 <div class="url"></div> | 391 <div class="url"></div> |
| 381 <button class="i18n_options_dialog_predefined_confirm default-focus primary" data-action="add-predefined-subscription"></button> | 392 <button class="i18n_options_dialog_predefined_confirm default-focus primary" data-action="add-predefined-subscription"></button> |
| 382 </div> | 393 </div> |
| 383 </div> | 394 </div> |
| 384 <!-- Acceptable Ads tracking notification --> | 395 <!-- Acceptable Ads tracking notification --> |
| 385 <div id="dialog-content-tracking" class="dialog-content"> | 396 <div id="dialog-content-tracking" class="dialog-content"> |
| 386 <div class="dialog-content-block"> | 397 <div class="dialog-content-block"> |
| 387 <p class="i18n_options_dialog_tracking_notification"></p> | 398 <div id="tracking-notification"> |
| 388 <p> | 399 <p class="i18n_options_dialog_tracking_notification_1"></p> |
| 389 <button class="i18n_options_dialog_tracking_relevent_ads" data-act ion="close-dialog"></button> | 400 <p class="i18n_options_dialog_tracking_notification_2"></p> |
| 390 </p> | 401 <p class="i18n_options_dialog_tracking_notification_3"></p> |
| 391 <p> | 402 <p class="i18n_options_dialog_tracking_notification_4"></p> |
| 392 <button class="i18n_options_dialog_tracking_privacy_ads" data-acti on="close-dialog"></button> | 403 </div> |
| 393 </p> | 404 <h3 class="i18n_options_dialog_tracking_note_title"></h3> |
| 394 <p> | 405 <ul> |
| 395 <h3 class="i18n_options_dialog_tracking_note"></h3> | 406 <li class="i18n_options_dialog_tracking_note_1"></li> |
| 396 <ul> | 407 <li class="i18n_options_dialog_tracking_note_2"></li> |
| 397 <li class="i18n_options_dialog_tracking_note_1"></li> | 408 <li class="i18n_options_dialog_tracking_note_3"></li> |
| 398 <li class="i18n_options_dialog_tracking_note_2"></li> | 409 </ul> |
| 399 <li class="i18n_options_dialog_tracking_note_3"></li> | 410 <p class="side-controls wrap"> |
| 400 </ul> | 411 <button class="i18n_options_dialog_tracking_allow primary default- focus" data-pref="ui_warn_tracking" data-action="toggle-pref,close-dialog"></but ton> |
| 412 <button class="i18n_options_dialog_tracking_disallow secondary" da ta-pref="ui_warn_tracking" data-value="privacy" data-action="switch-acceptable-a ds,toggle-pref,close-dialog"></button> | |
| 401 </p> | 413 </p> |
| 402 </div> | 414 </div> |
| 403 </div> | 415 </div> |
| 404 </div> | 416 </div> |
| 405 <!-- Placeholder element to determine when to wrap focus around --> | 417 <!-- Placeholder element to determine when to wrap focus around --> |
| 406 <span class="focus-last" tabindex="0"></span> | 418 <span class="focus-last" tabindex="0"></span> |
| 407 </div> | 419 </div> |
| 408 <!-- Notification --> | 420 <!-- Notification --> |
| 409 <div id="notification" aria-hidden="true" aria-live="polite"> | 421 <div id="notification" aria-hidden="true" aria-live="polite"> |
| 410 <strong id="notification-text"></strong> | 422 <strong id="notification-text"></strong> |
| 411 <button id="hide-notification" data-action="hide-notification"> | 423 <button id="hide-notification" data-action="hide-notification"> |
| 412 <span class="i18n_options_notification_hide sr-only"></span> | 424 <span class="i18n_options_notification_hide sr-only"></span> |
| 413 </button> | 425 </button> |
| 414 </div> | 426 </div> |
| 415 </body> | 427 </body> |
| 416 </html> | 428 </html> |
| LEFT | RIGHT |
« locale/en-US/new-options.json ('k')
|
new-options.js » ('j')
|
Toggle Intra-line Diffs ('i')
|
Expand Comments ('e')
|
Collapse Comments ('c')
|
Toggle Comments ('s')
