"Sign In" prompt should indicate when users can self-register

[orchardbot]

jsurfage created: https://orchard.codeplex.com/workitem/17695

The "Sign In" prompt should change to something like "Sign In/Register" to indicate that users can both:

• Sign In and
• Register when the administrator checks the "Users can create new accounts on the site" checkbox (in "Dashboard" --> "Configuration" --> "Settings" --> Users registration).

Suggestion: To fix this issue, modify Orchard.Core.Shapes.Views.ShapeResult.User.cshtml as follows:

@using System.Web.Mvc; @using Orchard.ContentManagement;

@{ var userCanRegister = @WorkContext.CurrentSite.As().UsersCanRegister; var SignInPrompt = ""; if (userCanRegister) { SignInPrompt = T("Sign In/Register").ToString(); } else { SignInPrompt = T("Sign In").ToString(); }; }

@if (Request.IsAuthenticated) { @T("Welcome, {0}!", new HtmlString(Html.ActionLink( WorkContext.CurrentUser.UserName, "ChangePassword", new { Controller = "Account", Area = "Orchard.Users" }).ToString())) @Html.ActionLink(T("Sign Out").ToString(), "LogOff", new { Controller = "Account", Area = "Orchard.Users", ReturnUrl = Context.Request.RawUrl }) @Html.ActionLink("Dashboard", "Index", new { Area = "Dashboard", Controller = "Admin" }) } else { @Html.ActionLink(SignInPrompt, "LogOn", new { Controller = "Account", Area = "Orchard.Users", ReturnUrl = Context.Request.RawUrl }) }

[agriffard]

There is such a code on Logon.cshtml but there is a weird behavior : It only appears if there is a ReturnUrl in the querystring (ex : .../Account/AccessDenied?ReturnUrl=%2Fadmin)