You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by di...@apache.org on 2015/09/16 13:44:21 UTC
[6/7] stratos git commit: Resolving alignment issues in the UI
Resolving alignment issues in the UI
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/82f6aadc
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/82f6aadc
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/82f6aadc
Branch: refs/heads/stratos-4.1.x
Commit: 82f6aadc07e63e6655904d4cb277c1b0cf6edf2f
Parents: f7deea3
Author: Dinithi <di...@wso2.com>
Authored: Wed Sep 16 17:00:42 2015 +0530
Committer: Dinithi <di...@wso2.com>
Committed: Wed Sep 16 17:00:42 2015 +0530
----------------------------------------------------------------------
.../theme0/partials/applications_form.hbs | 79 +++++++++++---------
1 file changed, 43 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/82f6aadc/components/org.apache.stratos.manager.console/console/themes/theme0/partials/applications_form.hbs
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme0/partials/applications_form.hbs b/components/org.apache.stratos.manager.console/console/themes/theme0/partials/applications_form.hbs
index 03c4bae..83a40be 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme0/partials/applications_form.hbs
+++ b/components/org.apache.stratos.manager.console/console/themes/theme0/partials/applications_form.hbs
@@ -116,7 +116,7 @@
<div class="toggle-menu-description">{{description}} {{status}}</div>
{{#ifCond status "!=" "Created"}}
{{#ifCond status "==" "Deployed"}}
- <div class="list-button" style="display: none;">
+ <div class="list-button" style="display: none;">
<button class="btn btn-danger btn-lg hover-undeploy"
type="button"
id="{{applicationId}}"> Undeploy
@@ -169,6 +169,7 @@
{{/if}}
{{/if}}
</div>
+ </div>
{{else}}
{{#ifCond status "==" "Active"}}
<div class="list-button" style="display: none;">
@@ -199,36 +200,38 @@
{{/if}}
</div>
<div class="bottom-bar-wrapper">
- <div class="bottom-bar">
+ <div class="bottom-bar">
- <button class="btn btn-info btn-lg hover-details" type="button"
- id="details_{{applicationId}}"
- data-url="{{url ""}}/applications/{{applicationId}}/">
- View
- </button>
- {{#if multiTenant}}
- {{#if isSuperTenant}}
- <button class="btn btn-danger btn-lg hover-undeploy"
- type="button"
- id="{{applicationId}}"> Undeploy
+ <button class="btn btn-info btn-lg hover-details" type="button"
+ id="details_{{applicationId}}"
+ data-url="{{url ""}}/applications/{{applicationId}}/">
+ View
</button>
- {{/if}}
-
- {{#if signUpsExist}}
- <button class="btn btn-warning btn-lg hover-remove-signup"
- type="button"
- id="{{applicationId}}"
- data-appid='{{applicationName}}'>Remove Signup
- </button>
- {{else}}
- <button class="btn btn-warning btn-lg hover-signup"
+ {{#if multiTenant}}
+ {{#if isSuperTenant}}
+ <button class="btn btn-danger btn-lg hover-undeploy"
type="button"
- id="signup_{{applicationId}}"
- data-url="{{url ""}}/applications/{{applicationId}}/signup">
- Signup
+ id="{{applicationId}}"> Undeploy
</button>
+ {{/if}}
+
+ {{#if signUpsExist}}
+ <button class="btn btn-warning btn-lg hover-remove-signup"
+ type="button"
+ id="{{applicationId}}"
+ data-appid='{{applicationName}}'>Remove Signup
+ </button>
+ {{else}}
+ <button class="btn btn-warning btn-lg hover-signup"
+ type="button"
+ id="signup_{{applicationId}}"
+ data-url="{{url ""}}/applications/{{applicationId}}/signup">
+ Signup
+ </button>
+ {{/if}}
{{/if}}
- {{/if}}
+ </div>
+ </div>
{{else}}
<div class="list-button" style="display: none;">
<button class="btn btn-info btn-lg hover-details" type="button"
@@ -241,17 +244,18 @@
</button>
</div>
<div class="bottom-bar-wrapper">
- <div class="bottom-bar">
- <button class="btn btn-info btn-lg hover-details"
- type="button"
- id="details_{{applicationId}}"
- data-url="{{url ""}}/applications/{{applicationId}}/">
- View
- </button>
+ <div class="bottom-bar">
+ <button class="btn btn-info btn-lg hover-details"
+ type="button"
+ id="details_{{applicationId}}"
+ data-url="{{url ""}}/applications/{{applicationId}}/">
+ View
+ </button>
+ </div>
</div>
{{/ifCond}}
{{/ifCond}}
- </div>
+
{{else}}
<div class="list-button" style="display: none;">
<button class="btn btn-danger btn-lg hover-delete" type="button"
@@ -288,12 +292,15 @@
</div>
</div>
{{/ifCond}}
- </div>
+
+ </div>
{{/each}}
{{/ifCond}}
+
</div>
- </div>
</div>
+ </div>
+ </div>
{{/if}}
<script>