Left: | ||
Right: |
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 11 matching lines...) Expand all Loading... | |
22 <title class="i18n_options_page_title"></title> | 22 <title class="i18n_options_page_title"></title> |
23 <link rel="stylesheet" href="skin/common.css"> | 23 <link rel="stylesheet" href="skin/common.css"> |
24 <link rel="stylesheet" href="skin/options.css"> | 24 <link rel="stylesheet" href="skin/options.css"> |
25 <style id="search-style"></style> | 25 <style id="search-style"></style> |
26 <script src="ext/common.js"></script> | 26 <script src="ext/common.js"></script> |
27 <script src="ext/content.js"></script> | 27 <script src="ext/content.js"></script> |
28 <script src="common.js"></script> | 28 <script src="common.js"></script> |
29 <script src="i18n.js"></script> | 29 <script src="i18n.js"></script> |
30 <script src="options.js"></script> | 30 <script src="options.js"></script> |
31 </head> | 31 </head> |
32 <body data-tab="general"> | 32 <body data-tab="advanced,filter-lists"> |
Thomas Greiner
2016/01/19 11:27:28
I suppose you added this for testing. Please rever
saroyanm
2016/01/22 09:55:07
Done.
| |
33 <!-- Navigation sidebar --> | 33 <!-- Navigation sidebar --> |
34 <div id="nav-sidebar"> | 34 <div id="nav-sidebar"> |
35 <div id="fixed-sidebar" class="fixed"> | 35 <div id="fixed-sidebar" class="fixed"> |
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,fi lter-lists"> |
Thomas Greiner
2016/01/19 11:27:28
Detail: "abc,def" looks like a list of elements bu
saroyanm
2016/01/22 09:55:07
No, I would like to indicate that the list of tabs
Thomas Greiner
2016/01/25 15:40:27
I see what you mean but in this case they are depe
saroyanm
2016/01/26 18:36:14
Done.
| |
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 149 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
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"> | 214 <div id="content-advanced"> |
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" href="#"></a> | |
219 </h1> | |
220 <ul class="table"> | |
218 <li> | 221 <li> |
219 <input type="checkbox" id="easylist"/><span id="block-element-ex planation" class="i18n_options_tweaks_blockElement"></span></li> | 222 <input type="checkbox" id="easylist"/> |
223 <span id="block-element-explanation" class="i18n_options_tweaks_ blockElement"></span> | |
224 </li> | |
220 </ul> | 225 </ul> |
221 </div> | 226 </div> |
222 <div> | 227 <div> |
223 <h1><span class="i18n_options_blockingList_title"></span><a class="i 18n_options_readMore tooltip" href="#" target="_blank"></a></h1> | 228 <h1> |
224 <ul id="blocking-list-tabs" class="tabs horizontal"> | 229 <span class="i18n_options_blockingList_title"></span> |
225 <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" href="#"></a> |
231 </h1> | |
232 <ul class="tabs horizontal"> | |
233 <li class="i18n_options_tab_overview active" data-action="switch-t ab" data-tab="advanced,filter-lists"></li> | |
234 <li class="i18n_options_tab_ownList" data-action="switch-tab" data -tab="advanced,custom-filters"></li> | |
226 </ul> | 235 </ul> |
227 <div id="blocking-list"> | 236 <div id="blocking-lists"> |
228 <div id="blocking-list-overview"> | 237 <div id="filter-lists"> |
229 <ul class="table cols" style="width: auto;"> | 238 <ul class="table cols" id="blocking-lists-table"> |
230 <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 <li class="head static"> |
Thomas Greiner
2016/01/19 11:27:28
The headline should semantically not be part of th
saroyanm
2016/01/22 09:55:07
Done, it's a bit sad, I couldn't find a way how it
| |
231 <li><input type="checkbox" id="easylist"/><span>Easylist</span ><span>Adblocking english sites</span><span>15 March 14 - 10:31</span></li> | 240 <span class="i18n_options_tableCol_name"></span> |
232 <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 <span class="i18n_options_tableCol_date"></span> |
233 <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 </li> |
234 <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> |
235 <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 <input type="checkbox" class="control" /> |
245 <span> | |
246 <span data-action="open-context-menu" class="display"></sp an> | |
247 <div class="context-menu"> | |
248 <a href="#" data-action="open-context-menu" class="arrow "></a> | |
Thomas Greiner
2016/01/19 11:27:28
I noticed a bunch of positioning styles in "option
saroyanm
2016/01/22 09:55:07
The problem with double div is that I don't have a
Thomas Greiner
2016/01/27 17:16:56
I tried it myself and didn't notice any issues. Wh
saroyanm
2016/01/28 17:00:10
Shouldn't the context menu be relative to anchor e
Thomas Greiner
2016/01/29 17:48:07
According to https://issues.adblockplus.org/attach
saroyanm
2016/01/29 18:56:16
I think I missread the part where you suggested to
| |
249 <div role="context-menu"> | |
Thomas Greiner
2016/01/19 11:27:28
This role value doesn't exist. For now, it should
saroyanm
2016/01/22 09:55:06
I see, done.
| |
250 <div class="content"> | |
251 <a class="update-now" data-action="update-now" href= "#"></a> | |
Thomas Greiner
2016/01/19 11:27:28
Detail: Please remove hyperlinking to "#" for link
saroyanm
2016/01/22 09:55:06
Done.
| |
252 <a class="website" data-action="website" href="#"></ a> | |
253 <a class="source" data-action="source" href="#"></a> | |
254 <a class="delete" data-action="delete" href="#"></a> | |
255 </div> | |
256 </div> | |
257 </div> | |
258 </span> | |
259 <span class="date"></span> | |
260 <span class="time"></span> | |
261 </template> | |
Thomas Greiner
2016/01/19 11:27:28
This causes the selector `.table.cols li:nth-child
saroyanm
2016/01/22 09:55:07
Done.
| |
262 <li class="static"> | |
263 <input type="checkbox" id="own-list" checked="true" disabled ="true" /> | |
Thomas Greiner
2016/01/19 11:27:28
This checkbox doesn't do anything so either implem
saroyanm
2016/01/22 09:55:08
Not sure if it looks good, if you think it's ugly
Thomas Greiner
2016/01/25 15:40:27
I don't mind to do it in a separate review but we
saroyanm
2016/01/26 18:36:15
Acknowledged.
| |
264 <span> | |
265 <span class="i18n_options_blockingList_own_list"></span> | |
266 </span> | |
267 <span data-action="switch-tab,edit-custom-filters" data-tab= "advanced,custom-filters"> | |
268 <a class="i18n_options_blockingList_edit_own_list" href="# "></a> | |
269 </span> | |
270 </li> | |
236 </ul> | 271 </ul> |
237 <div class="controls"> | 272 <div class="controls"> |
238 <button> | 273 <button data-action="open-dialog" data-dialog="custom"> |
239 <span class="icon icon-add"></span><span class="i18n_options _blockingList_add"></span> | 274 <span class="icon icon-add"></span><span class="i18n_options _blockingList_add"></span> |
240 </button> | 275 </button> |
241 <button> | 276 <button data-action="update-all-subscriptions"> |
242 <span class="icon icon-update"></span><span class="i18n_opti ons_blockingList_update"></span> | 277 <span class="icon icon-update"></span><span class="i18n_opti ons_blockingList_update"></span> |
243 </button> | 278 </button> |
244 </div> | 279 </div> |
245 </div> | 280 </div> |
246 <div id="custom-filters"> | 281 <div id="custom-filters"> |
247 <h2 id="custom-filters-header" class="i18n_options_customFilters _title"></h2> | 282 <h2 id="custom-filters-header" class="i18n_options_customFilters _title"></h2> |
248 <div id="custom-filters-wrapper"> | 283 <div id="custom-filters-wrapper"> |
249 <div id="custom-filters-list-wrapper"> | 284 <div id="custom-filters-list-wrapper"> |
250 <ul id="custom-filters-table" class="table list"> | 285 <ul id="custom-filters-table" class="table list"> |
251 <template> | 286 <template> |
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
343 <div id="dialog-content-custom" class="dialog-content"> | 378 <div id="dialog-content-custom" class="dialog-content"> |
344 <div class="dialog-content-block"> | 379 <div class="dialog-content-block"> |
345 <div> | 380 <div> |
346 <label for="blockingList-textbox" class="i18n_options_dialog_custo m_subscription_title"></label> | 381 <label for="blockingList-textbox" class="i18n_options_dialog_custo m_subscription_title"></label> |
347 <input id="blockingList-textbox" type="text" class="default-focus" placeholder="www.example.com/blockinglist.txt" /> | 382 <input id="blockingList-textbox" type="text" class="default-focus" placeholder="www.example.com/blockinglist.txt" /> |
348 </div> | 383 </div> |
349 <button class="i18n_options_dialog_custom_import" data-action="impor t-subscription"></button> | 384 <button class="i18n_options_dialog_custom_import" data-action="impor t-subscription"></button> |
350 </div> | 385 </div> |
351 <div class="dialog-content-block"> | 386 <div class="dialog-content-block"> |
352 <h3 class="i18n_options_dialog_edit_own_list"></h3> | 387 <h3 class="i18n_options_dialog_edit_own_list"></h3> |
353 <button class="i18n_options_dialog_create_own_list" data-action="clo se-dialog,switch-tab,edit-custom-filters" data-tab="advanced"></button> | 388 <button class="i18n_options_dialog_create_own_list" data-action="clo se-dialog,switch-tab,edit-custom-filters" data-tab="advanced,custom-filters"></b utton> |
354 </div> | 389 </div> |
355 </div> | 390 </div> |
356 <!-- Add predefined subscription --> | 391 <!-- Add predefined subscription --> |
357 <div id="dialog-content-predefined" class="dialog-content"> | 392 <div id="dialog-content-predefined" class="dialog-content"> |
358 <div class="dialog-content-block"> | 393 <div class="dialog-content-block"> |
359 <h3></h3> | 394 <h3></h3> |
360 <div class="url"></div> | 395 <div class="url"></div> |
361 <button class="i18n_options_dialog_predefined_confirm default-focus" data-action="add-predefined-subscription"></button> | 396 <button class="i18n_options_dialog_predefined_confirm default-focus" data-action="add-predefined-subscription"></button> |
362 </div> | 397 </div> |
363 </div> | 398 </div> |
364 </div> | 399 </div> |
365 <!-- Placeholder element to determine when to wrap focus around --> | 400 <!-- Placeholder element to determine when to wrap focus around --> |
366 <span class="focus-last" tabindex="0"></span> | 401 <span class="focus-last" tabindex="0"></span> |
367 </div> | 402 </div> |
368 </body> | 403 </body> |
369 </html> | 404 </html> |
OLD | NEW |