Side by Side Diff: desktop-options.html
Issue 29609587:
Issue 6031 - Implement Acceptable Ads notification (Closed)
Patch Set: Addressed Thomas comments
Created Nov. 17, 2017, 4:03 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« background.js ('k')
|
desktop-options.js » ('j')
|
desktop-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 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 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-warning"> | |
| 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> | |
| 103 </button> | |
| 104 <p id="tracking-warning-1"></p> | |
| 105 <p class="i18n_options_tracking_warning_2"></p> | |
| 106 <p id="tracking-warning-3" class="i18n_options_tracking_warning_3" ></p> | |
|
Thomas Greiner
2017/11/20 18:36:04
Detail: The "i18n_*" class here is redundant becau
saroyanm
2017/11/21 14:58:32
Done.
| |
| 107 <button class="i18n_options_tracking_warning_acknowledgment link" type="button" data-pref="ui_warn_tracking" data-action="toggle-pref"></button> | |
| 108 </div> | |
| 100 <ul> | 109 <ul> |
| 101 <li> | 110 <li> |
| 102 <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> |
| 103 <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> |
| 104 <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> |
| 105 </li> | 114 </li> |
| 106 <ul> | 115 <ul> |
| 107 <li> | 116 <li> |
| 108 <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> |
| 109 <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> |
| (...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 409 </div> | 418 </div> |
| 410 <!-- Notification --> | 419 <!-- Notification --> |
| 411 <div id="notification" aria-hidden="true" aria-live="polite"> | 420 <div id="notification" aria-hidden="true" aria-live="polite"> |
| 412 <strong id="notification-text"></strong> | 421 <strong id="notification-text"></strong> |
| 413 <button id="hide-notification" data-action="hide-notification"> | 422 <button id="hide-notification" data-action="hide-notification"> |
| 414 <span class="i18n_options_notification_hide sr-only"></span> | 423 <span class="i18n_options_notification_hide sr-only"></span> |
| 415 </button> | 424 </button> |
| 416 </div> | 425 </div> |
| 417 </body> | 426 </body> |
| 418 </html> | 427 </html> |
| OLD | NEW |
« no previous file with comments
|
« background.js ('k')
|
desktop-options.js » ('j')
|
desktop-options.js » ('J')
