Repository: stratos Updated Branches: refs/heads/master 20f17fa3d -> c166bc3d6
fix breadcrumb issue on application section Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/b5abe781 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/b5abe781 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/b5abe781 Branch: refs/heads/master Commit: b5abe781cf3d0ccb29ded849aae71a0c48cd4da1 Parents: 20f17fa Author: Dakshika Jayathilaka <[email protected]> Authored: Fri May 15 06:23:26 2015 +0530 Committer: Dakshika Jayathilaka <[email protected]> Committed: Fri May 15 06:23:26 2015 +0530 ---------------------------------------------------------------------- .../console/applications_form.jag | 8 ++++---- .../console/controllers/menu/menu.json | 2 +- .../console/jaggery.conf | 2 +- .../console/themes/theme0/partials/applications_form.hbs | 10 +++++----- 4 files changed, 11 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/b5abe781/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 b573e21..9b502eb 100644 --- a/components/org.apache.stratos.manager.console/console/applications_form.jag +++ b/components/org.apache.stratos.manager.console/console/applications_form.jag @@ -30,7 +30,7 @@ var log = new Log("apachestratos.applications_form"), menuJson = require('/controllers/menu/menu.json'), util = require('/controllers/rest/rest_calls.jag'), uriMatcher = new URIMatcher(request.getRequestURI()), - elements = uriMatcher.match('/{context}/applications/{formtype}/'), + elements = uriMatcher.match('/{context}/{formtype}/'), breadcrumbPathLevelOne = 'applications', formDataEdit = topologyData = editorGroups = editorCartridges = editorAutoscalePolicies = applicationHbs ='', editorDeploymentPolicies = applicationPolicyData = applicationJSON ='', @@ -42,10 +42,10 @@ var leftMenu = menuGenerator(context, menuJson.menu, userPermissions); if (!elements) { - elements = uriMatcher.match('/{context}/applications/{formtype}/{action}/'); + elements = uriMatcher.match('/{context}/{formtype}/{action}/'); if(!elements){ - elements = uriMatcher.match('/{context}/applications/{formtype}/{applicationId}/{action}'); + elements = uriMatcher.match('/{context}/{formtype}/{applicationId}/{action}'); var applicationName = elements.applicationId; //get application json @@ -107,7 +107,7 @@ switch (formtype) { error.push({"errorMessage":"Incorrect resource path found"}); } var caramelData = { - breadcrumbPathLevelOne: breadcrumbPathLevelOne+'/'+elements.formtype, + breadcrumbPathLevelOne: breadcrumbPathLevelOne, breadcrumbPathLevelTwo: '', left_menu: leftMenu, isForm: isForm, http://git-wip-us.apache.org/repos/asf/stratos/blob/b5abe781/components/org.apache.stratos.manager.console/console/controllers/menu/menu.json ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/controllers/menu/menu.json b/components/org.apache.stratos.manager.console/console/controllers/menu/menu.json index 36a21f4..2e50c5e 100644 --- a/components/org.apache.stratos.manager.console/console/controllers/menu/menu.json +++ b/components/org.apache.stratos.manager.console/console/controllers/menu/menu.json @@ -104,7 +104,7 @@ ] }, { - "link": "applications/applications/", + "link": "applications/", "linkexternal": false, "context": "/", "title": "Applications", http://git-wip-us.apache.org/repos/asf/stratos/blob/b5abe781/components/org.apache.stratos.manager.console/console/jaggery.conf ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/jaggery.conf b/components/org.apache.stratos.manager.console/console/jaggery.conf index 7f9b6f5..7e1fa49 100644 --- a/components/org.apache.stratos.manager.console/console/jaggery.conf +++ b/components/org.apache.stratos.manager.console/console/jaggery.conf @@ -32,7 +32,7 @@ }, { "url": "/applications/", - "path": "/applications.jag" + "path": "/applications_form.jag" }, { "url": "/applications/*", http://git-wip-us.apache.org/repos/asf/stratos/blob/b5abe781/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 2820784..bb4c01a 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 @@ -99,7 +99,7 @@ {{else}} <div class="row no-item row-overide"> <div class="row title"> - <h2>No {{formTitle}} Found..</h2> + <h2>No {{formTitle}}s found..</h2> <a type="button" class="btn btn-primary btn-lg" href="new/">Add New {{formTitle}}</a> </div> </div> @@ -141,11 +141,11 @@ id="{{applicationId}}" data-alias="{{alias}}"> Delete</button> <button class="btn btn-info btn-lg hover-details" type="button" id="details_list_{{applicationId}}" - data-url="{{url ""}}/applications/applications/{{applicationId}}/view" > View + data-url="{{url ""}}/applications/{{applicationId}}/view" > View </button> <button class="btn btn-warning btn-lg hover-details" type="button" id="details_{{applicationId}}" - data-url="{{url ""}}/applications/applications/{{applicationId}}/deploy" > Deploy + data-url="{{url ""}}/applications/{{applicationId}}/deploy" > Deploy </button> </div> <div class="bottom-bar-wrapper"> @@ -154,11 +154,11 @@ id="{{applicationId}}" data-alias="{{alias}}"> Delete</button> <button class="btn btn-info btn-lg hover-details" type="button" id="details_{{applicationId}}" - data-url="{{url ""}}/applications/applications/{{applicationId}}/view" > View + data-url="{{url ""}}/applications/{{applicationId}}/view" > View </button> <button class="btn btn-warning btn-lg hover-details" type="button" id="details_{{applicationId}}" - data-url="{{url ""}}/applications/applications/{{applicationId}}/deploy" > Deploy + data-url="{{url ""}}/applications/{{applicationId}}/deploy" > Deploy </button> </div>
