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

This commit is contained in:
James Cole
2020-09-30 17:28:31 +02:00
6 changed files with 14 additions and 14 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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