lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge

Browse Source 
--HG--
branch : dev
This commit is contained in:
Renaud Paquay
2010-06-14 09:02:25 -07:00
parent cd3a537396 e8766af95a
commit 59dbbfb44e
15 changed files with 26 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Orchard.Web/Core/Contents/AdminMenu.cs
View File

@@ -1,5 +1,4 @@
using Orchard.Localization;
using Orchard.Security;
using Orchard.UI.Navigation;
namespace Orchard.Core.Contents {
@@ -10,10 +9,11 @@ namespace Orchard.Core.Contents {
public void GetNavigation(NavigationBuilder builder) {
builder.Add(T("Content"), "1",
menu => {
menu.Add(T("Create"), "1.1", item => item.Action("Create", "Admin", new { area = "Contents" }));
menu.Add(T("List"), "1.2", item => item.Action("List", "Admin", new { area = "Contents" }));
menu.Add(T("Types"), "1.3", item => item.Action("Types", "Admin", new { area = "Contents" }));
menu.Add(T("Create New Content"), "1.1", item => item.Action("Create", "Admin", new { area = "Contents" }));
menu.Add(T("Manage Content"), "1.2", item => item.Action("List", "Admin", new { area = "Contents" }));
});
builder.Add(T("Site Configuration"), "11",
menu => menu.Add(T("Content Types"), "3", item => item.Action("Types", "Admin", new { area = "Contents" })));
}
}
}

2
src/Orchard.Web/Core/Contents/Module.txt
View File

@@ -7,5 +7,5 @@ orchardversion: 0.1.2010.0312
description: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas consectetur consequat risus, vel blandit arcu tincidunt eget. Nam rutrum nulla vestibulum dolor dapibus sagittis. Vivamus convallis faucibus accumsan. Suspendisse sapien enim, cursus at dignissim a, sollicitudin sit amet est. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Donec sed urna magna, in luctus nulla. Pellentesque erat ipsum, convallis sed molestie tempus, mattis vel leo metus.
features:
Contents:
Description: Default controllers for some content types.
Description: Default custom content type definition, creation and management.
Category: Core

5
src/Orchard.Web/Core/Navigation/AdminMenu.cs
View File

@@ -7,9 +7,10 @@ namespace Orchard.Core.Navigation {
public string MenuName { get { return "admin"; } }
public void GetNavigation(NavigationBuilder builder) {
builder.Add(T("Site"), "12",
//todo: - add new menu? and list menus? ...and remove hard-coded menu name here
builder.Add(T("Navigation"), "8",
menu => menu
.Add(T("Manage Menu"), "6.0", item => item.Action("Index", "Admin", new { area = "Navigation" }).Permission(Permissions.ManageMainMenu)));
.Add(T("Main Menu"), "6.0", item => item.Action("Index", "Admin", new { area = "Navigation" }).Permission(Permissions.ManageMainMenu)));
}
}
}

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

@@ -7,9 +7,9 @@ namespace Orchard.Core.Settings {
public string MenuName { get { return "admin"; } }
public void GetNavigation(NavigationBuilder builder) {
builder.Add(T("Site"), "11",
builder.Add(T("Site Configuration"), "11",
menu => menu
.Add(T("Manage Settings"), "2.0", item => item.Action("Index", "Admin", new { area = "Settings" }).Permission(Permissions.ManageSettings)));
.Add(T("Settings"), "2.0", item => item.Action("Index", "Admin", new { area = "Settings" }).Permission(Permissions.ManageSettings)));
}
}
}

6
src/Orchard.Web/Modules/Orchard.Blogs/AdminMenu.cs
View File

@@ -16,7 +16,7 @@ namespace Orchard.Blogs {
public string MenuName { get { return "admin"; } }
public void GetNavigation(NavigationBuilder builder) {
builder.Add(T("Blogs"), "2", BuildMenu);
builder.Add(T("Blogs"), "1", BuildMenu);
}
private void BuildMenu(NavigationItemBuilder menu) {
@@ -33,12 +33,12 @@ namespace Orchard.Blogs {
item =>
item.Action("Item", "BlogAdmin", new {area = "Orchard.Blogs", blogSlug = singleBlog.Slug}).Permission(Permissions.MetaListBlogs));
menu.Add(T("Add New Blog"), "1.1",
menu.Add(T("Create New Blog"), "1.1",
item =>
item.Action("Create", "BlogAdmin", new {area = "Orchard.Blogs"}).Permission(Permissions.ManageBlogs));
if (singleBlog != null)
menu.Add(T("Add New Post"), "1.2",
menu.Add(T("Create New Post"), "1.2",
item =>
item.Action("Create", "BlogPostAdmin", new {area = "Orchard.Blogs", blogSlug = singleBlog.Slug}).Permission(Permissions.PublishBlogPost));
}

1
src/Orchard.Web/Modules/Orchard.DevTools/Views/Home/Index.aspx
View File

@@ -2,7 +2,6 @@
<%@ Import Namespace="Orchard.Mvc.ViewModels"%>
<h1><%: Html.TitleForPage(T("Dev Tools").ToString()) %></h1>
<p><%: Html.ActionLink(T("Contents").ToString(), "Index", "Content") %></p>
<p><%: Html.ActionLink(T("Metadata").ToString(), "Index", "Metadata") %></p>
<p><%: Html.ActionLink(T("Test Unauthorized Request").ToString(), "NotAuthorized", "Home")%></p>

6
src/Orchard.Web/Modules/Orchard.Modules/AdminMenu.cs
View File

@@ -8,11 +8,11 @@ namespace Orchard.Modules {
public string MenuName { get { return "admin"; } }
public void GetNavigation(NavigationBuilder builder) {
builder.Add(T("Features"), "10",
builder.Add(T("Site Configuration"), "11",
menu => menu
.Add(T("Manage Features"), "1.0", item => item.Action("Features", "Admin", new { area = "Orchard.Modules" })
.Add(T("Features"), "5.0", item => item.Action("Features", "Admin", new { area = "Orchard.Modules" })
.Permission(Permissions.ManageFeatures))
.Add(T("Installed Modules"), "2.0", item => item.Action("Index", "Admin", new { area = "Orchard.Modules" })
.Add(T("Modules"), "5.1", item => item.Action("Index", "Admin", new { area = "Orchard.Modules" })
.Permission(Permissions.ManageModules)));
}
}

2
src/Orchard.Web/Modules/Orchard.Pages/AdminMenu.cs
View File

@@ -24,7 +24,7 @@ namespace Orchard.Pages {
item =>
item.Action("List", "Admin", new {area = "Orchard.Pages"}).Permission(Permissions.MetaListPages));
menu.Add(T("Add New Page"), "1.1",
menu.Add(T("Create New Page"), "1.1",
item =>
item.Action("Create", "Admin", new {area = "Orchard.Pages"}).Permission(Permissions.EditPages));
}

5
src/Orchard.Web/Modules/Orchard.Roles/AdminMenu.cs
View File

@@ -7,10 +7,9 @@ namespace Orchard.Roles {
public string MenuName { get { return "admin"; } }
public void GetNavigation(NavigationBuilder builder) {
builder.Add(T("Users"), "5",
builder.Add(T("Users"), "9",
menu => menu
.Add(T("Manage Roles"), "2.0", item => item.Action("Index", "Admin", new { area = "Orchard.Roles" }).Permission(Permissions.ManageRoles))
.Add(T("Add New Role"), "2.1", item => item.Action("Create", "Admin", new { area = "Orchard.Roles" }).Permission(Permissions.ManageRoles)));
.Add(T("Manage Roles"), "2.0", item => item.Action("Index", "Admin", new { area = "Orchard.Roles" }).Permission(Permissions.ManageRoles)));
}
}
}

2
src/Orchard.Web/Modules/Orchard.Search/AdminMenu.cs
View File

@@ -7,7 +7,7 @@ namespace Orchard.Search {
public string MenuName { get { return "admin"; } }
public void GetNavigation(NavigationBuilder builder) {
builder.Add(T("Site"), "11",
builder.Add(T("Site Configuration"), "11",
menu => menu
.Add(T("Search Index"), "10.0", item => item.Action("Index", "Admin", new {area = "Orchard.Search"})
.Permission(Permissions.ManageSearchIndex)));

16
src/Orchard.Web/Modules/Orchard.Tags/AdminMenu.cs
View File

@@ -1,16 +0,0 @@
using Orchard.Localization;
using Orchard.UI.Navigation;
namespace Orchard.Tags {
public class AdminMenu : INavigationProvider {
public Localizer T { get; set; }
public string MenuName { get { return "admin"; } }
public void GetNavigation(NavigationBuilder builder) {
builder.Add(T("Tags"), "3",
menu => menu
.Add(T("Manage Tags"), "1.0", item => item.Action("Index", "Admin", new { area = "Orchard.Tags" }).Permission(Permissions.ManageTags))
);
}
}
}

1
src/Orchard.Web/Modules/Orchard.Tags/Orchard.Tags.csproj
View File

@@ -65,7 +65,6 @@
<Reference Include="System.Xml.Linq" />
</ItemGroup>
<ItemGroup>
<Compile Include="AdminMenu.cs" />
<Compile Include="Controllers\AdminController.cs" />
<Compile Include="Models\TagsContentItems.cs" />
<Compile Include="Services\ITagService.cs" />

4
src/Orchard.Web/Modules/Orchard.Themes/AdminMenu.cs
View File

@@ -7,9 +7,9 @@ namespace Orchard.Themes {
public string MenuName { get { return "admin"; } }
public void GetNavigation(NavigationBuilder builder) {
builder.Add(T("Site"), "11",
builder.Add(T("Site Design"), "10",
menu => menu
.Add(T("Manage Themes"), "4.0", item => item.Action("Index", "Admin", new { area = "Orchard.Themes" })
.Add(T("Themes"), "2.0", item => item.Action("Index", "Admin", new { area = "Orchard.Themes" })
.Permission(Permissions.ManageThemes).Permission(Permissions.ApplyTheme)));
}
}

5
src/Orchard.Web/Modules/Orchard.Users/AdminMenu.cs
View File

@@ -7,10 +7,9 @@ namespace Orchard.Users {
public string MenuName { get { return "admin"; } }
public void GetNavigation(NavigationBuilder builder) {
builder.Add(T("Users"), "5",
builder.Add(T("Users"), "9",
menu => menu
.Add(T("Manage Users"), "1.0", item => item.Action("Index", "Admin", new { area = "Orchard.Users" }).Permission(Permissions.ManageUsers))
.Add(T("Add New User"), "1.1", item => item.Action("Create", "Admin", new { area = "Orchard.Users" }).Permission(Permissions.ManageUsers)));
.Add(T("Manage Users"), "1.0", item => item.Action("Index", "Admin", new { area = "Orchard.Users" }).Permission(Permissions.ManageUsers)));
}
}
}