Merge branch 'feature/ChangeUITextSearchToFilter' into develop

This commit is contained in:
JackDandy 2018-10-03 03:32:19 +01:00
commit 9f07cf1fd2
2 changed files with 3 additions and 2 deletions

View file

@ -28,6 +28,7 @@
* Change feedback result of manual search on the clicked button image/tooltip * Change feedback result of manual search on the clicked button image/tooltip
* Change reduce browser I/O on displayShow * Change reduce browser I/O on displayShow
* Fix displayShow bug where click holding on a season btn and then dragging away leaves 50% white * Fix displayShow bug where click holding on a season btn and then dragging away leaves 50% white
* Change Show List text "Search Show Name" to "Filter Show Name", and "Reset Search" to "Reset Filter" for clarity
[develop changelog] [develop changelog]

View file

@ -77,8 +77,8 @@
</div> </div>
#end if #end if
<div class="pull-right" style="clear:right"> <div class="pull-right" style="clear:right">
<input id="search_show_name" class="search form-control form-control-inline input-sm input200" type="search" data-column="1" placeholder="Search Show Name" tabindex="$tab#set $tab += 1#"> <input id="search_show_name" class="search form-control form-control-inline input-sm input200" type="search" data-column="1" placeholder="Filter Show Name" tabindex="$tab#set $tab += 1#">
&nbsp;<button type="button" class="resetshows btn btn-inline" tabindex="$tab#set $tab += 1#">Reset Search</button> &nbsp;<button type="button" class="resetshows btn btn-inline" tabindex="$tab#set $tab += 1#">Reset Filter</button>
</div> </div>
</div><!-- /HomeLayout --> </div><!-- /HomeLayout -->
## ##