Delta Between Two Patch Sets: new-options.html
Issue 29478597:
Issue 5326 - General tab (HTML, strings and functionality) (Closed)
Left Patch Set:
Created July 26, 2017, 8:38 p.m.
Right Patch Set: rebase
Created Aug. 23, 2017, 12:36 p.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-2017 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, |
| 11 - but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 - but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 12 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 12 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 13 - GNU General Public License for more details. | 13 - GNU General Public License for more details. |
| 14 - | 14 - |
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 83 <div id="content"> | 83 <div id="content"> |
| 84 <div id="content-wrapper"> | 84 <div id="content-wrapper"> |
| 85 <div id="dialog-background"></div> | 85 <div id="dialog-background"></div> |
| 86 | 86 |
| 87 <!-- General tab content --> | 87 <!-- General tab content --> |
| 88 <div id="content-general" role="tabpanel" aria-labelledby="tab-general"> | 88 <div id="content-general" role="tabpanel" aria-labelledby="tab-general"> |
| 89 <h1 class="i18n_options_tab_general"></h1> | 89 <h1 class="i18n_options_tab_general"></h1> |
| 90 <p class="i18n_options_general_description"></p> | 90 <p class="i18n_options_general_description"></p> |
| 91 <section> | 91 <section> |
| 92 <h2 class="i18n_options_privacy_header"></h2> | 92 <h2 class="i18n_options_privacy_header"></h2> |
| 93 <ul id="recommend-security-list-table" class="table list"> | 93 <ul id="recommend-protection-list-table" class="table list"> |
| 94 <template> | 94 <template> |
| 95 <button data-action="toggle-remove-subscription" role="checkbox" class="control"></button> | 95 <button data-action="toggle-remove-subscription" role="checkbox" class="control"></button> |
| 96 <label class="display"></label> | 96 <label class="display"></label> |
| 97 <span class="i18n_options_readMore" data-tooltip="options_more_% value%_tooltip"></span> | 97 <span class="i18n_options_readMore" data-tooltip="options_protec tion_%value%_tooltip"></span> |
| 98 </template> | 98 </template> |
| 99 </ul> | 99 </ul> |
| 100 </section> | 100 </section> |
| 101 <section> | 101 <section> |
| 102 <h2 class="i18n_options_aa_header"></h2> | 102 <h2 class="i18n_options_acceptableAds_header"></h2> |
| 103 <p class="i18n_options_aa_description"></p> | 103 <p class="i18n_options_acceptableAds_description"></p> |
| 104 <form id="acceptable-ads"> | 104 <form id="acceptable-ads"> |
| 105 <div> | 105 <div> |
| 106 <input data-action="enable-aa" type="radio" name="acceptable-ads " value="tracking"> | 106 <input data-action="switch-acceptable-ads" type="radio" name="ac ceptable-ads" value="ads"> |
|
Thomas Greiner
2017/08/09 18:14:48
Detail: I noticed that you created three messages
saroyanm
2017/08/14 14:00:08
I'll do in your suggested way.
saroyanm
2017/08/16 14:17:35
Done, I used none, for the block all option value,
| |
| 107 <label class="i18n_options_aa_tracking_label"></label> | 107 <label class="i18n_options_acceptableAds_ads_label"></label> |
| 108 <p id="enable-aa-description" class="i18n_options_aa_tracking_de scription_1"></p> | 108 <p id="enable-aa-description" class="i18n_options_acceptableAds_ ads_description_1"></p> |
| 109 <p class="i18n_options_aa_tracking_description_2"></p> | 109 <p class="i18n_options_acceptableAds_ads_description_2"></p> |
| 110 </div> | 110 </div> |
| 111 <div> | 111 <div> |
| 112 <input data-action="enable-privacy-aa" type="radio" name="accept able-ads" value="no-tracking"> | 112 <input data-action="switch-acceptable-ads" type="radio" name="ac ceptable-ads" value="privacy"> |
| 113 <label class="i18n_options_aa_no_tracking_label"></label> | 113 <label class="i18n_options_acceptableAds_privacy_label"></label> |
| 114 <p class="i18n_options_aa_no_tracking_description"></p> | 114 <p class="i18n_options_acceptableAds_privacy_description"></p> |
| 115 <p id="no-dnt" class="i18n_options_aa_no_dnt_notification"></p> | 115 <p id="dnt" class="i18n_options_acceptableAds_dnt_notification"> </p> |
|
Thomas Greiner
2017/08/09 18:14:48
Suggestion: Can we drop the "no" in "no-dnt" and "
saroyanm
2017/08/14 14:00:08
Acknowledged.
saroyanm
2017/08/16 14:17:35
Done.
| |
| 116 </div> | 116 </div> |
| 117 <div> | 117 <div> |
| 118 <input data-action="block-all" type="radio" name="acceptable-ads " value="disable"> | 118 <input data-action="switch-acceptable-ads" type="radio" name="ac ceptable-ads" value="none"> |
| 119 <label class="i18n_options_aa_disable_label"></label> | 119 <label class="i18n_options_acceptableAds_none_label"></label> |
| 120 </div> | 120 </div> |
| 121 </form> | 121 </form> |
| 122 </section> | 122 </section> |
| 123 <section> | 123 <section> |
| 124 <h2 class="i18n_options_language_header"></h2> | 124 <h2 class="i18n_options_language_header"></h2> |
| 125 <p class="i18n_options_language_description"></p> | 125 <p class="i18n_options_language_description"></p> |
| 126 <div id="blocking-languages"> | 126 <div id="blocking-languages"> |
| 127 <ul id="blocking-languages-table" class="table list"> | 127 <ul id="blocking-languages-table" class="table list"> |
| 128 <template> | 128 <template> |
| 129 <label class="display"></label> | 129 <label class="display"></label> |
| 130 <button data-single="hidden" data-action="remove-subscription" class="delete control" title="options_control_remove_title"></button> | 130 <button data-single="hidden" data-action="remove-subscription" class="delete control" title="options_control_remove_title"></button> |
| 131 <button data-single="visible" data-action="save-change-subscri ption,open-dialog" data-dialog="language-change" class="i18n_options_language_ch ange"></button> | 131 <button data-single="visible" data-action="open-dialog" data-d ialog="language-change" class="i18n_options_language_change"></button> |
| 132 </template> | 132 </template> |
| 133 </ul> | 133 </ul> |
| 134 <div class="controls"> | 134 <div class="controls"> |
| 135 <button data-action="open-dialog" data-dialog="language-add"> | 135 <button data-action="open-dialog" data-dialog="language-add"> |
| 136 <span class="i18n_options_language_add"></span> | 136 <span class="i18n_options_language_add"></span> |
| 137 </button> | 137 </button> |
| 138 </div> | 138 </div> |
| 139 </div> | 139 </div> |
| 140 <p class="i18n_options_language_tip"></p> | 140 <p class="i18n_options_language_tip"></p> |
| 141 </section> | 141 </section> |
| 142 <section> | 142 <section> |
| 143 <h2 class="i18n_options_more_filters_header"></h2> | 143 <h2 class="i18n_options_more_filters_header"></h2> |
| 144 <p class="i18n_options_more_filters_description"></p> | 144 <p class="i18n_options_more_filters_description"></p> |
| 145 <ul id="custom-list-table" class="table list"> | 145 <ul id="custom-list-table" class="table list"> |
| 146 <template> | 146 <template> |
| 147 <label class="display"></label> | 147 <label class="display"></label> |
| 148 <span class="i18n_options_readMore" data-tooltip="options_more_% value%_tooltip"></span> | |
| 149 <button data-action="remove-subscription" class="delete control" title="options_control_remove_title"></button> | 148 <button data-action="remove-subscription" class="delete control" title="options_control_remove_title"></button> |
| 150 </template> | 149 </template> |
| 151 </ul> | 150 </ul> |
| 152 <p class="i18n_options_more_filters_note"></p> | 151 <p class="i18n_options_more_filters_note"></p> |
| 153 </section> | 152 </section> |
| 154 </div> | 153 </div> |
| 155 | 154 |
| 156 <!-- Whitelist tab content --> | 155 <!-- Whitelist tab content --> |
| 157 <div id="content-whitelist" role="tabpanel" aria-labelledby="tab-whiteli st"> | 156 <div id="content-whitelist" role="tabpanel" aria-labelledby="tab-whiteli st"> |
| 158 <h1 class="i18n_options_tab_whitelist"></h1> | 157 <h1 class="i18n_options_tab_whitelist"></h1> |
| (...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 333 <span id="dialog-title-language-change" class="i18n_options_dialog_lan guage_title"></span> | 332 <span id="dialog-title-language-change" class="i18n_options_dialog_lan guage_title"></span> |
| 334 <span id="dialog-title-predefined" class="i18n_options_dialog_predefin ed_title"></span> | 333 <span id="dialog-title-predefined" class="i18n_options_dialog_predefin ed_title"></span> |
| 335 </span> | 334 </span> |
| 336 <button id="dialog-close" class="i18n_options_close focus-first" data-ac tion="close-dialog"></button> | 335 <button id="dialog-close" class="i18n_options_close focus-first" data-ac tion="close-dialog"></button> |
| 337 </header> | 336 </header> |
| 338 <div id="dialog-body" class="content"> | 337 <div id="dialog-body" class="content"> |
| 339 <!-- Add language subscription --> | 338 <!-- Add language subscription --> |
| 340 <div id="dialog-content-language-add" class="dialog-content"> | 339 <div id="dialog-content-language-add" class="dialog-content"> |
| 341 <ul id="all-lang-table-add" class="table list"> | 340 <ul id="all-lang-table-add" class="table list"> |
| 342 <template> | 341 <template> |
| 343 <button data-action="add-language-subscription,close-dialog" class ="control" role="checkbox"> | 342 <button data-action="add-language-subscription,close-dialog" class ="control add" role="checkbox"> |
| 344 <label class="display"></label> | 343 <label class="display"></label> |
| 345 </button> | 344 </button> |
| 346 </template> | 345 <button data-action="change-language-subscription,close-dialog" cl ass="control change" role="checkbox"> |
| 347 </ul> | |
| 348 </div> | |
| 349 <!-- Change language subscription --> | |
|
Thomas Greiner
2017/08/09 18:14:48
This is pretty much exactly the same dialog as the
saroyanm
2017/08/14 14:00:08
agree
saroyanm
2017/08/16 14:17:35
Done.
| |
| 350 <div id="dialog-content-language-change" class="dialog-content"> | |
| 351 <ul id="all-lang-table-change" class="table list"> | |
| 352 <template> | |
| 353 <button data-action="change-language-subscription,close-dialog" cl ass="control" role="checkbox"> | |
| 354 <label class="display"></label> | 346 <label class="display"></label> |
| 355 </button> | 347 </button> |
| 356 </template> | 348 </template> |
| 357 </ul> | 349 </ul> |
| 358 </div> | 350 </div> |
| 359 <!-- Add custom subscription --> | 351 <!-- Add custom subscription --> |
| 360 <div id="dialog-content-custom" class="dialog-content"> | 352 <div id="dialog-content-custom" class="dialog-content"> |
| 361 <div class="dialog-content-block"> | 353 <div class="dialog-content-block"> |
| 362 <div> | 354 <div> |
| 363 <label for="blockingList-textbox" class="i18n_options_dialog_custo m_subscription_title"></label> | 355 <label for="blockingList-textbox" class="i18n_options_dialog_custo m_subscription_title"></label> |
| (...skipping 13 matching lines...) Expand all Loading... | |
| 377 <div class="url"></div> | 369 <div class="url"></div> |
| 378 <button class="i18n_options_dialog_predefined_confirm default-focus" data-action="add-predefined-subscription"></button> | 370 <button class="i18n_options_dialog_predefined_confirm default-focus" data-action="add-predefined-subscription"></button> |
| 379 </div> | 371 </div> |
| 380 </div> | 372 </div> |
| 381 </div> | 373 </div> |
| 382 <!-- Placeholder element to determine when to wrap focus around --> | 374 <!-- Placeholder element to determine when to wrap focus around --> |
| 383 <span class="focus-last" tabindex="0"></span> | 375 <span class="focus-last" tabindex="0"></span> |
| 384 </div> | 376 </div> |
| 385 </body> | 377 </body> |
| 386 </html> | 378 </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')
