You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2013/10/05 02:31:30 UTC
svn commit: r1529364 - in
/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources:
index.html js/qpid/authorization/checkUser.js
Author: orudyy
Date: Sat Oct 5 00:31:30 2013
New Revision: 1529364
URL: http://svn.apache.org/r1529364
Log:
QPID-5138: Move logout link into user drop-down menu
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/index.html
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/authorization/checkUser.js
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/index.html
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/index.html?rev=1529364&r1=1529363&r2=1529364&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/index.html (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/index.html Sat Oct 5 00:31:30 2013
@@ -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%">
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/authorization/checkUser.js
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/authorization/checkUser.js?rev=1529364&r1=1529363&r2=1529364&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/authorization/checkUser.js (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/authorization/checkUser.js Sat Oct 5 00:31:30 2013
@@ -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);}}
+
});
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org