chrome/browser/resources/chromeos/oobe.html - Issue 7058048: [cros] Layout for OOBE WebUI.

Unified Diff: chrome/browser/resources/chromeos/oobe.html

Issue 7058048: [cros] Layout for OOBE WebUI. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: iterate Created 9 years, 6 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

« chrome/browser/resources/chromeos/oobe.css ('K') | « chrome/browser/resources/chromeos/oobe.css ('k') | chrome/browser/resources/chromeos/oobe.js » ('j') | chrome/browser/resources/chromeos/oobe.js » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/resources/chromeos/oobe.html

diff --git a/chrome/browser/resources/chromeos/oobe.html b/chrome/browser/resources/chromeos/oobe.html

index 4c555689b06bdc4327c1ada26cfee009d4e6a856..363e26526006d120696343a2744919399a06577f 100644

--- a/chrome/browser/resources/chromeos/oobe.html

+++ b/chrome/browser/resources/chromeos/oobe.html

@@ -2,8 +2,95 @@

<head>

+<link rel="stylesheet" href="chrome://resources/css/button.css">

+<link rel="stylesheet" href="chrome://resources/css/select.css">

+<script src="chrome://resources/js/cr.js"></script>

+<script src="chrome://resources/js/cr/event_target.js"></script>

+<script src="chrome://resources/js/local_strings.js"></script>

+<script src="chrome://resources/js/util.js"></script>

+<script src="oobe.js"></script>

</head>

+ <div id="oobe" class="connect">

+ <div id="outer-container">

+ <div id="header">

+ <div>

+ <span i18n-content="productName"></span>

+ </div>

+ <div id="header-sections">

+ <span id="headerConnect" class="header-section"

+ i18n-content="welcomeScreenTitle"></span>

+ <span id="headerEula" class="header-section right"

+ i18n-content="eulaScreenTitle"></span>

+ <span id="headerUpdate" class="header-section right"

+ i18n-content="updateScreenTitle"></span>

Evan Stade 2011/06/08 19:56:07 indentation

Nikita (slow) 2011/06/08 22:28:27 James asked me to do 4 spaces instead of aligning

Evan Stade 2011/06/08 22:46:56 oh, ok. Then there are some cases down below that

Nikita (slow) 2011/06/09 15:52:14 Done.

+ </div>

+ <hr class="topshadow">

+ <div id="inner-container">

+ <div class="step" id="connect">

+ <div class="control-with-label">

+ <div i18n-content="languageSelect" class="label"

+ class="menu-control"></div>

+ <div class="menu-area">

+ <select id='language-select'></select>

+ </div>

+ <div class="control-with-label">

+ <div i18n-content="keyboardSelect" class="label"></div>

+ <div class="menu-area">

+ <select id='keyboard-select' class="menu-control"></select>

+ </div>

+ <div class="control-with-label">

+ <div i18n-content="networkSelect" class="label"

+ class="menu-control"></div>

+ <div class="menu-area">

+

+ </div>

+ <div class="step right hidden" id="eula">

+ <div id="eulas" class="eula-columns one-column">

+ <div id="cros-eula">

+ <iframe id="cros-eula-frame" class="eula-frame"

+ src="chrome://about/terms"></iframe>

+ </div>

+ <div id="oem-eula"><iframe id="oem-eula-frame"

+ class="eula-frame"></iframe></div>

Evan Stade 2011/06/08 22:46:56 like here for example

Nikita (slow) 2011/06/09 15:52:14 Done.

+ </div>

+ <p id="logging">

+ <input type="checkbox"/><span i18n-content="checkboxLogging"></span>

+ <a id="stats-help-link" href="#" i18n-content="learnMore"></a>

+ </p>

+ </div>

+ <div class="step right hidden" id="update">

+ <div>

+ <p i18n-content="installingUpdate"></p>

+ <progress id="" max="100" value="0"></progress>

+ <p i18n-content="installingUpdateDesc"></p>

+ </div>

+ <hr class="bottomshadow">

+ <div id="footer">

+ <div id="progress">

+ <div id="connect-dot" class="progdot"></div>

+ <div id="eula-dot" class="progdot"></div>

+ <div id="signin-dot" class="progdot"></div>

+ <div id="photo-dot" class="progdot"></div>

+ </div>

+ <div class="button-strip">

+ <button id="continue-button" i18n-content="continue"></button>

+ <button id="back-button" i18n-content="back"></button>

+ <button id="accept-button" i18n-content="acceptAgreement"></button>

+ </div>

+ <div id="security-info">

+ <a id="security-link" href="#" i18n-content="tpmSetting"></a>

Evan Stade 2011/06/08 19:56:07 I still dont' know what tpm is

Nikita (slow) 2011/06/08 22:28:27 It's a Trusted Platform Module. Do you think namin

Evan Stade 2011/06/08 22:46:56 actually I think the name should be more similar t

Nikita (slow) 2011/06/09 15:52:14 Done.

+ </div>

</body>

</html>