From aca093125c80ddfbe84de46de9010ed637b0560a Mon Sep 17 00:00:00 2001 From: Steve Bohlen Date: Sun, 10 Jun 2012 08:20:41 -0400 Subject: [PATCH] SPRNET-1510 - mvc support for IDependencyResolver changes in mvc4 rc --- .../Spring.Mvc4QuickStart.sln | 13 +- .../App_Start/BundleConfig.cs | 40 - .../App_Start/FilterConfig.cs | 13 - .../App_Start/RouteConfig.cs | 30 - .../Config/controllers.xml | 2 +- .../Spring.Mvc4QuickStart/Content/Site.css | 168 +- .../Controllers/AccountController.cs | 74 +- .../Controllers/HomeController.cs | 6 +- ...ontroller.cs => ValuesSuffixController.cs} | 2 +- .../Spring.Mvc4QuickStart/Global.asax.cs | 29 +- .../Images/orderedList0.png | Bin 3424 -> 0 bytes .../Images/orderedList4.png | Bin 3355 -> 0 bytes .../Images/orderedList5.png | Bin 3361 -> 0 bytes .../Images/orderedList6.png | Bin 3757 -> 0 bytes .../Images/orderedList7.png | Bin 3651 -> 0 bytes .../Images/orderedList8.png | Bin 3467 -> 0 bytes .../Images/orderedList9.png | Bin 3446 -> 0 bytes .../{orderedList1.png => orderedListOne.png} | Bin ...{orderedList3.png => orderedListThree.png} | Bin .../{orderedList2.png => orderedListTwo.png} | Bin .../Properties/AssemblyInfo.cs | 2 +- .../Scripts/AjaxLogin.js | 110 + .../Scripts/_references.js | 1 - .../Spring.Mvc4QuickStart.csproj | 164 +- .../Views/Account/ChangePassword.cshtml | 24 +- .../Account/ChangePasswordSuccess.cshtml | 2 +- .../Views/Account/Login.cshtml | 15 +- .../Views/Account/Register.cshtml | 21 +- .../Views/Home/About.cshtml | 33 +- .../Views/Home/Contact.cshtml | 6 +- .../Views/Home/Index.cshtml | 91 +- .../Views/Shared/_Layout.cshtml | 12 +- .../Views/Shared/_LoginPartial.cshtml | 4 +- .../Spring.Mvc4QuickStart/Views/Web.config | 1 - .../Spring.Mvc4QuickStart/Web.config | 22 +- .../Spring.Mvc4QuickStart/packages.config | 33 +- .../AspNetMvc.4.0.20126.16343.nupkg | Bin 0 -> 337158 bytes .../lib/net40/System.Web.Mvc.dll | Bin 0 -> 491368 bytes .../lib/net40/System.Web.Mvc.xml | 9412 +++++++++++ .../AspNetRazor.Core.2.0.20126.16343.nupkg | Bin 0 -> 200232 bytes .../lib/net40/System.Web.Razor.dll | Bin 0 -> 276344 bytes .../lib/net40/System.Web.Razor.xml | 4323 +++++ .../tools/Install.ps1 | 180 + .../tools/Uninstall.ps1 | 174 + .../tools/VS.psd1 | 225 + .../tools/VS.psm1 | 166 + .../AspNetWebApi.4.0.20126.16343.nupkg | Bin 0 -> 24753 bytes .../lib/net40/System.Web.Http.WebHost.dll | Bin 0 -> 31592 bytes .../lib/net40/System.Web.Http.WebHost.xml | 96 + .../AspNetWebApi.Core.4.0.20126.16343.nupkg | Bin 0 -> 187497 bytes .../lib/net40/System.Web.Http.dll | Bin 0 -> 307560 bytes .../lib/net40/System.Web.Http.xml | 2015 +++ .../AspNetWebPages.Core.2.0.20126.16343.nupkg | Bin 0 -> 300886 bytes .../lib/net40/System.Web.Helpers.dll | Bin 0 -> 140664 bytes .../lib/net40/System.Web.Helpers.xml | 812 + .../net40/System.Web.WebPages.Deployment.dll | Bin 0 -> 41336 bytes .../net40/System.Web.WebPages.Deployment.xml | 53 + .../lib/net40/System.Web.WebPages.Razor.dll | Bin 0 -> 39800 bytes .../lib/net40/System.Web.WebPages.Razor.xml | 206 + .../lib/net40/System.Web.WebPages.dll | Bin 0 -> 194936 bytes .../lib/net40/System.Web.WebPages.xml | 2374 +++ .../tools/Install.ps1 | 180 + .../tools/Uninstall.ps1 | 174 + .../tools/VS.psd1 | 225 + .../tools/VS.psm1 | 166 + .../EntityFramework.4.1.10331.0.nupkg | Bin 0 -> 459260 bytes .../lib/net40/EntityFramework.dll | Bin 0 -> 785184 bytes .../lib/net40/EntityFramework.xml | 13206 ++++++++++++++++ ...icrosoft.Web.Optimization.1.0.0-beta.nupkg | Bin 0 -> 165638 bytes .../lib/net40/System.Web.Optimization.dll | Bin 0 -> 311616 bytes .../Modernizr.2.0.6/Modernizr.2.0.6.nupkg | Bin 19630 -> 19630 bytes .../System.Json.4.0.20126.16343.nupkg | Bin 0 -> 48670 bytes .../lib/net40/System.Json.dll | Bin 0 -> 66408 bytes .../lib/net40/System.Json.xml | 798 + .../System.Net.Http.2.0.20126.16343.nupkg | Bin 0 -> 141954 bytes .../lib/net40/System.Net.Http.WebRequest.dll | Bin 0 -> 14696 bytes .../lib/net40/System.Net.Http.WebRequest.xml | 59 + .../lib/net40/System.Net.Http.dll | Bin 0 -> 208232 bytes .../lib/net40/System.Net.Http.xml | 1920 +++ ....Net.Http.Formatting.4.0.20126.16343.nupkg | Bin 0 -> 104555 bytes .../lib/net40/System.Net.Http.Formatting.dll | Bin 0 -> 168296 bytes .../lib/net40/System.Net.Http.Formatting.xml | 1121 ++ ...stem.Web.Http.Common.4.0.20126.16343.nupkg | Bin 0 -> 30311 bytes .../lib/net40/System.Web.Http.Common.dll | Bin 0 -> 42856 bytes .../lib/net40/System.Web.Http.Common.xml | 229 + .../System.Web.Providers.1.1.nupkg | Bin 0 -> 12731 bytes .../content/web.config.transform | 36 + .../tools/install.ps1 | Bin 0 -> 19322 bytes .../System.Web.Providers.Core.1.0.nupkg | Bin 0 -> 87674 bytes .../lib/net40/System.Web.Providers.dll | Bin 0 -> 269120 bytes .../System.Web.Providers.Core.1.0/readme.html | Bin 0 -> 188154 bytes .../packages/jQuery.1.6.2/jQuery.1.6.2.nupkg | Bin 196894 -> 196901 bytes .../Scripts/jquery.unobtrusive-ajax.js | 163 + .../Scripts/jquery.unobtrusive-ajax.min.js | 5 + ...ery.Ajax.Unobtrusive.2.0.20126.16343.nupkg | Bin 0 -> 6319 bytes .../jQuery.UI.Combined.1.8.11.nupkg | Bin 239302 -> 239493 bytes .../jQuery.Validation.1.8.1.nupkg | Bin 37177 -> 37194 bytes .../Scripts/jquery.validate.unobtrusive.js | 345 + .../jquery.validate.unobtrusive.min.js | 5 + ...lidation.Unobtrusive.2.0.20126.16343.nupkg | Bin 0 -> 9036 bytes .../Content/Scripts/knockout-2.0.0.debug.js | 3255 ++++ .../Content/Scripts/knockout-2.0.0.js | 129 + .../knockoutjs.2.0.0.0.nupkg | Bin 0 -> 61841 bytes .../Support/AbstractXmlApplicationContext.cs | 4 +- .../Context/Support/XmlApplicationContext.cs | 4 +- .../Context/Support/MvcApplicationContext.cs | 6 +- .../Spring.Web.Mvc4/SpringMvcApplication.cs | 16 +- .../SpringMvcDependencyResolver.cs | 5 +- .../SpringWebApiDependencyResolver.cs | 43 +- .../Context/Support/WebApplicationContext.cs | 4 +- 110 files changed, 42553 insertions(+), 499 deletions(-) delete mode 100644 examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart/App_Start/BundleConfig.cs delete mode 100644 examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart/App_Start/FilterConfig.cs delete mode 100644 examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart/App_Start/RouteConfig.cs rename examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart/Controllers/{SuffixController.cs => ValuesSuffixController.cs} (93%) delete mode 100644 examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart/Images/orderedList0.png delete mode 100644 examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart/Images/orderedList4.png delete mode 100644 examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart/Images/orderedList5.png delete mode 100644 examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart/Images/orderedList6.png delete mode 100644 examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart/Images/orderedList7.png delete mode 100644 examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart/Images/orderedList8.png delete mode 100644 examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart/Images/orderedList9.png rename examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart/Images/{orderedList1.png => orderedListOne.png} (100%) rename examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart/Images/{orderedList3.png => orderedListThree.png} (100%) rename examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart/Images/{orderedList2.png => orderedListTwo.png} (100%) create mode 100644 examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart/Scripts/AjaxLogin.js create mode 100644 examples/Spring/Spring.Mvc4QuickStart/packages/AspNetMvc.4.0.20126.16343/AspNetMvc.4.0.20126.16343.nupkg create mode 100644 examples/Spring/Spring.Mvc4QuickStart/packages/AspNetMvc.4.0.20126.16343/lib/net40/System.Web.Mvc.dll create mode 100644 examples/Spring/Spring.Mvc4QuickStart/packages/AspNetMvc.4.0.20126.16343/lib/net40/System.Web.Mvc.xml create mode 100644 examples/Spring/Spring.Mvc4QuickStart/packages/AspNetRazor.Core.2.0.20126.16343/AspNetRazor.Core.2.0.20126.16343.nupkg create mode 100644 examples/Spring/Spring.Mvc4QuickStart/packages/AspNetRazor.Core.2.0.20126.16343/lib/net40/System.Web.Razor.dll create mode 100644 examples/Spring/Spring.Mvc4QuickStart/packages/AspNetRazor.Core.2.0.20126.16343/lib/net40/System.Web.Razor.xml create mode 100644 examples/Spring/Spring.Mvc4QuickStart/packages/AspNetRazor.Core.2.0.20126.16343/tools/Install.ps1 create mode 100644 examples/Spring/Spring.Mvc4QuickStart/packages/AspNetRazor.Core.2.0.20126.16343/tools/Uninstall.ps1 create mode 100644 examples/Spring/Spring.Mvc4QuickStart/packages/AspNetRazor.Core.2.0.20126.16343/tools/VS.psd1 create mode 100644 examples/Spring/Spring.Mvc4QuickStart/packages/AspNetRazor.Core.2.0.20126.16343/tools/VS.psm1 create mode 100644 examples/Spring/Spring.Mvc4QuickStart/packages/AspNetWebApi.4.0.20126.16343/AspNetWebApi.4.0.20126.16343.nupkg create mode 100644 examples/Spring/Spring.Mvc4QuickStart/packages/AspNetWebApi.4.0.20126.16343/lib/net40/System.Web.Http.WebHost.dll create mode 100644 examples/Spring/Spring.Mvc4QuickStart/packages/AspNetWebApi.4.0.20126.16343/lib/net40/System.Web.Http.WebHost.xml create mode 100644 examples/Spring/Spring.Mvc4QuickStart/packages/AspNetWebApi.Core.4.0.20126.16343/AspNetWebApi.Core.4.0.20126.16343.nupkg create mode 100644 examples/Spring/Spring.Mvc4QuickStart/packages/AspNetWebApi.Core.4.0.20126.16343/lib/net40/System.Web.Http.dll create mode 100644 examples/Spring/Spring.Mvc4QuickStart/packages/AspNetWebApi.Core.4.0.20126.16343/lib/net40/System.Web.Http.xml create mode 100644 examples/Spring/Spring.Mvc4QuickStart/packages/AspNetWebPages.Core.2.0.20126.16343/AspNetWebPages.Core.2.0.20126.16343.nupkg create mode 100644 examples/Spring/Spring.Mvc4QuickStart/packages/AspNetWebPages.Core.2.0.20126.16343/lib/net40/System.Web.Helpers.dll create mode 100644 examples/Spring/Spring.Mvc4QuickStart/packages/AspNetWebPages.Core.2.0.20126.16343/lib/net40/System.Web.Helpers.xml create mode 100644 examples/Spring/Spring.Mvc4QuickStart/packages/AspNetWebPages.Core.2.0.20126.16343/lib/net40/System.Web.WebPages.Deployment.dll create mode 100644 examples/Spring/Spring.Mvc4QuickStart/packages/AspNetWebPages.Core.2.0.20126.16343/lib/net40/System.Web.WebPages.Deployment.xml create mode 100644 examples/Spring/Spring.Mvc4QuickStart/packages/AspNetWebPages.Core.2.0.20126.16343/lib/net40/System.Web.WebPages.Razor.dll create mode 100644 examples/Spring/Spring.Mvc4QuickStart/packages/AspNetWebPages.Core.2.0.20126.16343/lib/net40/System.Web.WebPages.Razor.xml create mode 100644 examples/Spring/Spring.Mvc4QuickStart/packages/AspNetWebPages.Core.2.0.20126.16343/lib/net40/System.Web.WebPages.dll create mode 100644 examples/Spring/Spring.Mvc4QuickStart/packages/AspNetWebPages.Core.2.0.20126.16343/lib/net40/System.Web.WebPages.xml create mode 100644 examples/Spring/Spring.Mvc4QuickStart/packages/AspNetWebPages.Core.2.0.20126.16343/tools/Install.ps1 create mode 100644 examples/Spring/Spring.Mvc4QuickStart/packages/AspNetWebPages.Core.2.0.20126.16343/tools/Uninstall.ps1 create mode 100644 examples/Spring/Spring.Mvc4QuickStart/packages/AspNetWebPages.Core.2.0.20126.16343/tools/VS.psd1 create mode 100644 examples/Spring/Spring.Mvc4QuickStart/packages/AspNetWebPages.Core.2.0.20126.16343/tools/VS.psm1 create mode 100644 examples/Spring/Spring.Mvc4QuickStart/packages/EntityFramework.4.1.10331.0/EntityFramework.4.1.10331.0.nupkg create mode 100644 examples/Spring/Spring.Mvc4QuickStart/packages/EntityFramework.4.1.10331.0/lib/net40/EntityFramework.dll create mode 100644 examples/Spring/Spring.Mvc4QuickStart/packages/EntityFramework.4.1.10331.0/lib/net40/EntityFramework.xml create mode 100644 examples/Spring/Spring.Mvc4QuickStart/packages/Microsoft.Web.Optimization.1.0.0-beta/Microsoft.Web.Optimization.1.0.0-beta.nupkg create mode 100644 examples/Spring/Spring.Mvc4QuickStart/packages/Microsoft.Web.Optimization.1.0.0-beta/lib/net40/System.Web.Optimization.dll create mode 100644 examples/Spring/Spring.Mvc4QuickStart/packages/System.Json.4.0.20126.16343/System.Json.4.0.20126.16343.nupkg create mode 100644 examples/Spring/Spring.Mvc4QuickStart/packages/System.Json.4.0.20126.16343/lib/net40/System.Json.dll create mode 100644 examples/Spring/Spring.Mvc4QuickStart/packages/System.Json.4.0.20126.16343/lib/net40/System.Json.xml create mode 100644 examples/Spring/Spring.Mvc4QuickStart/packages/System.Net.Http.2.0.20126.16343/System.Net.Http.2.0.20126.16343.nupkg create mode 100644 examples/Spring/Spring.Mvc4QuickStart/packages/System.Net.Http.2.0.20126.16343/lib/net40/System.Net.Http.WebRequest.dll create mode 100644 examples/Spring/Spring.Mvc4QuickStart/packages/System.Net.Http.2.0.20126.16343/lib/net40/System.Net.Http.WebRequest.xml create mode 100644 examples/Spring/Spring.Mvc4QuickStart/packages/System.Net.Http.2.0.20126.16343/lib/net40/System.Net.Http.dll create mode 100644 examples/Spring/Spring.Mvc4QuickStart/packages/System.Net.Http.2.0.20126.16343/lib/net40/System.Net.Http.xml create mode 100644 examples/Spring/Spring.Mvc4QuickStart/packages/System.Net.Http.Formatting.4.0.20126.16343/System.Net.Http.Formatting.4.0.20126.16343.nupkg create mode 100644 examples/Spring/Spring.Mvc4QuickStart/packages/System.Net.Http.Formatting.4.0.20126.16343/lib/net40/System.Net.Http.Formatting.dll create mode 100644 examples/Spring/Spring.Mvc4QuickStart/packages/System.Net.Http.Formatting.4.0.20126.16343/lib/net40/System.Net.Http.Formatting.xml create mode 100644 examples/Spring/Spring.Mvc4QuickStart/packages/System.Web.Http.Common.4.0.20126.16343/System.Web.Http.Common.4.0.20126.16343.nupkg create mode 100644 examples/Spring/Spring.Mvc4QuickStart/packages/System.Web.Http.Common.4.0.20126.16343/lib/net40/System.Web.Http.Common.dll create mode 100644 examples/Spring/Spring.Mvc4QuickStart/packages/System.Web.Http.Common.4.0.20126.16343/lib/net40/System.Web.Http.Common.xml create mode 100644 examples/Spring/Spring.Mvc4QuickStart/packages/System.Web.Providers.1.1/System.Web.Providers.1.1.nupkg create mode 100644 examples/Spring/Spring.Mvc4QuickStart/packages/System.Web.Providers.1.1/content/web.config.transform create mode 100644 examples/Spring/Spring.Mvc4QuickStart/packages/System.Web.Providers.1.1/tools/install.ps1 create mode 100644 examples/Spring/Spring.Mvc4QuickStart/packages/System.Web.Providers.Core.1.0/System.Web.Providers.Core.1.0.nupkg create mode 100644 examples/Spring/Spring.Mvc4QuickStart/packages/System.Web.Providers.Core.1.0/lib/net40/System.Web.Providers.dll create mode 100644 examples/Spring/Spring.Mvc4QuickStart/packages/System.Web.Providers.Core.1.0/readme.html create mode 100644 examples/Spring/Spring.Mvc4QuickStart/packages/jQuery.Ajax.Unobtrusive.2.0.20126.16343/Content/Scripts/jquery.unobtrusive-ajax.js create mode 100644 examples/Spring/Spring.Mvc4QuickStart/packages/jQuery.Ajax.Unobtrusive.2.0.20126.16343/Content/Scripts/jquery.unobtrusive-ajax.min.js create mode 100644 examples/Spring/Spring.Mvc4QuickStart/packages/jQuery.Ajax.Unobtrusive.2.0.20126.16343/jQuery.Ajax.Unobtrusive.2.0.20126.16343.nupkg create mode 100644 examples/Spring/Spring.Mvc4QuickStart/packages/jQuery.Validation.Unobtrusive.2.0.20126.16343/Content/Scripts/jquery.validate.unobtrusive.js create mode 100644 examples/Spring/Spring.Mvc4QuickStart/packages/jQuery.Validation.Unobtrusive.2.0.20126.16343/Content/Scripts/jquery.validate.unobtrusive.min.js create mode 100644 examples/Spring/Spring.Mvc4QuickStart/packages/jQuery.Validation.Unobtrusive.2.0.20126.16343/jQuery.Validation.Unobtrusive.2.0.20126.16343.nupkg create mode 100644 examples/Spring/Spring.Mvc4QuickStart/packages/knockoutjs.2.0.0.0/Content/Scripts/knockout-2.0.0.debug.js create mode 100644 examples/Spring/Spring.Mvc4QuickStart/packages/knockoutjs.2.0.0.0/Content/Scripts/knockout-2.0.0.js create mode 100644 examples/Spring/Spring.Mvc4QuickStart/packages/knockoutjs.2.0.0.0/knockoutjs.2.0.0.0.nupkg diff --git a/examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart.sln b/examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart.sln index 51e6cca4..cfad7374 100644 --- a/examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart.sln +++ b/examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart.sln @@ -1,21 +1,18 @@  Microsoft Visual Studio Solution File, Format Version 11.00 # Visual Studio 2010 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Mvc4QuickStart", "Spring.Mvc4QuickStart\Spring.Mvc4QuickStart.csproj", "{A283911F-826C-4722-BD37-D1B3D9350932}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Spring.Mvc4QuickStart", "Spring.Mvc4QuickStart\Spring.Mvc4QuickStart.csproj", "{823803A7-8043-48EF-B38D-9F32B063F977}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - CodeCoverage|Any CPU = CodeCoverage|Any CPU Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {A283911F-826C-4722-BD37-D1B3D9350932}.CodeCoverage|Any CPU.ActiveCfg = Release|Any CPU - {A283911F-826C-4722-BD37-D1B3D9350932}.CodeCoverage|Any CPU.Build.0 = Release|Any CPU - {A283911F-826C-4722-BD37-D1B3D9350932}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A283911F-826C-4722-BD37-D1B3D9350932}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A283911F-826C-4722-BD37-D1B3D9350932}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A283911F-826C-4722-BD37-D1B3D9350932}.Release|Any CPU.Build.0 = Release|Any CPU + {823803A7-8043-48EF-B38D-9F32B063F977}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {823803A7-8043-48EF-B38D-9F32B063F977}.Debug|Any CPU.Build.0 = Debug|Any CPU + {823803A7-8043-48EF-B38D-9F32B063F977}.Release|Any CPU.ActiveCfg = Release|Any CPU + {823803A7-8043-48EF-B38D-9F32B063F977}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart/App_Start/BundleConfig.cs b/examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart/App_Start/BundleConfig.cs deleted file mode 100644 index ac2492d3..00000000 --- a/examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart/App_Start/BundleConfig.cs +++ /dev/null @@ -1,40 +0,0 @@ -using System.Web; -using System.Web.Optimization; - -namespace Spring.Mvc4QuickStart -{ - public class BundleConfig - { - public static void RegisterBundles(BundleCollection bundles) - { - bundles.Add(new ScriptBundle("~/bundles/jquery").Include( - "~/Scripts/jquery-1.*")); - - bundles.Add(new ScriptBundle("~/bundles/jqueryui").Include( - "~/Scripts/jquery-ui*")); - - bundles.Add(new ScriptBundle("~/bundles/jqueryval").Include( - "~/Scripts/jquery.unobtrusive*", - "~/Scripts/jquery.validate*")); - - bundles.Add(new ScriptBundle("~/bundles/modernizr").Include( - "~/Scripts/modernizr-*")); - - bundles.Add(new StyleBundle("~/Content/css").Include("~/Content/site.css")); - - bundles.Add(new StyleBundle("~/Content/themes/base/css").Include( - "~/Content/themes/base/jquery.ui.core.css", - "~/Content/themes/base/jquery.ui.resizable.css", - "~/Content/themes/base/jquery.ui.selectable.css", - "~/Content/themes/base/jquery.ui.accordion.css", - "~/Content/themes/base/jquery.ui.autocomplete.css", - "~/Content/themes/base/jquery.ui.button.css", - "~/Content/themes/base/jquery.ui.dialog.css", - "~/Content/themes/base/jquery.ui.slider.css", - "~/Content/themes/base/jquery.ui.tabs.css", - "~/Content/themes/base/jquery.ui.datepicker.css", - "~/Content/themes/base/jquery.ui.progressbar.css", - "~/Content/themes/base/jquery.ui.theme.css")); - } - } -} \ No newline at end of file diff --git a/examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart/App_Start/FilterConfig.cs b/examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart/App_Start/FilterConfig.cs deleted file mode 100644 index c1da1ea1..00000000 --- a/examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart/App_Start/FilterConfig.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System.Web; -using System.Web.Mvc; - -namespace Spring.Mvc4QuickStart -{ - public class FilterConfig - { - public static void RegisterGlobalFilters(GlobalFilterCollection filters) - { - filters.Add(new HandleErrorAttribute()); - } - } -} \ No newline at end of file diff --git a/examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart/App_Start/RouteConfig.cs b/examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart/App_Start/RouteConfig.cs deleted file mode 100644 index 7ee3f5f3..00000000 --- a/examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart/App_Start/RouteConfig.cs +++ /dev/null @@ -1,30 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; -using System.Web.Http; -using System.Web.Mvc; -using System.Web.Routing; - -namespace Spring.Mvc4QuickStart -{ - public class RouteConfig - { - public static void RegisterRoutes(RouteCollection routes) - { - routes.IgnoreRoute("{resource}.axd/{*pathInfo}"); - - routes.MapHttpRoute( - name: "DefaultApi", - routeTemplate: "api/{controller}/{id}", - defaults: new { id = RouteParameter.Optional } - ); - - routes.MapRoute( - name: "Default", - url: "{controller}/{action}/{id}", - defaults: new { controller = "Home", action = "Index", id = UrlParameter.Optional } - ); - } - } -} \ No newline at end of file diff --git a/examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart/Config/controllers.xml b/examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart/Config/controllers.xml index 4eb79ea3..bc3cbfbd 100644 --- a/examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart/Config/controllers.xml +++ b/examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart/Config/controllers.xml @@ -5,7 +5,7 @@ - + diff --git a/examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart/Content/Site.css b/examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart/Content/Site.css index 28a2b1ba..f865fab7 100644 --- a/examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart/Content/Site.css +++ b/examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart/Content/Site.css @@ -14,7 +14,8 @@ body { padding: 0; } -a { +a:link, a:visited, +a:active, a:hover { color: #333; outline: none; padding-left: 3px; @@ -22,26 +23,15 @@ a { text-decoration: underline; } - a:link, a:visited, - a:active, a:hover { - color: #333; - } - - a:hover { - background-color: #c7d1d6; - } +a:hover { + background-color: #c7d1d6; +} header, footer, hgroup, nav, section { display: block; } -mark { - background-color: #a6dbed; - padding-left: 5px; - padding-right: 5px; -} - .float-left { float: left; } @@ -50,6 +40,12 @@ mark { float: right; } +.highlight { + background-color: #a6dbed; + padding-left: 5px; + padding-right: 5px; +} + .clear-fix:after { content: "."; clear: both; @@ -252,44 +248,16 @@ ol.round { padding-left: 45px; } - ol.round li.zero { - background: url("../Images/orderedList0.png") no-repeat; - } - ol.round li.one { - background: url("../Images/orderedList1.png") no-repeat; + background: url("../Images/orderedListOne.png") no-repeat; } ol.round li.two { - background: url("../Images/orderedList2.png") no-repeat; + background: url("../Images/orderedListTwo.png") no-repeat; } ol.round li.three { - background: url("../Images/orderedList3.png") no-repeat; - } - - ol.round li.four { - background: url("../Images/orderedList4.png") no-repeat; - } - - ol.round li.five { - background: url("../Images/orderedList5.png") no-repeat; - } - - ol.round li.six { - background: url("../Images/orderedList6.png") no-repeat; - } - - ol.round li.seven { - background: url("../Images/orderedList7.png") no-repeat; - } - - ol.round li.eight { - background: url("../Images/orderedList8.png") no-repeat; - } - - ol.round li.nine { - background: url("../Images/orderedList9.png") no-repeat; + background: url("../Images/orderedListThree.png") no-repeat; } /* content */ @@ -404,41 +372,8 @@ fieldset { } /* ajax login/registration dialog */ -.ui-dialog { - font-family: inherit; - font-size: 1.0em; - -moz-border-radius: 0; - -webkit-border-radius: 0; - border-radius: 0; - border: 0 none; -} - - .ui-dialog input { - font-family: inherit; - font-size: 1.25em; - } - -.ui-dialog-titlebar { - color: inherit; - font-weight: inherit; - border: 0 none; - background: none; - float: right; -} - -.ui-dialog-titlebar-close { - -moz-border-radius: 0; - -webkit-border-radius: 0; - border-radius: 0; -} - -.ui-widget-header { - border: 0 none; - background: none; -} - .modal-popup { - + font-size: 0.7em; } .modal-popup input[type="text"], @@ -524,68 +459,6 @@ ul#social li { background: url("../Images/twitter.png") no-repeat; } -/* tables -----------------------------------------------------------*/ -table { - border-collapse: collapse; - border-spacing: 0; - margin-top: 0.75em; - border: 0 none; -} - -th { - font-size: 1.2em; - text-align: left; - border: none 0px; - padding-left: 0; -} - - th a { - display: block; - position: relative; - - } - - th a:link, th a:visited, th a:active, th a:hover { - color: #333; - font-weight: 600; - text-decoration: none; - padding: 0; - } - - th a:hover { - color: #000; - } - - th.asc a, th.desc a { - margin-right: .75em; - } - - th.asc a:after, th.desc a:after { - display: block; - position: absolute; - right: 0em; - top: 0; - font-size: 0.75em; - } - - th.asc a:after { - content: '▲'; - } - - th.desc a:after { - content: '▼'; - } - -td { - padding: 0.25em 2em 0.25em 0em; - border: 0 none; -} - -tr.pager td { - padding: 0 0.25em 0 0; -} - /******************** * Mobile Styles * @@ -686,16 +559,9 @@ tr.pager td { margin: 25px 0; } - ol.round li.zero, ol.round li.one, ol.round li.two, - ol.round li.three, - ol.round li.four, - ol.round li.five, - ol.round li.six, - ol.round li.seven, - ol.round li.eight, - ol.round li.nine { + ol.round li.three { background: none; } @@ -763,7 +629,9 @@ tr.pager td { background: none; display: inline; float: none; + height: auto; padding-left: 0; text-indent: 0; + width: auto; } } diff --git a/examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart/Controllers/AccountController.cs b/examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart/Controllers/AccountController.cs index 739d407c..44f7149a 100644 --- a/examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart/Controllers/AccountController.cs +++ b/examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart/Controllers/AccountController.cs @@ -17,10 +17,33 @@ namespace Spring.Mvc4QuickStart.Controllers // GET: /Account/Login [AllowAnonymous] - public ActionResult Login(string returnUrl) + public ActionResult Login() { - ViewBag.ReturnUrl = returnUrl; - return View(); + return ContextDependentView(); + } + + // + // POST: /Account/JsonLogin + + [AllowAnonymous] + [HttpPost] + public JsonResult JsonLogin(LoginModel model, string returnUrl) + { + if (ModelState.IsValid) + { + if (Membership.ValidateUser(model.UserName, model.Password)) + { + FormsAuthentication.SetAuthCookie(model.UserName, model.RememberMe); + return Json(new { success = true, redirect = returnUrl }); + } + else + { + ModelState.AddModelError("", "The user name or password provided is incorrect."); + } + } + + // If we got this far, something failed + return Json(new { errors = GetErrorsFromModelState() }); } // @@ -70,7 +93,35 @@ namespace Spring.Mvc4QuickStart.Controllers [AllowAnonymous] public ActionResult Register() { - return View(); + return ContextDependentView(); + } + + // + // POST: /Account/JsonRegister + + [AllowAnonymous] + [HttpPost] + public ActionResult JsonRegister(RegisterModel model) + { + if (ModelState.IsValid) + { + // Attempt to register the user + MembershipCreateStatus createStatus; + Membership.CreateUser(model.UserName, model.Password, model.Email, passwordQuestion: null, passwordAnswer: null, isApproved: true, providerUserKey: null, status: out createStatus); + + if (createStatus == MembershipCreateStatus.Success) + { + FormsAuthentication.SetAuthCookie(model.UserName, createPersistentCookie: false); + return Json(new { success = true }); + } + else + { + ModelState.AddModelError("", ErrorCodeToString(createStatus)); + } + } + + // If we got this far, something failed + return Json(new { errors = GetErrorsFromModelState() }); } // @@ -153,6 +204,21 @@ namespace Spring.Mvc4QuickStart.Controllers return View(); } + private ActionResult ContextDependentView() + { + string actionName = ControllerContext.RouteData.GetRequiredString("action"); + if (Request.QueryString["content"] != null) + { + ViewBag.FormAction = "Json" + actionName; + return PartialView(); + } + else + { + ViewBag.FormAction = actionName; + return View(); + } + } + private IEnumerable GetErrorsFromModelState() { return ModelState.SelectMany(x => x.Value.Errors.Select(error => error.ErrorMessage)); diff --git a/examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart/Controllers/HomeController.cs b/examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart/Controllers/HomeController.cs index c7a2714d..704821e8 100644 --- a/examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart/Controllers/HomeController.cs +++ b/examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart/Controllers/HomeController.cs @@ -16,17 +16,17 @@ namespace Spring.Mvc4QuickStart.Controllers return View(); } - + public ActionResult About() { - ViewBag.Message = "Your app description page."; + ViewBag.Message = "Your quintessential app description page."; return View(); } public ActionResult Contact() { - ViewBag.Message = "Your contact page."; + ViewBag.Message = "Your quintessential contact page."; return View(); } diff --git a/examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart/Controllers/SuffixController.cs b/examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart/Controllers/ValuesSuffixController.cs similarity index 93% rename from examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart/Controllers/SuffixController.cs rename to examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart/Controllers/ValuesSuffixController.cs index eb27e16b..f5d89746 100644 --- a/examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart/Controllers/SuffixController.cs +++ b/examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart/Controllers/ValuesSuffixController.cs @@ -3,7 +3,7 @@ using System.Web.Http; namespace Spring.Mvc4QuickStart.Controllers { - public class SuffixController : ApiController + public class ValuesSuffixController : ApiController { public string Suffix { get; set; } diff --git a/examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart/Global.asax.cs b/examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart/Global.asax.cs index 8d26bf38..5c5530c3 100644 --- a/examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart/Global.asax.cs +++ b/examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart/Global.asax.cs @@ -15,13 +15,36 @@ namespace Spring.Mvc4QuickStart public class MvcApplication : SpringMvcApplication { + public static void RegisterGlobalFilters(GlobalFilterCollection filters) + { + filters.Add(new HandleErrorAttribute()); + } + + public static void RegisterRoutes(RouteCollection routes) + { + routes.IgnoreRoute("{resource}.axd/{*pathInfo}"); + + routes.MapHttpRoute( + name: "DefaultApi", + routeTemplate: "api/{controller}/{id}", + defaults: new { id = RouteParameter.Optional } + ); + + routes.MapRoute( + name: "Default", + url: "{controller}/{action}/{id}", + defaults: new { controller = "Home", action = "Index", id = UrlParameter.Optional } + ); + } + protected void Application_Start() { AreaRegistration.RegisterAllAreas(); - FilterConfig.RegisterGlobalFilters(GlobalFilters.Filters); - RouteConfig.RegisterRoutes(RouteTable.Routes); - BundleConfig.RegisterBundles(BundleTable.Bundles); + RegisterGlobalFilters(GlobalFilters.Filters); + RegisterRoutes(RouteTable.Routes); + + BundleTable.Bundles.RegisterTemplateBundles(); } } } \ No newline at end of file diff --git a/examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart/Images/orderedList0.png b/examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart/Images/orderedList0.png deleted file mode 100644 index 7a4ea253aebd7c2fab5a14d7255d694c1f9825ed..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3424 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 diff --git a/examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart/Images/orderedList6.png b/examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart/Images/orderedList6.png deleted file mode 100644 index 3b9aa05a9cb5991971434ab050c07794260a6e32..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3757 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 XjsYQ9W9b5&00000NkvXXu0mjfoQ~>@ diff --git a/examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart/Images/orderedList7.png b/examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart/Images/orderedList7.png deleted file mode 100644 index f99c609f553957977407a39a11538f8656a45d32..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3651 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 V^Gy#~msS7(002ovPDHLkV1g5dtH1yN diff --git a/examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart/Images/orderedList8.png b/examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart/Images/orderedList8.png deleted file mode 100644 index 127596d105dd7862f48fe7aacf507fb7619b585e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3467 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 diff --git a/examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart/Images/orderedList9.png b/examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart/Images/orderedList9.png deleted file mode 100644 index 39cfdcf5768d99933867f86bcb2fdef2293d041e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3446 zcmV-+4TKLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 zfg=2N-7=cNnjjOr{yriy6mMFgG#l znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} z0007^NklEPlf^dc66_JWg=54t#51VQjB2!fm-6ha(&SFW+ieb+Sj#^ZbMfA78j zd*A;XYPZ|`4;ul<<#IA-PXJedDc}f@0S*J}Knth?t3X30*igIOjsl(p=7FqaGCzP4 z@D$kUc4)XqfTO@G;7trrfE4f;_z2|V0-plj1Lyl_;~4N7nC;r*JwV_2eeBl~z_QPU zN4+vm0ks1H4ch~slwEE1F(Q^LB?5`kS>u;<@4KPY1{U$??MO^ML|_nnK08~;4}R&M+mW9wye~i z$pVQ0I3wfXx^5hRUJTESgcuiTwOS2b*O{A}qgt)vc^;WehMAd}xZug*P}8MKS}Ya; zSXfwKad8n%({LOocGf}0zhtv^9OoY(UDtQ@TEcz@8Gq`hX%iC@0Bme*$hv$EfYK;8jZ#dyA8v@^E{T8mSq2RHM}zGzH&(Q z^6)$l(=;(na~I*t2uS+z9KJ)U_)(gZpHx&vc1p=obct!*nos(3&;h0 z3SWy`z%~ECAj}GrxKjwc1#S-jv<}>j5_|W7TL+l=3*b_x)a|A+9|D@c(fYA_z-8c1 z99_K%ob-ixYagXO-C15)V1VzyRp7Y)I{47z>{s9ka27ZhwGCySFx}o!$Please correct the errors and try again.

    ') + .prependTo($form); + } + + return errorSummary; + }; + + var displayErrors = function (form, errors) { + var errorSummary = getValidationSummaryErrors(form) + .removeClass('validation-summary-valid') + .addClass('validation-summary-errors'); + + var items = $.map(errors, function (error) { + return '
  • ' + error + '
  • '; + }).join(''); + + var ul = errorSummary + .find('ul') + .empty() + .append(items); + }; + + var resetForm = function ($form) { + // We reset the form so we make sure unobtrusive errors get cleared out. + $form[0].reset(); + + getValidationSummaryErrors($form) + .removeClass('validation-summary-errors') + .addClass('validation-summary-valid') + }; + + var formSubmitHandler = function (e) { + var $form = $(this); + + // We check if jQuery.validator exists on the form + if (!$form.valid || $form.valid()) { + $.post($form.attr('action'), $form.serializeArray()) + .done(function (json) { + json = json || {}; + + // In case of success, we redirect to the provided URL or the same page. + if (json.success) { + location = json.redirect || location.href; + } else if (json.errors) { + displayErrors($form, json.errors); + } + }) + .error(function () { + displayErrors($form, ['An unknown error happened.']); + }); + } + + // Prevent the normal behavior since we opened the dialog + e.preventDefault(); + }; + + var loadAndShowDialog = function (id, link, url) { + var separator = url.indexOf('?') >= 0 ? '&' : '?'; + + // Save an empty jQuery in our cache for now. + dialogs[id] = $(); + + // Load the dialog with the content=1 QueryString in order to get a PartialView + $.get(url + separator + 'content=1') + .done(function (content) { + dialogs[id] = $('') + .hide() // Hide the dialog for now so we prevent flicker + .appendTo(document.body) + .filter('div') // Filter for the div tag only, script tags could surface + .dialog({ // Create the jQuery UI dialog + title: link.data('dialog-title'), + modal: true, + resizable: true, + draggable: true, + width: link.data('dialog-width') || 600, + beforeClose: function () { resetForm($(this).find('form')); } + }) + .find('form') // Attach logic on forms + .submit(formSubmitHandler) + .end(); + }); + }; + + // List of link ids to have an ajax dialog + var links = ['#loginLink', '#registerLink']; + + $.each(links, function (i, id) { + $(id).click(function (e) { + var link = $(this), + url = link.attr('href'); + + if (!dialogs[id]) { + loadAndShowDialog(id, link, url); + } else { + dialogs[id].dialog('open'); + } + + // Prevent the normal behavior since we use a dialog + e.preventDefault(); + }); + }); +}); \ No newline at end of file diff --git a/examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart/Scripts/_references.js b/examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart/Scripts/_references.js index 90747dff..d91a82ab 100644 --- a/examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart/Scripts/_references.js +++ b/examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart/Scripts/_references.js @@ -1,6 +1,5 @@ /// /// /// -/// /// /// \ No newline at end of file diff --git a/examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart.csproj b/examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart.csproj index c6b02132..e609a4ce 100644 --- a/examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart.csproj +++ b/examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart.csproj @@ -1,13 +1,12 @@  - Debug AnyCPU 2.0 - {A283911F-826C-4722-BD37-D1B3D9350932} + {823803A7-8043-48EF-B38D-9F32B063F977} {E3E379DF-F4C6-4180-9B81-6769533ABE47};{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} Library Properties @@ -35,38 +34,94 @@ 4 + + ..\..\..\..\build\VS.Net.2010\Spring.Web.Mvc4\Debug\Common.Logging.dll + + + ..\packages\EntityFramework.4.1.10331.0\lib\net40\EntityFramework.dll + - - ..\packages\Newtonsoft.Json.4.5.6\lib\net40\Newtonsoft.Json.dll + + True + ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - - ..\..\..\..\build\VS.Net.2010\Spring.Core\Debug\Spring.Core.dll + + ..\..\..\..\build\VS.Net.2010\Spring.Web.Mvc4\Debug\Spring.Core.dll - - ..\..\..\..\build\VS.Net.2010\Spring.Web\Debug\Spring.Web.dll + + ..\..\..\..\build\VS.Net.2010\Spring.Web.Mvc4\Debug\Spring.Web.dll - + ..\..\..\..\build\VS.Net.2010\Spring.Web.Mvc4\Debug\Spring.Web.Mvc4.dll - + + True + ..\packages\System.Json.4.0.20126.16343\lib\net40\System.Json.dll + + + True + ..\packages\System.Net.Http.2.0.20126.16343\lib\net40\System.Net.Http.dll + + + True + ..\packages\System.Net.Http.Formatting.4.0.20126.16343\lib\net40\System.Net.Http.Formatting.dll + + + True + ..\packages\System.Net.Http.2.0.20126.16343\lib\net40\System.Net.Http.WebRequest.dll + - - - - - - - - + + True + ..\packages\AspNetWebPages.Core.2.0.20126.16343\lib\net40\System.Web.Helpers.dll + + + True + ..\packages\AspNetWebApi.Core.4.0.20126.16343\lib\net40\System.Web.Http.dll + + + True + ..\packages\System.Web.Http.Common.4.0.20126.16343\lib\net40\System.Web.Http.Common.dll + + + True + ..\packages\AspNetWebApi.4.0.20126.16343\lib\net40\System.Web.Http.WebHost.dll + + + True + ..\packages\AspNetMvc.4.0.20126.16343\lib\net40\System.Web.Mvc.dll + + + ..\packages\Microsoft.Web.Optimization.1.0.0-beta\lib\net40\System.Web.Optimization.dll + + + ..\packages\System.Web.Providers.Core.1.0\lib\net40\System.Web.Providers.dll + + + True + ..\packages\AspNetRazor.Core.2.0.20126.16343\lib\net40\System.Web.Razor.dll + + + True + ..\packages\AspNetWebPages.Core.2.0.20126.16343\lib\net40\System.Web.WebPages.dll + + + True + ..\packages\AspNetWebPages.Core.2.0.20126.16343\lib\net40\System.Web.WebPages.Deployment.dll + + + True + ..\packages\AspNetWebPages.Core.2.0.20126.16343\lib\net40\System.Web.WebPages.Razor.dll + @@ -76,44 +131,12 @@ - - ..\packages\EntityFramework.5.0.0-rc\lib\net40\EntityFramework.dll - - - True - ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - - - True - ..\packages\Microsoft.Net.Http.2.0.20505.0\lib\net40\System.Net.Http.dll - - - True - ..\packages\Microsoft.Net.Http.2.0.20505.0\lib\net40\System.Net.Http.WebRequest.dll - - - ..\packages\Microsoft.AspNet.Web.Optimization.1.0.0-beta2\lib\net40\System.Web.Optimization.dll - - - ..\packages\Microsoft.AspNet.Providers.Core.1.0\lib\net40\System.Web.Providers.dll - - - True - ..\packages\WebGrease.1.0.0\lib\WebGrease.dll - - - True - ..\packages\WebGrease.1.0.0\lib\Antlr3.Runtime.dll - - - - + - Global.asax @@ -121,9 +144,7 @@ - - Always - + @@ -177,6 +198,7 @@ + @@ -184,16 +206,9 @@ - - - - - - - - - - + + + @@ -215,13 +230,14 @@ - - 10.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - + + @@ -231,7 +247,7 @@ False True - 41293 + 57953 / @@ -244,10 +260,4 @@ - \ No newline at end of file diff --git a/examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart/Views/Account/ChangePassword.cshtml b/examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart/Views/Account/ChangePassword.cshtml index ac3bd714..5c21da6d 100644 --- a/examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart/Views/Account/ChangePassword.cshtml +++ b/examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart/Views/Account/ChangePassword.cshtml @@ -1,4 +1,4 @@ -@model Spring.Mvc4QuickStart.Models.ChangePasswordModel +@model Spring.Mvc4QuickStart.Models.ChangePasswordModel @{ ViewBag.Title = "Change Password"; @@ -6,36 +6,38 @@

    @ViewBag.Title.

    -

    Use this form to change your password.

    +

    Use the form below to change your password.

    - Passwords must be at least @Membership.MinRequiredPasswordLength characters long. + New passwords are required to be a minimum of @Membership.MinRequiredPasswordLength characters in length.

    + + + @using (Html.BeginForm()) { - @Html.ValidationSummary() + @Html.ValidationSummary(true, "Password change was unsuccessful. Please correct the errors and try again.")
    Change Password Form
    1. @Html.LabelFor(m => m.OldPassword) - @Html.PasswordFor(m => m.OldPassword) + @Html.PasswordFor(m => m.OldPassword) + @Html.ValidationMessageFor(m => m.OldPassword)
    2. @Html.LabelFor(m => m.NewPassword) - @Html.PasswordFor(m => m.NewPassword) + @Html.PasswordFor(m => m.NewPassword) + @Html.ValidationMessageFor(m => m.NewPassword)
    3. @Html.LabelFor(m => m.ConfirmPassword) - @Html.PasswordFor(m => m.ConfirmPassword) + @Html.PasswordFor(m => m.ConfirmPassword) + @Html.ValidationMessageFor(m => m.ConfirmPassword)
    } - -@section Scripts { - @Scripts.Render("~/bundles/jqueryval") -} diff --git a/examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart/Views/Account/ChangePasswordSuccess.cshtml b/examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart/Views/Account/ChangePasswordSuccess.cshtml index 07a7ccff..32cf73d6 100644 --- a/examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart/Views/Account/ChangePasswordSuccess.cshtml +++ b/examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart/Views/Account/ChangePasswordSuccess.cshtml @@ -4,5 +4,5 @@

    @ViewBag.Title.

    -

    Your password has been changed.

    +

    Your password has been changed successfully.

    diff --git a/examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart/Views/Account/Login.cshtml b/examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart/Views/Account/Login.cshtml index 55bad79e..576fb857 100644 --- a/examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart/Views/Account/Login.cshtml +++ b/examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart/Views/Account/Login.cshtml @@ -1,4 +1,4 @@ -@model Spring.Mvc4QuickStart.Models.LoginModel +@model Spring.Mvc4QuickStart.Models.LoginModel @{ ViewBag.Title = "Log in"; @@ -6,10 +6,13 @@

    @ViewBag.Title.

    -

    Use this form to enter your user name and password.

    +

    Enter your user name and password below.

    -@using (Html.BeginForm(new { ReturnUrl = ViewBag.ReturnUrl })) { + + + +@using (Html.BeginForm((string)ViewBag.FormAction, "Account")) { @Html.ValidationSummary(true, "Log in was unsuccessful. Please correct the errors and try again.")
    @@ -18,10 +21,12 @@
  • @Html.LabelFor(m => m.UserName) @Html.TextBoxFor(m => m.UserName) + @Html.ValidationMessageFor(m => m.UserName)
  • @Html.LabelFor(m => m.Password) @Html.PasswordFor(m => m.Password) + @Html.ValidationMessageFor(m => m.Password)
  • @Html.CheckBoxFor(m => m.RememberMe) @@ -34,7 +39,3 @@ @Html.ActionLink("Register", "Register") if you don't have an account.

    } - -@section Scripts { - @Scripts.Render("~/bundles/jqueryval") -} diff --git a/examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart/Views/Account/Register.cshtml b/examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart/Views/Account/Register.cshtml index d6c334b6..9d4c9179 100644 --- a/examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart/Views/Account/Register.cshtml +++ b/examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart/Views/Account/Register.cshtml @@ -1,4 +1,4 @@ -@model Spring.Mvc4QuickStart.Models.RegisterModel +@model Spring.Mvc4QuickStart.Models.RegisterModel @{ ViewBag.Title = "Register"; @@ -6,15 +6,18 @@

    @ViewBag.Title.

    -

    Create a new account.

    +

    Use the form below to create a new account.

    - Passwords must be at least @Membership.MinRequiredPasswordLength characters long. + Passwords are required to be a minimum of @Membership.MinRequiredPasswordLength characters in length.

    -@using (Html.BeginForm()) { - @Html.ValidationSummary() + + + +@using (Html.BeginForm((string)ViewBag.FormAction, "Account")) { + @Html.ValidationSummary(true, "Account creation was unsuccessful. Please correct the errors and try again.")
    Registration Form @@ -22,24 +25,24 @@
  • @Html.LabelFor(m => m.UserName) @Html.TextBoxFor(m => m.UserName) + @Html.ValidationMessageFor(m => m.UserName)
  • @Html.LabelFor(m => m.Email) @Html.TextBoxFor(m => m.Email) + @Html.ValidationMessageFor(m => m.Email)
  • @Html.LabelFor(m => m.Password) @Html.PasswordFor(m => m.Password) + @Html.ValidationMessageFor(m => m.Password)
  • @Html.LabelFor(m => m.ConfirmPassword) @Html.PasswordFor(m => m.ConfirmPassword) + @Html.ValidationMessageFor(m => m.ConfirmPassword)
  • } - -@section Scripts { - @Scripts.Render("~/bundles/jqueryval") -} diff --git a/examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart/Views/Home/About.cshtml b/examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart/Views/Home/About.cshtml index 273ba3ea..37e5d716 100644 --- a/examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart/Views/Home/About.cshtml +++ b/examples/Spring/Spring.Mvc4QuickStart/Spring.Mvc4QuickStart/Views/Home/About.cshtml @@ -9,22 +9,47 @@

    - Use this area to provide additional information. + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin luctus tincidunt justo nec tempor. + Aliquam erat volutpat. Fusce facilisis ullamcorper consequat. Vestibulum non sapien lectus. Nam + mi augue, posuere at tempus vel, dignissim vitae nulla. Nullam at quam eu sapien mattis ultrices. + Quisque quis leo mi, at lobortis dolor. Nullam scelerisque facilisis placerat. Fusce a augue + erat, malesuada euismod dui. Duis iaculis risus id felis volutpat elementum. Fusce blandit iaculis + quam a cursus. Cras varius tincidunt cursus. Morbi justo eros, adipiscing ac placerat sed, posuere + et mi. Suspendisse vulputate viverra aliquet. Duis non enim a nibh consequat mollis ac tempor + lorem. Phasellus elit leo, semper eu luctus et, suscipit at lacus. In hac habitasse platea + dictumst. Duis dignissim justo sit amet nulla pulvinar sodales.

    - Use this area to provide additional information. + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin luctus tincidunt justo nec tempor. + Aliquam erat volutpat. Fusce facilisis ullamcorper consequat. Vestibulum non sapien lectus. Nam + mi augue, posuere at tempus vel, dignissim vitae nulla. Nullam at quam eu sapien mattis ultrices. + Quisque quis leo mi, at lobortis dolor. Nullam scelerisque facilisis placerat. Fusce a augue + erat, malesuada euismod dui. Duis iaculis risus id felis volutpat elementum. Fusce blandit iaculis + quam a cursus. Cras varius tincidunt cursus. Morbi justo eros, adipiscing ac placerat sed, posuere + et mi. Suspendisse vulputate viverra aliquet. Duis non enim a nibh consequat mollis ac tempor + lorem. Phasellus elit leo, semper eu luctus et, suscipit at lacus. In hac habitasse platea + dictumst. Duis dignissim justo sit amet nulla pulvinar sodales.

    - Use this area to provide additional information. + Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin luctus tincidunt justo nec tempor. + Aliquam erat volutpat. Fusce facilisis ullamcorper consequat. Vestibulum non sapien lectus. Nam + mi augue, posuere at tempus vel, dignissim vitae nulla. Nullam at quam eu sapien mattis ultrices. + Quisque quis leo mi, at lobortis dolor. Nullam scelerisque facilisis placerat. Fusce a augue + erat, malesuada euismod dui. Duis iaculis risus id felis volutpat elementum. Fusce blandit iaculis + quam a cursus. Cras varius tincidunt cursus. Morbi justo eros, adipiscing ac placerat sed, posuere + et mi. Suspendisse vulputate viverra aliquet. Duis non enim a nibh consequat mollis ac tempor + lorem. Phasellus elit leo, semper eu luctus et, suscipit at lacus. In hac habitasse platea + dictumst. Duis dignissim justo sit amet nulla pulvinar sodales.