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

Side by Side Diff: options.html

Issue 29333819: Issue 2375 - Implement "Blocking lists" section in new options page (Closed)
Patch Set: Small fixes and improved download messages for filter lists Created Feb. 3, 2016, 5:41 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
« background.js ('K') | « messageResponder.js ('k') | options.js » ('j') | 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-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 25 matching lines...) Expand all
36 <header id="page-title"> 36 <header id="page-title">
37 <p class="i18n_options_page_header_1"></p> 37 <p class="i18n_options_page_header_1"></p>
38 <h1 class="i18n_options_page_header_2"></h1> 38 <h1 class="i18n_options_page_header_2"></h1>
39 </header> 39 </header>
40 <nav> 40 <nav>
41 <ul class="tabs vertical"> 41 <ul class="tabs vertical">
42 <li id="tab-general" data-action="switch-tab" data-tab="general" cla ss="active"> 42 <li id="tab-general" data-action="switch-tab" data-tab="general" cla ss="active">
43 <a class="i18n_options_tab_general"></a> 43 <a class="i18n_options_tab_general"></a>
44 <span class="icon"></span> 44 <span class="icon"></span>
45 </li> 45 </li>
46 <li id="tab-advanced" data-action="switch-tab" data-tab="advanced"> 46 <li id="tab-advanced" data-action="switch-tab" data-tab="advanced-al lFilterLists">
47 <a class="i18n_options_tab_advanced"></a> 47 <a class="i18n_options_tab_advanced"></a>
48 <span class="icon"></span> 48 <span class="icon"></span>
49 </li> 49 </li>
50 <li id="tab-help" data-action="switch-tab" data-tab="help"> 50 <li id="tab-help" data-action="switch-tab" data-tab="help">
51 <a class="i18n_options_tab_help"></a> 51 <a class="i18n_options_tab_help"></a>
52 <span class="icon"></span> 52 <span class="icon"></span>
53 </li> 53 </li>
54 </ul> 54 </ul>
55 </nav> 55 </nav>
56 <a id="link-version"> 56 <a id="link-version">
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 <img src="skin/tooltips/more.png" alt="" /> 117 <img src="skin/tooltips/more.png" alt="" />
118 <p class="i18n_options_furtherBlocking_title_tooltip"></p> 118 <p class="i18n_options_furtherBlocking_title_tooltip"></p>
119 </div> 119 </div>
120 </div> 120 </div>
121 </div> 121 </div>
122 <div id="custom-wrapper"> 122 <div id="custom-wrapper">
123 <ul id="recommend-list-table" class="table list"> 123 <ul id="recommend-list-table" class="table list">
124 <template> 124 <template>
125 <button role="checkbox" class="control"></button> 125 <button role="checkbox" class="control"></button>
126 <span class="display"></span> 126 <span class="display"></span>
127 <span class="popular"></span> 127 <span class="i18n_options_popular popular"></span>
128 </template> 128 </template>
129 </ul> 129 </ul>
130 <ul id="custom-list-table" class="table list"> 130 <ul id="custom-list-table" class="table list">
131 <template> 131 <template>
132 <button role="checkbox" class="control"></button> 132 <button role="checkbox" class="control"></button>
133 <span class="display"></span> 133 <span class="display"></span>
134 </template> 134 </template>
135 </ul> 135 </ul>
136 </div> 136 </div>
137 <div class="controls"> 137 <div class="controls">
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
206 </div> 206 </div>
207 </div> 207 </div>
208 </div> 208 </div>
209 </div> 209 </div>
210 </div> 210 </div>
211 </div> 211 </div>
212 212
213 <!-- Advanced tab content --> 213 <!-- Advanced tab content -->
214 <div id="content-advanced" class="tab-content"> 214 <div id="content-advanced" class="tab-content">
215 <div> 215 <div>
216 <h1><span class="i18n_options_tweaks_title"></span><a class="i18n_op tions_readMore tooltip" href="#"></a></h1> 216 <h1>
217 <ul class="table" style="width: auto;"> 217 <span class="i18n_options_tweaks_title"></span>
218 <a class="i18n_options_readMore tooltip"></a>
219 </h1>
220 <ul class="table">
218 <li> 221 <li>
219 <button role="checkbox" id="easylist"></button> 222 <button role="checkbox" id="easylist"></button>
220 <span id="block-element-explanation" class="i18n_options_tweaks_ blockElement"></span> 223 <span id="block-element-explanation" class="i18n_options_tweaks_ blockElement"></span>
221 </li> 224 </li>
222 </ul> 225 </ul>
223 </div> 226 </div>
224 <div> 227 <div>
225 <h1><span class="i18n_options_blockingList_title"></span><a class="i 18n_options_readMore tooltip" href="#" target="_blank"></a></h1> 228 <h1>
226 <ul id="blocking-list-tabs" class="tabs horizontal"> 229 <span class="i18n_options_filterList_title"></span>
227 <li class="i18n_options_tab_overview active" data-show="blocking-l ist-overview"></li><li class="i18n_options_tab_ownList" data-show="custom-filter s"></li> 230 <a class="i18n_options_readMore tooltip"></a>
231 </h1>
232 <ul class="tabs horizontal">
233 <li class="i18n_options_tab_overview active" data-action="switch-t ab" data-tab="advanced-allFilterLists"></li>
234 <li class="i18n_options_tab_ownList" data-action="switch-tab" data -tab="advanced-customFilters"></li>
228 </ul> 235 </ul>
229 <div id="blocking-list"> 236 <div id="filter-lists">
230 <div id="blocking-list-overview"> 237 <div id="all-filter-lists">
231 <ul class="table cols" style="width: auto;"> 238 <div class="table-header">
232 <li class="col-name"><span class="i18n_options_tableCol_name"> </span><span class="i18n_options_tableCol_description"></span><span class="i18n_ options_tableCol_date"></span></li> 239 <h3 class="i18n_options_column_name"></h3>
233 <li><input type="checkbox" id="easylist"/><span>Easylist</span ><span>Adblocking english sites</span><span>15 March 14 - 10:31</span></li> 240 <h3 class="i18n_options_column_date"></h3>
234 <li><input type="checkbox" id="easylist+de"/><span>Easylist Ge rmany + Easylist</span><span>Adblocking english + german sites</span><span>15 Ma rch 14 - 10:31</span></li> 241 </div>
235 <li><input type="checkbox" id="annoyance-fb"/><span>Facebook a nnoyance blocker</span><span>Blocks Facebook annoyances</span><span>15 March 14 - 10:31</span></li> 242 <ul class="table cols" id="all-filter-lists-table">
236 <li><input type="checkbox" id="annoyance-youtube"/><span>Faceb ook annoyance blocker</span><span>Blocks Facebook annoyances</span><span>15 Marc h 14 - 10:31</span></li> 243 <template>
237 <li><input type="checkbox" id="own-list"/><span>Own blocking l ist</span><span>Your own blocking list</span><span><a href="#">edit your blockin g list</a></span></li> 244 <button role="checkbox" class="control"></button>
245 <div>
246 <span data-action="open-context-menu" class="display"></sp an>
247 <div data-action="open-context-menu" class="arrow">
248 <div class="context-menu">
249 <div class="content">
250 <a class="i18n_options_filterList_updateNow update-s ubscription" data-action="update-subscription"></a>
251 <a class="i18n_options_filterList_website website" t arget="_blank"></a>
252 <a class="i18n_options_filterList_source source" tar get="_blank"></a>
253 <a class="i18n_options_filterList_delete delete" dat a-action="remove-subscription"></a>
254 </div>
255 </div>
256 </div>
257 </div>
258 <span class="date"></span>
259 <span class="time"></span>
260 <span class="error">error</span>
261 <span class="progress">progress</span>
Thomas Greiner 2016/02/04 15:28:16 We don't intend to show both at the same time so w
262 </template>
263 <li class="static">
264 <button role="checkbox" class="control" aria-checked="true" disabled="true"></button>
265 <div>
266 <span class="i18n_options_filterList_own_list"></span>
267 </div>
268 <span data-action="switch-tab,edit-custom-filters" data-tab= "advanced-customFilters">
269 <a class="i18n_options_filterList_edit_own_list"></a>
270 </span>
271 </li>
238 </ul> 272 </ul>
239 <div class="controls"> 273 <div class="controls">
240 <button> 274 <button data-action="open-dialog" data-dialog="custom">
241 <span class="icon icon-add"></span><span class="i18n_options _blockingList_add"></span> 275 <span class="icon icon-add"></span>
276 <span class="i18n_options_filterList_add"></span>
242 </button> 277 </button>
243 <button> 278 <button data-action="update-all-subscriptions">
244 <span class="icon icon-update"></span><span class="i18n_opti ons_blockingList_update"></span> 279 <span class="icon icon-update"></span>
280 <span class="i18n_options_filterList_update"></span>
245 </button> 281 </button>
246 </div> 282 </div>
247 </div> 283 </div>
248 <div id="custom-filters"> 284 <div id="custom-filters">
249 <h2 id="custom-filters-header" class="i18n_options_customFilters _title"></h2> 285 <h3 id="custom-filters-header" class="i18n_options_customFilters _title"></h3>
250 <div id="custom-filters-wrapper"> 286 <div id="custom-filters-wrapper">
251 <div id="custom-filters-list-wrapper"> 287 <div id="custom-filters-list-wrapper">
252 <ul id="custom-filters-table" class="table list"> 288 <ul id="custom-filters-table" class="table list">
253 <template> 289 <template>
254 <span class="display"></span> 290 <span class="display"></span>
255 </template> 291 </template>
256 </ul> 292 </ul>
257 <form id="custom-filters-add" class="controls"> 293 <form id="custom-filters-add" class="controls">
258 <input type="text"/> 294 <input type="text"/>
259 <button class="i18n_options_button_add" type="submit"></bu tton> 295 <button class="i18n_options_button_add" type="submit"></bu tton>
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
327 </ul> 363 </ul>
328 </div> 364 </div>
329 <div id="other-language" class="dialog-content-block"> 365 <div id="other-language" class="dialog-content-block">
330 <div> 366 <div>
331 <label for="find-language" class="i18n_options_dialog_language_oth er"></label> 367 <label for="find-language" class="i18n_options_dialog_language_oth er"></label>
332 <input type="search" id="find-language" class="default-focus" /> 368 <input type="search" id="find-language" class="default-focus" />
333 </div> 369 </div>
334 <ul id="all-lang-table" class="table list"> 370 <ul id="all-lang-table" class="table list">
335 <template> 371 <template>
336 <button class="button-add control"> 372 <button class="button-add control">
337 +<span></span> 373 +<span class="i18n_options_button_add"></span>
338 </button> 374 </button>
339 <span class="display"></span> 375 <span class="display"></span>
340 </template> 376 </template>
341 </ul> 377 </ul>
342 </div> 378 </div>
343 </div> 379 </div>
344 <!-- Add custom subscription --> 380 <!-- Add custom subscription -->
345 <div id="dialog-content-custom" class="dialog-content"> 381 <div id="dialog-content-custom" class="dialog-content">
346 <div class="dialog-content-block"> 382 <div class="dialog-content-block">
347 <div> 383 <div>
348 <label for="blockingList-textbox" class="i18n_options_dialog_custo m_subscription_title"></label> 384 <label for="blockingList-textbox" class="i18n_options_dialog_custo m_subscription_title"></label>
349 <input id="blockingList-textbox" type="text" class="default-focus" placeholder="www.example.com/blockinglist.txt" /> 385 <input id="blockingList-textbox" type="text" class="default-focus" placeholder="www.example.com/blockinglist.txt" />
350 </div> 386 </div>
351 <button class="i18n_options_dialog_custom_import" data-action="impor t-subscription"></button> 387 <button class="i18n_options_dialog_custom_import" data-action="impor t-subscription"></button>
352 </div> 388 </div>
353 <div class="dialog-content-block"> 389 <div class="dialog-content-block">
354 <h3 class="i18n_options_dialog_edit_own_list"></h3> 390 <h3 class="i18n_options_dialog_edit_own_list"></h3>
355 <button class="i18n_options_dialog_create_own_list" data-action="clo se-dialog,switch-tab,edit-custom-filters" data-tab="advanced"></button> 391 <button class="i18n_options_dialog_create_own_list" data-action="clo se-dialog,switch-tab,edit-custom-filters" data-tab="advanced-customFilters"></bu tton>
356 </div> 392 </div>
357 </div> 393 </div>
358 <!-- Add predefined subscription --> 394 <!-- Add predefined subscription -->
359 <div id="dialog-content-predefined" class="dialog-content"> 395 <div id="dialog-content-predefined" class="dialog-content">
360 <div class="dialog-content-block"> 396 <div class="dialog-content-block">
361 <h3></h3> 397 <h3></h3>
362 <div class="url"></div> 398 <div class="url"></div>
363 <button class="i18n_options_dialog_predefined_confirm default-focus" data-action="add-predefined-subscription"></button> 399 <button class="i18n_options_dialog_predefined_confirm default-focus" data-action="add-predefined-subscription"></button>
364 </div> 400 </div>
365 </div> 401 </div>
366 </div> 402 </div>
367 <!-- Placeholder element to determine when to wrap focus around --> 403 <!-- Placeholder element to determine when to wrap focus around -->
368 <span class="focus-last" tabindex="0"></span> 404 <span class="focus-last" tabindex="0"></span>
369 </div> 405 </div>
370 </body> 406 </body>
371 </html> 407 </html>
OLDNEW
« background.js ('K') | « messageResponder.js ('k') | options.js » ('j') | options.js » ('J')

Powered by Google App Engine
This is Rietveld