Merge branch 'develop'

artiomchi · Apr 22, 2014 · 3741f5b · 3741f5b
2 parents a379c6f + 878428b
commit 3741f5b
Show file tree

Hide file tree

Showing 8 changed files with 93 additions and 36 deletions.
diff --git a/CustomTableHeader.cs b/CustomTableHeader.cs
@@ -0,0 +1,11 @@
+using System;
+using System.Web;
+
+namespace FlexLabs.Web.TablePager
+{
+    public class CustomTableHeader : ITableHeader
+    {
+        public Func<Object, IHtmlString> Content { get; set; }
+        public String CssClass { get; set; }
+    }
+}
diff --git a/ITableHeader.cs b/ITableHeader.cs
@@ -0,0 +1,9 @@
+using System;
+
+namespace FlexLabs.Web.TablePager
+{
+    public interface ITableHeader
+    {
+        String CssClass { get; set; }
+    }
+}
diff --git a/NuGet/FlexLabs.Web.TablePager.nuspec b/NuGet/FlexLabs.Web.TablePager.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>FlexLabs.Web.TablePager</id>
-        <version>1.5.9</version>
+        <version>1.5.10</version>
         <title>Table Pager</title>
         <authors>Artiom Chilaru</authors>
         <owners>Artiom Chilaru</owners>

diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.5.9.*")]
-[assembly: AssemblyFileVersion("1.5.9.*")]
+[assembly: AssemblyVersion("1.5.10.*")]
+[assembly: AssemblyFileVersion("1.5.10.*")]
diff --git a/TableHeader.cs b/TableHeader.cs
@@ -2,7 +2,7 @@
 
 namespace FlexLabs.Web.TablePager
 {
-    public class TableHeader
+    public class TableHeader : ITableHeader
     {
         public String Title { get; set; }
         public Object Value { get; set; }

diff --git a/TablePager.cshtml b/TablePager.cshtml
@@ -41,10 +41,21 @@
     @html.ValidationMessage("PageSize")
 }
 
-@helper Header(IEnumerable<TableHeader> headers) {
+@helper Header(IEnumerable<ITableHeader> headers) {
     <thead>
-        @foreach (var header in headers) { 
-            <th class="@header.CssClass">@if(header.Value != null) { <button type="submit" name="changeSort" value="@header.Value" title="@header.ToolTip">@header.Title</button> } else { @header.Title }</th>
+        @foreach (var iheader in headers) { 
+            <th class="@iheader.CssClass">@{
+                var header = iheader as TableHeader;
+                if (iheader is CustomTableHeader) {
+                    @((iheader as CustomTableHeader).Content(null))
+                } else {
+                    if(header.Value != null)
+                        {<button type="submit" name="changeSort" value="@header.Value" title="@header.ToolTip">@header.Title</button>}
+                    else { 
+                        @header.Title 
+                    }
+                }
+            }</th>
         }
     </thead>
 }

diff --git a/TablePager.csproj b/TablePager.csproj
@@ -45,7 +45,9 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="CustomTableHeader.cs" />
     <Compile Include="IOrderByExpression.cs" />
+    <Compile Include="ITableHeader.cs" />
     <Compile Include="ITableModel.cs" />
     <Compile Include="OrderByExpression.cs" />
     <Compile Include="OrderByExpressionCollection.cs" />

diff --git a/TablePager.generated.cs b/TablePager.generated.cs
@@ -2,7 +2,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18033
+//     Runtime Version:4.0.30319.34014
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -43,7 +43,7 @@ namespace FlexLabs.Web.TablePager
     #line default
     #line hidden
 
-    [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "1.5.4.0")]
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("RazorGenerator", "2.0.0.0")]
     public static class TablePager
     {
 
@@ -273,13 +273,13 @@ public static System.Web.WebPages.HelperResult PageSizer(System.Web.Mvc.HtmlHelp
 }
 
 
-public static System.Web.WebPages.HelperResult Header(IEnumerable<TableHeader> headers) {
+public static System.Web.WebPages.HelperResult Header(IEnumerable<ITableHeader> headers) {
 return new System.Web.WebPages.HelperResult(__razor_helper_writer => {
 
 
 
 #line 44 "..\..\TablePager.cshtml"
-                                                  
+                                                   
 
 #line default
 #line hidden
@@ -289,7 +289,7 @@ public static System.Web.WebPages.HelperResult Header(IEnumerable<TableHeader> h
 
 
 #line 46 "..\..\TablePager.cshtml"
-         foreach (var header in headers) { 
+         foreach (var iheader in headers) { 
 
 #line default
 #line hidden
@@ -299,31 +299,50 @@ public static System.Web.WebPages.HelperResult Header(IEnumerable<TableHeader> h
 
 
 #line 47 "..\..\TablePager.cshtml"
-WebViewPage.WriteTo(@__razor_helper_writer, header.CssClass);
+WebViewPage.WriteTo(@__razor_helper_writer, iheader.CssClass);
 
 #line default
 #line hidden
 
 
 
 #line 47 "..\..\TablePager.cshtml"
-                                       WebViewPage.WriteLiteralTo(@__razor_helper_writer, "\">");
+                                        WebViewPage.WriteLiteralTo(@__razor_helper_writer, "\">");
 
 #line default
 #line hidden
 
 
 #line 47 "..\..\TablePager.cshtml"
-                                          if(header.Value != null) {
+                                            
+                var header = iheader as TableHeader;
+                if (iheader is CustomTableHeader) {
+                    
 #line default
 #line hidden
 
-WebViewPage.WriteLiteralTo(@__razor_helper_writer, " <button type=\"submit\" name=\"changeSort\" value=\"");
 
+#line 50 "..\..\TablePager.cshtml"
+WebViewPage.WriteTo(@__razor_helper_writer, (iheader as CustomTableHeader).Content(null));
 
+#line default
+#line hidden
 
-#line 47 "..\..\TablePager.cshtml"
-                                                                         WebViewPage.WriteTo(@__razor_helper_writer, header.Value);
+
+#line 50 "..\..\TablePager.cshtml"
+                                                                   
+                } else {
+                    if(header.Value != null)
+                        {
+#line default
+#line hidden
+
+WebViewPage.WriteLiteralTo(@__razor_helper_writer, "<button type=\"submit\" name=\"changeSort\" value=\"");
+
+
+
+#line 53 "..\..\TablePager.cshtml"
+                             WebViewPage.WriteTo(@__razor_helper_writer, header.Value);
 
 #line default
 #line hidden
@@ -332,8 +351,8 @@ public static System.Web.WebPages.HelperResult Header(IEnumerable<TableHeader> h
 
 
 
-#line 47 "..\..\TablePager.cshtml"
-                                                                                               WebViewPage.WriteTo(@__razor_helper_writer, header.ToolTip);
+#line 53 "..\..\TablePager.cshtml"
+                                                   WebViewPage.WriteTo(@__razor_helper_writer, header.ToolTip);
 
 #line default
 #line hidden
@@ -342,39 +361,44 @@ public static System.Web.WebPages.HelperResult Header(IEnumerable<TableHeader> h
 
 
 
-#line 47 "..\..\TablePager.cshtml"
-                                                                                                                WebViewPage.WriteTo(@__razor_helper_writer, header.Title);
+#line 53 "..\..\TablePager.cshtml"
+                                                                    WebViewPage.WriteTo(@__razor_helper_writer, header.Title);
 
 #line default
 #line hidden
 
-WebViewPage.WriteLiteralTo(@__razor_helper_writer, "</button> ");
+WebViewPage.WriteLiteralTo(@__razor_helper_writer, "</button>");
 
 
 
-#line 47 "..\..\TablePager.cshtml"
-                                                                                                                                                                                  } else { 
+#line 53 "..\..\TablePager.cshtml"
+                                                                                                                                     }
+                    else { 
+                        
 #line default
 #line hidden
 
 
-#line 47 "..\..\TablePager.cshtml"
-                                                                                                                                                WebViewPage.WriteTo(@__razor_helper_writer, header.Title);
+#line 55 "..\..\TablePager.cshtml"
+WebViewPage.WriteTo(@__razor_helper_writer, header.Title);
 
 #line default
 #line hidden
 
 
-#line 47 "..\..\TablePager.cshtml"
-                                                                                                                                                                                                         }
+#line 55 "..\..\TablePager.cshtml"
+                                      
+                    }
+                }
+            
 #line default
 #line hidden
 
 WebViewPage.WriteLiteralTo(@__razor_helper_writer, "</th>\r\n");
 
 
 
-#line 48 "..\..\TablePager.cshtml"
+#line 59 "..\..\TablePager.cshtml"
         }
 
 #line default
@@ -384,7 +408,7 @@ public static System.Web.WebPages.HelperResult Header(IEnumerable<TableHeader> h
 
 
 
-#line 50 "..\..\TablePager.cshtml"
+#line 61 "..\..\TablePager.cshtml"
 
 #line default
 #line hidden
@@ -399,15 +423,15 @@ public static System.Web.WebPages.HelperResult FormHidden(ITableModel model) {
 
 
 
-#line 52 "..\..\TablePager.cshtml"
+#line 63 "..\..\TablePager.cshtml"
                                        
     
 #line default
 #line hidden
 
 
 
-#line 53 "..\..\TablePager.cshtml"
+#line 64 "..\..\TablePager.cshtml"
                                                                                                                                                          
 
 #line default
@@ -417,7 +441,7 @@ public static System.Web.WebPages.HelperResult FormHidden(ITableModel model) {
 
 
 
-#line 54 "..\..\TablePager.cshtml"
+#line 65 "..\..\TablePager.cshtml"
    WebViewPage.WriteTo(@__razor_helper_writer, model.SortBy);
 
 #line default
@@ -431,7 +455,7 @@ public static System.Web.WebPages.HelperResult FormHidden(ITableModel model) {
 
 
 
-#line 55 "..\..\TablePager.cshtml"
+#line 66 "..\..\TablePager.cshtml"
     WebViewPage.WriteTo(@__razor_helper_writer, model.SortAsc.ToString());
 
 #line default
@@ -441,7 +465,7 @@ public static System.Web.WebPages.HelperResult FormHidden(ITableModel model) {
 
 
 
-#line 56 "..\..\TablePager.cshtml"
+#line 67 "..\..\TablePager.cshtml"
 
 #line default
 #line hidden