Chromium Code Reviews Chromium Code Reviews
Issue 7058048:
[cros] Layout for OOBE WebUI. (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src| 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..02448ff2c8524fd2de23d1e9286224564ce69c03 100644 |
| --- a/chrome/browser/resources/chromeos/oobe.html |
| +++ b/chrome/browser/resources/chromeos/oobe.html |
| @@ -2,8 +2,93 @@ |
| <html i18n-values="dir:textdirection"> |
| <head> |
| <title i18n-content="title"></title> |
| +<link rel="stylesheet" href="chrome://resources/css/button.css"> |
| +<link rel="stylesheet" href="chrome://resources/css/select.css"> |
| <link rel="stylesheet" href="oobe.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> |
| <body i18n-values=".style.fontFamily:fontfamily;"> |
| + <div id="oobe" class="connect"> |
| + <div id="outer-container"> |
| + <div id="header"> |
| + <span i18n-content="productName"></span> |
| + <div id="header-sections"> |
| + <span id="headerConnect" class="header-section" |
| + i18n-content="welcomeScreenTitle"></span> |
|
James Hawkins
2011/06/07 17:17:54
nit: 4 space indentation from previous line.
Nikita (slow)
2011/06/07 18:02:04
Done. But I've seen such formatting in other WebUI
James Hawkins
2011/06/07 18:13:06
Right; they need to be fixed to match the Chromium
|
| + <span id="headerEula" class="header-section right" |
| + i18n-content="eulaScreenTitle"></span> |
| + <span id="headerUpdate" class="header-section right" |
| + i18n-content="updateScreenTitle"></span> |
| + </div> |
| + </div> |
| + <hr class="topshadow"> |
| + <div id="inner-container"> |
| + <div class="step" id="connect"> |
| + <table> |
|
James Hawkins
2011/06/07 17:17:54
This section is not displaying tabular data; pleas
Nikita (slow)
2011/06/07 18:02:04
Is it ok to convert to divs in follow up CL?
James Hawkins
2011/06/07 18:13:06
I'd rather it be done in this CL, so we don't lose
Nikita (slow)
2011/06/08 14:30:54
Done.
|
| + <tr height='40px'> |
| + <td width='200px' i18n-content="languageSelect"></td> |
| + <td> |
| + <select id='language-select'></select> |
| + </td> |
| + </tr> |
| + <tr height='40px'> |
| + <td i18n-content="keyboardSelect"></td> |
| + <td> |
| + <select id='keyboard-select'></select> |
| + </td> |
| + </tr> |
| + <tr height='40px'> |
| + <td i18n-content="networkSelect"></td> |
| + <td> |
| + <!-- TODO(nkostylev): Embed network control. --> |
| + </td> |
| + </tr> |
| + </table> |
| + </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> |
| + </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> |
| + </div> |
| + </div> <!-- Inner Container --> |
|
James Hawkins
2011/06/07 17:17:54
nit: Remove this and similar comments.
Nikita (slow)
2011/06/07 18:02:04
Done.
|
| + <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> <!-- Footer --> |
| + </div> <!-- Outer Container --> |
| + </div> <!-- OOBE --> |
| + <div id="security-info"> |
| + <a id="security-link" href="#" i18n-content="tpmSetting"></a> |
| + </div> |
| </body> |
| </html> |
