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

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

Issue 2849823003: ChromeOS: implement per-user time zone preferences. (Closed)
Patch Set: Rebased. Created 3 years, 6 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/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
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" if="[[!perUserTimezoneEnabled_]]" restamp>
39 <cr-policy-indicator indicator-type="devicePolicy" 39 <template is="dom-if" if="[[hasTimeZoneAutoDetectPolicy_]]" restamp>
40 icon-aria-label="$i18n{timeZoneGeolocation}"> 40 <cr-policy-indicator indicator-type="devicePolicy"
41 </cr-policy-indicator> 41 icon-aria-label="$i18n{timeZoneGeolocation}">
42 </cr-policy-indicator>
43 </template>
44 <paper-toggle-button
45 id="timeZoneAutoDetect"
46 aria-labelledby="timezoneGeolocateToggleLabel"
47 checked="[[timeZoneAutoDetect_]]"
48 disabled="[[hasTimeZoneAutoDetectPolicy_]]"
49 on-change="onTimeZoneAutoDetectChange_">
50 </paper-toggle-button>
42 </template> 51 </template>
43 <paper-toggle-button 52 <template is="dom-if" if="[[perUserTimezoneEnabled_]]" restamp>
44 id="timeZoneAutoDetect" 53 <settings-toggle-button
45 aria-labelledby="timezoneGeolocateToggleLabel" 54 pref="{{prefs.settings.resolve_timezone_by_geolocation}}"
46 checked="[[timeZoneAutoDetect_]]" 55 id="timeZoneAutoDetect"
47 disabled="[[hasTimeZoneAutoDetectPolicy_]]" 56 aria-labelledby="timezoneGeolocateToggleLabel">
48 on-change="onTimeZoneAutoDetectChange_"> 57 </settings-toggle-button>
49 </paper-toggle-button> 58 </template>
50 </div> 59 </div>
51 <div class="settings-box continuation embedded"> 60 <div class="settings-box continuation embedded">
52 <settings-dropdown-menu pref="{{prefs.cros.system.timezone}}" 61 <template is="dom-if" if="[[!perUserTimezoneEnabled_]]" restamp>
53 label="$i18n{timeZone}" 62 <settings-dropdown-menu pref="{{prefs.cros.system.timezone}}"
54 menu-options="[[timeZoneList_]]" 63 label="$i18n{timeZone}"
55 disabled="[[timeZoneAutoDetect_]]"> 64 menu-options="[[timeZoneList_]]"
56 </settings-dropdown-menu> 65 disabled="[[timeZoneAutoDetect_]]">
66 </settings-dropdown-menu>
67 </template>
68 <template is="dom-if" if="[[perUserTimezoneEnabled_]]" restamp>
69 <template is="dom-if" if="[[!isUserTimeZoneSelectorHidden_(
70 prefs.settings.timezone,
71 prefs.settings.resolve_timezone_by_geolocation.value)]]" restamp>
michaelpg 2017/05/30 22:21:23 nit: break after a continuation line before the ne
Alexander Alekseev 2017/07/06 06:30:29 Done.
72 <settings-dropdown-menu id="userTimeZoneSelector"
73 pref="{{prefs.settings.timezone}}"
74 label="$i18n{timeZone}"
75 menu-options="[[timeZoneList_]]">
76 </settings-dropdown-menu>
77 </template>
78 <template is="dom-if" if="[[isUserTimeZoneSelectorHidden_(
79 prefs.settings.timezone,
80 prefs.settings.resolve_timezone_by_geolocation.value)]]" restamp>
michaelpg 2017/05/30 22:21:23 ditto
Alexander Alekseev 2017/07/06 06:30:29 Done.
81 <settings-dropdown-menu id="systemTimezoneSelector"
82 pref="{{prefs.cros.system.timezone}}"
83 label="$i18n{timeZone}"
84 menu-options="[[timeZoneList_]]"
85 disabled>
86 </settings-dropdown-menu>
87 </template>
88 </template>
57 </div> 89 </div>
58 <div class="settings-box"> 90 <div class="settings-box">
59 <settings-toggle-button class="start" 91 <settings-toggle-button class="start"
60 pref="{{prefs.settings.clock.use_24hour_clock}}" 92 pref="{{prefs.settings.clock.use_24hour_clock}}"
61 label="$i18n{use24HourClock}"> 93 label="$i18n{use24HourClock}">
62 </settings-toggle-button> 94 </settings-toggle-button>
63 </div> 95 </div>
64 <div class="settings-box" id="setDateTime" actionable 96 <div class="settings-box" id="setDateTime" actionable
65 on-tap="onSetDateTimeTap_" hidden$="[[!canSetDateTime_]]"> 97 on-tap="onSetDateTimeTap_" hidden$="[[!canSetDateTime_]]">
66 <div class="start">$i18n{setDateTime}</div> 98 <div class="start">$i18n{setDateTime}</div>
67 <button class="subpage-arrow" is="paper-icon-button-light" 99 <button class="subpage-arrow" is="paper-icon-button-light"
68 aria-label="$i18n{setDateTime}"></button> 100 aria-label="$i18n{setDateTime}"></button>
69 </div> 101 </div>
70 </template> 102 </template>
71 <script src="date_time_page.js"></script> 103 <script src="date_time_page.js"></script>
72 </dom-module> 104 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698