IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2024-12-28 09:51:21 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed all titles, subtitles and icons to properly display new layout.

Browse Source
This commit is contained in:
James Cole 2014-09-17 08:55:51 +02:00
parent 9e88d7a60d
commit c61f1307d8
26 changed files with 198 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/controllers/MigrateController.php
View File

@ -11,7 +11,8 @@ class MigrateController extends BaseController
*/
public function index()
{
return View::make('migrate.index')->with('index', 'Migration');
return View::make('migrate.index')->with('index', 'Migration')->with('title','Migrate')->
with('subTitle','From Firefly II to Firefly III');
}
/**

111
app/controllers/PiggybankController.php
View File

@ -49,10 +49,20 @@ class PiggybankController extends BaseController
*/
public function createPiggybank()
{
$periods = Config::get('firefly.piggybank_periods');
$accounts = $this->_accounts->getActiveDefaultAsSelectList();
/** @var \Firefly\Helper\Toolkit\Toolkit $toolkit */
$toolkit = App::make('Firefly\Helper\Toolkit\Toolkit');
return View::make('piggybanks.create-piggybank')->with('accounts', $accounts)->with('periods', $periods);
$periods = Config::get('firefly.piggybank_periods');
$list = $this->_accounts->getActiveDefault();
$accounts = $toolkit->makeSelectList($list);
View::share('title', 'Piggy banks');
View::share('subTitle', 'Create new');
View::share('mainTitleIcon', 'fa-sort-amount-asc');
return View::make('piggybanks.create-piggybank')->with('accounts', $accounts)
->with('periods', $periods);
}
/**
@ -60,8 +70,16 @@ class PiggybankController extends BaseController
*/
public function createRepeated()
{
/** @var \Firefly\Helper\Toolkit\Toolkit $toolkit */
$toolkit = App::make('Firefly\Helper\Toolkit\Toolkit');
$periods = Config::get('firefly.piggybank_periods');
$accounts = $this->_accounts->getActiveDefaultAsSelectList();
$list = $this->_accounts->getActiveDefault();
$accounts = $toolkit->makeSelectList($list);
View::share('title', 'Repeated expenses');
View::share('subTitle', 'Create new');
View::share('mainTitleIcon', 'fa-rotate-right');
return View::make('piggybanks.create-repeated')->with('accounts', $accounts)->with('periods', $periods);
}
@ -73,6 +91,15 @@ class PiggybankController extends BaseController
*/
public function delete(Piggybank $piggyBank)
{
View::share('subTitle', 'Delete "'.$piggyBank->name.'"');
if($piggyBank->repeats == 1) {
View::share('title', 'Repeated expenses');
View::share('mainTitleIcon', 'fa-rotate-right');
} else {
View::share('title', 'Piggy banks');
View::share('mainTitleIcon', 'fa-sort-amount-asc');
}
return View::make('piggybanks.delete')->with('piggybank', $piggyBank);
}
@ -98,12 +125,29 @@ class PiggybankController extends BaseController
*/
public function edit(Piggybank $piggyBank)
{
$accounts = $this->_accounts->getActiveDefaultAsSelectList();
/** @var \Firefly\Helper\Toolkit\Toolkit $toolkit */
$toolkit = App::make('Firefly\Helper\Toolkit\Toolkit');
$list = $this->_accounts->getActiveDefault();
$accounts = $toolkit->makeSelectList($list);
$periods = Config::get('firefly.piggybank_periods');
View::share('subTitle','Edit "'.$piggyBank->name.'"');
if ($piggyBank->repeats == 1) {
View::share('title','Repeated expenses');
View::share('mainTitleIcon', 'fa-rotate-left');
return View::make('piggybanks.edit-repeated')->with('piggybank', $piggyBank)->with('accounts', $accounts)
->with('periods', $periods);
} else {
// piggy bank.
View::share('title','Piggy banks');
View::share('mainTitleIcon', 'fa-sort-amount-asc');
return View::make('piggybanks.edit-piggybank')->with('piggybank', $piggyBank)->with('accounts', $accounts)
->with('periods', $periods);
}
@ -114,7 +158,7 @@ class PiggybankController extends BaseController
/**
* @return $this
*/
public function index()
public function piggybanks()
{
$countRepeating = $this->_repository->countRepeating();
$countNonRepeating = $this->_repository->countNonrepeating();
@ -134,6 +178,44 @@ class PiggybankController extends BaseController
}
}
View::share('title', 'Piggy banks');
View::share('subTitle', 'Save for big expenses');
View::share('mainTitleIcon', 'fa-sort-amount-asc');
return View::make('piggybanks.index')->with('piggybanks', $piggybanks)
->with('countRepeating', $countRepeating)
->with('countNonRepeating', $countNonRepeating)
->with('accounts', $accounts);
}
/**
* @return $this
*/
public function repeated()
{
$countRepeating = $this->_repository->countRepeating();
$countNonRepeating = $this->_repository->countNonrepeating();
$piggybanks = $this->_repository->get();
// get the accounts with each piggy bank and check their balance; Fireflyy might needs to
// show the user a correction.
$accounts = [];
/** @var \Piggybank $piggybank */
foreach ($piggybanks as $piggybank) {
$account = $piggybank->account;
$id = $account->id;
if (!isset($accounts[$id])) {
$accounts[$id] = ['account' => $account, 'left' => $this->_repository->leftOnAccount($account)];
}
}
View::share('title', 'Repeated expenses');
View::share('subTitle', 'Save for returning bills');
View::share('mainTitleIcon', 'fa-rotate-left');
return View::make('piggybanks.index')->with('piggybanks', $piggybanks)
->with('countRepeating', $countRepeating)
->with('countNonRepeating', $countNonRepeating)
@ -203,6 +285,18 @@ class PiggybankController extends BaseController
$leftOnAccount = $this->_repository->leftOnAccount($piggyBank->account);
$balance = $piggyBank->account->balance();
View::share('subTitle',$piggyBank->name);
if($piggyBank->repeats == 1) {
// repeated expense.
View::share('title','Repeated expenses');
View::share('mainTitleIcon', 'fa-rotate-left');
} else {
// piggy bank.
View::share('title','Piggy banks');
View::share('mainTitleIcon', 'fa-sort-amount-asc');
}
return View::make('piggybanks.show')->with('piggyBank', $piggyBank)->with('leftOnAccount', $leftOnAccount)
->with('balance', $balance);
}
@ -226,7 +320,7 @@ class PiggybankController extends BaseController
Session::flash('success', 'New piggy bank "' . $piggyBank->name . '" created!');
Event::fire('piggybanks.store', [$piggyBank]);
return Redirect::route('piggybanks.index');
return Redirect::route('piggybanks.index.piggybanks');
} else {
@ -254,8 +348,7 @@ class PiggybankController extends BaseController
if ($piggyBank->id) {
Session::flash('success', 'New piggy bank "' . $piggyBank->name . '" created!');
Event::fire('piggybanks.store', [$piggyBank]);
return Redirect::route('piggybanks.index');
return Redirect::route('piggybanks.index.repeated');
} else {
Session::flash('error', 'Could not save piggy bank: ' . $piggyBank->errors()->first());

2
app/controllers/PreferencesController.php
View File

@ -22,6 +22,8 @@ class PreferencesController extends BaseController
$this->_accounts = $accounts;
$this->_preferences = $preferences;
View::share('title','Preferences');
View::share('mainTitleIcon','fa-gear');
}
/**

6
app/controllers/ProfileController.php
View File

@ -22,6 +22,9 @@ class ProfileController extends BaseController
*/
public function index()
{
View::share('title','Profile');
View::share('subTitle',Auth::user()->email);
View::share('mainTitleIcon','fa-user');
return View::make('profile.index');
}
@ -30,6 +33,9 @@ class ProfileController extends BaseController
*/
public function changePassword()
{
View::share('title',Auth::user()->email);
View::share('subTitle','Change your password');
View::share('mainTitleIcon','fa-user');
return View::make('profile.change-password');
}

10
app/controllers/RecurringController.php
View File

@ -17,6 +17,9 @@ class RecurringController extends BaseController
public function __construct(RTR $repository)
{
$this->_repository = $repository;
View::share('title','Recurring transactions');
View::share('mainTitleIcon','fa-rotate-right');
}
/**
@ -24,6 +27,7 @@ class RecurringController extends BaseController
*/
public function create()
{
View::share('subTitle','Create new');
$periods = \Config::get('firefly.periods_to_text');
return View::make('recurring.create')->with('periods', $periods);
@ -36,6 +40,7 @@ class RecurringController extends BaseController
*/
public function delete(RecurringTransaction $recurringTransaction)
{
View::share('subTitle','Delete "' .$recurringTransaction->name.'"');
return View::make('recurring.delete')->with('recurringTransaction', $recurringTransaction);
}
@ -67,6 +72,8 @@ class RecurringController extends BaseController
{
$periods = \Config::get('firefly.periods_to_text');
View::share('subTitle','Edit "' .$recurringTransaction->name.'"');
return View::make('recurring.edit')->with('periods', $periods)->with(
'recurringTransaction', $recurringTransaction
);
@ -79,6 +86,8 @@ class RecurringController extends BaseController
{
$list = $this->_repository->get();
return View::make('recurring.index')->with('list', $list);
}
@ -87,6 +96,7 @@ class RecurringController extends BaseController
*/
public function show(RecurringTransaction $recurringTransaction)
{
View::share('subTitle',$recurringTransaction->name);
return View::make('recurring.show')->with('recurring', $recurringTransaction);
}

56
app/controllers/TransactionController.php
View File

@ -22,6 +22,7 @@ class TransactionController extends BaseController
{
$this->_repository = $repository;
View::share('title', 'Transactions');
View::share('mainTitleIcon', 'fa-repeat');
}
/**
@ -37,8 +38,8 @@ class TransactionController extends BaseController
// get asset accounts with names and id's.
/** @var \Firefly\Storage\Account\AccountRepositoryInterface $accountRepository */
$accountRepository = App::make('Firefly\Storage\Account\AccountRepositoryInterface');
$accounts = $accountRepository->getOfTypes(['Asset account','Default account']);
$assetAccounts = $toolkit->makeSelectList($accounts);
$list = $accountRepository->getActiveDefault();
$assetAccounts = $toolkit->makeSelectList($list);
// get budgets as a select list.
@ -64,6 +65,12 @@ class TransactionController extends BaseController
*/
public function delete(TransactionJournal $transactionJournal)
{
View::share(
'subTitle',
'Delete ' . strtolower($transactionJournal->transactionType->type) . ' "' . $transactionJournal->description
. '"'
);
return View::make('transactions.delete')->with('journal', $transactionJournal);
@ -95,9 +102,18 @@ class TransactionController extends BaseController
// some lists prefilled:
// get accounts with names and id's.
/** @var \Firefly\Helper\Toolkit\Toolkit $toolkit */
$toolkit = App::make('Firefly\Helper\Toolkit\Toolkit');
// get asset accounts with names and id's.
/** @var \Firefly\Storage\Account\AccountRepositoryInterface $accountRepository */
$accountRepository = App::make('Firefly\Storage\Account\AccountRepositoryInterface');
$accounts = $accountRepository->getActiveDefaultAsSelectList();
$list = $accountRepository->getActiveDefault();
$accounts = $toolkit->makeSelectList($list);
View::share(
'subTitle', 'Edit ' . strtolower($journal->transactionType->type) . ' "' . $journal->description . '"'
);
// get budgets as a select list.
/** @var \Firefly\Storage\Budget\BudgetRepositoryInterface $budgetRepository */
@ -156,8 +172,8 @@ class TransactionController extends BaseController
public function expenses()
{
$transactionType = $this->_repository->getTransactionType('Withdrawal');
$start = is_null(Input::get('startdate')) ? null : new Carbon(Input::get('startdate'));
$end = is_null(Input::get('enddate')) ? null : new Carbon(Input::get('enddate'));
$start = is_null(Input::get('startdate')) ? null : new Carbon(Input::get('startdate'));
$end = is_null(Input::get('enddate')) ? null : new Carbon(Input::get('enddate'));
if ($start <= $end && !is_null($start) && !is_null($end)) {
$journals = $this->_repository->paginate($transactionType, 25, $start, $end);
$filtered = true;
@ -168,17 +184,17 @@ class TransactionController extends BaseController
$filters = null;
}
View::share('subTitleIcon', 'fa-long-arrow-left');
return View::make('transactions.index')->with('journals', $journals)->with('filtered', $filtered)->with(
'filters', $filters
);
)->with('subTitle', 'Expenses');
}
public function revenue()
{
$transactionType = $this->_repository->getTransactionType('Deposit');
$start = is_null(Input::get('startdate')) ? null : new Carbon(Input::get('startdate'));
$end = is_null(Input::get('enddate')) ? null : new Carbon(Input::get('enddate'));
$start = is_null(Input::get('startdate')) ? null : new Carbon(Input::get('startdate'));
$end = is_null(Input::get('enddate')) ? null : new Carbon(Input::get('enddate'));
if ($start <= $end && !is_null($start) && !is_null($end)) {
$journals = $this->_repository->paginate($transactionType, 25, $start, $end);
$filtered = true;
@ -189,18 +205,18 @@ class TransactionController extends BaseController
$filters = null;
}
View::share('subTitleIcon', 'fa-long-arrow-right');
return View::make('transactions.index')->with('journals', $journals)->with('filtered', $filtered)->with(
'filters', $filters
);
)->with('subTitle', 'Revenue');
}
public function transfers()
{
$transactionType = $this->_repository->getTransactionType('Transfer');
$start = is_null(Input::get('startdate')) ? null : new Carbon(Input::get('startdate'));
$end = is_null(Input::get('enddate')) ? null : new Carbon(Input::get('enddate'));
$start = is_null(Input::get('startdate')) ? null : new Carbon(Input::get('startdate'));
$end = is_null(Input::get('enddate')) ? null : new Carbon(Input::get('enddate'));
if ($start <= $end && !is_null($start) && !is_null($end)) {
$journals = $this->_repository->paginate($transactionType, 25, $start, $end);
$filtered = true;
@ -211,10 +227,10 @@ class TransactionController extends BaseController
$filters = null;
}
View::share('subTitleIcon', 'fa-arrows-h');
return View::make('transactions.index')->with('journals', $journals)->with('filtered', $filtered)->with(
'filters', $filters
);
)->with('subTitle', 'Transfers');
}
@ -248,6 +264,8 @@ class TransactionController extends BaseController
*/
public function show(TransactionJournal $journal)
{
View::share('subTitle', $journal->transactionType->type . ' "' . $journal->description . '"');
return View::make('transactions.show')->with('journal', $journal);
}
@ -260,8 +278,8 @@ class TransactionController extends BaseController
{
$journal = $this->_repository->store($what, Input::all());
if($journal->errors()->count() > 0) {
Session::flash('error', 'Could not save transaction: ' . $journal->errors()->first().'!');
if ($journal->errors()->count() > 0) {
Session::flash('error', 'Could not save transaction: ' . $journal->errors()->first() . '!');
return Redirect::route('transactions.create', [$what])->withInput()->withErrors($journal->errors());
}
@ -282,7 +300,7 @@ class TransactionController extends BaseController
if (Input::get('create') == '1') {
return Redirect::route('transactions.create', [$what])->withInput();
} else {
switch($what) {
switch ($what) {
case 'withdrawal':
return Redirect::route('transactions.expenses');
break;
@ -296,7 +314,7 @@ class TransactionController extends BaseController
}
} else {
Session::flash('error', 'Could not save transaction: ' . $journal->errors()->first().'!');
Session::flash('error', 'Could not save transaction: ' . $journal->errors()->first() . '!');
return Redirect::route('transactions.create', [$what])->withInput()->withErrors($journal->errors());
}

10
app/views/migrate/index.blade.php
View File

@ -2,18 +2,14 @@
@section('content')
<div class="row">
<div class="col-lg-8 col-md-8 col-sm-12">
<h1>Firefly<br/>
<small>Migration</small>
</h1>
<p class="text-info">
Read <a href="https://github.com/JC5/firefly-iii/wiki/Importing-data-from-Firefly-II">the wiki</a> to read more about how data migration.
</p>
<ol>
<li>Upload <code>firefly-export-****-**-**.json</code></li>
<li>Wait..</li>
<li>Done!</li>
</ol>
<p>
&nbsp;
</p>
{{Form::open(['files' => true,'url' => route('migrate.upload')])}}
<div class="form-group">
<label for="file">Export file</label>

24
app/views/partials/menu.blade.php
View File

@ -12,13 +12,14 @@
<!-- /.navbar-header -->
<ul class="nav navbar-top-links navbar-right">
@if(Session::has('job_pct'))
<!-- /.dropdown -->
<li class="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown" href="#">
<i class="fa fa-tasks fa-fw"></i> <i class="fa fa-caret-down"></i>
</a>
<!-- display for import tasks, possibly others -->
@if(Session::has('job_pct'))
<ul class="dropdown-menu dropdown-tasks">
<li>
<a href="#">
@ -123,7 +124,11 @@
</li>
<li>
<a href="{{route('categories.index')}}"><i class="fa fa-bar-chart fa-fw"></i> Categories</a>
<a
@if(!(strpos($r,'categories') === false))
class="active"
@endif
href="{{route('categories.index')}}"><i class="fa fa-bar-chart fa-fw"></i> Categories</a>
</li>
<li>
<a href="#"><i class="fa fa-tags fa-fw"></i> Tags</a>
@ -154,17 +159,24 @@
</ul>
</li>
<li>
<li
@if(
!(strpos($r,'piggybanks') === false) ||
!(strpos($r,'recurring') === false)
)
class="active"
@endif
>
<a href="#"><i class="fa fa-euro fa-fw"></i> Money management<span class="fa arrow"></span></a>
<ul class="nav nav-second-level">
<li>
<a href="{{route('piggybanks.index')}}"><i class="fa fa-envelope-o fa-fw"></i> Piggy banks</a>
<a @if($r == 'piggybanks.index.piggybanks') class="active" @endif href="{{route('piggybanks.index.piggybanks')}}"><i class="fa fa-sort-amount-asc fa-fw"></i> Piggy banks</a>
</li>
<li>
<a href="{{route('recurring.index')}}"><i class="fa fa-rotate-right fa-fw"></i> Recurring transactions</a>
<a @if($r == 'recurring.index') class="active" @endif href="{{route('recurring.index')}}"><i class="fa fa-rotate-right fa-fw"></i> Recurring transactions</a>
</li>
<li>
<a href="{{route('piggybanks.index')}}"><i class="fa fa-rotate-left fa-fw"></i> Repeated expenses</a>
<a @if($r == 'piggybanks.index.repeated') class="active" @endif href="{{route('piggybanks.index.repeated')}}"><i class="fa fa-rotate-left fa-fw"></i> Repeated expenses</a>
</li>
</ul>
<!-- /.nav-second-level -->

3
app/views/piggybanks/create-piggybank.blade.php
View File

@ -2,9 +2,6 @@
@section('content')
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<h1>Firefly
<small>Create a new piggy bank</small>
</h1>
<p class="lead">Use piggy banks to save for a one-time goal.</p>
</div>
</div>

3
app/views/piggybanks/create-repeated.blade.php
View File

@ -2,9 +2,6 @@
@section('content')
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<h1>Firefly
<small>Create a new repeated expense</small>
</h1>
<p class="lead">Create repeated expenses to keep track of long-term planned expenses</p>
</div>
</div>

9
app/views/piggybanks/delete.blade.php
View File

@ -2,9 +2,6 @@
@section('content')
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<h1>Firefly
<small>Delete piggy bank</small>
</h1>
<p class="lead">Remember that deleting something is permanent.</p>
</div>
@ -29,7 +26,11 @@
<div class="form-group">
<div class="col-sm-8">
<input type="submit" name="submit" value="Remove piggy bank" class="btn btn-danger" />
<a href="{{route('piggybanks.index')}}" class="btn-default btn">Cancel</a>
@if($piggybank->repeats == 1)
<a href="{{route('piggybanks.index.repeated')}}" class="btn-default btn">Cancel</a>
@else
<a href="{{route('piggybanks.index.piggybanks')}}" class="btn-default btn">Cancel</a>
@endif
</div>
</div>
</div>

3
app/views/piggybanks/edit-piggybank.blade.php
View File

@ -2,9 +2,6 @@
@section('content')
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<h1>Firefly
<small>Edit piggy bank "{{{$piggybank->name}}}"</small>
</h1>
<p class="lead">Use piggy banks to save for a one-time goal.</p>
</div>
</div>

3
app/views/piggybanks/edit-repeated.blade.php
View File

@ -2,9 +2,6 @@
@section('content')
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<h1>Firefly
<small>Edit repeated expense "{{{$piggybank->name}}}"</small>
</h1>
<p class="lead">Create repeated expenses to keep track of long-term planned expenses</p>
</div>
</div>

3
app/views/piggybanks/index.blade.php
View File

@ -2,9 +2,6 @@
@section('content')
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<h1>Firefly
<small>Piggy banks, large expenses and repeated expenses</small>
</h1>
</div>
</div>
<div class="row">

9
app/views/piggybanks/show.blade.php
View File

@ -2,15 +2,6 @@
@section('content')
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<h1>Firefly
<small>
@if($piggyBank->repeats == 1)
Repeated expense
@else
Piggy bank
@endif
"{{{$piggyBank->name}}}"</small>
</h1>
<div class="btn-group">
<a href="{{route('piggybanks.edit',$piggyBank->id)}}" class="btn btn-default"><span class="glyphicon glyphicon-pencil"></span> Edit</a>
<a href="{{route('piggybanks.delete',$piggyBank->id)}}" class="btn btn-danger"><span class="glyphicon glyphicon-trash"></span> Delete</a>

8
app/views/preferences/index.blade.php
View File

@ -1,13 +1,5 @@
@extends('layouts.default')
@section('content')
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<h1>Firefly
<small>Preferences</small>
</h1>
</div>
</div>
<!-- form -->
{{Form::open(['class' => 'form-horizontal'])}}

11
app/views/profile/change-password.blade.php
View File

@ -2,14 +2,7 @@
@section('content')
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<h2>Change your password<br/>
<small>Logged in as {{Auth::user()->email}}</small>
</h1>
</div>
</div>
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<p>
<p class="text-info">
Use this extremely obvious form to change your password.
</p>
</div>
@ -40,7 +33,7 @@
</div>
<div class="form-group">
<div class="col-sm-offset-4 col-sm-10">
<button type="submit" class="btn btn-info">Change your password</button>
<button type="submit" class="btn btn-success">Change your password</button>
</div>
</div>
{{Form::close()}}

9
app/views/profile/index.blade.php
View File

@ -1,13 +1,6 @@
@extends('layouts.default')
@section('content')
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<h2>Profile<br/>
<small>Logged in as {{Auth::user()->email}}</small>
</h1>
</div>
</div>
<div class="row">
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<p class="lead"><a href="{{route('change-password')}}">Change your password</a></p>
</div>

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

@ -2,9 +2,6 @@
@section('content')
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<h1>Firefly
<small>Create a recurring transaction</small>
</h1>
<p class="lead">Use recurring transactions to track repeated expenses</p>
<p class="text-info">
Bla bla.
@ -192,5 +189,4 @@
@stop
@section('scripts')
<?php echo javascript_include_tag('recurring'); ?>
@stop

3
app/views/recurring/delete.blade.php
View File

@ -2,9 +2,6 @@
@section('content')
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<h1>Firefly
<small>Delete recurring transaction "{{{$recurringTransaction->name}}}"</small>
</h1>
<p class="lead">
Remember that deleting something is permanent.
</p>

3
app/views/recurring/edit.blade.php
View File

@ -2,9 +2,6 @@
@section('content')
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<h1>Firefly
<small>Edit recurring transaction "{{{$recurringTransaction->name}}}"</small>
</h1>
<p class="lead">Use recurring transactions to track repeated expenses</p>
<p class="text-info">
Bla bla.

3
app/views/recurring/index.blade.php
View File

@ -2,9 +2,6 @@
@section('content')
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<h1>Firefly
<small>Recurring transactions</small>
</h1>
<p class="lead">Use recurring transactions to track repeated withdrawals</p>
<p class="text-info">We all have bills to pay. Firefly can help you organize those bills into recurring transactions,
which are exactly what the name suggests. Firefly can match new (and existing) transactions to such a recurring transaction

3
app/views/recurring/show.blade.php
View File

@ -2,9 +2,6 @@
@section('content')
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<h1>Firefly
<small>Recurring transaction "{{{$recurring->name}}}"</small>
</h1>
<p class="lead">Use recurring transactions to track repeated withdrawals</p>
<p>
<div class="btn-group btn-group-xs">

14
app/views/transactions/delete.blade.php
View File

@ -2,9 +2,6 @@
@section('content')
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<h1>Firefly
<small>Delete transaction</small>
</h1>
<p class="lead">Remember that deleting something is permanent.</p>
</div>
@ -25,7 +22,16 @@
<div class="form-group">
<div class="col-sm-8">
<input type="submit" name="submit" value="Delete transaction" class="btn btn-danger" />
<a href="{{route('transactions.index')}}" class="btn-default btn">Cancel</a>
@if($journal->transactiontype->type == 'Withdrawal')
<a href="{{route('transactions.expenses')}}" class="btn-default btn">Cancel</a>
@endif
@if($journal->transactiontype->type == 'Deposit')
<a href="{{route('transactions.revenue')}}" class="btn-default btn">Cancel</a>
@endif
@if($journal->transactiontype->type == 'Transfer')
<a href="{{route('transactions.transfers')}}" class="btn-default btn">Cancel</a>
@endif
</div>
</div>
</div>

7
app/views/transactions/edit.blade.php
View File

@ -1,12 +1,5 @@
@extends('layouts.default')
@section('content')
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<h1>Firefly
<small>Edit transaction "{{{$journal->description}}}"</small>
</h1>
</div>
</div>
<div class="row">
<div class="col-lg-6 col-md-12 col-sm-12">
<p class="text-info">

8
app/views/transactions/show.blade.php
View File

@ -1,13 +1,5 @@
@extends('layouts.default')
@section('content')
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<h1>Firefly
<small>Transaction "{{{$journal->description}}}"</small>
</h1>
</div>
</div>
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-12">
<h3>Metadata</h3>