Delta Between Two Patch Sets: new-options.html
Issue 29334038:
Issue 2802/2358 - Dynamically generate tooltips in options page (Closed)
Left Patch Set: Rebased to 536c9b810423
Created March 21, 2016, 2:04 p.m.
Right Patch Set: Rebased to 75534a4a1e0e and addressed comments
Created May 31, 2016, 4:57 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 |
|---|---|
| (no file at all) | |
| 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 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 76 <div id="dialog-background"></div> | 76 <div id="dialog-background"></div> |
| 77 | 77 |
| 78 <!-- General tab content --> | 78 <!-- General tab content --> |
| 79 <div id="content-general" class="tab-content"> | 79 <div id="content-general" class="tab-content"> |
| 80 <div> | 80 <div> |
| 81 <h1 class="i18n_options_blocking_title"></h1> | 81 <h1 class="i18n_options_blocking_title"></h1> |
| 82 <div class="hbox"> | 82 <div class="hbox"> |
| 83 <div id="blocking-languages"> | 83 <div id="blocking-languages"> |
| 84 <div class="option-name"> | 84 <div class="option-name"> |
| 85 <span class="i18n_options_language_title"></span> | 85 <span class="i18n_options_language_title"></span> |
| 86 <div class="tooltip"> | 86 <span class="i18n_options_readMore" |
| 87 <span class="i18n_options_readMore"></span> | 87 data-tooltip="options_language_title_tooltip" |
| 88 <div role="tooltip"> | 88 data-tooltip-image="skin/tooltips/block.png"></span> |
| 89 <img src="skin/tooltips/block.png" alt="" /> | |
| 90 <p class="i18n_options_language_title_tooltip"></p> | |
| 91 <div class="notes"> | |
| 92 <p class="i18n_options_language_title_tooltip_notes_1">< /p> | |
| 93 <p class="i18n_options_language_title_tooltip_notes_2">< /p> | |
| 94 </div> | |
| 95 </div> | |
| 96 </div> | |
| 97 </div> | 89 </div> |
| 98 <ul id="blocking-languages-table" class="table list"> | 90 <ul id="blocking-languages-table" class="table list"> |
| 99 <template> | 91 <template> |
| 100 <button role="checkbox" class="control"></button> | 92 <button role="checkbox" class="control"></button> |
| 101 <label class="display"></label> | 93 <label class="display"></label> |
| 102 </template> | 94 </template> |
| 103 </ul> | 95 </ul> |
| 104 <div class="controls"> | 96 <div class="controls"> |
| 105 <button data-action="open-dialog" data-dialog="language"> | 97 <button data-action="open-dialog" data-dialog="language"> |
| 106 <span class="icon icon-add"></span> | 98 <span class="icon icon-add"></span> |
| 107 <span class="i18n_options_language_add"></span> | 99 <span class="i18n_options_language_add"></span> |
| 108 </button> | 100 </button> |
| 109 </div> | 101 </div> |
| 110 </div> | 102 </div> |
| 111 <div id="further-blocking"> | 103 <div id="further-blocking"> |
| 112 <div class="option-name"> | 104 <div class="option-name"> |
| 113 <strong class="i18n_options_furtherBlocking_title"></strong> | 105 <strong class="i18n_options_more_title"></strong> |
| 114 <div class="tooltip"> | 106 <span class="i18n_options_readMore" |
| 115 <span class="i18n_options_readMore"></span> | 107 data-tooltip="options_more_title_tooltip" |
| 116 <div role="tooltip" class="flip-vertical"> | 108 data-tooltip-image="skin/tooltips/more.png" |
| 117 <img src="skin/tooltips/more.png" alt="" /> | 109 data-tooltip-flip="horizontal"></span> |
| 118 <p class="i18n_options_furtherBlocking_title_tooltip"></p> | |
| 119 </div> | |
| 120 </div> | |
| 121 </div> | 110 </div> |
| 122 <div id="custom-wrapper"> | 111 <div id="custom-wrapper"> |
| 123 <ul id="recommend-list-table" class="table list"> | 112 <ul id="recommend-list-table" class="table list"> |
| 124 <template> | 113 <template> |
| 125 <button role="checkbox" class="control"></button> | 114 <button role="checkbox" class="control"></button> |
| 126 <label class="display"></label> | 115 <div class="fill"> |
| 116 <label class="display" | |
| 117 data-tooltip="options_more_%value%_tooltip" | |
| 118 data-tooltip-native></label> | |
| 119 </div> | |
| 127 <span class="i18n_options_popular popular"></span> | 120 <span class="i18n_options_popular popular"></span> |
| 128 </template> | 121 </template> |
| 129 </ul> | 122 </ul> |
| 130 <ul id="custom-list-table" class="table list"> | 123 <ul id="custom-list-table" class="table list"> |
| 131 <template> | 124 <template> |
| 132 <button role="checkbox" class="control"></button> | 125 <button role="checkbox" class="control"></button> |
| 133 <label class="display"></label> | 126 <label class="display"></label> |
| 134 </template> | 127 </template> |
| 135 </ul> | 128 </ul> |
| 136 </div> | 129 </div> |
| 137 <div class="controls"> | 130 <div class="controls"> |
| 138 <button data-action="open-dialog" data-dialog="custom"> | 131 <button data-action="open-dialog" data-dialog="custom"> |
| 139 <span class="icon icon-add"></span> | 132 <span class="icon icon-add"></span> |
| 140 <span class="i18n_options_furtherBlocking_add"><span> | 133 <span class="i18n_options_more_add"><span> |
| 141 </button> | 134 </button> |
| 142 </div> | 135 </div> |
| 143 </div> | 136 </div> |
| 144 </div> | 137 </div> |
| 145 </div> | 138 </div> |
| 146 <div> | 139 <div> |
| 147 <h1 class="i18n_options_exceptions_title"></h1> | 140 <h1 class="i18n_options_exceptions_title"></h1> |
| 148 <div class="hbox"> | 141 <div class="hbox"> |
| 149 <div id="acceptable-ads"> | 142 <div id="acceptable-ads"> |
| 150 <div class="option-name"> | 143 <div class="option-name"> |
| 151 <strong class="i18n_options_acceptableAds_title"></strong> | 144 <strong class="i18n_options_acceptableAds_title"></strong> |
| 152 <div class="tooltip"> | 145 <span class="i18n_options_readMore" |
| 153 <span class="i18n_options_readMore"></span> | 146 data-tooltip="options_acceptableAds_title_tooltip" |
| 154 <div role="tooltip"> | 147 data-tooltip-image="skin/tooltips/acceptable-ads.png"></sp an> |
| 155 <img src="skin/tooltips/acceptable-ads.png" alt="" /> | |
| 156 <p class="i18n_options_acceptableAds_title_tooltip_1"></p> | |
| 157 <p class="i18n_options_acceptableAds_title_tooltip_2"></p> | |
| 158 <p class="i18n_options_acceptableAds_title_tooltip_3"></p> | |
| 159 </div> | |
| 160 </div> | |
| 161 </div> | 148 </div> |
| 162 <ul id="acceptableads-table" class="table list"> | 149 <ul id="acceptableads-table" class="table list"> |
| 163 <template> | 150 <template> |
| 164 <button role="checkbox" class="control"></button> | 151 <button role="checkbox" class="control"></button> |
| 165 <label class="display"></label> | 152 <label class="display"></label> |
| 166 </template> | 153 </template> |
| 167 </ul> | 154 </ul> |
| 168 </div> | 155 </div> |
| 169 <div id="whitelisting"> | 156 <div id="whitelisting"> |
| 170 <div class="option-name"> | 157 <div class="option-name"> |
| 171 <strong class="i18n_options_whitelisted_title"></strong> | 158 <strong class="i18n_options_whitelisted_title"></strong> |
| 172 <div class="tooltip"> | 159 <span class="i18n_options_readMore" |
| 173 <span class="i18n_options_readMore"></span> | 160 data-tooltip="options_whitelisted_title_tooltip" |
| 174 <div role="tooltip" class="flip-vertical"> | 161 data-tooltip-image="skin/tooltips/whitelisted.png" |
| 175 <img src="skin/tooltips/whitelisted.png" alt="" /> | 162 data-tooltip-flip="horizontal"></span> |
| 176 <p class="i18n_options_whitelisted_title_tooltip_1"></p> | |
| 177 <p class="i18n_options_whitelisted_title_tooltip_2"></p> | |
| 178 <div class="notes"> | |
| 179 <p class="i18n_options_whitelisted_title_tooltip_notes"> </p> | |
| 180 </div> | |
| 181 </div> | |
| 182 </div> | |
| 183 </div> | 163 </div> |
| 184 <ul id="whitelisting-table" class="table list"> | 164 <ul id="whitelisting-table" class="table list"> |
| 185 <template> | 165 <template> |
| 186 <button class="delete control"></button> | 166 <button class="delete control"></button> |
| 187 <label class="display"></label> | 167 <label class="display"></label> |
| 188 </template> | 168 </template> |
| 189 </ul> | 169 </ul> |
| 190 <div class="controls"> | 170 <div class="controls"> |
| 191 <button data-action="edit-domain-exception"> | 171 <button data-action="edit-domain-exception"> |
| 192 <span class="icon icon-add"></span> | 172 <span class="icon icon-add"></span> |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 239 <span class="i18n_options_tweaks_safariContentBlocker"></span> | 219 <span class="i18n_options_tweaks_safariContentBlocker"></span> |
| 240 </label> | 220 </label> |
| 241 <span id="restart-safari" class="i18n_options_tweaks_restartSafa ri"></span> | 221 <span id="restart-safari" class="i18n_options_tweaks_restartSafa ri"></span> |
| 242 </li> | 222 </li> |
| 243 </ul> | 223 </ul> |
| 244 </div> | 224 </div> |
| 245 | 225 |
| 246 <div> | 226 <div> |
| 247 <h1> | 227 <h1> |
| 248 <span class="i18n_options_filterList_title"></span> | 228 <span class="i18n_options_filterList_title"></span> |
| 249 <div class="tooltip"> | 229 <span class="i18n_options_readMore" |
| 250 <span class="i18n_options_readMore"></span> | 230 data-tooltip="options_filterList_title_tooltip"></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> | |
| 259 </h1> | 231 </h1> |
| 260 <ul class="tabs horizontal"> | 232 <ul class="tabs horizontal"> |
| 261 <li class="i18n_options_tab_overview active" data-action="switch-t ab" data-tab="advanced-allFilterLists"></li> | 233 <li class="i18n_options_tab_overview active" data-action="switch-t ab" data-tab="advanced-allFilterLists"></li> |
| 262 <li class="i18n_options_tab_ownList" data-action="switch-tab" data -tab="advanced-customFilters"></li> | 234 <li class="i18n_options_tab_ownList" data-action="switch-tab" data -tab="advanced-customFilters"></li> |
| 263 </ul> | 235 </ul> |
| 264 <div id="filter-lists"> | 236 <div id="filter-lists"> |
| 265 <div id="all-filter-lists"> | 237 <div id="all-filter-lists"> |
| 266 <div class="table-header"> | 238 <div class="table-header"> |
| 267 <h2 class="i18n_options_column_name"></h2> | 239 <h2 class="i18n_options_column_name"></h2> |
| 268 <h2 class="i18n_options_column_date"></h2> | 240 <h2 class="i18n_options_column_date"></h2> |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 304 </button> | 276 </button> |
| 305 <button data-action="update-all-subscriptions"> | 277 <button data-action="update-all-subscriptions"> |
| 306 <span class="icon icon-update"></span> | 278 <span class="icon icon-update"></span> |
| 307 <span class="i18n_options_filterList_update"></span> | 279 <span class="i18n_options_filterList_update"></span> |
| 308 </button> | 280 </button> |
| 309 </div> | 281 </div> |
| 310 </div> | 282 </div> |
| 311 <div id="custom-filters"> | 283 <div id="custom-filters"> |
| 312 <h2 id="custom-filters-header"> | 284 <h2 id="custom-filters-header"> |
| 313 <span class="i18n_options_customFilters_title"></span> | 285 <span class="i18n_options_customFilters_title"></span> |
| 314 <div class="tooltip"> | 286 <span class="i18n_options_readMore" |
| 315 <span class="i18n_options_readMore"></span> | 287 data-tooltip="options_customFilters_title_tooltip"></span> |
| 316 <div role="tooltip"> | |
| 317 <p class="i18n_options_customFilters_title_tooltip"></p> | |
| 318 </div> | |
| 319 </div> | |
| 320 </h2> | 288 </h2> |
| 321 <div id="custom-filters-wrapper"> | 289 <div id="custom-filters-wrapper"> |
| 322 <div id="custom-filters-list-wrapper"> | 290 <div id="custom-filters-list-wrapper"> |
| 323 <ul id="custom-filters-table" class="table list"> | 291 <ul id="custom-filters-table" class="table list"> |
| 324 <template> | 292 <template> |
| 325 <label class="display"></label> | 293 <label class="display"></label> |
| 326 </template> | 294 </template> |
| 327 </ul> | 295 </ul> |
| 328 <form id="custom-filters-add" class="controls"> | 296 <form id="custom-filters-add" class="controls"> |
| 329 <input type="text"/> | 297 <input type="text"/> |
| (...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 433 <div class="url"></div> | 401 <div class="url"></div> |
| 434 <button class="i18n_options_dialog_predefined_confirm default-focus" data-action="add-predefined-subscription"></button> | 402 <button class="i18n_options_dialog_predefined_confirm default-focus" data-action="add-predefined-subscription"></button> |
| 435 </div> | 403 </div> |
| 436 </div> | 404 </div> |
| 437 </div> | 405 </div> |
| 438 <!-- Placeholder element to determine when to wrap focus around --> | 406 <!-- Placeholder element to determine when to wrap focus around --> |
| 439 <span class="focus-last" tabindex="0"></span> | 407 <span class="focus-last" tabindex="0"></span> |
| 440 </div> | 408 </div> |
| 441 </body> | 409 </body> |
| 442 </html> | 410 </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')
