From 1080f56794af35ff7b41a7eea5365368492f8d7d Mon Sep 17 00:00:00 2001
From: yekalkan <emre.kalkan@volosoft.com>
Date: Fri, 4 May 2018 15:31:30 +0300
Subject: [PATCH] Abp alert header refactor

---
 .../TagHelpers/Alert/AbpAlertHeaderSize.cs          | 13 -------------
 .../TagHelpers/Alert/AbpAlertHeaderTagHelper.cs     | 11 +++++++++--
 .../Alert/AbpAlertHeaderTagHelperService.cs         | 13 +------------
 .../Pages/Components/Alerts.cshtml                  |  4 ++--
 4 files changed, 12 insertions(+), 29 deletions(-)
 delete mode 100644 src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Alert/AbpAlertHeaderSize.cs

diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Alert/AbpAlertHeaderSize.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Alert/AbpAlertHeaderSize.cs
deleted file mode 100644
index a8d161b767..0000000000
--- a/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Alert/AbpAlertHeaderSize.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Alert
-{
-    public enum AbpAlertHeaderSize
-    {
-        Default,
-        h1,
-        h2,
-        h3,
-        h4,
-        h5,
-        h6
-    }
-}
\ No newline at end of file
diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Alert/AbpAlertHeaderTagHelper.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Alert/AbpAlertHeaderTagHelper.cs
index c1f587d7f6..385d34ba57 100644
--- a/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Alert/AbpAlertHeaderTagHelper.cs
+++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Alert/AbpAlertHeaderTagHelper.cs
@@ -1,8 +1,15 @@
-namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Alert
+using Microsoft.AspNetCore.Razor.TagHelpers;
+
+namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Alert
 {
+    [HtmlTargetElement("h1", Attributes = "abp-alert-header", TagStructure = TagStructure.NormalOrSelfClosing)]
+    [HtmlTargetElement("h2", Attributes = "abp-alert-header", TagStructure = TagStructure.NormalOrSelfClosing)]
+    [HtmlTargetElement("h3", Attributes = "abp-alert-header", TagStructure = TagStructure.NormalOrSelfClosing)]
+    [HtmlTargetElement("h4", Attributes = "abp-alert-header", TagStructure = TagStructure.NormalOrSelfClosing)]
+    [HtmlTargetElement("h5", Attributes = "abp-alert-header", TagStructure = TagStructure.NormalOrSelfClosing)]
+    [HtmlTargetElement("h6", Attributes = "abp-alert-header", TagStructure = TagStructure.NormalOrSelfClosing)]
     public class AbpAlertHeaderTagHelper : AbpTagHelper<AbpAlertHeaderTagHelper, AbpAlertHeaderTagHelperService>
     {
-        public AbpAlertHeaderSize Size { get; set; } = AbpAlertHeaderSize.Default;
 
         public AbpAlertHeaderTagHelper(AbpAlertHeaderTagHelperService tagHelperService)
             : base(tagHelperService)
diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Alert/AbpAlertHeaderTagHelperService.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Alert/AbpAlertHeaderTagHelperService.cs
index ed227bb36a..69bff1995c 100644
--- a/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Alert/AbpAlertHeaderTagHelperService.cs
+++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Alert/AbpAlertHeaderTagHelperService.cs
@@ -7,19 +7,8 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Alert
     {
         public override void Process(TagHelperContext context, TagHelperOutput output)
         {
-            output.TagName = GetHeaderSize(context, output);
             output.Attributes.AddClass("alert-heading");
-            output.TagMode = TagMode.StartTagAndEndTag;
-        }
-
-        protected virtual string GetHeaderSize(TagHelperContext context, TagHelperOutput output)
-        {
-            if (TagHelper.Size == AbpAlertHeaderSize.Default)
-            {
-                return AbpAlertHeaderSize.h4.ToString();
-            }
-
-            return TagHelper.Size.ToString();
+            output.Attributes.RemoveAll("abp-alert-header");
         }
     }
 }
\ No newline at end of file
diff --git a/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Alerts.cshtml b/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Alerts.cshtml
index df0b797272..88a20666e0 100644
--- a/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Alerts.cshtml
+++ b/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Alerts.cshtml
@@ -71,7 +71,7 @@
     <div class="demo-area">
 
         <abp-alert alert-type="Primary">
-            <abp-alert-header size="h4">Header</abp-alert-header>
+            <h4 abp-alert-header>Header</h4>
             I'm an abp alert!
         </abp-alert>
 
@@ -79,7 +79,7 @@
     <div class="code-area">
         <pre>
 &lt;abp-alert alert-type=&quot;Primary&quot;&gt;
-    &lt;abp-alert-header size=&quot;h3&quot;&gt;Header&lt;/abp-alert-header&gt;
+    &lt;h4 abp-alert-header&gt;Header&lt;/h4&gt;
     I&#39;m an abp alert!
 &lt;/abp-alert&gt;
 </pre>