Updated Branches: refs/heads/master 203ff0c5a -> f1d0461bd
removing unnecessary files and fixing tenants displaying issue in the GUI Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/50f12524 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/50f12524 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/50f12524 Branch: refs/heads/master Commit: 50f12524ca00d6981af4adf4a3e71b9345f52020 Parents: 15401c0 Author: rekathiru <[email protected]> Authored: Thu Feb 6 15:21:54 2014 +0530 Committer: rekathiru <[email protected]> Committed: Thu Feb 6 15:21:54 2014 +0530 ---------------------------------------------------------------------- .../console/cartridge_deployments.jag | 18 --- .../console/mt_service_deployments.jag | 9 -- .../console/partition_deployments.jag | 14 -- .../console/policy_deployments.jag | 16 --- .../theme1/partials/cartridge_deployments.hbs | 85 ------------ .../theme1/partials/mt_service_deployments.hbs | 89 ------------- .../theme1/partials/partition_deployments.hbs | 132 ------------------- .../theme1/partials/policy_deployments.hbs | 131 ------------------ .../theme1/partials/tenant_management.hbs | 8 +- 9 files changed, 4 insertions(+), 498 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/50f12524/components/org.apache.stratos.manager.console/console/cartridge_deployments.jag ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/cartridge_deployments.jag b/components/org.apache.stratos.manager.console/console/cartridge_deployments.jag deleted file mode 100644 index 4d38964..0000000 --- a/components/org.apache.stratos.manager.console/console/cartridge_deployments.jag +++ /dev/null @@ -1,18 +0,0 @@ -<% -var caramel = require('caramel'); -var config_status = require('/data/config_status.json'); - -var utils = require('/util/utility.jag'); -var cartridge_deployments = utils.consoleAppUtil.getCartridges(); -cartridge_deployments = cartridge_deployments.cartridge; -for(var i=0;i<cartridge_deployments.length;i++){ - if(cartridge_deployments[i].cartridgeType == "lb"){ - cartridge_deployments.splice(i,1); - } -} - -caramel.render({ - cartridge_deployments:cartridge_deployments, - config_status:config_status -}); -%> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/50f12524/components/org.apache.stratos.manager.console/console/mt_service_deployments.jag ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/mt_service_deployments.jag b/components/org.apache.stratos.manager.console/console/mt_service_deployments.jag deleted file mode 100644 index abe143d..0000000 --- a/components/org.apache.stratos.manager.console/console/mt_service_deployments.jag +++ /dev/null @@ -1,9 +0,0 @@ -<% -var caramel = require('caramel'); -var mt_service_deployments = require('/data/mt_service_deployments.json'); -var config_status = require('/data/config_status.json'); -caramel.render({ - mt_service_deployments:mt_service_deployments, - config_status:config_status -}); -%> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/50f12524/components/org.apache.stratos.manager.console/console/partition_deployments.jag ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/partition_deployments.jag b/components/org.apache.stratos.manager.console/console/partition_deployments.jag deleted file mode 100644 index 155e24c..0000000 --- a/components/org.apache.stratos.manager.console/console/partition_deployments.jag +++ /dev/null @@ -1,14 +0,0 @@ -<% -var caramel = require('caramel'); - -var utils = require('/util/utility.jag'); - -var config_status = utils.consoleAppUtil.getConfigStatus(); - -var partition_deployments = utils.consoleAppUtil.getPartitions(); -partition_deployments = partition_deployments.partition; -caramel.render({ - partition_deployments:partition_deployments, - config_status:config_status -}); -%> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/50f12524/components/org.apache.stratos.manager.console/console/policy_deployments.jag ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/policy_deployments.jag b/components/org.apache.stratos.manager.console/console/policy_deployments.jag deleted file mode 100644 index c111e39..0000000 --- a/components/org.apache.stratos.manager.console/console/policy_deployments.jag +++ /dev/null @@ -1,16 +0,0 @@ -<% -var caramel = require('caramel'); -var config_status = require('/data/config_status.json'); - -var utils = require('/util/utility.jag'); -var policy_autoscale = utils.consoleAppUtil.getPolicyAutoScale(); -var policy_deployments = utils.consoleAppUtil.getPolicyDeployment(); -policy_autoscale = policy_autoscale.autoscalePolicy; -policy_deployments = policy_deployments.deploymentPolicy; - -caramel.render({ - policy_deployments:policy_deployments, - policy_autoscale:policy_autoscale, - config_status:config_status -}); -%> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/50f12524/components/org.apache.stratos.manager.console/console/themes/theme1/partials/cartridge_deployments.hbs ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/cartridge_deployments.hbs b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/cartridge_deployments.hbs deleted file mode 100644 index e217ecf..0000000 --- a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/cartridge_deployments.hbs +++ /dev/null @@ -1,85 +0,0 @@ -<div class="container content-starter"> - <div class="row"> - <div class="col-lg-12"> - <h1>{{title}}</h1> - </div> - </div> -</div> -<div class="container" id="addItemSection"> - <div class="row"> - <div class="col-md-12"> - - <form id="jsonForm" method="post" role="form" action="{{url "/controllers/cartridgeDefintionSubmit.jag"}}"> - <label for="policy" class="required">Policy Configuration</label> - - <div class="container"> - <div class="row"> - <div class="col-md-6 padding-remover-left"> - <textarea name="cartridge-definition" class="form-control required" rows="11" - id="policy"></textarea> - <button type="submit" class="btn btn-primary" id="deployPolicy">Deploy Cartridge</button> - </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> - -<div class="container"> - - <div class="row"> - <div class="col-md-12"> - - - <div class="panel-group" id="accordion"> - - - {{#each cartridge_deployments}} - <div class="panel panel-default"> - <div class="panel-heading"> - <h4 class="panel-title"> - <a data-toggle="collapse" data-parent="#accordion" href="#collapse{{key}}"> - {{displayName}} - </a> - </h4> - </div> - <div id="collapse{{key}}" class="panel-collapse collapse"> - <div class="panel-body"> - </div> - </div> - </div> - {{/each}} - - - - </div> - </div> - </div> -</div> -<script src="{{url "/themes/theme1/ui/js/utils.js"}}"></script> -<script src="{{url "/themes/theme1/ui/js/configure_stratos.js"}}"></script> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/50f12524/components/org.apache.stratos.manager.console/console/themes/theme1/partials/mt_service_deployments.hbs ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/mt_service_deployments.hbs b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/mt_service_deployments.hbs deleted file mode 100644 index 09d1309..0000000 --- a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/mt_service_deployments.hbs +++ /dev/null @@ -1,89 +0,0 @@ -<div class="container content-starter"> - <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 Multi-Tenant Service</h2> - <form id="jsonForm" role="form"> - <label for="policy" class="required">Policy Configuration</label> - - <div class="container"> - <div class="row"> - <div class="col-md-6 padding-remover-left"> - <textarea class="form-control required" rows="11" id="policy"></textarea> - <button type="button" class="btn btn-primary" id="deployPolicy">Deploy MT Service</button> - </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> - -<div class="container"> - - <div class="row"> - <div class="col-md-12"> - - - <div class="panel-group" id="accordion"> - - - {{#each mt_service_deployments}} - <div class="panel panel-default"> - <div class="panel-heading"> - <h4 class="panel-title"> - <a data-toggle="collapse" data-parent="#accordion" href="#collapse{{key}}"> - {{name}} - </a> - </h4> - </div> - <div id="collapse{{key}}" class="panel-collapse collapse"> - <div class="panel-body"> - <pre>{{policy}}</pre> - <textarea style="display:none" class="jsonEditor">{{policy}}</textarea> - <button class="btn btn-primary js_jsonEdit">Edit</button> - <button class="btn btn-primary js_jsonSave" style="display:none">Save</button> - <a class="js_jsonCancel" style="display:none">Cancel</a> - </div> - </div> - </div> - {{/each}} - - - - </div> - </div> - </div> -</div> -<script src="{{url "/themes/theme1/ui/js/utils.js"}}"></script> -<script src="{{url "/themes/theme1/ui/js/configure_stratos.js"}}"></script> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/50f12524/components/org.apache.stratos.manager.console/console/themes/theme1/partials/partition_deployments.hbs ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/partition_deployments.hbs b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/partition_deployments.hbs deleted file mode 100644 index b8d6ef3..0000000 --- a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/partition_deployments.hbs +++ /dev/null @@ -1,132 +0,0 @@ -{{#unless config_status.first_use}} -<div class="container content-starter"> - <div class="row"> - <div class="col-lg-12"> - <h1>{{title}}</h1> - </div> - </div> -</div> -<div class="container" id="addItemSection"> - <div class="row"> - <div class="col-md-12"> - <form method="post" id="jsonForm" role="form" action="{{url "/controllers/partitionDefinitionSubmit.jag"}}"> - <label for="policy" class="required">Partition Configuration</label> - - <div class="container"> - <div class="row"> - <div class="col-md-6 padding-remover-left"> - <textarea name="partition-definition" class="form-control required" rows="11" id="policy"></textarea> - <button type="submit" class="btn btn-primary" id="deployPolicy">Deploy Partition</button> - </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> - -<div class="container"> - - <div class="row"> - <div class="col-md-12"> - - - <div class="panel-group" id="accordion"> - - - {{#each partition_deployments}} - <div class="panel panel-default"> - <div class="panel-heading"> - <h4 class="panel-title"> - <a data-toggle="collapse" data-parent="#accordion" href="#collapse{{key}}"> - {{id}} - </a> - </h4> - </div> - <div id="collapse{{key}}" class="panel-collapse collapse"> - <div class="panel-body"> - <div style="font-weight: bold">partitionMin</div> - {{partitionMin}}<br /> - <div style="font-weight: bold">partitionMax</div> - {{partitionMax}}<br /> - <div style="font-weight: bold">provider</div> - {{provider}}<br /> - <div style="font-weight: bold">property.name</div> - {{property.name}}<br /> - <div style="font-weight: bold">property.value</div> - {{property.value}}<br /> - </div> - </div> - </div> - {{/each}} - - - - </div> - </div> - </div> -</div> -<script src="{{url "/themes/theme1/ui/js/utils.js"}}"></script> -<script src="{{url "/themes/theme1/ui/js/configure_stratos.js"}}"></script> -{{/unless}} -{{#if config_status.first_use}} -<div class="container content-starter"> - <div class="row"> - <div class="col-lg-12"> - <h1>{{title}}</h1> - </div> - </div> -</div> -<div class="container"> - <div class="row"> - <div class="col-md-3"> - <a href="{{url "/configure_stratos_wizard.jag"}}" class="btn btn-important"><i class=""></i> Take the configuration Wizard</a> - </div> - <div class="col-md-1"> - <i class="icons-help"></i> - </div> - <div class="col-md-8"> - <p>Stratos is not configured yet. Each step needs to be done in the correct order.</p> - <i class="fa fa-arrow-circle-down color-a-full-icons"></i> - <p>Partition deployment</p> - <i class="fa fa-arrow-circle-down color-a-full-icons"></i> - - <p>Policy deployment</p> - <i class="fa fa-arrow-circle-down color-a-full-icons"></i> - - <p>LB Creation</p> - <i class="fa fa-arrow-circle-down color-a-full-icons"></i> - - <p>Cartridge Deployment</p> - <i class="fa fa-arrow-circle-down color-a-full-icons"></i> - - <p>Multi-Tenant Service Deployments</p> - - </div> - </div> -</div> -{{/if}} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/50f12524/components/org.apache.stratos.manager.console/console/themes/theme1/partials/policy_deployments.hbs ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/policy_deployments.hbs b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/policy_deployments.hbs deleted file mode 100644 index a931fd3..0000000 --- a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/policy_deployments.hbs +++ /dev/null @@ -1,131 +0,0 @@ -<div class="container content-starter"> - <div class="row"> - <div class="col-lg-12"> - <h1>{{title}}</h1> - </div> - </div> -</div> -<div class="container" id="addItemSection"> - <div class="row"> - <div class="col-md-12"> - <form id="jsonForm" method="post" role="form" action="{{url "/controllers/policyDefinitionSubmit.jag"}}"> - - - <div class="container"> - <div class="row"> - <div class="col-md-6 padding-remover-left"> - <label class="required">Policy Type</label> - - <div class="form-inline" style="padding-bottom: 10px;"> - <div class="radio"> - <label style="padding-right: 20px;"> - <input name="policyType" value="autoscale-policy" type="radio" checked="checked"> Auto scale - </label> - <label> - <input name="policyType" value="deployment-policy" type="radio"> Deployment - </label> - </div> - </div> - <label for="policy" class="required">Policy Configuration</label> - <textarea name="policy-definition" class="form-control required" rows="11" id="policy"></textarea> - <button type="submit" class="btn btn-primary" id="deployPolicy">Deploy Policy</button> - </div> - <div class="col-md-6"> - <i class="icons-help"></i> - Example configuration: - <pre> - { - "autoscalePolicy": { - "id": "economyPolicy", - "loadThresholds": { - "requestsInFlight": { - "average": "6000", - "gradient": "0", - "secondDerivative": "0", - "scaleDownMarginOfGradient": "1.0", - "scaleDownMarginOfSecondDerivative": "0.2" - }, - "memoryConsumption": { - "average": "6000", - "gradient": "0", - "secondDerivative": "0", - "scaleDownMarginOfGradient": "1.0", - "scaleDownMarginOfSecondDerivative": "0.2" - }, - "loadAverage": { - "average": "6000", - "gradient": "0", - "secondDerivative": "0", - "scaleDownMarginOfGradient": "1.0", - "scaleDownMarginOfSecondDerivative": "0.2" - } - } - } - } - </pre> - </div> - </div> - - </div> - - - </form> - - </div> - </div> -</div> - -<div class="container"> - - <div class="row"> - <div class="col-md-12"> - - - <div class="panel-group" id="accordion"> - <h3>Auto scale</h3> - {{#each policy_autoscale}} - <div class="panel panel-default"> - <div class="panel-heading"> - <h4 class="panel-title"> - <a data-toggle="collapse" data-parent="#accordion" href="#collapse{{key}}"> - {{id}} - </a> - </h4> - </div> - <div id="collapse{{key}}" class="panel-collapse collapse"> - <div class="panel-body"> - - <div style="font-weight: bold">loadThresholds</div> - {{loadThresholds}}<br /> - </div> - </div> - </div> - {{/each}} - - <h3>Deployment</h3> - {{#each policy_deployments}} - <div class="panel panel-default"> - <div class="panel-heading"> - <h4 class="panel-title"> - <a data-toggle="collapse" data-parent="#accordion" href="#collapse{{key}}"> - {{id}} - </a> - </h4> - </div> - <div id="collapse{{key}}" class="panel-collapse collapse"> - <div class="panel-body"> - <div style="font-weight: bold">partitionGroup</div> - {{partitionGroup}}<br /> - </div> - </div> - </div> - {{/each}} - - - - </div> - </div> - </div> -</div> -<script src="{{url "/themes/theme1/ui/js/utils.js"}}"></script> -<script src="{{url "/themes/theme1/ui/js/configure_stratos.js"}}"></script> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/50f12524/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 ee1a41f..9fc50ca 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 @@ -71,11 +71,11 @@ <tbody> {{#each tenants}} <tr> - <td><input value="{{domain}}" type="checkbox" {{#if active}}checked="checked"{{/if}} class="js_domainCheck" /></td> - <td><a title="Click to {{#if active}}}deactivate{{else}}activate{{/if}}" onclick="manage_one('{{#if active}}}deactivate{{else}}activate{{/if}}',this)" data-domain="{{domain}}"><i class="fa {{#if active}}}fa-check-circle-o green-check{{else}}fa-exclamation-circle orange-check{{/if}}"></i></a></td> - <td><a>{{domain}}</a></td> + <td><input value="{{tenantDomain}}" type="checkbox" {{#if active}}checked="checked"{{/if}} class="js_domainCheck" /></td> + <td><a title="Click to {{#if active}}}deactivate{{else}}activate{{/if}}" onclick="manage_one('{{#if active}}}deactivate{{else}}activate{{/if}}',this)" data-domain="{{tenantDomain}}"><i class="fa {{#if active}}}fa-check-circle-o green-check{{else}}fa-exclamation-circle orange-check{{/if}}"></i></a></td> + <td><a>{{tenantDomain}}</a></td> <td>{{email}}</td> - <td>{{created}}</td> + <td>{{createdDate}}</td> </tr> {{/each}} </tbody>
