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

Side by Side Diff: chrome/browser/resources/settings/date_time_page/date_time_page.html

Issue 2617533003: MD Settings: change most checkboxes to toggles (leave dialogs alone) (Closed)
Patch Set: fix tests Created 3 years, 11 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
OLDNEW
1 <link rel="import" href="chrome://resources/html/cr.html"> 1 <link rel="import" href="chrome://resources/html/cr.html">
2 <link rel="import" href="chrome://resources/html/polymer.html"> 2 <link rel="import" href="chrome://resources/html/polymer.html">
3 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> 3 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">
4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch eckbox.html">
5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html"> 4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html">
6 <link rel="import" href="/controls/settings_checkbox.html"> 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap er-toggle-button.html">
7 <link rel="import" href="/controls/settings_dropdown_menu.html"> 6 <link rel="import" href="/controls/settings_dropdown_menu.html">
7 <link rel="import" href="/controls/settings_toggle_button.html">
8 <link rel="import" href="/i18n_setup.html"> 8 <link rel="import" href="/i18n_setup.html">
9 <link rel="import" href="/prefs/prefs_behavior.html"> 9 <link rel="import" href="/prefs/prefs_behavior.html">
10 <link rel="import" href="/prefs/prefs_types.html"> 10 <link rel="import" href="/prefs/prefs_types.html">
11 <link rel="import" href="/settings_shared_css.html"> 11 <link rel="import" href="/settings_shared_css.html">
12 12
13 <dom-module id="settings-date-time-page"> 13 <dom-module id="settings-date-time-page">
14 <template> 14 <template>
15 <style include="settings-shared"> 15 <style include="settings-shared">
16 settings-dropdown-menu { 16 settings-dropdown-menu {
17 --md-select-width: 400px; 17 --md-select-width: 400px;
18 } 18 }
19 19
20 cr-policy-pref-indicator { 20 cr-policy-pref-indicator {
21 -webkit-margin-start: var(--checkbox-spacing); 21 -webkit-margin-start: var(--checkbox-spacing);
22 } 22 }
23 </style> 23 </style>
24 <div class="settings-box first"> 24 <div class="settings-box first">
25 <settings-dropdown-menu pref="{{prefs.cros.system.timezone}}" 25 <settings-dropdown-menu pref="{{prefs.cros.system.timezone}}"
26 menu-options="[[timeZoneList_]]" 26 menu-options="[[timeZoneList_]]"
27 disabled="[[timeZoneAutoDetect_]]"> 27 disabled="[[timeZoneAutoDetect_]]">
28 </settings-dropdown-menu> 28 </settings-dropdown-menu>
29 </div> 29 </div>
30 <div class="settings-box continuation"> 30 <div class="settings-box continuation">
31 <paper-checkbox 31 <div class="start">$i18n{timeZoneGeolocation}</div>
32 id="timeZoneAutoDetectCheckbox"
33 checked="[[timeZoneAutoDetect_]]"
34 disabled="[[hasTimeZoneAutoDetectPolicy_]]"
35 on-change="onTimeZoneAutoDetectCheckboxChange_">
36 $i18n{timeZoneGeolocation}
37 </paper-checkbox>
38 <template is="dom-if" if="[[hasTimeZoneAutoDetectPolicy_]]"> 32 <template is="dom-if" if="[[hasTimeZoneAutoDetectPolicy_]]">
39 <cr-policy-pref-indicator pref="[[timeZonePolicyPref_]]"> 33 <cr-policy-pref-indicator pref="[[timeZonePolicyPref_]]">
40 </cr-policy-pref-indicator> 34 </cr-policy-pref-indicator>
41 </template> 35 </template>
36 <paper-toggle-button
37 id="timeZoneAutoDetect"
38 checked="[[timeZoneAutoDetect_]]"
39 disabled="[[hasTimeZoneAutoDetectPolicy_]]"
40 on-change="onTimeZoneAutoDetectChange_">
41 </paper-toggle-button>
42 </div> 42 </div>
43 <div class="settings-box continuation"> 43 <div class="settings-box continuation">
44 <settings-checkbox pref="{{prefs.settings.clock.use_24hour_clock}}" 44 <settings-toggle-button class="start"
45 pref="{{prefs.settings.clock.use_24hour_clock}}"
45 label="$i18n{use24HourClock}"> 46 label="$i18n{use24HourClock}">
46 </settings-checkbox> 47 </settings-toggle-button>
47 </div> 48 </div>
48 <div class="settings-box" id="setDateTime" actionable 49 <div class="settings-box" id="setDateTime" actionable
49 on-tap="onSetDateTimeTap_" hidden$="[[!canSetDateTime_]]"> 50 on-tap="onSetDateTimeTap_" hidden$="[[!canSetDateTime_]]">
50 <div class="start"> 51 <div class="start">
51 <div>$i18n{setDateTime}</div> 52 <div>$i18n{setDateTime}</div>
52 </div> 53 </div>
53 <button class="subpage-arrow" is="paper-icon-button-light"></button> 54 <button class="subpage-arrow" is="paper-icon-button-light"></button>
54 </div> 55 </div>
55 </template> 56 </template>
56 <script src="/date_time_page/date_time_page.js"></script> 57 <script src="/date_time_page/date_time_page.js"></script>
57 </dom-module> 58 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698