OLD | NEW |
1 <link rel="import" href="chrome://resources/html/polymer.html"> | 1 <link rel="import" href="chrome://resources/html/polymer.html"> |
2 | 2 |
3 <link rel="import" href="chrome://resources/html/cr.html"> | 3 <link rel="import" href="chrome://resources/html/cr.html"> |
4 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> | 4 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> |
5 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_indicat
or.html"> | 5 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_indicat
or.html"> |
6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper
-icon-button-light.html"> | 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper
-icon-button-light.html"> |
7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap
er-toggle-button.html"> | 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap
er-toggle-button.html"> |
8 <link rel="import" href="../controls/settings_dropdown_menu.html"> | 8 <link rel="import" href="../controls/settings_dropdown_menu.html"> |
9 <link rel="import" href="../controls/settings_toggle_button.html"> | 9 <link rel="import" href="../controls/settings_toggle_button.html"> |
10 <link rel="import" href="../i18n_setup.html"> | 10 <link rel="import" href="../i18n_setup.html"> |
(...skipping 17 matching lines...) Expand all Loading... |
28 } | 28 } |
29 | 29 |
30 cr-policy-indicator { | 30 cr-policy-indicator { |
31 -webkit-margin-start: var(--settings-controlled-by-spacing); | 31 -webkit-margin-start: var(--settings-controlled-by-spacing); |
32 } | 32 } |
33 </style> | 33 </style> |
34 <div class="settings-box first"> | 34 <div class="settings-box first"> |
35 <div id="timezoneGeolocateToggleLabel" class="start"> | 35 <div id="timezoneGeolocateToggleLabel" class="start"> |
36 $i18n{timeZoneGeolocation} | 36 $i18n{timeZoneGeolocation} |
37 </div> | 37 </div> |
38 <template is="dom-if" if="[[hasTimeZoneAutoDetectPolicy_]]" restamp> | 38 <template is="dom-if" restamp |
39 <cr-policy-indicator indicator-type="devicePolicy" | 39 if="[[!prefs.cros.flags.per_user_timezone_enabled.value]]"> |
40 icon-aria-label="$i18n{timeZoneGeolocation}"> | 40 <template is="dom-if" if="[[hasTimeZoneAutoDetectPolicy_]]" restamp> |
41 </cr-policy-indicator> | 41 <cr-policy-indicator indicator-type="devicePolicy" |
| 42 icon-aria-label="$i18n{timeZoneGeolocation}"> |
| 43 </cr-policy-indicator> |
| 44 </template> |
| 45 <paper-toggle-button |
| 46 id="timeZoneAutoDetect" |
| 47 aria-labelledby="timezoneGeolocateToggleLabel" |
| 48 checked="[[timeZoneAutoDetect_]]" |
| 49 disabled="[[hasTimeZoneAutoDetectPolicy_]]" |
| 50 on-change="onTimeZoneAutoDetectChange_"> |
| 51 </paper-toggle-button> |
42 </template> | 52 </template> |
43 <paper-toggle-button | 53 <template is="dom-if" restamp |
44 id="timeZoneAutoDetect" | 54 if="[[prefs.cros.flags.per_user_timezone_enabled.value]]"> |
45 aria-labelledby="timezoneGeolocateToggleLabel" | 55 <settings-toggle-button |
46 checked="[[timeZoneAutoDetect_]]" | 56 pref="{{prefs.settings.resolve_timezone_by_geolocation}}" |
47 disabled="[[hasTimeZoneAutoDetectPolicy_]]" | 57 id="timeZoneAutoDetect" |
48 on-change="onTimeZoneAutoDetectChange_"> | 58 aria-labelledby="timezoneGeolocateToggleLabel"> |
49 </paper-toggle-button> | 59 </settings-toggle-button> |
| 60 </template> |
50 </div> | 61 </div> |
51 <div class="settings-box continuation embedded"> | 62 <div class="settings-box continuation embedded"> |
52 <settings-dropdown-menu pref="{{prefs.cros.system.timezone}}" | 63 <template is="dom-if" restamp |
53 label="$i18n{timeZone}" | 64 if="[[!prefs.cros.flags.per_user_timezone_enabled.value]]"> |
54 menu-options="[[timeZoneList_]]" | 65 <settings-dropdown-menu pref="{{prefs.cros.system.timezone}}" |
55 disabled="[[timeZoneAutoDetect_]]"> | 66 label="$i18n{timeZone}" |
56 </settings-dropdown-menu> | 67 menu-options="[[timeZoneList_]]" |
| 68 disabled="[[timeZoneAutoDetect_]]"> |
| 69 </settings-dropdown-menu> |
| 70 </template> |
| 71 <template is="dom-if" restamp |
| 72 if="[[prefs.cros.flags.per_user_timezone_enabled.value]]"> |
| 73 <template is="dom-if" if="[[!isUserTimeZoneSelectorHidden_( |
| 74 prefs.settings.timezone, |
| 75 prefs.settings.resolve_timezone_by_geolocation.value)]]" restamp> |
| 76 <settings-dropdown-menu id="userTimeZoneSelector" |
| 77 pref="{{prefs.settings.timezone}}" |
| 78 label="$i18n{timeZone}" |
| 79 menu-options="[[timeZoneList_]]"> |
| 80 </settings-dropdown-menu> |
| 81 </template> |
| 82 <template is="dom-if" if="[[isUserTimeZoneSelectorHidden_( |
| 83 prefs.settings.timezone, |
| 84 prefs.settings.resolve_timezone_by_geolocation.value)]]" restamp> |
| 85 <settings-dropdown-menu id="systemTimezoneSelector" |
| 86 pref="{{prefs.cros.system.timezone}}" |
| 87 label="$i18n{timeZone}" |
| 88 menu-options="[[timeZoneList_]]" |
| 89 disabled> |
| 90 </settings-dropdown-menu> |
| 91 </template> |
| 92 </template> |
57 </div> | 93 </div> |
58 <div class="settings-box"> | 94 <div class="settings-box"> |
59 <settings-toggle-button class="start" | 95 <settings-toggle-button class="start" |
60 pref="{{prefs.settings.clock.use_24hour_clock}}" | 96 pref="{{prefs.settings.clock.use_24hour_clock}}" |
61 label="$i18n{use24HourClock}"> | 97 label="$i18n{use24HourClock}"> |
62 </settings-toggle-button> | 98 </settings-toggle-button> |
63 </div> | 99 </div> |
64 <div class="settings-box" id="setDateTime" actionable | 100 <div class="settings-box" id="setDateTime" actionable |
65 on-tap="onSetDateTimeTap_" hidden$="[[!canSetDateTime_]]"> | 101 on-tap="onSetDateTimeTap_" hidden$="[[!canSetDateTime_]]"> |
66 <div class="start">$i18n{setDateTime}</div> | 102 <div class="start">$i18n{setDateTime}</div> |
67 <button class="subpage-arrow" is="paper-icon-button-light" | 103 <button class="subpage-arrow" is="paper-icon-button-light" |
68 aria-label="$i18n{setDateTime}"></button> | 104 aria-label="$i18n{setDateTime}"></button> |
69 </div> | 105 </div> |
70 </template> | 106 </template> |
71 <script src="date_time_page.js"></script> | 107 <script src="date_time_page.js"></script> |
72 </dom-module> | 108 </dom-module> |
OLD | NEW |