Merge ignite-843 -> ignite-1121
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3e8a935d Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3e8a935d Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3e8a935d Branch: refs/heads/ignite-1121 Commit: 3e8a935d83e0c4eed589fe490835d0518dd82cc6 Parents: 8e050e9 8f30428 Author: sevdokimov <sevdoki...@gridgain.com> Authored: Fri Jul 24 16:45:12 2015 +0300 Committer: sevdokimov <sevdoki...@gridgain.com> Committed: Fri Jul 24 16:45:12 2015 +0300 ---------------------------------------------------------------------- modules/web-control-center/src/main/js/app.js | 10 +- .../main/js/controllers/caches-controller.js | 14 + .../main/js/controllers/clusters-controller.js | 6 +- .../main/js/controllers/metadata-controller.js | 67 +- .../src/main/js/controllers/models/caches.json | 22 +- .../main/js/controllers/models/clusters.json | 8 +- .../main/js/controllers/models/metadata.json | 42 +- .../src/main/js/controllers/models/summary.json | 2 +- modules/web-control-center/src/main/js/db.js | 2 + .../web-control-center/src/main/js/package.json | 2 +- .../src/main/js/public/stylesheets/style.less | 1214 ----------------- .../src/main/js/public/stylesheets/style.scss | 1270 ++++++++++++++++++ .../src/main/js/routes/caches.js | 18 +- .../src/main/js/views/configuration/caches.jade | 4 +- .../main/js/views/configuration/clusters.jade | 4 +- .../main/js/views/configuration/metadata.jade | 6 +- .../main/js/views/configuration/summary.jade | 11 +- .../src/main/js/views/includes/controls.jade | 98 +- .../src/main/js/views/sql/sql.jade | 13 +- 19 files changed, 1482 insertions(+), 1331 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3e8a935d/modules/web-control-center/src/main/js/app.js ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3e8a935d/modules/web-control-center/src/main/js/package.json ----------------------------------------------------------------------
