You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by da...@apache.org on 2015/05/15 03:44:58 UTC
[1/4] stratos git commit: fix breadcrumb issue on application section
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 <si...@gmail.com>
Authored: Fri May 15 06:23:26 2015 +0530
Committer: Dakshika Jayathilaka <si...@gmail.com>
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>
[2/4] stratos git commit: fix jira [STRATOS-1299]
Posted by da...@apache.org.
fix jira [STRATOS-1299]
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/7ebcfa46
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/7ebcfa46
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/7ebcfa46
Branch: refs/heads/master
Commit: 7ebcfa46897393529502f28516088aa272d4b270
Parents: b5abe78
Author: Dakshika Jayathilaka <si...@gmail.com>
Authored: Fri May 15 06:24:12 2015 +0530
Committer: Dakshika Jayathilaka <si...@gmail.com>
Committed: Fri May 15 06:24:12 2015 +0530
----------------------------------------------------------------------
.../console/themes/theme0/partials/applications_form.hbs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/7ebcfa46/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 bb4c01a..e6ced2b 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
@@ -112,7 +112,7 @@
<div class="toggle-menu-icon">
<i class="fa fa-th-large"></i>
</div>
- <h2 class="truncate">{{alias}} </h2>
+ <h2 class="truncate">{{applicationId}} </h2>
<div class="toggle-menu-description">{{description}} {{status}}</div>
{{#ifCond status "!=" "Created"}}
[3/4] stratos git commit: fix tenant listing null issue
Posted by da...@apache.org.
fix tenant listing null issue
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/9f4122a9
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/9f4122a9
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/9f4122a9
Branch: refs/heads/master
Commit: 9f4122a9b623082b5a70e30391900ac929b0aa1b
Parents: 7ebcfa4
Author: Dakshika Jayathilaka <si...@gmail.com>
Authored: Fri May 15 06:28:28 2015 +0530
Committer: Dakshika Jayathilaka <si...@gmail.com>
Committed: Fri May 15 06:28:28 2015 +0530
----------------------------------------------------------------------
.../org.apache.stratos.manager.console/console/users_form.jag | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/9f4122a9/components/org.apache.stratos.manager.console/console/users_form.jag
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/users_form.jag b/components/org.apache.stratos.manager.console/console/users_form.jag
index 21a3ec5..e9c8b6d 100644
--- a/components/org.apache.stratos.manager.console/console/users_form.jag
+++ b/components/org.apache.stratos.manager.console/console/users_form.jag
@@ -58,14 +58,14 @@ var leftMenu = menuGenerator(context, menuJson.menu, userPermissions);
if (elements.formtype == 'users') {
formTitle = 'User';
list_data = util.RESTCalls.getUserList();
- if (list_data && list_data.length === 0) {
+ if (list_data.status == 'error') {
list_data = null;
}
} else if (elements.formtype == 'tenants') {
formTitle = 'Tenant'
list_data = util.RESTCalls.getTenants();
- if (list_data && list_data.length === 0) {
+ if (list_data.status == 'error') {
list_data = null;
}
}
[4/4] stratos git commit: fix no entity msg with lowercase
Posted by da...@apache.org.
fix no entity msg with lowercase
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/c166bc3d
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/c166bc3d
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/c166bc3d
Branch: refs/heads/master
Commit: c166bc3d606de3dd65aacab1c71e06e4f0252461
Parents: 9f4122a
Author: Dakshika Jayathilaka <si...@gmail.com>
Authored: Fri May 15 07:13:56 2015 +0530
Committer: Dakshika Jayathilaka <si...@gmail.com>
Committed: Fri May 15 07:13:56 2015 +0530
----------------------------------------------------------------------
.../console/themes/theme0/css/custom/style.css | 4 ++++
.../console/themes/theme0/partials/applications_form.hbs | 2 +-
.../console/themes/theme0/partials/configure_form.hbs | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/c166bc3d/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 400a642..fd971dc 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
@@ -277,4 +277,8 @@ button.hover-delete-autoscale{
button.hover-delete-app-policy{
margin-top: .7em;
+}
+
+h2>span {
+ text-transform: lowercase;
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/c166bc3d/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 e6ced2b..b48b9dc 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}}s found..</h2>
+ <h2>No <span>{{formTitle}}s</span> found..</h2>
<a type="button" class="btn btn-primary btn-lg" href="new/">Add New {{formTitle}}</a>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/stratos/blob/c166bc3d/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 5d4a380..8af3c34 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
@@ -129,7 +129,7 @@
{{else}}
<div class="row no-item row-overide">
<div class="row title">
- <h2>No {{buttonText}} Found..</h2>
+ <h2>No <span>{{formTitle}}s</span> found..</h2>
{{#if dependancy}}
<h3>You need to add <i>{{dependancy}}</i> before {{formTitle}}</h3>
<a type="button" class="btn btn-primary btn-lg" href="../{{dependancy}}/new/">Add New {{dependancy}}</a>