From dbfb342021af7b1f442119a1c32390a7d2362870 Mon Sep 17 00:00:00 2001 From: James Cole Date: Mon, 15 Sep 2014 17:46:01 +0200 Subject: [PATCH] Fixed for budget views. --- app/controllers/BudgetController.php | 12 +++++++++--- app/routes.php | 5 +++-- app/views/budgets/create.blade.php | 3 --- app/views/budgets/delete.blade.php | 3 --- app/views/budgets/edit.blade.php | 3 --- app/views/budgets/indexByBudget.blade.php | 11 ----------- app/views/budgets/indexByDate.blade.php | 4 ---- app/views/budgets/show.blade.php | 3 --- app/views/index.blade.php | 2 +- app/views/partials/menu.blade.php | 21 ++++++++++++++++++--- 10 files changed, 31 insertions(+), 36 deletions(-) diff --git a/app/controllers/BudgetController.php b/app/controllers/BudgetController.php index cb4f2294d2..157c711ce6 100644 --- a/app/controllers/BudgetController.php +++ b/app/controllers/BudgetController.php @@ -25,6 +25,8 @@ class BudgetController extends BaseController { $this->_budgets = $budgets; $this->_repository = $repository; + View::share('title','Budgets'); + View::share('mainTitleIcon', 'fa-tasks'); } /** @@ -85,10 +87,12 @@ class BudgetController extends BaseController */ public function indexByBudget() { + View::share('subTitleIcon', 'fa-folder-open'); + $budgets = $this->_repository->get(); return View::make('budgets.indexByBudget')->with('budgets', $budgets)->with('today', new Carbon) - ->with('subTitle', 'All your budgets grouped by budget'); + ->with('subTitle', 'Grouped by budget'); } @@ -97,12 +101,14 @@ class BudgetController extends BaseController */ public function indexByDate() { + View::share('subTitleIcon', 'fa-calendar'); + // get a list of dates by getting all repetitions: $set = $this->_repository->get(); $budgets = $this->_budgets->organizeByDate($set); return View::make('budgets.indexByDate')->with('budgets', $budgets) - ->with('subTitle', 'All your budgets grouped by date'); + ->with('subTitle', 'Grouped by date'); } @@ -152,7 +158,7 @@ class BudgetController extends BaseController ->with('view', $view) ->with('highlight', Input::get('highlight')) ->with('useSessionDates', $useSessionDates) - ->with('subTitle', $title); + ->with('subTitle', 'Overview for '.$title); } /** diff --git a/app/routes.php b/app/routes.php index 1660c65d09..6a1fca41e8 100644 --- a/app/routes.php +++ b/app/routes.php @@ -146,9 +146,10 @@ Route::group(['before' => 'auth'], function () { Route::get('/accounts/{account}/delete', ['uses' => 'AccountController@delete', 'as' => 'accounts.delete']); // budget controller: - Route::get('/budgets',['uses' => 'BudgetController@indexByDate','as' => 'budgets.index']); - Route::get('/budgets/create',['uses' => 'BudgetController@create', 'as' => 'budgets.create']); + Route::get('/budgets/date',['uses' => 'BudgetController@indexByDate','as' => 'budgets.index.date']); Route::get('/budgets/budget',['uses' => 'BudgetController@indexByBudget','as' => 'budgets.index.budget']); + Route::get('/budgets/create',['uses' => 'BudgetController@create', 'as' => 'budgets.create']); + Route::get('/budgets/show/{budget}/{limitrepetition?}',['uses' => 'BudgetController@show', 'as' => 'budgets.show']); Route::get('/budgets/edit/{budget}',['uses' => 'BudgetController@edit', 'as' => 'budgets.edit']); Route::get('/budgets/delete/{budget}',['uses' => 'BudgetController@delete', 'as' => 'budgets.delete']); diff --git a/app/views/budgets/create.blade.php b/app/views/budgets/create.blade.php index c40103f946..96d6664410 100644 --- a/app/views/budgets/create.blade.php +++ b/app/views/budgets/create.blade.php @@ -2,9 +2,6 @@ @section('content')
-

Firefly - Create a budget -

Use budgets to organize and limit your expenses.

Firefly uses the envelope system. Every budget diff --git a/app/views/budgets/delete.blade.php b/app/views/budgets/delete.blade.php index 395447faab..78abbcc3f7 100644 --- a/app/views/budgets/delete.blade.php +++ b/app/views/budgets/delete.blade.php @@ -2,9 +2,6 @@ @section('content')

-

Firefly - Delete budget "{{{$budget->name}}}" -

Remember that deleting something is permanent.

diff --git a/app/views/budgets/edit.blade.php b/app/views/budgets/edit.blade.php index 99388ceaf3..ecf8564944 100644 --- a/app/views/budgets/edit.blade.php +++ b/app/views/budgets/edit.blade.php @@ -2,9 +2,6 @@ @section('content')
-

Firefly - Edit budget "{{{$budget->name}}}" -

Use budgets to organize and limit your expenses.

diff --git a/app/views/budgets/indexByBudget.blade.php b/app/views/budgets/indexByBudget.blade.php index 458d122601..96bd10c9f8 100644 --- a/app/views/budgets/indexByBudget.blade.php +++ b/app/views/budgets/indexByBudget.blade.php @@ -2,9 +2,6 @@ @section('content')
-

Firefly - Budgets and envelopes -

Use budgets to organize and limit your expenses.

@@ -22,15 +19,7 @@ * Every month, week, year, etc.

-

-

- Create a new budget - Create a new envelope -
-

-
- Group by date Create a new budget Create a new envelope
diff --git a/app/views/budgets/indexByDate.blade.php b/app/views/budgets/indexByDate.blade.php index d684f97162..a953a8a633 100644 --- a/app/views/budgets/indexByDate.blade.php +++ b/app/views/budgets/indexByDate.blade.php @@ -2,9 +2,6 @@ @section('content')
-

Firefly - Budgets and envelopes -

Use budgets to organize and limit your expenses.

@@ -22,7 +19,6 @@ * Every month, week, year, etc.

- Group by budget Create a new budget Create a new envelope
diff --git a/app/views/budgets/show.blade.php b/app/views/budgets/show.blade.php index e4ddbd2555..03460312b7 100644 --- a/app/views/budgets/show.blade.php +++ b/app/views/budgets/show.blade.php @@ -2,9 +2,6 @@ @section('content')
-

Firefly - Overview for budget "{{{$budget->name}}}" -

Budgets can help you cut back on spending.

@if($view == 1) diff --git a/app/views/index.blade.php b/app/views/index.blade.php index 7bb3d15b16..39258437ca 100644 --- a/app/views/index.blade.php +++ b/app/views/index.blade.php @@ -41,7 +41,7 @@
- Budgets and spending + Budgets and spending
diff --git a/app/views/partials/menu.blade.php b/app/views/partials/menu.blade.php index 0862571342..74f95dd58c 100644 --- a/app/views/partials/menu.blade.php +++ b/app/views/partials/menu.blade.php @@ -90,7 +90,7 @@ class="active" @endif > - Accounts + Accounts -
  • - Budgets +
  • + Budgets + + + +
  • Categories