lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-14 19:04:51 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Roughing out a model aspect for body text. The format property will eventually determine the chain of output filters the text passes through, and which editor template is used for the text itself.

Browse Source 
--HG--
extra : convert_revision : svn%3A5ff7c347-ad56-4c35-b696-ccb81de16e03/trunk%4042796
This commit is contained in:
loudej
2009-12-01 05:30:10 +00:00
parent cd39efe610
commit 15b6b7116a
15 changed files with 171 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/Orchard.Web/Core/Common/Providers/BodyAspectProvider.cs
View File

@@ -1,18 +1,34 @@
using System;
using Orchard.Core.Common.Models;
using Orchard.Core.Common.Records;
using Orchard.Core.Common.ViewModels;
using Orchard.Data;
using Orchard.Models.Driver;
using Orchard.UI.Models;
namespace Orchard.Core.Common.Providers {
public class BodyAspectProvider : ContentProvider {
public BodyAspectProvider(IRepository<BodyRecord> bodyRepository) {
Filters.Add(new StorageFilter<BodyRecord>(bodyRepository));
OnGetEditors<BodyAspect>();
}
private const string TemplatePrefix = "Body";
private const string TemplateName = "BodyAspect";
private const string DefaultTextEditorTemplate = "TinyMceTextEditor";
private void OnGetEditors<TPart>() {
public BodyAspectProvider(IRepository<BodyRecord> bodyRepository) {
Filters.Add(new StorageFilter<BodyRecord>(bodyRepository) { AutomaticallyCreateMissingRecord = true });
OnGetDisplays<BodyAspect>((context, body) => {
var model = new BodyDisplayViewModel { BodyAspect = body };
context.Displays.Add(new ModelTemplate(model, TemplatePrefix) { TemplateName = TemplateName });
});
OnGetEditors<BodyAspect>((context, body) => {
var model = new BodyEditorViewModel { BodyAspect = body, TextEditorTemplate = DefaultTextEditorTemplate };
context.Editors.Add(new ModelTemplate(model, TemplatePrefix) { TemplateName = TemplateName });
});
OnUpdateEditors<BodyAspect>((context, body) => {
var model = new BodyEditorViewModel { BodyAspect = body, TextEditorTemplate = DefaultTextEditorTemplate };
context.Updater.TryUpdateModel(model, TemplatePrefix, null, null);
context.Editors.Add(new ModelTemplate(model, TemplatePrefix) { TemplateName = TemplateName });
});
}
}
}
}

2
src/Orchard.Web/Core/Common/Records/BodyRecord.cs
View File

@@ -2,7 +2,7 @@ using Orchard.Models.Records;
namespace Orchard.Core.Common.Records {
public class BodyRecord : ContentPartRecord {
public virtual string Body { get; set; }
public virtual string Text { get; set; }
public virtual string Format { get; set; }
}
}

11
src/Orchard.Web/Core/Common/ViewModels/BodyDisplayViewModel.cs Normal file
View File

@@ -0,0 +1,11 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using Orchard.Core.Common.Models;
namespace Orchard.Core.Common.ViewModels {
public class BodyDisplayViewModel {
public BodyAspect BodyAspect { get; set; }
}
}

23
src/Orchard.Web/Core/Common/ViewModels/BodyEditorViewModel.cs Normal file
View File

@@ -0,0 +1,23 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using Orchard.Core.Common.Models;
namespace Orchard.Core.Common.ViewModels {
public class BodyEditorViewModel {
public BodyAspect BodyAspect { get; set; }
public string Text {
get { return BodyAspect.Record.Text; }
set { BodyAspect.Record.Text = value; }
}
public string Format {
get { return BodyAspect.Record.Format; }
set { BodyAspect.Record.Format = value; }
}
public string TextEditorTemplate { get; set; }
}
}

7
src/Orchard.Web/Core/Common/Views/Models/DisplayTemplates/BodyAspect.ascx Normal file
View File

@@ -0,0 +1,7 @@
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<BodyDisplayViewModel>" %>
<%@ Import Namespace="Orchard.Core.Common.ViewModels"%>
<%@ Import Namespace="Orchard.Core.Common.Models"%>
<%@ Import Namespace="Orchard.Core.Settings.ViewModels"%>
<%@ Import Namespace="Orchard.Utility" %>
<%= Model.BodyAspect.Record.Text %>

7
src/Orchard.Web/Core/Common/Views/Models/EditorTemplates/BodyAspect.ascx Normal file
View File

@@ -0,0 +1,7 @@
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<BodyEditorViewModel>" %>
<%@ Import Namespace="Orchard.Core.Common.ViewModels" %>
<%@ Import Namespace="Orchard.Core.Common.Models" %>
<%@ Import Namespace="Orchard.Core.Settings.ViewModels" %>
<%@ Import Namespace="Orchard.Utility" %>
<h3>Body</h3>
<ul><li><%=Html.EditorFor(m=>m.Text, Model.TextEditorTemplate) %></li></ul>

34
src/Orchard.Web/Core/Common/Views/Web.config Normal file
View File

@@ -0,0 +1,34 @@
<?xml version="1.0"?>
<configuration>
<system.web>
<httpHandlers>
<add path="*" verb="*"
type="System.Web.HttpNotFoundHandler"/>
</httpHandlers>
<!--
Enabling request validation in view pages would cause validation to occur
after the input has already been processed by the controller. By default
MVC performs request validation before a controller processes the input.
To change this behavior apply the ValidateInputAttribute to a
controller or action.
-->
<pages
validateRequest="false"
pageParserFilterType="System.Web.Mvc.ViewTypeParserFilter, System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
pageBaseType="System.Web.Mvc.ViewPage, System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
userControlBaseType="System.Web.Mvc.ViewUserControl, System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
<controls>
<add assembly="System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" namespace="System.Web.Mvc" tagPrefix="mvc" />
</controls>
</pages>
</system.web>
<system.webServer>
<validation validateIntegratedModeConfiguration="false"/>
<handlers>
<remove name="BlockViewHandler"/>
<add name="BlockViewHandler" path="*" verb="*" preCondition="integratedMode" type="System.Web.HttpNotFoundHandler"/>
</handlers>
</system.webServer>
</configuration>

7
src/Orchard.Web/Core/Orchard.Core.csproj
View File

@@ -71,6 +71,8 @@
<Compile Include="Common\Records\BodyRecord.cs" />
<Compile Include="Common\Records\CommonRecord.cs" />
<Compile Include="Common\Records\RoutableRecord.cs" />
<Compile Include="Common\ViewModels\BodyDisplayViewModel.cs" />
<Compile Include="Common\ViewModels\BodyEditorViewModel.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Settings\AdminMenu.cs" />
<Compile Include="Settings\Controllers\AdminController.cs" />
@@ -110,9 +112,14 @@
<Content Include="Settings\Views\Web.config" />
</ItemGroup>
<ItemGroup>
<Content Include="Common\Views\Models\DisplayTemplates\BodyAspect.ascx" />
<Content Include="Common\Views\Models\EditorTemplates\BodyAspect.ascx" />
<Content Include="Settings\Views\Admin\EditorTemplates\SettingsIndexViewModel.ascx" />
<Content Include="XmlRpc\Views\Web.config" />
</ItemGroup>
<ItemGroup>
<Content Include="Common\Views\Web.config" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v9.0\WebApplications\Microsoft.WebApplication.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

2
src/Orchard.Web/Packages/Orchard.Blogs/Models/BlogPost.cs
View File

@@ -9,7 +9,7 @@ namespace Orchard.Blogs.Models {
public Blog Blog { get; set; }
public string Title { get { return this.As<RoutableAspect>().Title; } }
public string Body { get { return this.As<BodyAspect>().Record.Body; } }
public string Body { get { return this.As<BodyAspect>().Record.Text; } }
public string Slug { get { return this.As<RoutableAspect>().Slug; } }
public IUser Creator { get { return this.As<CommonAspect>().OwnerField.Value; } }
public DateTime? Published { get { return Record.Published; } }

2
src/Orchard.Web/Packages/Orchard.Sandbox/Controllers/PageController.cs
View File

@@ -83,7 +83,7 @@ namespace Orchard.Sandbox.Controllers {
return View(model);
}
[HttpPost]
[HttpPost, ValidateInput(false)]
public ActionResult Edit(int id, FormCollection input) {
var settings = CurrentSite.Get<ContentPart<SandboxSettingsRecord>>();
if (settings.Record.AllowAnonymousEdits == false && CurrentUser == null) {

6
src/Orchard.Web/Packages/Orchard.Sandbox/Views/Page/Show.aspx
View File

@@ -20,11 +20,7 @@
</div>
<div id="main">
<% Html.RenderPartial("Messages", Model.Messages); %>
<h3>
<%=Html.Encode(Model.Page.Record.Name) %></h3>
<div>
TODO: page body
</div>
<h1><%=Html.Encode(Model.Page.Record.Name) %></h1>
<%foreach (var display in Model.Displays) { %>
<%=Html.DisplayFor(m=>display.Model, display.TemplateName, display.Prefix) %>
<%} %>

8
src/Orchard.Web/Packages/TinyMce/TinyMce.csproj
View File

@@ -42,6 +42,10 @@
<Reference Include="System.Data.DataSetExtensions">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
<Reference Include="System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\lib\aspnetmvc\System.Web.Mvc.dll</HintPath>
</Reference>
<Reference Include="System.Xml.Linq">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
@@ -116,10 +120,14 @@
<Content Include="Scripts\utils\form_utils.js" />
<Content Include="Scripts\utils\mctabs.js" />
<Content Include="Scripts\utils\validate.js" />
<Content Include="Views\Models\EditorTemplates\TinyMceTextEditor.ascx" />
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<Content Include="Views\Web.config" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v9.0\WebApplications\Microsoft.WebApplication.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

11
src/Orchard.Web/Packages/TinyMce/Views/Models/EditorTemplates/TinyMceTextEditor.ascx Normal file
View File

@@ -0,0 +1,11 @@
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<string>" %>
<%@ Import Namespace="System.Web.Mvc.Html" %>
<script src="<%=ResolveUrl("~/Packages/TinyMce/scripts/tiny_mce.js") %>" type="text/javascript"></script>
<%=Html.TextArea("", Model, 25, 80, new {}) %>
<script type="text/javascript">
tinyMCE.init({ theme: "advanced", mode: "textareas", plugins: "fullscreen,autoresize", theme_advanced_toolbar_location: "top", theme_advanced_toolbar_align: "left", theme_advanced_buttons3_add: "fullscreen" });
</script>

34
src/Orchard.Web/Packages/TinyMce/Views/Web.config Normal file
View File

@@ -0,0 +1,34 @@
<?xml version="1.0"?>
<configuration>
<system.web>
<httpHandlers>
<add path="*" verb="*"
type="System.Web.HttpNotFoundHandler"/>
</httpHandlers>
<!--
Enabling request validation in view pages would cause validation to occur
after the input has already been processed by the controller. By default
MVC performs request validation before a controller processes the input.
To change this behavior apply the ValidateInputAttribute to a
controller or action.
-->
<pages
validateRequest="false"
pageParserFilterType="System.Web.Mvc.ViewTypeParserFilter, System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
pageBaseType="System.Web.Mvc.ViewPage, System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
userControlBaseType="System.Web.Mvc.ViewUserControl, System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
<controls>
<add assembly="System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" namespace="System.Web.Mvc" tagPrefix="mvc" />
</controls>
</pages>
</system.web>
<system.webServer>
<validation validateIntegratedModeConfiguration="false"/>
<handlers>
<remove name="BlockViewHandler"/>
<add name="BlockViewHandler" path="*" verb="*" preCondition="integratedMode" type="System.Web.HttpNotFoundHandler"/>
</handlers>
</system.webServer>
</configuration>

5
src/Orchard/UI/Models/ModelTemplate.cs
View File

@@ -1,17 +1,14 @@
namespace Orchard.UI.Models {
public class ModelTemplate {
public ModelTemplate()
: this(null) {
}
public ModelTemplate(object model)
: this(model, string.Empty) {
}
public ModelTemplate(object model, string prefix) {
Model = model;
Prefix = prefix;
}
public object Model { get; set; }
public string Prefix { get; set; }
public string TemplateName { get; set; }