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/2560c47e Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/2560c47e Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/2560c47e Branch: refs/heads/master Commit: 2560c47e610d0c3a98e15955539ff183a4e408aa Parents: 990ebc7 654db15 Author: Isuru <[email protected]> Authored: Thu Feb 13 23:07:21 2014 +0530 Committer: Isuru <[email protected]> Committed: Thu Feb 13 23:07:21 2014 +0530 ---------------------------------------------------------------------- .../console/controllers/wizardSubmit.jag | 2 +- .../console/themes/theme1/pages/index.hbs | 19 ++++ .../themes/theme1/partials/cartridges.hbs | 3 +- .../partials/configure_stratos_wizard.hbs | 2 +- .../console/themes/theme1/partials/header.hbs | 100 +++++++++++-------- .../themes/theme1/partials/mycartridges.hbs | 7 +- .../theme1/partials/subscribe_cartridge.hbs | 14 +-- .../themes/theme1/renderers/cartridges.js | 11 +- .../console/themes/theme1/renderers/index.js | 17 ++-- .../console/themes/theme1/ui/css/main.css | 49 ++++++++- .../console/themes/theme1/ui/js/wizard.js | 4 +- .../console/util/utility.jag | 6 +- .../manager/CartridgeSubscriptionManager.java | 2 +- .../rest/endpoint/bean/CartridgeInfoBean.java | 38 +++++-- .../stratos/rest/endpoint/mock/MockContext.java | 25 +++++ .../rest/endpoint/mock/StratosTestAdmin.java | 10 ++ .../rest/endpoint/services/ServiceUtils.java | 24 +++-- 17 files changed, 239 insertions(+), 94 deletions(-) ----------------------------------------------------------------------
