Side by Side Diff: new-options.html
Issue 29445590:
Issue 5255 - Advanced tab (HTML, strings and functionality) (Closed)
Patch Set: Addressed notes from weekly(ish) meeting and small collection fix
Created June 14, 2017, 11:58 a.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« locale/en-US/new-options.json ('K')
|
« locale/en-US/new-options.json ('k')
|
new-options.js » ('j')
|
new-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-2017 eyeo GmbH | 4 - Copyright (C) 2006-2017 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 30 matching lines...) Expand all Loading... | |
| 41 <nav> | 41 <nav> |
| 42 <ul id="nav-tablist" class="tabs vertical" | 42 <ul id="nav-tablist" class="tabs vertical" |
| 43 role="tablist" data-action="switch-tab" | 43 role="tablist" data-action="switch-tab" |
| 44 data-keys="ArrowLeft ArrowUp ArrowRight ArrowDown"> | 44 data-keys="ArrowLeft ArrowUp ArrowRight ArrowDown"> |
| 45 <li id="tab-general" role="tab" data-tab="general" | 45 <li id="tab-general" role="tab" data-tab="general" |
| 46 aria-selected="true" aria-controls="content-general" | 46 aria-selected="true" aria-controls="content-general" |
| 47 tabindex="0"> | 47 tabindex="0"> |
| 48 <span class="i18n_options_tab_general"></span> | 48 <span class="i18n_options_tab_general"></span> |
| 49 </li> | 49 </li> |
| 50 <li id="tab-advanced" role="tab" data-tab="advanced" | 50 <li id="tab-advanced" role="tab" data-tab="advanced" |
| 51 data-subtab="advanced-allFilterLists" | |
| 52 aria-controls="content-advanced" tabindex="-1"> | 51 aria-controls="content-advanced" tabindex="-1"> |
| 53 <span class="i18n_options_tab_advanced"></span> | 52 <span class="i18n_options_tab_advanced"></span> |
| 54 </li> | 53 </li> |
| 55 <li id="tab-help" role="tab" data-tab="help" | 54 <li id="tab-help" role="tab" data-tab="help" |
| 56 aria-controls="content-help" tabindex="-1"> | 55 aria-controls="content-help" tabindex="-1"> |
| 57 <span class="i18n_options_tab_help"></span> | 56 <span class="i18n_options_tab_help"></span> |
| 58 </li> | 57 </li> |
| 59 </ul> | 58 </ul> |
| 60 </nav> | 59 </nav> |
| 61 | 60 |
| (...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 194 </div> | 193 </div> |
| 195 </div> | 194 </div> |
| 196 </div> | 195 </div> |
| 197 </div> | 196 </div> |
| 198 </div> | 197 </div> |
| 199 | 198 |
| 200 <!-- Advanced tab content --> | 199 <!-- Advanced tab content --> |
| 201 <div id="content-advanced" role="tabpanel" | 200 <div id="content-advanced" role="tabpanel" |
| 202 aria-labelledby="tab-advanced"> | 201 aria-labelledby="tab-advanced"> |
| 203 <div> | 202 <div> |
| 204 <h1 class="i18n_options_tweaks_title"></h1> | 203 <h1 class="i18n_options_tab_advanced"></h1> |
| 205 <ul id="tweaks" class="table"> | 204 <p class="i18n_options_advanced_description"></p> |
| 206 <li data-pref="shouldShowBlockElementMenu"> | 205 <section> |
| 207 <label> | 206 <h2 class="i18n_options_customize_header"></h2> |
| 208 <button role="checkbox" data-action="toggle-pref"></button> | 207 <ul id="customize" class="table"> |
| 209 <span class="i18n_options_tweaks_blockElement"></span> | 208 <li data-pref="shouldShowBlockElementMenu"> |
| 210 </label> | 209 <label> |
| 211 </li> | 210 <button role="checkbox" data-action="toggle-pref"></button> |
| 212 <li data-pref="show_devtools_panel"> | 211 <span class="i18n_options_customize_blockElement"></span> |
| 213 <label> | 212 <span class="i18n_options_readMore" |
| 214 <button role="checkbox" data-action="toggle-pref"></button> | 213 data-tooltip="options_customize_blockElement_tooltip"></sp an> |
| 215 <span class="i18n_options_tweaks_showDevToolsPanel"></span> | 214 </label> |
| 216 </label> | 215 </li> |
| 217 </li> | 216 <li data-pref="show_devtools_panel"> |
| 218 <li data-pref="notifications_ignoredcategories"> | 217 <label> |
| 219 <label> | 218 <button role="checkbox" data-action="toggle-pref"></button> |
| 220 <button role="checkbox" data-action="toggle-pref"></button> | 219 <span class="i18n_options_customize_showDevToolsPanel"></spa n> |
| 221 <span class="i18n_options_tweaks_showNotifications"></span> | 220 <span class="i18n_options_readMore" |
| 222 </label> | 221 data-tooltip="options_customize_showDevToolsPanel_tooltip" ></span> |
| 223 </li> | 222 </label> |
| 224 </ul> | 223 </li> |
| 224 <li data-pref="notifications_ignoredcategories"> | |
| 225 <label> | |
| 226 <button role="checkbox" data-action="toggle-pref"></button> | |
| 227 <span class="i18n_options_customize_showNotifications"></spa n> | |
| 228 <span class="i18n_options_readMore" | |
| 229 data-tooltip="options_customize_showNotifications_tooltip" ></span> | |
| 230 </label> | |
| 231 </li> | |
| 232 </ul> | |
| 233 </section> | |
| 225 </div> | 234 </div> |
| 226 | 235 |
| 227 <div> | 236 <section> |
| 228 <h1> | 237 <h1 class="i18n_options_filterList_title"></h1> |
| 229 <span class="i18n_options_filterList_title"></span> | 238 <p id="filter-lists-description" class="i18n_options_filterList_desc ription"></p> |
| 230 <span class="i18n_options_readMore" | 239 |
| 231 data-tooltip="options_filterList_title_tooltip"></span> | 240 <ul class="table cols" id="all-filter-lists-table"> |
| 232 </h1> | 241 <li class="static header"> |
| 233 <ul class="tabs horizontal" role="tablist" data-action="switch-tab" | 242 <h2 class="i18n_options_filterList_column_status"></h2> |
| 234 data-keys="ArrowLeft ArrowUp ArrowRight ArrowDown"> | 243 <h2 class="i18n_options_filterList_column_name"></h2> |
| 235 <li id="tab-allFilterLists" | 244 <h2 class="i18n_options_filterList_column_update"></h2> |
| 236 class="i18n_options_tab_overview active" | 245 </li> |
| 237 role="tab" data-tab="advanced-allFilterLists" | 246 <template> |
| 238 aria-selected="true" aria-controls="all-filter-lists" | 247 <button data-action="remove-subscription" class="control delete" ></button> |
| 239 tabindex="0"></li> | 248 <button data-action="toggle-disable-subscription" role="checkbox " class="control"> |
| 240 <li id="tab-customFilters" class="i18n_options_tab_ownList" | 249 </button> |
| 241 role="tab" data-tab="advanced-customFilters" | 250 <div class="state"> |
| 242 aria-controls="custom-filters" tabindex="-1"></li> | 251 <span class="i18n_options_filterList_state_active" id="state-a ctive"></span> |
| 243 </ul> | 252 <span class="i18n_options_filterList_state_disabled" id="state -disabled"></span> |
| 244 <div id="filter-lists"> | |
| 245 <div id="all-filter-lists" role="tabpanel" | |
| 246 aria-labelledby="tab-allFilterLists"> | |
| 247 <div class="table-header"> | |
| 248 <h2 class="i18n_options_column_name"></h2> | |
| 249 <h2 class="i18n_options_column_date"></h2> | |
| 250 </div> | 253 </div> |
| 251 <ul class="table cols" id="all-filter-lists-table"> | 254 <div> |
| 252 <template> | 255 <label class="display"></label> |
| 253 <button data-action="toggle-disable-subscription" role="chec kbox" class="control"></button> | 256 </div> |
| 254 <div> | 257 <span class="last-update"></span> |
| 255 <label data-action="open-context-menu" class="display"></l abel> | 258 <span class="message"></span> |
| 256 <div data-action="open-context-menu" class="arrow"> | 259 <a href="#" data-action="open-context-menu" class="arrow"></a> |
| 257 <div class="context-menu"> | 260 <div role="menubar" class="context-menu-wrapper"> |
|
Thomas Greiner
2017/07/07 13:01:09
Since we're now making the context menu accessible
saroyanm
2017/07/10 11:38:00
Good point.
saroyanm
2017/07/12 15:29:01
Done.
| |
| 258 <div class="content"> | 261 <div class="context-menu"> |
| 259 <a class="i18n_options_filterList_updateNow update-s ubscription" data-action="update-subscription"></a> | 262 <div class="content"> |
| 260 <a class="i18n_options_filterList_website website" t arget="_blank"></a> | 263 <a role="menuitem" href="#" class="i18n_options_filterList _updateNow update-subscription" data-action="update-subscription"></a> |
| 261 <a class="i18n_options_filterList_source source" tar get="_blank"></a> | 264 <a role="menuitem" class="i18n_options_filterList_website website" target="_blank"></a> |
| 262 <a class="i18n_options_filterList_delete delete" dat a-action="remove-subscription"></a> | 265 <a role="menuitem" class="i18n_options_filterList_source s ource" target="_blank"></a> |
| 263 </div> | 266 <a role="menuitem" href="#" class="i18n_options_filterList _delete delete" data-action="remove-subscription"></a> |
| 264 </div> | |
| 265 </div> | |
| 266 </div> | 267 </div> |
| 267 <span class="date"></span> | |
| 268 <span class="time"></span> | |
| 269 <span class="message"></span> | |
| 270 </template> | |
| 271 <li class="static"> | |
| 272 <button id="own-list" role="checkbox" class="control" aria-c hecked="true" disabled="true"></button> | |
| 273 <div> | |
| 274 <label for="own-list" class="i18n_options_filterList_own_l ist"></label> | |
| 275 </div> | |
| 276 <span> | |
| 277 <a class="i18n_options_filterList_edit_own_list" | |
| 278 href="#advanced-customFilters"></a> | |
| 279 </span> | |
| 280 </li> | |
| 281 </ul> | |
| 282 <div class="controls"> | |
| 283 <button data-action="open-dialog" data-dialog="custom"> | |
| 284 <span class="icon icon-add"></span> | |
| 285 <span class="i18n_options_filterList_add"></span> | |
| 286 </button> | |
| 287 <button data-action="update-all-subscriptions"> | |
| 288 <span class="icon icon-update"></span> | |
| 289 <span class="i18n_options_filterList_update"></span> | |
| 290 </button> | |
| 291 </div> | |
| 292 </div> | |
| 293 <div id="custom-filters" role="tabpanel" | |
| 294 aria-labelledby="tab-customFilters"> | |
| 295 <h2 id="custom-filters-header"> | |
| 296 <span class="i18n_options_customFilters_title"></span> | |
| 297 <span class="i18n_options_readMore" | |
| 298 data-tooltip="options_customFilters_title_tooltip"></span> | |
| 299 </h2> | |
| 300 <div id="custom-filters-wrapper"> | |
| 301 <div id="custom-filters-list-wrapper"> | |
| 302 <ul id="custom-filters-table" class="table list"> | |
| 303 <template> | |
| 304 <label class="display"></label> | |
| 305 </template> | |
| 306 </ul> | |
| 307 <form id="custom-filters-add" class="controls"> | |
| 308 <input type="text"/> | |
| 309 <button class="i18n_options_button_add" type="submit"></bu tton> | |
| 310 </form> | |
| 311 </div> | |
| 312 <textarea id="custom-filters-raw"></textarea> | |
| 313 </div> | |
| 314 <div id="custom-filters-edit-wrapper" class="controls"> | |
| 315 <button id="custom-filters-show-edit" data-action="edit-custom -filters"> | |
| 316 <span class="icon icon-edit"></span> | |
| 317 <span class="i18n_options_customFilter_edit"></span> | |
| 318 </button> | |
| 319 <div id="custom-filters-raw-controls"> | |
| 320 <button id="custom-filters-raw-save" data-action="save-custo m-filters"> | |
| 321 <span class="icon icon-save"></span> | |
| 322 <span class="i18n_options_customFilter_save"></span> | |
| 323 </button> | |
| 324 <button data-action="cancel-custom-filters"> | |
| 325 <span class="icon icon-cancel"></span> | |
| 326 <span class="i18n_options_customFilter_cancel"></span> | |
| 327 </button> | |
| 328 </div> | 268 </div> |
| 329 </div> | 269 </div> |
| 270 </template> | |
| 271 </ul> | |
| 272 <div class="controls"> | |
| 273 <button data-action="open-dialog" data-dialog="custom"> | |
| 274 <span class="icon icon-add"></span> | |
| 275 <span class="i18n_options_filterList_add"></span> | |
| 276 </button> | |
| 277 <button data-action="update-all-subscriptions"> | |
| 278 <span class="icon icon-update"></span> | |
| 279 <span class="i18n_options_filterList_update"></span> | |
| 280 </button> | |
| 281 </div> | |
| 282 </section> | |
| 283 | |
| 284 <section> | |
| 285 <h1 class="i18n_options_customFilters_title"></h1> | |
| 286 <p class="i18n_options_customFilters_description"></p> | |
| 287 <h2 class="i18n_options_customFilters_widget_title"></h2> | |
| 288 <div id="custom-filters" class="mode-empty"> | |
| 289 <div id="empty-custom-filters"> | |
| 290 <p class="i18n_options_customFilters_tip"></p> | |
| 291 <button class="i18n_options_customFilters_start" data-action="ed it-custom-filters"> | |
| 292 </button> | |
| 293 <p> | |
| 294 <a class="i18n_options_customFilters_learn" id="link-filters" target="_blank"></a> | |
| 295 </p> | |
| 296 </div> | |
| 297 <select id="custom-filters-box" multiple></select> | |
|
Thomas Greiner
2017/07/07 13:01:09
What's the reason for making this a `<select>` ele
saroyanm
2017/07/10 11:38:00
Interesting, shouldn't we allow them to delete the
saroyanm
2017/07/10 13:27:43
This will not be a regression, as user still can r
saroyanm
2017/07/12 15:29:00
Done.
| |
| 298 <textarea id="custom-filters-raw"></textarea> | |
| 299 <button id="custom-filters-edit" class="i18n_options_customFilter_ edit" data-action="edit-custom-filters"> | |
| 300 </button> | |
| 301 <div id="custom-filters-raw-controls"> | |
| 302 <button class="i18n_options_customFilter_save" data-action="save -custom-filters"> | |
| 303 </button> | |
| 304 <button class="i18n_options_customFilter_cancel" data-action="ca ncel-custom-filters"> | |
| 305 </button> | |
| 330 </div> | 306 </div> |
| 331 </div> | 307 </div> |
| 332 </div> | 308 </section> |
| 333 </div> | 309 </div> |
| 334 | 310 |
| 335 <!-- Help tab content --> | 311 <!-- Help tab content --> |
| 336 <div id="content-help" role="tabpanel" aria-labelledby="tab-help"> | 312 <div id="content-help" role="tabpanel" aria-labelledby="tab-help"> |
| 337 <h1 class="i18n_options_faq_title"></h1> | 313 <h1 class="i18n_options_faq_title"></h1> |
| 338 <p class="i18n_options_faq_description"></p> | 314 <p class="i18n_options_faq_description"></p> |
| 339 <p> | 315 <p> |
| 340 <a id="link-faq" class="i18n_options_faq_title" target="_blank"></a > | 316 <a id="link-faq" class="i18n_options_faq_title" target="_blank"></a > |
| 341 </p> | 317 </p> |
| 342 <h1 class="i18n_options_forum_title"></h1> | 318 <h1 class="i18n_options_forum_title"></h1> |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 401 <div id="dialog-content-custom" class="dialog-content"> | 377 <div id="dialog-content-custom" class="dialog-content"> |
| 402 <div class="dialog-content-block"> | 378 <div class="dialog-content-block"> |
| 403 <div> | 379 <div> |
| 404 <label for="blockingList-textbox" class="i18n_options_dialog_custo m_subscription_title"></label> | 380 <label for="blockingList-textbox" class="i18n_options_dialog_custo m_subscription_title"></label> |
| 405 <input id="blockingList-textbox" type="text" class="default-focus" placeholder="www.example.com/blockinglist.txt" /> | 381 <input id="blockingList-textbox" type="text" class="default-focus" placeholder="www.example.com/blockinglist.txt" /> |
| 406 </div> | 382 </div> |
| 407 <button class="i18n_options_dialog_custom_import" data-action="impor t-subscription"></button> | 383 <button class="i18n_options_dialog_custom_import" data-action="impor t-subscription"></button> |
| 408 </div> | 384 </div> |
| 409 <div class="dialog-content-block"> | 385 <div class="dialog-content-block"> |
| 410 <h3 class="i18n_options_dialog_edit_own_list"></h3> | 386 <h3 class="i18n_options_dialog_edit_own_list"></h3> |
| 411 <button class="i18n_options_dialog_create_own_list" data-action="clo se-dialog,switch-tab,edit-custom-filters" data-tab="advanced-customFilters"></bu tton> | 387 <button class="i18n_options_dialog_create_own_list" data-action="clo se-dialog,switch-tab,edit-custom-filters" data-tab="advanced"></button> |
| 412 </div> | 388 </div> |
| 413 </div> | 389 </div> |
| 414 <!-- Add predefined subscription --> | 390 <!-- Add predefined subscription --> |
| 415 <div id="dialog-content-predefined" class="dialog-content"> | 391 <div id="dialog-content-predefined" class="dialog-content"> |
| 416 <div class="dialog-content-block"> | 392 <div class="dialog-content-block"> |
| 417 <h3></h3> | 393 <h3></h3> |
| 418 <div class="url"></div> | 394 <div class="url"></div> |
| 419 <button class="i18n_options_dialog_predefined_confirm default-focus" data-action="add-predefined-subscription"></button> | 395 <button class="i18n_options_dialog_predefined_confirm default-focus" data-action="add-predefined-subscription"></button> |
| 420 </div> | 396 </div> |
| 421 </div> | 397 </div> |
| 422 </div> | 398 </div> |
| 423 <!-- Placeholder element to determine when to wrap focus around --> | 399 <!-- Placeholder element to determine when to wrap focus around --> |
| 424 <span class="focus-last" tabindex="0"></span> | 400 <span class="focus-last" tabindex="0"></span> |
| 425 </div> | 401 </div> |
| 426 </body> | 402 </body> |
| 427 </html> | 403 </html> |
| OLD | NEW |
« locale/en-US/new-options.json ('K')
|
« locale/en-US/new-options.json ('k')
|
new-options.js » ('j')
|
new-options.js » ('J')
