- Full move to high charts.

- Cleanup homepage.
- Expanded libraries
- Added limits (for budgets)
- Extended models
- Added popups for charts.
- [skip-ci]

app/controllers/ChartController.php

@@ -1,5 +1,6 @@
 <?php
 
+use Firefly\Helper\Preferences\PreferencesHelperInterface as PHI;
 use Firefly\Helper\Toolkit\Toolkit as tk;
 use Firefly\Storage\Account\AccountRepositoryInterface as ARI;
 use Firefly\Storage\TransactionJournal\TransactionJournalRepositoryInterface as TJRI;
@@ -12,15 +13,17 @@ class ChartController extends BaseController
 
     protected $_accounts;
     protected $_journals;
+    protected $_preferences;
 
     /**
      * @param ARI  $accounts
      * @param TJRI $journals
      */
-    public function __construct(ARI $accounts, TJRI $journals)
+    public function __construct(ARI $accounts, TJRI $journals, PHI $preferences)
     {
         $this->_accounts = $accounts;
         $this->_journals = $journals;
+        $this->_preferences = $preferences;
     }
 
     /**
@@ -34,98 +37,139 @@ class ChartController extends BaseController
         $current = clone $start;
         $return = [];
         $account = null;
+        $today = new Carbon\Carbon;
 
         if (!is_null($accountId)) {
+            /** @var \Account $account */
             $account = $this->_accounts->find($accountId);
         }
 
         if (is_null($account)) {
-            $accounts = $this->_accounts->getActiveDefault();
 
+            $pref = $this->_preferences->get('frontpageAccounts', []);
+            if ($pref->data == []) {
+                $accounts = $this->_accounts->getActiveDefault();
+            } else {
+                $accounts = $this->_accounts->getByIds($pref->data);
+            }
             foreach ($accounts as $account) {
-                $return[] = ['name' => $account->name, 'data' => []];
+                $return[] = ['name' => $account->name, 'id' => 'acc-' . $account->id, 'data' => []];
+
             }
             while ($current <= $end) {
-
                 // loop accounts:
                 foreach ($accounts as $index => $account) {
-                    $return[$index]['data'][] = [$current->timestamp * 1000, $account->balance(clone $current)];
+
+
+                    if ($current > $today) {
+                        $return[$index]['data'][] = [$current->timestamp * 1000, $account->predict(clone $current)];
+                    } else {
+                        $return[$index]['data'][] = [$current->timestamp * 1000, $account->balance(clone $current)];
+                    }
                 }
                 $current->addDay();
             }
         } else {
-            $return[0] = ['name' => $account->name, 'data' => []];
+            $return[0] = ['name' => $account->name, 'id' => $account->id, 'data' => []];
 
             while ($current <= $end) {
+                if ($current > $today) {
+                    $return[0]['data'][] = [$current->timestamp * 1000, $account->predict(clone $current)];
+                } else {
+                    $return[0]['data'][] = [$current->timestamp * 1000, $account->balance(clone $current)];
+                }
 
-                $return[0]['data'][] = [$current->timestamp * 1000, $account->balance(clone $current)];
                 $current->addDay();
             }
-
         }
+//        // add an error bar as experiment:
+//        foreach($return as $index => $serie) {
+//            $err = [
+//                'type' => 'errorbar',
+//                'name' => $serie['name'].' pred',
+//                'linkedTo' => $serie['id'],
+//                'data' => []
+//            ];
+//            foreach($serie['data'] as $entry) {
+//                $err['data'][] = [$entry[0],10,300];
+//            }
+//            $return[] = $err;
+//        }
+
+
         return Response::json($return);
     }
 
     /**
-     * Get all budgets used in transaction(journals) this period:
+     * Return some beneficiary info for an account and a date.
+     *
+     * @param $name
+     * @param $day
+     * @param $month
+     * @param $year
      */
-    public function homeBudgets()
+    public function homeAccountInfo($name, $day, $month, $year)
     {
-        list($start, $end) = tk::getDateRange();
-        $data = [
-            'type' => 'pie',
-            'name' => 'Expense: ',
-            'data' => []
-        ];
+        $account = $this->_accounts->findByName($name);
+        $result = [];
+        $sum = 0;
+        if ($account) {
+            $date = \Carbon\Carbon::createFromDate($year, $month, $day);
+            $journals = $this->_journals->getByAccountAndDate($account, $date);
 
-        $result = $this->_journals->homeBudgetChart($start, $end);
-
-        foreach ($result as $name => $amount) {
-            $data['data'][] = [$name, $amount];
+            // loop all journals:
+            foreach ($journals as $journal) {
+                foreach ($journal->transactions as $transaction) {
+                    $name = $transaction->account->name;
+                    if ($transaction->account->id != $account->id) {
+                        $result[$name] = isset($result[$name]) ? $result[$name] + floatval($transaction->amount)
+                            : floatval($transaction->amount);
+                        $sum += floatval($transaction->amount);
+                    }
+                }
+            }
         }
-        return Response::json([$data]);
-
+        return View::make('charts.info')->with('rows', $result)->with('sum', $sum);
     }
 
-    /**
-     * Get all categories used in transaction(journals) this period.
-     */
-    public function homeCategories()
-    {
+    public function homeCategories() {
         list($start, $end) = tk::getDateRange();
+        $account = null;
+        $result = [];
+        // grab all transaction journals in this period:
+        $journals = $this->_journals->getByDateRange($start,$end);
 
-        $result = $this->_journals->homeCategoryChart($start, $end);
-        $data = [
-            'type' => 'pie',
-            'name' => 'Amount: ',
-            'data' => []
-        ];
+        $result = [];
+        foreach ($journals as $journal) {
+            // has to be one:
+
+            if (!isset($journal->transactions[0])) {
+                throw new FireflyException('Journal #' . $journal->id . ' has ' . count($journal->transactions)
+                    . ' transactions!');
+            }
+            $transaction = $journal->transactions[0];
+            $amount = floatval($transaction->amount);
+
+            // get budget from journal:
+            $budget = $journal->categories()->first();
+            $budgetName = is_null($budget) ? '(no category)' : $budget->name;
+
+            $result[$budgetName] = isset($result[$budgetName]) ? $result[$budgetName] + floatval($amount) : $amount;
 
-        foreach ($result as $name => $amount) {
-            $data['data'][] = [$name, $amount];
         }
-        return Response::json([$data]);
+        unset($journal, $transaction, $budget, $amount);
+
+        // sort
+        arsort($result);
+        $chartData = [
+        ];
+        foreach($result as $name => $value) {
+            $chartData[] = [$name, $value];
+        }
+
+
+
+        return Response::json($chartData);
 
     }
-
-    /**
-     * get all beneficiaries used in transaction(journals) this period.
-     */
-    public function homeBeneficiaries()
-    {
-        list($start, $end) = tk::getDateRange();
-        $data = [
-            'type' => 'pie',
-            'name' => 'Amount: ',
-            'data' => []
-        ];
-
-        $result = $this->_journals->homeBeneficiaryChart($start, $end);
-
-        foreach ($result as $name => $amount) {
-            $data['data'][] = [$name, $amount];
-        }
-        return Response::json([$data]);
-
-    }
-} 
+}

app/controllers/HomeController.php

@@ -30,24 +30,10 @@ class HomeController extends BaseController
      */
     public function index()
     {
-        // get list setting:
-        $pref = $this->_preferences->get('frontpageAccounts', []);
-
         // get the accounts to display on the home screen:
         $count = $this->_accounts->count();
-        if ($pref->data == []) {
-            $list = $this->_accounts->getActiveDefault();
-        } else {
-            $list = $this->_accounts->getByIds($pref->data);
-        }
-
-        // get transactions for each account:
-        foreach ($list as $account) {
-            $account->transactionList = $this->_journal->getByAccount($account, 10);
-        }
-
 
         // build the home screen:
-        return View::make('index')->with('count', $count)->with('accounts', $list);
+        return View::make('index')->with('count', $count);
     }
 }

app/controllers/MigrationController.php

@@ -40,6 +40,8 @@ class MigrationController extends BaseController
                 exit();
             }
         }
+        echo '<a href="'.route('index').'">home</a>';
+        exit();
     }
 
     /**

app/database/migrations/2014_07_17_183717_create_limits_table.php

@@ -0,0 +1,41 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateLimitsTable extends Migration {
+
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::create('limits', function(Blueprint $table)
+		{
+			$table->increments('id');
+			$table->timestamps();
+            $table->integer('component_id')->unsigned();
+            $table->date('startdate');
+            $table->date('enddate');
+            $table->decimal('amount',10,2);
+
+            // connect component
+            $table->foreign('component_id')
+                ->references('id')->on('components')
+                ->onDelete('cascade');
+		});
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::drop('limits');
+	}
+
+}

app/lib/Firefly/Storage/TransactionJournal/EloquentTransactionJournalRepository.php

@@ -167,127 +167,16 @@ class EloquentTransactionJournalRepository implements TransactionJournalReposito
 
     }
 
-    public function homeBudgetChart(\Carbon\Carbon $start, \Carbon\Carbon $end)
-    {
-        return $this->homeComponentChart($start, $end, 'Budget');
-    }
-
-    public function homeComponentChart(\Carbon\Carbon $start, \Carbon\Carbon $end, $chartType)
-    {
-
-        // lets make this simple.
-        $types = [];
-        foreach (\TransactionType::whereIn('type', ['Withdrawal'])->get() as $t) {
-            $types[] = $t->id;
-        }
-        unset($t);
-
-        // get all journals, partly filtered:
-        $journals = \TransactionJournal::
-            with(
-                ['components'         => function ($q) use ($chartType) {
-                        $q->where('class', $chartType);
-                    }, 'transactions' => function ($q) {
-                        $q->where('amount', '>', 0);
-                    }]
-            )
-            ->after($start)->before($end)
-            ->where('completed', 1)
-            ->whereIn('transaction_type_id', $types)
-            ->get(['transaction_journals.*']);
-        unset($types);
-        $result = [];
-
-
-        foreach ($journals as $journal) {
-            // has to be one:
-            if (!isset($journal->transactions[0])) {
-                throw new FireflyException('Journal #' . $journal->id . ' has ' . count($journal->transactions)
-                    . ' transactions!');
-            }
-            $transaction = $journal->transactions[0];
-            $amount = floatval($transaction->amount);
-
-
-            // MIGHT be one:
-            $budget = isset($journal->components[0]) ? $journal->components[0] : null;
-            if (!is_null($budget)) {
-                $name = $budget->name;
-            } else {
-                $name = '(no budget)';
-            }
-            $result[$name] = isset($result[$name]) ? $result[$name] + $amount : $amount;
-
-        }
-        unset($journal, $transaction, $budget, $name, $amount);
-
-        // sort
-        arsort($result);
-
-        return $result;
-    }
-
-    public function homeCategoryChart(\Carbon\Carbon $start, \Carbon\Carbon $end)
-    {
-        return $this->homeComponentChart($start, $end, 'Category');
-    }
-
-    public function homeBeneficiaryChart(\Carbon\Carbon $start, \Carbon\Carbon $end)
-    {
-        $result = [];
-
-        // lets make this simple.
-        $types = [];
-        foreach (\TransactionType::whereIn('type', ['Withdrawal'])->get() as $t) {
-            $types[] = $t->id;
-        }
-        unset($t);
-
-        // account type we want to see:
-        $accountType = \AccountType::where('description', 'Beneficiary account')->first();
-        $accountTypeID = $accountType->id;
-
-        // get all journals, partly filtered:
-        $journals = \TransactionJournal::
-            with(
-                ['transactions', 'transactions.account' => function ($q) use ($accountTypeID) {
-                        $q->where('account_type_id', $accountTypeID);
-                    }]
-            )
-            ->after($start)->before($end)
-            ->whereIn('transaction_type_id', $types)
-            ->orderBy('date', 'DESC')
-            ->orderBy('id', 'DESC')
-            ->get(['transaction_journals.*']);
-        foreach ($journals as $journal) {
-            foreach ($journal->transactions as $t) {
-                if (!is_null($t->account)) {
-                    $name = $t->account->name;
-                    $amount = floatval($t->amount) < 0 ? floatval($t->amount) * -1 : floatval($t->amount);
-
-                    $result[$name] = isset($result[$name]) ? $result[$name] + $amount : $amount;
-                }
-            }
-        }
-        // sort result:
-        arsort($result);
-
-
-        return $result;
-    }
-
     public function getByAccount(\Account $account, $count = 25)
     {
         $accountID = $account->id;
-        $query = \TransactionJournal::
-            with(
-                [
-                    'transactions',
-                    'transactioncurrency',
-                    'transactiontype'
-                ]
-            )
-            ->take($count)
+        $query = \Auth::user()->transactionjournals()->with(
+            [
+                'transactions',
+                'transactioncurrency',
+                'transactiontype'
+            ]
+        )
             ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
             ->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id')
             ->where('accounts.id', $accountID)
@@ -298,5 +187,51 @@ class EloquentTransactionJournalRepository implements TransactionJournalReposito
         return $query;
     }
 
+    public function getByDateRange(\Carbon\Carbon $start, \Carbon\Carbon $end)
+    {
+        // lets make this simple.
+        $types = [];
+        foreach (\TransactionType::whereIn('type', ['Withdrawal'])->get() as $t) {
+            $types[] = $t->id;
+        }
+        unset($t);
+
+        // get all journals, partly filtered:
+        $journals = \TransactionJournal::
+            with(
+                ['components', 'transactions' => function ($q) {
+                        $q->where('amount', '>', 0);
+                    }]
+            )
+            ->after($start)->before($end)
+            ->where('completed', 1)
+            ->whereIn('transaction_type_id', $types)
+            ->get(['transaction_journals.*']);
+        unset($types);
+        return $journals;
+    }
+
+    public function getByAccountAndDate(\Account $account, \Carbon\Carbon $date)
+    {
+        $accountID = $account->id;
+        $query = \Auth::user()->transactionjournals()->with(
+            [
+                'transactions',
+                'transactions.account',
+                'transactioncurrency',
+                'transactiontype'
+            ]
+        )
+            ->distinct()
+            ->leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
+            ->leftJoin('accounts', 'accounts.id', '=', 'transactions.account_id')
+            ->where('transactions.account_id', $accountID)
+            ->where('transaction_journals.date', $date->format('Y-m-d'))
+            ->orderBy('transaction_journals.date', 'DESC')
+            ->orderBy('transaction_journals.id', 'DESC')
+            ->get(['transaction_journals.*']);
+        return $query;
+    }
+
 
 }

app/lib/Firefly/Storage/TransactionJournal/TransactionJournalRepositoryInterface.php

@@ -13,12 +13,8 @@ interface TransactionJournalRepositoryInterface
 
     public function getByAccount(\Account $account, $count = 25);
 
-    public function homeBudgetChart(\Carbon\Carbon $start, \Carbon\Carbon $end);
+    public function getByAccountAndDate(\Account $account, \Carbon\Carbon $date);
 
-    public function homeCategoryChart(\Carbon\Carbon $start, \Carbon\Carbon $end);
-
-    public function homeBeneficiaryChart(\Carbon\Carbon $start, \Carbon\Carbon $end);
-
-    public function homeComponentChart(\Carbon\Carbon $start, \Carbon\Carbon $end, $chartType);
+    public function getByDateRange(\Carbon\Carbon $start, \Carbon\Carbon $end);
 
 }

app/models/Account.php

@@ -88,10 +88,14 @@ class Account extends Ardent
                 ->leftJoin(
                     'transaction_journals', 'transaction_journals.id', '=', 'transactions.transaction_journal_id'
                 )
-                ->where('transaction_journals.date', '<=', $date->format('Y-m-d'))->sum('transactions.amount')
+                ->where('transaction_journals.date', '<', $date->format('Y-m-d'))->sum('transactions.amount')
         );
     }
 
+    public function predict(\Carbon\Carbon $date) {
+        return null;
+    }
+
     /**
      * Transactions.
      *

app/models/Component.php

@@ -42,6 +42,10 @@ class Component extends Firefly\Database\SingleTableInheritanceEntity
         return $this->belongsToMany('Transaction');
     }
 
+    public function limits() {
+        return $this->belongsTo('Limit');
+    }
+
     public function transactionjournals()
     {
         return $this->belongsToMany('TransactionJournal');

app/models/Limit.php

@@ -0,0 +1,41 @@
+<?php
+
+use LaravelBook\Ardent\Ardent as Ardent;
+
+class Limit extends Ardent
+{
+
+    public static $rules
+        = [
+            'component_id' => 'required|exists:components,id',
+            'startdate'    => 'required|date',
+            'enddate'      => 'required|date',
+            'amount'       => 'numeric|required|min:0.01'
+
+        ];
+
+    public static $factory
+        = [
+            'component_id' => 'factory|Budget',
+            'startdate'    => 'date',
+            'enddate'      => 'date',
+            'amount'       => '100'
+        ];
+
+    public function component()
+    {
+        return $this->belongsTo('Component');
+    }
+
+    public function budget()
+    {
+        return $this->belongsTo('Budget', 'component_id');
+    }
+
+    public function getDates()
+    {
+        return ['created_at', 'updated_at', 'startdate', 'enddate'];
+    }
+
+
+} 

app/routes.php

@@ -7,9 +7,9 @@ Route::group(['before' => 'auth'], function () {
 
         // chart controller
         Route::get('/chart/home/account/{account?}', ['uses' => 'ChartController@homeAccount', 'as' => 'chart.home']);
-        Route::get('/chart/home/budgets', ['uses' => 'ChartController@homeBudgets', 'as' => 'chart.budgets']);
-        Route::get('/chart/home/beneficiaries', ['uses' => 'ChartController@homeBeneficiaries', 'as' => 'chart.beneficiaries']);
         Route::get('/chart/home/categories', ['uses' => 'ChartController@homeCategories', 'as' => 'chart.categories']);
+        Route::get('/chart/home/info/{account}/{day}/{month}/{year}', ['uses' => 'ChartController@homeAccountInfo', 'as' => 'chart.info']);
+
 
         // preferences controller
         Route::get('/preferences', ['uses' => 'PreferencesController@index', 'as' => 'preferences']);
@@ -26,6 +26,9 @@ Route::group(['before' => 'auth'], function () {
         Route::get('/accounts/create', ['uses' => 'AccountController@create', 'as' => 'accounts.create']);
         Route::get('/accounts/{account}', ['uses' => 'AccountController@show', 'as' => 'accounts.show']);
 
+        // budget controller
+        Route::get('/bugets',['uses' => 'BudgetController@index','as' => 'budgets.index']);
+
         // JSON controller:
         Route::get('/json/beneficiaries', ['uses' => 'JsonController@beneficiaries', 'as' => 'json.beneficiaries']);
         Route::get('/json/categories', ['uses' => 'JsonController@categories', 'as' => 'json.categories']);

app/tests/controllers/HomeControllerTest.php

@@ -13,64 +13,12 @@ class HomeControllerTest extends TestCase
         View::shouldReceive('share');
         View::shouldReceive('make')->with('index')->once()->andReturn(\Mockery::self())
             ->shouldReceive('with')->once()         // Pass a 'with' parameter
-            ->with('count', 0)
-            ->andReturn(Mockery::self())
-            ->shouldReceive('with')->once() // another 'with' parameter.
-            ->with('accounts',[])
-            ->andReturn(Mockery::self())
-            ;
+            ->with('count', 0);
         Auth::shouldReceive('check')->andReturn(true);
 
         // mock account repository
         $accounts = $this->mock('Firefly\Storage\Account\AccountRepositoryInterface');
         $accounts->shouldReceive('count')->andReturn(0);
-        $accounts->shouldReceive('getActiveDefault')->andReturn([]);
-
-        $preferences = $this->mock('Firefly\Helper\Preferences\PreferencesHelperInterface');
-        $preferences->shouldReceive('get')->with('frontpageAccounts',[])->andReturn(new \Preference)->once();
-
-        // call
-        $this->call('GET', '/');
-
-        // test
-        $this->assertResponseOk();
-    }
-
-    public function testIndexWithAccount() {
-
-        // mock Account
-        $account = $this->mock('Account');
-        $account->shouldReceive('setAttribute')->with('transactionList',[]);
-
-        // mock account repository
-        $accounts = $this->mock('Firefly\Storage\Account\AccountRepositoryInterface');
-        $accounts->shouldReceive('count')->andReturn(0);
-        $accounts->shouldReceive('getByIds')->andReturn([$account]);
-
-        // mock:
-        View::shouldReceive('share');
-        View::shouldReceive('make')->with('index')->once()->andReturn(\Mockery::self())
-            ->shouldReceive('with')->once()         // Pass a 'with' parameter
-            ->with('count', 0)
-            ->andReturn(Mockery::self())
-            ->shouldReceive('with')->once() // another 'with' parameter.
-            ->with('accounts',[$account])
-            ->andReturn(Mockery::self())
-        ;
-
-
-
-        // mock transaction journal
-        $tj = $this->mock('Firefly\Storage\TransactionJournal\TransactionJournalRepositoryInterface');
-        $tj->shouldReceive('getByAccount')->with($account,10)->andReturn([]);
-
-        // mock preferences helper:
-        $pref = $this->mock('Preference');
-        $pref->shouldReceive('getAttribute', 'data')->andReturn([1]);
-
-
-        $preferences = $this->mock('Firefly\Helper\Preferences\PreferencesHelperInterface');
-        $preferences->shouldReceive('get')->with('frontpageAccounts',[])->andReturn($pref)->once();
 
         // call
         $this->call('GET', '/');

app/views/charts/info.blade.php

@@ -0,0 +1,12 @@
+<table class="table table-condensed">
+    <tr>
+        <th>Total</th>
+        <th>{{mf($sum*-1)}}</th>
+    </tr>
+    @foreach($rows as $name => $amount)
+    <tr>
+        <td><a href="#">{{{$name}}}</a></td>
+        <td>{{mf($amount*-1)}}</td>
+    </tr>
+    @endforeach
+</table>

app/views/index.blade.php

@@ -35,6 +35,7 @@
         </p>
     </div>
 </div>
+<div id="something">Bla bla</div>
 <div class="row">
     <div class="col-lg-6 col-md-6 col-sm-12">
         <h2><a href="{{route('migrate')}}">Migrate from Firefly II</a></h2>
@@ -54,64 +55,27 @@
 
     <!-- ACCOUNTS -->
     <div class="row">
-    @foreach($accounts as $index => $account)
-        <div class="col-lg-6">
-            <div id="chart_{{{$account->id}}}" data-id="{{{$account->id}}}" style="width:100%;" class="homeChart" data-title="{{{$account->name}}}"></div>
-            <p>
-                Go to <a href="#" title="Overview for {{{$account->name}}}">{{{$account->name}}}</a>
-            </p>
-
+        <div class="col-lg-12 col-md-12 col-sm-12">
+            <div id="chart"></div>
         </div>
-        @if($index % 2 == 1)
-        </div><div class="row">
-        @endif
-    @endforeach
     </div>
 
-    <!-- TRANSACTIONS -->
     <div class="row">
-        @foreach($accounts as $index => $account)
-        <div class="col-lg-6">
-            <h4>{{$account->name}}</h4>
-            @include('transactions.journals',['journals' => $account->transactionList])
-        </div>
-        @if($index % 2 == 1)
-    </div><div class="row">
-        @endif
-        @endforeach
-    </div>
-
-
-    <!-- week / month / year navigation -->
-    <div class="row">
-        <div class="col-lg-2 col-sm-6 col-md-2">
-            <a href="#" class="btn btn-default btn-xs">Previous [period]</a>
-        </div>
-
-        <div class="col-lg-offset-8 col-lg-2 col-sm-6 col-md-offset-8 col-md-2" style="text-align: right;">
-            <a href="#" class="btn btn-default btn-xs">Next [period]</a>
+        <div class="col-lg-12 col-md-12 col-sm-12">
+            <div id="categories"></div>
         </div>
     </div>
 
-    <!-- Beneficiaries, categories and budget pie charts: -->
-    <div class="row">
-        <div class="col-lg-4 col-sm-6 col-md-6">
-            <div style="width:80%;margin:0 auto;" id="beneficiaryChart"></div>
-        </div>
-        <div class="col-lg-4 col-sm-6 col-md-6">
-            <div style="width:80%;margin:0 auto;" id="categoryChart"></div>
-        </div>
-        <div class="col-lg-4 col-sm-6 col-md-6">
-            <div style="width:80%;margin:0 auto;" id="budgetChart"></div>
-        </div>
-    </div>
-    <br /><br /><br /><br /><br />
-
-
 @endif
 
 @stop
 @section('scripts')
     <script src="assets/javascript/highcharts.js"></script>
-    <script src="assets/javascript/index.new.js"></script>
+    <script src="assets/javascript/highcharts-more.js"></script>
+    <script src="assets/javascript/highslide-full.min.js"></script>
+    <script src="assets/javascript/highslide.config.js"></script>
+    <script src="assets/javascript/index.js"></script>
+@stop
+@section('styles')
+    <link href="assets/css/highslide.css" rel="stylesheet">
 @stop

app/views/layouts/default.blade.php

@@ -10,6 +10,7 @@
     <!-- Bootstrap -->
     <link href="assets/bootstrap/css/bootstrap.min.css" rel="stylesheet">
     <link href="assets/css/site.css" rel="stylesheet">
+    @yield('styles')
 
     <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->

app/views/partials/menu/home.blade.php

@@ -21,8 +21,8 @@ $r = Route::current()->getName();
                 <li class="dropdown">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown">Go to...<span class="caret"></span></a>
                     <ul class="dropdown-menu" role="menu">
-                        <li><a href="{{route('accounts.index')}}">Accounts</a></li>
-                        <li><a href="#">Another action</a></li>
+                        <li><a href="{{route('accounts.index')}}"><span class="glyphicon glyphicon-inbox"></span> Accounts</a></li>
+                        <li><a href="{{route('budgets.index')}}"><span class="glyphicon glyphicon-euro"></span> Budgets</a></li>
                         <li><a href="#">Something else here</a></li>
                         <li class="divider"></li>
                         <li><a href="#">Separated link</a></li>