diff options
author | Belen Barros <belen.barros.pena@intel.com> | 2014-02-03 15:35:47 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-02-17 15:38:52 +0000 |
commit | 4157c3849f1f8083b11ec3658b4f74b3e68dea2d (patch) | |
tree | ccfd3eb1fe13ef77a820229d250c7b9d23f5f160 /bitbake | |
parent | 985017af3dd73c58ff6fa6e6e7cc630e56ba9445 (diff) | |
download | poky-4157c3849f1f8083b11ec3658b4f74b3e68dea2d.tar.gz |
bitbake: toaster: Add clear filter button to filter tooltips
This patch modifies the basetable_top.html template to add
the 'Show all' button to the applied filter tooltip. It also
adds a delay in the tooltip dismissal in main.js to allow
users to click the button comfortably.
The patch does not add the functionality to the button (when
you click on it nothing happens). Someone else will need
to add that in.
(Bitbake rev: e39857162b5d91cc2f92843a9a14599bab369849)
Signed-off-by: Belen Barros <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/main.js | 2 | ||||
-rw-r--r-- | bitbake/lib/toaster/toastergui/templates/basetable_top.html | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/bitbake/lib/toaster/toastergui/static/js/main.js b/bitbake/lib/toaster/toastergui/static/js/main.js index 52e0084095..032584d4e2 100644 --- a/bitbake/lib/toaster/toastergui/static/js/main.js +++ b/bitbake/lib/toaster/toastergui/static/js/main.js | |||
@@ -20,7 +20,7 @@ $(document).ready(function() { | |||
20 | $('td > a.btn').popover({html:true, container:'body', placement:'left'}); | 20 | $('td > a.btn').popover({html:true, container:'body', placement:'left'}); |
21 | 21 | ||
22 | // enable tooltips for applied filters | 22 | // enable tooltips for applied filters |
23 | $('th a.btn-primary').tooltip({container:'body', html:true, placement:'bottom'}); | 23 | $('th a.btn-primary').tooltip({container:'body', html:true, placement:'bottom', delay:{hide:1500}}); |
24 | 24 | ||
25 | // enable help information tooltip | 25 | // enable help information tooltip |
26 | $(".get-help").tooltip({container:'body', html:true, delay:{show:300}}); | 26 | $(".get-help").tooltip({container:'body', html:true, delay:{show:300}}); |
diff --git a/bitbake/lib/toaster/toastergui/templates/basetable_top.html b/bitbake/lib/toaster/toastergui/templates/basetable_top.html index 67a1d103db..84c73a72e0 100644 --- a/bitbake/lib/toaster/toastergui/templates/basetable_top.html +++ b/bitbake/lib/toaster/toastergui/templates/basetable_top.html | |||
@@ -79,7 +79,7 @@ | |||
79 | {%if tc.orderfield%}<a {%if tc.ordericon%} class="sorted" {%endif%}href="javascript:reload_params({'orderby' : '{{tc.orderfield}}' })" >{{tc.name}}</a>{%else%}<span class="muted">{{tc.name}}</span>{%endif%} | 79 | {%if tc.orderfield%}<a {%if tc.ordericon%} class="sorted" {%endif%}href="javascript:reload_params({'orderby' : '{{tc.orderfield}}' })" >{{tc.name}}</a>{%else%}<span class="muted">{{tc.name}}</span>{%endif%} |
80 | {%if tc.ordericon%} <i class="icon-caret-{{tc.ordericon}}"></i>{%endif%} | 80 | {%if tc.ordericon%} <i class="icon-caret-{{tc.ordericon}}"></i>{%endif%} |
81 | {%if tc.filter%}<div class="btn-group pull-right"> | 81 | {%if tc.filter%}<div class="btn-group pull-right"> |
82 | <a href="#filter_{{tc.filter.class}}" role="button" class="btn btn-mini {%if request.GET.filter%}{{tc.filter.options|filtered_icon:request.GET.filter}} {%endif%}" {%if request.GET.filter%} title="{{tc.filter.options|filtered_tooltip:request.GET.filter}}"{%endif%} data-toggle="modal"> <i class="icon-filter filtered"></i> </a> | 82 | <a href="#filter_{{tc.filter.class}}" role="button" class="btn btn-mini {%if request.GET.filter%}{{tc.filter.options|filtered_icon:request.GET.filter}} {%endif%}" {%if request.GET.filter%} title="<p>{{tc.filter.options|filtered_tooltip:request.GET.filter}}</p><p><a class='btn btn-small btn-primary' href=''>Show all {{objectname}}</a></p>" {%endif%} data-toggle="modal"> <i class="icon-filter filtered"></i> </a> |
83 | </div>{%endif%} | 83 | </div>{%endif%} |
84 | </th>{% endfor %} | 84 | </th>{% endfor %} |
85 | </tr> | 85 | </tr> |