Firefly III: a personal finances manager
PHP accountingbudgetbudgetingbudgetscash-flowcashflowcredit-carddockerexpensesfinancefinancesfinanciallinuxmoneypaycheckpersonal-financephpphp7
Fix modal button.
James Cole8454031872de
diff --git a/app/Http/Controllers/Rule/SelectController.php b/app/Http/Controllers/Rule/SelectController.phpindex 6b52088e89..637a337f0c 100644--- a/app/Http/Controllers/Rule/SelectController.php+++ b/app/Http/Controllers/Rule/SelectController.php@@ -176,7 +176,7 @@ final class SelectController extends Controller$view = 'ERROR, see logs.';try {- $view = view('list.journals-array-tiny', ['groups' => $collection])->render();+ $view = view('rules.rule.triggers-by-rule', ['groups' => $collection])->render();} catch (Throwable $exception) {Log::error(sprintf('Could not render view in testTriggers(): %s', $exception->getMessage()));Log::error($exception->getTraceAsString());diff --git a/public/v1/js/ff/accounts/reconcile.js b/public/v1/js/ff/accounts/reconcile.jsindex d6d4b3a501..ce2091b2cb 100644--- a/public/v1/js/ff/accounts/reconcile.js+++ b/public/v1/js/ff/accounts/reconcile.js@@ -194,7 +194,7 @@ function calculateBalanceDifference() {function getTransactionsForRange() {console.log('in getTransactionsForRange()');// clear out the box:- $('#transactions_holder').empty().append($('<p>').addClass('text-center').html('<span class="fa fa-fw fa-spin fa-spinner"></span>'));+ $('#transactions_holder').empty().append($('<p>').addClass('text-center').html('<span class="bi bi-hourglass"></span>'));var url = transactionsUrl.replace('%start%', $('input[name="start_date"]').val()).replace('%end%', $('input[name="end_date"]').val());var index = indexUrl.replace('%start%', $('input[name="start_date"]').val()).replace('%end%', $('input[name="end_date"]').val());window.history.pushState('object or string', "Reconcile account", index);diff --git a/public/v1/js/ff/help.js b/public/v1/js/ff/help.jsindex 1955d74eef..8924da49d4 100644--- a/public/v1/js/ff/help.js+++ b/public/v1/js/ff/help.js@@ -66,7 +66,7 @@ function showHelp(e) {}console.log('route', route);console.log('special page', specialPage);- $('#helpBody').html('<span class="fa fa-refresh fa-spin"></span>');+ $('#helpBody').html('<span class="bi bi-hourglass"></span>');$('#helpModal').modal('show');$('#helpTitle').html(helpPageTitle);$('#helpBody').html(helpPageBody);diff --git a/public/v1/js/ff/install/index.js b/public/v1/js/ff/install/index.jsindex 0caaf35b73..60129496d5 100644--- a/public/v1/js/ff/install/index.js+++ b/public/v1/js/ff/install/index.js@@ -27,7 +27,7 @@ document.addEventListener("DOMContentLoaded", (event) => {function startRunningCommands(index) {console.log('Now in startRunningCommands with index' + index);if (0 === index) {- document.querySelector('#status-box').innerHTML = '<span class="fa fa-spin fa-spinner"></span> Running first command...';+ document.querySelector('#status-box').innerHTML = '<span class="bi bi-hourglass"></span> Running first command...';}runCommand(index);}@@ -49,7 +49,7 @@ function runCommand(index) {index++;if (response.hasNextCommand) {// inform user- document.querySelector('#status-box').innerHTML = '<span class="fa fa-spin fa-spinner"></span> Just executed ' + response.previous + '...';+ document.querySelector('#status-box').innerHTML = '<span class="bi bi-hourglass"></span> Just executed ' + response.previous + '...';console.log('Will call next command.');runCommand(index);} else {@@ -90,7 +90,7 @@ function startMigration() {function startDecryption() {console.log('Now in startDecryption');- document.querySelector('#status-box').innerHTML = '<span class="fa fa-spin fa-spinner"></span> Setting up DB #2...';+ document.querySelector('#status-box').innerHTML = '<span class="bi bi-hourglass"></span> Setting up DB #2...';fetch(decryptUrl, {method: 'POST',headers: {@@ -117,7 +117,7 @@ function startDecryption() {**/function startPassport() {- document.querySelector('#status-box').innerHTML = '<span class="fa fa-spin fa-spinner"></span> Setting up OAuth2...';+ document.querySelector('#status-box').innerHTML = '<span class="bi bi-hourglass"></span> Setting up OAuth2...';fetch(keysUrl, {method: 'POST',headers: {@@ -143,7 +143,7 @@ function startPassport() {**/function startUpgrade() {- document.querySelector('#status-box').innerHTML = '<span class="fa fa-spin fa-spinner"></span> Upgrading database...';+ document.querySelector('#status-box').innerHTML = '<span class="bi bi-hourglass"></span> Upgrading database...';fetch(upgradeUrl, {method: 'POST',headers: {@@ -168,7 +168,7 @@ function startUpgrade() {**/function startVerify() {- document.querySelector('#status-box').innerHTML = '<span class="fa fa-spin fa-spinner"></span> Verify database integrity...';+ document.querySelector('#status-box').innerHTML = '<span class="bi bi-hourglass"></span> Verify database integrity...';fetch(veifyUrl, {method: 'POST',headers: {diff --git a/public/v1/js/ff/piggy-banks/index.js b/public/v1/js/ff/piggy-banks/index.jsindex ce2a282532..97b23c04e3 100644--- a/public/v1/js/ff/piggy-banks/index.js+++ b/public/v1/js/ff/piggy-banks/index.js@@ -84,7 +84,7 @@ function removeMoney(e) {function stopSorting() {"use strict";- $('.loadSpin').addClass('fa fa-refresh fa-spin');+ $('.loadSpin').addClass('bi bi-hourglass');$.each($('#piggy-sortable>tbody>tr.piggy-sortable'), function (i, v) {var holder = $(v);@@ -112,6 +112,6 @@ function stopSorting() {$.post('piggy-banks/set-order/' + id, {order: newOrder, objectGroupTitle: objectGroupTitle, _token: token})});- $('.loadSpin').removeClass('fa fa-refresh fa-spin');+ $('.loadSpin').removeClass('bi bi-hourglass');}diff --git a/public/v1/js/ff/rules/create-edit.js b/public/v1/js/ff/rules/create-edit.jsindex bcc2b91bdc..1936afcb90 100644--- a/public/v1/js/ff/rules/create-edit.js+++ b/public/v1/js/ff/rules/create-edit.js@@ -473,12 +473,12 @@ function createAutoComplete(input, URL) {function testRuleTriggers() {"use strict";-+ console.log('testRuleTriggers');// find the button:var button = $('.test_rule_triggers');// replace with spinner. fa-spin fa-spinner- button.html('<span class="fa fa-spin fa-spinner"></span> ' + testRuleTriggersText);+ button.html('<span class="bi bi-hourglass"></span> ' + testRuleTriggersText);button.attr('disabled', 'disabled');// Serialize all trigger data@@ -493,7 +493,6 @@ function testRuleTriggers() {// Set title and bodymodal.find(".transactions-list").html(data.html);- button.attr('disabled', '');// Show warning if appropriateif (data.warning) {modal.find(".transaction-warning .warning-contents").text(data.warning);@@ -501,10 +500,10 @@ function testRuleTriggers() {} else {modal.find(".transaction-warning").hide();}- button.removeAttr('disabled');- button.html('<span class="fa fa-flask"></span> ' + testRuleTriggersText);+ button.html('<span class="bi bi-flask"></span> ' + testRuleTriggersText).attr('disabled', false);// Show the modal dialog- modal.modal();+ console.log('Show modal');+ modal.show();}).fail(function () {alert('Cannot get transactions for given triggers.');});diff --git a/public/v1/js/ff/rules/index.js b/public/v1/js/ff/rules/index.jsindex 66d240ce3d..6a06992375 100644--- a/public/v1/js/ff/rules/index.js+++ b/public/v1/js/ff/rules/index.js@@ -176,7 +176,7 @@ function testRuleTriggers(e) {icon = $('span', obj);}// change icon:- icon.addClass('fa-spinner fa-spin').removeClass('fa-flask');+ icon.addClass('bi bi-hourglass').removeClass('bi-flask');var modal = $("#testTriggerModal");// respond to modal:@@ -210,7 +210,7 @@ function testRuleTriggers(e) {}function disableRuleSpinners() {- $('i.test_rule_triggers').removeClass('fa-spin fa-spinner').addClass('fa-flask');+ $('i.test_rule_triggers').removeClass('bi bi-hourglass').addClass('bi-flask');}diff --git a/resources/views/components/layout/tracking.blade.php b/resources/views/components/layout/tracking.blade.phpindex 6c952cea13..e69de29bb2 100644--- a/resources/views/components/layout/tracking.blade.php+++ b/resources/views/components/layout/tracking.blade.php@@ -1,3 +0,0 @@-<div>- <!-- Let all your things have their places; let each part of your business have its time. - Benjamin Franklin -->-</div>\ No newline at end of filediff --git a/resources/views/rules/partials/test-trigger-modal.blade.php b/resources/views/rules/partials/test-trigger-modal.blade.phpindex 74b4a0755a..2cf78473cc 100644--- a/resources/views/rules/partials/test-trigger-modal.blade.php+++ b/resources/views/rules/partials/test-trigger-modal.blade.php@@ -1,9 +1,10 @@-<div class="modal fade" id="testTriggerModal" tabindex="-1" role="dialog" aria-labelledby="testTriggerLabel">- <div class="modal-dialog" role="document">+<!-- Modal -->+<div class="modal fade" id="testTriggerModal" tabindex="-1" aria-labelledby="testTriggerLabel" aria-hidden="true">+ <div class="modal-dialog"><div class="modal-content"><div class="modal-header">- <h5 class="modal-title" id="testTriggerLabel">{{ __('firefly.test_rule_triggers') }}</h5>- <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="{{ __('firefly.close') }}"></button>+ <h5 class="modal-title" id="testTriggerLabel">Modal title</h5>+ <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button></div><div class="modal-body"><div class="transaction-warning alert alert-warning">@@ -14,8 +15,10 @@</div></div><div class="modal-footer">- <button type="button" class="btn btn-outline-secondary" data-bs-dismiss="modal">{{ __('firefly.close') }}</button>+ <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>+ <button type="button" class="btn btn-primary">Save changes</button></div></div></div></div>+diff --git a/resources/views/rules/rule/edit.blade.php b/resources/views/rules/rule/edit.blade.phpindex d26162d3a2..e2bf87636a 100644--- a/resources/views/rules/rule/edit.blade.php+++ b/resources/views/rules/rule/edit.blade.php@@ -36,7 +36,7 @@</div></div>- <div class="row">+ <div class="row content"><div class="col-lg-12 col-md-12 col-sm-12"><div class="card mb-2"><div class="card-header">@@ -62,7 +62,7 @@<p><br/><a href="#" class="btn btn-outline-secondary add_rule_trigger">{{ __('firefly.add_rule_trigger') }}</a>- <a href="#" class="btn btn-outline-secondary test_rule_triggers"><span+ <a href="#" class="btn btn-outline-secondary test_rule_triggers" data-bs-toggle="modal" data-bs-target="#testTriggerModal"><spanclass="bi bi-flask"></span> {{ __('firefly.test_rule_triggers') }}</a></p></div>@@ -70,7 +70,6 @@</div></div>- @include('rules.partials.test-trigger-modal')<div class="row"><div class="col-lg-12 col-md-12 col-sm-12">@@ -123,11 +122,12 @@</div></form>+ @vite(['js/pages/generic.js'])@endsection@section('scripts')- @vite(['js/pages/generic.js'])+ @include('rules.partials.test-trigger-modal'){{-- new auto complete --}}<script type="text/javascript" src="v1/js/lib/bootstrap-simple-autocomplete.js?v={{ $FF_BUILD_TIME }}"