Refactoring: creatdd macro for modals to confrm deletion

src/main/resources/templates/accounts/accounts.ftl

@@ -56,17 +56,9 @@
         </main>
 
         <#if currentAccount??>
-            <!-- confirm delete modal -->
-            <div id="modalConfirmDelete" class="modal background-color">
-                <div class="modal-content">
-                    <h4>${locale.getString("info.title.account.delete")}</h4>
+            <@header.modalConfirmDelete title=locale.getString("info.title.account.delete") confirmUrl='/accounts' cancelUrlBase="/accounts" itemId=currentAccount.getID() confirmButtonText=locale.getString("info.button.account.delete")>
                 <p>${locale.getString("info.text.account.delete", currentAccount.getName(), currentAccount.getReferringTransactions()?size)}</p>
-                </div>
-                <div class="modal-footer background-color">
-                    <a href="<@s.url '/accounts'/>" class="modal-action modal-close waves-effect waves-light red btn-flat white-text">${locale.getString("cancel")}</a>
-                    <a href="<@s.url '/accounts/${currentAccount.getID()?c}/delete'/>" class="modal-action modal-close waves-effect waves-light green btn-flat white-text">${locale.getString("info.button.account.delete")}</a>
-                </div>
-            </div>
+            </@header.modalConfirmDelete>
         </#if>
 
         <#if accountNotDeletable??>

src/main/resources/templates/charts/manage.ftl

@@ -57,17 +57,9 @@
             </div>
 
             <#if currentChart??>
-                <!-- confirm delete modal -->
-                <div id="modalConfirmDelete" class="modal background-color">
-                    <div class="modal-content">
-                        <h4>${locale.getString("info.title.chart.delete")}</h4>
+                <@header.modalConfirmDelete title=locale.getString("info.title.chart.delete") confirmUrl='/charts/manage' cancelUrlBase='/charts' itemId=currentChart.getID() confirmButtonText=locale.getString("info.title.chart.delete")>
                     <p>${locale.getString("info.text.chart.delete", currentChart.getName())}</p>
-                    </div>
-                    <div class="modal-footer background-color">
-                        <a href="<@s.url '/charts/manage'/>" class="modal-action modal-close waves-effect waves-light red btn-flat white-text">${locale.getString("cancel")}</a>
-                        <a href="<@s.url '/charts/${currentChart.getID()?c}/delete'/>" class="modal-action modal-close waves-effect waves-light green btn-flat white-text">${locale.getString("info.title.chart.delete")}</a>
-                    </div>
-                </div>
+                </@header.modalConfirmDelete>
             </#if>
         </main>
 

src/main/resources/templates/helpers/header.ftl

@@ -39,3 +39,17 @@
         <img class="${classes}" id="${id}" src="<@s.url '/images/Logo_with_text_medium_res.png'/>">
     </#if>
 </#macro>
+
+<#macro modalConfirmDelete title confirmUrl cancelUrlBase itemId confirmButtonText id="modalConfirmDelete" classes="">
+    <div id="${id}" class="modal background-color ${classes}">
+        <div class="modal-content">
+            <h4>${title}</h4>
+
+            <#nested>
+        </div>
+        <div class="modal-footer background-color">
+            <a href="<@s.url confirmUrl/>" class="modal-action modal-close waves-effect waves-light red btn-flat white-text">${locale.getString("cancel")}</a>
+            <a href="<@s.url cancelUrlBase + "/" + itemId?c + "/delete" />" class="modal-action modal-close waves-effect waves-light green btn-flat white-text">${confirmButtonText}</a>
+        </div>
+    </div>
+</#macro>
\ No newline at end of file

src/main/resources/templates/templates/templates.ftl

@@ -41,17 +41,9 @@
             </div>
 
             <#if currentTemplate??>
-                <!-- confirm delete modal -->
-                <div id="modalConfirmDelete" class="modal background-color">
-                    <div class="modal-content">
-                        <h4>${locale.getString("info.title.template.delete")}</h4>
+                <@header.modalConfirmDelete title=locale.getString("info.title.template.delete") confirmUrl='/templates' cancelUrlBase='/templates' itemId=currentTemplate.getID() confirmButtonText=locale.getString("info.title.template.delete")>
                     <p>${locale.getString("info.text.template.delete", currentTemplate.getTemplateName())}</p>
-                    </div>
-                    <div class="modal-footer background-color">
-                        <a href="<@s.url '/templates'/>" class="modal-action modal-close waves-effect waves-light red btn-flat white-text">${locale.getString("cancel")}</a>
-                        <a href="<@s.url '/templates/${currentTemplate.getID()?c}/delete'/>" class="modal-action modal-close waves-effect waves-light green btn-flat white-text">${locale.getString("info.title.template.delete")}</a>
-                    </div>
-                </div>
+                </@header.modalConfirmDelete>
             </#if>
         </main>
 

src/main/resources/templates/transactions/transactions.ftl

@@ -88,7 +88,13 @@
             </div>
 
             <#if currentTransaction??>
-                <@transactionsMacros.deleteModal currentTransaction/>
+                <@header.modalConfirmDelete title=locale.getString("info.title.transaction.delete") confirmUrl='/transactions' cancelUrlBase='/transactions' itemId=currentTransaction.getID() confirmButtonText=locale.getString("delete")>
+                    <#if currentTransaction.isRepeating()>
+                        <p>${locale.getString("info.text.transaction.repeating.delete", currentTransaction.name)}</p>
+                    <#else>
+                        <p>${locale.getString("info.text.transaction.delete", currentTransaction.name)}</p>
+                    </#if>
+                </@header.modalConfirmDelete>
             </#if>
 
             <@filterMacros.filterModal filterConfiguration/>

src/main/resources/templates/transactions/transactionsMacros.ftl

@@ -91,23 +91,6 @@
     </#if>
 </#macro>
 
-<#macro deleteModal transaction>
-    <div id="modalConfirmDelete" class="modal background-color">
-        <div class="modal-content">
-            <h4>${locale.getString("info.title.transaction.delete")}</h4>
-            <#if currentTransaction.isRepeating()>
-                <p>${locale.getString("info.text.transaction.repeating.delete", transaction.name)}</p>
-            <#else>
-                <p>${locale.getString("info.text.transaction.delete", transaction.name)}</p>
-            </#if>
-        </div>
-        <div class="modal-footer background-color">
-            <a href="<@s.url '/transactions'/>" class="modal-action modal-close waves-effect waves-light red btn-flat white-text">${locale.getString("cancel")}</a>
-            <a href="<@s.url '/transactions/${transaction.ID?c}/delete'/>" class="modal-action modal-close waves-effect waves-light green btn-flat white-text">${locale.getString("delete")}</a>
-        </div>
-    </div>
-</#macro>
-
 <#macro buttons isFilterActive>
     <div class="row hide-on-small-only valign-wrapper">
         <div class="col s6 right-align transactions-buttons-col">