lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-09-19 01:57:55 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge

Browse Source 
--HG--
branch : dev
This commit is contained in:
Louis DeJardin
2010-06-28 14:42:18 -07:00
parent aadde50df4 6d310fe3f1
commit 59498a6f6b
13 changed files with 15 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -201,7 +201,6 @@
<Content Include="Common\Views\EditorTemplates\Fields\Common.TextField.ascx" />
<Content Include="Common\Views\EditorTemplates\Parts\Common.Container.ascx" />
<Content Include="Contents\Module.txt" />
<Content Include="Contents\Styles\admin.css" />
<Content Include="Contents\Views\Admin\List.aspx" />
<Content Include="Contents\Views\Admin\Edit.aspx" />
<Content Include="Contents\Views\Admin\CreatableTypeList.aspx" />

2
src/Orchard.Web/Modules/Orchard.ContentTypes/Module.txt
View File

@@ -7,4 +7,4 @@ orchardversion: 0.1.2010.0312
features:
Orchard.ContentTypes:
Description: ContentTypes modules enables the creation and alteration of content types not based on code.
Category: Developer
Category: Content

7
src/Orchard.Web/Modules/Orchard.ContentTypes/Orchard.ContentTypes.csproj
View File

@@ -83,6 +83,7 @@
</ItemGroup>
<ItemGroup>
<Content Include="Module.txt" />
<Content Include="Styles\admin.css" />
<Content Include="Views\Admin\AddFieldTo.ascx" />
<Content Include="Views\Admin\Create.ascx" />
<Content Include="Views\Admin\EditPart.ascx" />
@@ -108,7 +109,6 @@
</ItemGroup>
<ItemGroup>
<Folder Include="App_Data\" />
<Folder Include="Helpers\" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\Orchard\Orchard.Framework.csproj">
@@ -136,9 +136,8 @@
<IISUrl>
</IISUrl>
<NTLMAuthentication>False</NTLMAuthentication>
<UseCustomServer>False</UseCustomServer>
<CustomServerUrl>
</CustomServerUrl>
<UseCustomServer>True</UseCustomServer>
<CustomServerUrl>http://orchard.codeplex.com</CustomServerUrl>
<SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
</WebProjectProperties>
</FlavorProperties>

0
src/Orchard.Web/Core/Contents/Styles/admin.css → src/Orchard.Web/Modules/Orchard.ContentTypes/Styles/admin.css
View File

6
src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/Edit.ascx
View File

@@ -1,7 +1,5 @@
<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<Orchard.ContentTypes.ViewModels.EditTypeViewModel>" %>
<%@ Import Namespace="Orchard.Core.Contents.ViewModels" %>
<%@ Import Namespace="Orchard.ContentTypes.ViewModels" %><%
Html.RegisterStyle("admin.css"); %>
<% Html.RegisterStyle("admin.css"); %>
<h1><%:Html.TitleForPage(T("Edit Content Type").ToString())%></h1>
<p class="breadcrumb"><%:Html.ActionLink(T("Content Types").Text, "index") %><%:T(" &#62; ") %><%:T("Edit Content Type") %></p><%
using (Html.BeginFormAntiForgeryPost()) { %>
@@ -24,4 +22,4 @@ using (Html.BeginFormAntiForgeryPost()) { %>
<fieldset>
<button class="primaryAction" type="submit"><%:T("Save") %></button>
</fieldset><%
} %>
} %>

1
src/Orchard.Web/Modules/Orchard.ContentTypes/Views/DisplayTemplates/Field.ascx
View File

@@ -1,5 +1,4 @@
<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<Orchard.ContentTypes.ViewModels.EditPartFieldViewModel>" %>
<%@ Import Namespace="Orchard.Core.Contents.ViewModels" %>
<dt><%:Model.Name %> <span>(<%:Model.FieldDefinition.Name %>)</span></dt>
<dd>
<%:Html.DisplayFor(m => m.Settings, "Settings", "") %>

2
src/Orchard.Web/Modules/Orchard.ContentTypes/Views/DisplayTemplates/Fields.ascx
View File

@@ -1,5 +1,5 @@
<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<IEnumerable<Orchard.ContentTypes.ViewModels.EditPartFieldViewModel>>" %>
<%@ Import Namespace="Orchard.Core.Contents.ViewModels" %><%
<%
if (Model.Any()) { %>
<dl><%
foreach (var field in Model) {

1
src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Field.ascx
View File

@@ -1,5 +1,4 @@
<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<Orchard.ContentTypes.ViewModels.EditPartFieldViewModel>" %>
<%@ Import Namespace="Orchard.Core.Contents.ViewModels" %>
<fieldset class="manage-field">
<h3><%:Model.Name %> <span>(<%:Model.FieldDefinition.Name %>)</span></h3>
<div class="manage">

2
src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Fields.ascx
View File

@@ -1,5 +1,5 @@
<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<IEnumerable<Orchard.ContentTypes.ViewModels.EditPartFieldViewModel>>" %>
<%@ Import Namespace="Orchard.Core.Contents.ViewModels" %><%
<%
if (Model.Any()) { %>
<fieldset><%
var fi = 0;

2
src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Part.ascx
View File

@@ -1,6 +1,4 @@
<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<Orchard.ContentTypes.ViewModels.EditTypePartViewModel>" %>
<%@ Import Namespace="Orchard.Core.Contents.ViewModels" %>
<%@ Import Namespace="Orchard.ContentTypes.ViewModels" %>
<fieldset class="manage-part">
<h3><%:Model.PartDefinition.Name %></h3>
<div class="manage">

2
src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Parts.ascx
View File

@@ -1,5 +1,5 @@
<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<IEnumerable<Orchard.ContentTypes.ViewModels.EditTypePartViewModel>>" %>
<%@ Import Namespace="Orchard.Core.Contents.ViewModels" %><%
<%
if (Model.Any()) { %>
<fieldset><%
var pi = 0;

3
src/Orchard/ContentManagement/Drivers/ContentFieldDriver.cs
View File

@@ -3,7 +3,6 @@ using System.Collections.Generic;
using System.Linq;
using Orchard.ContentManagement.Handlers;
using Orchard.ContentManagement.MetaData;
using Orchard.ContentManagement.MetaData.Models;
namespace Orchard.ContentManagement.Drivers {
public abstract class ContentFieldDriver<TField> : IContentFieldDriver where TField : ContentField, new() {
@@ -15,7 +14,7 @@ namespace Orchard.ContentManagement.Drivers {
}
DriverResult IContentFieldDriver.BuildEditorModel(BuildEditorModelContext context) {
return Process(context.ContentItem, (part, field) => Editor(part, field));
return Process(context.ContentItem, Editor);
}
DriverResult IContentFieldDriver.UpdateEditorModel(UpdateEditorModelContext context) {

10
src/Orchard/ContentManagement/Handlers/ContentItemBuilder.cs
View File

@@ -26,12 +26,12 @@ namespace Orchard.ContentManagement.Handlers {
typePartDefinition = new ContentTypeDefinition.Part(
new ContentPartDefinition(partName),
new SettingsDictionary());
}
var part = new TPart {
TypePartDefinition = typePartDefinition
};
_item.Weld(part);
var part = new TPart {
TypePartDefinition = typePartDefinition
};
_item.Weld(part);
}
return this;
}