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

Side by Side 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: fix 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 unified diff | Download patch | Annotate | Revision Log

« 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')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 <!DOCTYPE HTML>	1 <!DOCTYPE HTML>

2 <html i18n-values="dir:textdirection">	2 <html i18n-values="dir:textdirection">

3 <head>	3 <head>

4 <title i18n-content="title"></title>	4 <title i18n-content="title"></title>

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

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

5 <link rel="stylesheet" href="oobe.css">	7 <link rel="stylesheet" href="oobe.css">

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

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

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

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

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

6 </head>	13 </head>

7 <body i18n-values=".style.fontFamily:fontfamily;">	14 <body i18n-values=".style.fontFamily:fontfamily;">

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

	16 <div id="outer-container">

	17 <div id="header">

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

	19 <div id="header-sections">

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

	21 i18n-content="welcomeScreenTitle"></span>
	James Hawkins 2011/06/07 17:17:54 nit: 4 space indentation from previous line. 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 Show quoted text On 2011/06/07 17:17:54, James Hawkins wrote: > nit: 4 space indentation from previous line. Done. But I've seen such formatting in other WebUI pages. James Hawkins 2011/06/07 18:13:06 Right; they need to be fixed to match the Chromium Show quoted text On 2011/06/07 18:02:04, Nikita Kostylev wrote: > On 2011/06/07 17:17:54, James Hawkins wrote: > > nit: 4 space indentation from previous line. > > Done. But I've seen such formatting in other WebUI pages. Right; they need to be fixed to match the Chromium style as well.
	22 <span id="headerEula" class="header-section right"

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

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

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

	26 </div>

	27 </div>

	28 <hr class="topshadow">

	29 <div id="inner-container">

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

	31 <table>
	James Hawkins 2011/06/07 17:17:54 This section is not displaying tabular data; pleas This section is not displaying tabular data; please don't use tables. Nikita (slow) 2011/06/07 18:02:04 Is it ok to convert to divs in follow up CL? Show quoted text On 2011/06/07 17:17:54, James Hawkins wrote: > This section is not displaying tabular data; please don't use tables. 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 Show quoted text On 2011/06/07 18:02:04, Nikita Kostylev wrote: > On 2011/06/07 17:17:54, James Hawkins wrote: > > This section is not displaying tabular data; please don't use tables. > > Is it ok to convert to divs in follow up CL? I'd rather it be done in this CL, so we don't lose it. Nikita (slow) 2011/06/08 14:30:54 Done. Show quoted text On 2011/06/07 18:13:06, James Hawkins wrote: > On 2011/06/07 18:02:04, Nikita Kostylev wrote: > > On 2011/06/07 17:17:54, James Hawkins wrote: > > > This section is not displaying tabular data; please don't use tables. > > > > Is it ok to convert to divs in follow up CL? > > I'd rather it be done in this CL, so we don't lose it. Done.
	32 <tr height='40px'>

	33 <td width='200px' i18n-content="languageSelect"></td>

	34 <td>

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

	36 </td>

	37 </tr>

	38 <tr height='40px'>

	39 <td i18n-content="keyboardSelect"></td>

	40 <td>

	41 <select id='keyboard-select'></select>

	42 </td>

	43 </tr>

	44 <tr height='40px'>

	45 <td i18n-content="networkSelect"></td>

	46 <td>

	47 <!-- TODO(nkostylev): Embed network control. -->

	48 </td>

	49 </tr>

	50 </table>

	51 </div>

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

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

	54 <div id="cros-eula">

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

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

	57 </div>

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

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

	60 </div>

	61 <p id="logging">

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

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

	64 </p>

	65 </div>

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

	67 <div>

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

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

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

	71 </div>

	72 </div>

	73 </div> <!-- Inner Container -->
	James Hawkins 2011/06/07 17:17:54 nit: Remove this and similar comments. nit: Remove this and similar comments. Nikita (slow) 2011/06/07 18:02:04 Done. Show quoted text On 2011/06/07 17:17:54, James Hawkins wrote: > nit: Remove this and similar comments. Done.
	74 <hr class="bottomshadow">

	75 <div id="footer">

	76 <div id="progress">

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

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

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

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

	81 </div>

	82 <div class="button-strip">

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

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

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

	86 </div>

	87 </div> <!-- Footer -->

	88 </div> <!-- Outer Container -->

	89 </div> <!-- OOBE -->

	90 <div id="security-info">

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

	92 </div>

8 </body>	93 </body>

9 </html>	94 </html>

OLD	NEW