IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Start of some changes in budget overview related to #256 and #246

Browse Source
This commit is contained in:
James Cole 2016-04-25 09:49:34 +02:00
parent 950576d38b
commit ec70fde557
1 changed files with 36 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
resources/views/budgets/index.twig
View File

@ -99,10 +99,10 @@
</div> </div>
</div> </div>
<p>Bla bla bla</p>
<div class="row"> <div class="row">
{% for budget in budgets %} {% for budget in budgets %}
<div class="col-lg-3 col-sm-4 col-md-6" style="height:180px;"> <div class="col-lg-4 col-sm-6 col-md-6">
<div class="box"> <div class="box">
<div class="box-header with-border"> <div class="box-header with-border">
<h3 class="box-title"> <h3 class="box-title">
@ -130,7 +130,12 @@
<div class="box-body"> <div class="box-body">
<table class="table"> <table class="table">
<tr> <tr>
<td style="width:40%;">{{ 'budgeted'|_ }}</td> <td style="width:40%;">
{{ 'budgeted'|_ }}
<span class="small"><br />
{{ session('start').formatLocalized(monthAndDayFormat) }} -
{{ session('start').formatLocalized(monthAndDayFormat) }}</span>
</td>
<td> <td>
<div class="form-group" style="margin-bottom:0;"> <div class="form-group" style="margin-bottom:0;">
<div class="input-group"> <div class="input-group">
@ -140,13 +145,40 @@
data-id="{{ budget.id }}" value="{{ budget.currentRep.amount|number_format(0,'','') }}" autocomplete="off" data-id="{{ budget.id }}" value="{{ budget.currentRep.amount|number_format(0,'','') }}" autocomplete="off"
step="1" min="0" max="{{ budgetMaximum }}" name="amount" type="number"> step="1" min="0" max="{{ budgetMaximum }}" name="amount" type="number">
</div> </div>
<div class="small">
<ul class="list-inline">
<li>Previously budgeted:</li>
<li><a href="#">{{ 123|formatAmountPlain }}</a></li>
<li><a href="#">{{ 456|formatAmountPlain }}</a></li>
</ul>
</div>
</div> </div>
</td> </td>
</tr> </tr>
<tr> <tr>
<td style="width:50%;">{{ 'spent'|_ }}</td> <td style="width:40%;">
{{ 'spent'|_ }}
<span class="small"><br />
{{ session('start').formatLocalized(monthAndDayFormat) }} -
{{ session('start').formatLocalized(monthAndDayFormat) }}
</span>
</td>
<td>{{ budget.spent|formatAmount }}</a></td> <td>{{ budget.spent|formatAmount }}</a></td>
</tr> </tr>
<tr>
<td style="width:40%">
<span class="text-danger">
Conflicts
</span>
</td>
<td>
<ul class="list-unstyled">
<li>Also budgeted {{ 123|formatAmount }} between x and y.</li>
<li>Also budgeted {{ 123|formatAmount }} between x and y.</li>
</ul>
</td>
</tr>
</table> </table>
</div> </div>
</div> </div>