IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-09 23:15:45 -06:00
Code Issues Packages Projects Releases Wiki Activity

Easier upgrade, include FF version in JS

Browse Source
This commit is contained in:
James Cole 2017-09-12 19:59:07 +02:00
parent 158bf06efb
commit 4f934e54cf
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
52 changed files with 181 additions and 181 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
resources/views/accounts/create.twig
View File

@ -68,8 +68,8 @@
</form>
{% endblock %}
{% block scripts %}
<script type="text/javascript" src="js/lib/modernizr-custom.js"></script>
<script type="text/javascript" src="js/lib/jquery-ui.min.js"></script>
<script type="text/javascript" src="js/lib/modernizr-custom.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/lib/jquery-ui.min.js?v={{ FF_VERSION }}"></script>
{# JS currency list for update thing #}
<script type="text/javascript">
var currencies = [];
@ -77,7 +77,7 @@
currencies[{{ currency.id }}] = "{{ currency.symbol }}";
{% endfor %}
</script>
<script type="text/javascript" src="js/ff/accounts/create.js"></script>
<script type="text/javascript" src="js/ff/accounts/create.js?v={{ FF_VERSION }}"></script>
{% endblock %}
{% block styles %}

6
resources/views/accounts/edit.twig
View File

@ -84,8 +84,8 @@
{{ Form.close|raw }}
{% endblock %}
{% block scripts %}
<script type="text/javascript" src="js/lib/modernizr-custom.js"></script>
<script type="text/javascript" src="js/lib/jquery-ui.min.js"></script>
<script type="text/javascript" src="js/lib/modernizr-custom.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/lib/jquery-ui.min.js?v={{ FF_VERSION }}"></script>
{# JS currency list for update thing #}
<script type="text/javascript">
@ -95,7 +95,7 @@
{% endfor %}
</script>
<script type="text/javascript" src="js/ff/accounts/edit.js"></script>
<script type="text/javascript" src="js/ff/accounts/edit.js?v={{ FF_VERSION }}"></script>
{% endblock %}
{% block styles %}

2
resources/views/accounts/index.twig
View File

@ -45,5 +45,5 @@
<script type="text/javascript">
var what = '{{ what|escape }}';
</script>
<script type="text/javascript" src="js/lib/bootstrap-sortable.js"></script>
<script type="text/javascript" src="js/lib/bootstrap-sortable.js?v={{ FF_VERSION }}"></script>
{% endblock %}

14
resources/views/accounts/show.twig
View File

@ -164,12 +164,12 @@
</script>
<script type="text/javascript" src="js/lib/Chart.bundle.min.js"></script>
<script type="text/javascript" src="js/ff/charts.defaults.js"></script>
<script type="text/javascript" src="js/ff/charts.js"></script>
<script type="text/javascript" src="js/lib/Chart.bundle.min.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/ff/charts.defaults.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/ff/charts.js?v={{ FF_VERSION }}"></script>
<script src="js/lib/jquery-ui.min.js" type="text/javascript"></script>
<script src="js/lib/jquery.color-2.1.2.min.js" type="text/javascript"></script>
<script src="js/ff/accounts/show.js" type="text/javascript"></script>
<script type="text/javascript" src="js/ff/transactions/list.js"></script>
<script src="js/lib/jquery-ui.min.js?v={{ FF_VERSION }}" type="text/javascript"></script>
<script src="js/lib/jquery.color-2.1.2.min.js?v={{ FF_VERSION }}" type="text/javascript"></script>
<script src="js/ff/accounts/show.js?v={{ FF_VERSION }}" type="text/javascript"></script>
<script type="text/javascript" src="js/ff/transactions/list.js?v={{ FF_VERSION }}"></script>
{% endblock %}

2
resources/views/admin/link/index.twig
View File

@ -58,7 +58,7 @@
{% endblock %}
{% block scripts %}
<script type="text/javascript" src="js/lib/bootstrap-sortable.js"></script>
<script type="text/javascript" src="js/lib/bootstrap-sortable.js?v={{ FF_VERSION }}"></script>
{% endblock %}
{% block styles %}

2
resources/views/admin/link/show.twig
View File

@ -54,7 +54,7 @@
{% endblock %}
{% block scripts %}
<script type="text/javascript" src="js/lib/bootstrap-sortable.js"></script>
<script type="text/javascript" src="js/lib/bootstrap-sortable.js?v={{ FF_VERSION }}"></script>
{% endblock %}
{% block styles %}

2
resources/views/admin/users/index.twig
View File

@ -88,5 +88,5 @@
<link rel="stylesheet" href="css/bootstrap-sortable.css" type="text/css" media="all"/>
{% endblock %}
{% block scripts %}
<script type="text/javascript" src="js/lib/bootstrap-sortable.js"></script>
<script type="text/javascript" src="js/lib/bootstrap-sortable.js?v={{ FF_VERSION }}"></script>
{% endblock %}

8
resources/views/bills/create.twig
View File

@ -65,8 +65,8 @@
<link href="css/jquery-ui/jquery-ui.theme.min.css" type="text/css" rel="stylesheet" media="all">
{% endblock %}
{% block scripts %}
<script type="text/javascript" src="js/lib/bootstrap-tagsinput.min.js"></script>
<script type="text/javascript" src="js/lib/modernizr-custom.js"></script>
<script type="text/javascript" src="js/lib/jquery-ui.min.js"></script>
<script type="text/javascript" src="js/ff/bills/create.js"></script>
<script type="text/javascript" src="js/lib/bootstrap-tagsinput.min.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/lib/modernizr-custom.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/lib/jquery-ui.min.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/ff/bills/create.js?v={{ FF_VERSION }}"></script>
{% endblock %}

8
resources/views/bills/edit.twig
View File

@ -64,8 +64,8 @@
<link href="css/jquery-ui/jquery-ui.theme.min.css" type="text/css" rel="stylesheet" media="all">
{% endblock %}
{% block scripts %}
<script type="text/javascript" src="js/lib/bootstrap-tagsinput.min.js"></script>
<script type="text/javascript" src="js/lib/modernizr-custom.js"></script>
<script type="text/javascript" src="js/lib/jquery-ui.min.js"></script>
<script type="text/javascript" src="js/ff/accounts/edit.js"></script>
<script type="text/javascript" src="js/lib/bootstrap-tagsinput.min.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/lib/modernizr-custom.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/lib/jquery-ui.min.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/ff/accounts/edit.js?v={{ FF_VERSION }}"></script>
{% endblock %}

10
resources/views/bills/show.twig
View File

@ -125,9 +125,9 @@
<script type="text/javascript">
var billUri = '{{ route('chart.bill.single', [bill.id]) }}';
</script>
<script type="text/javascript" src="js/lib/Chart.bundle.min.js"></script>
<script type="text/javascript" src="js/ff/charts.defaults.js"></script>
<script type="text/javascript" src="js/ff/charts.js"></script>
<script type="text/javascript" src="js/ff/bills/show.js"></script>
<script type="text/javascript" src="js/ff/transactions/list.js"></script>
<script type="text/javascript" src="js/lib/Chart.bundle.min.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/ff/charts.defaults.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/ff/charts.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/ff/bills/show.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/ff/transactions/list.js?v={{ FF_VERSION }}"></script>
{% endblock %}

4
resources/views/budgets/index.twig
View File

@ -235,6 +235,6 @@
var periodStart = "{{ start.format('Y-m-d') }}";
var periodEnd = "{{ end.format('Y-m-d') }}";
</script>
<script type="text/javascript" src="js/lib/bootstrap-sortable.js"></script>
<script type="text/javascript" src="js/ff/budgets/index.js"></script>
<script type="text/javascript" src="js/lib/bootstrap-sortable.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/ff/budgets/index.js?v={{ FF_VERSION }}"></script>
{% endblock %}

2
resources/views/budgets/no-budget.twig
View File

@ -78,5 +78,5 @@
{% endblock %}
{% block scripts %}
<script type="text/javascript" src="js/ff/transactions/list.js"></script>
<script type="text/javascript" src="js/ff/transactions/list.js?v={{ FF_VERSION }}"></script>
{% endblock %}

10
resources/views/budgets/show.twig
View File

@ -171,9 +171,9 @@
{% endif %}
</script>
<script type="text/javascript" src="js/lib/Chart.bundle.min.js"></script>
<script type="text/javascript" src="js/ff/charts.defaults.js"></script>
<script type="text/javascript" src="js/ff/charts.js"></script>
<script type="text/javascript" src="js/ff/budgets/show.js"></script>
<script type="text/javascript" src="js/ff/transactions/list.js"></script>
<script type="text/javascript" src="js/lib/Chart.bundle.min.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/ff/charts.defaults.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/ff/charts.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/ff/budgets/show.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/ff/transactions/list.js?v={{ FF_VERSION }}"></script>
{% endblock %}

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

@ -39,6 +39,6 @@
{% endblock %}
{% block scripts %}
<script type="text/javascript" src="js/lib/bootstrap-sortable.js"></script>
<script type="text/javascript" src="js/ff/categories/index.js"></script>
<script type="text/javascript" src="js/lib/bootstrap-sortable.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/ff/categories/index.js?v={{ FF_VERSION }}"></script>
{% endblock %}

2
resources/views/categories/no-category.twig
View File

@ -92,5 +92,5 @@
{% endblock %}
{% block scripts %}
<script type="text/javascript" src="js/ff/transactions/list.js"></script>
<script type="text/javascript" src="js/ff/transactions/list.js?v={{ FF_VERSION }}"></script>
{% endblock %}

10
resources/views/categories/show.twig
View File

@ -135,9 +135,9 @@
var everything = '{{ route('chart.category.all', [category.id]) }}';
var specific = '{{ route('chart.category.specific', [category.id, start.format('Ymd')]) }}';
</script>
<script type="text/javascript" src="js/lib/Chart.bundle.min.js"></script>
<script type="text/javascript" src="js/ff/charts.defaults.js"></script>
<script type="text/javascript" src="js/ff/charts.js"></script>
<script type="text/javascript" src="js/ff/categories/show.js"></script>
<script type="text/javascript" src="js/ff/transactions/list.js"></script>
<script type="text/javascript" src="js/lib/Chart.bundle.min.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/ff/charts.defaults.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/ff/charts.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/ff/categories/show.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/ff/transactions/list.js?v={{ FF_VERSION }}"></script>
{% endblock %}

6
resources/views/export/index.twig
View File

@ -102,9 +102,9 @@
<script type="text/javascript">
var jobKey = "{{ job.key|escape }}";
</script>
<script type="text/javascript" src="js/lib/modernizr-custom.js"></script>
<script type="text/javascript" src="js/lib/jquery-ui.min.js"></script>
<script type="text/javascript" src="js/ff/export/index.js"></script>
<script type="text/javascript" src="js/lib/modernizr-custom.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/lib/jquery-ui.min.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/ff/export/index.js?v={{ FF_VERSION }}"></script>
{% endblock %}
{% block styles %}
<link href="css/jquery-ui/jquery-ui.structure.min.css" type="text/css" rel="stylesheet" media="all">

2
resources/views/import/file/status.twig
View File

@ -151,7 +151,7 @@
var jobStartUrl = '{{ route('import.file.start', [job.key]) }}';
var token = '{{ csrf_token() }}';
</script>
<script type="text/javascript" src="js/ff/import/status.js"></script>
<script type="text/javascript" src="js/ff/import/status.js?v={{ FF_VERSION }}"></script>
{% endblock %}
{% block styles %}
{% endblock %}

8
resources/views/index.twig
View File

@ -138,10 +138,10 @@
var accountExpenseUri = '{{ route('chart.account.expense') }}';
</script>
<script type="text/javascript" src="js/lib/Chart.bundle.min.js"></script>
<script type="text/javascript" src="js/ff/charts.defaults.js"></script>
<script type="text/javascript" src="js/ff/charts.js"></script>
<script type="text/javascript" src="js/ff/index.js"></script>
<script type="text/javascript" src="js/lib/Chart.bundle.min.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/ff/charts.defaults.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/ff/charts.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/ff/index.js?v={{ FF_VERSION }}"></script>
{% endblock %}
{% block styles %}
{% endblock %}

26
resources/views/layout/default.twig
View File

@ -30,8 +30,8 @@
{% block styles %}{% endblock %}
<!--[if lt IE 9]>
<script src="js/lib/html5shiv.min.js"></script>
<script src="js/lib/respond.min.js"></script>
<script src="js/lib/html5shiv.min.js?v={{ FF_VERSION }}"></script>
<script src="js/lib/respond.min.js?v={{ FF_VERSION }}"></script>
<![endif]-->
<script type="text/javascript">
var forceDemoOff = false;
@ -179,23 +179,23 @@
</div>
</div>
<script src="js/lib/jquery-3.1.1.min.js" type="text/javascript"></script>
<script src="lib/bootstrap/js/bootstrap.min.js" type="text/javascript"></script>
<script src="js/lib/moment.min.js" type="text/javascript"></script>
<script src="js/lib/daterangepicker.js" type="text/javascript"></script>
<script src="lib/adminlte/js/app.min.js" type="text/javascript"></script>
<script type="text/javascript" src="js/lib/accounting.min.js"></script>
<script src="{{ route('javascript.variables') }}?ext=.js" type="text/javascript"></script>
<script type="text/javascript" src="js/ff/firefly.js"></script>
<script type="text/javascript" src="js/ff/help.js"></script>
<script src="js/lib/jquery-3.1.1.min.js?v={{ FF_VERSION }}" type="text/javascript"></script>
<script src="lib/bootstrap/js/bootstrap.min.js?v={{ FF_VERSION }}" type="text/javascript"></script>
<script src="js/lib/moment.min.js?v={{ FF_VERSION }}" type="text/javascript"></script>
<script src="js/lib/daterangepicker.js?v={{ FF_VERSION }}" type="text/javascript"></script>
<script src="lib/adminlte/js/app.min.js?v={{ FF_VERSION }}" type="text/javascript"></script>
<script type="text/javascript" src="js/lib/accounting.min.js?v={{ FF_VERSION }}"></script>
<script src="{{ route('javascript.variables') }}?ext=.js&amp;v={{ FF_VERSION }}" type="text/javascript"></script>
<script type="text/javascript" src="js/ff/firefly.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/ff/help.js?v={{ FF_VERSION }}"></script>
{% if not shownDemo %}
<script type="text/javascript">
var routeForTour = "{{ current_route_name }}";
var routeStepsUri = "{{ route('json.intro', [current_route_name, what|default("")]) }}";
var routeForFinishedTour = "{{ route('json.intro.finished', [current_route_name, what|default("")]) }}";
</script>
<script type="text/javascript" src="lib/intro/intro.min.js"></script>
<script type="text/javascript" src="js/ff/intro/intro.js"></script>
<script type="text/javascript" src="lib/intro/intro.min.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/ff/intro/intro.js?v={{ FF_VERSION }}"></script>
{% endif %}
{% block scripts %}{% endblock %}

8
resources/views/layout/empty.twig
View File

@ -12,8 +12,8 @@
<link href="lib/adminlte/css/AdminLTE.min.css" rel="stylesheet" type="text/css"/>
<!--[if lt IE 9]>
<script src="js/lib/html5shiv.min.js"></script>
<script src="js/lib/respond.min.js"></script>
<script src="js/lib/html5shiv.min.js?v={{ FF_VERSION }}"></script>
<script src="js/lib/respond.min.js?v={{ FF_VERSION }}"></script>
<![endif]-->
{# favicons #}
@ -28,8 +28,8 @@
{% block content %}{% endblock %}
</div>
<!-- /.login-box -->
<script type="text/javascript" src="js/lib/jquery-3.1.1.min.js"></script>
<script type="text/javascript" src="lib/bootstrap/js/bootstrap.min.js"></script>
<script type="text/javascript" src="js/lib/jquery-3.1.1.min.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="lib/bootstrap/js/bootstrap.min.js?v={{ FF_VERSION }}"></script>
{% if env('ANALYTICS_ID','') != '' %}
<script>

10
resources/views/layout/guest.twig
View File

@ -22,8 +22,8 @@
<link href="css/firefly.css" rel="stylesheet" type="text/css"/>
<!--[if lt IE 9]>
<script src="js/lib/html5shiv.min.js"></script>
<script src="js/lib/respond.min.js"></script>
<script src="js/lib/html5shiv.min.js?v={{ FF_VERSION }}"></script>
<script src="js/lib/respond.min.js?v={{ FF_VERSION }}"></script>
<![endif]-->
{# favicons #}
@ -38,9 +38,9 @@
{% block content %}{% endblock %}
</div>
<!-- /.login-box -->
<script type="text/javascript" src="js/lib/jquery-3.1.1.min.js"></script>
<script type="text/javascript" src="lib/bootstrap/js/bootstrap.min.js"></script>
<script type="text/javascript" src="js/ff/guest.js"></script>
<script type="text/javascript" src="js/lib/jquery-3.1.1.min.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="lib/bootstrap/js/bootstrap.min.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/ff/guest.js?v={{ FF_VERSION }}"></script>
{% if env('ANALYTICS_ID','') != '' %}
<script>

6
resources/views/piggy-banks/create.twig
View File

@ -55,9 +55,9 @@
</form>
{% endblock %}
{% block scripts %}
<script type="text/javascript" src="js/lib/modernizr-custom.js"></script>
<script type="text/javascript" src="js/lib/jquery-ui.min.js"></script>
<script type="text/javascript" src="js/ff/piggy-banks/create.js"></script>
<script type="text/javascript" src="js/lib/modernizr-custom.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/lib/jquery-ui.min.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/ff/piggy-banks/create.js?v={{ FF_VERSION }}"></script>
{% endblock %}
{% block styles %}

6
resources/views/piggy-banks/edit.twig
View File

@ -57,9 +57,9 @@
{{ Form.close|raw }}
{% endblock %}
{% block scripts %}
<script type="text/javascript" src="js/lib/modernizr-custom.js"></script>
<script type="text/javascript" src="js/lib/jquery-ui.min.js"></script>
<script type="text/javascript" src="js/ff/piggy-banks/create.js"></script>
<script type="text/javascript" src="js/lib/modernizr-custom.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/lib/jquery-ui.min.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/ff/piggy-banks/create.js?v={{ FF_VERSION }}"></script>
{% endblock %}
{% block styles %}

4
resources/views/piggy-banks/index.twig
View File

@ -59,6 +59,6 @@
{% endif %}
{% endblock %}
{% block scripts %}
<script src="js/lib/jquery-ui.min.js" type="text/javascript"></script>
<script type="text/javascript" src="js/ff/piggy-banks/index.js"></script>
<script src="js/lib/jquery-ui.min.js?v={{ FF_VERSION }}" type="text/javascript"></script>
<script type="text/javascript" src="js/ff/piggy-banks/index.js?v={{ FF_VERSION }}"></script>
{% endblock %}

8
resources/views/piggy-banks/show.twig
View File

@ -114,8 +114,8 @@
var piggyBankID = {{ piggyBank.id }};
</script>
<script type="text/javascript" src="js/lib/Chart.bundle.min.js"></script>
<script type="text/javascript" src="js/ff/charts.defaults.js"></script>
<script type="text/javascript" src="js/ff/charts.js"></script>
<script type="text/javascript" src="js/ff/piggy-banks/show.js"></script>
<script type="text/javascript" src="js/lib/Chart.bundle.min.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/ff/charts.defaults.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/ff/charts.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/ff/piggy-banks/show.js?v={{ FF_VERSION }}"></script>
{% endblock %}

6
resources/views/preferences/index.twig
View File

@ -273,9 +273,9 @@
</form>
{% endblock %}
{% block scripts %}
<script type="text/javascript" src="js/lib/modernizr-custom.js"></script>
<script type="text/javascript" src="js/lib/jquery-ui.min.js"></script>
<script type="text/javascript" src="js/ff/preferences/index.js"></script>
<script type="text/javascript" src="js/lib/modernizr-custom.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/lib/jquery-ui.min.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/ff/preferences/index.js?v={{ FF_VERSION }}"></script>
{% endblock %}
{% block styles %}

2
resources/views/reports/audit/report.twig
View File

@ -86,5 +86,5 @@
<script type="text/javascript">
var hideable = {{ hideable|json_encode|raw }};
</script>
<script type="text/javascript" src="js/ff/reports/audit/all.js"></script>
<script type="text/javascript" src="js/ff/reports/audit/all.js?v={{ FF_VERSION }}"></script>
{% endblock %}

12
resources/views/reports/budget/month.twig
View File

@ -241,10 +241,10 @@
{% endblock %}
{% block scripts %}
<script type="text/javascript" src="js/lib/Chart.bundle.min.js"></script>
<script type="text/javascript" src="js/ff/charts.defaults.js"></script>
<script type="text/javascript" src="js/ff/charts.js"></script>
<script type="text/javascript" src="js/lib/bootstrap-sortable.js"></script>
<script type="text/javascript" src="js/lib/Chart.bundle.min.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/ff/charts.defaults.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/ff/charts.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/lib/bootstrap-sortable.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript">
// to report another URL:
@ -260,8 +260,8 @@
</script>
<script type="text/javascript" src="js/ff/reports/budget/all.js"></script>
<script type="text/javascript" src="js/ff/reports/budget/month.js"></script>
<script type="text/javascript" src="js/ff/reports/budget/all.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/ff/reports/budget/month.js?v={{ FF_VERSION }}"></script>
{% endblock %}

12
resources/views/reports/category/month.twig
View File

@ -376,10 +376,10 @@
{% endblock %}
{% block scripts %}
<script type="text/javascript" src="js/lib/Chart.bundle.min.js"></script>
<script type="text/javascript" src="js/ff/charts.defaults.js"></script>
<script type="text/javascript" src="js/ff/charts.js"></script>
<script type="text/javascript" src="js/lib/bootstrap-sortable.js"></script>
<script type="text/javascript" src="js/lib/Chart.bundle.min.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/ff/charts.defaults.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/ff/charts.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/lib/bootstrap-sortable.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript">
// to report another URL:
@ -397,8 +397,8 @@
</script>
<script type="text/javascript" src="js/ff/reports/category/all.js"></script>
<script type="text/javascript" src="js/ff/reports/category/month.js"></script>
<script type="text/javascript" src="js/ff/reports/category/all.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/ff/reports/category/month.js?v={{ FF_VERSION }}"></script>
{% endblock %}

12
resources/views/reports/default/month.twig
View File

@ -144,10 +144,10 @@
{% endblock %}
{% block scripts %}
<script type="text/javascript" src="js/lib/bootstrap-sortable.js"></script>
<script type="text/javascript" src="js/lib/Chart.bundle.min.js"></script>
<script type="text/javascript" src="js/ff/charts.defaults.js"></script>
<script type="text/javascript" src="js/ff/charts.js"></script>
<script type="text/javascript" src="js/lib/bootstrap-sortable.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/lib/Chart.bundle.min.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/ff/charts.defaults.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/ff/charts.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript">
var year = {{ start.year }};
var month = {{ start.month }};
@ -171,6 +171,6 @@
var accountChartUri = '{{ route('chart.account.report', [accountIds, start.format('Ymd'), end.format('Ymd')]) }}';
</script>
<script type="text/javascript" src="js/ff/reports/default/all.js"></script>
<script type="text/javascript" src="js/ff/reports/default/month.js"></script>
<script type="text/javascript" src="js/ff/reports/default/all.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/ff/reports/default/month.js?v={{ FF_VERSION }}"></script>
{% endblock %}

12
resources/views/reports/default/multi-year.twig
View File

@ -193,10 +193,10 @@
{% endblock %}
{% block scripts %}
<script type="text/javascript" src="js/lib/bootstrap-sortable.js"></script>
<script type="text/javascript" src="js/lib/Chart.bundle.min.js"></script>
<script type="text/javascript" src="js/ff/charts.defaults.js"></script>
<script type="text/javascript" src="js/ff/charts.js"></script>
<script type="text/javascript" src="js/lib/bootstrap-sortable.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/lib/Chart.bundle.min.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/ff/charts.defaults.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/ff/charts.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript">
var year = {{ start.year }};
var month = {{ start.month }};
@ -222,6 +222,6 @@
var categoryIncomeUri = '{{ route('report-data.category.income', [accountIds, start.format('Ymd'), end.format('Ymd')]) }}';
</script>
<script type="text/javascript" src="js/ff/reports/default/all.js"></script>
<script type="text/javascript" src="js/ff/reports/default/multi-year.js"></script>
<script type="text/javascript" src="js/ff/reports/default/all.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/ff/reports/default/multi-year.js?v={{ FF_VERSION }}"></script>
{% endblock %}

12
resources/views/reports/default/year.twig
View File

@ -188,10 +188,10 @@
{% endblock %}
{% block scripts %}
<script type="text/javascript" src="js/lib/bootstrap-sortable.js"></script>
<script type="text/javascript" src="js/lib/Chart.bundle.min.js"></script>
<script type="text/javascript" src="js/ff/charts.defaults.js"></script>
<script type="text/javascript" src="js/ff/charts.js"></script>
<script type="text/javascript" src="js/lib/bootstrap-sortable.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/lib/Chart.bundle.min.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/ff/charts.defaults.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/ff/charts.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript">
var year = '{{ start.year }}';
@ -218,8 +218,8 @@
</script>
<script type="text/javascript" src="js/ff/reports/default/all.js"></script>
<script type="text/javascript" src="js/ff/reports/default/year.js"></script>
<script type="text/javascript" src="js/ff/reports/default/all.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/ff/reports/default/year.js?v={{ FF_VERSION }}"></script>
{% endblock %}
{% block styles %}

4
resources/views/reports/index.twig
View File

@ -177,6 +177,6 @@
var allSelectedText = "{{ 'multi_select_all_selected'|_ }}";
var filterPlaceholder = "{{ 'multi_select_filter_placeholder'|_ }}";
</script>
<script type="text/javascript" src="js/lib/bootstrap-multiselect.js"></script>
<script type="text/javascript" src="js/ff/reports/index.js"></script>
<script type="text/javascript" src="js/lib/bootstrap-multiselect.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/ff/reports/index.js?v={{ FF_VERSION }}"></script>
{% endblock %}

12
resources/views/reports/tag/month.twig
View File

@ -398,10 +398,10 @@
{% endblock %}
{% block scripts %}
<script type="text/javascript" src="js/lib/Chart.bundle.min.js"></script>
<script type="text/javascript" src="js/ff/charts.defaults.js"></script>
<script type="text/javascript" src="js/ff/charts.js"></script>
<script type="text/javascript" src="js/lib/bootstrap-sortable.js"></script>
<script type="text/javascript" src="js/lib/Chart.bundle.min.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/ff/charts.defaults.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/ff/charts.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/lib/bootstrap-sortable.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript">
// to report another URL:
@ -423,8 +423,8 @@
</script>
<script type="text/javascript" src="js/ff/reports/tag/all.js"></script>
<script type="text/javascript" src="js/ff/reports/tag/month.js"></script>
<script type="text/javascript" src="js/ff/reports/tag/all.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/ff/reports/tag/month.js?v={{ FF_VERSION }}"></script>
{% endblock %}

4
resources/views/rules/index.twig
View File

@ -202,6 +202,6 @@
{% endblock %}
{% block scripts %}
<script type="text/javascript" src="js/lib/jquery-ui.min.js"></script>
<script type="text/javascript" src="js/ff/rules/index.js"></script>
<script type="text/javascript" src="js/lib/jquery-ui.min.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/ff/rules/index.js?v={{ FF_VERSION }}"></script>
{% endblock %}

6
resources/views/rules/rule-group/select-transactions.twig
View File

@ -41,9 +41,9 @@
</form>
{% endblock %}
{% block scripts %}
<script type="text/javascript" src="js/lib/modernizr-custom.js"></script>
<script type="text/javascript" src="js/lib/jquery-ui.min.js"></script>
<script type="text/javascript" src="js/ff/rules/select-transactions.js"></script>
<script type="text/javascript" src="js/lib/modernizr-custom.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/lib/jquery-ui.min.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/ff/rules/select-transactions.js?v={{ FF_VERSION }}"></script>
{% endblock %}
{% block styles %}

4
resources/views/rules/rule/create.twig
View File

@ -127,12 +127,12 @@
{% endblock %}
{% block scripts %}
<script type="text/javascript" src="js/lib/bootstrap3-typeahead.min.js"></script>
<script type="text/javascript" src="js/lib/bootstrap3-typeahead.min.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript">
var triggerCount = {{ triggerCount }};
var actionCount = {{ actionCount }};
</script>
<script type="text/javascript" src="js/ff/rules/create-edit.js"></script>
<script type="text/javascript" src="js/ff/rules/create-edit.js?v={{ FF_VERSION }}"></script>
{% endblock %}
{% block styles %}

4
resources/views/rules/rule/edit.twig
View File

@ -127,11 +127,11 @@
{% endblock %}
{% block scripts %}
<script type="text/javascript" src="js/lib/bootstrap3-typeahead.min.js"></script>
<script type="text/javascript" src="js/lib/bootstrap3-typeahead.min.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript">
var triggerCount = {{ triggerCount }};
var actionCount = {{ actionCount }};
</script>
<script type="text/javascript" src="js/ff/rules/create-edit.js"></script>
<script type="text/javascript" src="js/ff/rules/create-edit.js?v={{ FF_VERSION }}"></script>
{% endblock %}

6
resources/views/rules/rule/select-transactions.twig
View File

@ -41,9 +41,9 @@
</form>
{% endblock %}
{% block scripts %}
<script type="text/javascript" src="js/lib/modernizr-custom.js"></script>
<script type="text/javascript" src="js/lib/jquery-ui.min.js"></script>
<script type="text/javascript" src="js/ff/rules/select-transactions.js"></script>
<script type="text/javascript" src="js/lib/modernizr-custom.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/lib/jquery-ui.min.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/ff/rules/select-transactions.js?v={{ FF_VERSION }}"></script>
{% endblock %}
{% block styles %}

2
resources/views/search/index.twig
View File

@ -93,5 +93,5 @@
var searchQuery = "{{ fullQuery|escape('js') }}";
var searchUri = "{{ route('search.search') }}";
</script>
<script type="text/javascript" src="js/ff/search/index.js"></script>
<script type="text/javascript" src="js/ff/search/index.js?v={{ FF_VERSION }}"></script>
{% endblock %}

6
resources/views/tags/create.twig
View File

@ -83,9 +83,9 @@
</script>
<script src="https://maps.googleapis.com/maps/api/js?v=3&amp;key={{ apiKey }}"></script>
<script type="text/javascript" src="js/lib/modernizr-custom.js"></script>
<script type="text/javascript" src="js/lib/jquery-ui.min.js"></script>
<script src="js/ff/tags/create-edit.js"></script>
<script type="text/javascript" src="js/lib/modernizr-custom.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/lib/jquery-ui.min.js?v={{ FF_VERSION }}"></script>
<script src="js/ff/tags/create-edit.js?v={{ FF_VERSION }}"></script>
{% endblock %}
{% block styles %}
<link href="css/jquery-ui/jquery-ui.structure.min.css" type="text/css" rel="stylesheet" media="all">

6
resources/views/tags/edit.twig
View File

@ -86,9 +86,9 @@
</script>
<script src="https://maps.googleapis.com/maps/api/js?v=3&amp;key={{ apiKey }}"></script>
<script type="text/javascript" src="js/lib/modernizr-custom.js"></script>
<script type="text/javascript" src="js/lib/jquery-ui.min.js"></script>
<script src="js/ff/tags/create-edit.js"></script>
<script type="text/javascript" src="js/lib/modernizr-custom.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/lib/jquery-ui.min.js?v={{ FF_VERSION }}"></script>
<script src="js/ff/tags/create-edit.js?v={{ FF_VERSION }}"></script>
{% endblock %}
{% block styles %}
<link href="css/jquery-ui/jquery-ui.structure.min.css" type="text/css" rel="stylesheet" media="all">

2
resources/views/tags/index.twig
View File

@ -87,5 +87,5 @@
{% endblock %}
{% block scripts %}
<script src="js/ff/tags/index.js"></script>
<script src="js/ff/tags/index.js?v={{ FF_VERSION }}"></script>
{% endblock %}

4
resources/views/tags/show.twig
View File

@ -183,6 +183,6 @@
var apiKey = "{{ apiKey }}";
</script>
<script src="https://maps.googleapis.com/maps/api/js?v=3&amp;key={{ apiKey }}"></script>
<script src="js/ff/tags/show.js"></script>
<script type="text/javascript" src="js/ff/transactions/list.js"></script>
<script src="js/ff/tags/show.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/ff/transactions/list.js?v={{ FF_VERSION }}"></script>
{% endblock %}

4
resources/views/transactions/convert.twig
View File

@ -217,8 +217,8 @@
{% endblock %}
{% block scripts %}
<script type="text/javascript" src="js/lib/bootstrap3-typeahead.min.js"></script>
<script type="text/javascript" src="js/lib/bootstrap-tagsinput.min.js"></script>
<script type="text/javascript" src="js/lib/bootstrap3-typeahead.min.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/lib/bootstrap-tagsinput.min.js?v={{ FF_VERSION }}"></script>
{% endblock %}
{% block styles %}

2
resources/views/transactions/index.twig
View File

@ -104,5 +104,5 @@
{% endblock %}
{% block scripts %}
<script type="text/javascript" src="js/ff/transactions/list.js"></script>
<script type="text/javascript" src="js/ff/transactions/list.js?v={{ FF_VERSION }}"></script>
{% endblock %}

4
resources/views/transactions/mass/edit.twig
View File

@ -140,6 +140,6 @@
<script type="text/javascript">
var what = "";
</script>
<script type="text/javascript" src="js/lib/bootstrap3-typeahead.min.js"></script>
<script type="text/javascript" src="js/ff/transactions/mass/edit.js"></script>
<script type="text/javascript" src="js/lib/bootstrap3-typeahead.min.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/ff/transactions/mass/edit.js?v={{ FF_VERSION }}"></script>
{% endblock %}

4
resources/views/transactions/show.twig
View File

@ -488,6 +488,6 @@
<script type="text/javascript">
var autoCompleteUri = "{{ route('json.journals-with-id',[journal.id]) }}";
</script>
<script type="text/javascript" src="js/lib/bootstrap3-typeahead.min.js"></script>
<script type="text/javascript" src="js/ff/transactions/show.js"></script>
<script type="text/javascript" src="js/lib/bootstrap3-typeahead.min.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/ff/transactions/show.js?v={{ FF_VERSION }}"></script>
{% endblock %}

16
resources/views/transactions/single/create.twig
View File

@ -236,14 +236,14 @@
var overruleCurrency = {{ preFilled.amount_currency_id_amount|default(0) }};
</script>
<script type="text/javascript" src="js/lib/bootstrap3-typeahead.min.js"></script>
<script type="text/javascript" src="js/lib/bootstrap-tagsinput.min.js"></script>
<script type="text/javascript" src="js/lib/modernizr-custom.js"></script>
<script type="text/javascript" src="js/lib/jquery-ui.min.js"></script>
<script type="text/javascript" src="javascript/accounts?ext=.js"></script>
<script type="text/javascript" src="javascript/currencies?ext=.js"></script>
<script type="text/javascript" src="js/ff/transactions/single/common.js"></script>
<script type="text/javascript" src="js/ff/transactions/single/create.js"></script>
<script type="text/javascript" src="js/lib/bootstrap3-typeahead.min.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/lib/bootstrap-tagsinput.min.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/lib/modernizr-custom.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/lib/jquery-ui.min.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="jscript/accounts?ext=.js&amp;v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="jscript/currencies?ext=.js&amp;v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/ff/transactions/single/common.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/ff/transactions/single/create.js?v={{ FF_VERSION }}"></script>
{% endblock %}
{% block styles %}

16
resources/views/transactions/single/edit.twig
View File

@ -239,20 +239,20 @@
<script type="text/javascript">
var what = "{{ what }}";
</script>
<script type="text/javascript" src="js/lib/bootstrap3-typeahead.min.js"></script>
<script type="text/javascript" src="js/lib/bootstrap-tagsinput.min.js"></script>
<script type="text/javascript" src="js/lib/jquery-ui.min.js"></script>
<script type="text/javascript" src="js/lib/modernizr-custom.js"></script>
<script type="text/javascript" src="javascript/accounts?ext=.js"></script>
<script type="text/javascript" src="javascript/currencies?ext=.js"></script>
<script type="text/javascript" src="js/lib/bootstrap3-typeahead.min.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/lib/bootstrap-tagsinput.min.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/lib/jquery-ui.min.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/lib/modernizr-custom.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="jscript/accounts?ext=.js&amp;v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="jscript/currencies?ext=.js&amp;v={{ FF_VERSION }}"></script>
<script type="text/javascript">
var journal = {{ journal.toArray()|json_encode|raw }};
var journalData = {{ data|json_encode|raw }};
var exchangeRateInstructions = "{{ 'exchange_rate_instructions'|_|escape('js') }}";
var transferInstructions = "{{ 'transfer_exchange_rate_instructions'|_|escape('js') }}";
</script>
<script type="text/javascript" src="js/ff/transactions/single/common.js"></script>
<script type="text/javascript" src="js/ff/transactions/single/edit.js"></script>
<script type="text/javascript" src="js/ff/transactions/single/common.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/ff/transactions/single/edit.js?v={{ FF_VERSION }}"></script>
{% endblock %}
{% block styles %}

12
resources/views/transactions/split/edit.twig
View File

@ -334,7 +334,7 @@
<link href="css/jquery-ui/jquery-ui.theme.min.css" type="text/css" rel="stylesheet" media="all">
{% endblock %}
{% block scripts %}
<script type="text/javascript" src="{{ route('javascript.currencies') }}?ext=.js"></script>
<script type="text/javascript" src="{{ route('javascript.currencies') }}?ext=.js&amp;v={{ FF_VERSION }}"></script>
<script type="text/javascript">
var currencySymbol = 'x';
{% if preFilled.what == 'withdrawal' or preFilled.what == 'transfer' %}
@ -346,9 +346,9 @@
var originalSum = {{ preFilled.journal_amount }};
var what = "{{ preFilled.what }}";
</script>
<script type="text/javascript" src="js/lib/bootstrap3-typeahead.min.js"></script>
<script type="text/javascript" src="js/lib/bootstrap-tagsinput.min.js"></script>
<script type="text/javascript" src="js/lib/jquery-ui.min.js"></script>
<script type="text/javascript" src="js/lib/modernizr-custom.js"></script>
<script type="text/javascript" src="js/ff/transactions/split/edit.js"></script>
<script type="text/javascript" src="js/lib/bootstrap3-typeahead.min.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/lib/bootstrap-tagsinput.min.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/lib/jquery-ui.min.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/lib/modernizr-custom.js?v={{ FF_VERSION }}"></script>
<script type="text/javascript" src="js/ff/transactions/split/edit.js?v={{ FF_VERSION }}"></script>
{% endblock %}