kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-25 06:51:08 +00:00
Code Issues Projects Releases Wiki Activity

Remove Google references.

Browse Source
This commit is contained in:
James Cole
2015-12-18 16:37:02 +01:00
parent 08a53156bd
commit 56d36b7f53
12 changed files with 41 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -50,15 +50,8 @@
var what = '{{ what }}'; var what = '{{ what }}';
</script> </script>
<!-- load the libraries and scripts necessary for Google Charts: -->
{% 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>
{% endif %}
{% if Config.get('firefly.chart') == 'chartjs' %}
<script type="text/javascript" src="js/Chart.min.js"></script> <script type="text/javascript" src="js/Chart.min.js"></script>
<script type="text/javascript" src="js/charts.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/bootstrap-sortable.js"></script>
<script type="text/javascript" src="js/accounts.js"></script> <script type="text/javascript" src="js/accounts.js"></script>
{% endblock %} {% endblock %}

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

@@ -24,12 +24,7 @@
</div> </div>
</div> </div>
<div class="box-body"> <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> <canvas id="overview-chart" style="width:100%;height:400px;"></canvas>
{% endif %}
</div> </div>
</div> </div>
</div> </div>
@@ -57,15 +52,8 @@
<script type="text/javascript"> <script type="text/javascript">
var accountID = {{ account.id }}; var accountID = {{ account.id }};
</script> </script>
{% 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>
{% endif %}
{% if Config.get('firefly.chart') == 'chartjs' %}
<script type="text/javascript" src="js/Chart.min.js"></script> <script type="text/javascript" src="js/Chart.min.js"></script>
<script type="text/javascript" src="js/charts.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/jquery-ui.min.js" type="text/javascript"></script>
<script src="js/accounts.js" type="text/javascript"></script> <script src="js/accounts.js" type="text/javascript"></script>

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

@@ -85,13 +85,7 @@
<h3 class="box-title">Chart</h3> <h3 class="box-title">Chart</h3>
</div> </div>
<div class="box-body"> <div class="box-body">
{% if Config.get('firefly.chart') == 'google' %}
<div id="bill-overview"></div>
{% endif %}
{% if Config.get('firefly.chart') == 'chartjs' %}
<canvas id="bill-overview" style="width:100%;height:400px;"></canvas> <canvas id="bill-overview" style="width:100%;height:400px;"></canvas>
{% endif %}
</div> </div>
</div> </div>
</div> </div>
@@ -116,14 +110,7 @@
<script type="text/javascript"> <script type="text/javascript">
var billID = {{ bill.id }}; var billID = {{ bill.id }};
</script> </script>
{% 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>
{% endif %}
{% if Config.get('firefly.chart') == 'chartjs' %}
<script type="text/javascript" src="js/Chart.min.js"></script> <script type="text/javascript" src="js/Chart.min.js"></script>
<script type="text/javascript" src="js/charts.js"></script> <script type="text/javascript" src="js/charts.js"></script>
{% endif %}
<script type="text/javascript" src="js/bills.js"></script> <script type="text/javascript" src="js/bills.js"></script>
{% endblock %} {% endblock %}

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

@@ -27,12 +27,7 @@
</div> </div>
</div> </div>
<div class="box-body"> <div class="box-body">
{% if Config.get('firefly.chart') == 'google' %}
<div id="budgetOverview"></div>
{% endif %}
{% if Config.get('firefly.chart') == 'chartjs' %}
<canvas id="budgetOverview" style="width:100%;height:400px;"></canvas> <canvas id="budgetOverview" style="width:100%;height:400px;"></canvas>
{% endif %}
</div> </div>
</div> </div>
@@ -112,15 +107,8 @@
</script> </script>
<!-- load the libraries and scripts necessary for Google Charts: -->
{% 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>
{% endif %}
{% if Config.get('firefly.chart') == 'chartjs' %}
<script type="text/javascript" src="js/Chart.min.js"></script> <script type="text/javascript" src="js/Chart.min.js"></script>
<script type="text/javascript" src="js/charts.js"></script> <script type="text/javascript" src="js/charts.js"></script>
{% endif %}
<script type="text/javascript" src="js/budgets.js"></script> <script type="text/javascript" src="js/budgets.js"></script>
{% endblock %} {% endblock %}

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

@@ -35,14 +35,8 @@
{% endblock %} {% endblock %}
{% block scripts %} {% block scripts %}
{% 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>
{% endif %}
{% if Config.get('firefly.chart') == 'chartjs' %}
<script type="text/javascript" src="js/Chart.min.js"></script> <script type="text/javascript" src="js/Chart.min.js"></script>
<script type="text/javascript" src="js/charts.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/bootstrap-sortable.js"></script>
<script type="text/javascript" src="js/categories.js"></script> <script type="text/javascript" src="js/categories.js"></script>
{% endblock %} {% endblock %}

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

@@ -12,12 +12,7 @@
<h3 class="box-title">{{ 'overview'|_ }} (month)</h3> <h3 class="box-title">{{ 'overview'|_ }} (month)</h3>
</div> </div>
<div class="box-body"> <div class="box-body">
{% if Config.get('firefly.chart') == 'google' %}
<div id="period"></div>
{% endif %}
{% if Config.get('firefly.chart') == 'chartjs' %}
<canvas id="period" style="width:100%;height:350px;"></canvas> <canvas id="period" style="width:100%;height:350px;"></canvas>
{% endif %}
</div> </div>
</div> </div>
</div> </div>
@@ -27,12 +22,7 @@
<h3 class="box-title">{{ 'overview'|_ }} (all)</h3> <h3 class="box-title">{{ 'overview'|_ }} (all)</h3>
</div> </div>
<div class="box-body"> <div class="box-body">
{% if Config.get('firefly.chart') == 'google' %}
<div id="all"></div>
{% endif %}
{% if Config.get('firefly.chart') == 'chartjs' %}
<canvas id="all" style="width:100%;height:350px;"></canvas> <canvas id="all" style="width:100%;height:350px;"></canvas>
{% endif %}
</div> </div>
</div> </div>
</div> </div>
@@ -85,15 +75,8 @@
<script type="text/javascript"> <script type="text/javascript">
var categoryID = {{ category.id }}; var categoryID = {{ category.id }};
</script> </script>
<!-- load the libraries and scripts necessary for Google Charts: -->
{% 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>
{% endif %}
{% if Config.get('firefly.chart') == 'chartjs' %}
<script type="text/javascript" src="js/Chart.min.js"></script> <script type="text/javascript" src="js/Chart.min.js"></script>
<script type="text/javascript" src="js/charts.js"></script> <script type="text/javascript" src="js/charts.js"></script>
{% endif %}
<script type="text/javascript" src="js/categories.js"></script> <script type="text/javascript" src="js/categories.js"></script>
{% endblock %} {% endblock %}

12
resources/twig/categories/show_with_date.twig
View File

@@ -13,12 +13,7 @@
<h3 class="box-title">{{ 'overview'|_ }} (period)</h3> <h3 class="box-title">{{ 'overview'|_ }} (period)</h3>
</div> </div>
<div class="box-body"> <div class="box-body">
{% if Config.get('firefly.chart') == 'google' %}
<div id="period-specific-period"></div>
{% endif %}
{% if Config.get('firefly.chart') == 'chartjs' %}
<canvas id="period-specific-period" style="width:100%;height:350px;"></canvas> <canvas id="period-specific-period" style="width:100%;height:350px;"></canvas>
{% endif %}
</div> </div>
</div> </div>
</div> </div>
@@ -48,15 +43,8 @@
var categoryID = {{ category.id }}; var categoryID = {{ category.id }};
var categoryDate = "{{ carbon.format('Y-m-d') }}"; var categoryDate = "{{ carbon.format('Y-m-d') }}";
</script> </script>
<!-- load the libraries and scripts necessary for Google Charts: -->
{% 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>
{% endif %}
{% if Config.get('firefly.chart') == 'chartjs' %}
<script type="text/javascript" src="js/Chart.min.js"></script> <script type="text/javascript" src="js/Chart.min.js"></script>
<script type="text/javascript" src="js/charts.js"></script> <script type="text/javascript" src="js/charts.js"></script>
{% endif %}
<script type="text/javascript" src="js/categories.js"></script> <script type="text/javascript" src="js/categories.js"></script>
{% endblock %} {% endblock %}

38
resources/twig/index.twig
View File

@@ -22,12 +22,7 @@
</div> </div>
</div> </div>
<div class="box-body"> <div class="box-body">
{% 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> <canvas id="accounts-chart" style="width:100%;height:400px;"></canvas>
{% endif %}
</div> </div>
</div> </div>
@@ -41,12 +36,7 @@
</div> </div>
</div> </div>
<div class="box-body"> <div class="box-body">
{% if Config.get('firefly.chart') == 'google' %}
<div id="budgets-chart"></div>
{% endif %}
{% if Config.get('firefly.chart') == 'chartjs' %}
<canvas id="budgets-chart" style="width:100%;height:400px;"></canvas> <canvas id="budgets-chart" style="width:100%;height:400px;"></canvas>
{% endif %}
</div> </div>
</div> </div>
<!-- CATEGORIES --> <!-- CATEGORIES -->
@@ -59,12 +49,7 @@
</div> </div>
</div> </div>
<div class="box-body"> <div class="box-body">
{% if Config.get('firefly.chart') == 'google' %}
<div id="categories-chart"></div>
{% endif %}
{% if Config.get('firefly.chart') == 'chartjs' %}
<canvas id="categories-chart" style="width:100%;height:400px;"></canvas> <canvas id="categories-chart" style="width:100%;height:400px;"></canvas>
{% endif %}
</div> </div>
</div> </div>
</div> </div>
@@ -80,12 +65,7 @@
</div> </div>
</div> </div>
<div class="box-body"> <div class="box-body">
{% if Config.get('firefly.chart') == 'google' %}
<div id="bills-chart"></div>
{% endif %}
{% if Config.get('firefly.chart') == 'chartjs' %}
<canvas id="bills-chart" style="width:100%;height:250px;"></canvas> <canvas id="bills-chart" style="width:100%;height:250px;"></canvas>
{% endif %}
</div> </div>
</div> </div>
@@ -136,12 +116,7 @@
</div> </div>
</div> </div>
<div class="box-body"> <div class="box-body">
{% if Config.get('firefly.chart') == 'google' %}
<div id="expense-accounts-chart"></div>
{% endif %}
{% if Config.get('firefly.chart') == 'chartjs' %}
<canvas id="expense-accounts-chart" style="width:100%;height:400px;"></canvas> <canvas id="expense-accounts-chart" style="width:100%;height:400px;"></canvas>
{% endif %}
</div> </div>
</div> </div>
</div> </div>
@@ -163,7 +138,8 @@
{% else %} {% else %}
{% for account in savings %} {% for account in savings %}
<div class="row"> <div class="row">
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12"><h5><a href="{{ route('accounts.show', account.id) }}">{{ account.name }}</a></h5> <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12"><h5><a
href="{{ route('accounts.show', account.id) }}">{{ account.name }}</a></h5>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
@@ -230,7 +206,8 @@
{% else %} {% else %}
{% for account in piggyBankAccounts %} {% for account in piggyBankAccounts %}
<div class="row"> <div class="row">
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12"><h5><a href="{{ route('accounts.show', account.id) }}">{{ account.name }}</a></h5> <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12"><h5><a
href="{{ route('accounts.show', account.id) }}">{{ account.name }}</a></h5>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
@@ -275,16 +252,9 @@
</script> </script>
<!-- load the libraries and scripts necessary for Google Charts: -->
{% 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>
{% endif %}
{% if Config.get('firefly.chart') == 'chartjs' %}
<script type="text/javascript" src="js/Chart.min.js"></script> <script type="text/javascript" src="js/Chart.min.js"></script>
<script type="text/javascript" src="js/Chart.StackedBar.js"></script> <script type="text/javascript" src="js/Chart.StackedBar.js"></script>
<script type="text/javascript" src="js/charts.js"></script> <script type="text/javascript" src="js/charts.js"></script>
{% endif %}
<script type="text/javascript" src="js/index.js"></script> <script type="text/javascript" src="js/index.js"></script>
{% endblock %} {% endblock %}
{% block styles %} {% block styles %}

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

@@ -97,14 +97,7 @@
var piggyBankID = {{ piggyBank.id }}; var piggyBankID = {{ piggyBank.id }};
</script> </script>
<!-- load the libraries and scripts necessary for Google Charts: -->
{% 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>
{% endif %}
{% if Config.get('firefly.chart') == 'chartjs' %}
<script type="text/javascript" src="js/Chart.min.js"></script> <script type="text/javascript" src="js/Chart.min.js"></script>
<script type="text/javascript" src="js/charts.js"></script> <script type="text/javascript" src="js/charts.js"></script>
{% endif %}
<script type="text/javascript" src="js/piggy-banks.js"></script> <script type="text/javascript" src="js/piggy-banks.js"></script>
{% endblock %} {% endblock %}

9
resources/twig/reports/default/month.twig
View File

@@ -71,17 +71,8 @@
{% block scripts %} {% block scripts %}
<script type="text/javascript" src="js/bootstrap-sortable.js"></script> <script type="text/javascript" src="js/bootstrap-sortable.js"></script>
<!-- load the libraries and scripts necessary for Google Charts: -->
{% 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>
{% endif %}
{% if Config.get('firefly.chart') == 'chartjs' %}
<script type="text/javascript" src="js/Chart.min.js"></script> <script type="text/javascript" src="js/Chart.min.js"></script>
<script type="text/javascript" src="js/charts.js"></script> <script type="text/javascript" src="js/charts.js"></script>
{% endif %}
<script type="text/javascript"> <script type="text/javascript">
var year = {{ start.year }}; var year = {{ start.year }};
var month = {{ start.month }}; var month = {{ start.month }};

9
resources/twig/reports/default/multi-year.twig
View File

@@ -116,17 +116,8 @@
{% block scripts %} {% block scripts %}
<script type="text/javascript" src="js/bootstrap-sortable.js"></script> <script type="text/javascript" src="js/bootstrap-sortable.js"></script>
<!-- load the libraries and scripts necessary for Google Charts: -->
{% 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>
{% endif %}
{% if Config.get('firefly.chart') == 'chartjs' %}
<script type="text/javascript" src="js/Chart.min.js"></script> <script type="text/javascript" src="js/Chart.min.js"></script>
<script type="text/javascript" src="js/charts.js"></script> <script type="text/javascript" src="js/charts.js"></script>
{% endif %}
<script type="text/javascript"> <script type="text/javascript">
var year = {{ start.year }}; var year = {{ start.year }};
var month = {{ start.month }}; var month = {{ start.month }};

9
resources/twig/reports/default/year.twig
View File

@@ -98,18 +98,9 @@
{% endblock %} {% endblock %}
{% block scripts %} {% block scripts %}
<!-- load the libraries and scripts necessary for Google Charts: -->
{% 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>
{% endif %}
{% if Config.get('firefly.chart') == 'chartjs' %}
<script type="text/javascript" src="js/Chart.min.js"></script> <script type="text/javascript" src="js/Chart.min.js"></script>
<script type="text/javascript" src="js/Chart.StackedBar.js"></script> <script type="text/javascript" src="js/Chart.StackedBar.js"></script>
<script type="text/javascript" src="js/charts.js"></script> <script type="text/javascript" src="js/charts.js"></script>
{% endif %}
<script type="text/javascript"> <script type="text/javascript">
var year = '{{start.year}}'; var year = '{{start.year}}';