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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/resources/settings/internet_page/network_siminfo.html

Issue 2189523003: MD Settings: Internet: Clean up SIM info and dialog (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@issue_609156_internet_cleanup_4
Patch Set: . Created 4 years, 5 months 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/resources/settings/internet_page/internet_detail_page.html ('k') | chrome/browser/resources/settings/internet_page/network_siminfo.js » ('j') | chrome/browser/resources/settings/internet_page/network_siminfo.js » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/settings/internet_page/network_siminfo.html
diff --git a/chrome/browser/resources/settings/internet_page/network_siminfo.html b/chrome/browser/resources/settings/internet_page/network_siminfo.html
index 97fe666e0c0c27cb6e054685c48428a22a2e1a29..fdca3012fc359e83207d080f33ac3ce2e2ff3113 100644
--- a/chrome/browser/resources/settings/internet_page/network_siminfo.html
+++ b/chrome/browser/resources/settings/internet_page/network_siminfo.html
@@ -2,202 +2,155 @@
<link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.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-checkbox/paper-checkbox.html">
-<link rel="import" href="chrome://resources/polymer/v1_0/paper-dialog/paper-dialog.html">
<link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input.html">
+<link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html">
dschuyler 2016/07/28 22:12:16 Can these imports be alphabetized? I know that at
stevenjb 2016/07/29 17:48:34 Done.
<link rel="import" href="chrome://resources/cr_elements/network/cr_onc_types.html">
<link rel="import" href="/icons.html">
+<link rel="import" href="internet_shared_css.html">
<link rel="import" href="network_property_list.html">
<dom-module id="network-siminfo">
<template>
- <style>
+ <style include="internet-shared">
iron-icon {
- -webkit-margin-end: 5px;
- -webkit-margin-start: -3px;
+ -webkit-margin-end: 10px;
}
-
- paper-button {
- margin: 0;
- }
-
- span {
- -webkit-margin-end: 10px;
- }
-
- #lockedDiv span {
+ .error {
color: red;
font-weight: 500;
}
-
- #lockedDiv paper-input {
- -webkit-margin-start: 10px;
- width: 80px;
- }
-
- #unlockSimDialog paper-input {
- -webkit-margin-start: 5px;
- }
-
- #unlockSimDialog span {
- -webkit-margin-start: 5px;
+ .dialog-error {
+ color: red;
+ font-size: 125%;
+ font-weight: 500;
+ margin-top: 10px;
}
-
.pin {
min-width: 100px;
}
-
.puk {
min-width: 200px;
}
-
- .error {
- color: red;
- max-width: 400px;
- }
</style>
- <div id="outerDiv" class="layout vertical">
- <div class="layout horizontal center"
- hidden$="[[networkProperties.Cellular.SIMPresent]]">
- <!-- SIM missing UI -->
+
+ <!-- SIM missing UI -->
+ <div class="settings-box"
+ hidden$="[[networkProperties.Cellular.SIMPresent]]">
+ <div class="start layout horizontal center">
<iron-icon icon="settings:sim-card-alert"></iron-icon>
- <span>Missing SIM card</span>
+ <div class="error">Missing SIM card</div>
</div>
- <div class="layout vertical"
- hidden$="[[!networkProperties.Cellular.SIMPresent]]">
- <div id="lockedDiv" class="layout horizontal center"
- hidden$="[[!isSimLocked_(networkProperties)]]">
- <!-- SIM locked -->
- <iron-icon icon="settings:lock"></iron-icon>
- <span>SIM card is locked.</span>
- <paper-button on-tap="onUnlockPinTap_">Unlock</paper-button>
- </div>
- <div class="layout vertical"
- hidden$="[[isSimLocked_(networkProperties)]]">
- <!-- SIM unlocked -->
- <paper-checkbox
- checked="[[networkProperties.Cellular.SIMLockStatus.LockEnabled]]"
- on-change="onSimLockEnabledChange_">
- Enable SIM card locking (require PIN to use mobile data)
- </paper-checkbox>
- <div class="layout horizontal center"
- hidden$="[[!networkProperties.Cellular.SIMLockStatus.LockEnabled]]">
- <!-- SIM lock enabled -->
- <paper-button on-tap="onChangePinTap_">Change PIN</paper-button>
- </div>
- </div>
+ </div>
+
+ <!-- SIM locked -->
+ <div class="settings-box" hidden$="[[!showSimLocked_(networkProperties)]]">
+ <div class="start layout horizontal center">
+ <iron-icon icon="settings:lock"></iron-icon>
+ <div class="error">SIM card is locked.</div>
+ </div>
+ <div class="secondary-action">
+ <paper-button on-tap="onUnlockPinTap_">Unlock</paper-button>
</div>
</div>
+
+ <!-- SIM unlocked -->
+ <div class="settings-box"
+ hidden$="[[!showSimUnlocked_(networkProperties)]]">
+ <paper-checkbox class="start" on-change="onSimLockEnabledChange_"
+ checked="[[networkProperties.Cellular.SIMLockStatus.LockEnabled]]">
+ Enable SIM card locking (require PIN to use mobile data)
+ </paper-checkbox>
+ <paper-button on-tap="onChangePinTap_"
+ hidden$="[[!networkProperties.Cellular.SIMLockStatus.LockEnabled]]">
+ Change PIN
+ </paper-button>
+ </div>
<!-- Enter PIN dialog -->
- <paper-dialog modal id="enterPinDialog" class="layout vertical"
+ <cr-dialog id="enterPinDialog" class="layout vertical"
on-iron-overlay-opened="onEnterPinDialogOpened_">
- <div class="layout vertical">
- <h2>Enter SIM PIN</h2>
- <div class="layout vertical">
- <div class="layout horizontal">
- <paper-input id="enterPin" class="pin" no-label-float
- label="Enter PIN">
- </paper-input>
- <paper-button on-tap="sendEnterPin_">Enter</paper-button>
- </div>
- </div>
- <div class="layout horizontal">
- <span class="error" hidden$="[[!showError_(error)]]"
- >[[getErrorMsg_(error)]]
- </span>
- <span>[[getRetriesLeftMsg_(networkProperties)]]</span>
+ <div class="title">Enter SIM PIN</div>
+ <div class="body">
+ <paper-input id="enterPin" class="pin" no-label-float label="Enter PIN">
+ </paper-input>
+ <div class="dialog-error">
+ [[getErrorMsg_(error, networkProperties)]]
</div>
</div>
- </paper-dialog>
+ <div class="button-container">
+ <paper-button on-tap="sendEnterPin_">Enter</paper-button>
+ </div>
+ </cr-dialog>
<!-- Change PIN dialog -->
- <paper-dialog modal id="changePinDialog" class="layout vertical"
+ <cr-dialog id="changePinDialog" class="layout vertical"
on-iron-overlay-opened="onChangePinDialogOpened_">
- <div class="layout vertical">
- <h2>Change SIM PIN</h2>
- <div class="layout horizontal end">
- <div class="layout vertical">
- <paper-input id="changePinOld" class="pin" no-label-float
- label="Enter old PIN">
- </paper-input>
- <paper-input id="changePinNew1" class="pin" no-label-float
- label="Enter new PIN">
- </paper-input>
- <paper-input id="changePinNew2" class="pin" no-label-float
- label="Re-enter new PIN">
- </paper-input>
- </div>
- <paper-button on-tap="sendChangePin_">Change</paper-button>
- </div>
- <div class="layout horizontal">
- <span class="error" hidden$="[[!showError_(error)]]"
- >[[getErrorMsg_(error)]]
- </span>
- <span>[[getRetriesLeftMsg_(networkProperties)]]</span>
+ <div class="title">Change SIM PIN</div>
+ <div class="body">
+ <paper-input id="changePinOld" class="pin" no-label-float
+ label="Enter old PIN">
+ </paper-input>
+ <paper-input id="changePinNew1" class="pin" no-label-float
+ label="Enter new PIN">
+ </paper-input>
+ <paper-input id="changePinNew2" class="pin" no-label-float
+ label="Re-enter new PIN">
+ </paper-input>
+ <div class="dialog-error">
+ [[getErrorMsg_(error, networkProperties)]]
</div>
</div>
- </paper-dialog>
+ <div class="button-container">
+ <paper-button on-tap="sendChangePin_">Change</paper-button>
+ </div>
+ </cr-dialog>
<!-- Unlock PIN dialog -->
- <paper-dialog modal id="unlockPinDialog" class="layout vertical"
+ <cr-dialog id="unlockPinDialog" class="layout vertical"
on-iron-overlay-opened="onUnlockPinDialogOpened_">
- <div class="layout vertical">
- <h2>SIM Card is locked.</h2>
- <div class="layout horizontal">
- <paper-input id="unlockPin" class="pin" no-label-float
- label="Enter PIN">
- </paper-input>
- <paper-button on-tap="sendUnlockPin_">Unlock</paper-button>
- </div>
- <div class="layout horizontal">
- <span class="error" hidden$="[[!showError_(error)]]"
- >[[getErrorMsg_(error)]]
- </span>
- <span>[[getRetriesLeftMsg_(networkProperties)]]</span>
+ <div class="title">SIM Card is locked</div>
+ <div class="body">
+ <paper-input id="unlockPin" class="pin" no-label-float
+ label="Enter PIN">
+ </paper-input>
+ <div class="dialog-error">
+ [[getErrorMsg_(error, networkProperties)]]
</div>
</div>
- </paper-dialog>
+ <div class="button-container">
+ <paper-button on-tap="sendUnlockPin_">Unlock</paper-button>
+ </div>
+ </cr-dialog>
<!-- Unlock PUK dialog -->
- <paper-dialog modal id="unlockPukDialog" class="layout vertical"
+ <cr-dialog id="unlockPukDialog" class="layout vertical"
on-iron-overlay-opened="onUnlockPukDialogOpened_">
- <div class="layout vertical">
- <h2>SIM Card is locked.</h2>
- <span>
+ <div class="title">SIM Card is locked</div>
+ <div class="body">
+ <div>
Enter the 8-digit PIN Unblocking Key provided by your carrier
- </span>
- <div class="layout horizontal">
- <div class="layout vertical">
- <paper-input id="unlockPuk" class="puk" no-label-float
- label="Enter PIN Unblocking Key">
- </paper-input>
- <div class="layout horizontal end">
- <div class="layout vertical">
- <paper-input id="unlockPin1" class="pin" no-label-float
- label="Enter PIN">
- </paper-input>
- <paper-input id="unlockPin2" class="pin" no-label-float
- label="Re-enter PIN">
- </paper-input>
- </div>
- <paper-button on-tap="sendUnlockPuk_">Unlock</paper-button>
- </div>
- </div>
- <div class="flex"></div>.
</div>
- <span class="error">
+ <paper-input id="unlockPuk" class="puk" no-label-float
+ label="Enter PIN Unblocking Key">
+ </paper-input>
+ <paper-input id="unlockPin1" class="pin" no-label-float
+ label="Enter PIN">
+ </paper-input>
+ <paper-input id="unlockPin2" class="pin" no-label-float
+ label="Re-enter PIN">
+ </paper-input>
+ <div class="dialog-error">
Your SIM card will be permanently disabled if you cannot enter
the correct PIN Unblocking key.
- </span>
- <div class="layout horizontal">
- <span class="error" hidden$="[[!showError_(error)]]"
- >[[getErrorMsg_(error)]]
- </span>
- <span>[[getRetriesLeftMsg_(networkProperties)]]</span>
+ </div>
+ <div class="dialog-error">
+ [[getErrorMsg_(error, networkProperties)]]
</div>
</div>
- </paper-dialog>
-
+ <div class="button-container">
+ <paper-button on-tap="sendUnlockPuk_">Unlock</paper-button>
+ </div>
+ </cr-dialog>
</template>
<script src="network_siminfo.js"></script>
</dom-module>
« no previous file with comments | « chrome/browser/resources/settings/internet_page/internet_detail_page.html ('k') | chrome/browser/resources/settings/internet_page/network_siminfo.js » ('j') | chrome/browser/resources/settings/internet_page/network_siminfo.js » ('J')

Powered by Google App Engine
This is Rietveld 408576698