From f46223a70a7b4241458d5cbfb7ff8b62c3a30197 Mon Sep 17 00:00:00 2001 From: suhacan Date: Wed, 6 Jan 2010 19:56:47 +0000 Subject: [PATCH] - Removing the old CMS Pages package in favor of a new Pages package based on the new content manager and content item model (still very close to old package at this point) --HG-- extra : convert_revision : svn%3A5ff7c347-ad56-4c35-b696-ccb81de16e03/trunk%4045066 --- .../Orchard.Tests.Packages.csproj | 6 +- .../Pages/Controllers/AdminControllerTests.cs | 14 +- .../Controllers/TemplatesControllerTests.cs | 9 +- .../Pages/Services/PageManagerTests.cs | 7 +- .../Pages/Services/PageSchedulerTests.cs | 7 +- .../Pages/Services/SlugConstraintTests.cs | 8 +- .../Templates/CommentExtractorTests.cs | 2 +- .../Templates/TemplateMetadataParserTests.cs | 2 +- .../Templates/TemplateProviderTests.cs | 2 +- .../Templates/TestTemplateProvider.cs | 2 +- .../Pages/Services/TestExtensions.cs | 5 +- src/Orchard.Web/Orchard.Web.csproj | 8 +- .../Orchard.CmsPages/CmsPagesPermissions.cs | 40 ---- .../Orchard.CmsPages/Models/ModelDiagram.cd | 77 ------- .../Orchard.CmsPages/Orchard.CmsPages.csproj | 193 ------------------ .../Packages/Orchard.CmsPages/Package.txt | 1 - .../Properties/AssemblyInfo.cs | 37 ---- .../Services/Templates/TemplateEntry.cs | 12 -- .../Orchard.CmsPages/Views/Web.config | 39 ---- .../Packages/Orchard.CmsPages/Web.config | 154 -------------- .../AdminMenu.cs | 6 +- .../Content/Admin/images/draft.gif | Bin .../Content/Admin/images/offline.gif | Bin .../Content/Admin/images/online.gif | Bin .../Content/Admin/images/published.gif | Bin .../Content/Admin/images/scheduled.gif | Bin .../Content/Site.css | 0 .../Controllers/AdminController.cs | 13 +- .../Controllers/TemplatesController.cs | 4 +- .../Models/ContentItem.cs | 2 +- .../Models/ContentItemListModelBinder.cs | 2 +- .../Models/ModelExtensions.cs | 2 +- .../Models/Page.cs | 10 +- .../Models/PageRevision.cs | 5 +- .../Models/Published.cs | 2 +- .../Models/Scheduled.cs | 2 +- .../Orchard.Pages/Orchard.Pages.csproj | 72 ++++++- .../Packages/Orchard.Pages/Package.txt | 2 +- .../Permissions.cs | 24 +-- .../Routes.cs | 9 +- .../Services/PageManager.cs | 16 +- .../Services/PageScheduler.cs | 15 +- .../Services/SlugConstraint.cs | 8 +- .../Services/Templates/CommentExtractor.cs | 2 +- .../Services/Templates/MetadataEntry.cs | 2 +- .../Services/Templates/TemplateDescriptor.cs | 2 +- .../Services/Templates/TemplateEntry.cs | 8 + .../Templates/TemplateEntryProvider.cs | 4 +- .../Services/Templates/TemplateExtensions.cs | 4 +- .../Templates/TemplateMetadataParser.cs | 2 +- .../Services/Templates/TemplateProvider.cs | 2 +- .../Services/XmlRpcHandler.cs | 9 +- .../ViewModels/ChooseTemplateViewModel.cs | 10 +- .../ViewModels/PageCreateViewModel.cs | 4 +- .../ViewModels/PageEditViewModel.cs | 7 +- .../ViewModels/PageIndexViewModel.cs | 4 +- .../Views/Admin/BulkDeleteConfirm.aspx | 5 +- .../Views/Admin/BulkPublishLater.aspx | 5 +- .../Views/Admin/ChooseTemplate.aspx | 5 +- .../Views/Admin/Create.aspx | 3 +- .../Views/Admin/Edit.aspx | 5 +- .../EditorTemplates/PageCreateViewModel.ascx | 4 +- .../EditorTemplates/TemplateDescriptor.ascx | 4 +- .../Admin/EditorTemplates/inputTextLarge.ascx | 0 .../EditorTemplates/inputTextPermalink.ascx | 0 .../Views/Admin/Export.aspx | 3 +- .../Views/Admin/Index.aspx | 11 +- .../Views/Templates/ExtraUserControl.ascx | 4 +- .../Views/Templates/ThreeColumns.aspx | 4 +- .../Views/Templates/ThreeColumns.gif | Bin .../Views/Templates/TwoColumns.aspx | 4 +- .../Views/Templates/TwoColumns.gif | Bin .../Themes/TheAdmin/Styles/site.css | 2 +- .../Views/Templates/ThreeColumns.aspx | 4 +- .../Views/Templates/TwoColumns.aspx | 4 +- src/Orchard.sln | 7 - 76 files changed, 227 insertions(+), 726 deletions(-) delete mode 100644 src/Orchard.Web/Packages/Orchard.CmsPages/CmsPagesPermissions.cs delete mode 100644 src/Orchard.Web/Packages/Orchard.CmsPages/Models/ModelDiagram.cd delete mode 100644 src/Orchard.Web/Packages/Orchard.CmsPages/Orchard.CmsPages.csproj delete mode 100644 src/Orchard.Web/Packages/Orchard.CmsPages/Package.txt delete mode 100644 src/Orchard.Web/Packages/Orchard.CmsPages/Properties/AssemblyInfo.cs delete mode 100644 src/Orchard.Web/Packages/Orchard.CmsPages/Services/Templates/TemplateEntry.cs delete mode 100644 src/Orchard.Web/Packages/Orchard.CmsPages/Views/Web.config delete mode 100644 src/Orchard.Web/Packages/Orchard.CmsPages/Web.config rename src/Orchard.Web/Packages/{Orchard.CmsPages => Orchard.Pages}/AdminMenu.cs (67%) rename src/Orchard.Web/Packages/{Orchard.CmsPages => Orchard.Pages}/Content/Admin/images/draft.gif (100%) rename src/Orchard.Web/Packages/{Orchard.CmsPages => Orchard.Pages}/Content/Admin/images/offline.gif (100%) rename src/Orchard.Web/Packages/{Orchard.CmsPages => Orchard.Pages}/Content/Admin/images/online.gif (100%) rename src/Orchard.Web/Packages/{Orchard.CmsPages => Orchard.Pages}/Content/Admin/images/published.gif (100%) rename src/Orchard.Web/Packages/{Orchard.CmsPages => Orchard.Pages}/Content/Admin/images/scheduled.gif (100%) rename src/Orchard.Web/Packages/{Orchard.CmsPages => Orchard.Pages}/Content/Site.css (100%) rename src/Orchard.Web/Packages/{Orchard.CmsPages => Orchard.Pages}/Controllers/AdminController.cs (96%) rename src/Orchard.Web/Packages/{Orchard.CmsPages => Orchard.Pages}/Controllers/TemplatesController.cs (90%) rename src/Orchard.Web/Packages/{Orchard.CmsPages => Orchard.Pages}/Models/ContentItem.cs (85%) rename src/Orchard.Web/Packages/{Orchard.CmsPages => Orchard.Pages}/Models/ContentItemListModelBinder.cs (92%) rename src/Orchard.Web/Packages/{Orchard.CmsPages => Orchard.Pages}/Models/ModelExtensions.cs (87%) rename src/Orchard.Web/Packages/{Orchard.CmsPages => Orchard.Pages}/Models/Page.cs (89%) rename src/Orchard.Web/Packages/{Orchard.CmsPages => Orchard.Pages}/Models/PageRevision.cs (89%) rename src/Orchard.Web/Packages/{Orchard.CmsPages => Orchard.Pages}/Models/Published.cs (83%) rename src/Orchard.Web/Packages/{Orchard.CmsPages => Orchard.Pages}/Models/Scheduled.cs (88%) rename src/Orchard.Web/Packages/{Orchard.CmsPages => Orchard.Pages}/Permissions.cs (60%) rename src/Orchard.Web/Packages/{Orchard.CmsPages => Orchard.Pages}/Routes.cs (90%) rename src/Orchard.Web/Packages/{Orchard.CmsPages => Orchard.Pages}/Services/PageManager.cs (93%) rename src/Orchard.Web/Packages/{Orchard.CmsPages => Orchard.Pages}/Services/PageScheduler.cs (91%) rename src/Orchard.Web/Packages/{Orchard.CmsPages => Orchard.Pages}/Services/SlugConstraint.cs (89%) rename src/Orchard.Web/Packages/{Orchard.CmsPages => Orchard.Pages}/Services/Templates/CommentExtractor.cs (93%) rename src/Orchard.Web/Packages/{Orchard.CmsPages => Orchard.Pages}/Services/Templates/MetadataEntry.cs (81%) rename src/Orchard.Web/Packages/{Orchard.CmsPages => Orchard.Pages}/Services/Templates/TemplateDescriptor.cs (88%) create mode 100644 src/Orchard.Web/Packages/Orchard.Pages/Services/Templates/TemplateEntry.cs rename src/Orchard.Web/Packages/{Orchard.CmsPages => Orchard.Pages}/Services/Templates/TemplateEntryProvider.cs (91%) rename src/Orchard.Web/Packages/{Orchard.CmsPages => Orchard.Pages}/Services/Templates/TemplateExtensions.cs (89%) rename src/Orchard.Web/Packages/{Orchard.CmsPages => Orchard.Pages}/Services/Templates/TemplateMetadataParser.cs (95%) rename src/Orchard.Web/Packages/{Orchard.CmsPages => Orchard.Pages}/Services/Templates/TemplateProvider.cs (95%) rename src/Orchard.Web/Packages/{Orchard.CmsPages => Orchard.Pages}/Services/XmlRpcHandler.cs (92%) rename src/Orchard.Web/Packages/{Orchard.CmsPages => Orchard.Pages}/ViewModels/ChooseTemplateViewModel.cs (50%) rename src/Orchard.Web/Packages/{Orchard.CmsPages => Orchard.Pages}/ViewModels/PageCreateViewModel.cs (83%) rename src/Orchard.Web/Packages/{Orchard.CmsPages => Orchard.Pages}/ViewModels/PageEditViewModel.cs (74%) rename src/Orchard.Web/Packages/{Orchard.CmsPages => Orchard.Pages}/ViewModels/PageIndexViewModel.cs (91%) rename src/Orchard.Web/Packages/{Orchard.CmsPages => Orchard.Pages}/Views/Admin/BulkDeleteConfirm.aspx (86%) rename src/Orchard.Web/Packages/{Orchard.CmsPages => Orchard.Pages}/Views/Admin/BulkPublishLater.aspx (86%) rename src/Orchard.Web/Packages/{Orchard.CmsPages => Orchard.Pages}/Views/Admin/ChooseTemplate.aspx (83%) rename src/Orchard.Web/Packages/{Orchard.CmsPages => Orchard.Pages}/Views/Admin/Create.aspx (76%) rename src/Orchard.Web/Packages/{Orchard.CmsPages => Orchard.Pages}/Views/Admin/Edit.aspx (91%) rename src/Orchard.Web/Packages/{Orchard.CmsPages => Orchard.Pages}/Views/Admin/EditorTemplates/PageCreateViewModel.ascx (75%) rename src/Orchard.Web/Packages/{Orchard.CmsPages => Orchard.Pages}/Views/Admin/EditorTemplates/TemplateDescriptor.ascx (74%) rename src/Orchard.Web/Packages/{Orchard.CmsPages => Orchard.Pages}/Views/Admin/EditorTemplates/inputTextLarge.ascx (100%) rename src/Orchard.Web/Packages/{Orchard.CmsPages => Orchard.Pages}/Views/Admin/EditorTemplates/inputTextPermalink.ascx (100%) rename src/Orchard.Web/Packages/{Orchard.CmsPages => Orchard.Pages}/Views/Admin/Export.aspx (89%) rename src/Orchard.Web/Packages/{Orchard.CmsPages => Orchard.Pages}/Views/Admin/Index.aspx (89%) rename src/Orchard.Web/Packages/{Orchard.CmsPages => Orchard.Pages}/Views/Templates/ExtraUserControl.ascx (66%) rename src/Orchard.Web/Packages/{Orchard.CmsPages => Orchard.Pages}/Views/Templates/ThreeColumns.aspx (90%) rename src/Orchard.Web/Packages/{Orchard.CmsPages => Orchard.Pages}/Views/Templates/ThreeColumns.gif (100%) rename src/Orchard.Web/Packages/{Orchard.CmsPages => Orchard.Pages}/Views/Templates/TwoColumns.aspx (89%) rename src/Orchard.Web/Packages/{Orchard.CmsPages => Orchard.Pages}/Views/Templates/TwoColumns.gif (100%) diff --git a/src/Orchard.Tests.Packages/Orchard.Tests.Packages.csproj b/src/Orchard.Tests.Packages/Orchard.Tests.Packages.csproj index b0f089de4..ed33f3e5e 100644 --- a/src/Orchard.Tests.Packages/Orchard.Tests.Packages.csproj +++ b/src/Orchard.Tests.Packages/Orchard.Tests.Packages.csproj @@ -115,9 +115,9 @@ {9916839C-39FC-4CEB-A5AF-89CA7E87119F} Orchard.Core - - {1ECC1131-0D0C-4822-AD90-E979868C63F3} - Orchard.CmsPages + + {4A9C04A6-0986-4A92-A610-5F59FF273FB9} + Orchard.Pages {D10AD48F-407D-4DB5-A328-173EC7CB010F} diff --git a/src/Orchard.Tests.Packages/Pages/Controllers/AdminControllerTests.cs b/src/Orchard.Tests.Packages/Pages/Controllers/AdminControllerTests.cs index 813edccb4..a192fb899 100644 --- a/src/Orchard.Tests.Packages/Pages/Controllers/AdminControllerTests.cs +++ b/src/Orchard.Tests.Packages/Pages/Controllers/AdminControllerTests.cs @@ -1,23 +1,21 @@ using System; -using System.Globalization; using System.Linq; using System.Collections.Generic; using System.Web; using System.Web.Mvc; using System.Web.Routing; using NUnit.Framework; -using Orchard.CmsPages.Controllers; -using Orchard.CmsPages.Models; -using Orchard.CmsPages.Services; -using Orchard.CmsPages.Services.Templates; -using Orchard.CmsPages.ViewModels; +using Orchard.Pages.Controllers; +using Orchard.Pages.Models; +using Orchard.Pages.Services; +using Orchard.Pages.Services.Templates; +using Orchard.Pages.ViewModels; using Orchard.Data; using Orchard.Localization; using Orchard.Security; using Orchard.Security.Permissions; using Orchard.Tests.Stubs; using Orchard.UI.Notify; -using Orchard.Utility; namespace Orchard.Tests.Packages.Pages.Controllers { [TestFixture] @@ -44,7 +42,7 @@ namespace Orchard.Tests.Packages.Pages.Controllers { _slugPageId = page.Id; _controller = _container.Resolve(); - _controller.ControllerContext = new ControllerContext(new StubHttpContext("~/admin/cmspages"), new RouteData(), _controller); + _controller.ControllerContext = new ControllerContext(new StubHttpContext("~/admin/pages"), new RouteData(), _controller); } public override void Register(Autofac.Builder.ContainerBuilder builder) { diff --git a/src/Orchard.Tests.Packages/Pages/Controllers/TemplatesControllerTests.cs b/src/Orchard.Tests.Packages/Pages/Controllers/TemplatesControllerTests.cs index 0468db964..133fcb50d 100644 --- a/src/Orchard.Tests.Packages/Pages/Controllers/TemplatesControllerTests.cs +++ b/src/Orchard.Tests.Packages/Pages/Controllers/TemplatesControllerTests.cs @@ -3,11 +3,10 @@ using System.Collections.Generic; using System.Web.Mvc; using Autofac.Builder; using NUnit.Framework; -using Orchard.CmsPages.Controllers; -using Orchard.CmsPages.Services; -using Orchard.CmsPages.Services.Templates; -using Orchard.CmsPages.ViewModels; -using Orchard.CmsPages.Models; +using Orchard.Pages.Controllers; +using Orchard.Pages.Services; +using Orchard.Pages.Services.Templates; +using Orchard.Pages.Models; using System.Web; using Orchard.Tests.Packages.Pages.Services.Templates; diff --git a/src/Orchard.Tests.Packages/Pages/Services/PageManagerTests.cs b/src/Orchard.Tests.Packages/Pages/Services/PageManagerTests.cs index a7952fdbc..00fd0fa9e 100644 --- a/src/Orchard.Tests.Packages/Pages/Services/PageManagerTests.cs +++ b/src/Orchard.Tests.Packages/Pages/Services/PageManagerTests.cs @@ -4,10 +4,9 @@ using System.Diagnostics; using System.Linq; using Autofac.Builder; using NUnit.Framework; -using Orchard.CmsPages.Models; -using Orchard.CmsPages.Services; -using Orchard.CmsPages.Services.Templates; -using Orchard.CmsPages.ViewModels; +using Orchard.Pages.Models; +using Orchard.Pages.Services; +using Orchard.Pages.Services.Templates; using Orchard.Data; namespace Orchard.Tests.Packages.Pages.Services { diff --git a/src/Orchard.Tests.Packages/Pages/Services/PageSchedulerTests.cs b/src/Orchard.Tests.Packages/Pages/Services/PageSchedulerTests.cs index 48dc0457a..daa699dbd 100644 --- a/src/Orchard.Tests.Packages/Pages/Services/PageSchedulerTests.cs +++ b/src/Orchard.Tests.Packages/Pages/Services/PageSchedulerTests.cs @@ -1,11 +1,10 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Text; using NUnit.Framework; -using Orchard.CmsPages.Models; -using Orchard.CmsPages.Services; -using Orchard.CmsPages.Services.Templates; +using Orchard.Pages.Models; +using Orchard.Pages.Services; +using Orchard.Pages.Services.Templates; using Orchard.Data; namespace Orchard.Tests.Packages.Pages.Services { diff --git a/src/Orchard.Tests.Packages/Pages/Services/SlugConstraintTests.cs b/src/Orchard.Tests.Packages/Pages/Services/SlugConstraintTests.cs index f787ce014..1f48b49fb 100644 --- a/src/Orchard.Tests.Packages/Pages/Services/SlugConstraintTests.cs +++ b/src/Orchard.Tests.Packages/Pages/Services/SlugConstraintTests.cs @@ -1,10 +1,6 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Web.Routing; +using System.Web.Routing; using NUnit.Framework; -using Orchard.CmsPages.Services; +using Orchard.Pages.Services; namespace Orchard.Tests.Packages.Pages.Services { [TestFixture] diff --git a/src/Orchard.Tests.Packages/Pages/Services/Templates/CommentExtractorTests.cs b/src/Orchard.Tests.Packages/Pages/Services/Templates/CommentExtractorTests.cs index 4cd393497..b5dbfe248 100644 --- a/src/Orchard.Tests.Packages/Pages/Services/Templates/CommentExtractorTests.cs +++ b/src/Orchard.Tests.Packages/Pages/Services/Templates/CommentExtractorTests.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.IO; using NUnit.Framework; -using Orchard.CmsPages.Services.Templates; +using Orchard.Pages.Services.Templates; namespace Orchard.Tests.Packages.Pages.Services.Templates { [TestFixture] diff --git a/src/Orchard.Tests.Packages/Pages/Services/Templates/TemplateMetadataParserTests.cs b/src/Orchard.Tests.Packages/Pages/Services/Templates/TemplateMetadataParserTests.cs index d9ae9f5cb..a22f65fbf 100644 --- a/src/Orchard.Tests.Packages/Pages/Services/Templates/TemplateMetadataParserTests.cs +++ b/src/Orchard.Tests.Packages/Pages/Services/Templates/TemplateMetadataParserTests.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.IO; using NUnit.Framework; -using Orchard.CmsPages.Services.Templates; +using Orchard.Pages.Services.Templates; namespace Orchard.Tests.Packages.Pages.Services.Templates { [TestFixture] diff --git a/src/Orchard.Tests.Packages/Pages/Services/Templates/TemplateProviderTests.cs b/src/Orchard.Tests.Packages/Pages/Services/Templates/TemplateProviderTests.cs index f69f2dd42..0417a8a5f 100644 --- a/src/Orchard.Tests.Packages/Pages/Services/Templates/TemplateProviderTests.cs +++ b/src/Orchard.Tests.Packages/Pages/Services/Templates/TemplateProviderTests.cs @@ -1,5 +1,5 @@ using NUnit.Framework; -using Orchard.CmsPages.Services.Templates; +using Orchard.Pages.Services.Templates; namespace Orchard.Tests.Packages.Pages.Services.Templates { [TestFixture] diff --git a/src/Orchard.Tests.Packages/Pages/Services/Templates/TestTemplateProvider.cs b/src/Orchard.Tests.Packages/Pages/Services/Templates/TestTemplateProvider.cs index cbf6442ba..217ad7e3f 100644 --- a/src/Orchard.Tests.Packages/Pages/Services/Templates/TestTemplateProvider.cs +++ b/src/Orchard.Tests.Packages/Pages/Services/Templates/TestTemplateProvider.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; using System.IO; -using Orchard.CmsPages.Services.Templates; +using Orchard.Pages.Services.Templates; namespace Orchard.Tests.Packages.Pages.Services.Templates { public class StubTemplateEntryProvider : ITemplateEntryProvider { diff --git a/src/Orchard.Tests.Packages/Pages/Services/TestExtensions.cs b/src/Orchard.Tests.Packages/Pages/Services/TestExtensions.cs index cbabf8c4e..f605f00e1 100644 --- a/src/Orchard.Tests.Packages/Pages/Services/TestExtensions.cs +++ b/src/Orchard.Tests.Packages/Pages/Services/TestExtensions.cs @@ -1,6 +1,5 @@ -using Orchard.CmsPages.Models; -using Orchard.CmsPages.Services; -using Orchard.CmsPages.ViewModels; +using Orchard.Pages.Models; +using Orchard.Pages.Services; namespace Orchard.Tests.Packages.Pages.Services { public static class TestExtensions { diff --git a/src/Orchard.Web/Orchard.Web.csproj b/src/Orchard.Web/Orchard.Web.csproj index bd4021efb..1dd1a4407 100644 --- a/src/Orchard.Web/Orchard.Web.csproj +++ b/src/Orchard.Web/Orchard.Web.csproj @@ -109,10 +109,6 @@ {63FBD4D9-E1DA-4A7B-AA6A-D6074FE50867} Orchard.Blogs - - {1ECC1131-0D0C-4822-AD90-E979868C63F3} - Orchard.CmsPages - {14C049FD-B35B-415A-A824-87F26B26E7FD} Orchard.Comments @@ -125,6 +121,10 @@ {D9A7B330-CD22-4DA1-A95A-8DE1982AD8EB} Orchard.Media + + {4A9C04A6-0986-4A92-A610-5F59FF273FB9} + Orchard.Pages + {D10AD48F-407D-4DB5-A328-173EC7CB010F} Orchard.Roles diff --git a/src/Orchard.Web/Packages/Orchard.CmsPages/CmsPagesPermissions.cs b/src/Orchard.Web/Packages/Orchard.CmsPages/CmsPagesPermissions.cs deleted file mode 100644 index 07ad71585..000000000 --- a/src/Orchard.Web/Packages/Orchard.CmsPages/CmsPagesPermissions.cs +++ /dev/null @@ -1,40 +0,0 @@ -using System.Collections.Generic; -using Orchard.Security.Permissions; - -namespace Orchard.CmsPages { - public class CmsPagesPermissionsProvider : IPermissionProvider { - public static readonly Permission ViewPagesPermission = new Permission { Description = "Viewing CMS Pages", Name = "ViewPagesPermission" }; - public static readonly Permission CreatePagesPermission = new Permission { Description = "Creating CMS Pages", Name = "CreatePagesPermission" }; - public static readonly Permission CreateDraftPagesPermission = new Permission { Description = "Creating CMS Page Drafts", Name = "CreateDraftPagesPermission" }; - public static readonly Permission DeleteDraftPagesPermission = new Permission { Description = "Deleting CMS Page Drafts", Name = "DeleteDraftPagesPermission" }; - public static readonly Permission ModifyPagesPermission = new Permission { Description = "Modifying CMS Pages", Name = "ModifyPagesPermission" }; - public static readonly Permission DeletePagesPermission = new Permission { Description = "Deleting CMS Pages", Name = "DeletePagesPermission" }; - public static readonly Permission PublishPagesPermission = new Permission { Description = "Publishing CMS Pages", Name = "PublishPagesPermission" }; - public static readonly Permission UnpublishPagesPermission = new Permission { Description = "Unpublishing CMS Pages", Name = "UnpublishPagesPermission" }; - public static readonly Permission SchedulePagesPermission = new Permission { Description = "Scheduling CMS Pages", Name = "SchedulePagesPermission" }; - - #region Implementation of IPermissionProvider - - public string PackageName { - get { - return "CmsPages"; - } - } - - public IEnumerable GetPermissions() { - return new List { - ViewPagesPermission, - CreatePagesPermission, - CreateDraftPagesPermission, - DeleteDraftPagesPermission, - ModifyPagesPermission, - DeletePagesPermission, - PublishPagesPermission, - UnpublishPagesPermission, - SchedulePagesPermission - }; - } - - #endregion - } -} \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.CmsPages/Models/ModelDiagram.cd b/src/Orchard.Web/Packages/Orchard.CmsPages/Models/ModelDiagram.cd deleted file mode 100644 index 62319092c..000000000 --- a/src/Orchard.Web/Packages/Orchard.CmsPages/Models/ModelDiagram.cd +++ /dev/null @@ -1,77 +0,0 @@ - - - - - - - - - - - - AAACAAAAAAAAAAAAAAAAAAAAgEAAAAAAAAAAAAAAAAA= - Models\Overrides.cs - - - - - - - - - - - AAACAAAAAAAQAEAAAEAgAQAAAkAAAAAAAgAAAARAAAA= - Models\Overrides.cs - - - - - - - - - - - - - - AAACAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAgBAAAAA= - Models\ContentItem.cs - - - - - - - - - AAACAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAgAQAAAA= - Models\Published.cs - - - - - - - - - - AAACAAAAAAAQAAAAAAAAAAAAAAAQAAAAAAAAgAAAAAQ= - Models\Scheduled.cs - - - - - - - - - - - AAAAAAAAAAAAAAAAAEAEAAAAAAAAAAAAAAAAAAAAACA= - Models\Scheduled.cs - - - - \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.CmsPages/Orchard.CmsPages.csproj b/src/Orchard.Web/Packages/Orchard.CmsPages/Orchard.CmsPages.csproj deleted file mode 100644 index 2ba6d2c58..000000000 --- a/src/Orchard.Web/Packages/Orchard.CmsPages/Orchard.CmsPages.csproj +++ /dev/null @@ -1,193 +0,0 @@ - - - Debug - AnyCPU - 9.0.30729 - 2.0 - {1ECC1131-0D0C-4822-AD90-E979868C63F3} - {349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} - Library - Properties - Orchard.CmsPages - Orchard.CmsPages - v3.5 - false - - - true - full - false - bin\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\ - TRACE - prompt - 4 - - - - False - ..\..\..\..\lib\fluentnhibernate\FluentNHibernate.dll - - - False - ..\..\..\..\lib\fluentnhibernate\NHibernate.dll - - - - - 3.5 - - - 3.5 - - - 3.5 - - - ..\..\..\..\lib\aspnetmvc\System.Web.Mvc.dll - - - 3.5 - - - - - - - - - - - - - False - ..\..\..\..\lib\yaml\Yaml.dll - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {2D1D92BB-4555-4CBE-8D0E-63563D6CE4C6} - Orchard - - - {9916839C-39FC-4CEB-A5AF-89CA7E87119F} - Orchard.Core - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - $(ProjectDir)\..\Manifests - - - - - - - - - - - - False - True - 30927 - / - - - False - True - http://orchard.codeplex.com/ - False - - - - - \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.CmsPages/Package.txt b/src/Orchard.Web/Packages/Orchard.CmsPages/Package.txt deleted file mode 100644 index 1f4768e89..000000000 --- a/src/Orchard.Web/Packages/Orchard.CmsPages/Package.txt +++ /dev/null @@ -1 +0,0 @@ -name: Pages diff --git a/src/Orchard.Web/Packages/Orchard.CmsPages/Properties/AssemblyInfo.cs b/src/Orchard.Web/Packages/Orchard.CmsPages/Properties/AssemblyInfo.cs deleted file mode 100644 index 4e1c1fcb1..000000000 --- a/src/Orchard.Web/Packages/Orchard.CmsPages/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,37 +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.CmsPages")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[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("9b100f80-3406-4e94-a1eb-8131be996f39")] - -// 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")] \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.CmsPages/Services/Templates/TemplateEntry.cs b/src/Orchard.Web/Packages/Orchard.CmsPages/Services/Templates/TemplateEntry.cs deleted file mode 100644 index 2157f6b81..000000000 --- a/src/Orchard.Web/Packages/Orchard.CmsPages/Services/Templates/TemplateEntry.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Web; - -namespace Orchard.CmsPages.Services.Templates { - public class TemplateEntry { - public string Name { get; set; } - public TextReader Content { get; set; } - } -} diff --git a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Web.config b/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Web.config deleted file mode 100644 index 8f6688735..000000000 --- a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Web.config +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Orchard.Web/Packages/Orchard.CmsPages/Web.config b/src/Orchard.Web/Packages/Orchard.CmsPages/Web.config deleted file mode 100644 index 8bfa88317..000000000 --- a/src/Orchard.Web/Packages/Orchard.CmsPages/Web.config +++ /dev/null @@ -1,154 +0,0 @@ - - - - - - - -
- -
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.CmsPages/AdminMenu.cs b/src/Orchard.Web/Packages/Orchard.Pages/AdminMenu.cs similarity index 67% rename from src/Orchard.Web/Packages/Orchard.CmsPages/AdminMenu.cs rename to src/Orchard.Web/Packages/Orchard.Pages/AdminMenu.cs index 8d2ccf74f..2173dc854 100644 --- a/src/Orchard.Web/Packages/Orchard.CmsPages/AdminMenu.cs +++ b/src/Orchard.Web/Packages/Orchard.Pages/AdminMenu.cs @@ -1,14 +1,14 @@ using Orchard.UI.Navigation; -namespace Orchard.CmsPages { +namespace Orchard.Pages { public class AdminMenu : INavigationProvider { public string MenuName { get { return "admin"; } } public void GetNavigation(NavigationBuilder builder) { builder.Add("Pages", "1", menu => menu - .Add("Manage Pages", "1.0", item => item.Action("Index", "Admin", new { area = "Orchard.CmsPages" })) - .Add("Add New Page", "1.1", item => item.Action("Create", "Admin", new { area = "Orchard.CmsPages" }).Permission(Permissions.CreatePages)) + .Add("Manage Pages", "1.0", item => item.Action("Index", "Admin", new { area = "Orchard.Pages" })) + .Add("Add New Page", "1.1", item => item.Action("Create", "Admin", new { area = "Orchard.Pages" }).Permission(Permissions.CreatePages)) ); } } diff --git a/src/Orchard.Web/Packages/Orchard.CmsPages/Content/Admin/images/draft.gif b/src/Orchard.Web/Packages/Orchard.Pages/Content/Admin/images/draft.gif similarity index 100% rename from src/Orchard.Web/Packages/Orchard.CmsPages/Content/Admin/images/draft.gif rename to src/Orchard.Web/Packages/Orchard.Pages/Content/Admin/images/draft.gif diff --git a/src/Orchard.Web/Packages/Orchard.CmsPages/Content/Admin/images/offline.gif b/src/Orchard.Web/Packages/Orchard.Pages/Content/Admin/images/offline.gif similarity index 100% rename from src/Orchard.Web/Packages/Orchard.CmsPages/Content/Admin/images/offline.gif rename to src/Orchard.Web/Packages/Orchard.Pages/Content/Admin/images/offline.gif diff --git a/src/Orchard.Web/Packages/Orchard.CmsPages/Content/Admin/images/online.gif b/src/Orchard.Web/Packages/Orchard.Pages/Content/Admin/images/online.gif similarity index 100% rename from src/Orchard.Web/Packages/Orchard.CmsPages/Content/Admin/images/online.gif rename to src/Orchard.Web/Packages/Orchard.Pages/Content/Admin/images/online.gif diff --git a/src/Orchard.Web/Packages/Orchard.CmsPages/Content/Admin/images/published.gif b/src/Orchard.Web/Packages/Orchard.Pages/Content/Admin/images/published.gif similarity index 100% rename from src/Orchard.Web/Packages/Orchard.CmsPages/Content/Admin/images/published.gif rename to src/Orchard.Web/Packages/Orchard.Pages/Content/Admin/images/published.gif diff --git a/src/Orchard.Web/Packages/Orchard.CmsPages/Content/Admin/images/scheduled.gif b/src/Orchard.Web/Packages/Orchard.Pages/Content/Admin/images/scheduled.gif similarity index 100% rename from src/Orchard.Web/Packages/Orchard.CmsPages/Content/Admin/images/scheduled.gif rename to src/Orchard.Web/Packages/Orchard.Pages/Content/Admin/images/scheduled.gif diff --git a/src/Orchard.Web/Packages/Orchard.CmsPages/Content/Site.css b/src/Orchard.Web/Packages/Orchard.Pages/Content/Site.css similarity index 100% rename from src/Orchard.Web/Packages/Orchard.CmsPages/Content/Site.css rename to src/Orchard.Web/Packages/Orchard.Pages/Content/Site.css diff --git a/src/Orchard.Web/Packages/Orchard.CmsPages/Controllers/AdminController.cs b/src/Orchard.Web/Packages/Orchard.Pages/Controllers/AdminController.cs similarity index 96% rename from src/Orchard.Web/Packages/Orchard.CmsPages/Controllers/AdminController.cs rename to src/Orchard.Web/Packages/Orchard.Pages/Controllers/AdminController.cs index 52b4fae33..92b49f511 100644 --- a/src/Orchard.Web/Packages/Orchard.CmsPages/Controllers/AdminController.cs +++ b/src/Orchard.Web/Packages/Orchard.Pages/Controllers/AdminController.cs @@ -4,18 +4,17 @@ using System.Linq; using System.Reflection; using System.Web; using System.Web.Mvc; -using JetBrains.Annotations; -using Orchard.CmsPages.Models; -using Orchard.CmsPages.Services; -using Orchard.CmsPages.Services.Templates; -using Orchard.CmsPages.ViewModels; +using Orchard.Pages.Models; +using Orchard.Pages.Services; +using Orchard.Pages.Services.Templates; +using Orchard.Pages.ViewModels; using Orchard.Data; using Orchard.Localization; using Orchard.Logging; using Orchard.UI.Notify; using Orchard.Security; -namespace Orchard.CmsPages.Controllers { +namespace Orchard.Pages.Controllers { [ValidateInput(false)] public class AdminController : Controller { private readonly IPageManager _pageManager; @@ -206,7 +205,7 @@ namespace Orchard.CmsPages.Controllers { if (!_authorizer.Authorize(Permissions.CreatePages, T("Couldn't create page"))) return new HttpUnauthorizedResult(); - Logger.Information("Creating CmsPage slug:{0} title{1}: template{2}", + Logger.Information("Creating Page slug:{0} title{1}: template{2}", viewModel.Slug, viewModel.Title, viewModel.TemplateName); var revision = _pageManager.CreatePage(new CreatePageParams(viewModel.Title, viewModel.Slug, viewModel.TemplateName)); return RedirectToAction("Edit", new { revision.Page.Id }); diff --git a/src/Orchard.Web/Packages/Orchard.CmsPages/Controllers/TemplatesController.cs b/src/Orchard.Web/Packages/Orchard.Pages/Controllers/TemplatesController.cs similarity index 90% rename from src/Orchard.Web/Packages/Orchard.CmsPages/Controllers/TemplatesController.cs rename to src/Orchard.Web/Packages/Orchard.Pages/Controllers/TemplatesController.cs index 62868f72d..18864c38b 100644 --- a/src/Orchard.Web/Packages/Orchard.CmsPages/Controllers/TemplatesController.cs +++ b/src/Orchard.Web/Packages/Orchard.Pages/Controllers/TemplatesController.cs @@ -1,9 +1,9 @@ using System; using System.Web; using System.Web.Mvc; -using Orchard.CmsPages.Services; +using Orchard.Pages.Services; -namespace Orchard.CmsPages.Controllers { +namespace Orchard.Pages.Controllers { public class TemplatesController : Controller { private readonly IPageManager _pageManager; private readonly ISlugConstraint _slugConstraint; diff --git a/src/Orchard.Web/Packages/Orchard.CmsPages/Models/ContentItem.cs b/src/Orchard.Web/Packages/Orchard.Pages/Models/ContentItem.cs similarity index 85% rename from src/Orchard.Web/Packages/Orchard.CmsPages/Models/ContentItem.cs rename to src/Orchard.Web/Packages/Orchard.Pages/Models/ContentItem.cs index 3e3500153..a38472bc9 100644 --- a/src/Orchard.Web/Packages/Orchard.CmsPages/Models/ContentItem.cs +++ b/src/Orchard.Web/Packages/Orchard.Pages/Models/ContentItem.cs @@ -1,4 +1,4 @@ -namespace Orchard.CmsPages.Models { +namespace Orchard.Pages.Models { public partial class ContentItem { public virtual int Id { get; set; } public virtual PageRevision PageRevision { get; set; } diff --git a/src/Orchard.Web/Packages/Orchard.CmsPages/Models/ContentItemListModelBinder.cs b/src/Orchard.Web/Packages/Orchard.Pages/Models/ContentItemListModelBinder.cs similarity index 92% rename from src/Orchard.Web/Packages/Orchard.CmsPages/Models/ContentItemListModelBinder.cs rename to src/Orchard.Web/Packages/Orchard.Pages/Models/ContentItemListModelBinder.cs index bd6de904d..32d4c72f9 100644 --- a/src/Orchard.Web/Packages/Orchard.CmsPages/Models/ContentItemListModelBinder.cs +++ b/src/Orchard.Web/Packages/Orchard.Pages/Models/ContentItemListModelBinder.cs @@ -2,7 +2,7 @@ using System.Web.Mvc; using Orchard.Mvc.ModelBinders; -namespace Orchard.CmsPages.Models { +namespace Orchard.Pages.Models { public class ContentItemListModelBinder : IModelBinderProvider { private readonly ModelBinderDictionary _binders; private readonly ModelMetadataProvider _provider; diff --git a/src/Orchard.Web/Packages/Orchard.CmsPages/Models/ModelExtensions.cs b/src/Orchard.Web/Packages/Orchard.Pages/Models/ModelExtensions.cs similarity index 87% rename from src/Orchard.Web/Packages/Orchard.CmsPages/Models/ModelExtensions.cs rename to src/Orchard.Web/Packages/Orchard.Pages/Models/ModelExtensions.cs index 63e72f6d5..8b25ea8a7 100644 --- a/src/Orchard.Web/Packages/Orchard.CmsPages/Models/ModelExtensions.cs +++ b/src/Orchard.Web/Packages/Orchard.Pages/Models/ModelExtensions.cs @@ -1,4 +1,4 @@ -namespace Orchard.CmsPages.Models { +namespace Orchard.Pages.Models { public static class ModelExtensions { public static bool IsPublished(this PageRevision revision) { if (revision != null && diff --git a/src/Orchard.Web/Packages/Orchard.CmsPages/Models/Page.cs b/src/Orchard.Web/Packages/Orchard.Pages/Models/Page.cs similarity index 89% rename from src/Orchard.Web/Packages/Orchard.CmsPages/Models/Page.cs rename to src/Orchard.Web/Packages/Orchard.Pages/Models/Page.cs index 8b64d8f10..50702e345 100644 --- a/src/Orchard.Web/Packages/Orchard.CmsPages/Models/Page.cs +++ b/src/Orchard.Web/Packages/Orchard.Pages/Models/Page.cs @@ -3,22 +3,22 @@ using FluentNHibernate.Automapping; using FluentNHibernate.Automapping.Alterations; using Orchard.Data.Conventions; -namespace Orchard.CmsPages.Models { +namespace Orchard.Pages.Models { public class Page { public Page() { Revisions = new List(); Scheduled = new List(); } - + public virtual int Id { get; protected set; } - + [CascadeAllDeleteOrphan] public virtual IList Revisions { get; protected set; } - + [CascadeAllDeleteOrphan] public virtual IList Scheduled { get; protected set; } - + public virtual Published Published { get; set; } } diff --git a/src/Orchard.Web/Packages/Orchard.CmsPages/Models/PageRevision.cs b/src/Orchard.Web/Packages/Orchard.Pages/Models/PageRevision.cs similarity index 89% rename from src/Orchard.Web/Packages/Orchard.CmsPages/Models/PageRevision.cs rename to src/Orchard.Web/Packages/Orchard.Pages/Models/PageRevision.cs index fb2363515..5fa50a2dd 100644 --- a/src/Orchard.Web/Packages/Orchard.CmsPages/Models/PageRevision.cs +++ b/src/Orchard.Web/Packages/Orchard.Pages/Models/PageRevision.cs @@ -1,10 +1,11 @@ -using System; +using System; using System.Collections.Generic; using System.ComponentModel; using System.ComponentModel.DataAnnotations; +using Orchard.ContentManagement; using Orchard.Data.Conventions; -namespace Orchard.CmsPages.Models { +namespace Orchard.Pages.Models { public class PageRevision { public PageRevision() { diff --git a/src/Orchard.Web/Packages/Orchard.CmsPages/Models/Published.cs b/src/Orchard.Web/Packages/Orchard.Pages/Models/Published.cs similarity index 83% rename from src/Orchard.Web/Packages/Orchard.CmsPages/Models/Published.cs rename to src/Orchard.Web/Packages/Orchard.Pages/Models/Published.cs index f7b0d7f9a..7cada36c3 100644 --- a/src/Orchard.Web/Packages/Orchard.CmsPages/Models/Published.cs +++ b/src/Orchard.Web/Packages/Orchard.Pages/Models/Published.cs @@ -1,4 +1,4 @@ -namespace Orchard.CmsPages.Models { +namespace Orchard.Pages.Models { public class Published { public virtual int Id { get; set; } public virtual string Slug { get; set; } diff --git a/src/Orchard.Web/Packages/Orchard.CmsPages/Models/Scheduled.cs b/src/Orchard.Web/Packages/Orchard.Pages/Models/Scheduled.cs similarity index 88% rename from src/Orchard.Web/Packages/Orchard.CmsPages/Models/Scheduled.cs rename to src/Orchard.Web/Packages/Orchard.Pages/Models/Scheduled.cs index cd37f7a80..bc0d5b610 100644 --- a/src/Orchard.Web/Packages/Orchard.CmsPages/Models/Scheduled.cs +++ b/src/Orchard.Web/Packages/Orchard.Pages/Models/Scheduled.cs @@ -1,6 +1,6 @@ using System; -namespace Orchard.CmsPages.Models { +namespace Orchard.Pages.Models { public enum ScheduledAction { Undefined, Publish, diff --git a/src/Orchard.Web/Packages/Orchard.Pages/Orchard.Pages.csproj b/src/Orchard.Web/Packages/Orchard.Pages/Orchard.Pages.csproj index c5026848d..ed0874b17 100644 --- a/src/Orchard.Web/Packages/Orchard.Pages/Orchard.Pages.csproj +++ b/src/Orchard.Web/Packages/Orchard.Pages/Orchard.Pages.csproj @@ -31,6 +31,14 @@ 4 + + False + ..\..\..\..\lib\fluentnhibernate\FluentNHibernate.dll + + + False + ..\..\..\..\lib\fluentnhibernate\NHibernate.dll + @@ -59,18 +67,78 @@ + + False + ..\..\..\..\lib\yaml\Yaml.dll + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + {2D1D92BB-4555-4CBE-8D0E-63563D6CE4C6} + Orchard + + + {9916839C-39FC-4CEB-A5AF-89CA7E87119F} + Orchard.Core + diff --git a/src/Orchard.Web/Packages/Orchard.Pages/Package.txt b/src/Orchard.Web/Packages/Orchard.Pages/Package.txt index d26e0e022..1f4768e89 100644 --- a/src/Orchard.Web/Packages/Orchard.Pages/Package.txt +++ b/src/Orchard.Web/Packages/Orchard.Pages/Package.txt @@ -1 +1 @@ -name: NewPages +name: Pages diff --git a/src/Orchard.Web/Packages/Orchard.CmsPages/Permissions.cs b/src/Orchard.Web/Packages/Orchard.Pages/Permissions.cs similarity index 60% rename from src/Orchard.Web/Packages/Orchard.CmsPages/Permissions.cs rename to src/Orchard.Web/Packages/Orchard.Pages/Permissions.cs index be2a0c7cd..234041c36 100644 --- a/src/Orchard.Web/Packages/Orchard.CmsPages/Permissions.cs +++ b/src/Orchard.Web/Packages/Orchard.Pages/Permissions.cs @@ -1,21 +1,21 @@ using System.Collections.Generic; using Orchard.Security.Permissions; -namespace Orchard.CmsPages { +namespace Orchard.Pages { public class Permissions : IPermissionProvider { - public static readonly Permission ViewPages = new Permission { Description = "Viewing CMS Pages", Name = "ViewPages" }; - public static readonly Permission CreatePages = new Permission { Description = "Creating CMS Pages", Name = "CreatePages" }; - public static readonly Permission CreateDraftPages = new Permission { Description = "Creating CMS Page Drafts", Name = "CreateDraftPages" }; - public static readonly Permission DeleteDraftPages = new Permission { Description = "Deleting CMS Page Drafts", Name = "DeleteDraftPages" }; - public static readonly Permission ModifyPages = new Permission { Description = "Modifying CMS Pages", Name = "ModifyPages" }; - public static readonly Permission DeletePages = new Permission { Description = "Deleting CMS Pages", Name = "DeletePages" }; - public static readonly Permission PublishPages = new Permission { Description = "Publishing CMS Pages", Name = "PublishPages" }; - public static readonly Permission UnpublishPages = new Permission { Description = "Unpublishing CMS Pages", Name = "UnpublishPages" }; - public static readonly Permission SchedulePages = new Permission { Description = "Scheduling CMS Pages", Name = "SchedulePages" }; + public static readonly Permission ViewPages = new Permission { Description = "Viewing Pages", Name = "ViewPages" }; + public static readonly Permission CreatePages = new Permission { Description = "Creating Pages", Name = "CreatePages" }; + public static readonly Permission CreateDraftPages = new Permission { Description = "Creating Page Drafts", Name = "CreateDraftPages" }; + public static readonly Permission DeleteDraftPages = new Permission { Description = "Deleting Page Drafts", Name = "DeleteDraftPages" }; + public static readonly Permission ModifyPages = new Permission { Description = "Modifying Pages", Name = "ModifyPages" }; + public static readonly Permission DeletePages = new Permission { Description = "Deleting Pages", Name = "DeletePages" }; + public static readonly Permission PublishPages = new Permission { Description = "Publishing Pages", Name = "PublishPages" }; + public static readonly Permission UnpublishPages = new Permission { Description = "Unpublishing Pages", Name = "UnpublishPages" }; + public static readonly Permission SchedulePages = new Permission { Description = "Scheduling Pages", Name = "SchedulePages" }; public string PackageName { get { - return "CmsPages"; + return "NewPages"; } } @@ -32,5 +32,5 @@ namespace Orchard.CmsPages { SchedulePages }; } - } + } } \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.CmsPages/Routes.cs b/src/Orchard.Web/Packages/Orchard.Pages/Routes.cs similarity index 90% rename from src/Orchard.Web/Packages/Orchard.CmsPages/Routes.cs rename to src/Orchard.Web/Packages/Orchard.Pages/Routes.cs index 7c6fcdf8e..3d8ead1dc 100644 --- a/src/Orchard.Web/Packages/Orchard.CmsPages/Routes.cs +++ b/src/Orchard.Web/Packages/Orchard.Pages/Routes.cs @@ -1,11 +1,10 @@ using System.Collections.Generic; using System.Web.Mvc; using System.Web.Routing; -using Orchard.CmsPages.Services; using Orchard.Mvc.Routes; +using Orchard.Pages.Services; -namespace Orchard.CmsPages { - +namespace Orchard.Pages { public class Routes : IRouteProvider { private readonly ISlugConstraint _slugConstraint; @@ -25,7 +24,7 @@ namespace Orchard.CmsPages { Route = new Route( "{*slug}", new RouteValueDictionary { - {"area", "Orchard.CmsPages"}, + {"area", "Orchard.Pages"}, {"controller", "templates"}, {"action", "show"} }, @@ -33,7 +32,7 @@ namespace Orchard.CmsPages { {"slug", _slugConstraint} }, new RouteValueDictionary { - {"area", "Orchard.CmsPages"} + {"area", "Orchard.Pages"} }, new MvcRouteHandler()) } diff --git a/src/Orchard.Web/Packages/Orchard.CmsPages/Services/PageManager.cs b/src/Orchard.Web/Packages/Orchard.Pages/Services/PageManager.cs similarity index 93% rename from src/Orchard.Web/Packages/Orchard.CmsPages/Services/PageManager.cs rename to src/Orchard.Web/Packages/Orchard.Pages/Services/PageManager.cs index 8ac11c6ab..3d414df7b 100644 --- a/src/Orchard.Web/Packages/Orchard.CmsPages/Services/PageManager.cs +++ b/src/Orchard.Web/Packages/Orchard.Pages/Services/PageManager.cs @@ -2,15 +2,14 @@ using System.Collections.Generic; using System.Linq; using JetBrains.Annotations; -using Orchard.CmsPages.Models; -using Orchard.CmsPages.Services.Templates; -using Orchard.CmsPages.ViewModels; +using Orchard.Pages.Models; +using Orchard.Pages.Services.Templates; using Orchard.Data; using Orchard.Logging; using Orchard.Services; using Orchard.Utility; -namespace Orchard.CmsPages.Services { +namespace Orchard.Pages.Services { public enum PublishHistory { Default, @@ -23,7 +22,7 @@ namespace Orchard.CmsPages.Services { } public class CreatePageParams { - public CreatePageParams(){} + public CreatePageParams() { } public CreatePageParams(string title, string slug, string templateName) { Title = title; Slug = slug; @@ -67,7 +66,7 @@ namespace Orchard.CmsPages.Services { _pageRepository = pageRepository; _revisionRepository = revisionRepository; _publishedRepository = publishedRepository; - + Logger = NullLogger.Instance; } @@ -111,13 +110,14 @@ namespace Orchard.CmsPages.Services { } foreach (var zone in templateDescriptor.Zones) { - if (revision.Contents.Any(r=>r.ZoneName==zone)) { + string s = zone; + if (revision.Contents.Any(r => r.ZoneName == s)) { // take no action if content for a zone is already present continue; } // add an item for the named zone - revision.Contents.Add(new ContentItem {PageRevision = revision, ZoneName = zone}); + revision.Contents.Add(new ContentItem { PageRevision = revision, ZoneName = zone }); } } diff --git a/src/Orchard.Web/Packages/Orchard.CmsPages/Services/PageScheduler.cs b/src/Orchard.Web/Packages/Orchard.Pages/Services/PageScheduler.cs similarity index 91% rename from src/Orchard.Web/Packages/Orchard.CmsPages/Services/PageScheduler.cs rename to src/Orchard.Web/Packages/Orchard.Pages/Services/PageScheduler.cs index 09f6152b9..b7b113780 100644 --- a/src/Orchard.Web/Packages/Orchard.CmsPages/Services/PageScheduler.cs +++ b/src/Orchard.Web/Packages/Orchard.Pages/Services/PageScheduler.cs @@ -1,14 +1,13 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Web; using JetBrains.Annotations; -using Orchard.CmsPages.Models; +using Orchard.Pages.Models; using Orchard.Data; using Orchard.Services; using Orchard.Tasks; -namespace Orchard.CmsPages.Services { +namespace Orchard.Pages.Services { public interface IPageScheduler : IBackgroundTask { void AddPublishTask(PageRevision revision, DateTime moment); void ClearTasks(Page page); @@ -67,7 +66,7 @@ namespace Orchard.CmsPages.Services { task.Page.Scheduled.Remove(task); task.PageRevision.Scheduled.Remove(task); } - catch { + catch { //TODO: log critical, error removing failed task } } @@ -76,7 +75,7 @@ namespace Orchard.CmsPages.Services { public void ClearTasks(Page page) { #warning UNIT TEST!!!! var tasks = _scheduledRepository.Fetch(x => x.Page == page); - foreach(var task in tasks) { + foreach (var task in tasks) { task.Page.Scheduled.Remove(task); task.PageRevision.Scheduled.Remove(task); task.Page = null; @@ -109,16 +108,16 @@ namespace Orchard.CmsPages.Services { } } - + private void ProcessPublish(Scheduled scheduled) { _pageManager.Publish(scheduled.PageRevision, new PublishOptions()); } - private void ProcessUnpublish(Scheduled scheduled) { + private static void ProcessUnpublish(Scheduled scheduled) { throw new NotImplementedException(); } - + } } diff --git a/src/Orchard.Web/Packages/Orchard.CmsPages/Services/SlugConstraint.cs b/src/Orchard.Web/Packages/Orchard.Pages/Services/SlugConstraint.cs similarity index 89% rename from src/Orchard.Web/Packages/Orchard.CmsPages/Services/SlugConstraint.cs rename to src/Orchard.Web/Packages/Orchard.Pages/Services/SlugConstraint.cs index b941e580f..4fea0651c 100644 --- a/src/Orchard.Web/Packages/Orchard.CmsPages/Services/SlugConstraint.cs +++ b/src/Orchard.Web/Packages/Orchard.Pages/Services/SlugConstraint.cs @@ -1,18 +1,18 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Web; using System.Web.Routing; using Orchard.Tasks; -namespace Orchard.CmsPages.Services { +namespace Orchard.Pages.Services { public interface ISlugConstraint : IRouteConstraint, ISingletonDependency { void SetCurrentlyPublishedSlugs(IEnumerable slugs); string LookupPublishedSlug(string slug); } public class SlugConstraint : ISlugConstraint { - private IDictionary _currentlyPublishedSlugs = new Dictionary(); + private IDictionary _currentlyPublishedSlugs = new Dictionary(); public void SetCurrentlyPublishedSlugs(IEnumerable values) { _currentlyPublishedSlugs = values @@ -37,7 +37,7 @@ namespace Orchard.CmsPages.Services { } } - public class SlugConstraintUpdater : IBackgroundTask{ + public class SlugConstraintUpdater : IBackgroundTask { private readonly IPageManager _pageManager; private readonly ISlugConstraint _slugConstraint; diff --git a/src/Orchard.Web/Packages/Orchard.CmsPages/Services/Templates/CommentExtractor.cs b/src/Orchard.Web/Packages/Orchard.Pages/Services/Templates/CommentExtractor.cs similarity index 93% rename from src/Orchard.Web/Packages/Orchard.CmsPages/Services/Templates/CommentExtractor.cs rename to src/Orchard.Web/Packages/Orchard.Pages/Services/Templates/CommentExtractor.cs index 4dd6b96f7..6031e11a6 100644 --- a/src/Orchard.Web/Packages/Orchard.CmsPages/Services/Templates/CommentExtractor.cs +++ b/src/Orchard.Web/Packages/Orchard.Pages/Services/Templates/CommentExtractor.cs @@ -3,7 +3,7 @@ using System.IO; using System.Linq; using System.Text.RegularExpressions; -namespace Orchard.CmsPages.Services.Templates { +namespace Orchard.Pages.Services.Templates { /// /// Parse the content of a text reader into a list of metadata entries. /// diff --git a/src/Orchard.Web/Packages/Orchard.CmsPages/Services/Templates/MetadataEntry.cs b/src/Orchard.Web/Packages/Orchard.Pages/Services/Templates/MetadataEntry.cs similarity index 81% rename from src/Orchard.Web/Packages/Orchard.CmsPages/Services/Templates/MetadataEntry.cs rename to src/Orchard.Web/Packages/Orchard.Pages/Services/Templates/MetadataEntry.cs index ed610cf3e..9d04b95a6 100644 --- a/src/Orchard.Web/Packages/Orchard.CmsPages/Services/Templates/MetadataEntry.cs +++ b/src/Orchard.Web/Packages/Orchard.Pages/Services/Templates/MetadataEntry.cs @@ -1,4 +1,4 @@ -namespace Orchard.CmsPages.Services.Templates { +namespace Orchard.Pages.Services.Templates { public class MetadataEntry { public string Tag { get; set; } public string Value { get; set; } diff --git a/src/Orchard.Web/Packages/Orchard.CmsPages/Services/Templates/TemplateDescriptor.cs b/src/Orchard.Web/Packages/Orchard.Pages/Services/Templates/TemplateDescriptor.cs similarity index 88% rename from src/Orchard.Web/Packages/Orchard.CmsPages/Services/Templates/TemplateDescriptor.cs rename to src/Orchard.Web/Packages/Orchard.Pages/Services/Templates/TemplateDescriptor.cs index c389c878d..beb841707 100644 --- a/src/Orchard.Web/Packages/Orchard.CmsPages/Services/Templates/TemplateDescriptor.cs +++ b/src/Orchard.Web/Packages/Orchard.Pages/Services/Templates/TemplateDescriptor.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Orchard.CmsPages.Services.Templates { +namespace Orchard.Pages.Services.Templates { public class TemplateDescriptor { public TemplateDescriptor() { Zones = new List(); diff --git a/src/Orchard.Web/Packages/Orchard.Pages/Services/Templates/TemplateEntry.cs b/src/Orchard.Web/Packages/Orchard.Pages/Services/Templates/TemplateEntry.cs new file mode 100644 index 000000000..1c3ab950b --- /dev/null +++ b/src/Orchard.Web/Packages/Orchard.Pages/Services/Templates/TemplateEntry.cs @@ -0,0 +1,8 @@ +using System.IO; + +namespace Orchard.Pages.Services.Templates { + public class TemplateEntry { + public string Name { get; set; } + public TextReader Content { get; set; } + } +} diff --git a/src/Orchard.Web/Packages/Orchard.CmsPages/Services/Templates/TemplateEntryProvider.cs b/src/Orchard.Web/Packages/Orchard.Pages/Services/Templates/TemplateEntryProvider.cs similarity index 91% rename from src/Orchard.Web/Packages/Orchard.CmsPages/Services/Templates/TemplateEntryProvider.cs rename to src/Orchard.Web/Packages/Orchard.Pages/Services/Templates/TemplateEntryProvider.cs index f2a1a4f6b..0e4859521 100644 --- a/src/Orchard.Web/Packages/Orchard.CmsPages/Services/Templates/TemplateEntryProvider.cs +++ b/src/Orchard.Web/Packages/Orchard.Pages/Services/Templates/TemplateEntryProvider.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.IO; using System.Web.Hosting; -namespace Orchard.CmsPages.Services.Templates { +namespace Orchard.Pages.Services.Templates { public interface ITemplateEntryProvider : IDependency { IEnumerable List(); } @@ -10,7 +10,7 @@ namespace Orchard.CmsPages.Services.Templates { public class TemplateEntryProvider : ITemplateEntryProvider { public IEnumerable List() { //TODO: Figure out a way to formalize the notion of "Orchard Package View Folder" - const string templatesVirtualPath = "~/Packages/Orchard.CmsPages/Views/Templates"; + const string templatesVirtualPath = "~/Packages/Orchard.Pages/Views/Templates"; VirtualPathProvider vpathProvider = HostingEnvironment.VirtualPathProvider; VirtualDirectory templatesDirectory = vpathProvider.GetDirectory(templatesVirtualPath); diff --git a/src/Orchard.Web/Packages/Orchard.CmsPages/Services/Templates/TemplateExtensions.cs b/src/Orchard.Web/Packages/Orchard.Pages/Services/Templates/TemplateExtensions.cs similarity index 89% rename from src/Orchard.Web/Packages/Orchard.CmsPages/Services/Templates/TemplateExtensions.cs rename to src/Orchard.Web/Packages/Orchard.Pages/Services/Templates/TemplateExtensions.cs index a94ce85a5..4f8270424 100644 --- a/src/Orchard.Web/Packages/Orchard.CmsPages/Services/Templates/TemplateExtensions.cs +++ b/src/Orchard.Web/Packages/Orchard.Pages/Services/Templates/TemplateExtensions.cs @@ -1,8 +1,8 @@ using System; using System.Web.Mvc; -using Orchard.CmsPages.Models; +using Orchard.Pages.Models; -namespace Orchard.CmsPages.Services.Templates { +namespace Orchard.Pages.Services.Templates { public static class TemplateExtensions { /// /// Include a zone's contents from the current view. diff --git a/src/Orchard.Web/Packages/Orchard.CmsPages/Services/Templates/TemplateMetadataParser.cs b/src/Orchard.Web/Packages/Orchard.Pages/Services/Templates/TemplateMetadataParser.cs similarity index 95% rename from src/Orchard.Web/Packages/Orchard.CmsPages/Services/Templates/TemplateMetadataParser.cs rename to src/Orchard.Web/Packages/Orchard.Pages/Services/Templates/TemplateMetadataParser.cs index e905b83ce..b3f1fc24e 100644 --- a/src/Orchard.Web/Packages/Orchard.CmsPages/Services/Templates/TemplateMetadataParser.cs +++ b/src/Orchard.Web/Packages/Orchard.Pages/Services/Templates/TemplateMetadataParser.cs @@ -5,7 +5,7 @@ using Orchard.Logging; using Orchard.Utility; using Yaml.Grammar; -namespace Orchard.CmsPages.Services.Templates { +namespace Orchard.Pages.Services.Templates { public interface ITemplateMetadataParser : IDependency { IList Parse(TextReader reader); } diff --git a/src/Orchard.Web/Packages/Orchard.CmsPages/Services/Templates/TemplateProvider.cs b/src/Orchard.Web/Packages/Orchard.Pages/Services/Templates/TemplateProvider.cs similarity index 95% rename from src/Orchard.Web/Packages/Orchard.CmsPages/Services/Templates/TemplateProvider.cs rename to src/Orchard.Web/Packages/Orchard.Pages/Services/Templates/TemplateProvider.cs index 7e4d1166b..35208bb55 100644 --- a/src/Orchard.Web/Packages/Orchard.CmsPages/Services/Templates/TemplateProvider.cs +++ b/src/Orchard.Web/Packages/Orchard.Pages/Services/Templates/TemplateProvider.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using Orchard.Utility; -namespace Orchard.CmsPages.Services.Templates { +namespace Orchard.Pages.Services.Templates { public interface ITemplateProvider : IDependency { IList List(); TemplateDescriptor Get(string name); diff --git a/src/Orchard.Web/Packages/Orchard.CmsPages/Services/XmlRpcHandler.cs b/src/Orchard.Web/Packages/Orchard.Pages/Services/XmlRpcHandler.cs similarity index 92% rename from src/Orchard.Web/Packages/Orchard.CmsPages/Services/XmlRpcHandler.cs rename to src/Orchard.Web/Packages/Orchard.Pages/Services/XmlRpcHandler.cs index bfed34b9c..08fda7739 100644 --- a/src/Orchard.Web/Packages/Orchard.CmsPages/Services/XmlRpcHandler.cs +++ b/src/Orchard.Web/Packages/Orchard.Pages/Services/XmlRpcHandler.cs @@ -1,15 +1,10 @@ using System; -using System.Collections.Generic; -using System.IO; using System.Linq; -using System.Web; -using System.Web.Hosting; -using Orchard.CmsPages.ViewModels; using Orchard.Core.XmlRpc; using Orchard.Core.XmlRpc.Models; using Orchard.Logging; -namespace Orchard.CmsPages.Services { +namespace Orchard.Pages.Services { public class XmlRpcHandler : IXmlRpcHandler { private readonly IPageManager _pageManager; @@ -31,7 +26,7 @@ namespace Orchard.CmsPages.Services { .Add(new XRpcArray() .Add(new XRpcStruct() .Set("url", uriBuilder.Uri.AbsoluteUri) - .Set("blogid", "Orchard.CmsPages") + .Set("blogid", "Orchard.Pages") .Set("blogName", "Orchard Pages"))); } diff --git a/src/Orchard.Web/Packages/Orchard.CmsPages/ViewModels/ChooseTemplateViewModel.cs b/src/Orchard.Web/Packages/Orchard.Pages/ViewModels/ChooseTemplateViewModel.cs similarity index 50% rename from src/Orchard.Web/Packages/Orchard.CmsPages/ViewModels/ChooseTemplateViewModel.cs rename to src/Orchard.Web/Packages/Orchard.Pages/ViewModels/ChooseTemplateViewModel.cs index e5d1b383f..cc046e438 100644 --- a/src/Orchard.Web/Packages/Orchard.CmsPages/ViewModels/ChooseTemplateViewModel.cs +++ b/src/Orchard.Web/Packages/Orchard.Pages/ViewModels/ChooseTemplateViewModel.cs @@ -1,12 +1,8 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; -using System.Web.Mvc; -using Orchard.CmsPages.Services.Templates; +using System.Collections.Generic; +using Orchard.Pages.Services.Templates; using Orchard.Mvc.ViewModels; -namespace Orchard.CmsPages.ViewModels { +namespace Orchard.Pages.ViewModels { public class ChooseTemplateViewModel : AdminViewModel { public string TemplateName { get; set; } public IList Templates{ get; set; } diff --git a/src/Orchard.Web/Packages/Orchard.CmsPages/ViewModels/PageCreateViewModel.cs b/src/Orchard.Web/Packages/Orchard.Pages/ViewModels/PageCreateViewModel.cs similarity index 83% rename from src/Orchard.Web/Packages/Orchard.CmsPages/ViewModels/PageCreateViewModel.cs rename to src/Orchard.Web/Packages/Orchard.Pages/ViewModels/PageCreateViewModel.cs index e6e4d7110..fe57bf89a 100644 --- a/src/Orchard.Web/Packages/Orchard.CmsPages/ViewModels/PageCreateViewModel.cs +++ b/src/Orchard.Web/Packages/Orchard.Pages/ViewModels/PageCreateViewModel.cs @@ -1,10 +1,10 @@ using System.Collections.Generic; using System.ComponentModel; using System.ComponentModel.DataAnnotations; -using Orchard.CmsPages.Services.Templates; +using Orchard.Pages.Services.Templates; using Orchard.Mvc.ViewModels; -namespace Orchard.CmsPages.ViewModels { +namespace Orchard.Pages.ViewModels { public class PageCreateViewModel : AdminViewModel { [Required, DisplayName("Title:")] public string Title { get; set; } diff --git a/src/Orchard.Web/Packages/Orchard.CmsPages/ViewModels/PageEditViewModel.cs b/src/Orchard.Web/Packages/Orchard.Pages/ViewModels/PageEditViewModel.cs similarity index 74% rename from src/Orchard.Web/Packages/Orchard.CmsPages/ViewModels/PageEditViewModel.cs rename to src/Orchard.Web/Packages/Orchard.Pages/ViewModels/PageEditViewModel.cs index 35839a305..a9bf39654 100644 --- a/src/Orchard.Web/Packages/Orchard.CmsPages/ViewModels/PageEditViewModel.cs +++ b/src/Orchard.Web/Packages/Orchard.Pages/ViewModels/PageEditViewModel.cs @@ -1,10 +1,9 @@ using System; -using System.Collections.Generic; -using Orchard.CmsPages.Models; -using Orchard.CmsPages.Services.Templates; +using Orchard.Pages.Models; +using Orchard.Pages.Services.Templates; using Orchard.Mvc.ViewModels; -namespace Orchard.CmsPages.ViewModels { +namespace Orchard.Pages.ViewModels { public enum PageEditCommand { Undefined, PublishNow, diff --git a/src/Orchard.Web/Packages/Orchard.CmsPages/ViewModels/PageIndexViewModel.cs b/src/Orchard.Web/Packages/Orchard.Pages/ViewModels/PageIndexViewModel.cs similarity index 91% rename from src/Orchard.Web/Packages/Orchard.CmsPages/ViewModels/PageIndexViewModel.cs rename to src/Orchard.Web/Packages/Orchard.Pages/ViewModels/PageIndexViewModel.cs index b31f91dd3..187f5f163 100644 --- a/src/Orchard.Web/Packages/Orchard.CmsPages/ViewModels/PageIndexViewModel.cs +++ b/src/Orchard.Web/Packages/Orchard.Pages/ViewModels/PageIndexViewModel.cs @@ -1,9 +1,9 @@ using System; using System.Collections.Generic; -using Orchard.CmsPages.Models; +using Orchard.Pages.Models; using Orchard.Mvc.ViewModels; -namespace Orchard.CmsPages.ViewModels { +namespace Orchard.Pages.ViewModels { public class PageIndexViewModel : AdminViewModel { public PageIndexOptions Options { get; set; } public IList PageEntries { get; set; } diff --git a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/BulkDeleteConfirm.aspx b/src/Orchard.Web/Packages/Orchard.Pages/Views/Admin/BulkDeleteConfirm.aspx similarity index 86% rename from src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/BulkDeleteConfirm.aspx rename to src/Orchard.Web/Packages/Orchard.Pages/Views/Admin/BulkDeleteConfirm.aspx index 853b9a61e..279e5cdc9 100644 --- a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/BulkDeleteConfirm.aspx +++ b/src/Orchard.Web/Packages/Orchard.Pages/Views/Admin/BulkDeleteConfirm.aspx @@ -1,7 +1,8 @@ <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage" %> -<%@ Import Namespace="Orchard.CmsPages.ViewModels"%> +<%@ Import Namespace="Orchard.Mvc.Html"%> +<%@ Import Namespace="Orchard.Pages.ViewModels"%> <%@ Import Namespace="Orchard.Utility"%> -<%@ Import Namespace="Orchard.CmsPages.Services.Templates"%> +<%@ Import Namespace="Orchard.Pages.Services.Templates"%>

<%=Html.TitleForPage("Delete pages") %>

Are you sure you want to delete the pages?

<% using (Html.BeginFormAntiForgeryPost()) { %> diff --git a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/BulkPublishLater.aspx b/src/Orchard.Web/Packages/Orchard.Pages/Views/Admin/BulkPublishLater.aspx similarity index 86% rename from src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/BulkPublishLater.aspx rename to src/Orchard.Web/Packages/Orchard.Pages/Views/Admin/BulkPublishLater.aspx index 3908def09..5f1361fe0 100644 --- a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/BulkPublishLater.aspx +++ b/src/Orchard.Web/Packages/Orchard.Pages/Views/Admin/BulkPublishLater.aspx @@ -1,7 +1,8 @@ <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage" %> -<%@ Import Namespace="Orchard.CmsPages.ViewModels"%> +<%@ Import Namespace="Orchard.Mvc.Html"%> +<%@ Import Namespace="Orchard.Pages.ViewModels"%> <%@ Import Namespace="Orchard.Utility"%> -<%@ Import Namespace="Orchard.CmsPages.Services.Templates"%> +<%@ Import Namespace="Orchard.Pages.Services.Templates"%>

<%=Html.TitleForPage("Publish later") %>

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

Enter the scheduled publication date:

diff --git a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/ChooseTemplate.aspx b/src/Orchard.Web/Packages/Orchard.Pages/Views/Admin/ChooseTemplate.aspx similarity index 83% rename from src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/ChooseTemplate.aspx rename to src/Orchard.Web/Packages/Orchard.Pages/Views/Admin/ChooseTemplate.aspx index 7800d17ab..ee0cba0bf 100644 --- a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/ChooseTemplate.aspx +++ b/src/Orchard.Web/Packages/Orchard.Pages/Views/Admin/ChooseTemplate.aspx @@ -1,5 +1,6 @@ -<%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage" %> -<%@ Import Namespace="Orchard.CmsPages.Services.Templates"%> +<%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage" %> +<%@ Import Namespace="Orchard.Mvc.Html"%> +<%@ Import Namespace="Orchard.Pages.Services.Templates"%>

<%=Html.TitleForPage("Change Template") %>

Select your layout from one of the templates below.

<% using (Html.BeginFormAntiForgeryPost()) { diff --git a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Create.aspx b/src/Orchard.Web/Packages/Orchard.Pages/Views/Admin/Create.aspx similarity index 76% rename from src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Create.aspx rename to src/Orchard.Web/Packages/Orchard.Pages/Views/Admin/Create.aspx index d34b8dc72..fb37b82e0 100644 --- a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Create.aspx +++ b/src/Orchard.Web/Packages/Orchard.Pages/Views/Admin/Create.aspx @@ -1,4 +1,5 @@ -<%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage" %> +<%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage" %> +<%@ Import Namespace="Orchard.Mvc.Html"%>

<%=Html.TitleForPage("Add a Page") %>

Select your layout from one of the templates below.

<% using (Html.BeginFormAntiForgeryPost()) { %> diff --git a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Edit.aspx b/src/Orchard.Web/Packages/Orchard.Pages/Views/Admin/Edit.aspx similarity index 91% rename from src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Edit.aspx rename to src/Orchard.Web/Packages/Orchard.Pages/Views/Admin/Edit.aspx index 8e1bd2ffe..f23e8a4ff 100644 --- a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Edit.aspx +++ b/src/Orchard.Web/Packages/Orchard.Pages/Views/Admin/Edit.aspx @@ -1,5 +1,6 @@ -<%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage" %> -<%@ Import Namespace="Orchard.CmsPages.Models" %> +<%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage" %> +<%@ Import Namespace="Orchard.Mvc.Html"%> +<%@ Import Namespace="Orchard.Pages.Models" %>

<%=Html.TitleForPage("Edit Page") %>

<%=_Encoded("about setting up a page") %>

<%=Html.ValidationSummary() %> diff --git a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/EditorTemplates/PageCreateViewModel.ascx b/src/Orchard.Web/Packages/Orchard.Pages/Views/Admin/EditorTemplates/PageCreateViewModel.ascx similarity index 75% rename from src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/EditorTemplates/PageCreateViewModel.ascx rename to src/Orchard.Web/Packages/Orchard.Pages/Views/Admin/EditorTemplates/PageCreateViewModel.ascx index bc0ed4c2a..22e40b09a 100644 --- a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/EditorTemplates/PageCreateViewModel.ascx +++ b/src/Orchard.Web/Packages/Orchard.Pages/Views/Admin/EditorTemplates/PageCreateViewModel.ascx @@ -1,6 +1,6 @@ <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %> -<%@ Import Namespace="Orchard.CmsPages.Services.Templates" %> -<%@ Import Namespace="Orchard.CmsPages.ViewModels" %> +<%@ Import Namespace="Orchard.Pages.Services.Templates" %> +<%@ Import Namespace="Orchard.Pages.ViewModels" %> <%@ Import Namespace="Orchard.Utility" %>
    <% foreach (var template in Model.Templates) { diff --git a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/EditorTemplates/TemplateDescriptor.ascx b/src/Orchard.Web/Packages/Orchard.Pages/Views/Admin/EditorTemplates/TemplateDescriptor.ascx similarity index 74% rename from src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/EditorTemplates/TemplateDescriptor.ascx rename to src/Orchard.Web/Packages/Orchard.Pages/Views/Admin/EditorTemplates/TemplateDescriptor.ascx index 425253de7..c51b2f6a2 100644 --- a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/EditorTemplates/TemplateDescriptor.ascx +++ b/src/Orchard.Web/Packages/Orchard.Pages/Views/Admin/EditorTemplates/TemplateDescriptor.ascx @@ -1,5 +1,5 @@ <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %> -<%@ Import Namespace="Orchard.CmsPages.Services.Templates" %> +<%@ Import Namespace="Orchard.Pages.Services.Templates" %>

    <%=Html.Encode(Model.DisplayName)%>

    @@ -9,5 +9,5 @@ Select this template
    <%-- todo: (heskew) need an HTML helper (+route and controller/action for an ImageResult) for template thumbnails --%> -

    <%=Html.Encode(Model.DisplayName)%><%=Html.Encode(Model.Description)%>

    +

    <%=Html.Encode(Model.DisplayName)%><%=Html.Encode(Model.Description)%>

    \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/EditorTemplates/inputTextLarge.ascx b/src/Orchard.Web/Packages/Orchard.Pages/Views/Admin/EditorTemplates/inputTextLarge.ascx similarity index 100% rename from src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/EditorTemplates/inputTextLarge.ascx rename to src/Orchard.Web/Packages/Orchard.Pages/Views/Admin/EditorTemplates/inputTextLarge.ascx diff --git a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/EditorTemplates/inputTextPermalink.ascx b/src/Orchard.Web/Packages/Orchard.Pages/Views/Admin/EditorTemplates/inputTextPermalink.ascx similarity index 100% rename from src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/EditorTemplates/inputTextPermalink.ascx rename to src/Orchard.Web/Packages/Orchard.Pages/Views/Admin/EditorTemplates/inputTextPermalink.ascx diff --git a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Export.aspx b/src/Orchard.Web/Packages/Orchard.Pages/Views/Admin/Export.aspx similarity index 89% rename from src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Export.aspx rename to src/Orchard.Web/Packages/Orchard.Pages/Views/Admin/Export.aspx index d30877115..c0104fdf7 100644 --- a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Export.aspx +++ b/src/Orchard.Web/Packages/Orchard.Pages/Views/Admin/Export.aspx @@ -1,4 +1,5 @@ -<%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage>" %> +<%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage>" %> +<%@ Import Namespace="Orchard.Mvc.Html"%>

    <%=Html.TitleForPage("Export") %>

    Possible text about setting up a page goes here. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nulla erat turpis, blandit eget feugiat nec, tempus vel quam. Mauris et neque eget justo suscipit blandit.

      diff --git a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Index.aspx b/src/Orchard.Web/Packages/Orchard.Pages/Views/Admin/Index.aspx similarity index 89% rename from src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Index.aspx rename to src/Orchard.Web/Packages/Orchard.Pages/Views/Admin/Index.aspx index 15413caff..ce9ab2c02 100644 --- a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Admin/Index.aspx +++ b/src/Orchard.Web/Packages/Orchard.Pages/Views/Admin/Index.aspx @@ -1,6 +1,7 @@ <%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage" %> +<%@ Import Namespace="Orchard.Mvc.Html"%> <%@ Import Namespace="Orchard.Utility"%> -<%@ Import Namespace="Orchard.CmsPages.ViewModels"%> +<%@ Import Namespace="Orchard.Pages.ViewModels"%> <%-- todo: (heskew) localize --%>

      <%=Html.TitleForPage("Manage Pages") %>

      Possible text about setting up a page goes here. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nulla erat turpis, blandit eget feugiat nec, tempus vel quam. Mauris et neque eget justo suscipit blandit.

      @@ -68,9 +69,9 @@ <% if (pageEntry.IsPublished) { - %>" alt="Online" title="The page is currently online" /> + %>" alt="Online" title="The page is currently online" /> <% } else { - %>" alt="Offline" title="The page is currently offline" /> + %>" alt="Offline" title="The page is currently offline" /> <% } %> <%=Html.ActionLink(revision.Title ?? "(no title)", "Show", new { Controller = "Templates", revision.Slug }) %> @@ -79,10 +80,10 @@ <%=string.Format("{0:d}
      {0:t}", revision.ModifiedDate) %> <% if (pageEntry.HasDraft) { - %>" alt="Draft" title="The page has a draft" /> + %>" alt="Draft" title="The page has a draft" /> <% } if (revision.Page.Scheduled.Any()) { - %>" alt="Scheduled" title="The draft is scheduled for publishing" /> + %>" alt="Scheduled" title="The draft is scheduled for publishing" /> <% } %> <%=revision.Page.Scheduled.Any() ? string.Format("{0:d}
      {0:t}", revision.Page.Scheduled.First().ScheduledDate.Value) : "" %> diff --git a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Templates/ExtraUserControl.ascx b/src/Orchard.Web/Packages/Orchard.Pages/Views/Templates/ExtraUserControl.ascx similarity index 66% rename from src/Orchard.Web/Packages/Orchard.CmsPages/Views/Templates/ExtraUserControl.ascx rename to src/Orchard.Web/Packages/Orchard.Pages/Views/Templates/ExtraUserControl.ascx index 848884c26..44bf83168 100644 --- a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Templates/ExtraUserControl.ascx +++ b/src/Orchard.Web/Packages/Orchard.Pages/Views/Templates/ExtraUserControl.ascx @@ -1,9 +1,9 @@ <%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %> -<%@ Import Namespace="Orchard.CmsPages.Models"%> +<%@ Import Namespace="Orchard.Pages.Models"%> <% if (Request.IsAuthenticated) { %> - [ <%=Html.ActionLink("Edit", "Edit", "Admin", new{Area="Orchard.CmsPages", Model.Page.Id}, new{})%> ] + [ <%=Html.ActionLink("Edit", "Edit", "Admin", new{Area="Orchard.Pages", Model.Page.Id}, new{})%> ] <% } %> diff --git a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Templates/ThreeColumns.aspx b/src/Orchard.Web/Packages/Orchard.Pages/Views/Templates/ThreeColumns.aspx similarity index 90% rename from src/Orchard.Web/Packages/Orchard.CmsPages/Views/Templates/ThreeColumns.aspx rename to src/Orchard.Web/Packages/Orchard.Pages/Views/Templates/ThreeColumns.aspx index 2b0eda9e1..195540d87 100644 --- a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Templates/ThreeColumns.aspx +++ b/src/Orchard.Web/Packages/Orchard.Pages/Views/Templates/ThreeColumns.aspx @@ -1,5 +1,5 @@ -<%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage" %> -<%@ Import Namespace="Orchard.CmsPages.Services.Templates"%> +<%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage" %> +<%@ Import Namespace="Orchard.Pages.Services.Templates"%> <%-- name: Three column layout diff --git a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Templates/ThreeColumns.gif b/src/Orchard.Web/Packages/Orchard.Pages/Views/Templates/ThreeColumns.gif similarity index 100% rename from src/Orchard.Web/Packages/Orchard.CmsPages/Views/Templates/ThreeColumns.gif rename to src/Orchard.Web/Packages/Orchard.Pages/Views/Templates/ThreeColumns.gif diff --git a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Templates/TwoColumns.aspx b/src/Orchard.Web/Packages/Orchard.Pages/Views/Templates/TwoColumns.aspx similarity index 89% rename from src/Orchard.Web/Packages/Orchard.CmsPages/Views/Templates/TwoColumns.aspx rename to src/Orchard.Web/Packages/Orchard.Pages/Views/Templates/TwoColumns.aspx index 57c91ee52..2f48e473c 100644 --- a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Templates/TwoColumns.aspx +++ b/src/Orchard.Web/Packages/Orchard.Pages/Views/Templates/TwoColumns.aspx @@ -1,5 +1,5 @@ -<%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage" %> -<%@ Import Namespace="Orchard.CmsPages.Services.Templates" %> +<%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage" %> +<%@ Import Namespace="Orchard.Pages.Services.Templates" %> <%-- name: Two column layout diff --git a/src/Orchard.Web/Packages/Orchard.CmsPages/Views/Templates/TwoColumns.gif b/src/Orchard.Web/Packages/Orchard.Pages/Views/Templates/TwoColumns.gif similarity index 100% rename from src/Orchard.Web/Packages/Orchard.CmsPages/Views/Templates/TwoColumns.gif rename to src/Orchard.Web/Packages/Orchard.Pages/Views/Templates/TwoColumns.gif diff --git a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css index 96ee07a14..42dff3ceb 100644 --- a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css +++ b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css @@ -628,7 +628,7 @@ table.items th, table.items td { todo: (heskew) pull out into relevant modules where appropriate ----------------------------------------------------------*/ -/* CMSPages +/* Pages ----------------------------------------------------------*/ .templates fieldset { margin:0 0 .933%; diff --git a/src/Orchard.Web/Views/Templates/ThreeColumns.aspx b/src/Orchard.Web/Views/Templates/ThreeColumns.aspx index 2b0eda9e1..195540d87 100644 --- a/src/Orchard.Web/Views/Templates/ThreeColumns.aspx +++ b/src/Orchard.Web/Views/Templates/ThreeColumns.aspx @@ -1,5 +1,5 @@ -<%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage" %> -<%@ Import Namespace="Orchard.CmsPages.Services.Templates"%> +<%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage" %> +<%@ Import Namespace="Orchard.Pages.Services.Templates"%> <%-- name: Three column layout diff --git a/src/Orchard.Web/Views/Templates/TwoColumns.aspx b/src/Orchard.Web/Views/Templates/TwoColumns.aspx index 57c91ee52..2f48e473c 100644 --- a/src/Orchard.Web/Views/Templates/TwoColumns.aspx +++ b/src/Orchard.Web/Views/Templates/TwoColumns.aspx @@ -1,5 +1,5 @@ -<%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage" %> -<%@ Import Namespace="Orchard.CmsPages.Services.Templates" %> +<%@ Page Language="C#" Inherits="System.Web.Mvc.ViewPage" %> +<%@ Import Namespace="Orchard.Pages.Services.Templates" %> <%-- name: Two column layout diff --git a/src/Orchard.sln b/src/Orchard.sln index 9ac39d43c..ac7382fea 100644 --- a/src/Orchard.sln +++ b/src/Orchard.sln @@ -11,8 +11,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.Web.Tests", "Orchar EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Packages", "Packages", "{E9C9F120-07BA-4DFB-B9C3-3AFB9D44C9D5}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.CmsPages", "Orchard.Web\Packages\Orchard.CmsPages\Orchard.CmsPages.csproj", "{1ECC1131-0D0C-4822-AD90-E979868C63F3}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TinyMce", "Orchard.Web\Packages\TinyMce\TinyMce.csproj", "{954CA994-D204-468B-9D69-51F6AD3E1C29}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Orchard.Media", "Orchard.Web\Packages\Orchard.Media\Orchard.Media.csproj", "{D9A7B330-CD22-4DA1-A95A-8DE1982AD8EB}" @@ -67,10 +65,6 @@ Global {F112851D-B023-4746-B6B1-8D2E5AD8F7AA}.Debug|Any CPU.Build.0 = Debug|Any CPU {F112851D-B023-4746-B6B1-8D2E5AD8F7AA}.Release|Any CPU.ActiveCfg = Release|Any CPU {F112851D-B023-4746-B6B1-8D2E5AD8F7AA}.Release|Any CPU.Build.0 = Release|Any CPU - {1ECC1131-0D0C-4822-AD90-E979868C63F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1ECC1131-0D0C-4822-AD90-E979868C63F3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1ECC1131-0D0C-4822-AD90-E979868C63F3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1ECC1131-0D0C-4822-AD90-E979868C63F3}.Release|Any CPU.Build.0 = Release|Any CPU {954CA994-D204-468B-9D69-51F6AD3E1C29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {954CA994-D204-468B-9D69-51F6AD3E1C29}.Debug|Any CPU.Build.0 = Debug|Any CPU {954CA994-D204-468B-9D69-51F6AD3E1C29}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -136,7 +130,6 @@ Global {6CB3EB30-F725-45C0-9742-42599BA8E8D2} = {74E681ED-FECC-4034-B9BD-01B0BB1BDECA} {2FC1D9C8-446D-4414-B252-5E9FBE61EB63} = {74E681ED-FECC-4034-B9BD-01B0BB1BDECA} {ABC826D4-2FA1-4F2F-87DE-E6095F653810} = {74E681ED-FECC-4034-B9BD-01B0BB1BDECA} - {1ECC1131-0D0C-4822-AD90-E979868C63F3} = {E9C9F120-07BA-4DFB-B9C3-3AFB9D44C9D5} {954CA994-D204-468B-9D69-51F6AD3E1C29} = {E9C9F120-07BA-4DFB-B9C3-3AFB9D44C9D5} {D9A7B330-CD22-4DA1-A95A-8DE1982AD8EB} = {E9C9F120-07BA-4DFB-B9C3-3AFB9D44C9D5} {79AED36E-ABD0-4747-93D3-8722B042454B} = {E9C9F120-07BA-4DFB-B9C3-3AFB9D44C9D5}