balki/pgweb
1
0
Fork 0
Code Pull Requests Activity

Move query export buttons to the right, add xml export button

Browse Source
This commit is contained in:
Dan Sosedoff
2016-01-07 20:44:03 -06:00
parent e662e907be
commit 1bc824e39b
4 changed files with 26 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/data/bindata.go
View File

File diff suppressed because one or more lines are too long

4
static/css/app.css
View File

@@ -285,6 +285,10 @@
background: #bbb; background: #bbb;
} }
#input .actions .btn:last-child {
margin-right: 0px;
}
#output { #output {
position: absolute; position: absolute;
left: 0px; left: 0px;

8
static/index.html
View File

@@ -61,10 +61,12 @@
<div class="actions"> <div class="actions">
<input type="button" id="run" value="Run Query" class="btn btn-sm btn-primary" /> <input type="button" id="run" value="Run Query" class="btn btn-sm btn-primary" />
<input type="button" id="explain" value="Explain Query" class="btn btn-sm btn-default" /> <input type="button" id="explain" value="Explain Query" class="btn btn-sm btn-default" />
<input type="button" id="csv" value="CSV" class="btn btn-sm btn-default" />
<input type="button" id="json" value="JSON" class="btn btn-sm btn-default" />
<div id="query_progress">Please wait, query is executing...</div> <div id="query_progress">Please wait, query is executing...</div>
<div class="pull-right">
<input type="button" id="json" value="JSON" class="btn btn-sm btn-default" />
<input type="button" id="csv" value="CSV" class="btn btn-sm btn-default" />
<input type="button" id="xml" value="XML" class="btn btn-sm btn-default" />
</div>
</div> </div>
</div> </div>
</div> </div>

18
static/js/app.js
View File

@@ -316,13 +316,13 @@ function showActivityPanel() {
function runQuery() { function runQuery() {
setCurrentTab("table_query"); setCurrentTab("table_query");
$("#run, #explain, #csv, #json").prop("disabled", true); $("#run, #explain, #csv, #json, #xml").prop("disabled", true);
$("#query_progress").show(); $("#query_progress").show();
var query = $.trim(editor.getSelectedText() || editor.getValue()); var query = $.trim(editor.getSelectedText() || editor.getValue());
if (query.length == 0) { if (query.length == 0) {
$("#run, #explain, #csv, #json").prop("disabled", false); $("#run, #explain, #csv, #json, #xml").prop("disabled", false);
$("#query_progress").hide(); $("#query_progress").hide();
return; return;
} }
@@ -330,7 +330,7 @@ function runQuery() {
executeQuery(query, function(data) { executeQuery(query, function(data) {
buildTable(data); buildTable(data);
$("#run, #explain, #csv, #json").prop("disabled", false); $("#run, #explain, #csv, #json, #xml").prop("disabled", false);
$("#query_progress").hide(); $("#query_progress").hide();
$("#input").show(); $("#input").show();
$("#output").removeClass("full"); $("#output").removeClass("full");
@@ -352,13 +352,13 @@ function runQuery() {
function runExplain() { function runExplain() {
setCurrentTab("table_query"); setCurrentTab("table_query");
$("#run, #explain, #csv, #json").prop("disabled", true); $("#run, #explain, #csv, #json, #xml").prop("disabled", true);
$("#query_progress").show(); $("#query_progress").show();
var query = $.trim(editor.getValue()); var query = $.trim(editor.getValue());
if (query.length == 0) { if (query.length == 0) {
$("#run, #explain, #csv, #json").prop("disabled", false); $("#run, #explain, #csv, #json, #xml").prop("disabled", false);
$("#query_progress").hide(); $("#query_progress").hide();
return; return;
} }
@@ -366,7 +366,7 @@ function runExplain() {
explainQuery(query, function(data) { explainQuery(query, function(data) {
buildTable(data); buildTable(data);
$("#run, #explain, #csv, #json").prop("disabled", false); $("#run, #explain, #csv, #json, #xml").prop("disabled", false);
$("#query_progress").hide(); $("#query_progress").hide();
$("#input").show(); $("#input").show();
$("#output").removeClass("full"); $("#output").removeClass("full");
@@ -532,7 +532,11 @@ $(document).ready(function() {
$("#json").on("click", function() { $("#json").on("click", function() {
exportTo("json"); exportTo("json");
}) });
$("#xml").on("click", function() {
exportTo("xml");
});
$("#results").on("click", "tr", function() { $("#results").on("click", "tr", function() {
$("#results tr.selected").removeClass(); $("#results tr.selected").removeClass();