view support added and tested for group listing
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/6f29607c Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/6f29607c Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/6f29607c Branch: refs/heads/master Commit: 6f29607c7c957f14ee976b05f22c5814b7c38099 Parents: a8581b6 Author: Dakshika Jayathilaka <[email protected]> Authored: Thu Nov 27 14:15:51 2014 +0530 Committer: Imesh Gunaratne <[email protected]> Committed: Thu Nov 27 14:46:59 2014 +0530 ---------------------------------------------------------------------- .../console/applications_form.jag | 17 ++++++- .../forms/default/applications/groups.json | 2 +- .../console/themes/theme0/css/custom/style.css | 1 + .../theme0/partials/applications_form.hbs | 52 +++++++++++++++++--- .../theme0/renderers/applications_form.js | 1 + 5 files changed, 64 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/6f29607c/components/org.apache.stratos.manager.console/console/applications_form.jag ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/applications_form.jag b/components/org.apache.stratos.manager.console/console/applications_form.jag index 7e84364..f3bb322 100644 --- a/components/org.apache.stratos.manager.console/console/applications_form.jag +++ b/components/org.apache.stratos.manager.console/console/applications_form.jag @@ -32,8 +32,8 @@ var log = new Log("apachestratos.applications_form"), uriMatcher = new URIMatcher(request.getRequestURI()), elements = uriMatcher.match('/{context}/applications/{formtype}/'), breadcrumbPathLevelOne = 'applications', - isEdit = false, - isForm = false; + formDataEdit = '', + isEdit = applicationView = isForm = false, userPermissions = session.get('PERMISSIONS'); //create left menu @@ -43,8 +43,11 @@ if (!elements) { elements = uriMatcher.match('/{context}/applications/{formtype}/{action}/'); isForm = true; + if (elements.action != 'new') { isEdit = true; + }else if(elements.formtype == 'applications' && elements.action != 'new'){ + applicationView = true; } } @@ -65,6 +68,14 @@ switch (formtype) { list_data = util.RESTCalls.getGroups(); if (list_data.serviceGroup && list_data.serviceGroup.length === 0) { list_data = null; + }else{ + formDataEdit = list_data.serviceGroup; + for (specNumber in list_data.serviceGroup) { + if (list_data.serviceGroup[specNumber].name == elements.action) { + formDataEdit = list_data.serviceGroup[specNumber]; + } + + } } break; case "applications": @@ -82,9 +93,11 @@ var caramelData = { breadcrumbPathLevelTwo: elements.formtype, left_menu: leftMenu, isForm: isForm, + isEdit: isEdit, formTitle: formTitle, formDataRaw: JSON.stringify(formDataRaw), //formDataRaw: JSON.stringify(partition_data.partition[0]), + formDataEdit: JSON.stringify(formDataEdit), formData: JSON.stringify(formData), list_data: list_data, error: error http://git-wip-us.apache.org/repos/asf/stratos/blob/6f29607c/components/org.apache.stratos.manager.console/console/controllers/forms/default/applications/groups.json ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/default/applications/groups.json b/components/org.apache.stratos.manager.console/console/controllers/forms/default/applications/groups.json index 75df0cb..4156f39 100644 --- a/components/org.apache.stratos.manager.console/console/controllers/forms/default/applications/groups.json +++ b/components/org.apache.stratos.manager.console/console/controllers/forms/default/applications/groups.json @@ -6,4 +6,4 @@ "dependencies": { "terminationBehaviour": "terminate-none" } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/stratos/blob/6f29607c/components/org.apache.stratos.manager.console/console/themes/theme0/css/custom/style.css ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/themes/theme0/css/custom/style.css b/components/org.apache.stratos.manager.console/console/themes/theme0/css/custom/style.css index 88b5c30..47f590e 100644 --- a/components/org.apache.stratos.manager.console/console/themes/theme0/css/custom/style.css +++ b/components/org.apache.stratos.manager.console/console/themes/theme0/css/custom/style.css @@ -120,6 +120,7 @@ .list-button{ position: relative; z-index: 802; + float: right; } .list-group-item.border-right{ http://git-wip-us.apache.org/repos/asf/stratos/blob/6f29607c/components/org.apache.stratos.manager.console/console/themes/theme0/partials/applications_form.hbs ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/themes/theme0/partials/applications_form.hbs b/components/org.apache.stratos.manager.console/console/themes/theme0/partials/applications_form.hbs index 92f9441..83d660a 100644 --- a/components/org.apache.stratos.manager.console/console/themes/theme0/partials/applications_form.hbs +++ b/components/org.apache.stratos.manager.console/console/themes/theme0/partials/applications_form.hbs @@ -86,26 +86,48 @@ <div class="row general-table row-overide"> {{#each content_body.sections.applications}} - <a href="#" - 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> - </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 ""}}/applications/applications/{{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 ""}}/applications/applications/{{id}}/" > Details + </button> + </div> + </div> + </div> {{/each}} {{#each content_body.sections.serviceGroup}} - <a href="#" - 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">{{name}} </h2> <div class="toggle-menu-description">{{description}} </div> - </a> + <div class="list-button" style="display: none;"> + <button class="btn btn-info btn-lg hover-details" type="button" id="details_list_{{name}}" + data-url="{{url ""}}/applications/groups/{{name}}/" > 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_{{name}}" + data-url="{{url ""}}/applications/groups/{{name}}/" > Details + </button> + </div> + </div> + </div> {{/each}} </div> </div> @@ -225,8 +247,26 @@ $('textarea#jsoneditor').val(JSON.stringify(editor.getValue(), null, '\t')); } + }else if(rawEditValidate){ + editor.setValue(rawEditValidate); + editor.onChange(); + } + + }); + + {{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}} http://git-wip-us.apache.org/repos/asf/stratos/blob/6f29607c/components/org.apache.stratos.manager.console/console/themes/theme0/renderers/applications_form.js ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/themes/theme0/renderers/applications_form.js b/components/org.apache.stratos.manager.console/console/themes/theme0/renderers/applications_form.js index 8ae9134..6488a6e 100644 --- a/components/org.apache.stratos.manager.console/console/themes/theme0/renderers/applications_form.js +++ b/components/org.apache.stratos.manager.console/console/themes/theme0/renderers/applications_form.js @@ -72,6 +72,7 @@ var render = function (theme, data, meta, require) { formHtml: data.formHtml, formData: data.formData, formDataRaw: data.formDataRaw, + formDataEdit: data.formDataEdit, isForm: data.isForm, isEdit:data.isEdit, formTitle: data.formTitle,
