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

Added option for other charts (chartJS currently).

Browse Source
This commit is contained in:
James Cole
2015-06-27 12:21:04 +02:00
parent f6b1ec27e5
commit c581080f3f
5 changed files with 60 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
resources/twig/index.twig
View File

@@ -223,8 +223,10 @@
{% if Config.get('firefly.chart') == 'google' %}
<script type="text/javascript" src="https://www.google.com/jsapi"></script>
<script type="text/javascript" src="js/gcharts.js"></script>
{% else %}
<!-- no google-->
{% 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/index.js"></script>
{% endblock %}

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

@@ -77,8 +77,7 @@
<script type="text/javascript">
var year = '{{start.year}}';
var shared = {% if shared %}'/shared'
{% else %}''{% endif %};
var shared = {% if shared %}'/shared'{% else %}''{% endif %};
var incomeTopLength = {{ incomeTopLength }};
var expenseTopLength = {{ expenseTopLength }};
var incomeRestShow = false; // starts hidden.