Merge remote-tracking branch 'origin/ignite-843' into ignite-843
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ce7c763a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ce7c763a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ce7c763a Branch: refs/heads/ignite-843 Commit: ce7c763a3d9c461ce2d0f961ca69175ff750ddd2 Parents: 7d5299e e5812a7 Author: Andrey <anovi...@gridgain.com> Authored: Mon Aug 17 15:10:45 2015 +0700 Committer: Andrey <anovi...@gridgain.com> Committed: Mon Aug 17 15:10:45 2015 +0700 ---------------------------------------------------------------------- .../main/js/controllers/clusters-controller.js | 61 +++++++------------ .../src/main/js/controllers/common-module.js | 64 ++++++++++++++++---- .../main/js/controllers/models/clusters.json | 1 + .../src/main/js/public/stylesheets/style.scss | 8 +-- .../src/main/js/views/includes/controls.jade | 28 +++++---- .../src/main/js/views/templates/popover.jade | 10 ++- 6 files changed, 101 insertions(+), 71 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ce7c763a/modules/control-center-web/src/main/js/public/stylesheets/style.scss ----------------------------------------------------------------------
