From 7f480435057b957fc84f115a8850b98b30071aed Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 28 Aug 2020 21:29:47 +0200 Subject: [PATCH] Fix #3729 --- resources/views/v1/accounts/index.twig | 2 +- resources/views/v1/accounts/reconcile/show.twig | 4 ++-- resources/views/v1/accounts/show.twig | 2 +- resources/views/v1/admin/users/index.twig | 4 ++-- resources/views/v1/admin/users/show.twig | 8 ++++---- resources/views/v1/bills/index.twig | 2 +- resources/views/v1/bills/show.twig | 4 ++-- resources/views/v1/budgets/show.twig | 2 +- resources/views/v1/categories/show.twig | 2 +- resources/views/v1/list/accounts.twig | 2 +- resources/views/v1/list/attachments.twig | 2 +- resources/views/v1/list/bills.twig | 2 +- resources/views/v1/list/piggy-bank-events.twig | 2 +- resources/views/v1/partials/empty.twig | 2 +- resources/views/v1/piggy-banks/index.twig | 4 ++-- resources/views/v1/piggy-banks/show.twig | 8 ++++---- resources/views/v1/recurring/index.twig | 4 ++-- resources/views/v1/reports/audit/report.twig | 2 +- resources/views/v1/reports/partials/journals-audit.twig | 2 +- resources/views/v1/tags/show.twig | 2 +- resources/views/v1/transactions/show.twig | 4 ++-- 21 files changed, 33 insertions(+), 33 deletions(-) diff --git a/resources/views/v1/accounts/index.twig b/resources/views/v1/accounts/index.twig index 8621d52b4a..b08ae48bce 100644 --- a/resources/views/v1/accounts/index.twig +++ b/resources/views/v1/accounts/index.twig @@ -27,7 +27,7 @@ -
+
{{ ('make_new_' ~ objectType ~ '_account')|_ }}
diff --git a/resources/views/v1/accounts/reconcile/show.twig b/resources/views/v1/accounts/reconcile/show.twig index b67e5ac61f..5437712fd1 100644 --- a/resources/views/v1/accounts/reconcile/show.twig +++ b/resources/views/v1/accounts/reconcile/show.twig @@ -66,8 +66,8 @@

{{ 'transaction_journal_meta'|_ }}

-
- +
+
diff --git a/resources/views/v1/accounts/show.twig b/resources/views/v1/accounts/show.twig index 7040ac6a8d..944083cfe8 100644 --- a/resources/views/v1/accounts/show.twig +++ b/resources/views/v1/accounts/show.twig @@ -40,7 +40,7 @@ {{ 'attachments'|_ }} -
+
{% include 'list.attachments' %}
diff --git a/resources/views/v1/admin/users/index.twig b/resources/views/v1/admin/users/index.twig index 704cc77a1a..6b82598376 100644 --- a/resources/views/v1/admin/users/index.twig +++ b/resources/views/v1/admin/users/index.twig @@ -10,8 +10,8 @@

{{ 'all_users'|_ }}

-
-
{{ 'categories'|_ }}
+
+
diff --git a/resources/views/v1/admin/users/show.twig b/resources/views/v1/admin/users/show.twig index 3196a5df87..adaaa258c2 100644 --- a/resources/views/v1/admin/users/show.twig +++ b/resources/views/v1/admin/users/show.twig @@ -10,8 +10,8 @@

{{ 'user_information'|_ }}

-
-
+
+
@@ -75,8 +75,8 @@

{{ 'user_data_information'|_ }}

-
-
{{ trans('list.id') }}
+
+
diff --git a/resources/views/v1/bills/index.twig b/resources/views/v1/bills/index.twig index bd52d986eb..c57497fef7 100644 --- a/resources/views/v1/bills/index.twig +++ b/resources/views/v1/bills/index.twig @@ -22,7 +22,7 @@ -
+
diff --git a/resources/views/v1/bills/show.twig b/resources/views/v1/bills/show.twig index 27c73012c6..05c2f751bb 100644 --- a/resources/views/v1/bills/show.twig +++ b/resources/views/v1/bills/show.twig @@ -109,7 +109,7 @@

{{ 'notes'|_ }}

-
+
{{ object.data.notes|markdown }}
@@ -121,7 +121,7 @@

{{ 'attachments'|_ }}

-
+
{% include 'list.attachments' %}
diff --git a/resources/views/v1/budgets/show.twig b/resources/views/v1/budgets/show.twig index 4168d88229..b114f732c9 100644 --- a/resources/views/v1/budgets/show.twig +++ b/resources/views/v1/budgets/show.twig @@ -46,7 +46,7 @@ {{ 'attachments'|_ }}
-
+
{% include 'list.attachments' %}
diff --git a/resources/views/v1/categories/show.twig b/resources/views/v1/categories/show.twig index f45efb3a51..5865a04a12 100644 --- a/resources/views/v1/categories/show.twig +++ b/resources/views/v1/categories/show.twig @@ -56,7 +56,7 @@ {{ 'attachments'|_ }}
-
+
{% include 'list.attachments' %}
diff --git a/resources/views/v1/list/accounts.twig b/resources/views/v1/list/accounts.twig index 7df41abd27..eed834c4e5 100644 --- a/resources/views/v1/list/accounts.twig +++ b/resources/views/v1/list/accounts.twig @@ -1,7 +1,7 @@
{{ accounts.render|raw }}
-
{{ trans('list.accounts_count') }} {{ information.accounts }}
+
diff --git a/resources/views/v1/list/attachments.twig b/resources/views/v1/list/attachments.twig index 3b87ffcdc3..a287e31911 100644 --- a/resources/views/v1/list/attachments.twig +++ b/resources/views/v1/list/attachments.twig @@ -1,4 +1,4 @@ -
+
{% for attachment in attachments %}
diff --git a/resources/views/v1/list/bills.twig b/resources/views/v1/list/bills.twig index 6998b3400e..92fb9047df 100644 --- a/resources/views/v1/list/bills.twig +++ b/resources/views/v1/list/bills.twig @@ -1,7 +1,7 @@
{{ paginator.render|raw }}
- +
diff --git a/resources/views/v1/list/piggy-bank-events.twig b/resources/views/v1/list/piggy-bank-events.twig index 8dbcc326ba..26765de16d 100644 --- a/resources/views/v1/list/piggy-bank-events.twig +++ b/resources/views/v1/list/piggy-bank-events.twig @@ -1,4 +1,4 @@ -
+
{% if showPiggyBank %} diff --git a/resources/views/v1/partials/empty.twig b/resources/views/v1/partials/empty.twig index 46b09052a6..b18079818b 100644 --- a/resources/views/v1/partials/empty.twig +++ b/resources/views/v1/partials/empty.twig @@ -5,7 +5,7 @@

{{ ('no_'~type~'_title_'~objectType)|_ }}

-
+

{{ ('no_'~type~'_intro_'~objectType)|_ }}

diff --git a/resources/views/v1/piggy-banks/index.twig b/resources/views/v1/piggy-banks/index.twig index 113e2a2cda..dcaf17d05d 100644 --- a/resources/views/v1/piggy-banks/index.twig +++ b/resources/views/v1/piggy-banks/index.twig @@ -33,8 +33,8 @@

{{ 'account_status'|_ }}

-
-
{{ trans('list.piggy_bank') }}
+
+
diff --git a/resources/views/v1/piggy-banks/show.twig b/resources/views/v1/piggy-banks/show.twig index 2030114f22..5dba31c53b 100644 --- a/resources/views/v1/piggy-banks/show.twig +++ b/resources/views/v1/piggy-banks/show.twig @@ -30,8 +30,8 @@ -
-
{{ 'account'|_ }}
+
+
@@ -96,7 +96,7 @@

{{ 'transactions'|_ }}

-
+
{% include 'list/piggy-bank-events' %}
@@ -125,7 +125,7 @@ {{ 'attachments'|_ }} -
+
{% include 'list.attachments' %}
diff --git a/resources/views/v1/recurring/index.twig b/resources/views/v1/recurring/index.twig index c1b7cdd02e..8263afd36b 100644 --- a/resources/views/v1/recurring/index.twig +++ b/resources/views/v1/recurring/index.twig @@ -24,7 +24,7 @@ -
+
{{ ('make_new_recurring')|_ }} @@ -34,7 +34,7 @@
{{ paginator.render|raw }}
-
{{ 'account'|_ }} {{ piggyBank.account.name }}
+
diff --git a/resources/views/v1/reports/audit/report.twig b/resources/views/v1/reports/audit/report.twig index 4fb49d6313..aea2bc4c76 100644 --- a/resources/views/v1/reports/audit/report.twig +++ b/resources/views/v1/reports/audit/report.twig @@ -51,7 +51,7 @@ {% else %} -
+

{{ trans('firefly.audit_end_balance', { diff --git a/resources/views/v1/reports/partials/journals-audit.twig b/resources/views/v1/reports/partials/journals-audit.twig index d2838af694..25f69514fe 100644 --- a/resources/views/v1/reports/partials/journals-audit.twig +++ b/resources/views/v1/reports/partials/journals-audit.twig @@ -1,4 +1,4 @@ -

+
diff --git a/resources/views/v1/tags/show.twig b/resources/views/v1/tags/show.twig index dd4ff4c171..61572b02a8 100644 --- a/resources/views/v1/tags/show.twig +++ b/resources/views/v1/tags/show.twig @@ -120,7 +120,7 @@ {{ 'attachments'|_ }} -
+
{% include 'list.attachments' %}
diff --git a/resources/views/v1/transactions/show.twig b/resources/views/v1/transactions/show.twig index 72bcdfd1a5..27cd880d1e 100644 --- a/resources/views/v1/transactions/show.twig +++ b/resources/views/v1/transactions/show.twig @@ -381,7 +381,7 @@

{{ 'attachments'|_ }}

-
+
{% include 'list.attachments' with {attachments: attachments[journal.transaction_journal_id]} %}
@@ -393,7 +393,7 @@

{{ 'piggy_events'|_ }}

-
+
 
{% for event in events[journal.transaction_journal_id] %}