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/7a61fc02 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/7a61fc02 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/7a61fc02 Branch: refs/heads/master Commit: 7a61fc023d84e79acb6d384082f102c7bfc31145 Parents: 18949f7 8cf82f2 Author: Isuru <[email protected]> Authored: Mon Jan 6 17:46:45 2014 +0530 Committer: Isuru <[email protected]> Committed: Mon Jan 6 17:46:45 2014 +0530 ---------------------------------------------------------------------- .../configure_stratos.jag | 7 ++ .../themes/theme1/pages/index.hbs | 1 + .../themes/theme1/partials/cartridges.hbs | 4 +- .../theme1/partials/configure_stratos.hbs | 101 +++++++++++++++++++ .../themes/theme1/partials/header.hbs | 27 +++-- .../themes/theme1/partials/mycartridges.hbs | 34 ------- .../themes/theme1/renderers/cartridges.js | 47 ++++++++- .../theme1/renderers/configure_stratos.js | 40 ++++++++ .../themes/theme1/renderers/index.js | 59 ++++++++--- .../theme1/renderers/subscribe_cartridge.js | 27 +++-- .../themes/theme1/ui/css/main.css | 43 ++++++-- .../themes/theme1/ui/custom-fonts/style.css | 24 ++--- 12 files changed, 326 insertions(+), 88 deletions(-) ----------------------------------------------------------------------
