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

Expand some layouts to accept chartJS charts.

Browse Source
This commit is contained in:
James Cole
2015-06-27 16:00:50 +02:00
parent c581080f3f
commit 2194c4e0a9
13 changed files with 217 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
resources/twig/accounts/index.twig
View File

@@ -55,6 +55,10 @@
<script type="text/javascript" src="https://www.google.com/jsapi"></script>
<script type="text/javascript" src="js/gcharts.js"></script>
{% endif %}
{% if Config.get('firefly.chart') == 'chartjs' %}
<script type="text/javascript" src="js/Chart.min.js"></script>
<script type="text/javascript" src="js/charts.js"></script>
{% endif %}
<script type="text/javascript" src="js/bootstrap-sortable.js"></script>
<script type="text/javascript" src="js/accounts.js"></script>
{% endblock %}

9
resources/twig/accounts/show.twig
View File

@@ -24,7 +24,12 @@
</div>
</div>
<div class="box-body">
{% if Config.get('firefly.chart') == 'google' %}
<div id="overview-chart"></div>
{% endif %}
{% if Config.get('firefly.chart') == 'chartjs' %}
<canvas id="overview-chart" style="width:100%;height:400px;"></canvas>
{% endif %}
</div>
</div>
</div>
@@ -57,6 +62,10 @@
<script type="text/javascript" src="https://www.google.com/jsapi"></script>
<script type="text/javascript" src="js/gcharts.js"></script>
{% endif %}
{% if Config.get('firefly.chart') == 'chartjs' %}
<script type="text/javascript" src="js/Chart.min.js"></script>
<script type="text/javascript" src="js/charts.js"></script>
{% endif %}
<script src="js/jquery-ui.min.js" type="text/javascript"></script>
<script src="js/accounts.js" type="text/javascript"></script>

4
resources/twig/bills/show.twig
View File

@@ -114,6 +114,10 @@
<script type="text/javascript" src="https://www.google.com/jsapi"></script>
<script type="text/javascript" src="js/gcharts.js"></script>
{% endif %}
{% if Config.get('firefly.chart') == 'chartjs' %}
<script type="text/javascript" src="js/Chart.min.js"></script>
<script type="text/javascript" src="js/charts.js"></script>
{% endif %}
<script type="text/javascript" src="js/bills.js"></script>
{% endblock %}

4
resources/twig/budgets/show.twig
View File

@@ -111,6 +111,10 @@
<script type="text/javascript" src="https://www.google.com/jsapi"></script>
<script type="text/javascript" src="js/gcharts.js"></script>
{% endif %}
{% if Config.get('firefly.chart') == 'chartjs' %}
<script type="text/javascript" src="js/Chart.min.js"></script>
<script type="text/javascript" src="js/charts.js"></script>
{% endif %}
<script type="text/javascript" src="js/budgets.js"></script>
{% endblock %}

4
resources/twig/categories/index.twig
View File

@@ -39,6 +39,10 @@
<script type="text/javascript" src="https://www.google.com/jsapi"></script>
<script type="text/javascript" src="js/gcharts.js"></script>
{% endif %}
{% if Config.get('firefly.chart') == 'chartjs' %}
<script type="text/javascript" src="js/Chart.min.js"></script>
<script type="text/javascript" src="js/charts.js"></script>
{% endif %}
<script type="text/javascript" src="js/bootstrap-sortable.js"></script>
<script type="text/javascript" src="js/categories.js"></script>
{% endblock %}

4
resources/twig/categories/show.twig
View File

@@ -51,6 +51,10 @@
<script type="text/javascript" src="https://www.google.com/jsapi"></script>
<script type="text/javascript" src="js/gcharts.js"></script>
{% endif %}
{% if Config.get('firefly.chart') == 'chartjs' %}
<script type="text/javascript" src="js/Chart.min.js"></script>
<script type="text/javascript" src="js/charts.js"></script>
{% endif %}
<script type="text/javascript" src="js/categories.js"></script>
{% endblock %}

18
resources/twig/index.twig
View File

@@ -6,6 +6,8 @@
{% block content %}
{% include 'partials/boxes.twig' %}
<div class="row">
@@ -20,7 +22,12 @@
</div>
</div>
<div class="box-body">
<div id="accounts-chart"></div>
{% if Config.get('firefly.chart') == 'google' %}
<div id="accounts-chart"></div>
{% endif %}
{% if Config.get('firefly.chart') == 'chartjs' %}
<canvas id="accounts-chart" style="width:100%;height:400px;"></canvas>
{% endif %}
</div>
</div>
@@ -34,7 +41,12 @@
</div>
</div>
<div class="box-body">
<div id="budgets-chart"></div>
{% if Config.get('firefly.chart') == 'google' %}
<div id="budgets-chart"></div>
{% endif %}
{% if Config.get('firefly.chart') == 'chartjs' %}
<canvas id="accounts-chart" style="width:100%;height:400px;"></canvas>
{% endif %}
</div>
</div>
<!-- CATEGORIES -->
@@ -230,3 +242,5 @@
{% endif %}
<script type="text/javascript" src="js/index.js"></script>
{% endblock %}
{% block styles %}
{% endblock %}

4
resources/twig/piggy-banks/show.twig
View File

@@ -97,5 +97,9 @@
<script type="text/javascript" src="https://www.google.com/jsapi"></script>
<script type="text/javascript" src="js/gcharts.js"></script>
{% endif %}
{% if Config.get('firefly.chart') == 'chartjs' %}
<script type="text/javascript" src="js/Chart.min.js"></script>
<script type="text/javascript" src="js/charts.js"></script>
{% endif %}
<script type="text/javascript" src="js/piggy-banks.js"></script>
{% endblock %}

11
resources/twig/reports/month.twig
View File

@@ -13,7 +13,12 @@
<h3 class="box-title">{{ 'accountBalances'|_ }}</h3>
</div>
<div class="box-body">
<div id="account-balances-chart"></div>
{% if Config.get('firefly.chart') == 'google' %}
<div id="account-balances-chart"></div>
{% endif %}
{% if Config.get('firefly.chart') == 'chartjs' %}
<canvas id="account-balances-chart" style="width:100%;height:400px;"></canvas>
{% endif %}
</div>
</div>
</div>
@@ -72,6 +77,10 @@
<script type="text/javascript" src="https://www.google.com/jsapi"></script>
<script type="text/javascript" src="js/gcharts.js"></script>
{% endif %}
{% if Config.get('firefly.chart') == 'chartjs' %}
<script type="text/javascript" src="js/Chart.min.js"></script>
<script type="text/javascript" src="js/charts.js"></script>
{% endif %}
<script type="text/javascript">
var year = {{ start.year }};

4
resources/twig/reports/year.twig
View File

@@ -74,6 +74,10 @@
<script type="text/javascript" src="https://www.google.com/jsapi"></script>
<script type="text/javascript" src="js/gcharts.js"></script>
{% endif %}
{% if Config.get('firefly.chart') == 'chartjs' %}
<script type="text/javascript" src="js/Chart.min.js"></script>
<script type="text/javascript" src="js/charts.js"></script>
{% endif %}
<script type="text/javascript">
var year = '{{start.year}}';