Author: orudyy Date: Fri Mar 31 12:36:14 2017 New Revision: 1789670 URL: http://svn.apache.org/viewvc?rev=1789670&view=rev Log: QPID-7729: [Web Management Console] Fix context path in error dialog and markup in index.html
This closes #3 https://github.com/apache/qpid-java/pull/3#issuecomment-290416065 Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/index.html Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/index.html URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/index.html?rev=1789670&r1=1789669&r2=1789670&view=diff ============================================================================== --- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/index.html (original) +++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/index.html Fri Mar 31 12:36:14 2017 @@ -17,7 +17,7 @@ --> <html lang="en"> <head> - <meta charset="utf-8"> + <meta charset="utf-8"/> <title>Qpid Management</title> <link rel="icon" type="image/png" href="images/qpid-favicon.png"/> <link rel="stylesheet" href="dojo/dojo/resources/dojo.css"/> @@ -33,7 +33,7 @@ <link rel="stylesheet" href="dojo/dojo/resources/dnd.css"/> <link rel="stylesheet" href="dojo/dojox/layout/resources/GridContainer.css"/> <link rel="stylesheet" href="dojo/dojox/layout/resources/DndGridContainer.css"/> - <link rel="stylesheet" href="dojo/dojox/widget/Portlet/Portlet.css"> + <link rel="stylesheet" href="dojo/dojox/widget/Portlet/Portlet.css"/> <link rel="stylesheet" href="css/common.css" media="screen"/> <script> function getContextPath() @@ -82,9 +82,7 @@ }; </script> - <script src="dojo/dojo/dojo.js"> - </script> - + <script src="dojo/dojo/dojo.js"></script> <script> var qpidManagementHelper = null; var management = null; @@ -113,7 +111,6 @@ management = qpidManagementHelper.management; }); </script> - </head> <body class="claro qpid"> @@ -209,10 +206,12 @@ </div> </div> <div class="dijitDialogPaneActionBar qpidDialogPaneActionBar"> - <input type="button" id="errorDialog.button.cancel" value="Cancel" label="Cancel" - dojoType="dijit.form.Button" onClick="dijit.byId('errorDialog').hide();"/> - <input type="button" id="errorDialog.button.relogin" value="Login" label="Login" - dojoType="dijit.form.Button" onClick="dijit.byId('errorDialog').hide(); window.location='/';"/> + <input type="button" id="errorDialog.button.cancel" value="Cancel" + data-dojo-type="dijit.form.Button" + data-dojo-props="label: 'Cancel',onClick:function(){dijit.byId('errorDialog').hide();}"/> + <input type="button" id="errorDialog.button.relogin" value="Login" + data-dojo-type="dijit.form.Button" + data-dojo-props="label:'Login',onClick:function(){dijit.byId('errorDialog').hide();location.reload();}"/> </div> </div> </div> --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org