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

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: Mark which of the policies considered can be recommended. 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
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 <label>
11 <input type="radio" name="cookies" value="allow"> 11 <input type="radio" name="cookies" value="allow">
12 <span i18n-content="cookies_allow"></span> 12 <span i18n-content="cookies_allow"></span>
13 </label> 13 </label>
14 <span class="controlled-setting-indicator"
15 content-setting="cookies" value="allow">
16 </span>
14 </div> 17 </div>
15 <div class="radio"> 18 <div class="radio">
16 <label> 19 <label>
17 <input type="radio" name="cookies" value="session"> 20 <input type="radio" name="cookies" value="session">
18 <span i18n-content="cookies_session_only"></span> 21 <span i18n-content="cookies_session_only"></span>
19 </label> 22 </label>
23 <span class="controlled-setting-indicator"
24 content-setting="cookies" value="session">
25 </span>
20 </div> 26 </div>
21 <div class="radio"> 27 <div class="radio">
22 <label> 28 <label>
23 <input type="radio" name="cookies" value="block"> 29 <input type="radio" name="cookies" value="block">
24 <span i18n-content="cookies_block"></span> 30 <span i18n-content="cookies_block"></span>
25 </label> 31 </label>
32 <span class="controlled-setting-indicator"
33 content-setting="cookies" value="block">
34 </span>
26 </div> 35 </div>
27 <div class="checkbox"> 36 <div class="checkbox">
28 <label> 37 <label>
29 <input pref="profile.block_third_party_cookies" type="checkbox"> 38 <input pref="profile.block_third_party_cookies" type="checkbox">
30 <span i18n-content="cookies_block_3rd_party"></span> 39 <span i18n-content="cookies_block_3rd_party"></span>
31 </label> 40 </label>
41 <span class="controlled-setting-indicator"
42 pref="profile.block_third_party_cookies">
43 </span>
32 </div> 44 </div>
33 <!-- TODO(jochen): remove the div with the clear cookies on exit option 45 <!-- TODO(jochen): remove the div with the clear cookies on exit option
34 once this has shipped. --> 46 once this has shipped. -->
35 <div class="checkbox" guest-visibility="disabled" hidden> 47 <div class="checkbox" guest-visibility="disabled" hidden>
36 <label> 48 <label>
37 <input id="clear-cookies-on-exit" 49 <input id="clear-cookies-on-exit"
38 pref="profile.clear_site_data_on_exit" type="checkbox"> 50 pref="profile.clear_site_data_on_exit" type="checkbox">
39 <span i18n-content="cookies_lso_clear_when_close" 51 <span i18n-content="cookies_lso_clear_when_close"
40 class="clear-plugin-lso-data-enabled"></span> 52 class="clear-plugin-lso-data-enabled"></span>
41 <span i18n-content="cookies_clear_when_close" 53 <span i18n-content="cookies_clear_when_close"
(...skipping 10 matching lines...) Expand all
52 </section> 64 </section>
53 <!-- Image filter --> 65 <!-- Image filter -->
54 <section> 66 <section>
55 <h3 i18n-content="images_tab_label"></h3> 67 <h3 i18n-content="images_tab_label"></h3>
56 <div> 68 <div>
57 <div class="radio"> 69 <div class="radio">
58 <label> 70 <label>
59 <input type="radio" name="images" value="allow"> 71 <input type="radio" name="images" value="allow">
60 <span i18n-content="images_allow"></span> 72 <span i18n-content="images_allow"></span>
61 </label> 73 </label>
74 <span class="controlled-setting-indicator"
75 content-setting="images" value="allow">
76 </span>
62 </div> 77 </div>
63 <div class="radio"> 78 <div class="radio">
64 <label> 79 <label>
65 <input type="radio" name="images" value="block"> 80 <input type="radio" name="images" value="block">
66 <span i18n-content="images_block"></span> 81 <span i18n-content="images_block"></span>
67 </label> 82 </label>
83 <span class="controlled-setting-indicator"
84 content-setting="images" value="block">
85 </span>
68 </div> 86 </div>
69 <div class="settings-row"> 87 <div class="settings-row">
70 <button class="exceptions-list-button" contentType="images" 88 <button class="exceptions-list-button" contentType="images"
71 i18n-content="manageExceptions"></button> 89 i18n-content="manageExceptions"></button>
72 </div> 90 </div>
73 </div> 91 </div>
74 </section> 92 </section>
75 <!-- JavaScript filter --> 93 <!-- JavaScript filter -->
76 <section> 94 <section>
77 <h3 i18n-content="javascript_tab_label"></h3> 95 <h3 i18n-content="javascript_tab_label"></h3>
78 <div> 96 <div>
79 <div class="radio"> 97 <div class="radio">
80 <label> 98 <label>
81 <input type="radio" name="javascript" value="allow"> 99 <input type="radio" name="javascript" value="allow">
82 <span i18n-content="javascript_allow"></span> 100 <span i18n-content="javascript_allow"></span>
83 </label> 101 </label>
102 <span class="controlled-setting-indicator"
103 content-setting="javascript" value="allow">
104 </span>
84 </div> 105 </div>
85 <div class="radio"> 106 <div class="radio">
86 <label> 107 <label>
87 <input type="radio" name="javascript" value="block"> 108 <input type="radio" name="javascript" value="block">
88 <span i18n-content="javascript_block"></span> 109 <span i18n-content="javascript_block"></span>
89 </label> 110 </label>
111 <span class="controlled-setting-indicator"
112 content-setting="javascript" value="block">
113 </span>
90 </div> 114 </div>
91 <div class="settings-row"> 115 <div class="settings-row">
92 <button class="exceptions-list-button" contentType="javascript" 116 <button class="exceptions-list-button" contentType="javascript"
93 i18n-content="manageExceptions"></button> 117 i18n-content="manageExceptions"></button>
94 </div> 118 </div>
95 </div> 119 </div>
96 </section> 120 </section>
97 <!-- Handlers settings --> 121 <!-- Handlers settings -->
98 <section id="handlers-section"> 122 <section id="handlers-section">
99 <h3 i18n-content="handlers_tab_label"></h3> 123 <h3 i18n-content="handlers_tab_label"></h3>
(...skipping 20 matching lines...) Expand all
120 </section> 144 </section>
121 <!-- Plug-ins filter --> 145 <!-- Plug-ins filter -->
122 <section> 146 <section>
123 <h3 i18n-content="plugins_tab_label"></h3> 147 <h3 i18n-content="plugins_tab_label"></h3>
124 <div> 148 <div>
125 <div class="radio"> 149 <div class="radio">
126 <label> 150 <label>
127 <input type="radio" name="plugins" value="allow"> 151 <input type="radio" name="plugins" value="allow">
128 <span i18n-content="plugins_allow"></span> 152 <span i18n-content="plugins_allow"></span>
129 </label> 153 </label>
154 <span class="controlled-setting-indicator"
155 content-setting="plugins" value="allow">
156 </span>
130 </div> 157 </div>
131 <div id="click_to_play" class="radio"> 158 <div id="click_to_play" class="radio">
132 <label> 159 <label>
133 <input type="radio" name="plugins" value="ask"> 160 <input type="radio" name="plugins" value="ask">
134 <span i18n-content="plugins_ask"></span> 161 <span i18n-content="plugins_ask"></span>
135 </label> 162 </label>
163 <span class="controlled-setting-indicator"
164 content-setting="plugins" value="ask">
165 </span>
136 </div> 166 </div>
137 <div class="radio"> 167 <div class="radio">
138 <label> 168 <label>
139 <input type="radio" name="plugins" value="block"> 169 <input type="radio" name="plugins" value="block">
140 <span i18n-content="plugins_block"></span> 170 <span i18n-content="plugins_block"></span>
141 </label> 171 </label>
172 <span class="controlled-setting-indicator"
173 content-setting="plugins" value="block">
174 </span>
142 </div> 175 </div>
143 <div class="settings-row"> 176 <div class="settings-row">
144 <button class="exceptions-list-button" contentType="plugins" 177 <button class="exceptions-list-button" contentType="plugins"
145 i18n-content="manageExceptions"></button> 178 i18n-content="manageExceptions"></button>
146 </div> 179 </div>
147 <div id="disable-plugins-container"> 180 <div id="disable-plugins-container">
148 <a href="chrome://plugins" i18n-content="disableIndividualPlugins" 181 <a href="chrome://plugins" i18n-content="disableIndividualPlugins"
149 target="_blank"></a> 182 target="_blank"></a>
150 </div> 183 </div>
151 </div> 184 </div>
152 </section> 185 </section>
153 <!-- Pop-ups filter --> 186 <!-- Pop-ups filter -->
154 <section> 187 <section>
155 <h3 i18n-content="popups_tab_label" class="content-settings-header"></h3> 188 <h3 i18n-content="popups_tab_label" class="content-settings-header"></h3>
156 <div> 189 <div>
157 <div class="radio"> 190 <div class="radio">
158 <label> 191 <label>
159 <input type="radio" name="popups" value="allow"> 192 <input type="radio" name="popups" value="allow">
160 <span i18n-content="popups_allow"></span> 193 <span i18n-content="popups_allow"></span>
161 </label> 194 </label>
195 <span class="controlled-setting-indicator"
196 content-setting="popups" value="allow">
197 </span>
162 </div> 198 </div>
163 <div class="radio"> 199 <div class="radio">
164 <label> 200 <label>
165 <input type="radio" name="popups" value="block"> 201 <input type="radio" name="popups" value="block">
166 <span i18n-content="popups_block"></span> 202 <span i18n-content="popups_block"></span>
167 </label> 203 </label>
204 <span class="controlled-setting-indicator"
205 content-setting="popups" value="block">
206 </span>
168 </div> 207 </div>
169 <div class="settings-row"> 208 <div class="settings-row">
170 <button class="exceptions-list-button" contentType="popups" 209 <button class="exceptions-list-button" contentType="popups"
171 i18n-content="manageExceptions"></button> 210 i18n-content="manageExceptions"></button>
172 </div> 211 </div>
173 </div> 212 </div>
174 </section> 213 </section>
175 <!-- Location filter --> 214 <!-- Location filter -->
176 <section> 215 <section>
177 <h3 i18n-content="location_tab_label"></h3> 216 <h3 i18n-content="location_tab_label"></h3>
178 <div> 217 <div>
179 <div class="radio"> 218 <div class="radio">
180 <label> 219 <label>
181 <input type="radio" name="location" value="allow"> 220 <input type="radio" name="location" value="allow">
182 <span i18n-content="location_allow"></span> 221 <span i18n-content="location_allow"></span>
183 </label> 222 </label>
223 <span class="controlled-setting-indicator"
224 content-setting="location" value="allow">
225 </span>
184 </div> 226 </div>
185 <div class="radio"> 227 <div class="radio">
186 <label> 228 <label>
187 <input type="radio" name="location" value="ask"> 229 <input type="radio" name="location" value="ask">
188 <span i18n-content="location_ask"></span> 230 <span i18n-content="location_ask"></span>
189 </label> 231 </label>
232 <span class="controlled-setting-indicator"
233 content-setting="location" value="ask">
234 </span>
190 </div> 235 </div>
191 <div class="radio"> 236 <div class="radio">
192 <label> 237 <label>
193 <input type="radio" name="location" value="block"> 238 <input type="radio" name="location" value="block">
194 <span i18n-content="location_block"></span> 239 <span i18n-content="location_block"></span>
195 </label> 240 </label>
241 <span class="controlled-setting-indicator"
242 content-setting="location" value="block">
243 </span>
196 </div> 244 </div>
197 <div class="settings-row"> 245 <div class="settings-row">
198 <button class="exceptions-list-button" contentType="location" 246 <button class="exceptions-list-button" contentType="location"
199 i18n-content="manageExceptions"></button> 247 i18n-content="manageExceptions"></button>
200 </div> 248 </div>
201 </div> 249 </div>
202 </section> 250 </section>
203 <!-- Notifications filter tab contents --> 251 <!-- Notifications filter tab contents -->
204 <section> 252 <section>
205 <h3 i18n-content="notifications_tab_label"></h3> 253 <h3 i18n-content="notifications_tab_label"></h3>
206 <div> 254 <div>
207 <div class="radio"> 255 <div class="radio">
208 <label> 256 <label>
209 <input type="radio" name="notifications" value="allow"> 257 <input type="radio" name="notifications" value="allow">
210 <span i18n-content="notifications_allow"></span> 258 <span i18n-content="notifications_allow"></span>
211 </label> 259 </label>
260 <span class="controlled-setting-indicator"
261 content-setting="notifications" value="allow">
262 </span>
212 </div> 263 </div>
213 <div class="radio"> 264 <div class="radio">
214 <label> 265 <label>
215 <input type="radio" name="notifications" value="ask"> 266 <input type="radio" name="notifications" value="ask">
216 <span i18n-content="notifications_ask"></span> 267 <span i18n-content="notifications_ask"></span>
217 </label> 268 </label>
269 <span class="controlled-setting-indicator"
270 content-setting="notifications" value="ask">
271 </span>
218 </div> 272 </div>
219 <div class="radio"> 273 <div class="radio">
220 <label> 274 <label>
221 <input type="radio" name="notifications" value="block"> 275 <input type="radio" name="notifications" value="block">
222 <span i18n-content="notifications_block"></span> 276 <span i18n-content="notifications_block"></span>
223 </label> 277 </label>
278 <span class="controlled-setting-indicator"
279 content-setting="notifications" value="block">
280 </span>
224 </div> 281 </div>
225 <div class="settings-row"> 282 <div class="settings-row">
226 <button class="exceptions-list-button" contentType="notifications" 283 <button class="exceptions-list-button" contentType="notifications"
227 i18n-content="manageExceptions"></button> 284 i18n-content="manageExceptions"></button>
228 </div> 285 </div>
229 </div> 286 </div>
230 </section> 287 </section>
231 <!-- Fullscreen filter --> 288 <!-- Fullscreen filter -->
232 <section> 289 <section>
233 <h3 i18n-content="fullscreen_tab_label"></h3> 290 <h3 i18n-content="fullscreen_tab_label"></h3>
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
318 </if> 375 </if>
319 <!-- Media Stream capture device filter --> 376 <!-- Media Stream capture device filter -->
320 <section> 377 <section>
321 <h3 i18n-content="mediaStreamTabLabel"></h3> 378 <h3 i18n-content="mediaStreamTabLabel"></h3>
322 <div> 379 <div>
323 <div class="radio"> 380 <div class="radio">
324 <label> 381 <label>
325 <input type="radio" name="media-stream" value="ask"> 382 <input type="radio" name="media-stream" value="ask">
326 <span i18n-content="mediaStreamAsk"></span> 383 <span i18n-content="mediaStreamAsk"></span>
327 </label> 384 </label>
385 <span class="controlled-setting-indicator"
386 content-setting="media-stream" value="ask">
387 </span>
328 </div> 388 </div>
329 <div class="radio"> 389 <div class="radio">
330 <label> 390 <label>
331 <input type="radio" name="media-stream" value="block"> 391 <input type="radio" name="media-stream" value="block">
332 <span i18n-content="mediaStreamBlock"></span> 392 <span i18n-content="mediaStreamBlock"></span>
333 </label> 393 </label>
394 <span class="controlled-setting-indicator"
395 content-setting="media-stream" value="block">
396 </span>
334 </div> 397 </div>
335 <div class="settings-row"> 398 <div class="settings-row">
336 <button class="exceptions-list-button" contentType="media-stream" 399 <button class="exceptions-list-button" contentType="media-stream"
337 i18n-content="manageExceptions"></button> 400 i18n-content="manageExceptions"></button>
338 </div> 401 </div>
339 </div> 402 </div>
340 </section> 403 </section>
341 <!-- PPAPI broker --> 404 <!-- PPAPI broker -->
342 <section> 405 <section>
343 <h3 i18n-content="ppapiBrokerTabLabel"></h3> 406 <h3 i18n-content="ppapiBrokerTabLabel"></h3>
(...skipping 29 matching lines...) Expand all
373 i18n-content="manageGalleriesButton"></button> 436 i18n-content="manageGalleriesButton"></button>
374 </div> 437 </div>
375 </section> 438 </section>
376 </div> 439 </div>
377 <div class="action-area"> 440 <div class="action-area">
378 <div class="button-strip"> 441 <div class="button-strip">
379 <button id="content-settings-overlay-confirm" i18n-content="ok"></button> 442 <button id="content-settings-overlay-confirm" i18n-content="ok"></button>
380 </div> 443 </div>
381 </div> 444 </div>
382 </div> 445 </div>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698