Repository: incubator-stratos Updated Branches: refs/heads/master 4f3f26533 -> bcaf29bd7
fixing UI imrovements Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/bf4a3fea Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/bf4a3fea Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/bf4a3fea Branch: refs/heads/master Commit: bf4a3feabcb0044ca2c397b72c2f0198fbf8b2e9 Parents: cddbff0 Author: rekathiru <[email protected]> Authored: Thu Feb 20 18:16:31 2014 +0530 Committer: rekathiru <[email protected]> Committed: Thu Feb 20 18:16:31 2014 +0530 ---------------------------------------------------------------------- .../console/controllers/cartridgeSubscribeSubmit.jag | 10 ++++++++++ .../themes/theme1/partials/subscribe_cartridge.hbs | 11 ++++++----- 2 files changed, 16 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/bf4a3fea/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 index 88844ec..8f26ede 100755 --- a/components/org.apache.stratos.manager.console/console/controllers/cartridgeSubscribeSubmit.jag +++ b/components/org.apache.stratos.manager.console/console/controllers/cartridgeSubscribeSubmit.jag @@ -16,7 +16,17 @@ var removeontermination = request.getParameter('removeOnUnsubscription'); var persistencerequired = request.getParameter('persistencerequired'); + if(persistencerequired == "on"){ + persistencerequired = true; + } else { + persistencerequired = false; + } + if(removeontermination == "on"){ + removeontermination = true; + } else { + removeontermination = false; + } // constructing the json request jsonRequest.cartridgeInfoBean.cartridgeType = cartridgeType; jsonRequest.cartridgeInfoBean.alias = alias; http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/bf4a3fea/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 866cbc5..247f847 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 @@ -31,9 +31,10 @@ <input name="persistencerequired" type="checkbox" id="volume_check"/> Require Persistence storage </label> <div id="persistence_container" style="display: none;padding-left:20px;margin-left:20px; background: #efefef;padding-bottom:10px;margin-bottom:10px;"> - <h2>Persistence Mappings</h2> <div class="form-group"> - <label class="required">Size:</label> + <label class="required">Size(GB):</label> + </div> + <div class="form-group"> <div class="form-inline"> <input name="size" class="form-control input-xlarge" placeholder="10"/> </div> @@ -58,7 +59,7 @@ data-help="Specify a repository URL of the artifacts." data-help-x-offset="50" data-help-y-offset="10" - placeholder="myphp" /> + placeholder="https://github.com/test/mytestphp.git"; /> </div> <div class="checkbox"> <label> @@ -71,13 +72,13 @@ <div class="form-group"> <label class="required">Username:</label> <div class="form-inline"> - <input name="repoUsername" type="url" class="form-control input-xlarge" placeholder="myphp"/> + <input name="repoUsername" class="form-control input-xlarge" placeholder="username"/> </div> </div> <div class="form-group"> <label class="required">Password:</label> <div class="form-inline"> - <input name="repoPassword" type="url" class="form-control input-xlarge" placeholder="myphp"/> + <input name="repoPassword" type="password" class="form-control input-xlarge" placeholder="******"/> </div> </div> </div>
