Side by Side Diff: options.html
Issue 29321198:
Issue 2376 - Implement custom filters in new options page (Closed)
Patch Set: Addressed initial comments
Created July 8, 2015, 6:13 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« messageResponder.js ('K')
|
« messageResponder.js ('k')
|
options.js » ('j')
|
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-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 160 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 171 <div> | 171 <div> |
| 172 <h1><span class="i18n_options_tweaks_title"></span><a class="i18n_op tions_readMore tooltip" href="#"></a></h1> | 172 <h1><span class="i18n_options_tweaks_title"></span><a class="i18n_op tions_readMore tooltip" href="#"></a></h1> |
| 173 <ul class="table" style="width: auto;"> | 173 <ul class="table" style="width: auto;"> |
| 174 <li> | 174 <li> |
| 175 <input type="checkbox" id="easylist"/><span id="block-element-ex planation" class="i18n_options_tweaks_blockElement"></span></li> | 175 <input type="checkbox" id="easylist"/><span id="block-element-ex planation" class="i18n_options_tweaks_blockElement"></span></li> |
| 176 </ul> | 176 </ul> |
| 177 </div> | 177 </div> |
| 178 <div> | 178 <div> |
| 179 <h1><span class="i18n_options_blockingList_title"></span><a class="i 18n_options_readMore tooltip" href="#" target="_blank"></a></h1> | 179 <h1><span class="i18n_options_blockingList_title"></span><a class="i 18n_options_readMore tooltip" href="#" target="_blank"></a></h1> |
| 180 <ul id="blocking-list-tabs" class="tabs horizontal"> | 180 <ul id="blocking-list-tabs" class="tabs horizontal"> |
| 181 <li class="i18n_options_tab_overview active" data-show="blocking-l ist-overview"></li><li class="i18n_options_tab_ownList" data-show="blocking-list -own"></li> | 181 <li class="i18n_options_tab_overview active" data-show="blocking-l ist-overview"></li><li class="i18n_options_tab_ownList" data-show="custom-filter s"></li> |
| 182 </ul> | 182 </ul> |
| 183 <div id="blocking-list"> | 183 <div id="blocking-list"> |
| 184 <div id="blocking-list-overview"> | 184 <div id="blocking-list-overview"> |
| 185 <ul class="table cols" style="width: auto;"> | 185 <ul class="table cols" style="width: auto;"> |
| 186 <li class="col-name"><span class="i18n_options_tableCol_name"> </span><span class="i18n_options_tableCol_description"></span><span class="i18n_ options_tableCol_date"></span></li> | 186 <li class="col-name"><span class="i18n_options_tableCol_name"> </span><span class="i18n_options_tableCol_description"></span><span class="i18n_ options_tableCol_date"></span></li> |
| 187 <li><input type="checkbox" id="easylist"/><span>Easylist</span ><span>Adblocking english sites</span><span>15 March 14 - 10:31</span></li> | 187 <li><input type="checkbox" id="easylist"/><span>Easylist</span ><span>Adblocking english sites</span><span>15 March 14 - 10:31</span></li> |
| 188 <li><input type="checkbox" id="easylist+de"/><span>Easylist Ge rmany + Easylist</span><span>Adblocking english + german sites</span><span>15 Ma rch 14 - 10:31</span></li> | 188 <li><input type="checkbox" id="easylist+de"/><span>Easylist Ge rmany + Easylist</span><span>Adblocking english + german sites</span><span>15 Ma rch 14 - 10:31</span></li> |
| 189 <li><input type="checkbox" id="annoyance-fb"/><span>Facebook a nnoyance blocker</span><span>Blocks Facebook annoyances</span><span>15 March 14 - 10:31</span></li> | 189 <li><input type="checkbox" id="annoyance-fb"/><span>Facebook a nnoyance blocker</span><span>Blocks Facebook annoyances</span><span>15 March 14 - 10:31</span></li> |
| 190 <li><input type="checkbox" id="annoyance-youtube"/><span>Faceb ook annoyance blocker</span><span>Blocks Facebook annoyances</span><span>15 Marc h 14 - 10:31</span></li> | 190 <li><input type="checkbox" id="annoyance-youtube"/><span>Faceb ook annoyance blocker</span><span>Blocks Facebook annoyances</span><span>15 Marc h 14 - 10:31</span></li> |
| 191 <li><input type="checkbox" id="own-list"/><span>Own blocking l ist</span><span>Your own blocking list</span><span><a href="#">edit your blockin g list</a></span></li> | 191 <li><input type="checkbox" id="own-list"/><span>Own blocking l ist</span><span>Your own blocking list</span><span><a href="#">edit your blockin g list</a></span></li> |
| 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="blocking-list-own"> | 202 <div id="custom-filters" data-view="list"> |
|
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 <p class="i18n_options_blockingRules"></p> | 203 <h2 id="custom-filters-header" class="i18n_options_customFilters _title"></h2> |
| 204 <ul class="table list"> | 204 <div id="custom-filters-wrapper"> |
| 205 <li><span>zap2it.com##.zc-station-position</span></li> | 205 <div id="custom-filters-list-wrapper"> |
| 206 <li><span>downturk.net##.zippo</span></li> | 206 <ul id="custom-filters-table" class="table list"> |
| 207 <li><span>yahoo.com##.y708-promo-middle</span></li> | 207 <template> |
| 208 <li><span>reflector.com##.yahooboss</span></li> | 208 <span class="display"></span> |
| 209 <li><span>yardbarker.com##.yard_leader</span></li> | 209 </template> |
| 210 <li><span>espn.co.uk##.will_hill</span></li> | 210 </ul> |
| 211 <li><span>listverse.com##.wiki</span></li> | 211 <form id="custom-filter-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 <li><span>planet5d.com##.wp-image-1573</span></li> | 212 <input type="text"/> |
| 213 <li><span>buzzinn.net##.wpn_finner</span></li> | 213 <button class="i18n_options_button_add" type="submit"></bu tton> |
| 214 <li><span>talkers.com##.wpss_slideshow</span></li> | 214 </form> |
| 215 </ul> | |
| 216 <div class="controls" style="margin: 0px;"> | |
| 217 <input type="text" placeholder="add your blocking rule here"/> | |
| 218 <div class="input-control"> | |
| 219 <span class="input-separator"></span> | |
| 220 <span class="i18n_options_button_add input-button-text"></sp an> | |
| 221 <span class="icon icon-enter-blue"></span> | |
| 222 </div> | 215 </div> |
| 216 <textarea id="custom-filters-raw"></textarea> | |
| 223 </div> | 217 </div> |
| 224 <div class="controls"> | 218 <div id="custom-filters-edit-wrapper" class="controls"> |
| 225 <button> | 219 <button id="custom-filters-edit-btn" data-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.
| |
| 226 <span class="icon icon-edit"></span> | 220 <span class="icon icon-edit"></span> |
| 227 <span class="i18n_options_blockingRules_edit"></span> | 221 <span class="i18n_options_customFilter_edit"></span> |
| 228 </button> | 222 </button> |
| 223 <div id="custom-filters-raw-controls"> | |
| 224 <button id="custom-filters-list-btn" data-show="list"> | |
| 225 <span class="icon icon-edit"></span> | |
| 226 <span class="i18n_options_customFilter_list"></span> | |
| 227 </button> | |
| 228 <button id="custom-filters-save-btn" data-show="list"> | |
| 229 <span class="icon icon-edit"></span> | |
| 230 <span class="i18n_options_customFilter_save"></span> | |
| 231 </button> | |
| 232 </div> | |
| 229 </div> | 233 </div> |
| 230 </div> | 234 </div> |
| 231 </div> | 235 </div> |
| 232 </div> | 236 </div> |
| 233 </div> | 237 </div> |
| 234 | 238 |
| 235 <!-- Help tab content --> | 239 <!-- Help tab content --> |
| 236 <div id="content-help"> | 240 <div id="content-help"> |
| 237 <h1 class="i18n_options_faq_title"></h1> | 241 <h1 class="i18n_options_faq_title"></h1> |
| 238 <p class="i18n_options_faq_description"></p> | 242 <p class="i18n_options_faq_description"></p> |
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 307 <div id="edit-ownBlockingList-button" class="button-wrapper"> | 311 <div id="edit-ownBlockingList-button" class="button-wrapper"> |
| 308 <span class="icon icon-arrow"></span> | 312 <span class="icon icon-arrow"></span> |
| 309 <span class="i18n_options_dialog_create_own_list"></span> | 313 <span class="i18n_options_dialog_create_own_list"></span> |
| 310 </div> | 314 </div> |
| 311 </div> | 315 </div> |
| 312 </div> | 316 </div> |
| 313 </div> | 317 </div> |
| 314 </div> | 318 </div> |
| 315 </body> | 319 </body> |
| 316 </html> | 320 </html> |
| OLD | NEW |
