diff options
| author | Alex Rudyy <orudyy@apache.org> | 2013-10-14 16:16:15 +0000 |
|---|---|---|
| committer | Alex Rudyy <orudyy@apache.org> | 2013-10-14 16:16:15 +0000 |
| commit | c60f5b1e0d99298ce78b6935e0f4eb4ab9e52057 (patch) | |
| tree | 7398f9627d75e32128401d82ea26eeab6bd5edeb /qpid/java/broker-plugins/management-http/src/main/java/resources/index.html | |
| parent | d4fa6a03cf730933cc91d8a251cf368c92497daa (diff) | |
| download | qpid-python-c60f5b1e0d99298ce78b6935e0f4eb4ab9e52057.tar.gz | |
QPID-5138: Add improvements and fixes into Web Management Console preferences:
Use UTC time zone by default if no time zone is set
Create preferences dialog on demand
Enable preferences Set buttons only when changes are made
Display log viewer last update time for preferred and browser time zones
Fix provider name editing
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1531965 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker-plugins/management-http/src/main/java/resources/index.html')
| -rw-r--r-- | qpid/java/broker-plugins/management-http/src/main/java/resources/index.html | 39 |
1 files changed, 10 insertions, 29 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 dbb0c111c0..f17e8d8bba 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 @@ -57,33 +57,24 @@ </script> <script> - var qpidHelpLocation = "http://qpid.apache.org/releases/qpid-"; - var qpidHelpURL = null; - var qpidPreferences = null; + var qpidManagementHelper = null; require([ - "dojo/_base/xhr", "dojo/parser", - "qpid/management/Preferences", "qpid/authorization/checkUser", + "qpid/common/ConsoleHelper", "dijit/layout/BorderContainer", "dijit/layout/TabContainer", "dijit/layout/ContentPane", "dijit/TitlePane", + "dijit/Menu", + "dijit/MenuItem", "qpid/management/treeView", "qpid/management/controller", "qpid/common/footer" - ], function(xhr, parser, Preferences, User){ + ], function(parser, User, ConsoleHelper){ parser.parse(); + qpidManagementHelper = ConsoleHelper; User.getUserAndUpdateUI(); - qpidPreferences = new Preferences(); - xhr.get({ - sync: true, - url: "rest/helper?action=version", - handleAs: "json" - }).then(function(qpidVersion) { - qpidHelpURL = qpidHelpLocation + qpidVersion + "/java-broker/book/index.html"; - }); - }); </script> @@ -98,20 +89,10 @@ <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(); } "> - Preferences - </div> - <!-- - <div data-dojo-type="dijit.MenuItem" data-dojo-props="iconClass: 'dijitIconMail', onClick: function(){ console.log('TODO'); }"> - Contacts - </div> - --> - <div data-dojo-type="dijit.MenuItem" data-dojo-props="iconClass: 'helpIcon', onClick: function(){ - var newWindow = window.open(qpidHelpURL,'QpidHelp','height=600,width=600,scrollbars=1,location=1,resizable=1,status=0,toolbar=0,titlebar=1,menubar=0',true); newWindow.focus(); } "> - Help - </div> + <div data-dojo-type="dijit.MenuItem" + data-dojo-props="iconClass:'dijitIconFunction',onClick: function(){qpidManagementHelper.showPreferencesDialog();}">Preferences</div> + <div data-dojo-type="dijit.MenuItem" + data-dojo-props="iconClass: 'helpIcon', onClick: function(){qpidManagementHelper.showHelp();}">Help</div> </div> </div> </div> |