Repository: stratos Updated Branches: refs/heads/master b3c2f4ed0 -> 8683ac9e5
add view option button for all configuration types Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/932cba64 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/932cba64 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/932cba64 Branch: refs/heads/master Commit: 932cba6472f75f2a65255f188114b017ffec63e2 Parents: 89e7bfb Author: Dakshika Jayathilaka <[email protected]> Authored: Wed Nov 26 18:06:07 2014 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Thu Nov 27 14:46:57 2014 +0530 ---------------------------------------------------------------------- .../console/configure_form.jag | 44 +++++++++- .../themes/theme0/partials/configure_form.hbs | 88 ++++++++++++++++++-- .../themes/theme0/renderers/configure_form.js | 1 + 3 files changed, 123 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/932cba64/components/org.apache.stratos.manager.console/console/configure_form.jag ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/configure_form.jag b/components/org.apache.stratos.manager.console/console/configure_form.jag index 621cbbb..04b398c 100644 --- a/components/org.apache.stratos.manager.console/console/configure_form.jag +++ b/components/org.apache.stratos.manager.console/console/configure_form.jag @@ -61,9 +61,9 @@ try { error.push({"errorMessage": e.message}); } - +//get the title for view option if (elements.action != 'new' && isEdit) { - formTitle = 'Partition Details - ' + elements.action; + formTitle = formData.title + ' Details - ' + elements.action; } var formtype = elements.formtype; @@ -89,6 +89,14 @@ switch (formtype) { list_data = util.RESTCalls.getPolicyAutoScale(); if (list_data.autoscalePolicy && list_data.autoscalePolicy.length === 0) { list_data = null; + }else{ + formDataEdit = list_data.autoscalePolicy; + for (specNumber in list_data.autoscalePolicy) { + if (list_data.autoscalePolicy[specNumber].id == elements.action) { + formDataEdit = list_data.autoscalePolicy[specNumber]; + } + + } } break; @@ -102,6 +110,14 @@ switch (formtype) { }else{ list_data = null; } + }else{ + formDataEdit = list_data.deploymentPolicy; + for (specNumber in list_data.deploymentPolicy) { + if (list_data.deploymentPolicy[specNumber].id == elements.action) { + formDataEdit = list_data.deploymentPolicy[specNumber]; + } + + } } break; @@ -109,6 +125,14 @@ switch (formtype) { list_data = util.RESTCalls.getLbCartridges(); if (list_data.cartridge && list_data.cartridge.length === 0) { list_data = null; + }else{ + formDataEdit = list_data.cartridge; + for (specNumber in list_data.cartridge) { + if (list_data.cartridge[specNumber].cartridgeType == elements.action) { + formDataEdit = list_data.cartridge[specNumber]; + } + + } } break; @@ -125,6 +149,10 @@ switch (formtype) { i = i - 1; } } + if(list_data.cartridge.length == 0 ){ + list_data = null; + } + } break; @@ -137,6 +165,17 @@ switch (formtype) { case "docker": list_data = util.RESTCalls.getKubernetesGroups(); + if(list_data.kubernetesGroup && list_data.kubernetesGroup.length === 0){ + list_data = null; + }else{ + formDataEdit = list_data.kubernetesGroup; + for (specNumber in list_data.kubernetesGroup) { + if (list_data.kubernetesGroup[specNumber].groupId == elements.action) { + formDataEdit = list_data.kubernetesGroup[specNumber]; + } + + } + } break; default: @@ -160,6 +199,7 @@ var caramelData = { formTitle: formTitle, formDataRaw: JSON.stringify(formDataRaw), formData: JSON.stringify(formData), + formtype:elements.formtype, buttonText: buttonText, list_data: list_data, error: error http://git-wip-us.apache.org/repos/asf/stratos/blob/932cba64/components/org.apache.stratos.manager.console/console/themes/theme0/partials/configure_form.hbs ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/themes/theme0/partials/configure_form.hbs b/components/org.apache.stratos.manager.console/console/themes/theme0/partials/configure_form.hbs index 0fb8ee5..0afbd65 100644 --- a/components/org.apache.stratos.manager.console/console/themes/theme0/partials/configure_form.hbs +++ b/components/org.apache.stratos.manager.console/console/themes/theme0/partials/configure_form.hbs @@ -99,7 +99,18 @@ <h2 class="truncate">{{groupId}} </h2> <div class="toggle-menu-description">{{description}}</div> - + <div class="list-button" style="display: none;"> + <button class="btn btn-info btn-lg hover-details" type="button" id="details_list_{{id}}" + data-url="{{url ""}}/configure/docker/{{groupId}}/" > Details + </button> + </div> + <div class="bottom-bar-wrapper"> + <div class="bottom-bar"> + <button class="btn btn-info btn-lg hover-details" type="button" id="details_{{id}}" + data-url="{{url ""}}/configure/docker/{{groupId}}/" > Details + </button> + </div> + </div> </div> {{/each}} {{#each content_body.sections.serviceDefinitionBean}} @@ -118,10 +129,23 @@ <div class="toggle-menu-icon"> <i class="fa icon-{{cartridgeType}} fa-inbox "></i> </div> - <h2 class="truncate">{{displayName}} </h2> + <h2 class="truncate">{{cartridgeType}} </h2> <div class="toggle-menu-description">{{description}}</div> + <div class="list-button" style="display: none;"> + <button class="btn btn-info btn-lg hover-details" type="button" id="details_list_{{id}}" + data-url="{{url ""}}/configure/{{../formtype}}/{{cartridgeType}}/" > Details + </button> + </div> + <div class="bottom-bar-wrapper"> + <div class="bottom-bar"> + <button class="btn btn-info btn-lg hover-details" type="button" id="details_" + data-url="{{url ""}}/configure/{{../formtype}}/{{cartridgeType}}/" > Details + </button> + + </div> + </div> </div> {{/each}} {{#each content_body.sections.deploymentPolicy}} @@ -132,6 +156,18 @@ <h2 class="truncate">{{id}} </h2> <div class="toggle-menu-description">{{description}}</div> + <div class="list-button" style="display: none;"> + <button class="btn btn-info btn-lg hover-details" type="button" id="details_list_{{id}}" + data-url="{{url ""}}/configure/deployments/{{id}}/" > Details + </button> + </div> + <div class="bottom-bar-wrapper"> + <div class="bottom-bar"> + <button class="btn btn-info btn-lg hover-details" type="button" id="details_{{id}}" + data-url="{{url ""}}/configure/deployments/{{id}}/" > Details + </button> + </div> + </div> </div> {{/each}} {{#each content_body.sections.autoscalePolicy}} @@ -142,21 +178,41 @@ <h2 class="truncate">{{id}} </h2> <div class="toggle-menu-description">{{description}}</div> + <div class="list-button" style="display: none;"> + <button class="btn btn-info btn-lg hover-details" type="button" id="details_list_{{id}}" + data-url="{{url ""}}/configure/autoscalingpolicies/{{id}}/" > Details + </button> + </div> + <div class="bottom-bar-wrapper"> + <div class="bottom-bar"> + <button class="btn btn-info btn-lg hover-details" type="button" id="details_{{id}}" + data-url="{{url ""}}/configure/autoscalingpolicies/{{id}}/" > Details + </button> + </div> + </div> </div> {{/each}} {{#each content_body.sections.partition}} - <a href="{{url ""}}/configure/partitions/{{id}}/" - class="block col-md-4 grid-group-item border-right"> + <div class="block col-md-4 grid-group-item border-right"> <div class="toggle-menu-icon"> <i class="fa fa-th-large"></i> </div> <h2 class="truncate">{{id}} </h2> <div class="toggle-menu-description">{{description}} </div> - <!--<div class="toggle-menu-button"> - <button type="button" class="btn btn-primary" >Remove</button> - </div>--> - </a> + <div class="list-button" style="display: none;"> + <button class="btn btn-info btn-lg hover-details" type="button" id="details_list_{{id}}" + data-url="{{url ""}}/configure/partitions/{{id}}/" > Details + </button> + </div> + <div class="bottom-bar-wrapper"> + <div class="bottom-bar"> + <button class="btn btn-info btn-lg hover-details" type="button" id="details_{{id}}" + data-url="{{url ""}}/configure/partitions/{{id}}/" > Details + </button> + </div> + </div> + </div> {{/each}} </div> </div> @@ -280,8 +336,24 @@ }); + {{else}} + $('.general-table .grid-group-item').hover(function () { + if($(this).hasClass('grid-group-item')) { + $(this).find('.bottom-bar').stop().animate({bottom: '37px'}, 'slow'); + } + }, function () { + if($(this).hasClass('grid-group-item')) { + $(this).find('.bottom-bar').stop().animate({bottom: '-32px'}, 'slow'); + } + }); + + $('.general-table').on('click', '.hover-details', function (event) { + window.location = $(this).attr("data-url"); + }); {{/if}} + + $('#deploy').click(function () { var payload = editor.getValue(); http://git-wip-us.apache.org/repos/asf/stratos/blob/932cba64/components/org.apache.stratos.manager.console/console/themes/theme0/renderers/configure_form.js ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/themes/theme0/renderers/configure_form.js b/components/org.apache.stratos.manager.console/console/themes/theme0/renderers/configure_form.js index 550ef4b..1c198f2 100644 --- a/components/org.apache.stratos.manager.console/console/themes/theme0/renderers/configure_form.js +++ b/components/org.apache.stratos.manager.console/console/themes/theme0/renderers/configure_form.js @@ -72,6 +72,7 @@ var render = function (theme, data, meta, require) { formData: data.formData, formDataRaw: data.formDataRaw, formTitle: data.formTitle, + formtype: data.formtype, buttonText: data.buttonText, dependancy:data.dependancy, isForm: data.isForm,
