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

Delta Between Two Patch Sets: options.html

Issue 29336364: issue 2377 - Finish design of Advanced tab of new options page (Closed)
Left Patch Set: Created Feb. 15, 2016, 12:29 p.m.
Right Patch Set: Created April 28, 2016, 1 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « locale/en-US/options.json ('k') | skin/options.css » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
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 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 <div class="notes"> 91 <div class="notes">
92 <p class="i18n_options_language_title_tooltip_notes_1">< /p> 92 <p class="i18n_options_language_title_tooltip_notes_1">< /p>
93 <p class="i18n_options_language_title_tooltip_notes_2">< /p> 93 <p class="i18n_options_language_title_tooltip_notes_2">< /p>
94 </div> 94 </div>
95 </div> 95 </div>
96 </div> 96 </div>
97 </div> 97 </div>
98 <ul id="blocking-languages-table" class="table list"> 98 <ul id="blocking-languages-table" class="table list">
99 <template> 99 <template>
100 <button role="checkbox" class="control"></button> 100 <button role="checkbox" class="control"></button>
101 <span class="display"></span> 101 <label class="display"></label>
102 </template> 102 </template>
103 </ul> 103 </ul>
104 <div class="controls"> 104 <div class="controls">
105 <button data-action="open-dialog" data-dialog="language"> 105 <button data-action="open-dialog" data-dialog="language">
106 <span class="icon icon-add"></span> 106 <span class="icon icon-add"></span>
107 <span class="i18n_options_language_add"></span> 107 <span class="i18n_options_language_add"></span>
108 </button> 108 </button>
109 </div> 109 </div>
110 </div> 110 </div>
111 <div id="further-blocking"> 111 <div id="further-blocking">
112 <div class="option-name"> 112 <div class="option-name">
113 <strong class="i18n_options_furtherBlocking_title"></strong> 113 <strong class="i18n_options_furtherBlocking_title"></strong>
114 <div class="tooltip"> 114 <div class="tooltip">
115 <span class="i18n_options_readMore"></span> 115 <span class="i18n_options_readMore"></span>
116 <div role="tooltip" class="flip-vertical"> 116 <div role="tooltip" class="flip-vertical">
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 <label class="display"></label>
127 <span class="i18n_options_popular 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 <label class="display"></label>
134 </template> 134 </template>
135 </ul> 135 </ul>
136 </div> 136 </div>
137 <div class="controls"> 137 <div class="controls">
138 <button data-action="open-dialog" data-dialog="custom"> 138 <button data-action="open-dialog" data-dialog="custom">
139 <span class="icon icon-add"></span> 139 <span class="icon icon-add"></span>
140 <span class="i18n_options_furtherBlocking_add"><span> 140 <span class="i18n_options_furtherBlocking_add"><span>
141 </button> 141 </button>
142 </div> 142 </div>
143 </div> 143 </div>
(...skipping 11 matching lines...) Expand all
155 <img src="skin/tooltips/acceptable-ads.png" alt="" /> 155 <img src="skin/tooltips/acceptable-ads.png" alt="" />
156 <p class="i18n_options_acceptableAds_title_tooltip_1"></p> 156 <p class="i18n_options_acceptableAds_title_tooltip_1"></p>
157 <p class="i18n_options_acceptableAds_title_tooltip_2"></p> 157 <p class="i18n_options_acceptableAds_title_tooltip_2"></p>
158 <p class="i18n_options_acceptableAds_title_tooltip_3"></p> 158 <p class="i18n_options_acceptableAds_title_tooltip_3"></p>
159 </div> 159 </div>
160 </div> 160 </div>
161 </div> 161 </div>
162 <ul id="acceptableads-table" class="table list"> 162 <ul id="acceptableads-table" class="table list">
163 <template> 163 <template>
164 <button role="checkbox" class="control"></button> 164 <button role="checkbox" class="control"></button>
165 <span class="display"></span> 165 <label class="display"></label>
166 </template> 166 </template>
167 </ul> 167 </ul>
168 </div> 168 </div>
169 <div id="whitelisting"> 169 <div id="whitelisting">
170 <div class="option-name"> 170 <div class="option-name">
171 <strong class="i18n_options_whitelisted_title"></strong> 171 <strong class="i18n_options_whitelisted_title"></strong>
172 <div class="tooltip"> 172 <div class="tooltip">
173 <span class="i18n_options_readMore"></span> 173 <span class="i18n_options_readMore"></span>
174 <div role="tooltip" class="flip-vertical"> 174 <div role="tooltip" class="flip-vertical">
175 <img src="skin/tooltips/whitelisted.png" alt="" /> 175 <img src="skin/tooltips/whitelisted.png" alt="" />
176 <p class="i18n_options_whitelisted_title_tooltip_1"></p> 176 <p class="i18n_options_whitelisted_title_tooltip_1"></p>
177 <p class="i18n_options_whitelisted_title_tooltip_2"></p> 177 <p class="i18n_options_whitelisted_title_tooltip_2"></p>
178 <div class="notes"> 178 <div class="notes">
179 <p class="i18n_options_whitelisted_title_tooltip_notes"> </p> 179 <p class="i18n_options_whitelisted_title_tooltip_notes"> </p>
180 </div> 180 </div>
181 </div> 181 </div>
182 </div> 182 </div>
183 </div> 183 </div>
184 <ul id="whitelisting-table" class="table list"> 184 <ul id="whitelisting-table" class="table list">
185 <template> 185 <template>
186 <button class="delete control"></button> 186 <button class="delete control"></button>
187 <span class="display"></span> 187 <label class="display"></label>
188 </template> 188 </template>
189 </ul> 189 </ul>
190 <div class="controls"> 190 <div class="controls">
191 <button data-action="edit-domain-exception"> 191 <button data-action="edit-domain-exception">
192 <span class="icon icon-add"></span> 192 <span class="icon icon-add"></span>
193 <span class="i18n_options_whitelisted_add"></span> 193 <span class="i18n_options_whitelisted_add"></span>
194 </button> 194 </button>
195 <div> 195 <div>
196 <span class="icon icon-add" data-action="add-domain-exceptio n"></span> 196 <span class="icon icon-add" data-action="add-domain-exceptio n"></span>
197 <input type="text" id="whitelisting-textbox" placeholder="ww w.example.com" /> 197 <input type="text" id="whitelisting-textbox" placeholder="ww w.example.com" />
(...skipping 10 matching lines...) Expand all
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 class="i18n_options_tweaks_title"></h1> 216 <h1 class="i18n_options_tweaks_title"></h1>
217 <ul id="tweaks" class="table"> 217 <ul id="tweaks" class="table">
218 <li> 218 <li data-pref="shouldShowBlockElementMenu">
219 <button role="checkbox" id="easylist"></button> 219 <label>
220 <span id="block-element-explanation" class="i18n_options_tweaks_ blockElement"></span> 220 <button role="checkbox" data-action="toggle-pref"></button>
221 <span class="i18n_options_tweaks_blockElement"></span>
222 </label>
223 </li>
224 <li data-pref="show_devtools_panel">
225 <label>
226 <button role="checkbox" data-action="toggle-pref"></button>
227 <span class="i18n_options_tweaks_showDevToolsPanel"></span>
228 </label>
229 </li>
230 <li data-pref="notifications_ignoredcategories">
231 <label>
232 <button role="checkbox" data-action="toggle-pref"></button>
233 <span class="i18n_options_tweaks_showNotifications"></span>
234 </label>
235 </li>
236 <li data-pref="safari_contentblocker">
237 <label>
238 <button role="checkbox" data-action="toggle-pref"></button>
239 <span class="i18n_options_tweaks_safariContentBlocker"></span>
240 </label>
241 <span id="restart-safari" class="i18n_options_tweaks_restartSafa ri"></span>
221 </li> 242 </li>
222 </ul> 243 </ul>
223 </div> 244 </div>
245
224 <div> 246 <div>
225 <h1 class="with-description"> 247 <h1>
226 <span class="i18n_options_filterList_title"></span> 248 <span class="i18n_options_filterList_title"></span>
227 <div class="tooltip"> 249 <div class="tooltip">
228 <span class="i18n_options_readMore"></span> 250 <span class="i18n_options_readMore"></span>
229 <div role="tooltip"> 251 <div role="tooltip">
230 <p class="i18n_options_filterList_title_tooltip"></p> 252 <p class="i18n_options_filterList_title_tooltip"></p>
231 <div class="notes"> 253 <div class="notes">
232 <p class="i18n_options_filterList_title_tooltip_notes_1"></p > 254 <p class="i18n_options_filterList_title_tooltip_notes_1"></p >
233 <p class="i18n_options_filterList_title_tooltip_notes_2"></p > 255 <p class="i18n_options_filterList_title_tooltip_notes_2"></p >
234 </div> 256 </div>
235 </div> 257 </div>
236 </div> 258 </div>
237 </h1> 259 </h1>
238 <ul class="tabs horizontal"> 260 <ul class="tabs horizontal">
239 <li class="i18n_options_tab_overview active" data-action="switch-t ab" data-tab="advanced-allFilterLists"></li> 261 <li class="i18n_options_tab_overview active" data-action="switch-t ab" data-tab="advanced-allFilterLists"></li>
240 <li class="i18n_options_tab_ownList" data-action="switch-tab" data -tab="advanced-customFilters"></li> 262 <li class="i18n_options_tab_ownList" data-action="switch-tab" data -tab="advanced-customFilters"></li>
241 </ul> 263 </ul>
242 <div id="filter-lists"> 264 <div id="filter-lists">
243 <div id="all-filter-lists"> 265 <div id="all-filter-lists">
244 <div class="table-header"> 266 <div class="table-header">
245 <h3 class="i18n_options_column_name"></h3> 267 <h2 class="i18n_options_column_name"></h2>
246 <h3 class="i18n_options_column_date"></h3> 268 <h2 class="i18n_options_column_date"></h2>
247 </div> 269 </div>
248 <ul class="table cols" id="all-filter-lists-table"> 270 <ul class="table cols" id="all-filter-lists-table">
249 <template> 271 <template>
250 <button role="checkbox" class="control"></button> 272 <button role="checkbox" class="control"></button>
251 <div> 273 <div>
252 <span data-action="open-context-menu" class="display"></sp an> 274 <label data-action="open-context-menu" class="display"></l abel>
253 <div data-action="open-context-menu" class="arrow"> 275 <div data-action="open-context-menu" class="arrow">
254 <div class="context-menu"> 276 <div class="context-menu">
255 <div class="content"> 277 <div class="content">
256 <a class="i18n_options_filterList_updateNow update-s ubscription" data-action="update-subscription"></a> 278 <a class="i18n_options_filterList_updateNow update-s ubscription" data-action="update-subscription"></a>
257 <a class="i18n_options_filterList_website website" t arget="_blank"></a> 279 <a class="i18n_options_filterList_website website" t arget="_blank"></a>
258 <a class="i18n_options_filterList_source source" tar get="_blank"></a> 280 <a class="i18n_options_filterList_source source" tar get="_blank"></a>
259 <a class="i18n_options_filterList_delete delete" dat a-action="remove-subscription"></a> 281 <a class="i18n_options_filterList_delete delete" dat a-action="remove-subscription"></a>
260 </div> 282 </div>
261 </div> 283 </div>
262 </div> 284 </div>
263 </div> 285 </div>
264 <span class="date"></span> 286 <span class="date"></span>
265 <span class="time"></span> 287 <span class="time"></span>
266 <span class="message"></span> 288 <span class="message"></span>
267 </template> 289 </template>
268 <li id="own-filter-list" class="static"> 290 <li class="static">
269 <button role="checkbox" class="control" aria-checked="true" disabled="true"></button> 291 <button id="own-list" role="checkbox" class="control" aria-c hecked="true" disabled="true"></button>
270 <div> 292 <div>
271 <span class="i18n_options_filterList_own_list"></span> 293 <label for="own-list" class="i18n_options_filterList_own_l ist"></label>
272 </div> 294 </div>
273 <span data-action="switch-tab,edit-custom-filters" data-tab= "advanced-customFilters"> 295 <span data-action="switch-tab,edit-custom-filters" data-tab= "advanced-customFilters">
274 <a class="i18n_options_filterList_edit_own_list"></a> 296 <a class="i18n_options_filterList_edit_own_list"></a>
275 </span> 297 </span>
276 </li> 298 </li>
277 </ul> 299 </ul>
278 <div class="controls"> 300 <div class="controls">
279 <button data-action="open-dialog" data-dialog="custom"> 301 <button data-action="open-dialog" data-dialog="custom">
280 <span class="icon icon-add"></span> 302 <span class="icon icon-add"></span>
281 <span class="i18n_options_filterList_add"></span> 303 <span class="i18n_options_filterList_add"></span>
282 </button> 304 </button>
283 <button data-action="update-all-subscriptions"> 305 <button data-action="update-all-subscriptions">
284 <span class="icon icon-update"></span> 306 <span class="icon icon-update"></span>
285 <span class="i18n_options_filterList_update"></span> 307 <span class="i18n_options_filterList_update"></span>
286 </button> 308 </button>
287 </div> 309 </div>
288 </div> 310 </div>
289 <div id="custom-filters"> 311 <div id="custom-filters">
290 <h3 id="custom-filters-header" class="with-description"> 312 <h2 id="custom-filters-header">
291 <span class="i18n_options_customFilters_title"></span> 313 <span class="i18n_options_customFilters_title"></span>
292 <div class="tooltip"> 314 <div class="tooltip">
293 <span class="i18n_options_readMore"></span> 315 <span class="i18n_options_readMore"></span>
294 <div role="tooltip"> 316 <div role="tooltip">
295 <p class="i18n_options_customFilters_title_tooltip"></p> 317 <p class="i18n_options_customFilters_title_tooltip"></p>
296 </div> 318 </div>
297 </div> 319 </div>
298 </h3> 320 </h2>
299 <div id="custom-filters-wrapper"> 321 <div id="custom-filters-wrapper">
300 <div id="custom-filters-list-wrapper"> 322 <div id="custom-filters-list-wrapper">
301 <ul id="custom-filters-table" class="table list"> 323 <ul id="custom-filters-table" class="table list">
302 <template> 324 <template>
303 <span class="display"></span> 325 <label class="display"></label>
304 </template> 326 </template>
305 </ul> 327 </ul>
306 <form id="custom-filters-add" class="controls"> 328 <form id="custom-filters-add" class="controls">
307 <input type="text"/> 329 <input type="text"/>
308 <button class="i18n_options_button_add" type="submit"></bu tton> 330 <button class="i18n_options_button_add" type="submit"></bu tton>
309 </form> 331 </form>
310 </div> 332 </div>
311 <textarea id="custom-filters-raw"></textarea> 333 <textarea id="custom-filters-raw"></textarea>
312 </div> 334 </div>
313 <div id="custom-filters-edit-wrapper" class="controls"> 335 <div id="custom-filters-edit-wrapper" class="controls">
314 <button id="custom-filters-show-edit" data-action="edit-custom -filters"> 336 <button id="custom-filters-show-edit" data-action="edit-custom -filters">
315 <span class="icon icon-edit"></span> 337 <span class="icon icon-edit"></span>
316 <span class="i18n_options_customFilter_edit"></span> 338 <span class="i18n_options_customFilter_edit"></span>
317 </button> 339 </button>
318 <div id="custom-filters-raw-controls"> 340 <div id="custom-filters-raw-controls">
319 <button id="custom-filters-raw-save" data-action="save-custo m-filters"> 341 <button id="custom-filters-raw-save" data-action="save-custo m-filters">
320 <span class="icon icon-cancel"></span> 342 <span class="icon icon-save"></span>
321 <span class="i18n_options_customFilter_save"></span> 343 <span class="i18n_options_customFilter_save"></span>
Thomas Greiner 2016/02/15 18:09:21 Detail: You're using "icon-cancel" and "i18n_optio
saroyanm 2016/02/24 11:23:57 Oops, thanks.
322 </button> 344 </button>
323 <button data-action="cancel-custom-filters"> 345 <button data-action="cancel-custom-filters">
324 <span class="icon icon-save"></span> 346 <span class="icon icon-cancel"></span>
325 <span class="i18n_options_customFilter_list"></span> 347 <span class="i18n_options_customFilter_cancel"></span>
326 </button> 348 </button>
327 </div> 349 </div>
328 </div> 350 </div>
329 </div> 351 </div>
330 </div> 352 </div>
331 </div> 353 </div>
332 </div> 354 </div>
333 355
334 <!-- Help tab content --> 356 <!-- Help tab content -->
335 <div id="content-help" class="tab-content"> 357 <div id="content-help" class="tab-content">
(...skipping 28 matching lines...) Expand all
364 </span> 386 </span>
365 <button id="dialog-close" class="i18n_options_close focus-first" data-ac tion="close-dialog"></button> 387 <button id="dialog-close" class="i18n_options_close focus-first" data-ac tion="close-dialog"></button>
366 </header> 388 </header>
367 <div id="dialog-body" class="content"> 389 <div id="dialog-body" class="content">
368 <!-- Add language subscription --> 390 <!-- Add language subscription -->
369 <div id="dialog-content-language" class="dialog-content"> 391 <div id="dialog-content-language" class="dialog-content">
370 <div class="dialog-content-block"> 392 <div class="dialog-content-block">
371 <h3 class="i18n_options_dialog_language_added"></h3> 393 <h3 class="i18n_options_dialog_language_added"></h3>
372 <ul id="blocking-languages-dialog-table" class="table list"> 394 <ul id="blocking-languages-dialog-table" class="table list">
373 <template> 395 <template>
374 <span class="display"></span> 396 <label class="display"></label>
375 </template> 397 </template>
376 </ul> 398 </ul>
377 </div> 399 </div>
378 <div id="other-language" class="dialog-content-block"> 400 <div id="other-language" class="dialog-content-block">
379 <div> 401 <div>
380 <label for="find-language" class="i18n_options_dialog_language_oth er"></label> 402 <label for="find-language" class="i18n_options_dialog_language_oth er"></label>
381 <input type="search" id="find-language" class="default-focus" /> 403 <input type="search" id="find-language" class="default-focus" />
382 </div> 404 </div>
383 <ul id="all-lang-table" class="table list"> 405 <ul id="all-lang-table" class="table list">
384 <template> 406 <template>
385 <button class="button-add control"> 407 <button class="button-add control">
386 +<span class="i18n_options_button_add"></span> 408 +<span class="i18n_options_button_add"></span>
387 </button> 409 </button>
388 <span class="display"></span> 410 <label class="display"></label>
389 </template> 411 </template>
390 </ul> 412 </ul>
391 </div> 413 </div>
392 </div> 414 </div>
393 <!-- Add custom subscription --> 415 <!-- Add custom subscription -->
394 <div id="dialog-content-custom" class="dialog-content"> 416 <div id="dialog-content-custom" class="dialog-content">
395 <div class="dialog-content-block"> 417 <div class="dialog-content-block">
396 <div> 418 <div>
397 <label for="blockingList-textbox" class="i18n_options_dialog_custo m_subscription_title"></label> 419 <label for="blockingList-textbox" class="i18n_options_dialog_custo m_subscription_title"></label>
398 <input id="blockingList-textbox" type="text" class="default-focus" placeholder="www.example.com/blockinglist.txt" /> 420 <input id="blockingList-textbox" type="text" class="default-focus" placeholder="www.example.com/blockinglist.txt" />
(...skipping 12 matching lines...) Expand all
411 <div class="url"></div> 433 <div class="url"></div>
412 <button class="i18n_options_dialog_predefined_confirm default-focus" data-action="add-predefined-subscription"></button> 434 <button class="i18n_options_dialog_predefined_confirm default-focus" data-action="add-predefined-subscription"></button>
413 </div> 435 </div>
414 </div> 436 </div>
415 </div> 437 </div>
416 <!-- Placeholder element to determine when to wrap focus around --> 438 <!-- Placeholder element to determine when to wrap focus around -->
417 <span class="focus-last" tabindex="0"></span> 439 <span class="focus-last" tabindex="0"></span>
418 </div> 440 </div>
419 </body> 441 </body>
420 </html> 442 </html>
LEFTRIGHT
« locale/en-US/options.json ('k') | skin/options.css » ('j') | Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Toggle Comments ('s')

Powered by Google App Engine
This is Rietveld