Repository: ignite Updated Branches: refs/heads/ignite-843 24dcc8dda -> 2783ec70a
ignite-843 Minor fix. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2783ec70 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2783ec70 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2783ec70 Branch: refs/heads/ignite-843 Commit: 2783ec70a6c129e8a6dc9515c44ea5dfc2d8446f Parents: 24dcc8d Author: Vasiliy Sisko <vsi...@gridgain.com> Authored: Tue Sep 29 17:34:13 2015 +0700 Committer: Andrey <anovi...@gridgain.com> Committed: Tue Sep 29 17:34:13 2015 +0700 ---------------------------------------------------------------------- .../src/main/js/views/configuration/caches.jade | 4 ++-- .../src/main/js/views/configuration/clusters.jade | 4 ++-- .../src/main/js/views/includes/controls.jade | 10 ++-------- 3 files changed, 6 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/2783ec70/modules/control-center-web/src/main/js/views/configuration/caches.jade ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/views/configuration/caches.jade b/modules/control-center-web/src/main/js/views/configuration/caches.jade index 664d812..2dc7d1c 100644 --- a/modules/control-center-web/src/main/js/views/configuration/caches.jade +++ b/modules/control-center-web/src/main/js/views/configuration/caches.jade @@ -40,8 +40,8 @@ block content .panel-group(bs-collapse ng-model='panels.activePanels' data-allow-multiple='true') +groups('general', 'backupItem') div(ng-show='ui.expanded') - +advanced-options-bottom + +advanced-options +groups('advanced', 'backupItem') - +advanced-options-top + +advanced-options .section(ng-if='ui.expanded') +save-remove-buttons('cache') http://git-wip-us.apache.org/repos/asf/ignite/blob/2783ec70/modules/control-center-web/src/main/js/views/configuration/clusters.jade ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/views/configuration/clusters.jade b/modules/control-center-web/src/main/js/views/configuration/clusters.jade index 7d28c17..6412a25 100644 --- a/modules/control-center-web/src/main/js/views/configuration/clusters.jade +++ b/modules/control-center-web/src/main/js/views/configuration/clusters.jade @@ -40,8 +40,8 @@ block content .panel-group(bs-collapse ng-model='panels.activePanels' data-allow-multiple='true' ng-click='triggerDigest = true') +groups('general', 'backupItem') div(ng-show='ui.expanded') - +advanced-options-bottom + +advanced-options +groups('advanced', 'backupItem') - +advanced-options-top + +advanced-options .section(ng-show='ui.expanded') +save-remove-buttons('cluster') http://git-wip-us.apache.org/repos/asf/ignite/blob/2783ec70/modules/control-center-web/src/main/js/views/includes/controls.jade ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/views/includes/controls.jade b/modules/control-center-web/src/main/js/views/includes/controls.jade index ae66e2b..642cb5b 100644 --- a/modules/control-center-web/src/main/js/views/includes/controls.jade +++ b/modules/control-center-web/src/main/js/views/includes/controls.jade @@ -476,15 +476,9 @@ mixin groups(groups, dataSource) .col-sm-6 +preview('group.group', '{{::group.group + "-right"}}') -mixin advanced-options-top +mixin advanced-options .advanced-options - i.fa.fa-chevron-circle-up(ng-show='ui.expanded' ng-click='toggleExpanded()') - i.fa.fa-chevron-circle-down(ng-show='!ui.expanded' ng-click='toggleExpanded()') - a(ng-click='toggleExpanded()') {{ui.expanded ? 'Hide advanced settings...' : 'Show advanced settings...'}} - -mixin advanced-options-bottom - .advanced-options - i.fa.fa-chevron-circle-up(ng-click='toggleExpanded()') + i.fa(ng-class='ui.expanded ? "fa-chevron-circle-up" : "fa-chevron-circle-down"' ng-click='toggleExpanded()') a(ng-click='toggleExpanded()') {{ui.expanded ? 'Hide advanced settings...' : 'Show advanced settings...'}} mixin preview-content(preview, state, mode)
