You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by is...@apache.org on 2014/03/19 15:00:28 UTC
git commit: STRATOS-529
Repository: incubator-stratos
Updated Branches:
refs/heads/master 2fca01997 -> 3d7961ed4
STRATOS-529
Signed-off-by: M. Isuru Tharanga Chrishantha Perera <is...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/3d7961ed
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/3d7961ed
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/3d7961ed
Branch: refs/heads/master
Commit: 3d7961ed41afbcce9af108b609b632aa17fe2128
Parents: 2fca019
Author: Chanaka Jayasena <ch...@gmail.com>
Authored: Wed Mar 19 18:53:59 2014 +0530
Committer: M. Isuru Tharanga Chrishantha Perera <is...@apache.org>
Committed: Wed Mar 19 19:29:03 2014 +0530
----------------------------------------------------------------------
.../console/cartridge_info.jag | 7 ++-
.../controllers/cartridgeSubscribeSubmit.jag | 24 +++----
.../console/subscribe_cartridge.jag | 2 +
.../console/themes/theme1/pages/index.hbs | 12 +---
.../themes/theme1/partials/cartridge_info.hbs | 38 ++++++-----
.../themes/theme1/partials/cartridges.hbs | 24 ++++---
.../partials/configure_stratos_wizard.hbs | 62 +++++++++---------
.../console/themes/theme1/partials/header.hbs | 6 +-
.../themes/theme1/partials/mycartridges.hbs | 17 ++---
.../theme1/partials/tenant_management.hbs | 60 +++++-------------
.../themes/theme1/partials/tenant_new.hbs | 2 +-
.../themes/theme1/renderers/cartridge_info.js | 2 +-
.../themes/theme1/renderers/cartridges.js | 10 +--
.../console/themes/theme1/renderers/index.js | 12 ++--
.../theme1/renderers/subscribe_cartridge.js | 10 ++-
.../console/themes/theme1/ui/css/main.css | 66 ++++++++++++++------
.../console/util/utility.jag | 11 ++--
.../stratos/rest/endpoint/mock/MockContext.java | 9 ++-
.../rest/endpoint/mock/StratosTestAdmin.java | 7 ++-
19 files changed, 199 insertions(+), 182 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/3d7961ed/components/org.apache.stratos.manager.console/console/cartridge_info.jag
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/cartridge_info.jag b/components/org.apache.stratos.manager.console/console/cartridge_info.jag
index 9650081..f6065d9 100644
--- a/components/org.apache.stratos.manager.console/console/cartridge_info.jag
+++ b/components/org.apache.stratos.manager.console/console/cartridge_info.jag
@@ -6,9 +6,14 @@ var utils = require('/util/utility.jag');
var alias = request.getParameter("alias");
var lbCluster = {};
var cartridgeInfo = utils.consoleAppUtil.getCartridgeInfo(alias);
+log.info(cartridgeInfo);
+
if(cartridgeInfo.Error != undefined){
error.push(cartridgeInfo.Error);
}else{
+ if(cartridgeInfo.cartridge == undefined){
+ cartridgeInfo.cartridge = cartridgeInfo;
+ }
if(cartridgeInfo.cartridge.lbClusterId) {
lbCluster = utils.consoleAppUtil.getClusterInfo(cartridgeInfo.cartridge.lbClusterId);
if(lbCluster.Error != undefined){
@@ -20,8 +25,6 @@ if(cartridgeInfo.Error != undefined){
error.push(clusterInfo.Error);
}
}
-
-
caramel.render({
cartridgeInfo:cartridgeInfo,
lbCluster:lbCluster,
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/3d7961ed/components/org.apache.stratos.manager.console/console/controllers/cartridgeSubscribeSubmit.jag
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/cartridgeSubscribeSubmit.jag b/components/org.apache.stratos.manager.console/console/controllers/cartridgeSubscribeSubmit.jag
index 8f26ede..f891d2f 100755
--- a/components/org.apache.stratos.manager.console/console/controllers/cartridgeSubscribeSubmit.jag
+++ b/components/org.apache.stratos.manager.console/console/controllers/cartridgeSubscribeSubmit.jag
@@ -3,7 +3,7 @@
var log = new Log("controller.cartridgeSubscribeSubmit");
var utils = require('/util/utility.jag');
var jsonRequest = {};
- jsonRequest.cartridgeInfoBean = {};
+ jsonRequest = {};
var cartridgeType = request.getParameter('cartridgeType');
var alias = request.getParameter('alias');
var repoURL = request.getParameter('repoURL');
@@ -28,20 +28,20 @@
removeontermination = false;
}
// constructing the json request
- jsonRequest.cartridgeInfoBean.cartridgeType = cartridgeType;
- jsonRequest.cartridgeInfoBean.alias = alias;
- jsonRequest.cartridgeInfoBean.repoURL = repoURL;
- jsonRequest.cartridgeInfoBean.privateRepo = !isPublicRepo;
+ jsonRequest.cartridgeType = cartridgeType;
+ jsonRequest.alias = alias;
+ jsonRequest.repoURL = repoURL;
+ jsonRequest.privateRepo = !isPublicRepo;
if(!isPublicRepo){
- jsonRequest.cartridgeInfoBean.repoUsername = repoUsername;
- jsonRequest.cartridgeInfoBean.repoPassword = repoPassword;
+ jsonRequest.repoUsername = repoUsername;
+ jsonRequest.repoPassword = repoPassword;
}
- jsonRequest.cartridgeInfoBean.autoscalePolicy = autoscalePolicy;
- jsonRequest.cartridgeInfoBean.deploymentPolicy = deploymentPolicy;
- jsonRequest.cartridgeInfoBean.size = size;
- jsonRequest.cartridgeInfoBean.persistanceRequired = persistencerequired;
- jsonRequest.cartridgeInfoBean.removeOnTermination = removeontermination;
+ jsonRequest.autoscalePolicy = autoscalePolicy;
+ jsonRequest.deploymentPolicy = deploymentPolicy;
+ jsonRequest.size = size;
+ jsonRequest.persistanceRequired = persistencerequired;
+ jsonRequest.removeOnTermination = removeontermination;
var result = utils.consoleAppUtil.subscribeToCartridge(jsonRequest);
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/3d7961ed/components/org.apache.stratos.manager.console/console/subscribe_cartridge.jag
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/subscribe_cartridge.jag b/components/org.apache.stratos.manager.console/console/subscribe_cartridge.jag
index cf6c739..bdf2ef2 100644
--- a/components/org.apache.stratos.manager.console/console/subscribe_cartridge.jag
+++ b/components/org.apache.stratos.manager.console/console/subscribe_cartridge.jag
@@ -15,6 +15,8 @@ if(autoScalePolicies.Error != undefined ){
}if(cartridge.Error != undefined ){
error.push(cartridge.Error);
}
+
+
caramel.render({
cartridge:cartridge,
autoScalePolicies:autoScalePolicies,
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/3d7961ed/components/org.apache.stratos.manager.console/console/themes/theme1/pages/index.hbs
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/pages/index.hbs b/components/org.apache.stratos.manager.console/console/themes/theme1/pages/index.hbs
index f0d240d..6e3c9c5 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme1/pages/index.hbs
+++ b/components/org.apache.stratos.manager.console/console/themes/theme1/pages/index.hbs
@@ -42,16 +42,8 @@
<![endif]-->
-<!-- Part 1: Wrap all page content here -->
-<div id="wrap">
-
- {{include header}}
- {{include body}}
-
-
- <!-- /container -->
- <div id="push"></div>
-</div>
+{{include header}}
+{{include body}}
<footer id="footer">
<div class="container">
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/3d7961ed/components/org.apache.stratos.manager.console/console/themes/theme1/partials/cartridge_info.hbs
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/cartridge_info.hbs b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/cartridge_info.hbs
index 223fbe5..26bb78f 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/cartridge_info.hbs
+++ b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/cartridge_info.hbs
@@ -9,24 +9,34 @@
<div class="container">
<div class="row">
<div class="col-lg-12">
+
<div style="margin-bottom:20px;">{{cartridgeInfo.description}}</div>
- <strong>ActiveInstances:</strong>
+ <div class="data-title">Access URLs:</div>
+ <div>
+ <a target="_blank" href="http://{{cartridgeInfo.cartridgeAlias}}.{{cartridgeInfo.hostName}}">http://{{cartridgeInfo.cartridgeAlias}}.{{cartridgeInfo.hostName}}</a>
+ </div>
+ <div>
+ <a target="_blank" href="https://{{cartridgeInfo.cartridgeAlias}}.{{cartridgeInfo.hostName}}">https://{{cartridgeInfo.cartridgeAlias}}.{{cartridgeInfo.hostName}}</a>
+ </div>
+
+
+ <div class="data-title">ActiveInstances:</div>
<div>{{cartridgeInfo.activeInstances}}</div>
- <strong>CartridgeAlias:</strong>
+ <div class="data-title">CartridgeAlias:</div>
<div>{{cartridgeInfo.cartridgeAlias}}</div>
- <strong>CartridgeType:</strong>
+ <div class="data-title">CartridgeType:</div>
<div>{{cartridgeInfo.cartridgeType}}</div>
- <strong>HostName:</strong>
+ <div class="data-title">HostName:</div>
<div>{{cartridgeInfo.hostName}}</div>
- <strong>Version:</strong>
+ <div class="data-title">Version:</div>
<div>{{cartridgeInfo.version}}</div>
- <strong>Tenancy Model:</strong>
+ <div class="data-title">Tenancy Model:</div>
{{#if cartridgeInfo.multiTenant}}
<div>true</div>
@@ -35,32 +45,32 @@
{{/if}}
- <strong>Provider:</strong>
+ <div class="data-title">Provider:</div>
<div>{{cartridgeInfo.provider}}</div>
{{#if cartridgeInfo.repoURL }}
- <strong>RepoURL</strong>
+ <div class="data-title">RepoURL</div>
<div>{{cartridgeInfo.repoURL}}</div>
{{/if}}
{{#ifCond cartridgeInfo.provider "==" "data"}}
- <strong>UserName</strong>
+ <div class="data-title">UserName</div>
<div>{{cartridgeInfo.dbUserName}}</div>
- <strong>Password</strong>
+ <div class="data-title">Password</div>
<div>{{cartridgeInfo.password}}</div>
{{/ifCond}}
{{#if clusterinfo.member}}
- <strong>Members Private ip(s):</strong>
+ <div class="data-title">Members Private ip(s):</div>
<div>
{{#each clusterinfo.member}}
{{memberIp}}
{{/each}}
</div>
- <strong>Members Public ip(s):</strong>
+ <div class="data-title">Members Public ip(s):</div>
<div>
{{#each clusterinfo.member}}
{{memberPublicIp}}
@@ -70,14 +80,14 @@
{{/if}}
{{#if lbclusterinfo.member}}
- <strong>LB Private ip:</strong>
+ <div class="data-title">LB Private ip:</div>
<div>
{{#each lbclusterinfo.member}}
{{memberIp}};
{{/each}}
</div>
- <strong>LB Public ip:</strong>
+ <div class="data-title">LB Public ip:</div>
<div>
{{#each lbclusterinfo.member}}
{{memberPublicIp}};
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/3d7961ed/components/org.apache.stratos.manager.console/console/themes/theme1/partials/cartridges.hbs
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/cartridges.hbs b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/cartridges.hbs
index 317ce42..a954f55 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/cartridges.hbs
+++ b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/cartridges.hbs
@@ -8,12 +8,6 @@
{{#each cartridges}}
<div class="container">
<div class="row">
- <div class="col-lg-12">
- <div class="h2-wrapper"><h2>{{kind}}</h2></div>
- </div>
- </div>
- <div class="row">
- {{#each cartridges}}
<div class="col-md-6">
<div class="box-container">
<div class="row">
@@ -41,7 +35,21 @@
</div>
</div>
</div>
- {{/each}}
</div>
</div>
-{{/each}}
+{{else}}
+<div class="container">
+ <div class="row">
+ <div class="col-lg-12">
+ <div class="alert alert-info alert-empty-page">
+ <strong>There are no Cartridges available for you.</strong>
+ {{#isAllowed "configure"}}
+ Go to <a href="{{url "/configure_stratos.jag"}}">Configure Stratos</a> page to start.
+ {{else}}
+ Please contact your system administrator.
+ {{/isAllowed}}
+ </div>
+ </div>
+ </div>
+</div>
+{{/each}}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/3d7961ed/components/org.apache.stratos.manager.console/console/themes/theme1/partials/configure_stratos_wizard.hbs
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/configure_stratos_wizard.hbs b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/configure_stratos_wizard.hbs
index 9973f9d..4faa94c 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/configure_stratos_wizard.hbs
+++ b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/configure_stratos_wizard.hbs
@@ -240,36 +240,35 @@
</div>
</div>
{{#ifCond step "==" 1}}
- <div class="col-md-6">
+ <div class="col-md-6 config-responsive-fixer">
<i class="icons-help"></i>
Example configuration:
<pre>
{
- "partition":{
- "id": "zone-1",
- "provider": "ec2",
- "property": [
- {
- "name": "region",
- "value": "ap-southeast-1"
- },
- {
- "name": "zone",
- "value": "ap-southeast-1a"
- }
- ]
- }
- }
+ "id": "zone-1",
+ "provider": "ec2",
+ "property": [
+ {
+ "name": "region",
+ "value": "ap-southeast-1"
+ },
+ {
+ "name": "zone",
+ "value": "ap-southeast-1a"
+ }
+ ]
+ }
+
</pre>
</div>
{{/ifCond}}
{{#ifCond step "==" 2}}
- <div class="col-md-6">
+ <div class="col-md-6 config-responsive-fixer">
<i class="icons-help"></i>
Example configuration:
<pre>
- {"autoscalePolicy": {
+ {
"id": "economyPolicy",
"loadThresholds": {
"requestsInFlight": {
@@ -295,17 +294,17 @@
}
}
}
- }
+
</pre>
</div>
{{/ifCond}}
{{#ifCond step "==" 3}}
- <div class="col-md-6">
+ <div class="col-md-6 config-responsive-fixer">
<i class="icons-help"></i>
Example configuration:
<pre>
- {"deploymentPolicy": {
+ {
"id": "economyDeployment",
"partitionGroup": [
{
@@ -337,17 +336,17 @@
}
]
}
- }
+
</pre>
</div>
{{/ifCond}}
{{#ifCond step "==" 4}}
- <div class="col-md-6">
+ <div class="col-md-6 config-responsive-fixer">
<i class="icons-help"></i>
Example configuration:
<pre>
- {"cartridgeDefinitionBean":{
+ {
"type": "lb",
"provider": "apache",
"displayName": "Lb",
@@ -385,18 +384,17 @@
}
]
}
- }
+
</pre>
</div>
{{/ifCond}}
{{#ifCond step "==" 5}}
- <div class="col-md-6">
+ <div class="col-md-6 config-responsive-fixer">
<i class="icons-help"></i>
Example configuration:
<pre>
- { "cartridgeDefinitionBean":
- {
+ {
"type": "php",
"provider": "apache",
"host": "stratos.com",
@@ -427,18 +425,18 @@
}
]
}
- }
+
</pre>
</div>
{{/ifCond}}
{{#ifCond step "==" 6}}
- <div class="col-md-6">
+ <div class="col-md-6 config-responsive-fixer">
<i class="icons-help"></i>
Example configuration:
<pre>
- { "serviceDefinitionBean": {
+ {
"serviceName": "appserver",
"cartridgeType": "as",
"deploymentPolicyName": "economyDeployment",
@@ -447,7 +445,7 @@
"clusterSubDomain": "subdomain",
"tenantRange": "*"
}
- }
+
</pre>
</div>
{{/ifCond}}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/3d7961ed/components/org.apache.stratos.manager.console/console/themes/theme1/partials/header.hbs
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/header.hbs b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/header.hbs
index bf22378..7e02db1 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/header.hbs
+++ b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/header.hbs
@@ -28,7 +28,7 @@
<li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-user"></i><br /> {{#user}}{{/user}} <b class="caret"></b></a>
<ul class="dropdown-menu">
- <li><a><i class="fa fa-file-text-o"></i> View Profile</a></li>
+ <!--li><a><i class="fa fa-file-text-o"></i> View Profile</a></li -->
<li>
<a href="{{url "/controllers/logout.jag"}}"><i class="fa fa-sign-out"></i> logout</a>
</li>
@@ -49,12 +49,12 @@
<a class="btn {{button.class_name}}" href="{{url button.link }}"><i class="{{button.class_icon}}"></i> {{button.name}}</a>
</div>
{{#if has_action_buttons}}
- <div class="col-lg-3">
+ <div class="col-lg-4 action-buttons">
<button class="btn btn-default" onclick="manage_selected('activate')" type="button">Activate</button>
<button class="btn btn-default" onclick="manage_selected('deactivate')">Deactivate</button>
<button class="btn btn-default" onclick="manage_selected('delete')">Delete</button>
</div>
- <div class="col-lg-6 help-section">
+ <div class="col-lg-5 help-section">
{{#if has_help}}
<i class="icons-help"></i>
<p>{{help}}</p>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/3d7961ed/components/org.apache.stratos.manager.console/console/themes/theme1/partials/mycartridges.hbs
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/mycartridges.hbs b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/mycartridges.hbs
index ada00c8..2f5e3d4 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/mycartridges.hbs
+++ b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/mycartridges.hbs
@@ -8,12 +8,6 @@
{{#each mycartridges}}
<div class="container">
<div class="row">
- <div class="col-lg-12">
- <div class="h2-wrapper"><h2>{{kind}}</h2></div>
- </div>
- </div>
- <div class="row">
- {{#each cartridges}}
<div class="col-md-6">
<div class="box-container">
<div class="row">
@@ -31,7 +25,16 @@
</div>
</div>
</div>
- {{/each}}
+ </div>
+</div>
+{{else}}
+<div class="container">
+ <div class="row">
+ <div class="col-lg-12">
+ <div class="alert alert-info alert-empty-page">
+ <strong>You haven't subscribed to any Cartridges yet.</strong> Go to <a href="{{url "/cartridges.jag"}}">Subscribe to Cartridge</a> page to start.
+ </div>
+ </div>
</div>
</div>
{{/each}}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/3d7961ed/components/org.apache.stratos.manager.console/console/themes/theme1/partials/tenant_management.hbs
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/tenant_management.hbs b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/tenant_management.hbs
index b30622b..4e8f3c5 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/tenant_management.hbs
+++ b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/tenant_management.hbs
@@ -1,55 +1,11 @@
-<div class="container content-starter">
+<div class="container content-starter responsive-gap-maker">
<div class="row">
<div class="col-lg-12">
<h1>{{title}}</h1>
</div>
</div>
</div>
-<div class="container" style="display: none;" id="addItemSection">
- <div class="row">
- <div class="col-md-12">
- <h2>Deploy New Partition</h2>
- <form role="form">
- <label for="policy" class="required">Partition Configuration</label>
-
- <div class="container">
- <div class="row">
- <div class="col-md-6 padding-remover-left">
- <textarea class="form-control" rows="11" id="policy"></textarea>
- <button type="button" class="btn btn-primary" id="deployPolicy">Deploy Partition</button>
- <a>Cancel</a>
- </div>
- <div class="col-md-6">
- <i class="icons-help"></i>
- Example configuration:
- <pre>
- {
- "partition":{
- "id": "P1",
- "provider": "ec2",
- "property": [
- {
- "name": "region",
- "value": "ap-southeast-1"
- }
- ],
- "partitionMin": "1",
- "partitionMax": "3"
- }
- }
- </pre>
- </div>
- </div>
-
- </div>
-
-
- </form>
-
- </div>
- </div>
- </div>
-
+{{#if tenants}}
<div class="container">
<div class="row">
@@ -88,6 +44,18 @@
</div>
</div>
</div>
+{{else}}
+<div class="container">
+ <div class="row">
+ <div class="col-lg-12">
+ <div class="alert alert-info alert-empty-page">
+ <strong>There are no tenants created yet.</strong>{{#isAllowed "tenant-mgt"}} Go to <a href="{{url "/tenant_new.jag"}}">Add New Tenant</a> page to start. {{/isAllowed}}
+ </div>
+ </div>
+ </div>
+</div>
+{{/if}}
+
<form action="{{url "/controllers/manageTenants.jag"}}" id="manageTenantsForm">
<input type="hidden" value="" id="foo" name="foo" />
<input type="hidden" value="" id="state" name="state" />
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/3d7961ed/components/org.apache.stratos.manager.console/console/themes/theme1/partials/tenant_new.hbs
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/tenant_new.hbs b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/tenant_new.hbs
index 7130b11..f798846 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/tenant_new.hbs
+++ b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/tenant_new.hbs
@@ -21,7 +21,7 @@
<option>Enterprise</option>
<option>Demo</option>
</select>
- <a>More Info</a>
+ <!--<a>More Info</a>-->
<div class="h2-wrapper"><h2>Contact Details</h2></div>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/3d7961ed/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/cartridge_info.js
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/cartridge_info.js b/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/cartridge_info.js
index 019de9d..4a6a476 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/cartridge_info.js
+++ b/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/cartridge_info.js
@@ -23,7 +23,7 @@ var render = function (theme, data, meta, require) {
link:'/',
name:'Back To My Cartridges',
class_name:"btn-default",
- class_icon: 'icon-arrow-left'
+ class_icon: 'fa fa-arrow-left'
},
has_help:true,
help:'Create cartridges like PHP, Python, Ruby etc.. Or create data cartridges with mySql, PostgreSQL. Directly install applications like Drupal, Wordpress etc..'
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/3d7961ed/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/cartridges.js
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/cartridges.js b/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/cartridges.js
index 55753ff..97fad5b 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/cartridges.js
+++ b/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/cartridges.js
@@ -4,8 +4,8 @@ var render = function (theme, data, meta, require) {
var log = new Log();
session.remove("get-status");
session.remove("deploy-status");
- var cartridges_old = data.cartridges.cartridge;
- var cartridges_new = [
+ var cartridges_new = data.cartridges.cartridge;
+ /*var cartridges_new = [
{
kind: "Framework",
cartridges: []}
@@ -34,13 +34,13 @@ var render = function (theme, data, meta, require) {
cartridgesToPush.push(cartridges_old[i]);
}
}
- }
+ }*/
theme('index', {
body: [
{
partial: 'cartridges',
context: {
- title:'Cartridges',
+ title:'Subscribe to Cartridge',
cartridges:cartridges_new
}
}
@@ -55,7 +55,7 @@ var render = function (theme, data, meta, require) {
link:'/',
name:'Back To My Cartridges',
class_name:"btn-default",
- class_icon: 'icon-arrow-left'
+ class_icon: 'fa fa-arrow-left'
},
has_help:true,
help:'Create cartridges like PHP, Python, Ruby etc.. Or create data cartridges with mySql, PostgreSQL. Directly install applications like Drupal, Wordpress etc..'
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/3d7961ed/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/index.js
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/index.js b/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/index.js
index 6acdd05..676f18a 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/index.js
+++ b/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/index.js
@@ -1,12 +1,14 @@
var render = function (theme, data, meta, require) {
// Re-create the data structure of the cartridges.
if(data.error.length == 0 ){
- var cartridges_old = data.mycartridges.cartridge;
- if(cartridges_old == null) {
- cartridges_old = {};
- }
+ var cartridges_new = data.mycartridges.cartridge;
session.remove("get-status");
session.remove("deploy-status");
+
+ /*if(cartridges_old == null) {
+ cartridges_old = {};
+ }
+
var cartridges_new = [
{
kind: "Framework",
@@ -36,7 +38,7 @@ var render = function (theme, data, meta, require) {
cartridgesToPush.push(cartridges_old[i]);
}
}
- }
+ }*/
theme('index', {
body: [
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/3d7961ed/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/subscribe_cartridge.js
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/subscribe_cartridge.js b/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/subscribe_cartridge.js
index b1e0368..5f7fc07 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/subscribe_cartridge.js
+++ b/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/subscribe_cartridge.js
@@ -1,5 +1,9 @@
var render = function (theme, data, meta, require) {
if(data.error.length == 0 ){
+ var cartridge = data.cartridge.cartridge;
+ if(cartridge == undefined){
+ cartridge = data.cartridge;
+ }
theme('index', {
body: [
{
@@ -7,7 +11,7 @@ var render = function (theme, data, meta, require) {
context: {
autoScalePolicies:data.autoScalePolicies.autoscalePolicy,
deploymentPolicies:data.deploymentPolicies.deploymentPolicy,
- cartridge:data.cartridge.cartridge,
+ cartridge:cartridge,
cartridgeType:meta.request.getParameter('cartridgeType')
}
}
@@ -33,8 +37,8 @@ var render = function (theme, data, meta, require) {
{
partial:'title',
context:{
- title:"Subscribe Cartridge -" + data.cartridge.cartridge.cartridgeType + " " + data.cartridge.cartridge.version + " Cartridge",
- cartridge:data.cartridge.cartridge
+ title:"Subscribe Cartridge -" + cartridge.cartridgeType + " " + cartridge.version + " Cartridge",
+ cartridge:cartridge
}
}
]
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/3d7961ed/components/org.apache.stratos.manager.console/console/themes/theme1/ui/css/main.css
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/ui/css/main.css b/components/org.apache.stratos.manager.console/console/themes/theme1/ui/css/main.css
index e583aa3..f855621 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme1/ui/css/main.css
+++ b/components/org.apache.stratos.manager.console/console/themes/theme1/ui/css/main.css
@@ -110,26 +110,23 @@ div.password-wrapper input.input-password{
}
/* Sticky footer styles
-------------------------------------------------- */
-
-html,
+html {
+ position: relative;
+ min-height: 100%;
+}
body {
- height: 100%;
- /* The html and body elements cannot have any padding or margin. */
+ /* Margin bottom by footer height */
+ margin-bottom: 60px;
}
-/* Wrapper for page content to push down footer */
-#wrap {
- min-height: 100%;
- height: auto !important;
- height: 100%;
- /* Negative indent footer by it's height */
- margin: 0 auto -35px;
-}
/* Set the fixed height of the footer here */
-#push,
#footer {
- height: 62px;
+ position: absolute;
+ bottom: 0;
+ width: 100%;
+ /* Set the fixed height of the footer here */
+ height: 60px;
padding-top:10px;
}
@@ -527,15 +524,36 @@ li.dropdown ul.dropdown-menu li a i{
#wrap > div.container, .main-menu div.container{
min-width: 800px;
}
-@media (max-width: 980px) {
- .sub-menu-wizard{
- font-size: 11px;
- }
-}
+
+
@media (max-width: 1200px) {
.sub-menu{
font-size: 11px;
}
+ .responsive-gap-maker{
+ margin-top: 160px;
+ }
+}
+@media (max-width: 990px) {
+ .sub-menu-wizard{
+ font-size: 11px;
+ }
+ .responsive-gap-maker{
+ margin-top: 210px;
+ }
+ .config-responsive-fixer{
+ margin-left:0;
+ padding-left:0;
+ margin-top:20px;
+ }
+}
+@media (max-width: 900px) {
+ .breadcrumb-strip div[class*='col-lg-']{
+ padding-bottom:10px;
+ }
+ .responsive-gap-maker{
+ margin-top: 210px;
+ }
}
label.error{
color: #be0000;
@@ -608,4 +626,14 @@ label.error{
right: 6px;
top: 0;
z-index: 100;
+}
+.data-title{
+ font-weight: bold;
+ margin-top:10px;
+}
+.data-title + div{
+ color:#444;
+}
+.action-buttons{
+ white-space: nowrap;
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/3d7961ed/components/org.apache.stratos.manager.console/console/util/utility.jag
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/util/utility.jag b/components/org.apache.stratos.manager.console/console/util/utility.jag
index 632d96b..6b2ca9b 100755
--- a/components/org.apache.stratos.manager.console/console/util/utility.jag
+++ b/components/org.apache.stratos.manager.console/console/util/utility.jag
@@ -345,17 +345,16 @@ consoleAppUtil = new function(){
default :
log.error("Error in the programme flow.");
}
- if(response.data.stratosAdminResponse) {
- session.put("deploy-status", "succeeded");
- } else if (response.data.Error) {
+
+ if (response.data.Error) {
session.put("deploy-status", response.data.Error.errorMessage);
} else {
- session.put("deploy-status", "Error occurred while deploying...");
+ session.put("deploy-status", "succeeded");
}
log.debug("sent is: " + stringify(response));
- return response;
- };
+ return response;
+ };
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/3d7961ed/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/MockContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/MockContext.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/MockContext.java
index 9292ae8..d8046d9 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/MockContext.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/MockContext.java
@@ -377,9 +377,8 @@ public class MockContext {
public Cluster[] getClusters() throws RestAPIException{
return clusterMap.values().toArray(new Cluster[0]);
}
- /*public DeploymentPolicy[] getValidDeploymentPolicies(String cartridgeType) {
- for(DeploymentPolicy deploymentPolicy : deploymentPolicyMap.values()){
- deploymentPolicy.
- }
- }*/
+ public DeploymentPolicy[] getDeploymentPoliciesForCartridgeType(String cartridgeType) throws RestAPIException{
+ return deploymentPolicyMap.values().toArray(new DeploymentPolicy[0]);
+ }
+
}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/3d7961ed/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/StratosTestAdmin.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/StratosTestAdmin.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/StratosTestAdmin.java
index 268da7b..6880bab 100644
--- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/StratosTestAdmin.java
+++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/StratosTestAdmin.java
@@ -453,16 +453,17 @@ public class StratosTestAdmin {
public Cluster[] getCluster(@PathParam("clusterId") String clusterId) throws RestAPIException {
return MockContext.getInstance().getClusters();
}
- /* @GET
+
+ @GET
@Path("{cartridgeType}/policy/deployment")
@Produces("application/json")
@Consumes("application/json")
@AuthorizationAction("/permission/protected/manage/monitor/tenants")
public DeploymentPolicy[] getValidDeploymentPolicies (@PathParam("cartridgeType") String cartridgeType)
throws RestAPIException {
- return MockContext.getInstance().getValidDeploymentPolicies(cartridgeType);
- }*/
+ return MockContext.getInstance().getDeploymentPoliciesForCartridgeType(cartridgeType);
+ }