| 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/polymer.html"> | 3 <link rel="import" href="chrome://resources/html/polymer.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/polymer/v1_0/neon-animation/neon-ani
matable.html"> | 5 <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/paper-button/paper-butt
on.html"> | 6 <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-checkbox/paper-ch
eckbox.html"> | 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch
eckbox.html"> |
| 8 <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html
"> | 8 <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html
"> |
| 9 <link rel="import" href="/controls/settings_checkbox.html"> | 9 <link rel="import" href="/controls/settings_checkbox.html"> |
| 10 <link rel="import" href="/people_page/sync_page.html"> | 10 <link rel="import" href="/people_page/sync_page.html"> |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 66 background-size: cover; | 66 background-size: cover; |
| 67 height: var(--iron-icon-height); | 67 height: var(--iron-icon-height); |
| 68 width: var(--iron-icon-width); | 68 width: var(--iron-icon-width); |
| 69 } | 69 } |
| 70 | 70 |
| 71 paper-checkbox { | 71 paper-checkbox { |
| 72 margin: 16px 0 2px; | 72 margin: 16px 0 2px; |
| 73 } | 73 } |
| 74 </style> | 74 </style> |
| 75 <settings-animated-pages id="pages" section="people"> | 75 <settings-animated-pages id="pages" section="people"> |
| 76 <neon-animatable id="main"> | 76 <neon-animatable route-path="default"> |
| 77 <div id="picture-subpage-trigger" class="settings-box first two-line"> | 77 <div id="picture-subpage-trigger" class="settings-box first two-line"> |
| 78 <img id="profile-icon" src="[[profileIconUrl_]]" | 78 <img id="profile-icon" src="[[profileIconUrl_]]" |
| 79 on-tap="onPictureTap_" actionable> | 79 on-tap="onPictureTap_" actionable> |
| 80 <div class="middle"> | 80 <div class="middle"> |
| 81 <if expr="not chromeos"> | 81 <if expr="not chromeos"> |
| 82 <span id="profile-name" on-tap="onProfileNameTap_" actionable> | 82 <span id="profile-name" on-tap="onProfileNameTap_" actionable> |
| 83 [[profileName_]] | 83 [[profileName_]] |
| 84 </span> | 84 </span> |
| 85 </if> | 85 </if> |
| 86 <if expr="chromeos"> | 86 <if expr="chromeos"> |
| (...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 232 | 232 |
| 233 <template is="dom-if" if=[[profileManagesSupervisedUsers_]]> | 233 <template is="dom-if" if=[[profileManagesSupervisedUsers_]]> |
| 234 <div id="manageSupervisedUsersContainer" class="settings-box"> | 234 <div id="manageSupervisedUsersContainer" class="settings-box"> |
| 235 <paper-button class="primary-button" | 235 <paper-button class="primary-button" |
| 236 on-tap="onManageSupervisedUsers_"> | 236 on-tap="onManageSupervisedUsers_"> |
| 237 $i18n{manageSupervisedUsers} | 237 $i18n{manageSupervisedUsers} |
| 238 </paper-button> | 238 </paper-button> |
| 239 </div> | 239 </div> |
| 240 </template> | 240 </template> |
| 241 </neon-animatable> | 241 </neon-animatable> |
| 242 <template is="dom-if" name="sync" | 242 <template is="dom-if" route-path="/syncSetup" |
| 243 no-search$="[[!isAdvancedSyncSettingsVisible_(syncStatus)]]"> | 243 no-search$="[[!isAdvancedSyncSettingsVisible_(syncStatus)]]"> |
| 244 <settings-subpage | 244 <settings-subpage |
| 245 associated-control="[[$$('#customize-sync')]]" | 245 associated-control="[[$$('#customize-sync')]]" |
| 246 page-title="$i18n{syncPageTitle}" | 246 page-title="$i18n{syncPageTitle}" |
| 247 no-search$="[[!isAdvancedSyncSettingsVisible_(syncStatus)]]"> | 247 no-search$="[[!isAdvancedSyncSettingsVisible_(syncStatus)]]"> |
| 248 <settings-sync-page></settings-sync-page> | 248 <settings-sync-page></settings-sync-page> |
| 249 </settings-subpage> | 249 </settings-subpage> |
| 250 </template> | 250 </template> |
| 251 <if expr="chromeos"> | 251 <if expr="chromeos"> |
| 252 <template is="dom-if" if="[[quickUnlockEnabled_]]"> | 252 <template is="dom-if" if="[[quickUnlockEnabled_]]"> |
| 253 <template is="dom-if" name="lockScreen"> | 253 <template is="dom-if" route-path="/lockScreen" no-search> |
| 254 <settings-subpage page-title="$i18n{lockScreenTitle}"> | 254 <settings-subpage page-title="$i18n{lockScreenTitle}"> |
| 255 <settings-lock-screen | 255 <settings-lock-screen |
| 256 prefs="{{prefs}}"> | 256 prefs="{{prefs}}"> |
| 257 </settings-lock-screen> | 257 </settings-lock-screen> |
| 258 </settings-subpage> | 258 </settings-subpage> |
| 259 </template> | 259 </template> |
| 260 </template> | 260 </template> |
| 261 <template is="dom-if" name="users"> | 261 <template is="dom-if" route-path="/accounts"> |
| 262 <settings-subpage | 262 <settings-subpage |
| 263 associated-control="[[$$('#manage-other-people-subpage-trigger')]]" | 263 associated-control="[[$$('#manage-other-people-subpage-trigger')]]" |
| 264 page-title="$i18n{usersPageTitle}"> | 264 page-title="$i18n{usersPageTitle}"> |
| 265 <settings-users-page prefs="{{prefs}}"></settings-users-page> | 265 <settings-users-page prefs="{{prefs}}"></settings-users-page> |
| 266 </settings-subpage> | 266 </settings-subpage> |
| 267 </template> | 267 </template> |
| 268 <template is="dom-if" name="changePicture"> | 268 <template is="dom-if" route-path="/changePicture"> |
| 269 <settings-subpage | 269 <settings-subpage |
| 270 associated-control="[[$$('#picture-subpage-trigger')]]" | 270 associated-control="[[$$('#picture-subpage-trigger')]]" |
| 271 page-title="$i18n{changePictureTitle}"> | 271 page-title="$i18n{changePictureTitle}"> |
| 272 <settings-change-picture></settings-change-picture> | 272 <settings-change-picture></settings-change-picture> |
| 273 </settings-subpage> | 273 </settings-subpage> |
| 274 </template> | 274 </template> |
| 275 </if> | 275 </if> |
| 276 <if expr="not chromeos"> | 276 <if expr="not chromeos"> |
| 277 <template is="dom-if" name="manageProfile"> | 277 <template is="dom-if" route-path="/manageProfile"> |
| 278 <settings-subpage | 278 <settings-subpage |
| 279 associated-control="[[$$('#picture-subpage-trigger')]]" | 279 associated-control="[[$$('#picture-subpage-trigger')]]" |
| 280 page-title="$i18n{editPerson}"> | 280 page-title="$i18n{editPerson}"> |
| 281 <settings-manage-profile profile-icon-url="[[profileIconUrl_]]" | 281 <settings-manage-profile profile-icon-url="[[profileIconUrl_]]" |
| 282 profile-name="[[profileName_]]"> | 282 profile-name="[[profileName_]]"> |
| 283 </settings-manage-profile> | 283 </settings-manage-profile> |
| 284 </settings-subpage> | 284 </settings-subpage> |
| 285 </template> | 285 </template> |
| 286 </if> | 286 </if> |
| 287 </settings-animated-pages> | 287 </settings-animated-pages> |
| (...skipping 26 matching lines...) Expand all Loading... |
| 314 | 314 |
| 315 <if expr="chromeos"> | 315 <if expr="chromeos"> |
| 316 <template is="dom-if" if="[[easyUnlockEnabled_]]"> | 316 <template is="dom-if" if="[[easyUnlockEnabled_]]"> |
| 317 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog"> | 317 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog"> |
| 318 </easy-unlock-turn-off-dialog> | 318 </easy-unlock-turn-off-dialog> |
| 319 </template> | 319 </template> |
| 320 </if> | 320 </if> |
| 321 </template> | 321 </template> |
| 322 <script src="people_page.js"></script> | 322 <script src="people_page.js"></script> |
| 323 </dom-module> | 323 </dom-module> |
| OLD | NEW |