Multi-query formatting bug fixed, some visual appearance tweaks
diff --git a/asterix-app/src/main/java/edu/uci/ics/asterix/api/common/APIFramework.java b/asterix-app/src/main/java/edu/uci/ics/asterix/api/common/APIFramework.java
index 1afab97..6f5325d 100644
--- a/asterix-app/src/main/java/edu/uci/ics/asterix/api/common/APIFramework.java
+++ b/asterix-app/src/main/java/edu/uci/ics/asterix/api/common/APIFramework.java
@@ -162,7 +162,7 @@
out.println();
switch (pdf) {
case HTML: {
- out.println("<h3>Expression tree:</h3>");
+ out.println("<h4>Expression tree:</h4>");
out.println("<pre>");
break;
}
@@ -197,7 +197,7 @@
switch (pdf) {
case HTML: {
- out.println("<h3>Rewritten expression tree:</h3>");
+ out.println("<h4>Rewritten expression tree:</h4>");
out.println("<pre>");
break;
}
@@ -234,7 +234,7 @@
switch (pdf) {
case HTML: {
- out.println("<h3>Logical plan:</h3>");
+ out.println("<h4>Logical plan:</h4>");
out.println("<pre>");
break;
}
@@ -289,7 +289,7 @@
} else {
switch (pdf) {
case HTML: {
- out.println("<h3>Optimized logical plan:</h3>");
+ out.println("<h4>Optimized logical plan:</h4>");
out.println("<pre>");
break;
}
@@ -348,7 +348,7 @@
if (pc.isPrintJob()) {
switch (pdf) {
case HTML: {
- out.println("<h3>Hyracks job:</h3>");
+ out.println("<h4>Hyracks job:</h4>");
out.println("<pre>");
break;
}
diff --git a/asterix-app/src/main/java/edu/uci/ics/asterix/aql/translator/AqlTranslator.java b/asterix-app/src/main/java/edu/uci/ics/asterix/aql/translator/AqlTranslator.java
index 7f7db19..5655e35 100644
--- a/asterix-app/src/main/java/edu/uci/ics/asterix/aql/translator/AqlTranslator.java
+++ b/asterix-app/src/main/java/edu/uci/ics/asterix/aql/translator/AqlTranslator.java
@@ -1449,7 +1449,7 @@
}
switch (pdf) {
case HTML:
- out.println("<h3>Results:</h3>");
+ out.println("<h4>Results:</h4>");
out.println("<pre>");
ResultUtils.prettyPrintHTML(out, response);
out.println("</pre>");
diff --git a/asterix-app/src/main/resources/webui/querytemplate.html b/asterix-app/src/main/resources/webui/querytemplate.html
index f655fc5..c9c3b55 100644
--- a/asterix-app/src/main/resources/webui/querytemplate.html
+++ b/asterix-app/src/main/resources/webui/querytemplate.html
@@ -17,16 +17,16 @@
<link href="/webui/static/css/style.css" rel="stylesheet" type="text/css" />
<script type="text/javascript">
-$(document).ready(function(){
+$(document).ready(function() {
$('#checkboxes-on').click(function() {
$('#queryform :input').prop('checked', true);
- return false;
+ return false;
});
$('#checkboxes-off').click(function() {
$('form#queryform :input').removeAttr('checked');
- return false;
+ return false;
});
$('#clear-query-button').click(function() {
@@ -34,61 +34,64 @@
return false;
});
- $("form#queryform").submit(function() {
- $('#output-message').html("");
- $.post("/", $("form#queryform").serialize(), function(data) {
+ $("form#queryform").submit(function() {
+ $('#output-message').html("");
+ $.post("/", $("form#queryform").serialize(), function(data) {
- var resultCount = data.match(/<h3>Results:<\/h3>/g);
- if (resultCount.length <= 1) {
- $('#output-message').html(data);
- } else {
- var results = data.split('<h3>');
- var components = results.slice(1,results.length);
- var sections = components.length/resultCount.length;
+ var resSet = 0;
+ var resultCount = data.match(/<h4>Results:<\/h4>/g);
- $('#output-message').html('');
- $('<div/>')
- .attr("class", "accordion")
- .attr("id", "output-organization")
- .appendTo('#output-message');
-
- for (var resSet = 0; resSet < resultCount.length; resSet++) {
+ if (resultCount.length <= 1) {
+ $('#output-message').html(data);
+ } else {
+ var results = data.split('<h4>');
+ var components = results.slice(1, results.length);
+ var sections = components.length / resultCount.length;
$('<div/>')
- .attr("class","accordion-group")
- .attr("id", "agroup"+resSet)
- .appendTo("#output-organization");
+ .attr("class", "accordion")
+ .attr("id", "output-organization")
+ .appendTo('#output-message');
- $('<div/>')
- .attr("class","accordion-heading")
- .html('<a class="accordion-toggle" data-toggle="collapse" data-parent="output-organization" href="#collapse' + resSet + '">Result #' + (resSet+1) + '</a>')
- .appendTo("#agroup"+resSet);
+ for (resSet = 0; resSet < resultCount.length; resSet++) {
- $('<div/>')
- .attr("class", "accordion-body collapse in")
- .attr("id", "collapse"+resSet)
- .html('<div class="accordion-inner">')
- .appendTo("#agroup"+resSet);
+ $('<div/>')
+ .attr("class", "accordion-group")
+ .attr("id", "agroup" + resSet)
+ .appendTo("#output-organization");
- for (var c = 0; c < sections; c++) {
- var pos = resSet*sections + c;
- $('#collapse' + resSet).append('<h3>' + components[pos]);
+ var resNum = resSet + 1;
+ $('<div/>')
+ .attr("class", "accordion-heading")
+ .html('<a class="accordion-toggle" data-toggle="collapse" data-parent="output-organization" href="#collapse' + resSet + '">Result #' + resNum + '</a>')
+ .appendTo("#agroup" + resSet);
+
+ $('<div/>')
+ .attr("class", "accordion-body collapse in")
+ .attr("id", "collapse" + resSet)
+ .html('<div class="accordion-inner">')
+ .appendTo("#agroup" + resSet);
+
+ for (var c = 0; c < sections; c++) {
+ var pos = resSet*sections + c;
+ $('#collapse' + resSet).append('<h4>' + components[pos]);
+ }
+
+ $('#collapse'+resSet).append('</div>');
+ $('#collapse'+resSet).collapse('toggle');
}
-
- $('#collapse'+resSet).append('</div>');
}
- }
- var contentString = data.toString();
- if (contentString.indexOf("<PRE>Duration") !== -1) {
- $("<div/>")
- .addClass("alert alert-success")
- .html("Success: Query Complete")
- .appendTo('#output-message');
- }
- });
- return false;
- });
+ var contentString = data.toString();
+ if (contentString.indexOf("<PRE>Duration") !== -1) {
+ $('<div/>')
+ .addClass("alert alert-success")
+ .html("Success: Query Complete")
+ .appendTo('#output-message');
+ }
+ });
+ return false;
+ });
});
</script>
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 638b109..4b14784 100644
--- a/asterix-app/src/main/resources/webui/static/css/style.css
+++ b/asterix-app/src/main/resources/webui/static/css/style.css
@@ -73,10 +73,13 @@
margin-top: 2px;
padding-bottom: 10px;
font-weight: bold;
+}
+
+div.output h4 {
color : #17265a;
}
-div.output h3 {
+a.accordion-toggle {
color : #17265a;
}