From 3a96d669a46f2fffc9623fae96cea4048823a039 Mon Sep 17 00:00:00 2001 From: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Date: Wed, 20 Aug 2025 00:27:51 +0000 Subject: [PATCH 1/2] Implement comprehensive WCAG 2.1 AA accessibility improvements - Make skip links visible on focus with proper styling - Add ARIA landmarks (banner, navigation, main, contentinfo, complementary) - Enhance form accessibility with aria-describedby, aria-invalid, aria-required - Add proper IDs to help text and error messages with role='alert' - Implement focus indicators for all interactive elements - Add aria-expanded attributes to collapsible menu items - Include accessibility JavaScript for focus management and announcements - Add screen reader only utility class (.sr-only) - Support reduced motion preferences - Add dir='ltr' attribute to html element - Enhance modal accessibility with proper ARIA attributes - Improve table accessibility with scope attributes and ARIA labels - Add proper heading hierarchy throughout templates - Include alt attributes for images with aria-hidden for decorative icons Co-Authored-By: Sam Fertig --- resources/assets/v2/src/js/accessibility.js | 72 +++++++++++++++++++++ resources/assets/v2/src/sass/app.scss | 68 ++++++++++++++++++- resources/views/form/checkbox.twig | 2 +- resources/views/form/date.twig | 4 +- resources/views/form/feedback.twig | 2 +- resources/views/form/file.twig | 2 +- resources/views/form/help.twig | 2 +- resources/views/form/integer.twig | 2 +- resources/views/form/multi-select.twig | 2 +- resources/views/form/password.twig | 2 +- resources/views/form/percentage.twig | 2 +- resources/views/form/select.twig | 2 +- resources/views/form/text.twig | 2 +- resources/views/form/textarea.twig | 2 +- resources/views/layout/default.twig | 25 ++++--- resources/views/partials/menu-sidebar.twig | 22 +++---- 16 files changed, 178 insertions(+), 35 deletions(-) create mode 100644 resources/assets/v2/src/js/accessibility.js diff --git a/resources/assets/v2/src/js/accessibility.js b/resources/assets/v2/src/js/accessibility.js new file mode 100644 index 00000000000..08f9b9b1891 --- /dev/null +++ b/resources/assets/v2/src/js/accessibility.js @@ -0,0 +1,72 @@ +document.addEventListener('DOMContentLoaded', function() { + const sidebarToggle = document.querySelector('.sidebar-toggle'); + if (sidebarToggle) { + sidebarToggle.addEventListener('click', function() { + const isExpanded = this.getAttribute('aria-expanded') === 'true'; + this.setAttribute('aria-expanded', !isExpanded); + }); + } + + const treeviewLinks = document.querySelectorAll('.treeview > a'); + treeviewLinks.forEach(function(link) { + link.addEventListener('click', function(e) { + e.preventDefault(); + const isExpanded = this.getAttribute('aria-expanded') === 'true'; + this.setAttribute('aria-expanded', !isExpanded); + + const submenu = this.nextElementSibling; + if (submenu && submenu.classList.contains('treeview-menu')) { + submenu.style.display = isExpanded ? 'none' : 'block'; + } + }); + }); + + const modals = document.querySelectorAll('.modal'); + modals.forEach(function(modal) { + modal.addEventListener('shown.bs.modal', function() { + const firstFocusable = modal.querySelector('input, button, select, textarea, [tabindex]:not([tabindex="-1"])'); + if (firstFocusable) { + firstFocusable.focus(); + } + }); + + modal.addEventListener('hidden.bs.modal', function() { + const trigger = document.querySelector('[data-target="#' + modal.id + '"]'); + if (trigger) { + trigger.focus(); + } + }); + }); + + function announceToScreenReader(message) { + const announcement = document.createElement('div'); + announcement.setAttribute('aria-live', 'polite'); + announcement.setAttribute('aria-atomic', 'true'); + announcement.className = 'sr-only'; + announcement.textContent = message; + document.body.appendChild(announcement); + + setTimeout(function() { + document.body.removeChild(announcement); + }, 1000); + } + + const forms = document.querySelectorAll('form'); + forms.forEach(function(form) { + form.addEventListener('submit', function(e) { + const errors = form.querySelectorAll('.text-danger[role="alert"]'); + if (errors.length > 0) { + announceToScreenReader('Form has ' + errors.length + ' error' + (errors.length > 1 ? 's' : '') + '. Please review and correct.'); + } + }); + }); + + document.addEventListener('keydown', function(e) { + if (e.key === 'Escape') { + const openModals = document.querySelectorAll('.modal.in, .modal.show'); + openModals.forEach(function(modal) { + $(modal).modal('hide'); + }); + } + }); +}); diff --git a/resources/assets/v2/src/sass/app.scss b/resources/assets/v2/src/sass/app.scss index 872e5bda2d6..8f9809e0247 100644 --- a/resources/assets/v2/src/sass/app.scss +++ b/resources/assets/v2/src/sass/app.scss @@ -48,7 +48,20 @@ $success: #64B624 !default; // some local CSS -.skip-links {display: none;} +.skip-links { + position: absolute; + left: -9999px; + z-index: 999999; + padding: 8px 16px; + background: #000; + color: #fff; + text-decoration: none; + border-radius: 3px; +} +.skip-links:focus { + left: 6px; + top: 7px; +} /* Remove bottom margin from unstyled lists @@ -80,6 +93,59 @@ h3.hover-expand:hover { appearance: auto; } +.form-control:focus { + outline: 2px solid #1E6581; + outline-offset: 2px; +} + +.btn:focus { + outline: 2px solid #1E6581; + outline-offset: 2px; +} + +a:focus { + outline: 2px solid #1E6581; + outline-offset: 2px; +} + +.sidebar-toggle:focus { + outline: 2px solid #1E6581; + outline-offset: 2px; +} + +.treeview > a:focus { + outline: 2px solid #1E6581; + outline-offset: 2px; +} + +.modal:focus { + outline: none; +} + +.modal-content { + outline: 2px solid #1E6581; +} + +@media (prefers-reduced-motion: reduce) { + * { + animation-duration: 0.01ms !important; + animation-iteration-count: 1 !important; + transition-duration: 0.01ms !important; + } +} + +.sr-only { + position: absolute !important; + width: 1px !important; + height: 1px !important; + padding: 0 !important; + margin: -1px !important; + overflow: hidden !important; + clip: rect(0, 0, 0, 0) !important; + white-space: nowrap !important; + border: 0 !important; +} + // edit buttons .hidden-edit-button { cursor: pointer; diff --git a/resources/views/form/checkbox.twig b/resources/views/form/checkbox.twig index 7e64d02030b..5002293407b 100644 --- a/resources/views/form/checkbox.twig +++ b/resources/views/form/checkbox.twig @@ -9,7 +9,7 @@
{% include 'form.help' %} diff --git a/resources/views/form/date.twig b/resources/views/form/date.twig index 68a14ecd646..d190c72ce12 100644 --- a/resources/views/form/date.twig +++ b/resources/views/form/date.twig @@ -5,10 +5,10 @@
- +
{{ Html.input('date', name, value).id(options.id).class('form-control').attribute('autocomplete','off').attribute('spellcheck','false') - .attribute('min', options.min) + .attribute('min', options.min).attribute('aria-describedby', (options.helpText ? name ~ '_help' : '') ~ (errors.has(name) ? ' ' ~ name ~ '_error' : '')).attribute('aria-invalid', errors.has(name) ? 'true' : 'false').attribute('aria-required', options.required ? 'true' : 'false') }}
{% include 'form.help' %} diff --git a/resources/views/form/feedback.twig b/resources/views/form/feedback.twig index 64d5875b838..55985cded3a 100644 --- a/resources/views/form/feedback.twig +++ b/resources/views/form/feedback.twig @@ -1,4 +1,4 @@ {% if errors.has(name) %} -

{{ errors.first(name) }}

+ {% endif %} diff --git a/resources/views/form/file.twig b/resources/views/form/file.twig index b45a4606bb1..9d586945a1e 100644 --- a/resources/views/form/file.twig +++ b/resources/views/form/file.twig @@ -2,7 +2,7 @@
- {{ Html.input('file',name).id(options.id).attribute('multiple','multiple').class('form-control') }} + {{ Html.input('file',name).id(options.id).attribute('multiple','multiple').class('form-control').attribute('aria-describedby', (options.helpText ? name ~ '_help' : '') ~ (errors.has(name) ? ' ' ~ name ~ '_error' : '')).attribute('aria-invalid', errors.has(name) ? 'true' : 'false').attribute('aria-required', options.required ? 'true' : 'false') }} {% include 'form.help' %} {% include 'form.feedback' %}
diff --git a/resources/views/form/help.twig b/resources/views/form/help.twig index d402fb623b6..33c9e87b333 100644 --- a/resources/views/form/help.twig +++ b/resources/views/form/help.twig @@ -1,3 +1,3 @@ {% if options.helpText %} -

{{ options.helpText|raw }}

+

{{ options.helpText|raw }}

{% endif %} diff --git a/resources/views/form/integer.twig b/resources/views/form/integer.twig index 924e339d6ca..c470c92175a 100644 --- a/resources/views/form/integer.twig +++ b/resources/views/form/integer.twig @@ -2,7 +2,7 @@
- {{ Html.input('number', name, value).id(options.id).attribute('step',options.step).attribute('autocomplete','off').attribute('spellcheck', 'false').class('form-control').attribute('placeholder',options.placeholder) }} + {{ Html.input('number', name, value).id(options.id).attribute('step',options.step).attribute('autocomplete','off').attribute('spellcheck', 'false').class('form-control').attribute('placeholder',options.placeholder).attribute('aria-describedby', (options.helpText ? name ~ '_help' : '') ~ (errors.has(name) ? ' ' ~ name ~ '_error' : '')).attribute('aria-invalid', errors.has(name) ? 'true' : 'false').attribute('aria-required', options.required ? 'true' : 'false') }} {% include 'form.help' %} {% include 'form.feedback' %}
diff --git a/resources/views/form/multi-select.twig b/resources/views/form/multi-select.twig index d21a4734b67..ee436e41671 100644 --- a/resources/views/form/multi-select.twig +++ b/resources/views/form/multi-select.twig @@ -2,7 +2,7 @@
- {{ Html.multiselect(name~"[]", list, selected).id(options.id).attribute('size',12).class('form-control').attribute('autocomplete','off').attribute('spellcheck','false').attribute('placeholder', options.placeholder) }} + {{ Html.multiselect(name~"[]", list, selected).id(options.id).attribute('size',12).class('form-control').attribute('autocomplete','off').attribute('spellcheck','false').attribute('placeholder', options.placeholder).attribute('aria-describedby', (options.helpText ? name ~ '_help' : '') ~ (errors.has(name) ? ' ' ~ name ~ '_error' : '')).attribute('aria-invalid', errors.has(name) ? 'true' : 'false').attribute('aria-required', options.required ? 'true' : 'false') }} {% include 'form.help' %} {% include 'form.feedback' %} diff --git a/resources/views/form/password.twig b/resources/views/form/password.twig index 7524a4bb2bc..1ea981ff512 100644 --- a/resources/views/form/password.twig +++ b/resources/views/form/password.twig @@ -2,7 +2,7 @@
- {{ Html.input('password', name, value).id(options.id).class('form-control').attribute('placeholder',options.placeholder).attribute('autocomplete','off').attribute('spellcheck','false') }} + {{ Html.input('password', name, value).id(options.id).class('form-control').attribute('placeholder',options.placeholder).attribute('autocomplete','off').attribute('spellcheck','false').attribute('aria-describedby', (options.helpText ? name ~ '_help' : '') ~ (errors.has(name) ? ' ' ~ name ~ '_error' : '')).attribute('aria-invalid', errors.has(name) ? 'true' : 'false').attribute('aria-required', options.required ? 'true' : 'false') }} {% include 'form.help' %} {% include 'form.feedback' %}
diff --git a/resources/views/form/percentage.twig b/resources/views/form/percentage.twig index d22ca11c17c..fcdcb844290 100644 --- a/resources/views/form/percentage.twig +++ b/resources/views/form/percentage.twig @@ -3,7 +3,7 @@
- {{ Html.input('number', name, value).id(options.id).attribute('step',options.step).attribute('autocomplete','off').attribute('spellcheck', 'false').class('form-control').attribute('placeholder',options.placeholder) }} + {{ Html.input('number', name, value).id(options.id).attribute('step',options.step).attribute('autocomplete','off').attribute('spellcheck', 'false').class('form-control').attribute('placeholder',options.placeholder).attribute('aria-describedby', (options.helpText ? name ~ '_help' : '') ~ (errors.has(name) ? ' ' ~ name ~ '_error' : '')).attribute('aria-invalid', errors.has(name) ? 'true' : 'false').attribute('aria-required', options.required ? 'true' : 'false') }}
%
{% include 'form.help' %} diff --git a/resources/views/form/select.twig b/resources/views/form/select.twig index bbd5588aec0..736f4aa3231 100644 --- a/resources/views/form/select.twig +++ b/resources/views/form/select.twig @@ -2,7 +2,7 @@
- {{ Html.select(name, list, selected).id(options.id).class('form-control').attribute('autocomplete','off').attribute('spellcheck','false').attribute('placeholder', options.placeholder) }} + {{ Html.select(name, list, selected).id(options.id).class('form-control').attribute('autocomplete','off').attribute('spellcheck','false').attribute('placeholder', options.placeholder).attribute('aria-describedby', (options.helpText ? name ~ '_help' : '') ~ (errors.has(name) ? ' ' ~ name ~ '_error' : '')).attribute('aria-invalid', errors.has(name) ? 'true' : 'false').attribute('aria-required', options.required ? 'true' : 'false') }} {% include 'form.help' %} {% include 'form.feedback' %} diff --git a/resources/views/form/text.twig b/resources/views/form/text.twig index e1a9e3e3413..339ba292cbb 100644 --- a/resources/views/form/text.twig +++ b/resources/views/form/text.twig @@ -2,7 +2,7 @@
- {{ Html.input('text', name, value).id(options.id).class('form-control').attribute('autocomplete','off').attribute('spellcheck','false').attribute('placeholder',options.placeholder) }} + {{ Html.input('text', name, value).id(options.id).class('form-control').attribute('autocomplete','off').attribute('spellcheck','false').attribute('placeholder',options.placeholder).attribute('aria-describedby', (options.helpText ? name ~ '_help' : '') ~ (errors.has(name) ? ' ' ~ name ~ '_error' : '')).attribute('aria-invalid', errors.has(name) ? 'true' : 'false').attribute('aria-required', options.required ? 'true' : 'false') }} {% include 'form.help' %} {% include 'form.feedback' %}
diff --git a/resources/views/form/textarea.twig b/resources/views/form/textarea.twig index d8f647db298..76a4bcb2712 100644 --- a/resources/views/form/textarea.twig +++ b/resources/views/form/textarea.twig @@ -2,7 +2,7 @@
- {{ Html.textarea(name, value).id(options.id).attribute('rows', options.rows).class('form-control').attribute('autocomplete','off').attribute('spellcheck','false').attribute('placeholder',options.placeholder) }} + {{ Html.textarea(name, value).id(options.id).attribute('rows', options.rows).class('form-control').attribute('autocomplete','off').attribute('spellcheck','false').attribute('placeholder',options.placeholder).attribute('aria-describedby', (options.helpText ? name ~ '_help' : '') ~ (errors.has(name) ? ' ' ~ name ~ '_error' : '')).attribute('aria-invalid', errors.has(name) ? 'true' : 'false').attribute('aria-required', options.required ? 'true' : 'false') }} {% include 'form.help' %} {% include 'form.feedback' %}
diff --git a/resources/views/layout/default.twig b/resources/views/layout/default.twig index a20ed1b0600..196f99163b3 100644 --- a/resources/views/layout/default.twig +++ b/resources/views/layout/default.twig @@ -1,5 +1,5 @@ - + +

{{ ('edit_' ~ objectType ~ '_account')|_ }}

+
@@ -23,7 +25,7 @@
-

{{ 'mandatoryFields'|_ }}

+

{{ 'mandatoryFields'|_ }}

{{ ExpandedForm.text('name', account.name) }} @@ -50,7 +52,7 @@
-

{{ 'optionalFields'|_ }}

+

{{ 'optionalFields'|_ }}

{{ ExpandedForm.text('iban', account.iban) }} @@ -87,7 +89,7 @@ {% if preFilled.account_role == 'ccAsset' %}
-

{{ 'credit_card_options'|_ }}

+

{{ 'credit_card_options'|_ }}

{{ ExpandedForm.select('cc_type',Config.get('firefly.ccTypes')) }} @@ -102,7 +104,7 @@ {# panel for options #}
-

{{ 'options'|_ }}

+

{{ 'options'|_ }}

{{ ExpandedForm.optionsList('update','account') }} diff --git a/resources/views/accounts/index.twig b/resources/views/accounts/index.twig index e8e12dd7a84..be92973aa51 100644 --- a/resources/views/accounts/index.twig +++ b/resources/views/accounts/index.twig @@ -10,9 +10,9 @@
-

+

{{ subTitle }} -

+
diff --git a/resources/views/accounts/reconcile/index.twig b/resources/views/accounts/reconcile/index.twig index 5cef87c7afd..1fdf6c01e90 100644 --- a/resources/views/accounts/reconcile/index.twig +++ b/resources/views/accounts/reconcile/index.twig @@ -10,14 +10,14 @@
-

{{ 'reconcile_range'|_ }}

+

{{ 'reconcile_range'|_ }}

- +
- - + + @@ -92,7 +92,7 @@
-

{{ 'reconcile_options'|_ }}

+

{{ 'reconcile_options'|_ }}

@@ -110,7 +110,7 @@
-

{{ 'transactions'|_ }}

+

{{ 'transactions'|_ }}

diff --git a/resources/views/accounts/reconcile/overview.twig b/resources/views/accounts/reconcile/overview.twig index 914a897bf60..9eabdd356a4 100644 --- a/resources/views/accounts/reconcile/overview.twig +++ b/resources/views/accounts/reconcile/overview.twig @@ -19,11 +19,18 @@ {% endfor %} -
{{ 'start_balance'|_ }}{{ 'end_balance'|_ }}{{ 'start_balance'|_ }}{{ 'end_balance'|_ }}
- - - - +
{{ 'submitted_start_balance'|_ }} ({{ start.isoFormat(monthAndDayFormat) }}){{ formatAmountByAccount(account, startBalance) }}
+ + + + + + + + + + + @@ -49,6 +56,7 @@ +
{{ 'description'|_ }}{{ 'amount'|_ }}
{{ 'submitted_start_balance'|_ }} ({{ start.isoFormat(monthAndDayFormat) }}){{ formatAmountByAccount(account, startBalance) }}
{{ trans('firefly.selected_transactions', {count: selectedIds|length}) }} {{ formatAmountByAccount(account, amount) }}

{% if diffCompare > 0 %} diff --git a/resources/views/accounts/reconcile/show.twig b/resources/views/accounts/reconcile/show.twig index bbcaaff3a14..e3324b00342 100644 --- a/resources/views/accounts/reconcile/show.twig +++ b/resources/views/accounts/reconcile/show.twig @@ -24,26 +24,26 @@

- +
- + - + {# total amount #} - + - + @@ -67,21 +67,21 @@

{{ 'transaction_journal_meta'|_ }}

-
{{ trans('list.type') }}{{ trans('list.type') }} {{ journal.transactiontype.type|_ }}
{{ trans('list.description') }}{{ trans('list.description') }} {{ journal.description }}
{{ 'total_amount'|_ }}{{ 'total_amount'|_ }} {{ formatAmountByAccount(transaction.account, transaction.amount) }}
{{ trans('list.date') }}{{ trans('list.date') }} {{ journal.date.isoFormat(monthAndDayFormat) }}
+
{# - + #} {% if journal.tags|length > 0 %} - + diff --git a/resources/views/accounts/reconcile/transactions.twig b/resources/views/accounts/reconcile/transactions.twig index be9cc0331f6..634e1ce9745 100644 --- a/resources/views/accounts/reconcile/transactions.twig +++ b/resources/views/accounts/reconcile/transactions.twig @@ -1,15 +1,15 @@ -
{{ 'categories'|_ }}{{ 'categories'|_ }} {{ journalCategories(journal)|raw }}
{{ 'tags'|_ }}{{ 'tags'|_ }} {% for tag in journal.tags %} -

+ {% if tag.tag_mode == 'nothing' %} {% endif %} @@ -92,7 +92,7 @@ {% endif %} {{ tag.tag }} -

+ {% endfor %}
+
- - - - - - - - - + + + + + + + + + diff --git a/resources/views/accounts/show.twig b/resources/views/accounts/show.twig index e2145c14655..166338b8472 100644 --- a/resources/views/accounts/show.twig +++ b/resources/views/accounts/show.twig @@ -10,7 +10,7 @@
-

+

{% if balances.balance %} {{ trans('firefly.chart_account_in_period', { balance: formatAmountBySymbol(balances.balance, currency.symbol, currency.decimal_places, true), @@ -20,7 +20,7 @@ balance: formatAmountBySymbol(balances.pc_balance, primaryCurrency.symbol, primaryCurrency.decimal_places, true), name: account.name|escape, start: start.isoFormat(monthAndDayFormat), end: end.isoFormat(monthAndDayFormat) })|raw }} {% endif %} -

+
{{ trans('list.description') }}{{ trans('list.amount') }}{{ trans('list.description') }}{{ trans('list.amount') }}
+
- - - - - - + + + + + + diff --git a/resources/views/bills/create.twig b/resources/views/bills/create.twig index cdab3ccef11..8522bebaa10 100644 --- a/resources/views/bills/create.twig +++ b/resources/views/bills/create.twig @@ -6,6 +6,8 @@ {% block content %} +

{{ 'create_new_bill'|_ }}

+ @@ -13,7 +15,7 @@
-

{{ 'mandatoryFields'|_ }}

+

{{ 'mandatoryFields'|_ }}

{{ ExpandedForm.text('name') }} @@ -30,7 +32,7 @@
-

{{ 'optionalFields'|_ }}

+

{{ 'optionalFields'|_ }}

{{ ExpandedForm.date('bill_end_date',null, {'helpText': trans('firefly.bill_end_date_help')}) }} @@ -49,7 +51,7 @@ {# panel for options #}
-

{{ 'options'|_ }}

+

{{ 'options'|_ }}

{{ ExpandedForm.optionsList('create','bill') }} diff --git a/resources/views/bills/delete.twig b/resources/views/bills/delete.twig index b0a59c80798..40e098066ef 100644 --- a/resources/views/bills/delete.twig +++ b/resources/views/bills/delete.twig @@ -12,7 +12,7 @@
-

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

+

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

diff --git a/resources/views/bills/edit.twig b/resources/views/bills/edit.twig index 46206470392..a2f52e1ee44 100644 --- a/resources/views/bills/edit.twig +++ b/resources/views/bills/edit.twig @@ -6,6 +6,8 @@ {% block content %} +

{{ 'edit_bill'|_ }}: {{ bill.name }}

+ @@ -15,7 +17,7 @@
-

{{ 'mandatoryFields'|_ }}

+

{{ 'mandatoryFields'|_ }}

{% if rules.count() > 0 %} @@ -37,7 +39,7 @@
-

{{ 'optionalFields'|_ }}

+

{{ 'optionalFields'|_ }}

{{ ExpandedForm.date('bill_end_date',null, {'helpText': trans('firefly.bill_end_date_help')}) }} @@ -57,7 +59,7 @@
-

{{ 'options'|_ }}

+

{{ 'options'|_ }}

{{ ExpandedForm.optionsList('update','bill') }} diff --git a/resources/views/bills/index.twig b/resources/views/bills/index.twig index 49a2905d5d0..409459925af 100644 --- a/resources/views/bills/index.twig +++ b/resources/views/bills/index.twig @@ -12,7 +12,7 @@
-

{{ title }}

+

{{ title }}

diff --git a/resources/views/bills/show.twig b/resources/views/bills/show.twig index ec55e972209..ecfcb969e40 100644 --- a/resources/views/bills/show.twig +++ b/resources/views/bills/show.twig @@ -10,7 +10,7 @@
-

{{ object.data.name }}

+

{{ object.data.name }}

@@ -24,7 +24,8 @@
-
 {{ trans('list.file_name') }}{{ trans('list.file_size') }}{{ trans('list.file_type') }}{{ trans('list.attached_to') }}{{ trans('list.file_exists') }}{{ 'actions'|_ }}{{ trans('list.file_name') }}{{ trans('list.file_size') }}{{ trans('list.file_type') }}{{ trans('list.attached_to') }}{{ trans('list.file_exists') }}
+
+ - + - + - + - + +
{% set lowAmount = formatAmountByCurrency(object.data.currency,object.data.amount_min) %} @@ -42,7 +43,7 @@
{{ 'bill_is_active'|_ }}{{ 'bill_is_active'|_ }} {% if object.data.active %} {{ 'yes'|_ }} @@ -52,7 +53,7 @@
{{ 'next_expected_match'|_ }}{{ 'next_expected_match'|_ }} {% if object.data.pay_dates|length > 0 %} @@ -63,7 +64,7 @@
{{ trans('firefly.average_bill_amount_year', {year: year}) }}{{ trans('firefly.average_bill_amount_year', {year: year}) }} {% for avg in yearAverage %} {{ formatAmountBySymbol(avg.avg, avg.currency_symbol, avg.currency_decimal_places, true) }} @@ -77,7 +78,7 @@
{{ 'average_bill_amount_overall'|_ }}{{ 'average_bill_amount_overall'|_ }} {% for avg in overallAverage %} {{ formatAmountBySymbol(avg.avg, avg.currency_symbol, avg.currency_decimal_places, true) }} @@ -89,6 +90,7 @@ {% endfor %}
@@ -102,7 +104,7 @@
-

{{ 'bill_related_rules'|_ }}

+

{{ 'bill_related_rules'|_ }}

{% if rules.count() > 0 %} @@ -133,7 +135,7 @@ {% if object.data.notes %}
-

{{ 'notes'|_ }}

+

{{ 'notes'|_ }}

{{ object.data.notes|default('')|markdown }} @@ -145,7 +147,7 @@ {% if attachments.count() > 0 %}
-

{{ 'attachments'|_ }}

+

{{ 'attachments'|_ }}

{% include 'list.attachments' %} @@ -159,7 +161,7 @@
-

{{ 'chart'|_ }}

+

{{ 'chart'|_ }}

@@ -172,7 +174,7 @@
-

{{ 'connected_journals'|_ }}

+

{{ 'connected_journals'|_ }}

{% include 'list.groups' %} diff --git a/resources/views/budgets/budget-limits/create.twig b/resources/views/budgets/budget-limits/create.twig index 112bd739e7b..922ba7da122 100644 --- a/resources/views/budgets/budget-limits/create.twig +++ b/resources/views/budgets/budget-limits/create.twig @@ -3,7 +3,7 @@
-

+

diff --git a/resources/views/budgets/budget-limits/show.twig b/resources/views/budgets/budget-limits/show.twig index 783c81fd302..5bf2c52d3bb 100644 --- a/resources/views/budgets/budget-limits/show.twig +++ b/resources/views/budgets/budget-limits/show.twig @@ -3,9 +3,9 @@
-

+

{{ trans('firefly.set_budget_limit_notes') }} -

+
diff --git a/resources/views/budgets/create.twig b/resources/views/budgets/create.twig index fd1e014b485..f41e4ef87e0 100644 --- a/resources/views/budgets/create.twig +++ b/resources/views/budgets/create.twig @@ -6,6 +6,8 @@ {% block content %} +

{{ 'create_new_budget'|_ }}

+ @@ -14,7 +16,7 @@
-

{{ 'mandatoryFields'|_ }}

+

{{ 'mandatoryFields'|_ }}

{{ ExpandedForm.text('name') }} @@ -25,7 +27,7 @@ {# panel for auto-budget #}
-

{{ 'optionalFields'|_ }}

+

{{ 'optionalFields'|_ }}

{{ ExpandedForm.select('auto_budget_type', autoBudgetTypes,null, {helpText: trans('firefly.auto_budget_help')}) }} @@ -42,7 +44,7 @@ {# panel for options #}
-

{{ 'options'|_ }}

+

{{ 'options'|_ }}

{{ ExpandedForm.optionsList('create','budget') }} diff --git a/resources/views/budgets/delete.twig b/resources/views/budgets/delete.twig index 36976d17b24..f1403c21194 100644 --- a/resources/views/budgets/delete.twig +++ b/resources/views/budgets/delete.twig @@ -13,7 +13,7 @@
-

{{ trans('form.delete_budget', {'name': budget.name}) }}

+

{{ trans('form.delete_budget', {'name': budget.name}) }}

diff --git a/resources/views/budgets/edit.twig b/resources/views/budgets/edit.twig index ebe8d604b78..f47e4c12d41 100644 --- a/resources/views/budgets/edit.twig +++ b/resources/views/budgets/edit.twig @@ -13,7 +13,7 @@

-

{{ 'mandatoryFields'|_ }}

+

{{ 'mandatoryFields'|_ }}

{# only correct way to do active checkbox #} @@ -27,7 +27,7 @@ {# panel for auto-budget #}
-

{{ 'optionalFields'|_ }}

+

{{ 'optionalFields'|_ }}

{{ ExpandedForm.select('auto_budget_type', autoBudgetTypes, autoBudget.auto_budget_type) }} @@ -45,7 +45,7 @@ {# panel for options #}
-

{{ 'options'|_ }}

+

{{ 'options'|_ }}

{{ ExpandedForm.optionsList('update','budget') }} diff --git a/resources/views/budgets/index.twig b/resources/views/budgets/index.twig index d7739488748..9f61524f330 100644 --- a/resources/views/budgets/index.twig +++ b/resources/views/budgets/index.twig @@ -10,7 +10,7 @@
-

{{ 'budget_period_navigator'|_ }}

+

{{ 'budget_period_navigator'|_ }}

@@ -54,11 +54,11 @@
-

+

{{ trans('firefly.total_available_budget_in_currency', {currency: primaryCurrency.name}) }}
{{ trans('firefly.between_dates_breadcrumb', {start: start.isoFormat(monthAndDayFormat), end: end.isoFormat(monthAndDayFormat)}) }} -

+
@@ -103,11 +103,11 @@
-

+

{{ trans('firefly.total_available_budget_in_currency', {currency: budget.transaction_currency.name}) }}
{{ trans('firefly.between_dates_breadcrumb', {start: budget.start_date.isoFormat(monthAndDayFormat), end: budget.end_date.isoFormat(monthAndDayFormat)}) }} -

+
@@ -204,20 +204,20 @@
-

{{ 'budgets'|_ }}

+

{{ 'budgets'|_ }}

- +
- - - - - + + + + + diff --git a/resources/views/budgets/no-budget.twig b/resources/views/budgets/no-budget.twig index ac5fcf44ccd..dc6b06298ee 100644 --- a/resources/views/budgets/no-budget.twig +++ b/resources/views/budgets/no-budget.twig @@ -19,7 +19,7 @@
-

{{ subTitle }}

+

{{ subTitle }}

diff --git a/resources/views/budgets/show.twig b/resources/views/budgets/show.twig index 8f3c53aefaf..903527fb8e3 100644 --- a/resources/views/budgets/show.twig +++ b/resources/views/budgets/show.twig @@ -5,17 +5,22 @@ {% endblock %} {% block content %} +
+
+

{{ 'budget_details'|_ }}: {{ budget.name }}

+
+
-

+

{% if budgetLimit %} {{ trans('firefly.chart_budget_in_period', {name: budget.name, start: budgetLimit.start_date.isoFormat(monthAndDayFormat), end: budgetLimit.end_date.isoFormat(monthAndDayFormat),currency: budgetLimit.transactionCurrency.name }) }} {% else %} {{ trans('firefly.chart_all_journals_for_budget', {name:budget.name}) }} {% endif %} -

+
@@ -42,9 +47,9 @@
-

+

{{ 'attachments'|_ }} -

+
{% include 'list.attachments' %} @@ -57,7 +62,7 @@
-

{{ 'expenses_by_category'|_ }}

+

{{ 'expenses_by_category'|_ }}

@@ -76,7 +81,7 @@
-

{{ 'expenses_by_asset_account'|_ }}

+

{{ 'expenses_by_asset_account'|_ }}

@@ -95,7 +100,7 @@
-

{{ 'expenses_by_expense_account'|_ }}

+

{{ 'expenses_by_expense_account'|_ }}

@@ -125,7 +130,7 @@
-

{{ 'transactions'|_ }}

+

{{ 'transactions'|_ }}

{% include 'list.groups' %} @@ -153,9 +158,16 @@
-
{{ 'budget'|_ }}{{ 'budgeted'|_ }}{{ 'left'|_ }} ({{ 'per_day'|_|lower }}){{ 'budget'|_ }}{{ 'budgeted'|_ }}{{ 'left'|_ }} ({{ 'per_day'|_|lower }})
+
+ + + + + + + - + - + {% endif %} +
{{ 'description'|_ }}{{ 'amount'|_ }}
{{ 'amount'|_ }}{{ 'amount'|_ }} {{ formatAmountBySymbol(limit.amount, limit.transactionCurrency.symbol, limit.transactionCurrency.decimal_places) }} {% if convertToPrimary and null != limit.native_amount %} @@ -164,7 +176,7 @@
{{ 'spent'|_ }}{{ 'spent'|_ }} {% if convertToPrimary %} {{ formatAmountBySymbol(limit.spent, limit.transactionCurrency.symbol, limit.transactionCurrency.decimal_places) }} @@ -201,6 +213,7 @@
diff --git a/resources/views/categories/delete.twig b/resources/views/categories/delete.twig index 1c2a9836b1b..6af706d55c8 100644 --- a/resources/views/categories/delete.twig +++ b/resources/views/categories/delete.twig @@ -12,7 +12,7 @@
-

{{ trans('form.delete_category', {'name': category.name}) }}

+

{{ trans('form.delete_category', {'name': category.name}) }}

diff --git a/resources/views/categories/edit.twig b/resources/views/categories/edit.twig index aa9b6263d67..903325446af 100644 --- a/resources/views/categories/edit.twig +++ b/resources/views/categories/edit.twig @@ -5,6 +5,7 @@ {% endblock %} {% block content %} +

{{ 'edit_category'|_ }}: {{ category.name }}

-

{{ 'mandatoryFields'|_ }}

+

{{ 'mandatoryFields'|_ }}

{{ ExpandedForm.text('name', category.name) }} @@ -27,7 +28,7 @@ {# panel for optional fields #}
-

{{ 'optionalFields'|_ }}

+

{{ 'optionalFields'|_ }}

{{ ExpandedForm.textarea('notes', preFilled.notes, {helpText: trans('firefly.field_supports_markdown')} ) }} @@ -43,7 +44,7 @@ {# panel for options #}
-

{{ 'options'|_ }}

+

{{ 'options'|_ }}

{{ ExpandedForm.optionsList('update','category') }} diff --git a/resources/views/categories/index.twig b/resources/views/categories/index.twig index cefb5c0df2f..126a7a3d48e 100644 --- a/resources/views/categories/index.twig +++ b/resources/views/categories/index.twig @@ -10,7 +10,7 @@
-

{{ 'categories'|_ }}

+

{{ 'categories'|_ }}

diff --git a/resources/views/categories/no-category.twig b/resources/views/categories/no-category.twig index 7dde51d679e..f98a3e325ae 100644 --- a/resources/views/categories/no-category.twig +++ b/resources/views/categories/no-category.twig @@ -19,7 +19,7 @@
-

{{ subTitle }}

+

{{ subTitle }}

diff --git a/resources/views/categories/show.twig b/resources/views/categories/show.twig index 5a8563356e5..d90ed78c25f 100644 --- a/resources/views/categories/show.twig +++ b/resources/views/categories/show.twig @@ -5,15 +5,16 @@ {% endblock %} {% block content %} +

{{ 'category_details'|_ }}: {{ category.name }}

{% if Route.getCurrentRoute.getName == 'categories.show' %} {# both charts #}
-

+

{{ trans('firefly.chart_category_in_period', {name: category.name, start: start.isoFormat(monthAndDayFormat), end: end.isoFormat(monthAndDayFormat) }) }} -

+
@@ -23,9 +24,9 @@
-

+

{{ trans('firefly.chart_category_all', {name: category.name }) }} -

+
@@ -38,9 +39,9 @@
-

+

{{ trans('firefly.chart_category_all', {name: category.name }) }} -

+
@@ -52,9 +53,9 @@
-

+

{{ 'attachments'|_ }} -

+
{% include 'list.attachments' %} @@ -76,7 +77,7 @@
-

{{ 'transactions'|_ }}

+

{{ 'transactions'|_ }}

{% if periods|length > 0 %} diff --git a/resources/views/currencies/create.twig b/resources/views/currencies/create.twig index 619ab2d2122..d8832ee9a1a 100644 --- a/resources/views/currencies/create.twig +++ b/resources/views/currencies/create.twig @@ -11,7 +11,7 @@
-

{{ 'mandatoryFields'|_ }}

+

{{ 'mandatoryFields'|_ }}

{{ ExpandedForm.text('name',null,{'maxlength' : 48}) }} @@ -29,7 +29,7 @@ {# panel for options #}
-

{{ 'options'|_ }}

+

{{ 'options'|_ }}

{{ ExpandedForm.optionsList('create','currency') }} diff --git a/resources/views/currencies/delete.twig b/resources/views/currencies/delete.twig index 4a2dfb5e76e..e8d72031606 100644 --- a/resources/views/currencies/delete.twig +++ b/resources/views/currencies/delete.twig @@ -12,7 +12,7 @@
-

{{ trans('form.delete_currency', {'name': currency.name}) }}

+

{{ trans('form.delete_currency', {'name': currency.name}) }}

diff --git a/resources/views/currencies/edit.twig b/resources/views/currencies/edit.twig index 053891d8252..c0e38040065 100644 --- a/resources/views/currencies/edit.twig +++ b/resources/views/currencies/edit.twig @@ -15,7 +15,7 @@

-

{{ 'mandatoryFields'|_ }}

+

{{ 'mandatoryFields'|_ }}

{{ ExpandedForm.text('name', currency.name,{'maxlength' : 48}) }} @@ -33,7 +33,7 @@ {# panel for options #}
-

{{ 'options'|_ }}

+

{{ 'options'|_ }}

{{ ExpandedForm.optionsList('update','currency') }} diff --git a/resources/views/currencies/index.twig b/resources/views/currencies/index.twig index c05c82ea207..968117d97e7 100644 --- a/resources/views/currencies/index.twig +++ b/resources/views/currencies/index.twig @@ -9,7 +9,7 @@
-

{{ 'currencies'|_ }}

+

{{ 'currencies'|_ }}

{{ 'create_currency'|_ }}
@@ -22,12 +22,12 @@
{{ currencies.links('pagination.bootstrap-4')|raw }}
- +
- - - + + + diff --git a/resources/views/error.twig b/resources/views/error.twig index 05f883edf07..cea7a56c9c2 100644 --- a/resources/views/error.twig +++ b/resources/views/error.twig @@ -4,7 +4,7 @@
-

Sorry, an error occurred.

+

Sorry, an error occurred.

diff --git a/resources/views/errors/500.blade.php b/resources/views/errors/500.blade.php index 14bfb0c5fca..4a80cfe54a6 100644 --- a/resources/views/errors/500.blade.php +++ b/resources/views/errors/500.blade.php @@ -19,16 +19,16 @@ @if(!($debug ?? false))
-

+

{{ trans('errors.more_info') }} -

+

{!! trans('errors.collect_info') !!} {!! trans('errors.collect_info_more') !!}

-

+

{{ trans('errors.github_help') }} -

+

{!! trans('errors.github_instructions') !!}

@@ -45,13 +45,13 @@ @if($debug ?? false)
-

{{ trans('errors.error') }}

+

{{ trans('errors.error') }}

{!! trans('errors.error_location', ['file' => $exception->getFile(), 'line' => $exception->getLine(), 'code' => $exception->getCode() ]) !!}

-

+

{{ trans('errors.stacktrace') }} -

+
{!! nl2br($exception->getTraceAsString()) !!}
diff --git a/resources/views/errors/DatabaseException.blade.php b/resources/views/errors/DatabaseException.blade.php index ae65ae5fdf3..739764118ce 100644 --- a/resources/views/errors/DatabaseException.blade.php +++ b/resources/views/errors/DatabaseException.blade.php @@ -19,16 +19,16 @@ @if(!$debug)
-

+

{{ trans('errors.more_info') }} -

+

{!! trans('errors.collect_info') !!} {!! trans('errors.collect_info_more') !!}

-

+

{{ trans('errors.github_help') }} -

+

{!! trans('errors.github_instructions') !!}

@@ -45,13 +45,13 @@ @if($debug)
-

{{ trans('errors.error') }}

+

{{ trans('errors.error') }}

{!! trans('errors.error_location', ['file' => $exception->getFile(), 'line' => $exception->getLine(), 'code' => $exception->getCode() ]) !!}

-

+

{{ trans('errors.stacktrace') }} -

+
{!! nl2br($exception->getTraceAsString()) !!}
diff --git a/resources/views/errors/FireflyException.blade.php b/resources/views/errors/FireflyException.blade.php index 5dfc2be6c8d..773e5614f60 100644 --- a/resources/views/errors/FireflyException.blade.php +++ b/resources/views/errors/FireflyException.blade.php @@ -19,16 +19,16 @@ @if(!$debug)
-

+

{{ trans('errors.more_info') }} -

+

{!! trans('errors.collect_info') !!} {!! trans('errors.collect_info_more') !!}

-

+

{{ trans('errors.github_help') }} -

+

{!! trans('errors.github_instructions') !!}

@@ -45,13 +45,13 @@ @if($debug)
-

{{ trans('errors.error') }}

+

{{ trans('errors.error') }}

{!! trans('errors.error_location', ['file' => $exception->getFile(), 'line' => $exception->getLine(), 'code' => $exception->getCode() ]) !!}

-

+

{{ trans('errors.stacktrace') }} -

+
{!! nl2br($exception->getTraceAsString()) !!}
diff --git a/resources/views/export/index.twig b/resources/views/export/index.twig index 35490f14a3b..822da43f6a6 100644 --- a/resources/views/export/index.twig +++ b/resources/views/export/index.twig @@ -9,7 +9,7 @@
-

{{ 'export_data_main_title'|_ }}

+

{{ 'export_data_main_title'|_ }}

diff --git a/resources/views/index.twig b/resources/views/index.twig index ec0655f809f..a481980927b 100644 --- a/resources/views/index.twig +++ b/resources/views/index.twig @@ -4,6 +4,7 @@ {{ Breadcrumbs.render }} {% endblock %} {% block content %} +

{{ 'dashboard'|_ }}

{% include 'partials.boxes' %}
diff --git a/resources/views/list/accounts.twig b/resources/views/list/accounts.twig index c7168fcd265..413f5d8b65c 100644 --- a/resources/views/list/accounts.twig +++ b/resources/views/list/accounts.twig @@ -1,36 +1,36 @@
{{ accounts.links('pagination.bootstrap-4')|raw }}
-
 {{ 'currency'|_ }}{{ 'number_of_decimals'|_ }}{{ 'actions'|_ }}{{ 'currency'|_ }}{{ 'number_of_decimals'|_ }}
+
- - + + {% if objectType == 'asset' %} - + {% endif %} {% if objectType == 'liabilities' %} - - - + + + {% endif %} - + {% if objectType != 'liabilities' %} - + {% endif %} {% if objectType == 'liabilities' %} - {% endif %} - + {# hide last activity to make room for other stuff #} {% if objectType != 'liabilities' %} - + {% endif %} - - + diff --git a/resources/views/list/ale.twig b/resources/views/list/ale.twig index 7be50457b07..623a69e599e 100644 --- a/resources/views/list/ale.twig +++ b/resources/views/list/ale.twig @@ -1,4 +1,12 @@ -
{{ trans('list.name') }}{{ trans('list.name') }}{{ trans('list.liability_type') }}{{ trans('form.liability_direction') }}{{ trans('list.interest') }} ({{ trans('list.interest_period') }}){{ trans('list.liability_type') }}{{ trans('form.liability_direction') }}{{ trans('list.interest') }} ({{ trans('list.interest_period') }}){{ trans('list.currentBalance') }}{{ trans('list.currentBalance') }} + {{ trans('firefly.left_in_debt') }}
+
+ + + + + + + + {% for logEntry in logEntries %} {% endfor %} +
{{ 'changer'|_ }}{{ 'action'|_ }}{{ 'details'|_ }}
@@ -103,4 +111,5 @@
diff --git a/resources/views/list/attachments.twig b/resources/views/list/attachments.twig index e67e669062a..950a3219ceb 100644 --- a/resources/views/list/attachments.twig +++ b/resources/views/list/attachments.twig @@ -1,4 +1,11 @@ - +
+ + + + + + + {% for attachment in attachments %} {% endfor %} +
{{ 'actions'|_ }}{{ 'attachment'|_ }}
@@ -44,4 +51,5 @@
diff --git a/resources/views/list/bills.twig b/resources/views/list/bills.twig index e326f77c993..f48f9843a7d 100644 --- a/resources/views/list/bills.twig +++ b/resources/views/list/bills.twig @@ -1,17 +1,17 @@
{{ paginator.links('pagination.bootstrap-4')|raw }}
- +
- - - - - - - - + + + + + + + + {% for objectGroupOrder, objectGroup in bills %} diff --git a/resources/views/list/categories.twig b/resources/views/list/categories.twig index 81686e662d9..53658098aa7 100644 --- a/resources/views/list/categories.twig +++ b/resources/views/list/categories.twig @@ -1,12 +1,12 @@
{{ categories.links('pagination.bootstrap-4')|raw }}
-
{{ trans('list.name') }}{{ trans('list.matchingAmount') }}{{ trans('list.name') }}{{ trans('list.matchingAmount') }}
+
- - - + + + diff --git a/resources/views/list/groups.twig b/resources/views/list/groups.twig index 460462e6847..cebb427b0ea 100644 --- a/resources/views/list/groups.twig +++ b/resources/views/list/groups.twig @@ -1,4 +1,4 @@ -
 {{ trans('list.name') }} {{ trans('list.name') }}
+
{% if showCategory or showBudget %} @@ -30,23 +30,23 @@ - - - + + + {% if config('firefly.feature_flags.running_balance_column') %} - + {% endif %} - - - + + + {% if showCategory %} - + {% endif %} {% if showBudget %} - + {% endif %} - - + + diff --git a/resources/views/list/periods.twig b/resources/views/list/periods.twig index 0f19ef75258..ce2946dda71 100644 --- a/resources/views/list/periods.twig +++ b/resources/views/list/periods.twig @@ -1,11 +1,18 @@ {% for period in periods %}
-

{{ period.title }} +

{{ period.title }}

-
{{ trans('list.description') }}{{ trans('list.amount') }}{{ trans('list.description') }}{{ trans('list.amount') }}{{ trans('list.running_balance') }}{{ trans('list.running_balance') }}{{ trans('list.date') }}{{ trans('list.source_account') }}{{ trans('list.destination_account') }}{{ trans('list.date') }}{{ trans('list.source_account') }}{{ trans('list.destination_account') }}
+
+ + + + + + + {% if period.total_transactions > 0 %} @@ -88,6 +95,7 @@ {% endif %} {% endfor %} +
{{ 'transaction_type'|_ }}{{ 'amount'|_ }}
{{ 'transactions'|_ }}
diff --git a/resources/views/list/piggy-bank-events.twig b/resources/views/list/piggy-bank-events.twig index a1f36c50b5c..d2f4838f5d2 100644 --- a/resources/views/list/piggy-bank-events.twig +++ b/resources/views/list/piggy-bank-events.twig @@ -1,11 +1,14 @@ - - - {% if showPiggyBank %} - - {% endif %} - - - +
{{ trans('list.piggy_bank') }}{{ trans('list.date') }}{{ trans('list.amount') }}
+ + + {% if showPiggyBank %} + + {% endif %} + + + + + {% for event in events %} {% if showPiggyBank %} @@ -31,4 +34,5 @@ {% endfor %} +
{{ trans('list.piggy_bank') }}{{ trans('list.date') }}{{ trans('list.amount') }}
diff --git a/resources/views/list/piggy-banks.twig b/resources/views/list/piggy-banks.twig index 01dd93ec6e8..e1fe6ae6a4d 100644 --- a/resources/views/list/piggy-banks.twig +++ b/resources/views/list/piggy-banks.twig @@ -1,13 +1,13 @@ - +
- - - - - - - + + + + + + + diff --git a/resources/views/new-user/index.twig b/resources/views/new-user/index.twig index 627c511dd0f..dd863528560 100644 --- a/resources/views/new-user/index.twig +++ b/resources/views/new-user/index.twig @@ -14,7 +14,7 @@
-

{{ 'getting_started'|_ }}

+

{{ 'getting_started'|_ }}

diff --git a/resources/views/object-groups/delete.twig b/resources/views/object-groups/delete.twig index 8516f869b83..3507a4dbc46 100644 --- a/resources/views/object-groups/delete.twig +++ b/resources/views/object-groups/delete.twig @@ -12,7 +12,7 @@

-

{{ trans('form.delete_object_group', {'title': objectGroup.title}) }}

+

{{ trans('form.delete_object_group', {'title': objectGroup.title}) }}

diff --git a/resources/views/object-groups/edit.twig b/resources/views/object-groups/edit.twig index d6d52e29c6c..9f78ac6f70b 100644 --- a/resources/views/object-groups/edit.twig +++ b/resources/views/object-groups/edit.twig @@ -5,6 +5,7 @@ {% endblock %} {% block content %} +

{{ 'edit_object_group'|_ }}

@@ -16,7 +17,7 @@
-

{{ 'mandatoryFields'|_ }}

+

{{ 'mandatoryFields'|_ }}

{{ ExpandedForm.text('title', objectGroup.title) }} @@ -30,7 +31,7 @@ {# panel for options #}
-

{{ 'options'|_ }}

+

{{ 'options'|_ }}

{{ ExpandedForm.optionsList('update','object group') }} diff --git a/resources/views/object-groups/index.twig b/resources/views/object-groups/index.twig index 80402c7423e..021b888ee66 100644 --- a/resources/views/object-groups/index.twig +++ b/resources/views/object-groups/index.twig @@ -8,7 +8,7 @@
-

{{ 'object_groups'|_ }}

+

{{ 'object_groups'|_ }}

{% if objectGroups|length == 0 %}
@@ -23,15 +23,15 @@ {% endif %} {% if objectGroups|length > 0 %}
-
 {{ 'piggy_bank'|_ }}{{ 'saved_so_far'|_ }}{{ 'actions'|_ }}{{ 'piggy_bank'|_ }}{{ 'saved_so_far'|_ }}
+
- - + - diff --git a/resources/views/partials/debug-table.twig b/resources/views/partials/debug-table.twig index 6dd268a04e2..419645b0b7e 100644 --- a/resources/views/partials/debug-table.twig +++ b/resources/views/partials/debug-table.twig @@ -1,11 +1,11 @@ -
  + {{ 'sort_handle'|_ }} {{ 'object_group_title'|_ }} -   + + {{ 'actions'|_ }}
+
- - + + @@ -51,14 +51,14 @@ {% endif %}
System information
ItemValueItemValue
- +
- - + + @@ -125,14 +125,14 @@
Firefly III information
ItemValueItemValue
- +
- - + + diff --git a/resources/views/partials/old-password-modal.twig b/resources/views/partials/old-password-modal.twig index 1bda60cdfd5..2a10125fda1 100644 --- a/resources/views/partials/old-password-modal.twig +++ b/resources/views/partials/old-password-modal.twig @@ -1,15 +1,15 @@ -
User-specific information
ItemValueItemValue
+
- - - - - - + + + + + + diff --git a/resources/views/piggy-banks/remove-mobile.twig b/resources/views/piggy-banks/remove-mobile.twig index 192f5e7d537..9a2c9c89871 100644 --- a/resources/views/piggy-banks/remove-mobile.twig +++ b/resources/views/piggy-banks/remove-mobile.twig @@ -10,7 +10,7 @@
-

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

+

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

diff --git a/resources/views/piggy-banks/remove.twig b/resources/views/piggy-banks/remove.twig index e4b381aa8d9..428b9a935c0 100644 --- a/resources/views/piggy-banks/remove.twig +++ b/resources/views/piggy-banks/remove.twig @@ -6,7 +6,7 @@
-

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

+

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

diff --git a/resources/views/piggy-banks/show.twig b/resources/views/piggy-banks/show.twig index 6a5e58f3da3..efd655ae32a 100644 --- a/resources/views/piggy-banks/show.twig +++ b/resources/views/piggy-banks/show.twig @@ -5,11 +5,12 @@ {% endblock %} {% block content %} +

{{ piggyBank.name }} - {{ 'piggy_bank_details'|_ }}

-

{{ 'events'|_ }}

+

{{ 'events'|_ }}

@@ -19,7 +20,7 @@
-

{{ 'details'|_ }}

+

{{ 'details'|_ }}

@@ -31,7 +32,7 @@
-
{{ 'account'|_ }}{{ 'left_for_piggy_banks'|_ }}{{ 'account'|_ }}{{ 'left_for_piggy_banks'|_ }}
+
{{ 'saveOnAccounts'|_ }} @@ -114,7 +115,7 @@
-

{{ 'event_history'|_ }} ({{ 'reset_history'|_ }})

+

{{ 'event_history'|_ }} ({{ 'reset_history'|_ }})

{% include 'list/piggy-bank-events' %} @@ -129,7 +130,7 @@
-

{{ trans('form.notes') }}

+

{{ trans('form.notes') }}

{{ piggy.notes|default('')|markdown }}
@@ -141,9 +142,9 @@
-

+

{{ 'attachments'|_ }} -

+
{% include 'list.attachments' %} diff --git a/resources/views/popup/list/journals.twig b/resources/views/popup/list/journals.twig index 6a29d08f847..34034c675cc 100644 --- a/resources/views/popup/list/journals.twig +++ b/resources/views/popup/list/journals.twig @@ -1,28 +1,30 @@ - +
- - - - + + + + {% if not hideSource %} - + {% endif %} {% if not hideDestination %} - + {% endif %} {# Hide budgets? #} {% if not hideBudget %} - {% endif %} {# Hide categories? #} {% if not hideCategory %} - {% endif %} diff --git a/resources/views/popup/report/income-entry.twig b/resources/views/popup/report/income-entry.twig index c49306440c4..f3352fb7577 100644 --- a/resources/views/popup/report/income-entry.twig +++ b/resources/views/popup/report/income-entry.twig @@ -2,8 +2,8 @@
- +
{% set hideBudget = true %} diff --git a/resources/views/profile/change-email.twig b/resources/views/profile/change-email.twig index 6f1e9a80b28..8e8bd4f7c45 100644 --- a/resources/views/profile/change-email.twig +++ b/resources/views/profile/change-email.twig @@ -12,7 +12,7 @@
-

{{ 'change_your_email'|_ }}

+

{{ 'change_your_email'|_ }}

diff --git a/resources/views/profile/change-password.twig b/resources/views/profile/change-password.twig index 80bf41056d8..f711e7ec902 100644 --- a/resources/views/profile/change-password.twig +++ b/resources/views/profile/change-password.twig @@ -12,7 +12,7 @@
-

{{ 'change_your_password'|_ }}

+

{{ 'change_your_password'|_ }}

diff --git a/resources/views/profile/delete-account.twig b/resources/views/profile/delete-account.twig index 839380e0395..96347bd3fdd 100644 --- a/resources/views/profile/delete-account.twig +++ b/resources/views/profile/delete-account.twig @@ -5,6 +5,7 @@ {% endblock %} {% block content %} +

{{ 'delete_your_account'|_ }}

@@ -12,7 +13,7 @@
-

{{ 'delete_your_account'|_ }}

+

{{ 'delete_your_account'|_ }}

diff --git a/resources/views/profile/index.twig b/resources/views/profile/index.twig index 087445222c9..3eb0763911f 100644 --- a/resources/views/profile/index.twig +++ b/resources/views/profile/index.twig @@ -160,7 +160,7 @@
-

{{ 'purge_data_title'|_ }}

+

{{ 'purge_data_title'|_ }}

@@ -181,14 +181,14 @@
-

{{ 'delete_data_title'|_ }}

+

{{ 'delete_data_title'|_ }}

{{ 'permanent_delete_stuff'|_ }}

-

{{ 'financial_control'|_ }}

+

{{ 'financial_control'|_ }}

-

{{ 'automation'|_ }}

+

{{ 'automation'|_ }}

-

{{ 'classification'|_ }}

+

{{ 'classification'|_ }}

-

{{ 'accounts'|_ }}

+

{{ 'accounts'|_ }}

{{ 'also_delete_transactions'|_ }}

@@ -269,7 +269,7 @@ data-type="liabilities" class="confirm btn btn-danger btn-sm"> {{ 'delete_all_liabilities'|_ }}
-

{{ 'accounts'|_ }}

+

{{ 'accounts'|_ }}

{{ 'delete_unused_accounts'|_ }} @@ -284,7 +284,7 @@

-

{{ 'transactions'|_ }}

+

{{ 'transactions'|_ }}

@@ -34,14 +34,14 @@
{{ paginator.links('pagination.bootstrap-4')|raw }}
-
 {{ trans('list.description') }}{{ trans('list.amount') }}{{ 'transaction_type'|_ }}{{ trans('list.description') }}{{ trans('list.amount') }}
+
- - - - - + + + + + diff --git a/resources/views/recurring/show.twig b/resources/views/recurring/show.twig index b9e2f0893c7..6e2fe2033c2 100644 --- a/resources/views/recurring/show.twig +++ b/resources/views/recurring/show.twig @@ -10,7 +10,7 @@
-

+

{{ array.title }} ({{ array.type }}) @@ -18,10 +18,10 @@ {% if array.active == false %} ({{ 'inactive'|_|lower }}) {% endif %} -

+
-

{{ 'transaction_journal_meta'|_ }}

+

{{ 'transaction_journal_meta'|_ }}

{% if array.nr_of_repetitions > 0 %}

{% if array.journal_count >= array.nr_of_repetitions %} @@ -46,7 +46,7 @@

  • {{ rep.description }}
    • {% endfor %} -

    {{ 'attachments'|_ }}

    +

    {{ 'attachments'|_ }}

    {% include 'list.attachments' with {attachments: array.attachments} %}
    @@ -63,9 +63,9 @@
    -

    +

    {{ ('expected_'~array.type~'s')|_ }} -

    +
    {% if null != array.repeat_until and today > array.repeat_until %} @@ -84,7 +84,7 @@ {% endif %}

    -
    {{ trans('list.title') }}{{ trans('list.transaction_s') }}{{ trans('list.repetitions') }}{{ trans('list.next_due') }}{{ trans('list.title') }}{{ trans('list.transaction_s') }}{{ trans('list.repetitions') }}{{ trans('list.next_due') }}
    +
    {% for occ in rep.occurrences %} @@ -120,21 +120,21 @@
    -

    +

    {{ 'transaction_data'|_ }} -

    +
    -
    +
    - - - - - - - + + + + + + + @@ -200,9 +200,9 @@
    -

    +

    {{ ('created_'~array.type~'s')|_ }} -

    +
    {% include 'list.groups' %} diff --git a/resources/views/reports/budget/month.twig b/resources/views/reports/budget/month.twig index faf3a113b58..2f16ef99d19 100644 --- a/resources/views/reports/budget/month.twig +++ b/resources/views/reports/budget/month.twig @@ -10,7 +10,7 @@
    -

    {{ 'accounts'|_ }}

    +

    {{ 'accounts'|_ }}

    @@ -23,7 +23,7 @@
    -

    {{ 'budgets'|_ }}

    +

    {{ 'budgets'|_ }}

    @@ -38,7 +38,7 @@
    -

    {{ 'account_per_budget'|_ }}

    +

    {{ 'account_per_budget'|_ }}

    @@ -53,7 +53,7 @@
    -

    {{ 'expense_per_budget'|_ }}

    +

    {{ 'expense_per_budget'|_ }}

    @@ -65,7 +65,7 @@
    -

    {{ 'expense_per_category'|_ }}

    +

    {{ 'expense_per_category'|_ }}

    @@ -79,7 +79,7 @@
    -

    {{ 'expense_per_source_account'|_ }}

    +

    {{ 'expense_per_source_account'|_ }}

    @@ -91,7 +91,7 @@
    -

    {{ 'expense_per_destination_account'|_ }}

    +

    {{ 'expense_per_destination_account'|_ }}

    @@ -107,7 +107,7 @@
    -

    {{ 'expenses'|_ }} ({{ budget.name }})

    +

    {{ 'expenses'|_ }} ({{ budget.name }})

    @@ -120,7 +120,7 @@
    -

    {{ 'average_spending_per_destination'|_ }}

    +

    {{ 'average_spending_per_destination'|_ }}

    @@ -134,7 +134,7 @@
    -

    {{ 'expenses'|_ }} ({{ trans('firefly.topX', {number: listLength}) }})

    +

    {{ 'expenses'|_ }} ({{ trans('firefly.topX', {number: listLength}) }})

    diff --git a/resources/views/reports/budget/partials/account-per-budget.twig b/resources/views/reports/budget/partials/account-per-budget.twig index 0266078590e..779c4608c48 100644 --- a/resources/views/reports/budget/partials/account-per-budget.twig +++ b/resources/views/reports/budget/partials/account-per-budget.twig @@ -1,9 +1,9 @@ -
    {{ trans('list.description') }}{{ trans('list.source') }}{{ trans('list.destination') }}{{ trans('list.amount') }}{{ trans('list.category') }}{{ trans('list.budget') }}{{ trans('list.other_meta_data') }}{{ trans('list.description') }}{{ trans('list.source') }}{{ trans('list.destination') }}{{ trans('list.amount') }}{{ trans('list.category') }}{{ trans('list.budget') }}{{ trans('list.other_meta_data') }}
    +
    - + {% for budget in budgets %} - + {% endfor %} diff --git a/resources/views/reports/budget/partials/accounts.twig b/resources/views/reports/budget/partials/accounts.twig index cb21e4f5f52..98b732c338e 100644 --- a/resources/views/reports/budget/partials/accounts.twig +++ b/resources/views/reports/budget/partials/accounts.twig @@ -1,8 +1,8 @@ -
    {{ 'name'|_ }}{{ 'name'|_ }}{{ budget.name }}{{ budget.name }}
    +
    - - + + diff --git a/resources/views/reports/budget/partials/avg-expenses.twig b/resources/views/reports/budget/partials/avg-expenses.twig index b34a2ecc636..361992e1a33 100644 --- a/resources/views/reports/budget/partials/avg-expenses.twig +++ b/resources/views/reports/budget/partials/avg-expenses.twig @@ -1,10 +1,10 @@ -
    {{ 'name'|_ }}{{ 'spent'|_ }}{{ 'name'|_ }}{{ 'spent'|_ }}
    +
    - - - - + + + + diff --git a/resources/views/reports/budget/partials/budgets.twig b/resources/views/reports/budget/partials/budgets.twig index 66dab99ab51..9d2a6c74051 100644 --- a/resources/views/reports/budget/partials/budgets.twig +++ b/resources/views/reports/budget/partials/budgets.twig @@ -1,9 +1,9 @@ -
    {{ 'account'|_ }}{{ 'spent_average'|_ }}{{ 'total'|_ }}{{ 'transaction_count'|_ }}{{ 'account'|_ }}{{ 'spent_average'|_ }}{{ 'total'|_ }}{{ 'transaction_count'|_ }}
    +
    - - - + + + diff --git a/resources/views/reports/budget/partials/top-expenses.twig b/resources/views/reports/budget/partials/top-expenses.twig index 8b5d71bd6b5..9e2c8a4ca61 100644 --- a/resources/views/reports/budget/partials/top-expenses.twig +++ b/resources/views/reports/budget/partials/top-expenses.twig @@ -1,11 +1,11 @@ -
    {{ 'name'|_ }}{{ 'spent'|_ }}{{ trans('list.percentage') }}{{ 'name'|_ }}{{ 'spent'|_ }}{{ trans('list.percentage') }}
    +
    - - - - - + + + + + diff --git a/resources/views/reports/category/month.twig b/resources/views/reports/category/month.twig index c6a02692f24..c8b5459aa8c 100644 --- a/resources/views/reports/category/month.twig +++ b/resources/views/reports/category/month.twig @@ -5,12 +5,17 @@ {% endblock %} {% block content %} +
    +
    +

    {{ 'category_report'|_ }}

    +
    +
    -

    {{ 'accounts'|_ }}

    +

    {{ 'accounts'|_ }}

    @@ -23,7 +28,7 @@
    -

    {{ 'categories'|_ }}

    +

    {{ 'categories'|_ }}

    @@ -38,7 +43,7 @@
    -

    {{ 'account_per_category'|_ }}

    +

    {{ 'account_per_category'|_ }}

    diff --git a/resources/views/reports/category/partials/account-per-category.twig b/resources/views/reports/category/partials/account-per-category.twig index cb960c33bb6..e334129f52f 100644 --- a/resources/views/reports/category/partials/account-per-category.twig +++ b/resources/views/reports/category/partials/account-per-category.twig @@ -1,9 +1,9 @@ -
    {{ 'description'|_ }}{{ 'date'|_ }}{{ 'account'|_ }}{{ 'budget'|_ }}{{ 'amount'|_ }}{{ 'description'|_ }}{{ 'date'|_ }}{{ 'account'|_ }}{{ 'budget'|_ }}{{ 'amount'|_ }}
    +
    - + {% for category in categories %} - + {% endfor %} diff --git a/resources/views/reports/category/partials/accounts.twig b/resources/views/reports/category/partials/accounts.twig index 4e9ce9e9a2f..496a614808c 100644 --- a/resources/views/reports/category/partials/accounts.twig +++ b/resources/views/reports/category/partials/accounts.twig @@ -1,10 +1,10 @@ -
    {{ 'name'|_ }}{{ 'name'|_ }}{{ category.name }}{{ category.name }}
    +
    - - - - + + + + diff --git a/resources/views/reports/category/partials/avg-expenses.twig b/resources/views/reports/category/partials/avg-expenses.twig index b34a2ecc636..05ad85c74ac 100644 --- a/resources/views/reports/category/partials/avg-expenses.twig +++ b/resources/views/reports/category/partials/avg-expenses.twig @@ -1,10 +1,10 @@ -
    {{ 'name'|_ }}{{ 'spent'|_ }}{{ 'earned'|_ }}{{ 'sum'|_ }}{{ 'name'|_ }}{{ 'spent'|_ }}{{ 'earned'|_ }}{{ 'sum'|_ }}
    +
    - - - - + + + + diff --git a/resources/views/reports/category/partials/avg-income.twig b/resources/views/reports/category/partials/avg-income.twig index b859f13a09c..0828406b59d 100644 --- a/resources/views/reports/category/partials/avg-income.twig +++ b/resources/views/reports/category/partials/avg-income.twig @@ -1,10 +1,10 @@ -
    {{ 'account'|_ }}{{ 'spent_average'|_ }}{{ 'total'|_ }}{{ 'transaction_count'|_ }}{{ 'account'|_ }}{{ 'spent_average'|_ }}{{ 'total'|_ }}{{ 'transaction_count'|_ }}
    +
    - - - - + + + + diff --git a/resources/views/reports/category/partials/categories.twig b/resources/views/reports/category/partials/categories.twig index 08462940494..cb489df78ef 100644 --- a/resources/views/reports/category/partials/categories.twig +++ b/resources/views/reports/category/partials/categories.twig @@ -1,10 +1,10 @@ -
    {{ 'account'|_ }}{{ 'spent_average'|_ }}{{ 'total'|_ }}{{ 'transaction_count'|_ }}{{ 'account'|_ }}{{ 'spent_average'|_ }}{{ 'total'|_ }}{{ 'transaction_count'|_ }}
    +
    - - - - + + + + diff --git a/resources/views/reports/category/partials/top-expenses.twig b/resources/views/reports/category/partials/top-expenses.twig index f435d41189d..3aba3dc02e6 100644 --- a/resources/views/reports/category/partials/top-expenses.twig +++ b/resources/views/reports/category/partials/top-expenses.twig @@ -1,11 +1,11 @@ -
    {{ 'name'|_ }}{{ 'spent'|_ }}{{ 'earned'|_ }}{{ 'sum'|_ }}{{ 'name'|_ }}{{ 'spent'|_ }}{{ 'earned'|_ }}{{ 'sum'|_ }}
    +
    - - - - - + + + + + diff --git a/resources/views/reports/category/partials/top-income.twig b/resources/views/reports/category/partials/top-income.twig index e5d566d4682..621f072a124 100644 --- a/resources/views/reports/category/partials/top-income.twig +++ b/resources/views/reports/category/partials/top-income.twig @@ -1,11 +1,11 @@ -
    {{ 'description'|_ }}{{ 'date'|_ }}{{ 'account'|_ }}{{ 'category'|_ }}{{ 'amount'|_ }}{{ 'description'|_ }}{{ 'date'|_ }}{{ 'account'|_ }}{{ 'category'|_ }}{{ 'amount'|_ }}
    +
    - - - - - + + + + + diff --git a/resources/views/reports/default/month.twig b/resources/views/reports/default/month.twig index 687c45a1d4c..6275a38e264 100644 --- a/resources/views/reports/default/month.twig +++ b/resources/views/reports/default/month.twig @@ -11,7 +11,7 @@
    -

    {{ 'accountBalances'|_ }}

    +

    {{ 'accountBalances'|_ }}

    @@ -25,7 +25,7 @@
    -

    {{ 'accountBalances'|_ }}

    +

    {{ 'accountBalances'|_ }}

    @@ -38,7 +38,7 @@
    -

    {{ 'incomeVsExpenses'|_ }}

    +

    {{ 'incomeVsExpenses'|_ }}

    @@ -55,7 +55,7 @@
    -

    {{ 'income'|_ }}

    +

    {{ 'income'|_ }}

    @@ -68,7 +68,7 @@
    -

    {{ 'expenses'|_ }}

    +

    {{ 'expenses'|_ }}

    @@ -85,7 +85,7 @@
    -

    {{ 'budgets'|_ }}

    +

    {{ 'budgets'|_ }}

    @@ -100,7 +100,7 @@
    -

    {{ 'categories'|_ }}

    +

    {{ 'categories'|_ }}

    {# loading indicator #} @@ -114,7 +114,7 @@
    -

    {{ 'budgets'|_ }} ({{ 'splitByAccount'|_|lower }})

    +

    {{ 'budgets'|_ }} ({{ 'splitByAccount'|_|lower }})

    @@ -130,7 +130,7 @@
    -

    {{ 'bills'|_ }}

    +

    {{ 'bills'|_ }}

    {# loading indicator #} diff --git a/resources/views/reports/default/multi-year.twig b/resources/views/reports/default/multi-year.twig index be76587ad07..cb2e8232857 100644 --- a/resources/views/reports/default/multi-year.twig +++ b/resources/views/reports/default/multi-year.twig @@ -6,12 +6,14 @@ {% block content %} +

    {{ 'multi_year_report'|_ }}

    + {# charts #}
    -

    {{ 'incomeVsExpenses'|_ }}

    +

    {{ 'incomeVsExpenses'|_ }}

    @@ -25,7 +27,7 @@
    -

    {{ 'accountBalances'|_ }}

    +

    {{ 'accountBalances'|_ }}

    @@ -38,7 +40,7 @@
    -

    {{ 'incomeVsExpenses'|_ }}

    +

    {{ 'incomeVsExpenses'|_ }}

    @@ -55,7 +57,7 @@
    -

    {{ 'income'|_ }}

    +

    {{ 'income'|_ }}

    @@ -69,7 +71,7 @@
    -

    {{ 'expenses'|_ }}

    +

    {{ 'expenses'|_ }}

    @@ -86,7 +88,7 @@
    -

    {{ 'net_worth'|_ }}

    +

    {{ 'net_worth'|_ }}

    @@ -106,7 +108,7 @@
    -

    {{ 'budgets'|_ }}

    +

    {{ 'budgets'|_ }}

    @@ -124,7 +126,7 @@
    -

    {{ 'chart'|_ }}

    +

    {{ 'chart'|_ }}

    {{ 'budget_chart_click'|_ }}

    @@ -139,7 +141,7 @@
    -

    {{ 'categories'|_ }} ({{ 'expenses'|_ }})

    +

    {{ 'categories'|_ }} ({{ 'expenses'|_ }})

    @@ -156,7 +158,7 @@
    -

    {{ 'categories'|_ }} ({{ 'income'|_ }})

    +

    {{ 'categories'|_ }} ({{ 'income'|_ }})

    @@ -173,7 +175,7 @@
    -

    {{ 'chart'|_ }}

    +

    {{ 'chart'|_ }}

    {{ 'category_chart_click'|_ }}

    diff --git a/resources/views/reports/double/partials/accounts-per-asset.twig b/resources/views/reports/double/partials/accounts-per-asset.twig index 6a19774fbf9..4b11f5f6947 100644 --- a/resources/views/reports/double/partials/accounts-per-asset.twig +++ b/resources/views/reports/double/partials/accounts-per-asset.twig @@ -1,10 +1,10 @@ -
    {{ 'description'|_ }}{{ 'date'|_ }}{{ 'account'|_ }}{{ 'category'|_ }}{{ 'amount'|_ }}{{ 'description'|_ }}{{ 'date'|_ }}{{ 'account'|_ }}{{ 'category'|_ }}{{ 'amount'|_ }}
    +
    - - - - + + + + diff --git a/resources/views/reports/double/partials/accounts.twig b/resources/views/reports/double/partials/accounts.twig index 7149f2f45e3..38e91f1dba2 100644 --- a/resources/views/reports/double/partials/accounts.twig +++ b/resources/views/reports/double/partials/accounts.twig @@ -1,10 +1,10 @@ -
    {{ 'name'|_ }}{{ 'spent'|_ }}{{ 'earned'|_ }}{{ 'sum'|_ }}{{ 'name'|_ }}{{ 'spent'|_ }}{{ 'earned'|_ }}{{ 'sum'|_ }}
    +
    - - - - + + + + diff --git a/resources/views/reports/double/partials/avg-expenses.twig b/resources/views/reports/double/partials/avg-expenses.twig index b859f13a09c..fd8957556d2 100644 --- a/resources/views/reports/double/partials/avg-expenses.twig +++ b/resources/views/reports/double/partials/avg-expenses.twig @@ -1,10 +1,10 @@ -
    {{ 'name'|_ }}{{ 'spent'|_ }}{{ 'earned'|_ }}{{ 'sum'|_ }}{{ 'name'|_ }}{{ 'spent'|_ }}{{ 'earned'|_ }}{{ 'sum'|_ }}
    +
    - - - - + + + + diff --git a/resources/views/reports/double/partials/avg-income.twig b/resources/views/reports/double/partials/avg-income.twig index b34a2ecc636..e7a33d29604 100644 --- a/resources/views/reports/double/partials/avg-income.twig +++ b/resources/views/reports/double/partials/avg-income.twig @@ -1,10 +1,10 @@ -
    {{ 'account'|_ }}{{ 'spent_average'|_ }}{{ 'total'|_ }}{{ 'transaction_count'|_ }}{{ 'account'|_ }}{{ 'spent_average'|_ }}{{ 'total'|_ }}{{ 'transaction_count'|_ }}
    +
    - - - - + + + + diff --git a/resources/views/reports/double/partials/top-expenses.twig b/resources/views/reports/double/partials/top-expenses.twig index 8c957eb6e31..e7339f78de5 100644 --- a/resources/views/reports/double/partials/top-expenses.twig +++ b/resources/views/reports/double/partials/top-expenses.twig @@ -1,11 +1,11 @@ -
    {{ 'account'|_ }}{{ 'spent_average'|_ }}{{ 'total'|_ }}{{ 'transaction_count'|_ }}{{ 'account'|_ }}{{ 'spent_average'|_ }}{{ 'total'|_ }}{{ 'transaction_count'|_ }}
    +
    - - - - - + + + + + diff --git a/resources/views/reports/double/partials/top-income.twig b/resources/views/reports/double/partials/top-income.twig index 8c957eb6e31..c677b8345b3 100644 --- a/resources/views/reports/double/partials/top-income.twig +++ b/resources/views/reports/double/partials/top-income.twig @@ -1,11 +1,11 @@ -
    {{ 'description'|_ }}{{ 'date'|_ }}{{ 'source_account'|_ }}{{ 'destination_account'|_ }}{{ 'amount'|_ }}{{ 'description'|_ }}{{ 'date'|_ }}{{ 'source_account'|_ }}{{ 'destination_account'|_ }}{{ 'amount'|_ }}
    +
    - - - - - + + + + + diff --git a/resources/views/reports/double/report.twig b/resources/views/reports/double/report.twig index 602d2b1de2d..abf7cbcd055 100644 --- a/resources/views/reports/double/report.twig +++ b/resources/views/reports/double/report.twig @@ -10,7 +10,7 @@
    -

    {{ 'in_out_accounts'|_ }}

    +

    {{ 'in_out_accounts'|_ }}

    {# loading indicator #} @@ -24,7 +24,7 @@
    -

    {{ 'in_out_accounts_per_asset'|_ }}

    +

    {{ 'in_out_accounts_per_asset'|_ }}

    {# loading indicator #} @@ -40,7 +40,7 @@
    -

    {{ 'expense_per_category'|_ }}

    +

    {{ 'expense_per_category'|_ }}

    @@ -52,7 +52,7 @@
    -

    {{ 'income_per_category'|_ }}

    +

    {{ 'income_per_category'|_ }}

    @@ -64,7 +64,7 @@
    -

    {{ 'expense_per_budget'|_ }}

    +

    {{ 'expense_per_budget'|_ }}

    @@ -79,7 +79,7 @@
    -

    {{ 'expense_per_tag'|_ }}

    +

    {{ 'expense_per_tag'|_ }}

    @@ -96,7 +96,7 @@
    -

    {{ 'income_per_tag'|_ }}

    +

    {{ 'income_per_tag'|_ }}

    @@ -118,7 +118,7 @@
    -

    {{ 'income_and_expenses'|_ }} ({{ account.name }}) {% if account.iban %}({{ account.iban }}){% endif %}

    +

    {{ 'income_and_expenses'|_ }} ({{ account.name }}) {% if account.iban %}({{ account.iban }}){% endif %}

    -

    {{ 'expenses'|_ }} ({{ trans('firefly.topX', {number: listLength}) }})

    +

    {{ 'expenses'|_ }} ({{ trans('firefly.topX', {number: listLength}) }})

    {# loading indicator #} @@ -148,7 +148,7 @@
    -

    {{ 'income'|_ }} ({{ trans('firefly.topX', {number: listLength}) }})

    +

    {{ 'income'|_ }} ({{ trans('firefly.topX', {number: listLength}) }})

    {# loading indicator #} @@ -164,7 +164,7 @@
    -

    {{ 'average_spending_per_source'|_ }}

    +

    {{ 'average_spending_per_source'|_ }}

    diff --git a/resources/views/reports/index.twig b/resources/views/reports/index.twig index 15acad7e561..dde81780202 100644 --- a/resources/views/reports/index.twig +++ b/resources/views/reports/index.twig @@ -5,13 +5,14 @@ {% endblock %} {% block content %} +

    {{ 'reports'|_ }}

    -

    {{ 'reports'|_ }}

    +

    {{ 'reports'|_ }}

    @@ -96,7 +97,7 @@

    -

    {{ 'reports_extra_options'|_ }}

    +

    {{ 'reports_extra_options'|_ }}

    @@ -108,7 +109,7 @@
    -

    {{ 'reports_submit'|_ }}

    +

    {{ 'reports_submit'|_ }}

    @@ -125,7 +126,7 @@
    -

    {{ 'quick_link_reports'|_ }}

    +

    {{ 'quick_link_reports'|_ }}

    {% if '' == accountList %} @@ -137,7 +138,7 @@

    {{ 'quick_link_examples'|_ }}

    -

    {{ ('quick_link_default_report')|_ }}

    +

    {{ ('quick_link_default_report')|_ }}

    -

    {{ ('quick_link_audit_report')|_ }}

    +

    {{ ('quick_link_audit_report')|_ }}

    • {{ 'report_this_month_quick'|_ }} diff --git a/resources/views/reports/partials/accounts.twig b/resources/views/reports/partials/accounts.twig index 53a9e5e0c5e..1eaee1f006f 100644 --- a/resources/views/reports/partials/accounts.twig +++ b/resources/views/reports/partials/accounts.twig @@ -1,10 +1,10 @@ -
    {{ 'description'|_ }}{{ 'date'|_ }}{{ 'source_account'|_ }}{{ 'destination_account'|_ }}{{ 'amount'|_ }}{{ 'description'|_ }}{{ 'date'|_ }}{{ 'source_account'|_ }}{{ 'destination_account'|_ }}{{ 'amount'|_ }}
    +
    - - - - + + + + diff --git a/resources/views/reports/partials/balance.twig b/resources/views/reports/partials/balance.twig index 36dc3bb0cad..e6ffcd39fb4 100644 --- a/resources/views/reports/partials/balance.twig +++ b/resources/views/reports/partials/balance.twig @@ -1,14 +1,14 @@ -
    {{ 'name'|_ }}{{ 'difference'|_ }}{{ 'name'|_ }}{{ 'difference'|_ }}
    +
    - + {% for account in report.accounts %} {% if account.sum != 0 %} - {% endif %} {% endfor %} - + diff --git a/resources/views/reports/partials/bills.twig b/resources/views/reports/partials/bills.twig index 2f55e2bd6c1..f347440cc51 100644 --- a/resources/views/reports/partials/bills.twig +++ b/resources/views/reports/partials/bills.twig @@ -1,11 +1,11 @@ -
    {{ 'budgets'|_ }}{{ 'budgets'|_ }}{{ 'sum'|_ }}{{ 'sum'|_ }}
    +
    - - - - - + + + + + diff --git a/resources/views/reports/partials/budget-period.twig b/resources/views/reports/partials/budget-period.twig index bf672d0ab70..8cbd3b3fcb5 100644 --- a/resources/views/reports/partials/budget-period.twig +++ b/resources/views/reports/partials/budget-period.twig @@ -1,12 +1,12 @@ -
    {{ trans('form.name') }}{{ trans('form.expected_on') }}{{ trans('form.paid') }}{{ trans('form.name') }}{{ trans('form.expected_on') }}{{ trans('form.paid') }}
    +
    - + {% for period in periods %} - + {% endfor %} - - + + diff --git a/resources/views/reports/partials/budgets.twig b/resources/views/reports/partials/budgets.twig index 86f393cdb26..6e894ab82fa 100644 --- a/resources/views/reports/partials/budgets.twig +++ b/resources/views/reports/partials/budgets.twig @@ -1,15 +1,15 @@ -
    {{ 'budget'|_ }}{{ 'budget'|_ }}{{ period }}{{ period }}{{ 'average'|_ }}{{ 'sum'|_ }}{{ 'average'|_ }}{{ 'sum'|_ }}
    +
    - - - - - - - - - + + + + + + + + + diff --git a/resources/views/reports/partials/categories.twig b/resources/views/reports/partials/categories.twig index f45abde45d0..97cb9aa7ef5 100644 --- a/resources/views/reports/partials/categories.twig +++ b/resources/views/reports/partials/categories.twig @@ -1,11 +1,11 @@ -
    {{ 'budget'|_ }}{{ 'spent'|_ }}{{ 'overspent'|_ }}{{ 'budget'|_ }}{{ 'spent'|_ }}{{ 'overspent'|_ }}
    +
    - - - - - + + + + + diff --git a/resources/views/reports/partials/category-period.twig b/resources/views/reports/partials/category-period.twig index 2660eed70bc..4a624d9810f 100644 --- a/resources/views/reports/partials/category-period.twig +++ b/resources/views/reports/partials/category-period.twig @@ -1,11 +1,11 @@ -
    {{ 'category'|_ }}{{ 'spent'|_ }}{{ 'earned'|_ }}{{ 'sum'|_ }} {{ 'category'|_ }}{{ 'spent'|_ }}{{ 'earned'|_ }}{{ 'sum'|_ }} 
    +
    - + {% for period in periods %} - + {% endfor %} - + diff --git a/resources/views/reports/partials/exp-budgets.twig b/resources/views/reports/partials/exp-budgets.twig index d1cc577e1d4..665bc57d443 100644 --- a/resources/views/reports/partials/exp-budgets.twig +++ b/resources/views/reports/partials/exp-budgets.twig @@ -1,8 +1,8 @@ -
    {{ 'category'|_ }}{{ 'category'|_ }}{{ period }}{{ period }}{{ 'sum'|_ }}{{ 'sum'|_ }}
    +
    - - + + diff --git a/resources/views/reports/partials/exp-categories.twig b/resources/views/reports/partials/exp-categories.twig index bfa38f242b4..83683c753f8 100644 --- a/resources/views/reports/partials/exp-categories.twig +++ b/resources/views/reports/partials/exp-categories.twig @@ -1,9 +1,9 @@ -
    {{ 'category'|_ }}{{ 'spent'|_ }}{{ 'category'|_ }}{{ 'spent'|_ }}
    +
    - - - + + + diff --git a/resources/views/reports/partials/exp-not-grouped.twig b/resources/views/reports/partials/exp-not-grouped.twig index ec26868ce61..59da401016c 100644 --- a/resources/views/reports/partials/exp-not-grouped.twig +++ b/resources/views/reports/partials/exp-not-grouped.twig @@ -1,9 +1,9 @@ -
    {{ 'category'|_ }}{{ 'spent'|_ }}{{ 'earned'|_ }}{{ 'category'|_ }}{{ 'spent'|_ }}{{ 'earned'|_ }}
    +
    - - - + + + diff --git a/resources/views/reports/partials/income-expenses.twig b/resources/views/reports/partials/income-expenses.twig index 0bb7c009612..861e33c8c94 100644 --- a/resources/views/reports/partials/income-expenses.twig +++ b/resources/views/reports/partials/income-expenses.twig @@ -1,10 +1,10 @@ -
    {{ 'name'|_ }}{{ 'name'|_ }}
    +
    - - - - + + + + diff --git a/resources/views/reports/partials/journals-audit.twig b/resources/views/reports/partials/journals-audit.twig index 5eb2f71b74b..b6b8e43a1b3 100644 --- a/resources/views/reports/partials/journals-audit.twig +++ b/resources/views/reports/partials/journals-audit.twig @@ -1,36 +1,36 @@ -
    {{ 'name'|_ }}{{ 'total'|_ }}{{ 'name'|_ }}{{ 'total'|_ }}{{ 'actions'|_ }}
    +
    - - + + - - - - + + + + - + {# new optional fields (3x) #} - - + + - - - + + + {# more optional fields (2x) #} - - + + - + {# even more optional fields #} - - - - - - + + + + + + diff --git a/resources/views/reports/partials/operations.twig b/resources/views/reports/partials/operations.twig index 70dc36bb876..6fcb144194d 100644 --- a/resources/views/reports/partials/operations.twig +++ b/resources/views/reports/partials/operations.twig @@ -1,10 +1,10 @@ -
        {{ trans('list.description') }}{{ trans('list.balance_before') }}{{ trans('list.amount') }}{{ trans('list.balance_after') }}{{ trans('list.description') }}{{ trans('list.balance_before') }}{{ trans('list.amount') }}{{ trans('list.balance_after') }}{{ trans('list.date') }}{{ trans('list.date') }}{{ trans('list.from') }}{{ trans('list.to') }}{{ trans('list.from') }}{{ trans('list.to') }}{{ trans('list.bill') }}{{ trans('list.budget') }}{{ trans('list.category') }}{{ trans('list.bill') }}{{ trans('list.create_date') }}{{ trans('list.update_date') }}{{ trans('list.create_date') }}{{ trans('list.update_date') }}{{ trans('list.notes') }}{{ trans('list.notes') }}{{ trans('list.interest_date') }}{{ trans('list.book_date') }}{{ trans('list.process_date') }}{{ trans('list.due_date') }}{{ trans('list.payment_date') }}{{ trans('list.invoice_date') }}{{ trans('list.interest_date') }}{{ trans('list.book_date') }}{{ trans('list.process_date') }}{{ trans('list.due_date') }}{{ trans('list.payment_date') }}{{ trans('list.invoice_date') }}
    +
    - - - - + + + + diff --git a/resources/views/reports/partials/top-transactions.twig b/resources/views/reports/partials/top-transactions.twig index 8d0a835be08..c5dd9ebe627 100644 --- a/resources/views/reports/partials/top-transactions.twig +++ b/resources/views/reports/partials/top-transactions.twig @@ -1,10 +1,10 @@ -
    {{'currency'|_}}{{ 'money_flowing_in'|_ }}{{ 'money_flowing_out'|_ }}{{ 'difference'|_ }}{{'currency'|_}}{{ 'money_flowing_in'|_ }}{{ 'money_flowing_out'|_ }}{{ 'difference'|_ }}
    +
    - - - - + + + + diff --git a/resources/views/reports/tag/partials/account-per-tag.twig b/resources/views/reports/tag/partials/account-per-tag.twig index 871cf05d71c..90f2cba403a 100644 --- a/resources/views/reports/tag/partials/account-per-tag.twig +++ b/resources/views/reports/tag/partials/account-per-tag.twig @@ -1,9 +1,9 @@ -
    {{ 'account'|_ }}{{ 'description'|_ }}{{ 'date'|_ }}{{ 'account'|_ }}{{ 'description'|_ }}{{ 'date'|_ }}
    +
    - + {% for tag in tags %} - + {% endfor %} diff --git a/resources/views/reports/tag/partials/accounts.twig b/resources/views/reports/tag/partials/accounts.twig index 4e9ce9e9a2f..1801fd8cd8a 100644 --- a/resources/views/reports/tag/partials/accounts.twig +++ b/resources/views/reports/tag/partials/accounts.twig @@ -1,10 +1,10 @@ -
    {{ 'name'|_ }}{{ 'name'|_ }}{{ tag.tag }}{{ tag.tag }}
    +
    - - - - + + + + diff --git a/resources/views/reports/tag/partials/avg-expenses.twig b/resources/views/reports/tag/partials/avg-expenses.twig index b34a2ecc636..05ad85c74ac 100644 --- a/resources/views/reports/tag/partials/avg-expenses.twig +++ b/resources/views/reports/tag/partials/avg-expenses.twig @@ -1,10 +1,10 @@ -
    {{ 'name'|_ }}{{ 'spent'|_ }}{{ 'earned'|_ }}{{ 'sum'|_ }}{{ 'name'|_ }}{{ 'spent'|_ }}{{ 'earned'|_ }}{{ 'sum'|_ }}
    +
    - - - - + + + + diff --git a/resources/views/reports/tag/partials/avg-income.twig b/resources/views/reports/tag/partials/avg-income.twig index b859f13a09c..0828406b59d 100644 --- a/resources/views/reports/tag/partials/avg-income.twig +++ b/resources/views/reports/tag/partials/avg-income.twig @@ -1,10 +1,10 @@ -
    {{ 'account'|_ }}{{ 'spent_average'|_ }}{{ 'total'|_ }}{{ 'transaction_count'|_ }}{{ 'account'|_ }}{{ 'spent_average'|_ }}{{ 'total'|_ }}{{ 'transaction_count'|_ }}
    +
    - - - - + + + + diff --git a/resources/views/reports/tag/partials/tags.twig b/resources/views/reports/tag/partials/tags.twig index ed535d43eea..6e4a1c34145 100644 --- a/resources/views/reports/tag/partials/tags.twig +++ b/resources/views/reports/tag/partials/tags.twig @@ -1,10 +1,10 @@ -
    {{ 'account'|_ }}{{ 'spent_average'|_ }}{{ 'total'|_ }}{{ 'transaction_count'|_ }}{{ 'account'|_ }}{{ 'spent_average'|_ }}{{ 'total'|_ }}{{ 'transaction_count'|_ }}
    +
    - - - - + + + + diff --git a/resources/views/reports/tag/partials/top-expenses.twig b/resources/views/reports/tag/partials/top-expenses.twig index 1e88ec350b4..188bcf7218d 100644 --- a/resources/views/reports/tag/partials/top-expenses.twig +++ b/resources/views/reports/tag/partials/top-expenses.twig @@ -1,11 +1,11 @@ -
    {{ 'name'|_ }}{{ 'spent'|_ }}{{ 'earned'|_ }}{{ 'sum'|_ }}{{ 'name'|_ }}{{ 'spent'|_ }}{{ 'earned'|_ }}{{ 'sum'|_ }}
    +
    - - - - - + + + + + diff --git a/resources/views/reports/tag/partials/top-income.twig b/resources/views/reports/tag/partials/top-income.twig index 12dc972911d..1419292fc08 100644 --- a/resources/views/reports/tag/partials/top-income.twig +++ b/resources/views/reports/tag/partials/top-income.twig @@ -1,11 +1,11 @@ -
    {{ 'description'|_ }}{{ 'date'|_ }}{{ 'account'|_ }}{{ 'tag'|_ }}{{ 'amount'|_ }}{{ 'description'|_ }}{{ 'date'|_ }}{{ 'account'|_ }}{{ 'tag'|_ }}{{ 'amount'|_ }}
    +
    - - - - - + + + + + diff --git a/resources/views/rules/index.twig b/resources/views/rules/index.twig index 62adc40fd3e..35b6e35147c 100644 --- a/resources/views/rules/index.twig +++ b/resources/views/rules/index.twig @@ -71,15 +71,15 @@

    {% if ruleGroup.rules.count() > 0 %} -
    {{ 'description'|_ }}{{ 'date'|_ }}{{ 'account'|_ }}{{ 'tag'|_ }}{{ 'amount'|_ }}{{ 'description'|_ }}{{ 'date'|_ }}{{ 'account'|_ }}{{ 'tag'|_ }}{{ 'amount'|_ }}
    +
    - - - - - - + + + + + + diff --git a/resources/views/rules/partials/test-trigger-modal.twig b/resources/views/rules/partials/test-trigger-modal.twig index 11b03b288ad..739e953b46d 100644 --- a/resources/views/rules/partials/test-trigger-modal.twig +++ b/resources/views/rules/partials/test-trigger-modal.twig @@ -1,13 +1,13 @@ -
       {{ 'rule_name'|_ }}{{ 'drag_handle'|_ }}{{ 'actions'|_ }}{{ 'test_duplicate'|_ }}{{ 'rule_name'|_ }}
    +
    - - - - + + + + @@ -97,15 +97,15 @@
    -

    {{ 'rule_actions'|_ }}

    +

    {{ 'rule_actions'|_ }}

    -
    {{ 'trigger'|_ }}{{ 'is_not_rule_trigger'|_ }}{{ 'trigger_value'|_ }}{{ 'stop_processing_other_triggers'|_ }}{{ 'trigger'|_ }}{{ 'is_not_rule_trigger'|_ }}{{ 'trigger_value'|_ }}{{ 'stop_processing_other_triggers'|_ }}
    +
    - - - + + + @@ -129,7 +129,7 @@ {# panel for options #}
    -

    {{ 'options'|_ }}

    +

    {{ 'options'|_ }}

    {{ ExpandedForm.optionsList('create','rule') }} diff --git a/resources/views/rules/rule/delete.twig b/resources/views/rules/rule/delete.twig index ac328bbf9ed..f87661f039b 100644 --- a/resources/views/rules/rule/delete.twig +++ b/resources/views/rules/rule/delete.twig @@ -12,7 +12,7 @@
    -

    {{ trans('form.delete_rule', {'title': rule.title}) }}

    +

    {{ trans('form.delete_rule', {'title': rule.title}) }}

    diff --git a/resources/views/rules/rule/edit.twig b/resources/views/rules/rule/edit.twig index 7d1805cb3e4..5e70a0dee06 100644 --- a/resources/views/rules/rule/edit.twig +++ b/resources/views/rules/rule/edit.twig @@ -6,6 +6,8 @@ {% block content %} +

    {{ 'edit_rule'|_ }}: {{ rule.title }}

    + @@ -14,7 +16,7 @@
    -

    {{ 'mandatoryFields'|_ }}

    +

    {{ 'mandatoryFields'|_ }}

    {{ ExpandedForm.text('title', rule.title) }} @@ -34,7 +36,7 @@ {# optional fields #}
    -

    {{ 'optionalFields'|_ }}

    +

    {{ 'optionalFields'|_ }}

    {{ ExpandedForm.textarea('description', rule.description, {helpText: trans('firefly.field_supports_markdown')}) }} @@ -47,16 +49,16 @@
    -

    {{ 'rule_triggers'|_ }}

    +

    {{ 'rule_triggers'|_ }}

    -
    {{ 'action'|_ }}{{ 'action_value'|_ }}{{ 'stop_executing_other_actions'|_ }}{{ 'action'|_ }}{{ 'action_value'|_ }}{{ 'stop_executing_other_actions'|_ }}
    +
    - - - - + + + + @@ -83,15 +85,15 @@
    -

    {{ 'rule_actions'|_ }}

    +

    {{ 'rule_actions'|_ }}

    -
    {{ 'trigger'|_ }}{{ 'is_not_rule_trigger'|_ }}{{ 'trigger_value'|_ }}{{ 'stop_processing_other_triggers'|_ }}{{ 'trigger'|_ }}{{ 'is_not_rule_trigger'|_ }}{{ 'trigger_value'|_ }}{{ 'stop_processing_other_triggers'|_ }}
    +
    - - - + + + @@ -115,7 +117,7 @@ {# panel for options #}
    -

    {{ 'options'|_ }}

    +

    {{ 'options'|_ }}

    {{ ExpandedForm.optionsList('update','rule') }} diff --git a/resources/views/search/index.twig b/resources/views/search/index.twig index 92bb453811f..4a5e98f01d7 100644 --- a/resources/views/search/index.twig +++ b/resources/views/search/index.twig @@ -9,7 +9,7 @@
    -

    {{ 'search_box'|_ }}

    +

    {{ 'search_box'|_ }}

    @@ -88,7 +88,7 @@

    -

    {{ 'transactions'|_ }}

    +

    {{ 'transactions'|_ }}

    @@ -127,7 +127,7 @@

    -

    {{ 'search_error'|_ }}

    +

    {{ 'search_error'|_ }}

    @@ -143,7 +143,7 @@

    -

    {{ 'search_results'|_ }}

    +

    {{ 'search_results'|_ }}

    {{ 'no_results_for_empty_search'|_ }}

    diff --git a/resources/views/settings/link/delete.twig b/resources/views/settings/link/delete.twig index dee7289166d..54dcf98e416 100644 --- a/resources/views/settings/link/delete.twig +++ b/resources/views/settings/link/delete.twig @@ -13,7 +13,7 @@
    -

    {{ trans('form.delete_link_type', {'name': linkType.name}) }}

    +

    {{ trans('form.delete_link_type', {'name': linkType.name}) }}

    diff --git a/resources/views/settings/link/index.twig b/resources/views/settings/link/index.twig index 8c85b09c19b..694aefe2816 100644 --- a/resources/views/settings/link/index.twig +++ b/resources/views/settings/link/index.twig @@ -6,19 +6,20 @@ {% block content %}

    +

    {{ 'journal_link_configuration'|_ }}

    -

    {{ 'journal_link_configuration'|_ }}

    +

    {{ 'journal_link_configuration'|_ }}

    -
    {{ 'action'|_ }}{{ 'action_value'|_ }}{{ 'stop_executing_other_actions'|_ }}{{ 'action'|_ }}{{ 'action_value'|_ }}{{ 'stop_executing_other_actions'|_ }}
    +
    - - - - - + + + + + diff --git a/resources/views/settings/link/show.twig b/resources/views/settings/link/show.twig index c45689b6566..41e7b2cbc53 100644 --- a/resources/views/settings/link/show.twig +++ b/resources/views/settings/link/show.twig @@ -8,18 +8,18 @@
    -

    {{ trans('firefly.overview_for_link', {name: journalLinkTranslation('name', linkType.name)}) }}

    +

    {{ trans('firefly.overview_for_link', {name: journalLinkTranslation('name', linkType.name)}) }}

    -
    {{ trans('list.name') }}{{ trans('list.number_of_transactions') }}{{ trans('list.name') }}{{ trans('list.number_of_transactions') }}
    +
    - - - - - - + + + + + + diff --git a/resources/views/settings/notifications/index.twig b/resources/views/settings/notifications/index.twig index e8a60b6b435..db36b5f9e39 100644 --- a/resources/views/settings/notifications/index.twig +++ b/resources/views/settings/notifications/index.twig @@ -4,13 +4,18 @@ {{ Breadcrumbs.render }} {% endblock %} {% block content %} +
    +
    +

    {{ 'notification_settings'|_ }}

    +
    +
    -

    {{ 'notification_settings'|_ }}

    +

    {{ 'notification_preferences'|_ }}

    @@ -48,7 +53,7 @@

    -

    {{ 'available_channels_title'|_ }}

    +

    {{ 'available_channels_title'|_ }}

    diff --git a/resources/views/settings/users/delete.twig b/resources/views/settings/users/delete.twig index 8c0f2ee57db..b7c7ed66dc0 100644 --- a/resources/views/settings/users/delete.twig +++ b/resources/views/settings/users/delete.twig @@ -13,7 +13,7 @@

    -

    {{ trans('form.delete_user', {'email': user.email}) }}

    +

    {{ trans('form.delete_user', {'email': user.email}) }}

    diff --git a/resources/views/settings/users/edit.twig b/resources/views/settings/users/edit.twig index 260fee22627..75ae41b900e 100644 --- a/resources/views/settings/users/edit.twig +++ b/resources/views/settings/users/edit.twig @@ -4,6 +4,7 @@ {{ Breadcrumbs.render(Route.getCurrentRoute.getName, user) }} {% endblock %} {% block content %} +

    {{ 'edit_user'|_ }}

    -

    {{ 'mandatoryFields'|_ }}

    +

    {{ 'mandatoryFields'|_ }}

    {% if canEditDetails %} @@ -42,7 +43,7 @@ {# panel for options #}
    -

    {{ 'options'|_ }}

    +

    {{ 'options'|_ }}

    {{ ExpandedForm.optionsList('update','account') }} diff --git a/resources/views/settings/users/index.twig b/resources/views/settings/users/index.twig index 52a0d07fc74..e4d534e4e43 100644 --- a/resources/views/settings/users/index.twig +++ b/resources/views/settings/users/index.twig @@ -4,6 +4,11 @@ {{ Breadcrumbs.render }} {% endblock %} {% block content %} +
    +
    +

    {{ 'user_management'|_ }}

    +
    +
    {% if allowInvites %}
    @@ -11,7 +16,7 @@
    -

    {{ 'invite_new_user_title'|_ }}

    +

    {{ 'invite_new_user_title'|_ }}

    @@ -33,20 +38,20 @@

    -

    {{ 'all_users'|_ }}

    +

    {{ 'all_users'|_ }}

    -
     {{ trans('firefly.inward_transaction') }} {{ trans('firefly.link_description') }}{{ trans('firefly.outward_transaction') }} {{ trans('firefly.actions') }}{{ trans('firefly.inward_transaction') }}{{ trans('firefly.amount') }}{{ trans('firefly.link_description') }}{{ trans('firefly.outward_transaction') }}{{ trans('firefly.amount') }}
    +
    - - - - - - - - + + + + + + + + @@ -118,18 +123,18 @@
    -

    {{ 'all_invited_users'|_ }}

    +

    {{ 'all_invited_users'|_ }}

    -
    {{ trans('list.email') }}{{ trans('list.is_blocked') }}{{ trans('list.email') }}{{ trans('list.is_blocked') }}
    +
    - - - - - - + + + + + + diff --git a/resources/views/settings/users/show.twig b/resources/views/settings/users/show.twig index 04aef4cd7eb..b21d89db992 100644 --- a/resources/views/settings/users/show.twig +++ b/resources/views/settings/users/show.twig @@ -4,17 +4,18 @@ {{ Breadcrumbs.render(Route.getCurrentRoute.getName, user) }} {% endblock %} {% block content %} +

    {{ 'user_details'|_ }}

    -

    {{ 'user_information'|_ }}

    +

    {{ 'user_information'|_ }}

    -
    {{ trans('list.email') }}{{ trans('list.invite_link') }}{{ trans('list.email') }}{{ trans('list.invite_link') }}
    +
    - + @@ -73,7 +74,7 @@
    -

    {{ 'user_data_information'|_ }}

    +

    {{ 'user_data_information'|_ }}

    {{ trans('list.id') }}{{ trans('list.id') }} #{{ user.id }}
    diff --git a/resources/views/tags/create.twig b/resources/views/tags/create.twig index c334cb93d2f..33224dc1b91 100644 --- a/resources/views/tags/create.twig +++ b/resources/views/tags/create.twig @@ -5,6 +5,7 @@ {% endblock %} {% block content %} +

    {{ 'create_new_tag'|_ }}

    +

    {{ 'edit_tag'|_ }}: {{ tag.tag }}

    @@ -21,7 +22,7 @@
    -

    {{ 'mandatoryFields'|_ }}

    +

    {{ 'mandatoryFields'|_ }}

    {{ ExpandedForm.text('tag', tag.tag) }} @@ -33,7 +34,7 @@
    -

    {{ 'optionalFields'|_ }}

    +

    {{ 'optionalFields'|_ }}

    {{ ExpandedForm.date('date', tag.date.format('Y-m-d')) }} @@ -48,7 +49,7 @@ {# panel for options #}
    -

    {{ 'options'|_ }}

    +

    {{ 'options'|_ }}

    {{ ExpandedForm.optionsList('update','tag') }} diff --git a/resources/views/tags/index.twig b/resources/views/tags/index.twig index de15b4db182..8462118a27b 100644 --- a/resources/views/tags/index.twig +++ b/resources/views/tags/index.twig @@ -5,6 +5,11 @@ {% endblock %} {% block content %} +
    +
    +

    {{ 'tags'|_ }}

    +
    +
    {% if count == 0 %} {% include 'partials.empty' with {objectType: 'default', type: 'tags',route: route('tags.create')} %} {% else %} @@ -23,9 +28,9 @@
    -

    +

    {% if period == 'no-date' %}{{ 'without_date'|_ }}{% else %}{{ period }}{% endif %} -

    +
    diff --git a/resources/views/tags/show.twig b/resources/views/tags/show.twig index 885c5f6716a..4542ede5519 100644 --- a/resources/views/tags/show.twig +++ b/resources/views/tags/show.twig @@ -9,7 +9,7 @@
    -

    {{ 'meta_data'|_ }}

    +

    {{ 'meta_data'|_ }}

    @@ -28,7 +28,7 @@
    -
    +
    {% if tag.description %}
    @@ -177,7 +177,7 @@
    -

    {{ 'location'|_ }}

    +

    {{ 'location'|_ }}

    - +
    + + + + + + - + - + - +
    {{ 'property'|_ }}{{ 'value'|_ }}
    {{ trans('list.type') }}{{ trans('list.type') }} {{ first.transaction_type_type|_ }}
    {{ trans('list.description') }}{{ trans('list.description') }} {% if splits == 1 %} {{ first.description }} @@ -77,7 +84,7 @@
    {{ trans('list.date') }}{{ trans('list.date') }} {{ first.date.isoFormat(dateTimeFormat) }} @@ -94,9 +101,9 @@ {% if groupLogEntries|length > 0 %}
    -

    +

    {{ 'audit_log_entries'|_ }} -

    +
    {% include 'list.ale' with {logEntries: groupLogEntries} %} @@ -108,16 +115,22 @@
    -

    {{ 'transaction_journal_meta'|_ }}

    +

    {{ 'transaction_journal_meta'|_ }}

    - +
    + + + + + + {% if first.transaction_type_type != 'Withdrawal' or splits == 1 %} - - {% endif %} - +
    {{ 'property'|_ }}{{ 'value'|_ }}
    + {{ trans_choice('firefly.source_accounts', accounts['source']|length ) }} - + {% for account in accounts['source'] %} {% if 'Cash account' == account.type %} @@ -136,10 +149,10 @@ {% if first.transaction_type_type != 'Deposit' or splits == 1 %}
    + {{ trans_choice('firefly.destination_accounts', accounts['destination']|length ) }} - + {% for account in accounts['destination'] %} {% if 'Cash account' == account.type %} @@ -156,7 +169,7 @@
    {{ 'total_amount'|_ }}{{ 'total_amount'|_ }} {% for amount in amounts %} {% if first.transaction_type_type == 'Withdrawal' %} @@ -190,7 +203,7 @@ {% if splits > 1 %}
    -

    {{ 'splits'|_ }}

    +

    {{ 'splits'|_ }}

    {% endif %} @@ -209,7 +222,7 @@

    {{ journal.description }} {% if journal.reconciled %} - + {% endif %} {% if splits > 1 %} @@ -286,7 +299,13 @@
    - +
    + + + + + + - + {% if null != journal.category_id %} @@ -440,10 +459,10 @@ @@ -456,9 +475,9 @@ {% if links[journal.transaction_journal_id]|length > 0 %}
    -

    +

    {{ 'journal_links'|_ }} -

    +
    {{ 'transaction_flow'|_ }}
    @@ -361,7 +380,7 @@
    {{ 'transaction_journal_id'|_ }}{{ 'transaction_journal_id'|_ }} #{{ journal.transaction_journal_id }}
    {{ 'tags'|_ }} {% for tag in journal.tags %} -

    - {{ tag.tag }} -

    + {{ tag.tag }} + {% endfor %}
    @@ -498,7 +517,7 @@ {% if attachments[journal.transaction_journal_id]|length > 0 %}
    -

    {{ 'attachments'|_ }}

    +

    {{ 'attachments'|_ }}

    {% include 'list.attachments' with {attachments: attachments[journal.transaction_journal_id]} %} @@ -510,7 +529,7 @@ {% if events[journal.transaction_journal_id]|length > 0 %}
    -

    {{ 'piggy_events'|_ }}

    +

    {{ 'piggy_events'|_ }}

    @@ -543,7 +562,7 @@ {% endfor %} {# modal for linking journals. Will be filled by AJAX #} -
    +
    - - - diff --git a/resources/views/v2/administrations/create.blade.php b/resources/views/v2/administrations/create.blade.php index d1c9597f6b9..5ba3d443792 100644 --- a/resources/views/v2/administrations/create.blade.php +++ b/resources/views/v2/administrations/create.blade.php @@ -6,13 +6,14 @@
    +

    {{ __('firefly.create_new_administration') }}

    -

    {{ __('firefly.basic_administration_information') }}

    +

    {{ __('firefly.basic_administration_information') }}

    @@ -25,9 +26,9 @@
    -

    +

    {{ __('firefly.submission_options') }} -

    +
    @include('partials.form.submission-options') diff --git a/resources/views/v2/administrations/edit.blade.php b/resources/views/v2/administrations/edit.blade.php index cf0201eb3bc..c06d115bdc8 100644 --- a/resources/views/v2/administrations/edit.blade.php +++ b/resources/views/v2/administrations/edit.blade.php @@ -6,13 +6,14 @@
    +

    {{ __('firefly.edit_administration') }}

    -

    {{ __('firefly.basic_administration_information') }}

    +

    {{ __('firefly.basic_administration_information') }}

    @@ -25,9 +26,9 @@
    -

    +

    {{ __('firefly.submission_options') }} -

    +
    @include('partials.form.submission-options') diff --git a/resources/views/v2/administrations/index.blade.php b/resources/views/v2/administrations/index.blade.php index 0afc3eb2cb5..d5e00147392 100644 --- a/resources/views/v2/administrations/index.blade.php +++ b/resources/views/v2/administrations/index.blade.php @@ -19,11 +19,11 @@ class="btn btn-primary">{{ __('firefly.create_administration') }}
    -

    +

    - Administration ""

    + Administration ""
      @@ -36,7 +36,7 @@ class="btn btn-primary">{{ __('firefly.create_administration') }}
    @@ -96,22 +97,22 @@  
    +   - {{ __('list.active') }} + + {{ __('list.active') }} + class="fa-solid fa-arrow-down-short-wide" aria-hidden="true"> + class="fa-solid fa-arrow-down-wide-short" aria-hidden="true"> - {{ __('list.name') }} + + {{ __('list.name') }} - - + class="fa-solid fa-arrow-down-a-z" aria-hidden="true"> + + {{ __('list.type') }}