Side by Side Diff: options.html
Issue 29336364:
issue 2377 - Finish design of Advanced tab of new options page (Closed)
Patch Set: Addressed Thomas and Wladimir comments
Created Feb. 24, 2016, 11:19 a.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> | 217 <ul id="tweaks" class="table"> |
| 218 <a class="i18n_options_readMore tooltip"></a> | |
| 219 </h1> | |
| 220 <ul class="table"> | |
| 221 <li> | 218 <li> |
| 222 <button role="checkbox" id="easylist"></button> | 219 <button role="checkbox" id="easylist"></button> |
| 223 <span id="block-element-explanation" class="i18n_options_tweaks_ blockElement"></span> | 220 <span id="block-element-explanation" class="i18n_options_tweaks_ blockElement"></span> |
| 224 </li> | 221 </li> |
| 225 </ul> | 222 </ul> |
| 226 </div> | 223 </div> |
| 227 <div> | 224 <div> |
| 228 <h1> | 225 <h1 class="with-description"> |
| 229 <span class="i18n_options_filterList_title"></span> | 226 <span class="i18n_options_filterList_title"></span> |
| 230 <a class="i18n_options_readMore tooltip"></a> | 227 <div class="tooltip"> |
| 228 <span class="i18n_options_readMore"></span> | |
| 229 <div role="tooltip"> | |
| 230 <p class="i18n_options_filterList_title_tooltip"></p> | |
| 231 <div class="notes"> | |
| 232 <p class="i18n_options_filterList_title_tooltip_notes_1"></p > | |
| 233 <p class="i18n_options_filterList_title_tooltip_notes_2"></p > | |
| 234 </div> | |
| 235 </div> | |
| 236 </div> | |
| 231 </h1> | 237 </h1> |
| 232 <ul class="tabs horizontal"> | 238 <ul class="tabs horizontal"> |
| 233 <li class="i18n_options_tab_overview active" data-action="switch-t ab" data-tab="advanced-allFilterLists"></li> | 239 <li class="i18n_options_tab_overview active" data-action="switch-t ab" data-tab="advanced-allFilterLists"></li> |
| 234 <li class="i18n_options_tab_ownList" data-action="switch-tab" data -tab="advanced-customFilters"></li> | 240 <li class="i18n_options_tab_ownList" data-action="switch-tab" data -tab="advanced-customFilters"></li> |
| 235 </ul> | 241 </ul> |
| 236 <div id="filter-lists"> | 242 <div id="filter-lists"> |
| 237 <div id="all-filter-lists"> | 243 <div id="all-filter-lists"> |
| 238 <div class="table-header"> | 244 <div class="table-header"> |
| 239 <h3 class="i18n_options_column_name"></h3> | 245 <h2 class="i18n_options_column_name"></h2> |
| 240 <h3 class="i18n_options_column_date"></h3> | 246 <h2 class="i18n_options_column_date"></h2> |
| 241 </div> | 247 </div> |
| 242 <ul class="table cols" id="all-filter-lists-table"> | 248 <ul class="table cols" id="all-filter-lists-table"> |
| 243 <template> | 249 <template> |
| 244 <button role="checkbox" class="control"></button> | 250 <button role="checkbox" class="control"></button> |
| 245 <div> | 251 <div> |
| 246 <span data-action="open-context-menu" class="display"></sp an> | 252 <span data-action="open-context-menu" class="display"></sp an> |
| 247 <div data-action="open-context-menu" class="arrow"> | 253 <div data-action="open-context-menu" class="arrow"> |
| 248 <div class="context-menu"> | 254 <div class="context-menu"> |
| 249 <div class="content"> | 255 <div class="content"> |
| 250 <a class="i18n_options_filterList_updateNow update-s ubscription" data-action="update-subscription"></a> | 256 <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> | 257 <a class="i18n_options_filterList_website website" t arget="_blank"></a> |
| 252 <a class="i18n_options_filterList_source source" tar get="_blank"></a> | 258 <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> | 259 <a class="i18n_options_filterList_delete delete" dat a-action="remove-subscription"></a> |
| 254 </div> | 260 </div> |
| 255 </div> | 261 </div> |
| 256 </div> | 262 </div> |
| 257 </div> | 263 </div> |
| 258 <span class="date"></span> | 264 <span class="date"></span> |
| 259 <span class="time"></span> | 265 <span class="time"></span> |
| 260 <span class="message"></span> | 266 <span class="message"></span> |
| 261 </template> | 267 </template> |
| 262 <li class="static"> | 268 <li class="static"> |
| 263 <button role="checkbox" class="control" aria-checked="true" disabled="true"></button> | 269 <button role="checkbox" class="control" aria-checked="true" disabled="true"></button> |
| 264 <div> | 270 <div> |
| 265 <span class="i18n_options_filterList_own_list"></span> | 271 <strong class="i18n_options_filterList_own_list"></strong> |
| 266 </div> | 272 </div> |
| 267 <span data-action="switch-tab,edit-custom-filters" data-tab= "advanced-customFilters"> | 273 <span data-action="switch-tab,edit-custom-filters" data-tab= "advanced-customFilters"> |
| 268 <a class="i18n_options_filterList_edit_own_list"></a> | 274 <a class="i18n_options_filterList_edit_own_list"></a> |
| 269 </span> | 275 </span> |
| 270 </li> | 276 </li> |
| 271 </ul> | 277 </ul> |
| 272 <div class="controls"> | 278 <div class="controls"> |
| 273 <button data-action="open-dialog" data-dialog="custom"> | 279 <button data-action="open-dialog" data-dialog="custom"> |
| 274 <span class="icon icon-add"></span> | 280 <span class="icon icon-add"></span> |
| 275 <span class="i18n_options_filterList_add"></span> | 281 <span class="i18n_options_filterList_add"></span> |
| 276 </button> | 282 </button> |
| 277 <button data-action="update-all-subscriptions"> | 283 <button data-action="update-all-subscriptions"> |
| 278 <span class="icon icon-update"></span> | 284 <span class="icon icon-update"></span> |
| 279 <span class="i18n_options_filterList_update"></span> | 285 <span class="i18n_options_filterList_update"></span> |
| 280 </button> | 286 </button> |
| 281 </div> | 287 </div> |
| 282 </div> | 288 </div> |
| 283 <div id="custom-filters"> | 289 <div id="custom-filters"> |
| 284 <h3 id="custom-filters-header" class="i18n_options_customFilters _title"></h3> | 290 <h2 id="custom-filters-header" class="with-description"> |
| 291 <span class="i18n_options_customFilters_title"></span> | |
| 292 <div class="tooltip"> | |
| 293 <span class="i18n_options_readMore"></span> | |
| 294 <div role="tooltip"> | |
| 295 <p class="i18n_options_customFilters_title_tooltip"></p> | |
| 296 </div> | |
| 297 </div> | |
| 298 </h2> | |
| 285 <div id="custom-filters-wrapper"> | 299 <div id="custom-filters-wrapper"> |
| 286 <div id="custom-filters-list-wrapper"> | 300 <div id="custom-filters-list-wrapper"> |
| 287 <ul id="custom-filters-table" class="table list"> | 301 <ul id="custom-filters-table" class="table list"> |
| 288 <template> | 302 <template> |
| 289 <span class="display"></span> | 303 <span class="display"></span> |
| 290 </template> | 304 </template> |
| 291 </ul> | 305 </ul> |
| 292 <form id="custom-filters-add" class="controls"> | 306 <form id="custom-filters-add" class="controls"> |
| 293 <input type="text"/> | 307 <input type="text"/> |
| 294 <button class="i18n_options_button_add" type="submit"></bu tton> | 308 <button class="i18n_options_button_add" type="submit"></bu tton> |
| 295 </form> | 309 </form> |
| 296 </div> | 310 </div> |
| 297 <textarea id="custom-filters-raw"></textarea> | 311 <textarea id="custom-filters-raw"></textarea> |
| 298 </div> | 312 </div> |
| 299 <div id="custom-filters-edit-wrapper" class="controls"> | 313 <div id="custom-filters-edit-wrapper" class="controls"> |
| 300 <button id="custom-filters-show-edit" data-action="edit-custom -filters"> | 314 <button id="custom-filters-show-edit" data-action="edit-custom -filters"> |
| 301 <span class="icon icon-edit"></span> | 315 <span class="icon icon-edit"></span> |
| 302 <span class="i18n_options_customFilter_edit"></span> | 316 <span class="i18n_options_customFilter_edit"></span> |
| 303 </button> | 317 </button> |
| 304 <div id="custom-filters-raw-controls"> | 318 <div id="custom-filters-raw-controls"> |
| 319 <button id="custom-filters-raw-save" data-action="save-custo m-filters"> | |
| 320 <span class="icon icon-save"></span> | |
| 321 <span class="i18n_options_customFilter_save"></span> | |
| 322 </button> | |
| 305 <button data-action="cancel-custom-filters"> | 323 <button data-action="cancel-custom-filters"> |
| 306 <span class="icon icon-edit"></span> | 324 <span class="icon icon-cancel"></span> |
| 307 <span class="i18n_options_customFilter_list"></span> | 325 <span class="i18n_options_customFilter_cancel"></span> |
| 308 </button> | |
| 309 <button id="custom-filters-raw-save" data-action="save-custo m-filters"> | |
| 310 <span class="icon icon-edit"></span> | |
| 311 <span class="i18n_options_customFilter_save"></span> | |
| 312 </button> | 326 </button> |
| 313 </div> | 327 </div> |
| 314 </div> | 328 </div> |
| 315 </div> | 329 </div> |
| 316 </div> | 330 </div> |
| 317 </div> | 331 </div> |
| 318 </div> | 332 </div> |
| 319 | 333 |
| 320 <!-- Help tab content --> | 334 <!-- Help tab content --> |
| 321 <div id="content-help" class="tab-content"> | 335 <div id="content-help" class="tab-content"> |
| (...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 397 <div class="url"></div> | 411 <div class="url"></div> |
| 398 <button class="i18n_options_dialog_predefined_confirm default-focus" data-action="add-predefined-subscription"></button> | 412 <button class="i18n_options_dialog_predefined_confirm default-focus" data-action="add-predefined-subscription"></button> |
| 399 </div> | 413 </div> |
| 400 </div> | 414 </div> |
| 401 </div> | 415 </div> |
| 402 <!-- Placeholder element to determine when to wrap focus around --> | 416 <!-- Placeholder element to determine when to wrap focus around --> |
| 403 <span class="focus-last" tabindex="0"></span> | 417 <span class="focus-last" tabindex="0"></span> |
| 404 </div> | 418 </div> |
| 405 </body> | 419 </body> |
| 406 </html> | 420 </html> |
| OLD | NEW |
« no previous file with comments
|
« locale/en-US/options.json ('k')
|
skin/options.css » ('j')
|
no next file with comments »
