From ec3e5bf21f1ae73d9b92c791cbc75668a2ec81f6 Mon Sep 17 00:00:00 2001 From: yekalkan Date: Wed, 25 Apr 2018 15:29:16 +0300 Subject: [PATCH] Enum refactoring grid tag helpers --- .../Grid/AbpColumnTagHelperService.cs | 14 ++++--- .../TagHelpers/Grid/ColumnOrder.cs | 26 ++++++------ .../TagHelpers/Grid/ColumnSize.cs | 29 ++++++------- .../Pages/Components/Forms.cshtml | 23 ++++++++++ .../Pages/Components/Forms.cshtml.cs | 12 ++++++ .../Pages/Components/Grids.cshtml | 42 +++++++++---------- .../Pages/Index.cshtml | 1 + 7 files changed, 94 insertions(+), 53 deletions(-) create mode 100644 test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Forms.cshtml create mode 100644 test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Forms.cshtml.cs diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Grid/AbpColumnTagHelperService.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Grid/AbpColumnTagHelperService.cs index bf530eb0b3..82aa86fcd5 100644 --- a/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Grid/AbpColumnTagHelperService.cs +++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Grid/AbpColumnTagHelperService.cs @@ -30,14 +30,18 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Grid protected virtual void ProcessSizeClass(TagHelperOutput output, ColumnSize size, string breakpoint) { - if (size == ColumnSize.Empty) + if (size == ColumnSize.Undefined) { return; } var classString = "col" + breakpoint; - if (size != ColumnSize.C) + if (size == ColumnSize.Auto) + { + classString += "-auto"; + } + else if (size != ColumnSize._) { classString += "-" + size.ToString("D"); } @@ -47,14 +51,14 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Grid protected virtual void ProcessOffsetClass(TagHelperOutput output, ColumnSize size, string breakpoint) { - if (size == ColumnSize.Empty) + if (size == ColumnSize.Undefined) { return; } var classString = "offset" + breakpoint; - if (size == ColumnSize.C) + if (size == ColumnSize._) { classString += "-0"; } @@ -78,7 +82,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Grid protected virtual void ProcessColumnOrder(TagHelperOutput output) { - if (TagHelper.ColumnOrder == ColumnOrder.Empty) + if (TagHelper.ColumnOrder == ColumnOrder.Undefined) { return; } diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Grid/ColumnOrder.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Grid/ColumnOrder.cs index 89a58a2679..f80aef9acc 100644 --- a/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Grid/ColumnOrder.cs +++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Grid/ColumnOrder.cs @@ -2,19 +2,19 @@ { public enum ColumnOrder { - Empty = 0, - C1 = 1, - C2 = 2, - C3 = 3, - C4 = 4, - C5 = 5, - C6 = 6, - C7 = 7, - C8 = 8, - C9 = 9, - C10 = 10, - C11 = 11, - C12 = 12, + Undefined = 0, + _1 = 1, + _2 = 2, + _3 = 3, + _4 = 4, + _5 = 5, + _6 = 6, + _7 = 7, + _8 = 8, + _9 = 9, + _10 = 10, + _11 = 11, + _12 = 12, First = 13, Last = 14 } diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Grid/ColumnSize.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Grid/ColumnSize.cs index 747b0d600d..35a07b99b5 100644 --- a/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Grid/ColumnSize.cs +++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Grid/ColumnSize.cs @@ -2,19 +2,20 @@ { public enum ColumnSize { - Empty = 0, - C1 = 1, - C2 = 2, - C3 = 3, - C4 = 4, - C5 = 5, - C6 = 6, - C7 = 7, - C8 = 8, - C9 = 9, - C10 = 10, - C11 = 11, - C12 = 12, - C = -1 + Undefined = 0, + _1 = 1, + _2 = 2, + _3 = 3, + _4 = 4, + _5 = 5, + _6 = 6, + _7 = 7, + _8 = 8, + _9 = 9, + _10 = 10, + _11 = 11, + _12 = 12, + Auto = 13, + _ = -1 } } \ No newline at end of file diff --git a/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Forms.cshtml b/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Forms.cshtml new file mode 100644 index 0000000000..30d8008e0e --- /dev/null +++ b/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Forms.cshtml @@ -0,0 +1,23 @@ +@page +@model Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.Pages.Components.FormsModel +@{ + ViewData["Title"] = "Forms"; +} + +

Forms

+ +

Based on Bootstrap form.

+ +

# Example

+ +
+
+ +
+
+ 
+
+
+
+
+ diff --git a/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Forms.cshtml.cs b/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Forms.cshtml.cs new file mode 100644 index 0000000000..ab186db51a --- /dev/null +++ b/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Forms.cshtml.cs @@ -0,0 +1,12 @@ +using Microsoft.AspNetCore.Mvc.RazorPages; + +namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.Pages.Components +{ + public class FormsModel : PageModel + { + public void OnGet() + { + + } + } +} \ No newline at end of file diff --git a/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Grids.cshtml b/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Grids.cshtml index 309bcc7c63..aa12bf5431 100644 --- a/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Grids.cshtml +++ b/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Components/Grids.cshtml @@ -14,13 +14,13 @@
- One of two columns - One of two columns + One of two columns + One of two columns - One of three columns - One of three columns - One of three columns + One of three columns + One of three columns + One of three columns
@@ -144,24 +144,24 @@
- One of three columns - One of three columns + One of three columns + One of three columns - One of three columns - One of three columns + One of three columns + One of three columns - One of three columns - One of three columns + One of three columns + One of three columns - One of three columns - One of three columns + One of three columns + One of three columns - One of three columns - One of three columns + One of three columns + One of three columns
@@ -200,8 +200,8 @@ First, but unordered - Second, but last - Third, but first + Second, but last + Third, but first First, but unordered @@ -234,14 +234,14 @@
.col-md-4 - .col-md-4 .offset-md-4 + .col-md-4 .offset-md-4 - .col-md-3 .offset-md-3 - .col-md-3 .offset-md-3 + .col-md-3 .offset-md-3 + .col-md-3 .offset-md-3 - .col-md-6 .offset-md-3 + .col-md-6 .offset-md-3
diff --git a/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Index.cshtml b/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Index.cshtml index eb327b1e1f..39f05f6f61 100644 --- a/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Index.cshtml +++ b/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Pages/Index.cshtml @@ -10,5 +10,6 @@
  • Buttons
  • Grids
  • Cards
    • +
  • Forms