Side by Side Diff: new-options.html
Issue 29480624:
Issue 5374 - Add filter list popup (Closed)
Patch Set:
Created July 7, 2017, 6:12 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« locale/en-US/new-options.json ('K')
|
« 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-2017 eyeo GmbH | 4 - Copyright (C) 2006-2017 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 257 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 268 <div> | 268 <div> |
| 269 <label for="own-list" class="i18n_options_filterList_own_l ist"></label> | 269 <label for="own-list" class="i18n_options_filterList_own_l ist"></label> |
| 270 </div> | 270 </div> |
| 271 <span> | 271 <span> |
| 272 <a class="i18n_options_filterList_edit_own_list" | 272 <a class="i18n_options_filterList_edit_own_list" |
| 273 href="#advanced-customFilters"></a> | 273 href="#advanced-customFilters"></a> |
| 274 </span> | 274 </span> |
| 275 </li> | 275 </li> |
| 276 </ul> | 276 </ul> |
| 277 <div class="controls"> | 277 <div class="controls"> |
| 278 <button data-action="open-dialog" data-dialog="custom"> | 278 <button data-action="open-dialog" data-dialog="recommended"> |
| 279 <span class="icon icon-add"></span> | 279 <span class="icon icon-add"></span> |
| 280 <span class="i18n_options_filterList_add"></span> | 280 <span class="i18n_options_filterList_add"></span> |
| 281 </button> | 281 </button> |
| 282 <button data-action="update-all-subscriptions"> | 282 <button data-action="update-all-subscriptions"> |
| 283 <span class="icon icon-update"></span> | 283 <span class="icon icon-update"></span> |
| 284 <span class="i18n_options_filterList_update"></span> | 284 <span class="i18n_options_filterList_update"></span> |
| 285 </button> | 285 </button> |
| 286 </div> | 286 </div> |
| 287 </div> | 287 </div> |
| 288 <div id="custom-filters" role="tabpanel" | 288 <div id="custom-filters" role="tabpanel" |
| (...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 353 </span> | 353 </span> |
| 354 </p> | 354 </p> |
| 355 </div> | 355 </div> |
| 356 </div> | 356 </div> |
| 357 </div> | 357 </div> |
| 358 | 358 |
| 359 <!-- Dialog --> | 359 <!-- Dialog --> |
| 360 <div id="dialog" role="dialog" aria-hidden="true"> | 360 <div id="dialog" role="dialog" aria-hidden="true"> |
| 361 <header> | 361 <header> |
| 362 <span id="dialog-title"> | 362 <span id="dialog-title"> |
| 363 <span id="dialog-title-recommended" class="i18n_options_dialog_recomme nded_title"></span> | |
| 363 <span id="dialog-title-custom" class="i18n_options_dialog_custom_title "></span> | 364 <span id="dialog-title-custom" class="i18n_options_dialog_custom_title "></span> |
| 364 <span id="dialog-title-language" class="i18n_options_dialog_language_t itle"></span> | 365 <span id="dialog-title-language" class="i18n_options_dialog_language_t itle"></span> |
| 365 <span id="dialog-title-predefined" class="i18n_options_dialog_predefin ed_title"></span> | 366 <span id="dialog-title-predefined" class="i18n_options_dialog_predefin ed_title"></span> |
| 366 </span> | 367 </span> |
| 367 <button id="dialog-close" class="i18n_options_close focus-first" data-ac tion="close-dialog"></button> | 368 <button id="dialog-close" class="i18n_options_close focus-first" data-ac tion="close-dialog"></button> |
| 368 </header> | 369 </header> |
| 369 <div id="dialog-body" class="content"> | 370 <div id="dialog-body" class="content"> |
| 371 <!-- Add recommended subscription --> | |
| 372 <div id="dialog-content-recommended" class="dialog-content"> | |
| 373 <div id="recommended-general-ads-block"> | |
| 374 <div class="dialog-content-block"> | |
| 375 <h3 class="i18n_options_dialog_recommended_general"></h3> | |
| 376 <ul id="recommend-general-list-table" class="table list"> | |
|
saroyanm
2017/07/10 13:00:05
As discussed already, we do not need to introduce
saroyanm
2017/07/13 17:09:22
Product, agreed on introducing this anyway if it's
Thomas Greiner
2017/07/25 10:30:54
It's no longer in the spec, however.
saroyanm
2017/07/28 17:54:54
I'll remove this.
| |
| 377 <template> | |
| 378 <button data-action="add-enable-subscription" role="checkbox" class="control"></button> | |
|
Thomas Greiner
2017/07/25 10:30:54
The entire row should be clickable, not just the i
saroyanm
2017/07/28 17:54:54
I agree, I'll update it in current review.
| |
| 379 <label class="display"></label> | |
| 380 <span class="description"></span> | |
| 381 </template> | |
| 382 </ul> | |
| 383 </div> | |
| 384 <div class="dialog-content-block"> | |
| 385 <ul id="recommend-ads-list-table" class="table list"> | |
| 386 <template> | |
| 387 <button data-action="add-enable-subscription" role="checkbox" class="control"></button> | |
| 388 <label class="display"></label> | |
| 389 <span class="description"></span> | |
| 390 </template> | |
| 391 </ul> | |
| 392 </div> | |
| 393 </div> | |
| 394 <button class="i18n_options_filter_by_url" data-action="close-dialog,o pen-dialog" data-dialog="custom"></button> | |
|
Thomas Greiner
2017/07/25 10:30:54
I'd argue that "open-dialog" should automatically
saroyanm
2017/07/28 17:54:54
I agree, I'll add dialog management in current rev
| |
| 395 </div> | |
| 370 <!-- Add language subscription --> | 396 <!-- Add language subscription --> |
|
Thomas Greiner
2017/07/25 10:30:54
I thought we wanted to replace this dialog with th
saroyanm
2017/07/28 17:54:54
What you mean by new one ?
Sidenote: This is diffe
| |
| 371 <div id="dialog-content-language" class="dialog-content"> | 397 <div id="dialog-content-language" class="dialog-content"> |
| 372 <div class="dialog-content-block"> | 398 <div class="dialog-content-block"> |
| 373 <h3 class="i18n_options_dialog_language_added"></h3> | 399 <h3 class="i18n_options_dialog_language_added"></h3> |
| 374 <ul id="blocking-languages-dialog-table" class="table list"> | 400 <ul id="blocking-languages-dialog-table" class="table list"> |
| 375 <template> | 401 <template> |
| 376 <label class="display"></label> | 402 <label class="display"></label> |
| 377 </template> | 403 </template> |
| 378 </ul> | 404 </ul> |
| 379 </div> | 405 </div> |
| 380 <div id="other-language" class="dialog-content-block"> | 406 <div id="other-language" class="dialog-content-block"> |
| 381 <div> | 407 <div> |
| 382 <label for="find-language" class="i18n_options_dialog_language_oth er"></label> | 408 <label for="find-language" class="i18n_options_dialog_language_oth er"></label> |
| 383 <input type="search" id="find-language" class="default-focus" /> | 409 <input type="search" id="find-language" class="default-focus" /> |
| 384 </div> | 410 </div> |
| 385 <ul id="all-lang-table" class="table list"> | 411 <ul id="all-lang-table" class="table list"> |
| 386 <template> | 412 <template> |
| 387 <button data-action="add-language-subscription" class="button-ad d control"> | 413 <button data-action="add-enable-subscription" class="button-add control"> |
| 388 +<span class="i18n_options_button_add"></span> | 414 +<span class="i18n_options_button_add"></span> |
| 389 </button> | 415 </button> |
| 390 <label class="display"></label> | 416 <label class="display"></label> |
| 391 </template> | 417 </template> |
| 392 </ul> | 418 </ul> |
| 393 </div> | 419 </div> |
| 394 </div> | 420 </div> |
| 395 <!-- Add custom subscription --> | 421 <!-- Add custom subscription --> |
| 396 <div id="dialog-content-custom" class="dialog-content"> | 422 <div id="dialog-content-custom" class="dialog-content"> |
| 397 <div class="dialog-content-block"> | 423 <div class="dialog-content-block"> |
| (...skipping 15 matching lines...) Expand all Loading... | |
| 413 <div class="url"></div> | 439 <div class="url"></div> |
| 414 <button class="i18n_options_dialog_predefined_confirm default-focus" data-action="add-predefined-subscription"></button> | 440 <button class="i18n_options_dialog_predefined_confirm default-focus" data-action="add-predefined-subscription"></button> |
| 415 </div> | 441 </div> |
| 416 </div> | 442 </div> |
| 417 </div> | 443 </div> |
| 418 <!-- Placeholder element to determine when to wrap focus around --> | 444 <!-- Placeholder element to determine when to wrap focus around --> |
| 419 <span class="focus-last" tabindex="0"></span> | 445 <span class="focus-last" tabindex="0"></span> |
| 420 </div> | 446 </div> |
| 421 </body> | 447 </body> |
| 422 </html> | 448 </html> |
| OLD | NEW |
« locale/en-US/new-options.json ('K')
|
« locale/en-US/new-options.json ('k')
|
new-options.js » ('j')
|
new-options.js » ('J')
