lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-09-24 05:23:33 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Making progress on updating the content manager API fit better with the new dynamic UI composition scheme

Browse Source 
- Includes changing display-related implementations (drivers & views) to work with shapes
- Editor implementations still on the old template model
- Orchard.Blogs is currently using a different display type instead of specifying alterations (for Blog and BlogPost)

--HG--
branch : dev
This commit is contained in:
Nathan Heskew
2010-10-11 02:06:01 -07:00
parent b7c3ada825
commit ddca57edd4
128 changed files with 635 additions and 454 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Orchard.Core.Tests/Common/Providers/CommonPartProviderTests.cs
View File

@@ -109,7 +109,7 @@ namespace Orchard.Core.Tests.Common.Providers {
var item = contentManager.Create<ICommonPart>("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);
contentManager.UpdateEditor(item.ContentItem, updateModel.Object);
}
class UpdatModelStub : IUpdateModel {
@@ -148,7 +148,7 @@ namespace Orchard.Core.Tests.Common.Providers {
var updater = new UpdatModelStub() { Owner = null };
contentManager.UpdateEditorModel(item.ContentItem, updater);
contentManager.UpdateEditor(item.ContentItem, updater);
}
[Test, Ignore("Fix pending")]
@@ -166,7 +166,7 @@ namespace Orchard.Core.Tests.Common.Providers {
var updater = new UpdatModelStub() {Owner = ""};
contentManager.UpdateEditorModel(item.ContentItem, updater);
contentManager.UpdateEditor(item.ContentItem, updater);
Assert.That(updater.ModelErrors.ContainsKey("CommonPart.Owner"), Is.True);
}

37
src/Orchard.Tests/ContentManagement/Handlers/Coordinators/ContentPartDriverCoordinatorTests.cs
View File

@@ -31,7 +31,7 @@ namespace Orchard.Tests.ContentManagement.Handlers.Coordinators {
[Test]
public void DriverHandlerShouldNotThrowException() {
var contentHandler = _container.Resolve<IContentHandler>();
contentHandler.BuildDisplayShape(null);
contentHandler.BuildDisplay(null);
}
[Test]
@@ -45,13 +45,13 @@ namespace Orchard.Tests.ContentManagement.Handlers.Coordinators {
var contentHandler = _container.Resolve<IContentHandler>();
var contentItem = new ContentItem();
var context = new BuildDisplayModelContext(contentItem, "", null, new ShapeHelperFactory(null));
var context = new BuildDisplayContext(null, contentItem, "", new ShapeHelperFactory(null));
driver1.Verify(x => x.BuildDisplayShape(context), Times.Never());
driver2.Verify(x => x.BuildDisplayShape(context), Times.Never());
contentHandler.BuildDisplayShape(context);
driver1.Verify(x => x.BuildDisplayShape(context));
driver2.Verify(x => x.BuildDisplayShape(context));
driver1.Verify(x => x.BuildDisplay(context), Times.Never());
driver2.Verify(x => x.BuildDisplay(context), Times.Never());
contentHandler.BuildDisplay(context);
driver1.Verify(x => x.BuildDisplay(context));
driver2.Verify(x => x.BuildDisplay(context));
}
[Test, Ignore("no implementation for IZoneCollection")]
@@ -66,10 +66,10 @@ namespace Orchard.Tests.ContentManagement.Handlers.Coordinators {
var contentItem = new ContentItem();
contentItem.Weld(new StubPart { Foo = new[] { "a", "b", "c" } });
var ctx = new BuildDisplayModelContext(contentItem, "", null, null);
var ctx = new BuildDisplayContext(null, null, "", null);
var context = shapeHelperFactory.CreateHelper().Context(ctx);
Assert.That(context.TopMeta, Is.Null);
contentHandler.BuildDisplayShape(ctx);
contentHandler.BuildDisplay(ctx);
Assert.That(context.TopMeta, Is.Not.Null);
Assert.That(context.TopMeta.Count == 1);
}
@@ -79,20 +79,25 @@ namespace Orchard.Tests.ContentManagement.Handlers.Coordinators {
get { return "Stub"; }
}
protected override DriverResult Display(StubPart part, string displayType) {
var viewModel = new StubViewModel { Foo = string.Join(",", part.Foo) };
if (displayType.StartsWith("Summary"))
return ContentPartTemplate(viewModel, "StubViewModelTerse").Location("TopMeta");
protected override DriverResult Display(StubPart part, string displayType, dynamic shapeHelper) {
var stub = shapeHelper.Stub(ContentPart: part, Foo: string.Join(",", part.Foo));
if (!string.IsNullOrWhiteSpace(displayType))
stub.Metadata.Type = string.Format("{0}.{1}", stub.Metadata.Type, displayType);
return ContentShape(stub).Location("TopMeta");
return ContentPartTemplate(viewModel).Location("TopMeta");
//var viewModel = new StubViewModel { Foo = string.Join(",", part.Foo) };
//if (displayType.StartsWith("Summary"))
// return ContentPartTemplate(viewModel, "StubViewModelTerse").Location("TopMeta");
//return ContentPartTemplate(viewModel).Location("TopMeta");
}
protected override DriverResult Editor(StubPart part) {
protected override DriverResult Editor(StubPart part, dynamic shapeHelper) {
var viewModel = new StubViewModel { Foo = string.Join(",", part.Foo) };
return ContentPartTemplate(viewModel).Location("last", "10");
}
protected override DriverResult Editor(StubPart part, IUpdateModel updater) {
protected override DriverResult Editor(StubPart part, IUpdateModel updater, dynamic shapeHelper) {
var viewModel = new StubViewModel { Foo = string.Join(",", part.Foo) };
updater.TryUpdateModel(viewModel, Prefix, null, null);
part.Foo = viewModel.Foo.Split(new[] { ',' }).Select(x => x.Trim()).ToArray();

2
src/Orchard.Tests/ContentManagement/Models/AlphaHandler.cs
View File

@@ -3,7 +3,7 @@
namespace Orchard.Tests.ContentManagement.Models {
public class AlphaHandler : ContentHandler {
public AlphaHandler() {
OnGetDisplayShape<Alpha>((ctx, part) => ctx.Model.Zones["Main"].Add(part, "3"));
OnGetDisplayShape<Alpha>((ctx, part) => ctx.Shape.Zones["Main"].Add(part, "3"));
}
protected override void Activating(ActivatingContentContext context) {

2
src/Orchard.Tests/ContentManagement/Models/FlavoredHandler.cs
View File

@@ -3,7 +3,7 @@
namespace Orchard.Tests.ContentManagement.Models {
public class FlavoredHandler : ContentHandler {
public FlavoredHandler() {
OnGetDisplayShape<Flavored>((ctx, part) => ctx.Model.Zones["Main"].Add(part));
OnGetDisplayShape<Flavored>((ctx, part) => ctx.Shape.Zones["Main"].Add(part));
}
protected override void Activating(ActivatingContentContext context) {
if (context.ContentType == "beta" || context.ContentType == "alpha") {

2
src/Orchard.Tests/ContentManagement/Models/StyledHandler.cs
View File

@@ -3,7 +3,7 @@
namespace Orchard.Tests.ContentManagement.Models {
public class StyledHandler : ContentHandler {
public StyledHandler() {
OnGetDisplayShape<Styled>((ctx, part) => ctx.Model.Zones["Main"].Add(part, "10"));
OnGetDisplayShape<Styled>((ctx, part) => ctx.Shape.Zones["Main"].Add(part, "10"));
}
protected override void Activating(ActivatingContentContext context) {

25
src/Orchard.Web/Core/Common/Drivers/BodyPartDriver.cs
View File

@@ -1,13 +1,11 @@
using System.Collections.Generic;
using System.Linq;
using System.Text.RegularExpressions;
using System.Web;
using JetBrains.Annotations;
using Orchard.ContentManagement;
using Orchard.ContentManagement.Aspects;
using Orchard.ContentManagement.Drivers;
using Orchard.Core.Common.Models;
using Orchard.Core.Common.Services;
using Orchard.Core.Common.Settings;
using Orchard.Core.Common.ViewModels;
using Orchard.Core.ContentsLocation.Models;
@@ -35,26 +33,29 @@ namespace Orchard.Core.Common.Drivers {
get { return "Body"; }
}
// \/\/ Hackalicious on many accounts - don't copy what has been done here for the wrapper \/\/
protected override DriverResult Display(BodyPart part, string displayType) {
protected override DriverResult Display(BodyPart part, string displayType, dynamic shapeHelper) {
var bodyText = _htmlFilters.Aggregate(part.Text, (text, filter) => filter.ProcessContent(text));
var model = new BodyDisplayViewModel { BodyPart = part, Html = new HtmlString(bodyText) };
var body = shapeHelper.Common_Body(ContentPart: part, Html: new HtmlString(bodyText));
if (!string.IsNullOrWhiteSpace(displayType))
body.Metadata.Type = string.Format("{0}.{1}", body.Metadata.Type, displayType);
var location = part.GetLocation(displayType);
return Combined(
Services.Authorizer.Authorize(Permissions.ChangeOwner) ? ContentPartTemplate(model, "Parts/Common.Body.ManageWrapperPre").LongestMatch(displayType, "SummaryAdmin").Location(location) : null,
Services.Authorizer.Authorize(Permissions.ChangeOwner) ? ContentPartTemplate(model, "Parts/Common.Body.Manage").LongestMatch(displayType, "SummaryAdmin").Location(location) : null,
ContentPartTemplate(model, TemplateName, Prefix).LongestMatch(displayType, "Summary", "SummaryAdmin").Location(location),
Services.Authorizer.Authorize(Permissions.ChangeOwner) ? ContentPartTemplate(model, "Parts/Common.Body.ManageWrapperPost").LongestMatch(displayType, "SummaryAdmin").Location(location) : null);
//return Combined(
// Services.Authorizer.Authorize(Permissions.ChangeOwner) ? ContentPartTemplate(model, "Parts/Common.Body.ManageWrapperPre").LongestMatch(displayType, "SummaryAdmin").Location(location) : null,
// Services.Authorizer.Authorize(Permissions.ChangeOwner) ? ContentPartTemplate(model, "Parts/Common.Body.Manage").LongestMatch(displayType, "SummaryAdmin").Location(location) : null,
// ContentPartTemplate(model, TemplateName, Prefix).LongestMatch(displayType, "Summary", "SummaryAdmin").Location(location),
// Services.Authorizer.Authorize(Permissions.ChangeOwner) ? ContentPartTemplate(model, "Parts/Common.Body.ManageWrapperPost").LongestMatch(displayType, "SummaryAdmin").Location(location) : null);
return ContentShape(body).Location(location);
}
protected override DriverResult Editor(BodyPart part) {
protected override DriverResult Editor(BodyPart part, dynamic shapeHelper) {
var model = BuildEditorViewModel(part);
var location = part.GetLocation("Editor");
return ContentPartTemplate(model, TemplateName, Prefix).Location(location);
}
protected override DriverResult Editor(BodyPart part, IUpdateModel updater) {
protected override DriverResult Editor(BodyPart part, IUpdateModel updater, dynamic shapeHelper) {
var model = BuildEditorViewModel(part);
updater.TryUpdateModel(model, Prefix, null, null);

14
src/Orchard.Web/Core/Common/Drivers/CommonPartDriver.cs
View File

@@ -35,19 +35,21 @@ namespace Orchard.Core.Common.Drivers {
public Localizer T { get; set; }
public IOrchardServices Services { get; set; }
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 Display(CommonPart part, string displayType, dynamic shapeHelper) {
var metadata = shapeHelper.Common_Metadata(ContentPart: part);
if (!string.IsNullOrWhiteSpace(displayType))
metadata.Metadata.Type = string.Format("{0}.{1}", metadata.Metadata.Type, displayType);
var location = part.GetLocation(displayType);
return ContentShape(metadata).Location(location);
}
protected override DriverResult Editor(CommonPart part) {
protected override DriverResult Editor(CommonPart part, dynamic shapeHelper) {
return Combined(
OwnerEditor(part, null),
ContainerEditor(part, null));
}
protected override DriverResult Editor(CommonPart instance, ContentManagement.IUpdateModel updater) {
protected override DriverResult Editor(CommonPart instance, IUpdateModel updater, dynamic shapeHelper) {
// this event is hooked so the modified timestamp is changed when an edit-post occurs.
instance.ModifiedUtc = _clock.UtcNow;
instance.VersionModifiedUtc = _clock.UtcNow;

8
src/Orchard.Web/Core/Common/Extensions/HtmlHelperExtensions.cs
View File

@@ -1,6 +1,6 @@
using System;
using System.Web.Mvc;
using Orchard.Core.Common.ViewModels;
using Orchard.Core.Contents.ViewModels;
using Orchard.Localization;
using Orchard.Mvc.Html;
@@ -15,11 +15,11 @@ namespace Orchard.Core.Common.Extensions {
}
public static LocalizedString PublishedWhenForModel(this HtmlHelper<CommonMetadataViewModel> htmlHelper, Localizer T) {
return htmlHelper.PublishedWhen(htmlHelper.ViewData.Model, T);
return htmlHelper.PublishedWhen(htmlHelper.ViewData.Model.VersionPublishedUtc, T);
}
public static LocalizedString PublishedWhen(this HtmlHelper htmlHelper, CommonMetadataViewModel metadata, Localizer T) {
return htmlHelper.DateTimeRelative(metadata.VersionPublishedUtc, T("as a Draft"), T);
public static LocalizedString PublishedWhen(this HtmlHelper htmlHelper, DateTime? versionPublishedUtc, Localizer T) {
return htmlHelper.DateTimeRelative(versionPublishedUtc, T("as a Draft"), T);
}
}
}

4
src/Orchard.Web/Core/Common/Handlers/CommonPartHandler.cs
View File

@@ -149,7 +149,7 @@ namespace Orchard.Core.Common.Handlers {
}
//private void GetEditor(BuildEditorModelContext context, CommonPart instance) {
//private void GetEditor(BuildEditorContext context, CommonPart instance) {
// var currentUser = _authenticationService.GetAuthenticatedUser();
// if (!_authorizationService.TryCheckAccess(Permissions.ChangeOwner, currentUser, instance)) {
// return;
@@ -162,7 +162,7 @@ namespace Orchard.Core.Common.Handlers {
//}
//private void UpdateEditor(UpdateEditorModelContext context, CommonPart instance) {
//private void UpdateEditor(UpdateEditorContext 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;

0
src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Body.Summary.cshtml → src/Orchard.Web/Core/Common/Views/Common.Body.Summary.cshtml
View File

0
src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Body.SummaryAdmin.cshtml → src/Orchard.Web/Core/Common/Views/Common.Body.SummaryAdmin.cshtml
View File

1
src/Orchard.Web/Core/Common/Views/Common.Body.cshtml Normal file
View File

@@ -0,0 +1 @@
@Model.Html

0
src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Metadata.SummaryAdmin.cshtml → src/Orchard.Web/Core/Common/Views/Common.Metadata.SummaryAdmin.cshtml
View File

0
src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Metadata.cshtml → src/Orchard.Web/Core/Common/Views/Common.Metadata.cshtml
View File

3
src/Orchard.Web/Core/Common/Views/DisplayTemplates/Parts/Common.Body.cshtml
View File

@@ -1,3 +0,0 @@
@model BodyDisplayViewModel
@using Orchard.Core.Common.ViewModels;
@Model.Html

10
src/Orchard.Web/Core/Contents/Controllers/AdminController.cs
View File

@@ -114,7 +114,7 @@ namespace Orchard.Core.Contents.Controllers {
var list = Shape.List();
list.AddRange(contentItems.Select(ci => _contentManager.BuildDisplayModel(ci, "SummaryAdmin")));
list.AddRange(contentItems.Select(ci => _contentManager.BuildDisplay(ci, "SummaryAdmin")));
var viewModel = Shape.ViewModel()
.ContentItems(list)
@@ -216,7 +216,7 @@ namespace Orchard.Core.Contents.Controllers {
if (!Services.Authorizer.Authorize(Permissions.PublishContent, contentItem, T("Cannot create content")))
return new HttpUnauthorizedResult();
var model = _contentManager.BuildEditorModel(contentItem);
var model = _contentManager.BuildEditor(contentItem);
return View(model);
}
@@ -229,7 +229,7 @@ namespace Orchard.Core.Contents.Controllers {
return new HttpUnauthorizedResult();
_contentManager.Create(contentItem, VersionOptions.Draft);
var model = _contentManager.UpdateEditorModel(contentItem, this);
var model = _contentManager.UpdateEditor(contentItem, this);
if (!ModelState.IsValid) {
_transactionManager.Cancel();
@@ -254,7 +254,7 @@ namespace Orchard.Core.Contents.Controllers {
if (!Services.Authorizer.Authorize(Permissions.EditOthersContent, contentItem, T("Cannot edit content")))
return new HttpUnauthorizedResult();
var model = _contentManager.BuildEditorModel(contentItem);
var model = _contentManager.BuildEditor(contentItem);
return View(model);
}
@@ -269,7 +269,7 @@ namespace Orchard.Core.Contents.Controllers {
if (!Services.Authorizer.Authorize(Permissions.EditOthersContent, contentItem, T("Couldn't edit content")))
return new HttpUnauthorizedResult();
var model = _contentManager.UpdateEditorModel(contentItem, this);
var model = _contentManager.UpdateEditor(contentItem, this);
if (!ModelState.IsValid) {
_transactionManager.Cancel();
return View("Edit", model);

4
src/Orchard.Web/Core/Contents/Controllers/ItemController.cs
View File

@@ -18,7 +18,7 @@ namespace Orchard.Core.Contents.Controllers {
// /Contents/Item/Display/72
public ActionResult Display(int id) {
var contentItem = _contentManager.Get(id, VersionOptions.Published);
var model = _contentManager.BuildDisplayModel(contentItem);
var model = _contentManager.BuildDisplay(contentItem);
return View(model);
}
@@ -30,7 +30,7 @@ namespace Orchard.Core.Contents.Controllers {
versionOptions = VersionOptions.Number((int)version);
var contentItem = _contentManager.Get(id, versionOptions);
var model = _contentManager.BuildDisplayModel(contentItem);
var model = _contentManager.BuildDisplay(contentItem);
return View("Display", model);
}
}

10
src/Orchard.Web/Core/Contents/Drivers/ContentsDriver.cs
View File

@@ -1,13 +1,15 @@
using Orchard.ContentManagement;
using Orchard.ContentManagement.Drivers;
using Orchard.Core.Contents.ViewModels;
using Orchard.Core.ContentsLocation.Models;
namespace Orchard.Core.Contents.Drivers {
public class ContentsDriver : ContentPartDriver<ContentPart> {
protected override DriverResult Display(ContentPart part, string displayType) {
var location = part.GetLocation(displayType, "secondary", null);
return ContentPartTemplate(new PublishContentViewModel(part.ContentItem), "Parts/Contents.Publish").LongestMatch(displayType, "Summary", "SummaryAdmin").Location(location);
protected override DriverResult Display(ContentPart part, string displayType, dynamic shapeHelper) {
var publish = shapeHelper.Contents_Publish(ContentPart: part);
if (!string.IsNullOrWhiteSpace(displayType))
publish.Metadata.Type = string.Format("{0}.{1}", publish.Metadata.Type, displayType);
var location = part.GetLocation(displayType, "Secondary", "5");
return ContentShape(publish).Location(location);
}
}
}

0
src/Orchard.Web/Core/Contents/Views/DisplayTemplates/Parts/Contents.Publish.SummaryAdmin.cshtml → src/Orchard.Web/Core/Contents/Views/Contents.Publish.SummaryAdmin.cshtml
View File

0
src/Orchard.Web/Core/Contents/Views/DisplayTemplates/Parts/Contents.Publish.cshtml → src/Orchard.Web/Core/Contents/Views/Contents.Publish.cshtml
View File

6
src/Orchard.Web/Core/Localization/Controllers/AdminController.cs
View File

@@ -67,7 +67,7 @@ namespace Orchard.Core.Localization.Controllers {
Id = id,
SelectedCulture = selectedCulture,
SiteCultures = siteCultures,
Content = _contentManager.BuildEditorModel(contentItem)
Content = _contentManager.BuildEditor(contentItem)
};
Services.TransactionManager.Cancel();
@@ -104,13 +104,13 @@ namespace Orchard.Core.Localization.Controllers {
}
}
model.Content = _contentManager.UpdateEditorModel(contentItemTranslation, this);
model.Content = _contentManager.UpdateEditor(contentItemTranslation, this);
if (!ModelState.IsValid) {
Services.TransactionManager.Cancel();
model.SiteCultures = _cultureManager.ListCultures().Where(s => s != _localizationService.GetContentCulture(contentItem) && s != _cultureManager.GetSiteCulture());
contentItem.As<LocalizationPart>().Culture.Culture = null;
model.Content = _contentManager.BuildEditorModel(contentItem);
model.Content = _contentManager.BuildEditor(contentItem);
return View(model);
}

18
src/Orchard.Web/Core/Localization/Drivers/LocalizationPartDriver.cs
View File

@@ -22,15 +22,15 @@ namespace Orchard.Core.Localization.Drivers {
_localizationService = localizationService;
}
protected override DriverResult Display(LocalizationPart part, string displayType) {
var model = new ContentLocalizationsViewModel(part) {
Localizations = GetDisplayLocalizations(part)
};
return ContentPartTemplate(model, "Parts/Localization.ContentTranslations", TemplatePrefix).LongestMatch(displayType, "Summary", "SummaryAdmin").Location(part.GetLocation(displayType));
protected override DriverResult Display(LocalizationPart part, string displayType, dynamic shapeHelper) {
var contentTranslations = shapeHelper.Localization_ContentTranslations(ContentPart: part, Localizations: GetDisplayLocalizations(part));
if (!string.IsNullOrWhiteSpace(displayType))
contentTranslations.Metadata.Type = string.Format("{0}.{1}", contentTranslations.Metadata.Type, displayType);
var location = part.GetLocation(displayType);
return ContentShape(contentTranslations).Location(location);
}
protected override DriverResult Editor(LocalizationPart part) {
protected override DriverResult Editor(LocalizationPart part, dynamic shapeHelper) {
var localizations = GetEditorLocalizations(part).ToList();
var model = new EditLocalizationViewModel {
SelectedCulture = part.Culture != null ? part.Culture.Culture : null,
@@ -43,13 +43,13 @@ namespace Orchard.Core.Localization.Drivers {
return ContentPartTemplate(model, "Parts/Localization.Translation", TemplatePrefix).Location(part.GetLocation("Editor"));
}
protected override DriverResult Editor(LocalizationPart part, IUpdateModel updater) {
protected override DriverResult Editor(LocalizationPart part, IUpdateModel updater, dynamic shapeHelper) {
var model = new EditLocalizationViewModel();
if (updater != null && updater.TryUpdateModel(model, TemplatePrefix, null, null)) {
_localizationService.SetContentCulture(part, model.SelectedCulture);
}
return Editor(part);
return Editor(part, shapeHelper);
}
private IEnumerable<LocalizationPart> GetDisplayLocalizations(LocalizationPart part) {

12
src/Orchard.Web/Core/Localization/Views/DisplayTemplates/Parts/Localization.ContentTranslations.cshtml
View File

@@ -1,12 +0,0 @@
@model Orchard.Core.Localization.ViewModels.ContentLocalizationsViewModel
@{
Style.Require("Localization");
}
@if (Model.Localizations.Count() > 0) {
<div class="content-localization">
<div class="content-localizations">
<h4>@T("Translations:")</h4>
@Html.UnorderedList(Model.Localizations, (c, i) => Html.ItemDisplayLink(c.Culture.Culture, c), "localizations")
</div>
</div>
}

0
src/Orchard.Web/Core/Localization/Views/DisplayTemplates/Parts/Localization.ContentTranslations.Summary.cshtml → src/Orchard.Web/Core/Localization/Views/Localization.ContentTranslations.Summary.cshtml
View File

0
src/Orchard.Web/Core/Localization/Views/DisplayTemplates/Parts/Localization.ContentTranslations.SummaryAdmin.cshtml → src/Orchard.Web/Core/Localization/Views/Localization.ContentTranslations.SummaryAdmin.cshtml
View File

13
src/Orchard.Web/Core/Localization/Views/Localization.ContentTranslations.cshtml Normal file
View File

@@ -0,0 +1,13 @@
@using Orchard.Core.Localization.Models;
@{
Style.Require("Localization");
IEnumerable<LocalizationPart> localizations = Model.Localizations;
}
@if (localizations != null && localizations.Count() > 0) {
<div class="content-localization">
<div class="content-localizations">
<h4>@T("Translations:")</h4>
@Html.UnorderedList(localizations, (c, i) => Html.ItemDisplayLink(c.Culture.Culture, c), "localizations")
</div>
</div>
}

4
src/Orchard.Web/Core/Messaging/Drivers/MessageSettingsPartDriver.cs
View File

@@ -22,7 +22,7 @@ namespace Orchard.Core.Messaging.Drivers {
protected override string Prefix { get { return "MessageSettings"; } }
protected override DriverResult Editor(MessageSettingsPart part) {
protected override DriverResult Editor(MessageSettingsPart part, dynamic shapeHelper) {
var model = new MessageSettingsPartViewModel {
ChannelServices = _messageQueueManager.GetAvailableChannelServices(),
@@ -32,7 +32,7 @@ namespace Orchard.Core.Messaging.Drivers {
return ContentPartTemplate(model, "Parts/Messaging.MessageSettings");
}
protected override DriverResult Editor(MessageSettingsPart part, IUpdateModel updater) {
protected override DriverResult Editor(MessageSettingsPart part, IUpdateModel updater, dynamic shapeHelper) {
var model = new MessageSettingsPartViewModel {
MessageSettings = part
};

2
src/Orchard.Web/Core/Navigation/Controllers/AdminController.cs
View File

@@ -87,7 +87,7 @@ namespace Orchard.Core.Navigation.Controllers {
return new HttpUnauthorizedResult();
var menuPart = _services.ContentManager.New<MenuPart>("MenuItem");
model.MenuItem = _services.ContentManager.UpdateEditorModel(menuPart, this);
model.MenuItem = _services.ContentManager.UpdateEditor(menuPart, this);
if (!ModelState.IsValid) {
_services.TransactionManager.Cancel();

2
src/Orchard.Web/Core/Navigation/Drivers/MenuItemPartDriver.cs
View File

@@ -15,7 +15,7 @@ namespace Orchard.Core.Navigation.Drivers {
_workContextAccessor = workContextAccessor;
}
protected override DriverResult Editor(MenuItemPart itemPart, IUpdateModel updater) {
protected override DriverResult Editor(MenuItemPart itemPart, IUpdateModel updater, dynamic shapeHelper) {
//todo: (heskew) need context
var currentUser = _workContextAccessor.GetContext().CurrentUser;

4
src/Orchard.Web/Core/Navigation/Drivers/MenuPartDriver.cs
View File

@@ -24,14 +24,14 @@ namespace Orchard.Core.Navigation.Drivers {
public virtual IUser CurrentUser { get; set; }
public Localizer T { get; set; }
protected override DriverResult Editor(MenuPart part) {
protected override DriverResult Editor(MenuPart part, dynamic shapeHelper) {
if (!_authorizationService.TryCheckAccess(Permissions.ManageMainMenu, CurrentUser, part))
return null;
return ContentPartTemplate(part, "Parts/Navigation.EditMenuPart").Location(part.GetLocation("Editor"));
}
protected override DriverResult Editor(MenuPart part, IUpdateModel updater) {
protected override DriverResult Editor(MenuPart part, IUpdateModel updater, dynamic shapeHelper) {
if (!_authorizationService.TryCheckAccess(Permissions.ManageMainMenu, CurrentUser, part)) {
return null;
}

28
src/Orchard.Web/Core/Orchard.Core.csproj
View File

@@ -132,7 +132,7 @@
<Compile Include="Reports\ViewModels\DisplayReportViewModel.cs" />
<Compile Include="Reports\ViewModels\ReportsAdminIndexViewModel.cs" />
<Compile Include="Routable\Controllers\ItemController.cs" />
<Compile Include="Routable\DataMigrations\RoutableDataMigration.cs" />
<Compile Include="Routable\Migrations.cs" />
<Compile Include="Routable\Drivers\RoutePartDriver.cs" />
<Compile Include="Routable\Handlers\RoutePartHandler.cs" />
<Compile Include="Routable\IRoutablePathConstraint.cs" />
@@ -254,12 +254,12 @@
<Content Include="Common\Views\DefinitionTemplates\BodyTypePartSettings.cshtml" />
<Content Include="Common\Views\DefinitionTemplates\BodyPartSettings.cshtml" />
<Content Include="Common\Views\DisplayTemplates\Fields\Common.TextField.cshtml" />
<Content Include="Common\Views\DisplayTemplates\Parts\Common.Body.SummaryAdmin.cshtml" />
<Content Include="Common\Views\Common.Body.SummaryAdmin.cshtml" />
<Content Include="Common\Views\DisplayTemplates\Parts\Common.Body.Manage.SummaryAdmin.cshtml" />
<Content Include="Common\Views\DisplayTemplates\Parts\Common.Body.ManageWrapperPost.SummaryAdmin.cshtml" />
<Content Include="Common\Views\DisplayTemplates\Parts\Common.Body.ManageWrapperPre.SummaryAdmin.cshtml" />
<Content Include="Common\Views\DisplayTemplates\Parts\Common.Metadata.cshtml" />
<Content Include="Common\Views\DisplayTemplates\Parts\Common.Metadata.SummaryAdmin.cshtml" />
<Content Include="Common\Views\Common.Metadata.cshtml" />
<Content Include="Common\Views\Common.Metadata.SummaryAdmin.cshtml" />
<Content Include="ContentsLocation\Module.txt" />
<Content Include="ContentsLocation\Styles\admin.css" />
<Content Include="ContentsLocation\Views\DefinitionTemplates\LocationSettings.cshtml" />
@@ -268,8 +268,8 @@
<Content Include="Contents\Views\Admin\List.cshtml" />
<Content Include="Feeds\Views\Feed.cshtml" />
<Content Include="Localization\Views\EditorTemplates\Parts\Localization.Translation.cshtml" />
<Content Include="Contents\Views\DisplayTemplates\Parts\Contents.Publish.cshtml" />
<Content Include="Contents\Views\DisplayTemplates\Parts\Contents.Publish.SummaryAdmin.cshtml" />
<Content Include="Contents\Views\Contents.Publish.cshtml" />
<Content Include="Contents\Views\Contents.Publish.SummaryAdmin.cshtml" />
<Content Include="Messaging\Module.txt" />
<Content Include="Messaging\Views\EditorTemplates\Parts\Messaging.MessageSettings.cshtml" />
<Content Include="PublishLater\Content\Admin\images\draft.gif" />
@@ -277,8 +277,8 @@
<Content Include="PublishLater\Content\Admin\images\online.gif" />
<Content Include="PublishLater\Content\Admin\images\published.gif" />
<Content Include="PublishLater\Content\Admin\images\scheduled.gif" />
<Content Include="PublishLater\Views\DisplayTemplates\Parts\PublishLater.Metadata.cshtml" />
<Content Include="PublishLater\Views\DisplayTemplates\Parts\PublishLater.Metadata.SummaryAdmin.cshtml" />
<Content Include="PublishLater\Views\PublishLater.Metadata.cshtml" />
<Content Include="PublishLater\Views\PublishLater.Metadata.SummaryAdmin.cshtml" />
<Content Include="Common\Views\EditorTemplates\Fields\Common.TextField.cshtml" />
<Content Include="Common\Views\EditorTemplates\Parts\Common.Container.cshtml" />
<Content Include="Common\Views\EditorTemplates\PlainTextEditor.cshtml" />
@@ -286,8 +286,8 @@
<Content Include="Contents\Views\Admin\CreatableTypeList.cshtml" />
<Content Include="Localization\Styles\admin.css" />
<Content Include="Localization\Styles\base.css" />
<Content Include="Localization\Views\DisplayTemplates\Parts\Localization.ContentTranslations.Summary.cshtml" />
<Content Include="Localization\Views\DisplayTemplates\Parts\Localization.ContentTranslations.cshtml" />
<Content Include="Localization\Views\Localization.ContentTranslations.Summary.cshtml" />
<Content Include="Localization\Views\Localization.ContentTranslations.cshtml" />
<Content Include="PublishLater\Module.txt" />
<Content Include="PublishLater\Styles\datetime.css" />
<Content Include="PublishLater\Views\EditorTemplates\Parts\PublishLater.cshtml" />
@@ -296,12 +296,11 @@
<Content Include="Reports\Views\Admin\Index.cshtml" />
<Content Include="Localization\Module.txt" />
<Content Include="Localization\Views\Admin\Translate.cshtml" />
<Content Include="Localization\Views\DisplayTemplates\Parts\Localization.ContentTranslations.SummaryAdmin.cshtml" />
<Content Include="Localization\Views\Localization.ContentTranslations.SummaryAdmin.cshtml" />
<Content Include="Localization\Views\CultureSelection.cshtml" />
<Content Include="Routable\Module.txt" />
<Content Include="Routable\Scripts\jquery.slugify.js" />
<Content Include="Routable\Views\EditorTemplates\Parts\Routable.RoutePart.cshtml" />
<Content Include="Routable\Views\DisplayTemplates\Parts\Routable.RoutePart.cshtml" />
<Content Include="Settings\Module.txt" />
<Content Include="Settings\Styles\admin.css" />
<Content Include="Settings\Views\Admin\Index.cshtml" />
@@ -346,7 +345,7 @@
<Content Include="Common\Views\Web.config" />
</ItemGroup>
<ItemGroup>
<Content Include="Common\Views\DisplayTemplates\Parts\Common.Body.cshtml" />
<Content Include="Common\Views\Common.Body.cshtml" />
<Content Include="Common\Views\EditorTemplates\Parts\Common.Body.cshtml" />
<Content Include="Common\Views\EditorTemplates\Parts\Common.Owner.cshtml" />
<Content Include="Feeds\Module.txt" />
@@ -362,7 +361,7 @@
<Content Include="Navigation\Views\Web.config" />
</ItemGroup>
<ItemGroup>
<Content Include="Common\Views\DisplayTemplates\Parts\Common.Body.Summary.cshtml" />
<Content Include="Common\Views\Common.Body.Summary.cshtml" />
<Content Include="Common\Views\DisplayTemplates\Parts\Common.Body.ManageWrapperPost.cshtml" />
<Content Include="Common\Views\DisplayTemplates\Parts\Common.Body.ManageWrapperPre.cshtml" />
<Content Include="Common\Views\DisplayTemplates\Parts\Common.Body.Manage.cshtml" />
@@ -391,6 +390,7 @@
<Content Include="Shapes\Views\MenuItem.cshtml" />
<Content Include="Shapes\Views\Web.config" />
<Content Include="Dashboard\Views\Helper\Index.cshtml" />
<Content Include="Routable\Views\Routable.RoutePart.cshtml" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />

16
src/Orchard.Web/Core/PublishLater/Drivers/PublishLaterPartDriver.cs
View File

@@ -7,7 +7,6 @@ using Orchard.Core.PublishLater.Models;
using Orchard.Core.PublishLater.Services;
using Orchard.Core.PublishLater.ViewModels;
using Orchard.Localization;
using Orchard.UI.Notify;
namespace Orchard.Core.PublishLater.Drivers {
public class PublishLaterPartDriver : ContentPartDriver<PublishLaterPart> {
@@ -28,18 +27,19 @@ namespace Orchard.Core.PublishLater.Drivers {
public Localizer T { get; set; }
public IOrchardServices Services { get; set; }
protected override DriverResult Display(PublishLaterPart part, string displayType) {
var model = new PublishLaterViewModel(part) {
ScheduledPublishUtc = part.ScheduledPublishUtc.Value
};
return ContentPartTemplate(model, "Parts/PublishLater.Metadata").LongestMatch(displayType, "Summary", "SummaryAdmin").Location(part.GetLocation(displayType));
protected override DriverResult Display(PublishLaterPart part, string displayType, dynamic shapeHelper) {
var metadata = shapeHelper.PublishLater_Metadata(ContentPart: part, ScheduledPublishUtc: part.ScheduledPublishUtc.Value);
if (!string.IsNullOrWhiteSpace(displayType))
metadata.Metadata.Type = string.Format("{0}.{1}", metadata.Metadata.Type, displayType);
var location = part.GetLocation(displayType);
return ContentShape(metadata).Location(location);
}
protected override DriverResult Editor(PublishLaterPart part) {
protected override DriverResult Editor(PublishLaterPart part, dynamic shapeHelper) {
return PublishEditor(part, null);
}
protected override DriverResult Editor(PublishLaterPart instance, IUpdateModel updater) {
protected override DriverResult Editor(PublishLaterPart instance, IUpdateModel updater, dynamic shapeHelper) {
return PublishEditor(instance, updater);
}

0
src/Orchard.Web/Core/PublishLater/Views/DisplayTemplates/Parts/PublishLater.Metadata.SummaryAdmin.cshtml → src/Orchard.Web/Core/PublishLater/Views/PublishLater.Metadata.SummaryAdmin.cshtml
View File

0
src/Orchard.Web/Core/PublishLater/Views/DisplayTemplates/Parts/PublishLater.Metadata.cshtml → src/Orchard.Web/Core/PublishLater/Views/PublishLater.Metadata.cshtml
View File

4
src/Orchard.Web/Core/Routable/Controllers/ItemController.cs
View File

@@ -43,7 +43,7 @@ namespace Orchard.Core.Routable.Controllers {
throw new ApplicationException("Ambiguous content");
}
var model = _contentManager.BuildDisplayModel<IRoutableAspect>(hits.Single());
var model = _contentManager.BuildDisplay(hits.Single());
return View(model);
}
@@ -66,7 +66,7 @@ namespace Orchard.Core.Routable.Controllers {
}
}
_contentManager.UpdateEditorModel(contentItem, this);
_contentManager.UpdateEditor(contentItem, this);
_transactionManager.Cancel();
return Json(contentItem.As<IRoutableAspect>().Slug ?? slug);

26
src/Orchard.Web/Core/Routable/Drivers/RoutePartDriver.cs
View File

@@ -1,4 +1,5 @@
using System.Collections.Generic;
using System;
using System.Collections.Generic;
using System.Linq;
using JetBrains.Annotations;
using Orchard.ContentManagement;
@@ -35,7 +36,7 @@ namespace Orchard.Core.Routable.Drivers {
get { return "Routable"; }
}
int? GetContainerId(IContent item) {
static int? GetContainerId(IContent item) {
var commonPart = item.As<ICommonPart>();
if (commonPart != null && commonPart.Container != null) {
return commonPart.Container.ContentItem.Id;
@@ -43,18 +44,15 @@ namespace Orchard.Core.Routable.Drivers {
return null;
}
protected override DriverResult Display(RoutePart part, string displayType) {
var model = new RoutableDisplayViewModel {RoutePart = part};
var location = part.GetLocation(displayType);
//todo: give this part a default location
if (location == null || location.Zone == null)
location = new ContentLocation {Position = "5", Zone = "Header"};
return ContentPartTemplate(model, TemplateName, Prefix).LongestMatch(displayType, "Summary", "SummaryAdmin").Location(location);
protected override DriverResult Display(RoutePart part, string displayType, dynamic shapeHelper) {
var routePart = shapeHelper.Routable_RoutePart(ContentPart: part, Title: part.Title);
if (!string.IsNullOrWhiteSpace(displayType))
routePart.Metadata.Type = string.Format("{0}.{1}", routePart.Metadata.Type, displayType);
var location = part.GetLocation(displayType, "Header", "5");
return ContentShape(routePart).Location(location);
}
protected override DriverResult Editor(RoutePart part) {
protected override DriverResult Editor(RoutePart part, dynamic shapeHelper) {
var model = new RoutableEditorViewModel {
ContentType = part.ContentItem.ContentType,
Id = part.ContentItem.Id,
@@ -81,7 +79,7 @@ namespace Orchard.Core.Routable.Drivers {
return ContentPartTemplate(model, TemplateName, Prefix).Location(location);
}
protected override DriverResult Editor(RoutePart part, IUpdateModel updater) {
protected override DriverResult Editor(RoutePart part, IUpdateModel updater, dynamic shapeHelper) {
var model = new RoutableEditorViewModel();
updater.TryUpdateModel(model, Prefix, null, null);
@@ -105,7 +103,7 @@ namespace Orchard.Core.Routable.Drivers {
CurrentSite.HomePage = _routableHomePageProvider.GetSettingValue(part.ContentItem.Id);
}
return Editor(part);
return Editor(part, shapeHelper);
}
}
}

4
src/Orchard.Web/Core/Routable/Handlers/RoutePartHandler.cs
View File

@@ -48,8 +48,8 @@ namespace Orchard.Core.Routable.Handlers {
OnIndexing<RoutePart>((context, part) => context.DocumentIndex.Add("title", part.Record.Title).RemoveTags().Analyze());
}
private static void SetModelProperties(BuildModelContext context, RoutePart routable) {
var item = context.Model;
private static void SetModelProperties(BuildShapeContext context, RoutePart routable) {
var item = context.Shape;
item.Title = routable.Title;
item.Slug = routable.Slug;
item.Path = routable.Path;

4
src/Orchard.Web/Core/Routable/DataMigrations/RoutableDataMigration.cs → src/Orchard.Web/Core/Routable/Migrations.cs
View File

@@ -6,8 +6,8 @@ using Orchard.Core.Contents.Extensions;
using Orchard.Core.Routable.Models;
using Orchard.Data.Migration;
namespace Orchard.Core.Routable.DataMigrations {
public class RoutableDataMigration : DataMigrationImpl {
namespace Orchard.Core.Routable {
public class Migrations : DataMigrationImpl {
public int Create() {
//CREATE TABLE Routable_RoutableRecord (Id INTEGER not null, Title TEXT, Slug TEXT, Path TEXT, ContentItemRecord_id INTEGER, primary key (Id));

2
src/Orchard.Web/Core/Routable/Services/RoutableHomePageProvider.cs
View File

@@ -37,7 +37,7 @@ namespace Orchard.Core.Routable.Services {
if (contentItem == null || !contentItem.Is<RoutePart>())
return new NotFoundResult();
var model = _contentManager.BuildDisplayModel(contentItem);
var model = _contentManager.BuildDisplay(contentItem);
return new ViewResult {
ViewName = "Display",

2
src/Orchard.Web/Core/Routable/Views/DisplayTemplates/Parts/Routable.RoutePart.cshtml
View File

@@ -1,2 +0,0 @@
@model Orchard.Core.Routable.ViewModels.RoutableDisplayViewModel
<h1>@Model.Title</h1>

1
src/Orchard.Web/Core/Routable/Views/Routable.RoutePart.cshtml Normal file
View File

@@ -0,0 +1 @@
<h1>@Model.Title</h1>

4
src/Orchard.Web/Core/Settings/Controllers/AdminController.cs
View File

@@ -36,7 +36,7 @@ namespace Orchard.Core.Settings.Controllers {
if (!Services.Authorizer.Authorize(Permissions.ManageSettings, T("Not authorized to manage settings")))
return new HttpUnauthorizedResult();
var model = Services.ContentManager.BuildEditorModel(_siteService.GetSiteSettings());
var model = Services.ContentManager.BuildEditor(_siteService.GetSiteSettings());
return View(model);
}
@@ -47,7 +47,7 @@ namespace Orchard.Core.Settings.Controllers {
return new HttpUnauthorizedResult();
var site = _siteService.GetSiteSettings();
var model = Services.ContentManager.UpdateEditorModel(site, this);
var model = Services.ContentManager.UpdateEditor(site, this);
if (!ModelState.IsValid) {
Services.TransactionManager.Cancel();

4
src/Orchard.Web/Core/Settings/Drivers/SiteSettingsPartDriver.cs
View File

@@ -19,7 +19,7 @@ namespace Orchard.Core.Settings.Drivers {
protected override string Prefix { get { return "SiteSettings"; } }
protected override DriverResult Editor(SiteSettingsPart part) {
protected override DriverResult Editor(SiteSettingsPart part, dynamic shapeHelper) {
var site = _siteService.GetSiteSettings().As<SiteSettingsPart>();
var model = new SiteSettingsPartViewModel {
@@ -30,7 +30,7 @@ namespace Orchard.Core.Settings.Drivers {
return ContentPartTemplate(model, "Parts/Settings.SiteSettingsPart");
}
protected override DriverResult Editor(SiteSettingsPart part, IUpdateModel updater) {
protected override DriverResult Editor(SiteSettingsPart part, IUpdateModel updater, dynamic shapeHelper) {
var site = _siteService.GetSiteSettings().As<SiteSettingsPart>();
var model = new SiteSettingsPartViewModel { Site = site };

15
src/Orchard.Web/Modules/Orchard.ArchiveLater/Drivers/ArchiveLaterPartDriver.cs
View File

@@ -28,18 +28,19 @@ namespace ArchiveLater.Drivers {
public Localizer T { get; set; }
public IOrchardServices Services { get; set; }
protected override DriverResult Display(ArchiveLaterPart part, string displayType) {
var model = new ArchiveLaterViewModel(part) {
ScheduledArchiveUtc = part.ScheduledArchiveUtc.Value
};
return ContentPartTemplate(model, "Parts/ArchiveLater.Metadata").LongestMatch(displayType, "Summary", "SummaryAdmin").Location(part.GetLocation(displayType));
protected override DriverResult Display(ArchiveLaterPart part, string displayType, dynamic shapeHelper) {
var metadata = shapeHelper.ArchiveLater_Metadata(ContentPart: part, ScheduledArchiveUtc: part.ScheduledArchiveUtc.Value);
if (!string.IsNullOrWhiteSpace(displayType))
metadata.Metadata.Type = string.Format("{0}.{1}", metadata.Metadata.Type, displayType);
var location = part.GetLocation(displayType);
return ContentShape(metadata).Location(location);
}
protected override DriverResult Editor(ArchiveLaterPart part) {
protected override DriverResult Editor(ArchiveLaterPart part, dynamic shapeHelper) {
return ArchiveEditor(part, null);
}
protected override DriverResult Editor(ArchiveLaterPart instance, IUpdateModel updater) {
protected override DriverResult Editor(ArchiveLaterPart instance, IUpdateModel updater, dynamic shapeHelper) {
return ArchiveEditor(instance, updater);
}

4
src/Orchard.Web/Modules/Orchard.ArchiveLater/Orchard.ArchiveLater.csproj
View File

@@ -98,8 +98,8 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Content Include="Views\DisplayTemplates\Parts\ArchiveLater.Metadata.cshtml" />
<Content Include="Views\DisplayTemplates\Parts\ArchiveLater.Metadata.SummaryAdmin.cshtml" />
<Content Include="Views\ArchiveLater.Metadata.cshtml" />
<Content Include="Views\ArchiveLater.Metadata.SummaryAdmin.cshtml" />
<Content Include="Views\EditorTemplates\Parts\ArchiveLater.cshtml" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

0
src/Orchard.Web/Modules/Orchard.ArchiveLater/Views/DisplayTemplates/Parts/ArchiveLater.Metadata.SummaryAdmin.cshtml → src/Orchard.Web/Modules/Orchard.ArchiveLater/Views/ArchiveLater.Metadata.SummaryAdmin.cshtml
View File

0
src/Orchard.Web/Modules/Orchard.ArchiveLater/Views/DisplayTemplates/Parts/ArchiveLater.Metadata.cshtml → src/Orchard.Web/Modules/Orchard.ArchiveLater/Views/ArchiveLater.Metadata.cshtml
View File

12
src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogAdminController.cs
View File

@@ -52,7 +52,7 @@ namespace Orchard.Blogs.Controllers {
if (blog == null)
return new NotFoundResult();
var model = Services.ContentManager.BuildEditorModel(blog);
var model = Services.ContentManager.BuildEditor(blog);
return View(model);
}
@@ -64,7 +64,7 @@ namespace Orchard.Blogs.Controllers {
return new HttpUnauthorizedResult();
_contentManager.Create(blog, VersionOptions.Draft);
var model = _contentManager.UpdateEditorModel(blog, this);
var model = _contentManager.UpdateEditor(blog, this);
if (!ModelState.IsValid) {
_transactionManager.Cancel();
@@ -88,7 +88,7 @@ namespace Orchard.Blogs.Controllers {
if (blog == null)
return new NotFoundResult();
var model = Services.ContentManager.BuildEditorModel(blog);
var model = Services.ContentManager.BuildEditor(blog);
return View(model);
}
@@ -102,7 +102,7 @@ namespace Orchard.Blogs.Controllers {
if (blog == null)
return new NotFoundResult();
var model = Services.ContentManager.UpdateEditorModel(blog, this);
var model = Services.ContentManager.UpdateEditor(blog, this);
if (!ModelState.IsValid)
return View(model);
@@ -132,7 +132,7 @@ namespace Orchard.Blogs.Controllers {
var list = Shape.List();
list.AddRange(_blogService.Get()
.Select(b => {
var blog = Services.ContentManager.BuildDisplayModel(b, "SummaryAdmin.Blog");
var blog = Services.ContentManager.BuildDisplay(b, "SummaryAdmin.Blog");
blog.TotalPostCount = _blogPostService.Get(b, VersionOptions.Latest).Count();
return blog;
}));
@@ -151,7 +151,7 @@ namespace Orchard.Blogs.Controllers {
return new NotFoundResult();
//TODO: (erikpo) Need to make templatePath be more convention based so if my controller name has "Admin" in it then "Admin/{type}" is assumed
var model = Services.ContentManager.BuildDisplayModel(blogPart, "Admin.Blog");
var model = Services.ContentManager.BuildDisplay(blogPart, "Admin.Blog");
return View(model);
}

5
src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogController.cs
View File

@@ -32,7 +32,7 @@ namespace Orchard.Blogs.Controllers {
protected ILogger Logger { get; set; }
public ActionResult List() {
var blogs = _blogService.Get().Select(b => _services.ContentManager.BuildDisplayModel(b, "Summary.Blog"));
var blogs = _blogService.Get().Select(b => _services.ContentManager.BuildDisplay(b, "Summary.Blog"));
var list = Shape.List();
list.AddRange(blogs);
@@ -53,7 +53,8 @@ namespace Orchard.Blogs.Controllers {
if (blog == null)
return new NotFoundResult();
var model = _services.ContentManager.BuildDisplayModel(blog, "Blog");
//todo: (heskew) "Blog" should be an alternative instead of a display type
var model = _services.ContentManager.BuildDisplay(blog, "Blog");
return View(model);
}

8
src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogPostAdminController.cs
View File

@@ -34,7 +34,7 @@ namespace Orchard.Blogs.Controllers {
if (blogPost.BlogPart == null)
return new NotFoundResult();
var model = Services.ContentManager.BuildEditorModel(blogPost);
var model = Services.ContentManager.BuildEditor(blogPost);
//todo: (heskew) unhack
model.Metadata.Type += ".BlogPost";
@@ -52,7 +52,7 @@ namespace Orchard.Blogs.Controllers {
return new NotFoundResult();
Services.ContentManager.Create(blogPost, VersionOptions.Draft);
var model = Services.ContentManager.UpdateEditorModel(blogPost, this);
var model = Services.ContentManager.UpdateEditor(blogPost, this);
if (!ModelState.IsValid) {
Services.TransactionManager.Cancel();
@@ -80,7 +80,7 @@ namespace Orchard.Blogs.Controllers {
if (post == null)
return new NotFoundResult();
var model = Services.ContentManager.BuildEditorModel(post);
var model = Services.ContentManager.BuildEditor(post);
//todo: (heskew) unhack
model.Metadata.Type += ".BlogPost";
@@ -103,7 +103,7 @@ namespace Orchard.Blogs.Controllers {
return new NotFoundResult();
// Validate form input
var model = Services.ContentManager.UpdateEditorModel(blogPost, this);
var model = Services.ContentManager.UpdateEditor(blogPost, this);
if (!ModelState.IsValid) {
Services.TransactionManager.Cancel();
return View(model);

4
src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogPostController.cs
View File

@@ -51,7 +51,7 @@ namespace Orchard.Blogs.Controllers {
if (postPart == null)
return new NotFoundResult();
var model = _services.ContentManager.BuildDisplayModel(postPart, "BlogPost");
var model = _services.ContentManager.BuildDisplay(postPart, "BlogPost");
return View(model);
}
@@ -66,7 +66,7 @@ namespace Orchard.Blogs.Controllers {
var archive = new ArchiveData(archiveData);
var list = Shape.List();
list.AddRange(_blogPostService.Get(blogPart, archive).Select(b => _services.ContentManager.BuildDisplayModel(b, "Summary.BlogPost")));
list.AddRange(_blogPostService.Get(blogPart, archive).Select(b => _services.ContentManager.BuildDisplay(b, "Summary.BlogPost")));
_feedManager.Register(blogPart);

48
src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogPartDriver.cs
View File

@@ -34,38 +34,50 @@ namespace Orchard.Blogs.Drivers {
protected override string Prefix { get { return ""; } }
protected override DriverResult Display(BlogPart blogPart, string displayType) {
protected override DriverResult Display(BlogPart part, string displayType, dynamic shapeHelper) {
var driverResults = new List<DriverResult>();
var metadata = shapeHelper.Blogs_Blog_Manage(ContentPart: part);
metadata.Metadata.Type = "Blogs_Blog.Manage";
driverResults.Add(ContentShape(metadata).Location("manage"));
var description = shapeHelper.Blogs_Blog_Description(ContentPart: part);
description.Metadata.Type = "Blogs_Blog.Description";
driverResults.Add(ContentShape(description).Location("manage", "after"));
IEnumerable<dynamic > blogPosts = null;
if (displayType.StartsWith("Admin")) {
blogPosts = _blogPostService.Get(blogPart, VersionOptions.Latest)
.Select(bp => _contentManager.BuildDisplayModel(bp, "SummaryAdmin.BlogPost"));
var list = shapeHelper.List();
list.AddRange(_blogPostService.Get(part, VersionOptions.Latest)
.Select(bp => _contentManager.BuildDisplay(bp, "SummaryAdmin.BlogPost")));
var blogPostList = shapeHelper.Blogs_BlogPost_List(ContentPart: part, BlogPosts: list);
blogPostList.Metadata.Type = "Blogs_BlogPost.List.Admin";
var contentShape = ContentShape(blogPostList).Location("primary");
driverResults.Add(contentShape);
}
else if (!displayType.Contains("Summary")) {
blogPosts = _blogPostService.Get(blogPart)
.Select(bp => _contentManager.BuildDisplayModel(bp, "Summary.BlogPost"));
_feedManager.Register(blogPart);
var list = shapeHelper.List();
list.AddRange(_blogPostService.Get(part)
.Select(bp => _contentManager.BuildDisplay(bp, "Summary.BlogPost")));
var blogPostList = shapeHelper.Blogs_BlogPost_List(ContentPart: part, BlogPosts: list);
blogPostList.Metadata.Type = "Blogs_BlogPost.List";
var contentShape = ContentShape(blogPostList).Location("primary");
driverResults.Add(contentShape);
_feedManager.Register(part);
}
var blogPostList = Shape.List();
blogPostList.AddRange(blogPosts);
return Combined(
ContentPartTemplate(blogPart, "Parts/Blogs.Blog.Manage").Location("manage"),
ContentPartTemplate(blogPart, "Parts/Blogs.Blog.Metadata").Location("metadata"),
ContentPartTemplate(blogPart, "Parts/Blogs.Blog.Description").Location("manage", "after"),
ContentPartTemplate(blogPostList, "Parts/Blogs.BlogPost.List").LongestMatch(displayType, "Admin").Location("primary"));
return Combined(driverResults.ToArray());
}
protected override DriverResult Editor(BlogPart blogPart) {
protected override DriverResult Editor(BlogPart blogPart, dynamic shapeHelper) {
var location = blogPart.GetLocation("Editor");
return Combined(
ContentPartTemplate(blogPart, "Parts/Blogs.Blog.Fields").Location(location));
}
protected override DriverResult Editor(BlogPart blogPart, IUpdateModel updater) {
protected override DriverResult Editor(BlogPart blogPart, IUpdateModel updater, dynamic shapeHelper) {
updater.TryUpdateModel(blogPart, Prefix, null, null);
return Editor(blogPart);
return Editor(blogPart, shapeHelper);
}
}
}

4
src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogPostPartDriver.cs
View File

@@ -21,11 +21,11 @@ namespace Orchard.Blogs.Drivers {
protected override string Prefix { get { return ""; } }
protected override DriverResult Display(BlogPostPart part, string displayType) {
protected override DriverResult Display(BlogPostPart part, string displayType, dynamic shapeHelper) {
if (displayType.StartsWith("Detail"))
_feedManager.Register(part.BlogPart);
return base.Display(part, displayType);
return null;
}
}
}

4
src/Orchard.Web/Modules/Orchard.Blogs/Handlers/BlogPartHandler.cs
View File

@@ -10,8 +10,8 @@ namespace Orchard.Blogs.Handlers {
Filters.Add(StorageFilter.For(repository));
OnGetDisplayShape<BlogPart>((context, blog) => {
context.Model.Description = blog.Description;
context.Model.PostCount = blog.PostCount;
context.Shape.Description = blog.Description;
context.Shape.PostCount = blog.PostCount;
});
}
}

4
src/Orchard.Web/Modules/Orchard.Blogs/Handlers/BlogPostPartHandler.cs
View File

@@ -61,8 +61,8 @@ namespace Orchard.Blogs.Handlers {
blogPost => context.ContentManager.Remove(blogPost.ContentItem)));
}
private static void SetModelProperties(BuildModelContext context, BlogPostPart blogPost) {
context.Model.Blog = blogPost.BlogPart;
private static void SetModelProperties(BuildShapeContext context, BlogPostPart blogPost) {
context.Shape.Blog = blogPost.BlogPart;
}
Localizer T { get; set; }

37
src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj
View File

@@ -122,12 +122,12 @@
<Content Include="Views\BlogPost\ListByArchive.cshtml" />
<Content Include="Views\Blog\Item.cshtml" />
<Content Include="Views\Blog\List.cshtml" />
<Content Include="Views\DisplayTemplates\Parts\Blogs.Blog.Manage.cshtml" />
<Content Include="Views\DisplayTemplates\Parts\Blogs.Blog.Description.cshtml" />
<Content Include="Views\DisplayTemplates\Parts\Blogs.Blog.Metadata.cshtml" />
<Content Include="Views\DisplayTemplates\Parts\Blogs.BlogPost.List.cshtml" />
<Content Include="Views\Blogs.Blog.Manage.cshtml" />
<Content Include="Views\Blogs.Blog.Description.cshtml" />
<Content Include="Views\Common.Metadata.Admin.Blog.cshtml" />
<Content Include="Views\Blogs.BlogPost.List.cshtml" />
<Content Include="Views\EditorTemplates\Parts\Blogs.Blog.Fields.cshtml" />
<Content Include="Views\DisplayTemplates\Parts\Blogs.BlogPost.List.Admin.cshtml">
<Content Include="Views\Blogs.BlogPost.List.Admin.cshtml">
<SubType>Code</SubType>
</Content>
<Content Include="Views\Items\Content.Admin.Blog.cshtml" />
@@ -154,6 +154,33 @@
<Name>Orchard.Core</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Content Include="Views\Common.Metadata.Blog.cshtml" />
</ItemGroup>
<ItemGroup>
<Content Include="Views\Localization.ContentTranslations.Summary.BlogPost.cshtml" />
</ItemGroup>
<ItemGroup>
<Content Include="Views\Common.Body.Summary.BlogPost.cshtml" />
</ItemGroup>
<ItemGroup>
<Content Include="Views\Tags.ShowTags.Summary.BlogPost.cshtml" />
</ItemGroup>
<ItemGroup>
<Content Include="Views\PublishLater.Metadata.BlogPost.cshtml" />
</ItemGroup>
<ItemGroup>
<Content Include="Views\Common.Metadata.BlogPost.cshtml" />
</ItemGroup>
<ItemGroup>
<Content Include="Views\Localization.ContentTranslations.BlogPost.cshtml" />
</ItemGroup>
<ItemGroup>
<Content Include="Views\Common.Body.BlogPost.cshtml" />
</ItemGroup>
<ItemGroup>
<Content Include="Views\Tags.ShowTags.BlogPost.cshtml" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

0
src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Parts/Blogs.Blog.Description.cshtml → src/Orchard.Web/Modules/Orchard.Blogs/Views/Blogs.Blog.Description.cshtml
View File

2
src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Parts/Blogs.Blog.Manage.cshtml → src/Orchard.Web/Modules/Orchard.Blogs/Views/Blogs.Blog.Manage.cshtml
View File

@@ -4,6 +4,6 @@
}
@if (AuthorizedFor(Orchard.Blogs.Permissions.ManageBlogs)) {
<div class="item-properties actions">
<p><a href="@Url.BlogEdit((string)Model.Slug)" class="edit">@T("Blog Properties")</a></p>
<p><a href="@Url.BlogEdit((string)Model.ContentPart.Slug)" class="edit">@T("Blog Properties")</a></p>
</div>
}

2
src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Parts/Blogs.BlogPost.List.Admin.cshtml → src/Orchard.Web/Modules/Orchard.Blogs/Views/Blogs.BlogPost.List.Admin.cshtml
View File

@@ -14,7 +14,7 @@
<button type="submit" name="submit.BulkEdit" value="yes">@T("Apply")</button>
</fieldset>
<fieldset class="contentItems bulk-items">
@Display(Model)
@Display(Model.BlogPosts)
</fieldset>
}
} else {

7
src/Orchard.Web/Modules/Orchard.Blogs/Views/Blogs.BlogPost.List.cshtml Normal file
View File

@@ -0,0 +1,7 @@
@{
IEnumerable<object> blogPosts = Model.BlogPosts;
}
@Display(blogPosts)
@if (blogPosts == null || blogPosts.Count() < 1) {
<p>@T("There are no posts for this blog.")</p>
}

1
src/Orchard.Web/Modules/Orchard.Blogs/Views/Common.Body.BlogPost.cshtml Normal file
View File

@@ -0,0 +1 @@
@Model.Html

9
src/Orchard.Web/Modules/Orchard.Blogs/Views/Common.Body.Summary.BlogPost.cshtml Normal file
View File

@@ -0,0 +1,9 @@
@using Orchard.ContentManagement;
@using Orchard.Core.Common.ViewModels;
@*doing excerpt generation on the way out for now so we don't stick ourselves with needing to regen excerpts for existing data
also, doing this here, inline, until we have a pluggable processing model (both in and out)
also, ...this is ugly *@
@{
var body = new HtmlString(Html.Excerpt((string)Model.Html.ToString(), 200).ToString().Replace(Environment.NewLine, "</p>" + Environment.NewLine + "<p>"));
}
<p>@body @Html.ItemDisplayLink(T("[more]").ToString(), (IContent)Model.ContentPart.ContentItem)</p>

1
src/Orchard.Web/Modules/Orchard.Blogs/Views/Common.Metadata.Admin.Blog.cshtml Normal file
View File

@@ -0,0 +1 @@


1
src/Orchard.Web/Modules/Orchard.Blogs/Views/Common.Metadata.Blog.cshtml Normal file
View File

@@ -0,0 +1 @@


5
src/Orchard.Web/Modules/Orchard.Blogs/Views/Common.Metadata.BlogPost.cshtml Normal file
View File

@@ -0,0 +1,5 @@
@using Orchard.Core.Common.Extensions;
@if (Model.Creator != null) {
<div class="metadata">
<div class="posted">@T("Published by {0} {1}", (string)Model.ContentPart.Creator.UserName, Html.PublishedWhen((DateTime?)Model.ContentPart.VersionPublishedUtc, T))</div>
</div>}

1
src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Parts/Blogs.Blog.Metadata.cshtml
View File

@@ -1 +0,0 @@
[[metadata??]]

4
src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Parts/Blogs.BlogPost.List.cshtml
View File

@@ -1,4 +0,0 @@
@Display(Model)
@if (Model.Items.Count < 1) {
<p>@T("There are no posts for this blog.")</p>
}

13
src/Orchard.Web/Modules/Orchard.Blogs/Views/Localization.ContentTranslations.BlogPost.cshtml Normal file
View File

@@ -0,0 +1,13 @@
@using Orchard.Core.Localization.Models;
@{
Style.Require("Localization");
IEnumerable<LocalizationPart> localizations = Model.Localizations;
}
@if (localizations != null && localizations.Count() > 0) {
<div class="content-localization">
<div class="content-localizations">
<h4>@T("Translations:")</h4>
@Html.UnorderedList(localizations, (c, i) => Html.ItemDisplayLink(c.Culture.Culture, c), "localizations")
</div>
</div>
}

1
src/Orchard.Web/Modules/Orchard.Blogs/Views/Localization.ContentTranslations.Summary.BlogPost.cshtml Normal file
View File

@@ -0,0 +1 @@


1
src/Orchard.Web/Modules/Orchard.Blogs/Views/PublishLater.Metadata.BlogPost.cshtml Normal file
View File

@@ -0,0 +1 @@


16
src/Orchard.Web/Modules/Orchard.Blogs/Views/Tags.ShowTags.BlogPost.cshtml Normal file
View File

@@ -0,0 +1,16 @@
@{
var tagsHtml = new List<IHtmlString>();
foreach(var t in Model.Tags) {
if (tagsHtml.Any()) {
tagsHtml.Add(new HtmlString(", "));
}
tagsHtml.Add(Html.ActionLink((string)t.TagName, "Search", "Home", new { area = "Orchard.Tags", tagName = (string)t.TagName }, new { }));
}
}
@if (tagsHtml.Any()) {
<p class="tags">
<span>@T("Tags:")</span>
@foreach(var htmlString in tagsHtml) { @htmlString }
</p>
}

16
src/Orchard.Web/Modules/Orchard.Blogs/Views/Tags.ShowTags.Summary.BlogPost.cshtml Normal file
View File

@@ -0,0 +1,16 @@
@{
var tagsHtml = new List<IHtmlString>();
foreach(var t in Model.Tags) {
if (tagsHtml.Any()) {
tagsHtml.Add(new HtmlString(", "));
}
tagsHtml.Add(Html.ActionLink((string)t.TagName, "Search", "Home", new { area = "Orchard.Tags", tagName = (string)t.TagName }, new { }));
}
}
@if (tagsHtml.Any()) {
<p class="tags">
<span>@T("Tags:")</span>
@foreach(var htmlString in tagsHtml) { @htmlString }
</p>
}

6
src/Orchard.Web/Modules/Orchard.Comments/Drivers/CommentSettingsPartDriver.cs
View File

@@ -13,13 +13,13 @@ namespace Orchard.Comments.Drivers {
protected override string Prefix { get { return "CommentSettings"; } }
protected override DriverResult Editor(CommentSettingsPart part) {
protected override DriverResult Editor(CommentSettingsPart part, dynamic shapeHelper) {
return ContentPartTemplate(part.Record, "Parts/Comments.SiteSettings");
}
protected override DriverResult Editor(CommentSettingsPart part, IUpdateModel updater) {
protected override DriverResult Editor(CommentSettingsPart part, IUpdateModel updater, dynamic shapeHelper) {
updater.TryUpdateModel(part.Record, Prefix, null, null);
return Editor(part);
return Editor(part, shapeHelper);
}
}
}

33
src/Orchard.Web/Modules/Orchard.Comments/Drivers/CommentsContainerPartDriver.cs
View File

@@ -1,7 +1,6 @@
using System.Linq;
using JetBrains.Annotations;
using Orchard.Comments.Models;
using Orchard.Comments.ViewModels;
using Orchard.ContentManagement;
using Orchard.ContentManagement.Drivers;
using Orchard.Core.Common.Models;
@@ -10,27 +9,23 @@ using Orchard.Core.ContentsLocation.Models;
namespace Orchard.Comments.Drivers {
[UsedImplicitly]
public class CommentsContainerPartDriver : ContentPartDriver<CommentsContainerPart> {
protected override DriverResult Display(CommentsContainerPart part, string displayType) {
if (displayType == "SummaryAdmin") {
return ContentPartTemplate(CreateViewModel(part.ContentItem), "Parts/Comments.CountAdmin").Location(part.GetLocation("SummaryAdmin"));
}
else if (displayType.Contains("Summary")) {
return ContentPartTemplate(CreateViewModel(part.ContentItem), "Parts/Comments.Count").Location(part.GetLocation("Summary"));
protected override DriverResult Display(CommentsContainerPart part, string displayType, dynamic shapeHelper) {
if (displayType.Contains("Summary")) {
// Find all contents item with this part as the container
var parts = part.ContentItem.ContentManager.Query()
.Where<CommonPartRecord>(rec => rec.Container == part.ContentItem.Record).List();
// Count comments and create template
int count = parts.Aggregate(0, (seed, item) => seed + (item.Has<CommentsPart>() ? item.As<CommentsPart>().Comments.Count : 0));
int pendingCount = parts.Aggregate(0, (seed, item) => seed + (item.Has<CommentsPart>() ? item.As<CommentsPart>().PendingComments.Count : 0));
if (displayType == "SummaryAdmin")
return ContentShape(shapeHelper.Comments_CountAdmin(ContentPart: part, CommentCount: count, PendingCount: pendingCount)).Location(part.GetLocation("SummaryAdmin"));
return ContentShape(shapeHelper.Comments_Count(ContentPart: part, CommentCount: count, PendingCount: pendingCount)).Location(part.GetLocation("Summary"));
}
return null;
}
private static CommentCountViewModel CreateViewModel(ContentItem contentItem) {
// Find all contents item with this part as the container
var parts = contentItem.ContentManager.Query()
.Where<CommonPartRecord>(rec => rec.Container == contentItem.Record).List();
// Count comments and create template
int count = parts.Aggregate(0, (seed, item) => seed + (item.Has<CommentsPart>() ? item.As<CommentsPart>().Comments.Count : 0));
int pendingCount = parts.Aggregate(0, (seed, item) => seed + (item.Has<CommentsPart>() ? item.As<CommentsPart>().PendingComments.Count : 0));
return new CommentCountViewModel { Item = contentItem, CommentCount = count, PendingCount = pendingCount};
}
}
}

40
src/Orchard.Web/Modules/Orchard.Comments/Drivers/CommentsPartDriver.cs
View File

@@ -1,6 +1,5 @@
using JetBrains.Annotations;
using Orchard.Comments.Models;
using Orchard.Comments.ViewModels;
using Orchard.ContentManagement;
using Orchard.ContentManagement.Drivers;
using Orchard.Core.ContentsLocation.Models;
@@ -8,35 +7,30 @@ using Orchard.Core.ContentsLocation.Models;
namespace Orchard.Comments.Drivers {
[UsedImplicitly]
public class CommentsPartDriver : ContentPartDriver<CommentsPart> {
protected override DriverResult Display(CommentsPart part, string displayType) {
if (part.CommentsShown == false) {
protected override DriverResult Display(CommentsPart part, string displayType, dynamic shapeHelper) {
if (part.CommentsShown == false)
return null;
}
// todo: (heskew) need to be more flexible with displaying parts somehow. e.g. where should the...
// comment count go in any given skin or what if the skin builder doesn't want the count
if (displayType.StartsWith("Detail")) {
return ContentPartTemplate(part, "Parts/Comments.Comments").Location(part.GetLocation("Detail"));
}
else if (displayType == "SummaryAdmin") {
var model = new CommentCountViewModel(part);
return ContentPartTemplate(model, "Parts/Comments.CountAdmin").Location(part.GetLocation("SummaryAdmin"));
}
else if (displayType.Contains("Summary")) {
var model = new CommentCountViewModel(part);
return ContentPartTemplate(model, "Parts/Comments.Count").Location(part.GetLocation("Summary"));
}
else {
var model = new CommentCountViewModel(part);
return ContentPartTemplate(model, "Parts/Comments.Count").Location(part.GetLocation(displayType));
}
if (displayType.StartsWith("Detail"))
return ContentShape(shapeHelper.Comments_Comments(ContentPart: part)).Location(part.GetLocation("Detail"));
if (displayType == "SummaryAdmin")
return ContentShape(shapeHelper.Comments_CountAdmin(ContentPart: part, CommentCount: part.Comments.Count, PendingCount: part.PendingComments.Count))
.Location(part.GetLocation("SummaryAdmin"));
var location = displayType.Contains("Summary")
? part.GetLocation("Summary")
: part.GetLocation(displayType);
return ContentShape(shapeHelper.Comments_Count(ContentPart: part, CommentCount: part.Comments.Count, PendingCount: part.PendingComments.Count))
.Location(location);
}
protected override DriverResult Editor(CommentsPart part) {
protected override DriverResult Editor(CommentsPart part, dynamic shapeHelper) {
return ContentPartTemplate(part, "Parts/Comments.Comments").Location(part.GetLocation("Editor"));
}
protected override DriverResult Editor(CommentsPart part, IUpdateModel updater) {
protected override DriverResult Editor(CommentsPart part, IUpdateModel updater, dynamic shapeHelper) {
updater.TryUpdateModel(part, Prefix, null, null);
return ContentPartTemplate(part, "Parts/Comments.Comments").Location(part.GetLocation("Editor"));
}

7
src/Orchard.Web/Modules/Orchard.Comments/Orchard.Comments.csproj
View File

@@ -43,6 +43,7 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\lib\joel.net.akismet\Joel.Net.Akismet.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.ComponentModel.DataAnnotations">
@@ -126,9 +127,9 @@
<Content Include="Views\Admin\Details.cshtml" />
<Content Include="Views\Admin\Edit.cshtml" />
<Content Include="Views\Admin\Index.cshtml" />
<Content Include="Views\DisplayTemplates\Parts\Comments.Comments.cshtml" />
<Content Include="Views\DisplayTemplates\Parts\Comments.Count.cshtml" />
<Content Include="Views\DisplayTemplates\Parts\Comments.CountAdmin.cshtml" />
<Content Include="Views\Comments.Comments.cshtml" />
<Content Include="Views\Comments.Count.cshtml" />
<Content Include="Views\Comments.CountAdmin.cshtml" />
<Content Include="Views\EditorTemplates\Parts\Comments.Comments.cshtml" />
<Content Include="Views\EditorTemplates\Parts\Comments.SiteSettings.cshtml" />
<Content Include="Views\ListOfComments.cshtml" />

0
src/Orchard.Web/Modules/Orchard.Comments/Views/DisplayTemplates/Parts/Comments.Comments.cshtml → src/Orchard.Web/Modules/Orchard.Comments/Views/Comments.Comments.cshtml
View File

2
src/Orchard.Web/Modules/Orchard.Comments/Views/Comments.Count.cshtml Normal file
View File

@@ -0,0 +1,2 @@
@using Orchard.Comments.ViewModels;
<span class="commentcount">@T.Plural("1 Comment", "{0} Comments", (int)Model.CommentCount)</span>

0
src/Orchard.Web/Modules/Orchard.Comments/Views/DisplayTemplates/Parts/Comments.CountAdmin.cshtml → src/Orchard.Web/Modules/Orchard.Comments/Views/Comments.CountAdmin.cshtml
View File

4
src/Orchard.Web/Modules/Orchard.Comments/Views/DisplayTemplates/Parts/Comments.Count.cshtml
View File

@@ -1,4 +0,0 @@
@model Orchard.Comments.ViewModels.CommentCountViewModel
@using Orchard.Comments.ViewModels;
<span class="commentcount">@T.Plural("1 Comment", "{0} Comments", Model.CommentCount)</span>

6
src/Orchard.Web/Modules/Orchard.Email/Drivers/SmtpSettingsPartDriver.cs
View File

@@ -17,13 +17,13 @@ namespace Orchard.Email.Drivers {
protected override string Prefix { get { return "SmtpSettings"; } }
protected override DriverResult Editor(SmtpSettingsPart part) {
protected override DriverResult Editor(SmtpSettingsPart part, dynamic shapeHelper) {
return ContentPartTemplate(part, "Parts/Smtp.SiteSettings");
}
protected override DriverResult Editor(SmtpSettingsPart part, IUpdateModel updater) {
protected override DriverResult Editor(SmtpSettingsPart part, IUpdateModel updater, dynamic shapeHelper) {
updater.TryUpdateModel(part, Prefix, null, null);
return Editor(part);
return Editor(part, shapeHelper);
}
}
}

1
src/Orchard.Web/Modules/Orchard.Email/Orchard.Email.csproj
View File

@@ -39,6 +39,7 @@
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.CSharp" />
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.ComponentModel.DataAnnotations">

4
src/Orchard.Web/Modules/Orchard.Experimental/Controllers/ContentController.cs
View File

@@ -39,8 +39,8 @@ namespace Orchard.Experimental.Controllers {
.Select(x => x.GetType())
.SelectMany(x => AllTypes(x))
.Distinct();
model.DisplayShape = _contentManager.BuildDisplayModel(model.Item, "Detail");
model.EditorShape = _contentManager.BuildEditorModel(model.Item);
model.DisplayShape = _contentManager.BuildDisplay(model.Item, "Detail");
model.EditorShape = _contentManager.BuildEditor(model.Item);
return View(Shape.Model(model));
}

8
src/Orchard.Web/Modules/Orchard.Experimental/Handlers/DebugLinkHandler.cs
View File

@@ -5,15 +5,15 @@ using Orchard.Experimental.Models;
namespace Orchard.Experimental.Handlers {
[UsedImplicitly]
public class DebugLinkHandler : ContentHandler {
protected override void BuildDisplayShape(BuildDisplayModelContext context) {
protected override void BuildDisplayShape(BuildDisplayContext context) {
var experimentalSettings = context.ContentItem.TypeDefinition.Settings.GetModel<Settings.ExperimentalSettings>();
if (experimentalSettings.ShowDebugLinks)
context.Model.Zones["Recap"].Add(new ShowDebugLink { ContentItem = context.ContentItem }, "9999");
context.Shape.Zones["Recap"].Add(new ShowDebugLink { ContentItem = context.ContentItem }, "9999");
}
protected override void BuildEditorShape(BuildEditorModelContext context) {
protected override void BuildEditorShape(BuildEditorContext context) {
var experimentalSettings = context.ContentItem.TypeDefinition.Settings.GetModel<Settings.ExperimentalSettings>();
if (experimentalSettings.ShowDebugLinks)
context.Model.Zones["Recap"].Add(new ShowDebugLink { ContentItem = context.ContentItem }, "9999");
context.Shape.Zones["Recap"].Add(new ShowDebugLink { ContentItem = context.ContentItem }, "9999");
}
}
}

4
src/Orchard.Web/Modules/Orchard.Roles/Drivers/UserRolesPartDriver.cs
View File

@@ -41,7 +41,7 @@ namespace Orchard.Roles.Drivers {
public Localizer T { get; set; }
protected override DriverResult Editor(UserRolesPart userRolesPart) {
protected override DriverResult Editor(UserRolesPart userRolesPart, dynamic shapeHelper) {
// don't show editor without apply roles permission
if (!_authorizationService.TryCheckAccess(Permissions.ApplyRoles, _authenticationService.GetAuthenticatedUser(), userRolesPart))
return null;
@@ -62,7 +62,7 @@ namespace Orchard.Roles.Drivers {
return ContentPartTemplate(model, "Parts/Roles.UserRoles");
}
protected override DriverResult Editor(UserRolesPart userRolesPart, IUpdateModel updater) {
protected override DriverResult Editor(UserRolesPart userRolesPart, IUpdateModel updater, dynamic shapeHelper) {
// don't apply editor without apply roles permission
if (!_authorizationService.TryCheckAccess(Permissions.ApplyRoles, _authenticationService.GetAuthenticatedUser(), userRolesPart))
return null;

2
src/Orchard.Web/Modules/Orchard.Search/Controllers/SearchController.cs
View File

@@ -43,7 +43,7 @@ namespace Orchard.Search.Controllers {
}
searchResultViewModels.Add(new SearchResultViewModel {
Content = _contentManager.BuildDisplayModel(contentItem, "SummaryForSearch"),
Content = _contentManager.BuildDisplay(contentItem, "SummaryForSearch"),
SearchHit = searchHit
});
}

6
src/Orchard.Web/Modules/Orchard.Search/Drivers/SearchSettingsPartDriver.cs
View File

@@ -23,7 +23,7 @@ namespace Orchard.Search.Drivers {
protected override string Prefix { get { return "SearchSettings"; } }
protected override DriverResult Editor(SearchSettingsPart part) {
protected override DriverResult Editor(SearchSettingsPart part, dynamic shapeHelper) {
var model = new SearchSettingsViewModel();
var searchedFields = part.SearchedFields;
@@ -37,14 +37,14 @@ namespace Orchard.Search.Drivers {
return ContentPartTemplate(model, "Parts/Search.SiteSettings");
}
protected override DriverResult Editor(SearchSettingsPart part, IUpdateModel updater) {
protected override DriverResult Editor(SearchSettingsPart part, IUpdateModel updater, dynamic shapeHelper) {
var model = new SearchSettingsViewModel();
if(updater.TryUpdateModel(model, Prefix, null, null)) {
part.SearchedFields = model.Entries.Where(e => e.Selected).Select(e => e.Field).ToArray();
}
return Editor(part);
return Editor(part, shapeHelper);
}
}
}

2
src/Orchard.Web/Modules/Orchard.Tags/Controllers/HomeController.cs
View File

@@ -47,7 +47,7 @@ namespace Orchard.Tags.Controllers {
var shape = _shapeHelperFactory.CreateHelper();
var list = shape.List();
foreach (var taggedContentItem in _tagService.GetTaggedContentItems(tag.Id)) {
list.Add(_contentManager.BuildDisplayModel(taggedContentItem, "Summary"));
list.Add(_contentManager.BuildDisplay(taggedContentItem, "Summary"));
}
var viewModel = new TagsSearchViewModel {

12
src/Orchard.Web/Modules/Orchard.Tags/Drivers/TagsPartDriver.cs
View File

@@ -23,11 +23,15 @@ namespace Orchard.Tags.Drivers {
public virtual IUser CurrentUser { get; set; }
protected override DriverResult Display(TagsPart part, string displayType) {
return ContentPartTemplate(part, "Parts/Tags.ShowTags").Location(part.GetLocation(displayType));
protected override DriverResult Display(TagsPart part, string displayType, dynamic shapeHelper) {
var showTags = shapeHelper.Tags_ShowTags(ContentPart: part, Tags: part.CurrentTags);
if (!string.IsNullOrWhiteSpace(displayType))
showTags.Metadata.Type = string.Format("{0}.{1}", showTags.Metadata.Type, displayType);
var location = part.GetLocation(displayType);
return ContentShape(showTags).Location(location);
}
protected override DriverResult Editor(TagsPart part) {
protected override DriverResult Editor(TagsPart part, dynamic shapeHelper) {
if (!_authorizationService.TryCheckAccess(Permissions.ApplyTag, CurrentUser, part))
return null;
@@ -37,7 +41,7 @@ namespace Orchard.Tags.Drivers {
return ContentPartTemplate(model, "Parts/Tags.EditTags").Location(part.GetLocation("Editor"));
}
protected override DriverResult Editor(TagsPart part, IUpdateModel updater) {
protected override DriverResult Editor(TagsPart part, IUpdateModel updater, dynamic shapeHelper) {
if (!_authorizationService.TryCheckAccess(Permissions.ApplyTag, CurrentUser, part))
return null;

2
src/Orchard.Web/Modules/Orchard.Tags/Orchard.Tags.csproj
View File

@@ -97,7 +97,7 @@
<Content Include="Views\Admin\Edit.cshtml" />
<Content Include="Views\Admin\Index.cshtml" />
<Content Include="Views\Admin\Search.cshtml" />
<Content Include="Views\DisplayTemplates\Parts\Tags.ShowTags.cshtml" />
<Content Include="Views\Tags.ShowTags.cshtml" />
<Content Include="Views\EditorTemplates\Parts\Tags.EditTags.cshtml" />
<Content Include="Views\Home\Index.cshtml" />
<Content Include="Views\Home\Search.cshtml" />

17
src/Orchard.Web/Modules/Orchard.Tags/Views/DisplayTemplates/Parts/Tags.ShowTags.cshtml
View File

@@ -1,17 +0,0 @@
@model Orchard.Tags.Models.TagsPart
@{
var tagsHtml = new List<IHtmlString>();
foreach(var t in Model.CurrentTags) {
if (tagsHtml.Any()) {
tagsHtml.Add(new HtmlString(","));
}
tagsHtml.Add(Html.ActionLink(t.TagName, "Search", "Home", new { area = "Orchard.Tags", tagName = t.TagName }, new { }));
}
}
@if (tagsHtml.Any()) {
<p class="tags">
<span>@T("Tags:")</span>
@foreach(var htmlString in tagsHtml) { @htmlString }
</p>
}

16
src/Orchard.Web/Modules/Orchard.Tags/Views/Tags.ShowTags.cshtml Normal file
View File

@@ -0,0 +1,16 @@
@{
var tagsHtml = new List<IHtmlString>();
foreach(var t in Model.Tags) {
if (tagsHtml.Any()) {
tagsHtml.Add(new HtmlString(", "));
}
tagsHtml.Add(Html.ActionLink((string)t.TagName, "Search", "Home", new { area = "Orchard.Tags", tagName = (string)t.TagName }, new { }));
}
}
@if (tagsHtml.Any()) {
<p class="tags">
<span>@T("Tags:")</span>
@foreach(var htmlString in tagsHtml) { @htmlString }
</p>
}

6
src/Orchard.Web/Modules/Orchard.Users/Controllers/AdminController.cs
View File

@@ -59,7 +59,7 @@ namespace Orchard.Users.Controllers {
var user = Services.ContentManager.New<IUser>("User");
var model = new UserCreateViewModel {
User = Services.ContentManager.BuildEditorModel(user)
User = Services.ContentManager.BuildEditor(user)
};
return View(model);
}
@@ -70,7 +70,7 @@ namespace Orchard.Users.Controllers {
return new HttpUnauthorizedResult();
var user = Services.ContentManager.New<IUser>("User");
model.User = Services.ContentManager.UpdateEditorModel(user, this);
model.User = Services.ContentManager.UpdateEditor(user, this);
if (!ModelState.IsValid) {
Services.TransactionManager.Cancel();
return View(model);
@@ -91,7 +91,7 @@ namespace Orchard.Users.Controllers {
model.Email,
null, null, true));
model.User = Services.ContentManager.UpdateEditorModel(user, this);
model.User = Services.ContentManager.UpdateEditor(user, this);
if (ModelState.IsValid == false) {
Services.TransactionManager.Cancel();

2
src/Orchard.Web/Modules/Orchard.Widgets/Drivers/WidgetBagPartDriver.cs
View File

@@ -8,7 +8,7 @@ namespace Orchard.Widgets.Drivers {
public class WidgetBagPartDriver : ContentPartDriver<WidgetBagPart> {
private const string TemplateName = "Parts/Widgets.WidgetBagPart";
protected override DriverResult Editor(WidgetBagPart part) {
protected override DriverResult Editor(WidgetBagPart part, dynamic shapeHelper) {
var location = part.GetLocation("Editor");
return ContentPartTemplate("", TemplateName, Prefix).Location(location);
}

2
src/Orchard.Web/Modules/Orchard.Widgets/Filters/WidgetFilter.cs
View File

@@ -46,7 +46,7 @@ namespace Orchard.Widgets.Filters {
var zones = workContext.Layout.Zones;
foreach (var widgetPart in widgetParts) {
if (activeLayerIds.Contains(widgetPart.As<ICommonPart>().Container.ContentItem.Id)) {
var widgetShape = _contentManager.BuildDisplayModel(widgetPart);
var widgetShape = _contentManager.BuildDisplay(widgetPart);
zones[widgetPart.Record.Zone].Add(widgetShape, widgetPart.Record.Position);
}
}

6
src/Orchard/ContentManagement/ContentExtensions.cs
View File

@@ -168,14 +168,14 @@ namespace Orchard.ContentManagement {
var content = manager.Get<TContent>(id);
if (content == null)
return null;
return manager.BuildDisplayModel(content, displayType);
return manager.BuildDisplay(content, displayType);
}
public static TContent BuildEditorShape<TContent>(this IContentManager manager, int id) where TContent : class, IContent {
var content = manager.Get<TContent>(id);
if (content == null)
return null;
return manager.BuildEditorModel(content);
return manager.BuildEditor(content);
}
@@ -183,7 +183,7 @@ namespace Orchard.ContentManagement {
var content = manager.Get<TContent>(id);
if (content == null)
return null;
return manager.UpdateEditorModel(content, updater);
return manager.UpdateEditor(content, updater);
}

1
src/Orchard/ContentManagement/ContentItem.cs
View File

@@ -3,7 +3,6 @@ using System.Collections.Generic;
using System.Linq;
using Orchard.ContentManagement.MetaData.Models;
using Orchard.ContentManagement.Records;
using Orchard.UI;
namespace Orchard.ContentManagement {
public class ContentItem : IContent {

43
src/Orchard/ContentManagement/DefaultContentManager.cs
View File

@@ -4,7 +4,6 @@ using System.Collections.Generic;
using System.Linq;
using System.Runtime.CompilerServices;
using Autofac;
using ClaySharp.Implementation;
using Microsoft.CSharp.RuntimeBinder;
using Orchard.ContentManagement.Handlers;
using Orchard.ContentManagement.MetaData;
@@ -379,34 +378,46 @@ namespace Orchard.ContentManagement {
new[] { CSharpArgumentInfo.Create(CSharpArgumentInfoFlags.None, null) }));
public dynamic BuildDisplayModel<TContent>(TContent content, string displayType = "") where TContent : IContent {
public dynamic BuildDisplay(dynamic content, string displayType = "") {
var shapeHelper = _shapeHelperFactory.CreateHelper();
var shapeTypeName = string.IsNullOrEmpty(displayType) ? "Items_Content" : ("Items_Content_" + displayType);
var itemShape = _shapeHelperCalls.Invoke(shapeHelper, shapeTypeName);
itemShape.ContentItem = content.ContentItem;
IContent iContent = content;
if (iContent != null)
itemShape.ContentItem = iContent.ContentItem;
var context = new BuildDisplayModelContext(content, displayType, itemShape, _shapeHelperFactory);
Handlers.Invoke(handler => handler.BuildDisplayShape(context), Logger);
return context.Model;
var context = new BuildDisplayContext(itemShape, content, displayType, _shapeHelperFactory);
Handlers.Invoke(handler => handler.BuildDisplay(context), Logger);
return context.Shape;
}
public dynamic BuildEditorModel<TContent>(TContent content) where TContent : IContent {
public dynamic BuildEditor(dynamic content) {
var shapeHelper = _shapeHelperFactory.CreateHelper();
var itemShape = shapeHelper.Items_Content_Edit(ContentItem: content.ContentItem);
var context = new BuildEditorModelContext(content, itemShape, _shapeHelperFactory);
Handlers.Invoke(handler => handler.BuildEditorShape(context), Logger);
return context.Model;
var itemShape = shapeHelper.Items_Content_Edit();
IContent iContent = content;
if (iContent != null)
itemShape.ContentItem = iContent.ContentItem;
var context = new BuildEditorContext(itemShape, content, _shapeHelperFactory);
Handlers.Invoke(handler => handler.BuildEditor(context), Logger);
return context.Shape;
}
public dynamic UpdateEditorModel<TContent>(TContent content, IUpdateModel updater) where TContent : IContent {
public dynamic UpdateEditor(dynamic content, IUpdateModel updater) {
var shapeHelper = _shapeHelperFactory.CreateHelper();
var itemShape = shapeHelper.Items_Content_Edit(ContentItem: content.ContentItem);
var context = new UpdateEditorModelContext(content, updater, itemShape, _shapeHelperFactory);
Handlers.Invoke(handler => handler.UpdateEditorShape(context), Logger);
return context.Model;
var itemShape = shapeHelper.Items_Content_Edit();
IContent iContent = content;
if (iContent != null)
itemShape.ContentItem = iContent.ContentItem;
var context = new UpdateEditorContext(itemShape, content, updater, _shapeHelperFactory);
Handlers.Invoke(handler => handler.UpdateEditor(context), Logger);
return context.Shape;
}
public IContentQuery<ContentItem> Query() {

6
src/Orchard/ContentManagement/Drivers/AutomaticContentPartDriver.cs
View File

@@ -6,15 +6,15 @@ namespace Orchard.ContentManagement.Drivers {
}
}
protected override DriverResult Display(TPart part, string displayType) {
protected override DriverResult Display(TPart part, string displayType, dynamic shapeHelper) {
return ContentPartTemplate(part);
}
protected override DriverResult Editor(TPart part) {
protected override DriverResult Editor(TPart part, dynamic shapeHelper) {
return ContentPartTemplate(part);
}
protected override DriverResult Editor(TPart part, IUpdateModel updater) {
protected override DriverResult Editor(TPart part, IUpdateModel updater, dynamic shapeHelper) {
updater.TryUpdateModel(part, Prefix, null, null);
return ContentPartTemplate(part);
}

4
src/Orchard/ContentManagement/Drivers/CombinedResult.cs
View File

@@ -10,13 +10,13 @@ namespace Orchard.ContentManagement.Drivers {
_results = results.Where(x => x != null);
}
public override void Apply(BuildDisplayModelContext context) {
public override void Apply(BuildDisplayContext context) {
foreach (var result in _results) {
result.Apply(context);
}
}
public override void Apply(BuildEditorModelContext context) {
public override void Apply(BuildEditorContext context) {
foreach (var result in _results) {
result.Apply(context);
}

Some files were not shown because too many files have changed in this diff Show More