Chromium Code Reviews| 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/cr_elements/cr_dialog/cr_dialog.html "> | 9 <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html "> |
| 10 <link rel="import" href="/controls/settings_checkbox.html"> | 10 <link rel="import" href="/controls/settings_checkbox.html"> |
| (...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 88 [[profileName_]] | 88 [[profileName_]] |
| 89 </span> | 89 </span> |
| 90 </if> | 90 </if> |
| 91 <if expr="chromeos"> | 91 <if expr="chromeos"> |
| 92 <span id="profile-name"> | 92 <span id="profile-name"> |
| 93 [[profileName_]] | 93 [[profileName_]] |
| 94 </span> | 94 </span> |
| 95 </if> | 95 </if> |
| 96 </div> | 96 </div> |
| 97 <if expr="not chromeos"> | 97 <if expr="not chromeos"> |
| 98 <iron-icon icon="settings:arrow-drop-up" class="settings-arrow-right"> | |
|
hcarmona
2016/09/20 21:33:57
Maybe this button shouldn't have the > because it
dschuyler
2016/09/23 17:29:18
The longer term plan is to change the UI further s
| |
| 99 </iron-icon> | |
| 98 <template is="dom-if" if="[[!syncStatus.signedIn]]"> | 100 <template is="dom-if" if="[[!syncStatus.signedIn]]"> |
| 99 <span class="secondary-action"> | 101 <span class="secondary-action"> |
| 100 <paper-button class="primary-button" on-tap="onSigninTap_" | 102 <paper-button class="primary-button" on-tap="onSigninTap_" |
| 101 disabled="[[syncStatus.setupInProgress]]"> | 103 disabled="[[syncStatus.setupInProgress]]"> |
| 102 $i18n{syncSignin} | 104 $i18n{syncSignin} |
| 103 </paper-button> | 105 </paper-button> |
| 104 </span> | 106 </span> |
| 105 </template> | 107 </template> |
| 106 <template is="dom-if" if="[[syncStatus.signedIn]]"> | 108 <template is="dom-if" if="[[syncStatus.signedIn]]"> |
| 107 <span class="secondary-action"> | 109 <span class="secondary-action"> |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 142 <div class="middle"> | 144 <div class="middle"> |
| 143 <div>$i18n{sync}</div> | 145 <div>$i18n{sync}</div> |
| 144 <div class="secondary" hidden="[[syncStatus.hasError]]"> | 146 <div class="secondary" hidden="[[syncStatus.hasError]]"> |
| 145 [[syncStatus.statusText]] | 147 [[syncStatus.statusText]] |
| 146 </div> | 148 </div> |
| 147 <div class="secondary sync-error" | 149 <div class="secondary sync-error" |
| 148 hidden="[[!syncStatus.hasError]]"> | 150 hidden="[[!syncStatus.hasError]]"> |
| 149 [[syncStatus.statusText]] | 151 [[syncStatus.statusText]] |
| 150 </div> | 152 </div> |
| 151 </div> | 153 </div> |
| 154 <iron-icon icon="settings:arrow-drop-up" | |
| 155 class="settings-arrow-right"> | |
| 156 </iron-icon> | |
| 152 </div> | 157 </div> |
| 153 </template> | 158 </template> |
| 154 | 159 |
| 155 <div class="settings-box two-line" id="activity-controls" | 160 <div class="settings-box two-line" id="activity-controls" |
| 156 on-tap="onActivityControlsTap_" actionable | 161 on-tap="onActivityControlsTap_" actionable |
| 157 hidden="[[!syncStatus.signedIn]]"> | 162 hidden="[[!syncStatus.signedIn]]"> |
| 158 <div class="icon-container"> | 163 <div class="icon-container"> |
| 159 <div id="googleg-logo"></div> | 164 <div id="googleg-logo"></div> |
| 160 </div> | 165 </div> |
| 161 <div class="middle"> | 166 <div class="middle"> |
| 162 <div>$i18n{personalizeGoogleServicesTitle}</div> | 167 <div>$i18n{personalizeGoogleServicesTitle}</div> |
| 163 <div class="secondary">$i18n{personalizeGoogleServicesText}</div> | 168 <div class="secondary">$i18n{personalizeGoogleServicesText}</div> |
| 164 </div> | 169 </div> |
| 170 <iron-icon icon="settings:arrow-drop-up" class="settings-arrow-right"> | |
| 171 </iron-icon> | |
| 165 </div> | 172 </div> |
| 166 | 173 |
| 167 <if expr="chromeos"> | 174 <if expr="chromeos"> |
| 168 <template is="dom-if" if="[[!quickUnlockEnabled_]]"> | 175 <template is="dom-if" if="[[!quickUnlockEnabled_]]"> |
| 169 <div class="settings-box single-column"> | 176 <div class="settings-box single-column"> |
| 170 <settings-checkbox pref="{{prefs.settings.enable_screen_lock}}" | 177 <settings-checkbox pref="{{prefs.settings.enable_screen_lock}}" |
| 171 label="$i18n{enableScreenlock}"> | 178 label="$i18n{enableScreenlock}"> |
| 172 </settings-checkbox> | 179 </settings-checkbox> |
| 173 </div> | 180 </div> |
| 174 </template> | 181 </template> |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 223 on-tap="onEasyUnlockTurnOffTap_"> | 230 on-tap="onEasyUnlockTurnOffTap_"> |
| 224 $i18n{easyUnlockTurnOffButton} | 231 $i18n{easyUnlockTurnOffButton} |
| 225 </paper-button> | 232 </paper-button> |
| 226 </template> | 233 </template> |
| 227 </div> | 234 </div> |
| 228 </div> | 235 </div> |
| 229 </template> | 236 </template> |
| 230 </if> | 237 </if> |
| 231 | 238 |
| 232 <div id="manage-other-people-subpage-trigger" class="settings-box"> | 239 <div id="manage-other-people-subpage-trigger" class="settings-box"> |
| 233 <paper-button class="primary-button" on-tap="onManageOtherPeople_"> | 240 <paper-button class="primary-button" |
| 241 on-tap="onManageOtherPeople_"> | |
| 234 $i18n{manageOtherPeople} | 242 $i18n{manageOtherPeople} |
| 235 </paper-button> | 243 </paper-button> |
| 236 </div> | 244 </div> |
| 237 | 245 |
| 238 <template is="dom-if" if=[[profileManagesSupervisedUsers_]]> | 246 <template is="dom-if" if=[[profileManagesSupervisedUsers_]]> |
| 239 <div id="manageSupervisedUsersContainer" class="settings-box"> | 247 <div id="manageSupervisedUsersContainer" class="settings-box"> |
| 240 <paper-button class="primary-button" | 248 <paper-button class="primary-button" |
| 241 on-tap="onManageSupervisedUsers_"> | 249 on-tap="onManageSupervisedUsers_"> |
| 242 $i18n{manageSupervisedUsers} | 250 $i18n{manageSupervisedUsers} |
| 243 </paper-button> | 251 </paper-button> |
| (...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 319 | 327 |
| 320 <if expr="chromeos"> | 328 <if expr="chromeos"> |
| 321 <template is="dom-if" if="[[easyUnlockEnabled_]]"> | 329 <template is="dom-if" if="[[easyUnlockEnabled_]]"> |
| 322 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog"> | 330 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog"> |
| 323 </easy-unlock-turn-off-dialog> | 331 </easy-unlock-turn-off-dialog> |
| 324 </template> | 332 </template> |
| 325 </if> | 333 </if> |
| 326 </template> | 334 </template> |
| 327 <script src="people_page.js"></script> | 335 <script src="people_page.js"></script> |
| 328 </dom-module> | 336 </dom-module> |
| OLD | NEW |