Updated Branches: refs/heads/master f6e1352a4 -> 93fbed761
applying patch provided by chanaka jayasena, STRATOS-340 Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/93fbed76 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/93fbed76 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/93fbed76 Branch: refs/heads/master Commit: 93fbed76141da232762e39c378ee5b0c506c2826 Parents: f6e1352 Author: Pradeep Fernando <[email protected]> Authored: Wed Jan 8 16:53:38 2014 +0530 Committer: Pradeep Fernando <[email protected]> Committed: Wed Jan 8 16:53:38 2014 +0530 ---------------------------------------------------------------------- .../cartridge_deployments.jag | 4 +- .../org.apache.stratos.manager.console/lbs.jag | 4 +- .../mt_service_deployments.jag | 4 +- .../policy_deployments.jag | 4 +- .../theme1/partials/cartridge_deployments.hbs | 90 ++++++++++++++++++++ .../themes/theme1/partials/lbs.hbs | 90 ++++++++++++++++++++ .../theme1/partials/mt_service_deployments.hbs | 90 ++++++++++++++++++++ .../theme1/partials/policy_deployments.hbs | 90 ++++++++++++++++++++ .../theme1/renderers/cartridge_deployments.js | 25 ++++-- .../themes/theme1/renderers/lbs.js | 25 ++++-- .../theme1/renderers/mt_service_deployments.js | 25 ++++-- .../theme1/renderers/policy_deployments.js | 21 +++-- 12 files changed, 434 insertions(+), 38 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/93fbed76/components/org.apache.stratos.manager.console/cartridge_deployments.jag ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/cartridge_deployments.jag b/components/org.apache.stratos.manager.console/cartridge_deployments.jag index 02846a8..bdcbc59 100644 --- a/components/org.apache.stratos.manager.console/cartridge_deployments.jag +++ b/components/org.apache.stratos.manager.console/cartridge_deployments.jag @@ -1,7 +1,9 @@ <% var caramel = require('caramel'); var cartridge_deployments = require('/data/cartridge_deployments.json'); +var config_status = require('/data/config_status.json'); caramel.render({ - cartridge_deployments:cartridge_deployments + 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/93fbed76/components/org.apache.stratos.manager.console/lbs.jag ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/lbs.jag b/components/org.apache.stratos.manager.console/lbs.jag index 6a05e93..f229535 100644 --- a/components/org.apache.stratos.manager.console/lbs.jag +++ b/components/org.apache.stratos.manager.console/lbs.jag @@ -1,7 +1,9 @@ <% var caramel = require('caramel'); var lbs = require('/data/lbs.json'); +var config_status = require('/data/config_status.json'); caramel.render({ - lbs:lbs + lbs:lbs, + config_status:config_status }); %> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/93fbed76/components/org.apache.stratos.manager.console/mt_service_deployments.jag ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/mt_service_deployments.jag b/components/org.apache.stratos.manager.console/mt_service_deployments.jag index f771e70..abe143d 100644 --- a/components/org.apache.stratos.manager.console/mt_service_deployments.jag +++ b/components/org.apache.stratos.manager.console/mt_service_deployments.jag @@ -1,7 +1,9 @@ <% 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 + 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/93fbed76/components/org.apache.stratos.manager.console/policy_deployments.jag ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/policy_deployments.jag b/components/org.apache.stratos.manager.console/policy_deployments.jag index cd3d5cb..100e1c6 100644 --- a/components/org.apache.stratos.manager.console/policy_deployments.jag +++ b/components/org.apache.stratos.manager.console/policy_deployments.jag @@ -1,7 +1,9 @@ <% var caramel = require('caramel'); var policy_deployments = require('/data/policy_deployments.json'); +var config_status = require('/data/config_status.json'); caramel.render({ - policy_deployments:policy_deployments + policy_deployments:policy_deployments, + config_status:config_status }); %> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/93fbed76/components/org.apache.stratos.manager.console/themes/theme1/partials/cartridge_deployments.hbs ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/themes/theme1/partials/cartridge_deployments.hbs b/components/org.apache.stratos.manager.console/themes/theme1/partials/cartridge_deployments.hbs index e69de29..76638f4 100644 --- a/components/org.apache.stratos.manager.console/themes/theme1/partials/cartridge_deployments.hbs +++ b/components/org.apache.stratos.manager.console/themes/theme1/partials/cartridge_deployments.hbs @@ -0,0 +1,90 @@ +<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 Cartridge</h2> + <form 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" rows="11" id="policy"></textarea> + <button type="button" class="btn btn-primary" id="deployPolicy">Deploy Cartridge</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> + +<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}}"> + {{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/93fbed76/components/org.apache.stratos.manager.console/themes/theme1/partials/lbs.hbs ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/themes/theme1/partials/lbs.hbs b/components/org.apache.stratos.manager.console/themes/theme1/partials/lbs.hbs index e69de29..d28ca15 100644 --- a/components/org.apache.stratos.manager.console/themes/theme1/partials/lbs.hbs +++ b/components/org.apache.stratos.manager.console/themes/theme1/partials/lbs.hbs @@ -0,0 +1,90 @@ +<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>New LB</h2> + <form role="form"> + <label for="policy" class="required">LB 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">Add New LB</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> + +<div class="container"> + + <div class="row"> + <div class="col-md-12"> + + + <div class="panel-group" id="accordion"> + + + {{#each lbs}} + <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/93fbed76/components/org.apache.stratos.manager.console/themes/theme1/partials/mt_service_deployments.hbs ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/themes/theme1/partials/mt_service_deployments.hbs b/components/org.apache.stratos.manager.console/themes/theme1/partials/mt_service_deployments.hbs index e69de29..42ddbba 100644 --- a/components/org.apache.stratos.manager.console/themes/theme1/partials/mt_service_deployments.hbs +++ b/components/org.apache.stratos.manager.console/themes/theme1/partials/mt_service_deployments.hbs @@ -0,0 +1,90 @@ +<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 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" rows="11" id="policy"></textarea> + <button type="button" class="btn btn-primary" id="deployPolicy">Deploy MT Service</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> + +<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/93fbed76/components/org.apache.stratos.manager.console/themes/theme1/partials/policy_deployments.hbs ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/themes/theme1/partials/policy_deployments.hbs b/components/org.apache.stratos.manager.console/themes/theme1/partials/policy_deployments.hbs index e69de29..c7cfc42 100644 --- a/components/org.apache.stratos.manager.console/themes/theme1/partials/policy_deployments.hbs +++ b/components/org.apache.stratos.manager.console/themes/theme1/partials/policy_deployments.hbs @@ -0,0 +1,90 @@ +<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 Policy</h2> + <form 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" 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> + +<div class="container"> + + <div class="row"> + <div class="col-md-12"> + + + <div class="panel-group" id="accordion"> + + + {{#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}}"> + {{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/93fbed76/components/org.apache.stratos.manager.console/themes/theme1/renderers/cartridge_deployments.js ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/themes/theme1/renderers/cartridge_deployments.js b/components/org.apache.stratos.manager.console/themes/theme1/renderers/cartridge_deployments.js index 8f8e3cb..561ff72 100644 --- a/components/org.apache.stratos.manager.console/themes/theme1/renderers/cartridge_deployments.js +++ b/components/org.apache.stratos.manager.console/themes/theme1/renderers/cartridge_deployments.js @@ -1,14 +1,21 @@ var render = function (theme, data, meta, require) { - for(var i=0;i<data.partition_deployment.length;i++){ - data.partition_deployment[i].key = data.partition_deployment[i].name.replace(/ /g,''); + for(var i=0;i<data.cartridge_deployments.length;i++){ + data.cartridge_deployments[i].key = data.cartridge_deployments[i].name.replace(/ /g,''); + } + var create_btn_class = 'btn-important js_handle_click'; + var title = 'Configure Stratos - Partition Deployments'; + if(data.config_status.first_use){ + create_btn_class = "btn-default js_handle_click"; + title = 'Configure Stratos'; } theme('index', { body: [ { partial: 'cartridge_deployments', context: { - title:'Configure Stratos - Cartridge Deployments', - partition_deployment:data.partition_deployment + title:title, + cartridge_deployments:data.cartridge_deployments, + config_status:data.config_status } } ], @@ -17,14 +24,14 @@ var render = function (theme, data, meta, require) { partial: 'header', context:{ title:'Configure Stratos', - configure_stratos:true, button:{ link:'/', - name:'Deploy New Partition', - class_name:"btn-important" + name:'Deploy New Cartridge', + class_name:create_btn_class }, has_help:false, - cartridge_deployments:true + cartridge_deployments:true, + config_status:data.config_status } } ], @@ -32,7 +39,7 @@ var render = function (theme, data, meta, require) { { partial:'title', context:{ - title:"My Cartridges" + title:title } } ] http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/93fbed76/components/org.apache.stratos.manager.console/themes/theme1/renderers/lbs.js ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/themes/theme1/renderers/lbs.js b/components/org.apache.stratos.manager.console/themes/theme1/renderers/lbs.js index eb388da..ba0719e 100644 --- a/components/org.apache.stratos.manager.console/themes/theme1/renderers/lbs.js +++ b/components/org.apache.stratos.manager.console/themes/theme1/renderers/lbs.js @@ -1,14 +1,21 @@ var render = function (theme, data, meta, require) { - for(var i=0;i<data.partition_deployment.length;i++){ - data.partition_deployment[i].key = data.partition_deployment[i].name.replace(/ /g,''); + for(var i=0;i<data.lbs.length;i++){ + data.lbs[i].key = data.lbs[i].name.replace(/ /g,''); + } + var create_btn_class = 'btn-important js_handle_click'; + var title = 'Configure Stratos - LBs'; + if(data.config_status.first_use){ + create_btn_class = "btn-default js_handle_click"; + title = 'Configure Stratos'; } theme('index', { body: [ { partial: 'lbs', context: { - title:'Configure Stratos - Lbs', - partition_deployment:data.partition_deployment + title:title, + lbs:data.lbs, + config_status:data.config_status } } ], @@ -17,14 +24,14 @@ var render = function (theme, data, meta, require) { partial: 'header', context:{ title:'Configure Stratos', - configure_stratos:true, button:{ link:'/', - name:'Deploy New Partition', - class_name:"btn-important" + name:'New LB', + class_name:create_btn_class }, has_help:false, - lbs:true + lbs:true, + config_status:data.config_status } } ], @@ -32,7 +39,7 @@ var render = function (theme, data, meta, require) { { partial:'title', context:{ - title:"My Cartridges" + title:title } } ] http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/93fbed76/components/org.apache.stratos.manager.console/themes/theme1/renderers/mt_service_deployments.js ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/themes/theme1/renderers/mt_service_deployments.js b/components/org.apache.stratos.manager.console/themes/theme1/renderers/mt_service_deployments.js index ce2cd09..45687d0 100644 --- a/components/org.apache.stratos.manager.console/themes/theme1/renderers/mt_service_deployments.js +++ b/components/org.apache.stratos.manager.console/themes/theme1/renderers/mt_service_deployments.js @@ -1,14 +1,21 @@ var render = function (theme, data, meta, require) { - for(var i=0;i<data.partition_deployment.length;i++){ - data.partition_deployment[i].key = data.partition_deployment[i].name.replace(/ /g,''); + for(var i=0;i<data.mt_service_deployments.length;i++){ + data.mt_service_deployments[i].key = data.mt_service_deployments[i].name.replace(/ /g,''); + } + var create_btn_class = 'btn-important js_handle_click'; + var title = 'Configure Stratos - Multi-Tenant Service Deployments'; + if(data.config_status.first_use){ + create_btn_class = "btn-default js_handle_click"; + title = 'Configure Stratos'; } theme('index', { body: [ { partial: 'mt_service_deployments', context: { - title:'Configure Stratos - MT Service Deployments', - partition_deployment:data.partition_deployment + title:title, + mt_service_deployments:data.mt_service_deployments, + config_status:data.config_status } } ], @@ -17,14 +24,14 @@ var render = function (theme, data, meta, require) { partial: 'header', context:{ title:'Configure Stratos', - configure_stratos:true, button:{ link:'/', - name:'Deploy New Partition', - class_name:"btn-important" + name:'Deploy New Multi-Tenant Service', + class_name:create_btn_class }, has_help:false, - mt_service_deployments:true + mt_service_deployments:true, + config_status:data.config_status } } ], @@ -32,7 +39,7 @@ var render = function (theme, data, meta, require) { { partial:'title', context:{ - title:"My Cartridges" + title:title } } ] http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/93fbed76/components/org.apache.stratos.manager.console/themes/theme1/renderers/policy_deployments.js ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/themes/theme1/renderers/policy_deployments.js b/components/org.apache.stratos.manager.console/themes/theme1/renderers/policy_deployments.js index 5fcf81d..3b7777b 100644 --- a/components/org.apache.stratos.manager.console/themes/theme1/renderers/policy_deployments.js +++ b/components/org.apache.stratos.manager.console/themes/theme1/renderers/policy_deployments.js @@ -2,13 +2,20 @@ var render = function (theme, data, meta, require) { for(var i=0;i<data.policy_deployments.length;i++){ data.policy_deployments[i].key = data.policy_deployments[i].name.replace(/ /g,''); } + var create_btn_class = 'btn-important js_handle_click'; + var title = 'Configure Stratos - Policy Deployments'; + if(data.config_status.first_use){ + create_btn_class = "btn-default js_handle_click"; + title = 'Configure Stratos'; + } theme('index', { body: [ { partial: 'policy_deployments', context: { - title:'Configure Stratos - Policy Deployments', - policy_deployments:data.policy_deployments + title:title, + policy_deployments:data.policy_deployments, + config_status:data.config_status } } ], @@ -17,14 +24,14 @@ var render = function (theme, data, meta, require) { partial: 'header', context:{ title:'Configure Stratos', - configure_stratos:true, button:{ link:'/', - name:'Deploy New Partition', - class_name:"btn-important" + name:'Deploy New Policy', + class_name:create_btn_class }, has_help:false, - policy_deployments:true + policy_deployments:true, + config_status:data.config_status } } ], @@ -32,7 +39,7 @@ var render = function (theme, data, meta, require) { { partial:'title', context:{ - title:"My Cartridges" + title:title } } ]
