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

Side by Side Diff: new-options.html

Issue 29549891: Issue 5706 - Finish custom filter list dialog (Closed)
Patch Set: Addressed Ire's comments Created Sept. 21, 2017, 7:08 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
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-present eyeo GmbH 4 - Copyright (C) 2006-present 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 235 matching lines...) Expand 10 before | Expand all | Expand 10 after
246 <li role="menuitem"> 246 <li role="menuitem">
247 <button class="i18n_options_filterList_delete delete" da ta-action="remove-subscription"></button> 247 <button class="i18n_options_filterList_delete delete" da ta-action="remove-subscription"></button>
248 </li> 248 </li>
249 </ul> 249 </ul>
250 </div> 250 </div>
251 </div> 251 </div>
252 <button data-action="remove-subscription" class="control delete" ></button> 252 <button data-action="remove-subscription" class="control delete" ></button>
253 </div> 253 </div>
254 </template> 254 </template>
255 </ul> 255 </ul>
256 <div class="side-controls"> 256 <div class="side-controls wrap">
257 <button class="i18n_options_filterList_add primary" data-action="ope n-dialog" data-dialog="custom"></button> 257 <button class="i18n_options_filterList_add primary" data-action="ope n-dialog" data-dialog="import"></button>
258 <button id="update" class="i18n_options_filterList_update secondary" data-action="update-all-subscriptions"></button> 258 <button id="update" class="i18n_options_filterList_update secondary" data-action="update-all-subscriptions"></button>
259 </div> 259 </div>
260 </section> 260 </section>
261 261
262 <section class="cols"> 262 <section class="cols">
263 <header> 263 <header>
264 <h2 class="i18n_options_customFilters_title"></h2> 264 <h2 class="i18n_options_customFilters_title"></h2>
265 <p class="i18n_options_customFilters_description"></p> 265 <p class="i18n_options_customFilters_description"></p>
266 </header> 266 </header>
267 <div id="custom-filters"> 267 <div id="custom-filters">
268 <h3 class="i18n_options_customFilters_widget_title"></h3> 268 <h3 class="i18n_options_customFilters_widget_title"></h3>
269 <div id="empty-custom-filters"> 269 <div id="empty-custom-filters">
270 <p class="i18n_options_customFilters_tip"></p> 270 <p class="i18n_options_customFilters_tip"></p>
271 <button class="i18n_options_customFilters_start primary" data-acti on="edit-custom-filters"> 271 <button class="i18n_options_customFilters_start primary" data-acti on="edit-custom-filters">
272 </button> 272 </button>
273 <p> 273 <p>
274 <a class="i18n_options_customFilters_learn" id="link-filters" ta rget="_blank"></a> 274 <a class="i18n_options_customFilters_learn" id="link-filters" ta rget="_blank"></a>
275 </p> 275 </p>
276 </div> 276 </div>
277 <textarea id="custom-filters-raw" rows="15"></textarea> 277 <textarea id="custom-filters-raw" rows="15"></textarea>
278 <div class="side-controls"> 278 <div class="side-controls wrap">
279 <button id="custom-filters-edit" class="i18n_options_customFilter_ edit secondary" data-action="edit-custom-filters"> 279 <button id="custom-filters-edit" class="i18n_options_customFilter_ edit secondary" data-action="edit-custom-filters">
280 </button> 280 </button>
281 <div id="custom-filters-raw-controls"> 281 <div class="side-controls" id="custom-filters-raw-controls">
282 <button class="i18n_options_customFilter_cancel secondary" data- action="cancel-custom-filters"></button> 282 <button class="i18n_options_customFilter_cancel secondary" data- action="cancel-custom-filters"></button>
283 <button class="i18n_options_customFilter_save primary" data-acti on="save-custom-filters"></button> 283 <button class="i18n_options_customFilter_save primary" data-acti on="save-custom-filters"></button>
284 </div> 284 </div>
285 </div> 285 </div>
286 </div> 286 </div>
287 </section> 287 </section>
288 </div> 288 </div>
289 289
290 <!-- Help tab content --> 290 <!-- Help tab content -->
291 <div id="content-help" role="tabpanel" aria-labelledby="tab-help"> 291 <div id="content-help" role="tabpanel" aria-labelledby="tab-help">
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
325 </div> 325 </div>
326 </section> 326 </section>
327 </div> 327 </div>
328 </main> 328 </main>
329 329
330 <!-- Dialog --> 330 <!-- Dialog -->
331 <div id="dialog" role="dialog" aria-hidden="true"> 331 <div id="dialog" role="dialog" aria-hidden="true">
332 <header> 332 <header>
333 <span id="dialog-title"> 333 <span id="dialog-title">
334 <h3 id="dialog-title-about" class="i18n_options_dialog_about_title"></ h3> 334 <h3 id="dialog-title-about" class="i18n_options_dialog_about_title"></ h3>
335 <h3 id="dialog-title-custom" class="i18n_options_dialog_custom_title"> </h3> 335 <h3 id="dialog-title-import" class="i18n_options_dialog_import_title"> </h3>
336 <h3 id="dialog-title-language-add" class="i18n_options_dialog_language _title"></h3> 336 <h3 id="dialog-title-language-add" class="i18n_options_dialog_language _title"></h3>
337 <h3 id="dialog-title-language-change" class="i18n_options_dialog_langu age_title"></h3> 337 <h3 id="dialog-title-language-change" class="i18n_options_dialog_langu age_title"></h3>
338 <h3 id="dialog-title-predefined" class="i18n_options_dialog_predefined _title"></h3> 338 <h3 id="dialog-title-predefined" class="i18n_options_dialog_predefined _title"></h3>
339 </span> 339 </span>
340 <button id="dialog-close" data-action="close-dialog"></button> 340 <button id="dialog-close" data-action="close-dialog"></button>
341 </header> 341 </header>
342 <div id="dialog-body" class="content"> 342 <div id="dialog-body" class="content">
343 <!-- About Adblock Plus --> 343 <!-- About Adblock Plus -->
344 <div id="dialog-content-about" class="dialog-content"> 344 <div id="dialog-content-about" class="dialog-content">
345 <p id="abp-version"></p> 345 <p id="abp-version"></p>
346 <p class="i18n_options_dialog_about_copyright"></p> 346 <p class="i18n_options_dialog_about_copyright"></p>
347 <p class="i18n_options_dialog_about_trademark"></p> 347 <p class="i18n_options_dialog_about_trademark"></p>
348 <p> 348 <p>
349 <button class="i18n_options_close primary" data-action="close-dialog "></button> 349 <button class="i18n_options_close primary" data-action="close-dialog "></button>
350 </p> 350 </p>
351 </div> 351 </div>
352 <!-- Add language subscription --> 352 <!-- Add language subscription -->
353 <div id="dialog-content-language-add" class="dialog-content"> 353 <div id="dialog-content-language-add" class="dialog-content">
354 <ul id="all-lang-table-add" class="table list"> 354 <ul id="all-lang-table-add" class="table list">
355 <template> 355 <template>
356 <button data-action="add-language-subscription,close-dialog" class ="control add" role="checkbox"> 356 <button data-action="add-language-subscription,close-dialog" class ="control add" role="checkbox">
357 <label class="display"></label> 357 <label class="display"></label>
358 </button> 358 </button>
359 <button data-action="change-language-subscription,close-dialog" cl ass="control change" role="checkbox"> 359 <button data-action="change-language-subscription,close-dialog" cl ass="control change" role="checkbox">
360 <label class="display"></label> 360 <label class="display"></label>
361 </button> 361 </button>
362 </template> 362 </template>
363 </ul> 363 </ul>
364 </div> 364 </div>
365 <!-- Add custom subscription --> 365 <!-- Add import subscription -->
366 <div id="dialog-content-custom" class="dialog-content"> 366 <div id="dialog-content-import" class="dialog-content">
367 <div> 367 <form data-validation="custom" novalidate>
368 <label for="blockingList-textbox" class="i18n_options_dialog_custom_ subscription_title"></label> 368 <p class="floating-input">
369 <input id="blockingList-textbox" type="text" class="default-focus" p laceholder="https://website.com/filterlist.txt" /> 369 <input placeholder=" " id="import-list-title" type="text" class="d efault-focus" required />
370 </div> 370 <label for="import-list-title" class="i18n_options_dialog_import_s ubscription_title"></label>
371 <p> 371 <span class="attention"></span>
372 <button class="i18n_options_dialog_custom_import primary" data-actio n="import-subscription"></button> 372 <span class="i18n_options_dialog_import_subscription_title_error e rror-msg"></span>
373 </p> 373 </p>
374 <p class="floating-input">
375 <input placeholder=" " id="import-list-url" type="url" class="defa ult-focus" required/>
376 <label for="import-list-url" class="i18n_options_dialog_import_sub scription_location"></label>
377 <span class="attention"></span>
378 <span class="i18n_options_dialog_import_subscription_location_erro r error-msg"></span>
379 </p>
380 <p class="side-controls">
381 <button class="i18n_options_customFilter_cancel secondary" type="r eset" data-action="close-dialog"></button>
382 <button type="button" class="i18n_options_dialog_import_title prim ary" data-action="validate-import-subscription"></button>
383 </p>
384 </form>
374 </div> 385 </div>
375 <!-- Add predefined subscription --> 386 <!-- Add predefined subscription -->
376 <div id="dialog-content-predefined" class="dialog-content"> 387 <div id="dialog-content-predefined" class="dialog-content">
377 <div class="dialog-content-block"> 388 <div class="dialog-content-block">
378 <h3></h3> 389 <h3></h3>
379 <div class="url"></div> 390 <div class="url"></div>
380 <button class="i18n_options_dialog_predefined_confirm default-focus primary" data-action="add-predefined-subscription"></button> 391 <button class="i18n_options_dialog_predefined_confirm default-focus primary" data-action="add-predefined-subscription"></button>
381 </div> 392 </div>
382 </div> 393 </div>
383 </div> 394 </div>
384 <!-- Placeholder element to determine when to wrap focus around --> 395 <!-- Placeholder element to determine when to wrap focus around -->
385 <span class="focus-last" tabindex="0"></span> 396 <span class="focus-last" tabindex="0"></span>
386 </div> 397 </div>
387 <!-- Notification --> 398 <!-- Notification -->
388 <div id="notification" aria-hidden="true" aria-live="polite"> 399 <div id="notification" aria-hidden="true" aria-live="polite">
389 <strong id="notification-text"></strong> 400 <strong id="notification-text"></strong>
390 <button id="hide-notification" data-action="hide-notification"> 401 <button id="hide-notification" data-action="hide-notification">
391 <span class="i18n_options_notification_hide sr-only"></span> 402 <span class="i18n_options_notification_hide sr-only"></span>
392 </button> 403 </button>
393 </div> 404 </div>
394 </body> 405 </body>
395 </html> 406 </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