desktop-options.html - Issue 29674584: Issue 5549 - Implement missing error handlings for custom filter lists

Delta Between Two Patch Sets: desktop-options.html

Issue 29674584: Issue 5549 - Implement missing error handlings for custom filter lists (Closed)

Left Patch Set: fixed linting typos Created Jan. 23, 2018, 10:46 a.m.

Right Patch Set: changed custom-filters-edit-area to custom-filters-control as suggested Created Feb. 5, 2018, 9:05 a.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

LEFT	RIGHT
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 11 matching lines...) Expand all Loading...
22 <title class="i18n_options_page_document_title"></title>	22 <title class="i18n_options_page_document_title"></title>

23 <link rel="stylesheet" href="skin/common.css">	23 <link rel="stylesheet" href="skin/common.css">

24 <link rel="stylesheet" href="skin/desktop-options.css">	24 <link rel="stylesheet" href="skin/desktop-options.css">

25 <script src="polyfill.js"></script>	25 <script src="polyfill.js"></script>

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="desktop-options.js"></script>	30 <script src="desktop-options.js"></script>

31 </head>	31 </head>

32 <body data-tab="general" dir="rtl">	32 <body data-tab="general">
saroyanm 2018/01/23 15:26:05 Why direction RTL ? BTW we do specify the directi Why direction RTL ? BTW we do specify the directions on <html> element here -> https://hg.adblockplus.org/adblockplusui/file/tip/i18n.js#l32 If you would like to test RTL direction in the test environment you can also specify locale parameter in the URL. ex.: http://127.0.0.1:5000/desktop-options.html?locale=ar It's also handy for testing the translations. a.giammarchi 2018/01/23 15:43:18 oh gosh that's a "me trying things and not cleanin Show quoted text On 2018/01/23 15:26:05, saroyanm wrote: > Why direction RTL ? > > BTW we do specify the directions on <html> element here -> > https://hg.adblockplus.org/adblockplusui/file/tip/i18n.js#l32 > > If you would like to test RTL direction in the test environment you can also > specify locale parameter in the URL. ex.: > http://127.0.0.1:5000/desktop-options.html?locale=ar It's also handy for testing > the translations. oh gosh that's a "me trying things and not cleaning up" typo. sorry for that
33 <!-- Navigation sidebar -->	33 <!-- Navigation sidebar -->

34 <div id="sidebar">	34 <div id="sidebar">

35 <div class="fixed">	35 <div class="fixed">

36 <header>	36 <header>

37 <img id="sidebar-logo" alt="Adblock Plus logo" src="skin/abp-logo.svg" >	37 <img id="sidebar-logo" alt="Adblock Plus logo" src="skin/abp-logo.svg" >

38 <h1>	38 <h1>

39 Adblock <strong>Plus</strong>	39 Adblock <strong>Plus</strong>

40 </h1>	40 </h1>

41 <p class="i18n_options_page_title"></p>	41 <p class="i18n_options_page_title"></p>

42 </header>	42 </header>

(...skipping 240 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
283 <button class="i18n_options_filterList_add primary" data-action="ope n-dialog" data-dialog="import"></button>	283 <button class="i18n_options_filterList_add primary" data-action="ope n-dialog" data-dialog="import"></button>

284 <button id="update" class="i18n_options_filterList_update secondary" data-action="update-all-subscriptions"></button>	284 <button id="update" class="i18n_options_filterList_update secondary" data-action="update-all-subscriptions"></button>

285 </div>	285 </div>

286 </section>	286 </section>

287	287

288 <section class="cols">	288 <section class="cols">

289 <header>	289 <header>

290 <h2 class="i18n_options_customFilters_title"></h2>	290 <h2 class="i18n_options_customFilters_title"></h2>

291 <p class="i18n_options_customFilters_description"></p>	291 <p class="i18n_options_customFilters_description"></p>

292 <p>	292 <p>

293 <a class="i18n_options_customFilters_learn" id="link-filters-on-ed it-error" target="_blank"></a>	293 <a class="i18n_options_customFilters_learn" id="link-filters-1" ta rget="_blank"></a>
saroyanm 2018/01/23 15:26:05 In general we use text specified in the specificat In general we use text specified in the specification text, not in the screenshot (sometimes screenshots are being outdated and for accessibility reasons), but I agree with you that we should have this link here, I only think that it should be persistent rather than only when the filter is invalid, I did created an issue to update the specs -> https://gitlab.com/eyeo/spec/issues/133 in order to have the reference link below the section description. a.giammarchi 2018/01/23 15:43:18 I've just followed visual specs here, I probably s Show quoted text On 2018/01/23 15:26:05, saroyanm wrote: > In general we use text specified in the specification text, not in the > screenshot (sometimes screenshots are being outdated and for accessibility > reasons), but I agree with you that we should have this link here, I only think > that it should be persistent rather than only when the filter is invalid, I did > created an issue to update the specs -> https://gitlab.com/eyeo/spec/issues/133 > in order to have the reference link below the section description. I've just followed visual specs here, I probably should've asked around first.
294 </p>	294 </p>

295 </header>	295 </header>

296 <div id="custom-filters">	296 <div id="custom-filters">

297 <h3 class="i18n_options_customFilters_widget_title"></h3>	297 <h3 class="i18n_options_customFilters_widget_title"></h3>

298 <div id="empty-custom-filters">	298 <div id="empty-custom-filters">

299 <p class="i18n_options_customFilters_tip"></p>	299 <p class="i18n_options_customFilters_tip"></p>

300 <button class="i18n_options_customFilters_start primary" data-acti on="edit-custom-filters">	300 <button class="i18n_options_customFilters_start primary" data-acti on="edit-custom-filters">

301 </button>	301 </button>

302 <p>	302 <p>

303 <a class="i18n_options_customFilters_learn" id="link-filters" ta rget="_blank"></a>	303 <a class="i18n_options_customFilters_learn" id="link-filters-2" target="_blank"></a>

304 </p>	304 </p>

305 </div>	305 </div>

306 <textarea id="custom-filters-raw" rows="15"></textarea>	306 <textarea id="custom-filters-raw" rows="15"></textarea>

307 <div id="custom-filters-edit-area">	307 <div id="custom-filters-control">

308 <div id="custom-filters-edit-error" class="i18n_options_customFilt ers_edit_error"></div>	308 <div id="custom-filters-edit-error" class="i18n_options_customFilt ers_edit_error"></div>

309 <div class="side-controls">	309 <div class="side-controls">

310 <button id="custom-filters-edit" class="i18n_options_customFilte r_edit secondary" data-action="edit-custom-filters">	310 <button id="custom-filters-edit" class="i18n_options_customFilte r_edit secondary" data-action="edit-custom-filters">

311 </button>	311 </button>

312 <div id="custom-filters-raw-controls" class="side-controls">	312 <div id="custom-filters-raw-controls" class="side-controls">

313 <button class="i18n_options_customFilter_cancel secondary" dat a-action="cancel-custom-filters"></button>	313 <button class="i18n_options_customFilter_cancel secondary" dat a-action="cancel-custom-filters"></button>

314 <button class="i18n_options_customFilter_save primary" data-ac tion="save-custom-filters"></button>	314 <button class="i18n_options_customFilter_save primary" data-ac tion="save-custom-filters"></button>

315 </div>	315 </div>

316 </div>	316 </div>

317 </div>	317 </div>

318 <div id="custom-filters-edit-filters"></div>	318 <ul aria-labelledby="custom-filters-edit-error" role="alert" id="cus tom-filters-error"></ul>

319 </div>	319 </div>

320 </section>	320 </section>

321 </div>	321 </div>

322	322

323 <!-- Help tab content -->	323 <!-- Help tab content -->

324 <div id="content-help" role="tabpanel" aria-labelledby="tab-help">	324 <div id="content-help" role="tabpanel" aria-labelledby="tab-help">

325 <header>	325 <header>

326 <h1 class="i18n_options_tab_help"></h1>	326 <h1 class="i18n_options_tab_help"></h1>

327 <p class="i18n_options_help_description"></p>	327 <p class="i18n_options_help_description"></p>

328 </header>	328 </header>

(...skipping 107 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
436 </div>	436 </div>

437 <!-- Notification -->	437 <!-- Notification -->

438 <div id="notification" aria-hidden="true" aria-live="polite">	438 <div id="notification" aria-hidden="true" aria-live="polite">

439 <strong id="notification-text"></strong>	439 <strong id="notification-text"></strong>

440 <button class="icon close secondary" data-action="hide-notification">	440 <button class="icon close secondary" data-action="hide-notification">

441 <span class="i18n_options_notification_hide sr-only"></span>	441 <span class="i18n_options_notification_hide sr-only"></span>

442 </button>	442 </button>

443 </div>	443 </div>

444 </body>	444 </body>

445 </html>	445 </html>

LEFT	RIGHT