From a56b80322ae237382518ec5b4e8d22ce2ae9e360 Mon Sep 17 00:00:00 2001 From: Renaud Paquay Date: Fri, 3 Dec 2010 23:29:23 -0800 Subject: [PATCH] Flatten "Blogs" views --HG-- branch : dev rename : src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content-Blog.DetailAdmin.cshtml => src/Orchard.Web/Modules/Orchard.Blogs/Views/Content-Blog.DetailAdmin.cshtml rename : src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content-Blog.Edit.cshtml => src/Orchard.Web/Modules/Orchard.Blogs/Views/Content-Blog.Edit.cshtml rename : src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content-Blog.SummaryAdmin.cshtml => src/Orchard.Web/Modules/Orchard.Blogs/Views/Content-Blog.SummaryAdmin.cshtml rename : src/Orchard.Web/Modules/Orchard.Blogs/Views/EditorTemplates/Parts/Blogs.Blog.Fields.cshtml => src/Orchard.Web/Modules/Orchard.Blogs/Views/EditorTemplates/Parts.Blogs.Blog.Fields.cshtml rename : src/Orchard.Web/Modules/Orchard.Blogs/Views/EditorTemplates/Parts/Blogs.BlogArchives.cshtml => src/Orchard.Web/Modules/Orchard.Blogs/Views/EditorTemplates/Parts.Blogs.BlogArchives.cshtml rename : src/Orchard.Web/Modules/Orchard.Blogs/Views/EditorTemplates/Parts/Blogs.RecentBlogPosts.cshtml => src/Orchard.Web/Modules/Orchard.Blogs/Views/EditorTemplates/Parts.Blogs.RecentBlogPosts.cshtml rename : src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Blogs.Blog.BlogPostCount.cshtml => src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts.Blogs.Blog.BlogPostCount.cshtml rename : src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Blogs.Blog.Description.cshtml => src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts.Blogs.Blog.Description.cshtml rename : src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Blogs.Blog.Manage.cshtml => src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts.Blogs.Blog.Manage.cshtml rename : src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Blogs.BlogArchives.cshtml => src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts.Blogs.BlogArchives.cshtml rename : src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Blogs.BlogPost.List.cshtml => src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts.Blogs.BlogPost.List.cshtml rename : src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Blogs.BlogPost.ListAdmin.cshtml => src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts.Blogs.BlogPost.ListAdmin.cshtml rename : src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Blogs.RecentBlogPosts.cshtml => src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts.Blogs.RecentBlogPosts.cshtml rename : src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Blogs.RemotePublishing.cshtml => src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts.Blogs.RemotePublishing.cshtml --- .../Drivers/BlogArchivesPartDriver.cs | 2 +- .../Orchard.Blogs/Drivers/BlogPartDriver.cs | 2 +- .../Drivers/RecentBlogPostsPartDriver.cs | 2 +- .../Orchard.Blogs/Orchard.Blogs.csproj | 28 +++++++++---------- .../Content-Blog.DetailAdmin.cshtml | 0 .../{Items => }/Content-Blog.Edit.cshtml | 0 .../Content-Blog.SummaryAdmin.cshtml | 0 ....cshtml => Parts.Blogs.Blog.Fields.cshtml} | 0 ...cshtml => Parts.Blogs.BlogArchives.cshtml} | 0 ...tml => Parts.Blogs.RecentBlogPosts.cshtml} | 0 ... => Parts.Blogs.Blog.BlogPostCount.cshtml} | 0 ...ml => Parts.Blogs.Blog.Description.cshtml} | 0 ....cshtml => Parts.Blogs.Blog.Manage.cshtml} | 0 ...cshtml => Parts.Blogs.BlogArchives.cshtml} | 0 ...shtml => Parts.Blogs.BlogPost.List.cshtml} | 0 ... => Parts.Blogs.BlogPost.ListAdmin.cshtml} | 0 ...tml => Parts.Blogs.RecentBlogPosts.cshtml} | 0 ...ml => Parts.Blogs.RemotePublishing.cshtml} | 0 18 files changed, 17 insertions(+), 17 deletions(-) rename src/Orchard.Web/Modules/Orchard.Blogs/Views/{Items => }/Content-Blog.DetailAdmin.cshtml (100%) rename src/Orchard.Web/Modules/Orchard.Blogs/Views/{Items => }/Content-Blog.Edit.cshtml (100%) rename src/Orchard.Web/Modules/Orchard.Blogs/Views/{Items => }/Content-Blog.SummaryAdmin.cshtml (100%) rename src/Orchard.Web/Modules/Orchard.Blogs/Views/EditorTemplates/{Parts/Blogs.Blog.Fields.cshtml => Parts.Blogs.Blog.Fields.cshtml} (100%) rename src/Orchard.Web/Modules/Orchard.Blogs/Views/EditorTemplates/{Parts/Blogs.BlogArchives.cshtml => Parts.Blogs.BlogArchives.cshtml} (100%) rename src/Orchard.Web/Modules/Orchard.Blogs/Views/EditorTemplates/{Parts/Blogs.RecentBlogPosts.cshtml => Parts.Blogs.RecentBlogPosts.cshtml} (100%) rename src/Orchard.Web/Modules/Orchard.Blogs/Views/{Parts/Blogs.Blog.BlogPostCount.cshtml => Parts.Blogs.Blog.BlogPostCount.cshtml} (100%) rename src/Orchard.Web/Modules/Orchard.Blogs/Views/{Parts/Blogs.Blog.Description.cshtml => Parts.Blogs.Blog.Description.cshtml} (100%) rename src/Orchard.Web/Modules/Orchard.Blogs/Views/{Parts/Blogs.Blog.Manage.cshtml => Parts.Blogs.Blog.Manage.cshtml} (100%) rename src/Orchard.Web/Modules/Orchard.Blogs/Views/{Parts/Blogs.BlogArchives.cshtml => Parts.Blogs.BlogArchives.cshtml} (100%) rename src/Orchard.Web/Modules/Orchard.Blogs/Views/{Parts/Blogs.BlogPost.List.cshtml => Parts.Blogs.BlogPost.List.cshtml} (100%) rename src/Orchard.Web/Modules/Orchard.Blogs/Views/{Parts/Blogs.BlogPost.ListAdmin.cshtml => Parts.Blogs.BlogPost.ListAdmin.cshtml} (100%) rename src/Orchard.Web/Modules/Orchard.Blogs/Views/{Parts/Blogs.RecentBlogPosts.cshtml => Parts.Blogs.RecentBlogPosts.cshtml} (100%) rename src/Orchard.Web/Modules/Orchard.Blogs/Views/{Parts/Blogs.RemotePublishing.cshtml => Parts.Blogs.RemotePublishing.cshtml} (100%) diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogArchivesPartDriver.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogArchivesPartDriver.cs index 364ee1bf0..047e22687 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogArchivesPartDriver.cs +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogArchivesPartDriver.cs @@ -29,7 +29,7 @@ namespace Orchard.Blogs.Drivers { protected override DriverResult Editor(BlogArchivesPart part, dynamic shapeHelper) { return ContentShape("Parts_Blogs_BlogArchives_Edit", - () => shapeHelper.EditorTemplate(TemplateName: "Parts/Blogs.BlogArchives", Model: part, Prefix: Prefix)); + () => shapeHelper.EditorTemplate(TemplateName: "Parts.Blogs.BlogArchives", Model: part, Prefix: Prefix)); } protected override DriverResult Editor(BlogArchivesPart part, IUpdateModel updater, dynamic shapeHelper) { diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogPartDriver.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogPartDriver.cs index 01452dfd8..ad1013836 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogPartDriver.cs +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogPartDriver.cs @@ -65,7 +65,7 @@ namespace Orchard.Blogs.Drivers { protected override DriverResult Editor(BlogPart blogPart, dynamic shapeHelper) { return ContentShape("Parts_Blogs_Blog_Fields", - () => shapeHelper.EditorTemplate(TemplateName: "Parts/Blogs.Blog.Fields", Model: blogPart, Prefix: Prefix)); + () => shapeHelper.EditorTemplate(TemplateName: "Parts.Blogs.Blog.Fields", Model: blogPart, Prefix: Prefix)); } protected override DriverResult Editor(BlogPart blogPart, IUpdateModel updater, dynamic shapeHelper) { diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/RecentBlogPostsPartDriver.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/RecentBlogPostsPartDriver.cs index 082bf4019..198eb908b 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/RecentBlogPostsPartDriver.cs +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/RecentBlogPostsPartDriver.cs @@ -48,7 +48,7 @@ namespace Orchard.Blogs.Drivers { protected override DriverResult Editor(RecentBlogPostsPart part, dynamic shapeHelper) { return ContentShape("Parts_Blogs_RecentBlogPosts_Edit", - () => shapeHelper.EditorTemplate(TemplateName: "Parts/Blogs.RecentBlogPosts", Model: part, Prefix: Prefix)); + () => shapeHelper.EditorTemplate(TemplateName: "Parts.Blogs.RecentBlogPosts", Model: part, Prefix: Prefix)); } protected override DriverResult Editor(RecentBlogPostsPart part, IUpdateModel updater, dynamic shapeHelper) { diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj b/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj index 8f68e0986..485adb414 100644 --- a/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj +++ b/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj @@ -116,13 +116,13 @@ - - - - + + + + Code - + @@ -139,15 +139,15 @@ Designer - - - - - - - - - + + + + + + + + + Designer diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content-Blog.DetailAdmin.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Content-Blog.DetailAdmin.cshtml similarity index 100% rename from src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content-Blog.DetailAdmin.cshtml rename to src/Orchard.Web/Modules/Orchard.Blogs/Views/Content-Blog.DetailAdmin.cshtml diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content-Blog.Edit.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Content-Blog.Edit.cshtml similarity index 100% rename from src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content-Blog.Edit.cshtml rename to src/Orchard.Web/Modules/Orchard.Blogs/Views/Content-Blog.Edit.cshtml diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content-Blog.SummaryAdmin.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Content-Blog.SummaryAdmin.cshtml similarity index 100% rename from src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content-Blog.SummaryAdmin.cshtml rename to src/Orchard.Web/Modules/Orchard.Blogs/Views/Content-Blog.SummaryAdmin.cshtml diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/EditorTemplates/Parts/Blogs.Blog.Fields.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/EditorTemplates/Parts.Blogs.Blog.Fields.cshtml similarity index 100% rename from src/Orchard.Web/Modules/Orchard.Blogs/Views/EditorTemplates/Parts/Blogs.Blog.Fields.cshtml rename to src/Orchard.Web/Modules/Orchard.Blogs/Views/EditorTemplates/Parts.Blogs.Blog.Fields.cshtml diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/EditorTemplates/Parts/Blogs.BlogArchives.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/EditorTemplates/Parts.Blogs.BlogArchives.cshtml similarity index 100% rename from src/Orchard.Web/Modules/Orchard.Blogs/Views/EditorTemplates/Parts/Blogs.BlogArchives.cshtml rename to src/Orchard.Web/Modules/Orchard.Blogs/Views/EditorTemplates/Parts.Blogs.BlogArchives.cshtml diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/EditorTemplates/Parts/Blogs.RecentBlogPosts.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/EditorTemplates/Parts.Blogs.RecentBlogPosts.cshtml similarity index 100% rename from src/Orchard.Web/Modules/Orchard.Blogs/Views/EditorTemplates/Parts/Blogs.RecentBlogPosts.cshtml rename to src/Orchard.Web/Modules/Orchard.Blogs/Views/EditorTemplates/Parts.Blogs.RecentBlogPosts.cshtml diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Blogs.Blog.BlogPostCount.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts.Blogs.Blog.BlogPostCount.cshtml similarity index 100% rename from src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Blogs.Blog.BlogPostCount.cshtml rename to src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts.Blogs.Blog.BlogPostCount.cshtml diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Blogs.Blog.Description.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts.Blogs.Blog.Description.cshtml similarity index 100% rename from src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Blogs.Blog.Description.cshtml rename to src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts.Blogs.Blog.Description.cshtml diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Blogs.Blog.Manage.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts.Blogs.Blog.Manage.cshtml similarity index 100% rename from src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Blogs.Blog.Manage.cshtml rename to src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts.Blogs.Blog.Manage.cshtml diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Blogs.BlogArchives.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts.Blogs.BlogArchives.cshtml similarity index 100% rename from src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Blogs.BlogArchives.cshtml rename to src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts.Blogs.BlogArchives.cshtml diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Blogs.BlogPost.List.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts.Blogs.BlogPost.List.cshtml similarity index 100% rename from src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Blogs.BlogPost.List.cshtml rename to src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts.Blogs.BlogPost.List.cshtml diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Blogs.BlogPost.ListAdmin.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts.Blogs.BlogPost.ListAdmin.cshtml similarity index 100% rename from src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Blogs.BlogPost.ListAdmin.cshtml rename to src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts.Blogs.BlogPost.ListAdmin.cshtml diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Blogs.RecentBlogPosts.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts.Blogs.RecentBlogPosts.cshtml similarity index 100% rename from src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Blogs.RecentBlogPosts.cshtml rename to src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts.Blogs.RecentBlogPosts.cshtml diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Blogs.RemotePublishing.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts.Blogs.RemotePublishing.cshtml similarity index 100% rename from src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Blogs.RemotePublishing.cshtml rename to src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts.Blogs.RemotePublishing.cshtml