From 813fb679a7c899d41317597c22c95aafe3067a1f Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 18 Dec 2015 16:37:45 +0100 Subject: [PATCH] File reformatting. --- resources/twig/auth/register.twig | 4 +-- resources/twig/budgets/index.twig | 3 +- resources/twig/budgets/show.twig | 10 +++--- resources/twig/emails/registered-html.twig | 1 + resources/twig/errors/503.twig | 2 +- resources/twig/layout/default.twig | 22 ++++++------- resources/twig/layout/empty.twig | 6 ++-- resources/twig/layout/guest.twig | 6 ++-- resources/twig/list/journals.twig | 36 +++++++++++----------- resources/twig/preferences/index.twig | 2 +- resources/twig/reports/default/year.twig | 2 +- resources/twig/reports/index.twig | 7 +++-- resources/twig/tags/create.twig | 6 ++-- resources/twig/tags/edit.twig | 6 ++-- resources/twig/tags/show.twig | 20 +++++++----- resources/twig/transactions/edit.twig | 2 +- 16 files changed, 72 insertions(+), 63 deletions(-) diff --git a/resources/twig/auth/register.twig b/resources/twig/auth/register.twig index ea209c35d5..03970a73b9 100644 --- a/resources/twig/auth/register.twig +++ b/resources/twig/auth/register.twig @@ -26,10 +26,10 @@
- + {% if host == 'geld.nder.be' or host == 'firefly.app' %}

You will receive an email from Firefly III. If your email address - is incorrect, your account may not work.

+ is incorrect, your account may not work.

{% endif %}
diff --git a/resources/twig/budgets/index.twig b/resources/twig/budgets/index.twig index e98a252672..562663d137 100644 --- a/resources/twig/budgets/index.twig +++ b/resources/twig/budgets/index.twig @@ -24,7 +24,8 @@
{{ trans('firefly.availableIn',{date : period }) }}: - {{ budgetIncomeTotal|formatAmount }} + {{ budgetIncomeTotal|formatAmount }}
diff --git a/resources/twig/budgets/show.twig b/resources/twig/budgets/show.twig index 9ed53830ce..173b9a1d4e 100644 --- a/resources/twig/budgets/show.twig +++ b/resources/twig/budgets/show.twig @@ -45,7 +45,7 @@ {% for limit in limits %} {% for rep in limit.limitRepetitions %} - {% set spentInRep = spentInRepetition(rep) %} + {% set spentInRep = spentInRepetition(rep) %}

{{ rep.startdate.formatLocalized(monthFormat) }} @@ -97,12 +97,12 @@ {% endblock %} {% block scripts %} diff --git a/resources/twig/emails/registered-html.twig b/resources/twig/emails/registered-html.twig index 82d4050d96..48edb4ffc0 100644 --- a/resources/twig/emails/registered-html.twig +++ b/resources/twig/emails/registered-html.twig @@ -59,6 +59,7 @@ } + diff --git a/resources/twig/errors/503.twig b/resources/twig/errors/503.twig index 365a8698e3..a6bea4e28b 100644 --- a/resources/twig/errors/503.twig +++ b/resources/twig/errors/503.twig @@ -51,7 +51,7 @@ m.parentNode.insertBefore(a, m) })(window, document, 'script', '//www.google-analytics.com/analytics.js', 'ga'); - ga('create', '{{ env('ANALYTICS_ID', 'XXX-XX-X') }}', 'auto'); + ga('create', '{{ env('ANALYTICS_ID', 'XXX-XX-X') }}', 'auto'); ga('send', 'pageview'); diff --git a/resources/twig/layout/default.twig b/resources/twig/layout/default.twig index 9542222ad3..30c21850fb 100644 --- a/resources/twig/layout/default.twig +++ b/resources/twig/layout/default.twig @@ -164,11 +164,11 @@ // date range picker configuration: var dateRangeConfig = { - startDate: moment("{{Session.get('start').format('Y-m-d')}}"), - endDate: moment("{{Session.get('end').format('Y-m-d')}}"), - linkTitle: "{{Session.get('start').formatLocalized(monthAndDayFormat)}} - {{Session.get('end').formatLocalized(monthAndDayFormat)}}", - URL: "{{route('daterange')}}", - firstDate: moment("{{Session.get('first').format('Y-m-d')}}"), + startDate: moment("{{ Session.get('start').format('Y-m-d') }}"), + endDate: moment("{{ Session.get('end').format('Y-m-d') }}"), + linkTitle: "{{ Session.get('start').formatLocalized(monthAndDayFormat) }} - {{ Session.get('end').formatLocalized(monthAndDayFormat) }}", + URL: "{{ route('daterange') }}", + firstDate: moment("{{ Session.get('first').format('Y-m-d') }}"), currentMonth: "{{ currentMonthName }}", previousMonth: "{{ previousMonthName }}", nextMonth: "{{ nextMonthName }}", @@ -180,10 +180,10 @@ toLabel: '{{ 'to'|_ }}' }; - var token = "{{csrf_token()}}"; + var token = "{{ csrf_token() }}"; var language = "{{ language }}"; - var currencyCode = '{{getCurrencyCode() }}'; - var currencySymbol = '{{getCurrencySymbol()|raw }}'; + var currencyCode = '{{ getCurrencyCode() }}'; + var currencySymbol = '{{ getCurrencySymbol()|raw }}'; @@ -205,17 +205,17 @@ a.src = g; m.parentNode.insertBefore(a, m) })(window, document, 'script', '//www.google-analytics.com/analytics.js', 'ga'); - ga('create', '{{ env('ANALYTICS_ID', 'XXX-XX-X') }}', {'siteSpeedSampleRate': 100}); + ga('create', '{{ env('ANALYTICS_ID', 'XXX-XX-X') }}', {'siteSpeedSampleRate': 100}); ga('send', 'pageview'); // send an event if relevant: {% if Session.has('gaEventCategory') and Session.has('gaEventAction') and not Session.has('gaEventLabel') %} - ga('send', 'event', '{{Session.get('gaEventCategory')}}', '{{Session.get('gaEventAction')}}'); + ga('send', 'event', '{{ Session.get('gaEventCategory') }}', '{{ Session.get('gaEventAction') }}'); {% endif %} // send event if relevant: {% if Session.has('gaEventCategory') and Session.has('gaEventAction') and Session.has('gaEventLabel') %} - ga('send', 'event', '{{Session.get('gaEventCategory')}}', '{{Session.get('gaEventAction')}}', '{{ Session.get('gaEventLabel') }}'); + ga('send', 'event', '{{ Session.get('gaEventCategory') }}', '{{ Session.get('gaEventAction') }}', '{{ Session.get('gaEventLabel') }}'); {% endif %} {% endif %} diff --git a/resources/twig/layout/empty.twig b/resources/twig/layout/empty.twig index 7fd5ef6c46..3c32d46d3b 100644 --- a/resources/twig/layout/empty.twig +++ b/resources/twig/layout/empty.twig @@ -62,17 +62,17 @@ a.src = g; m.parentNode.insertBefore(a, m) })(window, document, 'script', '//www.google-analytics.com/analytics.js', 'ga'); - ga('create', '{{ env('ANALYTICS_ID', 'XXX-XX-X') }}', {'siteSpeedSampleRate': 100}); + ga('create', '{{ env('ANALYTICS_ID', 'XXX-XX-X') }}', {'siteSpeedSampleRate': 100}); ga('send', 'pageview'); // send an event if relevant: {% if Session.has('gaEventCategory') and Session.has('gaEventAction') and not Session.has('gaEventLabel') %} - ga('send', 'event', '{{Session.get('gaEventCategory')}}', '{{Session.get('gaEventAction')}}'); + ga('send', 'event', '{{ Session.get('gaEventCategory') }}', '{{ Session.get('gaEventAction') }}'); {% endif %} // send event if relevant: {% if Session.has('gaEventCategory') and Session.has('gaEventAction') and Session.has('gaEventLabel') %} - ga('send', 'event', '{{Session.get('gaEventCategory')}}', '{{Session.get('gaEventAction')}}', '{{ Session.get('gaEventLabel') }}'); + ga('send', 'event', '{{ Session.get('gaEventCategory') }}', '{{ Session.get('gaEventAction') }}', '{{ Session.get('gaEventLabel') }}'); {% endif %} {% endif %} diff --git a/resources/twig/layout/guest.twig b/resources/twig/layout/guest.twig index 43da3fc880..95fdcf293a 100644 --- a/resources/twig/layout/guest.twig +++ b/resources/twig/layout/guest.twig @@ -63,17 +63,17 @@ a.src = g; m.parentNode.insertBefore(a, m) })(window, document, 'script', '//www.google-analytics.com/analytics.js', 'ga'); - ga('create', '{{ env('ANALYTICS_ID', 'XXX-XX-X') }}', {'siteSpeedSampleRate': 100}); + ga('create', '{{ env('ANALYTICS_ID', 'XXX-XX-X') }}', {'siteSpeedSampleRate': 100}); ga('send', 'pageview'); // send an event if relevant: {% if Session.has('gaEventCategory') and Session.has('gaEventAction') and not Session.has('gaEventLabel') %} - ga('send', 'event', '{{Session.get('gaEventCategory')}}', '{{Session.get('gaEventAction')}}'); + ga('send', 'event', '{{ Session.get('gaEventCategory') }}', '{{ Session.get('gaEventAction') }}'); {% endif %} // send event if relevant: {% if Session.has('gaEventCategory') and Session.has('gaEventAction') and Session.has('gaEventLabel') %} - ga('send', 'event', '{{Session.get('gaEventCategory')}}', '{{Session.get('gaEventAction')}}', '{{ Session.get('gaEventLabel') }}'); + ga('send', 'event', '{{ Session.get('gaEventCategory') }}', '{{ Session.get('gaEventAction') }}', '{{ Session.get('gaEventLabel') }}'); {% endif %} {% endif %} diff --git a/resources/twig/list/journals.twig b/resources/twig/list/journals.twig index ddc9c6e64c..e8014c2f88 100644 --- a/resources/twig/list/journals.twig +++ b/resources/twig/list/journals.twig @@ -115,24 +115,24 @@ {% endfor %} - {% if showPageSum %} - - {{ 'sum'|_ }} - {{ _sum|formatAmount }} - - {% endif %} - {% if showPeriodSum %} - - {{ 'period_sum'|_ }} - {{ periodSum|formatAmount }} - - {% endif %} - {% if showTotalSum %} - - {{ 'total_sum'|_ }} - {{ totalSum|formatAmount }} - - {% endif %} + {% if showPageSum %} + + {{ 'sum'|_ }} + {{ _sum|formatAmount }} + + {% endif %} + {% if showPeriodSum %} + + {{ 'period_sum'|_ }} + {{ periodSum|formatAmount }} + + {% endif %} + {% if showTotalSum %} + + {{ 'total_sum'|_ }} + {{ totalSum|formatAmount }} + + {% endif %} diff --git a/resources/twig/preferences/index.twig b/resources/twig/preferences/index.twig index 366d64be45..da4aaac469 100644 --- a/resources/twig/preferences/index.twig +++ b/resources/twig/preferences/index.twig @@ -104,7 +104,7 @@ {% if language == key %} checked {% endif %} - /> + /> {{ lang }}

diff --git a/resources/twig/reports/default/year.twig b/resources/twig/reports/default/year.twig index 4fa3f92df1..34d7d31efc 100644 --- a/resources/twig/reports/default/year.twig +++ b/resources/twig/reports/default/year.twig @@ -102,7 +102,7 @@ {% endblock %} diff --git a/resources/twig/transactions/edit.twig b/resources/twig/transactions/edit.twig index 524e0df51d..8b53b6f2a2 100644 --- a/resources/twig/transactions/edit.twig +++ b/resources/twig/transactions/edit.twig @@ -103,7 +103,7 @@ {% endblock %} {% block scripts %}