Index: chrome/browser/resources/md_user_manager/import_supervised_user.html |
diff --git a/chrome/browser/resources/md_user_manager/import_supervised_user.html b/chrome/browser/resources/md_user_manager/import_supervised_user.html |
index 7fbeff1514428afa239bb5c9151a7dcd487fc206..72311207291c9b0eea6f36f9c2205c3069eab90f 100644 |
--- a/chrome/browser/resources/md_user_manager/import_supervised_user.html |
+++ b/chrome/browser/resources/md_user_manager/import_supervised_user.html |
@@ -1,11 +1,9 @@ |
-<link rel="import" href="chrome://md-user-manager/profile_browser_proxy.html"> |
<link rel="import" href="chrome://md-user-manager/shared_styles.html"> |
-<link rel="import" href="chrome://resources/cr_elements/icons.html"> |
+<link rel="import" href="chrome://md-user-manager/user_manager_dialog.html"> |
<link rel="import" href="chrome://resources/html/i18n_behavior.html"> |
<link rel="import" href="chrome://resources/html/polymer.html"> |
<link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classes/iron-flex-layout.html"> |
<link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-button.html"> |
-<link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper-icon-button.html"> |
<link rel="import" href="chrome://resources/polymer/v1_0/paper-item/paper-item.html"> |
<link rel="import" href="chrome://resources/polymer/v1_0/paper-listbox/paper-listbox.html"> |
@@ -17,46 +15,9 @@ |
--items-container-max-height: calc(var(--item-height) * 4); |
} |
- #backdrop { |
- align-items: center; |
- background: rgba(255, 255, 255, 0.6); |
- bottom: 0; |
- display: flex; |
- justify-content: center; |
- left: 0; |
- position: absolute; |
- right: 0; |
- top: 0; |
- } |
- |
- #dialog { |
- background: white; |
- border-radius: 2px; |
- box-shadow: 0 16px 24px 2px rgba(0, 0, 0, 0.14), |
- 0 6px 30px 5px rgba(0, 0, 0, 0.12), |
- 0 8px 10px -5px rgba(0, 0, 0, 0.4); |
- color: var(--primary-text-color); |
- width: 512px; |
- } |
- |
- #title-bar { |
- -webkit-padding-end: 6px; |
- -webkit-padding-start: 16px; |
- align-items: center; |
- border-bottom: 1px solid rgba(0, 0, 0, .12); |
- font-size: 16px; |
- padding-bottom: 6px; |
- padding-top: 6px; |
- } |
- |
- #title-bar paper-icon-button { |
- --paper-icon-button: { |
- padding: 10px; |
- }; |
- } |
- |
#message { |
- padding: 20px 16px 16px; |
+ margin-bottom: 16px; |
+ margin-top: 20px; |
white-space: pre-wrap; |
word-wrap: break-word; |
} |
@@ -103,46 +64,34 @@ |
-webkit-margin-start: 10px; |
flex-shrink: 0; |
} |
- |
- #actions { |
- margin-top: 20px; |
- padding: 16px; |
- } |
</style> |
- <template is="dom-if" if="[[!popupHidden_]]"> |
- <div id="backdrop"> |
- <div id="dialog"> |
- <div id="title-bar" class="horizontal justified layout"> |
- <span id="title">$i18n{supervisedUserImportTitle}</span> |
- <paper-icon-button icon="cr:close" on-tap="onCancelTap_"> |
- </paper-icon-button> |
- </div> |
- <div id="message">[[getMessage_(supervisedUsers_)]]</div> |
- <paper-listbox selected="{{supervisedUserIndex_}}"> |
- <template is="dom-repeat" items="[[supervisedUsers_]]"> |
- <paper-item disabled="[[item.onCurrentDevice]]"> |
- <img class="profile-img" src="[[item.iconURL]]"></img> |
- <div class="profile-name">[[item.name]]</div> |
- <div class="on-device" hidden="[[!item.onCurrentDevice]]"> |
- $i18n{supervisedUserAlreadyOnThisDevice} |
- </div> |
- </paper-item> |
- </template> |
- </paper-listbox> |
- <div id="actions" class="horizontal end-justified layout"> |
- <paper-button id="cancel" class="action secondary" |
- on-tap="onCancelTap_"> |
- $i18n{cancel} |
- </paper-button> |
- <paper-button id="import" class="action primary" |
- on-tap="onImportTap_" |
- disabled="[[isImportDisabled_(supervisedUserIndex_)]]"> |
- $i18n{supervisedUserImportOk} |
- </paper-button> |
- </div> |
- </div> |
+ <user-manager-dialog id="dialog"> |
+ <div class="title">$i18n{supervisedUserImportTitle}</div> |
+ <div class="body"> |
+ <div id="message">[[getMessage_(supervisedUsers_)]]</div> |
+ <paper-listbox class="no-padding" selected="{{supervisedUserIndex_}}"> |
+ <template is="dom-repeat" items="[[supervisedUsers_]]"> |
+ <paper-item disabled="[[item.onCurrentDevice]]"> |
+ <img class="profile-img" src="[[item.iconURL]]"></img> |
+ <div class="profile-name">[[item.name]]</div> |
+ <div class="on-device" hidden="[[!item.onCurrentDevice]]"> |
+ $i18n{supervisedUserAlreadyOnThisDevice} |
+ </div> |
+ </paper-item> |
+ </template> |
+ </paper-listbox> |
+ </div> |
+ <div class="footer horizontal end-justified layout"> |
+ <paper-button id="cancel" class="action secondary" dialog-dismiss> |
+ $i18n{cancel} |
+ </paper-button> |
+ <paper-button id="import" class="action primary" |
+ on-tap="onImportTap_" |
+ disabled="[[isImportDisabled_(supervisedUserIndex_)]]"> |
+ $i18n{supervisedUserImportOk} |
+ </paper-button> |
</div> |
- </template> |
+ </user-manager-dialog> |
</template> |
<script src="chrome://md-user-manager/import_supervised_user.js"></script> |
</dom-module> |