kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-05-03 20:56:21 +00:00
Code Issues Projects Releases Wiki Activity

Fix pagination of account lists for issue #1040

Browse Source
This commit is contained in:
James Cole
2017-12-21 21:18:30 +01:00
parent 4b869f0d9e
commit b0ecdfe01d
12 changed files with 45 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
resources/views/accounts/index.twig
View File

@@ -32,7 +32,8 @@
</div>
</div>
</div>
{% else %}
{% endif %}
{% if accounts.count == 0 and page == 0 %}
{% include 'partials.empty' with {what: what, type: 'accounts',route: route('accounts.create', [what])} %}
{% endif %}
{% endblock %}

8
resources/views/list/accounts.twig
View File

@@ -1,3 +1,6 @@
<div style="padding-left:8px;">
{{ accounts.render|raw }}
</div>
<table class="table table-hover sortable">
<thead>
<tr>
@@ -11,7 +14,7 @@
<th class="hidden-sm hidden-xs">{{ trans('list.active') }}</th>
<th data-defaultsign="month" class="hidden-sm hidden-xs hidden-md">{{ trans('list.lastActivity') }}</th>
<th data-defaultsign="_19" style="width:15%;"
class="hidden-sm hidden-xs hidden-md">{{ trans('list.balanceDiff', {'start' : Session.get('start').formatLocalized(monthAndDayFormat),'end' : Session.get('end').formatLocalized(monthAndDayFormat)}) }}</th>
class="hidden-sm hidden-xs hidden-md">{{ trans('list.balanceDiff') }}</th>
</tr>
</thead>
<tbody>
@@ -63,3 +66,6 @@
{% endfor %}
</tbody>
</table>
<div style="padding-left:8px;">
{{ accounts.render|raw }}
</div>

6
resources/views/preferences/index.twig
View File

@@ -245,9 +245,9 @@
<!-- layout settings column B -->
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
<div class="preferences-box">
<h3>{{ 'transaction_page_size_title'|_ }}</h3>
<p class="text-info">{{ 'transaction_page_size_help'|_ }}</p>
{{ ExpandedForm.integer('transactionPageSize',transactionPageSize,{'label' : 'transaction_page_size_label'|_}) }}
<h3>{{ 'list_page_size_title'|_ }}</h3>
<p class="text-info">{{ 'list_page_size_help'|_ }}</p>
{{ ExpandedForm.integer('listPageSize',listPageSize,{'label' : 'list_page_size_label'|_}) }}
</div>
</div>
</div>