Merge branch 'master' of https://github.com/mcintyre321/mvc.jquery.datatables

Conflicts:
	Mvc.JQuery.Datatables.Templates/Content/jquery.dataTables.columnFilter.js

Author: mcintyre321

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "Mvc.JQuery.Datatables.Templates/Content/jquery-datatables-column-filter"]
+	path = Mvc.JQuery.Datatables.Templates/Content/jquery-datatables-column-filter
+	url = https://github.com/mcintyre321/jquery-datatables-column-filter.git

Mvc.JQuery.Datatables.Example/Controllers/FakeDatabase.cs

@@ -57,6 +57,7 @@ public class User
 
         public PositionTypes? Position { get; set; }
 
+        
         public DateTime? Hired { get; set; }
 
         public Numbers Number { get; set; }

Mvc.JQuery.Datatables.Example/Controllers/HomeController.cs

@@ -64,10 +64,10 @@ public class UserView
         [DataTables(SortDirection = SortDirection.Ascending, Order = 0)]
         public int Id { get; set; }
 
-        [DataTables(DisplayName = "E-Mail", Searchable = false)]
+        [DataTables(DisplayName = "E-Mail", Searchable = true)]
         public string Email { get; set; }
 
-        [DataTables( Sortable = false)]
+        [DataTables( Sortable = false, Width = "70px")]
         public bool IsAdmin { get; set; }
 
         [DataTables(Visible = false)]
@@ -78,6 +78,8 @@ public class UserView
         public decimal Salary { get; set; }
 
         public string Position { get; set; }
+
+        [DataTablesFilter(DataTablesFilterType.DateTimeRange)]
         public DateTime?  Hired { get; set; }
 
         public Numbers Number { get; set; }

Mvc.JQuery.Datatables.Example/Mvc.JQuery.Datatables.Example.csproj

@@ -64,6 +64,9 @@
       <Private>True</Private>
       <HintPath>..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
     </Reference>
+    <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.5.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="System.Web.Extensions" />
     <Reference Include="Microsoft.CSharp" />

Mvc.JQuery.Datatables.Example/Views/Home/_ExampleTable.cshtml

@@ -10,7 +10,11 @@
 <script type="text/javascript" src="//cdn.datatables.net/tabletools/2.2.1/js/dataTables.tableTools.min.js"></script>
 <link rel="stylesheet" href="//cdn.datatables.net/tabletools/2.2.1/css/dataTables.tableTools.css" />
 
-<script type="text/javascript" src="/Content/jquery.dataTables.columnFilter.js"></script>
+<script type="text/javascript" src="/Content/jquery-datatables-column-filter/jquery-ui-timepicker-addon.js"></script>
+<link rel="stylesheet" href="/Content/jquery-datatables-column-filter/jquery-ui-timepicker-addon.css" />
+
+<link rel="stylesheet" href="/Content/jquery-datatables-column-filter/media/js/jquery.dataTables.columnFilter.css" />
+<script type="text/javascript" src="/Content/jquery-datatables-column-filter/media/js/jquery.dataTables.columnFilter.js"></script>
 
 <link rel="stylesheet" href="//cdn.datatables.net/colvis/1.1.1/css/dataTables.colVis.css" />
 <script type="text/javascript" src="//cdn.datatables.net/colvis/1.1.1/js/dataTables.colVis.min.js"></script>
@@ -36,7 +40,7 @@
     vm.LengthMenu = LengthMenuVm.Default();
     vm.LengthMenu.RemoveAll(t => t.Item2 == 5);
     vm.PageLength = 25; //... and set a default
-    
+    vm.ColVis = true;
     if (Request.QueryString["lang"] == "de")
     {
         //vm.Language = "{ 'sUrl': '" + Url.Content("~/Content/jquery.dataTables.lang.de-DE.txt") + "' }";

Mvc.JQuery.Datatables.Example/Views/Shared/_Layout.cshtml

@@ -4,8 +4,6 @@
     <meta charset="utf-8" />
     <title>@ViewBag.Title</title>
     <script src="@Url.Content("~/Scripts/modernizr-2.0.6-development-only.js")" type="text/javascript"></script>
-    <link href="@Url.Content("~/Content/bootstrap.min.css")" rel="stylesheet" type="text/css"/>
-    <link href="@Url.Content("~/Content/bootstrap-overrides.css")" rel="stylesheet" type="text/css"/>
     <script src="@Url.Content("~/Scripts/jquery-1.11.0.min.js")" type="text/javascript"></script>
     <script src="@Url.Content("~/Scripts/jquery-ui-1.10.3.min.js")" type="text/javascript"></script>
     <link href="/Content/themes/Aristo/jquery-ui-1.8.7.custom.css" type="text/css" rel="stylesheet" />
@@ -60,5 +58,8 @@
     </div>
     <footer>
     </footer>
+    <link href="@Url.Content("~/Content/bootstrap.min.css")" rel="stylesheet" type="text/css" />
+    <link href="@Url.Content("~/Content/bootstrap-overrides.css")" rel="stylesheet" type="text/css" />
+
 </body>
 </html>

Mvc.JQuery.Datatables.Example/packages.config

@@ -18,6 +18,7 @@
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
   <package id="Modernizr" version="1.7" />
   <package id="Modernizr" version="2.0.6" />
+  <package id="Newtonsoft.Json" version="5.0.8" targetFramework="net45" />
   <package id="Twitter.Bootstrap" version="1.4.0" />
   <package id="Twitter.Bootstrap" version="2.0.1" />
 </packages>