Side by Side Diff: new-options.html
Issue 29519669:
Issue 5539 - Implement "Acceptable Ads notification" (Closed)
Patch Set:
Created Sept. 14, 2017, 9:49 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« locale/en-US/new-options.json ('k')
|
new-options.js » ('j')
|
new-options.js » ('J')
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')
| OLD | NEW |
|---|---|
| 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 318 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 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-custom" class="i18n_options_dialog_custom_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 <h3 id="dialog-title-tracking" class="i18n_options_dialog_tracking_tit le"></h3> | |
| 339 </span> | 340 </span> |
| 340 <button id="dialog-close" data-action="close-dialog"></button> | 341 <button id="dialog-close" data-action="close-dialog"></button> |
| 341 </header> | 342 </header> |
| 342 <div id="dialog-body" class="content"> | 343 <div id="dialog-body" class="content"> |
| 343 <!-- About Adblock Plus --> | 344 <!-- About Adblock Plus --> |
| 344 <div id="dialog-content-about" class="dialog-content"> | 345 <div id="dialog-content-about" class="dialog-content"> |
| 345 <p id="abp-version"></p> | 346 <p id="abp-version"></p> |
| 346 <p class="i18n_options_dialog_about_copyright"></p> | 347 <p class="i18n_options_dialog_about_copyright"></p> |
| 347 <p class="i18n_options_dialog_about_trademark"></p> | 348 <p class="i18n_options_dialog_about_trademark"></p> |
| 348 <p> | 349 <p> |
| (...skipping 24 matching lines...) Expand all Loading... | |
| 373 </p> | 374 </p> |
| 374 </div> | 375 </div> |
| 375 <!-- Add predefined subscription --> | 376 <!-- Add predefined subscription --> |
| 376 <div id="dialog-content-predefined" class="dialog-content"> | 377 <div id="dialog-content-predefined" class="dialog-content"> |
| 377 <div class="dialog-content-block"> | 378 <div class="dialog-content-block"> |
| 378 <h3></h3> | 379 <h3></h3> |
| 379 <div class="url"></div> | 380 <div class="url"></div> |
| 380 <button class="i18n_options_dialog_predefined_confirm default-focus primary" data-action="add-predefined-subscription"></button> | 381 <button class="i18n_options_dialog_predefined_confirm default-focus primary" data-action="add-predefined-subscription"></button> |
| 381 </div> | 382 </div> |
| 382 </div> | 383 </div> |
| 384 <!-- Acceptable Ads tracking notification --> | |
| 385 <div id="dialog-content-tracking" class="dialog-content"> | |
| 386 <div class="dialog-content-block"> | |
| 387 <div id="tracking-notification"> | |
| 388 <p class="i18n_options_dialog_tracking_notification_1"></p> | |
| 389 <p class="i18n_options_dialog_tracking_notification_2"></p> | |
| 390 <p class="i18n_options_dialog_tracking_notification_3"></p> | |
| 391 <p class="i18n_options_dialog_tracking_notification_4"></p> | |
| 392 </div> | |
| 393 <h3 class="i18n_options_dialog_tracking_note_title"></h3> | |
| 394 <ul> | |
| 395 <li class="i18n_options_dialog_tracking_note_1"></li> | |
| 396 <li class="i18n_options_dialog_tracking_note_2"></li> | |
| 397 <li class="i18n_options_dialog_tracking_note_3"></li> | |
| 398 </ul> | |
| 399 <p> | |
| 400 <button class="i18n_options_dialog_tracking_allow primary" data-pr ef="ui_warn_tracking" data-action="toggle-pref,close-dialog"></button> | |
| 401 </p> | |
| 402 <p> | |
| 403 <button class="i18n_options_dialog_tracking_disallow secondary" da ta-pref="ui_warn_tracking" data-action="disallow-tracking,toggle-pref,close-dial og"></button> | |
|
Thomas Greiner
2017/09/15 16:15:23
We should probably not change the preference until
Thomas Greiner
2017/09/15 16:15:23
All "disallow-tracking" does is run "switch-accept
saroyanm
2017/09/15 18:37:35
Done.
saroyanm
2017/09/15 18:37:35
Acknowledged.
| |
| 404 </p> | |
| 405 </div> | |
| 406 </div> | |
| 383 </div> | 407 </div> |
| 384 <!-- Placeholder element to determine when to wrap focus around --> | 408 <!-- Placeholder element to determine when to wrap focus around --> |
| 385 <span class="focus-last" tabindex="0"></span> | 409 <span class="focus-last" tabindex="0"></span> |
| 386 </div> | 410 </div> |
| 387 <!-- Notification --> | 411 <!-- Notification --> |
| 388 <div id="notification" aria-hidden="true" aria-live="polite"> | 412 <div id="notification" aria-hidden="true" aria-live="polite"> |
| 389 <strong id="notification-text"></strong> | 413 <strong id="notification-text"></strong> |
| 390 <button id="hide-notification" data-action="hide-notification"> | 414 <button id="hide-notification" data-action="hide-notification"> |
| 391 <span class="i18n_options_notification_hide sr-only"></span> | 415 <span class="i18n_options_notification_hide sr-only"></span> |
| 392 </button> | 416 </button> |
| 393 </div> | 417 </div> |
| 394 </body> | 418 </body> |
| 395 </html> | 419 </html> |
| OLD | NEW |
« no previous file with comments
|
« locale/en-US/new-options.json ('k')
|
new-options.js » ('j')
|
new-options.js » ('J')
