From 4dcd90b188927760b007d7154cf3653ebf6fe238 Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Fri, 18 Mar 2016 11:02:34 +0100 Subject: [PATCH] Feature #4363: Fix multiple select table --- .../create/wizard-tabs/scheduling.js | 4 +-- .../create/wizard-tabs/scheduling/html.hbs | 2 +- .../public/app/utils/tab-datatable.js | 6 ++++ .../public/app/utils/tab-datatable/table.hbs | 28 ++++++++----------- src/sunstone/public/scss/app.scss | 2 +- 5 files changed, 22 insertions(+), 20 deletions(-) diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/scheduling.js b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/scheduling.js index 2b6e6b5350..8806427195 100644 --- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/scheduling.js +++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/scheduling.js @@ -93,11 +93,11 @@ define(function(require) { context.on("change", "input[name='req_select']", function() { if ($("input[name='req_select']:checked").val() == "host_select") { - $("div.host_select", context).toggle(); + $("div.host_select", context).show(); $("div.cluster_select", context).hide(); } else { $("div.host_select", context).hide(); - $("div.cluster_select", context).toggle(); + $("div.cluster_select", context).show(); } }); diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/scheduling/html.hbs b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/scheduling/html.hbs index 44a7d76f20..e7fa777310 100644 --- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/scheduling/html.hbs +++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/scheduling/html.hbs @@ -39,7 +39,7 @@
- +
diff --git a/src/sunstone/public/app/utils/tab-datatable.js b/src/sunstone/public/app/utils/tab-datatable.js index b5df16d055..7014166ae0 100644 --- a/src/sunstone/public/app/utils/tab-datatable.js +++ b/src/sunstone/public/app/utils/tab-datatable.js @@ -638,6 +638,12 @@ define(function(require) { $('#selected_resource_multiple_' + that.dataTableId, section).hide(); $('#select_resource_multiple_' + that.dataTableId, section).show(); + } else { + $('#selected_resource_' + that.dataTableId, section).hide(); + $('#select_resource_' + that.dataTableId, section).show(); + + $('#selected_resource_multiple_' + that.dataTableId, section).hide(); + $('#select_resource_multiple_' + that.dataTableId, section).hide(); } $('#selected_resource_name_' + that.dataTableId, section).hide(); diff --git a/src/sunstone/public/app/utils/tab-datatable/table.hbs b/src/sunstone/public/app/utils/tab-datatable/table.hbs index fe3b3e73ba..aec94705bd 100644 --- a/src/sunstone/public/app/utils/tab-datatable/table.hbs +++ b/src/sunstone/public/app/utils/tab-datatable/table.hbs @@ -17,13 +17,21 @@
{{! TODO: show also refresh and search box when {info: true} is used in panels}} {{#if conf.select}} -
+
+
+ + + + + + +
+
+ +
-
- -
{{/if}} @@ -39,16 +47,4 @@
- {{#if conf.select}} -
-
- - - - - - -
-
- {{/if}}
diff --git a/src/sunstone/public/scss/app.scss b/src/sunstone/public/scss/app.scss index 1157ca983a..2f716ddf12 100644 --- a/src/sunstone/public/scss/app.scss +++ b/src/sunstone/public/scss/app.scss @@ -69,7 +69,7 @@ a { label { i { - color: $dark-gray; + color: $medium-gray; } }