diff options
author | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-23 16:42:24 +0000 |
---|---|---|
committer | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-23 16:42:24 +0000 |
commit | 91460049b14fe9490c30d58899e7806d3e249582 (patch) | |
tree | 92ae6774c071c9d05622153527ec6e938b138bca /chrome/browser/resources | |
parent | f0095fef47ebee9295d80ca284cf4da6ed58f622 (diff) | |
download | chromium_src-91460049b14fe9490c30d58899e7806d3e249582.zip chromium_src-91460049b14fe9490c30d58899e7806d3e249582.tar.gz chromium_src-91460049b14fe9490c30d58899e7806d3e249582.tar.bz2 |
DOMUI prefs: Add and wire up a stub overlay for adding a startup page.
BUG=49090
TEST=The "Add..." button on the Basics page of DOMUI options should bring up an empty overlay.
Review URL: http://codereview.chromium.org/3020021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53479 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/resources')
6 files changed, 56 insertions, 2 deletions
diff --git a/chrome/browser/resources/options.html b/chrome/browser/resources/options.html index e34ef38..4a76423 100644 --- a/chrome/browser/resources/options.html +++ b/chrome/browser/resources/options.html @@ -33,6 +33,7 @@ <script src="options/personal_options.js"></script> <script src="options/content_settings_ui.js"></script> <script src="options/content_settings.js"></script> +<script src="options/add_startup_page_overlay.js"></script> <script src="options/clear_browser_data_overlay.js"></script> <script src="options/font_settings_overlay.js"></script> <script> @@ -63,6 +64,7 @@ function load() { OptionsPage.register(PersonalOptions.getInstance()); OptionsPage.register(AdvancedOptions.getInstance()); OptionsPage.registerSubPage(ContentSettings.getInstance()); + OptionsPage.registerOverlay(AddStartupPageOverlay.getInstance()); OptionsPage.registerOverlay(ClearBrowserDataOverlay.getInstance()); OptionsPage.registerOverlay(FontSettingsOverlay.getInstance()); @@ -114,6 +116,7 @@ window.onpopstate = function(e) { </div> <div id="overlay" class="overlay hidden"> <div id="overlayview"> + <include src="options/add_startup_page_overlay.html"> <include src="options/clear_browser_data_overlay.html"> <include src="options/font_settings_overlay.html"> <if expr="pp_ifdef('chromeos')"> diff --git a/chrome/browser/resources/options/add_startup_page_overlay.html b/chrome/browser/resources/options/add_startup_page_overlay.html new file mode 100644 index 0000000..014da75f --- /dev/null +++ b/chrome/browser/resources/options/add_startup_page_overlay.html @@ -0,0 +1,16 @@ +<div class="page hidden" id="addStartupPageOverlay"> + <h1 i18n-content="addStartupPageTitle"></h1> + + <div class="button-strip"> + <if expr="os != 'darwin'"> + <button id="addStartupPageOkayButton" disabled + i18n-content="ok_label"></button> + </if> + <button id="addStartupPageCancelButton" + i18n-content="addStartupPageCancelButton"></button> + <if expr="os == 'darwin'"> + <button id="addStartupPageAddButton" disabled + i18n-content="addStartupPageAddButton"></button> + </if> + </div> +</div> diff --git a/chrome/browser/resources/options/add_startup_page_overlay.js b/chrome/browser/resources/options/add_startup_page_overlay.js new file mode 100644 index 0000000..24f00c3 --- /dev/null +++ b/chrome/browser/resources/options/add_startup_page_overlay.js @@ -0,0 +1,31 @@ +// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +/** + * AddStartupPageOverlay class + * Encapsulated handling of the 'Add Page' overlay page. + * @class + */ +function AddStartupPageOverlay() { + OptionsPage.call(this, 'addStartupPageOverlay', + templateData.addStartupPageTitle, + 'addStartupPageOverlay'); +} + +cr.addSingletonGetter(AddStartupPageOverlay); + +AddStartupPageOverlay.prototype = { + __proto__: OptionsPage.prototype, + + /** + * Initializes the page. + */ + initializePage: function() { + OptionsPage.prototype.initializePage.call(this); + + $('addStartupPageCancelButton').onclick = function(e) { + OptionsPage.clearOverlays(); + }; + } +}; diff --git a/chrome/browser/resources/options/browser_options.html b/chrome/browser/resources/options/browser_options.html index 6d115d2..38b434f 100644 --- a/chrome/browser/resources/options/browser_options.html +++ b/chrome/browser/resources/options/browser_options.html @@ -15,7 +15,7 @@ <div class="suboption"> <select id="startupPages" size="3"> </select><br> - <button id="startupAddButton" disabled + <button id="startupAddButton" i18n-content="startupAddButton"></button> <button id="startupRemoveButton" disabled i18n-content="startupRemoveButton"></button> diff --git a/chrome/browser/resources/options/browser_options.js b/chrome/browser/resources/options/browser_options.js index 82b8b40..9d9d412 100644 --- a/chrome/browser/resources/options/browser_options.js +++ b/chrome/browser/resources/options/browser_options.js @@ -25,7 +25,7 @@ BrowserOptions.prototype = { // Wire up buttons. $('startupAddButton').onclick = function(event) { - // TODO(stuartmorgan): Spawn add sub-dialog. + OptionsPage.showOverlay('addStartupPageOverlay'); }; $('startupRemoveButton').onclick = function(event) { // TODO(stuartmorgan): Remove selected element(s). diff --git a/chrome/browser/resources/options/options_page.css b/chrome/browser/resources/options/options_page.css index c54adf7..d547810 100644 --- a/chrome/browser/resources/options/options_page.css +++ b/chrome/browser/resources/options/options_page.css @@ -36,6 +36,10 @@ height: 20px; } +#overlayview .button-strip { + text-align: end; +} + #overlayview { background: white; border-radius: 5px; |