kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 15:35:15 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' of github.com:firefly-iii/firefly-iii into develop

Browse Source
This commit is contained in:
James Cole
2020-09-30 17:28:31 +02:00
parent 564a387505 116fc0c70f
commit f957d8aeb5
6 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
resources/views/v1/currencies/index.twig
View File

@@ -21,7 +21,7 @@
</p>
{% if currencies|length > 0 %}
<div style="padding-left:8px;">
{{ currencies.render|raw }}
{{ currencies.render()|raw }}
</div>
<table class="table table-hover">
<thead>
@@ -87,7 +87,7 @@
</tbody>
</table>
<div style="padding-left:8px;">
{{ currencies.render|raw }}
{{ currencies.render()|raw }}
</div>
{% endif %}
</div>

4
resources/views/v1/list/accounts.twig
View File

@@ -1,5 +1,5 @@
<div style="padding-left:8px;">
{{ accounts.render|raw }}
{{ accounts.render()|raw }}
</div>
<table class="table table-responsive table-hover" id="sortable-table">
<thead>
@@ -104,5 +104,5 @@
</tbody>
</table>
<div style="padding-left:8px;">
{{ accounts.render|raw }}
{{ accounts.render()|raw }}
</div>

4
resources/views/v1/list/bills.twig
View File

@@ -1,5 +1,5 @@
<div style="padding-left:8px;">
{{ paginator.render|raw }}
{{ paginator.render()|raw }}
</div>
<table class="table table-responsive table-hover" id="bill-sortable">
<thead>
@@ -167,5 +167,5 @@
</table>
<div style="padding-left:8px;">
{{ paginator.render|raw }}
{{ paginator.render()|raw }}
</div>

4
resources/views/v1/list/categories.twig
View File

@@ -1,5 +1,5 @@
<div style="padding-left:8px;">
{{ categories.render|raw }}
{{ categories.render()|raw }}
</div>
<table class="table table-hover sortable">
<thead>
@@ -43,5 +43,5 @@
</tbody>
</table>
<div style="padding-left:8px;">
{{ categories.render|raw }}
{{ categories.render()|raw }}
</div>

8
resources/views/v1/list/groups.twig
View File

@@ -6,9 +6,9 @@ TODO: hide and show columns
<thead>
<tr>
{% if showCategory or showBudget %}
<td colspan="7" class="no-margin-pagination">{{ groups.render|raw }}</td>
<td colspan="7" class="no-margin-pagination">{{ groups.render()|raw }}</td>
{% else %}
<td colspan="6" class="no-margin-pagination">{{ groups.render|raw }}</td>
<td colspan="6" class="no-margin-pagination">{{ groups.render()|raw }}</td>
{% endif %}
<td colspan="1" class="hidden-xs">
<!-- Single button -->
@@ -283,9 +283,9 @@ TODO: hide and show columns
</tr>
<tr>
{% if showCategory or showBudget %}
<td colspan="9" class="no-margin-pagination">{{ groups.render|raw }}</td>
<td colspan="9" class="no-margin-pagination">{{ groups.render()|raw }}</td>
{% else %}
<td colspan="8" class="no-margin-pagination">{{ groups.render|raw }}</td>
<td colspan="8" class="no-margin-pagination">{{ groups.render()|raw }}</td>
{% endif %}
</tr>
</tfoot>

4
resources/views/v1/recurring/index.twig
View File

@@ -32,7 +32,7 @@
<!-- list of recurring here -->
<div style="padding-left:8px;">
{{ paginator.render|raw }}
{{ paginator.render()|raw }}
</div>
<table class="table table-responsive table-hover sortable">
<thead>
@@ -140,7 +140,7 @@
</tbody>
</table>
<div style="padding-left:8px;">
{{ paginator.render|raw }}
{{ paginator.render()|raw }}
</div>
</div>
<div class="box-footer">