diff --git a/web/ChangeLog b/web/ChangeLog index 7bc4c12c..81cc3a6c 100644 --- a/web/ChangeLog +++ b/web/ChangeLog @@ -1,3 +1,16 @@ +2015-06-28 Paul Schneider + + * AccountController.cs: Fixes the canonical login + + * App.master: Cleans the code + + * NoLogin.master: Fixes the canonical login (broken with last + master changes) + + * style.css: yet another footer style + + * UserPost.aspx: puts links in a "aside" block + 2015-06-26 Paul Schneider * Web.csproj: diff --git a/web/Controllers/AccountController.cs b/web/Controllers/AccountController.cs index 8c3cf61c..3fb973a7 100644 --- a/web/Controllers/AccountController.cs +++ b/web/Controllers/AccountController.cs @@ -51,6 +51,7 @@ namespace Yavsc.Controllers /// The login. /// Model. /// Return URL. + [HttpPost] public ActionResult Login (LoginModel model, string returnUrl) { if (ModelState.IsValid) { @@ -64,13 +65,22 @@ namespace Yavsc.Controllers ModelState.AddModelError ("UserName", "The user name or password provided is incorrect."); } } - ViewData ["returnUrl"] = returnUrl; - - // If we got this far, something failed, redisplay form return View (model); } + + /// + /// Login the specified returnUrl. + /// + /// Return URL. + [HttpGet] + public ActionResult Login (string returnUrl) + { + ViewData ["returnUrl"] = returnUrl; + return View (); + } + /// /// Register the specified model and returnUrl. /// diff --git a/web/Models/App.master b/web/Models/App.master index 96ab744c..e5964b85 100644 --- a/web/Models/App.master +++ b/web/Models/App.master @@ -1,7 +1,8 @@ <%@ Master Language="C#" Inherits="System.Web.Mvc.ViewMasterPage" %> -<% + +<% ViewState["orgtitle"] = T.GetString(Page.Title); Page.Title = ViewState["orgtitle"] + " - " + YavscHelpers.SiteName; %> @@ -57,8 +58,7 @@ ViewState["orgtitle"] = T.GetString(Page.Title); <% } %> -
-