diff options
author | Belen Barros Pena <belen.barros.pena@intel.com> | 2015-01-26 15:37:30 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-01-29 22:11:34 +0000 |
commit | d4b9b0f416a78478e732288b3832dbce2533da18 (patch) | |
tree | d6539dc4c4e647442aa1c9e65f8725b6b4cbb229 /bitbake | |
parent | c748c7e68ac5089ce52f85ce49b1c2e180bc103a (diff) | |
download | poky-d4b9b0f416a78478e732288b3832dbce2533da18.tar.gz |
bitbake: toastergui: add 'show all' link to no results page
When you search for targets or machines in the layer details
page and your search returns no results, you should
see a 'show all' link that you can click to clear the
search and display all table entries.
[YOCTO #7218]
(Bitbake rev: 70486fc36c5b6bd6b7b8e846e23ad4062d583877)
Signed-off-by: Belen Barros Pena <belen.barros.pena@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r-- | bitbake/lib/toaster/toastergui/static/js/layerdetails.js | 4 | ||||
-rw-r--r-- | bitbake/lib/toaster/toastergui/templates/layerdetails.html | 10 |
2 files changed, 10 insertions, 4 deletions
diff --git a/bitbake/lib/toaster/toastergui/static/js/layerdetails.js b/bitbake/lib/toaster/toastergui/static/js/layerdetails.js index 2addecd357..2793225d0c 100644 --- a/bitbake/lib/toaster/toastergui/static/js/layerdetails.js +++ b/bitbake/lib/toaster/toastergui/static/js/layerdetails.js | |||
@@ -381,12 +381,12 @@ function layerDetailsPageInit (ctx) { | |||
381 | }); | 381 | }); |
382 | 382 | ||
383 | /* Clear the current search selection and reload the results */ | 383 | /* Clear the current search selection and reload the results */ |
384 | $("#target-search-clear").click(function(){ | 384 | $(".target-search-clear").click(function(){ |
385 | $("#target-search").val(""); | 385 | $("#target-search").val(""); |
386 | $(this).parents("form").submit(); | 386 | $(this).parents("form").submit(); |
387 | }); | 387 | }); |
388 | 388 | ||
389 | $("#machine-search-clear").click(function(){ | 389 | $(".machine-search-clear").click(function(){ |
390 | $("#machine-search").val(""); | 390 | $("#machine-search").val(""); |
391 | $(this).parents("form").submit(); | 391 | $(this).parents("form").submit(); |
392 | }); | 392 | }); |
diff --git a/bitbake/lib/toaster/toastergui/templates/layerdetails.html b/bitbake/lib/toaster/toastergui/templates/layerdetails.html index a89ffb0312..f8f2d7ab87 100644 --- a/bitbake/lib/toaster/toastergui/templates/layerdetails.html +++ b/bitbake/lib/toaster/toastergui/templates/layerdetails.html | |||
@@ -205,11 +205,14 @@ | |||
205 | 205 | ||
206 | <input type="text" id="target-search" name="targets_search" placeholder="Search targets" class="input-xlarge" value="{{request.GET.targets_search}}"> | 206 | <input type="text" id="target-search" name="targets_search" placeholder="Search targets" class="input-xlarge" value="{{request.GET.targets_search}}"> |
207 | {% if request.GET.targets_search %} | 207 | {% if request.GET.targets_search %} |
208 | <a class="add-on btn" id="target-search-clear"> | 208 | <a class="add-on btn target-search-clear"> |
209 | <i class="icon-remove"></i> | 209 | <i class="icon-remove"></i> |
210 | </a> | 210 | </a> |
211 | {% endif %} | 211 | {% endif %} |
212 | <button type="submit" class="btn">Search</button> | 212 | <button type="submit" class="btn">Search</button> |
213 | {% if targets.paginator.count == 0 %} | ||
214 | <button type="submit" class="btn btn-link target-search-clear">Show all targets</a> | ||
215 | {% endif %} | ||
213 | </form> | 216 | </form> |
214 | {% endif %} | 217 | {% endif %} |
215 | 218 | ||
@@ -332,11 +335,14 @@ | |||
332 | 335 | ||
333 | <input type="text" id="machine-search" name="machines_search" placeholder="Search machines" class="input-xlarge" value="{{request.GET.machines_search}}"> | 336 | <input type="text" id="machine-search" name="machines_search" placeholder="Search machines" class="input-xlarge" value="{{request.GET.machines_search}}"> |
334 | {% if request.GET.machines_search %} | 337 | {% if request.GET.machines_search %} |
335 | <a class="add-on btn" id="machine-search-clear"> | 338 | <a class="add-on btn machine-search-clear"> |
336 | <i class="icon-remove"></i> | 339 | <i class="icon-remove"></i> |
337 | </a> | 340 | </a> |
338 | {% endif %} | 341 | {% endif %} |
339 | <button type="submit" class="btn">Search</button> | 342 | <button type="submit" class="btn">Search</button> |
343 | {% if machines.paginator.count == 0 %} | ||
344 | <button type="submit" class="btn btn-link machine-search-clear">Show all machines</a> | ||
345 | {% endif %} | ||
340 | </form> | 346 | </form> |
341 | {% endif %} | 347 | {% endif %} |
342 | 348 | ||