From dd794e409f388f60aea0e35cf5e348adf35db75d Mon Sep 17 00:00:00 2001 From: James Cole Date: Tue, 5 Sep 2023 19:34:46 +0200 Subject: [PATCH] Fix issues with relative urls --- resources/views/accounts/index.twig | 4 +- resources/views/accounts/show.twig | 6 +- resources/views/admin/link/index.twig | 4 +- resources/views/admin/link/show.twig | 5 +- resources/views/admin/users/index.twig | 8 +- resources/views/bills/create.twig | 6 +- resources/views/bills/index.twig | 46 +++---- resources/views/bills/show.twig | 16 +-- resources/views/budgets/create.twig | 2 +- resources/views/budgets/show.twig | 130 +++++++++--------- resources/views/categories/create.twig | 2 +- resources/views/categories/index.twig | 50 +++---- resources/views/categories/show.twig | 2 +- resources/views/currencies/index.twig | 6 +- resources/views/form/options.twig | 2 +- resources/views/index.twig | 44 +++--- resources/views/javascript/variables.twig | 6 +- resources/views/layout/default.twig | 14 +- resources/views/layout/empty.twig | 18 ++- resources/views/layout/guest.twig | 18 ++- resources/views/layout/install.twig | 18 ++- resources/views/list/groups.twig | 24 ++-- resources/views/object-groups/index.twig | 2 +- resources/views/partials/favicons.twig | 14 +- resources/views/partials/menu-sidebar.twig | 48 +++---- resources/views/piggy-banks/create.twig | 4 +- resources/views/piggy-banks/index.twig | 118 ++++++++-------- resources/views/piggy-banks/show.twig | 32 ++--- resources/views/preferences/index.twig | 18 +-- resources/views/recurring/index.twig | 12 +- resources/views/recurring/show.twig | 2 +- resources/views/reports/audit/report.twig | 124 ++++++++--------- resources/views/reports/budget/month.twig | 18 +-- resources/views/reports/index.twig | 18 +-- resources/views/rules/index.twig | 46 +++---- resources/views/rules/rule/edit.twig | 2 +- .../views/rules/rule/select-transactions.twig | 4 +- resources/views/search/index.twig | 4 +- resources/views/tags/index.twig | 12 +- resources/views/tags/show.twig | 24 ++-- resources/views/transactions/bulk/edit.twig | 14 +- resources/views/transactions/convert.twig | 56 ++++---- resources/views/transactions/mass/edit.twig | 2 +- 43 files changed, 509 insertions(+), 496 deletions(-) diff --git a/resources/views/accounts/index.twig b/resources/views/accounts/index.twig index 2c68f6e593..74bb5e4984 100644 --- a/resources/views/accounts/index.twig +++ b/resources/views/accounts/index.twig @@ -18,7 +18,7 @@ @@ -37,7 +37,7 @@

{{ ('make_new_' ~ objectType ~ '_account')|_ }} + class="fa fa-plus fa-fw"> {{ ('make_new_' ~ objectType ~ '_account')|_ }}

{% if inactiveCount > 0 %}

diff --git a/resources/views/accounts/show.twig b/resources/views/accounts/show.twig index 1acd8b17b8..3f3b1d2661 100644 --- a/resources/views/accounts/show.twig +++ b/resources/views/accounts/show.twig @@ -18,12 +18,12 @@

+ class="fa fa-ellipsis-v">
diff --git a/resources/views/admin/link/index.twig b/resources/views/admin/link/index.twig index 9ab3a4e654..5bd01d1ecf 100644 --- a/resources/views/admin/link/index.twig +++ b/resources/views/admin/link/index.twig @@ -28,9 +28,9 @@ {% if linkType.editable %}
+ class="fa fa-fw fa-pencil"> + class="fa fa-fw fa-trash-o">
{% endif %} diff --git a/resources/views/admin/link/show.twig b/resources/views/admin/link/show.twig index 1b17f775c4..c45689b656 100644 --- a/resources/views/admin/link/show.twig +++ b/resources/views/admin/link/show.twig @@ -27,9 +27,9 @@
- + + class="fa fa-fw fa-arrows-h">
@@ -61,6 +61,7 @@ diff --git a/resources/views/bills/index.twig b/resources/views/bills/index.twig index c340ad65f1..a4bdaaadfd 100644 --- a/resources/views/bills/index.twig +++ b/resources/views/bills/index.twig @@ -8,33 +8,33 @@ {% if total == 0 %} {% include 'partials.empty' with {objectType: 'default', type: 'bills',route: route('bills.create')} %} {% else %} -
-
-
-
-

{{ title }}

-
-
- - +
+
+
+
+

{{ title }}

+
+
+ + +
+
+
+
+ + {% include 'list/bills' %} +
+
+ {{ 'create_new_bill'|_ }}
-
- - {% include 'list/bills' %} -
-
- {{ 'create_new_bill'|_ }} -
-
-
-{% endif %} + {% endif %} {% endblock %} {% block styles %} diff --git a/resources/views/bills/show.twig b/resources/views/bills/show.twig index dacf29fb9d..763055be63 100644 --- a/resources/views/bills/show.twig +++ b/resources/views/bills/show.twig @@ -99,7 +99,7 @@

- +

@@ -111,14 +111,14 @@
{% if object.data.notes %} -
-
-

{{ 'notes'|_ }}

+
+
+

{{ 'notes'|_ }}

+
+
+ {{ object.data.notes|default('')|markdown }} +
-
- {{ object.data.notes|default('')|markdown }} -
-
{% endif %} diff --git a/resources/views/budgets/create.twig b/resources/views/budgets/create.twig index 72564b5c90..fd1e014b48 100644 --- a/resources/views/budgets/create.twig +++ b/resources/views/budgets/create.twig @@ -22,7 +22,7 @@
- {# panel for auto-budget#} + {# panel for auto-budget #}

{{ 'optionalFields'|_ }}

diff --git a/resources/views/budgets/show.twig b/resources/views/budgets/show.twig index a06232bb31..ca1dbd4995 100644 --- a/resources/views/budgets/show.twig +++ b/resources/views/budgets/show.twig @@ -113,11 +113,11 @@
{% if limits|length > 0 %} -
-
-

{{ 'showEverything'|_ }}

+
+
+

{{ 'showEverything'|_ }}

+
-
{% endif %}
@@ -141,62 +141,62 @@
{% if limits|length > 0 %} -
- {% for limit in limits %} -
-
-

+ {% for limit in limits %} +
+
+

- {{ limit.start_date.isoFormat(monthAndDayFormat) }} — - {{ limit.end_date.isoFormat(monthAndDayFormat) }} - -

-
-
- - - - - - - - - - {% if limit.spent > 0 %} + {{ limit.start_date.isoFormat(monthAndDayFormat) }} — + {{ limit.end_date.isoFormat(monthAndDayFormat) }} + + + +
+
{{ 'amount'|_ }} - {{ formatAmountBySymbol(limit.amount, limit.transactionCurrency.symbol, limit.transactionCurrency.decimal_places) }} -
{{ 'spent'|_ }} - {{ formatAmountBySymbol(limit.spent, limit.transactionCurrency.symbol, limit.transactionCurrency.decimal_places) }} -
- + - {% endif %} -
- {% set overspent = limit.amount + limit.spent < 0 %} - - {% if overspent %} - {% set pct = (limit.spent != 0 ? (limit.amount / (limit.spent*-1))*100 : 0) %} {# must have -1 here #} -
-
-
-
- {% else %} - {% set pct = (limit.amount != 0 ? (((limit.spent*-1) / limit.amount)*100) : 0) %} {# must have -1 here #} -
-
-
- {% endif %} + 		{{ 'amount'|_ }} + {{ formatAmountBySymbol(limit.amount, limit.transactionCurrency.symbol, limit.transactionCurrency.decimal_places) }}
+ + {{ 'spent'|_ }} + + {{ formatAmountBySymbol(limit.spent, limit.transactionCurrency.symbol, limit.transactionCurrency.decimal_places) }} + + + {% if limit.spent > 0 %} + + + {% set overspent = limit.amount + limit.spent < 0 %} + + {% if overspent %} + {% set pct = (limit.spent != 0 ? (limit.amount / (limit.spent*-1))*100 : 0) %} {# must have -1 here #} +
+
+
+
+ {% else %} + {% set pct = (limit.amount != 0 ? (((limit.spent*-1) / limit.amount)*100) : 0) %} {# must have -1 here #} +
+
+
+ {% endif %} + + + {% endif %} + +
-

- {% endfor %} -

{{ 'showEverything'|_ }}

-
+ {% endfor %} +

{{ 'showEverything'|_ }}

+
{% endif %}
@@ -206,17 +206,17 @@ var budgetID = {{ budget.id }}; var budgetLimitID = 0; {% if budgetLimit.id %} - budgetLimitID = {{ budgetLimit.id }}; - var budgetChartUrl = '{{ route('chart.budget.budget-limit', [budget.id, budgetLimit.id] ) }}'; - var currencySymbol = '{{ budgetLimit.transactionCurrency.symbol }}'; - var expenseCategoryUrl = '{{ route('chart.budget.expense-category', [budget.id, budgetLimit.id]) }}'; - var expenseAssetUrl = '{{ route('chart.budget.expense-asset', [budget.id, budgetLimit.id]) }}'; - var expenseExpenseUrl = '{{ route('chart.budget.expense-expense', [budget.id, budgetLimit.id]) }}'; + budgetLimitID = {{ budgetLimit.id }}; + var budgetChartUrl = '{{ route('chart.budget.budget-limit', [budget.id, budgetLimit.id] ) }}'; + var currencySymbol = '{{ budgetLimit.transactionCurrency.symbol }}'; + var expenseCategoryUrl = '{{ route('chart.budget.expense-category', [budget.id, budgetLimit.id]) }}'; + var expenseAssetUrl = '{{ route('chart.budget.expense-asset', [budget.id, budgetLimit.id]) }}'; + var expenseExpenseUrl = '{{ route('chart.budget.expense-expense', [budget.id, budgetLimit.id]) }}'; {% else %} - var budgetChartUrl = '{{ route('chart.budget.budget', [budget.id] ) }}'; - var expenseCategoryUrl = '{{ route('chart.budget.expense-category', [budget.id]) }}'; - var expenseAssetUrl = '{{ route('chart.budget.expense-asset', [budget.id]) }}'; - var expenseExpenseUrl = '{{ route('chart.budget.expense-expense', [budget.id]) }}'; + var budgetChartUrl = '{{ route('chart.budget.budget', [budget.id] ) }}'; + var expenseCategoryUrl = '{{ route('chart.budget.expense-category', [budget.id]) }}'; + var expenseAssetUrl = '{{ route('chart.budget.expense-asset', [budget.id]) }}'; + var expenseExpenseUrl = '{{ route('chart.budget.expense-expense', [budget.id]) }}'; {% endif %} diff --git a/resources/views/categories/create.twig b/resources/views/categories/create.twig index 59cfe119ec..0556ac39ba 100644 --- a/resources/views/categories/create.twig +++ b/resources/views/categories/create.twig @@ -20,7 +20,7 @@
- {# panel for optional fields#} + {# panel for optional fields #}

{{ 'optionalFields'|_ }}

diff --git a/resources/views/categories/index.twig b/resources/views/categories/index.twig index d19808e6a1..cefb5c0df2 100644 --- a/resources/views/categories/index.twig +++ b/resources/views/categories/index.twig @@ -6,41 +6,41 @@ {% block content %} {% if categories.count() > 0 %} -
-
-
-
-

{{ 'categories'|_ }}

-
-
- - +
+
+
+
+

{{ 'categories'|_ }}

+
+
+ + +
+
+ +
+
+ + {% include 'list/categories' %} +
+
+ {{ 'new_category'|_ }}
-
- - {% include 'list/categories' %} -
-
- {{ 'new_category'|_ }} -
- -
-
-{% else %} + {% else %} {% include 'partials.empty' with {objectType: 'default', type: 'categories',route: route('categories.create')} %} {% endif %} {% endblock %} {% block styles %} - + {% endblock %} {% block scripts %} diff --git a/resources/views/categories/show.twig b/resources/views/categories/show.twig index 923f307a51..5a8563356e 100644 --- a/resources/views/categories/show.twig +++ b/resources/views/categories/show.twig @@ -88,7 +88,7 @@

{% else %} - {% include 'list.groups' %} + {% include 'list.groups' %}

diff --git a/resources/views/currencies/index.twig b/resources/views/currencies/index.twig index 00df6f8152..d542f5fe6a 100644 --- a/resources/views/currencies/index.twig +++ b/resources/views/currencies/index.twig @@ -41,9 +41,9 @@

+ class="fa fa-fw fa-pencil"> + class="fa fa-fw fa-trash">
{% endif %} @@ -66,7 +66,7 @@
{% if currency.id != defaultCurrency.id %} + class="fa fa-fw fa-star"> {{ 'make_default_currency'|_ }} {% endif %} {% if currency.enabled %}
diff --git a/resources/views/index.twig b/resources/views/index.twig index b300a5c506..6b973a2f03 100644 --- a/resources/views/index.twig +++ b/resources/views/index.twig @@ -10,14 +10,14 @@ {# ACCOUNTS #}
-

{{ 'yourAccounts'|_ }}

- {{ 'go_to_asset_accounts'|_ }}
@@ -25,7 +25,7 @@ {# BUDGETS #}
-

{{ 'budgetsAndSpending'|_ }}

@@ -49,7 +49,7 @@
- + {{ 'go_to_categories'|_ }} @@ -64,7 +64,7 @@

{{ data.account.name }} + href="{{ route('accounts.show', [data.account.id]) }}">{{ data.account.name }}

@@ -92,34 +92,34 @@
@@ -132,7 +132,7 @@ {# BILLS #}
-

{{ 'bills'|_ }}

@@ -142,7 +142,7 @@
- {{ 'go_to_bills'|_ }}
@@ -159,7 +159,7 @@ {# EXPENSE ACCOUNTS #}
-

{{ 'expense_accounts'|_ }}

@@ -168,14 +168,14 @@ width="100%">
- {{ 'go_to_expense_accounts'|_ }}
{# OPTIONAL REVENUE ACCOUNTS #}
-

{{ 'revenue_accounts'|_ }}

@@ -184,7 +184,7 @@ width="100%">
- {{ 'go_to_revenue_accounts'|_ }}
@@ -200,9 +200,9 @@ lineTextColor = '#bec5cb'; } var billCount = {{ billCount }}; - var accountFrontpageUrl = '{{ route('chart.account.frontpage', null, false) }}'; - var accountRevenueUrl = '{{ route('chart.account.revenue', null, false) }}'; - var accountExpenseUrl = '{{ route('chart.account.expense',null, false) }}'; + var accountFrontpageUrl = '{{ route('chart.account.frontpage') }}'; + var accountRevenueUrl = '{{ route('chart.account.revenue') }}'; + var accountExpenseUrl = '{{ route('chart.account.expense') }}'; var piggyInfoUrl = '{{ route('json.fp.piggy-banks') }}'; var drawVerticalLine = ''; {# render vertical line with text "today" #} diff --git a/resources/views/javascript/variables.twig b/resources/views/javascript/variables.twig index 65a669e8ac..71a0c84137 100644 --- a/resources/views/javascript/variables.twig +++ b/resources/views/javascript/variables.twig @@ -54,9 +54,9 @@ var edit_selected_txt = "{{ trans('firefly.mass_edit')|escape('js') }}"; var edit_bulk_selected_txt = "{{ trans('firefly.bulk_edit')|escape('js') }}"; var delete_selected_txt = "{{ trans('firefly.mass_delete')|escape('js') }}"; -var mass_edit_url = '{{ route('transactions.mass.edit', [''], false) }}'; -var bulk_edit_url = '{{ route('transactions.bulk.edit', [''], false) }}'; -var mass_delete_url = '{{ route('transactions.mass.delete', [''], false) }}'; +var mass_edit_url = '{{ route('transactions.mass.edit', ['']) }}'; +var bulk_edit_url = '{{ route('transactions.bulk.edit', ['']) }}'; +var mass_delete_url = '{{ route('transactions.mass.delete', ['']) }}'; // for demo: var nextLabel = "{{ trans('firefly.intro_next_label')|escape('js') }}"; diff --git a/resources/views/layout/default.twig b/resources/views/layout/default.twig index 927ebda896..56d9738485 100644 --- a/resources/views/layout/default.twig +++ b/resources/views/layout/default.twig @@ -95,7 +95,7 @@
{# Logo #} -