Add extensible templates for form modal header/footer

ithielnor · ithielnor · commit c505186ded47 · 2023-12-08T09:56:35.000-05:00
diff --git a/Build/CommonAssemblyInfo.cs b/Build/CommonAssemblyInfo.cs
@@ -15,6 +15,6 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("3.6.36")]
-[assembly: AssemblyFileVersion("3.6.36")]
+[assembly: AssemblyVersion("3.6.37")]
+[assembly: AssemblyFileVersion("3.6.37")]
 //[assembly: AssemblyInformationalVersion("2.5-filters")]
diff --git a/Griddly.Mvc/GriddlyFilterBarSettings.cs b/Griddly.Mvc/GriddlyFilterBarSettings.cs
@@ -21,8 +21,12 @@ public class GriddlyFilterBarSettings : IGriddlyFilterSettings
 
 #if NETFRAMEWORK
         public Func<object, object> FilterButtonTemplate { get; set; }
+        public Func<IGriddlyFilterSettings, object> FilterModalHeaderTemplate { get; set; }
+        public Func<IGriddlyFilterSettings, object> FilterModalFooterTemplate { get; set; }
 #else
         public Func<object, IHtmlContent> FilterButtonTemplate { get; set; }
+        public Func<IGriddlyFilterSettings, IHtmlContent> FilterModalHeaderTemplate { get; set; }
+        public Func<IGriddlyFilterSettings, IHtmlContent> FilterModalFooterTemplate { get; set; }
 #endif
 
 
diff --git a/Griddly.Mvc/GriddlySettings.cs b/Griddly.Mvc/GriddlySettings.cs
@@ -172,6 +172,8 @@ public static void ConfigureBootstrap4Defaults()
         public Func<object, object> AfterTemplate { get; set; }
         public Func<GriddlySettings, object> FilterTemplate { get; set; }
         public Func<GriddlySettings, object> InlineFilterTemplate { get; set; }
+        public Func<IGriddlyFilterSettings, object> FilterModalHeaderTemplate { get; set; }
+        public Func<IGriddlyFilterSettings, object> FilterModalFooterTemplate { get; set; }
         public Func<object, object> FilterButtonTemplate { get; set; }
         public Func<object, object> BeforeColumnHeadersTemplate { get; set; }
 #else
@@ -181,6 +183,8 @@ public static void ConfigureBootstrap4Defaults()
         public Func<object, IHtmlContent> AfterTemplate { get; set; }
         public Func<GriddlySettings, IHtmlContent> FilterTemplate { get; set; }
         public Func<GriddlySettings, IHtmlContent> InlineFilterTemplate { get; set; }
+        public Func<IGriddlyFilterSettings, IHtmlContent> FilterModalHeaderTemplate { get; set; }
+        public Func<IGriddlyFilterSettings, IHtmlContent> FilterModalFooterTemplate { get; set; }
         public Func<object, IHtmlContent> FilterButtonTemplate { get; set; }
         public Func<object, IHtmlContent> BeforeColumnHeadersTemplate { get; set; }
 #endif
diff --git a/Griddly.Mvc/IGriddlyFilterSettings.cs b/Griddly.Mvc/IGriddlyFilterSettings.cs
@@ -13,10 +13,15 @@ namespace Griddly.Mvc
     public interface IGriddlyFilterSettings
     {
         List<GriddlyFilter> Filters { get; set; }
+
 #if NETFRAMEWORK
         Func<object, object> FilterButtonTemplate { get; set; }
+        Func<IGriddlyFilterSettings, object> FilterModalHeaderTemplate { get; set; }
+        Func<IGriddlyFilterSettings, object> FilterModalFooterTemplate { get; set; }
 #else
         Func<object, IHtmlContent> FilterButtonTemplate { get; set; }
+        Func<IGriddlyFilterSettings, IHtmlContent> FilterModalHeaderTemplate { get; set; }
+        Func<IGriddlyFilterSettings, IHtmlContent> FilterModalFooterTemplate { get; set; }
 #endif
     }
 }
diff --git a/Griddly/Views/Shared/Griddly/GriddlyFilters.cshtml b/Griddly/Views/Shared/Griddly/GriddlyFilters.cshtml
@@ -33,39 +33,53 @@ else
     <div class="modal-dialog modal-lg" role="document">
         <div class="modal-content">
             <div class="modal-header">
-                @if (css.IsBootstrap4) { <h4 class="modal-title">Filter</h4>}
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                @if (!css.IsBootstrap4) { <h4 class="modal-title">Filter</h4>}
+                @if (Model.FilterModalHeaderTemplate != null)
+                {
+                    @Model.FilterModalHeaderTemplate(Model)
+                }
+                else
+                {
+                    if (css.IsBootstrap4) { <h4 class="modal-title">Filter</h4> }
+                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                    if (!css.IsBootstrap4) { <h4 class="modal-title">Filter</h4> }
+                }
             </div>
-            <form class="@(css.IsBootstrap4?"":"form-horizontal")">
+            <form class="@(css.IsBootstrap4 ? ""  :"form-horizontal")">
                 <div class="modal-body">
                     @Html.Partial("Griddly/GriddlyFilterForm", Model.Filters)
                 </div>
-                <div class="modal-footer" style="@(css.IsBootstrap4 ? "justify-content:flex-start" : null@*fix for IE flex bug*@)" >
+                <div class="modal-footer" style="@(css.IsBootstrap4 ? "justify-content:flex-start" : null@*fix for IE flex bug*@)">
+                    @if (Model.FilterModalFooterTemplate != null)
+                    {
+                        @Model.FilterModalFooterTemplate(Model)
+                    }
+                    else
+                    {
+                        <div class="griddly-reset-btn btn-group @(css.IsBootstrap4 ? "mr-auto" : "pull-left")">
+                            <button type="button" class="@css.ButtonDefault dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                Reset @if (!css.IsBootstrap4)
+                                {<span class="@css.Icons.CaretDown"></span>}
+                            </button>
+                            @if (css.IsBootstrap4)
+                            {
+                                <div class="dropdown-menu">
+                                    <a class="griddly-search-reset dropdown-item" href="javascript:;">System Default</a>
+                                    <a class="griddly-search-clear dropdown-item" href="javascript:;">Clear (Show All)</a>
+                                </div>
+                            }
+                            else
+                            {
+                                <ul class="dropdown-menu">
+                                    <li><a class="griddly-search-reset" href="javascript:;">System Default</a></li>
+                                    <li><a class="griddly-search-clear" href="javascript:;">Clear (Show All)</a></li>
+                                </ul>
+                            }
+                        </div>
 
-                    <div class="btn-group @(css.IsBootstrap4 ? "mr-auto" : "pull-left")">
-                        <button type="button" class="@css.ButtonDefault dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                            Reset @if (!css.IsBootstrap4){<span class="@css.Icons.CaretDown"></span>}
-                        </button>
-                        @if (css.IsBootstrap4)
-                        {
-                            <div class="dropdown-menu">
-                                <a class="griddly-search-reset dropdown-item" href="javascript:;">System Default</a>
-                                <a class="griddly-search-clear dropdown-item" href="javascript:;">Clear (Show All)</a>
-                            </div>
-                        }
-                        else
-                        {
-                            <ul class="dropdown-menu">
-                                <li><a class="griddly-search-reset" href="javascript:;">System Default</a></li>
-                                <li><a class="griddly-search-clear" href="javascript:;">Clear (Show All)</a></li>
-                            </ul>
-                        }
-                    </div>
+                        <button type="button" class="@(css.IsBootstrap4 ? "btn btn-link" : css.ButtonDefault) griddly-filter-cancel" data-dismiss="modal">Cancel</button>
 
-                    <button type="button" class="@(css.IsBootstrap4 ? "btn btn-link" : css.ButtonDefault) griddly-filter-cancel" data-dismiss="modal">Cancel</button>
-
-                    <button type="submit" class="@css.ButtonDefault">Search</button>
+                        <button type="submit" class="@css.ButtonDefault">Search</button>
+                    }
                 </div>
             </form>
         </div>

Original file line number	Diff line number	Diff line change
`@@ -13,10 +13,15 @@ namespace Griddly.Mvc`
`13`	`13`	`public interface IGriddlyFilterSettings`
`14`	`14`	`{`
`15`	`15`	`List<GriddlyFilter> Filters { get; set; }`
	`16`	`+`
`16`	`17`	`#if NETFRAMEWORK`
`17`	`18`	`Func<object, object> FilterButtonTemplate { get; set; }`
	`19`	`+ Func<IGriddlyFilterSettings, object> FilterModalHeaderTemplate { get; set; }`
	`20`	`+ Func<IGriddlyFilterSettings, object> FilterModalFooterTemplate { get; set; }`
`18`	`21`	`#else`
`19`	`22`	`Func<object, IHtmlContent> FilterButtonTemplate { get; set; }`
	`23`	`+ Func<IGriddlyFilterSettings, IHtmlContent> FilterModalHeaderTemplate { get; set; }`
	`24`	`+ Func<IGriddlyFilterSettings, IHtmlContent> FilterModalFooterTemplate { get; set; }`
`20`	`25`	`#endif`
`21`	`26`	`}`
`22`	`27`	`}`