From ea645a2d7a6b20cf1f08acd5f1bafce30eb8e6ce Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Fri, 18 Mar 2016 19:13:41 +0100 Subject: [PATCH] Feature #4363: Fix dashboard styles --- src/sunstone/public/app/app.js | 4 +- src/sunstone/public/app/sunstone.js | 14 +-- src/sunstone/public/app/sunstone/buttons.hbs | 6 +- .../public/app/sunstone/user_and_zone.hbs | 2 +- src/sunstone/public/app/tabs/dashboard-tab.js | 1 - .../public/app/tabs/dashboard-tab/hosts.hbs | 85 ++++++-------- .../public/app/tabs/dashboard-tab/network.hbs | 44 +++----- .../public/app/tabs/dashboard-tab/storage.hbs | 42 +++---- .../public/app/tabs/dashboard-tab/users.hbs | 76 ++++++------- .../public/app/tabs/dashboard-tab/vms.hbs | 104 +++++++----------- .../public/app/tabs/hosts-tab/datatable.js | 33 +++--- src/sunstone/public/scss/_fieldset.scss | 24 +++- src/sunstone/public/scss/_menu.scss | 2 + src/sunstone/public/scss/_settings.scss | 2 +- src/sunstone/public/scss/_top-row.scss | 14 ++- src/sunstone/public/scss/app.scss | 6 +- 16 files changed, 208 insertions(+), 251 deletions(-) diff --git a/src/sunstone/public/app/app.js b/src/sunstone/public/app/app.js index c13c64f257..b17b159742 100644 --- a/src/sunstone/public/app/app.js +++ b/src/sunstone/public/app/app.js @@ -18,7 +18,7 @@ define(function(require) { require('jquery'); require('foundation'); - Foundation.Dropdown.defaults.positionClass = 'bottom'; + Foundation.Dropdown.defaults.positionClass = 'left'; Foundation.Dropdown.defaults.closeOnClick = true; Foundation.DropdownMenu.defaults.closeOnClick = true; Foundation.DropdownMenu.defaults.disableHover = true; @@ -161,7 +161,7 @@ define(function(require) { }); $(".user-zone-info a.configuration").click(function() { - $(document).foundation('dropdown', 'closeall'); + //$(document).foundation('dropdown', 'closeall'); Sunstone.showTab(SETTINGS_TAB_ID); }); } diff --git a/src/sunstone/public/app/sunstone.js b/src/sunstone/public/app/sunstone.js index 423478d139..07639b8d67 100644 --- a/src/sunstone/public/app/sunstone.js +++ b/src/sunstone/public/app/sunstone.js @@ -514,28 +514,28 @@ define(function(require) { var _showRighList = function(tabName) { var tab = $('#' + tabName); $(".tab").hide(); - tab.show(); + tab.fadeIn(); $(".right-info", tab).hide(); $(".right-form", tab).hide(); - $(".right-list", tab).show(); + $(".right-list", tab).fadeIn(); $(".only-right-info", tab).hide(); $(".only-right-form", tab).hide(); - $(".only-right-list", tab).show(); + $(".only-right-list", tab).fadeIn(); $('.action_blocks', tab).removeClass('large-12').addClass('large-9'); }; var _showRighInfo = function(tabName) { var tab = $('#' + tabName); $(".tab").hide(); - tab.show(); + tab.fadeIn(); $(".right-list", tab).hide(); $(".right-form", tab).hide(); - $(".right-info", tab).show(); + $(".right-info", tab).fadeIn(); $(".only-right-list", tab).hide(); $(".only-right-form", tab).hide(); - $(".only-right-info", tab).show(); + $(".only-right-info", tab).fadeIn(); $('.action_blocks', tab).removeClass('large-9').addClass('large-12'); } @@ -938,7 +938,7 @@ define(function(require) { $(".right-form-title", context).text(formPanelInstance.title()); $(".submit_button", context).text(formPanelInstance.buttonText()); - $("div[form-panel-id="+formPanelInstance.formPanelId+"]", context).show(); + $("div[form-panel-id="+formPanelInstance.formPanelId+"]", context).fadeIn(); } } diff --git a/src/sunstone/public/app/sunstone/buttons.hbs b/src/sunstone/public/app/sunstone/buttons.hbs index 31f0510d12..709458f09b 100644 --- a/src/sunstone/public/app/sunstone/buttons.hbs +++ b/src/sunstone/public/app/sunstone/buttons.hbs @@ -14,7 +14,6 @@ {{! limitations under the License. }} {{! -------------------------------------------------------------------------- }} -
{{#unless customContext}} @@ -35,7 +34,7 @@ - + @@ -61,7 +60,7 @@ - + @@ -88,5 +87,4 @@ -
diff --git a/src/sunstone/public/app/sunstone/user_and_zone.hbs b/src/sunstone/public/app/sunstone/user_and_zone.hbs index e113b93c36..ade9bf2e6f 100644 --- a/src/sunstone/public/app/sunstone/user_and_zone.hbs +++ b/src/sunstone/public/app/sunstone/user_and_zone.hbs @@ -14,7 +14,7 @@ {{! limitations under the License. }} {{! -------------------------------------------------------------------------- }} -