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

Delta Between Two Patch Sets: new-options.html

Issue 29445590: Issue 5255 - Advanced tab (HTML, strings and functionality) (Closed)
Left Patch Set: HTML, Strings and functionality Created June 11, 2017, 3:22 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.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« 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') | 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-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
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
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>
207 <ul id="customize" class="table"> 202 <ul id="customize" class="table">
208 <li data-pref="shouldShowBlockElementMenu"> 203 <li data-pref="shouldShowBlockElementMenu">
209 <label> 204 <label>
210 <button role="checkbox" data-action="toggle-pref"></button> 205 <button role="checkbox" data-action="toggle-pref"></button>
211 <span class="i18n_options_customize_blockElement"></span> 206 <span class="i18n_options_customize_blockElement"></span>
212 <span class="i18n_options_readMore" 207 <span class="i18n_options_readMore"
saroyanm 2017/06/11 15:40:11 I think redoing the tool-tips belong to another re
saroyanm 2017/06/12 16:44:42 Acknowledged.
213 data-tooltip="options_customize_blockElement_tooltip"></sp an> 208 data-tooltip="options_customize_blockElement_tooltip"></sp an>
214 </label> 209 </label>
215 </li> 210 </li>
216 <li data-pref="show_devtools_panel"> 211 <li data-pref="show_devtools_panel">
217 <label> 212 <label>
218 <button role="checkbox" data-action="toggle-pref"></button> 213 <button role="checkbox" data-action="toggle-pref"></button>
219 <span class="i18n_options_customize_showDevToolsPanel"></spa n> 214 <span class="i18n_options_customize_showDevToolsPanel"></spa n>
220 <span class="i18n_options_readMore" 215 <span class="i18n_options_readMore"
221 data-tooltip="options_customize_showDevToolsPanel_tooltip" ></span> 216 data-tooltip="options_customize_showDevToolsPanel_tooltip" ></span>
222 </label> 217 </label>
223 </li> 218 </li>
224 <li data-pref="notifications_ignoredcategories"> 219 <li data-pref="notifications_ignoredcategories">
225 <label> 220 <label>
226 <button role="checkbox" data-action="toggle-pref"></button> 221 <button role="checkbox" data-action="toggle-pref"></button>
227 <span class="i18n_options_customize_showNotifications"></spa n> 222 <span class="i18n_options_customize_showNotifications"></spa n>
228 <span class="i18n_options_readMore" 223 <span class="i18n_options_readMore"
229 data-tooltip="options_customize_showNotifications_tooltip" ></span> 224 data-tooltip="options_customize_showNotifications_tooltip" ></span>
230 </label> 225 </label>
231 </li> 226 </li>
232 </ul> 227 </ul>
233 </section> 228 </section>
234 </div> 229 </div>
235 230
236 <section> 231 <section>
237 <h1 class="i18n_options_filterList_title"></h1> 232 <h1 class="i18n_options_filterList_title"></h1>
238 <p class="i18n_options_filterList_description"></p> 233 <p id="filter-lists-description" class="i18n_options_filterList_desc ription"></p>
239 234
235 <div id="all-filter-lists-table-header">
236 <h2 class="i18n_options_filterList_column_status"></h2>
237 <h2 class="i18n_options_filterList_column_name"></h2>
238 <h2 class="i18n_options_filterList_column_update"></h2>
239 </div>
240 <ul class="table cols" id="all-filter-lists-table"> 240 <ul class="table cols" id="all-filter-lists-table">
saroyanm 2017/06/11 15:40:11 Shouldn't this be <table> rather than list ? It l
saroyanm 2017/06/12 16:44:41 If it easy to implement add support for both table
saroyanm 2017/06/14 10:59:00 After investigation, it appears that it might requ
Thomas Greiner 2017/07/07 13:01:07 Acknowledged.
241 <li class="static header">
242 <h2 class="i18n_options_filterList_column_status"></h2>
243 <h2 class="i18n_options_filterList_column_name"></h2>
244 <h2 class="i18n_options_filterList_column_update"></h2>
245 </li>
246 <template> 241 <template>
247 <button data-action="remove-subscription" class="control delete" ></button> 242 <button data-action="remove-subscription" class="control delete" ></button>
248 <button data-action="toggle-disable-subscription" role="checkbox " class="control"> 243 <button data-action="toggle-disable-subscription" role="checkbox " class="control">
249 </button> 244 </button>
250 <div class="state"> 245 <div class="state">
251 <span class="i18n_options_filterList_state_active" id="state-a ctive"></span> 246 <span class="i18n_options_filterList_state_active" id="state-a ctive"></span>
252 <span class="i18n_options_filterList_state_disabled" id="state -disabled"></span> 247 <span class="i18n_options_filterList_state_disabled" id="state -disabled"></span>
253 </div> 248 </div>
254 <div> 249 <div>
255 <label class="display"></label> 250 <label class="display"></label>
256 </div> 251 </div>
257 <span class="last-update"></span> 252 <span class="last-update"></span>
258 <span class="message"></span> 253 <span class="message"></span>
259 <div data-action="open-context-menu" class="arrow"> 254 <a data-action="open-context-menu" class="arrow"></a>
saroyanm 2017/06/11 15:40:11 This should be button instead: Focusing button loo
saroyanm 2017/06/12 16:44:42 Use <a> tag instead of DIV
saroyanm 2017/06/14 10:59:00 Done.
255 <div role="menubar" class="context-menu-wrapper">
260 <div class="context-menu"> 256 <div class="context-menu">
261 <div class="content"> 257 <ul class="content" role="menu">
262 <a class="i18n_options_filterList_updateNow update-subscri ption" data-action="update-subscription"></a> 258 <li role="menuitem">
263 <a class="i18n_options_filterList_website website" target= "_blank"></a> 259 <a class="i18n_options_filterList_updateNow update-subsc ription" data-action="update-subscription"></a>
264 <a class="i18n_options_filterList_source source" target="_ blank"></a> 260 </li>
265 <a class="i18n_options_filterList_delete delete" data-acti on="remove-subscription"></a> 261 <li role="menuitem">
266 </div> 262 <a class="i18n_options_filterList_website website" targe t="_blank"></a>
263 </li>
264 <li role="menuitem">
265 <a class="i18n_options_filterList_source source" target= "_blank"></a>
266 </li>
267 <li role="menuitem">
268 <a class="i18n_options_filterList_delete delete" data-ac tion="remove-subscription"></a>
269 </li>
270 </ul>
267 </div> 271 </div>
268 </div> 272 </div>
269 </template> 273 </template>
270 <li class="static">
271 <button id="own-list" role="checkbox" class="control" aria-check ed="true" disabled="true"></button>
272 <div>
273 <label for="own-list" class="i18n_options_filterList_own_list" ></label>
274 </div>
275 </li>
276 </ul> 274 </ul>
277 <div class="controls"> 275 <div class="controls">
278 <button data-action="open-dialog" data-dialog="custom"> 276 <button data-action="open-dialog" data-dialog="custom">
279 <span class="icon icon-add"></span> 277 <span class="icon icon-add"></span>
280 <span class="i18n_options_filterList_add"></span> 278 <span class="i18n_options_filterList_add"></span>
281 </button> 279 </button>
282 <button data-action="update-all-subscriptions"> 280 <button data-action="update-all-subscriptions">
283 <span class="icon icon-update"></span> 281 <span class="icon icon-update"></span>
284 <span class="i18n_options_filterList_update"></span> 282 <span class="i18n_options_filterList_update"></span>
285 </button> 283 </button>
286 </div> 284 </div>
287 </section> 285 </section>
288 286
289 <section> 287 <section>
290 <h1 class="i18n_options_customFilters_title"></h1> 288 <h1 class="i18n_options_customFilters_title"></h1>
291 <p class="i18n_options_customFilters_description"></p> 289 <p class="i18n_options_customFilters_description"></p>
292 <h2 class="i18n_options_customFilters_widget_title"></h2> 290 <h2 class="i18n_options_customFilters_widget_title"></h2>
293 <div id="custom-filters" class="mode-empty"> 291 <div id="custom-filters">
294 <div id="empty-custom-filters"> 292 <div id="empty-custom-filters">
295 <p class="i18n_options_customFilters_tip"></p> 293 <p class="i18n_options_customFilters_tip"></p>
296 <button class="i18n_options_customFilters_start" data-action="ed it-custom-filters"> 294 <button class="i18n_options_customFilters_start" data-action="ed it-custom-filters">
297 </button> 295 </button>
298 <p> 296 <p>
299 <a class="i18n_options_customFilters_learn" id="link-filters" target="_blank"></a> 297 <a class="i18n_options_customFilters_learn" id="link-filters" target="_blank"></a>
300 </p> 298 </p>
301 </div> 299 </div>
302 <select id="custom-filters-box" multiple></select> 300 <textarea id="custom-filters-raw" rows="15"></textarea>
303 <textarea id="custom-filters-raw"></textarea>
304 <button id="custom-filters-edit" class="i18n_options_customFilter_ edit" data-action="edit-custom-filters"> 301 <button id="custom-filters-edit" class="i18n_options_customFilter_ edit" data-action="edit-custom-filters">
305 </button> 302 </button>
306 <div id="custom-filters-raw-controls"> 303 <div id="custom-filters-raw-controls">
307 <button class="i18n_options_customFilter_save" data-action="save -custom-filters"> 304 <button class="i18n_options_customFilter_save" data-action="save -custom-filters">
308 </button> 305 </button>
309 <button class="i18n_options_customFilter_cancel" data-action="ca ncel-custom-filters"> 306 <button class="i18n_options_customFilter_cancel" data-action="ca ncel-custom-filters">
310 </button> 307 </button>
311 </div> 308 </div>
312 </div> 309 </div>
313 </section> 310 </section>
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
399 <div class="url"></div> 396 <div class="url"></div>
400 <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>
401 </div> 398 </div>
402 </div> 399 </div>
403 </div> 400 </div>
404 <!-- Placeholder element to determine when to wrap focus around --> 401 <!-- Placeholder element to determine when to wrap focus around -->
405 <span class="focus-last" tabindex="0"></span> 402 <span class="focus-last" tabindex="0"></span>
406 </div> 403 </div>
407 </body> 404 </body>
408 </html> 405 </html>
LEFTRIGHT
« 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')

Powered by Google App Engine
This is Rietveld