lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-09-22 20:13:50 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

#17177: Moving content wrappers to features

Browse Source 
Work Item: 17177

--HG--
branch : 1.x
This commit is contained in:
Sebastien Ros
2011-12-16 11:26:22 -08:00
parent b8f9e0e8e4
commit c00953f18d
9 changed files with 58 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/Orchard.Web/Core/Contents/ControlWrapper.cs Normal file
View File

@@ -0,0 +1,19 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using Orchard.DisplayManagement.Descriptors;
using Orchard.Environment.Extensions;
namespace Orchard.Core.Contents {
[OrchardFeature("Contents.ControlWrapper")]
public class ControlWrapper : IShapeTableProvider {
public void Discover(ShapeTableBuilder builder) {
builder.Describe("Content").OnDisplaying(displaying => {
if (!displaying.ShapeMetadata.DisplayType.Contains("Admin")) {
displaying.ShapeMetadata.Wrappers.Add("Content_ControlWrapper");
}
});
}
}
}

5
src/Orchard.Web/Core/Contents/Module.txt
View File

@@ -15,3 +15,8 @@ Features:
Description: Rules for the Contents modules
Category: Rules
Dependencies: Orchard.Rules, Contents
Contents.ControlWrapper:
Name: Content Control Wrapper
Description: Add an Edit button on the front-end for authenticated users
Category: Content
Dependencies: Contents

3
src/Orchard.Web/Core/Contents/Shapes.cs
View File

@@ -29,9 +29,6 @@ namespace Orchard.Core.Contents {
// Content_[DisplayType]__[Id] e.g. Content-42.Summary
displaying.ShapeMetadata.Alternates.Add("Content_" + displaying.ShapeMetadata.DisplayType + "__" + contentItem.Id);
if ( !displaying.ShapeMetadata.DisplayType.Contains("Admin") )
displaying.ShapeMetadata.Wrappers.Add("Content_ControlWrapper");
}
});
}

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

@@ -105,6 +105,7 @@
<Compile Include="Containers\ViewModels\ContainableViewModel.cs" />
<Compile Include="Containers\ViewModels\ContainerWidgetViewModel.cs" />
<Compile Include="Containers\ViewModels\ContainerViewModel.cs" />
<Compile Include="Contents\ControlWrapper.cs" />
<Compile Include="Contents\Handlers\RulesHandler.cs" />
<Compile Include="Contents\Rules\ContentEvents.cs" />
<Compile Include="Contents\Rules\ContentForms.cs" />

18
src/Orchard.Web/Modules/Orchard.Widgets/ControlWrapper.cs Normal file
View File

@@ -0,0 +1,18 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using Orchard.DisplayManagement.Descriptors;
using Orchard.Environment.Extensions;
namespace Orchard.Widgets {
[OrchardFeature("Orchard.Widgets.ControlWrapper")]
public class ControlWrapper : IShapeTableProvider {
public void Discover(ShapeTableBuilder builder) {
builder.Describe("Widget")
.Configure(descriptor => {
descriptor.Wrappers.Add("Widget_ControlWrapper");
});
}
}
}

5
src/Orchard.Web/Modules/Orchard.Widgets/Module.txt
View File

@@ -14,3 +14,8 @@ Features:
Description: Adds a notification after creating a new Page with a direct link to create a Widget Layer for that specific page by URL.
Dependencies: Orchard.Widgets, Routable
Category: Widget
Orchard.Widgets.ControlWrapper:
Name: Widget Control Wrapper
Description: Add an Edit button on the front-end for authenticated users
Category: Widget
Dependencies: Orchard.Widgets

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

@@ -51,6 +51,7 @@
<Compile Include="Commands\LayerCommands.cs" />
<Compile Include="Commands\WidgetCommands.cs" />
<Compile Include="Controllers\AdminController.cs" />
<Compile Include="ControlWrapper.cs" />
<Compile Include="Drivers\LayerPartDriver.cs" />
<Compile Include="Handlers\LayerHintHandler.cs" />
<Compile Include="Drivers\WidgetPartDriver.cs" />

6
src/Orchard.Web/Modules/Orchard.Widgets/Shapes.cs
View File

@@ -11,7 +11,6 @@ namespace Orchard.Widgets {
.Configure(descriptor => {
// todo: have "alternates" for chrome
descriptor.Wrappers.Add("Widget_Wrapper");
descriptor.Wrappers.Add("Widget_ControlWrapper");
})
.OnCreated(created => {
var widget = created.Shape;
@@ -24,10 +23,11 @@ namespace Orchard.Widgets {
ContentItem contentItem = displaying.Shape.ContentItem;
if (contentItem != null) {
var widgetPart = contentItem.As<WidgetPart>();
widget.Classes.Add("widget-" + contentItem.ContentType.HtmlClassify());
var zoneName = widgetPart.Zone;
widget.Classes.Add("widget-" + contentItem.ContentType.HtmlClassify());
widget.Classes.Add("widget-" + zoneName.HtmlClassify());
// Widget__[ZoneName] e.g. Widget-SideBar
displaying.ShapeMetadata.Alternates.Add("Widget__" + zoneName);

7
src/Orchard/Environment/DefaultOrchardHost.cs
View File

@@ -273,7 +273,12 @@ namespace Orchard.Environment {
/// </summary>
void IShellDescriptorManagerEventHandler.Changed(ShellDescriptor descriptor, string tenant) {
lock (_syncLock) {
var context = _shellContexts.FirstOrDefault(x => x.Settings.Name == tenant);
if (_shellContexts == null) {
return;
}
var context =_shellContexts.FirstOrDefault(x => x.Settings.Name == tenant);
// some shells might need to be started, e.g. created by command line
if(context == null) {