You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2014/12/14 18:15:16 UTC
[10/16] stratos git commit: fix listing hbs issues after data return
changes
fix listing hbs issues after data return changes
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/e854b69b
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/e854b69b
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/e854b69b
Branch: refs/heads/4.1.0-test
Commit: e854b69bfc32927befc08251a75aa2bd3afc4878
Parents: 4c34527
Author: Dakshika Jayathilaka <si...@gmail.com>
Authored: Sun Dec 14 17:44:24 2014 +0530
Committer: Dakshika Jayathilaka <si...@gmail.com>
Committed: Sun Dec 14 17:44:24 2014 +0530
----------------------------------------------------------------------
.../console/configure_form.jag | 16 +--
.../themes/theme0/partials/configure_form.hbs | 108 ++++++++++---------
2 files changed, 65 insertions(+), 59 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/e854b69b/components/org.apache.stratos.manager.console/console/configure_form.jag
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/configure_form.jag b/components/org.apache.stratos.manager.console/console/configure_form.jag
index 431f284..0b603a0 100644
--- a/components/org.apache.stratos.manager.console/console/configure_form.jag
+++ b/components/org.apache.stratos.manager.console/console/configure_form.jag
@@ -72,13 +72,13 @@ switch (formtype) {
case "autoscalingpolicies":
list_data = util.RESTCalls.getPolicyAutoScale();
- if (list_data.autoscalePolicy && list_data.autoscalePolicy.length === 0) {
+ if (list_data && list_data.length === 0) {
list_data = null;
}else{
- formDataEdit = list_data.autoscalePolicy;
- for (specNumber in list_data.autoscalePolicy) {
- if (list_data.autoscalePolicy[specNumber].id == elements.action) {
- formDataEdit = list_data.autoscalePolicy[specNumber];
+ formDataEdit = list_data;
+ for (specNumber in list_data) {
+ if (list_data[specNumber].id == elements.action) {
+ formDataEdit = list_data[specNumber];
}
}
@@ -106,9 +106,9 @@ switch (formtype) {
list_data = null; //TODO endpoint doesn't return correct info
}else{
formDataEdit = list_data.kubernetesGroup;
- for (specNumber in list_data.kubernetesGroup) {
- if (list_data.kubernetesGroup[specNumber].groupId == elements.action) {
- formDataEdit = list_data.kubernetesGroup[specNumber];
+ for (specNumber in list_data) {
+ if (list_data[specNumber].groupId == elements.action) {
+ formDataEdit = list_data[specNumber];
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/e854b69b/components/org.apache.stratos.manager.console/console/themes/theme0/partials/configure_form.hbs
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme0/partials/configure_form.hbs b/components/org.apache.stratos.manager.console/console/themes/theme0/partials/configure_form.hbs
index ec0eb00..52e6105 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme0/partials/configure_form.hbs
+++ b/components/org.apache.stratos.manager.console/console/themes/theme0/partials/configure_form.hbs
@@ -91,74 +91,80 @@
{{/if}}
<div class="row general-table row-overide">
- {{#each content_body.sections.kubernetesGroup}}
- <div class="block col-md-4 grid-group-item border-right">
- <div class="toggle-menu-icon">
- <i class="fa fa-gears "></i>
- </div>
- <h2 class="truncate">{{groupId}} </h2>
+ {{#ifCond formtype "==" "docker"}}
+ {{#each content_body.sections}}
+ <div class="block col-md-4 grid-group-item border-right">
+ <div class="toggle-menu-icon">
+ <i class="fa fa-gears "></i>
+ </div>
+ <h2 class="truncate">{{groupId}} </h2>
- <div class="toggle-menu-description">{{description}}</div>
- <div class="list-button" style="display: none;">
- <button class="btn btn-info btn-lg hover-details" type="button" id="details_list_{{id}}"
- data-url="{{url ""}}/configure/docker/{{groupId}}/" > Details
- </button>
- </div>
- <div class="bottom-bar-wrapper">
- <div class="bottom-bar">
- <button class="btn btn-info btn-lg hover-details" type="button" id="details_{{id}}"
+ <div class="toggle-menu-description">{{description}}</div>
+ <div class="list-button" style="display: none;">
+ <button class="btn btn-info btn-lg hover-details" type="button" id="details_list_{{id}}"
data-url="{{url ""}}/configure/docker/{{groupId}}/" > Details
</button>
</div>
+ <div class="bottom-bar-wrapper">
+ <div class="bottom-bar">
+ <button class="btn btn-info btn-lg hover-details" type="button" id="details_{{id}}"
+ data-url="{{url ""}}/configure/docker/{{groupId}}/" > Details
+ </button>
+ </div>
+ </div>
</div>
- </div>
- {{/each}}
- {{#each content_body.sections}}
- <div class="block col-md-4 grid-group-item border-right">
- <div class="toggle-menu-icon">
- <i class="fa icon-{{type}} fa-inbox "></i>
- </div>
- <h2 class="truncate">{{displayName}} </h2>
+ {{/each}}
+ {{/ifCond}}
+ {{#ifCond formtype "==" "cartridges"}}
+ {{#each content_body.sections}}
+ <div class="block col-md-4 grid-group-item border-right">
+ <div class="toggle-menu-icon">
+ <i class="fa icon-{{type}} fa-inbox "></i>
+ </div>
+ <h2 class="truncate">{{displayName}} </h2>
- <div class="toggle-menu-description">{{description}}</div>
- <div class="list-button" style="display: none;">
- <button class="btn btn-info btn-lg hover-details" type="button" id="details_list_{{id}}"
- data-url="{{url ""}}/configure/{{../formtype}}/{{type}}/" > Details
- </button>
- </div>
- <div class="bottom-bar-wrapper">
- <div class="bottom-bar">
- <button class="btn btn-info btn-lg hover-details" type="button" id="details_"
+ <div class="toggle-menu-description">{{description}}</div>
+ <div class="list-button" style="display: none;">
+ <button class="btn btn-info btn-lg hover-details" type="button" id="details_list_{{id}}"
data-url="{{url ""}}/configure/{{../formtype}}/{{type}}/" > Details
</button>
+ </div>
+ <div class="bottom-bar-wrapper">
+ <div class="bottom-bar">
+ <button class="btn btn-info btn-lg hover-details" type="button" id="details_"
+ data-url="{{url ""}}/configure/{{../formtype}}/{{type}}/" > Details
+ </button>
+ </div>
</div>
</div>
- </div>
- {{/each}}
- {{#each content_body.sections.autoscalePolicy}}
- <div class="block col-md-4 col-xs-4 grid-group-item border-right">
- <div class="toggle-menu-icon">
- <i class="fa fa-expand "></i>
- </div>
- <h2 class="truncate">{{id}} </h2>
+ {{/each}}
+ {{/ifCond}}
+ {{#ifCond formtype "==" "autoscalingpolicies"}}
+ {{#each content_body.sections}}
+ <div class="block col-md-4 col-xs-4 grid-group-item border-right">
+ <div class="toggle-menu-icon">
+ <i class="fa fa-expand "></i>
+ </div>
+ <h2 class="truncate">{{id}} </h2>
- <div class="toggle-menu-description">{{description}}</div>
- <div class="list-button" style="display: none;">
- <button class="btn btn-info btn-lg hover-details" type="button" id="details_list_{{id}}"
- data-url="{{url ""}}/configure/autoscalingpolicies/{{id}}/" > Details
- </button>
- </div>
- <div class="bottom-bar-wrapper">
- <div class="bottom-bar">
- <button class="btn btn-info btn-lg hover-details" type="button" id="details_{{id}}"
+ <div class="toggle-menu-description">{{description}}</div>
+ <div class="list-button" style="display: none;">
+ <button class="btn btn-info btn-lg hover-details" type="button" id="details_list_{{id}}"
data-url="{{url ""}}/configure/autoscalingpolicies/{{id}}/" > Details
</button>
</div>
+ <div class="bottom-bar-wrapper">
+ <div class="bottom-bar">
+ <button class="btn btn-info btn-lg hover-details" type="button" id="details_{{id}}"
+ data-url="{{url ""}}/configure/autoscalingpolicies/{{id}}/" > Details
+ </button>
+ </div>
+ </div>
</div>
- </div>
- {{/each}}
+ {{/each}}
+ {{/ifCond}}
</div>
</div>
</div>