From 7fbd0b2ffc4e31e31f618702c68235af2272e477 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 15 Aug 2015 21:44:29 +0200 Subject: [PATCH] Fixed some inconsistencies in the delete-form. --- resources/twig/accounts/delete.twig | 35 ++++++++++++++++------------- 1 file changed, 20 insertions(+), 15 deletions(-) diff --git a/resources/twig/accounts/delete.twig b/resources/twig/accounts/delete.twig index 81b16c4b4b..3e730fec42 100644 --- a/resources/twig/accounts/delete.twig +++ b/resources/twig/accounts/delete.twig @@ -22,22 +22,27 @@ {{ trans('form.account_areYouSure', {'name': account.name}) }}

-

- {% if account.transactions|length > 0 %} - {{ Lang.choice('form.also_delete_transactions', account.transactions|length, {count: account.transactions|length}) }} - {% endif %}
- {% if account.piggyBanks|length > 0 %} - {{ Lang.choice('form.also_delete_piggyBanks', account.piggyBanks|length, {count: account.piggyBanks|length}) }} - {% endif %} -

+ {% if account.transactions|length > 0 or account.piggyBanks|length > 0 %} +

+ {% if account.transactions|length > 0 %} + {{ Lang.choice('form.also_delete_transactions', account.transactions|length, {count: account.transactions|length}) }} + {% endif %}
+ {% if account.piggyBanks|length > 0 %} + {{ Lang.choice('form.also_delete_piggyBanks', account.piggyBanks|length, {count: account.piggyBanks|length}) }} + {% endif %} +

+ {% endif %} + {% if account.transactions|length > 0 %} +

+ {{ 'save_transactions_by_moving'|_ }} +

-

- {{ 'save_transactions_by_moving'|_ }} -

- -

- {{ Form.select('move_account_before_delete', accountList, null, {class: 'form-control'}) }} -

+

+ {{ Form.select('move_account_before_delete', accountList, null, {class: 'form-control'}) }} +

+ {% else %} + + {% endif %}