diff options
Diffstat (limited to 'bitbake/lib/toaster/toastergui/templates')
4 files changed, 2 insertions, 18 deletions
diff --git a/bitbake/lib/toaster/toastergui/templates/basetable_bottom.html b/bitbake/lib/toaster/toastergui/templates/basetable_bottom.html index d48ad92020..4c28cae810 100644 --- a/bitbake/lib/toaster/toastergui/templates/basetable_bottom.html +++ b/bitbake/lib/toaster/toastergui/templates/basetable_bottom.html | |||
@@ -60,8 +60,6 @@ | |||
60 | // load cookie for number of entries to be displayed on page | 60 | // load cookie for number of entries to be displayed on page |
61 | if ({{request.GET.count}} != "") { | 61 | if ({{request.GET.count}} != "") { |
62 | pagesize = {{request.GET.count}}; | 62 | pagesize = {{request.GET.count}}; |
63 | } else { | ||
64 | pagesize = $.cookie('_count'); | ||
65 | } | 63 | } |
66 | 64 | ||
67 | $('.pagesize option').prop('selected', false) | 65 | $('.pagesize option').prop('selected', false) |
@@ -84,8 +82,6 @@ | |||
84 | $('.progress, .lead span').tooltip({container:'table', placement:'top'}); | 82 | $('.progress, .lead span').tooltip({container:'table', placement:'top'}); |
85 | 83 | ||
86 | $(".pagesize").change(function () { | 84 | $(".pagesize").change(function () { |
87 | // save cookie with pagesize | ||
88 | $.cookie("_count", $(this).val(), { path : $(location).attr('pathname') }); | ||
89 | reload_params({"count":$(this).val()}); | 85 | reload_params({"count":$(this).val()}); |
90 | }); | 86 | }); |
91 | }); | 87 | }); |
diff --git a/bitbake/lib/toaster/toastergui/templates/basetable_top.html b/bitbake/lib/toaster/toastergui/templates/basetable_top.html index 92a3b50801..fcd2f036ec 100644 --- a/bitbake/lib/toaster/toastergui/templates/basetable_top.html +++ b/bitbake/lib/toaster/toastergui/templates/basetable_top.html | |||
@@ -156,13 +156,6 @@ | |||
156 | showhideImmediateTableAction( clname, sh, orderkey ); | 156 | showhideImmediateTableAction( clname, sh, orderkey ); |
157 | } | 157 | } |
158 | 158 | ||
159 | // | ||
160 | // saves a cookie with selected order field | ||
161 | // | ||
162 | function saveOrderCookie( orderfield ) { | ||
163 | $.cookie("orderby", orderfield, { path: $(location).attr('pathname') }); | ||
164 | } | ||
165 | |||
166 | </script> | 159 | </script> |
167 | 160 | ||
168 | <!-- control header --> | 161 | <!-- control header --> |
@@ -230,7 +223,7 @@ | |||
230 | <tr> | 223 | <tr> |
231 | {% for tc in tablecols %}<th class="{{tc.dclass}} {{tc.clclass}}"> | 224 | {% for tc in tablecols %}<th class="{{tc.dclass}} {{tc.clclass}}"> |
232 | {%if tc.qhelp%}<i class="icon-question-sign get-help" title="{{tc.qhelp}}"></i>{%endif%} | 225 | {%if tc.qhelp%}<i class="icon-question-sign get-help" title="{{tc.qhelp}}"></i>{%endif%} |
233 | {%if tc.orderfield%}<a {%if tc.ordericon%} class="sorted" {%endif%}href="javascript:reload_params({'page': 1, 'orderby' : '{{tc.orderfield}}' })" onclick="saveOrderCookie('{{tc.orderfield}}')">{{tc.name}}</a>{%else%}<span class="muted">{{tc.name}}</span>{%endif%} | 226 | {%if tc.orderfield%}<a {%if tc.ordericon%} class="sorted" {%endif%}href="javascript:reload_params({'page': 1, 'orderby' : '{{tc.orderfield}}' })">{{tc.name}}</a>{%else%}<span class="muted">{{tc.name}}</span>{%endif%} |
234 | {%if tc.ordericon%} <i class="icon-caret-{{tc.ordericon}}"></i>{%endif%} | 227 | {%if tc.ordericon%} <i class="icon-caret-{{tc.ordericon}}"></i>{%endif%} |
235 | {%if tc.filter%}<div class="btn-group pull-right"> | 228 | {%if tc.filter%}<div class="btn-group pull-right"> |
236 | <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 and tc.filter.options|filtered_tooltip:request.GET.filter %} title="<p>{{tc.filter.options|filtered_tooltip:request.GET.filter}}</p><p><a class='btn btn-small btn-primary' href=javascript:reload_params({'filter':''})>Show all {% if filter_search_display %}{{filter_search_display}}{% else %}{{objectname}}{% endif %}</a></p>" {%endif%} data-toggle="modal"> <i class="icon-filter filtered"></i> </a> | 229 | <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 and tc.filter.options|filtered_tooltip:request.GET.filter %} title="<p>{{tc.filter.options|filtered_tooltip:request.GET.filter}}</p><p><a class='btn btn-small btn-primary' href=javascript:reload_params({'filter':''})>Show all {% if filter_search_display %}{{filter_search_display}}{% else %}{{objectname}}{% endif %}</a></p>" {%endif%} data-toggle="modal"> <i class="icon-filter filtered"></i> </a> |
diff --git a/bitbake/lib/toaster/toastergui/templates/detail_pagination_bottom.html b/bitbake/lib/toaster/toastergui/templates/detail_pagination_bottom.html index 355ae9073c..434facba93 100644 --- a/bitbake/lib/toaster/toastergui/templates/detail_pagination_bottom.html +++ b/bitbake/lib/toaster/toastergui/templates/detail_pagination_bottom.html | |||
@@ -41,17 +41,12 @@ | |||
41 | // load cookie for number of entries to be displayed on page | 41 | // load cookie for number of entries to be displayed on page |
42 | if ({{request.GET.count}} != "") { | 42 | if ({{request.GET.count}} != "") { |
43 | pagesize = {{request.GET.count}}; | 43 | pagesize = {{request.GET.count}}; |
44 | } else { | ||
45 | pagesize = $.cookie('_count'); | ||
46 | } | 44 | } |
47 | |||
48 | $('.pagesize option').prop('selected', false) | 45 | $('.pagesize option').prop('selected', false) |
49 | .filter('[value="' + pagesize + '"]') | 46 | .filter('[value="' + pagesize + '"]') |
50 | .attr('selected', true); | 47 | .attr('selected', true); |
51 | 48 | ||
52 | $(".pagesize").change(function () { | 49 | $(".pagesize").change(function () { |
53 | // save cookie with pagesize | ||
54 | $.cookie("_count", $(this).val(), { path : $(location).attr('pathname') }); | ||
55 | reload_params({"count":$(this).val()}); | 50 | reload_params({"count":$(this).val()}); |
56 | }); | 51 | }); |
57 | }); | 52 | }); |
diff --git a/bitbake/lib/toaster/toastergui/templates/detail_sorted_header.html b/bitbake/lib/toaster/toastergui/templates/detail_sorted_header.html index a7917dcf5a..5214444ee0 100644 --- a/bitbake/lib/toaster/toastergui/templates/detail_sorted_header.html +++ b/bitbake/lib/toaster/toastergui/templates/detail_sorted_header.html | |||
@@ -11,7 +11,7 @@ | |||
11 | <tr> | 11 | <tr> |
12 | {% for tc in tablecols %}<th class="{{tc.dclass}} {{tc.clclass}}"> | 12 | {% for tc in tablecols %}<th class="{{tc.dclass}} {{tc.clclass}}"> |
13 | {%if tc.qhelp%}<i class="icon-question-sign get-help" title="{{tc.qhelp}}"></i>{%endif%} | 13 | {%if tc.qhelp%}<i class="icon-question-sign get-help" title="{{tc.qhelp}}"></i>{%endif%} |
14 | {%if tc.orderfield%}<a {%if tc.ordericon%} class="sorted" {%endif%}href="javascript:reload_params({'page': 1, 'orderby' : '{{tc.orderfield}}' })" onclick="saveOrderCookie('{{tc.orderfield}}')">{{tc.name}}</a>{%else%}<span class="muted">{{tc.name}}</span>{%endif%} | 14 | {%if tc.orderfield%}<a {%if tc.ordericon%} class="sorted" {%endif%}href="javascript:reload_params({'page': 1, 'orderby' : '{{tc.orderfield}}' })">{{tc.name}}</a>{%else%}<span class="muted">{{tc.name}}</span>{%endif%} |
15 | {%if tc.ordericon%} <i class="icon-caret-{{tc.ordericon}}"></i>{%endif%} | 15 | {%if tc.ordericon%} <i class="icon-caret-{{tc.ordericon}}"></i>{%endif%} |
16 | {% if request.GET.search and forloop.first %} | 16 | {% if request.GET.search and forloop.first %} |
17 | <span class="badge badge-info">{{objects.paginator.count}}</span> | 17 | <span class="badge badge-info">{{objects.paginator.count}}</span> |