From 1076a3a38a7ee2482ed767514a4fdedc3931a0dc Mon Sep 17 00:00:00 2001 From: "satorux@chromium.org" Date: Tue, 20 Jul 2010 05:35:34 +0000 Subject: Write HTML and CSS for Languages and Input options, based on Cole's mock. Still no logic implemented, but it's nice to have something looking pretty. :) The current screenshot can be found at: http://chromium-os.googlecode.com/issues/attachment?aid=6893314955718114103&name=domui.png&token=09541fa12341c817ca5b2ecff2e5d463&inline=1 BUG=chromium-os:4573 TEST=manually Review URL: http://codereview.chromium.org/2836052 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53008 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/app/generated_resources.grd | 4 ++ .../chromeos/dom_ui/language_options_handler.cc | 5 +- chrome/browser/resources/options.html | 1 + .../options/chromeos_language_options.css | 63 ++++++++++++++++++++++ .../options/chromeos_language_options.html | 35 +++++++++++- 5 files changed, 104 insertions(+), 4 deletions(-) create mode 100644 chrome/browser/resources/options/chromeos_language_options.css diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index 19dd3c6..c22b34f 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -8427,6 +8427,10 @@ Keep your key file in a safe place. You will need it to create new versions of y desc="The label for the add language combobox"> Add language + + Add + Remove diff --git a/chrome/browser/chromeos/dom_ui/language_options_handler.cc b/chrome/browser/chromeos/dom_ui/language_options_handler.cc index 7c7da5e..c78cccc 100644 --- a/chrome/browser/chromeos/dom_ui/language_options_handler.cc +++ b/chrome/browser/chromeos/dom_ui/language_options_handler.cc @@ -21,9 +21,8 @@ void LanguageOptionsHandler::GetLocalizedValues( DCHECK(localized_strings); localized_strings->SetString(L"languagePage", l10n_util::GetString(IDS_OPTIONS_SETTINGS_LANGUAGES_DIALOG_TITLE)); - localized_strings->SetString(L"add_language", - l10n_util::GetString( - IDS_OPTIONS_SETTINGS_LANGUAGES_ADD_LANGUAGE_COMBOBOX)); + localized_strings->SetString(L"add_button", + l10n_util::GetString(IDS_OPTIONS_SETTINGS_LANGUAGES_ADD_BUTTON)); localized_strings->SetString(L"configure", l10n_util::GetString(IDS_OPTIONS_SETTINGS_LANGUAGES_CONFIGURE)); localized_strings->SetString(L"input_method", diff --git a/chrome/browser/resources/options.html b/chrome/browser/resources/options.html index 596213b..e78d3c5 100644 --- a/chrome/browser/resources/options.html +++ b/chrome/browser/resources/options.html @@ -100,6 +100,7 @@ window.onpopstate = function(e) { + diff --git a/chrome/browser/resources/options/chromeos_language_options.css b/chrome/browser/resources/options/chromeos_language_options.css new file mode 100644 index 0000000..24b543d --- /dev/null +++ b/chrome/browser/resources/options/chromeos_language_options.css @@ -0,0 +1,63 @@ +.language-options { + display: -webkit-box; + margin: 15px; +} + +.language-options button { + min-width: 70px; +} + +.language-options h3 { + -webkit-margin-start: 12px; + font-size: 75%; + font-weight: bold; + margin-top: 12px; +} + +.language-options label { + display: block; +} + +.language-options-contents { + -webkit-padding-start: 12px; + padding-bottom: 10px; +} + +.language-options-left, .language-options-right { + border: 1px solid #cccccc; + vertical-align: top; + padding: 0px; + height: 400px; +} + +.language-options-left { + -webkit-box-orient: vertical; + display: -webkit-box; + background-color: #ebeff9; + min-width: 200px; +} + +.language-options-lower-left { + -webkit-box-flex: 0; + -webkit-padding-start: 12px; + padding-bottom: 10px; +} + +.language-options-right { + /* To share the center line with the left pane. */ + -webkit-margin-start: -1px; + min-width: 300px; +} + +#language-options-list { + -webkit-box-flex: 1; + padding: 0px; + width: 100%; + display: block; +} + +#language-options-list li { + -webkit-padding-start: 12px; + padding-top: 2px; + padding-bottom: 2px; +} diff --git a/chrome/browser/resources/options/chromeos_language_options.html b/chrome/browser/resources/options/chromeos_language_options.html index c09fffc..7d8ef823 100644 --- a/chrome/browser/resources/options/chromeos_language_options.html +++ b/chrome/browser/resources/options/chromeos_language_options.html @@ -1,4 +1,37 @@ + + -- cgit v1.1