diff --git a/public/v1/js/ff/accounts/reconcile.js b/public/v1/js/ff/accounts/reconcile.js index 3753fedf22..bb5ad5de8a 100644 --- a/public/v1/js/ff/accounts/reconcile.js +++ b/public/v1/js/ff/accounts/reconcile.js @@ -196,7 +196,7 @@ function calculateBalanceDifference() { function getTransactionsForRange() { console.log('in getTransactionsForRange()'); // clear out the box: - $('#transactions_holder').empty().append($('
').addClass('text-center').html('')); + $('#transactions_holder').empty().append($('
').addClass('text-center').html(''));
var uri = transactionsUri.replace('%start%', $('input[name="start_date"]').val()).replace('%end%', $('input[name="end_date"]').val());
var index = indexUri.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.js
index 2da5497886..3b549e83b9 100644
--- a/public/v1/js/ff/help.js
+++ b/public/v1/js/ff/help.js
@@ -33,7 +33,7 @@ function showHelp(e) {
if (typeof specialPage === 'undefined') {
specialPage = '';
}
- $('#helpBody').html('');
+ $('#helpBody').html('');
$('#helpModal').modal('show');
$('#helpTitle').html(helpPageTitle);
$.getJSON('help/' + encodeURI(route)).done(function (data) {
diff --git a/public/v1/js/ff/install/index.js b/public/v1/js/ff/install/index.js
index b7ef6894ac..3232a52a98 100644
--- a/public/v1/js/ff/install/index.js
+++ b/public/v1/js/ff/install/index.js
@@ -28,7 +28,7 @@ $(function () {
function startRunningCommands() {
if (0 === index) {
- $('#status-box').html(' Running first command...');
+ $('#status-box').html(' Running first command...');
}
runCommand(index);
}
@@ -41,7 +41,7 @@ function runCommand(index) {
if(data.hasNextCommand) {
// inform user
- $('#status-box').html(' Just executed ' + data.previous + '...');
+ $('#status-box').html(' Just executed ' + data.previous + '...');
console.log('Will call next command.');
runCommand(index);
} else {
@@ -54,7 +54,7 @@ function runCommand(index) {
}
}).fail(function () {
- $('#status-box').html(' Command failed! See log files :(');
+ $('#status-box').html(' Command failed! See log files :(');
});
}
@@ -69,12 +69,12 @@ function startMigration() {
}
}).fail(function () {
- $('#status-box').html(' Migration failed! See log files :(');
+ $('#status-box').html(' Migration failed! See log files :(');
});
}
function startDecryption() {
- $('#status-box').html(' Setting up DB #2...');
+ $('#status-box').html(' Setting up DB #2...');
$.post(decryptUri, {_token: token}).done(function (data) {
if (data.error === false) {
// move to decrypt routine.
@@ -84,7 +84,7 @@ function startDecryption() {
}
}).fail(function () {
- $('#status-box').html(' Migration failed! See log files :(');
+ $('#status-box').html(' Migration failed! See log files :(');
});
}
@@ -92,7 +92,7 @@ function startDecryption() {
*
*/
function startPassport() {
- $('#status-box').html(' Setting up OAuth2...');
+ $('#status-box').html(' Setting up OAuth2...');
$.post(keysUri, {_token: token}).done(function (data) {
if (data.error === false) {
startUpgrade();
@@ -101,7 +101,7 @@ function startPassport() {
}
}).fail(function () {
- $('#status-box').html(' OAuth2 failed! See log files :(');
+ $('#status-box').html(' OAuth2 failed! See log files :(');
});
}
@@ -109,7 +109,7 @@ function startPassport() {
*
*/
function startUpgrade() {
- $('#status-box').html(' Upgrading database...');
+ $('#status-box').html(' Upgrading database...');
$.post(upgradeUri, {_token: token}).done(function (data) {
if (data.error === false) {
startVerify();
@@ -117,7 +117,7 @@ function startUpgrade() {
displaySoftFail(data.message);
}
}).fail(function () {
- $('#status-box').html(' Upgrade failed! See log files :(');
+ $('#status-box').html(' Upgrade failed! See log files :(');
});
}
@@ -125,7 +125,7 @@ function startUpgrade() {
*
*/
function startVerify() {
- $('#status-box').html(' Verify database integrity...');
+ $('#status-box').html(' Verify database integrity...');
$.post(verifyUri, {_token: token}).done(function (data) {
if (data.error === false) {
completeDone();
@@ -133,7 +133,7 @@ function startVerify() {
displaySoftFail(data.message);
}
}).fail(function () {
- $('#status-box').html(' Verification failed! See log files :(');
+ $('#status-box').html(' Verification failed! See log files :(');
});
}
@@ -141,14 +141,14 @@ function startVerify() {
*
*/
function completeDone() {
- $('#status-box').html(' Installation + upgrade complete! Wait to be redirected...');
+ $('#status-box').html(' Installation + upgrade complete! Wait to be redirected...');
setTimeout(function () {
window.location = homeUri;
}, 3000);
}
function displaySoftFail(message) {
- $('#status-box').html(' ' + message + '
Please read the ' +
+ $('#status-box').html(' ' + message + '
Please read the ' +
'' +
'documentation about this, and upgrade by hand.');
}
\ No newline at end of file
diff --git a/public/v1/js/ff/rules/create-edit.js b/public/v1/js/ff/rules/create-edit.js
index 4fe73c78c4..e3ca5c6bbd 100644
--- a/public/v1/js/ff/rules/create-edit.js
+++ b/public/v1/js/ff/rules/create-edit.js
@@ -418,7 +418,7 @@ function testRuleTriggers() {
var button = $('.test_rule_triggers');
// replace with spinner. fa-spin fa-spinner
- button.html(' ' + testRuleTriggersText);
+ button.html(' ' + testRuleTriggersText);
button.attr('disabled', 'disabled');
// Serialize all trigger data
@@ -442,7 +442,7 @@ function testRuleTriggers() {
modal.find(".transaction-warning").hide();
}
button.removeAttr('disabled');
- button.html(' ' + testRuleTriggersText);
+ button.html(' ' + testRuleTriggersText);
// Show the modal dialog
modal.modal();
}).fail(function () {
diff --git a/public/v1/js/ff/rules/index.js b/public/v1/js/ff/rules/index.js
index 0ed873b90a..6caf69298c 100644
--- a/public/v1/js/ff/rules/index.js
+++ b/public/v1/js/ff/rules/index.js
@@ -115,7 +115,7 @@ function testRuleTriggers(e) {
var ruleId = parseInt(obj.data('id'));
var icon = obj;
if (obj.prop("tagName") === 'A') {
- icon = $('i', obj);
+ icon = $('span', obj);
}
// change icon:
icon.addClass('fa-spinner fa-spin').removeClass('fa-flask');
diff --git a/resources/views/errors/404.twig b/resources/views/errors/404.twig
index 9fd4e3dc57..2b0f8fb811 100644
--- a/resources/views/errors/404.twig
+++ b/resources/views/errors/404.twig
@@ -21,7 +21,7 @@
{{ trans('errors.404_header') }}
diff --git a/resources/views/errors/500.twig b/resources/views/errors/500.twig index f51d2db4cb..192279f5fa 100644 --- a/resources/views/errors/500.twig +++ b/resources/views/errors/500.twig @@ -21,7 +21,7 @@{{ trans('errors.error_not_recoverable') }} diff --git a/resources/views/errors/503.twig b/resources/views/errors/503.twig index ca92ff26c5..52a7958956 100644 --- a/resources/views/errors/503.twig +++ b/resources/views/errors/503.twig @@ -21,13 +21,13 @@
{{ trans('errors.check_back') }}
{% if 'demo.firefly-iii.org' == Request.getHost() %}- The Firefly III demo website resets every four hours. + The Firefly III demo website resets every four hours. Please wait for this process to finish. It should take less than a minute.
{% endif %} diff --git a/resources/views/errors/FireflyException.twig b/resources/views/errors/FireflyException.twig index f51d2db4cb..192279f5fa 100644 --- a/resources/views/errors/FireflyException.twig +++ b/resources/views/errors/FireflyException.twig @@ -21,7 +21,7 @@{{ trans('errors.error_not_recoverable') }} diff --git a/resources/views/v1/accounts/index.twig b/resources/views/v1/accounts/index.twig index 60284eaecd..38afbccc6d 100644 --- a/resources/views/v1/accounts/index.twig +++ b/resources/views/v1/accounts/index.twig @@ -15,10 +15,10 @@
- {{ ('make_new_' ~ objectType ~ '_account')|_ }} + {{ ('make_new_' ~ objectType ~ '_account')|_ }}
{% if inactiveCount > 0 %}
diff --git a/resources/views/v1/accounts/reconcile/index.twig b/resources/views/v1/accounts/reconcile/index.twig
index d7865e0164..205b67fd72 100644
--- a/resources/views/v1/accounts/reconcile/index.twig
+++ b/resources/views/v1/accounts/reconcile/index.twig
@@ -39,7 +39,7 @@
-
+
{{ 'show_all_no_filter'|_ }}
-
+
{{ 'show_the_current_period_and_overview'|_ }}
-
+
{{ 'show_all_no_filter'|_ }}
diff --git a/resources/views/v1/categories/index.twig b/resources/views/v1/categories/index.twig
index e9688ce0e9..f6592369ab 100644
--- a/resources/views/v1/categories/index.twig
+++ b/resources/views/v1/categories/index.twig
@@ -13,9 +13,9 @@
-
+
{{ 'show_all_no_filter'|_ }}
-
+
{{ 'show_the_current_period_and_overview'|_ }}
-
+
{{ 'show_all_no_filter'|_ }}
@@ -90,7 +90,7 @@
{% else %}
{% include 'v1.list.groups' %}
-
+
{{ 'show_the_current_period_and_overview'|_ }}
diff --git a/resources/views/v1/currencies/index.twig b/resources/views/v1/currencies/index.twig
index e6f4534914..de8e4c7dcc 100644
--- a/resources/views/v1/currencies/index.twig
+++ b/resources/views/v1/currencies/index.twig
@@ -40,8 +40,8 @@
{% if isOwner %}
{{ 'export_data_advanced_expl'|_ }}
diff --git a/resources/views/v1/form/date.twig b/resources/views/v1/form/date.twig
index c2238acfdb..bbb205a801 100644
--- a/resources/views/v1/form/date.twig
+++ b/resources/views/v1/form/date.twig
@@ -4,7 +4,7 @@
{{ errors.first(name) }}
-
{{ 'problems_with_input'|_ }}
{{ 'problems_with_input'|_ }}
{{ 'dashboard'|_ }}
{{ 'budgets'|_ }}
{{ 'bills'|_ }}
{{ 'piggyBanks'|_ }}
{{ 'transactions'|_ }}
-
+
{{ 'expenses'|_ }} {{ 'income'|_ }} {{ 'transfers'|_ }}
{{ 'automation'|_ }}
-
+
{% if tag.tagMode == 'nothing' %}
-
+
{% endif %}
{% if tag.tagMode == 'balancingAct' %}
-
+
{% endif %}
{% if tag.tagMode == 'advancePayment' %}
-
+
{% endif %}
{{ tag.tag }}
diff --git a/resources/views/v1/accounts/reconcile/transactions.twig b/resources/views/v1/accounts/reconcile/transactions.twig
index 81ab7a1786..9e4dcf73b5 100644
--- a/resources/views/v1/accounts/reconcile/transactions.twig
+++ b/resources/views/v1/accounts/reconcile/transactions.twig
@@ -8,8 +8,8 @@
{{ trans('list.date') }}
{{ trans('list.from') }}
{{ trans('list.to') }}
-
-
+
+
@@ -61,8 +61,8 @@
@@ -70,22 +70,22 @@
{% if journal.transaction_type_type == 'Withdrawal' %}
-
+
{% endif %}
{% if journal.transaction_type_type == 'Deposit' %}
-
+
{% endif %}
{% if journal.transaction_type_type == 'Transfer' %}
-
+
{% endif %}
{% if journal.transaction_type_type == 'Reconciliation' %}
-
+
{% endif %}
{% if journal.transaction_type_type == 'Opening balance' %}
-
+
{% endif %}
@@ -93,7 +93,7 @@
{% if journal.group_title %}
- {{ journal.group_title }}:
+ {{ journal.group_title }}:
{% endif %}
{{ journal.description }}
@@ -110,7 +110,7 @@
{% if journal.date >= start and journal.date <= end %}
{% if journal.reconciled %}
-
+
@@ -123,7 +123,7 @@
{% else %}
{% if journal.reconciled %}
-
+
{% else %}
{% endif %}
diff --git a/resources/views/v1/accounts/show.twig b/resources/views/v1/accounts/show.twig
index fe6dbf12e3..ef6bf37daa 100644
--- a/resources/views/v1/accounts/show.twig
+++ b/resources/views/v1/accounts/show.twig
@@ -17,10 +17,10 @@
{% if linkType.editable %}
{% endif %}
diff --git a/resources/views/v1/admin/link/show.twig b/resources/views/v1/admin/link/show.twig
index 18be721b76..652c2b4ac6 100644
--- a/resources/views/v1/admin/link/show.twig
+++ b/resources/views/v1/admin/link/show.twig
@@ -27,9 +27,9 @@
diff --git a/resources/views/v1/admin/users/index.twig b/resources/views/v1/admin/users/index.twig
index 1f8dcfc074..9e0cf78e80 100644
--- a/resources/views/v1/admin/users/index.twig
+++ b/resources/views/v1/admin/users/index.twig
@@ -29,8 +29,8 @@
@@ -42,9 +42,9 @@
#{{ user.id }}
@@ -46,23 +46,23 @@
{% if user.isAdmin %}
-
+
{% else %}
-
+
{% endif %}
{% if user.has2FA %}
-
+
{% else %}
-
+
{% endif %}
{% if user.blocked == 1 %}
-
+
{% else %}
-
+
{% endif %}
diff --git a/resources/views/v1/admin/users/show.twig b/resources/views/v1/admin/users/show.twig
index 63a5bbabed..1f0eb5233e 100644
--- a/resources/views/v1/admin/users/show.twig
+++ b/resources/views/v1/admin/users/show.twig
@@ -32,9 +32,9 @@
{{ trans('list.is_admin') }}
{% if information.is_admin %}
- {{ 'yes'|_ }}
+ {{ 'yes'|_ }}
{% else %}
- {{ 'no'|_ }}
+ {{ 'no'|_ }}
{% endif %}
{{ trans('list.has_two_factor') }}
{% if information.has_2fa %}
- {{ 'yes'|_ }}
+ {{ 'yes'|_ }}
{% else %}
- {{ 'no'|_ }}
+ {{ 'no'|_ }}
{% endif %}
@@ -52,7 +52,7 @@
{{ trans('list.is_blocked') }}
{% if information.blocked %}
- {{ 'yes'|_ }}:
+ {{ 'yes'|_ }}:
{% if information.blocked_code == "" %}
~
@@ -61,7 +61,7 @@
{% endif %}
{% else %}
- {{ 'no'|_ }}
+ {{ 'no'|_ }}
{% endif %}
diff --git a/resources/views/v1/attachments/index.twig b/resources/views/v1/attachments/index.twig
index b9fb0d8502..13c945d304 100644
--- a/resources/views/v1/attachments/index.twig
+++ b/resources/views/v1/attachments/index.twig
@@ -30,9 +30,9 @@
diff --git a/resources/views/v1/auth/register.twig b/resources/views/v1/auth/register.twig
index fba7bb1459..ff9e5b16e2 100644
--- a/resources/views/v1/auth/register.twig
+++ b/resources/views/v1/auth/register.twig
@@ -31,7 +31,7 @@
@@ -53,9 +53,9 @@
{% if att.file_exists %}
-
+
{% else %}
-
+
{% endif %}
{{ title }}
{{ 'bill_is_active'|_ }}
{% if object.data.active %}
- {{ 'yes'|_ }}
+ {{ 'yes'|_ }}
{% else %}
- {{ 'no'|_ }}
+ {{ 'no'|_ }}
{% endif %}
diff --git a/resources/views/v1/budgets/index.twig b/resources/views/v1/budgets/index.twig
index f7beed9a00..763525300f 100644
--- a/resources/views/v1/budgets/index.twig
+++ b/resources/views/v1/budgets/index.twig
@@ -77,7 +77,7 @@
:
{{ formatAmountBySymbol(0, defaultCurrency.symbol, defaultCurrency.decimal_places, true) }}
-
+
@@ -94,7 +94,7 @@
@@ -136,9 +136,9 @@
:
{{ formatAmountBySymbol(budget.amount, budget.transaction_currency.symbol, budget.transaction_currency.decimal_places, true) }}
-
+
+ class="delete_ab btn btn-danger btn-xs">
@@ -195,7 +195,7 @@
@@ -216,7 +216,7 @@
@@ -233,9 +233,9 @@
@@ -256,14 +256,14 @@
{% if budget.auto_budget %}
{% if 1 == budget.auto_budget.auto_budget_type %}
-
+
{% endif %}
{% if 2 == budget.auto_budget.auto_budget_type %}
-
+
{% endif %}
{% endif %}
{% if budget.attachments.count() > 0 %}
-
+
{% endif %}
@@ -305,7 +305,7 @@
{% endif %}
{% if budget.budgeted|length < currencies.count() %}
-
+
{% endif %}
@@ -391,7 +391,7 @@
{{ 'categories'|_ }}
@@ -23,12 +23,12 @@
{% endif %}
@@ -65,19 +65,19 @@
{% if currency.id != defaultCurrency.id %}
-
+
{{ 'make_default_currency'|_ }}
{% endif %}
{% if currency.enabled %}
-
+
{{ 'disable_currency'|_ }}
{% endif %}
{% if not currency.enabled %}
-
+
{{ 'enable_currency'|_ }}
{% endif %}
diff --git a/resources/views/v1/export/index.twig b/resources/views/v1/export/index.twig
index 5709a8e9e8..7df7cf179c 100644
--- a/resources/views/v1/export/index.twig
+++ b/resources/views/v1/export/index.twig
@@ -17,7 +17,7 @@
-
+
{{ account.name }}
{% if account.location %}
-
+
{% endif %}
{% if account.attachments.count() > 0 %}
-
+
{% endif %}
{% if objectType == "asset" %}
@@ -75,9 +75,9 @@
{% endif %}
{% if account.active %}
-
+
{% else %}
-
+
{% endif %}
{# hide last activity to make room for other stuff #}
@@ -102,10 +102,10 @@
-
diff --git a/resources/views/v1/list/attachments.twig b/resources/views/v1/list/attachments.twig
index 5a6a0cb5c8..e67e669062 100644
--- a/resources/views/v1/list/attachments.twig
+++ b/resources/views/v1/list/attachments.twig
@@ -3,22 +3,22 @@
{% if attachment.file_exists %}
-
+
{% if attachment.title %}
{{ attachment.title }}
@@ -32,7 +32,7 @@
{% endif %}
{% endif %}
{% if not attachment.file_exists %}
-
+
{% if attachment.title %}
{{ attachment.title }}
{% else %}
diff --git a/resources/views/v1/list/bills.twig b/resources/views/v1/list/bills.twig
index d054b27ea6..f542838ffa 100644
--- a/resources/views/v1/list/bills.twig
+++ b/resources/views/v1/list/bills.twig
@@ -25,21 +25,21 @@
{% for entry in objectGroup.bills %}
-
+
-
+
{% if not entry.active %}
-
+
{% endif %}
{{ entry.name }}
{# count attachments #}
{% if entry.attachments.count() > 0 %}
-
+
{% endif %}
diff --git a/resources/views/v1/list/categories.twig b/resources/views/v1/list/categories.twig
index 43a603f983..66cac1345f 100644
--- a/resources/views/v1/list/categories.twig
+++ b/resources/views/v1/list/categories.twig
@@ -19,14 +19,14 @@
{{ category.name }}
{% if category.attachments.count() > 0 %}
-
+
{% endif %}
{% if category.lastActivity %}
diff --git a/resources/views/v1/list/groups.twig b/resources/views/v1/list/groups.twig
index e8ccf53311..e799367791 100644
--- a/resources/views/v1/list/groups.twig
+++ b/resources/views/v1/list/groups.twig
@@ -14,11 +14,11 @@
{{ 'actions'|_ }}
@@ -81,12 +81,12 @@
aria-haspopup="true" aria-expanded="false">
{{ 'actions'|_ }}
@@ -101,34 +101,34 @@
{% for objectGroup in objectGroups %}
{% if transaction.transaction_type_type == 'Withdrawal' %}
-
+
{% endif %}
{% if transaction.transaction_type_type == 'Deposit' %}
-
+
{% endif %}
{% if transaction.transaction_type_type == 'Transfer' %}
-
+
{% endif %}
{% if transaction.transaction_type_type == 'Reconciliation' %}
-
+
{% endif %}
{% if transaction.transaction_type_type == 'Opening balance' %}
-
+
{% endif %}
{% if transaction.transaction_type_type == 'Liability credit' %}
-
+
{% endif %}
{% if transaction.reconciled %}
-
+
{% endif %}
{% if transaction.attachments|length > 0 %}
-
+
{% endif %}
{% if group.count == 1 %}
@@ -245,15 +245,15 @@
aria-haspopup="true" aria-expanded="false">
{{ 'actions'|_ }}
@@ -289,11 +289,11 @@
{{ 'actions'|_ }}
diff --git a/resources/views/v1/list/piggy-banks.twig b/resources/views/v1/list/piggy-banks.twig
index e0b70d660a..9a97feeda1 100644
--- a/resources/views/v1/list/piggy-banks.twig
+++ b/resources/views/v1/list/piggy-banks.twig
@@ -25,24 +25,24 @@
-
-
+
+
{{ piggy.name }}
{% if piggy.attachments.count() > 0 %}
-
+
{% endif %}
@@ -52,7 +52,7 @@
{% if piggy.current_amount > 0 %}
-
+
{% endif %}
@@ -77,7 +77,7 @@
{% if piggy.left_to_save > 0 %}
-
+
{% endif %}
diff --git a/resources/views/v1/object-groups/index.twig b/resources/views/v1/object-groups/index.twig
index 53ab37bc19..b0085a58f2 100644
--- a/resources/views/v1/object-groups/index.twig
+++ b/resources/views/v1/object-groups/index.twig
@@ -38,7 +38,7 @@
-
@@ -39,15 +39,15 @@
+
{{ objectGroup.title }}
@@ -52,10 +52,10 @@
diff --git a/resources/views/v1/partials/boxes.twig b/resources/views/v1/partials/boxes.twig
index dc43d7e007..a7c15d9814 100644
--- a/resources/views/v1/partials/boxes.twig
+++ b/resources/views/v1/partials/boxes.twig
@@ -22,7 +22,7 @@
{# box for bills #}
{{ 'new_withdrawal'|_ }}
@@ -14,7 +14,7 @@
{{ 'new_deposit'|_ }}
@@ -23,7 +23,7 @@
{{ 'new_transfer'|_ }}
@@ -32,7 +32,7 @@
{{ 'new_asset_account'|_ }}
@@ -41,7 +41,7 @@
{{ 'new_expense_account'|_ }}
@@ -50,7 +50,7 @@
{{ 'new_revenue_account'|_ }}
@@ -59,7 +59,7 @@
{{ 'new_liabilities_account'|_ }}
@@ -69,7 +69,7 @@
{{ 'new_budget'|_ }}
@@ -79,7 +79,7 @@
{{ 'new_category'|_ }}
@@ -89,7 +89,7 @@
{{ 'new_piggy_bank'|_ }}
@@ -98,7 +98,7 @@
{{ 'new_bill'|_ }}
@@ -107,7 +107,7 @@
{{ 'new_rule'|_ }}
@@ -116,7 +116,7 @@
{{ 'new_recurring_transaction'|_ }}
diff --git a/resources/views/v1/partials/flashes.twig b/resources/views/v1/partials/flashes.twig
index b5c907ce6d..cd795a2a01 100644
--- a/resources/views/v1/partials/flashes.twig
+++ b/resources/views/v1/partials/flashes.twig
@@ -4,14 +4,14 @@
{% if mainTitleIcon %}
-
+
{% endif %}
{{ title }}
{% if subTitle %}
{% if subTitleIcon %}
-
+
{% endif %}
{{ subTitle }}
diff --git a/resources/views/v1/piggy-banks/index.twig b/resources/views/v1/piggy-banks/index.twig
index 6bae280bec..64b17c381b 100644
--- a/resources/views/v1/piggy-banks/index.twig
+++ b/resources/views/v1/piggy-banks/index.twig
@@ -16,12 +16,12 @@
{{ 'details'|_ }}
-
+
{% endif %}
{# Hide categories? #}
{% if not hideCategory %}
-
+
{% endif %}
{% if transaction.transaction_type_type == 'Withdrawal' %}
-
+
{% endif %}
{% if transaction.transaction_type_type == 'Deposit' %}
-
+
{% endif %}
{% if transaction.transaction_type_type == 'Transfer' %}
-
+
{% endif %}
{% if transaction.transaction_type_type == 'Reconciliation' %}
diff --git a/resources/views/v1/profile/index.twig b/resources/views/v1/profile/index.twig
index 1c2026d1cc..d7709ee834 100644
--- a/resources/views/v1/profile/index.twig
+++ b/resources/views/v1/profile/index.twig
@@ -86,8 +86,8 @@
{{ 'automation'|_ }}
{{ 'classification'|_ }}
{{ 'accounts'|_ }}
@@ -199,54 +199,54 @@
{{ 'transactions'|_ }}
{% if rt.attachments > 0 %}
-
+
{% endif %}
{% if rt.active == false %}
{% else %}
{% if report.accounts[account.id].sum != 0 %}
@@ -38,7 +38,7 @@
{% endfor %}
{% endif %}
{{ rt.type|_ }}:
@@ -146,7 +146,7 @@
diff --git a/resources/views/v1/recurring/show.twig b/resources/views/v1/recurring/show.twig
index 6a5a307d94..2eecc2d0dc 100644
--- a/resources/views/v1/recurring/show.twig
+++ b/resources/views/v1/recurring/show.twig
@@ -37,8 +37,8 @@
diff --git a/resources/views/v1/reports/budget/month.twig b/resources/views/v1/reports/budget/month.twig
index 57e6b27d40..7aed5e046e 100644
--- a/resources/views/v1/reports/budget/month.twig
+++ b/resources/views/v1/reports/budget/month.twig
@@ -16,7 +16,7 @@
{# loading indicator #}
{% for sum in report.sums[budget.budget_id] %}
- {{ formatAmountBySymbol(sum.sum, sum.currency_symbol, sum.currency_decimal_places) }}
+ {{ formatAmountBySymbol(sum.sum, sum.currency_symbol, sum.currency_decimal_places) }}
diff --git a/resources/views/v1/reports/partials/budget-period.twig b/resources/views/v1/reports/partials/budget-period.twig
index 5bd717d8f1..bf672d0ab7 100644
--- a/resources/views/v1/reports/partials/budget-period.twig
+++ b/resources/views/v1/reports/partials/budget-period.twig
@@ -14,9 +14,9 @@
{% endfor %}
{% endfor %}
diff --git a/resources/views/v1/reports/partials/category-period.twig b/resources/views/v1/reports/partials/category-period.twig
index fc8d400919..2660eed70b 100644
--- a/resources/views/v1/reports/partials/category-period.twig
+++ b/resources/views/v1/reports/partials/category-period.twig
@@ -13,9 +13,9 @@
{% if info.id != 0 %}
-
+
{% else %}
-
+
{% endif %}
diff --git a/resources/views/v1/reports/partials/budgets.twig b/resources/views/v1/reports/partials/budgets.twig
index ef442ae46d..56b80cc5b5 100644
--- a/resources/views/v1/reports/partials/budgets.twig
+++ b/resources/views/v1/reports/partials/budgets.twig
@@ -60,8 +60,8 @@
{% if budget_limit.spent != 0 %}
-
+
{% endif %}
diff --git a/resources/views/v1/reports/partials/categories.twig b/resources/views/v1/reports/partials/categories.twig
index 18ebf6b465..f45abde45d 100644
--- a/resources/views/v1/reports/partials/categories.twig
+++ b/resources/views/v1/reports/partials/categories.twig
@@ -22,8 +22,8 @@
{{ formatAmountBySymbol(category.earned, category.currency_symbol, category.currency_decimal_places, true) }}
{{ formatAmountBySymbol(category.sum, category.currency_symbol, category.currency_decimal_places, true) }}
-
+
{% endfor %}
diff --git a/resources/views/v1/reports/partials/journals-audit.twig b/resources/views/v1/reports/partials/journals-audit.twig
index 25f69514fe..d88485ebb5 100644
--- a/resources/views/v1/reports/partials/journals-audit.twig
+++ b/resources/views/v1/reports/partials/journals-audit.twig
@@ -14,8 +14,8 @@
{% if info.id != 0 %}
-
+
{% else %}
-
+
{% endif %}
diff --git a/resources/views/v1/reports/partials/income-expenses.twig b/resources/views/v1/reports/partials/income-expenses.twig
index fb89c15b6f..ad3767f87d 100644
--- a/resources/views/v1/reports/partials/income-expenses.twig
+++ b/resources/views/v1/reports/partials/income-expenses.twig
@@ -34,8 +34,8 @@
{% endif %}
-
+
{{ trans('list.from') }}
{{ trans('list.to') }}
-
-
+
+
{{ trans('list.bill') }}
{# more optional fields (2x) #}
@@ -38,30 +38,30 @@
{% if journal.transaction_type_type == 'Withdrawal' %}
-
+
{% endif %}
{% if journal.transaction_type_type == 'Deposit' %}
-
+
{% endif %}
{% if journal.transaction_type_type == 'Transfer' %}
-
+
{% endif %}
{% if journal.transaction_type_type == 'Reconciliation' %}
-
+
{% endif %}
{% if journal.transaction_type_type == 'Opening balance' %}
-
+
{% endif %}
diff --git a/resources/views/v1/reports/tag/month.twig b/resources/views/v1/reports/tag/month.twig
index 6f32f634dd..2294bc2e91 100644
--- a/resources/views/v1/reports/tag/month.twig
+++ b/resources/views/v1/reports/tag/month.twig
@@ -16,7 +16,7 @@
-
@@ -80,7 +80,7 @@
@@ -98,14 +98,14 @@
@@ -115,7 +115,7 @@
{{ rule.title }} ({{ 'inactive'|_|lower }})
{% endif %}
{% if rule.stop_processing %}
-
+
{% endif %}
{% if rule.description != "" %}
@@ -140,7 +140,7 @@
{{ trans(('firefly.rule_trigger_' ~ getRootSearchOperator(trigger.trigger_type)), {trigger_value: trigger.trigger_value}) }}
{% if trigger.stop_processing %}
-
+
{% endif %}
{% endif %}
@@ -158,7 +158,7 @@
{% endif %}
data-id="{{ action.id }}">{{ trans(('firefly.rule_action_' ~ action.action_type), {action_value: action.action_value}) }}
{% if action.stop_processing %}
-
+
{% endif %}
{% endfor %}
diff --git a/resources/views/v1/rules/partials/action.twig b/resources/views/v1/rules/partials/action.twig
index d9419ab082..3f216f9df7 100644
--- a/resources/views/v1/rules/partials/action.twig
+++ b/resources/views/v1/rules/partials/action.twig
@@ -1,6 +1,6 @@
-
+
{# todo error when invalid name. #}
diff --git a/resources/views/v1/rules/partials/test-trigger-modal.twig b/resources/views/v1/rules/partials/test-trigger-modal.twig
index c94c4aebf3..11b03b288a 100644
--- a/resources/views/v1/rules/partials/test-trigger-modal.twig
+++ b/resources/views/v1/rules/partials/test-trigger-modal.twig
@@ -7,7 +7,7 @@
{{ 'flash_warning'|_ }}
+ {{ 'flash_warning'|_ }}
diff --git a/resources/views/v1/transactions/index.twig b/resources/views/v1/transactions/index.twig
index 5ad54c611b..6540483763 100644
--- a/resources/views/v1/transactions/index.twig
+++ b/resources/views/v1/transactions/index.twig
@@ -78,7 +78,7 @@
-
+
{% if journal.journals_in_group > 1 %}
-
+
{% endif %}
{% if journal.transaction_type_type == 'Withdrawal' %}
-
+
{% endif %}
{% if journal.transaction_type_type == 'Deposit' %}
-
+
{% endif %}
{% if journal.transaction_type_type == 'Transfer' %}
-
+
{% endif %}
{% if journal.transaction_type_type == 'Reconciliation' %}
-
+
{% endif %}
{% if journal.transaction_type_type == 'Opening balance' %}
-
+
{% endif %}
diff --git a/resources/views/v1/transactions/mass/edit.twig b/resources/views/v1/transactions/mass/edit.twig
index 937807b34a..8ab5e6926e 100644
--- a/resources/views/v1/transactions/mass/edit.twig
+++ b/resources/views/v1/transactions/mass/edit.twig
@@ -35,8 +35,8 @@
{# LINK TO EDIT FORM #}
-
+
diff --git a/resources/views/v1/transactions/show.twig b/resources/views/v1/transactions/show.twig
index e73ae146dc..668c9c3609 100644
--- a/resources/views/v1/transactions/show.twig
+++ b/resources/views/v1/transactions/show.twig
@@ -16,28 +16,28 @@
{# edit + delete #}
-
@@ -173,7 +173,7 @@
{{ journal.description }}
{% if journal.reconciled %}
-
+
{% endif %}
{% if splits > 1 %}
@@ -189,34 +189,34 @@
{# edit + delete #}
-
@@ -336,7 +336,7 @@
{% for tag in journal.tags %}
@@ -360,9 +360,9 @@
- {{ tag.tag }}
+ {{ tag.tag }}
{% endfor %}
{{ trans('firefly.'~link.link) }} "
{{ 'flash_error'|_ }}
+ {{ 'flash_error'|_ }}
{{ errors.get('email')[0] }}
+
{{ session('logoutMessage') }}
Firefly III demonstration website
+ Firefly III demonstration website
To log in, please use email address {{ DEMO_USERNAME }}
and password {{ DEMO_PASSWORD }}
{{ 'flash_error'|_ }}
+ {{ 'flash_error'|_ }}
{{ session('error') }}
{{ 'flash_error'|_ }}
+ {{ 'flash_error'|_ }}
{{ 'flash_error'|_ }}
+ {{ 'flash_error'|_ }}
{{ 'problems_with_input'|_ }}
+ {{ 'problems_with_input'|_ }}
{% for error in errors.all %}
- {% if mainTitleIcon|default(false) %}{% endif %}
+ {% if mainTitleIcon|default(false) %}{% endif %}
{{ title }}
- {% if subTitleIcon|default(false) %}{% endif %}
+ {% if subTitleIcon|default(false) %}{% endif %}
{{ subTitle|default('') }}
{{ 'flash_success'|_ }}
+ {{ 'flash_success'|_ }}
{% if session_has('success_url') %}
@@ -26,7 +26,7 @@
{{ 'flash_warning'|_ }}
+ {{ 'flash_warning'|_ }}
{% if session_has('warning_url') %}
diff --git a/resources/views/v2/partials/layout/navbar.twig b/resources/views/v2/partials/layout/navbar.twig
index 59d151b8b2..fc7df19831 100644
--- a/resources/views/v2/partials/layout/navbar.twig
+++ b/resources/views/v2/partials/layout/navbar.twig
@@ -2,7 +2,7 @@
@@ -12,7 +12,7 @@