Delta Between Two Patch Sets: new-options.html
Issue 29502647:
Issue 5482 - Sidebar and about ABP dialog (Closed)
Left Patch Set: Addressed comments
Created Aug. 23, 2017, 12:23 p.m.
Right Patch Set: Fixed nit
Created Aug. 28, 2017, 11:38 a.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with change/comment
|
« locale/en-US/new-options.json ('k')
|
new-options.js » ('j')
|
no next file with change/comment »
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')
| LEFT | RIGHT |
|---|---|
| 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-present 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, |
| 11 - but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 - but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 12 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 12 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
| 13 - GNU General Public License for more details. | 13 - GNU General Public License for more details. |
| 14 - | 14 - |
| (...skipping 11 matching lines...) Expand all Loading... | |
| 26 <script src="ext/content.js"></script> | 26 <script src="ext/content.js"></script> |
| 27 <script src="common.js"></script> | 27 <script src="common.js"></script> |
| 28 <script src="i18n.js"></script> | 28 <script src="i18n.js"></script> |
| 29 <script src="new-options.js"></script> | 29 <script src="new-options.js"></script> |
| 30 </head> | 30 </head> |
| 31 <body data-tab="general"> | 31 <body data-tab="general"> |
| 32 <!-- Navigation sidebar --> | 32 <!-- Navigation sidebar --> |
| 33 <div id="sidebar"> | 33 <div id="sidebar"> |
| 34 <div class="fixed"> | 34 <div class="fixed"> |
| 35 <header> | 35 <header> |
| 36 <img id="sidebar-logo" src="skin/abp-logo.svg"> | 36 <img id="sidebar-logo" alt="Adblock Plus logo" src="skin/abp-logo.svg" > |
| 37 <h1> | 37 <h1> |
| 38 Adblock <strong>Plus</strong> | 38 Adblock <strong>Plus</strong> |
| 39 </h1> | 39 </h1> |
| 40 <p class="i18n_options_page_title"></p> | 40 <p class="i18n_options_page_title"></p> |
| 41 </header> | 41 </header> |
| 42 | 42 |
| 43 <nav> | 43 <nav> |
| 44 <ul class="tabs" | 44 <ul class="tabs" |
| 45 role="tablist" data-action="switch-tab" | 45 role="tablist" data-action="switch-tab" |
| 46 data-keys="ArrowLeft ArrowUp ArrowRight ArrowDown"> | 46 data-keys="ArrowLeft ArrowUp ArrowRight ArrowDown"> |
| 47 <li> | 47 <li role="presentation"> |
| 48 <a href="#general" class="i18n_options_tab_general" role="tab" ari a-selected="true" aria-controls="content-general"></a> | 48 <a href="#general" class="i18n_options_tab_general" role="tab" ari a-selected="true" tabindex="-1" aria-controls="content-general"></a> |
| 49 </li> | 49 </li> |
| 50 <li> | 50 <li role="presentation"> |
| 51 <a href="#whitelist" class="i18n_options_tab_whitelist" role="tab" aria-controls="content-whitelist"></a> | 51 <a href="#whitelist" class="i18n_options_tab_whitelist" role="tab" tabindex="-1" aria-controls="content-whitelist"></a> |
| 52 </li> | 52 </li> |
| 53 <li> | 53 <li role="presentation"> |
| 54 <a href="#advanced" class="i18n_options_tab_advanced" role="tab" a ria-controls="content-advanced"></a> | 54 <a href="#advanced" class="i18n_options_tab_advanced" role="tab" t abindex="-1" aria-controls="content-advanced"></a> |
| 55 </li> | 55 </li> |
| 56 <li> | 56 <li role="presentation"> |
| 57 <a href="#help" class="i18n_options_tab_help" role="tab" aria-cont rols="content-help"></a> | 57 <a href="#help" class="i18n_options_tab_help" role="tab" tabindex= "-1" aria-controls="content-help"></a> |
| 58 </li> | 58 </li> |
| 59 </ul> | 59 </ul> |
| 60 </nav> | 60 </nav> |
| 61 <footer> | 61 <footer> |
| 62 <p> | 62 <p> |
| 63 <a id="contribute" | 63 <a id="contribute" |
| 64 class="i18n_options_footer_contribute button secondary" | 64 class="i18n_options_footer_contribute button secondary" |
| 65 target="_blank"></a> | 65 target="_blank"></a> |
| 66 </p> | 66 </p> |
| 67 <p> | 67 <p> |
| 68 <button class="i18n_options_footer_about link" | 68 <button class="i18n_options_footer_about link" |
| 69 data-action="open-dialog" data-dialog="about"></button> | 69 data-action="open-dialog" data-dialog="about"></button> |
| 70 </p> | 70 </p> |
| 71 </footer> | 71 </footer> |
| 72 </div> | 72 </div> |
| 73 </div> | 73 </div> |
| 74 <main> | 74 <main> |
| 75 <div id="dialog-background"></div> | 75 <div id="dialog-background"></div> |
| 76 | 76 |
| 77 <!-- General tab content --> | 77 <!-- General tab content --> |
| 78 <div id="content-general" role="tabpanel" aria-labelledby="tab-general"> | 78 <div id="content-general" role="tabpanel" aria-labelledby="tab-general"> |
| 79 <h1 class="i18n_options_tab_general"></h1> | 79 <h1 class="i18n_options_tab_general"></h1> |
| 80 <p class="i18n_options_general_description"></p> | 80 <p class="i18n_options_general_description"></p> |
| 81 <section> | 81 <section> |
| 82 <h2 class="i18n_options_privacy_header"></h2> | 82 <h2 class="i18n_options_privacy_header"></h2> |
| 83 <ul id="recommend-security-list-table" class="table list"> | 83 <ul id="recommend-protection-list-table" class="table list"> |
| 84 <template> | 84 <template> |
| 85 <button data-action="toggle-remove-subscription" role="checkbox" c lass="control"></button> | 85 <button data-action="toggle-remove-subscription" role="checkbox" c lass="control"></button> |
| 86 <label class="display"></label> | 86 <label class="display"></label> |
| 87 <span class="i18n_options_readMore" data-tooltip="options_more_%va lue%_tooltip"></span> | 87 <span class="i18n_options_readMore" data-tooltip="options_protecti on_%value%_tooltip"></span> |
| 88 </template> | 88 </template> |
| 89 </ul> | 89 </ul> |
| 90 </section> | 90 </section> |
| 91 <section> | 91 <section> |
| 92 <h2 class="i18n_options_aa_header"></h2> | 92 <h2 class="i18n_options_acceptableAds_header"></h2> |
| 93 <p class="i18n_options_aa_description"></p> | 93 <p class="i18n_options_acceptableAds_description"></p> |
| 94 <form id="acceptable-ads"> | 94 <form id="acceptable-ads"> |
| 95 <div> | 95 <div> |
| 96 <input data-action="enable-aa" type="radio" name="acceptable-ads" value="tracking"> | 96 <input data-action="switch-acceptable-ads" type="radio" name="acce ptable-ads" value="ads"> |
| 97 <label class="i18n_options_aa_tracking_label"></label> | 97 <label class="i18n_options_acceptableAds_ads_label"></label> |
| 98 <p id="enable-aa-description" class="i18n_options_aa_tracking_desc ription_1"></p> | 98 <p id="enable-aa-description" class="i18n_options_acceptableAds_ad s_description_1"></p> |
| 99 <p class="i18n_options_aa_tracking_description_2"></p> | 99 <p class="i18n_options_acceptableAds_ads_description_2"></p> |
| 100 </div> | 100 </div> |
| 101 <div> | 101 <div> |
| 102 <input data-action="enable-privacy-aa" type="radio" name="acceptab le-ads" value="no-tracking"> | 102 <input data-action="switch-acceptable-ads" type="radio" name="acce ptable-ads" value="privacy"> |
| 103 <label class="i18n_options_aa_no_tracking_label"></label> | 103 <label class="i18n_options_acceptableAds_privacy_label"></label> |
| 104 <p class="i18n_options_aa_no_tracking_description"></p> | 104 <p class="i18n_options_acceptableAds_privacy_description"></p> |
| 105 <p id="no-dnt" class="i18n_options_aa_no_dnt_notification"></p> | 105 <p id="dnt" class="i18n_options_acceptableAds_dnt_notification"></ p> |
| 106 </div> | 106 </div> |
| 107 <div> | 107 <div> |
| 108 <input data-action="block-all" type="radio" name="acceptable-ads" value="disable"> | 108 <input data-action="switch-acceptable-ads" type="radio" name="acce ptable-ads" value="none"> |
| 109 <label class="i18n_options_aa_disable_label"></label> | 109 <label class="i18n_options_acceptableAds_none_label"></label> |
| 110 </div> | 110 </div> |
| 111 </form> | 111 </form> |
| 112 </section> | 112 </section> |
| 113 <section> | 113 <section> |
| 114 <h2 class="i18n_options_language_header"></h2> | 114 <h2 class="i18n_options_language_header"></h2> |
| 115 <p class="i18n_options_language_description"></p> | 115 <p class="i18n_options_language_description"></p> |
| 116 <div id="blocking-languages"> | 116 <div id="blocking-languages"> |
| 117 <ul id="blocking-languages-table" class="table list"> | 117 <ul id="blocking-languages-table" class="table list"> |
| 118 <template> | 118 <template> |
| 119 <label class="display"></label> | 119 <label class="display"></label> |
| 120 <button data-single="hidden" data-action="remove-subscription" c lass="delete control" title="options_control_remove_title"></button> | 120 <button data-single="hidden" data-action="remove-subscription" c lass="delete control" title="options_control_remove_title"></button> |
| 121 <button data-single="visible" data-action="save-change-subscript ion,open-dialog" data-dialog="language-change" class="i18n_options_language_chan ge"></button> | 121 <button data-single="visible" data-action="open-dialog" data-dia log="language-change" class="i18n_options_language_change"></button> |
| 122 </template> | 122 </template> |
| 123 </ul> | 123 </ul> |
| 124 <div class="controls"> | 124 <div class="controls"> |
| 125 <button data-action="open-dialog" data-dialog="language-add"> | 125 <button data-action="open-dialog" data-dialog="language-add"> |
| 126 <span class="i18n_options_language_add"></span> | 126 <span class="i18n_options_language_add"></span> |
| 127 </button> | 127 </button> |
| 128 </div> | 128 </div> |
| 129 </div> | 129 </div> |
| 130 <p class="i18n_options_language_tip"></p> | 130 <p class="i18n_options_language_tip"></p> |
| 131 </section> | 131 </section> |
| 132 <section> | 132 <section> |
| 133 <h2 class="i18n_options_more_filters_header"></h2> | 133 <h2 class="i18n_options_more_filters_header"></h2> |
| 134 <p class="i18n_options_more_filters_description"></p> | 134 <p class="i18n_options_more_filters_description"></p> |
| 135 <ul id="custom-list-table" class="table list"> | 135 <ul id="custom-list-table" class="table list"> |
| 136 <template> | 136 <template> |
| 137 <label class="display"></label> | 137 <label class="display"></label> |
| 138 <span class="i18n_options_readMore" data-tooltip="options_more_%va lue%_tooltip"></span> | |
| 139 <button data-action="remove-subscription" class="delete control" t itle="options_control_remove_title"></button> | 138 <button data-action="remove-subscription" class="delete control" t itle="options_control_remove_title"></button> |
| 140 </template> | 139 </template> |
| 141 </ul> | 140 </ul> |
| 142 <p class="i18n_options_more_filters_note"></p> | 141 <p class="i18n_options_more_filters_note"></p> |
| 143 </section> | 142 </section> |
| 144 </div> | 143 </div> |
| 145 | 144 |
| 146 <!-- Whitelist tab content --> | 145 <!-- Whitelist tab content --> |
| 147 <div id="content-whitelist" role="tabpanel" aria-labelledby="tab-whitelist "> | 146 <div id="content-whitelist" role="tabpanel" aria-labelledby="tab-whitelist "> |
| 148 <h1 class="i18n_options_tab_whitelist"></h1> | 147 <h1 class="i18n_options_tab_whitelist"></h1> |
| (...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 280 </button> | 279 </button> |
| 281 <button class="i18n_options_customFilter_cancel" data-action="canc el-custom-filters"> | 280 <button class="i18n_options_customFilter_cancel" data-action="canc el-custom-filters"> |
| 282 </button> | 281 </button> |
| 283 </div> | 282 </div> |
| 284 </div> | 283 </div> |
| 285 </section> | 284 </section> |
| 286 </div> | 285 </div> |
| 287 | 286 |
| 288 <!-- Help tab content --> | 287 <!-- Help tab content --> |
| 289 <div id="content-help" role="tabpanel" aria-labelledby="tab-help"> | 288 <div id="content-help" role="tabpanel" aria-labelledby="tab-help"> |
| 290 <h1 class="i18n_options_faq_title"></h1> | 289 <h1 class="i18n_options_tab_help"></h1> |
| 291 <p class="i18n_options_faq_description"></p> | 290 <p class="i18n_options_help_description"></p> |
| 292 <p> | 291 <section> |
| 293 <a id="link-faq" class="i18n_options_faq_title" target="_blank"></a> | 292 <h2 class="i18n_options_support_title"></h2> |
| 294 </p> | 293 <ul> |
| 295 <h1 class="i18n_options_forum_title"></h1> | 294 <li id="report-issue" class="i18n_options_report_issue"></li> |
| 296 <p class="i18n_options_forum_description"></p> | 295 <li id="report-ad" class="i18n_options_report_ad"></li> |
| 297 <p> | 296 <li id="report-bug" class="i18n_options_report_bug"></li> |
| 298 <a id="link-forum" class="i18n_options_forum_link" target="_blank"></ a> | 297 <li id="report-forum" class="i18n_options_report_forum"></li> |
| 299 </p> | 298 </ul> |
| 300 <h1 class="i18n_options_media_title"></h1> | 299 </section> |
| 301 <p class="i18n_options_media_description"></p> | 300 <section> |
| 302 <p> | 301 <h2 class="i18n_options_social_title"></h2> |
| 303 <span id="share-general"> | 302 <p class="i18n_options_social_description"></p> |
| 304 <a id="link-twitter" target="_blank">Twitter</a> | 303 <div id="social"> |
| 305 <a id="link-facebook" target="_blank">Facebook</a> | 304 <ul id="social-general"> |
| 306 <a id="link-gplus" target="_blank">Google+</a> | 305 <li><a id="twitter">Twitter</a></li> |
| 307 </span> | 306 <li><a id="facebook">Facebook</a></li> |
| 308 <span id="share-chinese"> | 307 <li><a id="google-plus">Google Plus</a></li> |
| 309 <a id="link-renren" target="_blank">renren</a> | 308 </ul> |
| 310 <a id="link-weibo" target="_blank">weibo</a> | 309 <ul id="social-chinese"> |
| 311 </span> | 310 <li><a id="weibo">Weibo</a></li> |
| 312 </p> | 311 </ul> |
| 312 <p> | |
| 313 <strong> | |
| 314 <span class="i18n_options_email"></span> | |
| 315 <a href="mailto:support@adblockplus.org">support@adblockplus.org </a> | |
| 316 </strong> | |
| 317 </p> | |
| 318 </div> | |
| 319 </section> | |
| 313 </div> | 320 </div> |
| 314 </main> | 321 </main> |
| 315 | 322 |
| 316 <!-- Dialog --> | 323 <!-- Dialog --> |
| 317 <div id="dialog" role="dialog" aria-hidden="true"> | 324 <div id="dialog" role="dialog" aria-hidden="true"> |
| 318 <header> | 325 <header> |
| 319 <span id="dialog-title"> | 326 <span id="dialog-title"> |
| 320 <span id="dialog-title-about" class="i18n_options_dialog_about_title"> </span> | 327 <span id="dialog-title-about" class="i18n_options_dialog_about_title"> </span> |
| 321 <span id="dialog-title-custom" class="i18n_options_dialog_custom_title "></span> | 328 <span id="dialog-title-custom" class="i18n_options_dialog_custom_title "></span> |
| 322 <span id="dialog-title-language-add" class="i18n_options_dialog_langua ge_title"></span> | 329 <span id="dialog-title-language-add" class="i18n_options_dialog_langua ge_title"></span> |
| 323 <span id="dialog-title-language-change" class="i18n_options_dialog_lan guage_title"></span> | 330 <span id="dialog-title-language-change" class="i18n_options_dialog_lan guage_title"></span> |
| 324 <span id="dialog-title-predefined" class="i18n_options_dialog_predefin ed_title"></span> | 331 <span id="dialog-title-predefined" class="i18n_options_dialog_predefin ed_title"></span> |
| 325 </span> | 332 </span> |
| 326 <button id="dialog-close" class="i18n_options_close focus-first" data-ac tion="close-dialog"></button> | 333 <button id="dialog-close" class="i18n_options_close focus-first" data-ac tion="close-dialog"></button> |
| 327 </header> | 334 </header> |
| 328 <div id="dialog-body" class="content"> | 335 <div id="dialog-body" class="content"> |
| 329 <!-- About Adblock Plus --> | 336 <!-- About Adblock Plus --> |
| 330 <div id="dialog-content-about" class="dialog-content"> | 337 <div id="dialog-content-about" class="dialog-content"> |
| 331 <p id="abp-version"></p> | 338 <p id="abp-version"></p> |
| 332 <p class="i18n_options_dialog_about_copyright"></p> | 339 <p class="i18n_options_dialog_about_copyright"></p> |
| 333 <p> | 340 <p> |
| 334 <button class="i18n_options_close primary" data-action="close-dialog "></button> | 341 <button class="i18n_options_close primary" data-action="close-dialog "></button> |
| 335 </p> | 342 </p> |
| 336 </div> | 343 </div> |
| 337 <!-- Add language subscription --> | 344 <!-- Add language subscription --> |
| 338 <div id="dialog-content-language-add" class="dialog-content"> | 345 <div id="dialog-content-language-add" class="dialog-content"> |
| 339 <ul id="all-lang-table-add" class="table list"> | 346 <ul id="all-lang-table-add" class="table list"> |
| 340 <template> | 347 <template> |
| 341 <button data-action="add-language-subscription,close-dialog" class ="control" role="checkbox"> | 348 <button data-action="add-language-subscription,close-dialog" class ="control add" role="checkbox"> |
| 342 <label class="display"></label> | 349 <label class="display"></label> |
| 343 </button> | 350 </button> |
| 344 </template> | 351 <button data-action="change-language-subscription,close-dialog" cl ass="control change" role="checkbox"> |
| 345 </ul> | |
| 346 </div> | |
| 347 <!-- Change language subscription --> | |
| 348 <div id="dialog-content-language-change" class="dialog-content"> | |
| 349 <ul id="all-lang-table-change" class="table list"> | |
| 350 <template> | |
| 351 <button data-action="change-language-subscription,close-dialog" cl ass="control" role="checkbox"> | |
| 352 <label class="display"></label> | 352 <label class="display"></label> |
| 353 </button> | 353 </button> |
| 354 </template> | 354 </template> |
| 355 </ul> | 355 </ul> |
| 356 </div> | 356 </div> |
| 357 <!-- Add custom subscription --> | 357 <!-- Add custom subscription --> |
| 358 <div id="dialog-content-custom" class="dialog-content"> | 358 <div id="dialog-content-custom" class="dialog-content"> |
| 359 <div class="dialog-content-block"> | 359 <div class="dialog-content-block"> |
| 360 <div> | 360 <div> |
| 361 <label for="blockingList-textbox" class="i18n_options_dialog_custo m_subscription_title"></label> | 361 <label for="blockingList-textbox" class="i18n_options_dialog_custo m_subscription_title"></label> |
| (...skipping 11 matching lines...) Expand all Loading... | |
| 373 <div class="dialog-content-block"> | 373 <div class="dialog-content-block"> |
| 374 <h3></h3> | 374 <h3></h3> |
| 375 <div class="url"></div> | 375 <div class="url"></div> |
| 376 <button class="i18n_options_dialog_predefined_confirm default-focus" data-action="add-predefined-subscription"></button> | 376 <button class="i18n_options_dialog_predefined_confirm default-focus" data-action="add-predefined-subscription"></button> |
| 377 </div> | 377 </div> |
| 378 </div> | 378 </div> |
| 379 </div> | 379 </div> |
| 380 <!-- Placeholder element to determine when to wrap focus around --> | 380 <!-- Placeholder element to determine when to wrap focus around --> |
| 381 <span class="focus-last" tabindex="0"></span> | 381 <span class="focus-last" tabindex="0"></span> |
| 382 </div> | 382 </div> |
| 383 <!-- Notification --> | |
| 384 <div id="notification" aria-hidden="true" aria-live="polite"> | |
| 385 <strong id="notification-text"></strong> | |
| 386 <button id="hide-notification" data-action="hide-notification"> | |
| 387 <span class="i18n_options_notification_hide sr-only"></span> | |
| 388 </button> | |
| 389 </div> | |
| 383 </body> | 390 </body> |
| 384 </html> | 391 </html> |
| LEFT | RIGHT |
« locale/en-US/new-options.json ('k')
|
new-options.js » ('j')
|
Toggle Intra-line Diffs ('i')
|
Expand Comments ('e')
|
Collapse Comments ('c')
|
Toggle Comments ('s')
