templates/rrs: Recipes and Maintainers UI search improvments

Display button without btn-info to give consistency in the UI.
Don't display clear search button when search isn't active.

Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
This commit is contained in:
Aníbal Limón 2015-02-23 07:55:23 +00:00 committed by Paul Eggleton
parent 6752c23362
commit b58c504ee9
2 changed files with 19 additions and 17 deletions

View File

@ -26,10 +26,10 @@
</ul> </ul>
<form id="form-search" class="pull-right input-append"> <form id="form-search" class="pull-right input-append">
<input type="text" class="input-xlarge" placeholder="Search maintainers" id="filter"> <input type="text" class="input-xlarge" placeholder="Search maintainers" id="filter">
<a class="add-on btn" id="clear-search-btn"> <a class="add-on btn" id="clear-search-btn" style="display:none">
<i class="icon-remove"></i> <i class="icon-remove"></i>
</a> </a>
<button type="submit" value="Search" class="btn btn-info" id="btn-search">Search</button> <button type="submit" value="Search" class="btn" id="btn-search">Search</button>
</form> </form>
</div> </div>
</div> </div>
@ -156,11 +156,13 @@ $(document).ready(function() {
search_text = $("#filter").val() search_text = $("#filter").val()
$.uiTableFilter(statisticsTable, search_text); $.uiTableFilter(statisticsTable, search_text);
updateMaintainerCount() updateMaintainerCount()
$("#clear-search-btn").show()
event.preventDefault(); event.preventDefault();
}); });
function clearSearch() { function clearSearch() {
$.uiTableFilter(statisticsTable, ''); $.uiTableFilter(statisticsTable, '');
$("#clear-search-btn").hide()
$("#filter").val('') $("#filter").val('')
updateMaintainerCount() updateMaintainerCount()
} }

View File

@ -58,10 +58,10 @@
<form id="form-search" class="pull-right input-append"> <form id="form-search" class="pull-right input-append">
<input type="text" class="input-xlarge" placeholder="Search all recipes" id="filter"/> <input type="text" class="input-xlarge" placeholder="Search all recipes" id="filter"/>
<a class="add-on btn" id="clear-search-btn"> <a class="add-on btn" style="display:none" id="clear-search-btn">
<i class="icon-remove"></i> <i class="icon-remove"></i>
</a> </a>
<button type="submit" value="Search" class="btn btn-info" id="btn-search">Search</button> <button type="submit" value="Search" class="btn" id="btn-search">Search</button>
</form> </form>
</div> </div>
</div> </div>
@ -245,39 +245,39 @@ $(document).ready(function() {
upstreamStatus = 'All' upstreamStatus = 'All'
maintainer = 'All' maintainer = 'All'
search_text = $("#filter").val() search_text = $("#filter").val()
$("#clear-search-btn").show()
applyFilters() applyFilters()
$.uiTableFilter(recipesTable, search_text); $.uiTableFilter(recipesTable, search_text);
updateRecipeCount() updateRecipeCount()
event.preventDefault(); event.preventDefault();
}); });
function clearSearch() {
$("#filter").val('')
$("#clear-search-btn").hide()
applyFilters()
updateRecipeCount()
}
$("#select-status a").click(function() { $("#select-status a").click(function() {
upstreamStatus = this.text upstreamStatus = this.text
applyFilters() clearSearch()
$("#filter").val('')
updateRecipeCount()
}); });
$("#select-maintainer a").click(function() { $("#select-maintainer a").click(function() {
maintainer = this.text maintainer = this.text
applyFilters() clearSearch()
$("#filter").val('')
updateRecipeCount()
}); });
function clearSearch() { $("#view-all-recipes").click(function() {
upstreamStatus = 'All' upstreamStatus = 'All'
maintainer = 'All' maintainer = 'All'
applyFilters()
$("#filter").val('')
updateRecipeCount()
}
$("#view-all-recipes").click(function() {
clearSearch() clearSearch()
}); });
$("#clear-search-btn").click(function() { $("#clear-search-btn").click(function() {
upstreamStatus = 'All'
maintainer = 'All'
clearSearch() clearSearch()
}); });