Skip to content

Firefly III: a personal finances manager

Updated views

Sander Dorigo7f288274cf22
diff --git a/resources/assets/v1/webpack.mix.js b/resources/assets/v1/webpack.mix.js
index cf2a6627c5..8fe1fec0cf 100644
--- a/resources/assets/v1/webpack.mix.js
+++ b/resources/assets/v1/webpack.mix.js
@@ -37,12 +37,12 @@ mix.webpackConfig({
mix.js('src/app.js', 'build');
mix.js('src/app_vue.js', 'build').vue({version: 2});
-mix.js('src/create_transaction.js', 'build').vue({version: 2});
-mix.js('src/edit_transaction.js', 'build').vue({version: 2});
+// mix.js('src/create_transaction.js', 'build').vue({version: 2});
+// mix.js('src/edit_transaction.js', 'build').vue({version: 2});
mix.js('src/profile.js', 'build').vue({version: 2});
//
// // webhooks
-mix.js('src/webhooks/index.js', 'build/webhooks').vue({version: 2});
+// mix.js('src/webhooks/index.js', 'build/webhooks').vue({version: 2});
mix.js('src/webhooks/create.js', 'build/webhooks').vue({version: 2});
mix.js('src/webhooks/edit.js', 'build/webhooks').vue({version: 2});
mix.js('src/webhooks/show.js', 'build/webhooks').vue({version: 2}).copy('build','../../../public/v1/js')
diff --git a/resources/assets/v3/js/pages/exchange-rates/index.js b/resources/assets/v3/js/pages/exchange-rates/index.js
new file mode 100644
index 0000000000..217ae6c5fb
--- /dev/null
+++ b/resources/assets/v3/js/pages/exchange-rates/index.js
@@ -0,0 +1,61 @@
+/*
+ * dashboard.js
+ * Copyright (c) 2026 [email protected]
+ *
+ * This file is part of Firefly III (https://github.com/firefly-iii).
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+// CSS
+import '../../boot/bootstrap.js';
+import sidebar from '../../pages/shared/sidebar.js';
+import dates from '../shared/dates.js';
+
+let index = function () {
+ return {
+ foo2: 'bar2',
+ init() {
+ console.log('init op index xxx');
+ }
+ }
+};
+
+
+const comps = {
+ index,
+ sidebar,
+ dates
+};
+
+function loadPage(comps) {
+ console.log('loadPage');
+ Object.keys(comps).forEach(comp => {
+ let data = comps[comp]();
+ Alpine.data(comp, () => data);
+ console.log(comp);
+ });
+ Alpine.start();
+}
+
+// wait for load until bootstrapped event is received.
+document.addEventListener('firefly-iii-bootstrapped', () => {
+ console.log('Loaded through event listener.');
+ loadPage(comps);
+});
+// or is bootstrapped before event is triggered.
+if (window.bootstrapped) {
+ console.log('Loaded through window variable.');
+ loadPage(comps);
+}
diff --git a/resources/assets/v3/vite.config.js b/resources/assets/v3/vite.config.js
index 7aa597d7b5..d541172310 100644
--- a/resources/assets/v3/vite.config.js
+++ b/resources/assets/v3/vite.config.js
@@ -56,6 +56,9 @@ export default defineConfig(({command, mode, isSsrBuild, isPreview}) => {
// budgets
'js/pages/budgets/index.js',
+ // exchange rates
+ 'js/pages/exchange-rates/index.js',
+
// object groups
'js/pages/object-groups/index.js',
diff --git a/resources/lang/en_US/firefly.php b/resources/lang/en_US/firefly.php
index b69c895b9b..368f99d7a1 100644
--- a/resources/lang/en_US/firefly.php
+++ b/resources/lang/en_US/firefly.php
@@ -248,6 +248,7 @@ return [
'webhooks' => 'Webhooks',
'webhooks_breadcrumb' => 'Webhooks',
'webhooks_menu_disabled' => 'disabled',
+ 'cer_menu_disabled' => 'disabled',
'no_webhook_messages' => 'There are no webhook messages',
'webhook_trigger_ANY' => 'After any event',
'webhook_trigger_STORE_TRANSACTION' => 'After transaction creation',
diff --git a/resources/views/accounts/create.twig b/resources/views/accounts/create.twig
index 5cb69e56fc..c6dc994e3b 100644
--- a/resources/views/accounts/create.twig
+++ b/resources/views/accounts/create.twig
@@ -18,8 +18,8 @@
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-12">
<div class="box box-primary">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'mandatoryFields'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'mandatoryFields'|_ }}</h3>
</div>
<div class="card-body">
{{ ExpandedForm.text('name') }}
@@ -40,8 +40,8 @@
<div class="col-lg-6 col-md-6 col-sm-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'optionalFields'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'optionalFields'|_ }}</h3>
</div>
<div class="card-body">
@@ -69,8 +69,8 @@
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'options'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'options'|_ }}</h3>
</div>
<div class="card-body">
{{ ExpandedForm.optionsList('create','account') }}
diff --git a/resources/views/accounts/delete.twig b/resources/views/accounts/delete.twig
index 3914394bb4..d61e76329b 100644
--- a/resources/views/accounts/delete.twig
+++ b/resources/views/accounts/delete.twig
@@ -12,8 +12,8 @@
<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="box-header with-border">
- <h3 class="box-title">{{ trans('form.delete_account', {'name': account.name}) }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ trans('form.delete_account', {'name': account.name}) }}</h3>
</div>
<div class="card-body">
<p class="text-danger">
diff --git a/resources/views/accounts/edit.twig b/resources/views/accounts/edit.twig
index b8dc7a5267..0335b4a24e 100644
--- a/resources/views/accounts/edit.twig
+++ b/resources/views/accounts/edit.twig
@@ -22,8 +22,8 @@
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
<div class="box box-primary">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'mandatoryFields'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'mandatoryFields'|_ }}</h3>
</div>
<div class="card-body">
{{ ExpandedForm.text('name', account.name) }}
@@ -49,8 +49,8 @@
</div>
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'optionalFields'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'optionalFields'|_ }}</h3>
</div>
<div class="card-body">
{{ ExpandedForm.text('iban', account.iban) }}
@@ -86,8 +86,8 @@
{# panel for credit card options #}
{% if preFilled.account_role == 'ccAsset' %}
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'credit_card_options'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'credit_card_options'|_ }}</h3>
</div>
<div class="card-body">
{{ ExpandedForm.select('cc_type',Config.get('firefly.ccTypes')) }}
@@ -101,8 +101,8 @@
<div class="col-lg-6 col-md-6 col-sm-12">
{# panel for options #}
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'options'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'options'|_ }}</h3>
</div>
<div class="card-body">
{{ ExpandedForm.optionsList('update','account') }}
diff --git a/resources/views/accounts/reconcile/index.twig b/resources/views/accounts/reconcile/index.twig
index c91bbe89f9..b7a8cd7a07 100644
--- a/resources/views/accounts/reconcile/index.twig
+++ b/resources/views/accounts/reconcile/index.twig
@@ -9,8 +9,8 @@
<div class="row">
<div class="col-lg-9 col-md-12 col-sm-12 col-xs-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'reconcile_range'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'reconcile_range'|_ }}</h3>
</div>
<div class="box-body no-padding">
<table class="table table-hover">
@@ -91,8 +91,8 @@
</div>
<div class="col-lg-3 col-md-12 col-sm-12 col-xs-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'reconcile_options'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'reconcile_options'|_ }}</h3>
</div>
<div class="card-body">
<p class="lead" id="difference"></p>
@@ -109,8 +109,8 @@
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'transactions'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'transactions'|_ }}</h3>
</div>
<div class="card-body">
<div id="transactions_holder">
diff --git a/resources/views/accounts/reconcile/show.twig b/resources/views/accounts/reconcile/show.twig
index 146c1e2bee..d8693f6fc4 100644
--- a/resources/views/accounts/reconcile/show.twig
+++ b/resources/views/accounts/reconcile/show.twig
@@ -8,8 +8,8 @@
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'transaction_journal_information'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'transaction_journal_information'|_ }}</h3>
<div class="box-tools pull-right">
<div class="btn-group">
@@ -63,8 +63,8 @@
<div class="col-lg-6 col-md-6 col-sm-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'transaction_journal_meta'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'transaction_journal_meta'|_ }}</h3>
</div>
<div class="box-body no-padding">
<table class="table table-responsive table-hover">
diff --git a/resources/views/accounts/show.twig b/resources/views/accounts/show.twig
index 6093e6a382..0c4018a05e 100644
--- a/resources/views/accounts/show.twig
+++ b/resources/views/accounts/show.twig
@@ -9,8 +9,8 @@
<div class="row">
<div class="{% if attachments.count() == 0 %}col-lg-12 col-md-12 col-sm-12 col-xs-12{% else %}col-lg-8 col-md-6 col-sm-12 col-xs-12{% endif %}">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">
+ <div class="card-header">
+ <h3 class="card-title">
{% if balances.balance %}
<span title="balance">
{{ trans('firefly.chart_account_in_period', {
@@ -51,8 +51,8 @@
{% if attachments.count() > 0 %}
<div class="col-lg-4 col-md-6 col-sm-12 col-xs-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">
+ <div class="card-header">
+ <h3 class="card-title">
{{ 'attachments'|_ }}
</h3>
</div>
@@ -67,8 +67,8 @@
<div class="row">
<div class="col-lg-4 col-md-6 col-sm-12 col-xs-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">pay-off by date</h3>
+ <div class="card-header">
+ <h3 class="card-title">pay-off by date</h3>
</div>
<div class="card-body">
Content
@@ -81,8 +81,8 @@
<div class="row">
<div class="col-lg-4 col-md-6 col-sm-12 col-xs-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'expenses_by_category'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'expenses_by_category'|_ }}</h3>
</div>
<div class="card-body">
<div class="center-chart">
@@ -93,8 +93,8 @@
</div>
<div class="col-lg-4 col-md-6 col-sm-12 col-xs-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'expenses_by_budget'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'expenses_by_budget'|_ }}</h3>
</div>
<div class="card-body">
<div class="center-chart">
@@ -105,8 +105,8 @@
</div>
<div class="col-lg-4 col-md-6 col-sm-12 col-xs-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'income_by_category'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'income_by_category'|_ }}</h3>
</div>
<div class="card-body">
<div class="center-chart">
@@ -122,8 +122,8 @@
{% if(location) %}
<div class="col-lg-6">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'location'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'location'|_ }}</h3>
</div>
<div class="card-body">
<div id="location_map" class="map-size"></div>
@@ -134,8 +134,8 @@
{% if account.notes.count() == 1 %}
<div class="col-lg-6">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'notes'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'notes'|_ }}</h3>
</div>
<div class="card-body">
{{ account.notes.first().text|markdown }}
@@ -148,8 +148,8 @@
<div class="row">
<div class="{% if periods|length > 0 %}col-lg-10 col-md-8 col-sm-12{% else %}col-lg-12 col-md-12 col-sm-12{% endif %}">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'transactions'|_ }}
+ <div class="card-header">
+ <h3 class="card-title">{{ 'transactions'|_ }}
{% if balances.balance %}
({{ formatAmountBySymbol(balances.balance, currency.symbol, currency.decimal_places, true)|raw }})
{% elseif balances.pc_balance %}
diff --git a/resources/views/attachments/delete.twig b/resources/views/attachments/delete.twig
index 437be6dda8..73bf1a025b 100644
--- a/resources/views/attachments/delete.twig
+++ b/resources/views/attachments/delete.twig
@@ -11,8 +11,8 @@
<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="box-header with-border">
- <h3 class="box-title">{{ trans('form.delete_attachment', {'name': attachment.filename}) }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ trans('form.delete_attachment', {'name': attachment.filename}) }}</h3>
</div>
<div class="card-body">
<p class="text-danger">
diff --git a/resources/views/attachments/edit.twig b/resources/views/attachments/edit.twig
index 21344375d2..0582043f36 100644
--- a/resources/views/attachments/edit.twig
+++ b/resources/views/attachments/edit.twig
@@ -15,8 +15,8 @@
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-12">
<div class="box box-primary">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'mandatoryFields'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'mandatoryFields'|_ }}</h3>
</div>
<div class="card-body">
{{ ExpandedForm.staticText('filename',attachment.filename|escape) }}
@@ -28,8 +28,8 @@
</div>
<div class="col-lg-6 col-md-6 col-sm-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'optionalFields'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'optionalFields'|_ }}</h3>
</div>
<div class="card-body">
{{ ExpandedForm.text('title', attachment.title) }}
@@ -43,8 +43,8 @@
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
{# panel for options #}
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'options'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'options'|_ }}</h3>
</div>
<div class="card-body">
{{ ExpandedForm.optionsList('update','attachment') }}
diff --git a/resources/views/attachments/index.twig b/resources/views/attachments/index.twig
index 9acd027a46..b02e3e8cc7 100644
--- a/resources/views/attachments/index.twig
+++ b/resources/views/attachments/index.twig
@@ -8,8 +8,8 @@
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">
+ <div class="card-header">
+ <h3 class="card-title">
{{ 'list_all_attachments'|_ }}
</h3>
</div>
diff --git a/resources/views/bills/create.twig b/resources/views/bills/create.twig
index 86e9843249..629e476aef 100644
--- a/resources/views/bills/create.twig
+++ b/resources/views/bills/create.twig
@@ -12,8 +12,8 @@
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
<div class="box box-primary">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'mandatoryFields'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'mandatoryFields'|_ }}</h3>
</div>
<div class="card-body">
{{ ExpandedForm.text('name') }}
@@ -29,8 +29,8 @@
</div>
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'optionalFields'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'optionalFields'|_ }}</h3>
</div>
<div class="card-body">
{{ ExpandedForm.date('bill_end_date',null, {'helpText': trans('firefly.bill_end_date_help')}) }}
@@ -48,8 +48,8 @@
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
{# panel for options #}
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'options'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'options'|_ }}</h3>
</div>
<div class="card-body">
{{ ExpandedForm.optionsList('create','bill') }}
diff --git a/resources/views/bills/delete.twig b/resources/views/bills/delete.twig
index aea975fc11..b8ab3f40ff 100644
--- a/resources/views/bills/delete.twig
+++ b/resources/views/bills/delete.twig
@@ -11,8 +11,8 @@
<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="box-header with-border">
- <h3 class="box-title">{{ trans('form.delete_bill', {'name': bill.name}) }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ trans('form.delete_bill', {'name': bill.name}) }}</h3>
</div>
<div class="card-body">
<p class="text-danger">
diff --git a/resources/views/bills/edit.twig b/resources/views/bills/edit.twig
index 7863114d9a..4fcf60ec8e 100644
--- a/resources/views/bills/edit.twig
+++ b/resources/views/bills/edit.twig
@@ -14,8 +14,8 @@
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
<div class="box box-primary">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'mandatoryFields'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'mandatoryFields'|_ }}</h3>
</div>
<div class="card-body">
{% if rules.count() > 0 %}
@@ -36,8 +36,8 @@
</div>
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'optionalFields'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'optionalFields'|_ }}</h3>
</div>
<div class="card-body">
{{ ExpandedForm.date('bill_end_date',null, {'helpText': trans('firefly.bill_end_date_help')}) }}
@@ -56,8 +56,8 @@
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'options'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'options'|_ }}</h3>
</div>
<div class="card-body">
{{ ExpandedForm.optionsList('update','bill') }}
diff --git a/resources/views/bills/show.twig b/resources/views/bills/show.twig
index 3de0fcb6ef..b3d436be4c 100644
--- a/resources/views/bills/show.twig
+++ b/resources/views/bills/show.twig
@@ -9,8 +9,8 @@
<div class="row">
<div class="col-lg-6 col-sm-12 col-md-12">
<div class="box" id="billInfo">
- <div class="box-header with-border">
- <h3 class="box-title">{{ object.data.name }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ object.data.name }}</h3>
<div class="box-tools pull-right">
<div class="btn-group">
@@ -101,8 +101,8 @@
</div>
<div class="col-lg-6 col-sm-12 col-md-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'bill_related_rules'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'bill_related_rules'|_ }}</h3>
</div>
<div class="card-body">
{% if rules.count() > 0 %}
@@ -132,8 +132,8 @@
</div>
{% if object.data.notes %}
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'notes'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'notes'|_ }}</h3>
</div>
<div class="card-body">
{{ object.data.notes|default('')|markdown }}
@@ -144,8 +144,8 @@
{% if attachments.count() > 0 %}
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'attachments'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'attachments'|_ }}</h3>
</div>
<div class="box-body no-padding">
{% include 'list.attachments' %}
@@ -158,8 +158,8 @@
<div class="row">
<div class="col-lg-12 col-sm-12 col-md-12">
<div class="box" id="billChart">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'chart'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'chart'|_ }}</h3>
</div>
<div class="card-body">
<canvas id="bill-overview" class="wide-chart" height="400" width="100%"></canvas>
@@ -171,8 +171,8 @@
<div class="row">
<div class="col-lg-12 col-sm-12 col-md-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'connected_journals'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'connected_journals'|_ }}</h3>
</div>
<div class="card-body">
{% include 'list.groups' %}
diff --git a/resources/views/budgets/create.twig b/resources/views/budgets/create.twig
index 489c97432b..be9a0f60d6 100644
--- a/resources/views/budgets/create.twig
+++ b/resources/views/budgets/create.twig
@@ -13,8 +13,8 @@
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
<div class="box box-primary">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'mandatoryFields'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'mandatoryFields'|_ }}</h3>
</div>
<div class="card-body">
{{ ExpandedForm.text('name') }}
@@ -24,8 +24,8 @@
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
{# panel for auto-budget #}
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'optionalFields'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'optionalFields'|_ }}</h3>
</div>
<div class="card-body">
{{ ExpandedForm.select('auto_budget_type', autoBudgetTypes,null, {helpText: trans('firefly.auto_budget_help')}) }}
@@ -41,8 +41,8 @@
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
{# panel for options #}
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'options'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'options'|_ }}</h3>
</div>
<div class="card-body">
{{ ExpandedForm.optionsList('create','budget') }}
diff --git a/resources/views/budgets/delete.twig b/resources/views/budgets/delete.twig
index 5eeec5ab5b..33e4f48d42 100644
--- a/resources/views/budgets/delete.twig
+++ b/resources/views/budgets/delete.twig
@@ -12,8 +12,8 @@
<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="box-header with-border">
- <h3 class="box-title">{{ trans('form.delete_budget', {'name': budget.name}) }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ trans('form.delete_budget', {'name': budget.name}) }}</h3>
</div>
<div class="card-body">
<p class="text-danger">
diff --git a/resources/views/budgets/edit.twig b/resources/views/budgets/edit.twig
index 168c5fa49b..5f3b9e0a11 100644
--- a/resources/views/budgets/edit.twig
+++ b/resources/views/budgets/edit.twig
@@ -12,8 +12,8 @@
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
<div class="box box-primary">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'mandatoryFields'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'mandatoryFields'|_ }}</h3>
</div>
<div class="card-body">
{# only correct way to do active checkbox #}
@@ -26,8 +26,8 @@
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
{# panel for auto-budget #}
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'optionalFields'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'optionalFields'|_ }}</h3>
</div>
<div class="card-body">
{{ ExpandedForm.select('auto_budget_type', autoBudgetTypes, autoBudget.auto_budget_type) }}
@@ -44,8 +44,8 @@
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
{# panel for options #}
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'options'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'options'|_ }}</h3>
</div>
<div class="card-body">
{{ ExpandedForm.optionsList('update','budget') }}
diff --git a/resources/views/budgets/no-budget.twig b/resources/views/budgets/no-budget.twig
index 192dfb97bf..4f79c0389b 100644
--- a/resources/views/budgets/no-budget.twig
+++ b/resources/views/budgets/no-budget.twig
@@ -18,8 +18,8 @@
<div class="row">
<div class="{% if periods|length > 0 %}col-lg-9 col-md-9 col-sm-12{% else %}col-lg-12 col-md-12 col-sm-12{% endif %}">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ subTitle }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ subTitle }}</h3>
</div>
<div class="box-body ">
diff --git a/resources/views/budgets/show.twig b/resources/views/budgets/show.twig
index eced0118fa..f87c3dfb06 100644
--- a/resources/views/budgets/show.twig
+++ b/resources/views/budgets/show.twig
@@ -8,8 +8,8 @@
<div class="row">
<div class="{% if attachments.count() == 0 %}col-lg-12 col-md-12 col-sm-12 col-xs-12{% else %}col-lg-8 col-md-6 col-sm-12 col-xs-12{% endif %}">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">
+ <div class="card-header">
+ <h3 class="card-title">
{% 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 %}
@@ -41,8 +41,8 @@
{% if attachments.count() > 0 %}
<div class="col-lg-4 col-md-6 col-sm-12 col-xs-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">
+ <div class="card-header">
+ <h3 class="card-title">
{{ 'attachments'|_ }}
</h3>
</div>
@@ -56,8 +56,8 @@
<div class="row">
<div class="col-lg-4 col-md-6 col-sm-12 col-xs-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'expenses_by_category'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'expenses_by_category'|_ }}</h3>
</div>
<div class="card-body">
<div class="center-chart">
@@ -75,8 +75,8 @@
</div>
<div class="col-lg-4 col-md-6 col-sm-12 col-xs-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'expenses_by_asset_account'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'expenses_by_asset_account'|_ }}</h3>
</div>
<div class="card-body">
<div class="center-chart">
@@ -94,8 +94,8 @@
</div>
<div class="col-lg-4 col-md-6 col-sm-12 col-xs-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'expenses_by_expense_account'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'expenses_by_expense_account'|_ }}</h3>
</div>
<div class="card-body">
<div class="center-chart">
@@ -124,8 +124,8 @@
<div class="{% if limits|length > 0 %}col-lg-9 col-md-9 col-sm-12 col-xs-12{% else %}col-lg-12 col-md-12 col-sm-12 col-xs-12{% endif %}">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'transactions'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'transactions'|_ }}</h3>
</div>
<div class="card-body">
{% include 'list.groups' %}
@@ -144,8 +144,8 @@
<div class="col-lg-3 col-md-3 col-sm-12 col-xs-12">
{% for limit in limits %}
<div class="box {% if limit.start_date == budgetLimit.start_date %}box-primary box-solid{% endif %}">
- <div class="box-header with-border">
- <h3 class="box-title"><a
+ <div class="card-header">
+ <h3 class="card-title"><a
href="{{ route('budgets.show.limit',[budget.id,limit.id]) }}">
{{ limit.start_date.isoFormat(monthAndDayFormat) }} &mdash;
{{ limit.end_date.isoFormat(monthAndDayFormat) }}
diff --git a/resources/views/categories/create.twig b/resources/views/categories/create.twig
index 1104655d43..d72b39b453 100644
--- a/resources/views/categories/create.twig
+++ b/resources/views/categories/create.twig
@@ -11,8 +11,8 @@
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
<div class="box box-primary">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'mandatoryFields'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'mandatoryFields'|_ }}</h3>
</div>
<div class="card-body">
{{ ExpandedForm.text('name') }}
@@ -22,8 +22,8 @@
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
{# panel for optional fields #}
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'optionalFields'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'optionalFields'|_ }}</h3>
</div>
<div class="card-body">
{{ ExpandedForm.textarea('notes', null, {helpText: trans('firefly.field_supports_markdown')} ) }}
@@ -36,8 +36,8 @@
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
{# panel for options #}
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'options'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'options'|_ }}</h3>
</div>
<div class="card-body">
{{ ExpandedForm.optionsList('create','category') }}
diff --git a/resources/views/categories/delete.twig b/resources/views/categories/delete.twig
index d48c921853..9e5d0adae6 100644
--- a/resources/views/categories/delete.twig
+++ b/resources/views/categories/delete.twig
@@ -11,8 +11,8 @@
<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="box-header with-border">
- <h3 class="box-title">{{ trans('form.delete_category', {'name': category.name}) }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ trans('form.delete_category', {'name': category.name}) }}</h3>
</div>
<div class="card-body">
<p class="text-danger">
diff --git a/resources/views/categories/edit.twig b/resources/views/categories/edit.twig
index e889f80810..989d739bfc 100644
--- a/resources/views/categories/edit.twig
+++ b/resources/views/categories/edit.twig
@@ -15,8 +15,8 @@
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-12">
<div class="box box-primary">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'mandatoryFields'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'mandatoryFields'|_ }}</h3>
</div>
<div class="card-body">
{{ ExpandedForm.text('name', category.name) }}
@@ -26,8 +26,8 @@
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
{# panel for optional fields #}
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'optionalFields'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'optionalFields'|_ }}</h3>
</div>
<div class="card-body">
{{ ExpandedForm.textarea('notes', preFilled.notes, {helpText: trans('firefly.field_supports_markdown')} ) }}
@@ -42,8 +42,8 @@
{# panel for options #}
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'options'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'options'|_ }}</h3>
</div>
<div class="card-body">
{{ ExpandedForm.optionsList('update','category') }}
diff --git a/resources/views/categories/no-category.twig b/resources/views/categories/no-category.twig
index 8e1321541b..7a864ca70e 100644
--- a/resources/views/categories/no-category.twig
+++ b/resources/views/categories/no-category.twig
@@ -18,8 +18,8 @@
<div class="row">
<div class="{% if periods|length > 0 %}col-lg-10 col-md-9 col-sm-12 col-xs-12{% else %}col-lg-12 col-md-12 col-sm-12 col-xs-12{% endif %}">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ subTitle }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ subTitle }}</h3>
</div>
<div class="box-body ">
diff --git a/resources/views/categories/show.twig b/resources/views/categories/show.twig
index 07786eba65..19fd28236d 100644
--- a/resources/views/categories/show.twig
+++ b/resources/views/categories/show.twig
@@ -10,8 +10,8 @@
{# both charts #}
<div class="{% if attachments.count() == 0 %}col-lg-6 col-md-12 col-sm-12 col-xs-12{% else %}col-lg-4 col-md-12 col-sm-12 col-xs-12{% endif %}">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">
+ <div class="card-header">
+ <h3 class="card-title">
{{ trans('firefly.chart_category_in_period', {name: category.name, start: start.isoFormat(monthAndDayFormat), end: end.isoFormat(monthAndDayFormat) }) }}
</h3>
</div>
@@ -22,8 +22,8 @@
</div>
<div class="{% if attachments.count() == 0 %}col-lg-6 col-md-12 col-sm-12 col-xs-12{% else %}col-lg-4 col-md-12 col-sm-12 col-xs-12{% endif %}">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">
+ <div class="card-header">
+ <h3 class="card-title">
{{ trans('firefly.chart_category_all', {name: category.name }) }}
</h3>
</div>
@@ -37,8 +37,8 @@
{# all chart #}
<div class="{% if attachments.count() == 0 %}col-lg-12 col-md-12 col-sm-12 col-xs-12{% else %}col-lg-8 col-md-12 col-sm-12 col-xs-12{% endif %}">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">
+ <div class="card-header">
+ <h3 class="card-title">
{{ trans('firefly.chart_category_all', {name: category.name }) }}
</h3>
</div>
@@ -51,8 +51,8 @@
{% if attachments.count() > 0 %}
<div class="col-lg-4 col-md-12 col-sm-12 col-xs-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">
+ <div class="card-header">
+ <h3 class="card-title">
{{ 'attachments'|_ }}
</h3>
</div>
@@ -75,8 +75,8 @@
<div class="{% if periods|length > 0 %}col-lg-10 col-md-8 col-sm-12 col-xs-12{% else %}col-lg-12 col-md-12 col-sm-12 col-xs-12{% endif %}">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'transactions'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'transactions'|_ }}</h3>
</div>
<div class="card-body">
{% if periods|length > 0 %}
diff --git a/resources/views/components/layout/sidebar.blade.php b/resources/views/components/layout/sidebar.blade.php
index 2d6b0632a5..779268a60f 100644
--- a/resources/views/components/layout/sidebar.blade.php
+++ b/resources/views/components/layout/sidebar.blade.php
@@ -204,12 +204,22 @@
<p>{{ __('firefly.currencies') }}</p>
</a>
</li>
+ @if(true === $featuringCer)
<li class="nav-item">
<a href="{{ route('exchange-rates.index') }}" class="nav-link {{ menu_item_active_partial('exchange-rates.') }}">
<em class="nav-icon bi bi-currency-exchange"></em>
<p>{{ __('firefly.menu_exchange_rates_index') }}</p>
</a>
</li>
+ @endif
+ @if(false === $featuringCer)
+ <li class="nav-item">
+ <span class="nav-link {{ menu_item_active_partial('exchange-rates.') }}">
+ <em class="nav-icon bi bi-currency-exchange"></em>
+ <p>{{ __('firefly.menu_exchange_rates_index') }} ({{ trans('firefly.cer_menu_disabled') }})</p>
+ </span>
+ </li>
+ @endif
<li class="nav-item">
<a href="{{ route('reports.index') }}" class="nav-link {{ menu_item_active_partial('reports.') }}">
<em class="nav-icon bi bi-bar-chart"></em>
diff --git a/resources/views/currencies/create.twig b/resources/views/currencies/create.twig
index 79a0633922..b665fae0aa 100644
--- a/resources/views/currencies/create.twig
+++ b/resources/views/currencies/create.twig
@@ -10,8 +10,8 @@
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
<div class="box box-primary">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'mandatoryFields'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'mandatoryFields'|_ }}</h3>
</div>
<div class="card-body">
{{ ExpandedForm.text('name',null,{'maxlength' : 48}) }}
@@ -28,8 +28,8 @@
{# panel for options #}
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'options'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'options'|_ }}</h3>
</div>
<div class="card-body">
{{ ExpandedForm.optionsList('create','currency') }}
diff --git a/resources/views/currencies/delete.twig b/resources/views/currencies/delete.twig
index 62d0334017..3629cf6237 100644
--- a/resources/views/currencies/delete.twig
+++ b/resources/views/currencies/delete.twig
@@ -11,8 +11,8 @@
<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="box-header with-border">
- <h3 class="box-title">{{ trans('form.delete_currency', {'name': currency.name}) }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ trans('form.delete_currency', {'name': currency.name}) }}</h3>
</div>
<div class="card-body">
<p class="text-danger">
diff --git a/resources/views/currencies/edit.twig b/resources/views/currencies/edit.twig
index f56a8b19c4..474bd677da 100644
--- a/resources/views/currencies/edit.twig
+++ b/resources/views/currencies/edit.twig
@@ -14,8 +14,8 @@
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
<div class="box box-primary">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'mandatoryFields'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'mandatoryFields'|_ }}</h3>
</div>
<div class="card-body">
{{ ExpandedForm.text('name', currency.name,{'maxlength' : 48}) }}
@@ -32,8 +32,8 @@
{# panel for options #}
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'options'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'options'|_ }}</h3>
</div>
<div class="card-body">
{{ ExpandedForm.optionsList('update','currency') }}
diff --git a/resources/views/exchange-rates/index.blade.php b/resources/views/exchange-rates/index.blade.php
new file mode 100644
index 0000000000..7c47c65f03
--- /dev/null
+++ b/resources/views/exchange-rates/index.blade.php
@@ -0,0 +1,7 @@
+@extends('layout.v3.session')
+@section('content')
+<div id="exchange_rates_index"></div>
+@endsection
+@section('scripts')
+ @vite(['js/pages/exchange-rates/index.js'])
+@endsection
diff --git a/resources/views/exchange-rates/index.twig b/resources/views/exchange-rates/index.twig
deleted file mode 100644
index 8d51135202..0000000000
--- a/resources/views/exchange-rates/index.twig
+++ /dev/null
@@ -1,12 +0,0 @@
-{% set VUE_SCRIPT_NAME = 'exchange-rates/index' %}
-{% extends './layout/default' %}
-{% block breadcrumbs %}
- {{ Breadcrumbs.render(Route.getCurrentRoute.getName, objectType) }}
-{% endblock %}
-
-{% block content %}
- <div id="exchange_rates_index"></div>
-{% endblock %}
-{% block scripts %}
-
-{% endblock %}
diff --git a/resources/views/export/index.twig b/resources/views/export/index.twig
index 2b5704e672..917dd5d44d 100644
--- a/resources/views/export/index.twig
+++ b/resources/views/export/index.twig
@@ -8,8 +8,8 @@
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
<div class="box box-primary">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'export_data_main_title'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'export_data_main_title'|_ }}</h3>
</div>
<div class="card-body">
<p>
diff --git a/resources/views/form/checkbox.blade.php b/resources/views/form/checkbox.blade.php
new file mode 100644
index 0000000000..a1dc33bd48
--- /dev/null
+++ b/resources/views/form/checkbox.blade.php
@@ -0,0 +1,16 @@
+<div class="row mb-3" id="{{ $name }}_holder">
+ <div class="col-sm-9 offset-sm-3">
+ <div class="form-check has-validation">
+ <!-- <input class="form-check-input" type="checkbox" id="gridCheck1"> -->
+ {{ Html::checkbox($name, $options['checked'], $value)->class($inputClasses)->id($options['id']) }}
+ <label class="form-check-label" for="{{ $options['id'] }}">
+ {{ $label }}
+ </label>
+ @if(array_key_exists('small', $options) && true === $options['small'])
+ TODO SMALL!!!!!!!
+ @endif
+ @include('form.help')
+ {% include 'form.feedback' %}
+ </div>
+ </div>
+</div>
diff --git a/resources/views/form/checkbox.twig b/resources/views/form/checkbox.twig
deleted file mode 100644
index 7e64d02030..0000000000
--- a/resources/views/form/checkbox.twig
+++ /dev/null
@@ -1,18 +0,0 @@
-<div class="{{ classes }}" id="{{ name }}_holder">
- <label for="{{ options.id }}" class="
- {% if options.small %}
- col-sm-8
- {% else %}
- col-sm-4
- {% endif %}
- control-label">{{ label }}</label>
- <div class="{% if options.small %}col-sm-4{% else %}col-sm-8{% endif %}">
- <div class="checkbox">
- <label>
- {{ Html.checkbox(name, options.checked, value).id(options.id) }}
- </label>
- </div>
- {% include 'form.help' %}
- {% include 'form.feedback' %}
- </div>
-</div>
diff --git a/resources/views/form/feedback.blade.php b/resources/views/form/feedback.blade.php
new file mode 100644
index 0000000000..707e41758b
--- /dev/null
+++ b/resources/views/form/feedback.blade.php
@@ -0,0 +1,5 @@
+@if($errors->has($name))
+<div class="invalid-feedback">
+ {{ $errors->first($name) }}
+</div>
+@endif
diff --git a/resources/views/form/feedback.twig b/resources/views/form/feedback.twig
deleted file mode 100644
index 94e5935c8f..0000000000
--- a/resources/views/form/feedback.twig
+++ /dev/null
@@ -1,4 +0,0 @@
-{% if errors.has(name) %}
- <span class="form-control-feedback"><span class="bi bi-x"></span></span>
- <p class="text-danger">{{ errors.first(name) }}</p>
-{% endif %}
diff --git a/resources/views/form/help.blade.php b/resources/views/form/help.blade.php
new file mode 100644
index 0000000000..0e6217ea5c
--- /dev/null
+++ b/resources/views/form/help.blade.php
@@ -0,0 +1,3 @@
+@if(array_key_exists('helpText', $options) && '' !== $options['helpText'])
+ <p class="help-block">{{ $options['helpText'] }}</p>
+@endif
diff --git a/resources/views/form/help.twig b/resources/views/form/help.twig
deleted file mode 100644
index d402fb623b..0000000000
--- a/resources/views/form/help.twig
+++ /dev/null
@@ -1,3 +0,0 @@
-{% if options.helpText %}
- <p class="help-block">{{ options.helpText|raw }}</p>
-{% endif %}
diff --git a/resources/views/form/text.blade.php b/resources/views/form/text.blade.php
new file mode 100644
index 0000000000..0bfdf6fa6a
--- /dev/null
+++ b/resources/views/form/text.blade.php
@@ -0,0 +1,9 @@
+<div class="{{ $classes }}" id="{{ $name }}_holder">
+ <label for="{{ $options['id'] }}" class="col-sm-4 control-label">{{ $label }}</label>
+
+ <div class="col-sm-8">
+ {{ Html::input('text', $name, $value)->id($options['id'])->class('form-control')->attribute('autocomplete','off')->attribute('spellcheck','false')->attribute('placeholder',$options['placeholder']) }}
+ @include('form.help')
+ {% include 'form.feedback' %}
+ </div>
+</div>
diff --git a/resources/views/form/text.twig b/resources/views/form/text.twig
deleted file mode 100644
index e1a9e3e341..0000000000
--- a/resources/views/form/text.twig
+++ /dev/null
@@ -1,9 +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">
- {{ Html.input('text', name, value).id(options.id).class('form-control').attribute('autocomplete','off').attribute('spellcheck','false').attribute('placeholder',options.placeholder) }}
- {% include 'form.help' %}
- {% include 'form.feedback' %}
- </div>
-</div>
diff --git a/resources/views/json/piggy-banks-old.twig b/resources/views/json/piggy-banks-old.twig
index 82e2a5513e..5668afd30b 100644
--- a/resources/views/json/piggy-banks-old.twig
+++ b/resources/views/json/piggy-banks-old.twig
@@ -1,6 +1,6 @@
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title"><a href="{{ route('piggy-banks.index') }}" title="{{ 'piggyBanks'|_ }}">{{ 'piggyBanks'|_ }}</a></h3>
+ <div class="card-header">
+ <h3 class="card-title"><a href="{{ route('piggy-banks.index') }}" title="{{ 'piggyBanks'|_ }}">{{ 'piggyBanks'|_ }}</a></h3>
</div>
<div class="card-body">
diff --git a/resources/views/list/periods.twig b/resources/views/list/periods.twig
index 14b307793b..cc813b655f 100644
--- a/resources/views/list/periods.twig
+++ b/resources/views/list/periods.twig
@@ -1,7 +1,7 @@
{% for period in periods %}
- <div class="box box-default">
- <div class="box-header with-border">
- <h3 class="box-title"><a href="{{ period.route }}">{{ period.title }}</a>
+ <div class="card">
+ <div class="card-header">
+ <h3 class="card-title"><a href="{{ period.route }}">{{ period.title }}</a>
</h3>
</div>
<div class="box-body no-padding">
diff --git a/resources/views/new-user/index.twig b/resources/views/new-user/index.twig
index d2bbaf5501..504fa97ce2 100644
--- a/resources/views/new-user/index.twig
+++ b/resources/views/new-user/index.twig
@@ -13,8 +13,8 @@
<div class="col-lg-6 col-lg-offset-3 col-md-12 col-xs-12">
<div class="box box-primary">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'getting_started'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'getting_started'|_ }}</h3>
</div>
<div class="card-body">
<p>
diff --git a/resources/views/object-groups/delete.twig b/resources/views/object-groups/delete.twig
index 29e73df6cf..6598e852da 100644
--- a/resources/views/object-groups/delete.twig
+++ b/resources/views/object-groups/delete.twig
@@ -11,8 +11,8 @@
<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="box-header with-border">
- <h3 class="box-title">{{ trans('form.delete_object_group', {'title': objectGroup.title}) }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ trans('form.delete_object_group', {'title': objectGroup.title}) }}</h3>
</div>
<div class="card-body">
<p class="text-danger">
diff --git a/resources/views/object-groups/edit.twig b/resources/views/object-groups/edit.twig
index 3a0403a7d6..162af8aa4c 100644
--- a/resources/views/object-groups/edit.twig
+++ b/resources/views/object-groups/edit.twig
@@ -15,8 +15,8 @@
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
<div class="box box-primary">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'mandatoryFields'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'mandatoryFields'|_ }}</h3>
</div>
<div class="card-body">
{{ ExpandedForm.text('title', objectGroup.title) }}
@@ -29,8 +29,8 @@
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
{# panel for options #}
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'options'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'options'|_ }}</h3>
</div>
<div class="card-body">
{{ ExpandedForm.optionsList('update','object group') }}
diff --git a/resources/views/partials/empty.twig b/resources/views/partials/empty.twig
index 581eb2a17b..885f8a06b7 100644
--- a/resources/views/partials/empty.twig
+++ b/resources/views/partials/empty.twig
@@ -1,8 +1,8 @@
<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="box box-success">
- <div class="box-header with-border">
- <h3 class="box-title">{{ ('no_'~type~'_title_'~objectType)|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ ('no_'~type~'_title_'~objectType)|_ }}</h3>
</div>
<div class="card-body">
diff --git a/resources/views/piggy-banks/add-mobile.twig b/resources/views/piggy-banks/add-mobile.twig
index cb36a8d859..7a46378aa9 100644
--- a/resources/views/piggy-banks/add-mobile.twig
+++ b/resources/views/piggy-banks/add-mobile.twig
@@ -10,8 +10,8 @@
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="box box-primary">
- <div class="box-header with-border">
- <h3 class="box-title">{{ trans('firefly.add_money_to_piggy', {name: piggyBank.name}) }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ trans('firefly.add_money_to_piggy', {name: piggyBank.name}) }}</h3>
</div>
<div class="card-body">
{% if total > 0 %}
diff --git a/resources/views/piggy-banks/create.twig b/resources/views/piggy-banks/create.twig
index b9459ff1d0..2662ab673a 100644
--- a/resources/views/piggy-banks/create.twig
+++ b/resources/views/piggy-banks/create.twig
@@ -11,8 +11,8 @@
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
<div class="box box-primary">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'mandatoryFields'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'mandatoryFields'|_ }}</h3>
</div>
<div class="card-body">
{{ ExpandedForm.text('name') }}
@@ -25,8 +25,8 @@
</div>
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'optionalFields'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'optionalFields'|_ }}</h3>
</div>
<div class="card-body">
{{ ExpandedForm.date('target_date') }}
@@ -41,8 +41,8 @@
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
{# panel for options #}
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'options'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'options'|_ }}</h3>
</div>
<div class="card-body">
{{ ExpandedForm.optionsList('create','piggy bank') }}
diff --git a/resources/views/piggy-banks/delete.twig b/resources/views/piggy-banks/delete.twig
index 3ef18d8d33..553e2662b5 100644
--- a/resources/views/piggy-banks/delete.twig
+++ b/resources/views/piggy-banks/delete.twig
@@ -11,8 +11,8 @@
<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="box-header with-border">
- <h3 class="box-title">{{ trans('firefly.delete_piggy_bank', {'name': piggyBank.name}) }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ trans('firefly.delete_piggy_bank', {'name': piggyBank.name}) }}</h3>
</div>
<div class="card-body">
<p class="text-danger">
diff --git a/resources/views/piggy-banks/edit.twig b/resources/views/piggy-banks/edit.twig
index fbdacf26dc..b9141aab45 100644
--- a/resources/views/piggy-banks/edit.twig
+++ b/resources/views/piggy-banks/edit.twig
@@ -16,8 +16,8 @@
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
<div class="box box-primary">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'mandatoryFields'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'mandatoryFields'|_ }}</h3>
</div>
<div class="card-body">
@@ -32,8 +32,8 @@
</div>
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'optionalFields'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'optionalFields'|_ }}</h3>
</div>
<div class="card-body">
{{ ExpandedForm.date('start_date') }}
@@ -49,8 +49,8 @@
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
{# panel for options #}
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'options'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'options'|_ }}</h3>
</div>
<div class="card-body">
{{ ExpandedForm.optionsList('update','piggy bank') }}
diff --git a/resources/views/piggy-banks/remove-mobile.twig b/resources/views/piggy-banks/remove-mobile.twig
index 5ab6e3a86a..48cf7b78b1 100644
--- a/resources/views/piggy-banks/remove-mobile.twig
+++ b/resources/views/piggy-banks/remove-mobile.twig
@@ -9,8 +9,8 @@
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="box box-primary">
- <div class="box-header with-border">
- <h3 class="box-title">{{ trans('firefly.remove_money_from_piggy_title', {name: piggyBank.name}) }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ trans('firefly.remove_money_from_piggy_title', {name: piggyBank.name}) }}</h3>
</div>
<div class="card-body">
diff --git a/resources/views/piggy-banks/show.twig b/resources/views/piggy-banks/show.twig
index f5140778eb..1764dd3ee5 100644
--- a/resources/views/piggy-banks/show.twig
+++ b/resources/views/piggy-banks/show.twig
@@ -8,8 +8,8 @@
<div class="row">
<div class="col-lg-8 col-md-8 col-sm-6">
<div class="box" id="piggyChart">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'events'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'events'|_ }}</h3>
</div>
<div class="card-body">
<canvas id="piggy-bank-history" class="wide-chart" height="400" width="100%"></canvas>
@@ -18,8 +18,8 @@
</div>
<div class="col-lg-4 col-md-4 col-sm-6">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'details'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'details'|_ }}</h3>
<div class="box-tools pull-right">
<div class="btn-group">
<button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><span class="bi bi-list"></span></button>
@@ -113,8 +113,8 @@
</div>
</div>
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'event_history'|_ }} (<a class="confirm-history-delete reset-link" href="#">{{ 'reset_history'|_ }}</a>)</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'event_history'|_ }} (<a class="confirm-history-delete reset-link" href="#">{{ 'reset_history'|_ }}</a>)</h3>
</div>
<div class="box-body no-padding" id="piggyEvents">
{% include 'list/piggy-bank-events' %}
@@ -128,8 +128,8 @@
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ trans('form.notes') }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ trans('form.notes') }}</h3>
</div>
<div class="box-body markdown">{{ piggy.notes|default('')|markdown }}
</div>
@@ -140,8 +140,8 @@
{% if attachments.count() > 0 %}
<div class="col-lg-4 col-md-6 col-sm-12 col-xs-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">
+ <div class="card-header">
+ <h3 class="card-title">
{{ 'attachments'|_ }}
</h3>
</div>
diff --git a/resources/views/profile/change-email.twig b/resources/views/profile/change-email.twig
index 6ab5ab1aa2..9a894789da 100644
--- a/resources/views/profile/change-email.twig
+++ b/resources/views/profile/change-email.twig
@@ -11,8 +11,8 @@
<div class="row">
<div class="col-lg-6 col-md-12 col-sm-12">
<div class="box box-primary">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'change_your_email'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'change_your_email'|_ }}</h3>
</div>
<div class="card-body">
diff --git a/resources/views/profile/change-password.twig b/resources/views/profile/change-password.twig
index cd297ad2e7..05291e3714 100644
--- a/resources/views/profile/change-password.twig
+++ b/resources/views/profile/change-password.twig
@@ -11,8 +11,8 @@
<div class="row">
<div class="col-lg-6 col-md-12 col-sm-12">
<div class="box box-primary">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'change_your_password'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'change_your_password'|_ }}</h3>
</div>
<div class="card-body">
diff --git a/resources/views/profile/delete-account.twig b/resources/views/profile/delete-account.twig
index 5271af33ec..69a2fb6b91 100644
--- a/resources/views/profile/delete-account.twig
+++ b/resources/views/profile/delete-account.twig
@@ -11,8 +11,8 @@
<div class="row">
<div class="col-lg-6 col-md-12 col-sm-12">
<div class="box box-danger">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'delete_your_account'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'delete_your_account'|_ }}</h3>
</div>
<div class="card-body">
diff --git a/resources/views/profile/index.twig b/resources/views/profile/index.twig
index aea40c1b23..ac207986f7 100644
--- a/resources/views/profile/index.twig
+++ b/resources/views/profile/index.twig
@@ -28,7 +28,7 @@
<!-- main options -->
<div role="tabpanel" class="tab-pane active" id="options">
- <div class="box box-default">
+ <div class="card">
<div class="card-body">
<p>
{{ trans('firefly.user_id_is',{user: userId})|raw }}
@@ -75,7 +75,7 @@
<!-- command line options -->
<div role="tabpanel" class="tab-pane" id="cmd">
- <div class="box box-default">
+ <div class="card">
<div class="card-body">
<p>
{{ 'explain_command_line_token'|_ }}
@@ -101,9 +101,9 @@
<!-- purge stuff -->
<div role="tabpanel" class="tab-pane" id="delete">
- <div class="box box-default">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'purge_data_title'|_ }}</h3>
+ <div class="card">
+ <div class="card-header">
+ <h3 class="card-title">{{ 'purge_data_title'|_ }}</h3>
</div>
<div class="box-body with-border">
<div class="col-lg-12">
@@ -122,9 +122,9 @@
</div>
</div>
<!-- delete stuff -->
- <div class="box box-default">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'delete_data_title'|_ }}</h3>
+ <div class="card">
+ <div class="card-header">
+ <h3 class="card-title">{{ 'delete_data_title'|_ }}</h3>
</div>
<div class="box-body with-border">
<div class="col-lg-12">
diff --git a/resources/views/profile/logout-other-sessions.twig b/resources/views/profile/logout-other-sessions.twig
index 950deaa9a8..387dfe82da 100644
--- a/resources/views/profile/logout-other-sessions.twig
+++ b/resources/views/profile/logout-other-sessions.twig
@@ -11,8 +11,8 @@
<div class="row">
<div class="col-lg-6 col-md-12 col-sm-12">
<div class="box box-primary">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'logout_other_sessions'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'logout_other_sessions'|_ }}</h3>
</div>
<div class="card-body">
<div class="form-group">
diff --git a/resources/views/profile/mfa/backup-codes-intro.twig b/resources/views/profile/mfa/backup-codes-intro.twig
index eaea7753e4..dd79ceab30 100644
--- a/resources/views/profile/mfa/backup-codes-intro.twig
+++ b/resources/views/profile/mfa/backup-codes-intro.twig
@@ -10,8 +10,8 @@
<div class="row">
<div class="col-lg-6 col-lg-offset-3 col-md-12 col-sm-12 col-xs-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'mfa_backup_codes_title'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'mfa_backup_codes_title'|_ }}</h3>
</div>
<div class="card-body">
<div class="form group">
diff --git a/resources/views/profile/mfa/backup-codes-post.twig b/resources/views/profile/mfa/backup-codes-post.twig
index 796166cecd..08991a2427 100644
--- a/resources/views/profile/mfa/backup-codes-post.twig
+++ b/resources/views/profile/mfa/backup-codes-post.twig
@@ -8,8 +8,8 @@
<div class="row">
<div class="col-lg-6 col-lg-offset-3 col-md-12 col-sm-12 col-xs-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'mfa_backup_codes_post_title'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'mfa_backup_codes_post_title'|_ }}</h3>
</div>
<div class="card-body">
<div class="form group">
diff --git a/resources/views/profile/mfa/disable-mfa.twig b/resources/views/profile/mfa/disable-mfa.twig
index ba26ce89a6..6525f014e5 100644
--- a/resources/views/profile/mfa/disable-mfa.twig
+++ b/resources/views/profile/mfa/disable-mfa.twig
@@ -10,8 +10,8 @@
<div class="row">
<div class="col-lg-6 col-lg-offset-3 col-md-12 col-sm-12 col-xs-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'disable_mfa_page'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'disable_mfa_page'|_ }}</h3>
</div>
<div class="card-body">
<p class="hidden-print">
diff --git a/resources/views/profile/mfa/enable-mfa.twig b/resources/views/profile/mfa/enable-mfa.twig
index 5cc987b1f6..3915cfc74d 100644
--- a/resources/views/profile/mfa/enable-mfa.twig
+++ b/resources/views/profile/mfa/enable-mfa.twig
@@ -10,8 +10,8 @@
<div class="row">
<div class="col-lg-6 col-lg-offset-3 col-md-12 col-sm-12 col-xs-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'pref_two_factor_auth_code'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'pref_two_factor_auth_code'|_ }}</h3>
</div>
<div class="card-body">
<p class="hidden-print">
diff --git a/resources/views/profile/mfa/index.twig b/resources/views/profile/mfa/index.twig
index 1d3f72f155..2191469d8c 100644
--- a/resources/views/profile/mfa/index.twig
+++ b/resources/views/profile/mfa/index.twig
@@ -9,8 +9,8 @@
<div class="row">
<div class="col-lg-8 col-lg-offset-2 col-md-12 col-sm-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">
+ <div class="card-header">
+ <h3 class="card-title">
{{ 'mfa_index_title'|_ }}
</h3>
</div>
diff --git a/resources/views/profile/new-backup-codes.twig b/resources/views/profile/new-backup-codes.twig
index e50e6efb06..c77fe8efb2 100644
--- a/resources/views/profile/new-backup-codes.twig
+++ b/resources/views/profile/new-backup-codes.twig
@@ -8,8 +8,8 @@
<div class="row">
<div class="col-lg-6 col-lg-offset-3 col-md-12 col-sm-12 col-xs-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'pref_two_factor_auth_code'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'pref_two_factor_auth_code'|_ }}</h3>
</div>
<div class="card-body">
<div class="form group">
diff --git a/resources/views/profile/oauth/index.twig b/resources/views/profile/oauth/index.twig
index 90def31477..e9e6e3768b 100644
--- a/resources/views/profile/oauth/index.twig
+++ b/resources/views/profile/oauth/index.twig
@@ -11,9 +11,9 @@
<div class="col-lg-8 col-lg-offset-2 col-md-12 col-sm-12">
<div class="row">
<div class="col-lg-12">
- <div class="box box-default">
+ <div class="card">
<div class="box-header">
- <h3 class="box-title">{{ 'oauth_tokens'|_ }}</h3>
+ <h3 class="card-title">{{ 'oauth_tokens'|_ }}</h3>
</div>
<div class="card-body">
diff --git a/resources/views/recurring/create.twig b/resources/views/recurring/create.twig
index e9027d1835..eedd70ae7e 100644
--- a/resources/views/recurring/create.twig
+++ b/resources/views/recurring/create.twig
@@ -13,8 +13,8 @@
<div class="col-lg-6 col-md-6 col-sm-12">
{# mandatory recurrence stuff #}
<div class="box box-primary">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'mandatory_for_recurring'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'mandatory_for_recurring'|_ }}</h3>
</div>
<div class="card-body">
{{ ExpandedForm.text('title') }}
@@ -45,8 +45,8 @@
<div class="col-lg-6 col-md-6 col-sm-12">
{# optional recurrence stuff #}
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'optional_for_recurring'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'optional_for_recurring'|_ }}</h3>
</div>
<div class="card-body">
{{ ExpandedForm.textarea('recurring_description') }}
@@ -64,8 +64,8 @@
<div class="col-lg-6 col-md-6 col-sm-12">
{# mandatory transaction information #}
<div class="box box-primary">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'mandatory_for_transaction'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'mandatory_for_transaction'|_ }}</h3>
</div>
<div class="card-body">
<p><em>{{ 'mandatory_fields_for_tranaction'|_ }}</em></p>
@@ -115,8 +115,8 @@
<div class="col-lg-6 col-md-6 col-sm-12">
{# optional transaction information #}
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'optional_for_transaction'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'optional_for_transaction'|_ }}</h3>
</div>
<div class="card-body">
{# transaction information (optional) #}
@@ -154,8 +154,8 @@
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'options'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'options'|_ }}</h3>
</div>
<div class="card-body">
{{ ExpandedForm.optionsList('create','recurrence') }}
@@ -171,8 +171,8 @@
{#
<div class="row">
<div class="box box-primary">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'expected_repetitions'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'expected_repetitions'|_ }}</h3>
</div>
<div class="card-body">
Here.
diff --git a/resources/views/recurring/delete.twig b/resources/views/recurring/delete.twig
index f874022ac9..651491b147 100644
--- a/resources/views/recurring/delete.twig
+++ b/resources/views/recurring/delete.twig
@@ -11,8 +11,8 @@
<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="box-header with-border">
- <h3 class="box-title">{{ trans('form.delete_recurring', {'title': recurrence.title}) }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ trans('form.delete_recurring', {'title': recurrence.title}) }}</h3>
</div>
<div class="card-body">
<p class="text-danger">
diff --git a/resources/views/recurring/edit.twig b/resources/views/recurring/edit.twig
index 170336539a..6d99e14d26 100644
--- a/resources/views/recurring/edit.twig
+++ b/resources/views/recurring/edit.twig
@@ -15,8 +15,8 @@
<div class="col-lg-6 col-md-6 col-sm-12">
{# mandatory recurrence stuff #}
<div class="box box-primary">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'mandatory_for_recurring'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'mandatory_for_recurring'|_ }}</h3>
</div>
<div class="card-body">
<input type="hidden" name="id" value="{{ array.id }}"/>
@@ -47,8 +47,8 @@
<div class="col-lg-6 col-md-6 col-sm-12">
{# optional recurrence stuff #}
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'optional_for_recurring'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'optional_for_recurring'|_ }}</h3>
</div>
<div class="card-body">
{{ ExpandedForm.textarea('recurring_description',array.description) }}
@@ -66,8 +66,8 @@
<div class="col-lg-6 col-md-6 col-sm-12">
{# mandatory transaction information #}
<div class="box box-primary">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'mandatory_for_transaction'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'mandatory_for_transaction'|_ }}</h3>
</div>
<div class="card-body">
<p><em>{{ 'mandatory_fields_for_tranaction'|_ }}</em></p>
@@ -113,8 +113,8 @@
<div class="col-lg-6 col-md-6 col-sm-12">
{# optional transaction information #}
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'optional_for_transaction'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'optional_for_transaction'|_ }}</h3>
</div>
<div class="card-body">
{# transaction information (optional) #}
@@ -153,8 +153,8 @@
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'options'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'options'|_ }}</h3>
</div>
<div class="card-body">
{{ ExpandedForm.optionsList('update','recurrence') }}
@@ -170,8 +170,8 @@
{#
<div class="row">
<div class="box box-primary">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'expected_repetitions'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'expected_repetitions'|_ }}</h3>
</div>
<div class="card-body">
Here.
diff --git a/resources/views/recurring/old-index.twig b/resources/views/recurring/old-index.twig
index fdb92f2daf..6682b536d2 100644
--- a/resources/views/recurring/old-index.twig
+++ b/resources/views/recurring/old-index.twig
@@ -10,8 +10,8 @@
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">
+ <div class="card-header">
+ <h3 class="card-title">
{{ 'recurrences'|_ }}
</h3>
<div class="box-tools pull-right">
diff --git a/resources/views/recurring/show.twig b/resources/views/recurring/show.twig
index c59320ee96..71f13769b2 100644
--- a/resources/views/recurring/show.twig
+++ b/resources/views/recurring/show.twig
@@ -9,8 +9,8 @@
<!-- basic info -->
<div class="col-lg-8 col-md-12 col-sm-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">
+ <div class="card-header">
+ <h3 class="card-title">
{{ array.title }}
({{ array.type }})
@@ -62,8 +62,8 @@
<!-- next and previous repetitions -->
<div class="col-lg-4 col-md-12 col-sm-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">
+ <div class="card-header">
+ <h3 class="card-title">
{{ ('expected_'~array.type~'s')|_ }}
</h3>
</div>
@@ -119,8 +119,8 @@
<!-- transactions -->
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">
+ <div class="card-header">
+ <h3 class="card-title">
{{ 'transaction_data'|_ }}
</h3>
</div>
@@ -199,8 +199,8 @@
<!-- meta data -->
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">
+ <div class="card-header">
+ <h3 class="card-title">
{{ ('created_'~array.type~'s')|_ }}
</h3>
</div>
diff --git a/resources/views/reports/audit/report.twig b/resources/views/reports/audit/report.twig
index 8a1f1ac0ff..20cc50474d 100644
--- a/resources/views/reports/audit/report.twig
+++ b/resources/views/reports/audit/report.twig
@@ -9,8 +9,8 @@
<div class="row no-print">
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
<div class="box" id="optionsBox">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'options'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'options'|_ }}</h3>
</div>
<div class="card-body">
<ul class="list-inline">
@@ -32,8 +32,8 @@
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ account.name }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ account.name }}</h3>
</div>
{% set url = route('accounts.show',account.id) %}
{% if not auditData[account.id].exists %}
diff --git a/resources/views/reports/budget/month.twig b/resources/views/reports/budget/month.twig
index 811ff4b589..ee7050a208 100644
--- a/resources/views/reports/budget/month.twig
+++ b/resources/views/reports/budget/month.twig
@@ -9,8 +9,8 @@
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'accounts'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'accounts'|_ }}</h3>
</div>
<div class="box-body table-responsive no-padding" id="accountsHolder">
</div>
@@ -24,8 +24,8 @@
</div>
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'budgets'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'budgets'|_ }}</h3>
</div>
<div class="box-body table-responsive no-padding" id="budgetsHolder">
</div>
@@ -41,8 +41,8 @@
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'account_per_budget'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'account_per_budget'|_ }}</h3>
</div>
<div class="box-body table-responsive no-padding" id="accountPerbudgetHolder">
</div>
@@ -58,8 +58,8 @@
<div class="row">
<div class="col-lg-6 col-md-6">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'expense_per_budget'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'expense_per_budget'|_ }}</h3>
</div>
<div class="card-body">
<div class="center-chart">
@@ -70,8 +70,8 @@
</div>
<div class="col-lg-6 col-md-6">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'expense_per_category'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'expense_per_category'|_ }}</h3>
</div>
<div class="card-body">
<div class="center-chart">
@@ -84,8 +84,8 @@
<div class="row">
<div class="col-lg-6 col-md-6">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'expense_per_source_account'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'expense_per_source_account'|_ }}</h3>
</div>
<div class="card-body">
<div class="center-chart">
@@ -96,8 +96,8 @@
</div>
<div class="col-lg-6 col-md-6">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'expense_per_destination_account'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'expense_per_destination_account'|_ }}</h3>
</div>
<div class="card-body">
<div class="center-chart">
@@ -112,8 +112,8 @@
<div class="row">
<div class="col-lg-12">
<div class="box main_budget_chart">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'expenses'|_ }} ({{ budget.name }})</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'expenses'|_ }} ({{ budget.name }})</h3>
</div>
<div class="card-body">
<canvas class="main_budget_canvas" data-url="{{ route('chart.budget.main', [accountIds, budget.id, start.format('Ymd'), end.format('Ymd')]) }}" id="in-out-chart-{{ budget.id }}" class="wide-chart" height="400" width="100%"></canvas>
@@ -125,8 +125,8 @@
<div class="row">
<div class="col-lg-6">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'average_spending_per_destination'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'average_spending_per_destination'|_ }}</h3>
</div>
<div class="box-body table-responsive no-padding" id="avgExpensesHolder">
</div>
@@ -141,8 +141,8 @@
<div class="col-lg-6">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'expenses'|_ }} ({{ trans('firefly.topX', {number: listLength}) }})</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'expenses'|_ }} ({{ trans('firefly.topX', {number: listLength}) }})</h3>
</div>
<div class="box-body table-responsive no-padding" id="topExpensesHolder">
</div>
diff --git a/resources/views/reports/category/month.twig b/resources/views/reports/category/month.twig
index e94a689f7e..a8b2fa28b9 100644
--- a/resources/views/reports/category/month.twig
+++ b/resources/views/reports/category/month.twig
@@ -9,8 +9,8 @@
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'accounts'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'accounts'|_ }}</h3>
</div>
<div class="box-body table-responsive no-padding" id="accountsHolder">
</div>
@@ -24,8 +24,8 @@
</div>
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'categories'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'categories'|_ }}</h3>
</div>
<div class="box-body table-responsive no-padding" id="categoriesHolder">
</div>
@@ -41,8 +41,8 @@
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'account_per_category'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'account_per_category'|_ }}</h3>
</div>
<div class="box-body table-responsive no-padding" id="accountPerCategoryHolder">
</div>
@@ -58,8 +58,8 @@
<div class="row">
<div class="col-lg-4 col-md-6">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'expense_per_category'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'expense_per_category'|_ }}</h3>
</div>
<div class="card-body">
<div class="center-chart">
@@ -70,8 +70,8 @@
</div>
<div class="col-lg-4 col-md-6">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'income_per_category'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'income_per_category'|_ }}</h3>
</div>
<div class="card-body">
<div class="center-chart">
@@ -82,8 +82,8 @@
</div>
<div class="col-lg-4 col-md-6">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'expense_per_budget'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'expense_per_budget'|_ }}</h3>
</div>
<div class="card-body">
<div class="center-chart">
@@ -96,8 +96,8 @@
<div class="row">
<div class="col-lg-6 col-md-6">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'expense_per_source_account'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'expense_per_source_account'|_ }}</h3>
</div>
<div class="card-body">
<div class="center-chart">
@@ -108,8 +108,8 @@
</div>
<div class="col-lg-6 col-md-6">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'income_per_source_account'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'income_per_source_account'|_ }}</h3>
</div>
<div class="card-body">
<div class="center-chart">
@@ -122,8 +122,8 @@
<div class="row">
<div class="col-lg-6 col-md-6">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'expense_per_destination_account'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'expense_per_destination_account'|_ }}</h3>
</div>
<div class="card-body">
<div class="center-chart">
@@ -134,8 +134,8 @@
</div>
<div class="col-lg-6 col-md-6">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'income_per_destination_account'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'income_per_destination_account'|_ }}</h3>
</div>
<div class="card-body">
<div class="center-chart">
@@ -150,8 +150,8 @@
<div class="row">
<div class="col-lg-12">
<div class="box main_budget_chart">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'income_and_expenses'|_ }} ({{ category.name }})</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'income_and_expenses'|_ }} ({{ category.name }})</h3>
</div>
<div class="card-body">
<canvas class="main_category_canvas" data-url="{{ route('chart.category.main', [accountIds, category.id, start.format('Ymd'), end.format('Ymd')]) }}" id="in-out-chart-{{ category.id }}" class="wide-chart" height="400" width="100%"></canvas>
@@ -163,8 +163,8 @@
<div class="row">
<div class="col-lg-6">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'average_spending_per_destination'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'average_spending_per_destination'|_ }}</h3>
</div>
<div class="box-body table-responsive no-padding" id="avgExpensesHolder">
</div>
@@ -178,8 +178,8 @@
</div>
<div class="col-lg-6">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'average_earning_per_source'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'average_earning_per_source'|_ }}</h3>
</div>
<div class="box-body table-responsive no-padding" id="avgIncomeHolder">
</div>
@@ -195,8 +195,8 @@
<div class="row">
<div class="col-lg-6">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'expenses'|_ }} ({{ trans('firefly.topX', {number: listLength}) }})</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'expenses'|_ }} ({{ trans('firefly.topX', {number: listLength}) }})</h3>
</div>
<div class="box-body table-responsive no-padding" id="topExpensesHolder">
</div>
@@ -210,8 +210,8 @@
</div>
<div class="col-lg-6">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'income'|_ }} ({{ trans('firefly.topX', {number: listLength}) }})</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'income'|_ }} ({{ trans('firefly.topX', {number: listLength}) }})</h3>
</div>
<div class="box-body table-responsive no-padding" id="topIncomeHolder">
</div>
diff --git a/resources/views/reports/default/month.twig b/resources/views/reports/default/month.twig
index 0df23ef648..a9383a6414 100644
--- a/resources/views/reports/default/month.twig
+++ b/resources/views/reports/default/month.twig
@@ -10,8 +10,8 @@
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'accountBalances'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'accountBalances'|_ }}</h3>
</div>
<div class="card-body">
<canvas id="account-balances-chart" class="wide-chart" height="400" width="100%"></canvas>
@@ -24,8 +24,8 @@
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-6">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'accountBalances'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'accountBalances'|_ }}</h3>
</div>
<div class="box-body table-responsive no-padding" id="accountReport">
</div>
@@ -39,8 +39,8 @@
</div>
<div class="col-lg-6 col-md-6 col-sm-6">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'incomeVsExpenses'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'incomeVsExpenses'|_ }}</h3>
</div>
<div class="box-body table-responsive no-padding" id="incomeVsExpenseReport">
</div>
@@ -58,8 +58,8 @@
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'income'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'income'|_ }}</h3>
</div>
<div class="box-body table-responsive no-padding" id="incomeReport">
</div>
@@ -73,8 +73,8 @@
</div>
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'expenses'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'expenses'|_ }}</h3>
</div>
<div class="box-body table-responsive no-padding" id="expenseReport">
</div>
@@ -92,8 +92,8 @@
<div class="col-lg-8 col-md-8 col-sm-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'budgets'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'budgets'|_ }}</h3>
</div>
<div class="box-body table-responsive no-padding" id="budgetReport">
</div>
@@ -109,8 +109,8 @@
</div>
<div class="col-lg-4 col-md-4 col-sm-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'categories'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'categories'|_ }}</h3>
</div>
<div class="box-body table-responsive no-padding" id="categoryReport"></div>
{# loading indicator #}
@@ -125,8 +125,8 @@
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'budgets'|_ }} ({{ 'splitByAccount'|_|lower }})</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'budgets'|_ }} ({{ 'splitByAccount'|_|lower }})</h3>
</div>
<div class="box-body table-responsive no-padding" id="balanceReport">
</div>
@@ -143,8 +143,8 @@
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'bills'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'bills'|_ }}</h3>
</div>
<div class="box-body table-responsive no-padding" id="billReport"></div>
{# loading indicator #}
diff --git a/resources/views/reports/default/multi-year.twig b/resources/views/reports/default/multi-year.twig
index 90f8ac6338..a78c4f1cba 100644
--- a/resources/views/reports/default/multi-year.twig
+++ b/resources/views/reports/default/multi-year.twig
@@ -10,8 +10,8 @@
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="box" id="year-inc-exp">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'incomeVsExpenses'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'incomeVsExpenses'|_ }}</h3>
</div>
<div class="card-body">
<canvas id="income-expenses-chart" class="wide-chart" height="400" width="100%"></canvas>
@@ -24,8 +24,8 @@
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'accountBalances'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'accountBalances'|_ }}</h3>
</div>
<div class="box-body table-responsive no-padding" id="accountReport">
</div>
@@ -39,8 +39,8 @@
</div>
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'incomeVsExpenses'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'incomeVsExpenses'|_ }}</h3>
</div>
<div class="box-body table-responsive no-padding" id="incomeVsExpenseReport">
</div>
@@ -58,8 +58,8 @@
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'income'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'income'|_ }}</h3>
</div>
<div class="box-body table-responsive no-padding" id="incomeReport">
</div>
@@ -74,8 +74,8 @@
{# block with expenses #}
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'expenses'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'expenses'|_ }}</h3>
</div>
<div class="box-body table-responsive no-padding" id="expenseReport">
</div>
@@ -93,8 +93,8 @@
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'net_worth'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'net_worth'|_ }}</h3>
</div>
<div class="card-body">
<canvas id="net-worth" class="wide-chart" height="400" width="100%"></canvas>
@@ -113,8 +113,8 @@
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'budgets'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'budgets'|_ }}</h3>
</div>
<div class="box-body no-padding table-responsive" id="budgetPeriodReport">
</div>
@@ -133,8 +133,8 @@
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'chart'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'chart'|_ }}</h3>
</div>
<div class="card-body">
<p id="budget_help" class="text-muted text-center">{{ 'budget_chart_click'|_ }}</p>
@@ -148,8 +148,8 @@
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'categories'|_ }} ({{ 'expenses'|_ }})</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'categories'|_ }} ({{ 'expenses'|_ }})</h3>
</div>
<div class="box-body no-padding table-responsive" id="categoryExpense">
</div>
@@ -167,8 +167,8 @@
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'categories'|_ }} ({{ 'income'|_ }})</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'categories'|_ }} ({{ 'income'|_ }})</h3>
</div>
<div class="box-body no-padding table-responsive" id="categoryIncome">
</div>
@@ -186,8 +186,8 @@
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'chart'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'chart'|_ }}</h3>
</div>
<div class="card-body">
<p id="category_help" class="text-muted text-center">{{ 'category_chart_click'|_ }}</p>
diff --git a/resources/views/reports/default/year.twig b/resources/views/reports/default/year.twig
index a8fd1d4d43..df4a73661b 100644
--- a/resources/views/reports/default/year.twig
+++ b/resources/views/reports/default/year.twig
@@ -10,8 +10,8 @@
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="box" id="year-inc-exp">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'incomeVsExpenses'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'incomeVsExpenses'|_ }}</h3>
</div>
<div class="card-body">
<canvas id="income-expenses-chart" class="wide-chart" height="400" width="100%"></canvas>
@@ -24,8 +24,8 @@
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'accountBalances'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'accountBalances'|_ }}</h3>
</div>
<div class="box-body table-responsive no-padding" id="accountReport">
</div>
@@ -39,8 +39,8 @@
</div>
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'incomeVsExpenses'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'incomeVsExpenses'|_ }}</h3>
</div>
<div class="box-body table-responsive no-padding" id="incomeVsExpenseReport">
</div>
@@ -58,8 +58,8 @@
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'income'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'income'|_ }}</h3>
</div>
<div class="box-body table-responsive no-padding" id="incomeReport">
</div>
@@ -73,8 +73,8 @@
</div>
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'expenses'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'expenses'|_ }}</h3>
</div>
<div class="box-body table-responsive no-padding" id="expenseReport">
</div>
@@ -92,8 +92,8 @@
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'net_worth'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'net_worth'|_ }}</h3>
</div>
<div class="card-body">
<canvas id="net-worth" class="wide-chart" height="400" width="100%"></canvas>
@@ -111,8 +111,8 @@
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'budgets'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'budgets'|_ }}</h3>
</div>
<div class="box-body no-padding table-responsive" id="budgetPeriodReport">
</div>
@@ -131,8 +131,8 @@
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'chart'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'chart'|_ }}</h3>
</div>
<div class="card-body">
<p id="budget_help" class="text-muted text-center">{{ 'budget_chart_click'|_ }}</p>
@@ -146,8 +146,8 @@
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'categories'|_ }} ({{ 'expenses'|_ }})</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'categories'|_ }} ({{ 'expenses'|_ }})</h3>
</div>
<div class="box-body no-padding table-responsive" id="categoryExpense">
</div>
@@ -165,8 +165,8 @@
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'categories'|_ }} ({{ 'income'|_ }})</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'categories'|_ }} ({{ 'income'|_ }})</h3>
</div>
<div class="box-body no-padding table-responsive" id="categoryIncome">
</div>
@@ -184,8 +184,8 @@
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'chart'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'chart'|_ }}</h3>
</div>
<div class="card-body">
<p id="category_help" class="text-muted text-center">{{ 'category_chart_click'|_ }}</p>
diff --git a/resources/views/reports/double/report.twig b/resources/views/reports/double/report.twig
index 5ebd29d8e5..e43e6e4dc3 100644
--- a/resources/views/reports/double/report.twig
+++ b/resources/views/reports/double/report.twig
@@ -9,8 +9,8 @@
<div class="row">
<div class="col-lg-6 col-md-12 col-sm-12 col-xs-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'in_out_accounts'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'in_out_accounts'|_ }}</h3>
</div>
<div class="box-body table-responsive no-padding" id="opsAccounts">
{# loading indicator #}
@@ -25,8 +25,8 @@
<div class="col-lg-6 col-md-12 col-sm-12 col-xs-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'in_out_accounts_per_asset'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'in_out_accounts_per_asset'|_ }}</h3>
</div>
<div class="box-body table-responsive no-padding" id="opsAccountsAsset">
{# loading indicator #}
@@ -43,8 +43,8 @@
<div class="row">
<div class="col-lg-4 col-md-6">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'expense_per_category'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'expense_per_category'|_ }}</h3>
</div>
<div class="card-body">
<div class="center-chart">
@@ -55,8 +55,8 @@
</div>
<div class="col-lg-4 col-md-6">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'income_per_category'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'income_per_category'|_ }}</h3>
</div>
<div class="card-body">
<div class="center-chart">
@@ -67,8 +67,8 @@
</div>
<div class="col-lg-4 col-md-6">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'expense_per_budget'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'expense_per_budget'|_ }}</h3>
</div>
<div class="card-body">
<div class="center-chart">
@@ -82,8 +82,8 @@
<div class="row">
<div class="col-lg-6 col-md-6">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'expense_per_tag'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'expense_per_tag'|_ }}</h3>
</div>
<div class="card-body">
<div class="center-chart">
@@ -99,8 +99,8 @@
</div>
<div class="col-lg-6 col-md-6">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'income_per_tag'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'income_per_tag'|_ }}</h3>
</div>
<div class="card-body">
<div class="center-chart">
@@ -121,8 +121,8 @@
<div class="row">
<div class="col-lg-12">
<div class="box" id="incomeAndExpensesChart">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'income_and_expenses'|_ }} ({{ account.name }}) {% if account.iban %}({{ account.iban }}){% endif %}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'income_and_expenses'|_ }} ({{ account.name }}) {% if account.iban %}({{ account.iban }}){% endif %}</h3>
</div>
<div class="card-body">
<canvas class="main_double_canvas"
@@ -137,8 +137,8 @@
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'expenses'|_ }} ({{ trans('firefly.topX', {number: listLength}) }})</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'expenses'|_ }} ({{ trans('firefly.topX', {number: listLength}) }})</h3>
</div>
<div class="box-body table-responsive no-padding" id="topExpensesHolder">
{# loading indicator #}
@@ -153,8 +153,8 @@
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'income'|_ }} ({{ trans('firefly.topX', {number: listLength}) }})</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'income'|_ }} ({{ trans('firefly.topX', {number: listLength}) }})</h3>
</div>
<div class="box-body table-responsive no-padding" id="topIncomeHolder">
{# loading indicator #}
@@ -171,8 +171,8 @@
<div class="row">
<div class="col-lg-6">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'average_spending_per_source'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'average_spending_per_source'|_ }}</h3>
</div>
<div class="box-body table-responsive no-padding" id="avgExpensesHolder">
</div>
@@ -186,8 +186,8 @@
</div>
<div class="col-lg-6">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'average_earning_per_destination'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'average_earning_per_destination'|_ }}</h3>
</div>
<div class="box-body table-responsive no-padding" id="avgIncomeHolder">
</div>
diff --git a/resources/views/reports/tag/month.twig b/resources/views/reports/tag/month.twig
index ae8f1e78bb..ae18cd68c9 100644
--- a/resources/views/reports/tag/month.twig
+++ b/resources/views/reports/tag/month.twig
@@ -9,8 +9,8 @@
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'accounts'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'accounts'|_ }}</h3>
</div>
<div class="box-body table-responsive no-padding" id="accountsHolder">
</div>
@@ -24,8 +24,8 @@
</div>
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'tags'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'tags'|_ }}</h3>
</div>
<div class="box-body table-responsive no-padding" id="tagsHolder">
</div>
@@ -41,8 +41,8 @@
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'account_per_tag'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'account_per_tag'|_ }}</h3>
</div>
<div class="box-body table-responsive no-padding" id="accountPerTagHolder">
</div>
@@ -58,8 +58,8 @@
<div class="row">
<div class="col-lg-6 col-md-6">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'expense_per_tag'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'expense_per_tag'|_ }}</h3>
</div>
<div class="card-body">
<div class="center-chart">
@@ -70,8 +70,8 @@
</div>
<div class="col-lg-6 col-md-6">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'income_per_tag'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'income_per_tag'|_ }}</h3>
</div>
<div class="card-body">
<div class="center-chart">
@@ -84,8 +84,8 @@
<div class="row">
<div class="col-lg-4 col-md-6">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'expense_per_category'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'expense_per_category'|_ }}</h3>
</div>
<div class="card-body">
<div class="center-chart">
@@ -96,8 +96,8 @@
</div>
<div class="col-lg-4 col-md-6">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'income_per_category'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'income_per_category'|_ }}</h3>
</div>
<div class="card-body">
<div class="center-chart">
@@ -108,8 +108,8 @@
</div>
<div class="col-lg-4 col-md-6">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'expense_per_budget'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'expense_per_budget'|_ }}</h3>
</div>
<div class="card-body">
<div class="center-chart">
@@ -122,8 +122,8 @@
<div class="row">
<div class="col-lg-6 col-md-6">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'expense_per_source_account'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'expense_per_source_account'|_ }}</h3>
</div>
<div class="card-body">
<div class="center-chart">
@@ -134,8 +134,8 @@
</div>
<div class="col-lg-6 col-md-6">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'income_per_source_account'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'income_per_source_account'|_ }}</h3>
</div>
<div class="card-body">
<div class="center-chart">
@@ -148,8 +148,8 @@
<div class="row">
<div class="col-lg-6 col-md-6">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'expense_per_destination_account'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'expense_per_destination_account'|_ }}</h3>
</div>
<div class="card-body">
<div class="center-chart">
@@ -160,8 +160,8 @@
</div>
<div class="col-lg-6 col-md-6">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'income_per_destination_account'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'income_per_destination_account'|_ }}</h3>
</div>
<div class="card-body">
<div class="center-chart">
@@ -176,8 +176,8 @@
<div class="row">
<div class="col-lg-12">
<div class="box main_budget_chart">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'income_and_expenses'|_ }} ({{ tag.tag }})</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'income_and_expenses'|_ }} ({{ tag.tag }})</h3>
</div>
<div class="card-body">
<canvas class="main_tag_canvas"
@@ -194,8 +194,8 @@
<div class="row">
<div class="col-lg-6">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'average_spending_per_destination'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'average_spending_per_destination'|_ }}</h3>
</div>
<div class="box-body table-responsive no-padding" id="avgExpensesHolder">
</div>
@@ -209,8 +209,8 @@
</div>
<div class="col-lg-6">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'average_earning_per_source'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'average_earning_per_source'|_ }}</h3>
</div>
<div class="box-body table-responsive no-padding" id="avgIncomeHolder">
</div>
@@ -226,8 +226,8 @@
<div class="row">
<div class="col-lg-6">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'expenses'|_ }} ({{ trans('firefly.topX', {number: listLength}) }})</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'expenses'|_ }} ({{ trans('firefly.topX', {number: listLength}) }})</h3>
</div>
<div class="box-body table-responsive no-padding" id="topExpensesHolder">
</div>
@@ -241,8 +241,8 @@
</div>
<div class="col-lg-6">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'income'|_ }} ({{ trans('firefly.topX', {number: listLength}) }})</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'income'|_ }} ({{ trans('firefly.topX', {number: listLength}) }})</h3>
</div>
<div class="box-body table-responsive no-padding" id="topIncomeHolder">
</div>
diff --git a/resources/views/rules/old-index.twig b/resources/views/rules/old-index.twig
index 4c961f17e1..95e87e7ff2 100644
--- a/resources/views/rules/old-index.twig
+++ b/resources/views/rules/old-index.twig
@@ -25,8 +25,8 @@
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="box rules-box" data-group="{{ ruleGroup.id }}">
- <div class="box-header with-border">
- <h3 class="box-title">
+ <div class="card-header">
+ <h3 class="card-title">
{% if ruleGroup.active %}
{{ ruleGroup.title }}
{% else %}
diff --git a/resources/views/rules/rule-group/create.twig b/resources/views/rules/rule-group/create.twig
index 03aaabc028..874a7f8a52 100644
--- a/resources/views/rules/rule-group/create.twig
+++ b/resources/views/rules/rule-group/create.twig
@@ -10,8 +10,8 @@
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-12">
<div class="box box-primary">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'mandatoryFields'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'mandatoryFields'|_ }}</h3>
</div>
<div class="card-body">
{{ ExpandedForm.text('title') }}
@@ -22,8 +22,8 @@
{# optional fields #}
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'optionalFields'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'optionalFields'|_ }}</h3>
</div>
<div class="card-body">
{{ ExpandedForm.textarea('description') }}
@@ -35,8 +35,8 @@
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
{# panel for options #}
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'options'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'options'|_ }}</h3>
</div>
<div class="card-body">
{{ ExpandedForm.optionsList('create','rule-group') }}
diff --git a/resources/views/rules/rule-group/delete.twig b/resources/views/rules/rule-group/delete.twig
index 404a6bf11a..bd278d461f 100644
--- a/resources/views/rules/rule-group/delete.twig
+++ b/resources/views/rules/rule-group/delete.twig
@@ -11,8 +11,8 @@
<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="box-header with-border">
- <h3 class="box-title">{{ trans('form.delete_rule_group', {'title': ruleGroup.title}) }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ trans('form.delete_rule_group', {'title': ruleGroup.title}) }}</h3>
</div>
<div class="card-body">
<p class="text-danger">
diff --git a/resources/views/rules/rule-group/edit.twig b/resources/views/rules/rule-group/edit.twig
index ed081c8d9f..021f15ab55 100644
--- a/resources/views/rules/rule-group/edit.twig
+++ b/resources/views/rules/rule-group/edit.twig
@@ -14,8 +14,8 @@
<div class="row">
<div class="col-lg-6 col-md-12 col-sm-6">
<div class="box box-primary">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'mandatoryFields'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'mandatoryFields'|_ }}</h3>
</div>
<div class="card-body">
{# only correct way to do active checkbox #}
@@ -30,8 +30,8 @@
{# optional fields #}
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'optionalFields'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'optionalFields'|_ }}</h3>
</div>
<div class="card-body">
{{ ExpandedForm.textarea('description', ruleGroup.description) }}
@@ -43,8 +43,8 @@
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
{# panel for options #}
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'options'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'options'|_ }}</h3>
</div>
<div class="card-body">
{{ ExpandedForm.optionsList('update','rule-group') }}
diff --git a/resources/views/rules/rule-group/select-transactions.twig b/resources/views/rules/rule-group/select-transactions.twig
index b09abbbc66..2477e4fbb2 100644
--- a/resources/views/rules/rule-group/select-transactions.twig
+++ b/resources/views/rules/rule-group/select-transactions.twig
@@ -14,8 +14,8 @@
<div class="col-lg-12 col-sm-12 col-xs-12">
<div class="box box-primary">
- <div class="box-header with-border">
- <h3 class="box-title">{{ subTitle }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ subTitle }}</h3>
</div>
<div class="card-body">
<div id="form-body">
diff --git a/resources/views/rules/rule/create.twig b/resources/views/rules/rule/create.twig
index 4de797ccc7..e1be580ca4 100644
--- a/resources/views/rules/rule/create.twig
+++ b/resources/views/rules/rule/create.twig
@@ -17,8 +17,8 @@
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="box box-success" id="mandatory">
- <div class="box-header with-border">
- <h3 class="box-title">{{ trans('firefly.create_rule_for_bill', {name: bill.name}) }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ trans('firefly.create_rule_for_bill', {name: bill.name}) }}</h3>
</div>
<div class="card-body">
<p class="text-info">
@@ -32,8 +32,8 @@
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-12">
<div class="box box-primary" id="mandatory">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'mandatoryFields'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'mandatoryFields'|_ }}</h3>
</div>
<div class="card-body">
{{ ExpandedForm.text('title') }}
@@ -48,8 +48,8 @@
{# optional fields #}
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'optionalFields'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'optionalFields'|_ }}</h3>
</div>
<div class="card-body">
{{ ExpandedForm.textarea('description', null, {helpText: trans('firefly.field_supports_markdown')}) }}
@@ -61,8 +61,8 @@
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'rule_triggers'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'rule_triggers'|_ }}</h3>
</div>
<div class="box-body rule-trigger-box">
<table class="table table-sm table-bordered table-striped">
@@ -96,8 +96,8 @@
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'rule_actions'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'rule_actions'|_ }}</h3>
</div>
<div class="box-body rule-action-box">
<table class="table table-sm table-bordered table-striped">
@@ -128,8 +128,8 @@
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
{# panel for options #}
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'options'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'options'|_ }}</h3>
</div>
<div class="card-body">
{{ ExpandedForm.checkbox('run_after_form',1,null, {helpText: trans('firefly.rule_run_after_creation')}) }}
diff --git a/resources/views/rules/rule/delete.twig b/resources/views/rules/rule/delete.twig
index c04b7dde80..bc4f0c4b45 100644
--- a/resources/views/rules/rule/delete.twig
+++ b/resources/views/rules/rule/delete.twig
@@ -11,8 +11,8 @@
<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="box-header with-border">
- <h3 class="box-title">{{ trans('form.delete_rule', {'title': rule.title}) }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ trans('form.delete_rule', {'title': rule.title}) }}</h3>
</div>
<div class="card-body">
<p class="text-danger">
diff --git a/resources/views/rules/rule/edit.twig b/resources/views/rules/rule/edit.twig
index f68935c212..0a628afc0e 100644
--- a/resources/views/rules/rule/edit.twig
+++ b/resources/views/rules/rule/edit.twig
@@ -13,8 +13,8 @@
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-12">
<div class="box box-primary">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'mandatoryFields'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'mandatoryFields'|_ }}</h3>
</div>
<div class="card-body">
{{ ExpandedForm.text('title', rule.title) }}
@@ -33,8 +33,8 @@
{# optional fields #}
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'optionalFields'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'optionalFields'|_ }}</h3>
</div>
<div class="card-body">
{{ ExpandedForm.textarea('description', rule.description, {helpText: trans('firefly.field_supports_markdown')}) }}
@@ -46,8 +46,8 @@
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'rule_triggers'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'rule_triggers'|_ }}</h3>
</div>
<div class="box-body rule-trigger-box">
<table class="table table-sm table-bordered table-striped">
@@ -82,8 +82,8 @@
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'rule_actions'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'rule_actions'|_ }}</h3>
</div>
<div class="card-body">
<table class="table table-sm table-bordered table-striped">
@@ -114,8 +114,8 @@
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
{# panel for options #}
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'options'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'options'|_ }}</h3>
</div>
<div class="card-body">
{{ ExpandedForm.checkbox('run_after_form',1,null, {helpText: trans('firefly.rule_run_after_edit')}) }}
diff --git a/resources/views/rules/rule/select-transactions.twig b/resources/views/rules/rule/select-transactions.twig
index 22b8dc9a08..f850392111 100644
--- a/resources/views/rules/rule/select-transactions.twig
+++ b/resources/views/rules/rule/select-transactions.twig
@@ -13,8 +13,8 @@
<div class="col-lg-12 col-sm-12 col-xs-12">
<div class="box box-primary">
- <div class="box-header with-border">
- <h3 class="box-title">{{ subTitle }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ subTitle }}</h3>
</div>
<div class="card-body">
<div id="form-body">
diff --git a/resources/views/search/index.twig b/resources/views/search/index.twig
index 838bd5c410..e2963c9b95 100644
--- a/resources/views/search/index.twig
+++ b/resources/views/search/index.twig
@@ -8,8 +8,8 @@
<div class="row">
<div class="col-lg-12">
<div class="box box-primary">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'search_box'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'search_box'|_ }}</h3>
</div>
<div class="card-body">
<p>
@@ -87,8 +87,8 @@
<div class="row result_row">
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="box search_box">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'transactions'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'transactions'|_ }}</h3>
</div>
<div class="card-body">
<p class="search_ongoing text-center">
@@ -128,8 +128,8 @@
<div class="row error_row hidden">
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="box box-danger">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'search_error'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'search_error'|_ }}</h3>
</div>
<div class="card-body">
<p class="search_ongoing">
@@ -144,8 +144,8 @@
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'search_results'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'search_results'|_ }}</h3>
</div>
<div class="card-body">
<p>{{ 'no_results_for_empty_search'|_ }}</p>
diff --git a/resources/views/settings/configuration/index.blade.php b/resources/views/settings/configuration/index.blade.php
new file mode 100644
index 0000000000..6ebd705082
--- /dev/null
+++ b/resources/views/settings/configuration/index.blade.php
@@ -0,0 +1,150 @@
+@extends('layout.v3.session')
+@section('content')
+
+<!--
+
+Security
+- single user mode
+
+Features
+- enable exchange rates
+- use running balance
+
+External connections
+- enable external map
+- enable external exchange rates
+- allow webhooks
+
+Technical stuff
+- valid url protocols
+- is demo site
+
+-->
+
+
+ <form action="{{ route('settings.configuration.index.post') }}" method="post" id="store" class="form-horizontal">
+ <input type="hidden" name="_token" value="{{ csrf_token() }}"/>
+ {{-- security --}}
+ <div class="row">
+ <div class="col-lg-8 offset-lg-2 col-xl-8 offset-xl-2 col-md-12 col-sm-12 col-xs-12">
+ <div class="card mb-2">
+ <div class="card-header">
+ <h3 class="card-title">{{ __('firefly.config_security') }}</h3>
+ </div>
+ <div class="card-body">
+ <h4>
+ {{ __('firefly.setting_single_user_mode') }}
+ </h4>
+ <p>
+ {{ __('firefly.setting_single_user_mode_explain') }}
+ </p>
+ {!! ExpandedForm::checkbox('single_user_mode','1', $singleUserMode) !!}
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row">
+ <div class="col-lg-8 offset-lg-2 col-xl-8 offset-xl-2 col-md-12 col-sm-12 col-xs-12">
+ <div class="card mb-2">
+ <div class="card-header">
+ <h3 class="card-title">{{ __('firefly.config_features') }}</h3>
+ </div>
+ <div class="card-body">
+ <h4>
+ {{ __('firefly.setting_enable_exchange_rates') }}
+ </h4>
+ <p>
+ {{ __('firefly.setting_enable_exchange_rates_explain') }}
+ </p>
+ {!! ExpandedForm::checkbox('enable_exchange_rates','1', $enableExchangeRates) !!}
+
+ <h4>
+ {{ __('firefly.setting_use_running_balance') }}
+ </h4>
+ <p>
+ {{ __('firefly.setting_use_running_balance_explain') }}
+ </p>
+ {!! ExpandedForm::checkbox('use_running_balance','1', $useRunningBalance) !!}
+
+ <h4>
+ {{ __('firefly.setting_enable_batch_processing') }}
+ </h4>
+ <p>
+ {{ __('firefly.setting_enable_batch_processing_explain') }}
+ </p>
+ {!! ExpandedForm::checkbox('enable_batch_processing','1', $enableBatchProcessing) !!}
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row">
+ <div class="col-lg-8 offset-lg-2 col-xl-8 offset-xl-2 col-md-12 col-sm-12 col-xs-12">
+ <div class="card mb-2">
+ <div class="card-header">
+ <h3 class="card-title">{{ __('firefly.config_external_connections') }}</h3>
+ </div>
+ <div class="card-body">
+ <h4>
+ {{ __('firefly.setting_enable_external_map') }}
+ </h4>
+ <p>
+ {{ __('firefly.setting_enable_external_map_explain') }}
+ </p>
+ {!! ExpandedForm::checkbox('enable_external_map','1', $enableExternalMap) !!}
+
+ <h4>
+ {{ __('firefly.setting_enable_external_rates') }}
+ </h4>
+ <p>
+ {{ __('firefly.setting_enable_external_rates_explain') }}
+ </p>
+ {!! ExpandedForm::checkbox('enable_external_rates','1', $enableExternalRates) !!}
+
+ <h4>
+ {{ __('firefly.setting_allow_webhooks') }}
+ </h4>
+ <p>
+ {{ __('firefly.setting_allow_webhooks_explain') }}
+ </p>
+ {!! ExpandedForm::checkbox('allow_webhooks','1', $allowWebhooks) !!}
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row">
+ <div class="col-lg-8 offset-lg-2 col-xl-8 offset-xl-2 col-md-12 col-sm-12 col-xs-12">
+ <div class="card mb-2">
+ <div class="card-header">
+ <h3 class="card-title">{{ __('firefly.config_tech') }}</h3>
+ </div>
+ <div class="card-body">
+ <h4>
+ {{ __('firefly.setting_valid_url_protocols') }}
+ </h4>
+ <p>
+ {{ __('firefly.setting_valid_url_protocols_explain') }}
+ </p>
+ {!! ExpandedForm::text('valid_url_protocols', $validUrlProtocols) !!}
+
+ <h4>
+ {{ __('firefly.setting_is_demo_site') }}
+ </h4>
+ <p>
+ {{ __('firefly.setting_is_demo_site_explain') }}
+ </p>
+ {!! ExpandedForm::checkbox('is_demo_site','1', $isDemoSite) !!}
+ <p>
+ <button type="submit" class="btn btn-success">
+ {{ __('firefly.store_configuration') }}
+ </button>
+ </p>
+ </div>
+ </div>
+ </div>
+ </div>
+ </form>
+
+@endsection
diff --git a/resources/views/settings/configuration/index.twig b/resources/views/settings/configuration/index.twig
deleted file mode 100644
index 30bb6af231..0000000000
--- a/resources/views/settings/configuration/index.twig
+++ /dev/null
@@ -1,154 +0,0 @@
-{% extends './layout/default' %}
-
-{% block breadcrumbs %}
- {{ Breadcrumbs.render }}
-{% endblock %}
-{% block content %}
-
-<!--
-
-Security
-- single user mode
-
-Features
-- enable exchange rates
-- use running balance
-
-External connections
-- enable external map
-- enable external exchange rates
-- allow webhooks
-
-Technical stuff
-- valid url protocols
-- is demo site
-
--->
-
-
- <form action="{{ route('settings.configuration.index.post') }}" method="post" id="store" class="form-horizontal">
- <input type="hidden" name="_token" value="{{ csrf_token() }}"/>
- {# security #}
- <div class="row">
- <div class="col-lg-8 col-lg-offset-2 col-xl-8 col-xl-offset-2 col-md-12 col-sm-12 col-xs-12">
- <div class="box box-default">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'config_security'|_ }}</h3>
- </div>
- <div class="card-body">
- <h4>
- {{ 'setting_single_user_mode'|_ }}
- </h4>
- <p>
- {{ 'setting_single_user_mode_explain'|_ }}
- </p>
- {{ ExpandedForm.checkbox('single_user_mode','1', singleUserMode) }}
- </div>
- </div>
- </div>
- </div>
-
- <div class="row">
- <div class="col-lg-8 col-lg-offset-2 col-xl-8 col-xl-offset-2 col-md-12 col-sm-12 col-xs-12">
- <div class="box box-default">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'config_features'|_ }}</h3>
- </div>
- <div class="card-body">
- <h4>
- {{ 'setting_enable_exchange_rates'|_ }}
- </h4>
- <p>
- {{ 'setting_enable_exchange_rates_explain'|_ }}
- </p>
- {{ ExpandedForm.checkbox('enable_exchange_rates','1', enableExchangeRates) }}
-
- <h4>
- {{ 'setting_use_running_balance'|_ }}
- </h4>
- <p>
- {{ 'setting_use_running_balance_explain'|_ }}
- </p>
- {{ ExpandedForm.checkbox('use_running_balance','1', useRunningBalance) }}
-
- <h4>
- {{ 'setting_enable_batch_processing'|_ }}
- </h4>
- <p>
- {{ 'setting_enable_batch_processing_explain'|_ }}
- </p>
- {{ ExpandedForm.checkbox('enable_batch_processing','1', enableBatchProcessing) }}
- </div>
- </div>
- </div>
- </div>
-
- <div class="row">
- <div class="col-lg-8 col-lg-offset-2 col-xl-8 col-xl-offset-2 col-md-12 col-sm-12 col-xs-12">
- <div class="box box-default">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'config_external_connections'|_ }}</h3>
- </div>
- <div class="card-body">
- <h4>
- {{ 'setting_enable_external_map'|_ }}
- </h4>
- <p>
- {{ 'setting_enable_external_map_explain'|_ }}
- </p>
- {{ ExpandedForm.checkbox('enable_external_map','1', enableExternalMap) }}
-
- <h4>
- {{ 'setting_enable_external_rates'|_ }}
- </h4>
- <p>
- {{ 'setting_enable_external_rates_explain'|_ }}
- </p>
- {{ ExpandedForm.checkbox('enable_external_rates','1', enableExternalRates) }}
-
- <h4>
- {{ 'setting_allow_webhooks'|_ }}
- </h4>
- <p>
- {{ 'setting_allow_webhooks_explain'|_ }}
- </p>
- {{ ExpandedForm.checkbox('allow_webhooks','1', allowWebhooks) }}
- </div>
- </div>
- </div>
- </div>
-
- <div class="row">
- <div class="col-lg-8 col-lg-offset-2 col-xl-8 col-xl-offset-2 col-md-12 col-sm-12 col-xs-12">
- <div class="box box-default">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'config_tech'|_ }}</h3>
- </div>
- <div class="card-body">
- <h4>
- {{ 'setting_valid_url_protocols'|_ }}
- </h4>
- <p>
- {{ 'setting_valid_url_protocols_explain'|_ }}
- </p>
- {{ ExpandedForm.text('valid_url_protocols', validUrlProtocols) }}
-
- <h4>
- {{ 'setting_is_demo_site'|_ }}
- </h4>
- <p>
- {{ 'setting_is_demo_site_explain'|_ }}
- </p>
- {{ ExpandedForm.checkbox('is_demo_site','1', isDemoSite) }}
- <p>
- <button type="submit" class="btn btn-success">
- {{ ('store_configuration')|_ }}
- </button>
- </p>
- </div>
- </div>
- </div>
- </div>
- </form>
-
-{% endblock %}
diff --git a/resources/views/settings/index.twig b/resources/views/settings/index.blade.php
similarity index 51%
rename from resources/views/settings/index.twig
rename to resources/views/settings/index.blade.php
index 16af768a48..759cb46668 100644
--- a/resources/views/settings/index.twig
+++ b/resources/views/settings/index.blade.php
@@ -1,53 +1,49 @@
-{% extends './layout/default' %}
-
-{% block breadcrumbs %}
- {{ Breadcrumbs.render }}
-{% endblock %}
-{% block content %}
+@extends('layout.v3.session')
+@section('content')
<div class="row">
<div class="col-lg-6 col-md-12 col-sm-12 col-xs-12">
- <div class="box box-default">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'instance_configuration'|_ }}</h3>
+ <div class="card mb-2">
+ <div class="card-header">
+ <h3 class="card-title">{{ __('firefly.instance_configuration') }}</h3>
</div>
<div class="card-body">
<ul>
<li>
- <a href="{{ route('settings.configuration.index') }}">{{ 'firefly_instance_configuration'|_ }}</a>
+ <a href="{{ route('settings.configuration.index') }}">{{ __('firefly.firefly_instance_configuration') }}</a>
</li>
- <li><a href="{{ route('settings.links.index') }}">{{ 'journal_link_configuration'|_ }}</a></li>
- <li><a href="{{ route('settings.update-check') }}">{{ 'update_check_title'|_ }}</a></li>
- <li><a href="{{ route('settings.notification.index') }}">{{ 'settings_notifications'|_ }}</a></li>
+ <li><a href="{{ route('settings.links.index') }}">{{ __('firefly.journal_link_configuration') }}</a></li>
+ <li><a href="{{ route('settings.update-check') }}">{{ __('firefly.update_check_title') }}</a></li>
+ <li><a href="{{ route('settings.notification.index') }}">{{ __('firefly.settings_notifications') }}</a></li>
</ul>
</div>
</div>
- <div class="box box-default">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'user_administration'|_ }}</h3>
+ <div class="card mb-2">
+ <div class="card-header">
+ <h3 class="card-title">{{ __('firefly.user_administration') }}</h3>
</div>
<div class="card-body">
<ul>
- <li><a href="{{ route('settings.users') }}">{{ 'list_all_users'|_ }}</a></li>
+ <li><a href="{{ route('settings.users') }}">{{ __('firefly.list_all_users') }}</a></li>
</ul>
</div>
</div>
</div>
<div class="col-lg-6 col-md-12 col-sm-12 col-xs-12">
- <div class="box box-default">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'admin_maintanance_title'|_ }}</h3>
+ <div class="card mb-2">
+ <div class="card-header">
+ <h3 class="card-title">{{ __('firefly.admin_maintanance_title') }}</h3>
</div>
<div class="card-body">
<p>
- {{ 'admin_maintanance_expl'|_ }}
+ {{ __('firefly.admin_maintanance_expl') }}
</p>
<p>
<a href="{{ route('flush') }}"
- class="btn btn-warning">{{ 'admin_maintenance_clear_cache'|_ }}</a>
+ class="btn btn-warning">{{ __('firefly.admin_maintenance_clear_cache') }}</a>
</p>
</div>
</div>
</div>
</div>
+@endsection
-{% endblock %}
diff --git a/resources/views/settings/link/create.twig b/resources/views/settings/link/create.twig
index 9763286316..7d6d02cc12 100644
--- a/resources/views/settings/link/create.twig
+++ b/resources/views/settings/link/create.twig
@@ -11,8 +11,8 @@
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
<div class="box box-primary">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'mandatoryFields'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'mandatoryFields'|_ }}</h3>
</div>
<div class="card-body">
{{ ExpandedForm.text('name', null, {helpText: trans('firefly.link_type_help_name')}) }}
@@ -26,8 +26,8 @@
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
{# panel for options #}
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'options'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'options'|_ }}</h3>
</div>
<div class="card-body">
{{ ExpandedForm.optionsList('create','link_type') }}
diff --git a/resources/views/settings/link/delete.twig b/resources/views/settings/link/delete.twig
index 190bebf10d..ca55982241 100644
--- a/resources/views/settings/link/delete.twig
+++ b/resources/views/settings/link/delete.twig
@@ -12,8 +12,8 @@
<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="box-header with-border">
- <h3 class="box-title">{{ trans('form.delete_link_type', {'name': linkType.name}) }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ trans('form.delete_link_type', {'name': linkType.name}) }}</h3>
</div>
<div class="card-body">
<p class="text-danger">
diff --git a/resources/views/settings/link/edit.twig b/resources/views/settings/link/edit.twig
index 2f9c290835..e7f357920b 100644
--- a/resources/views/settings/link/edit.twig
+++ b/resources/views/settings/link/edit.twig
@@ -14,8 +14,8 @@
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
<div class="box box-primary">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'mandatoryFields'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'mandatoryFields'|_ }}</h3>
</div>
<div class="card-body">
{{ ExpandedForm.text('name', linkType.name, {helpText: trans('firefly.link_type_help_name')}) }}
@@ -30,8 +30,8 @@
{# panel for options #}
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'options'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'options'|_ }}</h3>
</div>
<div class="card-body">
{{ ExpandedForm.optionsList('update','link_type') }}
diff --git a/resources/views/settings/link/index.twig b/resources/views/settings/link/index.twig
index 945f5ae58a..802aa90d81 100644
--- a/resources/views/settings/link/index.twig
+++ b/resources/views/settings/link/index.twig
@@ -6,9 +6,9 @@
{% block content %}
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
- <div class="box box-default">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'journal_link_configuration'|_ }}</h3>
+ <div class="card">
+ <div class="card-header">
+ <h3 class="card-title">{{ 'journal_link_configuration'|_ }}</h3>
</div>
<div class="box-body no-padding">
<table class="table table-hover sortable">
diff --git a/resources/views/settings/link/show.twig b/resources/views/settings/link/show.twig
index b11a1fda60..dfa153f76a 100644
--- a/resources/views/settings/link/show.twig
+++ b/resources/views/settings/link/show.twig
@@ -6,9 +6,9 @@
{% block content %}
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
- <div class="box box-default">
- <div class="box-header with-border">
- <h3 class="box-title">{{ trans('firefly.overview_for_link', {name: journalLinkTranslation('name', linkType.name)}) }}</h3>
+ <div class="card">
+ <div class="card-header">
+ <h3 class="card-title">{{ trans('firefly.overview_for_link', {name: journalLinkTranslation('name', linkType.name)}) }}</h3>
</div>
<div class="box-body no-padding">
<table class="table table-hover sortable">
diff --git a/resources/views/settings/notifications/index.twig b/resources/views/settings/notifications/index.twig
index 46d791b474..82197caf2e 100644
--- a/resources/views/settings/notifications/index.twig
+++ b/resources/views/settings/notifications/index.twig
@@ -8,9 +8,9 @@
<div class="col-lg-6 col-md-12 col-sm-12 col-xs-12">
<form action="{{ route('settings.notification.post') }}" method="post">
<input type="hidden" name="_token" value="{{ csrf_token() }}">
- <div class="box box-default">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'notification_settings'|_ }}</h3>
+ <div class="card">
+ <div class="card-header">
+ <h3 class="card-title">{{ 'notification_settings'|_ }}</h3>
</div>
<div class="card-body">
<p>
@@ -46,9 +46,9 @@
<form action="{{ route('settings.notification.test') }}" method="post">
<div class="col-lg-6 col-md-12 col-sm-12 col-xs-12">
<input type="hidden" name="_token" value="{{ csrf_token() }}">
- <div class="box box-default">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'available_channels_title'|_ }}</h3>
+ <div class="card">
+ <div class="card-header">
+ <h3 class="card-title">{{ 'available_channels_title'|_ }}</h3>
</div>
<div class="card-body">
<p>
diff --git a/resources/views/settings/update/index.twig b/resources/views/settings/update/index.twig
index 68f900314f..54e0bf697f 100644
--- a/resources/views/settings/update/index.twig
+++ b/resources/views/settings/update/index.twig
@@ -11,9 +11,9 @@
<input type="hidden" name="_token" value="{{ csrf_token() }}"/>
<div class="col-lg-6 col-md-8 col-sm-12 col-xs-12">
- <div class="box box-default">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'admin_update_channel_title'|_ }}</h3>
+ <div class="card">
+ <div class="card-header">
+ <h3 class="card-title">{{ 'admin_update_channel_title'|_ }}</h3>
</div>
<div class="card-body">
<p class="text-info">
@@ -26,9 +26,9 @@
{# do update check. #}
<div class="col-lg-6 col-md-8 col-sm-12 col-xs-12">
- <div class="box box-default">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'admin_update_check_title'|_ }}</h3>
+ <div class="card">
+ <div class="card-header">
+ <h3 class="card-title">{{ 'admin_update_check_title'|_ }}</h3>
</div>
<div class="card-body">
<p class="text-info">
@@ -41,9 +41,9 @@
{# check now button #}
<div class="col-lg-4 col-md-4 col-sm-12 col-xs-12">
- <div class="box box-default">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'admin_update_check_now_title'|_ }}</h3>
+ <div class="card">
+ <div class="card-header">
+ <h3 class="card-title">{{ 'admin_update_check_now_title'|_ }}</h3>
</div>
<div class="card-body">
<p class="text-info">
diff --git a/resources/views/settings/users/delete.twig b/resources/views/settings/users/delete.twig
index 069932d7f0..793df8593c 100644
--- a/resources/views/settings/users/delete.twig
+++ b/resources/views/settings/users/delete.twig
@@ -12,8 +12,8 @@
<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="box-header with-border">
- <h3 class="box-title">{{ trans('form.delete_user', {'email': user.email}) }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ trans('form.delete_user', {'email': user.email}) }}</h3>
</div>
<div class="card-body">
<p class="text-danger">
diff --git a/resources/views/settings/users/edit.twig b/resources/views/settings/users/edit.twig
index ae15e11490..30c56a74a9 100644
--- a/resources/views/settings/users/edit.twig
+++ b/resources/views/settings/users/edit.twig
@@ -15,8 +15,8 @@
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-12">
<div class="box box-primary">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'mandatoryFields'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'mandatoryFields'|_ }}</h3>
</div>
<div class="card-body">
{% if canEditDetails %}
@@ -41,8 +41,8 @@
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
{# panel for options #}
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'options'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'options'|_ }}</h3>
</div>
<div class="card-body">
{{ ExpandedForm.optionsList('update','account') }}
diff --git a/resources/views/settings/users/index.twig b/resources/views/settings/users/index.twig
index 28a58960a8..c49b83b56c 100644
--- a/resources/views/settings/users/index.twig
+++ b/resources/views/settings/users/index.twig
@@ -10,8 +10,8 @@
<form action="{{ route('settings.users.invite') }}" method="post">
<input type="hidden" name="_token" value="{{ csrf_token() }}"/>
<div class="box box-primary">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'invite_new_user_title'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'invite_new_user_title'|_ }}</h3>
</div>
<div class="card-body">
<p>
@@ -32,8 +32,8 @@
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
<div class="box box-primary">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'all_users'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'all_users'|_ }}</h3>
</div>
<div class="box-body no-padding">
<table class="table table-responsive table-sm sortable" aria-label="Table">
@@ -117,8 +117,8 @@
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'all_invited_users'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'all_invited_users'|_ }}</h3>
</div>
<div class="box-body no-padding">
<table class="table table-responsive table-sm sortable">
diff --git a/resources/views/settings/users/show.twig b/resources/views/settings/users/show.twig
index fa1e2c3ca6..e89e5f5ca1 100644
--- a/resources/views/settings/users/show.twig
+++ b/resources/views/settings/users/show.twig
@@ -7,8 +7,8 @@
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
<div class="box box-primary">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'user_information'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'user_information'|_ }}</h3>
</div>
<div class="card-body">
<table class="table table-striped table-bordered table-responsive">
@@ -72,8 +72,8 @@
</div>
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
<div class="box box-primary">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'user_data_information'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'user_data_information'|_ }}</h3>
</div>
<div class="card-body">
<table class="table table-striped table-bordered table-responsive">
diff --git a/resources/views/tags/create.twig b/resources/views/tags/create.twig
index 219a8a1ca2..153ffbce37 100644
--- a/resources/views/tags/create.twig
+++ b/resources/views/tags/create.twig
@@ -16,8 +16,8 @@
<div class="row">
<div class="col-lg-5 col-md-5 col-sm-12">
<div class="box box-primary">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'mandatoryFields'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'mandatoryFields'|_ }}</h3>
</div>
<div class="card-body">
{{ ExpandedForm.text('tag') }}
@@ -28,8 +28,8 @@
<div class="col-lg-7 col-md-7 col-sm-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'optionalFields'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'optionalFields'|_ }}</h3>
</div>
<div class="card-body">
{{ ExpandedForm.date('date') }}
@@ -43,8 +43,8 @@
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
{# panel for options #}
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'options'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'options'|_ }}</h3>
</div>
<div class="card-body">
{{ ExpandedForm.optionsList('create','tag') }}
diff --git a/resources/views/tags/delete.twig b/resources/views/tags/delete.twig
index a6190580c0..3fcaf5ffac 100644
--- a/resources/views/tags/delete.twig
+++ b/resources/views/tags/delete.twig
@@ -11,8 +11,8 @@
<div class="row">
<div class="col-lg-6 col-lg-offset-3 col-md-6 col-sm-12">
<div class="box box-danger">
- <div class="box-header with-border">
- <h3 class="box-title">{{ trans('firefly.delete_tag',{tag: tag.tag}) }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ trans('firefly.delete_tag',{tag: tag.tag}) }}</h3>
</div>
<div class="card-body">
<p class="text-danger">
diff --git a/resources/views/tags/edit.twig b/resources/views/tags/edit.twig
index 69154b2e5a..6928217988 100644
--- a/resources/views/tags/edit.twig
+++ b/resources/views/tags/edit.twig
@@ -20,8 +20,8 @@
<div class="row">
<div class="col-lg-5 col-md-5 col-sm-12">
<div class="box box-primary">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'mandatoryFields'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'mandatoryFields'|_ }}</h3>
</div>
<div class="card-body">
{{ ExpandedForm.text('tag', tag.tag) }}
@@ -32,8 +32,8 @@
<div class="col-lg-7 col-md-7 col-sm-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'optionalFields'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'optionalFields'|_ }}</h3>
</div>
<div class="card-body">
{{ ExpandedForm.date('date', tag.date.format('Y-m-d')) }}
@@ -47,8 +47,8 @@
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
{# panel for options #}
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'options'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'options'|_ }}</h3>
</div>
<div class="card-body">
{{ ExpandedForm.optionsList('update','tag') }}
diff --git a/resources/views/tags/show.twig b/resources/views/tags/show.twig
index 81f1c0ab8f..d176dab264 100644
--- a/resources/views/tags/show.twig
+++ b/resources/views/tags/show.twig
@@ -8,8 +8,8 @@
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'meta_data'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'meta_data'|_ }}</h3>
<div class="box-tools pull-right">
@@ -176,8 +176,8 @@
</div>
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'location'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'location'|_ }}</h3>
<div class="box-tools pull-right">
<div class="btn-group">
<button class="btn btn-box-tool dropdown-toggle" data-toggle="dropdown"><span
@@ -207,8 +207,8 @@
<div class="row">
<div class="col-lg-6 col-md-6 col-sm-12 col-xs-12">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">
+ <div class="card-header">
+ <h3 class="card-title">
{{ 'attachments'|_ }}
</h3>
</div>
@@ -231,8 +231,8 @@
<div class="row">
<div class="{% if periods|length > 0 %}col-lg-10 col-md-10 col-sm-12 col-xs-12{% else %}col-lg-12 col-md-12 col-sm-12 col-xs-12{% endif %}">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'transactions'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'transactions'|_ }}</h3>
<div class="box-tools pull-right">
diff --git a/resources/views/transactions/bulk/edit.twig b/resources/views/transactions/bulk/edit.twig
index 665801f1c6..11f86e2af8 100644
--- a/resources/views/transactions/bulk/edit.twig
+++ b/resources/views/transactions/bulk/edit.twig
@@ -10,9 +10,9 @@
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
- <div class="box box-default">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'mass_bulk_journals'|_ }}</h3>
+ <div class="card">
+ <div class="card-header">
+ <h3 class="card-title">{{ 'mass_bulk_journals'|_ }}</h3>
</div>
<div class="card-body">
diff --git a/resources/views/transactions/convert.twig b/resources/views/transactions/convert.twig
index da5ade5d60..ddf6d10e10 100644
--- a/resources/views/transactions/convert.twig
+++ b/resources/views/transactions/convert.twig
@@ -13,8 +13,8 @@
<div class="row">
<div class="col-lg-8 col-lg-offset-2 col-md-12 col-sm-12">
<div class="box box-primary">
- <div class="box-header with-border">
- <h3 class="box-title">{{ ('convert_options_'~sourceType.type~destinationType.type)|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ ('convert_options_'~sourceType.type~destinationType.type)|_ }}</h3>
</div>
<div class="card-body">
<p>
diff --git a/resources/views/transactions/delete.twig b/resources/views/transactions/delete.twig
index d44a14d2a2..f5b4ec294c 100644
--- a/resources/views/transactions/delete.twig
+++ b/resources/views/transactions/delete.twig
@@ -11,8 +11,8 @@
<div class="row">
<div class="col-lg-6 col-lg-offset-3 col-md-6 col-sm-12">
<div class="box box-danger">
- <div class="box-header with-border">
- <h3 class="box-title">{{ trans('form.delete_journal', {'description': group.title|default(journal.description)}) }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ trans('form.delete_journal', {'description': group.title|default(journal.description)}) }}</h3>
</div>
<div class="card-body">
<p class="text-danger">
diff --git a/resources/views/transactions/links/delete.twig b/resources/views/transactions/links/delete.twig
index 7a9e8be3fb..020c41005f 100644
--- a/resources/views/transactions/links/delete.twig
+++ b/resources/views/transactions/links/delete.twig
@@ -11,8 +11,8 @@
<div class="row">
<div class="col-lg-6 col-lg-offset-3 col-md-6 col-sm-12">
<div class="box box-danger">
- <div class="box-header with-border">
- <h3 class="box-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>
+ <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>
</div>
<div class="card-body">
<p class="text-danger">
diff --git a/resources/views/transactions/mass/delete.twig b/resources/views/transactions/mass/delete.twig
index fc52b6ea26..4aa3b2c8a0 100644
--- a/resources/views/transactions/mass/delete.twig
+++ b/resources/views/transactions/mass/delete.twig
@@ -11,8 +11,8 @@
<div class="row">
<div class="col-lg-8 col-lg-offset-2 col-md-8 coll-offset-md-2 col-sm-12">
<div class="box box-danger">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'mass_delete_journals'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'mass_delete_journals'|_ }}</h3>
</div>
<div class="card-body">
<p class="text-danger">
diff --git a/resources/views/transactions/mass/edit.twig b/resources/views/transactions/mass/edit.twig
index 6e89939a9a..c4a47b73c4 100644
--- a/resources/views/transactions/mass/edit.twig
+++ b/resources/views/transactions/mass/edit.twig
@@ -10,9 +10,9 @@
<div class="row">
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
- <div class="box box-default">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'mass_edit_journals'|_ }}</h3>
+ <div class="card">
+ <div class="card-header">
+ <h3 class="card-title">{{ 'mass_edit_journals'|_ }}</h3>
</div>
<div class="card-body">
<p>
diff --git a/resources/views/transactions/old-index.twig b/resources/views/transactions/old-index.twig
index 36dc19c0d2..a9513143ec 100644
--- a/resources/views/transactions/old-index.twig
+++ b/resources/views/transactions/old-index.twig
@@ -22,8 +22,8 @@
{# for withdrawals, deposits and transfers #}
<div class="{{ boxSize }}">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'categories'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'categories'|_ }}</h3>
</div>
<div class="card-body">
<canvas id="category_chart" class="medium-chart" height="250"></canvas>
@@ -34,8 +34,8 @@
{% if objectType == 'withdrawal' %}
<div class="{{ boxSize }}">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'budgets'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'budgets'|_ }}</h3>
</div>
<div class="card-body">
<canvas id="budget_chart" class="medium-chart" height="250"></canvas>
@@ -46,8 +46,8 @@
{% if objectType != 'withdrawal' %}
<div class="{{ boxSize }}">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'all_source_accounts'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'all_source_accounts'|_ }}</h3>
</div>
<div class="card-body">
<canvas id="source_chart" class="medium-chart" height="250"></canvas>
@@ -58,8 +58,8 @@
{# for all #}
<div class="{{ boxSize }}">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'all_destination_accounts'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'all_destination_accounts'|_ }}</h3>
</div>
<div class="card-body">
<canvas id="destination_chart" class="medium-chart" height="250"></canvas>
@@ -73,8 +73,8 @@
<div class="row">
<div class="{% if periods|length > 0 %}col-lg-10 col-md-10 col-sm-12{% else %}col-lg-12 col-md-12 col-sm-12{% endif %}">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ subTitle }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ subTitle }}</h3>
</div>
<div class="box-body no-padding">
<div class="p-2">
diff --git a/resources/views/transactions/show.twig b/resources/views/transactions/show.twig
index 6c9ce2bcdf..764adba72b 100644
--- a/resources/views/transactions/show.twig
+++ b/resources/views/transactions/show.twig
@@ -8,8 +8,8 @@
<div class="row">
<div class="col-lg-6">
<div class="box box-primary">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'transaction_journal_information'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'transaction_journal_information'|_ }}</h3>
<div class="btn-group btn-group-sm pull-right">
<button type="button" class="btn btn-outline-secondary dropdown-toggle" data-toggle="dropdown"
aria-haspopup="true" aria-expanded="false">
@@ -97,8 +97,8 @@
</div>
{% if groupLogEntries|length > 0 %}
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">
+ <div class="card-header">
+ <h3 class="card-title">
{{ 'audit_log_entries'|_ }}
</h3>
</div>
@@ -111,8 +111,8 @@
</div>
<div class="col-lg-6">
<div class="box box-primary">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'transaction_journal_meta'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'transaction_journal_meta'|_ }}</h3>
</div>
<div class="box-body no-padding">
<table class="table table-hover">
@@ -209,8 +209,8 @@
{% for index, journal in selectedGroup.transactions %}
<div class="col-lg-{{ boxSize }}">
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">
+ <div class="card-header">
+ <h3 class="card-title">
{{ journal.description }}
{% if journal.reconciled %}
<span class="bi bi-check"></span>
@@ -457,8 +457,8 @@
<!-- Transaction links -->
{% if links[journal.transaction_journal_id]|length > 0 %}
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">
+ <div class="card-header">
+ <h3 class="card-title">
{{ 'journal_links'|_ }}
</h3>
</div>
@@ -502,8 +502,8 @@
<!-- Attachments -->
{% if attachments[journal.transaction_journal_id]|length > 0 %}
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'attachments'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'attachments'|_ }}</h3>
</div>
<div class="box-body no-padding">
{% include 'list.attachments' with {attachments: attachments[journal.transaction_journal_id]} %}
@@ -514,8 +514,8 @@
<!-- Piggy bank events -->
{% if events[journal.transaction_journal_id]|length > 0 %}
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">{{ 'piggy_events'|_ }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ 'piggy_events'|_ }}</h3>
</div>
<div class="box-body no-padding">
<table class="table table-hover">
@@ -534,8 +534,8 @@
{% endif %}
{% if logEntries[journal.transaction_journal_id]|length > 0 %}
<div class="card">
- <div class="box-header with-border">
- <h3 class="box-title">
+ <div class="card-header">
+ <h3 class="card-title">
{{ 'audit_log_entries'|_ }}
</h3>
</div>
diff --git a/resources/views/transactions/single/delete.twig b/resources/views/transactions/single/delete.twig
index bde1fa9c31..42bb32b4c7 100644
--- a/resources/views/transactions/single/delete.twig
+++ b/resources/views/transactions/single/delete.twig
@@ -11,8 +11,8 @@
<div class="row">
<div class="col-lg-6 col-lg-offset-3 col-md-6 col-sm-12">
<div class="box box-danger">
- <div class="box-header with-border">
- <h3 class="box-title">{{ trans('form.delete_journal', {'description': journal.description}) }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ trans('form.delete_journal', {'description': journal.description}) }}</h3>
</div>
<div class="card-body">
<p class="text-danger">
diff --git a/resources/views/webhooks/delete.twig b/resources/views/webhooks/delete.twig
index ccd401ae12..d6602fa6f6 100644
--- a/resources/views/webhooks/delete.twig
+++ b/resources/views/webhooks/delete.twig
@@ -8,8 +8,8 @@
<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="box-header with-border">
- <h3 class="box-title">{{ trans('form.delete_webhook', {'title': webhook.title}) }}</h3>
+ <div class="card-header">
+ <h3 class="card-title">{{ trans('form.delete_webhook', {'title': webhook.title}) }}</h3>
</div>
<div class="card-body">
<p class="text-danger">