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/05ef5285 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/05ef5285 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/05ef5285 Branch: refs/heads/master Commit: 05ef5285ad8ba462d1296b19feb585de59f1ce16 Parents: d45e4a9 3d7961e Author: Udara Liyanage <[email protected]> Authored: Thu Mar 20 02:50:44 2014 -0400 Committer: Udara Liyanage <[email protected]> Committed: Thu Mar 20 02:50:44 2014 -0400 ---------------------------------------------------------------------- .../console/cartridge_info.jag | 7 ++- .../console/subscribe_cartridge.jag | 2 + .../console/themes/theme1/pages/index.hbs | 12 +--- .../themes/theme1/partials/cartridge_info.hbs | 38 ++++++----- .../themes/theme1/partials/cartridges.hbs | 24 ++++--- .../partials/configure_stratos_wizard.hbs | 62 +++++++++--------- .../console/themes/theme1/partials/header.hbs | 6 +- .../themes/theme1/partials/mycartridges.hbs | 17 ++--- .../theme1/partials/tenant_management.hbs | 60 +++++------------- .../themes/theme1/partials/tenant_new.hbs | 2 +- .../themes/theme1/renderers/cartridge_info.js | 2 +- .../themes/theme1/renderers/cartridges.js | 10 +-- .../console/themes/theme1/renderers/index.js | 12 ++-- .../theme1/renderers/subscribe_cartridge.js | 10 ++- .../console/themes/theme1/ui/css/main.css | 66 ++++++++++++++------ .../console/util/utility.jag | 11 ++-- .../stratos/rest/endpoint/mock/MockContext.java | 9 ++- .../rest/endpoint/mock/StratosTestAdmin.java | 7 ++- 18 files changed, 187 insertions(+), 170 deletions(-) ----------------------------------------------------------------------
