summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authorstuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-02 19:58:29 +0000
committerstuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-02 19:58:29 +0000
commit62fe65807ecd824b2c49671eaadd819b6e7e7463 (patch)
tree0f84bf542827c389ea40dd852750cddc19343ecd /chrome/browser
parentd8a6b65f0b2dc770acb206535e8c447092c571d1 (diff)
downloadchromium_src-62fe65807ecd824b2c49671eaadd819b6e7e7463.zip
chromium_src-62fe65807ecd824b2c49671eaadd819b6e7e7463.tar.gz
chromium_src-62fe65807ecd824b2c49671eaadd819b6e7e7463.tar.bz2
DOMUI prefs: Remove use of tables for layout in Personal pane
In addition clean up the JS for showing/hiding sections of controls so that it's class-based rather than manipulating raw styles. Also fixes registration order of the top-level prefs (where order matter). BUG=None TEST=DOMUI Personal prefs still display and work correctly. Review URL: http://codereview.chromium.org/3037030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54590 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/resources/options.html3
-rw-r--r--chrome/browser/resources/options/personal_options.css6
-rw-r--r--chrome/browser/resources/options/personal_options.html217
-rw-r--r--chrome/browser/resources/options/personal_options.js34
4 files changed, 104 insertions, 156 deletions
diff --git a/chrome/browser/resources/options.html b/chrome/browser/resources/options.html
index 3705ac4..9e94384 100644
--- a/chrome/browser/resources/options.html
+++ b/chrome/browser/resources/options.html
@@ -93,9 +93,9 @@ function load() {
// 'languagePinyinPage'));
}
- OptionsPage.register(AdvancedOptions.getInstance());
OptionsPage.register(BrowserOptions.getInstance());
OptionsPage.register(PersonalOptions.getInstance());
+ OptionsPage.register(AdvancedOptions.getInstance());
OptionsPage.registerSubPage(ContentSettings.getInstance());
OptionsPage.registerSubPage(SearchEngineManager.getInstance());
OptionsPage.registerOverlay(AddStartupPageOverlay.getInstance());
@@ -147,7 +147,6 @@ window.onpopstate = function(e) {
<link rel="stylesheet" href="options/chromeos_internet_options_page.css">
<link rel="stylesheet" href="options/chromeos_language_options.css">
</if>
-<link rel="stylesheet" href="options/personal_options.css">
</head>
<body i18n-values=".style.fontFamily:fontfamily;.style.fontSize:fontsize">
<div class="header">
diff --git a/chrome/browser/resources/options/personal_options.css b/chrome/browser/resources/options/personal_options.css
deleted file mode 100644
index 414e0ed..0000000
--- a/chrome/browser/resources/options/personal_options.css
+++ /dev/null
@@ -1,6 +0,0 @@
-#text-when-synced, #button-when-synced {
- display: none;
-}
-#text-when-not-synced, #button-when-not-synced {
- display: none;
-}
diff --git a/chrome/browser/resources/options/personal_options.html b/chrome/browser/resources/options/personal_options.html
index a6eff2b..9f907c3 100644
--- a/chrome/browser/resources/options/personal_options.html
+++ b/chrome/browser/resources/options/personal_options.html
@@ -3,147 +3,108 @@
<section>
<h3 i18n-content="sync_section"></h3>
- <table class="option-control-table">
- <tr id="text-when-not-synced">
- <td>
- <div class="section-text" id="sync_not_setup_info"
- i18n-content="sync_not_setup_info"/>
- </td>
- </tr>
- <tr id="button-when-not-synced">
- <td>
+ <div>
+ <div id="not-synced-controls" class="hidden">
+ <div class="section-text" id="sync_not_setup_info"
+ i18n-content="sync_not_setup_info"></div>
+ <div>
<button id="start-sync" i18n-content="start_sync"></button>
- </td>
- </tr>
- <tr id="text-when-synced">
- <td>
- <div class="section-text" id="synced_to_user_with_time"/>
- </td>
- </tr>
- <tr id="button-when-synced">
- <td>
+ </div>
+ </div>
+ <div id="synced-controls" class="hidden">
+ <div class="section-text" id="synced_to_user_with_time"></div>
+ <div>
<button id="stop-sync" i18n-content="stop_sync"></button>
<button id="sync-customize" i18n-content="sync_customize"></button>
- </td>
- </tr>
- </table>
+ </div>
+ </div>
+ </div>
</section>
<section>
<h3 i18n-content="passwords"></h3>
- <table class="option-control-table">
- <tr>
- <td class="option-name">
- <label>
- <input id="passwords_asktosave"
- name="passwords_radio"
- pref="profile.password_manager_enabled"
- type="radio" value="true">
- <span i18n-content="passwords_asktosave"></span>
- </label>
- </td>
- </tr>
- <tr>
- <td class="option-name">
- <label>
- <input id="passwords_neversave"
- name="passwords_radio"
- pref="profile.password_manager_enabled"
- type="radio" value="false">
- <span i18n-content="passwords_neversave"></span>
- </label>
- </td>
- </tr>
- <tr><td>
- <button id="showpasswords" i18n-content="showpasswords"></button>
- </td></tr>
- </table>
+ <div>
+ <label>
+ <input id="passwords_asktosave"
+ name="passwords_radio"
+ pref="profile.password_manager_enabled"
+ type="radio" value="true">
+ <span i18n-content="passwords_asktosave"></span>
+ </label>
+ <label>
+ <input id="passwords_neversave"
+ name="passwords_radio"
+ pref="profile.password_manager_enabled"
+ type="radio" value="false">
+ <span i18n-content="passwords_neversave"></span>
+ </label>
+ <div><button id="showpasswords"
+ i18n-content="showpasswords"></button></div>
+ </div>
</section>
<section>
<h3 i18n-content="autofill"></h3>
- <table class="option-control-table">
- <tr>
- <td class="option-name">
- <label>
- <input id="autofill_enable"
- name="autofill_radio"
- pref="autofill.enabled"
- type="radio" value="true">
- <span i18n-content="autofill_enable"></span>
- </label>
- </td>
- </tr>
- <tr>
- <td class="option-name">
- <label>
- <input id="autofill_disable"
- name="autofill_radio"
- pref="autofill.enabled"
- type="radio" value="false">
- <span i18n-content="autofill_disable"></span>
- </label>
- </td>
- </tr>
- <tr><td>
- <button id="autofill_options" i18n-content="autofill_options">
- </button>
- </td></tr>
- </table>
+ <div>
+ <label>
+ <input id="autofill_enable"
+ name="autofill_radio"
+ pref="autofill.enabled"
+ type="radio" value="true">
+ <span i18n-content="autofill_enable"></span>
+ </label>
+ <label>
+ <input id="autofill_disable"
+ name="autofill_radio"
+ pref="autofill.enabled"
+ type="radio" value="false">
+ <span i18n-content="autofill_disable"></span>
+ </label>
+ <div><button id="autofill_options"
+ i18n-content="autofill_options"></button></div>
+ </div>
</section>
<section>
<h3 i18n-content="browsing_data"></h3>
- <table class="option-control-table">
- <tr><td>
- <button id="import_data" i18n-content="import_data"></button>
- </td></tr>
- </table>
+ <div>
+ <button id="import_data" i18n-content="import_data"></button>
+ </div>
</section>
- <if expr="not pp_ifdef('toolkit_views') and (os == 'linux2' or os.find('bsd') != -1)">
- <section>
- <h3 i18n-content="appearance"></h3>
- <table class="option-control-table">
- <tr><td>
- <button id="themes_GTK_button" i18n-content="themes_GTK_button">
- </button>
- <button id="themes_set_classic" i18n-content="themes_set_classic">
- </button>
- <a i18n-content="themes_gallery" target="_blank"
- href="https://tools.google.com/chrome/intl/en/themes/index.html" />
- </td></tr>
- <tr>
- <td class="option-name">
- <label>
- <input name="decorations_radio"
- pref="browser.custom_chrome_frame"
- type="radio" value="false">
- <span i18n-content="showWindow_decorations_radio"></span>
- </label>
- </td>
- </tr>
- <tr>
- <td class="option-name">
- <label>
- <input name="decorations_radio"
- pref="browser.custom_chrome_frame"
- type="radio" value="true">
- <span i18n-content="hideWindow_decorations_radio"></span>
- </label>
- </td>
- </tr>
- </table>
- </section>
- </if>
- <if expr="pp_ifdef('toolkit_views') or os == 'win32' or os == 'darwin'">
- <section>
- <h3 i18n-content="themes"></h3>
- <table class="option-control-table">
- <tr><td>
- <button id="themes_reset" i18n-content="themes_reset"></button>
- <a i18n-content="themes_gallery" target="_blank"
- href="https://tools.google.com/chrome/intl/en/themes/index.html" />
- </td></tr>
- </table>
- </section>
- </if>
+<if expr="not pp_ifdef('toolkit_views') and (os == 'linux2' or os.find('bsd') != -1)">
+ <section>
+ <h3 i18n-content="appearance"></h3>
+ <div>
+ <div>
+ <button id="themes_GTK_button"
+ i18n-content="themes_GTK_button"></button>
+ <button id="themes_set_classic"
+ i18n-content="themes_set_classic"></button>
+ <a i18n-content="themes_gallery" target="_blank"
+ href="https://tools.google.com/chrome/intl/en/themes/index.html"></a>
+ </div>
+ <label>
+ <input name="decorations_radio"
+ pref="browser.custom_chrome_frame"
+ type="radio" value="false">
+ <span i18n-content="showWindow_decorations_radio"></span>
+ </label>
+ <label>
+ <input name="decorations_radio"
+ pref="browser.custom_chrome_frame"
+ type="radio" value="true">
+ <span i18n-content="hideWindow_decorations_radio"></span>
+ </label>
+ </div>
+ </section>
+</if>
+<if expr="pp_ifdef('toolkit_views') or os == 'win32' or os == 'darwin'">
+ <section>
+ <h3 i18n-content="themes"></h3>
+ <div>
+ <button id="themes_reset" i18n-content="themes_reset"></button>
+ <a i18n-content="themes_gallery" target="_blank"
+ href="https://tools.google.com/chrome/intl/en/themes/index.html"></a>
+ </div>
+ </section>
+</if>
</div>
diff --git a/chrome/browser/resources/options/personal_options.js b/chrome/browser/resources/options/personal_options.js
index 7f1e1e0..972fd9f 100644
--- a/chrome/browser/resources/options/personal_options.js
+++ b/chrome/browser/resources/options/personal_options.js
@@ -26,32 +26,26 @@ cr.define('options', function() {
// Call base class implementation to starts preference initialization.
OptionsPage.prototype.initializePage.call(this);
+ $('stop-sync').onclick = function(event) {
+ OptionsPage.showOverlay('stopSyncingOverlay');
+ };
+ $('sync-customize').onclick = function(event) {
+ OptionsPage.showPageByName('sync');
+ };
+ $('start-sync').onclick = function(event) {
+ //TODO(sargrass): Show start-sync subpage, after dhg done.
+ };
+
// Listen to pref changes.
Preferences.getInstance().addEventListener('sync.has_setup_completed',
function(event) {
if(event.value) {
chrome.send('getSyncStatus');
- $('text-when-synced').style.display = 'block';
- $('button-when-synced').style.display = 'block';
- $('stop-sync').onclick = function(event) {
- OptionsPage.showOverlay('stopSyncingOverlay');
- };
-
- $('sync-customize').onclick = function(event) {
- OptionsPage.showPageByName('sync');
- };
-
- $('text-when-not-synced').style.display = 'none';
- $('button-when-not-synced').style.display = 'none';
+ $('synced-controls').classList.remove('hidden');
+ $('not-synced-controls').classList.add('hidden');
} else {
- $('text-when-not-synced').style.display = 'block';
- $('button-when-not-synced').style.display = 'block';
- $('start-sync').onclick = function(event) {
- //TODO(sargrass): Show start-sync subpage, after dhg done.
- };
-
- $('text-when-synced').style.display = 'none';
- $('button-when-synced').style.display = 'none';
+ $('synced-controls').classList.add('hidden');
+ $('not-synced-controls').classList.remove('hidden');
}
});
generated by cgit v1.1 at 2025-03-04 04:03:24 +0000