lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-02-09 09:16:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge

Browse Source 
--HG--
branch : dev
This commit is contained in:
Renaud Paquay
2010-10-19 16:26:24 -07:00
parent 6c1f1613e9 8f17aa9d56
commit 1bcbc7da3a
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,6 +12,7 @@ using Orchard.Settings;
using Orchard.UI; using Orchard.UI;
using Orchard.UI.Resources; using Orchard.UI.Resources;
using Orchard.UI.Zones; using Orchard.UI.Zones;
using Orchard.Utility.Extensions;
// ReSharper disable InconsistentNaming // ReSharper disable InconsistentNaming
@@ -51,17 +52,19 @@ namespace Orchard.Core.Shapes {
.OnCreating(creating => creating.BaseType = typeof(Zone)) .OnCreating(creating => creating.BaseType = typeof(Zone))
.OnDisplaying(displaying => { .OnDisplaying(displaying => {
var zone = displaying.Shape; var zone = displaying.Shape;
zone.Classes.Add("zone-" + zone.ZoneName.HtmlClassify()); string zoneName = zone.ZoneName;
zone.Classes.Add("zone-" + zoneName.HtmlClassify());
zone.Classes.Add("zone"); zone.Classes.Add("zone");
zone.Metadata.Alternates.Add("Zone__" + zone.ZoneName); zone.Metadata.Alternates.Add("Zone__" + zoneName);
}); });
builder.Describe("Menu") builder.Describe("Menu")
.OnDisplaying(displaying => { .OnDisplaying(displaying => {
var menu = displaying.Shape; var menu = displaying.Shape;
menu.Classes.Add("menu-" + menu.MenuName.HtmlClassify()); string menuName = menu.MenuName;
menu.Classes.Add("menu-" + menuName.HtmlClassify());
menu.Classes.Add("menu"); menu.Classes.Add("menu");
menu.Metadata.Alternates.Add("Menu__" + menu.MenuName); menu.Metadata.Alternates.Add("Menu__" + menuName);
}); });
builder.Describe("MenuItem") builder.Describe("MenuItem")

2
src/Orchard.Web/Modules/Orchard.Widgets/Migrations.cs
View File

@@ -23,6 +23,8 @@ namespace Orchard.Widgets {
_contentManager.Publish(authenticatedLayer.ContentItem); _contentManager.Publish(authenticatedLayer.ContentItem);
IContent anonymousLayer = _contentManager.Create<LayerPart>("Layer", t => { t.Record.Name = "Anonymous"; t.Record.LayerRule = "not authenticated"; }); IContent anonymousLayer = _contentManager.Create<LayerPart>("Layer", t => { t.Record.Name = "Anonymous"; t.Record.LayerRule = "not authenticated"; });
_contentManager.Publish(anonymousLayer.ContentItem); _contentManager.Publish(anonymousLayer.ContentItem);
IContent disabledLayer = _contentManager.Create<LayerPart>("Layer", t => { t.Record.Name = "Disabled"; t.Record.LayerRule = "false"; });
_contentManager.Publish(disabledLayer.ContentItem);
} }
} }

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

@@ -97,7 +97,6 @@
<Content Include="TheThemeMachine\Views\Layout.cshtml" /> <Content Include="TheThemeMachine\Views\Layout.cshtml" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Folder Include="TheThemeMachine\Views\Fields\" />
<Folder Include="TheThemeMachine\Views\Parts\" /> <Folder Include="TheThemeMachine\Views\Parts\" />
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />