You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2014/12/18 06:58:27 UTC
[1/5] stratos git commit: new button structure added
Repository: stratos
Updated Branches:
refs/heads/4.1.0-test 999ff7bd7 -> 2c4509929
new button structure added
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/2c450992
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/2c450992
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/2c450992
Branch: refs/heads/4.1.0-test
Commit: 2c45099299d288dc551444e4abd13c4702f5d8f0
Parents: f9c8627
Author: Dakshika Jayathilaka <si...@gmail.com>
Authored: Thu Dec 18 10:57:39 2014 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Thu Dec 18 11:28:07 2014 +0530
----------------------------------------------------------------------
.../console/themes/theme0/css/custom.css | 2 +-
.../theme0/partials/applications_form.hbs | 32 ++++++++++++++++++--
2 files changed, 31 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/2c450992/components/org.apache.stratos.manager.console/console/themes/theme0/css/custom.css
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme0/css/custom.css b/components/org.apache.stratos.manager.console/console/themes/theme0/css/custom.css
index 1fb731f..5964fba 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme0/css/custom.css
+++ b/components/org.apache.stratos.manager.console/console/themes/theme0/css/custom.css
@@ -192,6 +192,6 @@ a.btn:hover {
margin-top: 0.7em;
}
-button.hover-unsubscribe, button.hover-details{
+button.hover-unsubscribe, button.hover-details, button.hover-delete, button.hover-undeploy{
margin-top: .7em;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/2c450992/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 5dc5d75..ac893e3 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
@@ -100,7 +100,7 @@
id="{{applicationId}}"> Undeploy</button>
<button class="btn btn-info btn-lg hover-details" type="button"
id="details_list_{{applicationId}}"
- data-url="{{url ""}}/applications/applications/{{applicationId}}/" > Details
+ data-url="{{url ""}}/applications/applications/{{applicationId}}/" > View
</button>
</div>
<div class="bottom-bar-wrapper">
@@ -109,11 +109,39 @@
id="{{applicationId}}"> Undeploy</button>
<button class="btn btn-info btn-lg hover-details" type="button"
id="details_{{applicationId}}"
- data-url="{{url ""}}/applications/applications/{{applicationId}}/" > Details
+ data-url="{{url ""}}/applications/applications/{{applicationId}}/" > View
</button>
</div>
</div>
+ {{else}}
+ <div class="list-button" style="display: none;">
+ <button class="btn btn-danger btn-lg hover-delete" type="button"
+ id="{{applicationId}}"> Delete</button>
+ <button class="btn btn-info btn-lg hover-details" type="button"
+ id="details_list_{{applicationId}}"
+ data-url="{{url ""}}/applications/applications/{{applicationId}}/" > View
+ </button>
+ <button class="btn btn-warning btn-lg hover-details" type="button"
+ id="details_{{applicationId}}"
+ data-url="{{url ""}}/applications/applications/{{applicationId}}/" > Deploy
+ </button>
+ </div>
+ <div class="bottom-bar-wrapper">
+ <div class="bottom-bar">
+ <button class="btn btn-danger btn-lg hover-delete" type="button"
+ id="{{applicationId}}"> Delete</button>
+ <button class="btn btn-info btn-lg hover-details" type="button"
+ id="details_{{applicationId}}"
+ data-url="{{url ""}}/applications/applications/{{applicationId}}/" > View
+ </button>
+ <button class="btn btn-warning btn-lg hover-details" type="button"
+ id="details_{{applicationId}}"
+ data-url="{{url ""}}/applications/applications/{{applicationId}}/" > Deploy
+ </button>
+
+ </div>
+ </div>
{{/ifCond}}
</div>
{{/each}}
[3/5] stratos git commit: add status based button
Posted by im...@apache.org.
add status based button
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/f056faed
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/f056faed
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/f056faed
Branch: refs/heads/4.1.0-test
Commit: f056faedf5b92394a87bba72287d4e71eb965f34
Parents: 999ff7b
Author: Dakshika Jayathilaka <si...@gmail.com>
Authored: Wed Dec 17 16:19:05 2014 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Thu Dec 18 11:28:07 2014 +0530
----------------------------------------------------------------------
.../theme0/partials/applications_form.hbs | 21 ++++++++++++++------
1 file changed, 15 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/f056faed/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 36e9ea5..5dc5d75 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
@@ -91,21 +91,30 @@
<div class="toggle-menu-icon">
<i class="fa fa-th-large"></i>
</div>
- <h2 class="truncate">{{id}} </h2>
+ <h2 class="truncate">{{applicationId}} </h2>
- <div class="toggle-menu-description">{{description}} </div>
+ <div class="toggle-menu-description">{{description}} {{status}}</div>
+ {{#ifCond status "!=" "Created"}}
<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 class="btn btn-danger btn-lg hover-undeploy" type="button"
+ id="{{applicationId}}"> Undeploy</button>
+ <button class="btn btn-info btn-lg hover-details" type="button"
+ id="details_list_{{applicationId}}"
+ data-url="{{url ""}}/applications/applications/{{applicationId}}/" > 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 class="btn btn-danger btn-lg hover-undeploy" type="button"
+ id="{{applicationId}}"> Undeploy</button>
+ <button class="btn btn-info btn-lg hover-details" type="button"
+ id="details_{{applicationId}}"
+ data-url="{{url ""}}/applications/applications/{{applicationId}}/" > Details
</button>
+
</div>
</div>
+ {{/ifCond}}
</div>
{{/each}}
{{/ifCond}}
[2/5] stratos git commit: remove deployment from menu JSON
Posted by im...@apache.org.
remove deployment from menu JSON
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/52e2bee8
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/52e2bee8
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/52e2bee8
Branch: refs/heads/4.1.0-test
Commit: 52e2bee8e97bbe9c4a001018cdcb5e197d247611
Parents: 0b157bf
Author: Dakshika Jayathilaka <si...@gmail.com>
Authored: Wed Dec 17 16:22:27 2014 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Thu Dec 18 11:28:07 2014 +0530
----------------------------------------------------------------------
.../console/controllers/menu/menu.json | 9 ---------
1 file changed, 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/52e2bee8/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 e972496..8019ddb 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
@@ -93,15 +93,6 @@
"icon": "fa-archive",
"permissionPaths": ["/permission", "/permission/admin","/permission/admin/manage/view/subscription" ],
"description": "Add applications"
- },
- {
- "link": "applications/deployments/",
- "linkexternal": false,
- "context": "/applications",
- "title": "Deployment Policies",
- "icon": "fa-road",
- "permissionPaths": ["/permission", "/permission/admin", "/permission/admin/manage/view/deploymentpolicy"],
- "description": "Define specific policies for application deployment."
}
]
},
[5/5] stratos git commit: add deployed application runtime get to REST
Posted by im...@apache.org.
add deployed application runtime get to REST
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/0b157bfa
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/0b157bfa
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/0b157bfa
Branch: refs/heads/4.1.0-test
Commit: 0b157bfa262e67b6d34dc0cd3b56e4cc708b190d
Parents: f056fae
Author: Dakshika Jayathilaka <si...@gmail.com>
Authored: Wed Dec 17 16:19:55 2014 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Thu Dec 18 11:28:07 2014 +0530
----------------------------------------------------------------------
.../console/controllers/rest/rest_calls.jag | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/0b157bfa/components/org.apache.stratos.manager.console/console/controllers/rest/rest_calls.jag
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/rest/rest_calls.jag b/components/org.apache.stratos.manager.console/console/controllers/rest/rest_calls.jag
index 4e7eb6f..258c105 100644
--- a/components/org.apache.stratos.manager.console/console/controllers/rest/rest_calls.jag
+++ b/components/org.apache.stratos.manager.console/console/controllers/rest/rest_calls.jag
@@ -135,7 +135,7 @@ RESTCalls = new function(){
};
this.getApplicationTopology = function(appId){
- return this.sendReceive("GET","/applications/" + appId,{});
+ return this.sendReceive("GET","/applications/" + appId + '/runtime',{});
};
this.getClusterInfo = function(clusterId){
[4/5] stratos git commit: add deployemnt to REST
Posted by im...@apache.org.
add deployemnt to REST
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/f9c8627f
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/f9c8627f
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/f9c8627f
Branch: refs/heads/4.1.0-test
Commit: f9c8627f461be4fa7d4a5e237d2b12541e264dde
Parents: 52e2bee
Author: Dakshika Jayathilaka <si...@gmail.com>
Authored: Thu Dec 18 10:57:12 2014 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Thu Dec 18 11:28:07 2014 +0530
----------------------------------------------------------------------
.../console/controllers/rest/rest_calls.jag | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/f9c8627f/components/org.apache.stratos.manager.console/console/controllers/rest/rest_calls.jag
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/rest/rest_calls.jag b/components/org.apache.stratos.manager.console/console/controllers/rest/rest_calls.jag
index 258c105..09232fb 100644
--- a/components/org.apache.stratos.manager.console/console/controllers/rest/rest_calls.jag
+++ b/components/org.apache.stratos.manager.console/console/controllers/rest/rest_calls.jag
@@ -51,8 +51,8 @@ RESTCalls = new function(){
return this.send("POST","/tenant/availability/" + tenantDomain,{});
};
- this.deployDeploymentPolicyDefinition = function(policyDefinition){
- return this.send("POST","/applicationDeployments",policyDefinition);
+ this.deployDeploymentPolicyDefinition = function(applicationID, policyDefinition){
+ return this.send("POST","/application/"+applicationID+"/deploy",policyDefinition);
};
this.deployAutoscalePolicyDefinition = function(policyDefinition){