Side by Side Diff: options.html
Issue 29322581:
Issue 2356 - Implemented tooltip functionality (Closed)
Patch Set:
Created July 17, 2015, 4:08 p.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')
|
skin/options.css » ('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-2015 Eyeo GmbH | 4 - Copyright (C) 2006-2015 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 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 68 <div id="tab-content"> | 68 <div id="tab-content"> |
| 69 <div id="content-wrapper"> | 69 <div id="content-wrapper"> |
| 70 <div id="dialog-background"></div> | 70 <div id="dialog-background"></div> |
| 71 | 71 |
| 72 <!-- General tab content --> | 72 <!-- General tab content --> |
| 73 <div id="content-general"> | 73 <div id="content-general"> |
| 74 <div> | 74 <div> |
| 75 <h1 class="i18n_options_blocking_title"></h1> | 75 <h1 class="i18n_options_blocking_title"></h1> |
| 76 <div class="flex-container"> | 76 <div class="flex-container"> |
| 77 <div id="blocking-languages"> | 77 <div id="blocking-languages"> |
| 78 <p class="option-name"> | 78 <div class="option-name"> |
| 79 <span class="i18n_options_language_title"></span> | 79 <span class="i18n_options_language_title"></span> |
| 80 <a class="i18n_options_readMore tooltip" target="_blank"></a> | 80 <span class="tooltip"> |
|
saroyanm
2015/07/22 18:25:38
I think we shouldn't put div inside span, until we
Thomas Greiner
2015/07/28 14:13:07
Done.
| |
| 81 </p> | 81 <span class="i18n_options_readMore"></span> |
| 82 <div role="tooltip"> | |
| 83 <img src="skin/tooltips/block.png"> | |
|
saroyanm
2015/07/22 18:25:38
Please add alt attribute.
saroyanm
2015/07/22 18:25:38
I assume we are not adding this images to sprite,
saroyanm
2015/07/22 18:25:38
Nit: please add closing slash for consistency.
Thomas Greiner
2015/07/28 14:13:06
No, because we don't need to. A sprite is a workar
Thomas Greiner
2015/07/28 14:13:06
Done.
Thomas Greiner
2015/07/28 14:13:06
Done. Note that I intentionally left it empty sinc
saroyanm
2015/07/28 17:21:42
Sure, but we still need required attribute even if
saroyanm
2015/07/28 17:21:42
Fare enough
Thomas Greiner
2015/07/28 18:19:22
Yeah, that's what I did.
| |
| 84 <div class="i18n_options_language_title_tooltip_top"></div > | |
| 85 <div> | |
| 86 <div class="i18n_options_language_title_tooltip_bottom_1 "></div> | |
|
saroyanm
2015/07/22 18:25:38
I think they behave as paragraph here, so I think
Thomas Greiner
2015/07/28 14:13:07
Done.
| |
| 87 <div class="i18n_options_language_title_tooltip_bottom_2 "></div> | |
| 88 </div> | |
| 89 </div> | |
| 90 </span> | |
| 91 </div> | |
| 82 <ul id="blocking-languages-table" class="table list"> | 92 <ul id="blocking-languages-table" class="table list"> |
| 83 <template> | 93 <template> |
| 84 <input type="checkbox" class="control" /> | 94 <input type="checkbox" class="control" /> |
| 85 <span class="display"></span> | 95 <span class="display"></span> |
| 86 </template> | 96 </template> |
| 87 </ul> | 97 </ul> |
| 88 <div class="controls"> | 98 <div class="controls"> |
| 89 <button data-action="open-dialog" data-dialog="language"> | 99 <button data-action="open-dialog" data-dialog="language"> |
| 90 <span class="icon icon-add"></span> | 100 <span class="icon icon-add"></span> |
| 91 <span class="i18n_options_language_add"></span> | 101 <span class="i18n_options_language_add"></span> |
| 92 </button> | 102 </button> |
| 93 </div> | 103 </div> |
| 94 </div> | 104 </div> |
| 95 <div id="further-blocking"> | 105 <div id="further-blocking"> |
| 96 <p class="option-name"> | 106 <div class="option-name"> |
| 97 <strong class="i18n_options_furtherBlocking_title"></strong> | 107 <strong class="i18n_options_furtherBlocking_title"></strong> |
| 98 <a class="i18n_options_readMore tooltip" target="_blank"></a> | 108 <span class="tooltip"> |
|
saroyanm
2015/07/22 18:25:38
Same as above, this should be div.
I'll stop comm
Thomas Greiner
2015/07/28 14:13:07
Done.
| |
| 99 </p> | 109 <span class="i18n_options_readMore"></span> |
| 110 <div role="tooltip" class="flip-vertical"> | |
| 111 <img src="skin/tooltips/more.png"> | |
| 112 <div class="i18n_options_furtherBlocking_title_tooltip"></ div> | |
| 113 </div> | |
| 114 </span> | |
| 115 </div> | |
| 100 <div id="custom-wrapper"> | 116 <div id="custom-wrapper"> |
| 101 <ul id="recommend-list-table" class="table list"> | 117 <ul id="recommend-list-table" class="table list"> |
| 102 <template> | 118 <template> |
| 103 <input type="checkbox" class=control /> | 119 <input type="checkbox" class="control" /> |
| 104 <span class="display"></span> | 120 <span class="display"></span> |
| 105 <span class="popular"></span> | 121 <span class="popular"></span> |
| 106 </template> | 122 </template> |
| 107 </ul> | 123 </ul> |
| 108 <ul id="custom-list-table" class="table list"> | 124 <ul id="custom-list-table" class="table list"> |
| 109 <template> | 125 <template> |
| 110 <input type="checkbox" class="control" /> | 126 <input type="checkbox" class="control" /> |
| 111 <span class="display"></span> | 127 <span class="display"></span> |
| 112 </template> | 128 </template> |
| 113 </ul> | 129 </ul> |
| 114 </div> | 130 </div> |
| 115 <div class="controls"> | 131 <div class="controls"> |
| 116 <button data-action="open-dialog" data-dialog="custom"> | 132 <button data-action="open-dialog" data-dialog="custom"> |
| 117 <span class="icon icon-add"></span> | 133 <span class="icon icon-add"></span> |
| 118 <span class="i18n_options_furtherBlocking_add"><span> | 134 <span class="i18n_options_furtherBlocking_add"><span> |
| 119 </button> | 135 </button> |
| 120 </div> | 136 </div> |
| 121 </div> | 137 </div> |
| 122 </div> | 138 </div> |
| 123 </div> | 139 </div> |
| 124 <div> | 140 <div> |
| 125 <h1 class="i18n_options_exceptions_title"></h1> | 141 <h1 class="i18n_options_exceptions_title"></h1> |
| 126 <div class="flex-container"> | 142 <div class="flex-container"> |
| 127 <div id="acceptable-ads"> | 143 <div id="acceptable-ads"> |
| 128 <p class="option-name"> | 144 <div class="option-name"> |
| 129 <strong class="i18n_options_acceptableAds_title"></strong> | 145 <strong class="i18n_options_acceptableAds_title"></strong> |
| 130 <a class="i18n_options_readMore tooltip" target="_blank"></a> | 146 <span class="tooltip"> |
| 131 </p> | 147 <span class="i18n_options_readMore"></span> |
| 148 <div role="tooltip"> | |
| 149 <img src="skin/tooltips/acceptable-ads.png"> | |
| 150 <div> | |
| 151 <div class="i18n_options_acceptableAds_title_tooltip_1"> </div> | |
|
saroyanm
2015/07/22 18:25:38
Here again tooltips behave as paragraph or heading
Thomas Greiner
2015/07/28 14:13:06
Done.
| |
| 152 <div class="i18n_options_acceptableAds_title_tooltip_2"> </div> | |
| 153 <div class="i18n_options_acceptableAds_title_tooltip_3"> </div> | |
| 154 </div> | |
| 155 </div> | |
| 156 </span> | |
| 157 </div> | |
| 132 <ul id="acceptableads-table" class="table list"> | 158 <ul id="acceptableads-table" class="table list"> |
| 133 <template> | 159 <template> |
| 134 <input type="checkbox" class="control" /> | 160 <input type="checkbox" class="control" /> |
| 135 <span class="display"></span> | 161 <span class="display"></span> |
| 136 </template> | 162 </template> |
| 137 </ul> | 163 </ul> |
| 138 </div> | 164 </div> |
| 139 <div id="whitelisting"> | 165 <div id="whitelisting"> |
| 140 <p class="option-name"> | 166 <div class="option-name"> |
| 141 <strong class="i18n_options_whitelisted_title"></strong> | 167 <strong class="i18n_options_whitelisted_title"></strong> |
| 142 <a class="i18n_options_readMore tooltip" target="_blank"></a> | 168 <span class="tooltip"> |
| 143 </p> | 169 <span class="i18n_options_readMore"></span> |
| 170 <div role="tooltip" class="flip-vertical"> | |
| 171 <img src="skin/tooltips/whitelisted.png"> | |
| 172 <div> | |
| 173 <div class="i18n_options_whitelisted_title_tooltip_top_1 "></div> | |
| 174 <div class="i18n_options_whitelisted_title_tooltip_top_2 "></div> | |
| 175 </div> | |
| 176 <div class="i18n_options_whitelisted_title_tooltip_bottom" ></div> | |
| 177 </div> | |
| 178 </span> | |
| 179 </div> | |
| 144 <ul id="whitelisting-table" class="table list"> | 180 <ul id="whitelisting-table" class="table list"> |
| 145 <template> | 181 <template> |
| 146 <button class="delete control"></button> | 182 <button class="delete control"></button> |
| 147 <span class="display"></span> | 183 <span class="display"></span> |
| 148 </template> | 184 </template> |
| 149 </ul> | 185 </ul> |
| 150 <div class="controls"> | 186 <div class="controls"> |
| 151 <div> | 187 <div> |
| 152 <span class="icon icon-add" data-action="add-domain-exceptio n"></span> | 188 <span class="icon icon-add" data-action="add-domain-exceptio n"></span> |
| 153 <input type="text" id="whitelisting-textbox" /> | 189 <input type="text" id="whitelisting-textbox" /> |
| (...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 323 <div class="button-wrapper" data-action="add-predefined-subscription "> | 359 <div class="button-wrapper" data-action="add-predefined-subscription "> |
| 324 <span class="icon icon-arrow"></span> | 360 <span class="icon icon-arrow"></span> |
| 325 <span class="i18n_options_dialog_predefined_confirm"></span> | 361 <span class="i18n_options_dialog_predefined_confirm"></span> |
| 326 </div> | 362 </div> |
| 327 </div> | 363 </div> |
| 328 </div> | 364 </div> |
| 329 </div> | 365 </div> |
| 330 </div> | 366 </div> |
| 331 </body> | 367 </body> |
| 332 </html> | 368 </html> |
| OLD | NEW |
« no previous file with comments
|
« locale/en-US/options.json ('k')
|
skin/options.css » ('j')
|
skin/options.css » ('J')
