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/10/21 09:01:45 UTC
[1/3] ignite git commit: Merge branches 'ignite-843-rc1' and 'master'
of https://git-wip-us.apache.org/repos/asf/ignite into ignite-843-rc1
Repository: ignite
Updated Branches:
refs/heads/ignite-843-rc1 ff9afaf21 -> da8116e44
Merge branches 'ignite-843-rc1' and 'master' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-843-rc1
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/bcfe8c60
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/bcfe8c60
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/bcfe8c60
Branch: refs/heads/ignite-843-rc1
Commit: bcfe8c606aad179e05e4bd8d624fe26c80d42c12
Parents: bd7b27d 43b40f4
Author: Andrey <an...@gridgain.com>
Authored: Wed Oct 21 08:42:27 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Wed Oct 21 08:42:27 2015 +0700
----------------------------------------------------------------------
.../ignite/internal/processors/igfs/IgfsMetaManager.java | 10 +++++++---
.../processors/cache/CacheAffinityCallSelfTest.java | 4 +++-
.../IgniteCacheClientNodeChangingTopologyTest.java | 4 +++-
3 files changed, 13 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
[2/3] ignite git commit: IGNITE-843 Added collapse icon for group
panel.
Posted by an...@apache.org.
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/b2c71f5a
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b2c71f5a
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b2c71f5a
Branch: refs/heads/ignite-843-rc1
Commit: b2c71f5a1a1a42819d28debbcdc0b213519b5538
Parents: bcfe8c6
Author: Andrey <an...@gridgain.com>
Authored: Wed Oct 21 14:01:00 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Wed Oct 21 14:01:00 2015 +0700
----------------------------------------------------------------------
.../src/main/js/controllers/clusters-controller.js | 1 +
.../src/main/js/controllers/common-module.js | 11 +++++++++++
.../src/main/js/public/stylesheets/style.scss | 4 ++++
.../src/main/js/views/includes/controls.jade | 5 +++--
4 files changed, 19 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/b2c71f5a/modules/control-center-web/src/main/js/controllers/clusters-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/clusters-controller.js b/modules/control-center-web/src/main/js/controllers/clusters-controller.js
index dda0c13..6887825 100644
--- a/modules/control-center-web/src/main/js/controllers/clusters-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/clusters-controller.js
@@ -32,6 +32,7 @@ consoleModule.controller('clustersController', [
$scope.getModel = $common.getModel;
$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/b2c71f5a/modules/control-center-web/src/main/js/controllers/common-module.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/common-module.js b/modules/control-center-web/src/main/js/controllers/common-module.js
index 664b67d..75a4a57 100644
--- a/modules/control-center-web/src/main/js/controllers/common-module.js
+++ b/modules/control-center-web/src/main/js/controllers/common-module.js
@@ -724,6 +724,17 @@ consoleModule.service('$common', [
ensureActivePanel: function (panels, id, focusId) {
ensureActivePanel(panels, id, focusId);
},
+ panelExpanded: function (panels, id) {
+ if (panels && panels.activePanels && panels.activePanels.length > 0) {
+ var idx = _.findIndex($('div.panel-collapse'), function(pnl) {
+ return pnl.id == id;
+ });
+
+ return idx >= 0 && _.includes(panels.activePanels, idx);
+ }
+
+ return false;
+ },
showPopoverMessage: function (panels, panelId, id, message) {
return showPopoverMessage(panels, panelId, id, message)
},
http://git-wip-us.apache.org/repos/asf/ignite/blob/b2c71f5a/modules/control-center-web/src/main/js/public/stylesheets/style.scss
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/public/stylesheets/style.scss b/modules/control-center-web/src/main/js/public/stylesheets/style.scss
index cd38de5..d76e6d9 100644
--- a/modules/control-center-web/src/main/js/public/stylesheets/style.scss
+++ b/modules/control-center-web/src/main/js/public/stylesheets/style.scss
@@ -591,6 +591,10 @@ button.form-control {
.btn-group { margin-left: 10px; }
+ .fa-chevron-circle-up, .fa-chevron-circle-down {
+ color: inherit;
+ }
+
.fa-undo {
font-size: 16px;
http://git-wip-us.apache.org/repos/asf/ignite/blob/b2c71f5a/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 85b3324..2bce523 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
@@ -464,8 +464,9 @@ mixin main-table(title, rows, focusId, click, rowTemplate)
mixin groups(groups, dataSource)
.panel.panel-default(ng-repeat='group in #{groups}' ng-click='triggerDigest=true' ng-hide='{{group.hide}}')
- .panel-heading(bs-collapse-toggle ng-click='hidePopover()') {{::group.label}}
- label(id='{{::group.group + "-title"}}')
+ .panel-heading(bs-collapse-toggle ng-click='hidePopover()')
+ i.tipLabel.fa(ng-class='panelExpanded(panels, "{{group.group}}") ? "fa-chevron-circle-up" : "fa-chevron-circle-down"')
+ label(id='{{::group.group + "-title"}}') {{::group.label}}
i.tipLabel.fa.fa-question-circle(ng-if='group.tip' bs-tooltip='joinTip(group.tip)')
i.tipLabel.fa.fa-question-circle.blank(ng-if='!group.tip')
i.pull-right.fa.fa-undo(ng-show='group.dirty' ng-click='resetItem(group.group); $event.stopPropagation()' bs-tooltip data-title='Undo unsaved changes')
[3/3] ignite git commit: Merge remote-tracking branch
'origin/ignite-843-rc1' into ignite-843-rc1
Posted by an...@apache.org.
Merge remote-tracking branch 'origin/ignite-843-rc1' into ignite-843-rc1
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/da8116e4
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/da8116e4
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/da8116e4
Branch: refs/heads/ignite-843-rc1
Commit: da8116e44693802b25fb6fed01c3925ce035cf88
Parents: b2c71f5 ff9afaf
Author: Andrey <an...@gridgain.com>
Authored: Wed Oct 21 14:01:14 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Wed Oct 21 14:01:14 2015 +0700
----------------------------------------------------------------------
.../main/js/controllers/clusters-controller.js | 6 +
.../main/js/controllers/models/clusters.json | 4 +-
.../src/main/js/controllers/models/igfs.json | 139 +++++++++++++------
modules/control-center-web/src/main/js/db.js | 13 +-
.../src/main/js/routes/clusters.js | 37 +++--
.../main/js/routes/generator/generator-java.js | 9 ++
.../js/routes/generator/generator-readme.js | 2 +-
.../main/js/routes/generator/generator-xml.js | 9 ++
.../src/main/js/routes/igfs.js | 96 +++++--------
.../src/main/js/views/configuration/caches.jade | 2 +-
.../src/main/js/views/configuration/igfs.jade | 8 +-
11 files changed, 195 insertions(+), 130 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/da8116e4/modules/control-center-web/src/main/js/controllers/clusters-controller.js
----------------------------------------------------------------------