diff --git a/resources/twig/accounts/create.twig b/resources/twig/accounts/create.twig index 9d859121ba..da6437d0e7 100644 --- a/resources/twig/accounts/create.twig +++ b/resources/twig/accounts/create.twig @@ -1,12 +1,12 @@ {% extends "./layout/default.twig" %} {% block breadcrumbs %} - {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, what) }} + {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, what) }} {% endblock %} {% block content %}
- - + +
@@ -37,7 +37,7 @@
{% endif %} - +

{{ 'options'|_ }}

@@ -45,19 +45,14 @@
{{ ExpandedForm.optionsList('create','account') }}
+
+ +
-
-
-

- -

-
-
- -
+ {% endblock %} diff --git a/resources/twig/accounts/delete.twig b/resources/twig/accounts/delete.twig index 647e28309b..a5066bee5a 100644 --- a/resources/twig/accounts/delete.twig +++ b/resources/twig/accounts/delete.twig @@ -6,36 +6,39 @@ {% block content %} -{{ Form.open({'class' : 'form-horizontal','id' : 'destroy','url' : route('accounts.destroy',account.id)}) }} -
-
-
-
-

{{ trans('form.delete_account', {'name': account.name}) }}

-
-
-

- {{ trans('form.permDeleteWarning') }} -

-

- {{ trans('form.account_areYouSure', {'name': account.name}) }} -

-

- - {{ trans('form.cancel') }} -

-

- {% 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 %} -

+ {{ Form.open({'class' : 'form-horizontal','id' : 'destroy','url' : route('accounts.destroy',account.id)}) }} +
+
+
+
+

{{ trans('form.delete_account', {'name': account.name}) }}

+
+
+

+ {{ trans('form.permDeleteWarning') }} +

+ +

+ {{ 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 %} +

+ +
+
+ + {{ trans('form.cancel') }} +
-
- + {{ Form.close|raw }} {% endblock %} diff --git a/resources/twig/accounts/edit.twig b/resources/twig/accounts/edit.twig index bbaadb4255..78d846f546 100644 --- a/resources/twig/accounts/edit.twig +++ b/resources/twig/accounts/edit.twig @@ -5,71 +5,67 @@ {% endblock %} {% block content %} -{{ Form.model(account, {'class' : 'form-horizontal','id' : 'update','url' : route('accounts.update',account.id) } ) }} + {{ Form.model(account, {'class' : 'form-horizontal','id' : 'update','url' : route('accounts.update',account.id) } ) }} - + -
-
-
-
-

{{ 'mandatoryFields'|_ }}

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

{{ 'mandatoryFields'|_ }}

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

{{ 'optionalFields'|_ }}

+
+
+ {% if account.accounttype.type == 'Default account' or account.accounttype.type == 'Asset account' %} + {{ ExpandedForm.balance('openingBalance',null, {'currency' : openingBalance ? openingBalance.transactionCurrency : null}) }} + {{ ExpandedForm.date('openingBalanceDate') }} + {{ ExpandedForm.select('accountRole',Config.get('firefly.accountRoles')) }} + {{ ExpandedForm.balance('virtualBalance',null) }} -
-
-
-
-

{{ 'optionalFields'|_ }}

+ {% endif %} + {{ ExpandedForm.checkbox('active','1') }} +
-
- {% if account.accounttype.type == 'Default account' or account.accounttype.type == 'Asset account' %} - {{ ExpandedForm.balance('openingBalance',null, {'currency' : openingBalance ? openingBalance.transactionCurrency : null}) }} - {{ ExpandedForm.date('openingBalanceDate') }} - {{ ExpandedForm.select('accountRole',Config.get('firefly.accountRoles')) }} - {{ ExpandedForm.balance('virtualBalance',null) }} - {% endif %} - {{ ExpandedForm.checkbox('active','1') }} -
-
+ + {% if Session.get('preFilled').accountRole == 'ccAsset' %} +
+
+

Credit card options

+
+
+ {{ ExpandedForm.select('ccType',Config.get('firefly.ccTypes')) }} + {{ ExpandedForm.date('ccMonthlyPaymentDate',null,{'helpText' : 'Select any year and any month, it will be ignored anway. Only the day of the month is relevant.'}) }} +
+
+ {% endif %} - - {% if Session.get('preFilled').accountRole == 'ccAsset' %} -
-
-

Credit card options

-
-
- {{ ExpandedForm.select('ccType',Config.get('firefly.ccTypes')) }} - {{ ExpandedForm.date('ccMonthlyPaymentDate',null,{'helpText' : 'Select any year and any month, it will be ignored anway. Only the day of the month is relevant.'}) }} -
-
- {% endif %} - - -
-
-

{{ 'options'|_ }}

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

{{ 'options'|_ }}

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

- -

-
-
- + {{ Form.close|raw }} {% endblock %} diff --git a/resources/twig/accounts/index.twig b/resources/twig/accounts/index.twig index 3a373a1f1b..688c6b2060 100644 --- a/resources/twig/accounts/index.twig +++ b/resources/twig/accounts/index.twig @@ -20,13 +20,11 @@

{{ subTitle}}

-
+
+
- -
diff --git a/resources/twig/accounts/show.twig b/resources/twig/accounts/show.twig index 75d4f86b1f..1236ba546e 100644 --- a/resources/twig/accounts/show.twig +++ b/resources/twig/accounts/show.twig @@ -1,27 +1,24 @@ {% extends "./layout/default.twig" %} {% block breadcrumbs %} - {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, account) }} + {{ Breadcrumbs.renderIfExists(Route.getCurrentRoute.getName, account) }} {% endblock %} {% block content %} -
+

{{ account.name }}

- -
+
+
- -
@@ -43,22 +40,22 @@
{% include 'list/journals.twig' with {sorting:true} %}
+
-
-{% endblock %} + {% endblock %} -{% block scripts %} - - - - - - - + {% block scripts %} + + + + + + + -{% endblock %} + {% endblock %} diff --git a/resources/twig/bills/create.twig b/resources/twig/bills/create.twig index 43f8ee11d3..ba013a9289 100644 --- a/resources/twig/bills/create.twig +++ b/resources/twig/bills/create.twig @@ -8,59 +8,62 @@ {{ Form.open({'class' : 'form-horizontal','id' : 'store','url' : route('bills.store')}) }} -
-
-
-
-

{{ 'mandatoryFields'|_ }}

+
+
+
+
+

{{ 'mandatoryFields'|_ }}

+
+
+ {{ ExpandedForm.text('name') }} + {{ ExpandedForm.tags('match') }} + {{ ExpandedForm.amount('amount_min') }} + {{ ExpandedForm.amount('amount_max') }} + {{ ExpandedForm.date('date',phpdate('Y-m-d')) }} + {{ ExpandedForm.select('repeat_freq',periods,'monthly') }} +
-
- {{ ExpandedForm.text('name') }} - {{ ExpandedForm.tags('match') }} - {{ ExpandedForm.amount('amount_min') }} - {{ ExpandedForm.amount('amount_max') }} - {{ ExpandedForm.date('date',phpdate('Y-m-d')) }} - {{ 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/twig/bills/delete.twig b/resources/twig/bills/delete.twig index 4500018482..89c1e76621 100644 --- a/resources/twig/bills/delete.twig +++ b/resources/twig/bills/delete.twig @@ -7,31 +7,33 @@ {% block content %} {{ Form.open({'class' : 'form-horizontal','id' : 'destroy','url' : route('bills.destroy',bill.id)}) }} -
-
-
-
-

{{ trans('form.delete_bill', {'name': bill.name}) }}

-
-
-

- {{ trans('form.permDeleteWarning') }} -

-

- {{ trans('form.bill_areYouSure', {'name': bill.name}) }} -

-

- - {{ trans('form.cancel') }} -

-

- {% if bill.transactionjournals|length > 0 %} - {{ Lang.choice('form.bill_keep_transactions', bill.transactionjournals|length,{count: bill.transactionjournals|length}) }} - {% endif %} -

+
+
+
+
+

{{ trans('form.delete_bill', {'name': bill.name}) }}

+
+
+

+ {{ trans('form.permDeleteWarning') }} +

+ +

+ {{ trans('form.bill_areYouSure', {'name': bill.name}) }} +

+ +

+ {% if bill.transactionjournals|length > 0 %} + {{ Lang.choice('form.bill_keep_transactions', bill.transactionjournals|length,{count: bill.transactionjournals|length}) }} + {% endif %} +

+
+
+ + {{ trans('form.cancel') }} +
-
- + {{ Form.close|raw }} {% endblock %} diff --git a/resources/twig/bills/edit.twig b/resources/twig/bills/edit.twig index c8236cc76d..eae7fd2d88 100644 --- a/resources/twig/bills/edit.twig +++ b/resources/twig/bills/edit.twig @@ -8,38 +8,38 @@ {{ Form.model(bill, {'class' : 'form-horizontal','id' : 'update','url' : route('bills.update', bill.id)}) }} - + -
-
-
-
-

{{ 'mandatoryFields'|_ }}

+
+
+
+
+

{{ 'mandatoryFields'|_ }}

+
+
+ {{ ExpandedForm.text('name') }} + {{ ExpandedForm.tags('match') }} + {{ ExpandedForm.amount('amount_min') }} + {{ ExpandedForm.amount('amount_max') }} + {{ ExpandedForm.date('date',bill.date.format('Y-m-d')) }} + {{ ExpandedForm.select('repeat_freq',periods) }} +
-
- {{ ExpandedForm.text('name') }} - {{ ExpandedForm.tags('match') }} - {{ ExpandedForm.amount('amount_min') }} - {{ ExpandedForm.amount('amount_max') }} - {{ ExpandedForm.date('date',bill.date.format('Y-m-d')) }} - {{ ExpandedForm.select('repeat_freq',periods) }} + +
-
+
+
+
+

{{ 'optionalFields'|_ }}

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

{{ 'optionalFields'|_ }}

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

{{ 'options'|_ }}

@@ -47,20 +47,15 @@
{{ ExpandedForm.optionsList('update','bill') }}
- +
+ +
+
-
-
-
-

- -

-
-
- + {{ Form.close|raw }} {% endblock %} {% block styles %} diff --git a/resources/twig/bills/index.twig b/resources/twig/bills/index.twig index d0d8a2f77b..c3601d90f1 100644 --- a/resources/twig/bills/index.twig +++ b/resources/twig/bills/index.twig @@ -7,30 +7,30 @@ {% block content %}
-
-
-

{{ title }}

+
+
+

{{ title }}

- -
-
- - + +
+ +
+ + +
-
+
{% include 'list/bills.twig' %} +
{% endblock %} {% block styles %} - + {% endblock %} {% block scripts %} diff --git a/resources/twig/bills/show.twig b/resources/twig/bills/show.twig index 07cce9d12f..e53ed39670 100644 --- a/resources/twig/bills/show.twig +++ b/resources/twig/bills/show.twig @@ -6,113 +6,113 @@ {% block content %} -
-
-
-
-

{{ bill.name }}

+
+
+
+
+

{{ bill.name }}

- {% if bill.active %} - - {% else %} - - {% endif %} + {% if bill.active %} + + {% else %} + + {% endif %} - {% if bill.automatch %} - - {% else %} - - {% endif %} + {% if bill.automatch %} + + {% else %} + + {% endif %} -
-
- - + +
+ +
+ + +
+
- -
-
- - - - - - - - + + + + +
- Matching on - {% for word in bill.match|split(',') %} - {{ word }} - {% endfor %} - between {{ bill.amount_min|formatAmount }} and {{ bill.amount_max|formatAmount }}. - Repeats {{ bill.repeat_freq }}.
Next expected match - {% if bill.nextExpectedMatch %} - {{bill.nextExpectedMatch.formatLocalized(monthAndDayFormat)}} - {% else %} - {{ 'unknown'|_ }} - {% endif %} +
+ + + - -
+ Matching on + {% for word in bill.match|split(',') %} + {{ word }} + {% endfor %} + between {{ bill.amount_min|formatAmount }} and {{ bill.amount_max|formatAmount }}. + Repeats {{ bill.repeat_freq }}.
-
- - -
-
-
-

More

-
-
-

- Rescan old transactions -

-
-
-
- -
-
-
-
-

Chart

+
Next expected match + {% if bill.nextExpectedMatch %} + {{ bill.nextExpectedMatch.formatLocalized(monthAndDayFormat) }} + {% else %} + {{ 'unknown'|_ }} + {% endif %} +
+
-
-
+
+
+
+
+

More

+
+
+

+ Rescan old transactions +

+
-
-
-
-
-
-

Connected transaction journals

-
-
- {% include 'list/journals' %} +
+
+
+
+

Chart

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

Connected transaction journals

+
+
+ {% include 'list/journals' %} +
-
{% endblock %} {% block scripts %} - - - - + + + + - + {% endblock %} diff --git a/resources/twig/preferences/index.twig b/resources/twig/preferences/index.twig index bb0780104f..66f45235a3 100644 --- a/resources/twig/preferences/index.twig +++ b/resources/twig/preferences/index.twig @@ -7,122 +7,123 @@ {% block content %} {{ Form.open({'class' : 'form-horizontal','id' : 'preferences'}) }} -
-
-
-
-

Home screen accounts

-
-
-

Which accounts should be displayed on the home page?

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

Home screen accounts

+
+
+

Which accounts should be displayed on the home page?

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

Budget settings

+
+
+

+ What's the maximum amount of money a budget envelope may contain? +

+ {{ ExpandedForm.amount('budgetMaximum',budgetMaximum,{'label' : 'Budget maximum'}) }} +
+
+
-
-
-

Budget settings

-
-
-

- What's the maximum amount of money a budget envelope may contain? -

- {{ ExpandedForm.amount('budgetMaximum',budgetMaximum,{'label' : 'Budget maximum'}) }} -
-
- -
-
-
-
-

View range

-
-
-

Some charts are automatically grouped in periods. What period would you prefer?

-
- +
+
+
+

View range

+
+

Some charts are automatically grouped in periods. What period would you prefer?

-
- -
- -
- -
- -
- -
- -
- -
-
-
-
-
-
-
-

Languages

-
-
-

Firefly III supports several languages. Which one do you prefer?

- {% for key, lang in Config.get('firefly.lang') %}
- {% endfor %} +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+
+
+
+
+
+
+

Languages

+
+
+

Firefly III supports several languages. Which one do you prefer?

+ {% for key, lang in Config.get('firefly.lang') %} +
+ +
+ {% endfor %} + +
-
-
-
-
-
- +
+
+
+
+ +
-
- - + + {{ Form.close|raw }} {% endblock %} diff --git a/resources/twig/tags/delete.twig b/resources/twig/tags/delete.twig index 60a29469ef..f1dfbe2f96 100644 --- a/resources/twig/tags/delete.twig +++ b/resources/twig/tags/delete.twig @@ -6,30 +6,30 @@ {% block content %} {{ Form.open({'class' : 'form-horizontal','id' : 'destroy','url' : route('tags.destroy',tag.id)}) }} -
-
-
-
-

Delete tag "{{ tag.tag }}"

-
-
-

- Are you sure that you want to delete tag "{{ tag.tag }}"? -

- {% if tag.transactionjournals|length > 0 %} -

- Tag "{{ tag.tag }}" still has {{ tag.transactionjournals|length }} transaction(s) connected - to it. These will not be removed but will lose their connection to this tag. +

+
+
+
+

Delete tag "{{ tag.tag }}"

+
+
+

+ Are you sure that you want to delete tag "{{ tag.tag }}"?

- {% endif %} -
-
+ {% if tag.transactionjournals|length > 0 %} +

+ Tag "{{ tag.tag }}" still has {{ tag.transactionjournals|length }} transaction(s) connected + to it. These will not be removed but will lose their connection to this tag. +

+ {% endif %} +
+
- Cancel + Cancel +
-
- + {{ Form.close|raw }} {% endblock %} diff --git a/resources/twig/transactions/edit.twig b/resources/twig/transactions/edit.twig index 534f7b6bd0..5df0982c35 100644 --- a/resources/twig/transactions/edit.twig +++ b/resources/twig/transactions/edit.twig @@ -7,11 +7,11 @@ {% block content %} {{ Form.open({'class' : 'form-horizontal','id' : 'update','url' : route('transactions.update',journal.id)}) }} - - + + -
-
+
+

{{ 'mandatoryFields'|_ }}

@@ -46,34 +46,36 @@ {{ ExpandedForm.date('date',data['date']) }} +
-
+ -
-
-
-
-

{{ 'optionalFields'|_ }}

+
+
+
+
+

{{ 'optionalFields'|_ }}

+
+
+ + {% if what == 'withdrawal' %} + {{ ExpandedForm.select('budget_id',budgets,data['budget_id']) }} + {% endif %} + + + {{ ExpandedForm.text('category',data['category']) }} + + + {{ ExpandedForm.text('tags') }} + + + {% if what == 'withdrawal' and piggies|length > 0 %} + {{ ExpandedForm.select('piggy_bank_id',piggies,data['piggy_bank_id']) }} + {% endif %} + +
-
- - {% if what == 'withdrawal' %} - {{ ExpandedForm.select('budget_id',budgets,data['budget_id']) }} - {% endif %} - - - {{ ExpandedForm.text('category',data['category']) }} - - - {{ ExpandedForm.text('tags') }} - - - {% if what == 'withdrawal' and piggies|length > 0 %} - {{ ExpandedForm.select('piggy_bank_id',piggies,data['piggy_bank_id']) }} - {% endif %} - -
-
+
@@ -87,27 +89,20 @@
-
- -
-
-

- -

-
- + + {{ Form.close|raw }} {% endblock %} {% block scripts %} - - - - + + + + {% endblock %} {% block styles %}