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

Starting to get a UI around content type management

Browse Source 
- added a DisplayName to the ContentTypeDefinition
- added a CreateRouteValues rvd to go along with the existing display and edit
- set default display, edit and create route values for ContentItemMetadata (* should get fallback route values in a different manner. probably not good to refer to an area, even by string, in core from the fwk)
- starting to shape up the content type list into a more consistent UI
- added create type action, view, etc. for creating new content types
 - supporting service has a few default parts hard-coded for now

--HG--
branch : dev
This commit is contained in:
Nathan Heskew
2010-06-16 04:22:51 -07:00
parent ec0e452c3a
commit 6e756f54ff
32 changed files with 350 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogPostDriver.cs
View File

@@ -40,6 +40,9 @@ namespace Orchard.Blogs.Drivers {
}
public override RouteValueDictionary GetDisplayRouteValues(BlogPost post) {
if (post.Blog == null)
return new RouteValueDictionary();
return new RouteValueDictionary {
{"Area", "Orchard.Blogs"},
{"Controller", "BlogPost"},
@@ -50,6 +53,9 @@ namespace Orchard.Blogs.Drivers {
}
public override RouteValueDictionary GetEditorRouteValues(BlogPost post) {
if (post.Blog == null)
return new RouteValueDictionary();
return new RouteValueDictionary {
{"Area", "Orchard.Blogs"},
{"Controller", "BlogPostAdmin"},
@@ -59,6 +65,18 @@ namespace Orchard.Blogs.Drivers {
};
}
public override RouteValueDictionary GetCreateRouteValues(BlogPost post) {
if (post.Blog == null)
return new RouteValueDictionary();
return new RouteValueDictionary {
{"Area", "Orchard.Blogs"},
{"Controller", "BlogPostAdmin"},
{"Action", "Create"},
{"blogSlug", post.Blog.Slug},
};
}
protected override DriverResult Display(BlogPost post, string displayType) {
return Combined(
ContentItemTemplate("Items/Blogs.BlogPost").LongestMatch(displayType, "Summary", "SummaryAdmin"),

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

@@ -10,9 +10,9 @@ namespace Orchard.MetaData {
public void GetNavigation(NavigationBuilder builder)
{
builder.Add(T("Content Types"), "5",
builder.Add(T("Site Configuration"), "11",
menu => menu
.Add(T("Content Types"), "1.0", item => item.Action("ContentTypeList", "Admin", new { area = "Orchard.MetaData" }).Permission(Permissions.ManageMetaData))
.Add(T("Content Types (metadata)"), "3.1", item => item.Action("ContentTypeList", "Admin", new { area = "Orchard.MetaData" }).Permission(Permissions.ManageMetaData))
);
}

2
src/Orchard.Web/Modules/Orchard.MetaData/Views/Admin/ContentTypeList.ascx
View File

@@ -25,7 +25,7 @@
%>
<tr class="<%=contentTypeClass %>">
<td>
<%= Html.ActionLink(item.Name, "ContentTypeList", new {id=item.Name})%>
<%= Html.ActionLink(string.IsNullOrWhiteSpace(item.Name) ? "unkwn" : item.Name, "ContentTypeList", new {id=item.Name})%>
</td>
</tr>

8
src/Orchard.Web/Modules/Orchard.Pages/Drivers/PageDriver.cs
View File

@@ -61,6 +61,14 @@ namespace Orchard.Pages.Drivers {
};
}
public override RouteValueDictionary GetCreateRouteValues(Page page) {
return new RouteValueDictionary {
{"Area", "Orchard.Pages"},
{"Controller", "Admin"},
{"Action", "Create"},
};
}
protected override DriverResult Display(Page page, string displayType) {
return Combined(
ContentItemTemplate("Items/Pages.Page").LongestMatch(displayType, "Summary", "SummaryAdmin"),

15
src/Orchard.Web/Modules/Orchard.Setup/Controllers/SetupController.cs
View File

@@ -1,24 +1,9 @@
using System;
using System.Linq;
using System.Web.Mvc;
using Orchard.Comments.Models;
using Orchard.ContentManagement;
using Orchard.Core.Common.Models;
using Orchard.Core.Navigation.Models;
using Orchard.Core.Settings.Models;
using Orchard.Data;
using Orchard.Environment;
using Orchard.Environment.Extensions;
using Orchard.Environment.ShellBuilders;
using Orchard.Environment.Descriptor;
using Orchard.Environment.Descriptor.Models;
using Orchard.FileSystems.AppData;
using Orchard.Security;
using Orchard.Settings;
using Orchard.Setup.Services;
using Orchard.Setup.ViewModels;
using Orchard.Localization;
using Orchard.Themes;
using Orchard.UI.Notify;
namespace Orchard.Setup.Controllers {

8
src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs
View File

@@ -4,7 +4,6 @@ using System.Web;
using Orchard.Comments.Models;
using Orchard.ContentManagement;
using Orchard.ContentManagement.MetaData;
using Orchard.ContentManagement.MetaData.Builders;
using Orchard.Core.Common.Models;
using Orchard.Core.Navigation.Models;
using Orchard.Core.Settings.Models;
@@ -15,7 +14,6 @@ using Orchard.Environment.ShellBuilders;
using Orchard.Environment.Descriptor;
using Orchard.Environment.Descriptor.Models;
using Orchard.Localization;
using Orchard.ContentManagement.MetaData.Services;
using Orchard.Localization.Services;
using Orchard.Security;
using Orchard.Settings;
@@ -149,9 +147,9 @@ namespace Orchard.Setup.Services {
//hackInstallationGenerator.GenerateInstallEvents();
var contentDefinitionManager = environment.Resolve<IContentDefinitionManager>();
contentDefinitionManager.AlterTypeDefinition("blogpost", cfg => cfg.WithPart("HasComments").WithPart("HasTags").WithPart("Localized"));
contentDefinitionManager.AlterTypeDefinition("page", cfg => cfg.WithPart("HasComments").WithPart("HasTags").WithPart("Localized"));
contentDefinitionManager.AlterTypeDefinition("sandboxpage", cfg => cfg.WithPart("HasComments").WithPart("HasTags").WithPart("Localized"));
contentDefinitionManager.AlterTypeDefinition("blogpost", cfg => cfg.Named("blogpost", "Blog Post").WithPart("HasComments").WithPart("HasTags").WithPart("Localized"));
contentDefinitionManager.AlterTypeDefinition("page", cfg => cfg.Named("page", "Page").WithPart("HasComments").WithPart("HasTags").WithPart("Localized"));
contentDefinitionManager.AlterTypeDefinition("sandboxpage", cfg => cfg.Named("sandboxpage", "Sandbox Page").WithPart("HasComments").WithPart("HasTags").WithPart("Localized"));
// create home page as a CMS page
var page = contentManager.Create("page", VersionOptions.Draft);