Update the UI code for the new error reporting UI.
diff --git a/asterix-app/src/main/resources/webui/querytemplate.html b/asterix-app/src/main/resources/webui/querytemplate.html
index 727cfb8..8cc8d29 100644
--- a/asterix-app/src/main/resources/webui/querytemplate.html
+++ b/asterix-app/src/main/resources/webui/querytemplate.html
@@ -51,11 +51,16 @@
var resSet = 0;
var resPattern = /<h4>Results:<\/h4>/g;
var durPattern = /<PRE>Duration/g;
+ var errorPattern = /<div class="accordion" id="errorblock">/g;
var resultCount = data.match(resPattern);
- if (!resPattern.test(data)) {
+ if (!resPattern.test(data) && errorPattern.test(data)) {
+ $('#output-heading').html('Error');
+ $('#output-heading').addClass('error');
$('#output-message').html(data);
- } else {
+ } else {
+ $('#output-heading').html('Output');
+ $('#output-heading').removeClass('error');
if (resultCount.length <= 1) {
$('#output-message').html(data);
} else {
@@ -178,7 +183,7 @@
<div class="span6">
<div class="output">
- <label class="heading">Output</label>
+ <label id="output-heading" class="heading">Output</label>
<div id="output-message" class="message">
</div>
</div>
diff --git a/asterix-app/src/main/resources/webui/static/css/style.css b/asterix-app/src/main/resources/webui/static/css/style.css
index 041d9c0..b84c5ef 100644
--- a/asterix-app/src/main/resources/webui/static/css/style.css
+++ b/asterix-app/src/main/resources/webui/static/css/style.css
@@ -85,6 +85,10 @@
color : #17265a;
}
+div.output label.heading.error {
+ color: #E03809;
+}
+
div.output h4 {
color : #17265a;
}
@@ -93,6 +97,14 @@
color : #17265a;
}
+.accordion-inner {
+ padding : 0 0 0 0;
+}
+
+#errorblock .accordion-group .accordion-heading a.accordion-toggle {
+ color: #E03809;
+}
+
div.output .message {
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
@@ -103,22 +115,7 @@
}
div.output .message pre.error {
- -webkit-box-sizing: border-box;
- -moz-box-sizing: border-box;
- -ms-box-sizing: border-box;
- box-sizing: border-box;
- border-color: rgba(82, 168, 236, 0.8);
- outline: 0;
- outline: thin dotted 9;
-
- -webkit-box-shadow: inset 0 1px 1px rgba(250, 0, 0, 0.075), 0 0 8px rgba(255, 0, 0, 0.8);
- -moz-box-shadow: inset 0 1px 1px rgba(250, 0, 0, 0.075), 0 0 8px rgba(255, 0, 0, 1.0);
- box-shadow: inset 0 1px 1px rgba(250, 0, 0, 0.075), 0 0 8px rgba(255, 0, 0, 1.0);
- color: #000;
- resize: none;
- border: 1px solid #eee;
- margin-top: 7px;
- padding: 20px 20px 20px 20px;
+ border: 0;
}
.footer {