Updated Branches: refs/heads/master b746b90e4 -> eb91034c6
fixing LB as a mandatory configuration in the config wizard Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/7cc26b6a Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/7cc26b6a Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/7cc26b6a Branch: refs/heads/master Commit: 7cc26b6ac8a38b4ad6bf6b37f02557cb0676274b Parents: a11dec2 Author: rekathiru <[email protected]> Authored: Mon Feb 10 10:11:56 2014 +0530 Committer: rekathiru <[email protected]> Committed: Mon Feb 10 10:11:56 2014 +0530 ---------------------------------------------------------------------- .../console/controllers/wizardSubmit.jag | 6 +++-- .../partials/configure_stratos_wizard.hbs | 15 ++++++++--- .../console/themes/theme1/ui/js/wizard.js | 26 +++++++++++++++++--- 3 files changed, 38 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/7cc26b6a/components/org.apache.stratos.manager.console/console/controllers/wizardSubmit.jag ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/controllers/wizardSubmit.jag b/components/org.apache.stratos.manager.console/console/controllers/wizardSubmit.jag index f30e730..68d434e 100755 --- a/components/org.apache.stratos.manager.console/console/controllers/wizardSubmit.jag +++ b/components/org.apache.stratos.manager.console/console/controllers/wizardSubmit.jag @@ -2,10 +2,12 @@ (function(){ var log = new Log("controller.partitionDefinitionSubmit"); var utils = require('/util/utility.jag'); - var policy = request.getParameter("policy").trim(); var thisStep = request.getParameter("thisStep"); var nextStep = request.getParameter("nextStep"); - if(parseInt(thisStep)<parseInt(nextStep)){ + var skip = request.getParameter("skip"); + if(parseInt(thisStep)<parseInt(nextStep) && skip != "true"){ + var policy = request.getParameter("policy") + if(parseInt(thisStep) == 1 && policy != "" ){ utils.consoleAppUtil.deployPartitionDefinition(policy); } http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/7cc26b6a/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 d00b344..e030c3c 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 @@ -65,7 +65,15 @@ <div class="col-md-12"> <form method="post" id="jsonForm" action="{{url "/controllers/wizardSubmit.jag"}}"> - <i class="icons-help icons-small-size"></i> Add at least one {{title}}. + + {{#ifCond step "==" 4}} + {{#unless config_on}} + <i class="icons-help icons-small-size"></i> Add at least one or choose no.load.balancer {{title}}. + {{/unless}} + {{else}} + <i class="icons-help icons-small-size"></i> Add at least one {{title}}. + {{/ifCond}} + <div style="clear: both"></div> {{#ifCond step "==" 1}} <label for="policy" class="required" style="margin-top:10px;">Partition Configuration</label> @@ -93,14 +101,15 @@ <input type="hidden" name="nextStep" id="nextStep" value="{{step}}"/> <input type="hidden" name="thisStep" id="thisStep" value="{{step}}"/> <input type="hidden" name="items" id="items" value="{{step_data.length}}"/> - + <input type="hidden" name="skip" id="skip" value="false"/> <textarea rows="11" id="policy" name="policy" class="form-control" ></textarea> <label class="error" id="policyError" style="display:none;">Required</label> {{#if config_on}} <button data-step="{{step}}" type="button" class="btn btn-primary" id="wizardNext">Deploy</button> {{else}} <button data-step="{{step}}" type="button" class="btn btn-default" {{#unless wizard_on_2}} disabled="disabled" {{/unless}} id="wizardBack"><< Back</button> - <button data-step="{{step}}" type="button" class="btn {{#unless wizard_on_5}}btn-primary{{else}}btn-default{{/unless}}" id="wizardNext" {{#if wizard_on_5}} disabled="disabled" {{/if}}>Next >></button> + <button data-step="{{step}}" type="button" class="btn {{#unless wizard_on_5}}{{#unless wizard_on_4}}btn-primary{{else}}btn-default{{/unless}}{{else}}btn-default{{/unless}}" id="wizardNext" {{#if wizard_on_5}} disabled="disabled" {{/if}}>Next >></button> + {{#ifCond step "==" 4}}<button data-step="{{step}}" type="button" class="btn btn-primary" id="wizardSkip">Skip >></button>{{/ifCond}} <button data-step="{{step}}" type="button" class="btn {{#if wizard_on_5}}btn-primary{{else}}btn-default{{/if}}" id="wizardFinish" {{#unless wizard_on_5}} disabled="disabled" {{/unless}}>Finish</button> {{/if}} </div> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/7cc26b6a/components/org.apache.stratos.manager.console/console/themes/theme1/ui/js/wizard.js ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/ui/js/wizard.js b/components/org.apache.stratos.manager.console/console/themes/theme1/ui/js/wizard.js index 822ff37..1e5cb36 100644 --- a/components/org.apache.stratos.manager.console/console/themes/theme1/ui/js/wizard.js +++ b/components/org.apache.stratos.manager.console/console/themes/theme1/ui/js/wizard.js @@ -7,6 +7,13 @@ $(function () { } }); + $('#wizardSkip').click(function () { + var newStep = parseInt($(this).attr('data-step')) + 1; + $('#skip').val("true"); + $('#nextStep').val(newStep); + $('#jsonForm').submit(); + }); + $('#wizardFinish').click(function () { var newStep = parseInt($(this).attr('data-step')) + 1; $('#nextStep').val(newStep); @@ -19,13 +26,24 @@ $(function () { $('#wizardBack').click(function () { var newStep = parseInt($(this).attr('data-step')) - 1; $('#nextStep').val(newStep); - if(isValidForm()){ + // if(isValidForm()){ $('#jsonForm').submit(); - } + // } }); + var thisStep = $('#thisStep').val(); - $('#policy').keydown(function(){ - isValidForm(); + $('#policy').keyup(function(){ + if(parseInt(thisStep)==4){ + if($(this).val() != ""){ + $('#wizardNext').removeClass('btn-default').addClass('btn-primary'); + $('#wizardSkip').removeClass('btn-primary').addClass('btn-default'); + }else{ + $('#wizardSkip').removeClass('btn-default').addClass('btn-primary'); + $('#wizardNext').removeClass('btn-primary').addClass('btn-default'); + } + }else{ + isValidForm(); + } }); var isValidForm = function(){
