You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by an...@apache.org on 2015/06/18 11:58:05 UTC

incubator-ignite git commit: # ignite-843 Duplicate hide button.

Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-843 12ae6534a -> cd8d9a5e4


# ignite-843 Duplicate hide button.


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/cd8d9a5e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/cd8d9a5e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/cd8d9a5e

Branch: refs/heads/ignite-843
Commit: cd8d9a5e43fd734db60d9799196eccfeb0a10738
Parents: 12ae653
Author: Andrey <an...@gridgain.com>
Authored: Thu Jun 18 16:58:01 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Thu Jun 18 16:58:01 2015 +0700

----------------------------------------------------------------------
 modules/webconfig/nodejs/views/caches.jade            | 5 ++++-
 modules/webconfig/nodejs/views/clusters.jade          | 5 ++++-
 modules/webconfig/nodejs/views/includes/controls.jade | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd8d9a5e/modules/webconfig/nodejs/views/caches.jade
----------------------------------------------------------------------
diff --git a/modules/webconfig/nodejs/views/caches.jade b/modules/webconfig/nodejs/views/caches.jade
index c430565..6e42936 100644
--- a/modules/webconfig/nodejs/views/caches.jade
+++ b/modules/webconfig/nodejs/views/caches.jade
@@ -48,6 +48,9 @@ block content
                             .settings-row(ng-repeat='field in general')
                                 +form-row
             div(bs-collapse data-start-collapsed='true')
+                .panel-title(ng-show='expanded')
+                    h3
+                        a(bs-collapse-toggle='0' ng-click='expanded = !expanded;') {{expanded ? 'Hide advanced settings...' : 'Show advanced settings...'}}
                 .panel-collapse(bs-collapse-target)
                     .span(bs-collapse data-start-collapsed='true' data-allow-multiple='true')
                         .panel.panel-default(ng-repeat='group in advanced')
@@ -60,6 +63,6 @@ block content
                                         +form-row
                 .panel-title
                     h3
-                        a(bs-collapse-toggle ng-init='expanded=false; lbl="Show advanced settings..."' ng-click='expanded = !expanded; lbl=expanded ? "Hide advanced settings... " : "Show advanced settings..."') {{lbl}}
+                        a(bs-collapse-toggle='0' ng-click='expanded = !expanded;') {{expanded ? 'Hide advanced settings...' : 'Show advanced settings...'}}
             button.btn.btn-primary(ng-disabled='cachesForm.$invalid' ng-click='saveItem()') Save
             button.btn.btn-primary.btn-second(ng-show='backupItem._id' ng-click='removeItem()') Remove

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd8d9a5e/modules/webconfig/nodejs/views/clusters.jade
----------------------------------------------------------------------
diff --git a/modules/webconfig/nodejs/views/clusters.jade b/modules/webconfig/nodejs/views/clusters.jade
index 19c5934..f29ba10 100644
--- a/modules/webconfig/nodejs/views/clusters.jade
+++ b/modules/webconfig/nodejs/views/clusters.jade
@@ -48,6 +48,9 @@ block content
                             .settings-row(ng-repeat='field in general')
                                 +form-row
             div(bs-collapse data-start-collapsed='true')
+                .panel-title(ng-show='expanded')
+                    h3
+                        a(bs-collapse-toggle='0' ng-click='expanded = !expanded;') {{expanded ? 'Hide advanced settings...' : 'Show advanced settings...'}}
                 .panel-collapse(bs-collapse-target)
                     .span(bs-collapse data-start-collapsed='true' data-allow-multiple='true')
                         .panel.panel-default(ng-repeat='group in advanced')
@@ -60,6 +63,6 @@ block content
                                         +form-row
                 .panel-title
                     h3
-                        a(bs-collapse-toggle ng-init='expanded=false; lbl="Show advanced settings..."' ng-click='expanded = !expanded; lbl=expanded ? "Hide advanced settings... " : "Show advanced settings..."') {{lbl}}
+                        a(bs-collapse-toggle='0' ng-click='expanded = !expanded;') {{expanded ? 'Hide advanced settings...' : 'Show advanced settings...'}}
             button.btn.btn-primary(ng-disabled='clustersForm.$invalid' ng-click='saveItem()') Save
             button.btn.btn-primary(ng-show='backupItem._id' ng-click='removeItem()') Remove
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cd8d9a5e/modules/webconfig/nodejs/views/includes/controls.jade
----------------------------------------------------------------------
diff --git a/modules/webconfig/nodejs/views/includes/controls.jade b/modules/webconfig/nodejs/views/includes/controls.jade
index 3b77226..6d16d19 100644
--- a/modules/webconfig/nodejs/views/includes/controls.jade
+++ b/modules/webconfig/nodejs/views/includes/controls.jade
@@ -110,7 +110,7 @@ mixin form-row
                 +tipField('field.tip')
                 .input-tip
                     button.form-control(bs-select ng-model=masterMdl ng-required='field.required' data-placeholder='{{field.placeholder}}' bs-options='item.value as item.label for item in {{field.items}}')
-            a.customize(ng-show=masterMdl ng-init='' ng-click='#{expanded} = !#{expanded}') {{#{expanded} ? "Hide settings" : "Show settings"}}
+            a.customize(ng-show=masterMdl ng-click='#{expanded} = !#{expanded}') {{#{expanded} ? "Hide settings" : "Show settings"}}
             .col-sm-6.panel-details(ng-show='#{expanded} && #{masterMdl}')
                 .details-row(ng-repeat='detail in field.details[#{masterMdl}].fields')
                     +details-row