Update views and CSS

This commit is contained in:
Sander Dorigo 2014-10-28 16:29:31 +01:00
parent 9b4391c0bf
commit 8ad0d7af93
2 changed files with 99 additions and 90 deletions

View File

@ -38,7 +38,7 @@
<i class="fa fa-credit-card fa-fw"></i> <a href="#">Your accounts</a> <i class="fa fa-credit-card fa-fw"></i> <a href="#">Your accounts</a>
</div> </div>
<div class="panel-body"> <div class="panel-body">
<div id="accounts-chart" style="height:300px;"></div> <div id="accounts-chart"></div>
</div> </div>
</div> </div>
<!-- BUDGETS --> <!-- BUDGETS -->
@ -47,7 +47,7 @@
<i class="fa fa-tasks fa-fw"></i> <a href="{{route('budgets.index.date')}}">Budgets and spending</a> <i class="fa fa-tasks fa-fw"></i> <a href="{{route('budgets.index.date')}}">Budgets and spending</a>
</div> </div>
<div class="panel-body"> <div class="panel-body">
<div id="budgets"></div> <div id="budgets-chart"></div>
</div> </div>
</div> </div>
<!-- CATEGORIES --> <!-- CATEGORIES -->
@ -56,7 +56,7 @@
<i class="fa fa-bar-chart fa-fw"></i> <a href="{{route('categories.index')}}">Categories</a> <i class="fa fa-bar-chart fa-fw"></i> <a href="{{route('categories.index')}}">Categories</a>
</div> </div>
<div class="panel-body"> <div class="panel-body">
<div id="categories"></div> <div id="categories-chart"></div>
</div> </div>
</div> </div>
<div class="panel panel-default"> <div class="panel panel-default">
@ -64,7 +64,7 @@
<i class="fa fa-line-chart"></i> Savings <i class="fa fa-line-chart"></i> Savings
</div> </div>
<div class="panel-body"> <div class="panel-body">
Bla bla (todo)
</div> </div>
</div> </div>
@ -81,7 +81,7 @@
<i class="fa fa-line-chart"></i> Recurring transactions <i class="fa fa-line-chart"></i> Recurring transactions
</div> </div>
<div class="panel-body"> <div class="panel-body">
<div id="recurring"></div> <div id="recurring-chart"></div>
</div> </div>
</div> </div>
@ -123,9 +123,14 @@
@stop @stop
@section('scripts') @section('scripts')
{{HTML::script('assets/javascript/highcharts/highcharts.js')}} <!-- load the libraries and scripts necessary for Google Charts: -->
<script type="text/javascript" src="https://www.google.com/jsapi"></script>
{{HTML::script('assets/javascript/firefly/gcharts.options.js')}}
{{HTML::script('assets/javascript/firefly/gcharts.js')}}
{{HTML::script('assets/javascript/firefly/index.js')}} {{HTML::script('assets/javascript/firefly/index.js')}}
@stop @stop
@section('styles') @section('styles')
{{HTML::style('assets/stylesheets/highslide/highslide.css')}}
@stop @stop

View File

@ -8,6 +8,10 @@ body {
background-color: #f8f8f8; background-color: #f8f8f8;
} }
.google-chart-error {
border:1px red solid;height:20px;
}
#wrapper { #wrapper {
width: 100%; width: 100%;
} }