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 2 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
.hgsubstate
+3 -3
View File
@@ -1,12 +1,12 @@
c47525e90819321d37962a11313006a4ccfc8362 src/Orchard.Web/Modules/Orchard.AntiSpam c47525e90819321d37962a11313006a4ccfc8362 src/Orchard.Web/Modules/Orchard.AntiSpam
f41ead8138ef8eaec32e2c2826100ca175c15730 src/Orchard.Web/Modules/Orchard.Autoroute f41ead8138ef8eaec32e2c2826100ca175c15730 src/Orchard.Web/Modules/Orchard.Autoroute
5eb5861244852a382332abfbfe2d28ac1b9bd419 src/Orchard.Web/Modules/Orchard.ContentPermissions 5eb5861244852a382332abfbfe2d28ac1b9bd419 src/Orchard.Web/Modules/Orchard.ContentPermissions
d466369118538a8ca77754d047ee841d016ea9c2 src/Orchard.Web/Modules/Orchard.ContentPicker 947ac9d443cf2a83ce50f3f214ee673728160df1 src/Orchard.Web/Modules/Orchard.ContentPicker
8ac5b68b6ad42cfce6be53e6bd776a35ac14c6e7 src/Orchard.Web/Modules/Orchard.CustomForms b639c7ca01fc23837be54285e1de56bf3a47adae src/Orchard.Web/Modules/Orchard.CustomForms
b639cb33d2ba038de6048350400b664399608996 src/Orchard.Web/Modules/Orchard.Forms b639cb33d2ba038de6048350400b664399608996 src/Orchard.Web/Modules/Orchard.Forms
b748de63e3cf8debfc3eba77f26089705147047d src/Orchard.Web/Modules/Orchard.Rules b748de63e3cf8debfc3eba77f26089705147047d src/Orchard.Web/Modules/Orchard.Rules
419399ef2e37122a000e6cc8674148d3183d7032 src/Orchard.Web/Modules/Orchard.TaskLease 419399ef2e37122a000e6cc8674148d3183d7032 src/Orchard.Web/Modules/Orchard.TaskLease
63dda71453ebbfd0e165662a0d56c9c0a7a3d3d4 src/Orchard.Web/Modules/Orchard.Tokens 63dda71453ebbfd0e165662a0d56c9c0a7a3d3d4 src/Orchard.Web/Modules/Orchard.Tokens
a47761330447df38f714bc17797b8895721a6974 src/orchard.web/Modules/Orchard.Alias a47761330447df38f714bc17797b8895721a6974 src/orchard.web/Modules/Orchard.Alias
80ada5dcf8158f432ce99fc3c7e76f5137e73473 src/orchard.web/Modules/Orchard.Projections 80ada5dcf8158f432ce99fc3c7e76f5137e73473 src/orchard.web/Modules/Orchard.Projections
f649216f02ad6c2793a248a6386e94777eab4d59 src/orchard.web/modules/Orchard.Fields 04fc7e7bba44e0aa1214110616825f68aab5e5f6 src/orchard.web/modules/Orchard.Fields
src/Orchard.Web/Core/Shapes/CoreShapes.cs
+5 -5
View File
@@ -84,21 +84,21 @@ namespace Orchard.Core.Shapes {
string menuName = menu.MenuName; string menuName = menu.MenuName;
menu.Classes.Add("menu-" + menuName.HtmlClassify()); menu.Classes.Add("menu-" + menuName.HtmlClassify());
menu.Classes.Add("menu"); menu.Classes.Add("menu");
menu.Metadata.Alternates.Add("Menu__" + menuName); menu.Metadata.Alternates.Add("Menu__" + EncodeAlternateElement(menuName));
}); });
builder.Describe("MenuItem") builder.Describe("MenuItem")
.OnDisplaying(displaying => { .OnDisplaying(displaying => {
var menuItem = displaying.Shape; var menuItem = displaying.Shape;
var menu = menuItem.Menu; var menu = menuItem.Menu;
menuItem.Metadata.Alternates.Add("MenuItem__" + menu.MenuName); menuItem.Metadata.Alternates.Add("MenuItem__" + EncodeAlternateElement(menu.MenuName));
}); });
builder.Describe("MenuItemLink") builder.Describe("MenuItemLink")
.OnDisplaying(displaying => { .OnDisplaying(displaying => {
var menuItem = displaying.Shape; var menuItem = displaying.Shape;
var menu = menuItem.Menu; 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; string contentType = menuItem.Content.ContentItem.ContentType;
if(contentType != null) { if(contentType != null) {
@@ -112,14 +112,14 @@ namespace Orchard.Core.Shapes {
string menuName = menu.MenuName; string menuName = menu.MenuName;
menu.Classes.Add("localmenu-" + menuName.HtmlClassify()); menu.Classes.Add("localmenu-" + menuName.HtmlClassify());
menu.Classes.Add("localmenu"); menu.Classes.Add("localmenu");
menu.Metadata.Alternates.Add("LocalMenu__" + menuName); menu.Metadata.Alternates.Add("LocalMenu__" + EncodeAlternateElement(menuName));
}); });
builder.Describe("LocalMenuItem") builder.Describe("LocalMenuItem")
.OnDisplaying(displaying => { .OnDisplaying(displaying => {
var menuItem = displaying.Shape; var menuItem = displaying.Shape;
var menu = menuItem.Menu; var menu = menuItem.Menu;
menuItem.Metadata.Alternates.Add("LocalMenuItem__" + menu.MenuName); menuItem.Metadata.Alternates.Add("LocalMenuItem__" + EncodeAlternateElement(menu.MenuName));
}); });
#region Pager alternates #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 Website: http://orchardproject.net
Version: 1.5 Version: 1.5
OrchardVersion: 1.4 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 Dependencies: Orchard.Media, Orchard.jQuery
FeatureDescription: UI for browsing for, uploading, or selecting an image for an HTML editor. FeatureDescription: UI for browsing for, uploading, or selecting an image for an HTML editor.
Category: Input 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 @using Orchard.Utility.Extensions
@model UpgradeTo14.ViewModels.MigrateViewModel @model UpgradeTo15.ViewModels.MigrateViewModel
@{ Layout.Title = T("Migrate Fields").ToString(); } @{ 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 @using Orchard.Utility.Extensions
@model UpgradeTo14.ViewModels.MigrateViewModel @model UpgradeTo15.ViewModels.MigrateViewModel
@{ Layout.Title = T("Migrate Routes").ToString(); } @{ Layout.Title = T("Migrate Routes").ToString(); }