Merge pull request #3257 from gterdem/gterdem/modal_tag_enhancement

Abp-Modal Tag helper extra features

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Modal/AbpModalFooterTagHelper.cs

@@ -1,8 +1,12 @@
-namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Modal
+using Microsoft.AspNetCore.Razor.TagHelpers;
+
+namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Modal
 {
+    [HtmlTargetElement("abp-modal-footer")]
     public class AbpModalFooterTagHelper : AbpTagHelper<AbpModalFooterTagHelper, AbpModalFooterTagHelperService>
     {
         public AbpModalButtons Buttons { get; set; }
+        public ButtonsAlign ButtonAlignment { get; set; } = ButtonsAlign.Default;
 
         public AbpModalFooterTagHelper(AbpModalFooterTagHelperService tagHelperService)
             : base(tagHelperService)

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Modal/AbpModalFooterTagHelperService.cs

@@ -24,6 +24,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Modal
             {
                 output.PostContent.SetHtmlContent(CreateContent());
             }
+            ProcessButtonsAlignment(output);
         }
 
         protected virtual string CreateContent()
@@ -49,9 +50,18 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Modal
                     sb.AppendLine("<button type=\"button\" class=\"btn btn-secondary\" data-dismiss=\"modal\">" + _localizer["Close"] + "</button>");
                     sb.AppendLine("<button type=\"submit\" class=\"btn btn-primary\" data-busy-text=\"" + _localizer["SavingWithThreeDot"] + "\"><i class=\"fa fa-check\"></i> <span>" + _localizer["Save"] + "</span></button>");
                     break;
-            }
-            
+            }
+
             return sb.ToString();
         }
+
+        protected virtual void ProcessButtonsAlignment(TagHelperOutput output)
+        {
+            if (TagHelper.ButtonAlignment == ButtonsAlign.Default)
+            {
+                return;
+            }
+            output.Attributes.AddClass("justify-content-" + TagHelper.ButtonAlignment.ToString().ToLowerInvariant());
+        }
     }
 }

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Modal/AbpModalTagHelper.cs

@@ -6,6 +6,8 @@
 
         public bool? Centered { get; set; } = false;
 
+        public bool? Static { get; set; } = false;
+
         public AbpModalTagHelper(AbpModalTagHelperService tagHelperService)
             : base(tagHelperService)
         {

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Modal/AbpModalTagHelperService.cs

@@ -18,9 +18,9 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Modal
             var sb = new StringBuilder();
 
             var attritubutes = output.Attributes.Select(a => " " + a.Name + "=\"" + a.Value + "\" ").ToList();
-            var attritubutesAsJoin = string.Join(" ", attritubutes.ToArray()); 
-
-            sb.AppendLine("<div class=\""+ GetModalClasses() + "\" tabindex=\"-1\" role=\"dialog\" aria-hidden=\"true\" "+ attritubutesAsJoin + ">");
+            var attritubutesAsJoin = string.Join(" ", attritubutes.ToArray());
+
+            sb.AppendLine("<div class=\"" + GetModalClasses() + "\" tabindex=\"-1\" role=\"dialog\" aria-hidden=\"true\" " + attritubutesAsJoin + GetDataAttributes() + ">");
             sb.AppendLine("    <div class=\"" + GetModalDialogClasses() + "\" role=\"document\">");
             sb.AppendLine("        <div class=\"" + GetModalContentClasses() + "\">");
 
@@ -56,6 +56,15 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Modal
             return "modal-content";
         }
 
+        protected virtual string GetDataAttributes()
+        {
+            if (TagHelper.Static == true)
+            {
+                return "data-backdrop=\"static\" ";
+            }
+            return string.Empty;
+        }
+
         protected virtual string CreatePostContent()
         {
             var sb = new StringBuilder();

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Modal/ButtonsAlign.cs

@@ -0,0 +1,12 @@
+namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Modal
+{
+    public enum ButtonsAlign
+    {
+        Default,
+        Start,
+        Center,
+        Around,
+        Between,
+        End
+    }
+}

framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Modals.cshtml

@@ -45,16 +45,16 @@
     <div class="code-area">
         <abp-tabs>
             <abp-tab title="Tag Helper">
-                <pre><code>
-&lt;abp-button button-type=&quot;Primary&quot; data-toggle=&quot;modal&quot; data-target=&quot;#myModal&quot;&gt;Launch modal&lt;/abp-button&gt;
-
-&lt;abp-modal centered=&quot;true&quot; size=&quot;Large&quot; id=&quot;myModal&quot;&gt;
-   &lt;abp-modal-header title=&quot;Modal title&quot;&gt;&lt;/abp-modal-header&gt;
-   &lt;abp-modal-body&gt;
-       Woohoo, you're reading this text in a modal!
-   &lt;/abp-modal-body&gt;
-   &lt;abp-modal-footer buttons=&quot;(AbpModalButtons.Save|AbpModalButtons.Close)&quot;&gt;&lt;/abp-modal-footer&gt;
-&lt;/abp-modal&gt;
+                <pre><code>
+    &lt;abp-button button-type=&quot;Primary&quot; data-toggle=&quot;modal&quot; data-target=&quot;#myModal&quot;&gt;Launch modal&lt;/abp-button&gt;
+
+    &lt;abp-modal centered=&quot;true&quot; size=&quot;Large&quot; id=&quot;myModal&quot;&gt;
+    &lt;abp-modal-header title=&quot;Modal title&quot;&gt;&lt;/abp-modal-header&gt;
+    &lt;abp-modal-body&gt;
+    Woohoo, you're reading this text in a modal!
+    &lt;/abp-modal-body&gt;
+    &lt;abp-modal-footer buttons=&quot;&commat;(AbpModalButtons.Save|AbpModalButtons.Close)&quot;&gt;&lt;/abp-modal-footer&gt;
+    &lt;/abp-modal&gt;
 </code></pre>
             </abp-tab>
             <abp-tab title="Rendered">