Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-stratos
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/1295d29c Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/1295d29c Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/1295d29c Branch: refs/heads/master Commit: 1295d29c1dd926b06f081660b57fbf55da85e78e Parents: ae7f906 ec84193 Author: Nirmal Fernando <[email protected]> Authored: Tue Mar 18 18:29:39 2014 +0530 Committer: Nirmal Fernando <[email protected]> Committed: Tue Mar 18 18:29:39 2014 +0530 ---------------------------------------------------------------------- .../console/controllers/dashboard.jag | 15 + .../console/controllers/newTenantSubmit.jag | 14 +- .../console/data/dashboard.json | 197 +++++++ .../console/index.jag | 1 - .../themes/theme1/partials/dashboard.hbs | 565 +------------------ .../themes/theme1/renderers/dashboard.js | 3 +- .../themes/theme1/renderers/tenant_new.js | 106 ++-- .../console/themes/theme1/ui/css/main.css | 33 ++ .../console/themes/theme1/ui/img/panel-back.png | Bin 0 -> 152 bytes .../themes/theme1/ui/img/tmp-details.png | Bin 0 -> 63979 bytes .../console/themes/theme1/ui/js/dashboard.js | 396 +++++++++++++ .../manager/payload/BasicPayloadData.java | 2 +- .../rest/endpoint/services/ServiceUtils.java | 12 +- .../webapp/stratos-test/WEB-INF/cxf-servlet.xml | 4 + 14 files changed, 710 insertions(+), 638 deletions(-) ----------------------------------------------------------------------
