mirror of
https://github.com/OrchardCMS/Orchard.git
synced 2025-10-15 03:25:23 +08:00
Merge
--HG-- branch : dev
This commit is contained in:
@@ -34,7 +34,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(name => CreateZone(creating, name))))
|
||||
.OnCreating(creating => creating.Behaviors.Add(new ZoneHoldingBehavior(name => CreateZone(creating))))
|
||||
.OnCreated(created => {
|
||||
var layout = created.Shape;
|
||||
layout.Head = created.New.DocumentZone();
|
||||
@@ -48,21 +48,21 @@ namespace Orchard.Core.Shapes {
|
||||
|
||||
// 'Zone' shapes are built on the Zone base class
|
||||
builder.Describe("Zone")
|
||||
.OnCreating(creating => creating.BaseType = typeof (Zone));
|
||||
//.OnDisplaying(displaying => {
|
||||
// var name = displaying.Shape.ZoneName.ToLower();
|
||||
// var zone = displaying.Shape;
|
||||
// zone.Classes.Add("zone-" + name);
|
||||
// zone.Classes.Add("zone");
|
||||
// });
|
||||
.OnCreating(creating => creating.BaseType = typeof (Zone))
|
||||
.OnDisplaying(displaying => {
|
||||
var name = displaying.Shape.ZoneName.ToLower();
|
||||
var zone = displaying.Shape;
|
||||
zone.Classes.Add("zone-" + name);
|
||||
zone.Classes.Add("zone");
|
||||
});
|
||||
|
||||
//builder.Describe("menu")
|
||||
// .OnDisplaying(displaying => {
|
||||
// var name = displaying.Shape.MenuName.ToLower();
|
||||
// var menu = displaying.Shape;
|
||||
// menu.Classes.Add("menu-" + name);
|
||||
// menu.Classes.Add("menu");
|
||||
// });
|
||||
builder.Describe("Menu")
|
||||
.OnDisplaying(displaying => {
|
||||
var name = displaying.Shape.MenuName.ToLower();
|
||||
var menu = displaying.Shape;
|
||||
menu.Classes.Add("menu-" + name);
|
||||
menu.Classes.Add("menu");
|
||||
});
|
||||
|
||||
// 'List' shapes start with several empty collections
|
||||
builder.Describe("List")
|
||||
@@ -73,12 +73,8 @@ namespace Orchard.Core.Shapes {
|
||||
});
|
||||
}
|
||||
|
||||
private object CreateZone(ShapeCreatingContext context, string zoneName) {
|
||||
var name = zoneName.ToLower();
|
||||
var zone = context.New.Zone();
|
||||
zone.Id = "zone-" + name;
|
||||
zone.Classes.Add("zone");
|
||||
return zone;
|
||||
static object CreateZone(ShapeCreatingContext context) {
|
||||
return context.New.Zone();
|
||||
}
|
||||
|
||||
static TagBuilder GetTagBuilder(string tagName, string id, IEnumerable<string> classes, IDictionary<string, string> attributes) {
|
||||
|
Reference in New Issue
Block a user