diff options
| author | satorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-20 05:35:34 +0000 |
|---|---|---|
| committer | satorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-20 05:35:34 +0000 |
| commit | 1076a3a38a7ee2482ed767514a4fdedc3931a0dc (patch) | |
| tree | 7a8574555ad1675e923a979a74ea60a55e98811b | |
| parent | d2b3b07bb00ff723fb018a541f00592c1f3b7ac0 (diff) | |
| download | chromium_src-1076a3a38a7ee2482ed767514a4fdedc3931a0dc.zip chromium_src-1076a3a38a7ee2482ed767514a4fdedc3931a0dc.tar.gz chromium_src-1076a3a38a7ee2482ed767514a4fdedc3931a0dc.tar.bz2 | |
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
5 files changed, 104 insertions, 4 deletions
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 </message> + <message name="IDS_OPTIONS_SETTINGS_LANGUAGES_ADD_BUTTON" + desc="The label for the add button for adding a language"> + Add + </message> <message name="IDS_OPTIONS_SETTINGS_LANGUAGES_REMOVE_BUTTON" desc="The label for the remove button for removing a language"> 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) { <link rel="stylesheet" href="options/content_settings_page.css"> <if expr="pp_ifdef('chromeos')"> <link rel="stylesheet" href="options/chromeos_accounts_options_page.css"> + <link rel="stylesheet" href="options/chromeos_language_options.css"> </if> </head> <body i18n-values=".style.fontFamily:fontfamily;.style.fontSize:fontsize"> 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 @@ +<link rel="stylesheet" href="chrome://resources/css/list.css"> + <div class="page hidden" id="languagePage"> <h1 i18n-content="languagePage"></h1> - <!-- TO BE IMPLEMENTED. --> + <div class="language-options"> + <div class="language-options-left"> + <h3 i18n-content="languages"></h3> + <list id="language-options-list"> + <!-- TODO: The contents should be dynamically changed. --> + <li>English (United States)</li> + <li>Spanish</li> + <li>French</li> + <li>Japanese</li> + </list> + <div class="language-options-lower-left"> + <button id="add-button" i18n-content="add_button"></button> + <button id="remove-button" i18n-content="remove_button"></button> + </div> + </div> + <div class="language-options-right"> + <!-- TODO: The contents should be dynamically changed. --> + <h3>English (United States)</h3> + <div class="language-options-contents"> + <button id="ui-language-button" + i18n-content="display_in_this_language"></button> + </div> + <h3 i18n-content="input_method"></h3> + <div class="language-options-contents"> + <!-- TODO: The contents should be dynamically changed. --> + <label><input type="checkbox">US English</label> + <label><input type="checkbox">Dvorak</label> + <label><input type="checkbox">Dvorak - Left</label> + <label><input type="checkbox">Dvorak - Right</label> + </div> + </div> + </div> </div> |