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/d93f6871 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/d93f6871 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/d93f6871 Branch: refs/heads/master Commit: d93f6871dc58bf6f49f34ec450432be78f177e0a Parents: 41c0f77 68d1371 Author: Melan Nimesh <[email protected]> Authored: Tue Feb 18 16:35:37 2014 +0530 Committer: Melan Nimesh <[email protected]> Committed: Tue Feb 18 16:35:37 2014 +0530 ---------------------------------------------------------------------- .../console/cartridge_info.jag | 15 +++- .../controllers/cartridgeUnsubscribeSubmit.jag | 2 - .../themes/theme1/partials/cartridge_info.hbs | 78 +++++++++++++++++--- .../themes/theme1/partials/cartridges.hbs | 17 +++-- .../themes/theme1/partials/mycartridges.hbs | 4 +- .../theme1/partials/subscribe_cartridge.hbs | 54 ++++++-------- .../themes/theme1/renderers/cartridge_info.js | 8 +- .../console/themes/theme1/ui/css/main.css | 7 ++ .../console/util/utility.jag | 7 ++ 9 files changed, 138 insertions(+), 54 deletions(-) ----------------------------------------------------------------------
