Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code
Issues
All Issues

Delta Between Two Patch Sets: options.html

Issue 29322581: Issue 2356 - Implemented tooltip functionality (Closed)
Left Patch Set: Created July 17, 2015, 4:08 p.m.
Right Patch Set: Created July 29, 2015, 10:01 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « 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') | Show Comments Hide Comments ('s')
LEFTRIGHT
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 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 </div> 66 </div>
67 </div> 67 </div>
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="hbox">
77 <div id="blocking-languages"> 77 <div id="blocking-languages">
78 <div 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 <span class="tooltip"> 80 <div 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 <span class="i18n_options_readMore"></span> 81 <span class="i18n_options_readMore"></span>
82 <div role="tooltip"> 82 <div role="tooltip">
83 <img src="skin/tooltips/block.png"> 83 <img src="skin/tooltips/block.png" alt="" />
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 > 84 <p class="i18n_options_language_title_tooltip"></p>
85 <div> 85 <div class="notes">
86 <div class="i18n_options_language_title_tooltip_bottom_1 "></div> 86 <p class="i18n_options_language_title_tooltip_notes_1">< /p>
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> 87 <p class="i18n_options_language_title_tooltip_notes_2">< /p>
88 </div> 88 </div>
89 </div> 89 </div>
90 </span> 90 </div>
91 </div> 91 </div>
92 <ul id="blocking-languages-table" class="table list"> 92 <ul id="blocking-languages-table" class="table list">
93 <template> 93 <template>
94 <input type="checkbox" class="control" /> 94 <input type="checkbox" class="control" />
95 <span class="display"></span> 95 <span class="display"></span>
96 </template> 96 </template>
97 </ul> 97 </ul>
98 <div class="controls"> 98 <div class="controls">
99 <button data-action="open-dialog" data-dialog="language"> 99 <button data-action="open-dialog" data-dialog="language">
100 <span class="icon icon-add"></span> 100 <span class="icon icon-add"></span>
101 <span class="i18n_options_language_add"></span> 101 <span class="i18n_options_language_add"></span>
102 </button> 102 </button>
103 </div> 103 </div>
104 </div> 104 </div>
105 <div id="further-blocking"> 105 <div id="further-blocking">
106 <div class="option-name"> 106 <div class="option-name">
107 <strong class="i18n_options_furtherBlocking_title"></strong> 107 <strong class="i18n_options_furtherBlocking_title"></strong>
108 <span class="tooltip"> 108 <div 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.
109 <span class="i18n_options_readMore"></span> 109 <span class="i18n_options_readMore"></span>
110 <div role="tooltip" class="flip-vertical"> 110 <div role="tooltip" class="flip-vertical">
111 <img src="skin/tooltips/more.png"> 111 <img src="skin/tooltips/more.png" alt="" />
112 <div class="i18n_options_furtherBlocking_title_tooltip"></ div> 112 <p class="i18n_options_furtherBlocking_title_tooltip"></p>
113 </div> 113 </div>
114 </span> 114 </div>
115 </div> 115 </div>
116 <div id="custom-wrapper"> 116 <div id="custom-wrapper">
117 <ul id="recommend-list-table" class="table list"> 117 <ul id="recommend-list-table" class="table list">
118 <template> 118 <template>
119 <input type="checkbox" class="control" /> 119 <input type="checkbox" class="control" />
120 <span class="display"></span> 120 <span class="display"></span>
121 <span class="popular"></span> 121 <span class="popular"></span>
122 </template> 122 </template>
123 </ul> 123 </ul>
124 <ul id="custom-list-table" class="table list"> 124 <ul id="custom-list-table" class="table list">
125 <template> 125 <template>
126 <input type="checkbox" class="control" /> 126 <input type="checkbox" class="control" />
127 <span class="display"></span> 127 <span class="display"></span>
128 </template> 128 </template>
129 </ul> 129 </ul>
130 </div> 130 </div>
131 <div class="controls"> 131 <div class="controls">
132 <button data-action="open-dialog" data-dialog="custom"> 132 <button data-action="open-dialog" data-dialog="custom">
133 <span class="icon icon-add"></span> 133 <span class="icon icon-add"></span>
134 <span class="i18n_options_furtherBlocking_add"><span> 134 <span class="i18n_options_furtherBlocking_add"><span>
135 </button> 135 </button>
136 </div> 136 </div>
137 </div> 137 </div>
138 </div> 138 </div>
139 </div> 139 </div>
140 <div> 140 <div>
141 <h1 class="i18n_options_exceptions_title"></h1> 141 <h1 class="i18n_options_exceptions_title"></h1>
142 <div class="flex-container"> 142 <div class="hbox">
143 <div id="acceptable-ads"> 143 <div id="acceptable-ads">
144 <div class="option-name"> 144 <div class="option-name">
145 <strong class="i18n_options_acceptableAds_title"></strong> 145 <strong class="i18n_options_acceptableAds_title"></strong>
146 <span class="tooltip"> 146 <div class="tooltip">
147 <span class="i18n_options_readMore"></span> 147 <span class="i18n_options_readMore"></span>
148 <div role="tooltip"> 148 <div role="tooltip">
149 <img src="skin/tooltips/acceptable-ads.png"> 149 <img src="skin/tooltips/acceptable-ads.png" alt="" />
150 <div> 150 <p class="i18n_options_acceptableAds_title_tooltip_1"></p>
151 <div class="i18n_options_acceptableAds_title_tooltip_1"> </div> 151 <p class="i18n_options_acceptableAds_title_tooltip_2"></p>
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> 152 <p class="i18n_options_acceptableAds_title_tooltip_3"></p>
153 <div class="i18n_options_acceptableAds_title_tooltip_3"> </div>
154 </div>
155 </div> 153 </div>
156 </span> 154 </div>
157 </div> 155 </div>
158 <ul id="acceptableads-table" class="table list"> 156 <ul id="acceptableads-table" class="table list">
159 <template> 157 <template>
160 <input type="checkbox" class="control" /> 158 <input type="checkbox" class="control" />
161 <span class="display"></span> 159 <span class="display"></span>
162 </template> 160 </template>
163 </ul> 161 </ul>
164 </div> 162 </div>
165 <div id="whitelisting"> 163 <div id="whitelisting">
166 <div class="option-name"> 164 <div class="option-name">
167 <strong class="i18n_options_whitelisted_title"></strong> 165 <strong class="i18n_options_whitelisted_title"></strong>
168 <span class="tooltip"> 166 <div class="tooltip">
169 <span class="i18n_options_readMore"></span> 167 <span class="i18n_options_readMore"></span>
170 <div role="tooltip" class="flip-vertical"> 168 <div role="tooltip" class="flip-vertical">
171 <img src="skin/tooltips/whitelisted.png"> 169 <img src="skin/tooltips/whitelisted.png" alt="" />
172 <div> 170 <p class="i18n_options_whitelisted_title_tooltip_1"></p>
173 <div class="i18n_options_whitelisted_title_tooltip_top_1 "></div> 171 <p class="i18n_options_whitelisted_title_tooltip_2"></p>
174 <div class="i18n_options_whitelisted_title_tooltip_top_2 "></div> 172 <div class="notes">
173 <p class="i18n_options_whitelisted_title_tooltip_notes"> </p>
175 </div> 174 </div>
176 <div class="i18n_options_whitelisted_title_tooltip_bottom" ></div>
177 </div> 175 </div>
178 </span> 176 </div>
179 </div> 177 </div>
180 <ul id="whitelisting-table" class="table list"> 178 <ul id="whitelisting-table" class="table list">
181 <template> 179 <template>
182 <button class="delete control"></button> 180 <button class="delete control"></button>
183 <span class="display"></span> 181 <span class="display"></span>
184 </template> 182 </template>
185 </ul> 183 </ul>
186 <div class="controls"> 184 <div class="controls">
187 <div> 185 <div>
188 <span class="icon icon-add" data-action="add-domain-exceptio n"></span> 186 <span class="icon icon-add" data-action="add-domain-exceptio n"></span>
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
359 <div class="button-wrapper" data-action="add-predefined-subscription "> 357 <div class="button-wrapper" data-action="add-predefined-subscription ">
360 <span class="icon icon-arrow"></span> 358 <span class="icon icon-arrow"></span>
361 <span class="i18n_options_dialog_predefined_confirm"></span> 359 <span class="i18n_options_dialog_predefined_confirm"></span>
362 </div> 360 </div>
363 </div> 361 </div>
364 </div> 362 </div>
365 </div> 363 </div>
366 </div> 364 </div>
367 </body> 365 </body>
368 </html> 366 </html>
LEFTRIGHT
« locale/en-US/options.json ('k') | skin/options.css » ('j') | Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Toggle Comments ('s')

Powered by Google App Engine
This is Rietveld