diff --git a/app/Http/routes.php b/app/Http/routes.php index 3b1bca65b7..04f0704ce0 100644 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -295,10 +295,10 @@ Route::group( * Preferences Controller */ Route::get('/preferences', ['uses' => 'PreferencesController@index', 'as' => 'preferences']); - Route::post('/preferences', ['uses' => 'PreferencesController@postIndex']); + Route::post('/preferences', ['uses' => 'PreferencesController@postIndex', 'as' => 'preferences.update']); Route::get('/preferences/code', ['uses' => 'PreferencesController@code', 'as' => 'preferences.code']); Route::get('/preferences/delete-code', ['uses' => 'PreferencesController@deleteCode', 'as' => 'preferences.delete-code']); - Route::post('/preferences/code', ['uses' => 'PreferencesController@postCode']); + Route::post('/preferences/code', ['uses' => 'PreferencesController@postCode', 'as' => 'preferences.code.store']); /** * Profile Controller @@ -306,8 +306,8 @@ Route::group( Route::get('/profile', ['uses' => 'ProfileController@index', 'as' => 'profile']); Route::get('/profile/change-password', ['uses' => 'ProfileController@changePassword', 'as' => 'profile.change-password']); Route::get('/profile/delete-account', ['uses' => 'ProfileController@deleteAccount', 'as' => 'profile.delete-account']); - Route::post('/profile/delete-account', ['uses' => 'ProfileController@postDeleteAccount', 'as' => 'delete-account-post']); - Route::post('/profile/change-password', ['uses' => 'ProfileController@postChangePassword', 'as' => 'change-password-post']); + Route::post('/profile/delete-account', ['uses' => 'ProfileController@postDeleteAccount', 'as' => 'profile.delete-account.post']); + Route::post('/profile/change-password', ['uses' => 'ProfileController@postChangePassword', 'as' => 'profile.change-password.store']); /** * Report Controller diff --git a/resources/views/bills/create.twig b/resources/views/bills/create.twig index 51e6bff500..85540186e4 100644 --- a/resources/views/bills/create.twig +++ b/resources/views/bills/create.twig @@ -6,57 +6,56 @@ {% block content %} - {{ Form.open({'class' : 'form-horizontal','id' : 'store','url' : route('bills.store')}) }} +
+ -
-
-
-
-

{{ 'mandatoryFields'|_ }}

-
-
- {{ ExpandedForm.text('name') }} - {{ ExpandedForm.tags('match') }} - {{ ExpandedForm.amount('amount_min') }} - {{ ExpandedForm.amount('amount_max') }} - {{ ExpandedForm.date('date',phpdate('Y-m-d'), {helpText: trans('firefly.bill_date_little_relevance')}) }} - {{ ExpandedForm.select('repeat_freq',periods,'monthly') }} +
+
+
+
+

{{ 'mandatoryFields'|_ }}

+
+
+ {{ ExpandedForm.text('name') }} + {{ ExpandedForm.tags('match') }} + {{ ExpandedForm.amount('amount_min') }} + {{ ExpandedForm.amount('amount_max') }} + {{ ExpandedForm.date('date',phpdate('Y-m-d'), {helpText: trans('firefly.bill_date_little_relevance')}) }} + {{ ExpandedForm.select('repeat_freq',periods,'monthly') }} +
+
+
+
+
+

{{ 'optionalFields'|_ }}

+
+
+ {{ ExpandedForm.integer('skip',0) }} + {{ ExpandedForm.checkbox('automatch',1,true) }} + {{ ExpandedForm.checkbox('active',1,true) }} +
+
+ +
+
+

{{ 'options'|_ }}

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

{{ 'optionalFields'|_ }}

-
-
- {{ ExpandedForm.integer('skip',0) }} - {{ ExpandedForm.checkbox('automatch',1,true) }} - {{ ExpandedForm.checkbox('active',1,true) }} -
-
- - -
-
-

{{ 'options'|_ }}

-
-
- {{ ExpandedForm.optionsList('create','bill') }} -
- -
- -
- -
- - {{ Form.close|raw }} + {% endblock %} diff --git a/resources/views/budgets/create.twig b/resources/views/budgets/create.twig index 6af4450dfe..de276f2920 100644 --- a/resources/views/budgets/create.twig +++ b/resources/views/budgets/create.twig @@ -5,36 +5,39 @@ {% endblock %} {% block content %} - {{ Form.open({'class' : 'form-horizontal','id' : 'store','url' : route('budgets.store')}) }} -
-
-
-
-

{{ 'mandatoryFields'|_ }}

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

{{ 'mandatoryFields'|_ }}

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

{{ 'options'|_ }}

-
-
- {{ ExpandedForm.optionsList('create','budget') }} -
- - -
- {{ Form.close|raw }} + {% endblock %} diff --git a/resources/views/categories/create.twig b/resources/views/categories/create.twig index b4dffb55c5..a7911555fd 100644 --- a/resources/views/categories/create.twig +++ b/resources/views/categories/create.twig @@ -5,39 +5,39 @@ {% endblock %} {% block content %} - {{ Form.open({'class' : 'form-horizontal','id' : 'store','url' : route('categories.store')}) }} -
-
-
-
-

{{ 'mandatoryFields'|_ }}

+
+ +
+
+
+
+

{{ 'mandatoryFields'|_ }}

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

{{ 'options'|_ }}

+
+
+ {{ ExpandedForm.optionsList('create','category') }} +
+
- -
- - -
-
-

{{ 'options'|_ }}

-
-
- {{ ExpandedForm.optionsList('create','category') }} -
- -
-
-
- - {{ Form.close|raw }} +
{% endblock %} diff --git a/resources/views/currency/create.twig b/resources/views/currency/create.twig index 0b3c512f81..70943d3e15 100644 --- a/resources/views/currency/create.twig +++ b/resources/views/currency/create.twig @@ -5,40 +5,41 @@ {% endblock %} {% block content %} - {{ Form.open({'class' : 'form-horizontal','id' : 'store','route' : 'currency.store'}) }} -
-
-
-
-

{{ 'mandatoryFields'|_ }}

-
-
- {{ ExpandedForm.text('name',null,{'maxlength' : 48}) }} - {{ ExpandedForm.text('symbol',null,{'maxlength': 8}) }} - {{ ExpandedForm.text('code',null,{'maxlength' : 3}) }} +
+ +
+
+
+
+

{{ 'mandatoryFields'|_ }}

+
+
+ {{ ExpandedForm.text('name',null,{'maxlength' : 48}) }} + {{ ExpandedForm.text('symbol',null,{'maxlength': 8}) }} + {{ ExpandedForm.text('code',null,{'maxlength' : 3}) }} +
+
-
+
-
+ +
+
+

{{ 'options'|_ }}

+
+
+ {{ ExpandedForm.optionsList('create','currency') }} +
+ +
- -
-
-

{{ 'options'|_ }}

-
-
- {{ ExpandedForm.optionsList('create','currency') }} -
-
-
-
- {{ Form.close|raw }} +
{% endblock %} diff --git a/resources/views/piggy-banks/add-mobile.twig b/resources/views/piggy-banks/add-mobile.twig index 9afb021ebb..8839178622 100644 --- a/resources/views/piggy-banks/add-mobile.twig +++ b/resources/views/piggy-banks/add-mobile.twig @@ -5,35 +5,36 @@ {% endblock %} {% block content %} - {{ Form.open({'class' : 'form-horizontal','id' : 'store','url' : route('piggy-banks.add', piggyBank.id)}) }} -
-
-
-
-

{{ trans('firefly.add_money_to_piggy', {name: piggyBank.name}) }}

-
-
- -

- {{ 'max_amount_add'|_ }}: {{ maxAmount|formatAmount }}. -

- -
-
{{ getCurrencySymbol()|raw }}
- +
+ +
+
+
+
+

{{ trans('firefly.add_money_to_piggy', {name: piggyBank.name}) }}

-

-   -

- +
+ +

+ {{ 'max_amount_add'|_ }}: {{ maxAmount|formatAmount }}. +

+ +
+
{{ getCurrencySymbol()|raw }}
+ +
+

+   +

+ +
-
-
- {{ Form.close|raw }} +
+ {% endblock %} diff --git a/resources/views/piggy-banks/create.twig b/resources/views/piggy-banks/create.twig index 65b0f361db..492ff18ae8 100644 --- a/resources/views/piggy-banks/create.twig +++ b/resources/views/piggy-banks/create.twig @@ -5,50 +5,51 @@ {% endblock %} {% block content %} - {{ Form.open({'class' : 'form-horizontal','id' : 'store','url' : route('piggy-banks.store')}) }} - -
-
-
-
-

{{ 'mandatoryFields'|_ }}

+
+ + +
+
+
+
+

{{ 'mandatoryFields'|_ }}

+
+
+ + {{ ExpandedForm.text('name') }} + {{ ExpandedForm.select('account_id',accounts,null,{'label' : 'saveOnAccount'|_}) }} + {{ ExpandedForm.amount('targetamount') }} + +
-
- - {{ ExpandedForm.text('name') }} - {{ ExpandedForm.select('account_id',accounts,null,{'label' : 'saveOnAccount'|_}) }} - {{ ExpandedForm.amount('targetamount') }} - +
+
+
+
+

{{ 'optionalFields'|_ }}

+
+
+ {{ ExpandedForm.date('targetdate') }} +
+ + +
+
+

{{ 'options'|_ }}

+
+
+ {{ ExpandedForm.optionsList('create','piggy bank') }} +
+ +
+
-
-
-
-

{{ 'optionalFields'|_ }}

-
-
- {{ ExpandedForm.date('targetdate') }} -
-
- - -
-
-

{{ 'options'|_ }}

-
-
- {{ ExpandedForm.optionsList('create','piggy bank') }} -
- -
- -
-
- {{ Form.close|raw }} +
{% endblock %} diff --git a/resources/views/preferences/code.twig b/resources/views/preferences/code.twig index 0e76b35d8c..8931babd46 100644 --- a/resources/views/preferences/code.twig +++ b/resources/views/preferences/code.twig @@ -5,41 +5,42 @@ {% endblock %} {% block content %} - {{ Form.open({'class' : 'form-horizontal','id' : 'preferences.code'}) }} -
-
-
-
-

{{ 'pref_two_factor_auth_code'|_ }}

-
-
-

- {{ 'pref_two_factor_auth_code_help'|_ }} -

-
-
- -

+
+ +
+
+
+
+

{{ 'pref_two_factor_auth_code'|_ }}

+
+
+

+ {{ 'pref_two_factor_auth_code_help'|_ }} +

+
+
+ +

+
+
+ {{ ExpandedForm.text('code', code) }}
+
+
- {{ ExpandedForm.text('code', code) }} +
+
+
+
+
+ +
-
-
-
-
-
- -
-
-
-
- - - {{ Form.close|raw }} + + {% endblock %} diff --git a/resources/views/preferences/index.twig b/resources/views/preferences/index.twig index b2b3ef6d82..829b6c0adc 100644 --- a/resources/views/preferences/index.twig +++ b/resources/views/preferences/index.twig @@ -5,212 +5,210 @@ {% endblock %} {% block content %} - {{ Form.open({'class' : 'form-horizontal','id' : 'preferences'}) }} - -
-
-
-
-

{{ 'pref_home_screen_accounts'|_ }}

+
+ +
+
+
+
+

{{ 'pref_home_screen_accounts'|_ }}

+
+
+

{{ 'pref_home_screen_accounts_help'|_ }}

+ {% for account in accounts %} +
+
+
+ +
+
+
+ {% endfor %} +
-
-

{{ 'pref_home_screen_accounts_help'|_ }}

- {% for account in accounts %} +
+
+

{{ 'pref_budget_settings'|_ }}

+
+
+

+ {{ 'pref_budget_settings_help'|_ }} +

+ {{ ExpandedForm.amount('budgetMaximum',budgetMaximum,{'label' : 'budget_maximum'|_}) }} +
+
+
+
+

{{ 'pref_custom_fiscal_year'|_ }}

+
+
+

+ {{ 'pref_custom_fiscal_year_help'|_ }} +

+ {% set isCustomFiscalYear = customFiscalYear == 1 ? true : false %} + {{ ExpandedForm.checkbox('customFiscalYear','1',isCustomFiscalYear,{ 'label' : 'pref_custom_fiscal_year_label'|_ }) }} + {{ ExpandedForm.date('fiscalYearStart',fiscalYearStart,{ 'label' : 'pref_fiscal_year_start_label'|_ }) }} +
+
+ +
+
+
+
+

{{ 'pref_view_range'|_ }}

+
+
+

{{ 'pref_view_range_help'|_ }}

+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+
+ +
+
+
+
+
+
+
+

{{ 'pref_languages'|_ }}

+
+
+

{{ 'pref_languages_help'|_ }}

+ {% for key, lang in Config.get('firefly.languages') %} + {% if lang.complete == true or (lang.complete == false and showIncomplete) %} +
+ +
+ {% endif %} + {% endfor %} + +
+
+
+ + +
+
+
+

{{ 'transaction_page_size_title'|_ }}

+
+
+

{{ 'transaction_page_size_help'|_ }}

+ {{ ExpandedForm.integer('transactionPageSize',transactionPageSize,{'label' : 'transaction_page_size_label'|_}) }} +
+
+
+ + +
+
+
+

{{ 'pref_two_factor_auth'|_ }}

+
+
+

{{ 'pref_two_factor_auth_help'|_ }}

+ + {% if is2faEnabled == 1 and has2faSecret == true %} + +
+ +
+ +
+
+ {% endif %} +
- {% endfor %} -
-
-
-
-

{{ 'pref_budget_settings'|_ }}

-
-
-

- {{ 'pref_budget_settings_help'|_ }} -

- {{ ExpandedForm.amount('budgetMaximum',budgetMaximum,{'label' : 'budget_maximum'|_}) }} -
-
-
-
-

{{ 'pref_custom_fiscal_year'|_ }}

-
-
-

- {{ 'pref_custom_fiscal_year_help'|_ }} -

- {% set isCustomFiscalYear = customFiscalYear == 1 ? true : false %} - {{ ExpandedForm.checkbox('customFiscalYear','1',isCustomFiscalYear,{ 'label' : 'pref_custom_fiscal_year_label'|_ }) }} - {{ ExpandedForm.date('fiscalYearStart',fiscalYearStart,{ 'label' : 'pref_fiscal_year_start_label'|_ }) }} +
+
-
-
-
-

{{ 'pref_view_range'|_ }}

-
-
-

{{ 'pref_view_range_help'|_ }}

- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
-
- +
+
+
+
+
-
-
-
-

{{ 'pref_languages'|_ }}

-
-
-

{{ 'pref_languages_help'|_ }}

- {% for key, lang in Config.get('firefly.languages') %} - {% if lang.complete == true or (lang.complete == false and showIncomplete) %} -
- -
- {% endif %} - {% endfor %} - -
-
-
- - -
-
-
-

{{ 'transaction_page_size_title'|_ }}

-
-
-

{{ 'transaction_page_size_help'|_ }}

- {{ ExpandedForm.integer('transactionPageSize',transactionPageSize,{'label' : 'transaction_page_size_label'|_}) }} -
-
-
- - -
-
-
-

{{ 'pref_two_factor_auth'|_ }}

-
-
-

{{ 'pref_two_factor_auth_help'|_ }}

-
-
-
- -
-
- - {% if is2faEnabled == 1 and has2faSecret == true %} - -
- -
- -
-
- {% endif %} - -
-
-
-
- - -
-
-
-
-
- -
-
-
-
- - - {{ Form.close|raw }} + {% endblock %} diff --git a/resources/views/profile/change-password.twig b/resources/views/profile/change-password.twig index 9d3687d93f..29835429f3 100644 --- a/resources/views/profile/change-password.twig +++ b/resources/views/profile/change-password.twig @@ -5,58 +5,60 @@ {% endblock %} {% block content %} - {{ Form.open({'class' : 'form-horizontal','id' : 'change-password'}) }} +
+ -
-
-
-
-

{{ 'change_your_password'|_ }}

-
-
- - {% if errors|length > 0 %} -
    - {% for error in errors.all %} -
  • {{ error }}
  • - {% endfor %} -
- - {% endif %} - - -
- - -
- -
+
+
+
+
+

{{ 'change_your_password'|_ }}

+
-
- + {% if errors|length > 0 %} +
    + {% for error in errors.all %} +
  • {{ error }}
  • + {% endfor %} +
-
- + {% endif %} + + +
+ + +
+ +
-
-
- +
+ -
- +
+ +
+ +
+ + +
+ +
+
+ + +
+ - - -
-
-
- {{ Form.close|raw }} + {% endblock %} diff --git a/resources/views/profile/delete-account.twig b/resources/views/profile/delete-account.twig index 188e5ab6b0..9006950e63 100644 --- a/resources/views/profile/delete-account.twig +++ b/resources/views/profile/delete-account.twig @@ -5,50 +5,51 @@ {% endblock %} {% block content %} - {{ Form.open({'class' : 'form-horizontal','id' : 'change-password'}) }} +
+ -
-
-
-
-

{{ 'delete_your_account'|_ }}

-
-
+
+
+
+
+

{{ 'delete_your_account'|_ }}

+
+
-

- {{ 'delete_your_account_help'|_ }} -

+

+ {{ 'delete_your_account_help'|_ }} +

-

- {{ 'delete_your_account_password'|_ }} +

+ {{ 'delete_your_account_password'|_ }} -

+

- {% if errors|length > 0 %} -
    - {% for error in errors.all %} -
  • {{ error }}
  • - {% endfor %} -
+ {% if errors|length > 0 %} +
    + {% for error in errors.all %} +
  • {{ error }}
  • + {% endfor %} +
- {% endif %} + {% endif %} -
- +
+ -
- +
+ +
-
-
-
- {{ Form.close|raw }} + {% endblock %} diff --git a/resources/views/rules/rule-group/create.twig b/resources/views/rules/rule-group/create.twig index 4bff91f4f3..5cb21384f7 100644 --- a/resources/views/rules/rule-group/create.twig +++ b/resources/views/rules/rule-group/create.twig @@ -5,47 +5,46 @@ {% endblock %} {% block content %} - {{ Form.open({'class' : 'form-horizontal','id' : 'store','url' : route('rules.rule-group.store')}) }} -
-
-
-
-

{{ 'mandatoryFields'|_ }}

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

{{ 'mandatoryFields'|_ }}

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

{{ 'optionalFields'|_ }}

+ +
+
+

{{ 'optionalFields'|_ }}

+
+
+ {{ ExpandedForm.textarea('description') }} +
-
- {{ ExpandedForm.textarea('description') }} -
-
- -
-
-

{{ 'options'|_ }}

-
-
- {{ ExpandedForm.optionsList('create','rule-group') }} -
-
- -
- {{ Form.close|raw }} - - + {% endblock %} diff --git a/resources/views/rules/rule/create.twig b/resources/views/rules/rule/create.twig index f28807c503..b97b97018f 100644 --- a/resources/views/rules/rule/create.twig +++ b/resources/views/rules/rule/create.twig @@ -5,123 +5,124 @@ {% endblock %} {% block content %} - {{ Form.open({'class' : 'form-horizontal','id' : 'store','url' : route('rules.rule.store', ruleGroup.id)}) }} - -
-
-
-
-

{{ 'mandatoryFields'|_ }}

+ +
+ + +
+
+
+
+

{{ 'mandatoryFields'|_ }}

+
+
+ {{ ExpandedForm.text('title') }} + {{ ExpandedForm.select('trigger',allJournalTriggers()) }} + {{ ExpandedForm.checkbox('stop_processing',1,null, {helpText: trans('firefly.rule_help_stop_processing')}) }} +
-
- {{ ExpandedForm.text('title') }} - {{ ExpandedForm.select('trigger',allJournalTriggers()) }} - {{ ExpandedForm.checkbox('stop_processing',1,null, {helpText: trans('firefly.rule_help_stop_processing')}) }} +
+
+ + +
+
+

{{ 'optionalFields'|_ }}

+
+
+ {{ ExpandedForm.textarea('description') }} +
-
- -
-
-

{{ 'optionalFields'|_ }}

-
-
- {{ ExpandedForm.textarea('description') }} + +
+
+
+
+

{{ 'rule_triggers'|_ }}

+
+ +
+ + + + + + + + + + {% for trigger in oldTriggers %} + {{ trigger|raw }} + {% endfor %} + + +
{{ 'trigger'|_ }}{{ 'trigger_value'|_ }}{{ 'stop_processing_other_triggers'|_ }}
+

+
+ {{ 'add_rule_trigger'|_ }} + {{ 'test_rule_triggers'|_ }} +

+
-
- -
-
-
-
-

{{ 'rule_triggers'|_ }}

-
- -
- - - - - - - - - - {% for trigger in oldTriggers %} - {{ trigger|raw }} - {% endfor %} - + {% include '/rules/partials/test-trigger-modal.twig' %} -
{{ 'trigger'|_ }}{{ 'trigger_value'|_ }}{{ 'stop_processing_other_triggers'|_ }}
-

-
- {{ 'add_rule_trigger'|_ }} - {{ 'test_rule_triggers'|_ }} -

+ +
+
+
+
+

{{ 'rule_actions'|_ }}

+
+
+ + + + + + + + + + {% for action in oldActions %} + {{ action|raw }} + {% endfor %} + + +
{{ 'action'|_ }}{{ 'action_value'|_ }}{{ 'stop_executing_other_actions'|_ }}
+

+
+ {{ 'add_rule_action'|_ }} +

+
-
- {% include '/rules/partials/test-trigger-modal.twig' %} +
+
+ +
+
+

{{ 'options'|_ }}

+
+
+ {{ ExpandedForm.optionsList('create','rule') }} +
+ +
- -
-
-
-
-

{{ 'rule_actions'|_ }}

-
-
- - - - - - - - - - {% for action in oldActions %} - {{ action|raw }} - {% endfor %} - - -
{{ 'action'|_ }}{{ 'action_value'|_ }}{{ 'stop_executing_other_actions'|_ }}
-

-
- {{ 'add_rule_action'|_ }} -

-
-
-
-
- -
-
- -
-
-

{{ 'options'|_ }}

-
-
- {{ ExpandedForm.optionsList('create','rule') }} -
-
- -
- {{ Form.close|raw }} - + {% endblock %} {% block scripts %} diff --git a/resources/views/tags/create.twig b/resources/views/tags/create.twig index e0d9de79bd..ea9c4e12ac 100644 --- a/resources/views/tags/create.twig +++ b/resources/views/tags/create.twig @@ -5,52 +5,52 @@ {% endblock %} {% block content %} - {{ Form.open({'class' : 'form-horizontal','id' : 'store','route' : 'tags.store'}) }} +
+ +
+
+
+
+

{{ 'mandatoryFields'|_ }}

+
+
+ {{ ExpandedForm.text('tag') }} + {{ ExpandedForm.multiRadio('tagMode',tagOptions) }} +
+
+
-
-
-
-
-

{{ 'mandatoryFields'|_ }}

+
+ +
+
+

{{ 'optionalFields'|_ }}

+
+
+ {{ ExpandedForm.date('date') }} + {{ ExpandedForm.textarea('description') }} + {{ ExpandedForm.location('tagPosition') }} +
-
- {{ ExpandedForm.text('tag') }} - {{ ExpandedForm.multiRadio('tagMode',tagOptions) }} + + +
+
+

{{ 'options'|_ }}

+
+
+ {{ ExpandedForm.optionsList('create','tag') }} +
+
+
- -
- -
-
-

{{ 'optionalFields'|_ }}

-
-
- {{ ExpandedForm.date('date') }} - {{ ExpandedForm.textarea('description') }} - {{ ExpandedForm.location('tagPosition') }} -
-
- - -
-
-

{{ 'options'|_ }}

-
-
- {{ ExpandedForm.optionsList('create','tag') }} -
- -
- -
-
- {{ Form.close|raw }} + {% endblock %} {% block scripts %}