mirror of
https://github.com/OrchardCMS/Orchard.git
synced 2025-10-15 19:54:57 +08:00
Merge
--HG-- branch : dev
This commit is contained in:
@@ -27,6 +27,7 @@ namespace Orchard.Core.Contents {
|
||||
var contentTypes = contentTypeDefinitions.Where(ctd => ctd.Settings.GetModel<ContentTypeSettings>().Creatable).OrderBy(ctd => ctd.DisplayName);
|
||||
if (contentTypes.Count() > 0) {
|
||||
builder.Add(T("New"), "-1", menu => {
|
||||
menu.LinkToFirstChild(false);
|
||||
foreach (var contentTypeDefinition in contentTypes) {
|
||||
var ci = _contentManager.New(contentTypeDefinition.Name);
|
||||
var cim = _contentManager.GetItemMetadata(ci);
|
||||
|
@@ -16,7 +16,7 @@
|
||||
var firstOfTheSecond = secondLevelMenuItems.FirstOrDefault();
|
||||
var sectionHeaderMarkup = firstLevelMenuItem.RouteValues != null || HasText(firstLevelMenuItem.Url)
|
||||
? Html.Link(sectionHeaderText, (string)firstLevelMenuItem.Href)
|
||||
: firstOfTheSecond != null
|
||||
: firstOfTheSecond != null && firstLevelMenuItem.LinkToFirstChild
|
||||
? Html.Link(sectionHeaderText, (string)firstOfTheSecond.Href)
|
||||
: new HtmlString(string.Format("<span>{0}</span>", Html.Encode(sectionHeaderText)));
|
||||
|
||||
|
Reference in New Issue
Block a user