From 3d1fc3bbc5a25473b872b3831977a39326642b54 Mon Sep 17 00:00:00 2001
From: Nathan Heskew <nathan.heskew@microsoft.com>
Date: Mon, 28 Jun 2010 09:33:46 -0700
Subject: [PATCH 1/4] A little post Contents -> ContentTypes move view assembly
 import cleanup

--HG--
branch : dev
---
 .../Modules/Orchard.ContentTypes/Views/Admin/Edit.ascx        | 4 +---
 .../Orchard.ContentTypes/Views/DisplayTemplates/Field.ascx    | 1 -
 .../Orchard.ContentTypes/Views/DisplayTemplates/Fields.ascx   | 3 +--
 .../Orchard.ContentTypes/Views/EditorTemplates/Field.ascx     | 1 -
 .../Orchard.ContentTypes/Views/EditorTemplates/Fields.ascx    | 3 +--
 .../Orchard.ContentTypes/Views/EditorTemplates/Part.ascx      | 2 --
 .../Orchard.ContentTypes/Views/EditorTemplates/Parts.ascx     | 3 +--
 7 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/Edit.ascx b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/Edit.ascx
index 25b341ceb..69dbbae50 100644
--- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/Edit.ascx
+++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/Edit.ascx
@@ -1,6 +1,4 @@
-<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<Orchard.ContentTypes.ViewModels.EditTypeViewModel>" %>
-<%@ Import Namespace="Orchard.Core.Contents.ViewModels" %>
-<%@ Import Namespace="Orchard.ContentTypes.ViewModels" %><%
+<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<Orchard.ContentTypes.ViewModels.EditTypeViewModel>" %><%
 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><%
diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/DisplayTemplates/Field.ascx b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/DisplayTemplates/Field.ascx
index bab26afb7..75a1fa21f 100644
--- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/DisplayTemplates/Field.ascx
+++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/DisplayTemplates/Field.ascx
@@ -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", "") %>
diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/DisplayTemplates/Fields.ascx b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/DisplayTemplates/Fields.ascx
index c98cfb107..3295ed35a 100644
--- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/DisplayTemplates/Fields.ascx
+++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/DisplayTemplates/Fields.ascx
@@ -1,5 +1,4 @@
-<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<IEnumerable<Orchard.ContentTypes.ViewModels.EditPartFieldViewModel>>" %>
-<%@ Import Namespace="Orchard.Core.Contents.ViewModels" %><%
+<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<IEnumerable<Orchard.ContentTypes.ViewModels.EditPartFieldViewModel>>" %><%
 if (Model.Any()) { %>
     <dl><%
         foreach (var field in Model) {
diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Field.ascx b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Field.ascx
index 45ab564bd..fba1ccaf2 100644
--- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Field.ascx
+++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Field.ascx
@@ -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">
diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Fields.ascx b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Fields.ascx
index 6fcb47ed5..6982868ee 100644
--- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Fields.ascx
+++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Fields.ascx
@@ -1,5 +1,4 @@
-<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<IEnumerable<Orchard.ContentTypes.ViewModels.EditPartFieldViewModel>>" %>
-<%@ Import Namespace="Orchard.Core.Contents.ViewModels" %><%
+<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<IEnumerable<Orchard.ContentTypes.ViewModels.EditPartFieldViewModel>>" %><%
 if (Model.Any()) { %>
     <fieldset><%
         var fi = 0;
diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Part.ascx b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Part.ascx
index 7134ac5c4..c66916f20 100644
--- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Part.ascx
+++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Part.ascx
@@ -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">
diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Parts.ascx b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Parts.ascx
index b0158b24b..b821e2d1e 100644
--- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Parts.ascx
+++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Parts.ascx
@@ -1,5 +1,4 @@
-<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<IEnumerable<Orchard.ContentTypes.ViewModels.EditTypePartViewModel>>" %>
-<%@ Import Namespace="Orchard.Core.Contents.ViewModels" %><%
+<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<IEnumerable<Orchard.ContentTypes.ViewModels.EditTypePartViewModel>>" %><%
 if (Model.Any()) { %>
     <fieldset><%
         var pi = 0;

From 41849b20679691b4624d4bcfefd50c03e2a244ee Mon Sep 17 00:00:00 2001
From: Nathan Heskew <nathan.heskew@microsoft.com>
Date: Mon, 28 Jun 2010 10:08:17 -0700
Subject: [PATCH 2/4] Changed Orchard.ContentTypes feature category. Developer
 -> Content ("Custom Content" or "Site Builder" could also work)

--HG--
branch : dev
---
 src/Orchard.Web/Modules/Orchard.ContentTypes/Module.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Module.txt b/src/Orchard.Web/Modules/Orchard.ContentTypes/Module.txt
index 417c9d7d8..5b4367f7a 100644
--- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Module.txt
+++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Module.txt
@@ -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
\ No newline at end of file

From 0a38ebc8c41240cbcbae94eaafde4b90e19fedb4 Mon Sep 17 00:00:00 2001
From: Nathan Heskew <nathan.heskew@microsoft.com>
Date: Mon, 28 Jun 2010 10:13:48 -0700
Subject: [PATCH 3/4] Moved the CSS for Orchard.Content types to the new proj

--HG--
branch : dev
---
 src/Orchard.Web/Core/Orchard.Core.csproj                    | 1 -
 .../Orchard.ContentTypes/Orchard.ContentTypes.csproj        | 1 +
 .../Orchard.ContentTypes}/Styles/admin.css                  | 0
 .../Modules/Orchard.ContentTypes/Views/Admin/Edit.ascx      | 6 +++---
 .../Orchard.ContentTypes/Views/DisplayTemplates/Fields.ascx | 3 ++-
 .../Orchard.ContentTypes/Views/EditorTemplates/Fields.ascx  | 3 ++-
 .../Orchard.ContentTypes/Views/EditorTemplates/Parts.ascx   | 3 ++-
 7 files changed, 10 insertions(+), 7 deletions(-)
 rename src/Orchard.Web/{Core/Contents => Modules/Orchard.ContentTypes}/Styles/admin.css (100%)

diff --git a/src/Orchard.Web/Core/Orchard.Core.csproj b/src/Orchard.Web/Core/Orchard.Core.csproj
index e01c2e49b..85758fffe 100644
--- a/src/Orchard.Web/Core/Orchard.Core.csproj
+++ b/src/Orchard.Web/Core/Orchard.Core.csproj
@@ -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" />
diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Orchard.ContentTypes.csproj b/src/Orchard.Web/Modules/Orchard.ContentTypes/Orchard.ContentTypes.csproj
index 1b4a2bc2b..248a7c49d 100644
--- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Orchard.ContentTypes.csproj
+++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Orchard.ContentTypes.csproj
@@ -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" />
diff --git a/src/Orchard.Web/Core/Contents/Styles/admin.css b/src/Orchard.Web/Modules/Orchard.ContentTypes/Styles/admin.css
similarity index 100%
rename from src/Orchard.Web/Core/Contents/Styles/admin.css
rename to src/Orchard.Web/Modules/Orchard.ContentTypes/Styles/admin.css
diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/Edit.ascx b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/Edit.ascx
index 69dbbae50..13f50be98 100644
--- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/Edit.ascx
+++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/Edit.ascx
@@ -1,5 +1,5 @@
-<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<Orchard.ContentTypes.ViewModels.EditTypeViewModel>" %><%
-Html.RegisterStyle("admin.css"); %>
+<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<Orchard.ContentTypes.ViewModels.EditTypeViewModel>" %>
+<% 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()) { %>
@@ -22,4 +22,4 @@ using (Html.BeginFormAntiForgeryPost()) { %>
     <fieldset>
         <button class="primaryAction" type="submit"><%:T("Save") %></button>
     </fieldset><%
-} %>
+} %>
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/DisplayTemplates/Fields.ascx b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/DisplayTemplates/Fields.ascx
index 3295ed35a..34a7b9c56 100644
--- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/DisplayTemplates/Fields.ascx
+++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/DisplayTemplates/Fields.ascx
@@ -1,4 +1,5 @@
-<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<IEnumerable<Orchard.ContentTypes.ViewModels.EditPartFieldViewModel>>" %><%
+<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<IEnumerable<Orchard.ContentTypes.ViewModels.EditPartFieldViewModel>>" %>
+<%
 if (Model.Any()) { %>
     <dl><%
         foreach (var field in Model) {
diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Fields.ascx b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Fields.ascx
index 6982868ee..dba3f94eb 100644
--- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Fields.ascx
+++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Fields.ascx
@@ -1,4 +1,5 @@
-<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<IEnumerable<Orchard.ContentTypes.ViewModels.EditPartFieldViewModel>>" %><%
+<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<IEnumerable<Orchard.ContentTypes.ViewModels.EditPartFieldViewModel>>" %>
+<%
 if (Model.Any()) { %>
     <fieldset><%
         var fi = 0;
diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Parts.ascx b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Parts.ascx
index b821e2d1e..8f6e4b0ff 100644
--- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Parts.ascx
+++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Parts.ascx
@@ -1,4 +1,5 @@
-<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<IEnumerable<Orchard.ContentTypes.ViewModels.EditTypePartViewModel>>" %><%
+<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<IEnumerable<Orchard.ContentTypes.ViewModels.EditTypePartViewModel>>" %>
+<%
 if (Model.Any()) { %>
     <fieldset><%
         var pi = 0;

From 6d310fe3f1c920fe10956106d03a0c85ac6b6bbd Mon Sep 17 00:00:00 2001
From: Nathan Heskew <nathan.heskew@microsoft.com>
Date: Mon, 28 Jun 2010 13:22:34 -0700
Subject: [PATCH 4/4] Small update to not weld a content type's (implicit) part
 on twice

Also updated the Orchard.ContentTypes proj to not spin up cassini

--HG--
branch : dev
---
 .../Orchard.ContentTypes/Orchard.ContentTypes.csproj   |  6 ++----
 .../ContentManagement/Drivers/ContentFieldDriver.cs    |  3 +--
 .../ContentManagement/Handlers/ContentItemBuilder.cs   | 10 +++++-----
 3 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Orchard.ContentTypes.csproj b/src/Orchard.Web/Modules/Orchard.ContentTypes/Orchard.ContentTypes.csproj
index 248a7c49d..77e7c5269 100644
--- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Orchard.ContentTypes.csproj
+++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Orchard.ContentTypes.csproj
@@ -109,7 +109,6 @@
   </ItemGroup>
   <ItemGroup>
     <Folder Include="App_Data\" />
-    <Folder Include="Helpers\" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Orchard\Orchard.Framework.csproj">
@@ -137,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>
diff --git a/src/Orchard/ContentManagement/Drivers/ContentFieldDriver.cs b/src/Orchard/ContentManagement/Drivers/ContentFieldDriver.cs
index 7338874c1..64139d934 100644
--- a/src/Orchard/ContentManagement/Drivers/ContentFieldDriver.cs
+++ b/src/Orchard/ContentManagement/Drivers/ContentFieldDriver.cs
@@ -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) {
diff --git a/src/Orchard/ContentManagement/Handlers/ContentItemBuilder.cs b/src/Orchard/ContentManagement/Handlers/ContentItemBuilder.cs
index 1d0a2d428..f7af0e21b 100644
--- a/src/Orchard/ContentManagement/Handlers/ContentItemBuilder.cs
+++ b/src/Orchard/ContentManagement/Handlers/ContentItemBuilder.cs
@@ -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;
         }