Side by Side Diff: options.html
Issue 29336364:
issue 2377 - Finish design of Advanced tab of new options page (Closed)
Patch Set:
Created April 28, 2016, 1 p.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« locale/en-US/options.json ('k')
|
skin/options.css » ('j')
|
no next file with comments »
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-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 195 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" class="tab-content"> | 214 <div id="content-advanced" class="tab-content"> |
| 215 <div> | 215 <div> |
| 216 <h1> | 216 <h1 class="i18n_options_tweaks_title"></h1> |
| 217 <span class="i18n_options_tweaks_title"></span> | |
| 218 <a class="i18n_options_readMore tooltip"></a> | |
| 219 </h1> | |
| 220 <ul id="tweaks" class="table"> | 217 <ul id="tweaks" class="table"> |
| 221 <li data-pref="shouldShowBlockElementMenu"> | 218 <li data-pref="shouldShowBlockElementMenu"> |
| 222 <label> | 219 <label> |
| 223 <button role="checkbox" data-action="toggle-pref"></button> | 220 <button role="checkbox" data-action="toggle-pref"></button> |
| 224 <span class="i18n_options_tweaks_blockElement"></span> | 221 <span class="i18n_options_tweaks_blockElement"></span> |
| 225 </label> | 222 </label> |
| 226 </li> | 223 </li> |
| 227 <li data-pref="show_devtools_panel"> | 224 <li data-pref="show_devtools_panel"> |
| 228 <label> | 225 <label> |
| 229 <button role="checkbox" data-action="toggle-pref"></button> | 226 <button role="checkbox" data-action="toggle-pref"></button> |
| (...skipping 12 matching lines...) Expand all Loading... | |
| 242 <span class="i18n_options_tweaks_safariContentBlocker"></span> | 239 <span class="i18n_options_tweaks_safariContentBlocker"></span> |
| 243 </label> | 240 </label> |
| 244 <span id="restart-safari" class="i18n_options_tweaks_restartSafa ri"></span> | 241 <span id="restart-safari" class="i18n_options_tweaks_restartSafa ri"></span> |
| 245 </li> | 242 </li> |
| 246 </ul> | 243 </ul> |
| 247 </div> | 244 </div> |
| 248 | 245 |
| 249 <div> | 246 <div> |
| 250 <h1> | 247 <h1> |
| 251 <span class="i18n_options_filterList_title"></span> | 248 <span class="i18n_options_filterList_title"></span> |
| 252 <a class="i18n_options_readMore tooltip"></a> | 249 <div class="tooltip"> |
| 250 <span class="i18n_options_readMore"></span> | |
| 251 <div role="tooltip"> | |
| 252 <p class="i18n_options_filterList_title_tooltip"></p> | |
| 253 <div class="notes"> | |
| 254 <p class="i18n_options_filterList_title_tooltip_notes_1"></p > | |
| 255 <p class="i18n_options_filterList_title_tooltip_notes_2"></p > | |
| 256 </div> | |
| 257 </div> | |
| 258 </div> | |
| 253 </h1> | 259 </h1> |
| 254 <ul class="tabs horizontal"> | 260 <ul class="tabs horizontal"> |
| 255 <li class="i18n_options_tab_overview active" data-action="switch-t ab" data-tab="advanced-allFilterLists"></li> | 261 <li class="i18n_options_tab_overview active" data-action="switch-t ab" data-tab="advanced-allFilterLists"></li> |
| 256 <li class="i18n_options_tab_ownList" data-action="switch-tab" data -tab="advanced-customFilters"></li> | 262 <li class="i18n_options_tab_ownList" data-action="switch-tab" data -tab="advanced-customFilters"></li> |
| 257 </ul> | 263 </ul> |
| 258 <div id="filter-lists"> | 264 <div id="filter-lists"> |
| 259 <div id="all-filter-lists"> | 265 <div id="all-filter-lists"> |
| 260 <div class="table-header"> | 266 <div class="table-header"> |
| 261 <h3 class="i18n_options_column_name"></h3> | 267 <h2 class="i18n_options_column_name"></h2> |
| 262 <h3 class="i18n_options_column_date"></h3> | 268 <h2 class="i18n_options_column_date"></h2> |
| 263 </div> | 269 </div> |
| 264 <ul class="table cols" id="all-filter-lists-table"> | 270 <ul class="table cols" id="all-filter-lists-table"> |
| 265 <template> | 271 <template> |
| 266 <button role="checkbox" class="control"></button> | 272 <button role="checkbox" class="control"></button> |
| 267 <div> | 273 <div> |
| 268 <label data-action="open-context-menu" class="display"></l abel> | 274 <label data-action="open-context-menu" class="display"></l abel> |
| 269 <div data-action="open-context-menu" class="arrow"> | 275 <div data-action="open-context-menu" class="arrow"> |
| 270 <div class="context-menu"> | 276 <div class="context-menu"> |
| 271 <div class="content"> | 277 <div class="content"> |
| 272 <a class="i18n_options_filterList_updateNow update-s ubscription" data-action="update-subscription"></a> | 278 <a class="i18n_options_filterList_updateNow update-s ubscription" data-action="update-subscription"></a> |
| 273 <a class="i18n_options_filterList_website website" t arget="_blank"></a> | 279 <a class="i18n_options_filterList_website website" t arget="_blank"></a> |
| 274 <a class="i18n_options_filterList_source source" tar get="_blank"></a> | 280 <a class="i18n_options_filterList_source source" tar get="_blank"></a> |
| 275 <a class="i18n_options_filterList_delete delete" dat a-action="remove-subscription"></a> | 281 <a class="i18n_options_filterList_delete delete" dat a-action="remove-subscription"></a> |
| 276 </div> | 282 </div> |
| 277 </div> | 283 </div> |
| 278 </div> | 284 </div> |
| 279 </div> | 285 </div> |
| 280 <span class="date"></span> | 286 <span class="date"></span> |
| 281 <span class="time"></span> | 287 <span class="time"></span> |
| 282 <span class="message"></span> | 288 <span class="message"></span> |
| 283 </template> | 289 </template> |
| 284 <li class="static"> | 290 <li class="static"> |
| 285 <button role="checkbox" class="control" aria-checked="true" disabled="true"></button> | 291 <button id="own-list" role="checkbox" class="control" aria-c hecked="true" disabled="true"></button> |
| 286 <div> | 292 <div> |
| 287 <label class="i18n_options_filterList_own_list"></label> | 293 <label for="own-list" class="i18n_options_filterList_own_l ist"></label> |
| 288 </div> | 294 </div> |
| 289 <span data-action="switch-tab,edit-custom-filters" data-tab= "advanced-customFilters"> | 295 <span data-action="switch-tab,edit-custom-filters" data-tab= "advanced-customFilters"> |
| 290 <a class="i18n_options_filterList_edit_own_list"></a> | 296 <a class="i18n_options_filterList_edit_own_list"></a> |
| 291 </span> | 297 </span> |
| 292 </li> | 298 </li> |
| 293 </ul> | 299 </ul> |
| 294 <div class="controls"> | 300 <div class="controls"> |
| 295 <button data-action="open-dialog" data-dialog="custom"> | 301 <button data-action="open-dialog" data-dialog="custom"> |
| 296 <span class="icon icon-add"></span> | 302 <span class="icon icon-add"></span> |
| 297 <span class="i18n_options_filterList_add"></span> | 303 <span class="i18n_options_filterList_add"></span> |
| 298 </button> | 304 </button> |
| 299 <button data-action="update-all-subscriptions"> | 305 <button data-action="update-all-subscriptions"> |
| 300 <span class="icon icon-update"></span> | 306 <span class="icon icon-update"></span> |
| 301 <span class="i18n_options_filterList_update"></span> | 307 <span class="i18n_options_filterList_update"></span> |
| 302 </button> | 308 </button> |
| 303 </div> | 309 </div> |
| 304 </div> | 310 </div> |
| 305 <div id="custom-filters"> | 311 <div id="custom-filters"> |
| 306 <h3 id="custom-filters-header" class="i18n_options_customFilters _title"></h3> | 312 <h2 id="custom-filters-header"> |
| 313 <span class="i18n_options_customFilters_title"></span> | |
| 314 <div class="tooltip"> | |
| 315 <span class="i18n_options_readMore"></span> | |
| 316 <div role="tooltip"> | |
| 317 <p class="i18n_options_customFilters_title_tooltip"></p> | |
| 318 </div> | |
| 319 </div> | |
| 320 </h2> | |
| 307 <div id="custom-filters-wrapper"> | 321 <div id="custom-filters-wrapper"> |
| 308 <div id="custom-filters-list-wrapper"> | 322 <div id="custom-filters-list-wrapper"> |
| 309 <ul id="custom-filters-table" class="table list"> | 323 <ul id="custom-filters-table" class="table list"> |
| 310 <template> | 324 <template> |
| 311 <label class="display"></label> | 325 <label class="display"></label> |
| 312 </template> | 326 </template> |
| 313 </ul> | 327 </ul> |
| 314 <form id="custom-filters-add" class="controls"> | 328 <form id="custom-filters-add" class="controls"> |
| 315 <input type="text"/> | 329 <input type="text"/> |
| 316 <button class="i18n_options_button_add" type="submit"></bu tton> | 330 <button class="i18n_options_button_add" type="submit"></bu tton> |
| 317 </form> | 331 </form> |
| 318 </div> | 332 </div> |
| 319 <textarea id="custom-filters-raw"></textarea> | 333 <textarea id="custom-filters-raw"></textarea> |
| 320 </div> | 334 </div> |
| 321 <div id="custom-filters-edit-wrapper" class="controls"> | 335 <div id="custom-filters-edit-wrapper" class="controls"> |
| 322 <button id="custom-filters-show-edit" data-action="edit-custom -filters"> | 336 <button id="custom-filters-show-edit" data-action="edit-custom -filters"> |
| 323 <span class="icon icon-edit"></span> | 337 <span class="icon icon-edit"></span> |
| 324 <span class="i18n_options_customFilter_edit"></span> | 338 <span class="i18n_options_customFilter_edit"></span> |
| 325 </button> | 339 </button> |
| 326 <div id="custom-filters-raw-controls"> | 340 <div id="custom-filters-raw-controls"> |
| 341 <button id="custom-filters-raw-save" data-action="save-custo m-filters"> | |
| 342 <span class="icon icon-save"></span> | |
| 343 <span class="i18n_options_customFilter_save"></span> | |
| 344 </button> | |
| 327 <button data-action="cancel-custom-filters"> | 345 <button data-action="cancel-custom-filters"> |
| 328 <span class="icon icon-edit"></span> | 346 <span class="icon icon-cancel"></span> |
| 329 <span class="i18n_options_customFilter_list"></span> | 347 <span class="i18n_options_customFilter_cancel"></span> |
| 330 </button> | |
| 331 <button id="custom-filters-raw-save" data-action="save-custo m-filters"> | |
| 332 <span class="icon icon-edit"></span> | |
| 333 <span class="i18n_options_customFilter_save"></span> | |
| 334 </button> | 348 </button> |
| 335 </div> | 349 </div> |
| 336 </div> | 350 </div> |
| 337 </div> | 351 </div> |
| 338 </div> | 352 </div> |
| 339 </div> | 353 </div> |
| 340 </div> | 354 </div> |
| 341 | 355 |
| 342 <!-- Help tab content --> | 356 <!-- Help tab content --> |
| 343 <div id="content-help" class="tab-content"> | 357 <div id="content-help" class="tab-content"> |
| (...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 419 <div class="url"></div> | 433 <div class="url"></div> |
| 420 <button class="i18n_options_dialog_predefined_confirm default-focus" data-action="add-predefined-subscription"></button> | 434 <button class="i18n_options_dialog_predefined_confirm default-focus" data-action="add-predefined-subscription"></button> |
| 421 </div> | 435 </div> |
| 422 </div> | 436 </div> |
| 423 </div> | 437 </div> |
| 424 <!-- Placeholder element to determine when to wrap focus around --> | 438 <!-- Placeholder element to determine when to wrap focus around --> |
| 425 <span class="focus-last" tabindex="0"></span> | 439 <span class="focus-last" tabindex="0"></span> |
| 426 </div> | 440 </div> |
| 427 </body> | 441 </body> |
| 428 </html> | 442 </html> |
| OLD | NEW |
« no previous file with comments
|
« locale/en-US/options.json ('k')
|
skin/options.css » ('j')
|
no next file with comments »
