Repository: incubator-stratos Updated Branches: refs/heads/master 0955f29f6 -> 32f7c802d
Adding sync repo link hide logic and removed dummy check box in subscribe cartridge page. Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/490dc577 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/490dc577 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/490dc577 Branch: refs/heads/master Commit: 490dc577a6287074361be958c70c4a9daec04e30 Parents: 60d971f Author: Chanaka Jayasena <[email protected]> Authored: Thu Apr 3 18:13:33 2014 +0530 Committer: Chanaka Jayasena <[email protected]> Committed: Thu Apr 3 18:13:33 2014 +0530 ---------------------------------------------------------------------- .../console/controllers/cartridgeSubscribeSubmit.jag | 8 ++++++++ .../console/themes/theme1/partials/mycartridges.hbs | 4 ++-- .../themes/theme1/partials/subscribe_cartridge.hbs | 11 +++++------ .../console/themes/theme1/ui/css/main.css | 3 +++ 4 files changed, 18 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/490dc577/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 c047ed9..1aed656 100644 --- a/components/org.apache.stratos.manager.console/console/controllers/cartridgeSubscribeSubmit.jag +++ b/components/org.apache.stratos.manager.console/console/controllers/cartridgeSubscribeSubmit.jag @@ -36,6 +36,7 @@ var size = request.getParameter('size'); var removeontermination = request.getParameter('removeOnUnsubscription'); var persistencerequired = request.getParameter('persistencerequired'); + var commitsEnabled = request.getParameter('commitsEnabled'); if(persistencerequired == "on"){ persistencerequired = true; @@ -43,6 +44,12 @@ persistencerequired = false; } + if(commitsEnabled == "on"){ + commitsEnabled = true; + } else { + commitsEnabled = false; + } + if(removeontermination == "on"){ removeontermination = true; } else { @@ -62,6 +69,7 @@ jsonRequest.deploymentPolicy = deploymentPolicy; jsonRequest.size = size; jsonRequest.persistanceRequired = persistencerequired; + jsonRequest.commitsEnabled = commitsEnabled; jsonRequest.removeOnTermination = removeontermination; http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/490dc577/components/org.apache.stratos.manager.console/console/themes/theme1/partials/mycartridges.hbs ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/mycartridges.hbs b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/mycartridges.hbs index 729fef1..ff9cdaa 100644 --- a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/mycartridges.hbs +++ b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/mycartridges.hbs @@ -72,11 +72,11 @@ </div> <div class="col-lg-9"> {{#unless loadBalancer}} - <div class="un-subscribe-container"><a class="un-subscribe un-subscribe-btn" data-alias="{{cartridgeAlias}}">Un-subscribe <i class="icons-reload"></i></a></div> + <div class="un-subscribe-container"><a class="un-subscribe un-subscribe-btn" data-alias="{{cartridgeAlias}}">Un-subscribe <i class="icons-circle-close"></i></a></div> {{/unless}} <a href="{{url "/cartridge_info.jag?alias="}}{{cartridgeAlias}}"><h3>{{cartridgeAlias}}-<span>({{displayName}} - {{version}})</span></h3></a> <div class="cartridge-description">{{description}}</div> - <div class="cartridge-description">{{repoURL}} <a class="js_syncRepo" data-value="{{cartridgeAlias}}"><i class="icons-reload"></i></a></div> + <div class="cartridge-description">{{repoURL}} {{#if repoURL}}<a class="js_syncRepo" data-value="{{cartridgeAlias}}"><i class="icons-reload"></i></a>{{/if}}</div> </div> </div> </div> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/490dc577/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 a9ba0b6..520d98d 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 @@ -62,6 +62,11 @@ data-help-y-offset="10" placeholder="https://github.com/test/mytestphp.git"; /> </div> + <div class="checkbox"> + <label> + <input name="commitsEnabled" type="checkbox" checked="checked" /> Auto Commit + </label> + </div> <div class="checkbox"> <label> <input name="isPublicRepo" type="checkbox" checked="checked" id="public_check" /> This is a public repository @@ -168,12 +173,6 @@ {{/unless}} {{/if}} - <div class="form-group"> - <label class="required">New Checkbox:</label> - <label> - <input name="new_checkbox" type="checkbox" id="new_checkbox"/> Require Persistent Storage - </label> - </div> <button type="submit" class="btn btn-primary">Subscribe to Cartridge</button> </form> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/490dc577/components/org.apache.stratos.manager.console/console/themes/theme1/ui/css/main.css ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/ui/css/main.css b/components/org.apache.stratos.manager.console/console/themes/theme1/ui/css/main.css index 0f9ef13..e1b6623 100644 --- a/components/org.apache.stratos.manager.console/console/themes/theme1/ui/css/main.css +++ b/components/org.apache.stratos.manager.console/console/themes/theme1/ui/css/main.css @@ -667,3 +667,6 @@ label.error{ .action-buttons{ white-space: nowrap; } +pre{ + margin-top:20px; +}
