diff options
| author | satorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-24 06:22:25 +0000 |
|---|---|---|
| committer | satorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-24 06:22:25 +0000 |
| commit | 0766be5b872ca6e416338639eaae68eb4c42d36d (patch) | |
| tree | 42135933aad2966c463e4dd2c2a7be5cd4a9964d /chrome/browser/resources | |
| parent | 0e4dcafd7ef96ac39685301883b0626335e996df (diff) | |
| download | chromium_src-0766be5b872ca6e416338639eaae68eb4c42d36d.zip chromium_src-0766be5b872ca6e416338639eaae68eb4c42d36d.tar.gz chromium_src-0766be5b872ca6e416338639eaae68eb4c42d36d.tar.bz2 | |
Fix the release channel switching UI for Chrome OS.
Remove "canary" as it's not yet supported as of now.
Add warning text on the channel swtiching UI.
BUG=chromium-os:9597
TEST=confirmed that the canary is gone and the warning text appears.
Review URL: http://codereview.chromium.org/5256003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67228 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/resources')
| -rw-r--r-- | chrome/browser/resources/options/about_page.css | 5 | ||||
| -rw-r--r-- | chrome/browser/resources/options/about_page.html | 20 |
2 files changed, 18 insertions, 7 deletions
diff --git a/chrome/browser/resources/options/about_page.css b/chrome/browser/resources/options/about_page.css index b0148dd..ebd170a 100644 --- a/chrome/browser/resources/options/about_page.css +++ b/chrome/browser/resources/options/about_page.css @@ -23,3 +23,8 @@ .update-icon.up-to-date { background-image: url('../../../app/theme/update_uptodate.png'); } + +#channel-warning { + color: red; + font-weight: bold; +} diff --git a/chrome/browser/resources/options/about_page.html b/chrome/browser/resources/options/about_page.html index d531815..9c753aa 100644 --- a/chrome/browser/resources/options/about_page.html +++ b/chrome/browser/resources/options/about_page.html @@ -20,13 +20,19 @@ <div class="hidden" id="aboutPageMoreInfo"> <section> <h3 i18n-content="channel"></h3> - <select id="channelSelect"> - <!-- There is no "release" channel at this moment --> - <!-- <option value="release" i18n-content="release"></option> --> - <option value="beta-channel" i18n-content="beta"></option> - <option value="dev-channel" i18n-content="development"></option> - <option value="canary-channel" i18n-content="canary"></option> - </select> + <div> + <div> + <span id="channel-warning" + i18n-content="channel_warning_header"></span> + <span i18n-content="channel_warning_text"></span> + </div> + <select id="channelSelect"> + <!-- There is no "release" channel at this moment --> + <!-- <option value="release" i18n-content="release"></option> --> + <option value="beta-channel" i18n-content="beta"></option> + <option value="dev-channel" i18n-content="development"></option> + </select> + </div> </section> <section> <h3 i18n-content="os"></h3> |