diff options
| author | avayvod@chromium.org <avayvod@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-04 10:06:49 +0000 |
|---|---|---|
| committer | avayvod@chromium.org <avayvod@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-04 10:06:49 +0000 |
| commit | 10edbd989586830e95a158954ebac22b4683adae (patch) | |
| tree | a7891871ecb66de8e10a2e69f5cac54bea62a41e /chrome/browser/resources/chromeos | |
| parent | 612ba4afb86788c54cf9af5553496393f836a59e (diff) | |
| download | chromium_src-10edbd989586830e95a158954ebac22b4683adae.zip chromium_src-10edbd989586830e95a158954ebac22b4683adae.tar.gz chromium_src-10edbd989586830e95a158954ebac22b4683adae.tar.bz2 | |
Added version info to WebUI
R=xiyuan@chromium.org
BUG=chromium-os:18608
TEST=Verify that on WebUI OOBE and Login pages there's version info label.
Review URL: http://codereview.chromium.org/7564028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95406 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/resources/chromeos')
| -rw-r--r-- | chrome/browser/resources/chromeos/login/oobe.css | 11 | ||||
| -rw-r--r-- | chrome/browser/resources/chromeos/login/oobe.html | 4 | ||||
| -rw-r--r-- | chrome/browser/resources/chromeos/login/oobe.js | 9 |
3 files changed, 24 insertions, 0 deletions
diff --git a/chrome/browser/resources/chromeos/login/oobe.css b/chrome/browser/resources/chromeos/login/oobe.css index a3480ca..dc3470f 100644 --- a/chrome/browser/resources/chromeos/login/oobe.css +++ b/chrome/browser/resources/chromeos/login/oobe.css @@ -524,3 +524,14 @@ body.login-display #progress { html[dir=rtl] .error-message { background-position: right top; } + +#version-labels { + -webkit-transition: all .5s linear; + bottom: 10px; + color: #999; + font-size: 11px; + left: 10px; + opacity: 1.0; + position: absolute; + text-shadow: 0 1px 1px #fff; +} diff --git a/chrome/browser/resources/chromeos/login/oobe.html b/chrome/browser/resources/chromeos/login/oobe.html index 71b48a6..36dcf3a 100644 --- a/chrome/browser/resources/chromeos/login/oobe.html +++ b/chrome/browser/resources/chromeos/login/oobe.html @@ -63,6 +63,10 @@ </div> </div> </div> + <div id="version-labels"> + <div id="version"></div> + <div id="boot-times"></div> + </div> <div id="security-info"> <a id="security-link" href="#" i18n-content="eulaSystemSecuritySetting"></a> </div> diff --git a/chrome/browser/resources/chromeos/login/oobe.js b/chrome/browser/resources/chromeos/login/oobe.js index 533ac9e..0afd056 100644 --- a/chrome/browser/resources/chromeos/login/oobe.js +++ b/chrome/browser/resources/chromeos/login/oobe.js @@ -510,6 +510,15 @@ cr.define('cr.ui', function() { } }; + /** + * Sets text content for a div with |labelId|. + * @param {string} labelId Id of the label div. + * @param {string} labelText Text for the label. + */ + Oobe.setLabelText = function(labelId, labelText) { + $(labelId).textContent = labelText; + }; + // Export return { Oobe: Oobe |