You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ma...@apache.org on 2014/05/09 13:23:29 UTC
git commit: Added UI Fixes
Repository: incubator-stratos
Updated Branches:
refs/heads/master 5ebdf863b -> 344143449
Added UI 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/34414344
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/34414344
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/34414344
Branch: refs/heads/master
Commit: 344143449dc8e6530a119ad809b5505382d16231
Parents: 5ebdf86
Author: Manula Thantriwatte <ma...@apache.org>
Authored: Fri May 9 11:22:47 2014 +0000
Committer: Manula Thantriwatte <ma...@apache.org>
Committed: Fri May 9 11:22:47 2014 +0000
----------------------------------------------------------------------
.../themes/theme1/partials/cartridges.hbs | 56 +++++++++-----------
.../themes/theme1/partials/mycartridges.hbs | 51 +++++++++---------
2 files changed, 48 insertions(+), 59 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/34414344/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 80dd83c..f7335da 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
@@ -35,47 +35,39 @@
<div class="box-container">
<div class="row">
- <div class="col-lg-12">
- <div class="container">
- <div class="row">
- <div class="col-lg-push-2 col-lg-10"><a><h3>{{serviceGroup}}</h3></a></div>
- </div>
- </div>
+ <div class="col-lg-3">
+ <div class="box-left"><i class="icons-default icons-{{cartridgeType}} big-pro-icons"></i></div>
- <div class="container">
- {{#each items}}
- <div class="row">
- <div class="col-lg-2">
- <div class="box-left"><i class="icons-default icons-{{cartridgeType}} big-pro-icons"></i></div>
- </div>
- <div class="col-lg-10">
- {{#if loadBalancer}}
- <h3>{{displayName}} - {{version}}</h3>
- <div class="cartridge-description">{{description}}</div>
- <div class="lb-description">This will be auto subscribed for you</div>
+ </div>
+ <div class="col-lg-9">
+ <a href="{{url "/subscribe_cartridge.jag"}}?cartridgeType={{cartridgeType}}&serviceGroup={{serviceGroup}}"><h3>{{serviceGroup}}</h3></a>
+
+ {{#each items}}
+ <div class="serviceGroup-child-wrapper">
+ {{#if loadBalancer}}
+ <h3>{{displayName}} - {{version}}</h3>
+ <div class="cartridge-description">{{description}}</div>
+ <div class="lb-description">This will be auto subscribed for you</div>
+ {{else}}
+ <div class="cartridge-description">{{description}}</div>
+ <div class="cartridge-description">
+ {{#if multiTenant}}
+ <i class="icons-users"></i> Multi Tenant Enabled
{{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="icons-users"></i> Multi Tenant Enabled
- {{else}}
- <i class="icons-user"></i> Single Tenant
- {{/if}}
- </div>
+ <i class="icons-user"></i> Single Tenant
{{/if}}
</div>
+ {{/if}}
</div>
- {{/each}}
- </div>
+ {{/each}}
</div>
</div>
</div>
- </div>
+ </div>
- {{else}}
+ {{else}} <!-- End serviceGroup check if -->
<div class="col-md-6">
<div class="box-container">
<div class="row">
@@ -103,9 +95,9 @@
</div>
</div>
</div>
- {{/if}}
+ {{/if}} <!-- End serviceGroup check -->
- {{else}}
+ {{else}} <!-- Each can have else close ( Else of #each cartridges ) -->
<div class="col-lg-12">
<div class="alert alert-info alert-empty-page">
<strong>There are no Cartridges available for you.</strong>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/34414344/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 ff9cdaa..2f4e25f 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
@@ -31,39 +31,36 @@
<div class="row">
{{#each mycartridges}}
{{#if serviceGroup}}
- <div class="col-md-6">
- <div class="box-container">
- <div class="row">
+ <div class="col-md-6">
+ <div class="box-container">
+ <div class="row">
- <div class="col-lg-12">
- {{#unless loadBalancer}}
- <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}}
- <div class="container">
- <div class="row">
- <div class="col-lg-push-2 col-lg-10"><a><h3>{{serviceGroup}}</h3></a></div>
- </div>
- </div>
+ <div class="col-lg-3">
+
+ <div class="box-left"><i class="icons-default icons-{{cartridgeType}} big-pro-icons"></i></div>
- <div class="container">
- {{#each items}}
- <div class="row">
- <div class="col-lg-2">
- <div class="box-left"><i class="icons-default icons-{{cartridgeType}} big-pro-icons"></i></div>
- </div>
- <div class="col-lg-10">
- <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>
- </div>
- {{/each}}
- </div>
+ </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-circle-close"></i></a></div>
+ {{/unless}}
+
+ <a href="{{url "/cartridge_info.jag?alias="}}{{cartridgeAlias}}&serviceGroup={{serviceGroup}}"><h3>{{serviceGroup}}</h3></a>
+
+ {{#each items}}
+ <div class="serviceGroup-child-wrapper">
+ <h3>{{cartridgeAlias}}-<span>({{displayName}} - {{version}})</span></h3>
+ <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>
+ {{/each}}
</div>
</div>
</div>
- {{else}}
+ </div>
+
+ {{else}} <!-- End serviceGroup check if -->
+
<div class="col-md-6">
<div class="box-container">
<div class="row">