QPID-5138: Move logout link into user drop-down menu

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1529364 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 22 insertions, 11 deletions

diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/index.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/index.html
index 4fc961ec12..dbb0c111c0 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/index.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/index.html
@@ -64,16 +64,17 @@
                     "dojo/_base/xhr",
                     "dojo/parser",
                     "qpid/management/Preferences",
+                    "qpid/authorization/checkUser",
                     "dijit/layout/BorderContainer",
                     "dijit/layout/TabContainer",
                     "dijit/layout/ContentPane",
                     "dijit/TitlePane",
-                    "dojo/parser",
                     "qpid/management/treeView",
                     "qpid/management/controller",
-                    "qpid/common/footer",
-                    "qpid/authorization/checkUser"], function(xhr, parser, Preferences){
+                    "qpid/common/footer"
+                    ], function(xhr, parser, Preferences, User){
                         parser.parse();
+                        User.getUserAndUpdateUI();
                         qpidPreferences = new Preferences();
                          xhr.get({
                                 sync: true,
@@ -93,9 +94,10 @@
     <div data-dojo-type="dijit.layout.ContentPane" data-dojo-props="region:'top'">
         <div id="header" class="header" style="float: left; width: 300px"></div>
         <div style="float: right;">
-          <div id="login" style="display:none"><strong>User: </strong> <span id="authenticatedUser"></span><a href="logout">[logout]</a></div>
-          <div id="preferencesButton" style="float: right; margin-top: 0px;" data-dojo-type="dijit.form.DropDownButton" data-dojo-props="iconClass: 'preferencesIcon', title: 'Preferences', showLabel:false">
+          <div id="login" style="display:none"><span id="authenticatedUser" style="display:none"></span>
+            <div id="authenticatedUserControls" data-dojo-type="dijit.form.DropDownButton" data-dojo-props="iconClass: 'preferencesIcon', style:{'max-width': '100px'}">
             <div data-dojo-type="dijit.Menu">
+                <div data-dojo-type="dijit.MenuItem" data-dojo-props="onClick: function(){window.location='logout';}" >Log out</div>
                 <div data-dojo-type="dijit.MenuItem" data-dojo-props="
                         iconClass: 'dijitIconFunction',
                         onClick: function(){ qpidPreferences.showDialog(); } ">
@@ -111,7 +113,8 @@
                     Help
                 </div>
             </div>
-         </div>
+          </div>
+        </div>
        </div>
     </div>
     <div data-dojo-type="dijit.layout.ContentPane" data-dojo-props="region:'leading', splitter: true" style="width:20%">
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/authorization/checkUser.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/authorization/checkUser.js
index d65e6c6e07..be9bef3519 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/authorization/checkUser.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/authorization/checkUser.js
@@ -19,19 +19,27 @@
  *
  */
 
-require(["dojo/dom",
+define(["dojo/dom",
          "qpid/authorization/sasl",
+         "dijit/registry",
          "dojox/html/entities",
-         "dojo/domReady!"], function(dom, sasl, entities){
+         "dojo/domReady!"], function(dom, sasl, registry, entities){
 
 var updateUI = function updateUI(data)
 {
     if(data.user)
     {
-        dom.byId("authenticatedUser").innerHTML = entities.encode(String(data.user));
-        dom.byId("login").style.display = "inline";
+      var userName = entities.encode(String(data.user));
+      var controlButton = registry.byId("authenticatedUserControls");
+      if (controlButton)
+      {
+        controlButton.set("label", userName);
+      }
+      dom.byId("authenticatedUser").innerHTML = userName;
+      dom.byId("login").style.display = "inline";
     }
 };
 
-sasl.getUser(updateUI);
+return {getUserAndUpdateUI: function(){sasl.getUser(updateUI);}}
+
 });