Delta Between Two Patch Sets: new-options.html
Issue 29445590:
Issue 5255 - Advanced tab (HTML, strings and functionality) (Closed)
Left Patch Set: Addressed Thomas comments
Created July 12, 2017, 1:03 p.m.
Right Patch Set: Fixed nits
Created July 14, 2017, 5:43 p.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-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 29 matching lines...) Expand all Loading... | |
| 40 | 40 |
| 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-whitelist" role="tab" data-tab="whitelist" | |
| 51 aria-controls="content-whitelist" | |
| 52 tabindex="-1"> | |
| 53 <span class="i18n_options_tab_whitelist"></span> | |
| 54 </li> | |
| 50 <li id="tab-advanced" role="tab" data-tab="advanced" | 55 <li id="tab-advanced" role="tab" data-tab="advanced" |
| 51 aria-controls="content-advanced" tabindex="-1"> | 56 aria-controls="content-advanced" tabindex="-1"> |
| 52 <span class="i18n_options_tab_advanced"></span> | 57 <span class="i18n_options_tab_advanced"></span> |
| 53 </li> | 58 </li> |
| 54 <li id="tab-help" role="tab" data-tab="help" | 59 <li id="tab-help" role="tab" data-tab="help" |
| 55 aria-controls="content-help" tabindex="-1"> | 60 aria-controls="content-help" tabindex="-1"> |
| 56 <span class="i18n_options_tab_help"></span> | 61 <span class="i18n_options_tab_help"></span> |
| 57 </li> | 62 </li> |
| 58 </ul> | 63 </ul> |
| 59 </nav> | 64 </nav> |
| (...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 152 data-tooltip="options_acceptableAds_title_tooltip" | 157 data-tooltip="options_acceptableAds_title_tooltip" |
| 153 data-tooltip-image="skin/tooltips/acceptable-ads.png"></sp an> | 158 data-tooltip-image="skin/tooltips/acceptable-ads.png"></sp an> |
| 154 </div> | 159 </div> |
| 155 <ul id="acceptableads-table" class="table list"> | 160 <ul id="acceptableads-table" class="table list"> |
| 156 <template> | 161 <template> |
| 157 <button data-action="toggle-remove-subscription" role="check box" class="control"></button> | 162 <button data-action="toggle-remove-subscription" role="check box" class="control"></button> |
| 158 <label class="display"></label> | 163 <label class="display"></label> |
| 159 </template> | 164 </template> |
| 160 </ul> | 165 </ul> |
| 161 </div> | 166 </div> |
| 162 <div id="whitelisting"> | 167 </div> |
| 163 <div class="option-name"> | 168 </div> |
| 164 <strong class="i18n_options_whitelisted_title"></strong> | 169 </div> |
| 165 <span class="i18n_options_readMore" | 170 |
| 166 data-tooltip="options_whitelisted_title_tooltip" | 171 <!-- Whitelist tab content --> |
| 167 data-tooltip-image="skin/tooltips/whitelisted.png" | 172 <div id="content-whitelist" role="tabpanel" aria-labelledby="tab-whiteli st"> |
| 168 data-tooltip-flip="horizontal"></span> | 173 <h1 class="i18n_options_tab_whitelist"></h1> |
| 169 </div> | 174 <p class="i18n_options_whitelist_description"></p> |
| 170 <ul id="whitelisting-table" class="table list"> | 175 <form> |
| 171 <template> | 176 <input id="whitelisting-textbox" type="text"> |
| 172 <label class="display"></label> | 177 <button id="whitelisting-add-button" |
| 173 <button data-action="remove-filter" class="delete control" t itle="options_control_remove_title"></button> | 178 type="submit" |
| 174 </template> | 179 data-action="add-domain-exception" |
| 175 </ul> | 180 class="i18n_options_whitelist_add" disabled> |
| 176 <div class="controls"> | 181 </button> |
| 177 <button data-action="edit-domain-exception"> | 182 <div id="whitelisting-validation"></div> |
| 178 <span class="icon icon-add"></span> | 183 </form> |
| 179 <span class="i18n_options_whitelisted_add"></span> | 184 <ul id="whitelisting-table" class="table list"> |
| 180 </button> | 185 <template> |
| 181 <div> | 186 <label class="display"></label> |
| 182 <span class="icon icon-add" data-action="add-domain-exceptio n"></span> | 187 <button data-action="remove-filter" class="delete control" |
| 183 <input type="text" id="whitelisting-textbox" placeholder="ww w.example.com" /> | 188 title="options_control_remove_title"> |
| 184 <span class="icon icon-enter" data-action="add-domain-except ion"></span> | 189 </button> |
| 185 </div> | 190 </template> |
| 186 <div> | 191 </ul> |
| 187 <button id="whitelisting-add-button" class="button-add" data -action="add-domain-exception"> | |
| 188 +<span class="i18n_options_button_add"></span> | |
| 189 </button> | |
| 190 <span></span> | |
| 191 <button class="i18n_options_button_cancel cancel-button" dat a-action="cancel-domain-exception"></button> | |
| 192 </div> | |
| 193 </div> | |
| 194 </div> | |
| 195 </div> | |
| 196 </div> | |
| 197 </div> | 192 </div> |
| 198 | 193 |
| 199 <!-- Advanced tab content --> | 194 <!-- Advanced tab content --> |
| 200 <div id="content-advanced" role="tabpanel" | 195 <div id="content-advanced" role="tabpanel" |
| 201 aria-labelledby="tab-advanced"> | 196 aria-labelledby="tab-advanced"> |
| 202 <div> | 197 <div> |
| 203 <h1 class="i18n_options_tab_advanced"></h1> | 198 <h1 class="i18n_options_tab_advanced"></h1> |
| 204 <p class="i18n_options_advanced_description"></p> | 199 <p class="i18n_options_advanced_description"></p> |
| 205 <section> | 200 <section> |
| 206 <h2 class="i18n_options_customize_header"></h2> | 201 <h2 class="i18n_options_customize_header"></h2> |
| (...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 401 <div class="url"></div> | 396 <div class="url"></div> |
| 402 <button class="i18n_options_dialog_predefined_confirm default-focus" data-action="add-predefined-subscription"></button> | 397 <button class="i18n_options_dialog_predefined_confirm default-focus" data-action="add-predefined-subscription"></button> |
| 403 </div> | 398 </div> |
| 404 </div> | 399 </div> |
| 405 </div> | 400 </div> |
| 406 <!-- Placeholder element to determine when to wrap focus around --> | 401 <!-- Placeholder element to determine when to wrap focus around --> |
| 407 <span class="focus-last" tabindex="0"></span> | 402 <span class="focus-last" tabindex="0"></span> |
| 408 </div> | 403 </div> |
| 409 </body> | 404 </body> |
| 410 </html> | 405 </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')
