Skip to content

Commit 63abb1a

Browse files
robdmoorerobdmoore
committed
Added working example of bootstrap3 and default tempaltes with and without jquery validation vs aspnet-validation
Updated chameleon forms css/js to work against both Removed twitterbootstrap3 package and incstead just include all the files with the main library
1 parent bb39395 commit 63abb1a

File tree

91 files changed

+44401
-14335
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+44401
-14335
lines changed

‎ChameleonForms.Example/ChameleonForms.Example.csproj

+3-2
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,12 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<Folder Include="wwwroot\" />
8+
<ProjectReference Include="..\ChameleonForms\ChameleonForms.csproj" />
99
</ItemGroup>
1010

1111
<ItemGroup>
12-
<ProjectReference Include="..\ChameleonForms\ChameleonForms.csproj" />
12+
<Folder Include="wwwroot\lib\aspnetvalidation\" />
13+
<Folder Include="wwwroot\lib\bootstrap-native\dist\" />
1314
</ItemGroup>
1415

1516
</Project>

‎ChameleonForms.Example/Startup.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public void ConfigureServices(IServiceCollection services)
3232
{
3333
var accessor = provider.GetRequiredService<IHttpContextAccessor>();
3434
var template = accessor.HttpContext.Request.Cookies["template"] ?? "default";
35-
if (template == "default")
35+
if (template.StartsWith("default"))
3636
return new DefaultFormTemplate();
3737

3838
return new TwitterBootstrapFormTemplate();

‎ChameleonForms.Example/Views/Home/Index.cshtml

+2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@
99
<h2>Templates</h2>
1010
<ul>
1111
<li><a href="?template=default">Default</a></li>
12+
<li><a href="?template=defaultnojquery">Default - without jQuery</a></li>
1213
<li><a href="?template=bootstrap">Twitter Bootstrap</a></li>
14+
<li><a href="?template=bootstrapnojquery">Twitter Bootstrap - without jQuery</a></li>
1315
</ul>
1416

1517
<h2>ChameleonForms vs ASP.NET MVC <abbr title="out-of-the-box">OOTB</abbr></h2>

‎ChameleonForms.Example/Views/Shared/_Bootstrap3Layout.cshtml

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<!DOCTYPE html>
2+
<html>
3+
<head>
4+
<title>@ViewBag.Title</title>
5+
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
6+
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
7+
<link href="~/lib/bootstrap3/dist/css/bootstrap.min.css" rel="stylesheet" type="text/css" />
8+
<link href="~/lib/chameleonforms/chameleonforms-twitterbootstrap3.css" rel="stylesheet" type="text/css" />
9+
</head>
10+
<body>
11+
<div class="container">
12+
@RenderBody()
13+
</div>
14+
<script type="text/javascript" src="~/lib/jquery/dist/jquery.min.js"></script>
15+
<script type="text/javascript" src="~/lib/bootstrap3/dist/js/bootstrap.min.js"></script>
16+
<script type="text/javascript" src="~/lib/jquery-validation/dist/jquery.validate.min.js"></script>
17+
<script type="text/javascript" src="~/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js"></script>
18+
<script type="text/javascript" src="~/lib/chameleonforms/unobtrusive-date-validation.chameleonforms.js"></script>
19+
<script type="text/javascript" src="~/lib/chameleonforms/unobtrusive-twitterbootstrap3-validation.chameleonforms.js"></script>
20+
</body>
21+
</html>

‎ChameleonForms.Example/Views/Shared/_Bootstrap3LayoutWithoutJQuery.cshtml

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<!DOCTYPE html>
2+
<html>
3+
<head>
4+
<title>@ViewBag.Title</title>
5+
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
6+
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
7+
<link href="~/lib/bootstrap3/dist/css/bootstrap.min.css" rel="stylesheet" type="text/css" />
8+
<link href="~/lib/chameleonforms/chameleonforms-twitterbootstrap3.css" rel="stylesheet" type="text/css" />
9+
<link href="~/lib/aspnetvalidation/aspnet-validation.css" rel="stylesheet" type="text/css" />
10+
</head>
11+
<body>
12+
<div class="container">
13+
@RenderBody()
14+
</div>
15+
<script type="text/javascript" src="~/lib/aspnetvalidation/aspnet-validation.min.js"></script>
16+
<script type="text/javascript" src="~/lib/bootstrap-native/dist/bootstrap-native.min.js"></script>
17+
<script type="text/javascript" src="~/lib/chameleonforms/unobtrusive-date-validation.chameleonforms.js"></script>
18+
</body>
19+
</html>

‎ChameleonForms.Example/Views/Shared/_BootstrapLayout.cshtml

-21
This file was deleted.

‎ChameleonForms.Example/Views/Shared/_Layout.cshtml

+5-5
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
<meta charset="utf-8" />
55
<meta name="viewport" content="width=device-width" />
66
<title>@ViewBag.Title</title>
7-
<link rel="stylesheet" href="~/Content/styles.css" type="text/css" />
8-
<script type="text/javascript" src="~/Scripts/jquery-2.0.3.js"></script>
9-
<script type="text/javascript" src="~/Scripts/jquery.validate.js"></script>
10-
<script type="text/javascript" src="~/Scripts/jquery.validate.unobtrusive.js"></script>
11-
<script type="text/javascript" src="~/Scripts/jquery.validate.unobtrusive.chameleon.js"></script>
7+
<link rel="stylesheet" href="~/css/styles.css" type="text/css" />
8+
<script type="text/javascript" src="~/lib/jquery/dist/jquery.min.js"></script>
9+
<script type="text/javascript" src="~/lib/jquery-validation/dist/jquery.validate.min.js"></script>
10+
<script type="text/javascript" src="~/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js"></script>
11+
<script type="text/javascript" src="~/lib/chameleonforms/unobtrusive-date-validation.chameleonforms.js"></script>
1212
</head>
1313
<body>
1414
@RenderBody()

‎ChameleonForms.Example/Views/Shared/_LayoutWithoutJQuery.cshtml

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<!DOCTYPE html>
2+
<html>
3+
<head>
4+
<meta charset="utf-8" />
5+
<meta name="viewport" content="width=device-width" />
6+
<title>@ViewBag.Title</title>
7+
<link rel="stylesheet" href="~/css/styles.css" type="text/css" />
8+
<script type="text/javascript" src="~/lib/aspnetvalidation/aspnet-validation.min.js"></script>
9+
<script type="text/javascript" src="~/lib/chameleonforms/unobtrusive-date-validation.chameleonforms.js"></script>
10+
</head>
11+
<body>
12+
@RenderBody()
13+
</body>
14+
</html>

‎ChameleonForms.Example/Views/Web.config

-48
This file was deleted.

‎ChameleonForms.Example/Views/_ViewStart.cshtml

+18-3
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,27 @@
22
@using ChameleonForms.Templates.Default
33
@inject IFormTemplate DefaultFormTemplate
44
@{
5-
if (DefaultFormTemplate.GetType() == typeof (DefaultFormTemplate))
5+
if (ViewContext.HttpContext.Request.Cookies["template"].EndsWith("nojquery"))
66
{
7-
Layout = "~/Views/Shared/_Layout.cshtml";
7+
if (DefaultFormTemplate.GetType() == typeof (DefaultFormTemplate))
8+
{
9+
Layout = "~/Views/Shared/_LayoutWithoutJQuery.cshtml";
10+
}
11+
else
12+
{
13+
Layout = "~/Views/Shared/_Bootstrap3LayoutWithoutJQuery.cshtml";
14+
}
815
}
916
else
1017
{
11-
Layout = "~/Views/Shared/_BootstrapLayout.cshtml";
18+
if (DefaultFormTemplate.GetType() == typeof (DefaultFormTemplate))
19+
{
20+
Layout = "~/Views/Shared/_Layout.cshtml";
21+
}
22+
else
23+
{
24+
Layout = "~/Views/Shared/_Bootstrap3Layout.cshtml";
25+
}
26+
1227
}
1328
}

‎ChameleonForms.Example/wwwroot/Content/bootstrap-theme.css.map

-1
This file was deleted.

‎ChameleonForms.Example/wwwroot/Content/bootstrap.css.map

-1
This file was deleted.

‎ChameleonForms.Example/wwwroot/Content/bootstrap.min.css

-5
This file was deleted.

‎ChameleonForms.Example/wwwroot/Scripts/bootstrap.min.js

-7
This file was deleted.

0 commit comments

Comments
 (0)