kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-22 20:16:22 +00:00
Code Issues Projects Releases Wiki Activity

Moved to high charts.

Browse Source
This commit is contained in:
James Cole
2014-07-15 06:58:08 +02:00
parent 6e7ea89c70
commit 0e09e52e45
26 changed files with 2055 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
app/views/index.blade.php
View File

@@ -7,6 +7,24 @@
<small>What's playing?</small>
@endif
</h1>
<form role="form" class="form-horizontal">
<div class="input-group">
<?php $r = Session::get('range','1M');?>
<span class="input-group-btn input-group-btn">
<button name="range" value="1D" class="btn btn-default @if($r=='1D') btn-info @endif btn-sm" type="submit">1D</button>
<button name="range" value="1W" class="btn btn-default @if($r=='1W') btn-info @endif btn-sm" type="submit">1W</button>
<button name="range" value="1M" class="btn btn-default @if($r=='1M') btn-info @endif btn-sm" type="submit">1M</button>
<button name="range" value="3M" class="btn btn-default @if($r=='3M') btn-info @endif btn-sm" type="submit">3M</button>
<button name="range" value="6M" class="btn btn-default @if($r=='6M') btn-info @endif btn-sm" type="submit">6M</button>
</span>
<input value="{{Session::get('start')->format('Y-m-d')}}" name="start" type="date" style="width:15%;" class="form-control input-sm">
<input value="{{Session::get('end')->format('Y-m-d')}}" name="end" type="date" style="width:15%;" class="form-control input-sm">
<button class="btn btn-default btn-sm @if($r=='custom') btn-info @endif" type="submit" name="range" value="custom">Custom</button>
</div>
</form>
</div>
</div>
@if($count == 0)
@@ -39,8 +57,7 @@
<div class="row">
@foreach($accounts as $index => $account)
<div class="col-lg-6">
<h4>{{{$account->name}}} chart</h4>
<div id="chart_{{{$account->id}}}" data-id="{{{$account->id}}}" class="homeChart" data-title="{{{$account->name}}}"></div>
<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>
@@ -60,7 +77,7 @@
@include('transactions.journals',['journals' => $account->transactionList])
</div>
@if($index % 2 == 1)
</div><div class="row" style="border-top:1px #eee solid;">
</div><div class="row">
@endif
@endforeach
</div>
@@ -80,16 +97,13 @@
<!-- Beneficiaries, categories and budget pie charts: -->
<div class="row">
<div class="col-lg-4 col-sm-6 col-md-6">
<h4>Beneficiaries</h4>
<div id="beneficiaryChart"></div>
<div style="width:80%;margin:0 auto;" id="beneficiaryChart"></div>
</div>
<div class="col-lg-4 col-sm-6 col-md-6">
<h4>Categories</h4>
<div id="categoryChart"></div>
<div style="width:80%;margin:0 auto;" id="categoryChart"></div>
</div>
<div class="col-lg-4 col-sm-6 col-md-6">
<h4>Budgets</h4>
<div id="budgetChart"></div>
<div style="width:80%;margin:0 auto;" id="budgetChart"></div>
</div>
</div>
<br /><br /><br /><br /><br />
@@ -99,7 +113,6 @@
@stop
@section('scripts')
<script src="https://www.google.com/jsapi"></script>
<script src="assets/javascript/charts.js"></script>
<script src="assets/javascript/index.js"></script>
<script src="assets/javascript/highcharts.js"></script>
<script src="assets/javascript/index.new.js"></script>
@stop