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

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

Issue 2457483002: [MD Settings][Sync Settings] Updates sync status messages (Closed)
Patch Set: Created 4 years, 1 month 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/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/polymer/v1_0/paper-icon-button/paper -icon-button-light.html">
10 <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 ">
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 } 48 }
49 49
50 #managed-by-domain-name { 50 #managed-by-domain-name {
51 font-weight: bold; 51 font-weight: bold;
52 } 52 }
53 53
54 iron-icon[icon='settings:sync'] { 54 iron-icon[icon='settings:sync'] {
55 --iron-icon-fill-color: var(--google-green-700); 55 --iron-icon-fill-color: var(--google-green-700);
56 } 56 }
57 57
58 iron-icon[icon='settings:sync-problem'] { 58 #sync-status[actionable] iron-icon[icon='settings:sync-problem'] {
59 --iron-icon-fill-color: var(--settings-error-color); 59 --iron-icon-fill-color: var(--settings-error-color);
60 } 60 }
61 61
62 .settings-box .sync-error { 62 .settings-box[actionable] .sync-error {
63 color: var(--settings-error-color); 63 color: var(--settings-error-color);
64 } 64 }
65 65
66 .icon-container { 66 .icon-container {
67 display: flex; 67 display: flex;
68 flex-shrink: 0; 68 flex-shrink: 0;
69 justify-content: center; 69 justify-content: center;
70 width: 40px; 70 width: 40px;
71 } 71 }
72 72
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 <div class="middle" 140 <div class="middle"
141 inner-h-t-m-l="[[getDomainHtml_(syncStatus.domain)]]"> 141 inner-h-t-m-l="[[getDomainHtml_(syncStatus.domain)]]">
142 </div> 142 </div>
143 </div> 143 </div>
144 </template> 144 </template>
145 </if> 145 </if>
146 146
147 <template is="dom-if" 147 <template is="dom-if"
148 if="[[isAdvancedSyncSettingsVisible_(syncStatus)]]"> 148 if="[[isAdvancedSyncSettingsVisible_(syncStatus)]]">
149 <div class="settings-box two-line" on-tap="onSyncTap_" 149 <div class="settings-box two-line" on-tap="onSyncTap_"
150 id="customize-sync" actionable$="[[!syncStatus.managed]]"> 150 id="sync-status" actionable$="[[isSyncStatusActionable_(
151 syncStatus)]]">
151 <div class="icon-container"> 152 <div class="icon-container">
152 <iron-icon id="sync-icon" icon$="[[getSyncIcon_(syncStatus)]]"> 153 <iron-icon id="sync-icon" icon$="[[getSyncIcon_(syncStatus)]]">
153 </iron-icon> 154 </iron-icon>
154 </div> 155 </div>
155 <div class="middle"> 156 <div class="middle">
156 <div>$i18n{sync}</div> 157 <div>$i18n{sync}</div>
157 <div class="secondary" hidden="[[syncStatus.hasError]]"> 158 <div class$="secondary [[getSyncStatusTextClass_(syncStatus)]]">
158 [[syncStatus.statusText]]
159 </div>
160 <div class="secondary sync-error"
161 hidden="[[!syncStatus.hasError]]">
162 [[syncStatus.statusText]] 159 [[syncStatus.statusText]]
163 </div> 160 </div>
164 </div> 161 </div>
165 <button class="subpage-arrow" is="paper-icon-button-light"></button> 162 <button class="subpage-arrow" is="paper-icon-button-light"
tommycli 2016/10/28 21:21:09 Can we do this in pure CSS ? i.e. #sync-status:no
Moe 2016/11/01 19:44:01 Done.
163 hidden="[[!isSyncStatusActionable_(syncStatus)]]">
164 </button>
166 </div> 165 </div>
167 </template> 166 </template>
168 167
169 <div class="settings-box two-line" id="activity-controls" 168 <div class="settings-box two-line" id="activity-controls"
170 on-tap="onActivityControlsTap_" actionable 169 on-tap="onActivityControlsTap_" actionable
171 hidden="[[!syncStatus.signedIn]]"> 170 hidden="[[!syncStatus.signedIn]]">
172 <div class="icon-container"> 171 <div class="icon-container">
173 <div id="googleg-logo"></div> 172 <div id="googleg-logo"></div>
174 </div> 173 </div>
175 <div class="middle"> 174 <div class="middle">
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
263 $i18n{manageSupervisedUsersDescription} 262 $i18n{manageSupervisedUsersDescription}
264 </div> 263 </div>
265 </div> 264 </div>
266 <button class="icon-external" is="paper-icon-button-light"></button> 265 <button class="icon-external" is="paper-icon-button-light"></button>
267 </div> 266 </div>
268 </template> 267 </template>
269 </neon-animatable> 268 </neon-animatable>
270 <template is="dom-if" route-path="/syncSetup" 269 <template is="dom-if" route-path="/syncSetup"
271 no-search$="[[!isAdvancedSyncSettingsVisible_(syncStatus)]]"> 270 no-search$="[[!isAdvancedSyncSettingsVisible_(syncStatus)]]">
272 <settings-subpage 271 <settings-subpage
273 associated-control="[[$$('#customize-sync')]]" 272 associated-control="[[$$('#sync-status')]]"
274 page-title="$i18n{syncPageTitle}" 273 page-title="$i18n{syncPageTitle}"
275 no-search$="[[!isAdvancedSyncSettingsVisible_(syncStatus)]]"> 274 no-search$="[[!isAdvancedSyncSettingsVisible_(syncStatus)]]">
276 <settings-sync-page></settings-sync-page> 275 <settings-sync-page></settings-sync-page>
277 </settings-subpage> 276 </settings-subpage>
278 </template> 277 </template>
279 <if expr="chromeos"> 278 <if expr="chromeos">
280 <template is="dom-if" if="[[quickUnlockEnabled_]]"> 279 <template is="dom-if" if="[[quickUnlockEnabled_]]">
281 <template is="dom-if" route-path="/lockScreen" no-search> 280 <template is="dom-if" route-path="/lockScreen" no-search>
282 <settings-subpage page-title="$i18n{lockScreenTitle}"> 281 <settings-subpage page-title="$i18n{lockScreenTitle}">
283 <settings-lock-screen 282 <settings-lock-screen
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
342 341
343 <if expr="chromeos"> 342 <if expr="chromeos">
344 <template is="dom-if" if="[[easyUnlockEnabled_]]"> 343 <template is="dom-if" if="[[easyUnlockEnabled_]]">
345 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog"> 344 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog">
346 </easy-unlock-turn-off-dialog> 345 </easy-unlock-turn-off-dialog>
347 </template> 346 </template>
348 </if> 347 </if>
349 </template> 348 </template>
350 <script src="people_page.js"></script> 349 <script src="people_page.js"></script>
351 </dom-module> 350 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698