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

Unified Diff: chrome/browser/resources/chromeos/login/oobe_reset.html

Issue 2756863002: ChromeOS: Powerwash UI update (Closed)
Patch Set: Use String to denote UI state Created 3 years, 8 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
Index: chrome/browser/resources/chromeos/login/oobe_reset.html
diff --git a/chrome/browser/resources/chromeos/login/oobe_reset.html b/chrome/browser/resources/chromeos/login/oobe_reset.html
new file mode 100644
index 0000000000000000000000000000000000000000..ac49ff915135fda3558fc6d5c56c5873122b30b1
--- /dev/null
+++ b/chrome/browser/resources/chromeos/login/oobe_reset.html
@@ -0,0 +1,66 @@
+<!-- Copyright 2017 The Chromium Authors. All rights reserved.
+ Use of this source code is governed by a BSD-style license that can be
+ found in the LICENSE file. -->
+
+<dom-module id="oobe-reset-md">
+ <template>
+ <link rel="stylesheet" href="oobe_reset.css">
+ <link rel="stylesheet" href="oobe_dialog_parameters.css">
+ <link rel="stylesheet" href="chrome://resources/css/throbber.css">
+ <oobe-dialog id="resetDialog" role="dialog"
Alexander Alekseev 2017/04/08 10:36:18 The dialog size should be 768x640 px. This one is
Wenzhao (Colin) Zang 2017/04/10 20:37:35 It's changed to 768x640 px now.
+ i18n-values="aria-label:resetScreenAccessibleTitle" has-buttons>
+ <div class="header">
+ <img src="chrome://theme/IDR_RESET_ALERT"
Alexander Alekseev 2017/04/08 10:36:18 If you place the icon here, the header will occupy
Alexander Alekseev 2017/04/08 10:36:18 OOBE/signin code is traditionally using embedded i
Alexander Alekseev 2017/04/08 10:36:18 Please replace this icon with polymer icon icons:i
Wenzhao (Colin) Zang 2017/04/10 20:37:35 Done. The info icon is black so it's different fro
Wenzhao (Colin) Zang 2017/04/10 20:37:35 Done.
Wenzhao (Colin) Zang 2017/04/10 20:37:35 Originally I used iron-icon, but by using <iron-ic
Wenzhao (Colin) Zang 2017/04/11 20:42:53 Now the icon is blue. And the illustration is embe
+ i18n-values="alt:resetScreenIconTitle">
+ <h1 class="title" i18n-content="resetWarningTitle"></h1>
Alexander Alekseev 2017/04/08 10:36:18 We do not have precise specks for reset screen, bu
Wenzhao (Colin) Zang 2017/04/10 20:37:35 Done.
+ </div>
+ <div class="footer">
+ <div hidden="[[isPowerwashHidden_(uiState_)]]"
Alexander Alekseev 2017/04/11 04:19:26 We can (probably) make this more readable if we em
Wenzhao (Colin) Zang 2017/04/11 20:42:54 Done.
+ i18n-content="resetPowerwashWarningDetails"></div>
+ <div hidden="[[isRollbackHidden_(uiState_)]]"
+ i18n-content="resetPowerwashRollbackWarningDetails"></div>
+ <div hidden="[[isDataWarningHidden_(uiState_)]]"
+ i18n-content="resetWarningDataDetails"></div>
+ <div hidden="[[isRestartHidden_(uiState_)]]"
+ i18n-content="resetRestartMessage"></div>
+ <a id="powerwash-help-link-md" href="#"
Alexander Alekseev 2017/04/08 10:36:18 Are you sure that this link must be always display
Wenzhao (Colin) Zang 2017/04/10 20:37:35 I mimicked the original oobe_screen_reset.html str
+ hidden="[[isHelpLinkHidden_(uiState_, isOfficial_)]]"
+ on-tap="onLearnMoreTap_" i18n-content="learnMore"></a>
+ <div id="revert-promise-md" hidden="[[isRevertHidden_(uiState_)]]">
+ <div i18n-content="resetRevertPromise"></div>
+ <div id="reset-revert-spinner-md" class="throbber"></div>
+ <div id="reset-revert-spinner-message-md"
+ i18n-content="resetRevertSpinnerMessage">
+ </div>
+ </div>
+ <img id="reset-illustration"
+ src="chrome://theme/IDR_RESET_ILLUSTRATION"
+ i18n-values="alt:resetScreenIllustrationTitle">
+ </div>
+ <div class="bottom-buttons flex layout horizontal">
+ <div class="flex"></div>
+ <oobe-text-button hidden="[[isCancelHidden_(uiState_)]]" border
+ on-tap="onCancelTap_">
+ <div i18n-content="cancelButton"></div>
+ </oobe-text-button>
+ <div class="vertical-margin"
Alexander Alekseev 2017/04/08 10:36:18 Is it just a spacer? Could margin CSS attribute be
Wenzhao (Colin) Zang 2017/04/10 20:37:35 Done. Sorry I ignored this much simpler method.
+ hidden="[[isCancelHidden_(uiState_)]]"></div>
+ <oobe-text-button hidden="[[isRestartHidden_(uiState_)]]" inverse
+ on-tap="onRestartTap_">
Alexander Alekseev 2017/04/11 04:19:26 I believe you can also replace all the on.*Tap_()
Wenzhao (Colin) Zang 2017/04/11 20:42:54 I tried something like <oobe-text-button on-tap="
Alexander Alekseev 2017/04/13 00:01:53 You're right, my comment was incorrect. Just ignor
+ <div i18n-content="resetButtonRestart"></div>
+ </oobe-text-button>
+ <div class="vertical-margin"
+ hidden="[[isRestartHidden_(uiState_)]]"></div>
+ <oobe-text-button hidden="[[isDataWarningHidden_(uiState_)]]" inverse
Alexander Alekseev 2017/04/11 04:19:26 Could you split this into two buttons? I see that
Wenzhao (Colin) Zang 2017/04/11 20:42:54 Done.
+ on-tap="onPowerwashTap_">
+ <div i18n-content="resetButtonPowerwashAndRollback"
+ hidden="[[isRollbackHidden_(uiState_)]]"></div>
+ <div i18n-content="resetButtonPowerwash"
+ hidden="[[isPowerwashHidden_(uiState_)]]"></div>
+ </oobe-text-button>
+ <div class="vertical-margin"
+ hidden="[[isWarningDataHidden_(uiState_)]]"></div>
+ </div>
+ </oobe-dialog>
+ </template>
+</dom-module>

Powered by Google App Engine
This is Rietveld 408576698