From 4f934e54cf422e01ec004ed182f8438d2b426cbf Mon Sep 17 00:00:00 2001 From: James Cole Date: Tue, 12 Sep 2017 19:59:07 +0200 Subject: [PATCH] Easier upgrade, include FF version in JS --- resources/views/accounts/create.twig | 6 ++--- resources/views/accounts/edit.twig | 6 ++--- resources/views/accounts/index.twig | 2 +- resources/views/accounts/show.twig | 14 +++++----- resources/views/admin/link/index.twig | 2 +- resources/views/admin/link/show.twig | 2 +- resources/views/admin/users/index.twig | 2 +- resources/views/bills/create.twig | 8 +++--- resources/views/bills/edit.twig | 8 +++--- resources/views/bills/show.twig | 10 +++---- resources/views/budgets/index.twig | 4 +-- resources/views/budgets/no-budget.twig | 2 +- resources/views/budgets/show.twig | 10 +++---- resources/views/categories/index.twig | 4 +-- resources/views/categories/no-category.twig | 2 +- resources/views/categories/show.twig | 10 +++---- resources/views/export/index.twig | 6 ++--- resources/views/import/file/status.twig | 2 +- resources/views/index.twig | 8 +++--- resources/views/layout/default.twig | 26 +++++++++---------- resources/views/layout/empty.twig | 8 +++--- resources/views/layout/guest.twig | 10 +++---- resources/views/piggy-banks/create.twig | 6 ++--- resources/views/piggy-banks/edit.twig | 6 ++--- resources/views/piggy-banks/index.twig | 4 +-- resources/views/piggy-banks/show.twig | 8 +++--- resources/views/preferences/index.twig | 6 ++--- resources/views/reports/audit/report.twig | 2 +- resources/views/reports/budget/month.twig | 12 ++++----- resources/views/reports/category/month.twig | 12 ++++----- resources/views/reports/default/month.twig | 12 ++++----- .../views/reports/default/multi-year.twig | 12 ++++----- resources/views/reports/default/year.twig | 12 ++++----- resources/views/reports/index.twig | 4 +-- resources/views/reports/tag/month.twig | 12 ++++----- resources/views/rules/index.twig | 4 +-- .../rules/rule-group/select-transactions.twig | 6 ++--- resources/views/rules/rule/create.twig | 4 +-- resources/views/rules/rule/edit.twig | 4 +-- .../views/rules/rule/select-transactions.twig | 6 ++--- resources/views/search/index.twig | 2 +- resources/views/tags/create.twig | 6 ++--- resources/views/tags/edit.twig | 6 ++--- resources/views/tags/index.twig | 2 +- resources/views/tags/show.twig | 4 +-- resources/views/transactions/convert.twig | 4 +-- resources/views/transactions/index.twig | 2 +- resources/views/transactions/mass/edit.twig | 4 +-- resources/views/transactions/show.twig | 4 +-- .../views/transactions/single/create.twig | 16 ++++++------ resources/views/transactions/single/edit.twig | 16 ++++++------ resources/views/transactions/split/edit.twig | 12 ++++----- 52 files changed, 181 insertions(+), 181 deletions(-) diff --git a/resources/views/accounts/create.twig b/resources/views/accounts/create.twig index 1747c1a20b..9b545913dd 100644 --- a/resources/views/accounts/create.twig +++ b/resources/views/accounts/create.twig @@ -68,8 +68,8 @@ {% endblock %} {% block scripts %} - - + + {# JS currency list for update thing #} - + {% endblock %} {% block styles %} diff --git a/resources/views/accounts/edit.twig b/resources/views/accounts/edit.twig index e0b4ebf916..cf13020dcd 100644 --- a/resources/views/accounts/edit.twig +++ b/resources/views/accounts/edit.twig @@ -84,8 +84,8 @@ {{ Form.close|raw }} {% endblock %} {% block scripts %} - - + + {# JS currency list for update thing #} - + {% endblock %} {% block styles %} diff --git a/resources/views/accounts/index.twig b/resources/views/accounts/index.twig index 230e3a3a59..3bf542f93d 100644 --- a/resources/views/accounts/index.twig +++ b/resources/views/accounts/index.twig @@ -45,5 +45,5 @@ - + {% endblock %} diff --git a/resources/views/accounts/show.twig b/resources/views/accounts/show.twig index a176f0fcd6..43c219fc54 100644 --- a/resources/views/accounts/show.twig +++ b/resources/views/accounts/show.twig @@ -164,12 +164,12 @@ - - - + + + - - - - + + + + {% endblock %} diff --git a/resources/views/admin/link/index.twig b/resources/views/admin/link/index.twig index 2cc8338ef7..821ceec946 100644 --- a/resources/views/admin/link/index.twig +++ b/resources/views/admin/link/index.twig @@ -58,7 +58,7 @@ {% endblock %} {% block scripts %} - + {% endblock %} {% block styles %} diff --git a/resources/views/admin/link/show.twig b/resources/views/admin/link/show.twig index 813f53e534..72ee7135e0 100644 --- a/resources/views/admin/link/show.twig +++ b/resources/views/admin/link/show.twig @@ -54,7 +54,7 @@ {% endblock %} {% block scripts %} - + {% endblock %} {% block styles %} diff --git a/resources/views/admin/users/index.twig b/resources/views/admin/users/index.twig index a70b7cba77..1b1aee1ce7 100644 --- a/resources/views/admin/users/index.twig +++ b/resources/views/admin/users/index.twig @@ -88,5 +88,5 @@ {% endblock %} {% block scripts %} - + {% endblock %} diff --git a/resources/views/bills/create.twig b/resources/views/bills/create.twig index c182cb2976..11a19350f5 100644 --- a/resources/views/bills/create.twig +++ b/resources/views/bills/create.twig @@ -65,8 +65,8 @@ {% endblock %} {% block scripts %} - - - - + + + + {% endblock %} diff --git a/resources/views/bills/edit.twig b/resources/views/bills/edit.twig index ded9774dc8..861fe15fd0 100644 --- a/resources/views/bills/edit.twig +++ b/resources/views/bills/edit.twig @@ -64,8 +64,8 @@ {% endblock %} {% block scripts %} - - - - + + + + {% endblock %} diff --git a/resources/views/bills/show.twig b/resources/views/bills/show.twig index 6396a0948b..d233a6de8c 100644 --- a/resources/views/bills/show.twig +++ b/resources/views/bills/show.twig @@ -125,9 +125,9 @@ - - - - - + + + + + {% endblock %} diff --git a/resources/views/budgets/index.twig b/resources/views/budgets/index.twig index 030239feef..2b92e1380b 100644 --- a/resources/views/budgets/index.twig +++ b/resources/views/budgets/index.twig @@ -235,6 +235,6 @@ var periodStart = "{{ start.format('Y-m-d') }}"; var periodEnd = "{{ end.format('Y-m-d') }}"; - - + + {% endblock %} diff --git a/resources/views/budgets/no-budget.twig b/resources/views/budgets/no-budget.twig index 8e10cda80d..cc0910f055 100644 --- a/resources/views/budgets/no-budget.twig +++ b/resources/views/budgets/no-budget.twig @@ -78,5 +78,5 @@ {% endblock %} {% block scripts %} - + {% endblock %} diff --git a/resources/views/budgets/show.twig b/resources/views/budgets/show.twig index 5e8e953794..753c432375 100644 --- a/resources/views/budgets/show.twig +++ b/resources/views/budgets/show.twig @@ -171,9 +171,9 @@ {% endif %} - - - - - + + + + + {% endblock %} diff --git a/resources/views/categories/index.twig b/resources/views/categories/index.twig index 19ee48a915..f7b529f04b 100644 --- a/resources/views/categories/index.twig +++ b/resources/views/categories/index.twig @@ -39,6 +39,6 @@ {% endblock %} {% block scripts %} - - + + {% endblock %} diff --git a/resources/views/categories/no-category.twig b/resources/views/categories/no-category.twig index 60f3cc79eb..6d71b3606e 100644 --- a/resources/views/categories/no-category.twig +++ b/resources/views/categories/no-category.twig @@ -92,5 +92,5 @@ {% endblock %} {% block scripts %} - + {% endblock %} diff --git a/resources/views/categories/show.twig b/resources/views/categories/show.twig index 72be5d3faf..d333c40a8c 100644 --- a/resources/views/categories/show.twig +++ b/resources/views/categories/show.twig @@ -135,9 +135,9 @@ var everything = '{{ route('chart.category.all', [category.id]) }}'; var specific = '{{ route('chart.category.specific', [category.id, start.format('Ymd')]) }}'; - - - - - + + + + + {% endblock %} diff --git a/resources/views/export/index.twig b/resources/views/export/index.twig index 6279fef14b..16df684ab0 100644 --- a/resources/views/export/index.twig +++ b/resources/views/export/index.twig @@ -102,9 +102,9 @@ - - - + + + {% endblock %} {% block styles %} diff --git a/resources/views/import/file/status.twig b/resources/views/import/file/status.twig index c19906a5af..26acb3605e 100644 --- a/resources/views/import/file/status.twig +++ b/resources/views/import/file/status.twig @@ -151,7 +151,7 @@ var jobStartUrl = '{{ route('import.file.start', [job.key]) }}'; var token = '{{ csrf_token() }}'; - + {% endblock %} {% block styles %} {% endblock %} diff --git a/resources/views/index.twig b/resources/views/index.twig index 36f005598c..7f82db5715 100644 --- a/resources/views/index.twig +++ b/resources/views/index.twig @@ -138,10 +138,10 @@ var accountExpenseUri = '{{ route('chart.account.expense') }}'; - - - - + + + + {% endblock %} {% block styles %} {% endblock %} diff --git a/resources/views/layout/default.twig b/resources/views/layout/default.twig index ca3c255c10..bb4b8c3243 100644 --- a/resources/views/layout/default.twig +++ b/resources/views/layout/default.twig @@ -30,8 +30,8 @@ {% block styles %}{% endblock %} - - - - - - - - + + + + + + + + + {% if not shownDemo %} - - + + {% endif %} {% block scripts %}{% endblock %} diff --git a/resources/views/layout/empty.twig b/resources/views/layout/empty.twig index 09f97274bd..ba1d37aab5 100644 --- a/resources/views/layout/empty.twig +++ b/resources/views/layout/empty.twig @@ -12,8 +12,8 @@ {# favicons #} @@ -28,8 +28,8 @@ {% block content %}{% endblock %} - - + + {% if env('ANALYTICS_ID','') != '' %} - - + + + {% if env('ANALYTICS_ID','') != '' %} - - + + + {% endblock %} {% block styles %} diff --git a/resources/views/piggy-banks/edit.twig b/resources/views/piggy-banks/edit.twig index 7da0efdb69..7e98299b88 100644 --- a/resources/views/piggy-banks/edit.twig +++ b/resources/views/piggy-banks/edit.twig @@ -57,9 +57,9 @@ {{ Form.close|raw }} {% endblock %} {% block scripts %} - - - + + + {% endblock %} {% block styles %} diff --git a/resources/views/piggy-banks/index.twig b/resources/views/piggy-banks/index.twig index 4043c9267e..cfe76aee06 100644 --- a/resources/views/piggy-banks/index.twig +++ b/resources/views/piggy-banks/index.twig @@ -59,6 +59,6 @@ {% endif %} {% endblock %} {% block scripts %} - - + + {% endblock %} diff --git a/resources/views/piggy-banks/show.twig b/resources/views/piggy-banks/show.twig index b1ea8eae79..f85fa79d5f 100644 --- a/resources/views/piggy-banks/show.twig +++ b/resources/views/piggy-banks/show.twig @@ -114,8 +114,8 @@ var piggyBankID = {{ piggyBank.id }}; - - - - + + + + {% endblock %} diff --git a/resources/views/preferences/index.twig b/resources/views/preferences/index.twig index fa0f0cc67e..e2ade7cc6d 100644 --- a/resources/views/preferences/index.twig +++ b/resources/views/preferences/index.twig @@ -273,9 +273,9 @@ {% endblock %} {% block scripts %} - - - + + + {% endblock %} {% block styles %} diff --git a/resources/views/reports/audit/report.twig b/resources/views/reports/audit/report.twig index f206a209e8..5716f4dc08 100644 --- a/resources/views/reports/audit/report.twig +++ b/resources/views/reports/audit/report.twig @@ -86,5 +86,5 @@ - + {% endblock %} diff --git a/resources/views/reports/budget/month.twig b/resources/views/reports/budget/month.twig index 71e62e3d27..e480430194 100644 --- a/resources/views/reports/budget/month.twig +++ b/resources/views/reports/budget/month.twig @@ -241,10 +241,10 @@ {% endblock %} {% block scripts %} - - - - + + + + - - + + {% endblock %} diff --git a/resources/views/reports/category/month.twig b/resources/views/reports/category/month.twig index bdfa800f3d..dd9616d6fc 100644 --- a/resources/views/reports/category/month.twig +++ b/resources/views/reports/category/month.twig @@ -376,10 +376,10 @@ {% endblock %} {% block scripts %} - - - - + + + + - - + + {% endblock %} diff --git a/resources/views/reports/default/month.twig b/resources/views/reports/default/month.twig index bb9022d798..3696e452e0 100644 --- a/resources/views/reports/default/month.twig +++ b/resources/views/reports/default/month.twig @@ -144,10 +144,10 @@ {% endblock %} {% block scripts %} - - - - + + + + - - + + {% endblock %} diff --git a/resources/views/reports/default/multi-year.twig b/resources/views/reports/default/multi-year.twig index a58cf2bb9d..e00c6db712 100644 --- a/resources/views/reports/default/multi-year.twig +++ b/resources/views/reports/default/multi-year.twig @@ -193,10 +193,10 @@ {% endblock %} {% block scripts %} - - - - + + + + - - + + {% endblock %} diff --git a/resources/views/reports/default/year.twig b/resources/views/reports/default/year.twig index 90913db18d..57202d4291 100644 --- a/resources/views/reports/default/year.twig +++ b/resources/views/reports/default/year.twig @@ -188,10 +188,10 @@ {% endblock %} {% block scripts %} - - - - + + + + - - + + {% endblock %} {% block styles %} diff --git a/resources/views/reports/index.twig b/resources/views/reports/index.twig index ef63a38496..361e074699 100644 --- a/resources/views/reports/index.twig +++ b/resources/views/reports/index.twig @@ -177,6 +177,6 @@ var allSelectedText = "{{ 'multi_select_all_selected'|_ }}"; var filterPlaceholder = "{{ 'multi_select_filter_placeholder'|_ }}"; - - + + {% endblock %} diff --git a/resources/views/reports/tag/month.twig b/resources/views/reports/tag/month.twig index 1a1fc8461f..e110dfc0a7 100644 --- a/resources/views/reports/tag/month.twig +++ b/resources/views/reports/tag/month.twig @@ -398,10 +398,10 @@ {% endblock %} {% block scripts %} - - - - + + + + - - + + {% endblock %} diff --git a/resources/views/rules/index.twig b/resources/views/rules/index.twig index 2a4c8c8ffd..4ef73d26c5 100644 --- a/resources/views/rules/index.twig +++ b/resources/views/rules/index.twig @@ -202,6 +202,6 @@ {% endblock %} {% block scripts %} - - + + {% endblock %} diff --git a/resources/views/rules/rule-group/select-transactions.twig b/resources/views/rules/rule-group/select-transactions.twig index 22f3112404..f0c7c43331 100644 --- a/resources/views/rules/rule-group/select-transactions.twig +++ b/resources/views/rules/rule-group/select-transactions.twig @@ -41,9 +41,9 @@ {% endblock %} {% block scripts %} - - - + + + {% endblock %} {% block styles %} diff --git a/resources/views/rules/rule/create.twig b/resources/views/rules/rule/create.twig index f8b7136fc7..1ca0b13927 100644 --- a/resources/views/rules/rule/create.twig +++ b/resources/views/rules/rule/create.twig @@ -127,12 +127,12 @@ {% endblock %} {% block scripts %} - + - + {% endblock %} {% block styles %} diff --git a/resources/views/rules/rule/edit.twig b/resources/views/rules/rule/edit.twig index dbc112d439..129c8b03fa 100644 --- a/resources/views/rules/rule/edit.twig +++ b/resources/views/rules/rule/edit.twig @@ -127,11 +127,11 @@ {% endblock %} {% block scripts %} - + - + {% endblock %} diff --git a/resources/views/rules/rule/select-transactions.twig b/resources/views/rules/rule/select-transactions.twig index 59081622ca..4429c48338 100644 --- a/resources/views/rules/rule/select-transactions.twig +++ b/resources/views/rules/rule/select-transactions.twig @@ -41,9 +41,9 @@ {% endblock %} {% block scripts %} - - - + + + {% endblock %} {% block styles %} diff --git a/resources/views/search/index.twig b/resources/views/search/index.twig index 5748fe201f..8f35143102 100644 --- a/resources/views/search/index.twig +++ b/resources/views/search/index.twig @@ -93,5 +93,5 @@ var searchQuery = "{{ fullQuery|escape('js') }}"; var searchUri = "{{ route('search.search') }}"; - + {% endblock %} diff --git a/resources/views/tags/create.twig b/resources/views/tags/create.twig index 3c0aa3c447..49e3b4938f 100644 --- a/resources/views/tags/create.twig +++ b/resources/views/tags/create.twig @@ -83,9 +83,9 @@ - - - + + + {% endblock %} {% block styles %} diff --git a/resources/views/tags/edit.twig b/resources/views/tags/edit.twig index 0a6bfdff15..6165350ca0 100644 --- a/resources/views/tags/edit.twig +++ b/resources/views/tags/edit.twig @@ -86,9 +86,9 @@ - - - + + + {% endblock %} {% block styles %} diff --git a/resources/views/tags/index.twig b/resources/views/tags/index.twig index 7365efda52..946ff46a46 100644 --- a/resources/views/tags/index.twig +++ b/resources/views/tags/index.twig @@ -87,5 +87,5 @@ {% endblock %} {% block scripts %} - + {% endblock %} diff --git a/resources/views/tags/show.twig b/resources/views/tags/show.twig index dd99386bdd..da635e1256 100644 --- a/resources/views/tags/show.twig +++ b/resources/views/tags/show.twig @@ -183,6 +183,6 @@ var apiKey = "{{ apiKey }}"; - - + + {% endblock %} diff --git a/resources/views/transactions/convert.twig b/resources/views/transactions/convert.twig index 33f5c08daf..cd28416e8d 100644 --- a/resources/views/transactions/convert.twig +++ b/resources/views/transactions/convert.twig @@ -217,8 +217,8 @@ {% endblock %} {% block scripts %} - - + + {% endblock %} {% block styles %} diff --git a/resources/views/transactions/index.twig b/resources/views/transactions/index.twig index 5c3ffcb511..17e614ae24 100644 --- a/resources/views/transactions/index.twig +++ b/resources/views/transactions/index.twig @@ -104,5 +104,5 @@ {% endblock %} {% block scripts %} - + {% endblock %} diff --git a/resources/views/transactions/mass/edit.twig b/resources/views/transactions/mass/edit.twig index aba6f9687f..67aa4df0c8 100644 --- a/resources/views/transactions/mass/edit.twig +++ b/resources/views/transactions/mass/edit.twig @@ -140,6 +140,6 @@ - - + + {% endblock %} diff --git a/resources/views/transactions/show.twig b/resources/views/transactions/show.twig index b48745e424..c6e0dc7678 100644 --- a/resources/views/transactions/show.twig +++ b/resources/views/transactions/show.twig @@ -488,6 +488,6 @@ - - + + {% endblock %} diff --git a/resources/views/transactions/single/create.twig b/resources/views/transactions/single/create.twig index 2129bd70d1..6161ba098d 100644 --- a/resources/views/transactions/single/create.twig +++ b/resources/views/transactions/single/create.twig @@ -236,14 +236,14 @@ var overruleCurrency = {{ preFilled.amount_currency_id_amount|default(0) }}; - - - - - - - - + + + + + + + + {% endblock %} {% block styles %} diff --git a/resources/views/transactions/single/edit.twig b/resources/views/transactions/single/edit.twig index 76ea6216c3..a8528b55b1 100644 --- a/resources/views/transactions/single/edit.twig +++ b/resources/views/transactions/single/edit.twig @@ -239,20 +239,20 @@ - - - - - - + + + + + + - - + + {% endblock %} {% block styles %} diff --git a/resources/views/transactions/split/edit.twig b/resources/views/transactions/split/edit.twig index ddbbdd6c4a..2d10161f1a 100644 --- a/resources/views/transactions/split/edit.twig +++ b/resources/views/transactions/split/edit.twig @@ -334,7 +334,7 @@ {% endblock %} {% block scripts %} - + - - - - - + + + + + {% endblock %}