new-options.html - Issue 29478597: Issue 5326 - General tab (HTML, strings and functionality)

Side by Side Diff: new-options.html

Issue 29478597: Issue 5326 - General tab (HTML, strings and functionality) (Closed)

Patch Set: Created Aug. 17, 2017, 8:33 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

OLD	NEW
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,

11 - but WITHOUT ANY WARRANTY; without even the implied warranty of	11 - but WITHOUT ANY WARRANTY; without even the implied warranty of

12 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	12 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

13 - GNU General Public License for more details.	13 - GNU General Public License for more details.

14 -	14 -

15 - You should have received a copy of the GNU General Public License	15 - You should have received a copy of the GNU General Public License

16 - along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>.	16 - along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>.

17 -->	17 -->

18	18

19 <html>	19 <html>

20 <head>	20 <head>

21 <meta charset="utf-8">	21 <meta charset="utf-8">

22 <title class="i18n_options_page_title"></title>	22 <title class="i18n_options_page_title"></title>

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 <style id="search-style"></style>

26 <script src="ext/common.js"></script>	25 <script src="ext/common.js"></script>

27 <script src="ext/content.js"></script>	26 <script src="ext/content.js"></script>

28 <script src="common.js"></script>	27 <script src="common.js"></script>

29 <script src="i18n.js"></script>	28 <script src="i18n.js"></script>

30 <script src="new-options.js"></script>	29 <script src="new-options.js"></script>

31 </head>	30 </head>

32 <body data-tab="general">	31 <body data-tab="general">

33 <!-- Navigation sidebar -->	32 <!-- Navigation sidebar -->

34 <div id="nav-sidebar">	33 <div id="nav-sidebar">

35 <div id="fixed-sidebar" class="fixed">	34 <div id="fixed-sidebar" class="fixed">

(...skipping 44 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
80 </ul>	79 </ul>

81 </footer>	80 </footer>

82 </div>	81 </div>

83 </div>	82 </div>

84 <div id="content">	83 <div id="content">

85 <div id="content-wrapper">	84 <div id="content-wrapper">

86 <div id="dialog-background"></div>	85 <div id="dialog-background"></div>

87	86

88 <!-- General tab content -->	87 <!-- General tab content -->

89 <div id="content-general" role="tabpanel" aria-labelledby="tab-general">	88 <div id="content-general" role="tabpanel" aria-labelledby="tab-general">

90 <div>	89 <h1 class="i18n_options_tab_general"></h1>

91 <h1 class="i18n_options_blocking_title"></h1>	90 <p class="i18n_options_general_description"></p>

92 <div class="hbox">	91 <section>

93 <div id="blocking-languages">	92 <h2 class="i18n_options_privacy_header"></h2>

94 <div class="option-name">	93 <ul id="recommend-security-list-table" class="table list">

95 <span class="i18n_options_language_title"></span>	94 <template>

96 <span class="i18n_options_readMore"	95 <button data-action="toggle-remove-subscription" role="checkbox" class="control"></button>

97 data-tooltip="options_language_title_tooltip"	96 <label class="display"></label>

98 data-tooltip-image="skin/tooltips/block.png"></span>	97 <span class="i18n_options_readMore" data-tooltip="options_more_% value%_tooltip"></span>

99 </div>	98 </template>

100 <ul id="blocking-languages-table" class="table list">	99 </ul>

101 <template>	100 </section>

102 <button data-action="toggle-disable-subscription" role="chec kbox" class="control" title="options_control_toggle_title"></button>	101 <section>

103 <label class="display"></label>	102 <h2 class="i18n_options_acceptable_ads_header"></h2>

104 <button data-action="remove-subscription" class="delete cont rol" title="options_control_remove_title"></button>	103 <p class="i18n_options_acceptable_ads_description"></p>

105 </template>	104 <form id="acceptable-ads">

106 </ul>	105 <div>

107 <div class="controls">	106 <input data-action="switch-acceptable-ads" type="radio" name="ac ceptable-ads" value="ads">

108 <button data-action="open-dialog" data-dialog="language">	107 <label class="i18n_options_acceptable_ads_label"></label>

109 <span class="icon icon-add"></span>	108 <p id="enable-aa-description" class="i18n_options_acceptable_ads _privacy_description_1"></p>

110 <span class="i18n_options_language_add"></span>	109 <p class="i18n_options_acceptable_ads_privacy_description_2"></p >

111 </button>

112 </div>

113 </div>	110 </div>

114 <div id="further-blocking">	111 <div>

115 <div class="option-name">	112 <input data-action="switch-acceptable-ads" type="radio" name="ac ceptable-ads" value="privacy">

116 <strong class="i18n_options_more_title"></strong>	113 <label class="i18n_options_acceptable_ads_privacy_label"></label >

117 <span class="i18n_options_readMore"	114 <p class="i18n_options_acceptable_ads_no_privacy_description"></ p>
	Thomas Greiner 2017/08/22 16:08:57 You're using the "no_privacy" description for the You're using the "no_privacy" description for the "privacy" option whereas above you use the "privacy" description for the "ads" option. That's why I'd generally avoid negation in IDs because it's easy to miss that you mean the opposite. So I'd suggest rusing the same values we introduced (i.e. "ads", "privacy" and "none") for string IDs as well to avoid this confusion. For that it might also be useful to replace "acceptable_ads" to "acceptableAds" to avoid confusing ID parts such as "acceptable_ads_ads". e.g. options_acceptable_ads_no_privacy_* -> options_acceptableAds_ads_* options_acceptable_ads_privacy_* options_acceptable_ads_disable_* -> options_acceptableAds_none_* saroyanm 2017/08/22 17:00:07 Done. Show quoted text On 2017/08/22 16:08:57, Thomas Greiner wrote: > You're using the "no_privacy" description for the "privacy" option whereas above > you use the "privacy" description for the "ads" option. > > That's why I'd generally avoid negation in IDs because it's easy to miss that > you mean the opposite. So I'd suggest rusing the same values we introduced (i.e. > "ads", "privacy" and "none") for string IDs as well to avoid this confusion. For > that it might also be useful to replace "acceptable_ads" to "acceptableAds" to > avoid confusing ID parts such as "acceptable_ads_ads". > > e.g. > options_acceptable_ads_no_privacy_* -> options_acceptableAds_ads_* > options_acceptable_ads_privacy_* > options_acceptable_ads_disable_* -> options_acceptableAds_none_* Done.
118 data-tooltip="options_more_title_tooltip"	115 <p id="dnt" class="i18n_options_acceptable_ads_dnt_notification" ></p>

119 data-tooltip-image="skin/tooltips/more.png"	116 </div>

120 data-tooltip-flip="horizontal"></span>	117 <div>

121 </div>	118 <input data-action="switch-acceptable-ads" type="radio" name="ac ceptable-ads" value="none">

122 <div id="custom-wrapper">	119 <label class="i18n_options_acceptable_ads_disable_label"></label >

123 <ul id="recommend-list-table" class="table list">	120 </div>

124 <template>	121 </form>

125 <button data-action="toggle-remove-subscription" role="che ckbox" class="control"></button>	122 </section>

126 <div class="fill">	123 <section>

127 <label class="display"	124 <h2 class="i18n_options_language_header"></h2>

128 data-tooltip="options_more_%value%_tooltip"	125 <p class="i18n_options_language_description"></p>

129 data-tooltip-native></label>	126 <div id="blocking-languages">

130 </div>	127 <ul id="blocking-languages-table" class="table list">

131 </template>	128 <template>

132 </ul>	129 <label class="display"></label>

133 <ul id="custom-list-table" class="table list">	130 <button data-single="hidden" data-action="remove-subscription" class="delete control" title="options_control_remove_title"></button>

134 <template>	131 <button data-single="visible" data-action="open-dialog" data-d ialog="language-change" class="i18n_options_language_change"></button>

135 <button data-action="toggle-disable-subscription" role="ch eckbox" class="control" title="options_control_toggle_title"></button>	132 </template>

136 <label class="display"></label>	133 </ul>

137 <button data-action="remove-subscription" class="delete co ntrol" title="options_control_remove_title"></button>	134 <div class="controls">

138 </template>	135 <button data-action="open-dialog" data-dialog="language-add">

139 </ul>	136 <span class="i18n_options_language_add"></span>

140 </div>	137 </button>

141 <div class="controls">

142 <button data-action="open-dialog" data-dialog="custom">

143 <span class="icon icon-add"></span>

144 <span class="i18n_options_more_add"><span>

145 </button>

146 </div>

147 </div>	138 </div>

148 </div>	139 </div>

149 </div>	140 <p class="i18n_options_language_tip"></p>

150 <div>	141 </section>

151 <h1 class="i18n_options_exceptions_title"></h1>	142 <section>

152 <div class="hbox">	143 <h2 class="i18n_options_more_filters_header"></h2>

153 <div id="acceptable-ads">	144 <p class="i18n_options_more_filters_description"></p>

154 <div class="option-name">	145 <ul id="custom-list-table" class="table list">

155 <strong class="i18n_options_acceptableAds_title"></strong>	146 <template>

156 <span class="i18n_options_readMore"	147 <label class="display"></label>

157 data-tooltip="options_acceptableAds_title_tooltip"	148 <span class="i18n_options_readMore" data-tooltip="options_more_% value%_tooltip"></span>

158 data-tooltip-image="skin/tooltips/acceptable-ads.png"></sp an>	149 <button data-action="remove-subscription" class="delete control" title="options_control_remove_title"></button>

159 </div>	150 </template>

160 <ul id="acceptableads-table" class="table list">	151 </ul>

161 <template>	152 <p class="i18n_options_more_filters_note"></p>

162 <button data-action="toggle-remove-subscription" role="check box" class="control"></button>	153 </section>

163 <label class="display"></label>

164 </template>

165 </ul>

166 </div>

167 </div>

168 </div>

169 </div>	154 </div>

170	155

171 <!-- Whitelist tab content -->	156 <!-- Whitelist tab content -->

172 <div id="content-whitelist" role="tabpanel" aria-labelledby="tab-whiteli st">	157 <div id="content-whitelist" role="tabpanel" aria-labelledby="tab-whiteli st">

173 <h1 class="i18n_options_tab_whitelist"></h1>	158 <h1 class="i18n_options_tab_whitelist"></h1>

174 <p class="i18n_options_whitelist_description"></p>	159 <p class="i18n_options_whitelist_description"></p>

175 <form>	160 <form>

176 <input id="whitelisting-textbox" type="text">	161 <input id="whitelisting-textbox" type="text">

177 <button id="whitelisting-add-button"	162 <button id="whitelisting-add-button"

178 type="submit"	163 type="submit"

(...skipping 158 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
337 </p>	322 </p>

338 </div>	323 </div>

339 </div>	324 </div>

340 </div>	325 </div>

341	326

342 <!-- Dialog -->	327 <!-- Dialog -->

343 <div id="dialog" role="dialog" aria-hidden="true">	328 <div id="dialog" role="dialog" aria-hidden="true">

344 <header>	329 <header>

345 <span id="dialog-title">	330 <span id="dialog-title">

346 <span id="dialog-title-custom" class="i18n_options_dialog_custom_title "></span>	331 <span id="dialog-title-custom" class="i18n_options_dialog_custom_title "></span>

347 <span id="dialog-title-language" class="i18n_options_dialog_language_t itle"></span>	332 <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>

348 <span id="dialog-title-predefined" class="i18n_options_dialog_predefin ed_title"></span>	334 <span id="dialog-title-predefined" class="i18n_options_dialog_predefin ed_title"></span>

349 </span>	335 </span>

350 <button id="dialog-close" class="i18n_options_close focus-first" data-ac tion="close-dialog"></button>	336 <button id="dialog-close" class="i18n_options_close focus-first" data-ac tion="close-dialog"></button>

351 </header>	337 </header>

352 <div id="dialog-body" class="content">	338 <div id="dialog-body" class="content">

353 <!-- Add language subscription -->	339 <!-- Add language subscription -->

354 <div id="dialog-content-language" class="dialog-content">	340 <div id="dialog-content-language-add" class="dialog-content">

355 <div class="dialog-content-block">	341 <ul id="all-lang-table-add" class="table list">

356 <h3 class="i18n_options_dialog_language_added"></h3>	342 <template>

357 <ul id="blocking-languages-dialog-table" class="table list">	343 <button data-action="add-language-subscription,close-dialog" class ="control add" role="checkbox">

358 <template>

359 <label class="display"></label>	344 <label class="display"></label>

360 </template>	345 </button>

361 </ul>	346 <button data-action="change-language-subscription,close-dialog" cl ass="control change" role="checkbox">

362 </div>

363 <div id="other-language" class="dialog-content-block">

364 <div>

365 <label for="find-language" class="i18n_options_dialog_language_oth er"></label>

366 <input type="search" id="find-language" class="default-focus" />

367 </div>

368 <ul id="all-lang-table" class="table list">

369 <template>

370 <button data-action="add-language-subscription" class="button-ad d control">

371 +<span class="i18n_options_button_add"></span>

372 </button>

373 <label class="display"></label>	347 <label class="display"></label>

374 </template>	348 </button>

375 </ul>	349 </template>

376 </div>	350 </ul>

377 </div>	351 </div>

378 <!-- Add custom subscription -->	352 <!-- Add custom subscription -->

379 <div id="dialog-content-custom" class="dialog-content">	353 <div id="dialog-content-custom" class="dialog-content">

380 <div class="dialog-content-block">	354 <div class="dialog-content-block">

381 <div>	355 <div>

382 <label for="blockingList-textbox" class="i18n_options_dialog_custo m_subscription_title"></label>	356 <label for="blockingList-textbox" class="i18n_options_dialog_custo m_subscription_title"></label>

383 <input id="blockingList-textbox" type="text" class="default-focus" placeholder="www.example.com/blockinglist.txt" />	357 <input id="blockingList-textbox" type="text" class="default-focus" placeholder="www.example.com/blockinglist.txt" />

384 </div>	358 </div>

385 <button class="i18n_options_dialog_custom_import" data-action="impor t-subscription"></button>	359 <button class="i18n_options_dialog_custom_import" data-action="impor t-subscription"></button>

386 </div>	360 </div>

387 <div class="dialog-content-block">	361 <div class="dialog-content-block">

388 <h3 class="i18n_options_dialog_edit_own_list"></h3>	362 <h3 class="i18n_options_dialog_edit_own_list"></h3>

389 <button class="i18n_options_dialog_create_own_list" data-action="clo se-dialog,switch-tab,edit-custom-filters" data-tab="advanced"></button>	363 <button class="i18n_options_dialog_create_own_list" data-action="clo se-dialog,switch-tab,edit-custom-filters" data-tab="advanced"></button>

390 </div>	364 </div>

391 </div>	365 </div>

392 <!-- Add predefined subscription -->	366 <!-- Add predefined subscription -->

393 <div id="dialog-content-predefined" class="dialog-content">	367 <div id="dialog-content-predefined" class="dialog-content">

394 <div class="dialog-content-block">	368 <div class="dialog-content-block">

395 <h3></h3>	369 <h3></h3>

396 <div class="url"></div>	370 <div class="url"></div>

397 <button class="i18n_options_dialog_predefined_confirm default-focus" data-action="add-predefined-subscription"></button>	371 <button class="i18n_options_dialog_predefined_confirm default-focus" data-action="add-predefined-subscription"></button>

398 </div>	372 </div>

399 </div>	373 </div>

400 </div>	374 </div>

401 <!-- Placeholder element to determine when to wrap focus around -->	375 <!-- Placeholder element to determine when to wrap focus around -->

402 <span class="focus-last" tabindex="0"></span>	376 <span class="focus-last" tabindex="0"></span>

403 </div>	377 </div>

404 </body>	378 </body>

405 </html>	379 </html>

OLD	NEW

« locale/en-US/new-options.json ('K') | « locale/en-US/new-options.json ('k') | new-options.js » ('j') | new-options.js » ('J')