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

@ -30,7 +30,7 @@
<div class="row">
<div class="row">
<div class="col-lg-8 col-md-12 col-sm-12">
<!-- ACCOUNTS -->
<div class="panel panel-default">
@ -38,7 +38,7 @@
<i class="fa fa-credit-card fa-fw"></i> <a href="#">Your accounts</a>
</div>
<div class="panel-body">
<div id="accounts-chart" style="height:300px;"></div>
<div id="accounts-chart"></div>
</div>
</div>
<!-- BUDGETS -->
@ -47,7 +47,7 @@
<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>
<div id="budgets-chart"></div>
</div>
</div>
<!-- CATEGORIES -->
@ -56,7 +56,7 @@
<i class="fa fa-bar-chart fa-fw"></i> <a href="{{route('categories.index')}}">Categories</a>
</div>
<div class="panel-body">
<div id="categories"></div>
<div id="categories-chart"></div>
</div>
</div>
<div class="panel panel-default">
@ -64,7 +64,7 @@
<i class="fa fa-line-chart"></i> Savings
</div>
<div class="panel-body">
Bla bla
(todo)
</div>
</div>
@ -81,7 +81,7 @@
<i class="fa fa-line-chart"></i> Recurring transactions
</div>
<div class="panel-body">
<div id="recurring"></div>
<div id="recurring-chart"></div>
</div>
</div>
@ -117,15 +117,20 @@
</div>
@endforeach
</div>
</div>
</div>
@endif
@endif
@stop
@section('scripts')
{{HTML::script('assets/javascript/highcharts/highcharts.js')}}
{{HTML::script('assets/javascript/firefly/index.js')}}
@stop
@section('styles')
{{HTML::style('assets/stylesheets/highslide/highslide.css')}}
@stop
@stop
@section('scripts')
<!-- 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')}}
@stop
@section('styles')
@stop

View File

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