summaryrefslogtreecommitdiff
path: root/qpid/java/broker-plugins/management-http/src/main/java/resources/index.html
diff options
context:
space:
mode:
authorRobert Godfrey <rgodfrey@apache.org>2014-08-25 15:28:50 +0000
committerRobert Godfrey <rgodfrey@apache.org>2014-08-25 15:28:50 +0000
commit9556a8d9c53be396a25cd4c29842b79e99bc1746 (patch)
treebf6f92cfaee1883199c743bd25359841af3e7f1b /qpid/java/broker-plugins/management-http/src/main/java/resources/index.html
parent19478e74524f27e26f01117b1b973829718ed44d (diff)
downloadqpid-python-9556a8d9c53be396a25cd4c29842b79e99bc1746.tar.gz
Merging from trunk r1618473:1618815 in the Java tree
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.30@1620348 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.html23
1 files changed, 15 insertions, 8 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 dfbec13320..3c0cb9a5f6 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
@@ -108,17 +108,24 @@
</div>
<div class="dijitHidden">
- <div data-dojo-type="dijit.Dialog" data-dojo-props="title: 'Connection Error'" id="errorDialog">
- <div style="width:400px; overflow: auto">
- <div><strong><span id="errorMessage">An error occurred when communicating with the broker.</span></strong></div>
- <div><span id="statusMessage"></span></div>
- <div style="margin-top: 10px; margin-bottom: 8px"><span id="reloadMessage">Please try to reload.</span></div>
- <div id="errorDetails" data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Details', open:false">
- <span id="errorDetailsMessage"></span>
+ <div data-dojo-type="dijit.Dialog" data-dojo-props="title: 'Error'" id="errorDialog">
+ <div>
+ <div class="errorDialogErrorPrimary">
+ <span id="errorDialog.statusCode">000</span>&nbsp;-&nbsp;<span id="errorDialog.errorMessage">error</span>
+ </div>
+
+ <div class="clear" class="errorDialogErrorSecondary">
+ <div id="errorDialog.advice.reconnect">
+ Please login again and retry your operation.
+ </div>
+ <div id="errorDialog.advice.retry">
+ Please correct the problem and retry your operation.
+ </div>
</div>
</div>
<div class="dijitDialogPaneActionBar">
- <input type="button" value="Close" label="Close" dojoType="dijit.form.Button" onClick="dijit.byId('errorDialog').hide();"/>
+ <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(); document.location.href = '/';"/>
</div>
</div>
</div>