From 94f9766d945fd52729003737f5ea2040f4f8a571 Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Sun, 9 Jan 2022 16:43:07 +0100
Subject: [PATCH] #503 - add new save-and-continue button
---
src/main/resources/languages/base_de.properties | 1 +
src/main/resources/languages/base_en.properties | 1 +
.../transactions/newTransactionMacros.ftl | 17 ++++++++++++-----
3 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/languages/base_de.properties b/src/main/resources/languages/base_de.properties
index 7326352f8..1f0021b25 100644
--- a/src/main/resources/languages/base_de.properties
+++ b/src/main/resources/languages/base_de.properties
@@ -60,6 +60,7 @@ category.rest=Übertrag
ok=OK
cancel=Abbrechen
save=Speichern
+saveAndContinue=Speichern & Neu
delete=Löschen
delete.question=Löschen?
today=Heute
diff --git a/src/main/resources/languages/base_en.properties b/src/main/resources/languages/base_en.properties
index b0152ba93..4d95b1aa8 100644
--- a/src/main/resources/languages/base_en.properties
+++ b/src/main/resources/languages/base_en.properties
@@ -61,6 +61,7 @@ category.rest=Rest
ok=OK
cancel=Cancel
save=Save
+saveAndContinue=Save & New
delete=Delete
delete.question=Delete?
today=Today
diff --git a/src/main/resources/templates/transactions/newTransactionMacros.ftl b/src/main/resources/templates/transactions/newTransactionMacros.ftl
index cebc576e9..4e61426ce 100644
--- a/src/main/resources/templates/transactions/newTransactionMacros.ftl
+++ b/src/main/resources/templates/transactions/newTransactionMacros.ftl
@@ -309,11 +309,9 @@
<br>
<div class="row hide-on-small-only">
- <div class="col s6 right-align">
- <@buttonCancel cancelURL/>
- </div>
-
- <div class="col s6 left-align">
+ <div class="col s12 center-align">
+ <@buttonCancel cancelURL/>
+ <@buttonSaveAndContinue/>
<@buttonSave/>
</div>
</div>
@@ -324,6 +322,11 @@
<@buttonCancel cancelURL/>
</div>
</div>
+ <div class="row center-align">
+ <div class="col s12">
+ <@buttonSaveAndContinue/>
+ </div>
+ </div>
<div class="row center-align">
<div class="col s12">
<@buttonSave/>
@@ -340,6 +343,10 @@
<@header.buttonSubmit name='action' icon='save' localizationKey='save' id='button-save-transaction'/>
</#macro>
+<#macro buttonSaveAndContinue>
+ <@header.buttonSubmit name='action' icon='save' localizationKey='saveAndContinue' id='button-save-transaction-and-continue'/>
+</#macro>
+
<#macro buttonTransactionActions canChangeType canCreateTemplate changeTypeInProgress>
<#if (canChangeType || canCreateTemplate) && !changeTypeInProgress>
<div class="fixed-action-btn" id="transaction-actions-button">
--
GitLab