kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-12-19 04:49:30 +00:00
Code Issues Projects Releases Wiki Activity

Some small changes in the account display.

Browse Source
This commit is contained in:
Sander Dorigo
2014-07-07 19:33:17 +02:00
parent aca666704d
commit c7d3ef6a97
3 changed files with 30 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/AccountController.php
View File

@@ -26,8 +26,10 @@ class AccountController extends \BaseController
'initial' => [], 'initial' => [],
'cash' => [] 'cash' => []
]; ];
$total = $all->count();
foreach ($all as $account) { foreach ($all as $account) {
switch ($account->accounttype->description) { switch ($account->accounttype->description) {
case 'Default account': case 'Default account':
$list['personal'][] = $account; $list['personal'][] = $account;
@@ -45,7 +47,7 @@ class AccountController extends \BaseController
} }
} }
return View::make('accounts.index')->with('accounts', $list); return View::make('accounts.index')->with('accounts', $list)->with('total',$total);
} }
// //
// //

4
app/views/accounts/create.blade.php
View File

@@ -2,7 +2,7 @@
@section('content') @section('content')
<div class="row"> <div class="row">
<div class="col-lg-8 col-md-8 col-sm-12"> <div class="col-lg-8 col-md-8 col-sm-12">
<h1>Firefly<br/> <h1>Firefly
<small>Add a new account</small> <small>Add a new account</small>
</h1> </h1>
<p class="lead"> <p class="lead">
@@ -15,7 +15,7 @@
a positive balance). a positive balance).
</p> </p>
<p> <p>
Your first account should be a checking or savings account. Enter its name and if relevant If this is your first account, it should be a checking or savings account. Enter its name and if relevant
the current balance. Check your bank statements for the last current balance you can find. the current balance. Check your bank statements for the last current balance you can find.
</p> </p>
{{Form::open(['class' => 'form-horizontal','url' => route('accounts.store')])}} {{Form::open(['class' => 'form-horizontal','url' => route('accounts.store')])}}

46
app/views/accounts/index.blade.php
View File

@@ -15,33 +15,37 @@
</div> </div>
<div class="row"> <div class="row">
<div class="col-lg-12 col-md-12 col-sm-12"> <div class="col-lg-12 col-md-12 col-sm-12">
<h3>Your accounts</h3> @if($total > 0)
<p style="width:50%;" class="text-info"> <h3>Your accounts</h3>
These are your personal accounts. <p style="width:50%;" class="text-info">
</p> These are your personal accounts.
</p>
@include('accounts.list',['accounts' => $accounts['personal']]) @include('accounts.list',['accounts' => $accounts['personal']])
<h3>Beneficiaries</h3> <h3>Beneficiaries</h3>
<p style="width:50%;" class="text-info"> <p style="width:50%;" class="text-info">
These are beneficiaries; places where you spend money or people who pay you. These are beneficiaries; places where you spend money or people who pay you.
</p> </p>
@include('accounts.list',['accounts' => $accounts['beneficiaries']]) @include('accounts.list',['accounts' => $accounts['beneficiaries']])
<h3>Initial balances</h3> <h3>Initial balances</h3>
<p style="width:50%;" class="text-info"> <p style="width:50%;" class="text-info">
These are system accounts; created to add balance to the books when you add a personal account These are system accounts; created to add balance to the books when you add a personal account
which already has money in it. That money has to come from somewhere. which already has money in it. That money has to come from somewhere.
</p> </p>
@include('accounts.list',['accounts' => $accounts['initial']]) @include('accounts.list',['accounts' => $accounts['initial']])
<h3>Cash</h3> <h3>Cash</h3>
<p style="width:50%;" class="text-info"> <p style="width:50%;" class="text-info">
This is a system account. When you don't specify a beneficiary or draw many from an ATM (or put cash in your This is a system account. When you don't specify a beneficiary or draw many from an ATM (or put cash in your
personal accounts) it gets added or drawn from this account. personal accounts) it gets added or drawn from this account.
</p> </p>
@include('accounts.list',['accounts' => $accounts['cash']]) @include('accounts.list',['accounts' => $accounts['cash']])
@else
<a href="{{route('accounts.create')}}" class="btn btn-lg btn-info">Create a new account</a>
@endif
</div> </div>
</div> </div>