Side by Side Diff: options.html
Issue 29333819:
Issue 2375 - Implement "Blocking lists" section in new options page (Closed)
Patch Set: Addressed Thomas comments
Created Jan. 22, 2016, 9:53 a.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« locale/en-US/options.json ('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 25 matching lines...) Expand all Loading... | |
| 36 <header id="page-title"> | 36 <header id="page-title"> |
| 37 <p class="i18n_options_page_header_1"></p> | 37 <p class="i18n_options_page_header_1"></p> |
| 38 <h1 class="i18n_options_page_header_2"></h1> | 38 <h1 class="i18n_options_page_header_2"></h1> |
| 39 </header> | 39 </header> |
| 40 <nav> | 40 <nav> |
| 41 <ul class="tabs vertical"> | 41 <ul class="tabs vertical"> |
| 42 <li id="tab-general" data-action="switch-tab" data-tab="general" cla ss="active"> | 42 <li id="tab-general" data-action="switch-tab" data-tab="general" cla ss="active"> |
| 43 <a class="i18n_options_tab_general"></a> | 43 <a class="i18n_options_tab_general"></a> |
| 44 <span class="icon"></span> | 44 <span class="icon"></span> |
| 45 </li> | 45 </li> |
| 46 <li id="tab-advanced" data-action="switch-tab" data-tab="advanced"> | 46 <li id="tab-advanced" data-action="switch-tab" data-tab="advanced,fi lter-lists"> |
| 47 <a class="i18n_options_tab_advanced"></a> | 47 <a class="i18n_options_tab_advanced"></a> |
| 48 <span class="icon"></span> | 48 <span class="icon"></span> |
| 49 </li> | 49 </li> |
| 50 <li id="tab-help" data-action="switch-tab" data-tab="help"> | 50 <li id="tab-help" data-action="switch-tab" data-tab="help"> |
| 51 <a class="i18n_options_tab_help"></a> | 51 <a class="i18n_options_tab_help"></a> |
| 52 <span class="icon"></span> | 52 <span class="icon"></span> |
| 53 </li> | 53 </li> |
| 54 </ul> | 54 </ul> |
| 55 </nav> | 55 </nav> |
| 56 <a id="link-version"> | 56 <a id="link-version"> |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 117 <img src="skin/tooltips/more.png" alt="" /> | 117 <img src="skin/tooltips/more.png" alt="" /> |
| 118 <p class="i18n_options_furtherBlocking_title_tooltip"></p> | 118 <p class="i18n_options_furtherBlocking_title_tooltip"></p> |
| 119 </div> | 119 </div> |
| 120 </div> | 120 </div> |
| 121 </div> | 121 </div> |
| 122 <div id="custom-wrapper"> | 122 <div id="custom-wrapper"> |
| 123 <ul id="recommend-list-table" class="table list"> | 123 <ul id="recommend-list-table" class="table list"> |
| 124 <template> | 124 <template> |
| 125 <input type="checkbox" class="control" /> | 125 <input type="checkbox" class="control" /> |
| 126 <span class="display"></span> | 126 <span class="display"></span> |
| 127 <span class="popular"></span> | 127 <span class="i18n_options_popular popular"></span> |
| 128 </template> | 128 </template> |
| 129 </ul> | 129 </ul> |
| 130 <ul id="custom-list-table" class="table list"> | 130 <ul id="custom-list-table" class="table list"> |
| 131 <template> | 131 <template> |
| 132 <input type="checkbox" class="control" /> | 132 <input type="checkbox" class="control" /> |
| 133 <span class="display"></span> | 133 <span class="display"></span> |
| 134 </template> | 134 </template> |
| 135 </ul> | 135 </ul> |
| 136 </div> | 136 </div> |
| 137 <div class="controls"> | 137 <div class="controls"> |
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 206 </div> | 206 </div> |
| 207 </div> | 207 </div> |
| 208 </div> | 208 </div> |
| 209 </div> | 209 </div> |
| 210 </div> | 210 </div> |
| 211 </div> | 211 </div> |
| 212 | 212 |
| 213 <!-- Advanced tab content --> | 213 <!-- Advanced tab content --> |
| 214 <div id="content-advanced"> | 214 <div id="content-advanced"> |
| 215 <div> | 215 <div> |
| 216 <h1><span class="i18n_options_tweaks_title"></span><a class="i18n_op tions_readMore tooltip" href="#"></a></h1> | 216 <h1> |
| 217 <ul class="table" style="width: auto;"> | 217 <span class="i18n_options_tweaks_title"></span> |
| 218 <a class="i18n_options_readMore tooltip" href="#"></a> | |
| 219 </h1> | |
| 220 <ul class="table"> | |
| 218 <li> | 221 <li> |
| 219 <input type="checkbox" id="easylist"/><span id="block-element-ex planation" class="i18n_options_tweaks_blockElement"></span></li> | 222 <input type="checkbox" id="easylist"/> |
| 223 <span id="block-element-explanation" class="i18n_options_tweaks_ blockElement"></span> | |
| 224 </li> | |
| 220 </ul> | 225 </ul> |
| 221 </div> | 226 </div> |
| 222 <div> | 227 <div> |
| 223 <h1><span class="i18n_options_blockingList_title"></span><a class="i 18n_options_readMore tooltip" href="#" target="_blank"></a></h1> | 228 <h1> |
| 224 <ul id="blocking-list-tabs" class="tabs horizontal"> | 229 <span class="i18n_options_blockingList_title"></span> |
| 225 <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> | 230 <a class="i18n_options_readMore tooltip" href="#"></a> |
| 231 </h1> | |
| 232 <ul class="tabs horizontal"> | |
| 233 <li class="i18n_options_tab_overview active" data-action="switch-t ab" data-tab="advanced,filter-lists"></li> | |
| 234 <li class="i18n_options_tab_ownList" data-action="switch-tab" data -tab="advanced,custom-filters"></li> | |
| 226 </ul> | 235 </ul> |
| 227 <div id="blocking-list"> | 236 <div id="blocking-lists"> |
| 228 <div id="blocking-list-overview"> | 237 <div id="filter-lists"> |
|
Thomas Greiner
2016/01/25 15:40:31
Detail: It's unclear what the difference between t
saroyanm
2016/01/26 18:36:17
Done, I also updated texts that contain blocking l
Thomas Greiner
2016/01/27 17:16:56
Awesome, thanks!
| |
| 229 <ul class="table cols" style="width: auto;"> | 238 <div class="table-header"> |
| 230 <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> | 239 <h3 class="i18n_options_tableCol_name"></h3> |
| 231 <li><input type="checkbox" id="easylist"/><span>Easylist</span ><span>Adblocking english sites</span><span>15 March 14 - 10:31</span></li> | 240 <h3 class="i18n_options_tableCol_date"></h3> |
| 232 <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> | 241 </div> |
| 233 <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> | 242 <ul class="table cols" id="blocking-lists-table"> |
| 234 <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> | 243 <template> |
| 235 <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> | 244 <input type="checkbox" class="control" /> |
| 245 <span> | |
| 246 <span data-action="open-context-menu" class="display"></sp an> | |
| 247 <div class="context-menu"> | |
| 248 <a href="#" data-action="open-context-menu" class="arrow "></a> | |
|
Thomas Greiner
2016/01/25 15:40:30
Detail: No need to set the "href" attribute here s
saroyanm
2016/01/26 18:36:18
Done, also removed from other non linking anchors
| |
| 249 <div class="container"> | |
| 250 <div class="content" data-action="no-action"> | |
| 251 <a class="i18n_options_blockingList_updateNow update -now" data-action="update-now"></a> | |
| 252 <a class="i18n_options_blockingList_website website" target="_blank" data-action="website"></a> | |
| 253 <a class="i18n_options_blockingList_source source" t arget="_blank" data-action="source"></a> | |
| 254 <a class="i18n_options_blockingList_delete delete" d ata-action="delete"></a> | |
| 255 </div> | |
| 256 </div> | |
| 257 </div> | |
| 258 </span> | |
| 259 <span class="date"></span> | |
| 260 <span class="time"></span> | |
| 261 </template> | |
| 262 <li class="static"> | |
| 263 <input type="checkbox" id="own-list" checked="true" disabled ="true" /> | |
|
Thomas Greiner
2016/01/25 15:40:31
Detail: It doesn't seem you're using this ID here
saroyanm
2016/01/26 18:36:17
Done.
| |
| 264 <span> | |
| 265 <span class="i18n_options_blockingList_own_list"></span> | |
| 266 </span> | |
| 267 <span data-action="switch-tab,edit-custom-filters" data-tab= "advanced,custom-filters"> | |
| 268 <a class="i18n_options_blockingList_edit_own_list" href="# "></a> | |
| 269 </span> | |
| 270 </li> | |
| 236 </ul> | 271 </ul> |
| 237 <div class="controls"> | 272 <div class="controls"> |
| 238 <button> | 273 <button data-action="open-dialog" data-dialog="custom"> |
| 239 <span class="icon icon-add"></span><span class="i18n_options _blockingList_add"></span> | 274 <span class="icon icon-add"></span><span class="i18n_options _blockingList_add"></span> |
| 240 </button> | 275 </button> |
| 241 <button> | 276 <button data-action="update-all-subscriptions"> |
| 242 <span class="icon icon-update"></span><span class="i18n_opti ons_blockingList_update"></span> | 277 <span class="icon icon-update"></span><span class="i18n_opti ons_blockingList_update"></span> |
| 243 </button> | 278 </button> |
| 244 </div> | 279 </div> |
| 245 </div> | 280 </div> |
| 246 <div id="custom-filters"> | 281 <div id="custom-filters"> |
| 247 <h2 id="custom-filters-header" class="i18n_options_customFilters _title"></h2> | 282 <h2 id="custom-filters-header" class="i18n_options_customFilters _title"></h2> |
|
Thomas Greiner
2016/01/25 15:40:30
Why are you using `<h2>` here while you're using `
saroyanm
2016/01/26 18:36:18
Done.
| |
| 248 <div id="custom-filters-wrapper"> | 283 <div id="custom-filters-wrapper"> |
| 249 <div id="custom-filters-list-wrapper"> | 284 <div id="custom-filters-list-wrapper"> |
| 250 <ul id="custom-filters-table" class="table list"> | 285 <ul id="custom-filters-table" class="table list"> |
| 251 <template> | 286 <template> |
| 252 <span class="display"></span> | 287 <span class="display"></span> |
| 253 </template> | 288 </template> |
| 254 </ul> | 289 </ul> |
| 255 <form id="custom-filters-add" class="controls"> | 290 <form id="custom-filters-add" class="controls"> |
| 256 <input type="text"/> | 291 <input type="text"/> |
| 257 <button class="i18n_options_button_add" type="submit"></bu tton> | 292 <button class="i18n_options_button_add" type="submit"></bu tton> |
| (...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 325 </ul> | 360 </ul> |
| 326 </div> | 361 </div> |
| 327 <div id="other-language" class="dialog-content-block"> | 362 <div id="other-language" class="dialog-content-block"> |
| 328 <div> | 363 <div> |
| 329 <label for="find-language" class="i18n_options_dialog_language_oth er"></label> | 364 <label for="find-language" class="i18n_options_dialog_language_oth er"></label> |
| 330 <input type="search" id="find-language" class="default-focus" /> | 365 <input type="search" id="find-language" class="default-focus" /> |
| 331 </div> | 366 </div> |
| 332 <ul id="all-lang-table" class="table list"> | 367 <ul id="all-lang-table" class="table list"> |
| 333 <template> | 368 <template> |
| 334 <button class="button-add control"> | 369 <button class="button-add control"> |
| 335 +<span></span> | 370 +<span class="i18n_options_button_add"></span> |
| 336 </button> | 371 </button> |
| 337 <span class="display"></span> | 372 <span class="display"></span> |
| 338 </template> | 373 </template> |
| 339 </ul> | 374 </ul> |
| 340 </div> | 375 </div> |
| 341 </div> | 376 </div> |
| 342 <!-- Add custom subscription --> | 377 <!-- Add custom subscription --> |
| 343 <div id="dialog-content-custom" class="dialog-content"> | 378 <div id="dialog-content-custom" class="dialog-content"> |
| 344 <div class="dialog-content-block"> | 379 <div class="dialog-content-block"> |
| 345 <div> | 380 <div> |
| 346 <label for="blockingList-textbox" class="i18n_options_dialog_custo m_subscription_title"></label> | 381 <label for="blockingList-textbox" class="i18n_options_dialog_custo m_subscription_title"></label> |
| 347 <input id="blockingList-textbox" type="text" class="default-focus" placeholder="www.example.com/blockinglist.txt" /> | 382 <input id="blockingList-textbox" type="text" class="default-focus" placeholder="www.example.com/blockinglist.txt" /> |
| 348 </div> | 383 </div> |
| 349 <button class="i18n_options_dialog_custom_import" data-action="impor t-subscription"></button> | 384 <button class="i18n_options_dialog_custom_import" data-action="impor t-subscription"></button> |
| 350 </div> | 385 </div> |
| 351 <div class="dialog-content-block"> | 386 <div class="dialog-content-block"> |
| 352 <h3 class="i18n_options_dialog_edit_own_list"></h3> | 387 <h3 class="i18n_options_dialog_edit_own_list"></h3> |
| 353 <button class="i18n_options_dialog_create_own_list" data-action="clo se-dialog,switch-tab,edit-custom-filters" data-tab="advanced"></button> | 388 <button class="i18n_options_dialog_create_own_list" data-action="clo se-dialog,switch-tab,edit-custom-filters" data-tab="advanced,custom-filters"></b utton> |
| 354 </div> | 389 </div> |
| 355 </div> | 390 </div> |
| 356 <!-- Add predefined subscription --> | 391 <!-- Add predefined subscription --> |
| 357 <div id="dialog-content-predefined" class="dialog-content"> | 392 <div id="dialog-content-predefined" class="dialog-content"> |
| 358 <div class="dialog-content-block"> | 393 <div class="dialog-content-block"> |
| 359 <h3></h3> | 394 <h3></h3> |
| 360 <div class="url"></div> | 395 <div class="url"></div> |
| 361 <button class="i18n_options_dialog_predefined_confirm default-focus" data-action="add-predefined-subscription"></button> | 396 <button class="i18n_options_dialog_predefined_confirm default-focus" data-action="add-predefined-subscription"></button> |
| 362 </div> | 397 </div> |
| 363 </div> | 398 </div> |
| 364 </div> | 399 </div> |
| 365 <!-- Placeholder element to determine when to wrap focus around --> | 400 <!-- Placeholder element to determine when to wrap focus around --> |
| 366 <span class="focus-last" tabindex="0"></span> | 401 <span class="focus-last" tabindex="0"></span> |
| 367 </div> | 402 </div> |
| 368 </body> | 403 </body> |
| 369 </html> | 404 </html> |
| OLD | NEW |
« locale/en-US/options.json ('K')
|
« messageResponder.js ('k')
|
options.js » ('j')
|
options.js » ('J')
