lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-21 03:14:10 +08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Merge

Browse Source 
--HG--
branch : dev
This commit is contained in:
Suha Can
2011-02-23 11:00:19 -08:00
parent d97e90f402 c0dfcfae22
commit b4388caed5
7 changed files with 27 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Orchard.Web/Core/Settings/AdminMenu.cs
View File

@@ -20,7 +20,8 @@ namespace Orchard.Core.Settings {
public void GetNavigation(NavigationBuilder builder) {
builder.Add(T("Settings"), "50",
menu => menu.Add(T("General"), "0", item => item.Action("Index", "Admin", new { area = "Settings", groupInfoId = "Index" })
menu => menu.LinkToFirstChild(false)
.Add(T("General"), "0", item => item.Action("Index", "Admin", new { area = "Settings", groupInfoId = "Index" })
.Permission(StandardPermissions.SiteOwner)));
var site = _siteService.GetSiteSettings();

9
src/Orchard.Web/Modules/Orchard.Lists/Styles/menu.list.css
View File

@@ -1,16 +1,15 @@
.navicon-list,
.navicon-lists {
.navicon-lists,
.section-new .subnavicon-list {
background-image:url(images/menu.list.png) !important;
}
.navicon-list:hover,
.navicon-lists:hover {
background-position:0 -30px !important;
}
/* subnav */
ul ul .navicon-list {
.section-new .subnavicon-list {
background-position:0 6px !important;
padding-left:20px !important;
}
ul ul .navicon-list:hover {
.section-new .subnavicon-list:hover {
background-position:0 -26px !important;
}

7
src/Orchard.Web/Modules/Orchard.Pages/Styles/menu.page.css
View File

@@ -1,14 +1,15 @@
.navicon-page {
.navicon-page,
.section-new .subnavicon-page {
background-image:url(images/menu.page.png) !important;
}
.navicon-page:hover {
background-position:0 -30px !important;
}
/* subnav */
ul ul .navicon-page {
.section-new .subnavicon-page {
background-position:0 6px !important;
padding-left:20px !important;
}
ul ul .navicon-page:hover {
.section-new .subnavicon-page:hover {
background-position:0 -26px !important;
}

7
src/Orchard.Web/Themes/TheAdmin/Styles/site.css
View File

@@ -412,11 +412,12 @@ form.link button:hover {
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
}
.section-dashboard, .section-new
{
.section-dashboard, .section-new, .section-settings {
padding:6px 0;
}
.section-dashboard, .section-new {
background:#2b2b2b;
border:1px solid #404040;
padding:6px 0;
/*CSS3 properties*/
border-radius: 3px;

6
src/Orchard.Web/Themes/TheAdmin/Views/Menu.cshtml
View File

@@ -69,10 +69,10 @@
@foreach (var secondLevelMenuItem in secondLevelMenuItems.Where(menuItem => !menuItem.LocalNav)) {
string secondLevelTextHint = secondLevelMenuItem.TextHint;
var secondLevelItemClassName = HasText(secondLevelTextHint)
? "navicon-" + secondLevelTextHint.HtmlClassify()
: "navicon";
? "subnavicon-" + secondLevelTextHint.HtmlClassify()
: "subnavicon";
var secondLevelItemId = HasText(secondLevelMenuItem.IdHint)
? "navicon-" + secondLevelMenuItem.IdHint
? "subnavicon-" + secondLevelMenuItem.IdHint
: null;
if (secondLevelMenuItem.Selected) {

14
src/Orchard/ContentManagement/DefaultContentManager.cs
View File

@@ -358,16 +358,18 @@ namespace Orchard.ContentManagement {
return context.Metadata;
}
public IList<GroupInfo> GetEditorGroupInfos(IContent content) {
public IEnumerable<GroupInfo> GetEditorGroupInfos(IContent content) {
var metadata = GetItemMetadata(content);
// todo: (heskew) dedup and order
return metadata.EditorGroupInfo;
return metadata.EditorGroupInfo
.GroupBy(groupInfo => groupInfo.Id)
.Select(grouping => grouping.OrderBy(groupInfo => groupInfo.Position, new FlatPositionComparer()).FirstOrDefault());
}
public IList<GroupInfo> GetDisplayGroupInfos(IContent content) {
public IEnumerable<GroupInfo> GetDisplayGroupInfos(IContent content) {
var metadata = GetItemMetadata(content);
// todo: (heskew) dedup and order
return metadata.DisplayGroupInfo;
return metadata.DisplayGroupInfo
.GroupBy(groupInfo => groupInfo.Id)
.Select(grouping => grouping.OrderBy(groupInfo => groupInfo.Position, new FlatPositionComparer()).FirstOrDefault());
}
public GroupInfo GetEditorGroupInfo(IContent content, string groupInfoId) {

4
src/Orchard/ContentManagement/IContentManager.cs
View File

@@ -25,8 +25,8 @@ namespace Orchard.ContentManagement {
IContentQuery<ContentItem> Query();
ContentItemMetadata GetItemMetadata(IContent contentItem);
IList<GroupInfo> GetEditorGroupInfos(IContent contentItem);
IList<GroupInfo> GetDisplayGroupInfos(IContent contentItem);
IEnumerable<GroupInfo> GetEditorGroupInfos(IContent contentItem);
IEnumerable<GroupInfo> GetDisplayGroupInfos(IContent contentItem);
GroupInfo GetEditorGroupInfo(IContent contentItem, string groupInfoId);
GroupInfo GetDisplayGroupInfo(IContent contentItem, string groupInfoId);