From a4f9a6fd427c805597b2bdc570099375b49b401d Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 4 Jun 2023 10:09:24 +0200 Subject: [PATCH 1/3] fix: replace deprecated form.model with html --- resources/views/accounts/edit.twig | 190 ++++++++++--------- resources/views/admin/link/edit.twig | 62 +++--- resources/views/admin/users/edit.twig | 82 ++++---- resources/views/bills/edit.twig | 124 ++++++------ resources/views/budgets/edit.twig | 82 ++++---- resources/views/categories/edit.twig | 79 ++++---- resources/views/currencies/edit.twig | 65 ++++--- resources/views/object-groups/edit.twig | 77 ++++---- resources/views/piggy-banks/edit.twig | 109 ++++++----- resources/views/recurring/edit.twig | 98 ++++++---- resources/views/rules/rule-group/edit.twig | 79 ++++---- resources/views/rules/rule/edit.twig | 210 +++++++++++---------- resources/views/tags/edit.twig | 99 +++++----- 13 files changed, 715 insertions(+), 641 deletions(-) diff --git a/resources/views/accounts/edit.twig b/resources/views/accounts/edit.twig index edc8df2e58..0a47e571ff 100644 --- a/resources/views/accounts/edit.twig +++ b/resources/views/accounts/edit.twig @@ -11,107 +11,106 @@ var mapboxToken = "{{ config('firefly.mapbox_api_key') }}"; - {{ Form.model(account, { - 'class': 'form-horizontal', - 'id': 'update', - 'url': route('accounts.update',account.id), - 'enctype': 'multipart/form-data' - } ) }} - - +
+ -
-
-
-
-

{{ 'mandatoryFields'|_ }}

-
-
- {{ ExpandedForm.text('name') }} - {% if account.accountType.type == 'Default account' or account.accountType.type == 'Asset account' or objectType == 'liabilities' %} - {{ CurrencyForm.currencyList('currency_id', null, {helpText:'account_default_currency'|_}) }} + + - {% endif %} - - {% if objectType == 'liabilities' %} - {{ ExpandedForm.select('liability_type_id', liabilityTypes) }} - {{ ExpandedForm.amountNoCurrency('opening_balance', null, {label:'debt_start_amount'|_}) }} - {{ ExpandedForm.select('liability_direction', liabilityDirections) }} - {{ ExpandedForm.date('opening_balance_date', null, {label:'debt_start_date'|_}) }} - {{ ExpandedForm.percentage('interest') }} - {{ ExpandedForm.select('interest_period', interestPeriods) }} - {% endif %} -
-
- -
-
-
-
-

{{ 'optionalFields'|_ }}

-
-
- {{ ExpandedForm.text('iban') }} - {{ ExpandedForm.text('BIC', null, {maxlength: 11}) }} - {% if preFilled.account_role == 'ccAsset' %} - {{ ExpandedForm.text('account_number', null , {label:trans('form.creditCardNumber')}) }} - {% else %} - {{ ExpandedForm.text('account_number') }} - {% endif %} - - {% if account.accounttype.type == 'Default account' or account.accounttype.type == 'Asset account' %} - - {# get opening balance entry for this thing! #} - {{ ExpandedForm.amountNoCurrency('opening_balance',null) }} - {{ ExpandedForm.date('opening_balance_date') }} - {{ ExpandedForm.select('account_role', roles) }} - {{ ExpandedForm.amountNoCurrency('virtual_balance',null) }} - - {% endif %} - {{ ExpandedForm.checkbox('include_net_worth', 1) }} - {{ ExpandedForm.textarea('notes',preFilled.notes,{helpText: trans('firefly.field_supports_markdown')}) }} - {# only correct way to do active checkbox #} - {{ ExpandedForm.checkbox('active', 1) }} - {# only correct way to do active checkbox #} - - {{ ExpandedForm.location('location', null, {locations: locations}) }} - {{ ExpandedForm.file('attachments[]', {'multiple': 'multiple','helpText': trans('firefly.upload_max_file_size', {'size': uploadSize|filesize}) }) }} - -
-
- - {# panel for credit card options #} - {% if preFilled.account_role == 'ccAsset' %} -
+
+
+
-

{{ 'credit_card_options'|_ }}

+

{{ 'mandatoryFields'|_ }}

- {{ ExpandedForm.select('cc_type',Config.get('firefly.ccTypes')) }} - {{ ExpandedForm.date('cc_monthly_payment_date',null,{'helpText' : trans('firefly.cc_monthly_payment_date_help')}) }} + {{ ExpandedForm.text('name') }} + {% if account.accountType.type == 'Default account' or account.accountType.type == 'Asset account' or objectType == 'liabilities' %} + {{ CurrencyForm.currencyList('currency_id', null, {helpText:'account_default_currency'|_}) }} + + {% endif %} + + {% if objectType == 'liabilities' %} + {{ ExpandedForm.select('liability_type_id', liabilityTypes) }} + {{ ExpandedForm.amountNoCurrency('opening_balance', null, {label:'debt_start_amount'|_}) }} + {{ ExpandedForm.select('liability_direction', liabilityDirections) }} + {{ ExpandedForm.date('opening_balance_date', null, {label:'debt_start_date'|_}) }} + {{ ExpandedForm.percentage('interest') }} + {{ ExpandedForm.select('interest_period', interestPeriods) }} + {% endif %}
- {% endif %} + +
+
+
+
+

{{ 'optionalFields'|_ }}

+
+
+ {{ ExpandedForm.text('iban') }} + {{ ExpandedForm.text('BIC', null, {maxlength: 11}) }} + {% if preFilled.account_role == 'ccAsset' %} + {{ ExpandedForm.text('account_number', null , {label:trans('form.creditCardNumber')}) }} + {% else %} + {{ ExpandedForm.text('account_number') }} + {% endif %} + + {% if account.accounttype.type == 'Default account' or account.accounttype.type == 'Asset account' %} + + {# get opening balance entry for this thing! #} + {{ ExpandedForm.amountNoCurrency('opening_balance',null) }} + {{ ExpandedForm.date('opening_balance_date') }} + {{ ExpandedForm.select('account_role', roles) }} + {{ ExpandedForm.amountNoCurrency('virtual_balance',null) }} + + {% endif %} + {{ ExpandedForm.checkbox('include_net_worth', 1) }} + {{ ExpandedForm.textarea('notes',preFilled.notes,{helpText: trans('firefly.field_supports_markdown')}) }} + {# only correct way to do active checkbox #} + {{ ExpandedForm.checkbox('active', 1) }} + {# only correct way to do active checkbox #} + + {{ ExpandedForm.location('location', null, {locations: locations}) }} + {{ ExpandedForm.file('attachments[]', {'multiple': 'multiple','helpText': trans('firefly.upload_max_file_size', {'size': uploadSize|filesize}) }) }} + +
+
+ + {# panel for credit card options #} + {% if preFilled.account_role == 'ccAsset' %} +
+
+

{{ 'credit_card_options'|_ }}

+
+
+ {{ ExpandedForm.select('cc_type',Config.get('firefly.ccTypes')) }} + {{ ExpandedForm.date('cc_monthly_payment_date',null,{'helpText' : trans('firefly.cc_monthly_payment_date_help')}) }} +
+
+ {% endif %} +
-
-
-
- {# panel for options #} -
-
-

{{ 'options'|_ }}

-
-
- {{ ExpandedForm.optionsList('update','account') }} -
-
- +
+
+ {# panel for options #} +
+
+

{{ 'options'|_ }}

+
+
+ {{ ExpandedForm.optionsList('update','account') }} +
+
+ +
-
{% endblock %} {% block scripts %} @@ -120,13 +119,16 @@ var iOwe = '{{ 'i_owe_amount'|_|escape('js') }}'; - + {% endblock %} {% block styles %} - - - + + + {% endblock %} diff --git a/resources/views/admin/link/edit.twig b/resources/views/admin/link/edit.twig index efc19f9968..39635b8cad 100644 --- a/resources/views/admin/link/edit.twig +++ b/resources/views/admin/link/edit.twig @@ -6,44 +6,46 @@ {% block content %} - {{ Form.model(linkType, {'class' : 'form-horizontal','id' : 'update','url' : route('admin.links.update', linkType.id) } ) }} - - -
-
-
-
-

{{ 'mandatoryFields'|_ }}

-
-
- {{ ExpandedForm.text('name', null, {helpText: trans('firefly.link_type_help_name')}) }} - {{ ExpandedForm.text('inward', null, {helpText: trans('firefly.link_type_help_inward')}) }} - {{ ExpandedForm.text('outward', null, {helpText: trans('firefly.link_type_help_outward')}) }} +
+ + +
+
+
+
+

{{ 'mandatoryFields'|_ }}

+
+
+ {{ ExpandedForm.text('name', null, {helpText: trans('firefly.link_type_help_name')}) }} + {{ ExpandedForm.text('inward', null, {helpText: trans('firefly.link_type_help_inward')}) }} + {{ ExpandedForm.text('outward', null, {helpText: trans('firefly.link_type_help_outward')}) }} +
-
-
-
+
+
- {# panel for options #} -
-
-

{{ 'options'|_ }}

-
-
- {{ ExpandedForm.optionsList('update','link_type') }} -
-
- + {# panel for options #} +
+
+

{{ 'options'|_ }}

+
+
+ {{ ExpandedForm.optionsList('update','link_type') }} +
+
+ +
+
- -
diff --git a/resources/views/admin/users/edit.twig b/resources/views/admin/users/edit.twig index 5a4b6334b7..bcdd79ab15 100644 --- a/resources/views/admin/users/edit.twig +++ b/resources/views/admin/users/edit.twig @@ -5,53 +5,55 @@ {% endblock %} {% block content %} +
+ - {{ Form.model(user, {'class' : 'form-horizontal','id' : 'update','url' : route('admin.users.update',user.id) } ) }} + - - -
-
-
-
-

{{ 'mandatoryFields'|_ }}

-
-
- {% if canEditDetails %} - {{ ExpandedForm.text('email',null,{'helpText': trans('firefly.admin_update_email')}) }} - {{ ExpandedForm.password('password') }} - {{ ExpandedForm.password('password_confirmation') }} - {% else %} - - - - {% endif %} - {{ ExpandedForm.checkbox('blocked') }} - {{ ExpandedForm.select('blocked_code', codes, user.blocked_code) }} - {% if user.id != currentUser.id %} - {{ ExpandedForm.checkbox('is_owner',1,isAdmin) }} - {% endif %} +
+
+
+
+

{{ 'mandatoryFields'|_ }}

+
+
+ {% if canEditDetails %} + {{ ExpandedForm.text('email',null,{'helpText': trans('firefly.admin_update_email')}) }} + {{ ExpandedForm.password('password') }} + {{ ExpandedForm.password('password_confirmation') }} + {% else %} + + + + {% endif %} + {{ ExpandedForm.checkbox('blocked') }} + {{ ExpandedForm.select('blocked_code', codes, user.blocked_code) }} + {% if user.id != currentUser.id %} + {{ ExpandedForm.checkbox('is_owner',1,isAdmin) }} + {% endif %} +
-
-
-
- {# panel for options #} -
-
-

{{ 'options'|_ }}

-
-
- {{ ExpandedForm.optionsList('update','account') }} -
-
- +
+
+ {# panel for options #} +
+
+

{{ 'options'|_ }}

+
+
+ {{ ExpandedForm.optionsList('update','account') }} +
+
+ +
-
{% endblock %} diff --git a/resources/views/bills/edit.twig b/resources/views/bills/edit.twig index 0f953f5800..09303033db 100644 --- a/resources/views/bills/edit.twig +++ b/resources/views/bills/edit.twig @@ -6,85 +6,93 @@ {% block content %} - {{ Form.model(bill, {'class' : 'form-horizontal','enctype': 'multipart/form-data','id' : 'update','url' : route('bills.update', bill.id)}) }} +
+ + - +
+
+
+
+

{{ 'mandatoryFields'|_ }}

+
+
+ {% if rules.count() > 0 %} + {{ ExpandedForm.text('name',null, {helpText: trans_choice('firefly.bill_edit_rules', rules.count())}) }} + {% else %} + {{ ExpandedForm.text('name') }} + {% endif %} + {{ CurrencyForm.currencyList('transaction_currency_id') }} + {{ ExpandedForm.amountNoCurrency('amount_min') }} + {{ ExpandedForm.amountNoCurrency('amount_max') }} + {{ ExpandedForm.date('date',bill.date.format('Y-m-d')) }} + {{ ExpandedForm.select('repeat_freq',periods) }} + {{ ExpandedForm.integer('skip') }} -
-
-
-
-

{{ 'mandatoryFields'|_ }}

+
-
- {% if rules.count() > 0 %} - {{ ExpandedForm.text('name',null, {helpText: trans_choice('firefly.bill_edit_rules', rules.count())}) }} - {% else %} - {{ ExpandedForm.text('name') }} - {% endif %} - {{ CurrencyForm.currencyList('transaction_currency_id') }} - {{ ExpandedForm.amountNoCurrency('amount_min') }} - {{ ExpandedForm.amountNoCurrency('amount_max') }} - {{ ExpandedForm.date('date',bill.date.format('Y-m-d')) }} - {{ ExpandedForm.select('repeat_freq',periods) }} - {{ ExpandedForm.integer('skip') }} -
+
+
+
+
+

{{ 'optionalFields'|_ }}

+
+
+ {{ ExpandedForm.date('bill_end_date',null, {'helpText': trans('firefly.bill_end_date_help')}) }} + {{ ExpandedForm.date('extension_date',null,{'helpText': trans('firefly.bill_extension_date_help')} ) }} + {{ ExpandedForm.textarea('notes',null,{helpText: trans('firefly.field_supports_markdown')}) }} + {{ ExpandedForm.file('attachments[]', {'multiple': 'multiple','helpText': trans('firefly.upload_max_file_size', {'size': uploadSize|filesize}) }) }} + {{ ExpandedForm.objectGroup() }} + {# only correct way to do active checkbox #} + {{ ExpandedForm.checkbox('active', 1) }} -
-
-
-
-

{{ 'optionalFields'|_ }}

-
-
- {{ ExpandedForm.date('bill_end_date',null, {'helpText': trans('firefly.bill_end_date_help')}) }} - {{ ExpandedForm.date('extension_date',null,{'helpText': trans('firefly.bill_extension_date_help')} ) }} - - {{ ExpandedForm.textarea('notes',null,{helpText: trans('firefly.field_supports_markdown')}) }} - {{ ExpandedForm.file('attachments[]', {'multiple': 'multiple','helpText': trans('firefly.upload_max_file_size', {'size': uploadSize|filesize}) }) }} - {{ ExpandedForm.objectGroup() }} - {# only correct way to do active checkbox #} - {{ ExpandedForm.checkbox('active', 1) }} - +
-
-
-
-
-
-

{{ 'options'|_ }}

-
-
- {{ ExpandedForm.optionsList('update','bill') }} -
-
- +
+
+
+
+

{{ 'options'|_ }}

+
+
+ {{ ExpandedForm.optionsList('update','bill') }} +
+
+ +
-
{% endblock %} {% block styles %} - - - + + + {% endblock %} {% block scripts %} - - + + {# auto complete for object groups #} - - + + {% endblock %} diff --git a/resources/views/budgets/edit.twig b/resources/views/budgets/edit.twig index e3d5d1d2c9..4fec930260 100644 --- a/resources/views/budgets/edit.twig +++ b/resources/views/budgets/edit.twig @@ -5,54 +5,56 @@ {% endblock %} {% block content %} - {{ Form.model(budget, {'class' : 'form-horizontal','enctype': 'multipart/form-data','id' : 'update','url' : route('budgets.update',budget.id) } ) }} - -
-
-
-
-

{{ 'mandatoryFields'|_ }}

+
+ + +
+
+
+
+

{{ 'mandatoryFields'|_ }}

+
+
+ {# only correct way to do active checkbox #} + {{ ExpandedForm.checkbox('active', 1) }} + {{ ExpandedForm.text('name') }} +
-
- {# only correct way to do active checkbox #} - {{ ExpandedForm.checkbox('active', 1) }} - {{ ExpandedForm.text('name') }} -
-
-
-
- {# panel for auto-budget #} -
-
-

{{ 'optionalFields'|_ }}

-
-
- {{ ExpandedForm.select('auto_budget_type', autoBudgetTypes, autoBudget.auto_budget_type) }} - {{ CurrencyForm.currencyList('auto_budget_currency_id', autoBudget.transaction_currency_id) }} - {{ ExpandedForm.amountNoCurrency('auto_budget_amount', preFilled.auto_budget_amount) }} - {{ ExpandedForm.select('auto_budget_period', autoBudgetPeriods, autoBudget.period) }} - {{ ExpandedForm.file('attachments[]', {'multiple': 'multiple','helpText': trans('firefly.upload_max_file_size', {'size': uploadSize|filesize}) }) }} +
+
+ {# panel for auto-budget #} +
+
+

{{ 'optionalFields'|_ }}

+
+
+ {{ ExpandedForm.select('auto_budget_type', autoBudgetTypes, autoBudget.auto_budget_type) }} + {{ CurrencyForm.currencyList('auto_budget_currency_id', autoBudget.transaction_currency_id) }} + {{ ExpandedForm.amountNoCurrency('auto_budget_amount', preFilled.auto_budget_amount) }} + {{ ExpandedForm.select('auto_budget_period', autoBudgetPeriods, autoBudget.period) }} + {{ ExpandedForm.file('attachments[]', {'multiple': 'multiple','helpText': trans('firefly.upload_max_file_size', {'size': uploadSize|filesize}) }) }} +
-
-
-
- {# panel for options #} -
-
-

{{ 'options'|_ }}

-
-
- {{ ExpandedForm.optionsList('update','budget') }} -
-
- +
+
+ {# panel for options #} +
+
+

{{ 'options'|_ }}

+
+
+ {{ ExpandedForm.optionsList('update','budget') }} +
+
+ +
-
diff --git a/resources/views/categories/edit.twig b/resources/views/categories/edit.twig index c4bb56a9ce..d2bb786836 100644 --- a/resources/views/categories/edit.twig +++ b/resources/views/categories/edit.twig @@ -5,52 +5,57 @@ {% endblock %} {% block content %} - {{ Form.model(category, {'class' : 'form-horizontal','enctype': 'multipart/form-data','id' : 'update','url' : route('categories.update',category.id)}) }} - -
-
-
-
-

{{ 'mandatoryFields'|_ }}

+ +
+ + + +
+
+
+
+

{{ 'mandatoryFields'|_ }}

+
+
+ {{ ExpandedForm.text('name') }} +
-
- {{ ExpandedForm.text('name') }} +
+
+ {# panel for optional fields #} +
+
+

{{ 'optionalFields'|_ }}

+
+
+ {{ ExpandedForm.textarea('notes', preFilled.notes, {helpText: trans('firefly.field_supports_markdown')} ) }} + {{ ExpandedForm.file('attachments[]', {'multiple': 'multiple','helpText': trans('firefly.upload_max_file_size', {'size': uploadSize|filesize}) }) }} +
-
- {# panel for optional fields#} -
-
-

{{ 'optionalFields'|_ }}

-
-
- {{ ExpandedForm.textarea('notes', preFilled.notes, {helpText: trans('firefly.field_supports_markdown')} ) }} - {{ ExpandedForm.file('attachments[]', {'multiple': 'multiple','helpText': trans('firefly.upload_max_file_size', {'size': uploadSize|filesize}) }) }} -
-
-
-
-
-
+
+
- {# panel for options #} -
-
-

{{ 'options'|_ }}

-
-
- {{ ExpandedForm.optionsList('update','category') }} -
-
- + {# panel for options #} +
+
+

{{ 'options'|_ }}

+
+
+ {{ ExpandedForm.optionsList('update','category') }} +
+
+ +
-
{% endblock %} {% block scripts %} diff --git a/resources/views/currencies/edit.twig b/resources/views/currencies/edit.twig index d200a70ddc..422de5ce6e 100644 --- a/resources/views/currencies/edit.twig +++ b/resources/views/currencies/edit.twig @@ -5,44 +5,47 @@ {% endblock %} {% block content %} - {{ Form.model(currency, {'class' : 'form-horizontal','id' : 'update','url' : route('currencies.update',currency.id)}) }} +
+ - -
-
-
-
-

{{ 'mandatoryFields'|_ }}

-
-
- {{ ExpandedForm.text('name',null,{'maxlength' : 48}) }} - {{ ExpandedForm.text('symbol',null,{'maxlength' : 51}) }} - {{ ExpandedForm.text('code',null,{'maxlength' : 51}) }} - {{ ExpandedForm.integer('decimal_places',null,{'maxlength' : 2,'min': 0,'max': 12}) }} - {{ ExpandedForm.checkbox('enabled',null) }} + +
+
+
+
+

{{ 'mandatoryFields'|_ }}

+
+
+ {{ ExpandedForm.text('name',null,{'maxlength' : 48}) }} + {{ ExpandedForm.text('symbol',null,{'maxlength' : 51}) }} + {{ ExpandedForm.text('code',null,{'maxlength' : 51}) }} + {{ ExpandedForm.integer('decimal_places',null,{'maxlength' : 2,'min': 0,'max': 12}) }} + {{ ExpandedForm.checkbox('enabled',null) }} +
-
-
-
+
+
- {# panel for options #} -
-
-

{{ 'options'|_ }}

-
-
- {{ ExpandedForm.optionsList('update','currency') }} -
-
- + {# panel for options #} +
+
+

{{ 'options'|_ }}

+
+
+ {{ ExpandedForm.optionsList('update','currency') }} +
+
+ +
+
-
-
{% endblock %} diff --git a/resources/views/object-groups/edit.twig b/resources/views/object-groups/edit.twig index f7cc09c091..dc046a865a 100644 --- a/resources/views/object-groups/edit.twig +++ b/resources/views/object-groups/edit.twig @@ -5,54 +5,63 @@ {% endblock %} {% block content %} - {{ Form.model(objectGroup, {'class' : 'form-horizontal','enctype': 'multipart/form-data','id' : 'update','url' : route('object-groups.update',objectGroup.id)}) }} +
+ - + -
-
-
-
-

{{ 'mandatoryFields'|_ }}

-
-
- {{ ExpandedForm.text('title') }} +
+
+
+
+

{{ 'mandatoryFields'|_ }}

+
+
+ {{ ExpandedForm.text('title') }} +
+
-
-
-
-
- {# panel for options #} -
-
-

{{ 'options'|_ }}

-
-
- {{ ExpandedForm.optionsList('update','object group') }} -
-
- +
+
+ {# panel for options #} +
+
+

{{ 'options'|_ }}

+
+
+ {{ ExpandedForm.optionsList('update','object group') }} +
+
+ +
+
-
-
{% endblock %} {% block scripts %} - + - + {# auto complete for object groups #} - - + + {% endblock %} {% block styles %} - - + + {% endblock %} diff --git a/resources/views/piggy-banks/edit.twig b/resources/views/piggy-banks/edit.twig index 97c660966a..4adf6f003a 100644 --- a/resources/views/piggy-banks/edit.twig +++ b/resources/views/piggy-banks/edit.twig @@ -5,73 +5,82 @@ {% endblock %} {% block content %} - {{ Form.model(piggyBank, {'class' : 'form-horizontal','enctype': 'multipart/form-data','id' : 'update','url' : route('piggy-banks.update',piggyBank.id)}) }} +
+ - - + + -
-
-
-
-

{{ 'mandatoryFields'|_ }}

+
+
+
+
+

{{ 'mandatoryFields'|_ }}

+
+
+ + {{ ExpandedForm.text('name') }} + {{ AccountForm.assetAccountList('account_id', null, {label: 'saveOnAccount'|_ }) }} + {{ ExpandedForm.amountNoCurrency('targetamount') }} + +
-
- {{ ExpandedForm.text('name') }} - {{ AccountForm.assetAccountList('account_id', null, {label: 'saveOnAccount'|_ }) }} - {{ ExpandedForm.amountNoCurrency('targetamount') }} - -
- -
-
-
-
-

{{ 'optionalFields'|_ }}

-
-
- {{ ExpandedForm.date('startdate') }} - {{ ExpandedForm.date('targetdate') }} - {{ ExpandedForm.textarea('notes', null, {helpText: trans('firefly.field_supports_markdown')}) }} - {{ ExpandedForm.file('attachments[]', {'multiple': 'multiple','helpText': trans('firefly.upload_max_file_size', {'size': uploadSize|filesize}) }) }} - {{ ExpandedForm.objectGroup() }} +
+
+
+

{{ 'optionalFields'|_ }}

+
+
+ {{ ExpandedForm.date('startdate') }} + {{ ExpandedForm.date('targetdate') }} + {{ ExpandedForm.textarea('notes', null, {helpText: trans('firefly.field_supports_markdown')}) }} + {{ ExpandedForm.file('attachments[]', {'multiple': 'multiple','helpText': trans('firefly.upload_max_file_size', {'size': uploadSize|filesize}) }) }} + {{ ExpandedForm.objectGroup() }} +
-
-
-
- {# panel for options #} -
-
-

{{ 'options'|_ }}

+
+
+ {# panel for options #} +
+
+

{{ 'options'|_ }}

+
+
+ {{ ExpandedForm.optionsList('update','piggy bank') }} +
+
+ +
-
- {{ ExpandedForm.optionsList('update','piggy bank') }} -
-
- -
-
+
-
{% endblock %} {% block scripts %} - + - + {# auto complete for object groups #} - - + + {% endblock %} {% block styles %} - - + + {% endblock %} diff --git a/resources/views/recurring/edit.twig b/resources/views/recurring/edit.twig index 6e241238b8..a5a2d931ab 100644 --- a/resources/views/recurring/edit.twig +++ b/resources/views/recurring/edit.twig @@ -4,8 +4,11 @@ {% endblock %} {% block content %} - {{ Form.model(recurrence, {'class' : 'form-horizontal','enctype': 'multipart/form-data','id' : 'update','url' : route('recurring.update', recurrence.id)}) }} +
+ {# row with recurrence information #}
@@ -16,7 +19,7 @@

{{ 'mandatory_for_recurring'|_ }}

- + {{ ExpandedForm.text('title') }} {{ ExpandedForm.date('first_date',array.first_date, {helpText: trans('firefly.help_first_date_no_past')}) }} {{ ExpandedForm.select('repetition_type', [], null, {helpText: trans('firefly.change_date_other_options')}) }} @@ -28,7 +31,8 @@ {# calendar in popup #}
- +

@@ -67,7 +71,7 @@

{{ 'mandatory_fields_for_tranaction'|_ }}

- {# three buttons to distinguish type of transaction#} + {# three buttons to distinguish type of transaction #}
- {# end of three buttons#} + {# end of three buttons #} {{ ExpandedForm.text('transaction_description', array.transactions[0].description) }} {# transaction information (mandatory) #} {{ CurrencyForm.currencyList('transaction_currency_id', array.transactions[0].currency_id) }} @@ -119,7 +126,7 @@ {{ ExpandedForm.select('budget_id', budgets, array.transactions[0].budget_id) }} {% else %} {{ ExpandedForm.select('budget_id', budgets, array.transactions[0].budget_id, {helpText: trans('firefly.no_budget_pointer', {link: route('budgets.index')})}) }} - {#budgets#} + {# budgets #} {% endif %} {# CATEGORY ALWAYS #} @@ -143,8 +150,8 @@
{# row with submit stuff. #} -
-
+
+

{{ 'options'|_ }}

@@ -161,48 +168,53 @@
{# -
-
-
-

{{ 'expected_repetitions'|_ }}

-
-
- Here. -
+
+
+
+

{{ 'expected_repetitions'|_ }}

+
+
+ Here.
-
+
+
#} {# calendar modal #}