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

Side by Side Diff: new-options.html

Issue 29445590: Issue 5255 - Advanced tab (HTML, strings and functionality) (Closed)
Patch Set: HTML, Strings and functionality Created June 11, 2017, 3:22 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« locale/en-US/new-options.json ('K') | « locale/en-US/new-options.json ('k') | new-options.js » ('j') | new-options.js » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 30 matching lines...) Expand all
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-advanced" role="tab" data-tab="advanced" 50 <li id="tab-advanced" role="tab" data-tab="advanced"
51 data-subtab="advanced-allFilterLists"
52 aria-controls="content-advanced" tabindex="-1"> 51 aria-controls="content-advanced" tabindex="-1">
53 <span class="i18n_options_tab_advanced"></span> 52 <span class="i18n_options_tab_advanced"></span>
54 </li> 53 </li>
55 <li id="tab-help" role="tab" data-tab="help" 54 <li id="tab-help" role="tab" data-tab="help"
56 aria-controls="content-help" tabindex="-1"> 55 aria-controls="content-help" tabindex="-1">
57 <span class="i18n_options_tab_help"></span> 56 <span class="i18n_options_tab_help"></span>
58 </li> 57 </li>
59 </ul> 58 </ul>
60 </nav> 59 </nav>
61 60
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
194 </div> 193 </div>
195 </div> 194 </div>
196 </div> 195 </div>
197 </div> 196 </div>
198 </div> 197 </div>
199 198
200 <!-- Advanced tab content --> 199 <!-- Advanced tab content -->
201 <div id="content-advanced" role="tabpanel" 200 <div id="content-advanced" role="tabpanel"
202 aria-labelledby="tab-advanced"> 201 aria-labelledby="tab-advanced">
203 <div> 202 <div>
204 <h1 class="i18n_options_tweaks_title"></h1> 203 <h1 class="i18n_options_tab_advanced"></h1>
205 <ul id="tweaks" class="table"> 204 <p class="i18n_options_advanced_description"></p>
206 <li data-pref="shouldShowBlockElementMenu"> 205 <section>
207 <label> 206 <h2 class="i18n_options_customize_header"></h2>
208 <button role="checkbox" data-action="toggle-pref"></button> 207 <ul id="customize" class="table">
209 <span class="i18n_options_tweaks_blockElement"></span> 208 <li data-pref="shouldShowBlockElementMenu">
210 </label> 209 <label>
210 <button role="checkbox" data-action="toggle-pref"></button>
211 <span class="i18n_options_customize_blockElement"></span>
212 <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>
214 </label>
215 </li>
216 <li data-pref="show_devtools_panel">
217 <label>
218 <button role="checkbox" data-action="toggle-pref"></button>
219 <span class="i18n_options_customize_showDevToolsPanel"></spa n>
220 <span class="i18n_options_readMore"
221 data-tooltip="options_customize_showDevToolsPanel_tooltip" ></span>
222 </label>
223 </li>
224 <li data-pref="notifications_ignoredcategories">
225 <label>
226 <button role="checkbox" data-action="toggle-pref"></button>
227 <span class="i18n_options_customize_showNotifications"></spa n>
228 <span class="i18n_options_readMore"
229 data-tooltip="options_customize_showNotifications_tooltip" ></span>
230 </label>
231 </li>
232 </ul>
233 </section>
234 </div>
235
236 <section>
237 <h1 class="i18n_options_filterList_title"></h1>
238 <p class="i18n_options_filterList_description"></p>
239
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>
211 </li> 245 </li>
212 <li data-pref="show_devtools_panel"> 246 <template>
213 <label> 247 <button data-action="remove-subscription" class="control delete" ></button>
214 <button role="checkbox" data-action="toggle-pref"></button> 248 <button data-action="toggle-disable-subscription" role="checkbox " class="control">
215 <span class="i18n_options_tweaks_showDevToolsPanel"></span> 249 </button>
216 </label> 250 <div class="state">
217 </li> 251 <span class="i18n_options_filterList_state_active" id="state-a ctive"></span>
218 <li data-pref="notifications_ignoredcategories"> 252 <span class="i18n_options_filterList_state_disabled" id="state -disabled"></span>
219 <label> 253 </div>
220 <button role="checkbox" data-action="toggle-pref"></button> 254 <div>
221 <span class="i18n_options_tweaks_showNotifications"></span> 255 <label class="display"></label>
222 </label> 256 </div>
257 <span class="last-update"></span>
258 <span class="message"></span>
259 <div data-action="open-context-menu" class="arrow">
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.
260 <div class="context-menu">
261 <div class="content">
262 <a class="i18n_options_filterList_updateNow update-subscri ption" data-action="update-subscription"></a>
263 <a class="i18n_options_filterList_website website" target= "_blank"></a>
264 <a class="i18n_options_filterList_source source" target="_ blank"></a>
265 <a class="i18n_options_filterList_delete delete" data-acti on="remove-subscription"></a>
266 </div>
267 </div>
268 </div>
269 </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>
223 </li> 275 </li>
224 </ul> 276 </ul>
225 </div> 277 <div class="controls">
278 <button data-action="open-dialog" data-dialog="custom">
279 <span class="icon icon-add"></span>
280 <span class="i18n_options_filterList_add"></span>
281 </button>
282 <button data-action="update-all-subscriptions">
283 <span class="icon icon-update"></span>
284 <span class="i18n_options_filterList_update"></span>
285 </button>
286 </div>
287 </section>
226 288
227 <div> 289 <section>
228 <h1> 290 <h1 class="i18n_options_customFilters_title"></h1>
229 <span class="i18n_options_filterList_title"></span> 291 <p class="i18n_options_customFilters_description"></p>
230 <span class="i18n_options_readMore" 292 <h2 class="i18n_options_customFilters_widget_title"></h2>
231 data-tooltip="options_filterList_title_tooltip"></span> 293 <div id="custom-filters" class="mode-empty">
232 </h1> 294 <div id="empty-custom-filters">
233 <ul class="tabs horizontal" role="tablist" data-action="switch-tab" 295 <p class="i18n_options_customFilters_tip"></p>
234 data-keys="ArrowLeft ArrowUp ArrowRight ArrowDown"> 296 <button class="i18n_options_customFilters_start" data-action="ed it-custom-filters">
235 <li id="tab-allFilterLists" 297 </button>
236 class="i18n_options_tab_overview active" 298 <p>
237 role="tab" data-tab="advanced-allFilterLists" 299 <a class="i18n_options_customFilters_learn" id="link-filters" target="_blank"></a>
238 aria-selected="true" aria-controls="all-filter-lists" 300 </p>
239 tabindex="0"></li>
240 <li id="tab-customFilters" class="i18n_options_tab_ownList"
241 role="tab" data-tab="advanced-customFilters"
242 aria-controls="custom-filters" tabindex="-1"></li>
243 </ul>
244 <div id="filter-lists">
245 <div id="all-filter-lists" role="tabpanel"
246 aria-labelledby="tab-allFilterLists">
247 <div class="table-header">
248 <h2 class="i18n_options_column_name"></h2>
249 <h2 class="i18n_options_column_date"></h2>
250 </div>
251 <ul class="table cols" id="all-filter-lists-table">
252 <template>
253 <button data-action="toggle-disable-subscription" role="chec kbox" class="control"></button>
254 <div>
255 <label data-action="open-context-menu" class="display"></l abel>
256 <div data-action="open-context-menu" class="arrow">
257 <div class="context-menu">
258 <div class="content">
259 <a class="i18n_options_filterList_updateNow update-s ubscription" data-action="update-subscription"></a>
260 <a class="i18n_options_filterList_website website" t arget="_blank"></a>
261 <a class="i18n_options_filterList_source source" tar get="_blank"></a>
262 <a class="i18n_options_filterList_delete delete" dat a-action="remove-subscription"></a>
263 </div>
264 </div>
265 </div>
266 </div>
267 <span class="date"></span>
saroyanm 2017/06/11 15:40:11 We do have date and time still in the sprite: * I'
saroyanm 2017/06/12 16:44:42 I will remove the icon from the sprite, but leave
saroyanm 2017/06/14 10:59:00 Done.
268 <span class="time"></span>
269 <span class="message"></span>
270 </template>
271 <li class="static">
272 <button id="own-list" role="checkbox" class="control" aria-c hecked="true" disabled="true"></button>
273 <div>
274 <label for="own-list" class="i18n_options_filterList_own_l ist"></label>
275 </div>
276 <span>
277 <a class="i18n_options_filterList_edit_own_list"
278 href="#advanced-customFilters"></a>
279 </span>
280 </li>
281 </ul>
282 <div class="controls">
283 <button data-action="open-dialog" data-dialog="custom">
284 <span class="icon icon-add"></span>
285 <span class="i18n_options_filterList_add"></span>
286 </button>
287 <button data-action="update-all-subscriptions">
288 <span class="icon icon-update"></span>
289 <span class="i18n_options_filterList_update"></span>
290 </button>
291 </div>
292 </div> 301 </div>
293 <div id="custom-filters" role="tabpanel" 302 <select id="custom-filters-box" multiple></select>
294 aria-labelledby="tab-customFilters"> 303 <textarea id="custom-filters-raw"></textarea>
295 <h2 id="custom-filters-header"> 304 <button id="custom-filters-edit" class="i18n_options_customFilter_ edit" data-action="edit-custom-filters">
296 <span class="i18n_options_customFilters_title"></span> 305 </button>
297 <span class="i18n_options_readMore" 306 <div id="custom-filters-raw-controls">
298 data-tooltip="options_customFilters_title_tooltip"></span> 307 <button class="i18n_options_customFilter_save" data-action="save -custom-filters">
299 </h2> 308 </button>
300 <div id="custom-filters-wrapper"> 309 <button class="i18n_options_customFilter_cancel" data-action="ca ncel-custom-filters">
301 <div id="custom-filters-list-wrapper"> 310 </button>
302 <ul id="custom-filters-table" class="table list">
303 <template>
304 <label class="display"></label>
305 </template>
306 </ul>
307 <form id="custom-filters-add" class="controls">
308 <input type="text"/>
309 <button class="i18n_options_button_add" type="submit"></bu tton>
310 </form>
311 </div>
312 <textarea id="custom-filters-raw"></textarea>
313 </div>
314 <div id="custom-filters-edit-wrapper" class="controls">
315 <button id="custom-filters-show-edit" data-action="edit-custom -filters">
316 <span class="icon icon-edit"></span>
317 <span class="i18n_options_customFilter_edit"></span>
318 </button>
319 <div id="custom-filters-raw-controls">
320 <button id="custom-filters-raw-save" data-action="save-custo m-filters">
321 <span class="icon icon-save"></span>
322 <span class="i18n_options_customFilter_save"></span>
323 </button>
324 <button data-action="cancel-custom-filters">
325 <span class="icon icon-cancel"></span>
326 <span class="i18n_options_customFilter_cancel"></span>
327 </button>
328 </div>
329 </div>
330 </div> 311 </div>
331 </div> 312 </div>
332 </div> 313 </section>
333 </div> 314 </div>
334 315
335 <!-- Help tab content --> 316 <!-- Help tab content -->
336 <div id="content-help" role="tabpanel" aria-labelledby="tab-help"> 317 <div id="content-help" role="tabpanel" aria-labelledby="tab-help">
337 <h1 class="i18n_options_faq_title"></h1> 318 <h1 class="i18n_options_faq_title"></h1>
338 <p class="i18n_options_faq_description"></p> 319 <p class="i18n_options_faq_description"></p>
339 <p> 320 <p>
340 <a id="link-faq" class="i18n_options_faq_title" target="_blank"></a > 321 <a id="link-faq" class="i18n_options_faq_title" target="_blank"></a >
341 </p> 322 </p>
342 <h1 class="i18n_options_forum_title"></h1> 323 <h1 class="i18n_options_forum_title"></h1>
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
401 <div id="dialog-content-custom" class="dialog-content"> 382 <div id="dialog-content-custom" class="dialog-content">
402 <div class="dialog-content-block"> 383 <div class="dialog-content-block">
403 <div> 384 <div>
404 <label for="blockingList-textbox" class="i18n_options_dialog_custo m_subscription_title"></label> 385 <label for="blockingList-textbox" class="i18n_options_dialog_custo m_subscription_title"></label>
405 <input id="blockingList-textbox" type="text" class="default-focus" placeholder="www.example.com/blockinglist.txt" /> 386 <input id="blockingList-textbox" type="text" class="default-focus" placeholder="www.example.com/blockinglist.txt" />
406 </div> 387 </div>
407 <button class="i18n_options_dialog_custom_import" data-action="impor t-subscription"></button> 388 <button class="i18n_options_dialog_custom_import" data-action="impor t-subscription"></button>
408 </div> 389 </div>
409 <div class="dialog-content-block"> 390 <div class="dialog-content-block">
410 <h3 class="i18n_options_dialog_edit_own_list"></h3> 391 <h3 class="i18n_options_dialog_edit_own_list"></h3>
411 <button class="i18n_options_dialog_create_own_list" data-action="clo se-dialog,switch-tab,edit-custom-filters" data-tab="advanced-customFilters"></bu tton> 392 <button class="i18n_options_dialog_create_own_list" data-action="clo se-dialog,switch-tab,edit-custom-filters" data-tab="advanced"></button>
412 </div> 393 </div>
413 </div> 394 </div>
414 <!-- Add predefined subscription --> 395 <!-- Add predefined subscription -->
415 <div id="dialog-content-predefined" class="dialog-content"> 396 <div id="dialog-content-predefined" class="dialog-content">
416 <div class="dialog-content-block"> 397 <div class="dialog-content-block">
417 <h3></h3> 398 <h3></h3>
418 <div class="url"></div> 399 <div class="url"></div>
419 <button class="i18n_options_dialog_predefined_confirm default-focus" data-action="add-predefined-subscription"></button> 400 <button class="i18n_options_dialog_predefined_confirm default-focus" data-action="add-predefined-subscription"></button>
420 </div> 401 </div>
421 </div> 402 </div>
422 </div> 403 </div>
423 <!-- Placeholder element to determine when to wrap focus around --> 404 <!-- Placeholder element to determine when to wrap focus around -->
424 <span class="focus-last" tabindex="0"></span> 405 <span class="focus-last" tabindex="0"></span>
425 </div> 406 </div>
426 </body> 407 </body>
427 </html> 408 </html>
OLDNEW
« locale/en-US/new-options.json ('K') | « locale/en-US/new-options.json ('k') | new-options.js » ('j') | new-options.js » ('J')

Powered by Google App Engine
This is Rietveld