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. 18, 2017, 12:39 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 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">
juliandoucette 2017/08/21 14:10:33 This logo is pixelated at 1x. I suggest aligning i
saroyanm 2017/08/21 15:20:21 I can't test that, looks fine for me, please note
juliandoucette 2017/08/21 16:07:24 - Test via 72 or 96 DPI monitor in the office - SV
saroyanm 2017/08/21 16:46:10 I don't know what needs/want to be done here ? Are
juliandoucette 2017/08/22 10:10:44 Yes. I'm suggesting that we may be able to change
37 <h1 class="i18n_options_page_header_2"></h1> 37 <h1 class="i18n_options_page_title_1"></h1>
38 <h2 class="i18n_options_page_title_2"></h2>
juliandoucette 2017/08/21 14:10:33 I think <p> is better than <h2> here.
saroyanm 2017/08/21 15:20:22 I'll change it back.
juliandoucette 2017/08/21 16:07:23 Acknowledged.
saroyanm 2017/08/23 13:35:45 Done.
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 <a class="i18n_options_tab_general"></a>
juliandoucette 2017/08/21 14:10:33 NIT: I don't think that text-shadow is enough to c
saroyanm 2017/08/21 15:20:22 I agree, As mentioned here -> https://codereview.a
juliandoucette 2017/08/21 16:07:24 Acknowledged.
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 <a class="i18n_options_tab_whitelist"></a>
juliandoucette 2017/08/21 14:10:34 Tabbing seems to function differently between Chro
saroyanm 2017/08/21 15:20:21 Can't reproduce that :/
juliandoucette 2017/08/21 16:07:23 What happens in your browsers?
saroyanm 2017/08/21 16:46:10 Same you explained for "Chrome".
juliandoucette 2017/08/22 10:10:44 It's definitely an issue on FF for OS X. And addin
saroyanm 2017/08/23 13:35:44 This implementation is changed please let me know
juliandoucette 2017/08/23 18:11:07 See my comment [here](https://codereview.adblockpl
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 <a class="i18n_options_tab_advanced"></a>
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 <a class="i18n_options_tab_help"></a>
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"
juliandoucette 2017/08/21 14:10:33 NIT: I don't think that the border thickness chang
saroyanm 2017/08/21 15:20:21 I think I did it consistently with the style guide
juliandoucette 2017/08/21 16:07:24 I don't see an active state for the secondary butt
saroyanm 2017/08/21 16:46:09 Yes, active state for secondary button is missing
juliandoucette 2017/08/22 10:10:43 Acknowledged.
73 <li id="tab-share" data-doclink="share-general" tabindex="0"> 68 class="i18n_options_footer_contribute button secondary"
74 <span class="i18n_options_tab_share"></span> 69 target="_blank"></a>
75 </li> 70 </p>
76 <li id="tab-contribute" data-doclink="contribute" tabindex="0"> 71 <p>
77 <span class="i18n_options_tab_contribute"></span> 72 <button class="i18n_options_footer_about link"
78 </li> 73 data-action="open-dialog" data-dialog="about"></button>
79 </ul> 74 </p>
80 </footer> 75 </footer>
81 </div> 76 </div>
82 </div> 77 </div>
83 <div id="content"> 78 <main>
saroyanm 2017/08/18 12:44:29 I also changed this element, as we were already to
juliandoucette 2017/08/21 13:06:39 Acknowledged.
84 <div id="content-wrapper"> 79 <div id="dialog-background"></div>
saroyanm 2017/08/18 12:44:29 The only change below is that I removed this conta
juliandoucette 2017/08/21 13:06:39 Acknowledged.
85 <div id="dialog-background"></div> 80
86 81 <!-- General tab content -->
87 <!-- General tab content --> 82 <div id="content-general" role="tabpanel" aria-labelledby="tab-general">
88 <div id="content-general" role="tabpanel" aria-labelledby="tab-general"> 83 <h1 class="i18n_options_tab_general"></h1>
89 <h1 class="i18n_options_tab_general"></h1> 84 <p class="i18n_options_general_description"></p>
90 <p class="i18n_options_general_description"></p> 85 <section>
91 <section> 86 <h2 class="i18n_options_privacy_header"></h2>
92 <h2 class="i18n_options_privacy_header"></h2> 87 <ul id="recommend-security-list-table" class="table list">
93 <ul id="recommend-security-list-table" class="table list"> 88 <template>
94 <template> 89 <button data-action="toggle-remove-subscription" role="checkbox" c lass="control"></button>
95 <button data-action="toggle-remove-subscription" role="checkbox" class="control"></button> 90 <label class="display"></label>
96 <label class="display"></label> 91 <span class="i18n_options_readMore" data-tooltip="options_more_%va lue%_tooltip"></span>
97 <span class="i18n_options_readMore" data-tooltip="options_more_% value%_tooltip"></span> 92 </template>
98 </template> 93 </ul>
99 </ul> 94 </section>
100 </section> 95 <section>
101 <section> 96 <h2 class="i18n_options_aa_header"></h2>
102 <h2 class="i18n_options_aa_header"></h2> 97 <p class="i18n_options_aa_description"></p>
103 <p class="i18n_options_aa_description"></p> 98 <form id="acceptable-ads">
104 <form id="acceptable-ads"> 99 <div>
105 <div> 100 <input data-action="enable-aa" type="radio" name="acceptable-ads" value="tracking">
106 <input data-action="enable-aa" type="radio" name="acceptable-ads " value="tracking"> 101 <label class="i18n_options_aa_tracking_label"></label>
107 <label class="i18n_options_aa_tracking_label"></label> 102 <p id="enable-aa-description" class="i18n_options_aa_tracking_desc ription_1"></p>
108 <p id="enable-aa-description" class="i18n_options_aa_tracking_de scription_1"></p> 103 <p class="i18n_options_aa_tracking_description_2"></p>
109 <p class="i18n_options_aa_tracking_description_2"></p> 104 </div>
110 </div> 105 <div>
111 <div> 106 <input data-action="enable-privacy-aa" type="radio" name="acceptab le-ads" value="no-tracking">
112 <input data-action="enable-privacy-aa" type="radio" name="accept able-ads" value="no-tracking"> 107 <label class="i18n_options_aa_no_tracking_label"></label>
113 <label class="i18n_options_aa_no_tracking_label"></label> 108 <p class="i18n_options_aa_no_tracking_description"></p>
114 <p class="i18n_options_aa_no_tracking_description"></p> 109 <p id="no-dnt" class="i18n_options_aa_no_dnt_notification"></p>
115 <p id="no-dnt" class="i18n_options_aa_no_dnt_notification"></p> 110 </div>
116 </div> 111 <div>
117 <div> 112 <input data-action="block-all" type="radio" name="acceptable-ads" value="disable">
118 <input data-action="block-all" type="radio" name="acceptable-ads " value="disable"> 113 <label class="i18n_options_aa_disable_label"></label>
119 <label class="i18n_options_aa_disable_label"></label> 114 </div>
120 </div> 115 </form>
121 </form> 116 </section>
122 </section> 117 <section>
123 <section> 118 <h2 class="i18n_options_language_header"></h2>
124 <h2 class="i18n_options_language_header"></h2> 119 <p class="i18n_options_language_description"></p>
125 <p class="i18n_options_language_description"></p> 120 <div id="blocking-languages">
126 <div id="blocking-languages"> 121 <ul id="blocking-languages-table" class="table list">
127 <ul id="blocking-languages-table" class="table list">
128 <template>
129 <label class="display"></label>
130 <button data-single="hidden" data-action="remove-subscription" class="delete control" title="options_control_remove_title"></button>
131 <button data-single="visible" data-action="save-change-subscri ption,open-dialog" data-dialog="language-change" class="i18n_options_language_ch ange"></button>
132 </template>
133 </ul>
134 <div class="controls">
135 <button data-action="open-dialog" data-dialog="language-add">
136 <span class="i18n_options_language_add"></span>
137 </button>
138 </div>
139 </div>
140 <p class="i18n_options_language_tip"></p>
141 </section>
142 <section>
143 <h2 class="i18n_options_more_filters_header"></h2>
144 <p class="i18n_options_more_filters_description"></p>
145 <ul id="custom-list-table" class="table list">
146 <template> 122 <template>
147 <label class="display"></label> 123 <label class="display"></label>
148 <span class="i18n_options_readMore" data-tooltip="options_more_% value%_tooltip"></span> 124 <button data-single="hidden" data-action="remove-subscription" c lass="delete control" title="options_control_remove_title"></button>
149 <button data-action="remove-subscription" class="delete control" title="options_control_remove_title"></button> 125 <button data-single="visible" data-action="save-change-subscript ion,open-dialog" data-dialog="language-change" class="i18n_options_language_chan ge"></button>
150 </template>
151 </ul>
152 <p class="i18n_options_more_filters_note"></p>
153 </section>
154 </div>
155
156 <!-- Whitelist tab content -->
157 <div id="content-whitelist" role="tabpanel" aria-labelledby="tab-whiteli st">
158 <h1 class="i18n_options_tab_whitelist"></h1>
159 <p class="i18n_options_whitelist_description"></p>
160 <form>
161 <input id="whitelisting-textbox" type="text">
162 <button id="whitelisting-add-button"
163 type="submit"
164 data-action="add-domain-exception"
165 class="i18n_options_whitelist_add" disabled>
166 </button>
167 <div id="whitelisting-validation"></div>
168 </form>
169 <ul id="whitelisting-table" class="table list">
170 <template>
171 <label class="display"></label>
172 <button data-action="remove-filter" class="delete control"
173 title="options_control_remove_title">
174 </button>
175 </template>
176 </ul>
177 </div>
178
179 <!-- Advanced tab content -->
180 <div id="content-advanced" role="tabpanel"
181 aria-labelledby="tab-advanced">
182 <div>
183 <h1 class="i18n_options_tab_advanced"></h1>
184 <p class="i18n_options_advanced_description"></p>
185 <section>
186 <h2 class="i18n_options_customize_header"></h2>
187 <ul id="customize" class="table">
188 <li data-pref="shouldShowBlockElementMenu">
189 <label>
190 <button role="checkbox" data-action="toggle-pref"></button>
191 <span class="i18n_options_customize_blockElement"></span>
192 <span class="i18n_options_readMore"
193 data-tooltip="options_customize_blockElement_tooltip"></sp an>
194 </label>
195 </li>
196 <li data-pref="show_devtools_panel">
197 <label>
198 <button role="checkbox" data-action="toggle-pref"></button>
199 <span class="i18n_options_customize_showDevToolsPanel"></spa n>
200 <span class="i18n_options_readMore"
201 data-tooltip="options_customize_showDevToolsPanel_tooltip" ></span>
202 </label>
203 </li>
204 <li data-pref="notifications_ignoredcategories">
205 <label>
206 <button role="checkbox" data-action="toggle-pref"></button>
207 <span class="i18n_options_customize_showNotifications"></spa n>
208 <span class="i18n_options_readMore"
209 data-tooltip="options_customize_showNotifications_tooltip" ></span>
210 </label>
211 </li>
212 </ul>
213 </section>
214 </div>
215
216 <section>
217 <h1 class="i18n_options_filterList_title"></h1>
218 <p id="filter-lists-description" class="i18n_options_filterList_desc ription"></p>
219
220 <div id="all-filter-lists-table-header">
221 <h2 class="i18n_options_filterList_column_status"></h2>
222 <h2 class="i18n_options_filterList_column_name"></h2>
223 <h2 class="i18n_options_filterList_column_update"></h2>
224 </div>
225 <ul class="table cols" id="all-filter-lists-table">
226 <template>
227 <button data-action="remove-subscription" class="control delete" ></button>
228 <button data-action="toggle-disable-subscription" role="checkbox " class="control">
229 </button>
230 <div class="state">
231 <span class="i18n_options_filterList_state_active" id="state-a ctive"></span>
232 <span class="i18n_options_filterList_state_disabled" id="state -disabled"></span>
233 </div>
234 <div>
235 <label class="display"></label>
236 </div>
237 <span class="last-update"></span>
238 <span class="message"></span>
239 <a data-action="open-context-menu" class="arrow"></a>
240 <div role="menubar" class="context-menu-wrapper">
241 <div class="context-menu">
242 <ul class="content" role="menu">
243 <li role="menuitem">
244 <a class="i18n_options_filterList_updateNow update-subsc ription" data-action="update-subscription"></a>
245 </li>
246 <li role="menuitem">
247 <a class="i18n_options_filterList_website website" targe t="_blank"></a>
248 </li>
249 <li role="menuitem">
250 <a class="i18n_options_filterList_source source" target= "_blank"></a>
251 </li>
252 <li role="menuitem">
253 <a class="i18n_options_filterList_delete delete" data-ac tion="remove-subscription"></a>
254 </li>
255 </ul>
256 </div>
257 </div>
258 </template> 126 </template>
259 </ul> 127 </ul>
260 <div class="controls"> 128 <div class="controls">
261 <button data-action="open-dialog" data-dialog="custom"> 129 <button data-action="open-dialog" data-dialog="language-add">
262 <span class="icon icon-add"></span> 130 <span class="i18n_options_language_add"></span>
263 <span class="i18n_options_filterList_add"></span> 131 </button>
264 </button> 132 </div>
265 <button data-action="update-all-subscriptions"> 133 </div>
266 <span class="icon icon-update"></span> 134 <p class="i18n_options_language_tip"></p>
267 <span class="i18n_options_filterList_update"></span> 135 </section>
268 </button> 136 <section>
269 </div> 137 <h2 class="i18n_options_more_filters_header"></h2>
270 </section> 138 <p class="i18n_options_more_filters_description"></p>
271 139 <ul id="custom-list-table" class="table list">
140 <template>
141 <label class="display"></label>
142 <span class="i18n_options_readMore" data-tooltip="options_more_%va lue%_tooltip"></span>
143 <button data-action="remove-subscription" class="delete control" t itle="options_control_remove_title"></button>
144 </template>
145 </ul>
146 <p class="i18n_options_more_filters_note"></p>
147 </section>
148 </div>
149
150 <!-- Whitelist tab content -->
151 <div id="content-whitelist" role="tabpanel" aria-labelledby="tab-whitelist ">
152 <h1 class="i18n_options_tab_whitelist"></h1>
153 <p class="i18n_options_whitelist_description"></p>
154 <form>
155 <input id="whitelisting-textbox" type="text">
156 <button id="whitelisting-add-button"
157 type="submit"
158 data-action="add-domain-exception"
159 class="i18n_options_whitelist_add" disabled>
160 </button>
161 <div id="whitelisting-validation"></div>
162 </form>
163 <ul id="whitelisting-table" class="table list">
164 <template>
165 <label class="display"></label>
166 <button data-action="remove-filter" class="delete control"
167 title="options_control_remove_title">
168 </button>
169 </template>
170 </ul>
171 </div>
172
173 <!-- Advanced tab content -->
174 <div id="content-advanced" role="tabpanel"
175 aria-labelledby="tab-advanced">
176 <div>
177 <h1 class="i18n_options_tab_advanced"></h1>
178 <p class="i18n_options_advanced_description"></p>
272 <section> 179 <section>
273 <h1 class="i18n_options_customFilters_title"></h1> 180 <h2 class="i18n_options_customize_header"></h2>
274 <p class="i18n_options_customFilters_description"></p> 181 <ul id="customize" class="table">
275 <h2 class="i18n_options_customFilters_widget_title"></h2> 182 <li data-pref="shouldShowBlockElementMenu">
276 <div id="custom-filters"> 183 <label>
277 <div id="empty-custom-filters"> 184 <button role="checkbox" data-action="toggle-pref"></button>
278 <p class="i18n_options_customFilters_tip"></p> 185 <span class="i18n_options_customize_blockElement"></span>
279 <button class="i18n_options_customFilters_start" data-action="ed it-custom-filters"> 186 <span class="i18n_options_readMore"
280 </button> 187 data-tooltip="options_customize_blockElement_tooltip"></span >
281 <p> 188 </label>
282 <a class="i18n_options_customFilters_learn" id="link-filters" target="_blank"></a> 189 </li>
283 </p> 190 <li data-pref="show_devtools_panel">
284 </div> 191 <label>
285 <textarea id="custom-filters-raw" rows="15"></textarea> 192 <button role="checkbox" data-action="toggle-pref"></button>
286 <button id="custom-filters-edit" class="i18n_options_customFilter_ edit" data-action="edit-custom-filters"> 193 <span class="i18n_options_customize_showDevToolsPanel"></span>
287 </button> 194 <span class="i18n_options_readMore"
288 <div id="custom-filters-raw-controls"> 195 data-tooltip="options_customize_showDevToolsPanel_tooltip">< /span>
289 <button class="i18n_options_customFilter_save" data-action="save -custom-filters"> 196 </label>
290 </button> 197 </li>
291 <button class="i18n_options_customFilter_cancel" data-action="ca ncel-custom-filters"> 198 <li data-pref="notifications_ignoredcategories">
292 </button> 199 <label>
293 </div> 200 <button role="checkbox" data-action="toggle-pref"></button>
294 </div> 201 <span class="i18n_options_customize_showNotifications"></span>
202 <span class="i18n_options_readMore"
203 data-tooltip="options_customize_showNotifications_tooltip">< /span>
204 </label>
205 </li>
206 </ul>
295 </section> 207 </section>
296 </div> 208 </div>
297 209
298 <!-- Help tab content --> 210 <section>
299 <div id="content-help" role="tabpanel" aria-labelledby="tab-help"> 211 <h1 class="i18n_options_filterList_title"></h1>
300 <h1 class="i18n_options_faq_title"></h1> 212 <p id="filter-lists-description" class="i18n_options_filterList_descri ption"></p>
301 <p class="i18n_options_faq_description"></p> 213
302 <p> 214 <div id="all-filter-lists-table-header">
303 <a id="link-faq" class="i18n_options_faq_title" target="_blank"></a > 215 <h2 class="i18n_options_filterList_column_status"></h2>
304 </p> 216 <h2 class="i18n_options_filterList_column_name"></h2>
305 <h1 class="i18n_options_forum_title"></h1> 217 <h2 class="i18n_options_filterList_column_update"></h2>
306 <p class="i18n_options_forum_description"></p> 218 </div>
307 <p> 219 <ul class="table cols" id="all-filter-lists-table">
308 <a id="link-forum" class="i18n_options_forum_link" target="_blank"> </a> 220 <template>
309 </p> 221 <button data-action="remove-subscription" class="control delete">< /button>
310 <h1 class="i18n_options_media_title"></h1> 222 <button data-action="toggle-disable-subscription" role="checkbox" class="control">
311 <p class="i18n_options_media_description"></p> 223 </button>
312 <p> 224 <div class="state">
313 <span id="share-general"> 225 <span class="i18n_options_filterList_state_active" id="state-act ive"></span>
314 <a id="link-twitter" target="_blank">Twitter</a> 226 <span class="i18n_options_filterList_state_disabled" id="state-d isabled"></span>
315 <a id="link-facebook" target="_blank">Facebook</a> 227 </div>
316 <a id="link-gplus" target="_blank">Google+</a> 228 <div>
317 </span> 229 <label class="display"></label>
318 <span id="share-chinese"> 230 </div>
319 <a id="link-renren" target="_blank">renren</a> 231 <span class="last-update"></span>
320 <a id="link-weibo" target="_blank">weibo</a> 232 <span class="message"></span>
321 </span> 233 <a data-action="open-context-menu" class="arrow"></a>
322 </p> 234 <div role="menubar" class="context-menu-wrapper">
323 </div> 235 <div class="context-menu">
324 </div> 236 <ul class="content" role="menu">
325 </div> 237 <li role="menuitem">
238 <a class="i18n_options_filterList_updateNow update-subscri ption" data-action="update-subscription"></a>
239 </li>
240 <li role="menuitem">
241 <a class="i18n_options_filterList_website website" target= "_blank"></a>
242 </li>
243 <li role="menuitem">
244 <a class="i18n_options_filterList_source source" target="_ blank"></a>
245 </li>
246 <li role="menuitem">
247 <a class="i18n_options_filterList_delete delete" data-acti on="remove-subscription"></a>
248 </li>
249 </ul>
250 </div>
251 </div>
252 </template>
253 </ul>
254 <div class="controls">
255 <button data-action="open-dialog" data-dialog="custom">
256 <span class="icon icon-add"></span>
257 <span class="i18n_options_filterList_add"></span>
258 </button>
259 <button data-action="update-all-subscriptions">
260 <span class="icon icon-update"></span>
261 <span class="i18n_options_filterList_update"></span>
262 </button>
263 </div>
264 </section>
265
266 <section>
267 <h1 class="i18n_options_customFilters_title"></h1>
268 <p class="i18n_options_customFilters_description"></p>
269 <h2 class="i18n_options_customFilters_widget_title"></h2>
270 <div id="custom-filters">
271 <div id="empty-custom-filters">
272 <p class="i18n_options_customFilters_tip"></p>
273 <button class="i18n_options_customFilters_start" data-action="edit -custom-filters">
274 </button>
275 <p>
276 <a class="i18n_options_customFilters_learn" id="link-filters" ta rget="_blank"></a>
277 </p>
278 </div>
279 <textarea id="custom-filters-raw" rows="15"></textarea>
280 <button id="custom-filters-edit" class="i18n_options_customFilter_ed it" data-action="edit-custom-filters">
281 </button>
282 <div id="custom-filters-raw-controls">
283 <button class="i18n_options_customFilter_save" data-action="save-c ustom-filters">
284 </button>
285 <button class="i18n_options_customFilter_cancel" data-action="canc el-custom-filters">
286 </button>
287 </div>
288 </div>
289 </section>
290 </div>
291
292 <!-- Help tab content -->
293 <div id="content-help" role="tabpanel" aria-labelledby="tab-help">
294 <h1 class="i18n_options_faq_title"></h1>
295 <p class="i18n_options_faq_description"></p>
296 <p>
297 <a id="link-faq" class="i18n_options_faq_title" target="_blank"></a>
298 </p>
299 <h1 class="i18n_options_forum_title"></h1>
300 <p class="i18n_options_forum_description"></p>
301 <p>
302 <a id="link-forum" class="i18n_options_forum_link" target="_blank"></ a>
303 </p>
304 <h1 class="i18n_options_media_title"></h1>
305 <p class="i18n_options_media_description"></p>
306 <p>
307 <span id="share-general">
308 <a id="link-twitter" target="_blank">Twitter</a>
309 <a id="link-facebook" target="_blank">Facebook</a>
310 <a id="link-gplus" target="_blank">Google+</a>
311 </span>
312 <span id="share-chinese">
313 <a id="link-renren" target="_blank">renren</a>
314 <a id="link-weibo" target="_blank">weibo</a>
315 </span>
316 </p>
317 </div>
318 </main>
326 319
327 <!-- Dialog --> 320 <!-- Dialog -->
328 <div id="dialog" role="dialog" aria-hidden="true"> 321 <div id="dialog" role="dialog" aria-hidden="true">
juliandoucette 2017/08/21 14:10:33 I think you can/should take one of two approaches.
saroyanm 2017/08/21 15:20:21 Thanks for bringing this: I think using aside is a
juliandoucette 2017/08/21 16:07:24 Acknowledged.
329 <header> 322 <header>
330 <span id="dialog-title"> 323 <span id="dialog-title">
juliandoucette 2017/08/21 14:10:34 There are no headings in this header :/
saroyanm 2017/08/21 15:20:21 No there are no, it's shouldn't be part of current
juliandoucette 2017/08/21 16:07:24 Acknowledged.
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">
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>
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
« 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