Fixed for budget views.

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);
     }
 
     /**

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']);

app/views/budgets/create.blade.php

@@ -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 budget</small>
-        </h1>
         <p class="lead">Use budgets to organize and limit your expenses.</p>
         <p class="text-info">
             Firefly uses the <a href="http://en.wikipedia.org/wiki/Envelope_System" class="text-success">envelope system</a>. Every budget

app/views/budgets/delete.blade.php

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

app/views/budgets/edit.blade.php

@@ -2,9 +2,6 @@
 @section('content')
 <div class="row">
     <div class="col-lg-12 col-md-12 col-sm-12">
-        <h1>Firefly
-            <small>Edit budget "{{{$budget->name}}}"</small>
-        </h1>
         <p class="lead">Use budgets to organize and limit your expenses.</p>
     </div>
 </div>

app/views/budgets/indexByBudget.blade.php

@@ -2,9 +2,6 @@
 @section('content')
 <div class="row">
     <div class="col-lg-12 col-md-12 col-sm-12">
-        <h1>Firefly
-            <small>Budgets and envelopes</small>
-        </h1>
         <p class="lead">Use budgets to organize and limit your expenses.</p>
 
         <p class="text-info">
@@ -22,15 +19,7 @@
             * <small>Every month, week, year, etc.</small>
         </p>
 
-        <p>
-            <div class="btn-group">
-            <a href="{{route('budgets.create')}}" class="btn btn-success"><span class="glyphicon glyphicon-plus"></span> Create a new budget</a>
-            <a href="{{route('budgets.limits.create')}}" class="btn btn-success"><span class="glyphicon glyphicon-plus"></span> Create a new envelope</a>
-            </div>
-        </p>
-
         <div class="btn-group">
-            <a class="btn btn-default" href ="{{route('budgets.index')}}"><span class="glyphicon glyphicon-indent-left"></span> Group by date</a>
             <a class="btn btn-default" href ="{{route('budgets.create')}}?from=budget"><span class="glyphicon glyphicon-plus-sign"></span> Create a new budget</a>
             <a class="btn btn-default" href ="{{route('budgets.limits.create')}}?from=budget"><span class="glyphicon glyphicon-plus-sign"></span> Create a new envelope</a>
         </div>

app/views/budgets/indexByDate.blade.php

@@ -2,9 +2,6 @@
 @section('content')
 <div class="row">
     <div class="col-lg-12 col-md-12 col-sm-12">
-        <h1>Firefly
-            <small>Budgets and envelopes</small>
-        </h1>
         <p class="lead">Use budgets to organize and limit your expenses.</p>
 
         <p class="text-info">
@@ -22,7 +19,6 @@
             * <small>Every month, week, year, etc.</small>
         </p>
         <div class="btn-group">
-            <a class="btn btn-default" href ="{{route('budgets.index.budget')}}"><span class="glyphicon glyphicon-tasks"></span> Group by budget</a>
             <a class="btn btn-default" href ="{{route('budgets.create')}}?from=date"><span class="glyphicon glyphicon-plus-sign"></span> Create a new budget</a>
             <a class="btn btn-default" href ="{{route('budgets.limits.create')}}?from=date"><span class="glyphicon glyphicon-plus-sign"></span> Create a new envelope</a>
         </div>

app/views/budgets/show.blade.php

@@ -2,9 +2,6 @@
 @section('content')
 <div class="row">
     <div class="col-lg-12 col-md-12 col-sm-12">
-        <h1>Firefly
-            <small>Overview for budget "{{{$budget->name}}}"</small>
-        </h1>
             <p class="lead">Budgets can help you cut back on spending.</p>
 
                 @if($view == 1)

app/views/index.blade.php

@@ -41,7 +41,7 @@
             </div>
             <div class="panel panel-default">
                 <div class="panel-heading">
-                    <i class="fa fa-tasks fa-fw"></i> <a href="{{route('budgets.index')}}">Budgets and spending</a>
+                    <i class="fa fa-tasks fa-fw"></i> <a href="{{route('budgets.index.date')}}">Budgets and spending</a>
                 </div>
                 <div class="panel-body">
                     <div id="budgets"></div>

app/views/partials/menu.blade.php

@@ -90,7 +90,7 @@
                     class="active"
                 @endif
                 >
-                <a href="#"><i class="fa fa-credit-card fa-fw"></i> Accounts<span class="fa arrow"></span></a>
+                <a href="#"><i class="fa fa-credit-card fa-fw"></i> Accounts <span class="fa arrow"></span></a>
                 <ul class="nav nav-second-level">
                     <li>
                         <a @if($r == 'accounts.asset') class="active" @endif href="{{route('accounts.asset')}}"><i class="fa fa-money fa-fw"></i> Asset accounts</a>
@@ -104,8 +104,23 @@
                 </ul>
                 <!-- /.nav-second-level -->
             </li>
-            <li>
-                <a href="{{route('budgets.index')}}"><i class="fa fa-tasks fa-fw"></i> Budgets</a>
+            <li
+            @if(!(strpos($r,'budgets') === false))
+            class="active"
+            @endif
+                >
+                <a href="#"><i class="fa fa-tasks fa-fw"></i> Budgets <span class="fa arrow"></span></a>
+
+                <ul class="nav nav-second-level">
+                    <li>
+                        <a @if($r == 'budgets.index.date') class="active" @endif href="{{route('budgets.index.date')}}"><i class="fa fa-calendar fa-fw"></i> Grouped by date</a>
+                    </li>
+                    <li>
+                        <a @if($r == 'budgets.index.budget') class="active" @endif href="{{route('budgets.index.budget')}}"><i class="fa fa-folder-open fa-fw"></i> Grouped by budget</a>
+                    </li>
+                </ul>
+
+
             </li>
             <li>
                 <a href="{{route('categories.index')}}"><i class="fa fa-bar-chart fa-fw"></i> Categories</a>