Repository: incubator-stratos Updated Branches: refs/heads/master 33c00334b -> e821466c1
fixing LB cartidge and subscription 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/ed37ccea Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/ed37ccea Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/ed37ccea Branch: refs/heads/master Commit: ed37ccea843f4fb47d53a079284f3a202190839c Parents: 0b2e736 Author: rekathiru <[email protected]> Authored: Tue Feb 18 12:24:55 2014 +0530 Committer: rekathiru <[email protected]> Committed: Tue Feb 18 12:24:55 2014 +0530 ---------------------------------------------------------------------- .../themes/theme1/partials/cartridges.hbs | 17 +++--- .../theme1/partials/subscribe_cartridge.hbs | 54 +++++++++----------- .../console/themes/theme1/ui/css/main.css | 7 +++ 3 files changed, 42 insertions(+), 36 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ed37ccea/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 50c6166..79d60a4 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 @@ -21,17 +21,22 @@ <div class="box-left"><i class="icons-default icons-{{cartridgeType}} big-pro-icons"></i></div> </div> <div class="col-lg-9"> - <a href="{{url "/subscribe_cartridge.jag"}}?cartridgeType={{cartridgeType}}"><h3>{{displayName}} - {{version}}</h3></a> - <div class="cartridge-description">{{description}}</div> - <div class="cartridge-description"> - {{#unless loadBalancer}} + {{#if loadBalancer}} + <h3>{{displayName}} - {{version}}</h3> + <div class="cartridge-description">{{description}}</div> + <div class="lb-description">This will be auto subscribe for you</div> + + {{else}} + <a href="{{url "/subscribe_cartridge.jag"}}?cartridgeType={{cartridgeType}}"><h3>{{displayName}} - {{version}}</h3></a> + <div class="cartridge-description">{{description}}</div> + <div class="cartridge-description"> {{#if multiTenant}} <i class="fa fa-users"></i> Multi Tenant Enabled {{else}} <i class="fa fa-user"></i> Single Tenant {{/if}} - {{/unless}} - </div> + </div> + {{/if}} </div> </div> </div> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ed37ccea/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 29b7e40..866cbc5 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 @@ -24,37 +24,31 @@ <label>.{{cartridge.hostName}}</label> </div> </div> - {{#ifCond cartridge.provider "==" "data"}} - {{#if cartridge.persistence.persistanceRequired}} - <label class="required">Persistence Storage:</label> - <label> - <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> - <div class="form-inline"> - <input name="size" class="form-control input-xlarge" placeholder="10"/> - </div> - </div> - <div class="form-group"> - <label> - <input name="removeOnUnsubscription" type="checkbox" id="volume_check" />Remove On Unsubscription - </label> - </div> - </div> - - - {{/if}} - - {{else}} - - {{#ifCond cartridge.provider "==" "application"}} - - - {{else}} + {{#if cartridge.persistence.persistanceRequired}} + <label class="required">Persistence Storage:</label> + <label> + <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> + <div class="form-inline"> + <input name="size" class="form-control input-xlarge" placeholder="10"/> + </div> + </div> + <div class="form-group"> + <label> + <input name="removeOnUnsubscription" type="checkbox" id="volume_check" />Remove On Unsubscription + </label> + </div> + </div> + {{/if}} + {{#ifCond cartridge.provider "==" "data"}} + {{else}} + {{#ifCond cartridge.provider "==" "application"}} + {{else}} <div class="form-group"> <label class="required">Repo URL:</label> <div class="form-inline"> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/ed37ccea/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 b6cf2b5..f3c9c6b 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 @@ -282,6 +282,13 @@ h4{ padding-top:10px; font-size: 12px; } + +.lb-description{ + padding-top:10px; + font-size: 14px; + font-weight: bold; + color: green; +} .required{ font-weight: bold; }
