diff options
author | Ravi Chintakunta <ravi.chintakunta@timesys.com> | 2014-01-10 16:36:40 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-01-27 21:01:05 +0000 |
commit | 87776ca32eeede85086c31ae4036d8e1de7fe1e1 (patch) | |
tree | d445c43a80b147fce323d0b8903aeebb6748ff0b /bitbake | |
parent | 4acdf8aaf1bb0a6d81c052a236ed04b45e4d8c3e (diff) | |
download | poky-87776ca32eeede85086c31ae4036d8e1de7fe1e1.tar.gz |
bitbake: toaster: Base table fixes for header text, sort icon and filter icon
- Display the table column header as a link only if it is sortable.
Non-sortable column headers are displayed as plain text.
- Display the sort order by an up / down arrow icon next to the
column header
- Add style for header in default.css
- Set tooltip for the active filter icon
- Pass the view name to the filter dialog
(Bitbake rev: 53ede15926d45b555252d77919a0568a984c6d74)
Signed-off-by: Ravi Chintakunta <ravi.chintakunta@timesys.com>
Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
3 files changed, 5 insertions, 3 deletions
diff --git a/bitbake/lib/toaster/toastergui/static/css/default.css b/bitbake/lib/toaster/toastergui/static/css/default.css index 53c50043bc..fe3881eea1 100644 --- a/bitbake/lib/toaster/toastergui/static/css/default.css +++ b/bitbake/lib/toaster/toastergui/static/css/default.css | |||
@@ -175,3 +175,4 @@ dd p {line-height:20px;} | |||
175 | 175 | ||
176 | 176 | ||
177 | .no-results { margin: 10px 0 0; } | 177 | .no-results { margin: 10px 0 0; } |
178 | th > a, th > span { font-weight: normal; color:#333333;} | ||
diff --git a/bitbake/lib/toaster/toastergui/templates/basetable_bottom.html b/bitbake/lib/toaster/toastergui/templates/basetable_bottom.html index 8f81472723..abce7c24b7 100644 --- a/bitbake/lib/toaster/toastergui/templates/basetable_bottom.html +++ b/bitbake/lib/toaster/toastergui/templates/basetable_bottom.html | |||
@@ -76,7 +76,7 @@ | |||
76 | </script> | 76 | </script> |
77 | 77 | ||
78 | <!-- modal filter boxes --> | 78 | <!-- modal filter boxes --> |
79 | {% for tc in tablecols %}{% if tc.filter %}{% with f=tc.filter %} | 79 | {% for tc in tablecols %}{% if tc.filter %}{% with objectname=objectname f=tc.filter %} |
80 | {% include "filtersnippet.html" %} | 80 | {% include "filtersnippet.html" %} |
81 | {% endwith %}{% endif %} {% endfor %} | 81 | {% endwith %}{% endif %} {% endfor %} |
82 | <!-- end modals --> | 82 | <!-- end modals --> |
diff --git a/bitbake/lib/toaster/toastergui/templates/basetable_top.html b/bitbake/lib/toaster/toastergui/templates/basetable_top.html index b8d5c382c7..7b3017affb 100644 --- a/bitbake/lib/toaster/toastergui/templates/basetable_top.html +++ b/bitbake/lib/toaster/toastergui/templates/basetable_top.html | |||
@@ -75,9 +75,10 @@ | |||
75 | <tr> | 75 | <tr> |
76 | {% for tc in tablecols %}<th class="{{tc.dclass}} {{tc.clclass}}"> | 76 | {% for tc in tablecols %}<th class="{{tc.dclass}} {{tc.clclass}}"> |
77 | {%if tc.qhelp%}<i class="icon-question-sign get-help" data-toggle="tooltip" title="{{tc.qhelp}}"></i>{%endif%} | 77 | {%if tc.qhelp%}<i class="icon-question-sign get-help" data-toggle="tooltip" title="{{tc.qhelp}}"></i>{%endif%} |
78 | <a href="javascript:reload_params({'orderby' : '{{tc.orderfield}}' })" style="font-weight:normal;">{{tc.name}}</a> | 78 | {%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.ordericon%} <i class="icon-caret-{{tc.ordericon}}"></i>{%endif%} | ||
79 | {%if tc.filter%}<div class="btn-group pull-right"> | 80 | {%if tc.filter%}<div class="btn-group pull-right"> |
80 | <a href="#filter_{{tc.filter.class}}" role="button" class="btn btn-mini{%if request.GET.filter in tc.filter.options.values%} btn-primary{%endif%}" data-toggle="modal"> <i class="icon-filter filtered"></i> </a> | 81 | <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> |
81 | </div>{%endif%} | 82 | </div>{%endif%} |
82 | </th>{% endfor %} | 83 | </th>{% endfor %} |
83 | </tr> | 84 | </tr> |