Merge branch 'ignite-843' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into 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/f621c3ef Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f621c3ef Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f621c3ef Branch: refs/heads/ignite-843 Commit: f621c3ef7d7569aa1c9e4a2109c05aafb0bd6cf0 Parents: 301ac42 2e4daaa Author: Andrey <anovi...@gridgain.com> Authored: Wed Jul 29 08:50:20 2015 +0700 Committer: Andrey <anovi...@gridgain.com> Committed: Wed Jul 29 08:50:20 2015 +0700 ---------------------------------------------------------------------- .../main/js/controllers/caches-controller.js | 1 + .../main/js/controllers/clusters-controller.js | 1 + .../src/main/js/controllers/common-module.js | 59 ++++++++++++ .../main/js/controllers/metadata-controller.js | 5 +- .../src/main/js/controllers/models/caches.json | 7 +- .../main/js/controllers/models/clusters.json | 20 ++-- .../main/js/controllers/models/metadata.json | 14 ++- modules/web-control-center/src/main/js/db.js | 2 +- .../src/main/js/routes/generator/common.js | 11 ++- .../src/main/js/routes/generator/xml.js | 93 +++++++++++++------ .../src/main/js/views/configuration/caches.jade | 4 +- .../main/js/views/configuration/clusters.jade | 4 +- .../main/js/views/configuration/metadata.jade | 4 +- .../main/js/views/configuration/summary.jade | 2 +- .../src/main/js/views/includes/controls.jade | 96 ++++++++++---------- .../src/main/js/views/login.jade | 14 +-- .../src/main/js/views/settings/profile.jade | 4 +- .../src/main/js/views/templates/layout.jade | 2 +- .../src/main/js/views/templates/select.jade | 8 +- .../src/main/js/views/templates/tab.jade | 8 +- 20 files changed, 237 insertions(+), 122 deletions(-) ----------------------------------------------------------------------
