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 with default

Browse Source 
--HG--
branch : NH3
This commit is contained in:
Sebastien Ros
2012-07-17 14:47:14 -07:00
parent ccee6f5449 5683e2557b
commit 29d0e94416
5 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Orchard.Web/Core/Shapes/CoreShapes.cs
+5 -5
View File
@@ -84,21 +84,21 @@ namespace Orchard.Core.Shapes {
string menuName = menu.MenuName;
menu.Classes.Add("menu-" + menuName.HtmlClassify());
menu.Classes.Add("menu");
menu.Metadata.Alternates.Add("Menu__" + menuName);
menu.Metadata.Alternates.Add("Menu__" + EncodeAlternateElement(menuName));
});
builder.Describe("MenuItem")
.OnDisplaying(displaying => {
var menuItem = displaying.Shape;
var menu = menuItem.Menu;
menuItem.Metadata.Alternates.Add("MenuItem__" + menu.MenuName);
menuItem.Metadata.Alternates.Add("MenuItem__" + EncodeAlternateElement(menu.MenuName));
});
builder.Describe("MenuItemLink")
.OnDisplaying(displaying => {
var menuItem = displaying.Shape;
var menu = menuItem.Menu;
menuItem.Metadata.Alternates.Add("MenuItemLink__" + menu.MenuName);
menuItem.Metadata.Alternates.Add("MenuItemLink__" + EncodeAlternateElement(menu.MenuName));
string contentType = menuItem.Content.ContentItem.ContentType;
if(contentType != null) {
@@ -112,14 +112,14 @@ namespace Orchard.Core.Shapes {
string menuName = menu.MenuName;
menu.Classes.Add("localmenu-" + menuName.HtmlClassify());
menu.Classes.Add("localmenu");
menu.Metadata.Alternates.Add("LocalMenu__" + menuName);
menu.Metadata.Alternates.Add("LocalMenu__" + EncodeAlternateElement(menuName));
});
builder.Describe("LocalMenuItem")
.OnDisplaying(displaying => {
var menuItem = displaying.Shape;
var menu = menuItem.Menu;
menuItem.Metadata.Alternates.Add("LocalMenuItem__" + menu.MenuName);
menuItem.Metadata.Alternates.Add("LocalMenuItem__" + EncodeAlternateElement(menu.MenuName));
});
#region Pager alternates
src/Orchard.Web/Modules/Orchard.MediaPicker/Module.txt
+1 -1
View File
@@ -5,7 +5,7 @@ Author: The Orchard Team
Website: http://orchardproject.net
Version: 1.5
OrchardVersion: 1.4
Description: Description for the module
Description: UI for browsing for, uploading, or selecting an image for an HTML editor.
Dependencies: Orchard.Media, Orchard.jQuery
FeatureDescription: UI for browsing for, uploading, or selecting an image for an HTML editor.
Category: Input Editor
src/Orchard.Web/Modules/UpgradeTo15/Views/Field/Index.cshtml
+1 -1
View File
@@ -1,5 +1,5 @@
@using Orchard.Utility.Extensions
@model UpgradeTo14.ViewModels.MigrateViewModel
@model UpgradeTo15.ViewModels.MigrateViewModel
@{ Layout.Title = T("Migrate Fields").ToString(); }
src/Orchard.Web/Modules/UpgradeTo15/Views/Route/Index.cshtml
+1 -1
View File
@@ -1,5 +1,5 @@
@using Orchard.Utility.Extensions
@model UpgradeTo14.ViewModels.MigrateViewModel
@model UpgradeTo15.ViewModels.MigrateViewModel
@{ Layout.Title = T("Migrate Routes").ToString(); }