Updated Branches: refs/heads/master dd85cc287 -> a0d6ce5f3
updating console Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/ab00e0ae Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/ab00e0ae Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/ab00e0ae Branch: refs/heads/master Commit: ab00e0aeb031beeb38412ee36354efcc3d69306f Parents: 8a76a55 Author: Pradeep Fernando <[email protected]> Authored: Fri Jan 10 17:48:54 2014 +0530 Committer: Pradeep Fernando <[email protected]> Committed: Fri Jan 10 17:48:54 2014 +0530 ---------------------------------------------------------------------- .../controllers/cartridgeDefintionSubmit.jag | 8 ++++++++ .../theme1/partials/cartridge_deployments.hbs | 21 +++++++++++--------- .../console/util/utility.jag | 4 ++++ 3 files changed, 24 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ab00e0ae/components/org.apache.stratos.manager.console/console/controllers/cartridgeDefintionSubmit.jag ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/controllers/cartridgeDefintionSubmit.jag b/components/org.apache.stratos.manager.console/console/controllers/cartridgeDefintionSubmit.jag new file mode 100644 index 0000000..c6dcd1c --- /dev/null +++ b/components/org.apache.stratos.manager.console/console/controllers/cartridgeDefintionSubmit.jag @@ -0,0 +1,8 @@ +<% +(function(){ + var log = new Log(); + var utils = require('/util/utility.jag'); + var cartridgeDefinition = request.getParameter("cartridge-definition").trim(); + utils.consoleAppUtil.deployCartridgeDefinition(cartridgeDefinition); +}()); +%> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ab00e0ae/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 index 76638f4..de0722d 100644 --- 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 @@ -9,16 +9,19 @@ <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> + <form 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" rows="11" + id="policy"></textarea> + <button type="submit" 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: http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ab00e0ae/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 42810c0..b0a5d55 100644 --- a/components/org.apache.stratos.manager.console/console/util/utility.jag +++ b/components/org.apache.stratos.manager.console/console/util/utility.jag @@ -89,6 +89,10 @@ consoleAppUtil = new function(){ return this.makeRequest("GET","/cartridge/list/subscribed",{}).data; } + this.deployCartridgeDefinition = function(cartridgeDefintion){ + return this.makeRequest("POST","/cartridge/definition",cartridgeDefintion).data; + }; + this.makeRequest = function(httpMethod,urlPostFix,data){ var config = require('/config/console.js').config(); var backendServerURL = config.backendServerConfiguration.url;
