lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-22 03:37:25 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge with clayless

Browse Source 
--HG--
branch : 1.x
This commit is contained in:
Sebastien Ros
2013-02-04 10:51:21 -08:00
parent e28841f13e a9f1312b88
commit fca554ddc9
45 changed files with 1031 additions and 568 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,11 +46,6 @@
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<Reference Include="ClaySharp, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\lib\claysharp\ClaySharp.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="System" />
<Reference Include="System.ComponentModel.DataAnnotations">

4
src/Orchard.Web/Core/Shapes/CoreShapes.cs
View File

@@ -48,7 +48,7 @@ namespace Orchard.Core.Shapes {
// and has an automatic zone creating behavior
builder.Describe("Layout")
.Configure(descriptor => descriptor.Wrappers.Add("Document"))
.OnCreating(creating => creating.Behaviors.Add(new ZoneHoldingBehavior(() => creating.New.Zone(), null)))
.OnCreating(creating => creating.Create = () => new ZoneHolding(() => creating.New.Zone()))
.OnCreated(created => {
var layout = created.Shape;
@@ -68,7 +68,7 @@ namespace Orchard.Core.Shapes {
// They have class="zone zone-{name}"
// and the template can be specialized with "Zone-{Name}" base file name
builder.Describe("Zone")
.OnCreating(creating => creating.BaseType = typeof(Zone))
.OnCreating(creating => creating.Create = () => new Zone())
.OnDisplaying(displaying => {
var zone = displaying.Shape;
string zoneName = zone.ZoneName;