Firefly III: a personal finances manager
PHP accountingbudgetbudgetingbudgetscash-flowcashflowcredit-carddockerexpensesfinancefinancesfinanciallinuxmoneypaycheckpersonal-financephpphp7
Fix lists and other tiny details.
James Cole82c3ff08d0ab
diff --git a/app/Exceptions/GracefulNotFoundHandler.php b/app/Exceptions/GracefulNotFoundHandler.phpindex c5794b2925..c16e4d7d9e 100644--- a/app/Exceptions/GracefulNotFoundHandler.php+++ b/app/Exceptions/GracefulNotFoundHandler.php@@ -61,6 +61,7 @@ class GracefulNotFoundHandler extends ExceptionHandler}$name = $route->getName();if (!auth()->check()) {+return parent::render($request, $e);}diff --git a/public/v1/js/ff/list/groups.js b/public/v1/js/ff/list/groups.jsindex 609477bdb4..7d8f0f81a9 100644--- a/public/v1/js/ff/list/groups.js+++ b/public/v1/js/ff/list/groups.js@@ -122,10 +122,12 @@ function countChecked() {function checkAll() {$('.mass-select').prop('checked', true);+ $('.select-all').prop('checked', true);}function uncheckAll() {$('.mass-select').prop('checked', false);+ $('.select-all').prop('checked', false);}function updateActionButtons() {diff --git a/resources/views/accounts/reconcile/transactions.blade.php b/resources/views/accounts/reconcile/transactions.blade.phpindex 4187f76b73..955fc1fd66 100644--- a/resources/views/accounts/reconcile/transactions.blade.php+++ b/resources/views/accounts/reconcile/transactions.blade.php@@ -65,7 +65,7 @@<tr data-date="{{ $journal['date']->format('Y-m-d') }}" data-id="{{ $journal['transaction_journal_id'] }}"><td class="hidden-xs"><div class="btn-group btn-group-sm">- <a href="{{ route('transactions.edit', [$journal['transaction_group_id']]) }}" class="btn btn-xs btn-outline-secondary"><span+ <a href="{{ route('transactions.edit', [$journal['transaction_group_id']]) }}" class="btn btn-sm btn-outline-secondary"><spanclass="bi bi-pencil"></span></a><a href="{{ route('transactions.delete', [$journal['transaction_group_id']]) }}" class="btn btn-danger"><spanclass="bi bi-trash"></span></a>diff --git a/resources/views/components/lists/groups-large.blade.php b/resources/views/components/lists/groups-large.blade.phpindex 814f3d1057..b6aba7765c 100644--- a/resources/views/components/lists/groups-large.blade.php+++ b/resources/views/components/lists/groups-large.blade.php@@ -225,7 +225,7 @@</tbody><tfoot><tr>- <td colspan="8"> </td>+ <td colspan="7"> </td><td class="d-xs-none text-end"><div class="d-none action-menu"><button class="btn btn-sm btn-outline-secondary dropdown-toggle" type="button" id="bottom_action_menu" data-bs-toggle="dropdown" aria-expanded="false">{{ __('firefly.actions') }} <span class="caret"></span></button>@@ -237,7 +237,7 @@</div></td>- <td> </td>+ <td class="text-end"><input id="list_ALL_bottom" value="1" name="select-all" type="checkbox" class="select-all form-check-inline"/></td></tr><tr>diff --git a/resources/views/components/report/partial/journals-audit.blade.php b/resources/views/components/report/partial/journals-audit.blade.phpindex 48fa0f7057..5be2fc389e 100644--- a/resources/views/components/report/partial/journals-audit.blade.php+++ b/resources/views/components/report/partial/journals-audit.blade.php@@ -40,8 +40,8 @@<td class="hide-buttons"><div class="btn-group btn-group-sm">- <a href="{{ route('transactions.edit',$journal['transaction_group_id']) }}" class="btn btn-xs btn-outline-secondary"><span class="bi bi-pencil"></span></a>- <a href="{{ route('transactions.delete',$journal['transaction_group_id']) }}" class="btn btn-xs btn-danger"><span class="bi bi-trash"></span></a>+ <a href="{{ route('transactions.edit',$journal['transaction_group_id']) }}" class="btn btn-sm btn-outline-secondary"><span class="bi bi-pencil"></span></a>+ <a href="{{ route('transactions.delete',$journal['transaction_group_id']) }}" class="btn btn-sm btn-danger"><span class="bi bi-trash"></span></a></div></td>diff --git a/resources/views/layout/v3/blank.blade.php b/resources/views/layout/v3/blank.blade.phpindex 947c8753c3..a2b68e361f 100644--- a/resources/views/layout/v3/blank.blade.php+++ b/resources/views/layout/v3/blank.blade.php@@ -14,7 +14,7 @@please visit the following page: https://bit.ly/FF3-broken-base-href--><base href="{{ route('index', null, true) }}/">- <title>{{ __('firefly.login_page_title') }}</title>+ <title>@yield('status') - {{ $title ?? 'Firefly III' }}</title><meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes"/><meta name="theme-color" content="#007bff" media="(prefers-color-scheme: light)"/><meta name="theme-color" content="#1a1a1a" media="(prefers-color-scheme: dark)"/>@@ -36,7 +36,7 @@<p class="text-center"><img src="images/logo-session.png" width="68" height="100" alt="Firefly III Logo" title="Firefly III"/><br></p>- <h1><strong>Firefly</strong> III - @yield('status_code') @yield('status') :(</h1>+ <h1><strong>Firefly</strong> III - @yield('status_code') @yield('status')</h1><h2 class="text-danger">@yield('sub_title')</h2>@yield('content')</div>diff --git a/resources/views/profile/index.blade.php b/resources/views/profile/index.blade.phpindex 1af422834a..146a04dec0 100644--- a/resources/views/profile/index.blade.php+++ b/resources/views/profile/index.blade.php@@ -83,7 +83,7 @@<p><input type="hidden" name="_token" value="{{ csrf_token() }}"/>- <button type="submit" class="btn btn-danger btn-xs"><span+ <button type="submit" class="btn btn-danger btn-sm"><spanclass="bi bi-arrow-repeat"></span> {{ __('firefly.regenerate_command_line_token') }}</button></p>diff --git a/resources/views/reports/partials/budget-period.blade.php b/resources/views/reports/partials/budget-period.blade.phpindex 7e63ce6374..5c71163d1a 100644--- a/resources/views/reports/partials/budget-period.blade.php+++ b/resources/views/reports/partials/budget-period.blade.php@@ -14,9 +14,9 @@<tr><td data-value="{{ $info['name'] }}">@if($info['id'] !== 0)- <a class="btn btn-outline-secondary btn-xs" href="{{ route('budgets.show', [$info['id']]) }}"><span class="bi bi-box-arrow-up-right"></span></a>+ <a class="btn btn-outline-secondary btn-sm" href="{{ route('budgets.show', [$info['id']]) }}"><span class="bi bi-box-arrow-up-right"></span></a>@else- <a class="btn btn-outline-secondary btn-xs" href="{{ route('budgets.no-budget') }}"><span class="bi bi-box-arrow-up-right"></span></a>+ <a class="btn btn-outline-secondary btn-sm" href="{{ route('budgets.no-budget') }}"><span class="bi bi-box-arrow-up-right"></span></a>@endif</td><td data-value="{{ $info['name'] }}">diff --git a/resources/views/reports/partials/category-period.blade.php b/resources/views/reports/partials/category-period.blade.phpindex a0cedbe780..7322629f90 100644--- a/resources/views/reports/partials/category-period.blade.php+++ b/resources/views/reports/partials/category-period.blade.php@@ -13,9 +13,9 @@<tr><td data-value="{{ $info['title'] }}">@if($info['id'] !== 0)- <a class="btn btn-outline-secondary btn-xs" href="{{ route('categories.show', [$info['id']]) }}"><span class="bi bi-box-arrow-up-right"></span></a>+ <a class="btn btn-outline-secondary btn-sm" href="{{ route('categories.show', [$info['id']]) }}"><span class="bi bi-box-arrow-up-right"></span></a>@else- <a class="btn btn-outline-secondary btn-xs" href="{{ route('categories.no-category') }}"><span class="bi bi-box-arrow-up-right"></span></a>+ <a class="btn btn-outline-secondary btn-sm" href="{{ route('categories.no-category') }}"><span class="bi bi-box-arrow-up-right"></span></a>@endif</td><td data-value="{{ $info['title'] }}">diff --git a/resources/views/settings/link/index.blade.php b/resources/views/settings/link/index.blade.phpindex a1326e139d..c1d0a2dc0d 100644--- a/resources/views/settings/link/index.blade.php+++ b/resources/views/settings/link/index.blade.php@@ -23,9 +23,9 @@<td>@if($linkType->editable)<div class="btn-group btn-group-sm">- <a class="btn btn-outline-secondary btn-xs" href="{{ route('settings.links.edit',$linkType->id) }}"><span+ <a class="btn btn-outline-secondary btn-sm" href="{{ route('settings.links.edit',$linkType->id) }}"><spanclass="bi bi-pencil"></span></a>- <a class="btn btn-danger btn-xs" href="{{ route('settings.links.delete',$linkType->id) }}"><span+ <a class="btn btn-danger btn-sm" href="{{ route('settings.links.delete',$linkType->id) }}"><spanclass="bi bi-trash"></span></a></div>@endifdiff --git a/resources/views/transactions/mass/edit.blade.php b/resources/views/transactions/mass/edit.blade.phpindex bb283270dc..c3a9d2448a 100644--- a/resources/views/transactions/mass/edit.blade.php+++ b/resources/views/transactions/mass/edit.blade.php@@ -30,13 +30,13 @@<tr><td>{{-- LINK TO EDIT FORM --}}- <a href="{{ route('transactions.edit', $journal['transaction_group_id']) }}" class="btn btn-xs btn-outline-secondary"><span+ <a href="{{ route('transactions.edit', $journal['transaction_group_id']) }}" class="btn btn-sm btn-outline-secondary"><spanclass="bi bi-pencil"></span></a><input type="hidden" name="journals[]" value="{{ $journal['transaction_journal_id'] }}"/></td><td>{{-- DESCRIPTION --}}- <input class="form-control input-sm" autocomplete="off"+ <input class="form-control form-control-sm" autocomplete="off"placeholder="{{ $journal['description'] }}" name="description[{{ $journal['transaction_journal_id'] }}]"type="text" value="{{ $journal['description'] }}"></td>@@ -44,16 +44,14 @@<td>@if(false === $journal['reconciled'])<div class="input-group input-group-sm">- <span class="input-group-addon">{{ $journal['currency_symbol'] }}</span>- <input name="amount[{{ $journal['transaction_journal_id'] }}]" class="form-control" autocomplete="off"- step="any" type="number" value="{{ $journal['amount'] }}">- <input type="hidden" name="transaction_currency_id[{{ $journal['transaction_journal_id'] }}]"- value="{{ $journal['currency_id'] }}">+ <span class="input-group-text" id="basic-addon1">{{ $journal['currency_symbol'] }}</span>+ <input name="amount[{{ $journal['transaction_journal_id'] }}]" class="form-control" autocomplete="off" step="any" type="number" value="{{ $journal['amount'] }}">+ <input type="hidden" name="transaction_currency_id[{{ $journal['transaction_journal_id'] }}]" value="{{ $journal['currency_id'] }}"></div>@if(null !== $journal['foreign_amount']){{-- insert foreign data --}}<div class="input-group input-group-sm">- <span class="input-group-addon">{{ $journal['foreign_currency_symbol'] }}</span>+ <span class="input-group-text">{{ $journal['foreign_currency_symbol'] }}</span><input name="foreign_amount[{{ $journal['transaction_journal_id'] }}]" class="form-control" autocomplete="off"step="any" type="number" value="{{ $journal['foreign_amount'] }}"><input type="hidden" name="foreign_currency_id[{{ $journal['transaction_journal_id'] }}]"@@ -86,7 +84,7 @@</td><td>{{-- DATE --}}- <input class="form-control input-sm" autocomplete="off"+ <input class="form-control form-control-sm" autocomplete="off"name="date[{{ $journal['transaction_journal_id'] }}]" type="datetime-local" value="{{ $journal['date'] }}"></td><!-- {{ $journal['transaction_type_type'] }} -->@@ -99,17 +97,18 @@@if(false === $journal['reconciled']){{-- SOURCE ACCOUNT ID FOR TRANSFER OR WITHDRAWAL --}}@if($journal['transaction_type_type'] == 'Transfer' or $journal['transaction_type_type'] == 'Withdrawal')- <select class="form-control input-sm" name="source_id[{{ $journal['transaction_journal_id'] }}]">+ <select class="form-control form-control-sm" name="source_id[{{ $journal['transaction_journal_id'] }}]">@foreach($withdrawalSources as $account)<option value="{{ $account->id }}" @if($account->id === $journal['source_account_id']) selected @endiflabel="{{ $account->name }}">{{ $account->name }}</option>@endforeach</select>+@endif{{-- SOURCE ACCOUNT NAME FOR DEPOSIT --}}@if($journal['transaction_type_type'] == 'Deposit')- <input class="form-control input-sm" spellcheck="false"+ <input class="form-control form-control-sm" spellcheck="false"placeholder="@if($journal['source_account_type'] !== 'Cash account'){{ $journal['source_account_name'] }}@endif"autocomplete="off"name="source_name[{{ $journal['transaction_journal_id'] }}]" type="text"@@ -124,7 +123,7 @@@if(false === $journal['reconciled']){{-- DESTINATION ACCOUNT NAME FOR TRANSFER AND DEPOSIT --}}@if($journal['transaction_type_type'] == 'Transfer' || $journal['transaction_type_type'] == 'Deposit')- <select class="form-control input-sm" name="destination_id[{{ $journal['transaction_journal_id'] }}]">+ <select class="form-control form-control-sm" name="destination_id[{{ $journal['transaction_journal_id'] }}]">@foreach($depositDestinations as $account)<option value="{{ $account->id }}" @if($account->id === $journal['destination_account_id']) selected="selected" @endiflabel="{{ $account->name }}">{{ $account->name }}</option>@@ -134,22 +133,22 @@{{-- DESTINATION ACCOUNT NAME FOR WITHDRAWAL --}}@if($journal['transaction_type_type'] === 'Withdrawal')- <input class="form-control input-sm" spellcheck="false"- placeholder="@if(array_key_exists('destination_type', $journal) && $journal['destination_type'] !== 'Cash account'){{ $journal['destination_account_name'] }}@endif"+ <input class="form-control form-control-sm" spellcheck="false"+ placeholder="@if(array_key_exists('destination_account_type', $journal) && $journal['destination_account_type'] !== 'Cash account'){{ $journal['destination_account_name'] }}@endif"name="destination_name[{{ $journal['transaction_journal_id'] }}]" type="text" autocomplete="off"- value="@if(array_key_exists('destination_type', $journal) && $journal['destination_type'] !== 'Cash account'){{ $journal['destination_account_name'] }}@endif">+ value="@if(array_key_exists('destination_account_type', $journal) && $journal['destination_account_type'] !== 'Cash account') {{ $journal['destination_account_name'] }}@endif">@endif@endif</td>{{-- category --}}<td class="position-relative">- <input class="form-control input-sm" placeholder="{{ $journal['category_name'] }}" autocomplete="off" spellcheck="false"+ <input class="form-control form-control-sm" placeholder="{{ $journal['category_name'] }}" autocomplete="off" spellcheck="false"name="category[{{ $journal['transaction_journal_id'] }}]" type="text" value="{{ $journal['category_name'] }}"></td>{{-- budget --}}<td>@if($journal['transaction_type_type'] === 'Withdrawal')- <select class="form-control input-sm" name="budget_id[{{ $journal['transaction_journal_id'] }}]">+ <select class="form-control form-control-sm" name="budget_id[{{ $journal['transaction_journal_id'] }}]"><option value="0" label="({{ __('firefly.no_budget') }})"@if($journal['budget_id'] === 0) selected="selected" @endif>{{ __('firefly.no_budget') }}</option>@foreach($budgets as $budget)