Repository: ignite Updated Branches: refs/heads/ignite-843-rc1 da8116e44 -> 8cbd568f9
IGNITE-843 Added collapse icon for group panel. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8cbd568f Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8cbd568f Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8cbd568f Branch: refs/heads/ignite-843-rc1 Commit: 8cbd568f934126ea26a0bf6c7ec441cb7b74e496 Parents: da8116e Author: Andrey <[email protected]> Authored: Wed Oct 21 14:28:06 2015 +0700 Committer: Andrey <[email protected]> Committed: Wed Oct 21 14:28:06 2015 +0700 ---------------------------------------------------------------------- .../src/main/js/controllers/caches-controller.js | 1 + .../src/main/js/controllers/igfs-controller.js | 1 + .../src/main/js/controllers/metadata-controller.js | 1 + .../src/main/js/views/configuration/summary.jade | 12 ++++++++---- 4 files changed, 11 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/8cbd568f/modules/control-center-web/src/main/js/controllers/caches-controller.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/controllers/caches-controller.js b/modules/control-center-web/src/main/js/controllers/caches-controller.js index b4d7277..5152c13 100644 --- a/modules/control-center-web/src/main/js/controllers/caches-controller.js +++ b/modules/control-center-web/src/main/js/controllers/caches-controller.js @@ -33,6 +33,7 @@ consoleModule.controller('cachesController', [ $scope.javaBuildInClasses = $common.javaBuildInClasses; $scope.compactJavaName = $common.compactJavaName; $scope.saveBtnTipText = $common.saveBtnTipText; + $scope.panelExpanded = $common.panelExpanded; $scope.tableVisibleRow = $table.tableVisibleRow; $scope.tableReset = $table.tableReset; http://git-wip-us.apache.org/repos/asf/ignite/blob/8cbd568f/modules/control-center-web/src/main/js/controllers/igfs-controller.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/controllers/igfs-controller.js b/modules/control-center-web/src/main/js/controllers/igfs-controller.js index 785545f..2726e87 100644 --- a/modules/control-center-web/src/main/js/controllers/igfs-controller.js +++ b/modules/control-center-web/src/main/js/controllers/igfs-controller.js @@ -33,6 +33,7 @@ consoleModule.controller('igfsController', [ $scope.javaBuildInClasses = $common.javaBuildInClasses; $scope.compactJavaName = $common.compactJavaName; $scope.saveBtnTipText = $common.saveBtnTipText; + $scope.panelExpanded = $common.panelExpanded; $scope.tableVisibleRow = $table.tableVisibleRow; $scope.tableReset = $table.tableReset; http://git-wip-us.apache.org/repos/asf/ignite/blob/8cbd568f/modules/control-center-web/src/main/js/controllers/metadata-controller.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/controllers/metadata-controller.js b/modules/control-center-web/src/main/js/controllers/metadata-controller.js index c596af4..08f4ae0 100644 --- a/modules/control-center-web/src/main/js/controllers/metadata-controller.js +++ b/modules/control-center-web/src/main/js/controllers/metadata-controller.js @@ -39,6 +39,7 @@ consoleModule.controller('metadataController', [ $scope.javaBuildInClasses = $common.javaBuildInClasses; $scope.compactJavaName = $common.compactJavaName; $scope.saveBtnTipText = $common.saveBtnTipText; + $scope.panelExpanded = $common.panelExpanded; $scope.tableVisibleRow = $table.tableVisibleRow; $scope.tableReset = $table.tableReset; http://git-wip-us.apache.org/repos/asf/ignite/blob/8cbd568f/modules/control-center-web/src/main/js/views/configuration/summary.jade ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/views/configuration/summary.jade b/modules/control-center-web/src/main/js/views/configuration/summary.jade index 63f92a5..4427285 100644 --- a/modules/control-center-web/src/main/js/views/configuration/summary.jade +++ b/modules/control-center-web/src/main/js/views/configuration/summary.jade @@ -61,9 +61,11 @@ block content a(href='clusters') here. +main-table('Clusters:', 'clusters', 'clusterName', 'selectItem(row)', '{{$index + 1}}) {{row.name}}') div(ng-show='selectedItem && tableVisibleRow(displayedRows, selectedItem)' role='tab' method='post' action='summary/download') - .padding-dflt(bs-collapse data-start-collapsed='false') + .padding-dflt(bs-collapse ng-init='serverExpanded=0' ng-model='serverExpanded') .panel.panel-default - form.panel-heading(role='tab' method='post' action='summary/download' bs-collapse-toggle) Server + form.panel-heading(role='tab' method='post' action='summary/download' bs-collapse-toggle) + i.tipLabel.fa(ng-class='serverExpanded == 0 ? "fa-chevron-circle-up" : "fa-chevron-circle-down"') + label Server input(type='hidden' name='_id' value='{{selectedItem._id}}') input(type='hidden' name='os' value='{{os}}') input(type='hidden' name='javaClass' value='{{javaClassServer}}') @@ -98,9 +100,11 @@ block content .col-xs-5.col-sm-4 input#os.form-control(type='text' ng-model='configServer.os' placeholder='debian:8' data-min-length='0' data-html='1' data-auto-select='true' bs-typeahead retain-selection bs-options='os for os in oss') div(ui-ace='{ onLoad: aceInit, mode: "dockerfile" }' ng-model='dockerServer') - .padding-dflt(bs-collapse data-start-collapsed='false') + .padding-dflt(bs-collapse ng-init='clientExpanded=0' ng-model='clientExpanded') .panel.panel-default - form.panel-heading(role='tab' method='post' action='summary/download' bs-collapse-toggle) Client + form.panel-heading(role='tab' method='post' action='summary/download' bs-collapse-toggle) + i.tipLabel.fa(ng-class='clientExpanded == 0 ? "fa-chevron-circle-up" : "fa-chevron-circle-down"') + label Client input(type='hidden' name='_id' value='{{selectedItem._id}}') input(type='hidden' name='javaClass' value='{{javaClassClient}}') input(type='hidden' name='clientNearConfiguration' value='{{backupItem}}')
