mirror of
https://github.com/firefly-iii/firefly-iii.git
synced 2025-01-02 12:17:22 -06:00
Keep the box [skip ci]
This commit is contained in:
James Cole
parent
fe3f015171
commit
7182909e28
@ -22,7 +22,14 @@
|
||||
<div class="row">
|
||||
<div class="col-lg-6 col-md-6 col-sm-6 loading" id="accountReport">
|
||||
</div>
|
||||
<div class="col-lg-3 col-md-3 col-sm-3 loading" id="incomeReport">
|
||||
<div class="col-lg-3 col-md-3 col-sm-3">
|
||||
<div class="box">
|
||||
<div class="box-header with-border">
|
||||
<h3 class="box-title">{{ 'income'|_ }}</h3>
|
||||
</div>
|
||||
<div class="box-body table-responsive no-padding loading" id="incomeReport">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-lg-3 col-md-3 col-sm-3 loading" id="expenseReport">
|
||||
</div>
|
||||
@ -39,8 +46,14 @@
|
||||
<!-- budgets -->
|
||||
{% include 'reports/partials/budgets.twig' %}
|
||||
</div>
|
||||
<div class="col-lg-4 col-md-4 col-sm-12 loading" id="categoryReport">
|
||||
{# {% include 'reports/partials/categories.twig' %} #}
|
||||
<div class="col-lg-4 col-md-4 col-sm-12">
|
||||
<div class="box">
|
||||
<div class="box-header with-border">
|
||||
<h3 class="box-title">{{ 'categories'|_ }}</h3>
|
||||
</div>
|
||||
<div class="box-body table-responsive no-padding loading" id="categoryReport">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
|
||||
@ -33,7 +33,14 @@
|
||||
<div class="row">
|
||||
<div class="col-lg-6 col-md-6 col-sm-6 loading" id="accountReport">
|
||||
</div>
|
||||
<div class="col-lg-3 col-md-3 col-sm-3 loading" id="incomeReport">
|
||||
<div class="col-lg-3 col-md-3 col-sm-3">
|
||||
<div class="box">
|
||||
<div class="box-header with-border">
|
||||
<h3 class="box-title">{{ 'income'|_ }}</h3>
|
||||
</div>
|
||||
<div class="box-body table-responsive no-padding loading" id="incomeReport">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-lg-3 col-md-3 col-sm-3 loading" id="expenseReport">
|
||||
</div>
|
||||
|
||||
@ -36,7 +36,14 @@
|
||||
<div class="loading" id="incomeVsExpenseReport">
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-lg-3 col-md-3 col-sm-3 loading" id="incomeReport">
|
||||
<div class="col-lg-3 col-md-3 col-sm-3">
|
||||
<div class="box">
|
||||
<div class="box-header with-border">
|
||||
<h3 class="box-title">{{ 'income'|_ }}</h3>
|
||||
</div>
|
||||
<div class="box-body table-responsive no-padding loading" id="incomeReport">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-lg-3 col-md-3 col-sm-3 loading" id="expenseReport">
|
||||
</div>
|
||||
|
||||
@ -1,48 +1,41 @@
|
||||
<div class="box">
|
||||
<div class="box-header with-border">
|
||||
<h3 class="box-title">{{ 'categories'|_ }}</h3>
|
||||
</div>
|
||||
<div class="box-body table-responsive no-padding">
|
||||
<table class="table table-hover">
|
||||
<thead>
|
||||
<table class="table table-hover">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>{{ 'category'|_ }}</th>
|
||||
<th colspan="2">{{ 'spent'|_ }}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{% for cat in categories.getCategories %}
|
||||
{% if loop.index > listLength %}
|
||||
<tr class="overListLength">
|
||||
{% else %}
|
||||
<tr>
|
||||
<th>{{ 'categories'|_ }}</th>
|
||||
<th colspan="2">{{ 'spent'|_ }}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{% for cat in categories.getCategories %}
|
||||
{% if loop.index > listLength %}
|
||||
<tr class="overListLength">
|
||||
{% else %}
|
||||
<tr>
|
||||
{% endif %}
|
||||
<td>
|
||||
<a href="{{ route('categories.show',cat.id) }}">{{ cat.name }}</a>
|
||||
</td>
|
||||
<td>{{ cat.spent|formatAmount }}</td>
|
||||
<td style="width:20px;">
|
||||
<i class="fa fa-fw fa-info-circle text-muted firefly-info-button"
|
||||
data-location="category-entry" data-category-id="{{ cat.id }}"
|
||||
></i>
|
||||
</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
<tfoot>
|
||||
{% if categories.getCategories.count > expenseTopLength %}
|
||||
<tr>
|
||||
<td colspan="2" class="active">
|
||||
<a href="#" class="listLengthTrigger">{{ trans('firefly.show_full_list',{number:incomeTopLength}) }}</a>
|
||||
</td>
|
||||
</tr>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
<td>
|
||||
<a href="{{ route('categories.show',cat.id) }}">{{ cat.name }}</a>
|
||||
</td>
|
||||
<td>{{ cat.spent|formatAmount }}</td>
|
||||
<td style="width:20px;">
|
||||
<i class="fa fa-fw fa-info-circle text-muted firefly-info-button"
|
||||
data-location="category-entry" data-category-id="{{ cat.id }}"
|
||||
></i>
|
||||
</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
<tfoot>
|
||||
{% if categories.getCategories.count > expenseTopLength %}
|
||||
<tr>
|
||||
<td colspan="2" class="active">
|
||||
<a href="#" class="listLengthTrigger">{{ trans('firefly.show_full_list',{number:incomeTopLength}) }}</a>
|
||||
</td>
|
||||
</tr>
|
||||
{% endif %}
|
||||
|
||||
<tr>
|
||||
<td><em>{{ 'sum'|_ }}</em></td>
|
||||
<td>{{ categories.getTotal|formatAmount }}</td>
|
||||
</tr>
|
||||
</tfoot>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
<tr>
|
||||
<td><em>{{ 'sum'|_ }}</em></td>
|
||||
<td>{{ categories.getTotal|formatAmount }}</td>
|
||||
</tr>
|
||||
</tfoot>
|
||||
</table>
|
||||
|
||||
@ -1,46 +1,39 @@
|
||||
<div class="box">
|
||||
<div class="box-header with-border">
|
||||
<h3 class="box-title">{{ 'income'|_ }}</h3>
|
||||
</div>
|
||||
<div class="box-body table-responsive no-padding">
|
||||
<table class="table table-hover">
|
||||
<tbody>
|
||||
{% for income in incomes.getIncomes %}
|
||||
{% if loop.index > listLength %}
|
||||
<tr class="overListLength">
|
||||
{% else %}
|
||||
<tr>
|
||||
{% endif %}
|
||||
<td>
|
||||
<a href="{{ route('accounts.show',income.id) }}" title="{{ income.name }}">{{ income.name }}</a>
|
||||
{% if income.count > 1 %}
|
||||
<br/>
|
||||
<small>
|
||||
{{ income.count }} {{ 'transactions'|_|lower }}
|
||||
<i class="fa fa-fw text-muted fa-info-circle firefly-info-button" data-location="income-entry"
|
||||
data-account-id="{{ income.id }}"></i>
|
||||
</small>
|
||||
|
||||
{% endif %}
|
||||
</td>
|
||||
|
||||
<td>{{ income.amount|formatAmount }}</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
<tfoot>
|
||||
{% if incomes.getIncomes|length > listLength %}
|
||||
<tr>
|
||||
<td colspan="2" class="active">
|
||||
<a href="#" class="listLengthTrigger">{{ trans('firefly.show_full_list',{ number:listLength } ) }}</a>
|
||||
</td>
|
||||
</tr>
|
||||
{% endif %}
|
||||
<table class="table table-hover">
|
||||
<tbody>
|
||||
{% for income in incomes.getIncomes %}
|
||||
{% if loop.index > listLength %}
|
||||
<tr class="overListLength">
|
||||
{% else %}
|
||||
<tr>
|
||||
<td><em>{{ 'sum'|_ }}</em></td>
|
||||
<td>{{ incomes.getTotal|formatAmount }}</td>
|
||||
</tr>
|
||||
</tfoot>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
{% endif %}
|
||||
<td>
|
||||
<a href="{{ route('accounts.show',income.id) }}" title="{{ income.name }}">{{ income.name }}</a>
|
||||
{% if income.count > 1 %}
|
||||
<br/>
|
||||
<small>
|
||||
{{ income.count }} {{ 'transactions'|_|lower }}
|
||||
<i class="fa fa-fw text-muted fa-info-circle firefly-info-button" data-location="income-entry"
|
||||
data-account-id="{{ income.id }}"></i>
|
||||
</small>
|
||||
|
||||
{% endif %}
|
||||
</td>
|
||||
|
||||
<td>{{ income.amount|formatAmount }}</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
<tfoot>
|
||||
{% if incomes.getIncomes|length > listLength %}
|
||||
<tr>
|
||||
<td colspan="2" class="active">
|
||||
<a href="#" class="listLengthTrigger">{{ trans('firefly.show_full_list',{ number:listLength } ) }}</a>
|
||||
</td>
|
||||
</tr>
|
||||
{% endif %}
|
||||
<tr>
|
||||
<td><em>{{ 'sum'|_ }}</em></td>
|
||||
<td>{{ incomes.getTotal|formatAmount }}</td>
|
||||
</tr>
|
||||
</tfoot>
|
||||
</table>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user