From 0b2c5c2ad641e2f5c20c6d792fe9f702ad8557a7 Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Mon, 27 Sep 2021 22:51:00 +0200
Subject: [PATCH] #596 - added horizontal line above transaction form buttons
---
src/main/resources/templates/templates/newTemplate.ftl | 1 -
.../resources/templates/transactions/newTransactionMacros.ftl | 4 ++++
.../resources/templates/transactions/newTransactionNormal.ftl | 1 -
.../templates/transactions/newTransactionRepeating.ftl | 2 +-
.../templates/transactions/newTransactionTransfer.ftl | 1 -
5 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/templates/templates/newTemplate.ftl b/src/main/resources/templates/templates/newTemplate.ftl
index 96d29e2ac..11382cb18 100644
--- a/src/main/resources/templates/templates/newTemplate.ftl
+++ b/src/main/resources/templates/templates/newTemplate.ftl
@@ -81,7 +81,6 @@
<#-- icon -->
<@iconSelectMacros.iconSelect id="template-icon" item=template/>
- <br>
<#-- buttons -->
<@newTransactionMacros.buttons "/templates"/>
</form>
diff --git a/src/main/resources/templates/transactions/newTransactionMacros.ftl b/src/main/resources/templates/transactions/newTransactionMacros.ftl
index 9f6f36f77..3931e0b5c 100644
--- a/src/main/resources/templates/transactions/newTransactionMacros.ftl
+++ b/src/main/resources/templates/transactions/newTransactionMacros.ftl
@@ -288,6 +288,10 @@
</#macro>
<#macro buttons cancelURL>
+ <br>
+ <hr>
+ <br>
+
<div class="row hide-on-small-only">
<div class="col s6 right-align">
<@buttonCancel cancelURL/>
diff --git a/src/main/resources/templates/transactions/newTransactionNormal.ftl b/src/main/resources/templates/transactions/newTransactionNormal.ftl
index 82b800818..bc29ed0f4 100644
--- a/src/main/resources/templates/transactions/newTransactionNormal.ftl
+++ b/src/main/resources/templates/transactions/newTransactionNormal.ftl
@@ -72,7 +72,6 @@
</#if>
<@customSelectMacros.customAccountSelect "account-select-wrapper" "account" accounts selectedAccount "col s12 m12 l8 offset-l2" locale.getString("transaction.new.label.account") "transaction-account"/>
- <br>
<#-- buttons -->
<@newTransactionMacros.buttons "/transactions"/>
<@newTransactionMacros.buttonTransactionActions isEdit true previousType??/>
diff --git a/src/main/resources/templates/transactions/newTransactionRepeating.ftl b/src/main/resources/templates/transactions/newTransactionRepeating.ftl
index 5c9d47f7b..8d1d12344 100644
--- a/src/main/resources/templates/transactions/newTransactionRepeating.ftl
+++ b/src/main/resources/templates/transactions/newTransactionRepeating.ftl
@@ -72,7 +72,7 @@
<#-- repeating options -->
<@newTransactionMacros.transactionRepeating transaction currentDate/>
- <br>
+
<#-- buttons -->
<@newTransactionMacros.buttons "/transactions"/>
<@newTransactionMacros.buttonTransactionActions isEdit false previousType??/>
diff --git a/src/main/resources/templates/transactions/newTransactionTransfer.ftl b/src/main/resources/templates/transactions/newTransactionTransfer.ftl
index 96c3c21e6..b44cc7a1c 100644
--- a/src/main/resources/templates/transactions/newTransactionTransfer.ftl
+++ b/src/main/resources/templates/transactions/newTransactionTransfer.ftl
@@ -78,7 +78,6 @@
</#if>
<@customSelectMacros.customAccountSelect "transfer-account-select-wrapper" "transferAccount" accounts selectedTransferAccount "col s12 m12 l8 offset-l2" locale.getString("transaction.new.label.transfer.account") "transaction-destination-account"/>
- <br>
<#-- buttons -->
<@newTransactionMacros.buttons '/transactions'/>
<@newTransactionMacros.buttonTransactionActions isEdit true previousType??/>
--
GitLab