From 204536c905cfc5bf406acf0bd5c6255b1fa8e4cc Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Thu, 10 Mar 2016 12:11:38 +0100 Subject: [PATCH] Feature #4363: Fix vm create network selector --- src/sunstone/public/app/tabs/provision-tab.js | 2 + .../app/tabs/provision-tab/vms/create.hbs | 41 ++++++++----------- src/sunstone/public/app/utils/nics-section.js | 14 ++++--- src/sunstone/public/scss/_accordion.scss | 4 +- 4 files changed, 29 insertions(+), 32 deletions(-) diff --git a/src/sunstone/public/app/tabs/provision-tab.js b/src/sunstone/public/app/tabs/provision-tab.js index feab23eeff..664030a9fa 100644 --- a/src/sunstone/public/app/tabs/provision-tab.js +++ b/src/sunstone/public/app/tabs/provision-tab.js @@ -1047,6 +1047,8 @@ define(function(require) { show_provision_create_vm(); }); + Foundation.reflow($('#provision_create_vm'), 'accordion'); + // // Create FLOW diff --git a/src/sunstone/public/app/tabs/provision-tab/vms/create.hbs b/src/sunstone/public/app/tabs/provision-tab/vms/create.hbs index 0099fd2445..7ba0c95f2c 100644 --- a/src/sunstone/public/app/tabs/provision-tab/vms/create.hbs +++ b/src/sunstone/public/app/tabs/provision-tab/vms/create.hbs @@ -17,32 +17,29 @@

{{tr "Create Virtual Machine"}}

-
-
+
- -
-
+ +
-
-
- - {{tr "Select a Template"}} -
-
+ +
-
@@ -88,15 +84,10 @@
-
-
-
- - + +
-
-
\ No newline at end of file diff --git a/src/sunstone/public/app/utils/nics-section.js b/src/sunstone/public/app/utils/nics-section.js index 92324b4184..bd3a452e93 100644 --- a/src/sunstone/public/app/utils/nics-section.js +++ b/src/sunstone/public/app/utils/nics-section.js @@ -172,11 +172,11 @@ define(function(require) { ''; } - var dd_context = $('
' + - '' + + var dd_context = $('
' + + '' + nic_span + '' + - '
' + + '
' + '
' + '
' + '

' + @@ -203,6 +203,8 @@ define(function(require) { '

' + '
').appendTo(context); + Foundation.reInit(context); + provision_nic_accordion_dd_id += 1; var provision_networks_datatable = $('.provision_networks_table', dd_context).dataTable({ @@ -367,16 +369,18 @@ define(function(require) { '' + '
' + '' + '
' + '
') + Foundation.reflow(context, 'accordion'); + provision_nic_accordion_id += 1; $(".provision_add_network_interface", context).on("click", function() { diff --git a/src/sunstone/public/scss/_accordion.scss b/src/sunstone/public/scss/_accordion.scss index e010ab233e..afc4026344 100644 --- a/src/sunstone/public/scss/_accordion.scss +++ b/src/sunstone/public/scss/_accordion.scss @@ -2,12 +2,12 @@ .accordion-item { &.is-active { .only-not-active { - display: none; + display: none !important; } } &:not(.is-active) { .only-active { - display: none; + display: none !important; } } }