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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 14325003: Clean up managed user settings dialogs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix broken merge Created 7 years, 8 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/managed_user_set_passphrase.js ('k') | chrome/browser/resources/options/managed_user_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="managed-user-settings-page" class="page" hidden> 1 <div id="managed-user-settings-page" class="page" hidden>
2 <div class="close-button"></div> 2 <div class="close-button"></div>
3 <h1 i18n-content="managedUserSettingsPage"></h1> 3 <h1 i18n-content="managedUserSettingsPage"></h1>
4 <div class="content-area"> 4 <div class="content-area">
5 <!-- Content pack area --> 5 <!-- Content pack area -->
6 <section> 6 <section>
7 <h3 i18n-content="contentPacksTabLabel"></h3> 7 <h3 i18n-content="contentPacksTabLabel"></h3>
8 <list id="content-packs-list"></list> 8 <list id="content-packs-list"></list>
9 <div class="settings-row"> 9 <div class="settings-row">
10 <button id="get-content-packs-button" i18n-content="getContentPacks" 10 <button id="get-content-packs-button" i18n-content="getContentPacks"
11 disabled> 11 disabled>
12 </button> 12 </button>
13 </button>
14 <button id="manage-exceptions-button" i18n-content="manageExceptions"> 13 <button id="manage-exceptions-button" i18n-content="manageExceptions">
15 </button> 14 </button>
16 </div> 15 </div>
17 </section> 16 </section>
18 <!-- Content pack settings --> 17 <!-- Content pack settings -->
19 <section> 18 <section>
20 <h3 i18n-content="contentPackSettings"></h3> 19 <h3 i18n-content="contentPackSettings"></h3>
21 <div class="radio"> 20 <div class="radio">
22 <label> 21 <label>
23 <input type="radio" name="contentpacks" value="0" 22 <input type="radio" name="contentpacks" value="0"
24 id="contentpacks-allow" 23 id="contentpacks-allow"
25 pref="profile.managed.default_filtering_behavior" dialog-pref> 24 pref="profile.managed.default_filtering_behavior">
26 <span for="contentpacks-allow" 25 <span i18n-content="outsideContentPacksAllow"></span>
27 i18n-content="outsideContentPacksAllow"></span>
28 </label> 26 </label>
29 </div> 27 </div>
30 <div class="radio"> 28 <div class="radio">
31 <label> 29 <label>
32 <input type="radio" name="contentpacks" value="1" 30 <input type="radio" name="contentpacks" value="1"
33 id="contentpacks-warn" 31 id="contentpacks-warn"
34 pref="profile.managed.default_filtering_behavior" dialog-pref> 32 pref="profile.managed.default_filtering_behavior">
35 <span for="contentpacks-warn" 33 <span i18n-content="outsideContentPacksWarn"></span>
36 i18n-content="outsideContentPacksWarn"></span>
37 </label> 34 </label>
38 </div> 35 </div>
39 <div class="radio"> 36 <div class="radio">
40 <label> 37 <label>
41 <input type="radio" name="contentpacks" value="2" 38 <input type="radio" name="contentpacks" value="2"
42 id="contentpacks-block" 39 id="contentpacks-block"
43 pref="profile.managed.default_filtering_behavior" dialog-pref> 40 pref="profile.managed.default_filtering_behavior">
44 <span for="contentpacks-block" 41 <span i18n-content="outsideContentPacksBlock"></span>
45 i18n-content="outsideContentPacksBlock"></span>
46 </label> 42 </label>
47 </div> 43 </div>
48 </section> 44 </section>
49 <!-- Advanced Settings --> 45 <!-- Advanced Settings -->
50 <section> 46 <section>
51 <h3 i18n-content="advancedManagedUserSettings"></h3> 47 <h3 i18n-content="advancedManagedUserSettings"></h3>
52 <div class="checkbox"> 48 <div class="checkbox">
53 <label> 49 <label>
54 <input type="checkbox" id="safe-search-checkbox" 50 <input type="checkbox" id="safe-search-checkbox"
55 pref="settings.force_safesearch" dialog-pref> 51 pref="settings.force_safesearch">
56 <span for="safe-search-checkbox" 52 <span i18n-content="enableSafeSearch"></span>
57 i18n-content="enableSafeSearch"></span>
58 </label> 53 </label>
59 </div> 54 </div>
60 <div class="checkbox"> 55 <div class="settings-row">
61 <label> 56 <button id="set-passphrase" i18n-content="setPassphrase"></button>
62 <input id="allow-signin-checkbox" type="checkbox"
63 pref="signin.allowed" dialog-pref>
64 <span for="allow-signin-checkbox"
65 i18n-content="allowSignIn"></span>
66 </label>
67 </div> 57 </div>
68 <div class="checkbox">
69 <label>
70 <input id="disable-history-deletion-checkbox" type="checkbox"
71 disabled>
72 <span for="disable-history-deletion-checkbox"
73 i18n-content="disableHistoryDeletion"></span>
74 </label>
75 </div>
76 <if expr="not pp_ifdef('chromeos')">
77 <div class="checkbox">
78 <label>
79 <input id="use-passphrase-checkbox" type="checkbox">
80 <span for="use-passphrase-checkbox"
81 i18n-content="usePassphrase"></span>
82 </label>
83 <button id="set-passphrase" class="link-button"
84 i18n-content="setPassphrase">
85 </button>
86 </div>
87 </if>
88 </section> 58 </section>
89 </div> 59 </div>
90 <div class="action-area"> 60 <div class="action-area">
91 <if expr="not pp_ifdef('chromeos')"> 61 <if expr="not pp_ifdef('chromeos')">
92 <button id="lock-settings" i18n-content="lockSettings"></button> 62 <button id="lock-settings" i18n-content="lockSettings"></button>
93 <button id="unlock-settings" i18n-content="unlockSettings"></button> 63 <button id="unlock-settings" i18n-content="unlockSettings"></button>
94 </if> 64 </if>
95 <div id="spacer"></div> 65 <div id="spacer"></div>
96 <div class="button-strip"> 66 <div class="button-strip">
97 <button id="managed-user-settings-cancel" type="submit" 67 <button id="managed-user-settings-done" type="submit"
98 i18n-content="cancel"> 68 i18n-content="done">
99 </button>
100 <button id="managed-user-settings-confirm" type="submit"
101 i18n-content="ok">
102 </button> 69 </button>
103 </div> 70 </div>
104 </div> 71 </div>
105 </div> 72 </div>
OLDNEW
« no previous file with comments | « chrome/browser/resources/options/managed_user_set_passphrase.js ('k') | chrome/browser/resources/options/managed_user_settings.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698