diff --git a/src/Orchard.Core.Tests/Common/Providers/CommonAspectProviderTests.cs b/src/Orchard.Core.Tests/Common/Providers/CommonPartProviderTests.cs similarity index 83% rename from src/Orchard.Core.Tests/Common/Providers/CommonAspectProviderTests.cs rename to src/Orchard.Core.Tests/Common/Providers/CommonPartProviderTests.cs index 5328b5f1b..fde903ad3 100644 --- a/src/Orchard.Core.Tests/Common/Providers/CommonAspectProviderTests.cs +++ b/src/Orchard.Core.Tests/Common/Providers/CommonPartProviderTests.cs @@ -25,7 +25,7 @@ using System.Web.Mvc; namespace Orchard.Core.Tests.Common.Providers { [TestFixture] - public class CommonAspectProviderTests : DatabaseEnabledTestsBase { + public class CommonPartProviderTests : DatabaseEnabledTestsBase { private Mock _authn; private Mock _authz; private Mock _membership; @@ -35,7 +35,7 @@ namespace Orchard.Core.Tests.Common.Providers { builder.RegisterType().As(); builder.RegisterType().As(); builder.RegisterType().As(); - builder.RegisterType().As(); + builder.RegisterType().As(); builder.RegisterType().As(); builder.RegisterType().As(); builder.RegisterType().As(); @@ -57,8 +57,8 @@ namespace Orchard.Core.Tests.Common.Providers { typeof(ContentTypeRecord), typeof(ContentItemRecord), typeof(ContentItemVersionRecord), - typeof(CommonRecord), - typeof(CommonVersionRecord), + typeof(CommonPartRecord), + typeof(CommonPartVersionRecord), typeof(ScheduledTaskRecord), }; } @@ -67,8 +67,8 @@ namespace Orchard.Core.Tests.Common.Providers { [UsedImplicitly] class TestHandler : ContentHandler { public TestHandler() { - Filters.Add(new ActivatingFilter("test-item")); - Filters.Add(new ActivatingFilter>("test-item")); + Filters.Add(new ActivatingFilter("test-item")); + Filters.Add(new ActivatingFilter>("test-item")); Filters.Add(new ActivatingFilter("User")); } } @@ -82,7 +82,7 @@ namespace Orchard.Core.Tests.Common.Providers { [Test] public void OwnerShouldBeNullAndZeroByDefault() { var contentManager = _container.Resolve(); - var item = contentManager.Create("test-item", init => { }); + var item = contentManager.Create("test-item", init => { }); ClearSession(); Assert.That(item.Owner, Is.Null); @@ -99,7 +99,7 @@ namespace Orchard.Core.Tests.Common.Providers { _authn.Setup(x => x.GetAuthenticatedUser()).Returns(user); var createUtc = _clock.UtcNow; - var item = contentManager.Create("test-item", VersionOptions.Draft, init => { }); + var item = contentManager.Create("test-item", VersionOptions.Draft, init => { }); var viewModel = new OwnerEditorViewModel() { Owner = "User" }; updateModel.Setup(x => x.TryUpdateModel(viewModel, "", null, null)).Returns(true); contentManager.UpdateEditorModel(item.ContentItem, updateModel.Object); @@ -131,7 +131,7 @@ namespace Orchard.Core.Tests.Common.Providers { { var contentManager = _container.Resolve(); - var item = contentManager.Create("test-item", VersionOptions.Draft, init => { }); + var item = contentManager.Create("test-item", VersionOptions.Draft, init => { }); var user = contentManager.New("User"); _authn.Setup(x => x.GetAuthenticatedUser()).Returns(user); @@ -149,7 +149,7 @@ namespace Orchard.Core.Tests.Common.Providers { { var contentManager = _container.Resolve(); - var item = contentManager.Create("test-item", VersionOptions.Draft, init => { }); + var item = contentManager.Create("test-item", VersionOptions.Draft, init => { }); var user = contentManager.New("User"); _authn.Setup(x => x.GetAuthenticatedUser()).Returns(user); @@ -161,7 +161,7 @@ namespace Orchard.Core.Tests.Common.Providers { contentManager.UpdateEditorModel(item.ContentItem, updater); - Assert.That(updater.ModelErrors.ContainsKey("CommonAspect.Owner"), Is.True); + Assert.That(updater.ModelErrors.ContainsKey("CommonPart.Owner"), Is.True); } [Test] @@ -170,7 +170,7 @@ namespace Orchard.Core.Tests.Common.Providers { var contentManager = _container.Resolve(); var createUtc = _clock.UtcNow; - var item = contentManager.Create("test-item", VersionOptions.Draft, init => { }); + var item = contentManager.Create("test-item", VersionOptions.Draft, init => { }); Assert.That(item.CreatedUtc, Is.EqualTo(createUtc)); Assert.That(item.PublishedUtc, Is.Null); @@ -190,7 +190,7 @@ namespace Orchard.Core.Tests.Common.Providers { var contentManager = _container.Resolve(); var createUtc = _clock.UtcNow; - var item1 = contentManager.Create("test-item", VersionOptions.Draft, init => { }); + var item1 = contentManager.Create("test-item", VersionOptions.Draft, init => { }); Assert.That(item1.CreatedUtc, Is.EqualTo(createUtc)); Assert.That(item1.PublishedUtc, Is.Null); @@ -204,7 +204,7 @@ namespace Orchard.Core.Tests.Common.Providers { _clock.Advance(TimeSpan.FromMinutes(1)); var draftUtc = _clock.UtcNow; - var item2 = contentManager.GetDraftRequired(item1.ContentItem.Id); + var item2 = contentManager.GetDraftRequired(item1.ContentItem.Id); _clock.Advance(TimeSpan.FromMinutes(1)); var publish2Utc = _clock.UtcNow; @@ -232,7 +232,7 @@ namespace Orchard.Core.Tests.Common.Providers { var contentManager = _container.Resolve(); var createUtc = _clock.UtcNow; - var item = contentManager.Create("test-item", VersionOptions.Draft, init => { }); + var item = contentManager.Create("test-item", VersionOptions.Draft, init => { }); Assert.That(item.CreatedUtc, Is.EqualTo(createUtc)); Assert.That(item.PublishedUtc, Is.Null); @@ -252,9 +252,9 @@ namespace Orchard.Core.Tests.Common.Providers { _session.Flush(); _session.Clear(); - var publishedItem = contentManager.Get(item.ContentItem.Id, VersionOptions.Published); - var latestItem = contentManager.Get(item.ContentItem.Id, VersionOptions.Latest); - var draftItem = contentManager.Get(item.ContentItem.Id, VersionOptions.Draft); + var publishedItem = contentManager.Get(item.ContentItem.Id, VersionOptions.Published); + var latestItem = contentManager.Get(item.ContentItem.Id, VersionOptions.Latest); + var draftItem = contentManager.Get(item.ContentItem.Id, VersionOptions.Draft); var allVersions = contentManager.GetAllVersions(item.ContentItem.Id); Assert.That(publishedItem, Is.Null); diff --git a/src/Orchard.Core.Tests/Common/Services/RoutableServiceTests.cs b/src/Orchard.Core.Tests/Common/Services/RoutableServiceTests.cs index 991355bcf..67fd4ac54 100644 --- a/src/Orchard.Core.Tests/Common/Services/RoutableServiceTests.cs +++ b/src/Orchard.Core.Tests/Common/Services/RoutableServiceTests.cs @@ -189,8 +189,8 @@ namespace Orchard.Core.Tests.Common.Services { typeof(ContentTypeRecord), typeof(ContentItemRecord), typeof(ContentItemVersionRecord), - typeof(CommonRecord), - typeof(CommonVersionRecord), + typeof(CommonPartRecord), + typeof(CommonPartVersionRecord), }; } } @@ -199,8 +199,8 @@ namespace Orchard.Core.Tests.Common.Services { public class ThingHandler : ContentHandler { public ThingHandler() { Filters.Add(new ActivatingFilter(ThingDriver.ContentType.Name)); - Filters.Add(new ActivatingFilter>(ThingDriver.ContentType.Name)); - Filters.Add(new ActivatingFilter(ThingDriver.ContentType.Name)); + Filters.Add(new ActivatingFilter>(ThingDriver.ContentType.Name)); + Filters.Add(new ActivatingFilter(ThingDriver.ContentType.Name)); Filters.Add(new ActivatingFilter(ThingDriver.ContentType.Name)); } } @@ -230,8 +230,8 @@ namespace Orchard.Core.Tests.Common.Services { public class StuffHandler : ContentHandler { public StuffHandler() { Filters.Add(new ActivatingFilter(StuffDriver.ContentType.Name)); - Filters.Add(new ActivatingFilter>(StuffDriver.ContentType.Name)); - Filters.Add(new ActivatingFilter(StuffDriver.ContentType.Name)); + Filters.Add(new ActivatingFilter>(StuffDriver.ContentType.Name)); + Filters.Add(new ActivatingFilter(StuffDriver.ContentType.Name)); Filters.Add(new ActivatingFilter(StuffDriver.ContentType.Name)); } } diff --git a/src/Orchard.Core.Tests/Feeds/Controllers/FeedControllerTests.cs b/src/Orchard.Core.Tests/Feeds/Controllers/FeedControllerTests.cs index 91fe72ea1..2fa48aee2 100644 --- a/src/Orchard.Core.Tests/Feeds/Controllers/FeedControllerTests.cs +++ b/src/Orchard.Core.Tests/Feeds/Controllers/FeedControllerTests.cs @@ -148,18 +148,18 @@ namespace Orchard.Core.Tests.Feeds.Controllers { public void CorePartValuesAreExtracted() { var clock = new StubClock(); var hello = new ContentItemBuilder(new ContentTypeDefinitionBuilder().Named("hello").Build()) - .Weld() + .Weld() .Weld() - .Weld() + .Weld() .Build(); - hello.As().Record = new CommonRecord(); + hello.As().Record = new CommonPartRecord(); hello.As().Record = new RoutableRecord(); - hello.As().Record = new BodyRecord(); + hello.As().Record = new BodyPartRecord(); - hello.As().PublishedUtc = clock.UtcNow; + hello.As().PublishedUtc = clock.UtcNow; hello.As().Title = "alpha"; hello.As().Slug = "beta"; - hello.As().Text = "gamma"; + hello.As().Text = "gamma"; var query = new StubQuery(new[] { hello, diff --git a/src/Orchard.Core.Tests/Orchard.Core.Tests.csproj b/src/Orchard.Core.Tests/Orchard.Core.Tests.csproj index 747351d8e..7eab2d21c 100644 --- a/src/Orchard.Core.Tests/Orchard.Core.Tests.csproj +++ b/src/Orchard.Core.Tests/Orchard.Core.Tests.csproj @@ -100,7 +100,7 @@ - + diff --git a/src/Orchard.Web/Core/Common/DataMigrations/CommonDataMigration.cs b/src/Orchard.Web/Core/Common/DataMigrations/CommonDataMigration.cs index a341f52b4..485c3d57a 100644 --- a/src/Orchard.Web/Core/Common/DataMigrations/CommonDataMigration.cs +++ b/src/Orchard.Web/Core/Common/DataMigrations/CommonDataMigration.cs @@ -9,15 +9,15 @@ using Orchard.Data.Migration; namespace Orchard.Core.Common.DataMigrations { public class CommonDataMigration : DataMigrationImpl { public int Create() { - //CREATE TABLE Common_BodyRecord (Id INTEGER not null, Text TEXT, Format TEXT, ContentItemRecord_id INTEGER, primary key (Id)); - SchemaBuilder.CreateTable("BodyRecord", table => table + //CREATE TABLE Common_BodyPartRecord (Id INTEGER not null, Text TEXT, Format TEXT, ContentItemRecord_id INTEGER, primary key (Id)); + SchemaBuilder.CreateTable("BodyPartRecord", table => table .ContentPartVersionRecord() .Column("Text", column => column.Unlimited()) .Column("Format") ); - //CREATE TABLE Common_CommonRecord (Id INTEGER not null, OwnerId INTEGER, CreatedUtc DATETIME, PublishedUtc DATETIME, ModifiedUtc DATETIME, Container_id INTEGER, primary key (Id)); - SchemaBuilder.CreateTable("CommonRecord", table => table + //CREATE TABLE Common_CommonPartRecord (Id INTEGER not null, OwnerId INTEGER, CreatedUtc DATETIME, PublishedUtc DATETIME, ModifiedUtc DATETIME, Container_id INTEGER, primary key (Id)); + SchemaBuilder.CreateTable("CommonPartRecord", table => table .ContentPartRecord() .Column("OwnerId") .Column("CreatedUtc") @@ -26,8 +26,8 @@ namespace Orchard.Core.Common.DataMigrations { .Column("Container_id") ); - //CREATE TABLE Common_CommonVersionRecord (Id INTEGER not null, CreatedUtc DATETIME, PublishedUtc DATETIME, ModifiedUtc DATETIME, ContentItemRecord_id INTEGER, primary key (Id)); - SchemaBuilder.CreateTable("CommonVersionRecord", table => table + //CREATE TABLE Common_CommonPartVersionRecord (Id INTEGER not null, CreatedUtc DATETIME, PublishedUtc DATETIME, ModifiedUtc DATETIME, ContentItemRecord_id INTEGER, primary key (Id)); + SchemaBuilder.CreateTable("CommonPartVersionRecord", table => table .ContentPartVersionRecord() .Column("CreatedUtc") .Column("PublishedUtc") @@ -38,7 +38,7 @@ namespace Orchard.Core.Common.DataMigrations { } public int UpdateFrom1() { - ContentDefinitionManager.AlterPartDefinition(typeof(BodyAspect).Name, cfg => cfg + ContentDefinitionManager.AlterPartDefinition(typeof(BodyPart).Name, cfg => cfg .WithLocation(new Dictionary { {"Default", new ContentLocation { Zone = "primary", Position = "5" }}, })); @@ -46,7 +46,7 @@ namespace Orchard.Core.Common.DataMigrations { } public int UpdateFrom2() { - ContentDefinitionManager.AlterPartDefinition(typeof(CommonAspect).Name, cfg => cfg + ContentDefinitionManager.AlterPartDefinition(typeof(CommonPart).Name, cfg => cfg .WithLocation(new Dictionary { {"Default", new ContentLocation { Zone = "metadata", Position = "5" }}, {"Editor", new ContentLocation { Zone = "primary", Position = "20" }}, diff --git a/src/Orchard.Web/Core/Common/Drivers/BodyDriver.cs b/src/Orchard.Web/Core/Common/Drivers/BodyPartDriver.cs similarity index 87% rename from src/Orchard.Web/Core/Common/Drivers/BodyDriver.cs rename to src/Orchard.Web/Core/Common/Drivers/BodyPartDriver.cs index d9a3d8ef8..d4dd21cb2 100644 --- a/src/Orchard.Web/Core/Common/Drivers/BodyDriver.cs +++ b/src/Orchard.Web/Core/Common/Drivers/BodyPartDriver.cs @@ -11,13 +11,13 @@ using Orchard.Core.Routable.Models; namespace Orchard.Core.Common.Drivers { [UsedImplicitly] - public class BodyDriver : ContentPartDriver { + public class BodyPartDriver : ContentPartDriver { public IOrchardServices Services { get; set; } private const string TemplateName = "Parts/Common.Body"; private const string DefaultTextEditorTemplate = "TinyMceTextEditor"; private const string PlainTextEditorTemplate = "PlainTextEditor"; - public BodyDriver(IOrchardServices services) { + public BodyPartDriver(IOrchardServices services) { Services = services; } @@ -26,8 +26,8 @@ namespace Orchard.Core.Common.Drivers { } // \/\/ Hackalicious on many accounts - don't copy what has been done here for the wrapper \/\/ - protected override DriverResult Display(BodyAspect part, string displayType) { - var model = new BodyDisplayViewModel { BodyAspect = part, Text = BbcodeReplace(part.Text) }; + protected override DriverResult Display(BodyPart part, string displayType) { + var model = new BodyDisplayViewModel { BodyPart = part, Text = BbcodeReplace(part.Text) }; var location = part.GetLocation(displayType); return Combined( @@ -37,13 +37,13 @@ namespace Orchard.Core.Common.Drivers { Services.Authorizer.Authorize(Permissions.ChangeOwner) ? ContentPartTemplate(model, "Parts/Common.Body.ManageWrapperPost").LongestMatch(displayType, "SummaryAdmin").Location(location) : null); } - protected override DriverResult Editor(BodyAspect part) { + protected override DriverResult Editor(BodyPart part) { var model = BuildEditorViewModel(part); var location = part.GetLocation("Editor"); return ContentPartTemplate(model, TemplateName, Prefix).Location(location); } - protected override DriverResult Editor(BodyAspect part, IUpdateModel updater) { + protected override DriverResult Editor(BodyPart part, IUpdateModel updater) { var model = BuildEditorViewModel(part); updater.TryUpdateModel(model, Prefix, null, null); @@ -55,15 +55,15 @@ namespace Orchard.Core.Common.Drivers { return ContentPartTemplate(model, TemplateName, Prefix).Location(location); } - private static BodyEditorViewModel BuildEditorViewModel(BodyAspect part) { + private static BodyEditorViewModel BuildEditorViewModel(BodyPart part) { return new BodyEditorViewModel { - BodyAspect = part, + BodyPart = part, TextEditorTemplate = GetFlavor(part) == "html" ? DefaultTextEditorTemplate : PlainTextEditorTemplate, AddMediaPath= new PathBuilder(part).AddContentType().AddContainerSlug().AddSlug().ToString() }; } - private static string GetFlavor(BodyAspect part) { + private static string GetFlavor(BodyPart part) { var typePartSettings = part.Settings.GetModel(); return (typePartSettings != null && !string.IsNullOrWhiteSpace(typePartSettings.Flavor)) ? typePartSettings.Flavor @@ -89,7 +89,7 @@ namespace Orchard.Core.Common.Drivers { } public PathBuilder AddContainerSlug() { - var common = _content.As(); + var common = _content.As(); if (common == null) return this; diff --git a/src/Orchard.Web/Core/Common/Drivers/CommonDriver.cs b/src/Orchard.Web/Core/Common/Drivers/CommonPartDriver.cs similarity index 82% rename from src/Orchard.Web/Core/Common/Drivers/CommonDriver.cs rename to src/Orchard.Web/Core/Common/Drivers/CommonPartDriver.cs index eb47b832a..97f46197b 100644 --- a/src/Orchard.Web/Core/Common/Drivers/CommonDriver.cs +++ b/src/Orchard.Web/Core/Common/Drivers/CommonPartDriver.cs @@ -8,15 +8,15 @@ using Orchard.Security; using Orchard.Services; namespace Orchard.Core.Common.Drivers { - public class CommonDriver : ContentPartDriver { - private const string TemplatePrefix = "CommonAspect"; + public class CommonPartDriver : ContentPartDriver { + private const string TemplatePrefix = "CommonPart"; private readonly IContentManager _contentManager; private readonly IAuthenticationService _authenticationService; private readonly IAuthorizationService _authorizationService; private readonly IMembershipService _membershipService; private readonly IClock _clock; - public CommonDriver( + public CommonPartDriver( IOrchardServices services, IContentManager contentManager, IAuthenticationService authenticationService, @@ -35,19 +35,19 @@ namespace Orchard.Core.Common.Drivers { public Localizer T { get; set; } public IOrchardServices Services { get; set; } - protected override DriverResult Display(CommonAspect part, string displayType) { + protected override DriverResult Display(CommonPart part, string displayType) { return ContentPartTemplate(new CommonMetadataViewModel(part), "Parts/Common.Metadata") .LongestMatch(displayType, "Summary", "SummaryAdmin") .Location(part.GetLocation(displayType)); } - protected override DriverResult Editor(CommonAspect part) { + protected override DriverResult Editor(CommonPart part) { return Combined( OwnerEditor(part, null), ContainerEditor(part, null)); } - protected override DriverResult Editor(CommonAspect instance, ContentManagement.IUpdateModel updater) { + protected override DriverResult Editor(CommonPart instance, ContentManagement.IUpdateModel updater) { // this event is hooked so the modified timestamp is changed when an edit-post occurs. instance.ModifiedUtc = _clock.UtcNow; instance.VersionModifiedUtc = _clock.UtcNow; @@ -57,7 +57,7 @@ namespace Orchard.Core.Common.Drivers { ContainerEditor(instance, updater)); } - DriverResult OwnerEditor(CommonAspect part, IUpdateModel updater) { + DriverResult OwnerEditor(CommonPart part, IUpdateModel updater) { var currentUser = _authenticationService.GetAuthenticatedUser(); if (!_authorizationService.TryCheckAccess(Permissions.ChangeOwner, currentUser, part)) { return null; @@ -74,7 +74,7 @@ namespace Orchard.Core.Common.Drivers { if (model.Owner != null && model.Owner != priorOwner) { var newOwner = _membershipService.GetUser(model.Owner); if (newOwner == null) { - updater.AddModelError("CommonAspect.Owner", T("Invalid user name")); + updater.AddModelError("CommonPart.Owner", T("Invalid user name")); } else { part.Owner = newOwner; @@ -85,7 +85,7 @@ namespace Orchard.Core.Common.Drivers { return ContentPartTemplate(model, "Parts/Common.Owner", TemplatePrefix).Location(part.GetLocation("Editor")); } - DriverResult ContainerEditor(CommonAspect part, IUpdateModel updater) { + DriverResult ContainerEditor(CommonPart part, IUpdateModel updater) { var currentUser = _authenticationService.GetAuthenticatedUser(); if (!_authorizationService.TryCheckAccess(Permissions.ChangeOwner, currentUser, part)) { return null; @@ -102,7 +102,7 @@ namespace Orchard.Core.Common.Drivers { if (model.ContainerId != null && model.ContainerId != priorContainerId) { var newContainer = _contentManager.Get((int)model.ContainerId, VersionOptions.Latest); if (newContainer == null) { - updater.AddModelError("CommonAspect.ContainerId", T("Invalid container")); + updater.AddModelError("CommonPart.ContainerId", T("Invalid container")); } else { part.Container = newContainer; diff --git a/src/Orchard.Web/Core/Common/Handlers/BodyAspectHandler.cs b/src/Orchard.Web/Core/Common/Handlers/BodyPartHandler.cs similarity index 53% rename from src/Orchard.Web/Core/Common/Handlers/BodyAspectHandler.cs rename to src/Orchard.Web/Core/Common/Handlers/BodyPartHandler.cs index 6fd4265a9..2d8666e06 100644 --- a/src/Orchard.Web/Core/Common/Handlers/BodyAspectHandler.cs +++ b/src/Orchard.Web/Core/Common/Handlers/BodyPartHandler.cs @@ -5,13 +5,13 @@ using Orchard.ContentManagement.Handlers; namespace Orchard.Core.Common.Handlers { [UsedImplicitly] - public class BodyAspectHandler : ContentHandler { - public BodyAspectHandler(IRepository bodyRepository) { + public class BodyPartHandler : ContentHandler { + public BodyPartHandler(IRepository bodyRepository) { Filters.Add(StorageFilter.For(bodyRepository)); - OnIndexing((context, bodyAspect) => context.DocumentIndex - .Add("body", bodyAspect.Record.Text).RemoveTags().Analyze() - .Add("format", bodyAspect.Record.Format).Store()); + OnIndexing((context, bodyPart) => context.DocumentIndex + .Add("body", bodyPart.Record.Text).RemoveTags().Analyze() + .Add("format", bodyPart.Record.Format).Store()); } } } \ No newline at end of file diff --git a/src/Orchard.Web/Core/Common/Handlers/CommonAspectHandler.cs b/src/Orchard.Web/Core/Common/Handlers/CommonPartHandler.cs similarity index 63% rename from src/Orchard.Web/Core/Common/Handlers/CommonAspectHandler.cs rename to src/Orchard.Web/Core/Common/Handlers/CommonPartHandler.cs index 83fcb41a8..8cd21908e 100644 --- a/src/Orchard.Web/Core/Common/Handlers/CommonAspectHandler.cs +++ b/src/Orchard.Web/Core/Common/Handlers/CommonPartHandler.cs @@ -9,14 +9,14 @@ using Orchard.Services; namespace Orchard.Core.Common.Handlers { [UsedImplicitly] - public class CommonAspectHandler : ContentHandler { + public class CommonPartHandler : ContentHandler { private readonly IClock _clock; private readonly IAuthenticationService _authenticationService; private readonly IContentManager _contentManager; - public CommonAspectHandler( - IRepository commonRepository, - IRepository commonVersionRepository, + public CommonPartHandler( + IRepository commonRepository, + IRepository commonVersionRepository, IClock clock, IAuthenticationService authenticationService, IContentManager contentManager) { @@ -29,56 +29,56 @@ namespace Orchard.Core.Common.Handlers { Filters.Add(StorageFilter.For(commonRepository)); Filters.Add(StorageFilter.For(commonVersionRepository)); - OnInitializing(PropertySetHandlers); - OnInitializing(AssignCreatingOwner); - OnInitializing>(AssignCreatingDates); - OnInitializing>(AssignCreatingDates); + OnInitializing(PropertySetHandlers); + OnInitializing(AssignCreatingOwner); + OnInitializing>(AssignCreatingDates); + OnInitializing>(AssignCreatingDates); - OnLoaded(LazyLoadHandlers); + OnLoaded(LazyLoadHandlers); - OnVersioning(CopyOwnerAndContainer); + OnVersioning(CopyOwnerAndContainer); - OnVersioned>(AssignVersioningDates); + OnVersioned>(AssignVersioningDates); - OnPublishing>(AssignPublishingDates); - OnPublishing>(AssignPublishingDates); + OnPublishing>(AssignPublishingDates); + OnPublishing>(AssignPublishingDates); - //OnGetDisplayViewModel(); - //OnGetEditorViewModel(GetEditor); - //OnUpdateEditorViewModel(UpdateEditor); + //OnGetDisplayViewModel(); + //OnGetEditorViewModel(GetEditor); + //OnUpdateEditorViewModel(UpdateEditor); - OnIndexing((context, commonAspect) => context.DocumentIndex - .Add("type", commonAspect.ContentItem.ContentType).Store() - .Add("author", commonAspect.Owner.UserName).Store() - .Add("created", commonAspect.CreatedUtc ?? _clock.UtcNow).Store() - .Add("published", commonAspect.PublishedUtc ?? _clock.UtcNow).Store() - .Add("modified", commonAspect.ModifiedUtc ?? _clock.UtcNow).Store() + OnIndexing((context, commonPart) => context.DocumentIndex + .Add("type", commonPart.ContentItem.ContentType).Store() + .Add("author", commonPart.Owner.UserName).Store() + .Add("created", commonPart.CreatedUtc ?? _clock.UtcNow).Store() + .Add("published", commonPart.PublishedUtc ?? _clock.UtcNow).Store() + .Add("modified", commonPart.ModifiedUtc ?? _clock.UtcNow).Store() ); } public Localizer T { get; set; } - void AssignCreatingOwner(InitializingContentContext context, CommonAspect part) { + void AssignCreatingOwner(InitializingContentContext context, CommonPart part) { // and use the current user as Owner if (part.Record.OwnerId == 0) { part.Owner = _authenticationService.GetAuthenticatedUser(); } } - void AssignCreatingDates(InitializingContentContext context, ContentPart part) { + void AssignCreatingDates(InitializingContentContext context, ContentPart part) { // assign default create/modified dates part.Record.CreatedUtc = _clock.UtcNow; part.Record.ModifiedUtc = _clock.UtcNow; } - void AssignCreatingDates(InitializingContentContext context, ContentPart part) { + void AssignCreatingDates(InitializingContentContext context, ContentPart part) { // assign default create/modified dates part.Record.CreatedUtc = _clock.UtcNow; part.Record.ModifiedUtc = _clock.UtcNow; } - void AssignVersioningDates(VersionContentContext context, ContentPart existing, ContentPart building) { + void AssignVersioningDates(VersionContentContext context, ContentPart existing, ContentPart building) { // assign create/modified dates for the new version building.Record.CreatedUtc = _clock.UtcNow; building.Record.ModifiedUtc = _clock.UtcNow; @@ -87,7 +87,7 @@ namespace Orchard.Core.Common.Handlers { building.Record.PublishedUtc = null; } - void AssignPublishingDates(PublishContentContext context, ContentPart part) { + void AssignPublishingDates(PublishContentContext context, ContentPart part) { // don't assign dates when unpublishing if (context.PublishingItemVersionRecord == null) return; @@ -96,7 +96,7 @@ namespace Orchard.Core.Common.Handlers { part.Record.PublishedUtc = _clock.UtcNow; } - void AssignPublishingDates(PublishContentContext context, ContentPart part) { + void AssignPublishingDates(PublishContentContext context, ContentPart part) { // don't assign dates when unpublishing if (context.PublishingItemVersionRecord == null) return; @@ -105,51 +105,51 @@ namespace Orchard.Core.Common.Handlers { part.Record.PublishedUtc = _clock.UtcNow; } - private static void CopyOwnerAndContainer(VersionContentContext c, CommonAspect c1, CommonAspect c2) { + private static void CopyOwnerAndContainer(VersionContentContext c, CommonPart c1, CommonPart c2) { c2.Owner = c1.Owner; c2.Container = c1.Container; } - void LazyLoadHandlers(LoadContentContext context, CommonAspect aspect) { + void LazyLoadHandlers(LoadContentContext context, CommonPart part) { // add handlers that will load content for id's just-in-time - aspect.OwnerField.Loader(() => _contentManager.Get(aspect.Record.OwnerId)); - aspect.ContainerField.Loader(() => aspect.Record.Container == null ? null : _contentManager.Get(aspect.Record.Container.Id)); + part.OwnerField.Loader(() => _contentManager.Get(part.Record.OwnerId)); + part.ContainerField.Loader(() => part.Record.Container == null ? null : _contentManager.Get(part.Record.Container.Id)); } - static void PropertySetHandlers(InitializingContentContext context, CommonAspect aspect) { - // add handlers that will update records when aspect properties are set + static void PropertySetHandlers(InitializingContentContext context, CommonPart part) { + // add handlers that will update records when part properties are set - aspect.OwnerField.Setter(user => { + part.OwnerField.Setter(user => { if (user == null) { - aspect.Record.OwnerId = 0; + part.Record.OwnerId = 0; } else { - aspect.Record.OwnerId = user.ContentItem.Id; + part.Record.OwnerId = user.ContentItem.Id; } return user; }); // Force call to setter if we had already set a value - if (aspect.OwnerField.Value != null) - aspect.OwnerField.Value = aspect.OwnerField.Value; + if (part.OwnerField.Value != null) + part.OwnerField.Value = part.OwnerField.Value; - aspect.ContainerField.Setter(container => { + part.ContainerField.Setter(container => { if (container == null) { - aspect.Record.Container = null; + part.Record.Container = null; } else { - aspect.Record.Container = container.ContentItem.Record; + part.Record.Container = container.ContentItem.Record; } return container; }); // Force call to setter if we had already set a value - if (aspect.ContainerField.Value != null) - aspect.ContainerField.Value = aspect.ContainerField.Value; + if (part.ContainerField.Value != null) + part.ContainerField.Value = part.ContainerField.Value; } - //private void GetEditor(BuildEditorModelContext context, CommonAspect instance) { + //private void GetEditor(BuildEditorModelContext context, CommonPart instance) { // var currentUser = _authenticationService.GetAuthenticatedUser(); // if (!_authorizationService.TryCheckAccess(Permissions.ChangeOwner, currentUser, instance)) { // return; @@ -158,11 +158,11 @@ namespace Orchard.Core.Common.Handlers { // if (instance.Owner != null) // viewModel.Owner = instance.Owner.UserName; - // context.AddEditor(new TemplateViewModel(viewModel, "CommonAspect") { TemplateName = "Parts/Common.Owner", ZoneName = "primary", Position = "999" }); + // context.AddEditor(new TemplateViewModel(viewModel, "CommonPart") { TemplateName = "Parts/Common.Owner", ZoneName = "primary", Position = "999" }); //} - //private void UpdateEditor(UpdateEditorModelContext context, CommonAspect instance) { + //private void UpdateEditor(UpdateEditorModelContext context, CommonPart instance) { // // this event is hooked so the modified timestamp is changed when an edit-post occurs. // // kind of a loose rule of thumb. may not be sufficient // instance.ModifiedUtc = _clock.UtcNow; @@ -178,19 +178,19 @@ namespace Orchard.Core.Common.Handlers { // viewModel.Owner = instance.Owner.UserName; // var priorOwner = viewModel.Owner; - // context.Updater.TryUpdateModel(viewModel, "CommonAspect", null, null); + // context.Updater.TryUpdateModel(viewModel, "CommonPart", null, null); // if (viewModel.Owner != null && viewModel.Owner != priorOwner) { // var newOwner = _membershipService.GetUser(viewModel.Owner); // if (newOwner == null) { - // context.Updater.AddModelError("CommonAspect.Owner", T("Invalid user name")); + // context.Updater.AddModelError("CommonPart.Owner", T("Invalid user name")); // } // else { // instance.Owner = newOwner; // } // } - // context.AddEditor(new TemplateViewModel(viewModel, "CommonAspect") { TemplateName = "Parts/Common.Owner", ZoneName = "primary", Position = "999" }); + // context.AddEditor(new TemplateViewModel(viewModel, "CommonPart") { TemplateName = "Parts/Common.Owner", ZoneName = "primary", Position = "999" }); //} } } \ No newline at end of file diff --git a/src/Orchard.Web/Core/Common/Models/BodyAspect.cs b/src/Orchard.Web/Core/Common/Models/BodyPart.cs similarity index 74% rename from src/Orchard.Web/Core/Common/Models/BodyAspect.cs rename to src/Orchard.Web/Core/Common/Models/BodyPart.cs index 8f1512978..5a3501fbb 100644 --- a/src/Orchard.Web/Core/Common/Models/BodyAspect.cs +++ b/src/Orchard.Web/Core/Common/Models/BodyPart.cs @@ -1,7 +1,7 @@ using Orchard.ContentManagement; namespace Orchard.Core.Common.Models { - public class BodyAspect : ContentPart { + public class BodyPart : ContentPart { public string Text { get { return Record.Text; } set { Record.Text = value; } diff --git a/src/Orchard.Web/Core/Common/Models/BodyRecord.cs b/src/Orchard.Web/Core/Common/Models/BodyPartRecord.cs similarity index 77% rename from src/Orchard.Web/Core/Common/Models/BodyRecord.cs rename to src/Orchard.Web/Core/Common/Models/BodyPartRecord.cs index cbf7b173c..c71fc37be 100644 --- a/src/Orchard.Web/Core/Common/Models/BodyRecord.cs +++ b/src/Orchard.Web/Core/Common/Models/BodyPartRecord.cs @@ -2,7 +2,7 @@ using Orchard.ContentManagement.Records; using Orchard.Data.Conventions; namespace Orchard.Core.Common.Models { - public class BodyRecord : ContentPartVersionRecord { + public class BodyPartRecord : ContentPartVersionRecord { [StringLengthMax] public virtual string Text { get; set; } diff --git a/src/Orchard.Web/Core/Common/Models/CommonAspect.cs b/src/Orchard.Web/Core/Common/Models/CommonPart.cs similarity index 65% rename from src/Orchard.Web/Core/Common/Models/CommonAspect.cs rename to src/Orchard.Web/Core/Common/Models/CommonPart.cs index d8468c348..c452fa3f3 100644 --- a/src/Orchard.Web/Core/Common/Models/CommonAspect.cs +++ b/src/Orchard.Web/Core/Common/Models/CommonPart.cs @@ -5,7 +5,7 @@ using Orchard.ContentManagement.Aspects; using Orchard.Security; namespace Orchard.Core.Common.Models { - public class CommonAspect : ContentPart, ICommonAspect { + public class CommonPart : ContentPart, ICommonPart { private readonly LazyField _owner = new LazyField(); private readonly LazyField _container = new LazyField(); @@ -38,42 +38,42 @@ namespace Orchard.Core.Common.Models { set { Record.ModifiedUtc = value; } } - CommonVersionRecord VersionRecord { + CommonPartVersionRecord PartVersionRecord { get { - var versionPart = this.As>(); + var versionPart = this.As>(); return versionPart == null ? null : versionPart.Record; } } public DateTime? VersionCreatedUtc { get { - return VersionRecord == null ? CreatedUtc : VersionRecord.CreatedUtc; + return PartVersionRecord == null ? CreatedUtc : PartVersionRecord.CreatedUtc; } set { - if (VersionRecord != null) { - VersionRecord.CreatedUtc = value; + if (PartVersionRecord != null) { + PartVersionRecord.CreatedUtc = value; } } } public DateTime? VersionPublishedUtc { get { - return VersionRecord == null ? PublishedUtc : VersionRecord.PublishedUtc; + return PartVersionRecord == null ? PublishedUtc : PartVersionRecord.PublishedUtc; } set { - if (VersionRecord != null) { - VersionRecord.PublishedUtc = value; + if (PartVersionRecord != null) { + PartVersionRecord.PublishedUtc = value; } } } public DateTime? VersionModifiedUtc { get { - return VersionRecord == null ? ModifiedUtc : VersionRecord.ModifiedUtc; + return PartVersionRecord == null ? ModifiedUtc : PartVersionRecord.ModifiedUtc; } set { - if (VersionRecord != null) { - VersionRecord.ModifiedUtc = value; + if (PartVersionRecord != null) { + PartVersionRecord.ModifiedUtc = value; } } } diff --git a/src/Orchard.Web/Core/Common/Models/CommonRecord.cs b/src/Orchard.Web/Core/Common/Models/CommonPartRecord.cs similarity index 85% rename from src/Orchard.Web/Core/Common/Models/CommonRecord.cs rename to src/Orchard.Web/Core/Common/Models/CommonPartRecord.cs index e352f549a..3d02b6c40 100644 --- a/src/Orchard.Web/Core/Common/Models/CommonRecord.cs +++ b/src/Orchard.Web/Core/Common/Models/CommonPartRecord.cs @@ -2,7 +2,7 @@ using Orchard.ContentManagement.Records; namespace Orchard.Core.Common.Models { - public class CommonRecord : ContentPartRecord { + public class CommonPartRecord : ContentPartRecord { public virtual int OwnerId { get; set; } public virtual ContentItemRecord Container { get; set; } public virtual DateTime? CreatedUtc { get; set; } diff --git a/src/Orchard.Web/Core/Common/Models/CommonVersionRecord.cs b/src/Orchard.Web/Core/Common/Models/CommonPartVersionRecord.cs similarity index 77% rename from src/Orchard.Web/Core/Common/Models/CommonVersionRecord.cs rename to src/Orchard.Web/Core/Common/Models/CommonPartVersionRecord.cs index 4e3a04b28..379392948 100644 --- a/src/Orchard.Web/Core/Common/Models/CommonVersionRecord.cs +++ b/src/Orchard.Web/Core/Common/Models/CommonPartVersionRecord.cs @@ -2,7 +2,7 @@ using System; using Orchard.ContentManagement.Records; namespace Orchard.Core.Common.Models { - public class CommonVersionRecord : ContentPartVersionRecord { + public class CommonPartVersionRecord : ContentPartVersionRecord { public virtual DateTime? CreatedUtc { get; set; } public virtual DateTime? PublishedUtc { get; set; } public virtual DateTime? ModifiedUtc { get; set; } diff --git a/src/Orchard.Web/Core/Common/Settings/BodySettings.cs b/src/Orchard.Web/Core/Common/Settings/BodySettings.cs index dd79f0aba..156779570 100644 --- a/src/Orchard.Web/Core/Common/Settings/BodySettings.cs +++ b/src/Orchard.Web/Core/Common/Settings/BodySettings.cs @@ -23,7 +23,7 @@ namespace Orchard.Core.Common.Settings { public class BodySettingsHooks : ContentDefinitionEditorEventsBase { public override IEnumerable TypePartEditor(ContentTypePartDefinition definition) { - if (definition.PartDefinition.Name != "BodyAspect") + if (definition.PartDefinition.Name != "BodyPart") yield break; var model = definition.Settings.GetModel(); @@ -37,7 +37,7 @@ namespace Orchard.Core.Common.Settings { } public override IEnumerable PartEditor(ContentPartDefinition definition) { - if (definition.Name != "BodyAspect") + if (definition.Name != "BodyPart") yield break; var model = definition.Settings.GetModel(); @@ -45,7 +45,7 @@ namespace Orchard.Core.Common.Settings { } public override IEnumerable TypePartEditorUpdate(ContentTypePartDefinitionBuilder builder, IUpdateModel updateModel) { - if (builder.Name != "BodyAspect") + if (builder.Name != "BodyPart") yield break; var model = new BodyTypePartSettings(); @@ -55,7 +55,7 @@ namespace Orchard.Core.Common.Settings { } public override IEnumerable PartEditorUpdate(ContentPartDefinitionBuilder builder, IUpdateModel updateModel) { - if (builder.Name != "BodyAspect") + if (builder.Name != "BodyPart") yield break; var model = new BodyPartSettings(); diff --git a/src/Orchard.Web/Core/Common/ViewModels/BodyDisplayViewModel.cs b/src/Orchard.Web/Core/Common/ViewModels/BodyDisplayViewModel.cs index e9c01fad0..8617f2fd7 100644 --- a/src/Orchard.Web/Core/Common/ViewModels/BodyDisplayViewModel.cs +++ b/src/Orchard.Web/Core/Common/ViewModels/BodyDisplayViewModel.cs @@ -2,7 +2,7 @@ namespace Orchard.Core.Common.ViewModels { public class BodyDisplayViewModel { - public BodyAspect BodyAspect { get; set; } + public BodyPart BodyPart { get; set; } public string Text { get; set; } } } \ No newline at end of file diff --git a/src/Orchard.Web/Core/Common/ViewModels/BodyEditorViewModel.cs b/src/Orchard.Web/Core/Common/ViewModels/BodyEditorViewModel.cs index c1e723a1e..8d85e80db 100644 --- a/src/Orchard.Web/Core/Common/ViewModels/BodyEditorViewModel.cs +++ b/src/Orchard.Web/Core/Common/ViewModels/BodyEditorViewModel.cs @@ -2,16 +2,16 @@ namespace Orchard.Core.Common.ViewModels { public class BodyEditorViewModel { - public BodyAspect BodyAspect { get; set; } + public BodyPart BodyPart { get; set; } public string Text { - get { return BodyAspect.Record.Text; } - set { BodyAspect.Record.Text = value; } + get { return BodyPart.Record.Text; } + set { BodyPart.Record.Text = value; } } public string Format { - get { return BodyAspect.Record.Format; } - set { BodyAspect.Record.Format = value; } + get { return BodyPart.Record.Format; } + set { BodyPart.Record.Format = value; } } public string TextEditorTemplate { get; set; } diff --git a/src/Orchard.Web/Core/Common/ViewModels/CommonMetadataViewModel.cs b/src/Orchard.Web/Core/Common/ViewModels/CommonMetadataViewModel.cs index e4c1c806a..9af444559 100644 --- a/src/Orchard.Web/Core/Common/ViewModels/CommonMetadataViewModel.cs +++ b/src/Orchard.Web/Core/Common/ViewModels/CommonMetadataViewModel.cs @@ -4,20 +4,20 @@ using Orchard.Security; namespace Orchard.Core.Common.ViewModels { public class CommonMetadataViewModel { - private readonly CommonAspect _commonAspect; + private readonly CommonPart _commonPart; - public CommonMetadataViewModel(CommonAspect commonAspect) { - _commonAspect = commonAspect; + public CommonMetadataViewModel(CommonPart commonPart) { + _commonPart = commonPart; } - public IUser Creator { get { return _commonAspect.Owner; } } + public IUser Creator { get { return _commonPart.Owner; } } - public DateTime? CreatedUtc { get { return _commonAspect.CreatedUtc; } } - public DateTime? PublishedUtc { get { return _commonAspect.PublishedUtc; } } - public DateTime? ModifiedUtc { get { return _commonAspect.ModifiedUtc; } } + public DateTime? CreatedUtc { get { return _commonPart.CreatedUtc; } } + public DateTime? PublishedUtc { get { return _commonPart.PublishedUtc; } } + public DateTime? ModifiedUtc { get { return _commonPart.ModifiedUtc; } } - public DateTime? VersionCreatedUtc { get { return _commonAspect.VersionCreatedUtc; } } - public DateTime? VersionPublishedUtc { get { return _commonAspect.VersionPublishedUtc; } } - public DateTime? VersionModifiedUtc { get { return _commonAspect.VersionModifiedUtc; } } + public DateTime? VersionCreatedUtc { get { return _commonPart.VersionCreatedUtc; } } + public DateTime? VersionPublishedUtc { get { return _commonPart.VersionPublishedUtc; } } + public DateTime? VersionModifiedUtc { get { return _commonPart.VersionModifiedUtc; } } } } \ No newline at end of file diff --git a/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Body.Manage.ascx b/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Body.Manage.ascx index 71cf574c5..cba9ea231 100644 --- a/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Body.Manage.ascx +++ b/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Body.Manage.ascx @@ -1,5 +1,5 @@ <%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %> <%@ Import Namespace="Orchard.Core.Common.ViewModels"%>
- <%: Html.ItemEditLinkWithReturnUrl(T("Edit").ToString(), Model.BodyAspect.ContentItem) %> + <%: Html.ItemEditLinkWithReturnUrl(T("Edit").ToString(), Model.BodyPart.ContentItem) %>
\ No newline at end of file diff --git a/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Body.Summary.ascx b/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Body.Summary.ascx index a1b1280ae..b122c54e3 100644 --- a/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Body.Summary.ascx +++ b/src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Body.Summary.ascx @@ -6,4 +6,4 @@ <%: new HtmlString(string.Format( "

{0} {1}

", Html.Excerpt(Model.Text, 200).ToString().Replace(Environment.NewLine, "

" + Environment.NewLine + "

"), - Html.ItemDisplayLink(T("[more]").ToString(), Model.BodyAspect.ContentItem))) %> \ No newline at end of file + Html.ItemDisplayLink(T("[more]").ToString(), Model.BodyPart.ContentItem))) %> \ No newline at end of file diff --git a/src/Orchard.Web/Core/Contents/Controllers/AdminController.cs b/src/Orchard.Web/Core/Contents/Controllers/AdminController.cs index 980b3e71a..c7aef33ee 100644 --- a/src/Orchard.Web/Core/Contents/Controllers/AdminController.cs +++ b/src/Orchard.Web/Core/Contents/Controllers/AdminController.cs @@ -64,19 +64,19 @@ namespace Orchard.Core.Contents.Controllers { } if (model.ContainerId != null) - query = query.Join().Where(cr => cr.Container.Id == model.ContainerId); + query = query.Join().Where(cr => cr.Container.Id == model.ContainerId); // Ordering //-- want something like //switch (model.Options.OrderBy) { // case ContentsOrder.Modified: - // query = query.OrderByDescending(cr => cr.ModifiedUtc); + // query = query.OrderByDescending(cr => cr.ModifiedUtc); // break; // case ContentsOrder.Published: - // query = query.OrderByDescending(cr => cr.PublishedUtc); + // query = query.OrderByDescending(cr => cr.PublishedUtc); // break; // case ContentsOrder.Created: - // query = query.OrderByDescending(cr => cr.CreatedUtc); + // query = query.OrderByDescending(cr => cr.CreatedUtc); // break; //} diff --git a/src/Orchard.Web/Core/Feeds/StandardBuilders/ItemInspector.cs b/src/Orchard.Web/Core/Feeds/StandardBuilders/ItemInspector.cs index 2d8c0c49c..4f24fb55f 100644 --- a/src/Orchard.Web/Core/Feeds/StandardBuilders/ItemInspector.cs +++ b/src/Orchard.Web/Core/Feeds/StandardBuilders/ItemInspector.cs @@ -9,16 +9,16 @@ namespace Orchard.Core.Feeds.StandardBuilders { public class ItemInspector { private readonly IContent _item; private readonly ContentItemMetadata _metadata; - private readonly ICommonAspect _common; + private readonly ICommonPart _common; private readonly IsRoutable _routable; - private readonly BodyAspect _body; + private readonly BodyPart _body; public ItemInspector(IContent item, ContentItemMetadata metadata) { _item = item; _metadata = metadata; - _common = item.Get(); + _common = item.Get(); _routable = item.Get(); - _body = item.Get(); + _body = item.Get(); } public string Title { diff --git a/src/Orchard.Web/Core/Feeds/StandardQueries/ContainerFeedQuery.cs b/src/Orchard.Web/Core/Feeds/StandardQueries/ContainerFeedQuery.cs index d824c3b1a..8e531a205 100644 --- a/src/Orchard.Web/Core/Feeds/StandardQueries/ContainerFeedQuery.cs +++ b/src/Orchard.Web/Core/Feeds/StandardQueries/ContainerFeedQuery.cs @@ -58,7 +58,7 @@ namespace Orchard.Core.Feeds.StandardQueries { } var items = _contentManager.Query() - .Where(x => x.Container == container.Record) + .Where(x => x.Container == container.Record) .OrderByDescending(x => x.PublishedUtc) .Slice(0, limit); diff --git a/src/Orchard.Web/Core/Orchard.Core.csproj b/src/Orchard.Web/Core/Orchard.Core.csproj index f0f4b368b..e0a38c22a 100644 --- a/src/Orchard.Web/Core/Orchard.Core.csproj +++ b/src/Orchard.Web/Core/Orchard.Core.csproj @@ -62,8 +62,8 @@ - - + + @@ -116,14 +116,14 @@ - + - - - - - - + + + + + + diff --git a/src/Orchard.Web/Core/PublishLater/ViewModels/PublishLaterViewModel.cs b/src/Orchard.Web/Core/PublishLater/ViewModels/PublishLaterViewModel.cs index 67b8ff18f..6e1e7a50f 100644 --- a/src/Orchard.Web/Core/PublishLater/ViewModels/PublishLaterViewModel.cs +++ b/src/Orchard.Web/Core/PublishLater/ViewModels/PublishLaterViewModel.cs @@ -33,7 +33,7 @@ namespace Orchard.Core.PublishLater.ViewModels { get { return IsPublished || ContentItem.ContentManager.Get(ContentItem.Id, VersionOptions.Published) != null; } } - public DateTime? VersionPublishedUtc { get { return ContentItem.As() == null ? null : ContentItem.As().VersionPublishedUtc; } } + public DateTime? VersionPublishedUtc { get { return ContentItem.As() == null ? null : ContentItem.As().VersionPublishedUtc; } } public DateTime? ScheduledPublishUtc { get; set; } diff --git a/src/Orchard.Web/Core/Routable/Controllers/ItemController.cs b/src/Orchard.Web/Core/Routable/Controllers/ItemController.cs index 690ad156f..e0a074e4b 100644 --- a/src/Orchard.Web/Core/Routable/Controllers/ItemController.cs +++ b/src/Orchard.Web/Core/Routable/Controllers/ItemController.cs @@ -67,7 +67,7 @@ namespace Orchard.Core.Routable.Controllers { if (containerId != null) { var containerItem = _contentManager.Get((int)containerId); - contentItem.As().Container = containerItem; + contentItem.As().Container = containerItem; } } diff --git a/src/Orchard.Web/Core/Routable/Drivers/RoutableDriver.cs b/src/Orchard.Web/Core/Routable/Drivers/RoutableDriver.cs index 70c8cb828..1a7201d73 100644 --- a/src/Orchard.Web/Core/Routable/Drivers/RoutableDriver.cs +++ b/src/Orchard.Web/Core/Routable/Drivers/RoutableDriver.cs @@ -28,15 +28,15 @@ namespace Orchard.Core.Routable.Drivers { } int? GetContainerId(IContent item) { - var commonAspect = item.As(); - if (commonAspect != null && commonAspect.Container != null) { - return commonAspect.Container.ContentItem.Id; + var commonPart = item.As(); + if (commonPart != null && commonPart.Container != null) { + return commonPart.Container.ContentItem.Id; } return null; } string GetContainerSlug(IContent item) { - var commonAspect = item.As(); + var commonAspect = item.As(); if (commonAspect != null && commonAspect.Container != null) { var routable = commonAspect.Container.As(); if (routable != null) { diff --git a/src/Orchard.Web/Modules/Futures.Widgets/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Futures.Widgets/Controllers/AdminController.cs index e2204492a..a65bc1db6 100644 --- a/src/Orchard.Web/Modules/Futures.Widgets/Controllers/AdminController.cs +++ b/src/Orchard.Web/Modules/Futures.Widgets/Controllers/AdminController.cs @@ -35,7 +35,7 @@ namespace Futures.Widgets.Controllers { init.Record.Scope = hasWidgetsRecord; init.Record.Zone = zoneName; init.Record.Position = "1"; - init.As().Text = System.IO.File.ReadAllText(physicalPath); + init.As().Text = System.IO.File.ReadAllText(physicalPath); }); return RedirectToAction("Edit", new { widget.ContentItem.Id, returnUrl }); diff --git a/src/Orchard.Web/Modules/Futures.Widgets/DataMigrations/WidgetsDataMigration.cs b/src/Orchard.Web/Modules/Futures.Widgets/DataMigrations/WidgetsDataMigration.cs index de0d6c6c7..57c8b2252 100644 --- a/src/Orchard.Web/Modules/Futures.Widgets/DataMigrations/WidgetsDataMigration.cs +++ b/src/Orchard.Web/Modules/Futures.Widgets/DataMigrations/WidgetsDataMigration.cs @@ -30,7 +30,7 @@ namespace Futures.Widgets.DataMigrations { ContentDefinitionManager.AlterTypeDefinition("HtmlWidget", cfg => cfg .WithPart("Widget") - .WithPart("BodyAspect") + .WithPart("BodyPart") ); return 2; diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Commands/BlogCommands.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Commands/BlogCommands.cs index 2894149fc..750a59e76 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Commands/BlogCommands.cs +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Commands/BlogCommands.cs @@ -53,7 +53,7 @@ namespace Orchard.Blogs.Commands { } var blog = _contentManager.New("Blog"); - blog.As().Owner = admin; + blog.As().Owner = admin; blog.As().Slug = Slug; blog.As().Title = Title; if ( !String.IsNullOrWhiteSpace(MenuText) ) { @@ -95,11 +95,11 @@ namespace Orchard.Blogs.Commands { Context.Output.WriteLine("Adding post: {0}...", postName.Substring(0, Math.Min(postName.Length, 40))); var post = _contentManager.New("BlogPost"); - post.As().Owner = admin; - post.As().Container = blog; + post.As().Owner = admin; + post.As().Container = blog; post.As().Slug = Slugify(postName); post.As().Title = postName; - post.As().Text = item.Element("description").Value; + post.As().Text = item.Element("description").Value; _contentManager.Create(post); } diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/DataMigrations/BlogsDataMigration.cs b/src/Orchard.Web/Modules/Orchard.Blogs/DataMigrations/BlogsDataMigration.cs index d0b0527b1..f04f74f38 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/DataMigrations/BlogsDataMigration.cs +++ b/src/Orchard.Web/Modules/Orchard.Blogs/DataMigrations/BlogsDataMigration.cs @@ -32,17 +32,17 @@ namespace Orchard.Blogs.DataMigrations { ContentDefinitionManager.AlterTypeDefinition("Blog", cfg => cfg .WithPart("BlogPart") - .WithPart("CommonAspect") + .WithPart("CommonPart") .WithPart("IsRoutable") ); ContentDefinitionManager.AlterTypeDefinition("BlogPost", cfg => cfg .WithPart("BlogPostPart") - .WithPart("CommonAspect") + .WithPart("CommonPart") .WithPart("PublishLaterPart") .WithPart("IsRoutable") - .WithPart("BodyAspect") + .WithPart("BodyPart") ); return 2; diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Handlers/BlogArchiveHandler.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Handlers/BlogPartArchiveHandler.cs similarity index 86% rename from src/Orchard.Web/Modules/Orchard.Blogs/Handlers/BlogArchiveHandler.cs rename to src/Orchard.Web/Modules/Orchard.Blogs/Handlers/BlogPartArchiveHandler.cs index e676c5d73..63c0a16cd 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Handlers/BlogArchiveHandler.cs +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Handlers/BlogPartArchiveHandler.cs @@ -10,13 +10,13 @@ using Orchard.Data; namespace Orchard.Blogs.Handlers { [UsedImplicitly] - public class BlogArchiveHandler : ContentHandler { - public BlogArchiveHandler(IRepository blogArchiveRepository, IRepository commonRepository) { + public class BlogPartArchiveHandler : ContentHandler { + public BlogPartArchiveHandler(IRepository blogArchiveRepository, IRepository commonRepository) { OnPublished((context, bp) => RecalculateBlogArchive(blogArchiveRepository, commonRepository, bp)); OnRemoved((context, bp) => RecalculateBlogArchive(blogArchiveRepository, commonRepository, bp)); } - private static void RecalculateBlogArchive(IRepository blogArchiveRepository, IRepository commonRepository, BlogPostPart blogPostPart) { + private static void RecalculateBlogArchive(IRepository blogArchiveRepository, IRepository commonRepository, BlogPostPart blogPostPart) { blogArchiveRepository.Flush(); //INFO: (erikpo) Remove all current blog archive records diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Handlers/BlogHandler.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Handlers/BlogPartHandler.cs similarity index 64% rename from src/Orchard.Web/Modules/Orchard.Blogs/Handlers/BlogHandler.cs rename to src/Orchard.Web/Modules/Orchard.Blogs/Handlers/BlogPartHandler.cs index 9499c9e0e..6c7220f2f 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Handlers/BlogHandler.cs +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Handlers/BlogPartHandler.cs @@ -5,8 +5,8 @@ using Orchard.Data; namespace Orchard.Blogs.Handlers { [UsedImplicitly] - public class BlogHandler : ContentHandler { - public BlogHandler(IRepository repository) { + public class BlogPartHandler : ContentHandler { + public BlogPartHandler(IRepository repository) { Filters.Add(StorageFilter.For(repository)); } } diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Handlers/BlogPostHandler.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Handlers/BlogPostPartHandler.cs similarity index 89% rename from src/Orchard.Web/Modules/Orchard.Blogs/Handlers/BlogPostHandler.cs rename to src/Orchard.Web/Modules/Orchard.Blogs/Handlers/BlogPostPartHandler.cs index d7cbe394c..d31e93aff 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Handlers/BlogPostHandler.cs +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Handlers/BlogPostPartHandler.cs @@ -10,11 +10,11 @@ using Orchard.Localization; namespace Orchard.Blogs.Handlers { [UsedImplicitly] - public class BlogPostHandler : ContentHandler { + public class BlogPostPartHandler : ContentHandler { private readonly IBlogPostService _blogPostService; private readonly IOrchardServices _orchardServices; - public BlogPostHandler(IBlogService blogService, IBlogPostService blogPostService, IOrchardServices orchardServices, RequestContext requestContext) { + public BlogPostPartHandler(IBlogService blogService, IBlogPostService blogPostService, IOrchardServices orchardServices, RequestContext requestContext) { _blogPostService = blogPostService; _orchardServices = orchardServices; T = NullLocalizer.Instance; @@ -37,7 +37,7 @@ namespace Orchard.Blogs.Handlers { //todo: don't get at the container form data directly. right now the container is set in the common driver editor (updater) //todo: which is too late for what's needed (currently) in this handler - var containerId = requestContext.HttpContext.Request.Form["CommonAspect.containerId"]; + var containerId = requestContext.HttpContext.Request.Form["CommonPart.containerId"]; if (!string.IsNullOrEmpty(containerId)) { int cId; if (int.TryParse(containerId, out cId)) { diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Models/BlogPostPart.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Models/BlogPostPart.cs index 8ea0fa057..9235abe0c 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Models/BlogPostPart.cs +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Models/BlogPostPart.cs @@ -24,18 +24,18 @@ namespace Orchard.Blogs.Models { } public string Text { - get { return this.As().Text; } - set { this.As().Text = value; } + get { return this.As().Text; } + set { this.As().Text = value; } } public BlogPart BlogPart { - get { return this.As().Container.As(); } - set { this.As().Container = value; } + get { return this.As().Container.As(); } + set { this.As().Container = value; } } public IUser Creator { - get { return this.As().Owner; } - set { this.As().Owner = value; } + get { return this.As().Owner; } + set { this.As().Owner = value; } } public bool IsPublished { @@ -58,7 +58,7 @@ namespace Orchard.Blogs.Models { } public DateTime? CreatedUtc { - get { return this.As().CreatedUtc; } + get { return this.As().CreatedUtc; } } public DateTime? ScheduledPublishUtc { get; set; } diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj b/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj index 973727be2..24beb0b1a 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj @@ -77,7 +77,7 @@ - + @@ -88,9 +88,9 @@ - + - + diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Services/BlogPostService.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Services/BlogPostService.cs index 646a19bcd..212520dfc 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Services/BlogPostService.cs +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Services/BlogPostService.cs @@ -30,7 +30,7 @@ namespace Orchard.Blogs.Services { public BlogPostPart Get(BlogPart blogPart, string slug, VersionOptions versionOptions) { return _contentManager.Query(versionOptions, BlogPostPartDriver.ContentType.Name).Join().Where(rr => rr.Slug == slug). - Join().Where(cr => cr.Container == blogPart.Record.ContentItemRecord).List(). + Join().Where(cr => cr.Container == blogPart.Record.ContentItemRecord).List(). SingleOrDefault().As(); } @@ -110,9 +110,9 @@ namespace Orchard.Blogs.Services { return (task == null ? null : task.ScheduledUtc); } - private IContentQuery GetBlogQuery(ContentPart blog, VersionOptions versionOptions) { + private IContentQuery GetBlogQuery(ContentPart blog, VersionOptions versionOptions) { return - _contentManager.Query(versionOptions, BlogPostPartDriver.ContentType.Name).Join().Where( + _contentManager.Query(versionOptions, BlogPostPartDriver.ContentType.Name).Join().Where( cr => cr.Container == blog.Record.ContentItemRecord).OrderByDescending(cr => cr.CreatedUtc); } } diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.BlogPost.Summary.ascx b/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.BlogPost.Summary.ascx index 270fbe96e..123fee7cc 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.BlogPost.Summary.ascx +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.BlogPost.Summary.ascx @@ -8,5 +8,5 @@ <%@ Import Namespace="Orchard.Core.Common.ViewModels" %> <%@ Import Namespace="Orchard.Core.Contents.ViewModels" %>

<%: Html.Link(Model.Item.Title, Url.BlogPost(Model.Item)) %>

-
<%: Html.PublishedState(new CommonMetadataViewModel(Model.Item.As()), T) %> | <%Html.Zone("meta");%>
+
<%: Html.PublishedState(new CommonMetadataViewModel(Model.Item.As()), T) %> | <%Html.Zone("meta");%>
<% Html.Zone("primary", ":manage :metadata");%>
diff --git a/src/Orchard.Web/Modules/Orchard.Comments/DataMigrations/CommentsDataMigration.cs b/src/Orchard.Web/Modules/Orchard.Comments/DataMigrations/CommentsDataMigration.cs index 260f97d73..6e60f581c 100644 --- a/src/Orchard.Web/Modules/Orchard.Comments/DataMigrations/CommentsDataMigration.cs +++ b/src/Orchard.Web/Modules/Orchard.Comments/DataMigrations/CommentsDataMigration.cs @@ -53,7 +53,7 @@ namespace Orchard.Comments.DataMigrations { ContentDefinitionManager.AlterTypeDefinition("Comment", cfg => cfg .WithPart("Comment") - .WithPart("CommonAspect") + .WithPart("CommonPart") ); ContentDefinitionManager.AlterTypeDefinition("Blog", diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Drivers/HasCommentsContainerDriver.cs b/src/Orchard.Web/Modules/Orchard.Comments/Drivers/HasCommentsContainerDriver.cs index 13f07c1bc..0bde275dd 100644 --- a/src/Orchard.Web/Modules/Orchard.Comments/Drivers/HasCommentsContainerDriver.cs +++ b/src/Orchard.Web/Modules/Orchard.Comments/Drivers/HasCommentsContainerDriver.cs @@ -24,7 +24,7 @@ namespace Orchard.Comments.Drivers { private static CommentCountViewModel CreateViewModel(ContentItem contentItem) { // Find all contents item with this part as the container var parts = contentItem.ContentManager.Query() - .Where(rec => rec.Container == contentItem.Record).List(); + .Where(rec => rec.Container == contentItem.Record).List(); // Count comments and create template int count = parts.Aggregate(0, (seed, item) => seed + (item.Has() ? item.As().Comments.Count : 0)); diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Services/CommentService.cs b/src/Orchard.Web/Modules/Orchard.Comments/Services/CommentService.cs index c8e1226d0..427d88ec1 100644 --- a/src/Orchard.Web/Modules/Orchard.Comments/Services/CommentService.cs +++ b/src/Orchard.Web/Modules/Orchard.Comments/Services/CommentService.cs @@ -86,7 +86,7 @@ namespace Orchard.Comments.Services { // store id of the next layer for large-grained operations, e.g. rss on blog //TODO:(rpaquay) Get rid of this (comment aspect takes care of container) - var commentedOn = _contentManager.Get(comment.Record.CommentedOn); + var commentedOn = _contentManager.Get(comment.Record.CommentedOn); if (commentedOn != null && commentedOn.Container != null) { comment.Record.CommentedOnContainer = commentedOn.Container.ContentItem.Id; } diff --git a/src/Orchard.Web/Modules/Orchard.DevTools/Commands/ProfilingCommands.cs b/src/Orchard.Web/Modules/Orchard.DevTools/Commands/ProfilingCommands.cs index 21f065a90..837126c3f 100644 --- a/src/Orchard.Web/Modules/Orchard.DevTools/Commands/ProfilingCommands.cs +++ b/src/Orchard.Web/Modules/Orchard.DevTools/Commands/ProfilingCommands.cs @@ -26,11 +26,11 @@ namespace Orchard.DevTools.Commands { var pageName = "page" + index; var page = _contentManager.Create("Page", VersionOptions.Draft); - page.As().Owner = admin; + page.As().Owner = admin; page.As().Slug = pageName; page.As().Path = pageName; page.As().Title = pageName; - page.As().Text = pageName; + page.As().Text = pageName; page.As().OnMainMenu = true; page.As().MenuPosition = "5." + index; page.As().MenuText = pageName; @@ -38,7 +38,7 @@ namespace Orchard.DevTools.Commands { var blogName = "blog" + index; var blog = _contentManager.New("Blog"); - blog.As().Owner = admin; + blog.As().Owner = admin; blog.As().Slug = blogName; blog.As().Path = blogName; blog.As().Title = blogName; @@ -51,11 +51,11 @@ namespace Orchard.DevTools.Commands { //for (var index2 = 0; index2 != 5; ++index2) { // var postName = "post" + index; // var post = _contentManager.New("BlogPost"); - // post.As().Owner = admin; - // post.As().Container = blog; + // post.As().Owner = admin; + // post.As().Container = blog; // post.As().Slug = postName; // post.As().Title = postName; - // post.As().Text = postName; + // post.As().Text = postName; // _contentManager.Create(post); //} } diff --git a/src/Orchard.Web/Modules/Orchard.Indexing/Handlers/CreateIndexingTaskHandler.cs b/src/Orchard.Web/Modules/Orchard.Indexing/Handlers/CreateIndexingTaskHandler.cs index ae6d18bbe..48eea68d1 100644 --- a/src/Orchard.Web/Modules/Orchard.Indexing/Handlers/CreateIndexingTaskHandler.cs +++ b/src/Orchard.Web/Modules/Orchard.Indexing/Handlers/CreateIndexingTaskHandler.cs @@ -14,15 +14,15 @@ namespace Orchard.Indexing.Handlers { public CreateIndexingTaskHandler(IIndexingTaskManager indexingTaskManager) { _indexingTaskManager = indexingTaskManager; - OnPublishing>(CreateIndexingTask); - OnRemoved>(RemoveIndexingTask); + OnPublishing>(CreateIndexingTask); + OnRemoved>(RemoveIndexingTask); } - void CreateIndexingTask(PublishContentContext context, ContentPart part) { + void CreateIndexingTask(PublishContentContext context, ContentPart part) { _indexingTaskManager.CreateUpdateIndexTask(context.ContentItem); } - void RemoveIndexingTask(RemoveContentContext context, ContentPart part) { + void RemoveIndexingTask(RemoveContentContext context, ContentPart part) { _indexingTaskManager.CreateDeleteIndexTask(context.ContentItem); } diff --git a/src/Orchard.Web/Modules/Orchard.Pages/DataMigrations/PageDataMigration.cs b/src/Orchard.Web/Modules/Orchard.Pages/DataMigrations/PageDataMigration.cs index 981b2ffb1..28a31deb7 100644 --- a/src/Orchard.Web/Modules/Orchard.Pages/DataMigrations/PageDataMigration.cs +++ b/src/Orchard.Web/Modules/Orchard.Pages/DataMigrations/PageDataMigration.cs @@ -9,9 +9,9 @@ namespace Orchard.Pages.DataMigrations { ContentDefinitionManager.AlterTypeDefinition("Page", cfg => cfg .WithPart("Page") - .WithPart("CommonAspect") + .WithPart("CommonPart") .WithPart("IsRoutable") - .WithPart("BodyAspect") + .WithPart("BodyPart") ); return 1; diff --git a/src/Orchard.Web/Modules/Orchard.Pages/Models/Page.cs b/src/Orchard.Web/Modules/Orchard.Pages/Models/Page.cs index bd565d33b..8df5c9587 100644 --- a/src/Orchard.Web/Modules/Orchard.Pages/Models/Page.cs +++ b/src/Orchard.Web/Modules/Orchard.Pages/Models/Page.cs @@ -21,8 +21,8 @@ namespace Orchard.Pages.Models { } public IUser Creator { - get { return this.As().Owner; } - set { this.As().Owner = value; } + get { return this.As().Owner; } + set { this.As().Owner = value; } } public bool IsPublished { diff --git a/src/Orchard.Web/Modules/Orchard.Pages/Security/AuthorizationEventHandler.cs b/src/Orchard.Web/Modules/Orchard.Pages/Security/AuthorizationEventHandler.cs index f86b68305..248f556e5 100644 --- a/src/Orchard.Web/Modules/Orchard.Pages/Security/AuthorizationEventHandler.cs +++ b/src/Orchard.Web/Modules/Orchard.Pages/Security/AuthorizationEventHandler.cs @@ -26,7 +26,7 @@ namespace Orchard.Pages.Security { if (user==null || content==null) return false; - var common = content.As(); + var common = content.As(); if (common==null || common.Owner==null) return false; diff --git a/src/Orchard.Web/Modules/Orchard.Pages/Views/Admin/List.aspx b/src/Orchard.Web/Modules/Orchard.Pages/Views/Admin/List.aspx index 39859932c..9dcf64e5d 100644 --- a/src/Orchard.Web/Modules/Orchard.Pages/Views/Admin/List.aspx +++ b/src/Orchard.Web/Modules/Orchard.Pages/Views/Admin/List.aspx @@ -65,10 +65,10 @@ using (Html.BeginFormAntiForgeryPost()) { %> <%: Html.DateTime(pageEntry.Page.ScheduledPublishUtc.Value, T("M/d/yyyy h:mm tt"))%><% } else if (pageEntry.Page.IsPublished) { %> - <%: T("Published: {0}", Html.DateTimeRelative(pageEntry.Page.As().VersionPublishedUtc.Value, T)) %><% + <%: T("Published: {0}", Html.DateTimeRelative(pageEntry.Page.As().VersionPublishedUtc.Value, T)) %><% } else { %> - <%: T("Last modified: {0}", Html.DateTimeRelative(pageEntry.Page.As().ModifiedUtc.Value, T)) %><% + <%: T("Last modified: {0}", Html.DateTimeRelative(pageEntry.Page.As().ModifiedUtc.Value, T)) %><% } %> | 
  • <%: T("By {0}", pageEntry.Page.Creator.UserName)%>
    • diff --git a/src/Orchard.Web/Modules/Orchard.Sandbox/DataMigrations/SandBoxDataMigration.cs b/src/Orchard.Web/Modules/Orchard.Sandbox/DataMigrations/SandBoxDataMigration.cs index 08f04f685..27443d88c 100644 --- a/src/Orchard.Web/Modules/Orchard.Sandbox/DataMigrations/SandBoxDataMigration.cs +++ b/src/Orchard.Web/Modules/Orchard.Sandbox/DataMigrations/SandBoxDataMigration.cs @@ -23,9 +23,9 @@ namespace Orchard.Sandbox.DataMigrations { ContentDefinitionManager.AlterTypeDefinition("SandboxPage", cfg => cfg .WithPart("SandboxPage") - .WithPart("CommonAspect") + .WithPart("CommonPart") .WithPart("IsRoutable") - .WithPart("BodyAspect") + .WithPart("BodyPart") ); return 2; diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs b/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs index e5cbced2a..95c334348 100644 --- a/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs +++ b/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs @@ -197,24 +197,24 @@ namespace Orchard.Setup.Services { .Indexed()); contentDefinitionManager.AlterTypeDefinition("Page", cfg => cfg .DisplayedAs("Page") - .WithPart("CommonAspect") + .WithPart("CommonPart") .WithPart("PublishLaterPart") .WithPart("IsRoutable") - .WithPart("BodyAspect") + .WithPart("BodyPart") .WithPart("HasComments") .WithPart("HasTags") .WithPart("Localized") .Indexed()); - contentDefinitionManager.AlterPartDefinition("BodyAspect", cfg => cfg + contentDefinitionManager.AlterPartDefinition("BodyPart", cfg => cfg .WithSetting("BodyPartSettings.FlavorDefault", BodyPartSettings.FlavorDefaultDefault)); // create home page as a CMS page var page = contentManager.Create("Page", VersionOptions.Draft); - page.As().Text = "

    Welcome to Orchard!

    Congratulations, you've successfully set-up your Orchard site.

    This is the home page of your new site. We've taken the liberty to write here about a few things you could look at next in order to get familiar with the application. Once you feel confident you don't need this anymore, just click Edit to go into edit mode and replace this with whatever you want on your home page to make it your own.

    One thing you could do (but you don't have to) is go into Manage Settings (follow the Admin link and then look for it under \"Settings\" in the menu on the left) and check that everything is configured the way you want.

    You probably want to make the site your own. One of the ways you can do that is by clicking Manage Themes in the admin menu. A theme is a packaged look and feel that affects the whole site.

    Next, you can start playing with the content types that we installed. For example, go ahead and click Add New Page in the admin menu and create an \"about\" page. Then, add it to the navigation menu by going to Manage Menu. You can also click Add New Blog and start posting by clicking \"Add New Post\".

    Finally, Orchard has been designed to be extended. It comes with a few built-in modules such as pages and blogs or themes. You can install new themes by going to Manage Themes and clicking Install a new Theme. Like for themes, modules are created by other users of Orchard just like you so if you feel up to it, please consider participating.

    --The Orchard Crew

    "; + page.As().Text = "

    Welcome to Orchard!

    Congratulations, you've successfully set-up your Orchard site.

    This is the home page of your new site. We've taken the liberty to write here about a few things you could look at next in order to get familiar with the application. Once you feel confident you don't need this anymore, just click Edit to go into edit mode and replace this with whatever you want on your home page to make it your own.

    One thing you could do (but you don't have to) is go into Manage Settings (follow the Admin link and then look for it under \"Settings\" in the menu on the left) and check that everything is configured the way you want.

    You probably want to make the site your own. One of the ways you can do that is by clicking Manage Themes in the admin menu. A theme is a packaged look and feel that affects the whole site.

    Next, you can start playing with the content types that we installed. For example, go ahead and click Add New Page in the admin menu and create an \"about\" page. Then, add it to the navigation menu by going to Manage Menu. You can also click Add New Blog and start posting by clicking \"Add New Post\".

    Finally, Orchard has been designed to be extended. It comes with a few built-in modules such as pages and blogs or themes. You can install new themes by going to Manage Themes and clicking Install a new Theme. Like for themes, modules are created by other users of Orchard just like you so if you feel up to it, please consider participating.

    --The Orchard Crew

    "; page.As().Slug = "home"; page.As().Path = "home"; page.As().Title = T("Home").ToString(); - page.As().Owner = user; + page.As().Owner = user; if (page.Has()) { page.As().CommentsShown = false; } diff --git a/src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Items/Blogs.Blog.Summary.ascx b/src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Items/Blogs.Blog.Summary.ascx index cfa18d826..7ea5d7aa3 100644 --- a/src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Items/Blogs.Blog.Summary.ascx +++ b/src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Items/Blogs.Blog.Summary.ascx @@ -1,4 +1,4 @@ -<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl>" %> +<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl>" %> <%@ Import Namespace="Orchard.Mvc.ViewModels"%> <%@ Import Namespace="Orchard.Blogs.Extensions"%> <%@ Import Namespace="Orchard.Blogs.Models"%> diff --git a/src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Items/Blogs.Blog.ascx b/src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Items/Blogs.Blog.ascx index efe611fa8..fb430fe5e 100644 --- a/src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Items/Blogs.Blog.ascx +++ b/src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Items/Blogs.Blog.ascx @@ -1,4 +1,4 @@ -<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl>" %> +<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl>" %> <%@ Import Namespace="Orchard.UI.Resources"%> <%@ Import Namespace="Orchard.Mvc.ViewModels"%> <%@ Import Namespace="Orchard.Blogs.Extensions"%> diff --git a/src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Items/Blogs.BlogPost.Summary.ascx b/src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Items/Blogs.BlogPost.Summary.ascx index a832b5cfa..351e7b8e8 100644 --- a/src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Items/Blogs.BlogPost.Summary.ascx +++ b/src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Items/Blogs.BlogPost.Summary.ascx @@ -1,4 +1,4 @@ -<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl>" %> +<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl>" %> <%@ Import Namespace="Orchard.Mvc.ViewModels"%> <%@ Import Namespace="Orchard.Blogs.Extensions"%> <%@ Import Namespace="Orchard.Blogs.Models"%> diff --git a/src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Items/Blogs.BlogPost.ascx b/src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Items/Blogs.BlogPost.ascx index e40fb3678..43fc273e3 100644 --- a/src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Items/Blogs.BlogPost.ascx +++ b/src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Items/Blogs.BlogPost.ascx @@ -1,4 +1,4 @@ -<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl>" %> +<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl>" %> <%@ Import Namespace="Orchard.Mvc.ViewModels"%> <%@ Import Namespace="Orchard.Blogs.Models"%>

    <%: Html.TitleForPage(Model.Item.Title)%>

    diff --git a/src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Parts/Blogs.BlogPost.Metadata.ascx b/src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Parts/Blogs.BlogPost.Metadata.ascx index 318e59b08..90ff7989d 100644 --- a/src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Parts/Blogs.BlogPost.Metadata.ascx +++ b/src/Orchard.Web/Themes/Classic/Views/DisplayTemplates/Parts/Blogs.BlogPost.Metadata.ascx @@ -1,4 +1,4 @@ -<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %> +<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %> <%@ Import Namespace="Orchard.Blogs.Extensions"%> <%@ Import Namespace="Orchard.Blogs.Models"%> <%@ Import Namespace="Orchard.Core.Common.Extensions" %><% diff --git a/src/Orchard.Web/Themes/Classic/Views/ZoneTest.ascx b/src/Orchard.Web/Themes/Classic/Views/ZoneTest.ascx index 418a5d370..32dad3b90 100644 --- a/src/Orchard.Web/Themes/Classic/Views/ZoneTest.ascx +++ b/src/Orchard.Web/Themes/Classic/Views/ZoneTest.ascx @@ -1,3 +1,3 @@ -<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl>" %> +<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl>" %> <%@ Import Namespace="Orchard.Blogs.Models"%> <%@ Import Namespace="Orchard.Mvc.ViewModels"%> diff --git a/src/Orchard.Web/Themes/ClassicDark/Views/DisplayTemplates/Items/Blogs.Blog.Summary.ascx b/src/Orchard.Web/Themes/ClassicDark/Views/DisplayTemplates/Items/Blogs.Blog.Summary.ascx index cfa18d826..7ea5d7aa3 100644 --- a/src/Orchard.Web/Themes/ClassicDark/Views/DisplayTemplates/Items/Blogs.Blog.Summary.ascx +++ b/src/Orchard.Web/Themes/ClassicDark/Views/DisplayTemplates/Items/Blogs.Blog.Summary.ascx @@ -1,4 +1,4 @@ -<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl>" %> +<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl>" %> <%@ Import Namespace="Orchard.Mvc.ViewModels"%> <%@ Import Namespace="Orchard.Blogs.Extensions"%> <%@ Import Namespace="Orchard.Blogs.Models"%> diff --git a/src/Orchard.Web/Themes/ClassicDark/Views/DisplayTemplates/Items/Blogs.Blog.ascx b/src/Orchard.Web/Themes/ClassicDark/Views/DisplayTemplates/Items/Blogs.Blog.ascx index efe611fa8..fb430fe5e 100644 --- a/src/Orchard.Web/Themes/ClassicDark/Views/DisplayTemplates/Items/Blogs.Blog.ascx +++ b/src/Orchard.Web/Themes/ClassicDark/Views/DisplayTemplates/Items/Blogs.Blog.ascx @@ -1,4 +1,4 @@ -<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl>" %> +<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl>" %> <%@ Import Namespace="Orchard.UI.Resources"%> <%@ Import Namespace="Orchard.Mvc.ViewModels"%> <%@ Import Namespace="Orchard.Blogs.Extensions"%> diff --git a/src/Orchard.Web/Themes/ClassicDark/Views/DisplayTemplates/Items/Blogs.BlogPost.Summary.ascx b/src/Orchard.Web/Themes/ClassicDark/Views/DisplayTemplates/Items/Blogs.BlogPost.Summary.ascx index a832b5cfa..351e7b8e8 100644 --- a/src/Orchard.Web/Themes/ClassicDark/Views/DisplayTemplates/Items/Blogs.BlogPost.Summary.ascx +++ b/src/Orchard.Web/Themes/ClassicDark/Views/DisplayTemplates/Items/Blogs.BlogPost.Summary.ascx @@ -1,4 +1,4 @@ -<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl>" %> +<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl>" %> <%@ Import Namespace="Orchard.Mvc.ViewModels"%> <%@ Import Namespace="Orchard.Blogs.Extensions"%> <%@ Import Namespace="Orchard.Blogs.Models"%> diff --git a/src/Orchard.Web/Themes/ClassicDark/Views/DisplayTemplates/Items/Blogs.BlogPost.ascx b/src/Orchard.Web/Themes/ClassicDark/Views/DisplayTemplates/Items/Blogs.BlogPost.ascx index e40fb3678..43fc273e3 100644 --- a/src/Orchard.Web/Themes/ClassicDark/Views/DisplayTemplates/Items/Blogs.BlogPost.ascx +++ b/src/Orchard.Web/Themes/ClassicDark/Views/DisplayTemplates/Items/Blogs.BlogPost.ascx @@ -1,4 +1,4 @@ -<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl>" %> +<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl>" %> <%@ Import Namespace="Orchard.Mvc.ViewModels"%> <%@ Import Namespace="Orchard.Blogs.Models"%>

    <%: Html.TitleForPage(Model.Item.Title)%>

    diff --git a/src/Orchard.Web/Themes/ClassicDark/Views/DisplayTemplates/Parts/Blogs.BlogPost.Metadata.ascx b/src/Orchard.Web/Themes/ClassicDark/Views/DisplayTemplates/Parts/Blogs.BlogPost.Metadata.ascx index 318e59b08..90ff7989d 100644 --- a/src/Orchard.Web/Themes/ClassicDark/Views/DisplayTemplates/Parts/Blogs.BlogPost.Metadata.ascx +++ b/src/Orchard.Web/Themes/ClassicDark/Views/DisplayTemplates/Parts/Blogs.BlogPost.Metadata.ascx @@ -1,4 +1,4 @@ -<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %> +<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %> <%@ Import Namespace="Orchard.Blogs.Extensions"%> <%@ Import Namespace="Orchard.Blogs.Models"%> <%@ Import Namespace="Orchard.Core.Common.Extensions" %><% diff --git a/src/Orchard.Web/Themes/ClassicDark/Views/ZoneTest.ascx b/src/Orchard.Web/Themes/ClassicDark/Views/ZoneTest.ascx index 418a5d370..32dad3b90 100644 --- a/src/Orchard.Web/Themes/ClassicDark/Views/ZoneTest.ascx +++ b/src/Orchard.Web/Themes/ClassicDark/Views/ZoneTest.ascx @@ -1,3 +1,3 @@ -<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl>" %> +<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl>" %> <%@ Import Namespace="Orchard.Blogs.Models"%> <%@ Import Namespace="Orchard.Mvc.ViewModels"%> diff --git a/src/Orchard.Web/Themes/Contoso/Views/DisplayTemplates/Items/Blogs.Blog.ascx b/src/Orchard.Web/Themes/Contoso/Views/DisplayTemplates/Items/Blogs.Blog.ascx index c157cbc65..8a30f347a 100644 --- a/src/Orchard.Web/Themes/Contoso/Views/DisplayTemplates/Items/Blogs.Blog.ascx +++ b/src/Orchard.Web/Themes/Contoso/Views/DisplayTemplates/Items/Blogs.Blog.ascx @@ -1,4 +1,4 @@ -<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl>" %> +<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl>" %> <%@ Import Namespace="Orchard.Security"%> <%@ Import Namespace="Orchard.UI.Resources"%> <%@ Import Namespace="Orchard.Mvc.ViewModels"%> diff --git a/src/Orchard.Web/Themes/Contoso/Views/DisplayTemplates/Items/Blogs.BlogPost.ascx b/src/Orchard.Web/Themes/Contoso/Views/DisplayTemplates/Items/Blogs.BlogPost.ascx index 8b1e822f1..6cce1c3f7 100644 --- a/src/Orchard.Web/Themes/Contoso/Views/DisplayTemplates/Items/Blogs.BlogPost.ascx +++ b/src/Orchard.Web/Themes/Contoso/Views/DisplayTemplates/Items/Blogs.BlogPost.ascx @@ -1,4 +1,4 @@ -<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl>" %> +<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl>" %> <%@ Import Namespace="Orchard.Mvc.ViewModels"%> <%@ Import Namespace="Orchard.Blogs.Extensions"%> <%@ Import Namespace="Orchard.Blogs.Models"%> diff --git a/src/Orchard.Web/Themes/Corporate/Views/DisplayTemplates/Items/Blogs.Blog.ascx b/src/Orchard.Web/Themes/Corporate/Views/DisplayTemplates/Items/Blogs.Blog.ascx index c157cbc65..8a30f347a 100644 --- a/src/Orchard.Web/Themes/Corporate/Views/DisplayTemplates/Items/Blogs.Blog.ascx +++ b/src/Orchard.Web/Themes/Corporate/Views/DisplayTemplates/Items/Blogs.Blog.ascx @@ -1,4 +1,4 @@ -<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl>" %> +<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl>" %> <%@ Import Namespace="Orchard.Security"%> <%@ Import Namespace="Orchard.UI.Resources"%> <%@ Import Namespace="Orchard.Mvc.ViewModels"%> diff --git a/src/Orchard.Web/Themes/Corporate/Views/DisplayTemplates/Items/Blogs.BlogPost.ascx b/src/Orchard.Web/Themes/Corporate/Views/DisplayTemplates/Items/Blogs.BlogPost.ascx index 8b1e822f1..6cce1c3f7 100644 --- a/src/Orchard.Web/Themes/Corporate/Views/DisplayTemplates/Items/Blogs.BlogPost.ascx +++ b/src/Orchard.Web/Themes/Corporate/Views/DisplayTemplates/Items/Blogs.BlogPost.ascx @@ -1,4 +1,4 @@ -<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl>" %> +<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl>" %> <%@ Import Namespace="Orchard.Mvc.ViewModels"%> <%@ Import Namespace="Orchard.Blogs.Extensions"%> <%@ Import Namespace="Orchard.Blogs.Models"%> diff --git a/src/Orchard.Web/Themes/Green/Views/DisplayTemplates/Items/Blogs.Blog.Summary.ascx b/src/Orchard.Web/Themes/Green/Views/DisplayTemplates/Items/Blogs.Blog.Summary.ascx index 8165191a5..5fbcba026 100644 --- a/src/Orchard.Web/Themes/Green/Views/DisplayTemplates/Items/Blogs.Blog.Summary.ascx +++ b/src/Orchard.Web/Themes/Green/Views/DisplayTemplates/Items/Blogs.Blog.Summary.ascx @@ -1,4 +1,4 @@ -<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl>" %> +<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl>" %> <%@ Import Namespace="Orchard.Mvc.ViewModels"%> <%@ Import Namespace="Orchard.Blogs.Extensions"%> <%@ Import Namespace="Orchard.Blogs.Models"%> diff --git a/src/Orchard.Web/Themes/Green/Views/DisplayTemplates/Items/Blogs.Blog.ascx b/src/Orchard.Web/Themes/Green/Views/DisplayTemplates/Items/Blogs.Blog.ascx index 26a8a1049..9c297383f 100644 --- a/src/Orchard.Web/Themes/Green/Views/DisplayTemplates/Items/Blogs.Blog.ascx +++ b/src/Orchard.Web/Themes/Green/Views/DisplayTemplates/Items/Blogs.Blog.ascx @@ -1,4 +1,4 @@ -<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl>" %> +<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl>" %> <%@ Import Namespace="Orchard.Blogs.Extensions"%> <%@ Import Namespace="Orchard.UI.Resources"%> <%@ Import Namespace="Orchard.Mvc.ViewModels"%> diff --git a/src/Orchard.Web/Themes/Green/Views/DisplayTemplates/Items/Blogs.BlogPost.Summary.ascx b/src/Orchard.Web/Themes/Green/Views/DisplayTemplates/Items/Blogs.BlogPost.Summary.ascx index eb633a89c..a4a01c525 100644 --- a/src/Orchard.Web/Themes/Green/Views/DisplayTemplates/Items/Blogs.BlogPost.Summary.ascx +++ b/src/Orchard.Web/Themes/Green/Views/DisplayTemplates/Items/Blogs.BlogPost.Summary.ascx @@ -1,4 +1,4 @@ -<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl>" %> +<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl>" %> <%@ Import Namespace="Orchard.Mvc.ViewModels"%> <%@ Import Namespace="Orchard.Blogs.Extensions"%> <%@ Import Namespace="Orchard.Blogs.Models"%> diff --git a/src/Orchard.Web/Themes/Green/Views/DisplayTemplates/Items/Blogs.BlogPost.ascx b/src/Orchard.Web/Themes/Green/Views/DisplayTemplates/Items/Blogs.BlogPost.ascx index eac1da2b4..456617eaa 100644 --- a/src/Orchard.Web/Themes/Green/Views/DisplayTemplates/Items/Blogs.BlogPost.ascx +++ b/src/Orchard.Web/Themes/Green/Views/DisplayTemplates/Items/Blogs.BlogPost.ascx @@ -1,4 +1,4 @@ -<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl>" %> +<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl>" %> <%@ Import Namespace="Orchard.Mvc.ViewModels"%> <%@ Import Namespace="Orchard.Blogs.Models"%>

    <%: Html.TitleForPage(Model.Item.Title)%>

    diff --git a/src/Orchard.Web/Themes/Green/Views/DisplayTemplates/Parts/Blogs.BlogPost.Metadata.ascx b/src/Orchard.Web/Themes/Green/Views/DisplayTemplates/Parts/Blogs.BlogPost.Metadata.ascx index 318e59b08..90ff7989d 100644 --- a/src/Orchard.Web/Themes/Green/Views/DisplayTemplates/Parts/Blogs.BlogPost.Metadata.ascx +++ b/src/Orchard.Web/Themes/Green/Views/DisplayTemplates/Parts/Blogs.BlogPost.Metadata.ascx @@ -1,4 +1,4 @@ -<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %> +<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl" %> <%@ Import Namespace="Orchard.Blogs.Extensions"%> <%@ Import Namespace="Orchard.Blogs.Models"%> <%@ Import Namespace="Orchard.Core.Common.Extensions" %><% diff --git a/src/Orchard/ContentManagement/Aspects/ICommonAspect.cs b/src/Orchard/ContentManagement/Aspects/ICommonPart.cs similarity index 87% rename from src/Orchard/ContentManagement/Aspects/ICommonAspect.cs rename to src/Orchard/ContentManagement/Aspects/ICommonPart.cs index 68a829ed8..c1776edb3 100644 --- a/src/Orchard/ContentManagement/Aspects/ICommonAspect.cs +++ b/src/Orchard/ContentManagement/Aspects/ICommonPart.cs @@ -2,7 +2,7 @@ using Orchard.Security; namespace Orchard.ContentManagement.Aspects { - public interface ICommonAspect : IContent { + public interface ICommonPart : IContent { IUser Owner { get; set; } IContent Container { get; set; } diff --git a/src/Orchard/Orchard.Framework.csproj b/src/Orchard/Orchard.Framework.csproj index 75e202326..972eee81f 100644 --- a/src/Orchard/Orchard.Framework.csproj +++ b/src/Orchard/Orchard.Framework.csproj @@ -137,7 +137,7 @@ - + Code