Merge pull request #23 from rishabhnambiar/remove_query_hook

FIX: Remove useless no_query_hook text and move create & import butto…
This commit is contained in:
Rishabh 2018-09-10 13:15:21 +05:30 committed by GitHub
commit 40e01f2141
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 17 deletions

View File

@ -5,9 +5,9 @@
{{else}}
{{#unless selectedQueryId}}
<div class="query-list">
{{combo-box valueAttribute="id" value=selectedQueryId nameProperty="listName" none="explorer.menu_none" content=content castInteger="true" nameChanges="true"}}
{{d-button action="showCreate" icon="plus" class="no-text"}}
{{d-button action="importQuery" label="explorer.import.label" icon="upload"}}
{{combo-box valueAttribute="id" class="btn-left" value=selectedQueryId nameProperty="listName" none="explorer.menu_none" content=content castInteger="true" nameChanges="true"}}
{{d-button action="showCreate" icon="plus" class="no-text btn-right"}}
{{d-button action="importQuery" label="explorer.import.label" icon="upload btn-right"}}
</div>
{{#if showCreate}}
@ -23,14 +23,10 @@
{{i18n "explorer.others_dirty"}}
</div>
{{/if}}
<hr>
{{/unless}}
{{#if content.length}}
{{#if selectedItem.fake}}
<p>{{i18n "explorer.no_query_selected"}} <a {{action "showCreate"}}>{{i18n "explorer.no_query_selected_hook"}}</a></p>
{{else}}
{{#unless selectedItem.fake}}
<div class="query-edit {{if editName "editing"}}">
{{#if selectedItem}}
{{#if editing}}
@ -124,7 +120,7 @@
</form>
<hr>
{{/if}}
{{/unless}}
{{conditional-loading-spinner condition=loading}}
{{#unless selectedItem.fake}}
{{#if results}}
@ -199,8 +195,6 @@
<div class="explorer-pad-bottom"></div>
{{else}}
<p>{{i18n "explorer.no_queries"}} <a {{action "showCreate"}}>{{i18n "explorer.no_queries_hook"}}</a></p>
{{/if}}
{{/if}}
{{/explorer-container}}

View File

@ -236,8 +236,11 @@
.query-list {
display: flex;
.combo-box,
button {
.btn-left {
margin-right: 0.5em;
}
.btn-right {
margin-left: auto;
margin-right: 0.5em;
}
li.none {

View File

@ -61,8 +61,4 @@ en:
explain_label: "Include query plan?"
save_params: "Set Defaults"
reset_params: "Reset"
no_queries: "There are no queries. Why not "
no_queries_hook: "create one?"
menu_none: "Select a query"
no_query_selected: "No query selected. Would you like to "
no_query_selected_hook: "create one?"