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

Delta Between Two Patch Sets: options.html

Issue 6088024630755328: issue 1526 - Implement new options page design for Chrome/Opera/Safari (Closed)
Left Patch Set: Created Feb. 19, 2015, 4:52 p.m.
Right Patch Set: Comment about solution being temprorary is added to subscriptions.xml Created June 13, 2015, 12:59 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') | options.js » ('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-2015 Eyeo GmbH 4 - Copyright (C) 2006-2015 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/options.css"> 23 <link rel="stylesheet" href="skin/options.css">
24 <style id="search_style"></style> 24 <style id="search-style"></style>
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="i18n.js"></script> 27 <script src="i18n.js"></script>
28 <script src="options.js"></script> 28 <script src="options.js"></script>
29 </head> 29 </head>
30 <body data-tab="general"> 30 <body data-tab="general">
31 <!-- Navigation sidebar --> 31 <!-- Navigation sidebar -->
32 <div id="nav-sidebar"> 32 <div id="nav-sidebar">
33 <div id="fixed-sidebar" class="fixed"> 33 <div id="fixed-sidebar" class="fixed">
34 <div id="page-title"> 34 <div id="page-title">
35 <p class="i18n_options_page_name"></p> 35 <p class="i18n_options_page_header_1"></p>
36 <h1 class="i18n_options_abp"></h1> 36 <h1 class="i18n_options_page_header_2"></h1>
37 </div> 37 </div>
38 <ul class="tabs vertical" id="main-navigation-tabs"> 38 <ul id="main-navigation-tabs" class="tabs vertical">
39 <li id="tab-general" data-show="general" class="active"> 39 <li id="tab-general" data-show="general" class="active">
40 <span class="i18n_options_tab_general"></span> 40 <span class="i18n_options_tab_general"></span>
41 <span class="icon"></span> 41 <span class="icon"></span>
42 </li> 42 </li>
43 <li id="tab-advanced" data-show="advanced"> 43 <li id="tab-advanced" data-show="advanced">
44 <span class="i18n_options_tab_advanced"></span> 44 <span class="i18n_options_tab_advanced"></span>
45 <span class="icon"></span> 45 <span class="icon"></span>
46 </li> 46 </li>
47 <li id="tab-help" data-show="help"> 47 <li id="tab-help" data-show="help">
48 <span class="i18n_options_tab_help"></span> 48 <span class="i18n_options_tab_help"></span>
49 <span class="icon"></span> 49 <span class="icon"></span>
50 </li> 50 </li>
51 </ul> 51 </ul>
52 <p class="nav-link"> 52 <p class="nav-link">
53 <span class="i18n_options_version"></span> <span id="abp-version"></sp an> 53 <span class="i18n_options_version"></span> <span id="abp-version"></sp an>
54 </p> 54 </p>
55 <ul class="tabs vertical bottom"> 55 <ul class="tabs vertical bottom">
56 <li id="tab-share"> 56 <li id="tab-share">
57 <span class="i18n_options_tab_share"></span><span class="icon"></spa n> 57 <span class="i18n_options_tab_share"></span><span class="icon"></spa n>
58 </li> 58 </li>
59 <li id="tab-donate"> 59 <li id="tab-donate">
60 <span class="i18n_options_tab_donate"></span><span class="icon"></sp an> 60 <span class="i18n_options_tab_donate"></span><span class="icon"></sp an>
61 </li> 61 </li>
62 </ul> 62 </ul>
63 </div> 63 </div>
64 </div> 64 </div>
65 <div id="tab-content"> 65 <div id="tab-content">
66 <div id="content-wrapper"> 66 <div id="content-wrapper">
67 <div id="modal-background"></div> 67 <div id="dialog-background"></div>
68 68
69 <!-- General tab content --> 69 <!-- General tab content -->
70 <div id="content-general"> 70 <div id="content-general">
71 <div> 71 <div>
72 <h1 class="i18n_options_blocking"></h1> 72 <h1 class="i18n_options_blocking_title"></h1>
73 <div class="flex-container"> 73 <div class="flex-container">
74 <div id="blocking-languages"> 74 <div id="blocking-languages">
75 <p class="option-name"> 75 <p class="option-name">
76 <span class="i18n_options_language_title"></span> 76 <span class="i18n_options_language_title"></span>
77 <a class="i18n_options_readMore tooltip" href="#" target="_bla nk"></a> 77 <a class="i18n_options_readMore tooltip" target="_blank"></a>
78 </p> 78 </p>
79 <ul class="table list" id="blocking-languages-table"></ul> 79 <ul id="blocking-languages-table" class="table list">
80 <template>
81 <input type="checkbox" class="control" />
82 <span class="display"></span>
83 </template>
84 </ul>
80 <div class="controls"> 85 <div class="controls">
81 <button id="add-website-language"> 86 <button id="add-website-language">
82 <span class="icon icon-add"></span> 87 <span class="icon icon-add"></span>
83 <span class="i18n_options_language_add"></span> 88 <span class="i18n_options_language_add"></span>
84 </button> 89 </button>
85 </div> 90 </div>
86 </div> 91 </div>
87 <div id="further-blocking"> 92 <div id="further-blocking">
88 <p class="option-name"> 93 <p class="option-name">
89 <strong class="i18n_options_furtherBlocking_title"></strong> 94 <strong class="i18n_options_furtherBlocking_title"></strong>
90 <a class="i18n_options_readMore tooltip" href="#" target="_bla nk"></a> 95 <a class="i18n_options_readMore tooltip" target="_blank"></a>
91 </p> 96 </p>
92 <div id="custom-wrapper"> 97 <div id="custom-wrapper">
93 <ul class="table list" id="recommend-list-table"></ul> 98 <ul id="recommend-list-table" class="table list">
94 <ul class="table list" id="custom-list-table"></ul> 99 <template>
100 <input type="checkbox" class=control />
101 <span class="display"></span>
102 <span class="popular"></span>
103 </template>
104 </ul>
105 <ul id="custom-list-table" class="table list">
106 <template>
107 <input type="checkbox" class="control" />
108 <span class="display"></span>
109 </template>
110 </ul>
95 </div> 111 </div>
96 <div class="controls"> 112 <div class="controls">
97 <button id="add-blocking-list"> 113 <button id="add-blocking-list">
98 <span class="icon icon-add"></span> 114 <span class="icon icon-add"></span>
99 <span class="i18n_options_furtherBlocking_add"><span> 115 <span class="i18n_options_furtherBlocking_add"><span>
100 </button> 116 </button>
101 </div> 117 </div>
102 </div> 118 </div>
103 </div> 119 </div>
104 </div> 120 </div>
105 <div> 121 <div>
106 <h1 class="i18n_options_exceptions"></h1> 122 <h1 class="i18n_options_exceptions_title"></h1>
107 <div class="flex-container"> 123 <div class="flex-container">
108 <div id="acceptable-ads"> 124 <div id="acceptable-ads">
109 <p class="option-name"> 125 <p class="option-name">
110 <strong class="i18n_options_acceptableAds_title"></strong> 126 <strong class="i18n_options_acceptableAds_title"></strong>
111 <a class="i18n_options_readMore tooltip" href="#" target="_bla nk"></a> 127 <a class="i18n_options_readMore tooltip" target="_blank"></a>
112 </p> 128 </p>
113 <ul id="acceptableads-table" class="table list"></ul> 129 <ul id="acceptableads-table" class="table list">
130 <template>
131 <input type="checkbox" class="control" />
132 <span class="display"></span>
133 </template>
134 </ul>
114 </div> 135 </div>
115 <div id="whitelisting"> 136 <div id="whitelisting">
116 <p class="option-name"> 137 <p class="option-name">
117 <strong class="i18n_options_whitelisted_title"></strong> 138 <strong class="i18n_options_whitelisted_title"></strong>
118 <a class="i18n_options_readMore tooltip" href="#" target="_bla nk"></a> 139 <a class="i18n_options_readMore tooltip" target="_blank"></a>
119 </p> 140 </p>
120 <ul class="table list" id="whitelisting-table"></ul> 141 <ul id="whitelisting-table" class="table list">
142 <template>
143 <button class="delete control"></button>
144 <span class="display"></span>
145 </template>
146 </ul>
121 <div class="controls"> 147 <div class="controls">
122 <div> 148 <div>
123 <span class="icon icon-add" id="whitelisting-add-icon"></spa n> 149 <span id="whitelisting-add-icon" class="icon icon-add"></spa n>
124 <input type="text" id="whitelisting-textbox" /> 150 <input type="text" id="whitelisting-textbox" />
125 <span class="icon icon-enter" id="whitelisting-enter-icon">< /span> 151 <span id="whitelisting-enter-icon" class="icon icon-enter">< /span>
126 </div> 152 </div>
127 <div> 153 <div>
128 <button class="button-add" id="whitelisting-add-btn"> 154 <button id="whitelisting-add-button" class="button-add">
129 +<span class="i18n_options_btn_add"></span> 155 +<span class="i18n_options_button_add"></span>
130 </button> 156 </button>
131 <span></span> 157 <span></span>
132 <button class="i18n_options_btn_cancel cancelbtn" id="whitel isting-cancel-btn"></button> 158 <button id="whitelisting-cancel-button" class="i18n_options_ button_cancel cancel-button"></button>
133 </div> 159 </div>
134 </div> 160 </div>
135 </div> 161 </div>
136 </div> 162 </div>
137 </div> 163 </div>
138 </div> 164 </div>
139 165
140 <!-- Advanced tab content --> 166 <!-- Advanced tab content -->
141 <div id="content-advanced"> 167 <div id="content-advanced">
142 <div> 168 <div>
143 <h1><span class="i18n_options_tweaks"></span><a class="i18n_options_ readMore tooltip" href="#"></a></h1> 169 <h1><span class="i18n_options_tweaks_title"></span><a class="i18n_op tions_readMore tooltip" href="#"></a></h1>
144 <ul class="table" style="width: auto;"> 170 <ul class="table" style="width: auto;">
145 <li> 171 <li>
146 <input type="checkbox" id="easylist"/><span id="block-element-ex planation" class="i18n_options_tweaks_blockElement"></span></li> 172 <input type="checkbox" id="easylist"/><span id="block-element-ex planation" class="i18n_options_tweaks_blockElement"></span></li>
147 </ul> 173 </ul>
148 </div> 174 </div>
149 <div> 175 <div>
150 <h1><span class="i18n_options_blockingList"></span><a class="i18n_op tions_readMore tooltip" href="#" target="_blank"></a></h1> 176 <h1><span class="i18n_options_blockingList_title"></span><a class="i 18n_options_readMore tooltip" href="#" target="_blank"></a></h1>
151 <ul class="tabs horizontal" id="blocking-list-tabs"> 177 <ul id="blocking-list-tabs" class="tabs horizontal">
152 <li class="i18n_options_tab_overview active" data-show="blocking-l ist-overview"></li><li class="i18n_options_tab_ownList" data-show="blocking-list -own"></li> 178 <li class="i18n_options_tab_overview active" data-show="blocking-l ist-overview"></li><li class="i18n_options_tab_ownList" data-show="blocking-list -own"></li>
153 </ul> 179 </ul>
154 <div id="blocking-list"> 180 <div id="blocking-list">
155 <div id="blocking-list-overview"> 181 <div id="blocking-list-overview">
156 <ul class="table cols" style="width: auto;"> 182 <ul class="table cols" style="width: auto;">
157 <li class="col-name"><span class="i18n_options_tableCol_name"> </span><span class="i18n_options_tableCol_description"></span><span class="i18n_ options_tableCol_date"></span></li> 183 <li class="col-name"><span class="i18n_options_tableCol_name"> </span><span class="i18n_options_tableCol_description"></span><span class="i18n_ options_tableCol_date"></span></li>
158 <li><input type="checkbox" id="easylist"/><span>Easylist</span ><span>Adblocking english sites</span><span>15 March 14 - 10:31</span></li> 184 <li><input type="checkbox" id="easylist"/><span>Easylist</span ><span>Adblocking english sites</span><span>15 March 14 - 10:31</span></li>
159 <li><input type="checkbox" id="easylist+de"/><span>Easylist Ge rmany + Easylist</span><span>Adblocking english + german sites</span><span>15 Ma rch 14 - 10:31</span></li> 185 <li><input type="checkbox" id="easylist+de"/><span>Easylist Ge rmany + Easylist</span><span>Adblocking english + german sites</span><span>15 Ma rch 14 - 10:31</span></li>
160 <li><input type="checkbox" id="annoyance-fb"/><span>Facebook a nnoyance blocker</span><span>Blocks Facebook annoyances</span><span>15 March 14 - 10:31</span></li> 186 <li><input type="checkbox" id="annoyance-fb"/><span>Facebook a nnoyance blocker</span><span>Blocks Facebook annoyances</span><span>15 March 14 - 10:31</span></li>
161 <li><input type="checkbox" id="annoyance-youtube"/><span>Faceb ook annoyance blocker</span><span>Blocks Facebook annoyances</span><span>15 Marc h 14 - 10:31</span></li> 187 <li><input type="checkbox" id="annoyance-youtube"/><span>Faceb ook annoyance blocker</span><span>Blocks Facebook annoyances</span><span>15 Marc h 14 - 10:31</span></li>
(...skipping 19 matching lines...) Expand all
181 <li><span>espn.co.uk##.will_hill</span></li> 207 <li><span>espn.co.uk##.will_hill</span></li>
182 <li><span>listverse.com##.wiki</span></li> 208 <li><span>listverse.com##.wiki</span></li>
183 <li><span>planet5d.com##.wp-image-1573</span></li> 209 <li><span>planet5d.com##.wp-image-1573</span></li>
184 <li><span>buzzinn.net##.wpn_finner</span></li> 210 <li><span>buzzinn.net##.wpn_finner</span></li>
185 <li><span>talkers.com##.wpss_slideshow</span></li> 211 <li><span>talkers.com##.wpss_slideshow</span></li>
186 </ul> 212 </ul>
187 <div class="controls" style="margin: 0px;"> 213 <div class="controls" style="margin: 0px;">
188 <input type="text" placeholder="add your blocking rule here"/> 214 <input type="text" placeholder="add your blocking rule here"/>
189 <div class="input-control"> 215 <div class="input-control">
190 <span class="input-separator"></span> 216 <span class="input-separator"></span>
191 <span class="i18n_options_btn_add input-btn-text"></span> 217 <span class="i18n_options_button_add input-button-text"></sp an>
192 <span class="icon icon-enter-blue"></span> 218 <span class="icon icon-enter-blue"></span>
193 </div> 219 </div>
194 </div> 220 </div>
195 <div class="controls"> 221 <div class="controls">
196 <button> 222 <button>
197 <span class="icon icon-edit"></span> 223 <span class="icon icon-edit"></span>
198 <span class="i18n_options_blockingRules_edit"></span> 224 <span class="i18n_options_blockingRules_edit"></span>
199 </button> 225 </button>
200 </div> 226 </div>
201 </div> 227 </div>
202 </div> 228 </div>
203 </div> 229 </div>
204 </div> 230 </div>
205 231
206 <!-- Help tab content --> 232 <!-- Help tab content -->
207 <div id="content-help"> 233 <div id="content-help">
208 <h1 class="i18n_options_faq"></h1> 234 <h1 class="i18n_options_faq_title"></h1>
209 <p class="i18n_options_faq_description"></p> 235 <p class="i18n_options_faq_description"></p>
210 <p> 236 <p>
211 <a class="i18n_options_faq_link" href="#" target="_blank"></a> 237 <a class="i18n_options_faq_title" href="#" target="_blank"></a>
212 </p> 238 </p>
213 <h1 class="i18n_options_forum"></h1> 239 <h1 class="i18n_options_forum_title"></h1>
214 <p class="i18n_options_forum_description"></p> 240 <p class="i18n_options_forum_description"></p>
215 <p> 241 <p>
216 <a class="i18n_options_forum_link" href="#" target="_blank"></a> 242 <a class="i18n_options_forum_link" href="#" target="_blank"></a>
217 </p> 243 </p>
218 <h1 class="i18n_options_media"></h1> 244 <h1 class="i18n_options_media_title"></h1>
219 <p class="i18n_options_media_description"></p> 245 <p class="i18n_options_media_description"></p>
220 <p> 246 <p>
221 <a href="#" target="_blank">Twitter</a> 247 <a href="#" target="_blank">Twitter</a>
222 <a href="#" target="_blank">Facebook</a> 248 <a href="#" target="_blank">Facebook</a>
223 <a href="#" target="_blank">Google+</a> 249 <a href="#" target="_blank">Google+</a>
224 </p> 250 </p>
225 </div> 251 </div>
226 </div> 252 </div>
227 </div> 253 </div>
228 254
229 <!-- Modal --> 255 <!-- Dialog -->
230 <div id="modal"> 256 <div id="dialog">
231 <header> 257 <header>
232 <span id="modal-title"></span> 258 <span id="dialog-title">
233 <button id="modal-close" class="i18n_options_close"></button> 259 <span id="dialog-title-customlist" class="i18n_options_dialog_customli st_title"></span>
260 <span id="dialog-title-language" class="i18n_options_dialog_language_t itle"></span>
261 </span>
262 <button id="dialog-close" class="i18n_options_close"></button>
234 </header> 263 </header>
235 <div class="content" id="modal-content"> 264 <div id="dialog-body" class="content">
236 <!-- Add other website language: Modal --> 265 <!-- Add other website language: Dialog -->
237 <div id="modal-content-language"> 266 <div id="dialog-content-language" class="dialog-content">
238 <div> 267 <div class="dialog-content-block">
239 <h3 class="i18n_options_modal_language_added"></h3> 268 <h3 class="i18n_options_dialog_language_added"></h3>
240 <ul class="table list" id="blocking-languages-modal-table"></ul> 269 <ul id="blocking-languages-dialog-table" class="table list">
241 </div> 270 <template>
242 <div id="other-language"> 271 <span class="display"></span>
243 <h3 class="i18n_options_modal_language_other"></h3> 272 </template>
273 </ul>
274 </div>
275 <div id="other-language" class="dialog-content-block">
276 <h3 class="i18n_options_dialog_language_other"></h3>
244 <div> 277 <div>
245 <input type="text" id="find-language" /> 278 <input type="search" id="find-language" />
246 </div> 279 </div>
247 <ul class="table list" id="all-lang-table"></ul> 280 <ul id="all-lang-table" class="table list">
248 </div> 281 <template>
249 </div> 282 <button class="button-add control">
250 <!-- Add other blocking list: Modal --> 283 +<span></span>
251 <div id="modal-content-customlist"> 284 </button>
252 <div> 285 <span class="display"></span>
253 <h3 class="i18n_options_modal_customlist_subscription_title"></h3> 286 </template>
287 </ul>
288 </div>
289 </div>
290 <!-- Add other blocking list: Dialog -->
291 <div id="dialog-content-customlist" class="dialog-content">
292 <div class="dialog-content-block">
293 <h3 class="i18n_options_dialog_customlist_subscription_title"></h3>
254 <div> 294 <div>
255 <input id="blockingList-textbox" type="text" placeholder="www.exam ple.com/blockinglist.txt" /> 295 <input id="blockingList-textbox" type="text" placeholder="www.exam ple.com/blockinglist.txt" />
256 </div> 296 </div>
257 <div class="btn-wrapper" id="import-blockingList-btn"> 297 <div id="import-blockingList-button" class="button-wrapper">
258 <span class="icon icon-arrow"></span> 298 <span class="icon icon-arrow"></span>
259 <span class="i18n_options_modal_customlist_import"></span> 299 <span class="i18n_options_dialog_customlist_import"></span>
260 </div> 300 </div>
261 </div> 301 </div>
262 <div> 302 <div class="dialog-content-block">
263 <h3 class="i18n_options_modal_edit_own_list"></h3> 303 <h3 class="i18n_options_dialog_edit_own_list"></h3>
264 <div class="btn-wrapper" id="edit-ownBlockingList-btn"> 304 <div id="edit-ownBlockingList-button" class="button-wrapper">
265 <span class="icon icon-arrow"></span> 305 <span class="icon icon-arrow"></span>
266 <span class="i18n_options_modal_create_own_list"></span> 306 <span class="i18n_options_dialog_create_own_list"></span>
267 </div> 307 </div>
268 </div> 308 </div>
269 </div> 309 </div>
270 </div> 310 </div>
271 </div> 311 </div>
272 </body> 312 </body>
273 </html> 313 </html>
LEFTRIGHT
« locale/en-US/options.json ('k') | options.js » ('j') | Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Toggle Comments ('s')

Powered by Google App Engine
This is Rietveld