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

Side by Side Diff: new-options.html

Issue 29502647: Issue 5482 - Sidebar and about ABP dialog (Closed)
Patch Set: Created Aug. 9, 2017, 11:02 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « 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 12 matching lines...) Expand all
23 <link rel="stylesheet" href="skin/common.css"> 23 <link rel="stylesheet" href="skin/common.css">
24 <link rel="stylesheet" href="skin/new-options.css"> 24 <link rel="stylesheet" href="skin/new-options.css">
25 <script src="ext/common.js"></script> 25 <script src="ext/common.js"></script>
26 <script src="ext/content.js"></script> 26 <script src="ext/content.js"></script>
27 <script src="common.js"></script> 27 <script src="common.js"></script>
28 <script src="i18n.js"></script> 28 <script src="i18n.js"></script>
29 <script src="new-options.js"></script> 29 <script src="new-options.js"></script>
30 </head> 30 </head>
31 <body data-tab="general"> 31 <body data-tab="general">
32 <!-- Navigation sidebar --> 32 <!-- Navigation sidebar -->
33 <div id="nav-sidebar"> 33 <div id="sidebar">
34 <div id="fixed-sidebar" class="fixed"> 34 <div class="fixed">
35 <header id="page-title"> 35 <header>
36 <p class="i18n_options_page_header_1"></p> 36 <img id="sidebar-logo" src="skin/abp-logo.svg">
37 <h1 class="i18n_options_page_header_2"></h1> 37 <h1 class="i18n_options_page_title_1"></h1>
38 <p class="i18n_options_page_title_2"></p>
juliandoucette 2017/08/16 23:42:31 NIT: ~"Settings" is not a paragraph. I suggest usi
saroyanm 2017/08/18 10:23:12 I agree.
saroyanm 2017/08/18 12:44:27 I tried that solution, but the markup and implemen
juliandoucette 2017/08/21 13:06:39 Acknowledged. I think <p> is better than <h2> her
38 </header> 39 </header>
39 40
40 <nav> 41 <nav>
41 <ul id="nav-tablist" class="tabs vertical" 42 <ul class="tabs"
42 role="tablist" data-action="switch-tab" 43 role="tablist" data-action="switch-tab"
43 data-keys="ArrowLeft ArrowUp ArrowRight ArrowDown"> 44 data-keys="ArrowLeft ArrowUp ArrowRight ArrowDown">
44 <li id="tab-general" role="tab" data-tab="general" 45 <li id="tab-general" role="tab" data-tab="general"
45 aria-selected="true" aria-controls="content-general" 46 aria-selected="true" aria-controls="content-general"
46 tabindex="0"> 47 tabindex="0">
47 <span class="i18n_options_tab_general"></span> 48 <span class="i18n_options_tab_general"></span>
48 </li> 49 </li>
49 <li id="tab-whitelist" role="tab" data-tab="whitelist" 50 <li id="tab-whitelist" role="tab" data-tab="whitelist"
50 aria-controls="content-whitelist" 51 aria-controls="content-whitelist"
51 tabindex="-1"> 52 tabindex="-1">
52 <span class="i18n_options_tab_whitelist"></span> 53 <span class="i18n_options_tab_whitelist"></span>
53 </li> 54 </li>
54 <li id="tab-advanced" role="tab" data-tab="advanced" 55 <li id="tab-advanced" role="tab" data-tab="advanced"
55 aria-controls="content-advanced" tabindex="-1"> 56 aria-controls="content-advanced" tabindex="-1">
56 <span class="i18n_options_tab_advanced"></span> 57 <span class="i18n_options_tab_advanced"></span>
57 </li> 58 </li>
58 <li id="tab-help" role="tab" data-tab="help" 59 <li id="tab-help" role="tab" data-tab="help"
59 aria-controls="content-help" tabindex="-1"> 60 aria-controls="content-help" tabindex="-1">
60 <span class="i18n_options_tab_help"></span> 61 <span class="i18n_options_tab_help"></span>
61 </li> 62 </li>
62 </ul> 63 </ul>
63 </nav> 64 </nav>
64
65 <a id="link-version">
66 <span class="i18n_options_version"></span>
67 <span id="abp-version"></span>
68 </a>
69
70 <footer> 65 <footer>
71 <ul class="tabs vertical bottom" data-action="open-doclink" 66 <p>
72 data-keys="Enter"> 67 <a id="contribute" class="i18n_options_footer_contribute button seco ndary"
juliandoucette 2017/08/16 23:42:31 I think we should add an external link icon to thi
saroyanm 2017/08/18 10:49:29 Right, but as mentioned in several places in curre
juliandoucette 2017/08/18 11:17:04 Acknowledged.
73 <li id="tab-share" data-doclink="share-general" tabindex="0"> 68 target="_blank"></a>
74 <span class="i18n_options_tab_share"></span> 69 </p>
75 </li> 70 <p>
76 <li id="tab-contribute" data-doclink="contribute" tabindex="0"> 71 <button id="about" class="i18n_options_footer_about" data-action="op en-dialog" data-dialog="about"></button>
juliandoucette 2017/08/16 23:42:31 I think that this link is very misleading. It look
saroyanm 2017/08/18 10:49:29 Same as above.
juliandoucette 2017/08/18 11:17:04 Acknowledged.
77 <span class="i18n_options_tab_contribute"></span> 72 </p>
78 </li> 73 </footer>
79 </ul>
80 </footer>
81 </div> 74 </div>
82 </div> 75 </div>
83 <div id="content"> 76 <div id="content">
84 <div id="content-wrapper"> 77 <div id="content-wrapper">
85 <div id="dialog-background"></div> 78 <div id="dialog-background"></div>
86 79
87 <!-- General tab content --> 80 <!-- General tab content -->
88 <div id="content-general" role="tabpanel" aria-labelledby="tab-general"> 81 <div id="content-general" role="tabpanel" aria-labelledby="tab-general">
89 <h1 class="i18n_options_tab_general"></h1> 82 <h1 class="i18n_options_tab_general"></h1>
90 <p class="i18n_options_general_description"></p> 83 <p class="i18n_options_general_description"></p>
(...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after
321 </span> 314 </span>
322 </p> 315 </p>
323 </div> 316 </div>
324 </div> 317 </div>
325 </div> 318 </div>
326 319
327 <!-- Dialog --> 320 <!-- Dialog -->
328 <div id="dialog" role="dialog" aria-hidden="true"> 321 <div id="dialog" role="dialog" aria-hidden="true">
329 <header> 322 <header>
330 <span id="dialog-title"> 323 <span id="dialog-title">
324 <span id="dialog-title-about" class="i18n_options_dialog_about_title"> </span>
331 <span id="dialog-title-custom" class="i18n_options_dialog_custom_title "></span> 325 <span id="dialog-title-custom" class="i18n_options_dialog_custom_title "></span>
332 <span id="dialog-title-language-add" class="i18n_options_dialog_langua ge_title"></span> 326 <span id="dialog-title-language-add" class="i18n_options_dialog_langua ge_title"></span>
333 <span id="dialog-title-language-change" class="i18n_options_dialog_lan guage_title"></span> 327 <span id="dialog-title-language-change" class="i18n_options_dialog_lan guage_title"></span>
334 <span id="dialog-title-predefined" class="i18n_options_dialog_predefin ed_title"></span> 328 <span id="dialog-title-predefined" class="i18n_options_dialog_predefin ed_title"></span>
335 </span> 329 </span>
336 <button id="dialog-close" class="i18n_options_close focus-first" data-ac tion="close-dialog"></button> 330 <button id="dialog-close" class="i18n_options_close focus-first" data-ac tion="close-dialog"></button>
337 </header> 331 </header>
338 <div id="dialog-body" class="content"> 332 <div id="dialog-body" class="content">
333 <!-- About Adblock Plus -->
334 <div id="dialog-content-about" class="dialog-content">
saroyanm 2017/08/10 12:04:48 Styles for Dialog is missing, I'll create separate
juliandoucette 2017/08/16 23:42:31 Acknowledged.
335 <p id="abp-version"></p>
336 <p class="i18n_options_dialog_about_copyright"></p>
337 <p>
338 <button class="i18n_options_close primary" data-action="close-dialog "></button>
saroyanm 2017/08/10 12:04:48 I'll update all other buttons to primary or second
juliandoucette 2017/08/16 23:42:31 Acknowledged.
339 </p>
340 </div>
339 <!-- Add language subscription --> 341 <!-- Add language subscription -->
340 <div id="dialog-content-language-add" class="dialog-content"> 342 <div id="dialog-content-language-add" class="dialog-content">
341 <ul id="all-lang-table-add" class="table list"> 343 <ul id="all-lang-table-add" class="table list">
342 <template> 344 <template>
343 <button data-action="add-language-subscription,close-dialog" class ="control" role="checkbox"> 345 <button data-action="add-language-subscription,close-dialog" class ="control" role="checkbox">
344 <label class="display"></label> 346 <label class="display"></label>
345 </button> 347 </button>
346 </template> 348 </template>
347 </ul> 349 </ul>
348 </div> 350 </div>
(...skipping 28 matching lines...) Expand all
377 <div class="url"></div> 379 <div class="url"></div>
378 <button class="i18n_options_dialog_predefined_confirm default-focus" data-action="add-predefined-subscription"></button> 380 <button class="i18n_options_dialog_predefined_confirm default-focus" data-action="add-predefined-subscription"></button>
379 </div> 381 </div>
380 </div> 382 </div>
381 </div> 383 </div>
382 <!-- Placeholder element to determine when to wrap focus around --> 384 <!-- Placeholder element to determine when to wrap focus around -->
383 <span class="focus-last" tabindex="0"></span> 385 <span class="focus-last" tabindex="0"></span>
384 </div> 386 </div>
385 </body> 387 </body>
386 </html> 388 </html>
OLDNEW
« no previous file with comments | « locale/en-US/new-options.json ('k') | new-options.js » ('j') | new-options.js » ('J')

Powered by Google App Engine
This is Rietveld