| OLD | NEW |
| 1 <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html
"> | 1 <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html
"> |
| 2 <link rel="import" href="chrome://resources/cr_elements/cr_expand_button/cr_expa
nd_button.html"> | 2 <link rel="import" href="chrome://resources/cr_elements/cr_expand_button/cr_expa
nd_button.html"> |
| 3 <link rel="import" href="chrome://resources/cr_elements/icons.html"> | 3 <link rel="import" href="chrome://resources/cr_elements/icons.html"> |
| 4 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> | 4 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> |
| 5 <link rel="import" href="chrome://resources/html/icon.html"> | 5 <link rel="import" href="chrome://resources/html/icon.html"> |
| 6 <link rel="import" href="chrome://resources/html/polymer.html"> | 6 <link rel="import" href="chrome://resources/html/polymer.html"> |
| 7 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> | 7 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> |
| 8 <link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-coll
apse.html"> | 8 <link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-coll
apse.html"> |
| 9 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani
matable.html"> | 9 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani
matable.html"> |
| 10 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt
on.html"> | 10 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt
on.html"> |
| (...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 116 <if expr="not chromeos"> | 116 <if expr="not chromeos"> |
| 117 <div class="middle two-line no-min-width" | 117 <div class="middle two-line no-min-width" |
| 118 on-tap="onProfileNameTap_" actionable> | 118 on-tap="onProfileNameTap_" actionable> |
| 119 </if> | 119 </if> |
| 120 <if expr="chromeos"> | 120 <if expr="chromeos"> |
| 121 <div class="middle two-line no-min-width" on-tap="onPictureTap_" | 121 <div class="middle two-line no-min-width" on-tap="onPictureTap_" |
| 122 actionable> | 122 actionable> |
| 123 </if> | 123 </if> |
| 124 <div class="flex text-elide"> | 124 <div class="flex text-elide"> |
| 125 <span id="profile-name">[[profileName_]]</span> | 125 <span id="profile-name">[[profileName_]]</span> |
| 126 <div class="secondary" hidden="[[!syncStatus.signedIn]]"> | 126 <div class="secondary" hidden="[[!syncStatus.signedIn]]" |
| 127 id="profileNameSecondary"> |
| 127 [[syncStatus.signedInUsername]] | 128 [[syncStatus.signedInUsername]] |
| 128 </div> | 129 </div> |
| 129 </div> | 130 </div> |
| 130 <button class="subpage-arrow" is="paper-icon-button-light"> | 131 <button class="subpage-arrow" is="paper-icon-button-light" |
| 131 </button> | 132 aria-labelledby="profile-name" |
| 133 aria-describedby="profileNameSecondary"></button> |
| 132 </div> | 134 </div> |
| 133 <if expr="not chromeos"> | 135 <if expr="not chromeos"> |
| 134 <template is="dom-if" if="[[showSignin_(syncStatus)]]"> | 136 <template is="dom-if" if="[[showSignin_(syncStatus)]]"> |
| 135 <span class="secondary-action"> | 137 <span class="secondary-action"> |
| 136 <paper-button class="primary-button" on-tap="onSigninTap_" | 138 <paper-button class="primary-button" on-tap="onSigninTap_" |
| 137 disabled="[[syncStatus.setupInProgress]]"> | 139 disabled="[[syncStatus.setupInProgress]]"> |
| 138 $i18n{syncSignin} | 140 $i18n{syncSignin} |
| 139 </paper-button> | 141 </paper-button> |
| 140 </span> | 142 </span> |
| 141 </template> | 143 </template> |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 177 <template is="dom-if" | 179 <template is="dom-if" |
| 178 if="[[isAdvancedSyncSettingsVisible_(syncStatus)]]"> | 180 if="[[isAdvancedSyncSettingsVisible_(syncStatus)]]"> |
| 179 <div class="settings-box two-line" on-tap="onSyncTap_" | 181 <div class="settings-box two-line" on-tap="onSyncTap_" |
| 180 id="sync-status" actionable$="[[isSyncStatusActionable_( | 182 id="sync-status" actionable$="[[isSyncStatusActionable_( |
| 181 syncStatus)]]"> | 183 syncStatus)]]"> |
| 182 <div class="icon-container"> | 184 <div class="icon-container"> |
| 183 <iron-icon id="sync-icon" icon$="[[getSyncIcon_(syncStatus)]]"> | 185 <iron-icon id="sync-icon" icon$="[[getSyncIcon_(syncStatus)]]"> |
| 184 </iron-icon> | 186 </iron-icon> |
| 185 </div> | 187 </div> |
| 186 <div class="middle"> | 188 <div class="middle"> |
| 187 <div>$i18n{sync}</div> | 189 $i18n{sync} |
| 188 <div class$="secondary [[getSyncStatusTextClass_(syncStatus)]]"> | 190 <div class$="secondary [[getSyncStatusTextClass_(syncStatus)]]" |
| 191 id="syncSecondary"> |
| 189 [[syncStatus.statusText]] | 192 [[syncStatus.statusText]] |
| 190 </div> | 193 </div> |
| 191 </div> | 194 </div> |
| 192 <button class="subpage-arrow" is="paper-icon-button-light"></button> | 195 <button class="subpage-arrow" is="paper-icon-button-light" |
| 196 aria-label="$i18n{sync}" |
| 197 aria-describedby="syncSecondary"></button> |
| 193 </div> | 198 </div> |
| 194 </template> | 199 </template> |
| 195 | 200 |
| 196 <div class="settings-box three-line" id="activity-controls" | 201 <div class="settings-box three-line" id="activity-controls" |
| 197 on-tap="onActivityControlsTap_" actionable | 202 on-tap="onActivityControlsTap_" actionable |
| 198 hidden="[[!syncStatus.signedIn]]"> | 203 hidden="[[!syncStatus.signedIn]]"> |
| 199 <div class="icon-container"> | 204 <div class="icon-container"> |
| 200 <div id="googleg-logo"></div> | 205 <div id="googleg-logo"></div> |
| 201 </div> | 206 </div> |
| 202 <div class="middle"> | 207 <div class="middle"> |
| 203 <div>$i18n{personalizeGoogleServicesTitle}</div> | 208 $i18n{personalizeGoogleServicesTitle} |
| 204 <div class="secondary">$i18n{personalizeGoogleServicesText}</div> | 209 <div class="secondary" id="personalizeGoogleServicesSecondary"> |
| 210 $i18n{personalizeGoogleServicesText} |
| 211 </div> |
| 205 </div> | 212 </div> |
| 206 <button class="icon-external" is="paper-icon-button-light"></button> | 213 <button class="icon-external" is="paper-icon-button-light" |
| 214 aria-label="$i18n{personalizeGoogleServicesTitle}" |
| 215 aria-describedby="personalizeGoogleServicesSecondary"></button> |
| 207 </div> | 216 </div> |
| 208 | 217 |
| 209 <if expr="chromeos"> | 218 <if expr="chromeos"> |
| 210 <template is="dom-if" if="[[!quickUnlockEnabled_]]"> | 219 <template is="dom-if" if="[[!quickUnlockEnabled_]]"> |
| 211 <div class="settings-box"> | 220 <div class="settings-box"> |
| 212 <settings-toggle-button class="start" | 221 <settings-toggle-button class="start" |
| 213 pref="{{prefs.settings.enable_screen_lock}}" | 222 pref="{{prefs.settings.enable_screen_lock}}" |
| 214 label="$i18n{enableScreenlock}"> | 223 label="$i18n{enableScreenlock}"> |
| 215 </settings-toggle-button> | 224 </settings-toggle-button> |
| 216 </div> | 225 </div> |
| 217 </template> | 226 </template> |
| 218 | 227 |
| 219 <template is="dom-if" if="[[quickUnlockEnabled_]]"> | 228 <template is="dom-if" if="[[quickUnlockEnabled_]]"> |
| 220 <div class="settings-box two-line" actionable | 229 <div class="settings-box two-line" actionable |
| 221 on-tap="onConfigureLockTap_"> | 230 on-tap="onConfigureLockTap_"> |
| 222 <div class="start"> | 231 <div class="start"> |
| 223 $i18n{lockScreenTitle} | 232 $i18n{lockScreenTitle} |
| 224 <div class="secondary"> | 233 <div class="secondary" id="lockScreenSecondary"> |
| 225 [[getPasswordState_(hasPin, | 234 [[getPasswordState_(hasPin, |
| 226 prefs.settings.enable_screen_lock.value)]] | 235 prefs.settings.enable_screen_lock.value)]] |
| 227 </div> | 236 </div> |
| 228 </div> | 237 </div> |
| 229 <button class="subpage-arrow" is="paper-icon-button-light"></button> | 238 <button class="subpage-arrow" is="paper-icon-button-light" |
| 239 aria-label="$i18n{lockScreenTitle}" |
| 240 aria-describedby="lockScrenSecondary"></button> |
| 230 </div> | 241 </div> |
| 231 </template> | 242 </template> |
| 232 | 243 |
| 233 <template is="dom-if" if="[[easyUnlockAllowed_]]"> | 244 <template is="dom-if" if="[[easyUnlockAllowed_]]"> |
| 234 <div id="easy-unlock" class="settings-box two-line"> | 245 <div id="easy-unlock" class="settings-box two-line"> |
| 235 <div class="start"> | 246 <div class="start"> |
| 236 <div>$i18n{easyUnlockSectionTitle}</div> | 247 <div>$i18n{easyUnlockSectionTitle}</div> |
| 237 <div class="secondary"> | 248 <div class="secondary"> |
| 238 <template is="dom-if" if="[[!easyUnlockEnabled_]]"> | 249 <template is="dom-if" if="[[!easyUnlockEnabled_]]"> |
| 239 $i18n{easyUnlockSetupIntro} | 250 $i18n{easyUnlockSetupIntro} |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 271 </paper-button> | 282 </paper-button> |
| 272 </template> | 283 </template> |
| 273 </div> | 284 </div> |
| 274 </div> | 285 </div> |
| 275 </template> | 286 </template> |
| 276 </if> | 287 </if> |
| 277 | 288 |
| 278 <div id="manage-other-people-subpage-trigger" | 289 <div id="manage-other-people-subpage-trigger" |
| 279 class="settings-box" on-tap="onManageOtherPeople_" actionable> | 290 class="settings-box" on-tap="onManageOtherPeople_" actionable> |
| 280 <div class="start">$i18n{manageOtherPeople}</div> | 291 <div class="start">$i18n{manageOtherPeople}</div> |
| 281 <button class="subpage-arrow" is="paper-icon-button-light"></button> | 292 <button class="subpage-arrow" is="paper-icon-button-light" |
| 293 aria-label="$i18n{manageOtherPeople}"></button> |
| 282 </div> | 294 </div> |
| 283 | 295 |
| 284 <if expr="not chromeos"> | 296 <if expr="not chromeos"> |
| 285 <div class="settings-box" on-tap="onImportDataTap_" actionable> | 297 <div class="settings-box" on-tap="onImportDataTap_" actionable> |
| 286 <div class="start">$i18n{importTitle}</div> | 298 <div class="start">$i18n{importTitle}</div> |
| 287 <button class="subpage-arrow" is="paper-icon-button-light"></button> | 299 <button class="subpage-arrow" is="paper-icon-button-light" |
| 300 aria-label="$i18n{importTitle}"></button> |
| 288 </div> | 301 </div> |
| 289 </if> | 302 </if> |
| 290 | 303 |
| 291 <template is="dom-if" if="[[profileManagesSupervisedUsers_]]"> | 304 <template is="dom-if" if="[[profileManagesSupervisedUsers_]]"> |
| 292 <div id="manageSupervisedUsersContainer" class="settings-box two-line" | 305 <div id="manageSupervisedUsersContainer" class="settings-box two-line" |
| 293 on-tap="onManageSupervisedUsers_" actionable> | 306 on-tap="onManageSupervisedUsers_" actionable> |
| 294 <div class="start"> | 307 <div class="start"> |
| 295 $i18n{manageSupervisedUsers} | 308 $i18n{manageSupervisedUsers} |
| 296 <div class="secondary"> | 309 <div class="secondary" id="manageSupervisedUsersSecondary"> |
| 297 $i18n{manageSupervisedUsersDescription} | 310 $i18n{manageSupervisedUsersDescription} |
| 298 </div> | 311 </div> |
| 299 </div> | 312 </div> |
| 300 <button class="icon-external" is="paper-icon-button-light"></button> | 313 <button class="icon-external" is="paper-icon-button-light" |
| 314 aria-label="$i18n{manageSupervisedUsers}" |
| 315 aria-describedby="manageSupervisedUsersSecondary"></button> |
| 301 </div> | 316 </div> |
| 302 </template> | 317 </template> |
| 303 </neon-animatable> | 318 </neon-animatable> |
| 304 <template is="dom-if" route-path="/syncSetup" | 319 <template is="dom-if" route-path="/syncSetup" |
| 305 no-search$="[[!isAdvancedSyncSettingsVisible_(syncStatus)]]"> | 320 no-search$="[[!isAdvancedSyncSettingsVisible_(syncStatus)]]"> |
| 306 <settings-subpage | 321 <settings-subpage |
| 307 associated-control="[[$$('#sync-status')]]" | 322 associated-control="[[$$('#sync-status')]]" |
| 308 page-title="$i18n{syncPageTitle}" | 323 page-title="$i18n{syncPageTitle}" |
| 309 no-search$="[[!isAdvancedSyncSettingsVisible_(syncStatus)]]"> | 324 no-search$="[[!isAdvancedSyncSettingsVisible_(syncStatus)]]"> |
| 310 <settings-sync-page></settings-sync-page> | 325 <settings-sync-page></settings-sync-page> |
| (...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 402 <if expr="chromeos"> | 417 <if expr="chromeos"> |
| 403 <template is="dom-if" if="[[showEasyUnlockTurnOffDialog_]]"> | 418 <template is="dom-if" if="[[showEasyUnlockTurnOffDialog_]]"> |
| 404 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog" | 419 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog" |
| 405 on-close="onEasyUnlockTurnOffDialogClose_"> | 420 on-close="onEasyUnlockTurnOffDialogClose_"> |
| 406 </easy-unlock-turn-off-dialog> | 421 </easy-unlock-turn-off-dialog> |
| 407 </template> | 422 </template> |
| 408 </if> | 423 </if> |
| 409 </template> | 424 </template> |
| 410 <script src="people_page.js"></script> | 425 <script src="people_page.js"></script> |
| 411 </dom-module> | 426 </dom-module> |
| OLD | NEW |