yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moved controllers and models as per Shannon's suggestion

Browse Source 
Added LoginStatus and updated Register
Updated to use CDF instead of <script> tags
This commit is contained in:
Sebastiaan Janssen
2013-08-28 13:36:04 +02:00
parent 8274883fa5
commit f26d759c84
14 changed files with 183 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
View File

@@ -2137,6 +2137,7 @@
<Content Include="Umbraco\PartialViews\Templates\Login.cshtml" />
<Content Include="Umbraco\PartialViews\Templates\EmptyTemplate.cshtml" />
<Content Include="Umbraco\PartialViews\Templates\RegisterMember.cshtml" />
<Content Include="Umbraco\PartialViews\Templates\LoginStatus.cshtml" />
<None Include="Umbraco_client\CodeMirror\js\mode\coffeescript\LICENSE" />
<None Include="Umbraco_client\CodeMirror\js\mode\pascal\LICENSE" />
<None Include="Umbraco_client\CodeMirror\js\mode\perl\LICENSE" />

2
src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/EmptyTemplate.cshtml
View File

@@ -1 +1 @@
@using Umbraco.Web.Macros.PartialViewMacroPage
@inherits Umbraco.Web.Macros.PartialViewMacroPage

20
src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/Login.cshtml
View File

@@ -2,24 +2,20 @@
@using System.Web.Mvc.Html
@using ClientDependency.Core.Mvc
@using Umbraco.Web.UmbracoModels
@using Umbraco.Web.UmbracoControllers
@using Umbraco.Web.Models
@using Umbraco.Web.Controllers
@{
var loginModel = new LoginModel();
Html.EnableClientValidation();
Html.EnableUnobtrusiveJavaScript();
// TODO: CDF doesn't work at the moment, Shannon is looking at it
//Html.RequiresJs("/umbraco_client/ui/jquery.js");
//Html.RequiresJs("/umbraco_client/Application/JQuery/jquery.validate.min.js");
//Html.RequiresJs("/umbraco_client/Application/JQuery/jquery.validate.unobtrusive.min.js");
var loginModel = new LoginModel();
Html.RequiresJs("/umbraco_client/ui/jquery.js");
Html.RequiresJs("/umbraco_client/Application/JQuery/jquery.validate.min.js");
Html.RequiresJs("/umbraco_client/Application/JQuery/jquery.validate.unobtrusive.min.js");
}
<script src="@Url.Content("~/umbraco_client/ui/jquery.js")" type="text/javascript"></script>
<script src="@Url.Content("~/umbraco_client/Application/JQuery/jquery.validate.min.js")" type="text/javascript"></script>
<script src="@Url.Content("~/umbraco_client/Application/JQuery/jquery.validate.unobtrusive.min.js")" type="text/javascript"></script>
@Html.RenderJsHere()
@using (Html.BeginUmbracoForm<LoginController>("HandleLogin"))
{

29
src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/LoginStatus.cshtml Normal file
View File

@@ -0,0 +1,29 @@
@inherits Umbraco.Web.Macros.PartialViewMacroPage
@using ClientDependency.Core.Mvc
@using Umbraco.Web.Models
@using Umbraco.Web.Controllers
@{
var loginStatusModel = new LoginStatusModel();
Html.EnableClientValidation();
Html.EnableUnobtrusiveJavaScript();
Html.RequiresJs("/umbraco_client/ui/jquery.js");
Html.RequiresJs("/umbraco_client/Application/JQuery/jquery.validate.min.js");
Html.RequiresJs("/umbraco_client/Application/JQuery/jquery.validate.unobtrusive.min.js");
}
@Html.RenderJsHere()
@if (loginStatusModel.IsLoggedIn)
{
<p>You are currently logged in as @loginStatusModel.Name</p>
using (Html.BeginUmbracoForm<LoginStatusController>("HandleLogout"))
{
<fieldset>
<legend>Logout</legend>
<button>Logout</button>
</fieldset>
}
}

44
src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/RegisterMember.cshtml
View File

@@ -2,47 +2,21 @@
@using System.Web.Mvc.Html
@using ClientDependency.Core.Mvc
@using umbraco.cms.businesslogic.member
@using Umbraco.Web.UmbracoModels
@using Umbraco.Web.UmbracoControllers
@using Umbraco.Web.Models
@using Umbraco.Web.Controllers
@{
var registerModel = new RegisterModel();
registerModel.FillModel(registerModel, Model.MacroParameters);
Html.EnableClientValidation();
Html.EnableUnobtrusiveJavaScript();
// TODO: CDF doesn't work at the moment, Shannon is looking at it
//Html.RequiresJs("/umbraco_client/ui/jquery.js");
//Html.RequiresJs("/umbraco_client/Application/JQuery/jquery.validate.min.js");
//Html.RequiresJs("/umbraco_client/Application/JQuery/jquery.validate.unobtrusive.min.js");
// TODO: Make a helper for this
var memberTypeAlias = "UmbracoMember";
if (Model.MacroParameters.Any() && Model.MacroParameters.ContainsKey("memberTypeAlias"))
{
var alias = Model.MacroParameters["memberTypeAlias"];
if (string.IsNullOrWhiteSpace(alias.ToString()) == false)
{
memberTypeAlias = alias.ToString();
}
}
var registerModel = new RegisterModel
{
MemberProperties = new List<UmbracoProperty>(),
MemberTypeAlias = memberTypeAlias
};
// TODO: Fill model somewhere else
var memberType = MemberType.GetByAlias(registerModel.MemberTypeAlias);
foreach (var prop in memberType.PropertyTypes.Where(memberType.MemberCanEdit))
{
registerModel.MemberProperties.Add(new UmbracoProperty {Alias = prop.Alias, Name = prop.Name, Value = string.Empty});
}
Html.RequiresJs("/umbraco_client/ui/jquery.js");
Html.RequiresJs("/umbraco_client/Application/JQuery/jquery.validate.min.js");
Html.RequiresJs("/umbraco_client/Application/JQuery/jquery.validate.unobtrusive.min.js");
}
<script src="@Url.Content("~/umbraco_client/ui/jquery.js")" type="text/javascript"></script>
<script src="@Url.Content("~/umbraco_client/Application/JQuery/jquery.validate.min.js")" type="text/javascript"></script>
<script src="@Url.Content("~/umbraco_client/Application/JQuery/jquery.validate.unobtrusive.min.js")" type="text/javascript"></script>
@Html.RenderJsHere()
@using (Html.BeginUmbracoForm<RegisterController>("HandleRegisterMember"))
{