Delta Between Two Patch Sets: options.html
Issue 29321198:
Issue 2376 - Implement custom filters in new options page (Closed)
Left Patch Set: Addressed initial comments
Created July 8, 2015, 6:13 p.m.
Right Patch Set: Nit fixes
Created July 15, 2015, 2:35 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with change/comment
|
« 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-2015 Eyeo GmbH | 4 - Copyright (C) 2006-2015 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 181 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 192 </ul> | 192 </ul> |
| 193 <div class="controls"> | 193 <div class="controls"> |
| 194 <button> | 194 <button> |
| 195 <span class="icon icon-add"></span><span class="i18n_options _blockingList_add"></span> | 195 <span class="icon icon-add"></span><span class="i18n_options _blockingList_add"></span> |
| 196 </button> | 196 </button> |
| 197 <button> | 197 <button> |
| 198 <span class="icon icon-update"></span><span class="i18n_opti ons_blockingList_update"></span> | 198 <span class="icon icon-update"></span><span class="i18n_opti ons_blockingList_update"></span> |
| 199 </button> | 199 </button> |
| 200 </div> | 200 </div> |
| 201 </div> | 201 </div> |
| 202 <div id="custom-filters" data-view="list"> | 202 <div id="custom-filters"> |
|
Thomas Greiner
2015/07/09 11:07:55
The "data-view" attribute is no longer used.
saroyanm
2015/07/09 16:31:41
Done.
| |
| 203 <h2 id="custom-filters-header" class="i18n_options_customFilters _title"></h2> | 203 <h2 id="custom-filters-header" class="i18n_options_customFilters _title"></h2> |
| 204 <div id="custom-filters-wrapper"> | 204 <div id="custom-filters-wrapper"> |
| 205 <div id="custom-filters-list-wrapper"> | 205 <div id="custom-filters-list-wrapper"> |
| 206 <ul id="custom-filters-table" class="table list"> | 206 <ul id="custom-filters-table" class="table list"> |
| 207 <template> | 207 <template> |
| 208 <span class="display"></span> | 208 <span class="display"></span> |
| 209 </template> | 209 </template> |
| 210 </ul> | 210 </ul> |
| 211 <form id="custom-filter-add" class="controls"> | 211 <form id="custom-filters-add" class="controls"> |
|
Thomas Greiner
2015/07/09 11:07:56
Plural for consistency: "custom-filters-add"
saroyanm
2015/07/09 16:31:41
Done.
| |
| 212 <input type="text"/> | 212 <input type="text"/> |
| 213 <button class="i18n_options_button_add" type="submit"></bu tton> | 213 <button class="i18n_options_button_add" type="submit"></bu tton> |
| 214 </form> | 214 </form> |
| 215 </div> | 215 </div> |
| 216 <textarea id="custom-filters-raw"></textarea> | 216 <textarea id="custom-filters-raw"></textarea> |
| 217 </div> | 217 </div> |
| 218 <div id="custom-filters-edit-wrapper" class="controls"> | 218 <div id="custom-filters-edit-wrapper" class="controls"> |
| 219 <button id="custom-filters-edit-btn" data-show="edit"> | 219 <button id="custom-filters-show-edit"> |
|
Thomas Greiner
2015/07/09 11:07:55
Again, please avoid referring to specific UI eleme
Thomas Greiner
2015/07/09 11:07:55
The "data-show" attribute is no longer used here a
saroyanm
2015/07/09 16:31:41
Done.
saroyanm
2015/07/09 16:31:41
Done.
| |
| 220 <span class="icon icon-edit"></span> | 220 <span class="icon icon-edit"></span> |
| 221 <span class="i18n_options_customFilter_edit"></span> | 221 <span class="i18n_options_customFilter_edit"></span> |
| 222 </button> | 222 </button> |
| 223 <div id="custom-filters-raw-controls"> | 223 <div id="custom-filters-raw-controls"> |
| 224 <button id="custom-filters-list-btn" data-show="list"> | 224 <button> |
| 225 <span class="icon icon-edit"></span> | 225 <span class="icon icon-edit"></span> |
| 226 <span class="i18n_options_customFilter_list"></span> | 226 <span class="i18n_options_customFilter_list"></span> |
| 227 </button> | 227 </button> |
| 228 <button id="custom-filters-save-btn" data-show="list"> | 228 <button id="custom-filters-raw-save"> |
| 229 <span class="icon icon-edit"></span> | 229 <span class="icon icon-edit"></span> |
| 230 <span class="i18n_options_customFilter_save"></span> | 230 <span class="i18n_options_customFilter_save"></span> |
| 231 </button> | 231 </button> |
| 232 </div> | 232 </div> |
| 233 </div> | 233 </div> |
| 234 </div> | 234 </div> |
| 235 </div> | 235 </div> |
| 236 </div> | 236 </div> |
| 237 </div> | 237 </div> |
| 238 | 238 |
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 311 <div id="edit-ownBlockingList-button" class="button-wrapper"> | 311 <div id="edit-ownBlockingList-button" class="button-wrapper"> |
| 312 <span class="icon icon-arrow"></span> | 312 <span class="icon icon-arrow"></span> |
| 313 <span class="i18n_options_dialog_create_own_list"></span> | 313 <span class="i18n_options_dialog_create_own_list"></span> |
| 314 </div> | 314 </div> |
| 315 </div> | 315 </div> |
| 316 </div> | 316 </div> |
| 317 </div> | 317 </div> |
| 318 </div> | 318 </div> |
| 319 </body> | 319 </body> |
| 320 </html> | 320 </html> |
| LEFT | RIGHT |
« messageResponder.js ('k')
|
options.js » ('j')
|
Toggle Intra-line Diffs ('i')
|
Expand Comments ('e')
|
Collapse Comments ('c')
|
Toggle Comments ('s')
