Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(477)

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/browser/resources/options/content_settings.html

Issue 11078023: Add controlled setting indicators for content settings (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased. Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/resources/options/content_settings.css ('k') | chrome/browser/resources/options/content_settings.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <div id="content-settings-page" class="page" hidden> 1 <div id="content-settings-page" class="page" hidden>
2 <div class="close-button"></div> 2 <div class="close-button"></div>
3 <h1 i18n-content="contentSettingsPage"></h1> 3 <h1 i18n-content="contentSettingsPage"></h1>
4 <div class="content-area"> 4 <div class="content-area">
5 <!-- Cookie filter tab contents --> 5 <!-- Cookie filter tab contents -->
6 <section> 6 <section>
7 <h3 i18n-content="cookies_tab_label"></h3> 7 <h3 i18n-content="cookies_tab_label"></h3>
8 <div> 8 <div>
9 <div class="radio"> 9 <div class="radio">
10 <label> 10 <span class="controlled-setting-with-label">
11 <input type="radio" name="cookies" value="allow"> 11 <input id="cookies-allow" type="radio" name="cookies" value="allow">
12 <span i18n-content="cookies_allow"></span> 12 <span>
13 </label> 13 <label for="cookies-allow" i18n-content="cookies_allow"></label>
14 <span class="controlled-setting-indicator"
15 content-setting="cookies" value="allow">
16 </span>
17 </span>
18 </span>
14 </div> 19 </div>
15 <div class="radio"> 20 <div class="radio">
16 <label> 21 <span class="controlled-setting-with-label">
17 <input type="radio" name="cookies" value="session"> 22 <input id="cookies-session" type="radio" name="cookies"
18 <span i18n-content="cookies_session_only"></span> 23 value="session">
19 </label> 24 <span>
25 <label for="cookies-session" i18n-content="cookies_session_only">
26 </label>
27 <span class="controlled-setting-indicator"
28 content-setting="cookies" value="session">
29 </span>
30 </span>
31 </span>
20 </div> 32 </div>
21 <div class="radio"> 33 <div class="radio">
22 <label> 34 <span class="controlled-setting-with-label">
23 <input type="radio" name="cookies" value="block"> 35 <input id="cookies-block" type="radio" name="cookies" value="block">
24 <span i18n-content="cookies_block"></span> 36 <span>
25 </label> 37 <label for="cookies-block" i18n-content="cookies_block"></label>
38 <span class="controlled-setting-indicator"
39 content-setting="cookies" value="block">
40 </span>
41 </span>
42 </span>
26 </div> 43 </div>
27 <div class="checkbox"> 44 <div class="checkbox">
28 <label> 45 <span class="controlled-setting-with-label">
29 <input pref="profile.block_third_party_cookies" type="checkbox"> 46 <input id="block-third-party-cookies"
30 <span i18n-content="cookies_block_3rd_party"></span> 47 pref="profile.block_third_party_cookies" type="checkbox">
31 </label> 48 <span>
49 <label for="block-third-party-cookies"
50 i18n-content="cookies_block_3rd_party">
51 </label>
52 <span class="controlled-setting-indicator"
53 pref="profile.block_third_party_cookies">
54 </span>
55 </span>
56 </span>
32 </div> 57 </div>
33 <!-- TODO(jochen): remove the div with the clear cookies on exit option 58 <!-- TODO(jochen): remove the div with the clear cookies on exit option
34 once this has shipped. --> 59 once this has shipped. -->
35 <div class="checkbox" guest-visibility="disabled" hidden> 60 <div class="checkbox" guest-visibility="disabled" hidden>
36 <label> 61 <label>
37 <input id="clear-cookies-on-exit" 62 <input id="clear-cookies-on-exit"
38 pref="profile.clear_site_data_on_exit" type="checkbox"> 63 pref="profile.clear_site_data_on_exit" type="checkbox">
39 <span i18n-content="cookies_lso_clear_when_close" 64 <span i18n-content="cookies_lso_clear_when_close"
40 class="clear-plugin-lso-data-enabled"></span> 65 class="clear-plugin-lso-data-enabled"></span>
41 <span i18n-content="cookies_clear_when_close" 66 <span i18n-content="cookies_clear_when_close"
42 class="clear-plugin-lso-data-disabled"></span> 67 class="clear-plugin-lso-data-disabled"></span>
43 </label> 68 </label>
44 </div> 69 </div>
45 <div class="settings-row"> 70 <div class="settings-row">
46 <button class="exceptions-list-button" contentType="cookies" 71 <button class="exceptions-list-button" contentType="cookies"
47 i18n-content="manageExceptions"></button> 72 i18n-content="manageExceptions"></button>
48 <button id="show-cookies-button" 73 <button id="show-cookies-button"
49 i18n-content="cookies_show_cookies"></button> 74 i18n-content="cookies_show_cookies"></button>
50 </div> 75 </div>
51 </div> 76 </div>
52 </section> 77 </section>
53 <!-- Image filter --> 78 <!-- Image filter -->
54 <section> 79 <section>
55 <h3 i18n-content="images_tab_label"></h3> 80 <h3 i18n-content="images_tab_label"></h3>
56 <div> 81 <div>
57 <div class="radio"> 82 <div class="radio">
58 <label> 83 <span class="controlled-setting-with-label">
59 <input type="radio" name="images" value="allow"> 84 <input id="images-allow" type="radio" name="images" value="allow">
60 <span i18n-content="images_allow"></span> 85 <span>
61 </label> 86 <label for="images-allow" i18n-content="images_allow"></label>
87 <span class="controlled-setting-indicator"
88 content-setting="images" value="allow">
89 </span>
90 </span>
91 </span>
62 </div> 92 </div>
63 <div class="radio"> 93 <div class="radio">
64 <label> 94 <span class="controlled-setting-with-label">
65 <input type="radio" name="images" value="block"> 95 <input id="images-block" type="radio" name="images" value="block">
66 <span i18n-content="images_block"></span> 96 <span>
67 </label> 97 <label for="images-block" i18n-content="images_block"></label>
98 <span class="controlled-setting-indicator"
99 content-setting="images" value="block">
100 </span>
101 </span>
102 </span>
68 </div> 103 </div>
69 <div class="settings-row"> 104 <div class="settings-row">
70 <button class="exceptions-list-button" contentType="images" 105 <button class="exceptions-list-button" contentType="images"
71 i18n-content="manageExceptions"></button> 106 i18n-content="manageExceptions"></button>
72 </div> 107 </div>
73 </div> 108 </div>
74 </section> 109 </section>
75 <!-- JavaScript filter --> 110 <!-- JavaScript filter -->
76 <section> 111 <section>
77 <h3 i18n-content="javascript_tab_label"></h3> 112 <h3 i18n-content="javascript_tab_label"></h3>
78 <div> 113 <div>
79 <div class="radio"> 114 <div class="radio">
80 <label> 115 <span class="controlled-setting-with-label">
81 <input type="radio" name="javascript" value="allow"> 116 <input id="javascript-allow" type="radio" name="javascript"
82 <span i18n-content="javascript_allow"></span> 117 value="allow">
83 </label> 118 <span>
119 <label for="javascript-allow" i18n-content="javascript_allow">
120 </label>
121 <span class="controlled-setting-indicator"
122 content-setting="javascript" value="allow">
123 </span>
124 </span>
125 </span>
84 </div> 126 </div>
85 <div class="radio"> 127 <div class="radio">
86 <label> 128 <span class="controlled-setting-with-label">
87 <input type="radio" name="javascript" value="block"> 129 <input id="javascript-block" type="radio" name="javascript"
88 <span i18n-content="javascript_block"></span> 130 value="block">
89 </label> 131 <span>
132 <label for="javascript-block" i18n-content="javascript_block">
133 </label>
134 <span class="controlled-setting-indicator"
135 content-setting="javascript" value="block">
136 </span>
137 </span>
138 </span>
90 </div> 139 </div>
91 <div class="settings-row"> 140 <div class="settings-row">
92 <button class="exceptions-list-button" contentType="javascript" 141 <button class="exceptions-list-button" contentType="javascript"
93 i18n-content="manageExceptions"></button> 142 i18n-content="manageExceptions"></button>
94 </div> 143 </div>
95 </div> 144 </div>
96 </section> 145 </section>
97 <!-- Handlers settings --> 146 <!-- Handlers settings -->
98 <section id="handlers-section"> 147 <section id="handlers-section">
99 <h3 i18n-content="handlers_tab_label"></h3> 148 <h3 i18n-content="handlers_tab_label"></h3>
(...skipping 16 matching lines...) Expand all
116 <button id="manage-handlers-button" contentType="handlers" 165 <button id="manage-handlers-button" contentType="handlers"
117 i18n-content="manage_handlers"></button> 166 i18n-content="manage_handlers"></button>
118 </div> 167 </div>
119 </div> 168 </div>
120 </section> 169 </section>
121 <!-- Plug-ins filter --> 170 <!-- Plug-ins filter -->
122 <section> 171 <section>
123 <h3 i18n-content="plugins_tab_label"></h3> 172 <h3 i18n-content="plugins_tab_label"></h3>
124 <div> 173 <div>
125 <div class="radio"> 174 <div class="radio">
126 <label> 175 <span class="controlled-setting-with-label">
127 <input type="radio" name="plugins" value="allow"> 176 <input id="plugins-allow" type="radio" name="plugins" value="allow">
128 <span i18n-content="plugins_allow"></span> 177 <span>
129 </label> 178 <label for="plugins-allow" i18n-content="plugins_allow"></label>
179 <span class="controlled-setting-indicator"
180 content-setting="plugins" value="allow">
181 </span>
182 </span>
183 </span>
130 </div> 184 </div>
131 <div id="click_to_play" class="radio"> 185 <div id="click_to_play" class="radio">
132 <label> 186 <span class="controlled-setting-with-label">
133 <input type="radio" name="plugins" value="ask"> 187 <input id="plugins-ask" type="radio" name="plugins" value="ask">
134 <span i18n-content="plugins_ask"></span> 188 <span>
135 </label> 189 <label for="plugins-ask" i18n-content="plugins_ask"></label>
190 <span class="controlled-setting-indicator"
191 content-setting="plugins" value="ask">
192 </span>
193 </span>
194 </span>
136 </div> 195 </div>
137 <div class="radio"> 196 <div class="radio">
138 <label> 197 <span class="controlled-setting-with-label">
139 <input type="radio" name="plugins" value="block"> 198 <input id="plugins-block" type="radio" name="plugins" value="block">
140 <span i18n-content="plugins_block"></span> 199 <span>
141 </label> 200 <label for="plugins-block" i18n-content="plugins_block"></label>
201 <span class="controlled-setting-indicator"
202 content-setting="plugins" value="block">
203 </span>
204 </span>
205 </span>
142 </div> 206 </div>
143 <div class="settings-row"> 207 <div class="settings-row">
144 <button class="exceptions-list-button" contentType="plugins" 208 <button class="exceptions-list-button" contentType="plugins"
145 i18n-content="manageExceptions"></button> 209 i18n-content="manageExceptions"></button>
146 </div> 210 </div>
147 <div id="disable-plugins-container"> 211 <div id="disable-plugins-container">
148 <a href="chrome://plugins" i18n-content="disableIndividualPlugins" 212 <a href="chrome://plugins" i18n-content="disableIndividualPlugins"
149 target="_blank"></a> 213 target="_blank"></a>
150 </div> 214 </div>
151 </div> 215 </div>
152 </section> 216 </section>
153 <!-- Pop-ups filter --> 217 <!-- Pop-ups filter -->
154 <section> 218 <section>
155 <h3 i18n-content="popups_tab_label" class="content-settings-header"></h3> 219 <h3 i18n-content="popups_tab_label" class="content-settings-header"></h3>
156 <div> 220 <div>
157 <div class="radio"> 221 <div class="radio">
158 <label> 222 <span class="controlled-setting-with-label">
159 <input type="radio" name="popups" value="allow"> 223 <input id="popups-allow" type="radio" name="popups" value="allow">
160 <span i18n-content="popups_allow"></span> 224 <span>
161 </label> 225 <label for="popups-allow" i18n-content="popups_allow"></label>
226 <span class="controlled-setting-indicator"
227 content-setting="popups" value="allow">
228 </span>
229 </span>
230 </span>
162 </div> 231 </div>
163 <div class="radio"> 232 <div class="radio">
164 <label> 233 <span class="controlled-setting-with-label">
165 <input type="radio" name="popups" value="block"> 234 <input id="popups-block" type="radio" name="popups" value="block">
166 <span i18n-content="popups_block"></span> 235 <span>
167 </label> 236 <label for="popups-block" i18n-content="popups_block"></label>
237 <span class="controlled-setting-indicator"
238 content-setting="popups" value="block">
239 </span>
240 </span>
241 </span>
168 </div> 242 </div>
169 <div class="settings-row"> 243 <div class="settings-row">
170 <button class="exceptions-list-button" contentType="popups" 244 <button class="exceptions-list-button" contentType="popups"
171 i18n-content="manageExceptions"></button> 245 i18n-content="manageExceptions"></button>
172 </div> 246 </div>
173 </div> 247 </div>
174 </section> 248 </section>
175 <!-- Location filter --> 249 <!-- Location filter -->
176 <section> 250 <section>
177 <h3 i18n-content="location_tab_label"></h3> 251 <h3 i18n-content="location_tab_label"></h3>
178 <div> 252 <div>
179 <div class="radio"> 253 <div class="radio">
180 <label> 254 <span class="controlled-setting-with-label">
181 <input type="radio" name="location" value="allow"> 255 <input id="location-allow" type="radio" name="location"
182 <span i18n-content="location_allow"></span> 256 value="allow">
183 </label> 257 <span>
258 <label for="location-allow" i18n-content="location_allow"></label>
259 <span class="controlled-setting-indicator"
260 content-setting="location" value="allow">
261 </span>
262 </span>
263 </span>
184 </div> 264 </div>
185 <div class="radio"> 265 <div class="radio">
186 <label> 266 <span class="controlled-setting-with-label">
187 <input type="radio" name="location" value="ask"> 267 <input id="location-ask" type="radio" name="location" value="ask">
188 <span i18n-content="location_ask"></span> 268 <span>
189 </label> 269 <label for="location-ask" i18n-content="location_ask"></label>
270 <span class="controlled-setting-indicator"
271 content-setting="location" value="ask">
272 </span>
273 </span>
274 </span>
190 </div> 275 </div>
191 <div class="radio"> 276 <div class="radio">
192 <label> 277 <span class="controlled-setting-with-label">
193 <input type="radio" name="location" value="block"> 278 <input id="location-block" type="radio" name="location"
194 <span i18n-content="location_block"></span> 279 value="block">
195 </label> 280 <span>
281 <label for="location-block" i18n-content="location_block"></label>
282 <span class="controlled-setting-indicator"
283 content-setting="location" value="block">
284 </span>
285 </span>
286 </span>
196 </div> 287 </div>
197 <div class="settings-row"> 288 <div class="settings-row">
198 <button class="exceptions-list-button" contentType="location" 289 <button class="exceptions-list-button" contentType="location"
199 i18n-content="manageExceptions"></button> 290 i18n-content="manageExceptions"></button>
200 </div> 291 </div>
201 </div> 292 </div>
202 </section> 293 </section>
203 <!-- Notifications filter tab contents --> 294 <!-- Notifications filter tab contents -->
204 <section> 295 <section>
205 <h3 i18n-content="notifications_tab_label"></h3> 296 <h3 i18n-content="notifications_tab_label"></h3>
206 <div> 297 <div>
207 <div class="radio"> 298 <div class="radio">
208 <label> 299 <span class="controlled-setting-with-label">
209 <input type="radio" name="notifications" value="allow"> 300 <input id="notifications-allow" type="radio" name="notifications"
210 <span i18n-content="notifications_allow"></span> 301 value="allow">
211 </label> 302 <span>
303 <label for="notifications-allow"
304 i18n-content="notifications_allow">
305 </label>
306 <span class="controlled-setting-indicator"
307 content-setting="notifications" value="allow">
308 </span>
309 </span>
310 </span>
212 </div> 311 </div>
213 <div class="radio"> 312 <div class="radio">
214 <label> 313 <span class="controlled-setting-with-label">
215 <input type="radio" name="notifications" value="ask"> 314 <input id="notifications-ask" type="radio" name="notifications"
216 <span i18n-content="notifications_ask"></span> 315 value="ask">
217 </label> 316 <span>
317 <label for="notifications-ask" i18n-content="notifications_ask">
318 </label>
319 <span class="controlled-setting-indicator"
320 content-setting="notifications" value="ask">
321 </span>
322 </span>
323 </span>
218 </div> 324 </div>
219 <div class="radio"> 325 <div class="radio">
220 <label> 326 <span class="controlled-setting-with-label">
221 <input type="radio" name="notifications" value="block"> 327 <input id="notifications-block" type="radio" name="notifications"
222 <span i18n-content="notifications_block"></span> 328 value="block">
223 </label> 329 <span>
330 <label for="notifications-block"
331 i18n-content="notifications_block">
332 </label>
333 <span class="controlled-setting-indicator"
334 content-setting="notifications" value="block">
335 </span>
336 </span>
337 </span>
224 </div> 338 </div>
225 <div class="settings-row"> 339 <div class="settings-row">
226 <button class="exceptions-list-button" contentType="notifications" 340 <button class="exceptions-list-button" contentType="notifications"
227 i18n-content="manageExceptions"></button> 341 i18n-content="manageExceptions"></button>
228 </div> 342 </div>
229 </div> 343 </div>
230 </section> 344 </section>
231 <!-- Fullscreen filter --> 345 <!-- Fullscreen filter -->
232 <section> 346 <section>
233 <h3 i18n-content="fullscreen_tab_label"></h3> 347 <h3 i18n-content="fullscreen_tab_label"></h3>
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
314 </label> 428 </label>
315 </div> 429 </div>
316 </div> 430 </div>
317 </section> 431 </section>
318 </if> 432 </if>
319 <!-- Media Stream capture device filter --> 433 <!-- Media Stream capture device filter -->
320 <section> 434 <section>
321 <h3 i18n-content="mediaStreamTabLabel"></h3> 435 <h3 i18n-content="mediaStreamTabLabel"></h3>
322 <div> 436 <div>
323 <div class="radio"> 437 <div class="radio">
324 <label> 438 <span class="controlled-setting-with-label">
325 <input type="radio" name="media-stream" value="ask"> 439 <input id="media-stream-ask" type="radio" name="media-stream"
326 <span i18n-content="mediaStreamAsk"></span> 440 value="ask">
327 </label> 441 <span>
442 <label for="media-stream-ask" i18n-content="mediaStreamAsk">
443 </label>
444 <span class="controlled-setting-indicator"
445 content-setting="media-stream" value="ask">
446 </span>
447 </span>
448 </span>
328 </div> 449 </div>
329 <div class="radio"> 450 <div class="radio">
330 <label> 451 <span class="controlled-setting-with-label">
331 <input type="radio" name="media-stream" value="block"> 452 <input id="media-stream-block" type="radio" name="media-stream"
332 <span i18n-content="mediaStreamBlock"></span> 453 value="block">
333 </label> 454 <span>
455 <label for="media-stream-block" i18n-content="mediaStreamBlock">
456 </label>
457 <span class="controlled-setting-indicator"
458 content-setting="media-stream" value="block">
459 </span>
460 </span>
461 </span>
334 </div> 462 </div>
335 <div class="settings-row"> 463 <div class="settings-row">
336 <button class="exceptions-list-button" contentType="media-stream" 464 <button class="exceptions-list-button" contentType="media-stream"
337 i18n-content="manageExceptions"></button> 465 i18n-content="manageExceptions"></button>
338 </div> 466 </div>
339 </div> 467 </div>
340 </section> 468 </section>
341 <!-- PPAPI broker --> 469 <!-- PPAPI broker -->
342 <section> 470 <section>
343 <h3 i18n-content="ppapiBrokerTabLabel"></h3> 471 <h3 i18n-content="ppapiBrokerTabLabel"></h3>
(...skipping 29 matching lines...) Expand all
373 i18n-content="manageGalleriesButton"></button> 501 i18n-content="manageGalleriesButton"></button>
374 </div> 502 </div>
375 </section> 503 </section>
376 </div> 504 </div>
377 <div class="action-area"> 505 <div class="action-area">
378 <div class="button-strip"> 506 <div class="button-strip">
379 <button id="content-settings-overlay-confirm" i18n-content="ok"></button> 507 <button id="content-settings-overlay-confirm" i18n-content="ok"></button>
380 </div> 508 </div>
381 </div> 509 </div>
382 </div> 510 </div>
OLDNEW
« no previous file with comments | « chrome/browser/resources/options/content_settings.css ('k') | chrome/browser/resources/options/content_settings.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698