Updated Branches: refs/heads/master a05094255 -> 218035f5f
form submission fixes Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/21d98579 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/21d98579 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/21d98579 Branch: refs/heads/master Commit: 21d9857916ffd6c00d136b30ec15f5557ae0192a Parents: a7109af Author: Pradeep Fernando <[email protected]> Authored: Fri Jan 17 19:14:36 2014 +0530 Committer: Pradeep Fernando <[email protected]> Committed: Fri Jan 17 19:14:36 2014 +0530 ---------------------------------------------------------------------- .../controllers/cartridgeSubscribeSubmit.jag | 32 ++++ .../themes/theme1/partials/cartridges.hbs | 2 +- .../theme1/partials/subscribe_cartridge.hbs | 163 ++++++++++--------- .../themes/theme1/renderers/cartridges.js | 2 - .../theme1/renderers/subscribe_cartridge.js | 3 +- 5 files changed, 119 insertions(+), 83 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/21d98579/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 new file mode 100644 index 0000000..45ee41d --- /dev/null +++ b/components/org.apache.stratos.manager.console/console/controllers/cartridgeSubscribeSubmit.jag @@ -0,0 +1,32 @@ +<% +(function(){ + var log = new Log("controller.cartridgeSubscribeSubmit"); + var utils = require('/util/utility.jag'); + var jsonRequest = {}; + jsonRequest.cartridgeInfoBean = {}; + var cartridgeType = request.getParameter('cartridgeType'); + var alias = request.getParameter('alias'); + var repoURL = request.getParameter('repoURL'); + var isPublicRepo = request.getParameter('isPublicRepo'); + var repoUsername = request.getParameter('repoUsername'); + var repoPassword = request.getParameter('repoPassword'); + var autoscalePolicy = request.getParameter('autoscalePolicy'); + var deploymentPolicy = request.getParameter('deploymentPolicy'); + + // constructing the json request + jsonRequest.cartridgeInfoBean.cartridgeType = cartridgeType; + jsonRequest.cartridgeInfoBean.alias = alias; + jsonRequest.cartridgeInfoBean.repoURL = repoURL; + jsonRequest.cartridgeInfoBean.privateRepo = !isPublicRepo; + if(!isPublicRepo){ + jsonRequest.cartridgeInfoBean.repoUsername = repoUsername; + jsonRequest.cartridgeInfoBean.repoPassword = repoPassword; + + } + jsonRequest.cartridgeInfoBean.autoscalePolicy = autoscalePolicy; + jsonRequest.cartridgeInfoBean.deploymentPolicy = deploymentPolicy; + + var result = utils.consoleAppUtil.subscribeToCartridge(jsonRequest); + response.sendRedirect(request.getContextPath() + '/index.jag'); +}()); +%> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/21d98579/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 2e5d831..db55a2f 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 @@ -23,7 +23,7 @@ <div class="big-pro-icons-title">{{version}}</div> </div> <div class="col-lg-9"> - <a href="{{url "/subscribe_cartridge.jag"}}"><h3>{{displayName}} - {{version}}</h3></a> + <a href="{{url "/subscribe_cartridge.jag"}}?cartridgeType={{cartridgeType}}"><h3>{{displayName}} - {{version}}</h3></a> <div class="cartridge-description">{{description}}</div> </div> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/21d98579/components/org.apache.stratos.manager.console/console/themes/theme1/partials/subscribe_cartridge.hbs ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/subscribe_cartridge.hbs b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/subscribe_cartridge.hbs index 2a37d7c..a783e63 100644 --- a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/subscribe_cartridge.hbs +++ b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/subscribe_cartridge.hbs @@ -9,11 +9,13 @@ <div class="container"> <div class="row"> <div class="col-lg-12"> - <form role="form"> - <div class="form-group"> + <form method="post" role="form" action="{{url "/controllers/cartridgeSubscribeSubmit.jag"}}"> + <div class="form-group"> <label class="required">Public URL:</label> <div class="form-inline"> - <input type="url" + <input name="cartridgeType" type="hidden" value="{{cartridgeType}}"/> + <input name="alias" + type="url" class="form-control input-xlarge js-help" data-help="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas condimentum eros nec risus pretium, at lobortis nulla vulputate. Duis et cursus justo, vel fermentum neque. Praesent bibendum turpis vel tincidunt sollicitudin. @@ -23,103 +25,106 @@ placeholder="myphp" /> <label>-lakmal.php.stratos.com</label> </div> - </div> - <div class="form-group"> - <label class="required">Repo URL:</label> - <div class="form-inline"> - <input type="url" - class="form-control input-xlarge js-help" - data-help="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas condimentum eros nec risus pretium, at lobortis + </div> + <div class="form-group"> + <label class="required">Repo URL:</label> + <div class="form-inline"> + <input name="repoURL" + type="url" + class="form-control input-xlarge js-help" + data-help="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas condimentum eros nec risus pretium, at lobortis nulla vulputate. Duis et cursus justo, vel fermentum neque. Praesent bibendum turpis vel tincidunt sollicitudin. Integer nibh est, pretium nec nunc vitae, auctor pharetra elit. Fusce at ornare sapien." - data-help-x-offset="200" - data-help-y-offset="-10" - placeholder="myphp" /> - </div> - <div class="checkbox"> - <label> - <input type="checkbox" checked="checked" id="public_check" /> This is a public repository - </label> - </div> + data-help-x-offset="200" + data-help-y-offset="-10" + placeholder="myphp" /> </div> - <div id="credential_container" style="display: none;padding-left:20px;margin-left:20px; background: #efefef;padding-bottom:10px;margin-bottom:10px;"> - <h2>Provide Credentials</h2> - <div class="form-group"> - <label class="required">Username:</label> - <div class="form-inline"> - <input type="url" class="form-control input-xlarge" placeholder="myphp"/> - </div> - </div> - <div class="form-group"> - <label class="required">Password:</label> - <div class="form-inline"> - <input type="url" class="form-control input-xlarge" placeholder="myphp"/> - </div> - </div> + <div class="checkbox"> + <label> + <input name="isPublicRepo" type="checkbox" checked="checked" id="public_check" /> This is a public repository + </label> </div> + </div> + <div id="credential_container" style="display: none;padding-left:20px;margin-left:20px; background: #efefef;padding-bottom:10px;margin-bottom:10px;"> + <h2>Provide Credentials</h2> <div class="form-group"> - <label class="required">Autoscale Policy:</label> + <label class="required">Username:</label> <div class="form-inline"> - <select - class="form-control input-xlarge js-help" - data-help="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas condimentum eros nec risus pretium, at lobortis - nulla vulputate. Duis et cursus justo, vel fermentum neque. Praesent bibendum turpis vel tincidunt sollicitudin. - Integer nibh est, pretium nec nunc vitae, auctor pharetra elit. Fusce at ornare sapien." - data-help-x-offset="50" - data-help-y-offset="-10" > - <option>policyx</option> - <option>policyy</option> - </select> + <input name="repoUsername" type="url" class="form-control input-xlarge" placeholder="myphp"/> </div> </div> <div class="form-group"> - <label class="required">Deployment Policy:</label> + <label class="required">Password:</label> <div class="form-inline"> - <select - class="form-control input-xlarge js-help" - data-help="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas condimentum eros nec risus pretium, at lobortis + <input name="repoPassword" type="url" class="form-control input-xlarge" placeholder="myphp"/> + </div> + </div> + </div> + <div class="form-group"> + <label class="required">Autoscale Policy:</label> + <div class="form-inline"> + <select + name="autoscalePolicy" + class="form-control input-xlarge js-help" + data-help="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas condimentum eros nec risus pretium, at lobortis nulla vulputate. Duis et cursus justo, vel fermentum neque. Praesent bibendum turpis vel tincidunt sollicitudin. Integer nibh est, pretium nec nunc vitae, auctor pharetra elit. Fusce at ornare sapien." - data-help-x-offset="50" - data-help-y-offset="-10" > - <option>policyx</option> - <option>policyy</option> - </select> - </div> + data-help-x-offset="50" + data-help-y-offset="-10" > + <option>policyx</option> + <option>policyy</option> + </select> + </div> + </div> + <div class="form-group"> + <label class="required">Deployment Policy:</label> + <div class="form-inline"> + <select + name="deploymentPolicy" + class="form-control input-xlarge js-help" + data-help="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas condimentum eros nec risus pretium, at lobortis + nulla vulputate. Duis et cursus justo, vel fermentum neque. Praesent bibendum turpis vel tincidunt sollicitudin. + Integer nibh est, pretium nec nunc vitae, auctor pharetra elit. Fusce at ornare sapien." + data-help-x-offset="50" + data-help-y-offset="-10" > + <option>policyx</option> + <option>policyy</option> + </select> </div> - <button type="submit" class="btn btn-primary">Subscribe to Cartridge</button> + </div> + <button type="submit" class="btn btn-primary">Subscribe to Cartridge</button> </form> </div> </div> </div> <script> -$(function(){ - $('.js-help') - .focus( - function () { - var $input = $(this); - var bubbleLeft = $input.offset().left + $input.width(); - var bubbleTop = $input.offset().top - $input.height() / 2; - $('#speech_bubble_container p').html($input.attr('data-help')); - bubbleLeft += parseInt($input.attr('data-help-x-offset')); - bubbleTop += parseInt($input.attr('data-help-y-offset')); - var bubbleWidth = Math.floor($(document).width() - bubbleLeft - 105); - $('#speech_bubble_container').css({'width': bubbleWidth + "px"}).show('fast').css({"position": "absolute", "left": bubbleLeft + "px", "top": bubbleTop + "px"}); - console.info(Math.floor(bubbleWidth)); - } + $(function(){ + $('.js-help') + .focus( + function () { + var $input = $(this); + var bubbleLeft = $input.offset().left + $input.width(); + var bubbleTop = $input.offset().top - $input.height() / 2; + $('#speech_bubble_container p').html($input.attr('data-help')); + bubbleLeft += parseInt($input.attr('data-help-x-offset')); + bubbleTop += parseInt($input.attr('data-help-y-offset')); + var bubbleWidth = Math.floor($(document).width() - bubbleLeft - 105); + $('#speech_bubble_container').css({'width': bubbleWidth + "px"}).show('fast').css({"position": "absolute", "left": bubbleLeft + "px", "top": bubbleTop + "px"}); + console.info(Math.floor(bubbleWidth)); + } ).blur( - function () { - $('#speech_bubble_container').hide(); - }); + function () { + $('#speech_bubble_container').hide(); + }); - var $public_check = $('#public_check'); - if(!$public_check.is(':checked')){ - $('#public_check').prop("checked",true); - } - $public_check.click(function(){ - $('#credential_container').toggle($public_check.checked); + var $public_check = $('#public_check'); + if(!$public_check.is(':checked')){ + $('#public_check').prop("checked",true); + } + $public_check.click(function(){ + $('#credential_container').toggle($public_check.checked); + }); }); -}); </script> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/21d98579/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 8deaed4..36357a6 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 @@ -17,7 +17,6 @@ var render = function (theme, data, meta, require) { } } cartridgesToPush.push(cartridges_old[i]); - log.info(cartridges_old[i]); } else { cartridgesToPush = null; for (var j = 0; j < cartridges_new.length; j++) { @@ -32,7 +31,6 @@ var render = function (theme, data, meta, require) { } } } - log.info(cartridges_new); theme('index', { body: [ { http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/21d98579/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 c431470..56210cd 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 @@ -4,7 +4,8 @@ var render = function (theme, data, meta, require) { { partial: 'subscribe_cartridge', context: { - title:data.name + title:data.name, + cartridgeType:meta.request.getParameter('cartridgeType') } } ],
