diff --git a/src/Orchard.Web/Modules/Orchard.MetaData/AdminMenu.cs b/src/Orchard.Web/Modules/Orchard.MetaData/AdminMenu.cs deleted file mode 100644 index 5757fabdb..000000000 --- a/src/Orchard.Web/Modules/Orchard.MetaData/AdminMenu.cs +++ /dev/null @@ -1,21 +0,0 @@ - -using Orchard.Localization; -using Orchard.UI.Navigation; - -namespace Orchard.MetaData { - public class AdminMenu : INavigationProvider { - public Localizer T { get; set; } - - public string MenuName { get { return "admin"; } } - - public void GetNavigation(NavigationBuilder builder) - { - builder.Add(T("Site Configuration"), "11", - menu => menu - .Add(T("Content Types (metadata)"), "3.1", item => item.Action("ContentTypeList", "Admin", new { area = "Orchard.MetaData" }).Permission(Permissions.ManageMetaData)) - ); - } - - - } -} \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.MetaData/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.MetaData/Controllers/AdminController.cs deleted file mode 100644 index baae2d64c..000000000 --- a/src/Orchard.Web/Modules/Orchard.MetaData/Controllers/AdminController.cs +++ /dev/null @@ -1,82 +0,0 @@ -using System.Web.Mvc; -using Orchard.ContentManagement.MetaData; -using Orchard.Localization; -using Orchard.MetaData.ViewModels; - -namespace Orchard.MetaData.Controllers { - - public class AdminController : Controller { - private readonly IContentDefinitionManager _contentDefinitionManager; - public IOrchardServices Services { get; set; } - - public AdminController(IOrchardServices services, IContentDefinitionManager contentDefinitionManager) { - _contentDefinitionManager = contentDefinitionManager; - Services = services; - T = NullLocalizer.Instance; - } - - public Localizer T { get; set; } - // - // GET: /ContentTypeList/ - - public ActionResult ContentTypeList(string id) { - - if (!Services.Authorizer.Authorize(Permissions.ManageMetaData, T("Not allowed to manage MetaData"))) - return new HttpUnauthorizedResult(); - - var contentTypes = _contentDefinitionManager.ListTypeDefinitions(); - var contentParts = _contentDefinitionManager.ListPartDefinitions(); - - var model = new ContentTypesIndexViewModel(); - - foreach (var contentType in contentTypes) { - var contentTypeEntry = new ContentTypeEntry { Name = contentType.Name, DisplayName = contentType.Name }; - - if (contentType.Name == id) { - foreach (var contentTypePartNameRecord in contentParts) { - var contentTypePartEntry = new ContentTypePartEntry { Name = contentTypePartNameRecord.Name }; - foreach (var contentTypePartEntryTest in contentType.Parts) { - if (contentTypePartEntryTest.PartDefinition.Name == contentTypePartEntry.Name) { - contentTypePartEntry.Selected = true; - } - } - model.ContentTypeParts.Add(contentTypePartEntry); - } - model.SelectedContentType = contentTypeEntry; - } - model.ContentTypes.Add(contentTypeEntry); - } - return View(model); - } - - - // - // POST: /ContentTypeList/Save - [HttpPost] - public ActionResult Save(string id, FormCollection collection) { - if (!Services.Authorizer.Authorize(Permissions.ManageMetaData, T("Not allowed to manage MetaData"))) - return new HttpUnauthorizedResult(); - - var existingDefinition = _contentDefinitionManager.GetTypeDefinition(id); - - _contentDefinitionManager.AlterTypeDefinition(id, alter => { - foreach(var part in existingDefinition.Parts) { - alter.RemovePart(part.PartDefinition.Name); - } - foreach (var formKey in collection.AllKeys) { - if (formKey.Contains("part_")) { - var partName = formKey.Replace("part_", ""); - alter.WithPart(partName); - } - } - - }); - - return RedirectToAction("ContentTypeList", new { id }); - - - } - - - } -} diff --git a/src/Orchard.Web/Modules/Orchard.MetaData/Module.txt b/src/Orchard.Web/Modules/Orchard.MetaData/Module.txt deleted file mode 100644 index 6aee1f068..000000000 --- a/src/Orchard.Web/Modules/Orchard.MetaData/Module.txt +++ /dev/null @@ -1,8 +0,0 @@ -name: MetaData -antiforgery: enabled -description: The MetaData module enables the management of the content type meta data, which describes how content types are built from parts and parts from fields. -features: - Orchard.MetaData: - Description: Module for managing Orchard MetaData - Dependencies: Common, XmlRpc - Category: MetaData \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.MetaData/Orchard.MetaData.csproj b/src/Orchard.Web/Modules/Orchard.MetaData/Orchard.MetaData.csproj deleted file mode 100644 index 5f110a3d1..000000000 --- a/src/Orchard.Web/Modules/Orchard.MetaData/Orchard.MetaData.csproj +++ /dev/null @@ -1,120 +0,0 @@ - - - - Debug - AnyCPU - 9.0.30729 - 2.0 - {23E04990-2A8D-41B8-9908-6DDB71EA3B23} - {F85E285D-A4E0-4152-9332-AB1D724D3325};{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} - Library - Properties - Orchard.MetaData - Orchard.MetaData - v4.0 - false - - - 3.5 - - - - - true - full - false - bin\ - DEBUG;TRACE - prompt - 4 - AllRules.ruleset - - - pdbonly - true - bin\ - TRACE - prompt - 4 - AllRules.ruleset - - - - - - 3.5 - - - - - - - - False - ..\..\..\..\lib\aspnetmvc\System.Web.Mvc.dll - - - - - - - - - - - - - - - - - - - - - - - - - - - {2D1D92BB-4555-4CBE-8D0E-63563D6CE4C6} - Orchard.Framework - - - {9916839C-39FC-4CEB-A5AF-89CA7E87119F} - Orchard.Core - - - - - - - - - - - - - - - - - False - True - 33002 - / - - - False - True - http://orchard.codeplex.com - False - - - - - \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.MetaData/Permissions.cs b/src/Orchard.Web/Modules/Orchard.MetaData/Permissions.cs deleted file mode 100644 index d0bbb35ed..000000000 --- a/src/Orchard.Web/Modules/Orchard.MetaData/Permissions.cs +++ /dev/null @@ -1,33 +0,0 @@ -using System.Collections.Generic; -using Orchard.Security.Permissions; - -namespace Orchard.MetaData { - public class Permissions : IPermissionProvider { - public static readonly Permission ManageMetaData = new Permission { Description = "Manage MetaData", Name = "ManageMetaData" };//q: Should edit_MetaData be ManageMetaData? - - - public string ModuleName { - get { - return "MetaData"; - } - } - - public IEnumerable GetPermissions() { - return new Permission[] { - ManageMetaData, - }; - } - - public IEnumerable GetDefaultStereotypes() { - return new[] { - new PermissionStereotype { - Name = "Administrator", - Permissions = new[] {ManageMetaData} - }, - }; - } - - } -} - - diff --git a/src/Orchard.Web/Modules/Orchard.MetaData/Properties/AssemblyInfo.cs b/src/Orchard.Web/Modules/Orchard.MetaData/Properties/AssemblyInfo.cs deleted file mode 100644 index b2221aaf5..000000000 --- a/src/Orchard.Web/Modules/Orchard.MetaData/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,34 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Orchard.MetaData")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Orchard")] -[assembly: AssemblyCopyright("Copyright © CodePlex Foundation 2009")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("9b958fbe-1d0d-4975-9a1b-7e3ff5bed510")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Revision and Build Numbers -// by using the '*' as shown below: -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/src/Orchard.Web/Modules/Orchard.MetaData/Styles/ContentTypes.css b/src/Orchard.Web/Modules/Orchard.MetaData/Styles/ContentTypes.css deleted file mode 100644 index 6c7f0ddd4..000000000 --- a/src/Orchard.Web/Modules/Orchard.MetaData/Styles/ContentTypes.css +++ /dev/null @@ -1,35 +0,0 @@ - -.ContentTypeList -{ - width: 100px; - float:left; -} -.ContentTypePartList -{ - width: 200px; - float: left; - margin-left: 20px; -} -.ContentTypePartListRow -{ - height:5px; - padding:0px; -} -.ContentTypePartListRowItem -{ - background:#EAEAEA; - - padding:0px; - vertical-align:top; - margin:1px; - padding-top: 5px; -} - -.SelectedContentPart { - background:#D1F2A5; - border-color:#BCD994; -} -.UnSelectedContentPart { - background:#EAEAEA; - border-color:#CCC; -} \ No newline at end of file diff --git a/src/Orchard.Web/Modules/Orchard.MetaData/ViewModels/ContentTypesViewModel.cs b/src/Orchard.Web/Modules/Orchard.MetaData/ViewModels/ContentTypesViewModel.cs deleted file mode 100644 index 2fd0bc744..000000000 --- a/src/Orchard.Web/Modules/Orchard.MetaData/ViewModels/ContentTypesViewModel.cs +++ /dev/null @@ -1,31 +0,0 @@ -using System.Collections.Generic; -using Orchard.Mvc.ViewModels; - -namespace Orchard.MetaData.ViewModels -{ - public class ContentTypesIndexViewModel : BaseViewModel { - public IList ContentTypes { get; set; } - public IList ContentTypeParts { get; set; } - public ContentTypesIndexViewModel() { - ContentTypes=new List(); - ContentTypeParts = new List(); - } - public ContentTypeEntry SelectedContentType { get; set; } - } - - public class ContentTypeEntry { - public string Name { get; set; } - public string DisplayName { get; set; } - public IList ContentTypeParts { get; set; } - public ContentTypeEntry(){ - ContentTypeParts = new List(); - } - } - - public class ContentTypePartEntry { - public string Name { get; set; } - public bool Selected { get; set; } - } - - -} diff --git a/src/Orchard.Web/Modules/Orchard.MetaData/Views/Admin/ContentTypeList.ascx b/src/Orchard.Web/Modules/Orchard.MetaData/Views/Admin/ContentTypeList.ascx deleted file mode 100644 index cefdbbfca..000000000 --- a/src/Orchard.Web/Modules/Orchard.MetaData/Views/Admin/ContentTypeList.ascx +++ /dev/null @@ -1,79 +0,0 @@ - -<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %> -<%@ Import Namespace="Orchard.MetaData.ViewModels"%> -<% Html.RegisterStyle("ContentTypes.css"); %> - -
- - - - - - - <% foreach (var item in Model.ContentTypes) { %> - - <% - var contentTypeClass = ""; - if (Model.SelectedContentType!=null && Model.SelectedContentType.Name == item.Name) - { - contentTypeClass = "SelectedContentPart"; - }else{ - contentTypeClass = "UnSelectedContentPart"; - } - %> - - - - - <% } %> - -
- Content Types -
- <%: Html.ActionLink(string.IsNullOrWhiteSpace(item.Name) ? "unkwn" : item.Name, "ContentTypeList", new {id=item.Name})%> -
-
- -<%if (Model.SelectedContentType!=null) {%> - -
- - - - - -<% -using (Html.BeginFormAntiForgeryPost(Url.Action("Save",new {id=Model.SelectedContentType.Name}))) { %> - - <% foreach (var item in Model.ContentTypeParts) { %> - - - - - - - <% } %> - -
- - - Included Content Part -
- <%if (item.Selected) - {%> - " type="checkbox" checked="checked" /><%} - else {%> - " type="checkbox" /><%}%> - - <%: item.Name%> -
-

- " /> -

- <% } %> -
-<%} %> - - - - diff --git a/src/Orchard.Web/Modules/Orchard.MetaData/Views/Web.config b/src/Orchard.Web/Modules/Orchard.MetaData/Views/Web.config deleted file mode 100644 index 7022197d4..000000000 --- a/src/Orchard.Web/Modules/Orchard.MetaData/Views/Web.config +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Orchard.Web/Modules/Orchard.MetaData/Web.config b/src/Orchard.Web/Modules/Orchard.MetaData/Web.config deleted file mode 100644 index fcb2503b6..000000000 --- a/src/Orchard.Web/Modules/Orchard.MetaData/Web.config +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Orchard.sln b/src/Orchard.sln index 180aacc4c..2b778a10d 100644 --- a/src/Orchard.sln +++ b/src/Orchard.sln @@ -63,8 +63,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.Modules", "Orchard. EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.Profile", "Orchard.Profile\Orchard.Profile.csproj", "{94E694A2-D140-468D-A277-C5FCE1D13E9B}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.MetaData", "Orchard.Web\Modules\Orchard.MetaData\Orchard.MetaData.csproj", "{23E04990-2A8D-41B8-9908-6DDB71EA3B23}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.Search", "Orchard.Web\Modules\Orchard.Search\Orchard.Search.csproj", "{4BE4EB01-AC56-4048-924E-2CA77F509ABA}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.Indexing", "Orchard.Web\Modules\Orchard.Indexing\Orchard.Indexing.csproj", "{EA2B9121-EF54-40A6-A53E-6593C86EE696}" @@ -187,10 +185,6 @@ Global {94E694A2-D140-468D-A277-C5FCE1D13E9B}.Debug|Any CPU.Build.0 = Debug|Any CPU {94E694A2-D140-468D-A277-C5FCE1D13E9B}.Release|Any CPU.ActiveCfg = Release|Any CPU {94E694A2-D140-468D-A277-C5FCE1D13E9B}.Release|Any CPU.Build.0 = Release|Any CPU - {23E04990-2A8D-41B8-9908-6DDB71EA3B23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {23E04990-2A8D-41B8-9908-6DDB71EA3B23}.Debug|Any CPU.Build.0 = Debug|Any CPU - {23E04990-2A8D-41B8-9908-6DDB71EA3B23}.Release|Any CPU.ActiveCfg = Release|Any CPU - {23E04990-2A8D-41B8-9908-6DDB71EA3B23}.Release|Any CPU.Build.0 = Release|Any CPU {4BE4EB01-AC56-4048-924E-2CA77F509ABA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4BE4EB01-AC56-4048-924E-2CA77F509ABA}.Debug|Any CPU.Build.0 = Debug|Any CPU {4BE4EB01-AC56-4048-924E-2CA77F509ABA}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -226,7 +220,6 @@ Global {72457126-E118-4171-A08F-9A709EE4B7FC} = {E9C9F120-07BA-4DFB-B9C3-3AFB9D44C9D5} {CDE24A24-01D3-403C-84B9-37722E18DFB7} = {E9C9F120-07BA-4DFB-B9C3-3AFB9D44C9D5} {17F86780-9A1F-4AA1-86F1-875EEC2730C7} = {E9C9F120-07BA-4DFB-B9C3-3AFB9D44C9D5} - {23E04990-2A8D-41B8-9908-6DDB71EA3B23} = {E9C9F120-07BA-4DFB-B9C3-3AFB9D44C9D5} {4BE4EB01-AC56-4048-924E-2CA77F509ABA} = {E9C9F120-07BA-4DFB-B9C3-3AFB9D44C9D5} {EA2B9121-EF54-40A6-A53E-6593C86EE696} = {E9C9F120-07BA-4DFB-B9C3-3AFB9D44C9D5} {0E7646E8-FE8F-43C1-8799-D97860925EC4} = {E9C9F120-07BA-4DFB-B9C3-3AFB9D44C9D5}