diff --git a/assets/javascripts/discourse/controllers/admin-plugins-explorer.js.es6 b/assets/javascripts/discourse/controllers/admin-plugins-explorer.js.es6 index 3c40d98..d96904c 100644 --- a/assets/javascripts/discourse/controllers/admin-plugins-explorer.js.es6 +++ b/assets/javascripts/discourse/controllers/admin-plugins-explorer.js.es6 @@ -102,6 +102,7 @@ export default Ember.Controller.extend({ this.setProperties({ asc: null, order: null, + showResults: false, selectedQueryId: null, sortBy: ['last_run_at:desc'] }); @@ -163,6 +164,7 @@ export default Ember.Controller.extend({ const self = this; const query = this.get('selectedItem'); this.set('loading', true); + this.set('showResults', false); this.store.destroyRecord('query', query).then(function() { query.set('destroyed', true); }).catch(popupAjaxError).finally(function() { @@ -174,6 +176,7 @@ export default Ember.Controller.extend({ const self = this; const query = this.get('selectedItem'); this.set('loading', true); + this.set('showResults', true); query.save().then(function() { query.set('destroyed', false); }).catch(popupAjaxError).finally(function() { diff --git a/assets/javascripts/discourse/templates/explorer-query-result.hbs b/assets/javascripts/discourse/templates/explorer-query-result.hbs index 55486f4..b9f6a33 100644 --- a/assets/javascripts/discourse/templates/explorer-query-result.hbs +++ b/assets/javascripts/discourse/templates/explorer-query-result.hbs @@ -1,18 +1,22 @@
+
{{~content.explain}}
{{~/if}}
+
+
diff --git a/assets/stylesheets/explorer.scss b/assets/stylesheets/explorer.scss
index a7c9311..aaa9216 100644
--- a/assets/stylesheets/explorer.scss
+++ b/assets/stylesheets/explorer.scss
@@ -298,6 +298,18 @@
}
}
+.result-info {
+ float: left;
+}
+.result-about {
+ color: $primary-high;
+ float: right;
+}
+.result-explain {
+ padding-top: 1em;
+ margin-bottom: 0px;
+}
+
.explorer-pad-bottom {
margin-bottom: 200px;
}
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 64c77ea..6f52a66 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -48,7 +48,6 @@ en:
edit: "Edit"
delete: "Delete"
recover: "Undelete Query"
- download: "Download Results"
download_json: "JSON"
download_csv: "CSV"
others_dirty: "A query has unsaved changes that will be lost if you navigate away."