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/04/23 13:34:57 UTC
svn commit: r1470900 - in /qpid/branches/0.22/qpid/java: ./
broker-plugins/management-http/src/main/java/resources/
broker-plugins/management-http/src/main/java/resources/css/
broker-plugins/management-http/src/main/java/resources/js/qpid/authorization/
Author: orudyy
Date: Tue Apr 23 11:34:57 2013
New Revision: 1470900
URL: http://svn.apache.org/r1470900
Log:
QPID-4768: Resolve compatibility issues in web management console for old versions of IE and FF
merged from trunk r1470897
Modified:
qpid/branches/0.22/qpid/java/ (props changed)
qpid/branches/0.22/qpid/java/broker-plugins/management-http/src/main/java/resources/css/common.css
qpid/branches/0.22/qpid/java/broker-plugins/management-http/src/main/java/resources/index.html
qpid/branches/0.22/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/authorization/checkUser.js
Propchange: qpid/branches/0.22/qpid/java/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java:r1470897
Modified: qpid/branches/0.22/qpid/java/broker-plugins/management-http/src/main/java/resources/css/common.css
URL: http://svn.apache.org/viewvc/qpid/branches/0.22/qpid/java/broker-plugins/management-http/src/main/java/resources/css/common.css?rev=1470900&r1=1470899&r2=1470900&view=diff
==============================================================================
--- qpid/branches/0.22/qpid/java/broker-plugins/management-http/src/main/java/resources/css/common.css (original)
+++ qpid/branches/0.22/qpid/java/broker-plugins/management-http/src/main/java/resources/css/common.css Tue Apr 23 11:34:57 2013
@@ -43,7 +43,6 @@ button {
-moz-border-radius: 4px 4px 4px 4px;
-moz-box-shadow: 0 1px 1px rgba(0, 0, 0, 0.15);
background-color: #E4F2FF;
- background-image: url("../dojo/dijit/themes/claro/form/images/button.png");
background-position: center top;
background-repeat: repeat-x;
border: 1px solid #769DC0;
Modified: qpid/branches/0.22/qpid/java/broker-plugins/management-http/src/main/java/resources/index.html
URL: http://svn.apache.org/viewvc/qpid/branches/0.22/qpid/java/broker-plugins/management-http/src/main/java/resources/index.html?rev=1470900&r1=1470899&r2=1470900&view=diff
==============================================================================
--- qpid/branches/0.22/qpid/java/broker-plugins/management-http/src/main/java/resources/index.html (original)
+++ qpid/branches/0.22/qpid/java/broker-plugins/management-http/src/main/java/resources/index.html Tue Apr 23 11:34:57 2013
@@ -75,7 +75,7 @@
<div id="pageLayout" data-dojo-type="dijit.layout.BorderContainer" data-dojo-props="design: 'headline', gutters: false">
<div data-dojo-type="dijit.layout.ContentPane" data-dojo-props="region:'top'">
<div id="header" class="header" style="float: left; width: 300px"></div>
- <div id="login" style="float: right"></div>
+ <div id="login" style="float: right; display:none"><strong>User: </strong> <span id="authenticatedUser"></span><a href="logout">[logout]</a></div>
</div>
<div data-dojo-type="dijit.layout.ContentPane" data-dojo-props="region:'leading', splitter: true" style="width:20%">
<div qpid-type="treeView" qpid-props="query: 'rest/structure'" ></div>
Modified: qpid/branches/0.22/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/authorization/checkUser.js
URL: http://svn.apache.org/viewvc/qpid/branches/0.22/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/authorization/checkUser.js?rev=1470900&r1=1470899&r2=1470900&view=diff
==============================================================================
--- qpid/branches/0.22/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/authorization/checkUser.js (original)
+++ qpid/branches/0.22/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/authorization/checkUser.js Tue Apr 23 11:34:57 2013
@@ -19,60 +19,18 @@
*
*/
-require(["dijit/form/DropDownButton",
- "dijit/TooltipDialog",
- "dijit/form/TextBox",
- "dojo/_base/xhr",
- "dojo/dom",
- "dojo/dom-construct",
+require(["dojo/dom",
"qpid/authorization/sasl",
- "dojo/domReady!"], function(DropDownButton, TooltipDialog, TextBox, xhr, dom, domConstruct, sasl){
-
-var dialog = new TooltipDialog({
- content:
- '<strong><label for="username" style="display:inline-block;width:100px;">Username:</label></strong>' +
- '<div data-dojo-type="dijit.form.TextBox" id="username"></div><br/>' +
- '<strong><label for="pass" style="display:inline-block;width:100px;">Password:</label></strong>' +
- '<div data-dojo-type="dijit.form.TextBox" type="password" id="pass"></div><br/>' +
- '<button data-dojo-type="dijit.form.Button" type="submit" id="loginButton">Login</button>'
-});
-
-var button = new DropDownButton({
- label: "Login",
- dropDown: dialog
-});
-
-var usernameSpan = domConstruct.create("span", {
- innerHTML: '<strong>User: </strong> <span id="authenticatedUser"></span><a href="logout">[logout]</a>',
- style: { display: "none" }
-});
-
-
-var loginDiv = dom.byId("login");
-loginDiv.appendChild(usernameSpan);
-loginDiv.appendChild(button.domNode);
+ "dojo/domReady!"], function(dom, sasl){
var updateUI = function updateUI(data)
{
if(data.user)
{
- dojo.byId("authenticatedUser").innerHTML = data.user;
- dojo.style(button.domNode, {display: 'none'});
- dojo.style(usernameSpan, {display: 'block'});
- }
- else
- {
- dojo.style(button.domNode, {display: 'block'});
- dojo.style(usernameSpan, {display: 'none'});
+ dom.byId("authenticatedUser").innerHTML = data.user;
+ dojo.style(dom.byId("login"), {display: 'block'});
}
};
-dijit.byId("loginButton").on("click", function(){
- sasl.authenticate(dojo.byId("username").value, dojo.byId("pass").value, updateUI);
-});
-
-dialog.startup();
-
sasl.getUser(updateUI);
-
});
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org