OLD | NEW |
1 <link rel="import" href="chrome://resources/cr_elements/icons.html"> | 1 <link rel="import" href="chrome://resources/cr_elements/icons.html"> |
2 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> | 2 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> |
3 <link rel="import" href="chrome://resources/html/icon.html"> | 3 <link rel="import" href="chrome://resources/html/icon.html"> |
4 <link rel="import" href="chrome://resources/html/polymer.html"> | 4 <link rel="import" href="chrome://resources/html/polymer.html"> |
5 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> | 5 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> |
6 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani
matable.html"> | 6 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani
matable.html"> |
7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt
on.html"> | 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt
on.html"> |
8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch
eckbox.html"> | 8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch
eckbox.html"> |
| 9 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper
-icon-button-light.html"> |
9 <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html
"> | 10 <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html
"> |
10 <link rel="import" href="/controls/settings_checkbox.html"> | 11 <link rel="import" href="/controls/settings_checkbox.html"> |
11 <link rel="import" href="/people_page/sync_page.html"> | 12 <link rel="import" href="/people_page/sync_page.html"> |
12 <link rel="import" href="/people_page/profile_info_browser_proxy.html"> | 13 <link rel="import" href="/people_page/profile_info_browser_proxy.html"> |
13 <link rel="import" href="/people_page/sync_browser_proxy.html"> | 14 <link rel="import" href="/people_page/sync_browser_proxy.html"> |
14 <link rel="import" href="/route.html"> | 15 <link rel="import" href="/route.html"> |
15 <link rel="import" href="/settings_page/settings_animated_pages.html"> | 16 <link rel="import" href="/settings_page/settings_animated_pages.html"> |
16 <link rel="import" href="/settings_page/settings_subpage.html"> | 17 <link rel="import" href="/settings_page/settings_subpage.html"> |
17 <link rel="import" href="/settings_shared_css.html"> | 18 <link rel="import" href="/settings_shared_css.html"> |
18 | 19 |
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
75 paper-checkbox { | 76 paper-checkbox { |
76 margin: 16px 0 2px; | 77 margin: 16px 0 2px; |
77 } | 78 } |
78 </style> | 79 </style> |
79 <settings-animated-pages id="pages" section="people"> | 80 <settings-animated-pages id="pages" section="people"> |
80 <neon-animatable route-path="default"> | 81 <neon-animatable route-path="default"> |
81 <div id="picture-subpage-trigger" class="settings-box first two-line"> | 82 <div id="picture-subpage-trigger" class="settings-box first two-line"> |
82 <div id="profile-icon" on-tap="onPictureTap_" actionable | 83 <div id="profile-icon" on-tap="onPictureTap_" actionable |
83 style="background-image: [[getIconImageset_(profileIconUrl_)]]"> | 84 style="background-image: [[getIconImageset_(profileIconUrl_)]]"> |
84 </div> | 85 </div> |
85 <div class="middle"> | |
86 <if expr="not chromeos"> | 86 <if expr="not chromeos"> |
87 <span id="profile-name" on-tap="onProfileNameTap_" actionable> | 87 <div class="middle two-line" on-tap="onProfileNameTap_" actionable> |
| 88 </if> |
| 89 <if expr="chromeos"> |
| 90 <div class="middle two-line" on-tap="onPictureTap_" actionable> |
| 91 </if> |
| 92 <span class="flex" id="profile-name"> |
88 [[profileName_]] | 93 [[profileName_]] |
89 </span> | 94 </span> |
90 </if> | 95 <button class="icon-arrow-right" is="paper-icon-button-light"> |
91 <if expr="chromeos"> | 96 </button> |
92 <span id="profile-name"> | |
93 [[profileName_]] | |
94 </span> | |
95 </if> | |
96 </div> | 97 </div> |
97 <if expr="not chromeos"> | 98 <if expr="not chromeos"> |
98 <template is="dom-if" if="[[!syncStatus.signedIn]]"> | 99 <template is="dom-if" if="[[!syncStatus.signedIn]]"> |
99 <span class="secondary-action"> | 100 <span class="secondary-action"> |
100 <paper-button class="primary-button" on-tap="onSigninTap_" | 101 <paper-button class="primary-button" on-tap="onSigninTap_" |
101 disabled="[[syncStatus.setupInProgress]]"> | 102 disabled="[[syncStatus.setupInProgress]]"> |
102 $i18n{syncSignin} | 103 $i18n{syncSignin} |
103 </paper-button> | 104 </paper-button> |
104 </span> | 105 </span> |
105 </template> | 106 </template> |
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
142 <div class="middle"> | 143 <div class="middle"> |
143 <div>$i18n{sync}</div> | 144 <div>$i18n{sync}</div> |
144 <div class="secondary" hidden="[[syncStatus.hasError]]"> | 145 <div class="secondary" hidden="[[syncStatus.hasError]]"> |
145 [[syncStatus.statusText]] | 146 [[syncStatus.statusText]] |
146 </div> | 147 </div> |
147 <div class="secondary sync-error" | 148 <div class="secondary sync-error" |
148 hidden="[[!syncStatus.hasError]]"> | 149 hidden="[[!syncStatus.hasError]]"> |
149 [[syncStatus.statusText]] | 150 [[syncStatus.statusText]] |
150 </div> | 151 </div> |
151 </div> | 152 </div> |
| 153 <button class="icon-external" is="paper-icon-button-light"></button> |
152 </div> | 154 </div> |
153 </template> | 155 </template> |
154 | 156 |
155 <div class="settings-box two-line" id="activity-controls" | 157 <div class="settings-box two-line" id="activity-controls" |
156 on-tap="onActivityControlsTap_" actionable | 158 on-tap="onActivityControlsTap_" actionable |
157 hidden="[[!syncStatus.signedIn]]"> | 159 hidden="[[!syncStatus.signedIn]]"> |
158 <div class="icon-container"> | 160 <div class="icon-container"> |
159 <div id="googleg-logo"></div> | 161 <div id="googleg-logo"></div> |
160 </div> | 162 </div> |
161 <div class="middle"> | 163 <div class="middle"> |
162 <div>$i18n{personalizeGoogleServicesTitle}</div> | 164 <div>$i18n{personalizeGoogleServicesTitle}</div> |
163 <div class="secondary">$i18n{personalizeGoogleServicesText}</div> | 165 <div class="secondary">$i18n{personalizeGoogleServicesText}</div> |
164 </div> | 166 </div> |
| 167 <button class="icon-external" is="paper-icon-button-light"></button> |
165 </div> | 168 </div> |
166 | 169 |
167 <if expr="chromeos"> | 170 <if expr="chromeos"> |
168 <template is="dom-if" if="[[!quickUnlockEnabled_]]"> | 171 <template is="dom-if" if="[[!quickUnlockEnabled_]]"> |
169 <div class="settings-box single-column"> | 172 <div class="settings-box single-column"> |
170 <settings-checkbox pref="{{prefs.settings.enable_screen_lock}}" | 173 <settings-checkbox pref="{{prefs.settings.enable_screen_lock}}" |
171 label="$i18n{enableScreenlock}"> | 174 label="$i18n{enableScreenlock}"> |
172 </settings-checkbox> | 175 </settings-checkbox> |
173 </div> | 176 </div> |
174 </template> | 177 </template> |
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
222 <paper-button id="easyUnlockTurnOff" class="secondary-button" | 225 <paper-button id="easyUnlockTurnOff" class="secondary-button" |
223 on-tap="onEasyUnlockTurnOffTap_"> | 226 on-tap="onEasyUnlockTurnOffTap_"> |
224 $i18n{easyUnlockTurnOffButton} | 227 $i18n{easyUnlockTurnOffButton} |
225 </paper-button> | 228 </paper-button> |
226 </template> | 229 </template> |
227 </div> | 230 </div> |
228 </div> | 231 </div> |
229 </template> | 232 </template> |
230 </if> | 233 </if> |
231 | 234 |
232 <div id="manage-other-people-subpage-trigger" class="settings-box"> | 235 <div id="manage-other-people-subpage-trigger" |
233 <paper-button class="primary-button" on-tap="onManageOtherPeople_"> | 236 class="settings-box two-line" on-tap="onManageOtherPeople_" |
| 237 actionable> |
| 238 <div class="start"> |
234 $i18n{manageOtherPeople} | 239 $i18n{manageOtherPeople} |
235 </paper-button> | 240 <div class="secondary">$i18n{manageOtherPeopleDescription}</div> |
| 241 </div> |
| 242 <button class="icon-external" is="paper-icon-button-light"></button> |
236 </div> | 243 </div> |
237 | 244 |
238 <template is="dom-if" if=[[profileManagesSupervisedUsers_]]> | 245 <template is="dom-if" if=[[profileManagesSupervisedUsers_]]> |
239 <div id="manageSupervisedUsersContainer" class="settings-box"> | 246 <div id="manageSupervisedUsersContainer" class="settings-box two-line" |
240 <paper-button class="primary-button" | 247 on-tap="onManageSupervisedUsers_" actionable> |
241 on-tap="onManageSupervisedUsers_"> | 248 <div class="start"> |
242 $i18n{manageSupervisedUsers} | 249 $i18n{manageSupervisedUsers} |
243 </paper-button> | 250 <div class="secondary"> |
| 251 $i18n{manageSupervisedUsersDescription} |
| 252 </div> |
| 253 </div> |
| 254 <button class="icon-external" is="paper-icon-button-light"></button> |
244 </div> | 255 </div> |
245 </template> | 256 </template> |
246 </neon-animatable> | 257 </neon-animatable> |
247 <template is="dom-if" route-path="/syncSetup" | 258 <template is="dom-if" route-path="/syncSetup" |
248 no-search$="[[!isAdvancedSyncSettingsVisible_(syncStatus)]]"> | 259 no-search$="[[!isAdvancedSyncSettingsVisible_(syncStatus)]]"> |
249 <settings-subpage | 260 <settings-subpage |
250 associated-control="[[$$('#customize-sync')]]" | 261 associated-control="[[$$('#customize-sync')]]" |
251 page-title="$i18n{syncPageTitle}" | 262 page-title="$i18n{syncPageTitle}" |
252 no-search$="[[!isAdvancedSyncSettingsVisible_(syncStatus)]]"> | 263 no-search$="[[!isAdvancedSyncSettingsVisible_(syncStatus)]]"> |
253 <settings-sync-page></settings-sync-page> | 264 <settings-sync-page></settings-sync-page> |
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
319 | 330 |
320 <if expr="chromeos"> | 331 <if expr="chromeos"> |
321 <template is="dom-if" if="[[easyUnlockEnabled_]]"> | 332 <template is="dom-if" if="[[easyUnlockEnabled_]]"> |
322 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog"> | 333 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog"> |
323 </easy-unlock-turn-off-dialog> | 334 </easy-unlock-turn-off-dialog> |
324 </template> | 335 </template> |
325 </if> | 336 </if> |
326 </template> | 337 </template> |
327 <script src="people_page.js"></script> | 338 <script src="people_page.js"></script> |
328 </dom-module> | 339 </dom-module> |
OLD | NEW |