pgadmin-org
/
pgadmin4
mirror of https://github.com/pgadmin-org/pgadmin4.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix query tool button/menu inconsistencies. Fixes #1461

pull/3/head
Akshay Joshi 2016-08-09 16:23:24 +01:00 committed by Dave Page
parent 81e2bc1e80
commit 035066bd41
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
web/pgadmin/tools/datagrid/templates/datagrid/index.html
View File

@ -70,9 +70,10 @@
</button> </button>
<ul class="dropdown-menu dropdown-menu-right"> <ul class="dropdown-menu dropdown-menu-right">
<li> <li>
<a id="btn-remove-filter" href="#">{{ _('Remove') }}</a> <a id="btn-filter-menu" href="#">{{ _('Filter') }}</a>
<a id="btn-include-filter" href="#">{{ _('By selection') }}</a> <a id="btn-remove-filter" href="#">{{ _('Remove Filter') }}</a>
<a id="btn-exclude-filter" href="#">{{ _('Exclude selection') }}</a> <a id="btn-include-filter" href="#">{{ _('By Selection') }}</a>
<a id="btn-exclude-filter" href="#">{{ _('Exclude Selection') }}</a>
</li> </li>
</ul> </ul>
</div> </div>
@ -94,6 +95,11 @@
<span class="caret"></span> <span class="sr-only">Toggle Dropdown</span> <span class="caret"></span> <span class="sr-only">Toggle Dropdown</span>
</button> </button>
<ul class="dropdown-menu dropdown-menu"> <ul class="dropdown-menu dropdown-menu">
<li>
<a id="btn-flash-menu" href="#">
<span>{{ _('Execute/Refresh (F5)') }}</span>
</a>
</li>
<li> <li>
<a id="btn-explain" href="#"> <a id="btn-explain" href="#">
<span>{{ _('Explain (F7)') }}</span> <span>{{ _('Explain (F7)') }}</span>
@ -101,7 +107,7 @@
</li> </li>
<li> <li>
<a id="btn-explain-analyze" href="#"> <a id="btn-explain-analyze" href="#">
<span>{{ _('Explain analyze (Shift+F7)') }}</span> <span>{{ _('Explain Analyze (Shift+F7)') }}</span>
</a> </a>
</li> </li>
<li class="divider"></li> <li class="divider"></li>
@ -154,7 +160,7 @@
</button> </button>
</div> </div>
<div class="btn-group" role="group" aria-label=""> <div class="btn-group" role="group" aria-label="">
<button id="btn-edit" type="button" class="btn btn-default" title="{{ _('Edit') }}"> <button id="btn-edit" type="button" class="btn btn-default" title="{{ _('Clear query window') }}">
<i class="fa fa-pencil-square-o" aria-hidden="true"></i> <i class="fa fa-pencil-square-o" aria-hidden="true"></i>
</button> </button>
<button id="btn-edit-dropdown" type="button" class="btn btn-default dropdown-toggle" <button id="btn-edit-dropdown" type="button" class="btn btn-default dropdown-toggle"
@ -165,11 +171,11 @@
<li> <li>
<a id="btn-clear" href="#"> <a id="btn-clear" href="#">
<i class="fa fa-eraser" aria-hidden="true"></i> <i class="fa fa-eraser" aria-hidden="true"></i>
<span> {{ _('Clear query window') }} </span> <span> {{ _('Clear Query Window') }} </span>
</a> </a>
<a id="btn-clear-history" href="#"> <a id="btn-clear-history" href="#">
<i class="fa fa-eraser" aria-hidden="true"></i> <i class="fa fa-eraser" aria-hidden="true"></i>
<span> {{ _('Clear history') }} </span> <span> {{ _('Clear History') }} </span>
</a> </a>
</li> </li>
</ul> </ul>

3
web/pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js
View File

@ -161,6 +161,7 @@ define(
"click #btn-file-menu-save-as": "on_save_as", "click #btn-file-menu-save-as": "on_save_as",
"click #btn-add-row": "on_add", "click #btn-add-row": "on_add",
"click #btn-filter": "on_show_filter", "click #btn-filter": "on_show_filter",
"click #btn-filter-menu": "on_show_filter",
"click #btn-include-filter": "on_include_filter", "click #btn-include-filter": "on_include_filter",
"click #btn-exclude-filter": "on_exclude_filter", "click #btn-exclude-filter": "on_exclude_filter",
"click #btn-remove-filter": "on_remove_filter", "click #btn-remove-filter": "on_remove_filter",
@ -169,8 +170,10 @@ define(
"click #btn-copy-row": "on_copy_row", "click #btn-copy-row": "on_copy_row",
"click #btn-paste-row": "on_paste_row", "click #btn-paste-row": "on_paste_row",
"click #btn-flash": "on_flash", "click #btn-flash": "on_flash",
"click #btn-flash-menu": "on_flash",
"click #btn-cancel-query": "on_cancel_query", "click #btn-cancel-query": "on_cancel_query",
"click #btn-download": "on_download", "click #btn-download": "on_download",
"click #btn-edit": "on_clear",
"click #btn-clear": "on_clear", "click #btn-clear": "on_clear",
"click #btn-auto-commit": "on_auto_commit", "click #btn-auto-commit": "on_auto_commit",
"click #btn-auto-rollback": "on_auto_rollback", "click #btn-auto-rollback": "on_auto_rollback",