Updated Branches: refs/heads/master 42169a4f3 -> 4886e11ab
applying patch for STRATOS-430 Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/4886e11a Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/4886e11a Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/4886e11a Branch: refs/heads/master Commit: 4886e11ab22b285f6e2cbf02d9b117414ac6da9f Parents: 42169a4 Author: rekathiru <[email protected]> Authored: Tue Feb 11 16:33:51 2014 +0530 Committer: rekathiru <[email protected]> Committed: Tue Feb 11 16:33:51 2014 +0530 ---------------------------------------------------------------------- .../console/controllers/loginSubmit.jag | 1 + .../console/themes/theme1/partials/header.hbs | 2 +- .../console/themes/theme1/theme.js | 7 +++++++ .../console/themes/theme1/ui/css/main.css | 1 + 4 files changed, 10 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/4886e11a/components/org.apache.stratos.manager.console/console/controllers/loginSubmit.jag ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/controllers/loginSubmit.jag b/components/org.apache.stratos.manager.console/console/controllers/loginSubmit.jag index 0ade4d8..a9369c9 100644 --- a/components/org.apache.stratos.manager.console/console/controllers/loginSubmit.jag +++ b/components/org.apache.stratos.manager.console/console/controllers/loginSubmit.jag @@ -22,6 +22,7 @@ var user = um.getUser('admin'); var roles = user.getRoles(); //storing in session + session.put("USER_NAME",username); session.put("TENANT_DOMAIN",userObject.domain); session.put("ROLE_ARRAY",roles); //call the authentication rest-endpoint and get the JSESSION_ID http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/4886e11a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/header.hbs ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/header.hbs b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/header.hbs index 5b7699f..9edce6e 100644 --- a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/header.hbs +++ b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/header.hbs @@ -27,7 +27,7 @@ </ul> <ul class="pull-right"> <li class="dropdown"> - <a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-user"></i><br /> admin <b class="caret"></b></a> + <a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-user"></i><br /> {{#user}}{{/user}} <b class="caret"></b></a> <ul class="dropdown-menu"> <li><a><i class="fa fa-file-text-o"></i> View Profile</a></li> <li> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/4886e11a/components/org.apache.stratos.manager.console/console/themes/theme1/theme.js ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/theme.js b/components/org.apache.stratos.manager.console/console/themes/theme1/theme.js index fb992ea..b54963c 100644 --- a/components/org.apache.stratos.manager.console/console/themes/theme1/theme.js +++ b/components/org.apache.stratos.manager.console/console/themes/theme1/theme.js @@ -58,6 +58,13 @@ var engine = require('caramel').engine('handlebars', (function () { } }); + Handlebars.registerHelper('user', function(action, options) { + if(caramel.meta().session.get("USER_NAME") != undefined ) { + return caramel.meta().session.get("USER_NAME"); + } + return ""; + }); + } } }())); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/4886e11a/components/org.apache.stratos.manager.console/console/themes/theme1/ui/css/main.css ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/ui/css/main.css b/components/org.apache.stratos.manager.console/console/themes/theme1/ui/css/main.css index 09862cb..4720872 100644 --- a/components/org.apache.stratos.manager.console/console/themes/theme1/ui/css/main.css +++ b/components/org.apache.stratos.manager.console/console/themes/theme1/ui/css/main.css @@ -449,6 +449,7 @@ li.dropdown ul.dropdown-menu li a{ } li.dropdown ul.dropdown-menu li a:hover{ background: #3e3f3f; + color:#fff; } li.dropdown ul.dropdown-menu li a i{ font-size: 20px;
