From afa12f478e08b523e2a45f73164d06b3cacfeff1 Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Wed, 2 Mar 2016 18:39:54 +0100 Subject: [PATCH] Feature #4363: Fix tabs plugin in Group create form --- .../app/tabs/groups-tab/form-panels/create.js | 4 +- .../groups-tab/form-panels/create/wizard.hbs | 312 ++++++++++-------- 2 files changed, 177 insertions(+), 139 deletions(-) diff --git a/src/sunstone/public/app/tabs/groups-tab/form-panels/create.js b/src/sunstone/public/app/tabs/groups-tab/form-panels/create.js index d6160b0c92..323f19af4e 100644 --- a/src/sunstone/public/app/tabs/groups-tab/form-panels/create.js +++ b/src/sunstone/public/app/tabs/groups-tab/form-panels/create.js @@ -146,7 +146,9 @@ define(function(require) { function _setup(context) { var that = this; - context.foundation('tab', 'reflow'); + //context.foundation('tabs'); + Foundation.reflow(context, 'tabs'); + this.userCreation.setup( $("#admin_user_wrapper",context) ); Tips.setup(context); diff --git a/src/sunstone/public/app/tabs/groups-tab/form-panels/create/wizard.hbs b/src/sunstone/public/app/tabs/groups-tab/form-panels/create/wizard.hbs index ad92dcad2d..cf0a0910de 100644 --- a/src/sunstone/public/app/tabs/groups-tab/form-panels/create/wizard.hbs +++ b/src/sunstone/public/app/tabs/groups-tab/form-panels/create/wizard.hbs @@ -13,164 +13,200 @@ {{! See the License for the specific language governing permissions and }} {{! limitations under the License. }} {{! -------------------------------------------------------------------------- }} -
-
-
-
-
-
-
-

- {{tr "Allow users in this group to use the following Sunstone views"}} -  {{tr "Views available to the group users. If the default is unset, the one set in sunstone-views.yaml will be used"}} -

-
+
+
+ +
{{tr "Views"}}
+
+
+ +
{{tr "Admin"}}
+
+
+ + +
{{tr "Permissions"}}
+
+
-
-
-
-
- - -
-
- - -
+
+
+
+
+
+

+ {{tr "Allow users in this group to use the following Sunstone views"}} +   + + {{tr "Views available to the group users. If the default is unset, the one set in sunstone-views.yaml will be used"}} + +

-
- {{#each viewTypes}} -
-
-

{{name}} +

+
+
+
+
+ + +
+
+ + +
+
+
+ {{#each viewTypes}} +
+
+

+ {{name}} {{#if description}} - {{description}} - {{/if}} -

- - - - - - - {{#each views}} - - + + + + + + + + + + +
{{tr "Group Users"}}{{tr "Group Admins"}}
- {{name}} {{tr "View"}} + {{description}} + {{/if}} + + + + + + + + {{#each views}} + + - + - + + + {{/each}} +
{{tr "Group Users"}}{{tr "Group Admins"}}
+ {{name}} {{tr "View"}} {{#if description}} - {{description}} - {{/if}} - - {{description}} + {{/if}} + + - - + + -
+ +
+ {{#if preview}} + {{/if}}
+ +
{{/each}} + + +
+
+
+
+
+ +
+
+ {{{userCreationHTML}}} +
+
+
+
+
+
+ +
+
+
+
+

+ {{tr "Allow users in this group to create the following resources"}} +   + + {{tr "This will create new ACL Rules to define which virtual resources this group's users will be able to create."}} + +

+
+
+
+
+ + + + + + + + + + - {{/each}} -
{{tr "VMs"}}{{tr "VNets"}}{{tr "Security Groups"}}{{tr "Virtual Routers"}}{{tr "Images"}}{{tr "Templates"}} + {{tr "Documents"}} + + {{tr "Documents are a special tool used for general purposes, mainly by OneFlow. If you want to enable users of this group to use service composition via OneFlow, let it checked."}} + +
-
-
- {{#if preview}} - - {{/if}} -
+ +
+ + + + + + + + + + + + + + +
-
- {{/each}}
-
-
-
-
-
- -
-
- {{{userCreationHTML}}} + -
-
-
- -
-
-
-
-

- {{tr "Allow users in this group to create the following resources"}} -  {{tr "This will create new ACL Rules to define which virtual resources this group's users will be able to create."}} -

-
-
-
-
- - - - - - - - - - - - - - - - - - - - - -
{{tr "VMs"}}{{tr "VNets"}}{{tr "Security Groups"}}{{tr "Virtual Routers"}}{{tr "Images"}}{{tr "Templates"}}{{tr "Documents"}}{{tr "Documents are a special tool used for general purposes, mainly by OneFlow. If you want to enable users of this group to use service composition via OneFlow, let it checked."}}
-
-
-
-
-
- - + \ No newline at end of file