From a49555d6ab1f976567b3613149e2a5c9e4c0400a Mon Sep 17 00:00:00 2001 From: Sebastien Ros Date: Mon, 13 Sep 2010 13:34:51 -0700 Subject: [PATCH] Migrating Orchard.ContentType - Needs some more work on displaying children shapres --HG-- branch : theming --- ...nSettings.ascx => LocationSettings.cshtml} | 0 src/Orchard.Web/Core/Orchard.Core.csproj | 2 +- .../{Module.txt_ => Module.txt} | 0 ...es.csproj_ => Orchard.ContentTypes.csproj} | 44 +++++++++--------- .../ViewModels/AddFieldViewModel.cs | 3 +- .../ViewModels/AddPartsViewModel.cs | 3 +- .../ViewModels/CreatePartViewModel.cs | 6 +-- .../ViewModels/CreateTypeViewModel.cs | 6 +-- .../ViewModels/EditTypeViewModel.cs | 5 +-- .../ViewModels/ListContentPartsViewModel.cs | 3 +- .../ViewModels/ListContentTypesViewModel.cs | 3 +- .../ViewModels/ListContentsViewModel.cs | 29 ++++++------ .../ViewModels/RemoveFieldViewModel.cs | 6 +-- .../ViewModels/RemovePartViewModel.cs | 6 +-- .../Views/Admin/AddFieldTo.ascx | 18 -------- .../Views/Admin/AddFieldTo.cshtml | 15 +++++++ .../{AddPartsTo.ascx => AddPartsTo.cshtml} | 19 ++++---- .../Views/Admin/Create.ascx | 12 ----- .../Views/Admin/Create.cshtml | 10 +++++ .../Views/Admin/CreatePart.ascx | 12 ----- .../Views/Admin/CreatePart.cshtml | 10 +++++ .../Views/Admin/Edit.ascx | 38 ---------------- .../Views/Admin/Edit.cshtml | 45 +++++++++++++++++++ .../Views/Admin/EditPart.ascx | 24 ---------- .../Views/Admin/EditPart.cshtml | 24 ++++++++++ .../Views/Admin/List.ascx | 12 ----- .../Views/Admin/List.cshtml | 12 +++++ .../Views/Admin/ListParts.ascx | 11 ----- .../Views/Admin/ListParts.cshtml | 11 +++++ .../Views/Admin/RemoveFieldFrom.ascx | 11 ----- .../Views/Admin/RemoveFieldFrom.cshtml | 8 ++++ .../Views/Admin/RemovePartFrom.ascx | 11 ----- .../Views/Admin/RemovePartFrom.cshtml | 8 ++++ .../DisplayTemplates/EditPartViewModel.ascx | 9 ---- .../DisplayTemplates/EditPartViewModel.cshtml | 9 ++++ .../DisplayTemplates/EditTypeViewModel.ascx | 17 ------- .../DisplayTemplates/EditTypeViewModel.cshtml | 14 ++++++ .../Views/DisplayTemplates/Field.ascx | 5 --- .../Views/DisplayTemplates/Field.cshtml | 5 +++ .../Views/DisplayTemplates/Fields.ascx | 10 ----- .../Views/DisplayTemplates/Fields.cshtml | 6 +++ .../Views/DisplayTemplates/Settings.ascx | 12 ----- .../Views/DisplayTemplates/Settings.cshtml | 8 ++++ .../Views/EditorTemplates/Field.ascx | 13 ------ .../Views/EditorTemplates/Field.cshtml | 11 +++++ .../Views/EditorTemplates/Fields.ascx | 10 ----- .../Views/EditorTemplates/Fields.cshtml | 6 +++ .../Views/EditorTemplates/Settings.ascx | 16 ------- .../Views/EditorTemplates/Settings.cshtml | 17 +++++++ .../Views/EditorTemplates/TypePart.ascx | 19 -------- .../Views/EditorTemplates/TypePart.cshtml | 18 ++++++++ .../Views/EditorTemplates/TypePartField.ascx | 12 ----- .../EditorTemplates/TypePartField.cshtml | 7 +++ .../Views/EditorTemplates/TypePartFields.ascx | 8 ---- .../EditorTemplates/TypePartFields.cshtml | 6 +++ .../Views/EditorTemplates/TypeParts.ascx | 10 ----- .../Views/EditorTemplates/TypeParts.cshtml | 6 +++ src/Orchard.sln | 13 ++++++ 58 files changed, 328 insertions(+), 366 deletions(-) rename src/Orchard.Web/Core/ContentsLocation/Views/DefinitionTemplates/{LocationSettings.ascx => LocationSettings.cshtml} (100%) rename src/Orchard.Web/Modules/Orchard.ContentTypes/{Module.txt_ => Module.txt} (100%) rename src/Orchard.Web/Modules/Orchard.ContentTypes/{Orchard.ContentTypes.csproj_ => Orchard.ContentTypes.csproj} (81%) delete mode 100644 src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/AddFieldTo.ascx create mode 100644 src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/AddFieldTo.cshtml rename src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/{AddPartsTo.ascx => AddPartsTo.cshtml} (56%) delete mode 100644 src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/Create.ascx create mode 100644 src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/Create.cshtml delete mode 100644 src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/CreatePart.ascx create mode 100644 src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/CreatePart.cshtml delete mode 100644 src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/Edit.ascx create mode 100644 src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/Edit.cshtml delete mode 100644 src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/EditPart.ascx create mode 100644 src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/EditPart.cshtml delete mode 100644 src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/List.ascx create mode 100644 src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/List.cshtml delete mode 100644 src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/ListParts.ascx create mode 100644 src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/ListParts.cshtml delete mode 100644 src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/RemoveFieldFrom.ascx create mode 100644 src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/RemoveFieldFrom.cshtml delete mode 100644 src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/RemovePartFrom.ascx create mode 100644 src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/RemovePartFrom.cshtml delete mode 100644 src/Orchard.Web/Modules/Orchard.ContentTypes/Views/DisplayTemplates/EditPartViewModel.ascx create mode 100644 src/Orchard.Web/Modules/Orchard.ContentTypes/Views/DisplayTemplates/EditPartViewModel.cshtml delete mode 100644 src/Orchard.Web/Modules/Orchard.ContentTypes/Views/DisplayTemplates/EditTypeViewModel.ascx create mode 100644 src/Orchard.Web/Modules/Orchard.ContentTypes/Views/DisplayTemplates/EditTypeViewModel.cshtml delete mode 100644 src/Orchard.Web/Modules/Orchard.ContentTypes/Views/DisplayTemplates/Field.ascx create mode 100644 src/Orchard.Web/Modules/Orchard.ContentTypes/Views/DisplayTemplates/Field.cshtml delete mode 100644 src/Orchard.Web/Modules/Orchard.ContentTypes/Views/DisplayTemplates/Fields.ascx create mode 100644 src/Orchard.Web/Modules/Orchard.ContentTypes/Views/DisplayTemplates/Fields.cshtml delete mode 100644 src/Orchard.Web/Modules/Orchard.ContentTypes/Views/DisplayTemplates/Settings.ascx create mode 100644 src/Orchard.Web/Modules/Orchard.ContentTypes/Views/DisplayTemplates/Settings.cshtml delete mode 100644 src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Field.ascx create mode 100644 src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Field.cshtml delete mode 100644 src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Fields.ascx create mode 100644 src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Fields.cshtml delete mode 100644 src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Settings.ascx create mode 100644 src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Settings.cshtml delete mode 100644 src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/TypePart.ascx create mode 100644 src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/TypePart.cshtml delete mode 100644 src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/TypePartField.ascx create mode 100644 src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/TypePartField.cshtml delete mode 100644 src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/TypePartFields.ascx create mode 100644 src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/TypePartFields.cshtml delete mode 100644 src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/TypeParts.ascx create mode 100644 src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/TypeParts.cshtml diff --git a/src/Orchard.Web/Core/ContentsLocation/Views/DefinitionTemplates/LocationSettings.ascx b/src/Orchard.Web/Core/ContentsLocation/Views/DefinitionTemplates/LocationSettings.cshtml similarity index 100% rename from src/Orchard.Web/Core/ContentsLocation/Views/DefinitionTemplates/LocationSettings.ascx rename to src/Orchard.Web/Core/ContentsLocation/Views/DefinitionTemplates/LocationSettings.cshtml diff --git a/src/Orchard.Web/Core/Orchard.Core.csproj b/src/Orchard.Web/Core/Orchard.Core.csproj index 6bba44629..af1dfc258 100644 --- a/src/Orchard.Web/Core/Orchard.Core.csproj +++ b/src/Orchard.Web/Core/Orchard.Core.csproj @@ -249,7 +249,7 @@ - + diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Module.txt_ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Module.txt similarity index 100% rename from src/Orchard.Web/Modules/Orchard.ContentTypes/Module.txt_ rename to src/Orchard.Web/Modules/Orchard.ContentTypes/Module.txt diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Orchard.ContentTypes.csproj_ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Orchard.ContentTypes.csproj similarity index 81% rename from src/Orchard.Web/Modules/Orchard.ContentTypes/Orchard.ContentTypes.csproj_ rename to src/Orchard.Web/Modules/Orchard.ContentTypes/Orchard.ContentTypes.csproj index 0c83a5b22..78b49840b 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Orchard.ContentTypes.csproj_ +++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Orchard.ContentTypes.csproj @@ -90,28 +90,28 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + Web.config diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/ViewModels/AddFieldViewModel.cs b/src/Orchard.Web/Modules/Orchard.ContentTypes/ViewModels/AddFieldViewModel.cs index 404985813..a3094491c 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentTypes/ViewModels/AddFieldViewModel.cs +++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/ViewModels/AddFieldViewModel.cs @@ -1,9 +1,8 @@ using System.Collections.Generic; using Orchard.ContentManagement.MetaData; -using Orchard.Mvc.ViewModels; namespace Orchard.ContentTypes.ViewModels { - public class AddFieldViewModel : BaseViewModel { + public class AddFieldViewModel { public AddFieldViewModel() { Fields = new List(); } diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/ViewModels/AddPartsViewModel.cs b/src/Orchard.Web/Modules/Orchard.ContentTypes/ViewModels/AddPartsViewModel.cs index 91d1b7e03..187150daa 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentTypes/ViewModels/AddPartsViewModel.cs +++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/ViewModels/AddPartsViewModel.cs @@ -1,8 +1,7 @@ using System.Collections.Generic; -using Orchard.Mvc.ViewModels; namespace Orchard.ContentTypes.ViewModels { - public class AddPartsViewModel : BaseViewModel { + public class AddPartsViewModel { public AddPartsViewModel() { PartSelections = new List(); } diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/ViewModels/CreatePartViewModel.cs b/src/Orchard.Web/Modules/Orchard.ContentTypes/ViewModels/CreatePartViewModel.cs index a9de89208..f292a76f8 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentTypes/ViewModels/CreatePartViewModel.cs +++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/ViewModels/CreatePartViewModel.cs @@ -1,7 +1,5 @@ -using Orchard.Mvc.ViewModels; - -namespace Orchard.ContentTypes.ViewModels { - public class CreatePartViewModel : BaseViewModel { +namespace Orchard.ContentTypes.ViewModels { + public class CreatePartViewModel { public string Name { get; set; } } } diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/ViewModels/CreateTypeViewModel.cs b/src/Orchard.Web/Modules/Orchard.ContentTypes/ViewModels/CreateTypeViewModel.cs index ad93e49ba..29a57e6e6 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentTypes/ViewModels/CreateTypeViewModel.cs +++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/ViewModels/CreateTypeViewModel.cs @@ -1,7 +1,5 @@ -using Orchard.Mvc.ViewModels; - -namespace Orchard.ContentTypes.ViewModels { - public class CreateTypeViewModel : BaseViewModel { +namespace Orchard.ContentTypes.ViewModels { + public class CreateTypeViewModel { public string DisplayName { get; set; } } } diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/ViewModels/EditTypeViewModel.cs b/src/Orchard.Web/Modules/Orchard.ContentTypes/ViewModels/EditTypeViewModel.cs index 80e2d7166..7404c5f46 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentTypes/ViewModels/EditTypeViewModel.cs +++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/ViewModels/EditTypeViewModel.cs @@ -4,11 +4,10 @@ using System.Linq; using Orchard.ContentManagement.MetaData.Models; using Orchard.ContentManagement.ViewModels; using Orchard.ContentTypes.Extensions; -using Orchard.Mvc.ViewModels; using Orchard.Utility.Extensions; namespace Orchard.ContentTypes.ViewModels { - public class EditTypeViewModel : BaseViewModel { + public class EditTypeViewModel { public EditTypeViewModel() { Settings = new SettingsDictionary(); Fields = new List(); @@ -68,7 +67,7 @@ namespace Orchard.ContentTypes.ViewModels { public ContentTypePartDefinition _Definition { get; private set; } } - public class EditPartViewModel : BaseViewModel { + public class EditPartViewModel { public EditPartViewModel() { Fields = new List(); Settings = new SettingsDictionary(); diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/ViewModels/ListContentPartsViewModel.cs b/src/Orchard.Web/Modules/Orchard.ContentTypes/ViewModels/ListContentPartsViewModel.cs index 35b1c5cd9..bae091735 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentTypes/ViewModels/ListContentPartsViewModel.cs +++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/ViewModels/ListContentPartsViewModel.cs @@ -1,8 +1,7 @@ using System.Collections.Generic; -using Orchard.Mvc.ViewModels; namespace Orchard.ContentTypes.ViewModels { - public class ListContentPartsViewModel : BaseViewModel { + public class ListContentPartsViewModel { public IEnumerable Parts { get; set; } } } \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/ViewModels/ListContentTypesViewModel.cs b/src/Orchard.Web/Modules/Orchard.ContentTypes/ViewModels/ListContentTypesViewModel.cs index 3dc4fa9f3..2997395ab 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentTypes/ViewModels/ListContentTypesViewModel.cs +++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/ViewModels/ListContentTypesViewModel.cs @@ -1,8 +1,7 @@ using System.Collections.Generic; -using Orchard.Mvc.ViewModels; namespace Orchard.ContentTypes.ViewModels { - public class ListContentTypesViewModel : BaseViewModel { + public class ListContentTypesViewModel { public IEnumerable Types { get; set; } } } \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/ViewModels/ListContentsViewModel.cs b/src/Orchard.Web/Modules/Orchard.ContentTypes/ViewModels/ListContentsViewModel.cs index ada84e833..25e6ea2b3 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentTypes/ViewModels/ListContentsViewModel.cs +++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/ViewModels/ListContentsViewModel.cs @@ -1,17 +1,16 @@ -using System.Collections.Generic; -using Orchard.ContentManagement; -using Orchard.Mvc.ViewModels; +//using System.Collections.Generic; +//using Orchard.ContentManagement; -namespace Orchard.ContentTypes.ViewModels { - public class ListContentsViewModel : BaseViewModel { - public string Id { get; set; } - public int? Page { get; set; } - public IList Entries { get; set; } +//namespace Orchard.ContentTypes.ViewModels { +// public class ListContentsViewModel { +// public string Id { get; set; } +// public int? Page { get; set; } +// public IList Entries { get; set; } - public class Entry { - public ContentItem ContentItem { get; set; } - public ContentItemMetadata ContentItemMetadata { get; set; } - public ContentItemViewModel ViewModel { get; set; } - } - } -} \ No newline at end of file +// public class Entry { +// public ContentItem ContentItem { get; set; } +// public ContentItemMetadata ContentItemMetadata { get; set; } +// public ContentItemViewModel ViewModel { get; set; } +// } +// } +//} \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/ViewModels/RemoveFieldViewModel.cs b/src/Orchard.Web/Modules/Orchard.ContentTypes/ViewModels/RemoveFieldViewModel.cs index 08ba7a1fd..71fd5c345 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentTypes/ViewModels/RemoveFieldViewModel.cs +++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/ViewModels/RemoveFieldViewModel.cs @@ -1,7 +1,5 @@ -using Orchard.Mvc.ViewModels; - -namespace Orchard.ContentTypes.ViewModels { - public class RemoveFieldViewModel : BaseViewModel { +namespace Orchard.ContentTypes.ViewModels { + public class RemoveFieldViewModel { public string Name { get; set; } public EditPartViewModel Part { get; set; } } diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/ViewModels/RemovePartViewModel.cs b/src/Orchard.Web/Modules/Orchard.ContentTypes/ViewModels/RemovePartViewModel.cs index 88844e073..713723363 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentTypes/ViewModels/RemovePartViewModel.cs +++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/ViewModels/RemovePartViewModel.cs @@ -1,7 +1,5 @@ -using Orchard.Mvc.ViewModels; - -namespace Orchard.ContentTypes.ViewModels { - public class RemovePartViewModel : BaseViewModel { +namespace Orchard.ContentTypes.ViewModels { + public class RemovePartViewModel { public string Name { get; set; } public EditTypeViewModel Type { get; set; } } diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/AddFieldTo.ascx b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/AddFieldTo.ascx deleted file mode 100644 index a00d22a7e..000000000 --- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/AddFieldTo.ascx +++ /dev/null @@ -1,18 +0,0 @@ -<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %> -<% -Html.RegisterStyle("admin.css"); %> -

<%:Html.TitleForPage(T("Add New Field To \"{0}\"", Model.Part.DisplayName).ToString())%>

<% -using (Html.BeginFormAntiForgeryPost()) { %> - <%:Html.ValidationSummary() %> -
- - <%:Html.TextBoxFor(m => m.DisplayName, new {@class = "textMedium", autofocus = "autofocus"}) %> -
-
- - <%:Html.DropDownListFor(m => m.FieldTypeName, new SelectList(Model.Fields, "FieldTypeName", "FieldTypeName"))%> -
-
- -
<% -} %> diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/AddFieldTo.cshtml b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/AddFieldTo.cshtml new file mode 100644 index 000000000..2bad12474 --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/AddFieldTo.cshtml @@ -0,0 +1,15 @@ +@model Orchard.ContentTypes.ViewModels.AddFieldViewModel +@Html.RegisterStyle("admin.css"); +

@Html.TitleForPage(T("Add New Field To \"{0}\"", Model.Part.DisplayName).ToString())

@using (Html.BeginFormAntiForgeryPost()) { + @Html.ValidationSummary() +
+ + @Html.TextBoxFor(m => m.DisplayName, new {@class = "textMedium", autofocus = "autofocus"}) +
+
+ + @Html.DropDownListFor(m => m.FieldTypeName, new SelectList(Model.Fields, "FieldTypeName", "FieldTypeName")) +
+
+ +
} diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/AddPartsTo.ascx b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/AddPartsTo.cshtml similarity index 56% rename from src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/AddPartsTo.ascx rename to src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/AddPartsTo.cshtml index 7cf655640..798f1a0aa 100644 --- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/AddPartsTo.ascx +++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/AddPartsTo.cshtml @@ -1,11 +1,9 @@ -<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %> -<% -Html.RegisterStyle("admin.css"); %> -

<%:Html.TitleForPage(T("Add Parts To \"{0}\"", Model.Type.DisplayName).ToString())%>

<% -using (Html.BeginFormAntiForgeryPost()) { %> - <%:Html.ValidationSummary() %> +@model Orchard.ContentTypes.ViewModels.AddPartsViewModel +@Html.RegisterStyle("admin.css"); +

@Html.TitleForPage(T("Add Parts To \"{0}\"", Model.Type.DisplayName).ToString())

@using (Html.BeginFormAntiForgeryPost()) { + @Html.ValidationSummary()
- <%:Html.UnorderedList( + @Html.UnorderedList( Model.PartSelections, (partSelection, i) => { var fieldNameStart = "PartSelections[" + i + "]."; @@ -17,9 +15,8 @@ using (Html.BeginFormAntiForgeryPost()) { %> partSelection.PartDisplayName, Html.Hidden(fieldNameStart + "PartName", partSelection.PartName))); }, - "available-parts")%> + "available-parts")
- -
<% -} %> + + } diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/Create.ascx b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/Create.ascx deleted file mode 100644 index ed94de70a..000000000 --- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/Create.ascx +++ /dev/null @@ -1,12 +0,0 @@ -<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %> -

<%:Html.TitleForPage(T("New Content Type").ToString())%>

<% -using (Html.BeginFormAntiForgeryPost()) { %> - <%:Html.ValidationSummary() %> -
- - <%:Html.TextBoxFor(m => m.DisplayName, new {@class = "textMedium", autofocus = "autofocus"}) %> -
-
- -
<% -} %> \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/Create.cshtml b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/Create.cshtml new file mode 100644 index 000000000..fe3758232 --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/Create.cshtml @@ -0,0 +1,10 @@ +@model Orchard.ContentTypes.ViewModels.CreateTypeViewModel +

@Html.TitleForPage(T("New Content Type").ToString())

@using (Html.BeginFormAntiForgeryPost()) { + @Html.ValidationSummary() +
+ + @Html.TextBoxFor(m => m.DisplayName, new {@class = "textMedium", autofocus = "autofocus"}) +
+
+ +
} \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/CreatePart.ascx b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/CreatePart.ascx deleted file mode 100644 index 3d6a65626..000000000 --- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/CreatePart.ascx +++ /dev/null @@ -1,12 +0,0 @@ -<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %> -

<%:Html.TitleForPage(T("New Content Part").ToString())%>

<% -using (Html.BeginFormAntiForgeryPost()) { %> - <%:Html.ValidationSummary() %> -
- - <%:Html.TextBoxFor(m => m.Name, new {@class = "textMedium", autofocus = "autofocus"}) %> -
-
- -
<% -} %> \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/CreatePart.cshtml b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/CreatePart.cshtml new file mode 100644 index 000000000..5a9138e80 --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/CreatePart.cshtml @@ -0,0 +1,10 @@ +@model Orchard.ContentTypes.ViewModels.CreatePartViewModel +

@Html.TitleForPage(T("New Content Part").ToString())

@using (Html.BeginFormAntiForgeryPost()) { + @Html.ValidationSummary() +
+ + @Html.TextBoxFor(m => m.Name, new {@class = "textMedium", autofocus = "autofocus"}) +
+
+ +
} \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/Edit.ascx b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/Edit.ascx deleted file mode 100644 index 89c8f540d..000000000 --- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/Edit.ascx +++ /dev/null @@ -1,38 +0,0 @@ -<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %> -<% Html.RegisterStyle("admin.css"); -%>

<%:Html.TitleForPage(T("Edit Content Type").ToString())%>

-

<%:Html.ActionLink(T("Content Types").Text, "index") %><%:T(" > ") %><%:T("Edit Content Type") %>

<% -using (Html.BeginFormAntiForgeryPost()) { %> - <%--// todo: come up with real itemtype definitions and locations for said definitions--%> -
<%:Html.ValidationSummary() %> -
- - <%:Html.TextBoxFor(m => m.DisplayName, new { @class = "textMedium" })%> - <%--// todo: if we continue to go down the midrodata route, some helpers would be nice--%> - <%-- - // has unintended consequences (renamging the type) - changing the name creates a new type of that name--%> - - <%:Html.HiddenFor(m => m.Name) %> -
<% - Html.RenderTemplates(Model.Templates); %> -
-

<%:T("Fields") %>

-
<%: Html.ActionLink(T("Add").Text, "AddFieldTo", new { area = "Orchard.ContentTypes", id = Model.Name }, new { @class = "button" }) %>
<%: - Html.EditorFor(m => m.Fields, "Fields", "") %> -

<%:T("Parts") %>

-
<%: Html.ActionLink(T("Add").Text, "AddPartsTo", new { area = "Orchard.ContentTypes", id = Model.Name }, new { @class = "button" })%>
<%: - Html.EditorFor(m => m.Parts, "TypeParts", "") %> -
-
- -
-
<% -} -using (this.Capture("end-of-page-scripts")) { %> -<% -} %> \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/Edit.cshtml b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/Edit.cshtml new file mode 100644 index 000000000..5cb3f3bf6 --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/Edit.cshtml @@ -0,0 +1,45 @@ +@model Orchard.ContentTypes.ViewModels.EditTypeViewModel +@Html.RegisterStyle("admin.css") +

@Html.TitleForPage(T("Edit Content Type").ToString())

+

@Html.ActionLink(T("Content Types").Text, "index")@T(" > ")@T("Edit Content Type")

+@using (Html.BeginFormAntiForgeryPost()) { + // todo: come up with real itemtype definitions and locations for said definitions +
+ @Html.ValidationSummary() +
+ + @Html.TextBoxFor(m => m.DisplayName, new { @class = "textMedium" }) + @// todo: if we continue to go down the midrodata route, some helpers would be nice + + @// has unintended consequences (renamging the type) - changing the name creates a new type of that name + + @Html.HiddenFor(m => m.Name) +
+ @Display(Model) +
+

@T("Fields")

+
+ @Html.ActionLink(T("Add").Text, "AddFieldTo", new { area = "Orchard.ContentTypes", id = Model.Name }, new { @class = "button" }) +
+ @Html.EditorFor(m => m.Fields, "Fields", "") +

@T("Parts")

+
+ @Html.ActionLink(T("Add").Text, "AddPartsTo", new { area = "Orchard.ContentTypes", id = Model.Name }, new { @class = "button" }) +
+ @Html.EditorFor(m => m.Parts, "TypeParts", "") +
+
+ +
+
+} + +@//todo: (sebros) move at the end of the page +@/* + +*/ \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/EditPart.ascx b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/EditPart.ascx deleted file mode 100644 index 36c8d2715..000000000 --- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/EditPart.ascx +++ /dev/null @@ -1,24 +0,0 @@ -<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %> -<% Html.RegisterStyle("admin.css"); %> -

<%:Html.TitleForPage(T("Edit Part").ToString()) %>

-

<%:Html.ActionLink(T("Content Types").Text, "index") %><%:T(" > ") %><%:Html.ActionLink(T("Content Parts").Text, "listparts") %><%:T(" > ") %><%:T("Edit Part") %>

<% -using (Html.BeginFormAntiForgeryPost()) { %> - <%:Html.ValidationSummary() %> -
- - <%--// has unintended consequences (renamging the part) - changing the name creates a new part of that name--%> - <%:Html.TextBoxFor(m => m.Name, new {@class = "textMedium", disabled = "disabled"}) %> - <%:Html.HiddenFor(m => m.Name) %> -
-
-
- <% Html.RenderTemplates(Model.Templates); %> -
-

<%:T("Fields") %>

-
<%: Html.ActionLink(T("Add").Text, "AddFieldTo", new { area = "Orchard.ContentTypes", id = Model.Name }, new { @class = "button" }) %>
- <%:Html.EditorFor(m => m.Fields, "Fields", "") %> -
-
- -
<% -} %> diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/EditPart.cshtml b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/EditPart.cshtml new file mode 100644 index 000000000..efe8f56e9 --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/EditPart.cshtml @@ -0,0 +1,24 @@ +@model Orchard.ContentTypes.ViewModels.EditPartViewModel + +

@Html.TitleForPage(T("Edit Part").ToString())

+

@Html.ActionLink(T("Content Types").Text, "index")@T(" > ")@Html.ActionLink(T("Content Parts").Text, "listparts")@T(" > ")@T("Edit Part")

+@using (Html.BeginFormAntiForgeryPost()) { + @Html.ValidationSummary() +
+ + @// has unintended consequences (renamging the part) - changing the name creates a new part of that name + @Html.TextBoxFor(m => m.Name, new {@class = "textMedium", disabled = "disabled"}) + @Html.HiddenFor(m => m.Name) +
+
+
+ @DisplayChildren(Model.Templates) +
+

@T("Fields")

+
@Html.ActionLink(T("Add").Text, "AddFieldTo", new { area = "Orchard.ContentTypes", id = Model.Name }, new { @class = "button" })
+ @DisplayChildren(Model.Fields) +
+
+ +
+} diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/List.ascx b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/List.ascx deleted file mode 100644 index 542f9bf1b..000000000 --- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/List.ascx +++ /dev/null @@ -1,12 +0,0 @@ -<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %> -<% Html.RegisterStyle("admin.css"); %> -

<%:Html.TitleForPage(T("Manage Content Types").ToString())%>

-
- <%:Html.ActionLink(T("Create new type").ToString(), "Create", new{Controller="Admin",Area="Orchard.ContentTypes"}, new { @class = "button primaryAction" }) %> - <%:Html.ActionLink(T("Content Parts").ToString(), "ListParts", new{Controller="Admin",Area="Orchard.ContentTypes"}, new { @class = "button" }) %> -
-<%:Html.UnorderedList( - Model.Types, - (t,i) => Html.DisplayFor(m => t), - "contentItems" - ) %> \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/List.cshtml b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/List.cshtml new file mode 100644 index 000000000..8c3af4cf3 --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/List.cshtml @@ -0,0 +1,12 @@ +@model Orchard.ContentTypes.ViewModels.ListContentTypesViewModel +@Html.RegisterStyle("admin.css"); +

@Html.TitleForPage(T("Manage Content Types").ToString())

+
+ @Html.ActionLink(T("Create new type").ToString(), "Create", new{Controller="Admin",Area="Orchard.ContentTypes"}, new { @class = "button primaryAction" }) + @Html.ActionLink(T("Content Parts").ToString(), "ListParts", new{Controller="Admin",Area="Orchard.ContentTypes"}, new { @class = "button" }) +
+@Html.UnorderedList( + Model.Types, + (t,i) => Html.DisplayFor(m => t), + "contentItems" + ) \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/ListParts.ascx b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/ListParts.ascx deleted file mode 100644 index e7c25ac65..000000000 --- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/ListParts.ascx +++ /dev/null @@ -1,11 +0,0 @@ -<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %> -

<%:Html.TitleForPage(T("Content Parts").ToString())%>

-

<%:Html.ActionLink(T("Content Types").Text, "index") %><%:T(" > ") %><%:T("Content Parts") %>

-
- <%:Html.ActionLink(T("Create new part").ToString(), "CreatePart", new{Controller="Admin",Area="Orchard.ContentTypes"}, new { @class = "button primaryAction" }) %> -
-<%:Html.UnorderedList( - Model.Parts, - (t,i) => Html.DisplayFor(m => t), - "contentItems" - ) %> \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/ListParts.cshtml b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/ListParts.cshtml new file mode 100644 index 000000000..229b108db --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/ListParts.cshtml @@ -0,0 +1,11 @@ +@model Orchard.ContentTypes.ViewModels.ListContentPartsViewModel +

@Html.TitleForPage(T("Content Parts").ToString())

+

@Html.ActionLink(T("Content Types").Text, "index")@T(" > ")@T("Content Parts")

+
+ @Html.ActionLink(T("Create new part").ToString(), "CreatePart", new{Controller="Admin",Area="Orchard.ContentTypes"}, new { @class = "button primaryAction" }) +
+@Html.UnorderedList( + Model.Parts, + (t,i) => Html.DisplayFor(m => t), + "contentItems" + ) \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/RemoveFieldFrom.ascx b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/RemoveFieldFrom.ascx deleted file mode 100644 index 681d08142..000000000 --- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/RemoveFieldFrom.ascx +++ /dev/null @@ -1,11 +0,0 @@ -<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %> -<% -Html.RegisterStyle("admin.css"); %> -

<%:Html.TitleForPage(T("Remove the \"{0}\" part from \"{1}\"", Model.Name, Model.Part.DisplayName).ToString())%>

<% -using (Html.BeginFormAntiForgeryPost()) { %> -

<%:T("Looks like you couldn't use the fancy way to remove the field. Try hitting the button below to force the issue.") %>

-
- <%=Html.HiddenFor(m => m.Name) %> - -
<% -} %> \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/RemoveFieldFrom.cshtml b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/RemoveFieldFrom.cshtml new file mode 100644 index 000000000..786b7724c --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/RemoveFieldFrom.cshtml @@ -0,0 +1,8 @@ +@model Orchard.ContentTypes.ViewModels.RemoveFieldViewModel +@Html.RegisterStyle("admin.css"); +

@Html.TitleForPage(T("Remove the \"{0}\" part from \"{1}\"", Model.Name, Model.Part.DisplayName).ToString())

@using (Html.BeginFormAntiForgeryPost()) { +

@T("Looks like you couldn't use the fancy way to remove the field. Try hitting the button below to force the issue.")

+
+ @Html.HiddenFor(m => m.Name) + +
} \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/RemovePartFrom.ascx b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/RemovePartFrom.ascx deleted file mode 100644 index c2c5cfa45..000000000 --- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/RemovePartFrom.ascx +++ /dev/null @@ -1,11 +0,0 @@ -<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %> -<% -Html.RegisterStyle("admin.css"); %> -

<%:Html.TitleForPage(T("Remove the \"{0}\" part from \"{1}\"", Model.Name, Model.Type.DisplayName).ToString())%>

<% -using (Html.BeginFormAntiForgeryPost()) { %> -

<%:T("Looks like you couldn't use the fancy way to remove the part. Try hitting the button below to force the issue.") %>

-
- <%=Html.HiddenFor(m => m.Name) %> - -
<% -} %> \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/RemovePartFrom.cshtml b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/RemovePartFrom.cshtml new file mode 100644 index 000000000..aa9cfa58f --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/RemovePartFrom.cshtml @@ -0,0 +1,8 @@ +@model Orchard.ContentTypes.ViewModels.RemovePartViewModel +@Html.RegisterStyle("admin.css"); +

@Html.TitleForPage(T("Remove the \"{0}\" part from \"{1}\"", Model.Name, Model.Type.DisplayName).ToString())

@using (Html.BeginFormAntiForgeryPost()) { +

@T("Looks like you couldn't use the fancy way to remove the part. Try hitting the button below to force the issue.")

+
+ @Html.HiddenFor(m => m.Name) + +
} \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/DisplayTemplates/EditPartViewModel.ascx b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/DisplayTemplates/EditPartViewModel.ascx deleted file mode 100644 index 963d97b01..000000000 --- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/DisplayTemplates/EditPartViewModel.ascx +++ /dev/null @@ -1,9 +0,0 @@ -<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %> -
-
-

<%:Model.DisplayName %>

-
-
- <%:Html.ActionLink(T("Edit").ToString(), "EditPart", new {area = "Orchard.ContentTypes", id = Model.Name}) %> -
-
\ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/DisplayTemplates/EditPartViewModel.cshtml b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/DisplayTemplates/EditPartViewModel.cshtml new file mode 100644 index 000000000..e615b08a8 --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/DisplayTemplates/EditPartViewModel.cshtml @@ -0,0 +1,9 @@ +@model Orchard.ContentTypes.ViewModels.EditPartViewModel +
+
+

@Model.DisplayName

+
+
+ @Html.ActionLink(T("Edit").ToString(), "EditPart", new {area = "Orchard.ContentTypes", id = Model.Name}) +
+
\ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/DisplayTemplates/EditTypeViewModel.ascx b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/DisplayTemplates/EditTypeViewModel.ascx deleted file mode 100644 index cc3ebc4d0..000000000 --- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/DisplayTemplates/EditTypeViewModel.ascx +++ /dev/null @@ -1,17 +0,0 @@ -<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %> -<%@ Import Namespace="Orchard.Core.Contents.Settings" %> -
-
-

<%:Model.DisplayName%>

<% - var creatable = Model.Settings.GetModel().Creatable; - if (creatable) { %> -

<%:Html.ActionLink(T("Create New {0}", Model.DisplayName).Text, "Create", new {area = "Contents", id = Model.Name}) %>

<% - } %> -
-
<% - if (creatable) { %> - <%:Html.ActionLink(T("List Items").ToString(), "List", new {area = "Contents", id = Model.Name})%><%:T(" | ")%><% - } %> - <%:Html.ActionLink(T("Edit").ToString(), "Edit", new {area = "Orchard.ContentTypes", id = Model.Name})%> -
-
\ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/DisplayTemplates/EditTypeViewModel.cshtml b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/DisplayTemplates/EditTypeViewModel.cshtml new file mode 100644 index 000000000..78621a9a5 --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/DisplayTemplates/EditTypeViewModel.cshtml @@ -0,0 +1,14 @@ +@model Orchard.ContentTypes.ViewModels.EditTypeViewModel +@using Orchard.Core.Contents.Settings +
+
+

@Model.DisplayName

@{ var creatable = Model.Settings.GetModel().Creatable; } + @if (creatable) { +

@Html.ActionLink(T("Create New {0}", Model.DisplayName).Text, "Create", new {area = "Contents", id = Model.Name})

+ } +
+
@if (creatable) { + @Html.ActionLink(T("List Items").ToString(), "List", new {area = "Contents", id = Model.Name})@T(" | ")} + @Html.ActionLink(T("Edit").ToString(), "Edit", new {area = "Orchard.ContentTypes", id = Model.Name}) +
+
\ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/DisplayTemplates/Field.ascx b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/DisplayTemplates/Field.ascx deleted file mode 100644 index 75a1fa21f..000000000 --- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/DisplayTemplates/Field.ascx +++ /dev/null @@ -1,5 +0,0 @@ -<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %> -
<%:Model.Name %> (<%:Model.FieldDefinition.Name %>)
-
- <%:Html.DisplayFor(m => m.Settings, "Settings", "") %> -
\ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/DisplayTemplates/Field.cshtml b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/DisplayTemplates/Field.cshtml new file mode 100644 index 000000000..5d3c6ed0c --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/DisplayTemplates/Field.cshtml @@ -0,0 +1,5 @@ +@model Orchard.ContentTypes.ViewModels.EditPartFieldViewModel +
@Model.Name (@Model.FieldDefinition.Name)
+
+ @Html.DisplayFor(m => m.Settings, "Settings", "") +
\ 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 deleted file mode 100644 index 34a7b9c56..000000000 --- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/DisplayTemplates/Fields.ascx +++ /dev/null @@ -1,10 +0,0 @@ -<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl>" %> -<% -if (Model.Any()) { %> -
<% - foreach (var field in Model) { - var f = field; %> - <%:Html.DisplayFor(m => f, "Field") %><% - } %> -
<% -} %> \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/DisplayTemplates/Fields.cshtml b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/DisplayTemplates/Fields.cshtml new file mode 100644 index 000000000..80107d3f6 --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/DisplayTemplates/Fields.cshtml @@ -0,0 +1,6 @@ +@model IEnumerable@foreach (var field in Model) { + var f = field; + @Html.DisplayFor(m => f, "Field")} + } \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/DisplayTemplates/Settings.ascx b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/DisplayTemplates/Settings.ascx deleted file mode 100644 index 1cefbbcda..000000000 --- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/DisplayTemplates/Settings.ascx +++ /dev/null @@ -1,12 +0,0 @@ -<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %> -<%@ import Namespace="Orchard.ContentManagement.MetaData.Models" %> -<% -if (Model.Any()) { %> - <%--

<%:T("Global Settings") %>

--%> -
<% - foreach (var setting in Model) { %> -
<%:setting.Key %>
-
<%:setting.Value %>
<% - } %> -
<% -} %> \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/DisplayTemplates/Settings.cshtml b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/DisplayTemplates/Settings.cshtml new file mode 100644 index 000000000..e0facc518 --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/DisplayTemplates/Settings.cshtml @@ -0,0 +1,8 @@ +@model SettingsDictionary +@using Orchard.ContentManagement.MetaData.Models +@if (Model.Any()) { + @/*

@T("Global Settings")

*/ +
@foreach (var setting in Model) { +
@setting.Key
+
@setting.Value
} +
} \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Field.ascx b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Field.ascx deleted file mode 100644 index 0970b33a6..000000000 --- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Field.ascx +++ /dev/null @@ -1,13 +0,0 @@ -<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %> -
-

<%:Model.Name %> (<%:Model.FieldDefinition.Name %>)

-
- <%:Html.ActionLink(T("Remove").Text, "RemoveFieldFrom", new { area = "Orchard.ContentTypes", id = Model.Part.Name, Model.Name }, new { itemprop = "RemoveUrl UnsafeUrl" })%><%--// <- some experimentation--%> -
-
<% - Html.RenderTemplates(Model.Templates); - %><%:Html.HiddenFor(m => m.Name) - %><%:Html.HiddenFor(m => m.FieldDefinition.Name) - %><%:Html.HiddenFor(m => m.Index) %> -
-
\ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Field.cshtml b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Field.cshtml new file mode 100644 index 000000000..2b75bee98 --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Field.cshtml @@ -0,0 +1,11 @@ +@model Orchard.ContentTypes.ViewModels.EditPartFieldViewModel +
+

@Model.Name (@Model.FieldDefinition.Name)

+
+ @Html.ActionLink(T("Remove").Text, "RemoveFieldFrom", new { area = "Orchard.ContentTypes", id = Model.Part.Name, Model.Name }, new { itemprop = "RemoveUrl UnsafeUrl" }) @// <- some experimentation +
+
+ @Html.RenderTemplates(Model.Templates) + @Html.HiddenFor(m => m.Name)@Html.HiddenFor(m => m.FieldDefinition.Name)@Html.HiddenFor(m => m.Index) +
+
\ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Fields.ascx b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Fields.ascx deleted file mode 100644 index 29b577a43..000000000 --- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Fields.ascx +++ /dev/null @@ -1,10 +0,0 @@ -<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl>" %> -<% -if (Model.Any()) { %> -
<% - foreach (var field in Model) { - var f = field; %> - <%:Html.EditorFor(m => f, "Field", field.Prefix) %><% - } %> -
<% -} %> \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Fields.cshtml b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Fields.cshtml new file mode 100644 index 000000000..4b79b2be9 --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Fields.cshtml @@ -0,0 +1,6 @@ +@model IEnumerable +@if (Model.Any()) { +
@foreach (var field in Model) { + var f = field; + @Html.EditorFor(m => f, "Field", field.Prefix)} +
} \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Settings.ascx b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Settings.ascx deleted file mode 100644 index efe01d478..000000000 --- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Settings.ascx +++ /dev/null @@ -1,16 +0,0 @@ -<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %> -<%@ import Namespace="Orchard.ContentManagement.MetaData.Models" %> -<% -if (Model.Any()) { %> -
<% - var si = 0; - foreach (var setting in Model) { - var s = setting; - var htmlFieldName = string.Format("Settings[{0}]", si++); %> - <%--// doesn't gen a similarly sanitized id as the other inputs...--%> - - <%:Html.Hidden(htmlFieldName + ".Key", s.Key) %> - <%:Html.TextBox(htmlFieldName + ".Value", s.Value)%><% - } %> -
<% -} %>asdf \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Settings.cshtml b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Settings.cshtml new file mode 100644 index 000000000..763428577 --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/Settings.cshtml @@ -0,0 +1,17 @@ +@model SettingsDictionary +@using Orchard.ContentManagement.MetaData.Models +@if (Model.Any()) { +
+ @{ + var si = 0; + foreach (var setting in Model) { + var s = setting; + var htmlFieldName = string.Format("Settings[{0}]", si++); + // doesn't gen a similarly sanitized id as the other inputs...*/ + + Html.Hidden(htmlFieldName + ".Key", s.Key) + Html.TextBox(htmlFieldName + ".Value", s.Value) + } + } +
+} \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/TypePart.ascx b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/TypePart.ascx deleted file mode 100644 index c58dfec34..000000000 --- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/TypePart.ascx +++ /dev/null @@ -1,19 +0,0 @@ -<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %> -
-

<%:Model.PartDefinition.DisplayName %>

-
- <%:Html.ActionLink(T("Remove").Text, "RemovePartFrom", new { area = "Orchard.ContentTypes", id = Model.Type.Name, Model.PartDefinition.Name }, new { itemprop = "RemoveUrl UnsafeUrl" })%><%--// <- some experimentation--%> -
-
<%:Html.EditorFor(m => m.PartDefinition.Fields, "TypePartFields", "PartDefinition") - %><% - if (Model.Templates.Any()) { %> -
-

<%:T("{0} Settings:", Model.PartDefinition.DisplayName) %>

<% - Html.RenderTemplates(Model.Templates); %> -
<% - } %> - <%-- don't show global part settings for now - <%:Html.DisplayFor(m => m.PartDefinition.Settings, "Settings", "PartDefinition") - %>--%><%:Html.HiddenFor(m => m.PartDefinition.Name) - %><%:Html.HiddenFor(m => m.Index) %> -
-
\ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/TypePart.cshtml b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/TypePart.cshtml new file mode 100644 index 000000000..e6094dac6 --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/TypePart.cshtml @@ -0,0 +1,18 @@ +@model Orchard.ContentTypes.ViewModels.EditTypePartViewModel +
+

@Model.PartDefinition.DisplayName

+
+ @Html.ActionLink(T("Remove").Text, "RemovePartFrom", new { area = "Orchard.ContentTypes", id = Model.Type.Name, Model.PartDefinition.Name }, new { itemprop = "RemoveUrl UnsafeUrl" }) @// <- some experimentation +
+
@Html.EditorFor(m => m.PartDefinition.Fields, "TypePartFields", "PartDefinition") + @if (Model.Templates.Any()) { +
+

@T("{0} Settings:", Model.PartDefinition.DisplayName)

+ @DisplayChildren(Model.Templates) +
+ } + @//don't show global part settings for now - @Html.DisplayFor(m => m.PartDefinition.Settings, "Settings", "PartDefinition") + @Html.HiddenFor(m => m.PartDefinition.Name) + @Html.HiddenFor(m => m.Index) +
+
\ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/TypePartField.ascx b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/TypePartField.ascx deleted file mode 100644 index 2b236a4a3..000000000 --- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/TypePartField.ascx +++ /dev/null @@ -1,12 +0,0 @@ -<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %> -
-

<%:Model.Name %> (<%:Model.FieldDefinition.Name %>)

<% - if (Model.Templates.Any()) { %> -
<% - Html.RenderTemplates(Model.Templates); %> -
<% - } %> - <%:Html.HiddenFor(m => m.Name) - %><%:Html.HiddenFor(m => m.FieldDefinition.Name) - %><%:Html.HiddenFor(m => m.Index) %> -
\ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/TypePartField.cshtml b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/TypePartField.cshtml new file mode 100644 index 000000000..4d9f1db2d --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/TypePartField.cshtml @@ -0,0 +1,7 @@ +@model Orchard.ContentTypes.ViewModels.EditPartFieldViewModel +
+

@Model.Name (@Model.FieldDefinition.Name)

@if (Model.Templates.Any()) { +
@Html.RenderTemplates(Model.Templates); +
} + @Html.HiddenFor(m => m.Name)@Html.HiddenFor(m => m.FieldDefinition.Name)@Html.HiddenFor(m => m.Index) +
\ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/TypePartFields.ascx b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/TypePartFields.ascx deleted file mode 100644 index a1c1b86e6..000000000 --- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/TypePartFields.ascx +++ /dev/null @@ -1,8 +0,0 @@ -<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl>" %> -<% -if (Model.Any()) { - foreach (var field in Model) { - var f = field; %> - <%:Html.EditorFor(m => f, "TypePartField", f.Prefix) %><% - } -} %> \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/TypePartFields.cshtml b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/TypePartFields.cshtml new file mode 100644 index 000000000..8bce34ec6 --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/TypePartFields.cshtml @@ -0,0 +1,6 @@ +@model IEnumerable +@if (Model.Any()) { + foreach (var field in Model) { + var f = field; + @Html.EditorFor(m => f, "TypePartField", f.Prefix) } +} \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/TypeParts.ascx b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/TypeParts.ascx deleted file mode 100644 index c6035fba2..000000000 --- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/TypeParts.ascx +++ /dev/null @@ -1,10 +0,0 @@ -<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl>" %> -<% -if (Model.Any()) { %> -
<% - foreach (var part in Model) { - var p = part; %> - <%:Html.EditorFor(m => p, "TypePart", p.Prefix) %><% - } %> -
<% -} %> \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/TypeParts.cshtml b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/TypeParts.cshtml new file mode 100644 index 000000000..f15edc13f --- /dev/null +++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/EditorTemplates/TypeParts.cshtml @@ -0,0 +1,6 @@ +@model IEnumerable +@if (Model.Any()) { +
@foreach (var part in Model) { + var p = part; + @Html.EditorFor(m => p, "TypePart", p.Prefix)} +
} \ No newline at end of file diff --git a/src/Orchard.sln b/src/Orchard.sln index c22249718..bcb99edb7 100644 --- a/src/Orchard.sln +++ b/src/Orchard.sln @@ -62,6 +62,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.Modules", "Orchard. EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.Packaging", "Orchard.Web\Modules\Orchard.Packaging\Orchard.Packaging.csproj", "{DFD137A2-DDB5-4D22-BE0D-FA9AD4C8B059}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.ContentTypes", "Orchard.Web\Modules\Orchard.ContentTypes\Orchard.ContentTypes.csproj", "{0E7646E8-FE8F-43C1-8799-D97860925EC4}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution CodeCoverage|Any CPU = CodeCoverage|Any CPU @@ -301,6 +303,16 @@ Global {DFD137A2-DDB5-4D22-BE0D-FA9AD4C8B059}.FxCop|Any CPU.Build.0 = Release|Any CPU {DFD137A2-DDB5-4D22-BE0D-FA9AD4C8B059}.Release|Any CPU.ActiveCfg = Release|Any CPU {DFD137A2-DDB5-4D22-BE0D-FA9AD4C8B059}.Release|Any CPU.Build.0 = Release|Any CPU + {0E7646E8-FE8F-43C1-8799-D97860925EC4}.CodeCoverage|Any CPU.ActiveCfg = Release|Any CPU + {0E7646E8-FE8F-43C1-8799-D97860925EC4}.CodeCoverage|Any CPU.Build.0 = Release|Any CPU + {0E7646E8-FE8F-43C1-8799-D97860925EC4}.Coverage|Any CPU.ActiveCfg = Release|Any CPU + {0E7646E8-FE8F-43C1-8799-D97860925EC4}.Coverage|Any CPU.Build.0 = Release|Any CPU + {0E7646E8-FE8F-43C1-8799-D97860925EC4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0E7646E8-FE8F-43C1-8799-D97860925EC4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0E7646E8-FE8F-43C1-8799-D97860925EC4}.FxCop|Any CPU.ActiveCfg = Release|Any CPU + {0E7646E8-FE8F-43C1-8799-D97860925EC4}.FxCop|Any CPU.Build.0 = Release|Any CPU + {0E7646E8-FE8F-43C1-8799-D97860925EC4}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0E7646E8-FE8F-43C1-8799-D97860925EC4}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -313,6 +325,7 @@ Global {CDE24A24-01D3-403C-84B9-37722E18DFB7} = {E9C9F120-07BA-4DFB-B9C3-3AFB9D44C9D5} {17F86780-9A1F-4AA1-86F1-875EEC2730C7} = {E9C9F120-07BA-4DFB-B9C3-3AFB9D44C9D5} {DFD137A2-DDB5-4D22-BE0D-FA9AD4C8B059} = {E9C9F120-07BA-4DFB-B9C3-3AFB9D44C9D5} + {0E7646E8-FE8F-43C1-8799-D97860925EC4} = {E9C9F120-07BA-4DFB-B9C3-3AFB9D44C9D5} {ABC826D4-2FA1-4F2F-87DE-E6095F653810} = {74E681ED-FECC-4034-B9BD-01B0BB1BDECA} {F112851D-B023-4746-B6B1-8D2E5AD8F7AA} = {74E681ED-FECC-4034-B9BD-01B0BB1BDECA} {6CB3EB30-F725-45C0-9742-42599BA8E8D2} = {74E681ED-FECC-4034-B9BD-01B0BB1BDECA}