Firefly III: a personal finances manager
PHP accountingbudgetbudgetingbudgetscash-flowcashflowcredit-carddockerexpensesfinancefinancesfinanciallinuxmoneypaycheckpersonal-financephpphp7
update views
Sander Dorigoe75602aef490
diff --git a/resources/views/accounts/reconcile/unused-show.blade.php b/resources/views/accounts/reconcile/unused-show.blade.phpindex a2ee3d4ace..a23a55734f 100644--- a/resources/views/accounts/reconcile/unused-show.blade.php+++ b/resources/views/accounts/reconcile/unused-show.blade.php@@ -6,7 +6,7 @@<div class="card-header"><h3 class="card-title">{{ __('firefly.transaction_journal_information') }}</h3>- <div class="box-tools pull-right">+ <div class="box-tools text-end"><div class="btn-group"><button id="transaction_menu" class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><span class="bi bi-list"></span></button>@@ -45,7 +45,7 @@</table></div><div class="card-footer">- <div class="pull-right">+ <div class="text-end"><div class="btn-group"><a class="btn btn-outline-secondary" href="{{ route('transactions.edit',[$journal->id]) }}"><span class="bi bi-pencil"></span> {{ __('firefly.edit') }}</a><a href="{{ route('transactions.delete',[$journal->id]) }}" class="btn btn-danger"><span class="bi bi-trash"></span> {{ __('firefly.delete') }}diff --git a/resources/views/attachments/delete.twig b/resources/views/attachments/delete.blade.phpsimilarity index 63%rename from resources/views/attachments/delete.twigrename to resources/views/attachments/delete.blade.phpindex acd4e20689..360d98ec5a 100644--- a/resources/views/attachments/delete.twig+++ b/resources/views/attachments/delete.blade.php@@ -1,18 +1,12 @@@extends('layout.v3.session')--{% block breadcrumbs %}- {{ Breadcrumbs.render(Route.getCurrentRoute().getName(), attachment) }}-@endsection-@section('content')-- <form method="POST" action="{{ route('attachments.destroy',attachment.id) }}" accept-charset="UTF-8" class="form-horizontal" id="destroy">+ <form method="POST" action="{{ route('attachments.destroy', $attachment->id) }}" accept-charset="UTF-8" class="form-horizontal" id="destroy"><input name="_token" type="hidden" value="{{ csrf_token() }}"><div class="row">- <div class="col-lg-6 col-lg-offset-3 col-md-12 col-sm-12">- <div class="box box-danger">+ <div class="col-lg-6 offset-lg-3 col-md-12 col-sm-12">+ <div class="card card-outline card-danger"><div class="card-header">- <h3 class="card-title">{{ trans('form.delete_attachment', {'name': attachment.filename}) }}</h3>+ <h3 class="card-title">{{ trans('form.delete_attachment', ['name' => $attachment->filename]) }}</h3></div><div class="card-body"><p class="text-danger">@@ -20,11 +14,11 @@</p><p>- {{ trans('form.attachment_areYouSure', {'name': attachment.filename}) }}+ {{ trans('form.attachment_areYouSure', ['name' => $attachment->filename]) }}</p></div><div class="card-footer">- <input type="submit" name="submit" value="{{ trans('form.deletePermanently') }}" class="btn pull-right btn-danger"/>+ <input type="submit" name="submit" value="{{ trans('form.deletePermanently') }}" class="btn text-end btn-danger"/><a href="{{ URL::previous() }}" class="btn-outline-secondary btn">{{ trans('form.cancel') }}</a></div></div>diff --git a/resources/views/attachments/edit.twig b/resources/views/attachments/edit.blade.phpsimilarity index 59%rename from resources/views/attachments/edit.twigrename to resources/views/attachments/edit.blade.phpindex 280fafa617..df54ffcd14 100644--- a/resources/views/attachments/edit.twig+++ b/resources/views/attachments/edit.blade.php@@ -1,15 +1,10 @@@extends('layout.v3.session')--{% block breadcrumbs %}- {{ Breadcrumbs.render(Route.getCurrentRoute().getName(), attachment) }}-@endsection-@section('content')- <form method="POST" action="{{ route('attachments.update', attachment.id) }}" accept-charset="UTF-8"+ <form method="POST" action="{{ route('attachments.update', $attachment->id) }}" accept-charset="UTF-8"class="form-horizontal" id="update"><input type="hidden" name="_token" value="{{ csrf_token() }}"/>- <input type="hidden" name="id" value="{{ attachment.id }}"/>+ <input type="hidden" name="id" value="{{ $attachment->id }}"/><div class="row">@@ -19,9 +14,9 @@<h3 class="card-title">{{ __('firefly.mandatoryFields') }}</h3></div><div class="card-body">- {{ ExpandedForm::staticText('filename',attachment.filename|escape) }}- {{ ExpandedForm::staticText('mime',attachment.mime|escape) }}- {{ ExpandedForm::staticText('size',attachment.size|filesize) }}+ {!! ExpandedForm::staticText('filename',$attachment->filename) !!}+ {!! ExpandedForm::staticText('mime',$attachment->mime) !!}+ {!! ExpandedForm::staticText('size',$attachment->size) !!}</div></div>@@ -32,8 +27,8 @@<h3 class="card-title">{{ __('firefly.optionalFields') }}</h3></div><div class="card-body">- {{ ExpandedForm::text('title', attachment.title) }}- {{ ExpandedForm::textarea('notes',null,{helpText: trans('firefly.field_supports_markdown')}) }}+ {!! ExpandedForm::text('title', $attachment->title) !!}+ {!! ExpandedForm::textarea('notes',null,['helpText' => trans('firefly.field_supports_markdown')]) !!}</div></div></div>@@ -47,11 +42,11 @@<h3 class="card-title">{{ __('firefly.options') }}</h3></div><div class="card-body">- {{ ExpandedForm::optionsList('update','attachment') }}+ {!! ExpandedForm::optionsList('update','attachment') !!}</div>- <div class="card-footer">- <button type="submit" class="btn pull-right btn-success">- {{ 'update_attachment'|_ }}+ <div class="card-footer text-end">+ <button type="submit" class="btn btn-success">+ {{ __('firefly.update_attachment') }}</button></div></div>diff --git a/resources/views/attachments/index.twig b/resources/views/attachments/index.blade.phpsimilarity index 64%rename from resources/views/attachments/index.twigrename to resources/views/attachments/index.blade.phpindex 649121ec6d..e98e7c0c05 100644--- a/resources/views/attachments/index.twig+++ b/resources/views/attachments/index.blade.php@@ -1,16 +1,11 @@@extends('layout.v3.session')--{% block breadcrumbs %}- {{ Breadcrumbs.render(Route.getCurrentRoute.getName) }}-@endsection-@section('content')<div class="row"><div class="col-lg-12 col-md-12 col-sm-12"><div class="card"><div class="card-header"><h3 class="card-title">- {{ 'list_all_attachments'|_ }}+ {{ __('firefly.list_all_attachments') }}</h3></div><div class="card-body p-0">@@ -26,33 +21,33 @@</tr></thead><tbody>- {% for att in set %}+ @foreach($set as $att)<tr>- <td data-value="{{ att.id }}">+ <td data-value="{{ $att->id }}"><div class="btn-group btn-group-sm">- <a href="{{ route('attachments.edit', att.id) }}" class="btn btn-outline-secondary"><span class="bi bi-pencil"></span></a>- <a href="{{ route('attachments.delete', att.id) }}" class="btn btn-danger"><span class="bi bi-trash"></span></a>- <a href="{{ route('attachments.download', att.id) }}" class="btn btn-outline-secondary"><span class="bi bi-download"></span></a>+ <a href="{{ route('attachments.edit', $att->id) }}" class="btn btn-outline-secondary"><span class="bi bi-pencil"></span></a>+ <a href="{{ route('attachments.delete', $att->id) }}" class="btn btn-outline-danger"><span class="bi bi-trash"></span></a>+ <a href="{{ route('attachments.download', $att->id) }}" class="btn btn-outline-secondary"><span class="bi bi-download"></span></a></div></td>- <td data-value="{{ att.filename }}">- <a href="{{ route('attachments.view', att.id) }}" title="{{ att.filename }}">- {{ att.filename }}+ <td data-value="{{ $att->filename }}">+ <a href="{{ route('attachments.view', $att->id) }}" title="{{ $att->filename }}">+ {{ $att->filename }}</a></td>- <td data-value="{{ att.size }}">{{ att.size|filesize }}</td>- <td data-value="{{ att.mime }}">{{ att.mime }}</td>- <td data-value="{{ att.attachable_type }}_{{ att.attachable_id }}">- {% if att.attachable_type == 'FireflyIII\\Models\\TransactionJournal' %}- <a href="{{ route('transactions.show', [att.attachable_id]) }}">- {{ att.attachable.description }}+ <td data-value="{{ $att->size }}">{{ print_nice_filesize($att->size) }}</td>+ <td data-value="{{ $att->mime }}">{{ $att->mime }}</td>+ <td data-value="{{ $att->attachable_type }}_{{ $att->attachable_id }}">+ @if($att->attachable_type === 'FireflyIII\\Models\\TransactionJournal')+ <a href="{{ route('transactions.show', [$att->attachable_id]) }}">+ {{ $att->attachable->description }}</a>@else- {{ att.attachable_type }}+ {{ $att->attachable_type }}@endif</td>- <td data-value="{% if att.file_exists %}1@else0@endif">- {% if att.file_exists %}+ <td data-value=" @if($att->file_exists)1 @else 0 @endif ">+ @if($att->file_exists)<span class="bi bi-check text-success"></span>@else<span class="bi bi-exclamation-triangle text-danger"></span>diff --git a/resources/views/bills/create.twig b/resources/views/bills/create.twigindex ff3400599c..453f263360 100644--- a/resources/views/bills/create.twig+++ b/resources/views/bills/create.twig@@ -55,7 +55,7 @@{{ ExpandedForm::optionsList('create','bill') }}</div><div class="card-footer">- <button type="submit" class="btn pull-right btn-success">+ <button type="submit" class="btn text-end btn-success">{{ 'store_new_bill'|_ }}</button></div>diff --git a/resources/views/bills/delete.twig b/resources/views/bills/delete.twigindex ce8c8026fa..1e02a298e0 100644--- a/resources/views/bills/delete.twig+++ b/resources/views/bills/delete.twig@@ -9,7 +9,7 @@<form method="POST" action="{{ route('subscriptions.destroy',bill.id) }}" accept-charset="UTF-8" class="form-horizontal" id="destroy"><input name="_token" type="hidden" value="{{ csrf_token() }}"><div class="row">- <div class="col-lg-6 col-lg-offset-3 col-md-12 col-sm-12">+ <div class="col-lg-6 offset-lg-3 col-md-12 col-sm-12"><div class="box box-danger"><div class="card-header"><h3 class="card-title">{{ trans('form.delete_bill', {'name': bill.name}) }}</h3>@@ -30,7 +30,7 @@</p></div><div class="card-footer">- <input type="submit" name="submit" value="{{ trans('form.deletePermanently') }}" class="btn btn-danger pull-right"/>+ <input type="submit" name="submit" value="{{ trans('form.deletePermanently') }}" class="btn btn-danger text-end"/><a href="{{ URL::previous() }}" class="btn-outline-secondary btn">{{ trans('form.cancel') }}</a></div></div>diff --git a/resources/views/bills/edit.twig b/resources/views/bills/edit.twigindex 09130c80e1..40f7cdbe0b 100644--- a/resources/views/bills/edit.twig+++ b/resources/views/bills/edit.twig@@ -63,7 +63,7 @@{{ ExpandedForm::optionsList('update','bill') }}</div><div class="card-footer">- <button type="submit" class="btn pull-right btn-success">+ <button type="submit" class="btn text-end btn-success">{{ 'update_bill'|_ }}</button></div>diff --git a/resources/views/bills/show.twig b/resources/views/bills/show.twigindex 1859ddc476..6239df1425 100644--- a/resources/views/bills/show.twig+++ b/resources/views/bills/show.twig@@ -12,7 +12,7 @@<div class="card-header"><h3 class="card-title">{{ object.data.name }}</h3>- <div class="box-tools pull-right">+ <div class="box-tools text-end"><div class="btn-group"><button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><span class="bi bi-list"></span></button><ul class="dropdown-menu" role="menu">diff --git a/resources/views/budgets/create.twig b/resources/views/budgets/create.twigindex 8372e79ac0..2d1cf9bdea 100644--- a/resources/views/budgets/create.twig+++ b/resources/views/budgets/create.twig@@ -48,7 +48,7 @@{{ ExpandedForm::optionsList('create','budget') }}</div><div class="card-footer">- <button type="submit" class="btn pull-right btn-success">{{ 'store_new_budget'|_ }}</button>+ <button type="submit" class="btn text-end btn-success">{{ 'store_new_budget'|_ }}</button></div></div>diff --git a/resources/views/budgets/delete.twig b/resources/views/budgets/delete.twigindex a9ba8864c5..736c0b0d44 100644--- a/resources/views/budgets/delete.twig+++ b/resources/views/budgets/delete.twig@@ -10,7 +10,7 @@<input name="_token" type="hidden" value="{{ csrf_token() }}"><div class="row">- <div class="col-lg-6 col-lg-offset-3 col-md-12 col-sm-12">+ <div class="col-lg-6 offset-lg-3 col-md-12 col-sm-12"><div class="box box-danger"><div class="card-header"><h3 class="card-title">{{ trans('form.delete_budget', {'name': budget.name}) }}</h3>@@ -32,7 +32,7 @@</div><div class="card-footer">- <input type="submit" name="submit" value="{{ trans('form.deletePermanently') }}" class="btn btn-danger pull-right"/>+ <input type="submit" name="submit" value="{{ trans('form.deletePermanently') }}" class="btn btn-danger text-end"/><a href="{{ URL::previous() }}" class="btn-outline-secondary btn">{{ trans('form.cancel') }}</a></div>diff --git a/resources/views/budgets/edit.twig b/resources/views/budgets/edit.twigindex 25026ad6cb..1512970bd9 100644--- a/resources/views/budgets/edit.twig+++ b/resources/views/budgets/edit.twig@@ -51,7 +51,7 @@{{ ExpandedForm::optionsList('update','budget') }}</div><div class="card-footer">- <button type="submit" class="btn pull-right btn-success">{{ 'update_budget'|_ }}</button>+ <button type="submit" class="btn text-end btn-success">{{ 'update_budget'|_ }}</button></div></div></div>diff --git a/resources/views/budgets/index.blade.php b/resources/views/budgets/index.blade.phpindex 5a53726c96..5b60433896 100644--- a/resources/views/budgets/index.blade.php+++ b/resources/views/budgets/index.blade.php@@ -403,7 +403,7 @@<h3 class="card-title">{{ __('firefly.createBudget') }}</h3></div><div class="card-body">- <a href="{{ route('budgets.create') }}" class="btn btn-success pull-right">{{ __('firefly.createBudget') }}</a>+ <a href="{{ route('budgets.create') }}" class="btn btn-success text-end">{{ __('firefly.createBudget') }}</a></div></div></div>diff --git a/resources/views/budgets/show.twig b/resources/views/budgets/show.twigindex 039cc53b4d..562911440d 100644--- a/resources/views/budgets/show.twig+++ b/resources/views/budgets/show.twig@@ -16,7 +16,7 @@{{ trans('firefly.chart_all_journals_for_budget', {name:budget.name}) }}@endif</h3>- <div class="box-tools pull-right">+ <div class="box-tools text-end"><div class="btn-group"><button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><span class="bi bi-list"></span></button><ul class="dropdown-menu" role="menu">diff --git a/resources/views/categories/create.twig b/resources/views/categories/create.twigindex bd5187460d..e74d159527 100644--- a/resources/views/categories/create.twig+++ b/resources/views/categories/create.twig@@ -43,7 +43,7 @@{{ ExpandedForm::optionsList('create','category') }}</div><div class="card-footer">- <button type="submit" class="btn pull-right btn-success">+ <button type="submit" class="btn text-end btn-success">{{ 'store_category'|_ }}</button></div>diff --git a/resources/views/categories/delete.twig b/resources/views/categories/delete.twigindex 13b4979253..93e0a83deb 100644--- a/resources/views/categories/delete.twig+++ b/resources/views/categories/delete.twig@@ -9,7 +9,7 @@<form method="POST" action="{{ route('categories.destroy',category.id) }}" accept-charset="UTF-8" class="form-horizontal" id="destroy"><input name="_token" type="hidden" value="{{ csrf_token() }}"><div class="row">- <div class="col-lg-6 col-lg-offset-3 col-md-12 col-sm-12">+ <div class="col-lg-6 offset-lg-3 col-md-12 col-sm-12"><div class="box box-danger"><div class="card-header"><h3 class="card-title">{{ trans('form.delete_category', {'name': category.name}) }}</h3>@@ -30,7 +30,7 @@</p></div><div class="card-footer">- <input type="submit" name="submit" value="{{ trans('form.deletePermanently') }}" class="btn btn-danger pull-right"/>+ <input type="submit" name="submit" value="{{ trans('form.deletePermanently') }}" class="btn btn-danger text-end"/><a href="{{ URL::previous() }}" class="btn-outline-secondary btn">{{ trans('form.cancel') }}</a></div></div>diff --git a/resources/views/categories/edit.twig b/resources/views/categories/edit.twigindex c31500883d..9e46f6d4b5 100644--- a/resources/views/categories/edit.twig+++ b/resources/views/categories/edit.twig@@ -49,7 +49,7 @@{{ ExpandedForm::optionsList('update','category') }}</div><div class="card-footer">- <button type="submit" class="btn pull-right btn-success">+ <button type="submit" class="btn text-end btn-success">{{ 'update_category'|_ }}</button></div>diff --git a/resources/views/components/generic/amount.blade.php b/resources/views/components/generic/amount.blade.phpindex 01234b9d2a..fd21a47e2a 100644--- a/resources/views/components/generic/amount.blade.php+++ b/resources/views/components/generic/amount.blade.php@@ -99,7 +99,7 @@{{---<span class="pull-right small">+<span class="text-end small">{% elseif transaction.transaction_type_type == 'Reconciliation' %}diff --git a/resources/views/currencies/create.twig b/resources/views/currencies/create.twigindex a15b731525..8d3f0b9b23 100644--- a/resources/views/currencies/create.twig+++ b/resources/views/currencies/create.twig@@ -35,7 +35,7 @@{{ ExpandedForm::optionsList('create','currency') }}</div><div class="card-footer">- <button type="submit" class="btn pull-right btn-success">+ <button type="submit" class="btn text-end btn-success">{{ 'store_currency'|_ }}</button></div>diff --git a/resources/views/currencies/delete.twig b/resources/views/currencies/delete.twigindex 13addcd52e..8affef2a1b 100644--- a/resources/views/currencies/delete.twig+++ b/resources/views/currencies/delete.twig@@ -9,7 +9,7 @@<form method="POST" action="{{ route('currencies.destroy',currency.id) }}" accept-charset="UTF-8" class="form-horizontal" id="destroy"><input name="_token" type="hidden" value="{{ csrf_token() }}"><div class="row">- <div class="col-lg-6 col-lg-offset-3 col-md-12 col-sm-12">+ <div class="col-lg-6 offset-lg-3 col-md-12 col-sm-12"><div class="box box-danger"><div class="card-header"><h3 class="card-title">{{ trans('form.delete_currency', {'name': currency.name}) }}</h3>@@ -24,7 +24,7 @@</p></div><div class="card-footer">- <input type="submit" name="submit" value="{{ trans('form.deletePermanently') }}" class="btn btn-danger pull-right"/>+ <input type="submit" name="submit" value="{{ trans('form.deletePermanently') }}" class="btn btn-danger text-end"/><a href="{{ URL::previous }}" class="btn-outline-secondary btn">{{ trans('form.cancel') }}</a></div></div>diff --git a/resources/views/currencies/edit.twig b/resources/views/currencies/edit.twigindex 0f7e7e6285..27d1048f81 100644--- a/resources/views/currencies/edit.twig+++ b/resources/views/currencies/edit.twig@@ -39,7 +39,7 @@{{ ExpandedForm::optionsList('update','currency') }}</div><div class="card-footer">- <button type="submit" class="btn btn-success pull-right">+ <button type="submit" class="btn btn-success text-end">{{ 'update_currency'|_ }}</button></div>diff --git a/resources/views/form/static.blade.php b/resources/views/form/static.blade.phpnew file mode 100644index 0000000000..b781be4ce1--- /dev/null+++ b/resources/views/form/static.blade.php@@ -0,0 +1,9 @@+<div class="row mb-3" id="{{ $name }}_holder">+ <div class="input-group">+ <label for="{{ $options['id'] }}" class="col-sm-3 col-form-label has-validation">{{ $label }}</label>++ <div class="col-sm-9">+ <input type="text" readonly class="form-control-plaintext" id="{{ $options['id'] }}" value="{{ $value }}">+ </div>+</div>+</div>diff --git a/resources/views/form/static.twig b/resources/views/form/static.twigdeleted file mode 100644index 7600723086..0000000000--- a/resources/views/form/static.twig+++ /dev/null@@ -1,7 +0,0 @@-<div class="{{ classes }}" id="{{ name }}_holder">- <label for="{{ options.id }}" class="col-sm-4 control-label">{{ label }}</label>-- <div class="col-sm-8">- <p class="form-control-static" id="{{ options.id }}">{{ value|raw }}</p>- </div>-</div>diff --git a/resources/views/layout/default.twig b/resources/views/layout/default.twigindex 3c1f71e6f4..73d2991ef4 100644--- a/resources/views/layout/default.twig+++ b/resources/views/layout/default.twig@@ -192,7 +192,7 @@</section></div><footer class="main-footer">- <div class="pull-right">+ <div class="text-end"><b class="hidden-xs">{{ 'version'|_ }}</b> <ahref="{{ route('debug') }}">{{ Config.get('firefly.version') }}</a></div>diff --git a/resources/views/list/accounts.twig b/resources/views/list/accounts.twigindex d9081a3d6b..a281e65528 100644--- a/resources/views/list/accounts.twig+++ b/resources/views/list/accounts.twig@@ -133,7 +133,7 @@</span></td><td class="hidden-sm hidden-xs">- <div class="btn-group btn-group-sm pull-right">+ <div class="btn-group btn-group-sm text-end"><button type="button" class="btn btn-outline-secondary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">{{ __('firefly.actions') }} <span class="caret"></span></button><ul class="dropdown-menu dropdown-menu-right" role="menu">diff --git a/resources/views/list/groups-tiny.twig b/resources/views/list/groups-tiny.twigindex dfc867f605..600367e1a4 100644--- a/resources/views/list/groups-tiny.twig+++ b/resources/views/list/groups-tiny.twig@@ -6,7 +6,7 @@@endif{{ transaction.description }}- <span class="pull-right small">+ <span class="text-end small">{% if transaction.transaction_type_type == 'Deposit' %}{{ format_amount_by_symbol(transaction.amount*-1, transaction.currency_symbol, transaction.currency_decimal_places) }}{% if null != transaction.foreign_amount %}diff --git a/resources/views/list/groups.twig b/resources/views/list/groups.twigindex 34f0168456..fa3302fd18 100644--- a/resources/views/list/groups.twig+++ b/resources/views/list/groups.twig@@ -8,7 +8,7 @@@endif<td colspan="1" class="hidden-xs"><!-- Single button -->- <div class="btn-group btn-group-sm action-menu pull-right hidden">+ <div class="btn-group btn-group-sm action-menu text-end hidden"><button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown"aria-haspopup="true" aria-expanded="false">{{ __('firefly.actions') }}<span class="caret"></span>@@ -24,7 +24,7 @@</div></td><td colspan="1" class="hidden-xs">- <div class="pull-right">+ <div class="text-end"><input id="list_ALL" value="1" name="select-all" type="checkbox" class="select-all form-check-inline"/></div></td>@@ -92,7 +92,7 @@<td class="top-light-border" colspan="2"> </td>@endif<td class="top-light-border hidden-xs" colspan="2">- <div class="btn-group btn-group-sm pull-right">+ <div class="btn-group btn-group-sm text-end"><button type="button" class="btn btn-outline-secondary dropdown-toggle" data-toggle="dropdown"aria-haspopup="true" aria-expanded="false">{{ __('firefly.actions') }} <span class="caret"></span></button>@@ -381,7 +381,7 @@{% if group.count == 1 %}<td class="hidden-xs {{ className }}">- <div class="btn-group btn-group-sm pull-right">+ <div class="btn-group btn-group-sm text-end"><button type="button" class="btn btn-outline-secondary dropdown-toggle" data-toggle="dropdown"aria-haspopup="true" aria-expanded="false">{{ __('firefly.actions') }} <span class="caret"></span></button>@@ -414,7 +414,7 @@@endif<td class="hidden-xs {{ className }}">{% if transaction.transaction_type_type != 'Reconciliation' and transaction.transaction_type_type != 'Opening balance' and transaction.transaction_type_type != 'Liability credit' %}- <div class="pull-right">+ <div class="text-end"><input id="list_{{ transaction.transaction_journal_id }}"value="{{ transaction.transaction_journal_id }}"name="journals[{{ transaction.transaction_journal_id }}]"@@ -430,9 +430,9 @@<tfoot><tr><td colspan="8">- <div class="pull-right">+ <div class="text-end"><!-- Single button -->- <div class="btn-group action-menu btn-group-sm pull-right hidden">+ <div class="btn-group action-menu btn-group-sm text-end hidden"><button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown"aria-haspopup="true" aria-expanded="false">{{ __('firefly.actions') }} <span class="caret"></span>diff --git a/resources/views/list/journals-array-tiny.twig b/resources/views/list/journals-array-tiny.twigindex b15eb88b9f..035e72d210 100644--- a/resources/views/list/journals-array-tiny.twig+++ b/resources/views/list/journals-array-tiny.twig@@ -3,7 +3,7 @@{% for transaction in group.transactions %}<a class="list-group-item" href="{{ route('transactions.show', [transaction.transaction_group_id]) }}">{{ transaction.description }}- <span class="pull-right small">+ <span class="text-end small">X</span></a>diff --git a/resources/views/new-user/index.twig b/resources/views/new-user/index.twigindex c2244855dd..f0f83b2682 100644--- a/resources/views/new-user/index.twig+++ b/resources/views/new-user/index.twig@@ -10,7 +10,7 @@<input type="hidden" name="_token" value="{{ csrf_token() }}"/><div class="row">- <div class="col-lg-6 col-lg-offset-3 col-md-12 col-xs-12">+ <div class="col-lg-6 offset-lg-3 col-md-12 col-xs-12"><div class="card"><div class="card-header">@@ -62,7 +62,7 @@</div><div class="card-footer">- <input type="submit" name="submit" value="{{ 'submit'|_ }}" class="btn btn-success pull-right"/>+ <input type="submit" name="submit" value="{{ 'submit'|_ }}" class="btn btn-success text-end"/></div></div></div>diff --git a/resources/views/object-groups/delete.twig b/resources/views/object-groups/delete.twigindex 528c913241..ea061c4054 100644--- a/resources/views/object-groups/delete.twig+++ b/resources/views/object-groups/delete.twig@@ -9,7 +9,7 @@<form method="POST" action="{{ route('object-groups.destroy',objectGroup.id) }}" accept-charset="UTF-8" class="form-horizontal"><input name="_token" type="hidden" value="{{ csrf_token() }}"><div class="row">- <div class="col-lg-6 col-lg-offset-3 col-md-12 col-sm-12">+ <div class="col-lg-6 offset-lg-3 col-md-12 col-sm-12"><div class="box box-danger"><div class="card-header"><h3 class="card-title">{{ trans('form.delete_object_group', {'title': objectGroup.title}) }}</h3>@@ -31,7 +31,7 @@</div><div class="card-footer">- <input type="submit" name="submit" value="{{ trans('form.deletePermanently') }}" class="btn pull-right btn-danger"/>+ <input type="submit" name="submit" value="{{ trans('form.deletePermanently') }}" class="btn text-end btn-danger"/><a href="{{ URL::previous() }}" class="btn-outline-secondary btn">{{ trans('form.cancel') }}</a></div></div>diff --git a/resources/views/object-groups/edit.twig b/resources/views/object-groups/edit.twigindex abf0479ce0..e141d38cc9 100644--- a/resources/views/object-groups/edit.twig+++ b/resources/views/object-groups/edit.twig@@ -36,7 +36,7 @@{{ ExpandedForm::optionsList('update','object group') }}</div><div class="card-footer">- <button type="submit" class="btn btn-success pull-right">+ <button type="submit" class="btn btn-success text-end">{{ 'update_object_group'|_ }}</button></div>diff --git a/resources/views/partials/empty.twig b/resources/views/partials/empty.twigindex 885f8a06b7..46085afe46 100644--- a/resources/views/partials/empty.twig+++ b/resources/views/partials/empty.twig@@ -1,5 +1,5 @@<div class="row">- <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12 col-lg-offset-3 col-md-offset-3">+ <div class="col-lg-6 col-md-6 col-sm-12 col-xs-12 offset-lg-3 col-md-offset-3"><div class="box box-success"><div class="card-header"><h3 class="card-title">{{ ('no_'~type~'_title_'~objectType)|_ }}</h3>diff --git a/resources/views/partials/menu-sidebar.twig b/resources/views/partials/menu-sidebar.twigindex 2603ac5b25..25f5f8e57e 100644--- a/resources/views/partials/menu-sidebar.twig+++ b/resources/views/partials/menu-sidebar.twig@@ -42,8 +42,8 @@<a href="#"><em class="bi bi-arrow-left-right"></em><span>{{ __('firefly.transactions') }}</span>- <span class="pull-right-container">- <span class="fa fa-angle-left pull-right"></span>+ <span class="text-end-container">+ <span class="fa fa-angle-left text-end"></span></span></a>@@ -73,8 +73,8 @@<a href="#"><em class="fa fa-microchip"></em><span>{{ 'automation'|_ }}</span>- <span class="pull-right-container">- <span class="fa fa-angle-left pull-right"></span>+ <span class="text-end-container">+ <span class="fa fa-angle-left text-end"></span></span></a>@@ -115,8 +115,8 @@<a href="#"><em class="fa fa-credit-card"></em><span>{{ 'accounts'|_ }}</span>- <span class="pull-right-container">- <span class="fa fa-angle-left pull-right"></span>+ <span class="text-end-container">+ <span class="fa fa-angle-left text-end"></span></span></a>@@ -152,8 +152,8 @@<a href="#"><em class="bi bi-tags"></em><span>{{ 'classification'|_ }}</span>- <span class="pull-right-container">- <span class="fa fa-angle-left pull-right"></span>+ <span class="text-end-container">+ <span class="fa fa-angle-left text-end"></span></span></a>@@ -201,8 +201,8 @@<a href="#"><em class="fa fa-sliders"></em><span>{{ __('firefly.options') }}</span>- <span class="pull-right-container">- <span class="fa fa-angle-left pull-right"></span>+ <span class="text-end-container">+ <span class="fa fa-angle-left text-end"></span></span></a>diff --git a/resources/views/piggy-banks/add-mobile.twig b/resources/views/piggy-banks/add-mobile.twigindex d74b26b1bf..4026078ad0 100644--- a/resources/views/piggy-banks/add-mobile.twig+++ b/resources/views/piggy-banks/add-mobile.twig@@ -27,7 +27,7 @@<p> </p>- <button type="submit" class="btn btn-success pull-right">+ <button type="submit" class="btn btn-success text-end">{{ 'add'|_ }}</button>@elsediff --git a/resources/views/piggy-banks/create.twig b/resources/views/piggy-banks/create.twigindex 5fbe32fc01..10a684d68d 100644--- a/resources/views/piggy-banks/create.twig+++ b/resources/views/piggy-banks/create.twig@@ -48,7 +48,7 @@{{ ExpandedForm::optionsList('create','piggy bank') }}</div><div class="card-footer">- <button type="submit" class="btn btn-success pull-right">+ <button type="submit" class="btn btn-success text-end">{{ 'store_piggy_bank'|_ }}</button></div>diff --git a/resources/views/piggy-banks/delete.twig b/resources/views/piggy-banks/delete.twigindex d5537f8ba2..d58b8b4581 100644--- a/resources/views/piggy-banks/delete.twig+++ b/resources/views/piggy-banks/delete.twig@@ -9,7 +9,7 @@<form method="POST" action="{{ route('piggy-banks.destroy',piggyBank.id) }}" accept-charset="UTF-8" class="form-horizontal" id="destroy"><input name="_token" type="hidden" value="{{ csrf_token() }}"><div class="row">- <div class="col-lg-6 col-lg-offset-3 col-md-12 col-sm-12">+ <div class="col-lg-6 offset-lg-3 col-md-12 col-sm-12"><div class="box box-danger"><div class="card-header"><h3 class="card-title">{{ trans('firefly.delete_piggy_bank', {'name': piggyBank.name}) }}</h3>@@ -24,7 +24,7 @@</p></div><div class="card-footer">- <input type="submit" name="submit" value="{{ trans('form.deletePermanently') }}" class="btn btn-danger pull-right"/>+ <input type="submit" name="submit" value="{{ trans('form.deletePermanently') }}" class="btn btn-danger text-end"/><a href="{{ URL::previous() }}" class="btn-outline-secondary btn">{{ trans('form.cancel') }}</a></div></div>diff --git a/resources/views/piggy-banks/edit.twig b/resources/views/piggy-banks/edit.twigindex 86af3a387d..b43d6494d3 100644--- a/resources/views/piggy-banks/edit.twig+++ b/resources/views/piggy-banks/edit.twig@@ -56,7 +56,7 @@{{ ExpandedForm::optionsList('update','piggy bank') }}</div><div class="card-footer">- <button type="submit" class="btn btn-success pull-right">+ <button type="submit" class="btn btn-success text-end">{{ 'update_piggy_button'|_ }}</button></div>diff --git a/resources/views/piggy-banks/remove-mobile.twig b/resources/views/piggy-banks/remove-mobile.twigindex de824c035d..be6200eb71 100644--- a/resources/views/piggy-banks/remove-mobile.twig+++ b/resources/views/piggy-banks/remove-mobile.twig@@ -28,7 +28,7 @@<p> </p>- <button type="submit" class="btn btn-success pull-right">+ <button type="submit" class="btn btn-success text-end">{{ 'remove'|_ }}</button>diff --git a/resources/views/piggy-banks/show.twig b/resources/views/piggy-banks/show.twigindex 9f7eaefa54..0691ceceae 100644--- a/resources/views/piggy-banks/show.twig+++ b/resources/views/piggy-banks/show.twig@@ -20,7 +20,7 @@<div class="card"><div class="card-header"><h3 class="card-title">{{ 'details'|_ }}</h3>- <div class="box-tools pull-right">+ <div class="box-tools text-end"><div class="btn-group"><button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><span class="bi bi-list"></span></button><ul class="dropdown-menu" role="menu">diff --git a/resources/views/profile/change-email.twig b/resources/views/profile/change-email.twigindex 25722a9894..d4e0c91f5e 100644--- a/resources/views/profile/change-email.twig+++ b/resources/views/profile/change-email.twig@@ -38,7 +38,7 @@</div><div class="card-footer">- <button type="submit" class="btn btn-success pull-right">{{ 'change_your_email'|_ }}</button>+ <button type="submit" class="btn btn-success text-end">{{ 'change_your_email'|_ }}</button></div></div></div>diff --git a/resources/views/profile/change-password.twig b/resources/views/profile/change-password.twigindex 3f7444168d..1c62518599 100644--- a/resources/views/profile/change-password.twig+++ b/resources/views/profile/change-password.twig@@ -59,7 +59,7 @@</div><div class="card-footer">- <button type="submit" class="btn btn-success pull-right">{{ 'change_your_password'|_ }}</button>+ <button type="submit" class="btn btn-success text-end">{{ 'change_your_password'|_ }}</button></div></div></div>diff --git a/resources/views/profile/delete-account.twig b/resources/views/profile/delete-account.twigindex 97745c9599..3bc7b6f7ed 100644--- a/resources/views/profile/delete-account.twig+++ b/resources/views/profile/delete-account.twig@@ -43,7 +43,7 @@</div></div><div class="card-footer">- <button type="submit" class="btn btn-danger pull-right delete-profile">+ <button type="submit" class="btn btn-danger text-end delete-profile">{{ 'delete_account_button'|_ }}</button></div>diff --git a/resources/views/profile/logout-other-sessions.twig b/resources/views/profile/logout-other-sessions.twigindex e854d590ee..4e1edfa22e 100644--- a/resources/views/profile/logout-other-sessions.twig+++ b/resources/views/profile/logout-other-sessions.twig@@ -25,7 +25,7 @@</div></div><div class="card-footer">- <button type="submit" class="btn btn-success pull-right">{{ 'logout_other_sessions'|_ }}</button>+ <button type="submit" class="btn btn-success text-end">{{ 'logout_other_sessions'|_ }}</button></div></div></div>diff --git a/resources/views/profile/mfa/backup-codes-intro.twig b/resources/views/profile/mfa/backup-codes-intro.twigindex c787a69678..967e89934e 100644--- a/resources/views/profile/mfa/backup-codes-intro.twig+++ b/resources/views/profile/mfa/backup-codes-intro.twig@@ -8,7 +8,7 @@<form method="POST" action="{{ route('profile.mfa.backup-codes.post') }}" accept-charset="UTF-8" class="form-horizontal" id="preferences_code"><input name="_token" type="hidden" value="{{ csrf_token() }}"><div class="row">- <div class="col-lg-6 col-lg-offset-3 col-md-12 col-sm-12 col-xs-12">+ <div class="col-lg-6 offset-lg-3 col-md-12 col-sm-12 col-xs-12"><div class="card"><div class="card-header"><h3 class="card-title">{{ 'mfa_backup_codes_title'|_ }}</h3>@@ -28,7 +28,7 @@</div><div class="row">- <div class="col-lg-6 col-lg-offset-3 col-md-12 col-sm-12 col-xs-12">+ <div class="col-lg-6 offset-lg-3 col-md-12 col-sm-12 col-xs-12"><div class="card"><div class="card-body">{{ ExpandedForm.password('password', {helpText: 'current_password_confirm_mfa'|_}) }}diff --git a/resources/views/profile/mfa/backup-codes-post.twig b/resources/views/profile/mfa/backup-codes-post.twigindex 2278dbbd41..a02b6b2afb 100644--- a/resources/views/profile/mfa/backup-codes-post.twig+++ b/resources/views/profile/mfa/backup-codes-post.twig@@ -6,7 +6,7 @@@section('content')<div class="row">- <div class="col-lg-6 col-lg-offset-3 col-md-12 col-sm-12 col-xs-12">+ <div class="col-lg-6 offset-lg-3 col-md-12 col-sm-12 col-xs-12"><div class="card"><div class="card-header"><h3 class="card-title">{{ 'mfa_backup_codes_post_title'|_ }}</h3>diff --git a/resources/views/profile/mfa/disable-mfa.twig b/resources/views/profile/mfa/disable-mfa.twigindex aca71fac68..fbfa7abf94 100644--- a/resources/views/profile/mfa/disable-mfa.twig+++ b/resources/views/profile/mfa/disable-mfa.twig@@ -8,7 +8,7 @@<form method="POST" action="{{ route('profile.mfa.disableMFA.post') }}" accept-charset="UTF-8" class="form-horizontal"><input name="_token" type="hidden" value="{{ csrf_token() }}"><div class="row">- <div class="col-lg-6 col-lg-offset-3 col-md-12 col-sm-12 col-xs-12">+ <div class="col-lg-6 offset-lg-3 col-md-12 col-sm-12 col-xs-12"><div class="card"><div class="card-header"><h3 class="card-title">{{ 'disable_mfa_page'|_ }}</h3>@@ -22,7 +22,7 @@</div></div><div class="row">- <div class="col-lg-6 col-lg-offset-3 col-md-12 col-sm-12 col-xs-12">+ <div class="col-lg-6 offset-lg-3 col-md-12 col-sm-12 col-xs-12"><div class="card"><div class="card-body">{{ ExpandedForm.password('password', {helpText: 'current_password_confirm_mfa'|_}) }}diff --git a/resources/views/profile/mfa/enable-mfa.twig b/resources/views/profile/mfa/enable-mfa.twigindex 59f40a6688..d9a1b7f428 100644--- a/resources/views/profile/mfa/enable-mfa.twig+++ b/resources/views/profile/mfa/enable-mfa.twig@@ -8,7 +8,7 @@<form method="POST" action="{{ route('profile.mfa.enableMFA.post') }}" accept-charset="UTF-8" class="form-horizontal" id="preferences_code"><input name="_token" type="hidden" value="{{ csrf_token() }}"><div class="row">- <div class="col-lg-6 col-lg-offset-3 col-md-12 col-sm-12 col-xs-12">+ <div class="col-lg-6 offset-lg-3 col-md-12 col-sm-12 col-xs-12"><div class="card"><div class="card-header"><h3 class="card-title">{{ 'pref_two_factor_auth_code'|_ }}</h3>@@ -33,7 +33,7 @@</div></div><div class="row">- <div class="col-lg-6 col-lg-offset-3 col-md-12 col-sm-12 col-xs-12">+ <div class="col-lg-6 offset-lg-3 col-md-12 col-sm-12 col-xs-12"><div class="card"><div class="card-body">{{ ExpandedForm.password('password', {helpText: 'current_password_confirm_mfa'|_}) }}diff --git a/resources/views/profile/new-backup-codes.twig b/resources/views/profile/new-backup-codes.twigindex f0cf416eab..717d1798b6 100644--- a/resources/views/profile/new-backup-codes.twig+++ b/resources/views/profile/new-backup-codes.twig@@ -6,7 +6,7 @@@section('content')<div class="row">- <div class="col-lg-6 col-lg-offset-3 col-md-12 col-sm-12 col-xs-12">+ <div class="col-lg-6 offset-lg-3 col-md-12 col-sm-12 col-xs-12"><div class="card"><div class="card-header"><h3 class="card-title">{{ 'pref_two_factor_auth_code'|_ }}</h3>diff --git a/resources/views/recurring/create.twig b/resources/views/recurring/create.twigindex e644aa4532..b18bef3030 100644--- a/resources/views/recurring/create.twig+++ b/resources/views/recurring/create.twig@@ -161,7 +161,7 @@{{ ExpandedForm::optionsList('create','recurrence') }}</div><div class="card-footer">- <button type="submit" class="btn pull-right btn-success">+ <button type="submit" class="btn text-end btn-success">{{ ('store_new_recurrence')|_ }}</button></div>diff --git a/resources/views/recurring/delete.twig b/resources/views/recurring/delete.twigindex 813c2e3b91..3dbb3e21be 100644--- a/resources/views/recurring/delete.twig+++ b/resources/views/recurring/delete.twig@@ -9,7 +9,7 @@<form method="POST" action="{{ route('recurring.destroy',recurrence.id) }}" accept-charset="UTF-8" class="form-horizontal" id="destroy"><input name="_token" type="hidden" value="{{ csrf_token() }}"><div class="row">- <div class="col-lg-6 col-lg-offset-3 col-md-12 col-sm-12">+ <div class="col-lg-6 offset-lg-3 col-md-12 col-sm-12"><div class="box box-danger"><div class="card-header"><h3 class="card-title">{{ trans('form.delete_recurring', {'title': recurrence.title}) }}</h3>@@ -30,7 +30,7 @@</p></div><div class="card-footer">- <input type="submit" name="submit" value="{{ trans('form.deletePermanently') }}" class="btn btn-danger pull-right"/>+ <input type="submit" name="submit" value="{{ trans('form.deletePermanently') }}" class="btn btn-danger text-end"/><a href="{{ URL::previous() }}" class="btn-outline-secondary btn">{{ trans('form.cancel') }}</a></div></div>diff --git a/resources/views/recurring/edit.twig b/resources/views/recurring/edit.twigindex 223678a4f4..5c03e0b540 100644--- a/resources/views/recurring/edit.twig+++ b/resources/views/recurring/edit.twig@@ -160,7 +160,7 @@{{ ExpandedForm::optionsList('update','recurrence') }}</div><div class="card-footer">- <button type="submit" class="btn pull-right btn-success">+ <button type="submit" class="btn text-end btn-success">{{ ('update_recurrence')|_ }}</button></div>diff --git a/resources/views/recurring/old-index.twig b/resources/views/recurring/old-index.twigindex 664477db6b..26b0b7f75d 100644--- a/resources/views/recurring/old-index.twig+++ b/resources/views/recurring/old-index.twig@@ -14,7 +14,7 @@<h3 class="card-title">{{ 'recurrences'|_ }}</h3>- <div class="box-tools pull-right">+ <div class="box-tools text-end"><div class="btn-group"><button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><span class="bi bi-list"></span></button><ul class="dropdown-menu" role="menu">diff --git a/resources/views/rules/old-index.twig b/resources/views/rules/old-index.twigindex 4738c8a3c0..2ebdf08496 100644--- a/resources/views/rules/old-index.twig+++ b/resources/views/rules/old-index.twig@@ -35,7 +35,7 @@</h3>- <div class="box-tools pull-right">+ <div class="box-tools text-end"><div class="btn-group"><button type="button" class="btn btn-box-tool" data-widget="collapse"><span class="fa fa-minus"></span></button>diff --git a/resources/views/rules/rule-group/create.twig b/resources/views/rules/rule-group/create.twigindex 48a120ea56..2dc9846aab 100644--- a/resources/views/rules/rule-group/create.twig+++ b/resources/views/rules/rule-group/create.twig@@ -42,7 +42,7 @@{{ ExpandedForm::optionsList('create','rule-group') }}</div><div class="card-footer">- <button type="submit" class="btn pull-right btn-success">{{ 'store_new_rule_group'|_ }}</button>+ <button type="submit" class="btn text-end btn-success">{{ 'store_new_rule_group'|_ }}</button></div></div>diff --git a/resources/views/rules/rule-group/delete.twig b/resources/views/rules/rule-group/delete.twigindex fed6575d94..99efd64a30 100644--- a/resources/views/rules/rule-group/delete.twig+++ b/resources/views/rules/rule-group/delete.twig@@ -9,7 +9,7 @@<form method="POST" action="{{ route('rule-groups.destroy',ruleGroup.id) }}" accept-charset="UTF-8" class="form-horizontal" id="destroy"><input name="_token" type="hidden" value="{{ csrf_token() }}"><div class="row">- <div class="col-lg-6 col-lg-offset-3 col-md-12 col-sm-12">+ <div class="col-lg-6 offset-lg-3 col-md-12 col-sm-12"><div class="box box-danger"><div class="card-header"><h3 class="card-title">{{ trans('form.delete_rule_group', {'title': ruleGroup.title}) }}</h3>@@ -42,7 +42,7 @@</div><div class="card-footer">- <input type="submit" name="submit" value="{{ trans('form.deletePermanently') }}" class="btn btn-danger pull-right"/>+ <input type="submit" name="submit" value="{{ trans('form.deletePermanently') }}" class="btn btn-danger text-end"/><a href="{{ URL::previous() }}" class="btn-outline-secondary btn">{{ trans('form.cancel') }}</a></div>diff --git a/resources/views/rules/rule-group/edit.twig b/resources/views/rules/rule-group/edit.twigindex 5cce7ac638..2e8feff0ab 100644--- a/resources/views/rules/rule-group/edit.twig+++ b/resources/views/rules/rule-group/edit.twig@@ -50,7 +50,7 @@{{ ExpandedForm::optionsList('update','rule-group') }}</div><div class="card-footer">- <button type="submit" class="btn pull-right btn-success">{{ 'update_rule_group'|_ }}</button>+ <button type="submit" class="btn text-end btn-success">{{ 'update_rule_group'|_ }}</button></div></div></div>diff --git a/resources/views/rules/rule-group/select-transactions.twig b/resources/views/rules/rule-group/select-transactions.twigindex b5e5bad98d..f9cb70092c 100644--- a/resources/views/rules/rule-group/select-transactions.twig+++ b/resources/views/rules/rule-group/select-transactions.twig@@ -33,7 +33,7 @@</div><div class="card-footer"><input type="submit" name="submit" value="{{ 'execute'|_ }}" id="do-execute-button"- class="btn btn-success pull-right"/>+ class="btn btn-success text-end"/></div></div></div>diff --git a/resources/views/rules/rule/create.twig b/resources/views/rules/rule/create.twigindex 0afeb73f3a..c4819691ea 100644--- a/resources/views/rules/rule/create.twig+++ b/resources/views/rules/rule/create.twig@@ -136,7 +136,7 @@{{ ExpandedForm::optionsList('create','rule') }}</div><div class="card-footer">- <button type="submit" class="btn pull-right btn-success">{{ 'store_new_rule'|_ }}</button>+ <button type="submit" class="btn text-end btn-success">{{ 'store_new_rule'|_ }}</button></div></div>diff --git a/resources/views/rules/rule/delete.twig b/resources/views/rules/rule/delete.twigindex 5891a102b0..71c42da040 100644--- a/resources/views/rules/rule/delete.twig+++ b/resources/views/rules/rule/delete.twig@@ -9,7 +9,7 @@<form method="POST" action="{{ route('rules.destroy',rule.id) }}" accept-charset="UTF-8" class="form-horizontal" id="destroy"><input name="_token" type="hidden" value="{{ csrf_token() }}"><div class="row">- <div class="col-lg-6 col-lg-offset-3 col-md-12 col-sm-12">+ <div class="col-lg-6 offset-lg-3 col-md-12 col-sm-12"><div class="box box-danger"><div class="card-header"><h3 class="card-title">{{ trans('form.delete_rule', {'title': rule.title}) }}</h3>@@ -24,7 +24,7 @@</p></div><div class="card-footer">- <input type="submit" name="submit" value="{{ trans('form.deletePermanently') }}" class="btn btn-danger pull-right"/>+ <input type="submit" name="submit" value="{{ trans('form.deletePermanently') }}" class="btn btn-danger text-end"/><a href="{{ URL::previous() }}" class="btn-outline-secondary btn">{{ trans('form.cancel') }}</a></div></div>diff --git a/resources/views/rules/rule/edit.twig b/resources/views/rules/rule/edit.twigindex 90187acbfc..6b7d6aae72 100644--- a/resources/views/rules/rule/edit.twig+++ b/resources/views/rules/rule/edit.twig@@ -122,7 +122,7 @@{{ ExpandedForm::optionsList('update','rule') }}</div><div class="card-footer">- <button type="submit" class="btn pull-right btn-success">{{ 'update_rule'|_ }}</button>+ <button type="submit" class="btn text-end btn-success">{{ 'update_rule'|_ }}</button></div></div>diff --git a/resources/views/rules/rule/select-transactions.twig b/resources/views/rules/rule/select-transactions.twigindex ce7fc9ede2..c0c57136fe 100644--- a/resources/views/rules/rule/select-transactions.twig+++ b/resources/views/rules/rule/select-transactions.twig@@ -31,7 +31,7 @@</div></div><div class="card-footer">- <input type="submit" name="submit" value="{{ 'execute'|_ }}" id="do-execute-button" class="btn btn-success pull-right"/>+ <input type="submit" name="submit" value="{{ 'execute'|_ }}" id="do-execute-button" class="btn btn-success text-end"/></div></div></div>diff --git a/resources/views/search/index.twig b/resources/views/search/index.twigindex b4f1f4a9e0..45c9686a2c 100644--- a/resources/views/search/index.twig+++ b/resources/views/search/index.twig@@ -113,7 +113,7 @@</div><div class="col-lg-6 col-md-12 col-sm-12 col-xs-12 hidden-xs">- <div class="mass_buttons btn-group btn-group pull-right">+ <div class="mass_buttons btn-group btn-group text-end"><a href="#" class="btn btn-outline-secondary mass_select"><spanclass="bi bi-check-square-o"></span> {{ 'select_transactions'|_ }}</a><a href="#" class="btn btn-outline-secondary mass_stop_select hidden"><span class="fa faw-fw fa-square-o"diff --git a/resources/views/settings/link/create.twig b/resources/views/settings/link/create.twigindex ffb2d8fadc..de475384f4 100644--- a/resources/views/settings/link/create.twig+++ b/resources/views/settings/link/create.twig@@ -33,7 +33,7 @@{{ ExpandedForm::optionsList('create','link_type') }}</div><div class="card-footer">- <button type="submit" class="btn pull-right btn-success">{{ 'store_new_link_type'|_ }}</button>+ <button type="submit" class="btn text-end btn-success">{{ 'store_new_link_type'|_ }}</button></div></div>diff --git a/resources/views/settings/link/delete.twig b/resources/views/settings/link/delete.twigindex 9391d718ec..b1c2668b07 100644--- a/resources/views/settings/link/delete.twig+++ b/resources/views/settings/link/delete.twig@@ -10,7 +10,7 @@class="form-horizontal" id="destroy"><input name="_token" type="hidden" value="{{ csrf_token() }}"><div class="row">- <div class="col-lg-6 col-lg-offset-3 col-md-12 col-sm-12">+ <div class="col-lg-6 offset-lg-3 col-md-12 col-sm-12"><div class="box box-danger"><div class="card-header"><h3 class="card-title">{{ trans('form.delete_link_type', {'name': linkType.name}) }}</h3>@@ -44,7 +44,7 @@</div><div class="card-footer"><input type="submit" name="submit" value="{{ trans('form.deletePermanently') }}"- class="btn pull-right btn-danger"/>+ class="btn text-end btn-danger"/><a href="{{ URL::previous() }}" class="btn-outline-secondary btn">{{ trans('form.cancel') }}</a></div></div>diff --git a/resources/views/settings/link/edit.twig b/resources/views/settings/link/edit.twigindex 320c6cb032..25c6965c9d 100644--- a/resources/views/settings/link/edit.twig+++ b/resources/views/settings/link/edit.twig@@ -37,7 +37,7 @@{{ ExpandedForm::optionsList('update','link_type') }}</div><div class="card-footer">- <button type="submit" class="btn pull-right btn-success">+ <button type="submit" class="btn text-end btn-success">{{ ('update_link_type')|_ }}</button></div>diff --git a/resources/views/settings/users/delete.twig b/resources/views/settings/users/delete.twigindex 3a11f64d2f..7fc2944081 100644--- a/resources/views/settings/users/delete.twig+++ b/resources/views/settings/users/delete.twig@@ -10,7 +10,7 @@<input name="_token" type="hidden" value="{{ csrf_token() }}"><div class="row">- <div class="col-lg-6 col-lg-offset-3 col-md-12 col-sm-12">+ <div class="col-lg-6 offset-lg-3 col-md-12 col-sm-12"><div class="box box-danger"><div class="card-header"><h3 class="card-title">{{ trans('form.delete_user', {'email': user.email}) }}</h3>@@ -26,7 +26,7 @@</div><div class="card-footer"><input type="submit" name="submit"- value="{{ trans('form.deletePermanently') }}" class="btn btn-danger pull-right delete-user"/>+ value="{{ trans('form.deletePermanently') }}" class="btn btn-danger text-end delete-user"/><a href="{{ URL::previous() }}" class="btn-outline-secondary btn">{{ trans('form.cancel') }}</a></div>diff --git a/resources/views/settings/users/edit.twig b/resources/views/settings/users/edit.twigindex d4a912db0a..54c98d28b1 100644--- a/resources/views/settings/users/edit.twig+++ b/resources/views/settings/users/edit.twig@@ -48,7 +48,7 @@{{ ExpandedForm::optionsList('update','account') }}</div><div class="card-footer">- <button type="submit" class="btn pull-right btn-success">+ <button type="submit" class="btn text-end btn-success">{{ ('update_user')|_ }}</button></div>diff --git a/resources/views/settings/users/index.twig b/resources/views/settings/users/index.twigindex 84c8844e68..0b9824c3bf 100644--- a/resources/views/settings/users/index.twig+++ b/resources/views/settings/users/index.twig@@ -20,7 +20,7 @@{{ ExpandedForm::text('invited_user',null, {'type': 'email', 'label' : 'invited_user_mail'|_}) }}</div><div class="card-footer">- <button type="submit" class="btn pull-right btn-success">+ <button type="submit" class="btn text-end btn-success">{{ ('invite_user')|_ }}</button></div>diff --git a/resources/views/tags/create.twig b/resources/views/tags/create.twigindex b6a2793dcc..9c8847317a 100644--- a/resources/views/tags/create.twig+++ b/resources/views/tags/create.twig@@ -50,7 +50,7 @@{{ ExpandedForm::optionsList('create','tag') }}</div><div class="card-footer">- <button type="submit" class="btn btn-success pull-right">+ <button type="submit" class="btn btn-success text-end">{{ 'store_new_tag'|_ }}</button></div>diff --git a/resources/views/tags/delete.twig b/resources/views/tags/delete.twigindex cd350796f4..61b01cfc28 100644--- a/resources/views/tags/delete.twig+++ b/resources/views/tags/delete.twig@@ -9,7 +9,7 @@<form method="POST" action="{{ route('tags.destroy',tag.id) }}" accept-charset="UTF-8" class="form-horizontal" id="destroy"><input name="_token" type="hidden" value="{{ csrf_token() }}"><div class="row">- <div class="col-lg-6 col-lg-offset-3 col-md-6 col-sm-12">+ <div class="col-lg-6 offset-lg-3 col-md-6 col-sm-12"><div class="box box-danger"><div class="card-header"><h3 class="card-title">{{ trans('firefly.delete_tag',{tag: tag.tag}) }}</h3>@@ -30,7 +30,7 @@</p></div><div class="card-footer">- <input type="submit" name="submit" value="{{ trans('form.deletePermanently') }}" class="btn pull-right btn-danger"/>+ <input type="submit" name="submit" value="{{ trans('form.deletePermanently') }}" class="btn text-end btn-danger"/><a href="{{ URL::previous() }}" class="btn-outline-secondary btn">{{ trans('form.cancel') }}</a></div></div>diff --git a/resources/views/tags/edit.twig b/resources/views/tags/edit.twigindex 891c5ba12c..ef883a1bf5 100644--- a/resources/views/tags/edit.twig+++ b/resources/views/tags/edit.twig@@ -54,7 +54,7 @@{{ ExpandedForm::optionsList('update','tag') }}</div><div class="card-footer">- <button type="submit" class="btn pull-right btn-success">+ <button type="submit" class="btn text-end btn-success">{{ 'update_tag'|_ }}</button></div>diff --git a/resources/views/tags/index.blade.php b/resources/views/tags/index.blade.phpindex a6c4485cb2..5951145fee 100644--- a/resources/views/tags/index.blade.php+++ b/resources/views/tags/index.blade.php@@ -36,7 +36,7 @@<div class="row"><div class="col-lg-12 col-md-12 col-sm-12 col-xs-12"><p>- <button type="submit" class="btn pull-right btn-danger confirm-tag-delete">+ <button type="submit" class="btn text-end btn-danger confirm-tag-delete"><span class="bi bi-trash"></span> {{ __('firefly.delete_all_selected_tags') }}</button></p>diff --git a/resources/views/tags/show.twig b/resources/views/tags/show.twigindex f7e3cb9b93..631e069a6e 100644--- a/resources/views/tags/show.twig+++ b/resources/views/tags/show.twig@@ -12,7 +12,7 @@<h3 class="card-title">{{ 'meta_data'|_ }}</h3>- <div class="box-tools pull-right">+ <div class="box-tools text-end"><div class="btn-group"><button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><spanclass="bi bi-list"></span></button>@@ -178,7 +178,7 @@<div class="card"><div class="card-header"><h3 class="card-title">{{ __('firefly.location') }}</h3>- <div class="box-tools pull-right">+ <div class="box-tools text-end"><div class="btn-group"><button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><spanclass="bi bi-list"></span></button>@@ -235,7 +235,7 @@<h3 class="card-title">{{ __('firefly.transactions') }}</h3>- <div class="box-tools pull-right">+ <div class="box-tools text-end"><div class="btn-group"><button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><spanclass="bi bi-list"></span></button>diff --git a/resources/views/transactions/bulk/edit.twig b/resources/views/transactions/bulk/edit.twigindex 254ae50642..8c15210711 100644--- a/resources/views/transactions/bulk/edit.twig+++ b/resources/views/transactions/bulk/edit.twig@@ -169,7 +169,7 @@<div class="card-footer"><div class="row"><div class="col-lg-8">- <input type="submit" name="submit" value="{{ trans('form.update_all_journals') }}" class="btn btn-success pull-right"/>+ <input type="submit" name="submit" value="{{ trans('form.update_all_journals') }}" class="btn btn-success text-end"/><a href="{{ route('index') }}" class="btn-outline-secondary btn">{{ trans('form.cancel') }}</a></div></div>diff --git a/resources/views/transactions/convert.twig b/resources/views/transactions/convert.twigindex 73c469491a..2b88e6c377 100644--- a/resources/views/transactions/convert.twig+++ b/resources/views/transactions/convert.twig@@ -282,7 +282,7 @@</div><div class="card-footer"><a href="{{ route('transactions.show', group.id) }}" class="btn btn-danger">{{ 'cancel'|_ }}</a>- <button type="submit" id="transaction-btn" class="btn btn-success pull-right">+ <button type="submit" id="transaction-btn" class="btn btn-success text-end">{{ trans('form.convert_'~sourceType.type) }}</button></div>diff --git a/resources/views/transactions/delete.twig b/resources/views/transactions/delete.twigindex 51a93a9d43..4eab747945 100644--- a/resources/views/transactions/delete.twig+++ b/resources/views/transactions/delete.twig@@ -9,7 +9,7 @@<input name="_token" type="hidden" value="{{ csrf_token() }}"><div class="row">- <div class="col-lg-6 col-lg-offset-3 col-md-6 col-sm-12">+ <div class="col-lg-6 offset-lg-3 col-md-6 col-sm-12"><div class="box box-danger"><div class="card-header"><h3 class="card-title">{{ trans('form.delete_journal', {'description': group.title|default(journal.description)}) }}</h3>@@ -24,7 +24,7 @@</p></div><div class="card-footer">- <input type="submit" name="submit" value="{{ trans('form.deletePermanently') }}" class="btn btn-danger pull-right"/>+ <input type="submit" name="submit" value="{{ trans('form.deletePermanently') }}" class="btn btn-danger text-end"/><a href="{{ previous }}" class="btn-outline-secondary btn">{{ trans('form.cancel') }}</a></div></div>diff --git a/resources/views/transactions/links/delete.twig b/resources/views/transactions/links/delete.twigindex 89ed61f597..9a890f1ef6 100644--- a/resources/views/transactions/links/delete.twig+++ b/resources/views/transactions/links/delete.twig@@ -9,7 +9,7 @@<form method="POST" action="{{ route('transactions.link.destroy', [link.id]) }}" accept-charset="UTF-8" class="form-horizontal" id="destroy"><input name="_token" type="hidden" value="{{ csrf_token() }}"><div class="row">- <div class="col-lg-6 col-lg-offset-3 col-md-6 col-sm-12">+ <div class="col-lg-6 offset-lg-3 col-md-6 col-sm-12"><div class="box box-danger"><div class="card-header"><h3 class="card-title">{{ trans('firefly.delete_journal_link', {source: link.source.description|escape, destination: link.destination.description|escape, source_link: route('transactions.show', [link.source_id]) , destination_link: route('transactions.show',link.destination_id)})|raw }}</h3>@@ -23,7 +23,7 @@</p></div><div class="card-footer">- <input type="submit" name="submit" value="{{ trans('form.deletePermanently') }}" class="btn pull-right btn-danger"/>+ <input type="submit" name="submit" value="{{ trans('form.deletePermanently') }}" class="btn text-end btn-danger"/><a href="{{ URL::previous() }}" class="btn-outline-secondary btn">{{ trans('form.cancel') }}</a></div></div>diff --git a/resources/views/transactions/mass/delete.twig b/resources/views/transactions/mass/delete.twigindex e1d4a17824..ccdf2d1b8c 100644--- a/resources/views/transactions/mass/delete.twig+++ b/resources/views/transactions/mass/delete.twig@@ -99,7 +99,7 @@</div><div class="card-footer">- <input type="submit" name="submit" value="{{ trans('form.delete_all_permanently') }}" class="btn btn-danger pull-right"/>+ <input type="submit" name="submit" value="{{ trans('form.delete_all_permanently') }}" class="btn btn-danger text-end"/><a href="{{ route('index') }}" class="btn-outline-secondary btn">{{ trans('form.cancel') }}</a></div></div>diff --git a/resources/views/transactions/mass/edit.twig b/resources/views/transactions/mass/edit.twigindex 6bcdfb6bef..4780ef038b 100644--- a/resources/views/transactions/mass/edit.twig+++ b/resources/views/transactions/mass/edit.twig@@ -172,7 +172,7 @@</table></div><div class="card-footer">- <input type="submit" name="submit" value="{{ trans('form.update_all_journals') }}" class="btn btn-success pull-right"/>+ <input type="submit" name="submit" value="{{ trans('form.update_all_journals') }}" class="btn btn-success text-end"/><a href="{{ route('index') }}" class="btn-outline-secondary btn">{{ trans('form.cancel') }}</a></div></div>diff --git a/resources/views/transactions/single/delete.twig b/resources/views/transactions/single/delete.twigindex 79d00037ac..f4b961e8e9 100644--- a/resources/views/transactions/single/delete.twig+++ b/resources/views/transactions/single/delete.twig@@ -9,7 +9,7 @@<input name="_token" type="hidden" value="{{ csrf_token() }}"><div class="row">- <div class="col-lg-6 col-lg-offset-3 col-md-6 col-sm-12">+ <div class="col-lg-6 offset-lg-3 col-md-6 col-sm-12"><div class="box box-danger"><div class="card-header"><h3 class="card-title">{{ trans('form.delete_journal', {'description': journal.description}) }}</h3>@@ -24,7 +24,7 @@</p></div><div class="card-footer">- <input type="submit" name="submit" value="{{ trans('form.deletePermanently') }}" class="btn btn-danger pull-right"/>+ <input type="submit" name="submit" value="{{ trans('form.deletePermanently') }}" class="btn btn-danger text-end"/>{% if journal.transactiontype.type == 'Withdrawal' %}<a href="{{ route('transactions.index','withdrawal') }}" class="btn-outline-secondary btn">{{ trans('form.cancel') }}</a>@endifdiff --git a/resources/views/webhooks/delete.twig b/resources/views/webhooks/delete.twigindex 4b647e36ac..f177a9b435 100644--- a/resources/views/webhooks/delete.twig+++ b/resources/views/webhooks/delete.twig@@ -6,7 +6,7 @@@section('content')<div class="row">- <div class="col-lg-6 col-lg-offset-3 col-md-12 col-sm-12">+ <div class="col-lg-6 offset-lg-3 col-md-12 col-sm-12"><div class="box box-danger"><div class="card-header"><h3 class="card-title">{{ trans('form.delete_webhook', {'title': webhook.title}) }}</h3>@@ -22,7 +22,7 @@</div><div class="card-footer"><input type="submit" id="button" name="submit" value="{{ trans('form.deletePermanently') }}"- class="btn pull-right btn-danger"/>+ class="btn text-end btn-danger"/><a href="{{ URL::previous() }}" class="btn-outline-secondary btn">{{ trans('form.cancel') }}</a></div></div>