Fixed #630 - filter modal should use fixed footer for buttons

src/main/resources/templates/filter/filterMacros.ftl

 <#import "/spring.ftl" as s>
 
 <#macro buttons>
-    <div class="row hide-on-small-only valign-wrapper">
-        <div class="col s6 right-align">
+    <div class="row hide-on-small-only no-margin-bottom">
+        <div class="col s12 right-align">
+            <@buttonCloseModal/>
             <@buttonReset/>
-        </div>
-
-        <div class="col s6 left-align">
             <@buttonApply/>
         </div>
     </div>
 
-    <div class="hide-on-med-and-up valign-wrapper">
+    <div class="hide-on-med-and-up valign-wrapper no-margin-bottom">
+        <div class="row center-align">
+            <div class="col s12">
+                <@buttonCloseModal/>
+            </div>
+        </div>
         <div class="row center-align">
             <div class="col s12">
                 <@buttonReset/>
@@ -30,7 +33,7 @@
 </#macro>
 
 <#macro buttonApply>
-    <button class="btn waves-effect waves-light background-blue" type="submit" name="buttonSave">
+    <button class="btn waves-effect waves-light background-green" type="submit" name="buttonSave">
         <i class="fas fa-filter left"></i>${locale.getString("filter.apply")}
     </button>
 </#macro>
@@ -43,6 +46,10 @@
     <a class="filter-button-close waves-effect waves-light background-blue btn white-text"><i class="fas fa-filter left"></i>${locale.getString("filter.apply")}</a>
 </#macro>
 
+<#macro buttonCloseModal>
+    <@header.buttonLink url='' icon='clear' localizationKey='cancel' color='red' classes='modal-action modal-close text-white'/>
+</#macro>
+
 <#macro buttonsAllOrNone>
     <div class="row no-margin">
         <div class="col s6 right-align">
@@ -55,17 +62,16 @@
 </#macro>
 
 <#macro filterModal filterConfiguration>
-    <div id="modalFilter" class="modal background-color">
+    <div id="modalFilter" class="modal modal-fixed-footer background-color">
         <div class="modal-content">
             <h4>${locale.getString("title.filter")}</h4>
             <form name="NewFilterConfiguration" action="<@s.url '/filter/apply'/>" method="post">
                 <input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}"/>
                 <@filterModalContent filterConfiguration/>
-                <@buttons/>
             </form>
         </div>
         <div class="modal-footer background-color">
-            <@header.buttonLink url='' icon='clear' localizationKey='cancel' color='red' classes='modal-action modal-close text-white'/>
+            <@buttons/>
         </div>
     </div>
 </#macro>