kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-09 23:41:10 +00:00
Code Issues Projects Releases Wiki Activity

Got up to categories with the new tables.

Browse Source
This commit is contained in:
James Cole
2014-11-14 10:17:12 +01:00
parent 0530c0402c
commit ac2ab65471
11 changed files with 114 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/list/accounts.blade.php
View File

@@ -26,7 +26,7 @@
<td>
<?php $active = $account->lastActionDate(); ?>
@if($active)
{{{$active->format('j F Y @ H:i')}}}
{{{$active->format('j F Y')}}}
@else
<em>Never</em>
@endif

28
app/views/list/categories.blade.php Normal file
View File

@@ -0,0 +1,28 @@
<table class="table table-striped table-bordered">
<tr>
<th>&nbsp;</th>
<th>Name</th>
<th>Last activity</th>
</tr>
@foreach($categories as $category)
<tr>
<td>
<div class="btn-group btn-group-xs">
<a href="{{route('categories.edit',$category->id)}}" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-pencil"></span></a>
<a href="{{route('categories.delete',$category->id)}}" class="btn btn-danger btn-xs"><span class="glyphicon glyphicon-trash"></span></a>
</div>
</td>
<td>
<a href="{{route('categories.show',$category->id)" title="{{{$category->name}}}">{{{$category->name}}}</a>
</td>
<td>
<?php $active = $category->lastActionDate(); ?>
@if($active)
{{{$active->format('j F Y')}}}
@else
<em>Never</em>
@endif
</td>
</tr>
@endforeach
</table>

25
app/views/list/journals-full.blade.php
View File

@@ -1,3 +1,6 @@
@if(is_object($journals))
{{$journals->links()}}
@endif
<table class="table table-striped table-bordered">
<tr>
<th>&nbsp;</th>
@@ -7,7 +10,9 @@
<th>Date</th>
<th>From</th>
<th>To</th>
<th><i class="fa fa-tasks fa-fw" title="Budget"></i></th>
@if(!isset($hideBudget) || (isset($hideBudget) && $hideBudget=== false))
<th><i class="fa fa-tasks fa-fw" title="Budget"></i></th>
@endif
<th><i class="fa fa-bar-chart fa-fw" title="Category"></i></th>
<th><i class="fa fa-fw fa-rotate-right" title="Recurring transaction"></i></th>
</tr>
@@ -64,12 +69,14 @@
<a href="{{route('accounts.show',$journal->transactions[1]->account_id)}}">{{{$journal->transactions[1]->account->name}}}</a>
@endif
</td>
<td>
<?php $budget = isset($journal->budgets[0]) ? $journal->budgets[0] : null; ?>
@if($budget)
<a href="{{route('budgets.show',$budget->id)}}">{{{$budget->name}}}</a>
@endif
</td>
@if(!isset($hideBudget) || (isset($hideBudget) && $hideBudget=== false))
<td>
<?php $budget = isset($journal->budgets[0]) ? $journal->budgets[0] : null; ?>
@if($budget)
<a href="{{route('budgets.show',$budget->id)}}">{{{$budget->name}}}</a>
@endif
</td>
@endif
<td>
<?php $category = isset($journal->categories[0]) ? $journal->categories[0] : null; ?>
@if($category)
@@ -87,4 +94,6 @@
@endforeach
</table>
{{$journals->links()}}
@if(is_object($journals))
{{$journals->links()}}
@endif