Updated Branches: refs/heads/master 4df912f6c -> 02d111432
adding the description of the items as json in the UI Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/02d11143 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/02d11143 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/02d11143 Branch: refs/heads/master Commit: 02d11143281aaf5fa96414e10510384148d53a50 Parents: 4df912f Author: rekathiru <[email protected]> Authored: Mon Feb 10 15:24:12 2014 +0530 Committer: rekathiru <[email protected]> Committed: Mon Feb 10 15:24:12 2014 +0530 ---------------------------------------------------------------------- .../console/configure_stratos.jag | 8 +- .../partials/configure_stratos_wizard.hbs | 138 +++++-------------- .../theme1/renderers/configure_stratos.js | 9 +- .../renderers/configure_stratos_wizard.js | 3 +- .../console/util/utility.jag | 4 +- 5 files changed, 57 insertions(+), 105 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/02d11143/components/org.apache.stratos.manager.console/console/configure_stratos.jag ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/configure_stratos.jag b/components/org.apache.stratos.manager.console/console/configure_stratos.jag index c61f41d..0c900a3 100644 --- a/components/org.apache.stratos.manager.console/console/configure_stratos.jag +++ b/components/org.apache.stratos.manager.console/console/configure_stratos.jag @@ -1,6 +1,8 @@ <% var caramel = require('caramel'); var step = request.getParameter('step'); + var log = new Log("config.stratos"); + if(step == null){ step = 1; } @@ -18,12 +20,15 @@ var config_status = utils.consoleAppUtil.getConfigStatus(); if(wizard.step == 1){ var partition_deployments = utils.consoleAppUtil.getPartitions(); step_data = partition_deployments.partition; + }else if(wizard.step == 2){ step_data = utils.consoleAppUtil.getPolicyAutoScale(); step_data = step_data.autoscalePolicy; + }else if(wizard.step == 3){ step_data = utils.consoleAppUtil.getPolicyDeployment(); step_data = step_data.deploymentPolicy; + }else if(wizard.step == 4){ step_data = utils.consoleAppUtil.getCartridges(); step_data = step_data.cartridge; @@ -32,6 +37,7 @@ if(wizard.step == 1){ step_data.splice(i,1); } } + }else if(wizard.step == 5){ step_data = utils.consoleAppUtil.getCartridges(); step_data = step_data.cartridge; @@ -40,7 +46,7 @@ if(wizard.step == 1){ step_data.splice(i,1); } } -}else if(wizard.step == 6){ +}else if(wizard.step == 6) { step_data = require('data/mt_service_deployments.json'); } caramel.render({ http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/02d11143/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 edbbb9d..3c303bc 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 @@ -291,122 +291,60 @@ <div class="panel-group" id="accordion"> - {{#ifCond step "==" 1}} + {{#ifCond step "==" 4}} {{#each step_data}} <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 data-toggle="collapse" data-parent="#accordion" href="#collapse{{cartridgeType}}"> + {{cartridgeType}} </a> </h4> </div> - <div id="collapse{{key}}" class="panel-collapse collapse"> + <div id="collapse{{cartridgeType}}" 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 /> + <pre>{{json_string}}</pre> </div> </div> </div> {{/each}} {{/ifCond}} - {{#ifCond step "==" 2}} - {{#each step_data}} - <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}} - {{/ifCond}} - - - - {{#ifCond step "==" 3}} - {{#each step_data}} - <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}} - {{/ifCond}} - - - {{#ifCond step "==" 4}} - {{#each step_data}} - <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"> - <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}} - {{/ifCond}} - - {{#ifCond step "==" 5}} - {{#each step_data}} - <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"> + {{#each step_data}} + <div class="panel panel-default"> + <div class="panel-heading"> + <h4 class="panel-title"> + <a data-toggle="collapse" data-parent="#accordion" href="#collapse{{cartridgeType}}"> + {{cartridgeType}} + </a> + </h4> + </div> + <div id="collapse{{cartridgeType}}" class="panel-collapse collapse"> + <div class="panel-body"> + <pre>{{json_string}}</pre> + </div> + </div> </div> - </div> - </div> - {{/each}} - {{/ifCond}} - - - + {{/each}} + {{else}} + {{#each step_data}} + <div class="panel panel-default"> + <div class="panel-heading"> + <h4 class="panel-title"> + <a data-toggle="collapse" data-parent="#accordion" href="#collapse{{id}}"> + {{id}} + </a> + </h4> + </div> + <div id="collapse{{id}}" class="panel-collapse collapse"> + <div class="panel-body"> + <pre>{{json_string}}</pre> + </div> + </div> + </div> + {{/each}} + {{/ifCond}} </div> </div> </div> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/02d11143/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/configure_stratos.js ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/configure_stratos.js b/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/configure_stratos.js index 17b6ba6..16dd728 100644 --- a/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/configure_stratos.js +++ b/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/configure_stratos.js @@ -24,6 +24,11 @@ var render = function (theme, data, meta, require) { title = 'Multi-Tenant Service Deployment'; } + + for(var i=0;i<step_data.length;i++){ + step_data[i].json_string = stringify(step_data[i]); + } + theme('index', { body: [ { @@ -40,7 +45,9 @@ var render = function (theme, data, meta, require) { wizard_on_4:wizard_on_val[3], wizard_on_5:wizard_on_val[4], wizard_on_6:wizard_on_val[5], - config_status:data.config_status + config_status:data.config_status, + data_string:stringify(data.step_data) + } } ], http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/02d11143/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/configure_stratos_wizard.js ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/configure_stratos_wizard.js b/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/configure_stratos_wizard.js index 9733543..922bed8 100644 --- a/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/configure_stratos_wizard.js +++ b/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/configure_stratos_wizard.js @@ -37,7 +37,8 @@ var render = function (theme, data, meta, require) { wizard_on_3:wizard_on_val[2], wizard_on_4:wizard_on_val[3], wizard_on_5:wizard_on_val[4], - wizard_on_6:wizard_on_val[5] + wizard_on_6:wizard_on_val[5], + data_string:stringify(data.step_data) } } ], http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/02d11143/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 d8785dd..8b59e8c 100644 --- a/components/org.apache.stratos.manager.console/console/util/utility.jag +++ b/components/org.apache.stratos.manager.console/console/util/utility.jag @@ -219,7 +219,7 @@ consoleAppUtil = new function(){ default : log.error("Error in the programme flow."); } - log.debug(response.data); + log.info("recieved data is: " + stringify(response.data)); return response; }; @@ -247,7 +247,7 @@ consoleAppUtil = new function(){ default : log.error("Error in the programme flow."); } - log.debug(response.data); + log.info("sent response is: " + stringify(response.data)); return response; };
