diff --git a/src/main/resources/templates/templates/newTemplate.ftl b/src/main/resources/templates/templates/newTemplate.ftl index f266971652caf1c682cf0442f8c87eba063a3e39..92ddcbaaf4269a7af87e80149526b2b0a9106cc2 100644 --- a/src/main/resources/templates/templates/newTemplate.ftl +++ b/src/main/resources/templates/templates/newTemplate.ftl @@ -69,7 +69,7 @@ <br> <#-- buttons --> - <@newTransactionMacros.buttons/> + <@newTransactionMacros.buttons "/templates"/> </form> </div> </div> diff --git a/src/main/resources/templates/transactions/newTransactionMacros.ftl b/src/main/resources/templates/transactions/newTransactionMacros.ftl index bc9518ab61d14a0add786b918d20080ad8ada55f..731f3c2bf52c05e4200df6af8ca6c827d2ac5682 100644 --- a/src/main/resources/templates/transactions/newTransactionMacros.ftl +++ b/src/main/resources/templates/transactions/newTransactionMacros.ftl @@ -340,10 +340,10 @@ </div> </#macro> -<#macro buttons> +<#macro buttons cancelURL> <div class="row hide-on-small-only"> <div class="col s6 right-align"> - <@buttonCancel/> + <@buttonCancel cancelURL/> </div> <div class="col s6 left-align"> @@ -354,7 +354,7 @@ <div class="hide-on-med-and-up"> <div class="row center-align"> <div class="col s12"> - <@buttonCancel/> + <@buttonCancel cancelURL/> </div> </div> <div class="row center-align"> @@ -365,8 +365,8 @@ </div> </#macro> -<#macro buttonCancel> - <a href="<@s.url '/transactions'/>" class="waves-effect waves-light btn budgetmaster-blue"><i class="material-icons left">clear</i>${locale.getString("cancel")}</a> +<#macro buttonCancel cancelURL> + <a href="<@s.url cancelURL/>" class="waves-effect waves-light btn budgetmaster-blue"><i class="material-icons left">clear</i>${locale.getString("cancel")}</a> </#macro> <#macro buttonSave> diff --git a/src/main/resources/templates/transactions/newTransactionNormal.ftl b/src/main/resources/templates/transactions/newTransactionNormal.ftl index fc4e34daed42d4a226be613e30a03fa57648c298..c9ff04c77e8cbed71e894e8e5e9ba5b090e514dd 100644 --- a/src/main/resources/templates/transactions/newTransactionNormal.ftl +++ b/src/main/resources/templates/transactions/newTransactionNormal.ftl @@ -60,7 +60,7 @@ <br> <#-- buttons --> - <@newTransactionMacros.buttons/> + <@newTransactionMacros.buttons "/transactions"/> <@newTransactionMacros.buttonTemplate/> </form> diff --git a/src/main/resources/templates/transactions/newTransactionRepeating.ftl b/src/main/resources/templates/transactions/newTransactionRepeating.ftl index 6c30e5862eaab20e08fe677c808a542d12359e22..0362a0c29e709d66f5917d909f5b3271281539f0 100644 --- a/src/main/resources/templates/transactions/newTransactionRepeating.ftl +++ b/src/main/resources/templates/transactions/newTransactionRepeating.ftl @@ -60,7 +60,7 @@ <@newTransactionMacros.transactionRepeating transaction currentDate/> <br> <#-- buttons --> - <@newTransactionMacros.buttons/> + <@newTransactionMacros.buttons "/transactions"/> </form> </div> </div> diff --git a/src/main/resources/templates/transactions/newTransactionTransfer.ftl b/src/main/resources/templates/transactions/newTransactionTransfer.ftl index a4bbc948d2b0d1c91e0122694a7f7f56fa7cd7b7..7eeb0e0336b7da9f9c4d6926d783cc30882734b5 100644 --- a/src/main/resources/templates/transactions/newTransactionTransfer.ftl +++ b/src/main/resources/templates/transactions/newTransactionTransfer.ftl @@ -65,7 +65,7 @@ <br> <#-- buttons --> - <@newTransactionMacros.buttons/> + <@newTransactionMacros.buttons "/transactions"/> <@newTransactionMacros.buttonTemplate/> </form>