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: 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 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 <div>

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

	20 </div>

	21 <div id="header-sections">

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

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

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

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

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

	27 i18n-content="updateScreenTitle"></span>
	Evan Stade 2011/06/08 19:56:07 indentation indentation Nikita (slow) 2011/06/08 22:28:27 James asked me to do 4 spaces instead of aligning Show quoted text On 2011/06/08 19:56:07, Evan Stade wrote: > indentation James asked me to do 4 spaces instead of aligning to properties, which I had initially. Evan Stade 2011/06/08 22:46:56 oh, ok. Then there are some cases down below that Show quoted text On 2011/06/08 22:28:27, Nikita Kostylev wrote: > On 2011/06/08 19:56:07, Evan Stade wrote: > > indentation > > James asked me to do 4 spaces instead of aligning to properties, which I had > initially. oh, ok. Then there are some cases down below that need fixing. Nikita (slow) 2011/06/09 15:52:14 Done. Show quoted text On 2011/06/08 22:46:56, Evan Stade wrote: > On 2011/06/08 22:28:27, Nikita Kostylev wrote: > > On 2011/06/08 19:56:07, Evan Stade wrote: > > > indentation > > > > James asked me to do 4 spaces instead of aligning to properties, which I had > > initially. > > oh, ok. Then there are some cases down below that need fixing. Done.
	28 </div>

	29 </div>

	30 <hr class="topshadow">

	31 <div id="inner-container">

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

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

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

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

	36 <div class="menu-area">

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

	38 </div>

	39 </div>

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

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

	42 <div class="menu-area">

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

	44 </div>

	45 </div>

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

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

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

	49 <div class="menu-area">

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

	51 </div>

	52 </div>

	53 </div>

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

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

	56 <div id="cros-eula">

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

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

	59 </div>

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

	61 class="eula-frame"></iframe></div>
	Evan Stade 2011/06/08 22:46:56 like here for example like here for example Nikita (slow) 2011/06/09 15:52:14 Done. Show quoted text On 2011/06/08 22:46:56, Evan Stade wrote: > like here for example Done.
	62 </div>

	63 <p id="logging">

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

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

	66 </p>

	67 </div>

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

	69 <div>

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

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

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

	73 </div>

	74 </div>

	75 </div>

	76 <hr class="bottomshadow">

	77 <div id="footer">

	78 <div id="progress">

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

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

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

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

	83 </div>

	84 <div class="button-strip">

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

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

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

	88 </div>

	89 </div>

	90 </div>

	91 </div>

	92 <div id="security-info">

	93 <a id="security-link" href="#" i18n-content="tpmSetting"></a>
	Evan Stade 2011/06/08 19:56:07 I still dont' know what tpm is 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 Show quoted text On 2011/06/08 19:56:07, Evan Stade wrote: > I still dont' know what tpm is It's a Trusted Platform Module. Do you think naming should be different? I might think something up but it's a nit comment I guess. Evan Stade 2011/06/08 22:46:56 actually I think the name should be more similar t actually I think the name should be more similar to the grd resource name, which is apparently very different (IDS_EULA_SYSTEM_SECURITY_SETTING) Nikita (slow) 2011/06/09 15:52:14 Done. Show quoted text On 2011/06/08 22:46:56, Evan Stade wrote: > actually I think the name should be more similar to the grd resource name, which > is apparently very different (IDS_EULA_SYSTEM_SECURITY_SETTING) Done.
	94 </div>

8 </body>	95 </body>

9 </html>	96 </html>

OLD	NEW