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

Keep the box [skip ci]

Browse Source
This commit is contained in:
James Cole
2016-10-26 16:54:52 +02:00
parent fe3f015171
commit 7182909e28
5 changed files with 109 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
resources/views/reports/default/month.twig
View File

@@ -22,7 +22,14 @@
<div class="row"> <div class="row">
<div class="col-lg-6 col-md-6 col-sm-6 loading" id="accountReport"> <div class="col-lg-6 col-md-6 col-sm-6 loading" id="accountReport">
</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>
<div class="col-lg-3 col-md-3 col-sm-3 loading" id="expenseReport"> <div class="col-lg-3 col-md-3 col-sm-3 loading" id="expenseReport">
</div> </div>
@@ -39,8 +46,14 @@
<!-- budgets --> <!-- budgets -->
{% include 'reports/partials/budgets.twig' %} {% include 'reports/partials/budgets.twig' %}
</div> </div>
<div class="col-lg-4 col-md-4 col-sm-12 loading" id="categoryReport"> <div class="col-lg-4 col-md-4 col-sm-12">
{# {% include 'reports/partials/categories.twig' %} #} <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> </div>
<div class="row"> <div class="row">

9
resources/views/reports/default/multi-year.twig
View File

@@ -33,7 +33,14 @@
<div class="row"> <div class="row">
<div class="col-lg-6 col-md-6 col-sm-6 loading" id="accountReport"> <div class="col-lg-6 col-md-6 col-sm-6 loading" id="accountReport">
</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>
<div class="col-lg-3 col-md-3 col-sm-3 loading" id="expenseReport"> <div class="col-lg-3 col-md-3 col-sm-3 loading" id="expenseReport">
</div> </div>

9
resources/views/reports/default/year.twig
View File

@@ -36,7 +36,14 @@
<div class="loading" id="incomeVsExpenseReport"> <div class="loading" id="incomeVsExpenseReport">
</div> </div>
</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>
<div class="col-lg-3 col-md-3 col-sm-3 loading" id="expenseReport"> <div class="col-lg-3 col-md-3 col-sm-3 loading" id="expenseReport">
</div> </div>

85
resources/views/reports/partials/categories.twig
View File

@@ -1,48 +1,41 @@
<div class="box"> <table class="table table-hover">
<div class="box-header with-border"> <thead>
<h3 class="box-title">{{ 'categories'|_ }}</h3> <tr>
</div> <th>{{ 'category'|_ }}</th>
<div class="box-body table-responsive no-padding"> <th colspan="2">{{ 'spent'|_ }}</th>
<table class="table table-hover"> </tr>
<thead> </thead>
<tbody>
{% for cat in categories.getCategories %}
{% if loop.index > listLength %}
<tr class="overListLength">
{% else %}
<tr> <tr>
<th>{{ 'categories'|_ }}</th> {% endif %}
<th colspan="2">{{ 'spent'|_ }}</th> <td>
</tr> <a href="{{ route('categories.show',cat.id) }}">{{ cat.name }}</a>
</thead> </td>
<tbody> <td>{{ cat.spent|formatAmount }}</td>
{% for cat in categories.getCategories %} <td style="width:20px;">
{% if loop.index > listLength %} <i class="fa fa-fw fa-info-circle text-muted firefly-info-button"
<tr class="overListLength"> data-location="category-entry" data-category-id="{{ cat.id }}"
{% else %} ></i>
<tr> </td>
{% endif %} </tr>
<td> {% endfor %}
<a href="{{ route('categories.show',cat.id) }}">{{ cat.name }}</a> </tbody>
</td> <tfoot>
<td>{{ cat.spent|formatAmount }}</td> {% if categories.getCategories.count > expenseTopLength %}
<td style="width:20px;"> <tr>
<i class="fa fa-fw fa-info-circle text-muted firefly-info-button" <td colspan="2" class="active">
data-location="category-entry" data-category-id="{{ cat.id }}" <a href="#" class="listLengthTrigger">{{ trans('firefly.show_full_list',{number:incomeTopLength}) }}</a>
></i> </td>
</td> </tr>
</tr> {% endif %}
{% 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> <tr>
<td><em>{{ 'sum'|_ }}</em></td> <td><em>{{ 'sum'|_ }}</em></td>
<td>{{ categories.getTotal|formatAmount }}</td> <td>{{ categories.getTotal|formatAmount }}</td>
</tr> </tr>
</tfoot> </tfoot>
</table> </table>
</div>
</div>

83
resources/views/reports/partials/income.twig
View File

@@ -1,46 +1,39 @@
<div class="box"> <table class="table table-hover">
<div class="box-header with-border"> <tbody>
<h3 class="box-title">{{ 'income'|_ }}</h3> {% for income in incomes.getIncomes %}
</div> {% if loop.index > listLength %}
<div class="box-body table-responsive no-padding"> <tr class="overListLength">
<table class="table table-hover"> {% else %}
<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 %}
<tr> <tr>
<td><em>{{ 'sum'|_ }}</em></td> {% endif %}
<td>{{ incomes.getTotal|formatAmount }}</td> <td>
</tr> <a href="{{ route('accounts.show',income.id) }}" title="{{ income.name }}">{{ income.name }}</a>
</tfoot> {% if income.count > 1 %}
</table> <br/>
</div> <small>
</div> {{ 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>