Delta Between Two Patch Sets: options.html
Issue 29333819:
Issue 2375 - Implement "Blocking lists" section in new options page (Closed)
Left Patch Set:
Created Jan. 29, 2016, 6:54 p.m.
Right Patch Set: Fixed the progress indicator and small fixes
Created Feb. 4, 2016, 5:43 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« background.js ('K')
|
« messageResponder.js ('k')
|
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-2016 Eyeo GmbH | 4 - Copyright (C) 2006-2016 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 224 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 235 </ul> | 235 </ul> |
| 236 <div id="filter-lists"> | 236 <div id="filter-lists"> |
| 237 <div id="all-filter-lists"> | 237 <div id="all-filter-lists"> |
| 238 <div class="table-header"> | 238 <div class="table-header"> |
| 239 <h3 class="i18n_options_column_name"></h3> | 239 <h3 class="i18n_options_column_name"></h3> |
| 240 <h3 class="i18n_options_column_date"></h3> | 240 <h3 class="i18n_options_column_date"></h3> |
| 241 </div> | 241 </div> |
| 242 <ul class="table cols" id="all-filter-lists-table"> | 242 <ul class="table cols" id="all-filter-lists-table"> |
| 243 <template> | 243 <template> |
| 244 <button role="checkbox" class="control"></button> | 244 <button role="checkbox" class="control"></button> |
| 245 <span> | 245 <div> |
| 246 <span data-action="open-context-menu" class="display"></sp an> | 246 <span data-action="open-context-menu" class="display"></sp an> |
| 247 <div data-action="open-context-menu" class="arrow"> | 247 <div data-action="open-context-menu" class="arrow"> |
| 248 <div class="context-menu"> | 248 <div class="context-menu"> |
| 249 <div class="content"> | 249 <div class="content"> |
| 250 <a class="i18n_options_filterList_updateNow update-n ow" data-action="update-now"></a> | 250 <a class="i18n_options_filterList_updateNow update-s ubscription" data-action="update-subscription"></a> |
| 251 <a class="i18n_options_filterList_website website" t arget="_blank"></a> | 251 <a class="i18n_options_filterList_website website" t arget="_blank"></a> |
| 252 <a class="i18n_options_filterList_source source" tar get="_blank"></a> | 252 <a class="i18n_options_filterList_source source" tar get="_blank"></a> |
| 253 <a class="i18n_options_filterList_delete delete" dat a-action="remove-subscription"></a> | 253 <a class="i18n_options_filterList_delete delete" dat a-action="remove-subscription"></a> |
| 254 </div> | 254 </div> |
| 255 </div> | 255 </div> |
| 256 </div> | 256 </div> |
| 257 </span> | 257 </div> |
| 258 <span class="date"></span> | 258 <span class="date"></span> |
| 259 <span class="time"></span> | 259 <span class="time"></span> |
| 260 <span class="message"></span> | |
| 260 </template> | 261 </template> |
| 261 <li class="static"> | 262 <li class="static"> |
| 262 <button role="checkbox" class="control" aria-checked="true" disabled="true"></button> | 263 <button role="checkbox" class="control" aria-checked="true" disabled="true"></button> |
| 263 <span> | 264 <div> |
| 264 <span class="i18n_options_filterList_own_list"></span> | 265 <span class="i18n_options_filterList_own_list"></span> |
| 265 </span> | 266 </div> |
| 266 <span data-action="switch-tab,edit-custom-filters" data-tab= "advanced-customFilters"> | 267 <span data-action="switch-tab,edit-custom-filters" data-tab= "advanced-customFilters"> |
| 267 <a class="i18n_options_filterList_edit_own_list"></a> | 268 <a class="i18n_options_filterList_edit_own_list"></a> |
| 268 </span> | 269 </span> |
| 269 </li> | 270 </li> |
| 270 </ul> | 271 </ul> |
| 271 <div class="controls"> | 272 <div class="controls"> |
| 272 <button data-action="open-dialog" data-dialog="custom"> | 273 <button data-action="open-dialog" data-dialog="custom"> |
| 273 <span class="icon icon-add"></span><span class="i18n_options _filterList_add"></span> | 274 <span class="icon icon-add"></span> |
|
Thomas Greiner
2016/02/01 18:52:35
Detail: Please split this up into separate lines f
saroyanm
2016/02/03 14:04:25
Done.
| |
| 275 <span class="i18n_options_filterList_add"></span> | |
| 274 </button> | 276 </button> |
| 275 <button data-action="update-all-subscriptions"> | 277 <button data-action="update-all-subscriptions"> |
| 276 <span class="icon icon-update"></span><span class="i18n_opti ons_filterList_update"></span> | 278 <span class="icon icon-update"></span> |
| 279 <span class="i18n_options_filterList_update"></span> | |
| 277 </button> | 280 </button> |
| 278 </div> | 281 </div> |
| 279 </div> | 282 </div> |
| 280 <div id="custom-filters"> | 283 <div id="custom-filters"> |
| 281 <h3 id="custom-filters-header" class="i18n_options_customFilters _title"></h3> | 284 <h3 id="custom-filters-header" class="i18n_options_customFilters _title"></h3> |
| 282 <div id="custom-filters-wrapper"> | 285 <div id="custom-filters-wrapper"> |
| 283 <div id="custom-filters-list-wrapper"> | 286 <div id="custom-filters-list-wrapper"> |
| 284 <ul id="custom-filters-table" class="table list"> | 287 <ul id="custom-filters-table" class="table list"> |
| 285 <template> | 288 <template> |
| 286 <span class="display"></span> | 289 <span class="display"></span> |
| (...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 394 <div class="url"></div> | 397 <div class="url"></div> |
| 395 <button class="i18n_options_dialog_predefined_confirm default-focus" data-action="add-predefined-subscription"></button> | 398 <button class="i18n_options_dialog_predefined_confirm default-focus" data-action="add-predefined-subscription"></button> |
| 396 </div> | 399 </div> |
| 397 </div> | 400 </div> |
| 398 </div> | 401 </div> |
| 399 <!-- Placeholder element to determine when to wrap focus around --> | 402 <!-- Placeholder element to determine when to wrap focus around --> |
| 400 <span class="focus-last" tabindex="0"></span> | 403 <span class="focus-last" tabindex="0"></span> |
| 401 </div> | 404 </div> |
| 402 </body> | 405 </body> |
| 403 </html> | 406 </html> |
| LEFT | RIGHT |
« messageResponder.js ('k')
|
options.js » ('j')
|
Toggle Intra-line Diffs ('i')
|
Expand Comments ('e')
|
Collapse Comments ('c')
|
Toggle Comments ('s')
