Refactoring some shape naming conventions

Items_Content* shapes types now Content*
Items_Widget* shape types now Widget*
*_Editor shapes now *_Edit

--HG--
branch : dev

src/Orchard.Web/Core/Common/Drivers/BodyPartDriver.cs

@@ -55,7 +55,7 @@ namespace Orchard.Core.Common.Drivers {
 
         protected override DriverResult Editor(BodyPart part, dynamic shapeHelper) {
             var model = BuildEditorViewModel(part);
-            return ContentShape("Parts_Common_Body_Editor",
+            return ContentShape("Parts_Common_Body_Edit",
                                 () => shapeHelper.EditorTemplate(TemplateName: TemplateName, Model: model, Prefix: Prefix));
         }
 
@@ -63,7 +63,7 @@ namespace Orchard.Core.Common.Drivers {
             var model = BuildEditorViewModel(part);
             updater.TryUpdateModel(model, Prefix, null, null);
 
-            return ContentShape("Parts_Common_Body_Editor", 
+            return ContentShape("Parts_Common_Body_Edit", 
                                 () => shapeHelper.EditorTemplate(TemplateName: TemplateName, Model: model, Prefix: Prefix));
         }
 

src/Orchard.Web/Core/Common/Placement.info

@@ -2,7 +2,7 @@
     <Place Parts_Common_Metadata="-"/>
     <Place Parts_Common_Metadata_Summary="-"/>
     <Place Parts_Common_Metadata_SummaryAdmin="-"/>
-    <Place Parts_Common_Body_Editor="Primary:2"/>
+    <Place Parts_Common_Body_Edit="Primary:2"/>
     <!-- show summary for all DisplayType by default -->
     <Place Parts_Common_Body_Summary="Content:5"/>
     <Match DisplayType="Detail">

src/Orchard.Web/Core/Contents/Shapes.cs

@@ -19,12 +19,12 @@ namespace Orchard.Core.Contents {
                     }
                 });
 
-            builder.Describe("Items_Content_Editor")
+            builder.Describe("Items_Content_Edit")
                .OnDisplaying(displaying => {
                    ContentItem contentItem = displaying.Shape.ContentItem;
                    if (contentItem != null) {
                        //Content.Editor-Page
-                       displaying.ShapeMetadata.Alternates.Add("Items_Content_Editor__" + contentItem.ContentType);
+                       displaying.ShapeMetadata.Alternates.Add("Items_Content_Edit__" + contentItem.ContentType);
                    }
                });
         }

src/Orchard.Web/Core/Orchard.Core.csproj

@@ -381,7 +381,7 @@
     <Content Include="ContentsLocation\Views\Web.config" />
     <Content Include="Messaging\Views\Web.config" />
     <Content Include="Contents\Views\Items\Content.cshtml" />
-    <Content Include="Contents\Views\Items\Content.Editor.cshtml" />
+    <Content Include="Contents\Views\Items\Content.Edit.cshtml" />
     <Content Include="Contents\Views\Items\Content.Summary.cshtml" />
     <Content Include="Contents\Views\Items\Content.SummaryAdmin.cshtml" />
     <Content Include="Shapes\Views\Document.cshtml" />

src/Orchard.Web/Core/PublishLater/Drivers/PublishLaterPartDriver.cs

@@ -43,7 +43,7 @@ namespace Orchard.Core.PublishLater.Drivers {
 
         protected override DriverResult Editor(PublishLaterPart part, dynamic shapeHelper) {
             var model = BuildEditorViewModel(part);
-            return ContentShape("Parts_PublishLater_Editor",
+            return ContentShape("Parts_PublishLater_Edit",
                                 () => shapeHelper.EditorTemplate(TemplateName: TemplateName, Model: model, Prefix: Prefix));
         }
         protected override DriverResult Editor(PublishLaterPart part, IUpdateModel updater, dynamic shapeHelper) {
@@ -65,7 +65,7 @@ namespace Orchard.Core.PublishLater.Drivers {
                     //Services.Notifier.Information(T("{0} draft has been saved!", model.ContentItem.TypeDefinition.DisplayName));
                     break;
             }
-            return ContentShape("Parts_PublishLater_Editor",
+            return ContentShape("Parts_PublishLater_Edit",
                                 () => shapeHelper.EditorTemplate(TemplateName: TemplateName, Model: model, Prefix: Prefix));
         }
 

src/Orchard.Web/Core/PublishLater/Placement.info

@@ -2,7 +2,7 @@
     <Place Parts_PublishLater_Metadata="-"/>
     <Place Parts_PublishLater_Metadata_Summary="-"/>
     <Place Parts_PublishLater_Metadata_SummaryAdmin="-"/>
-    <Place Parts_PublishLater_Editor="Secondary:1"/>
+    <Place Parts_PublishLater_Edit="Secondary:1"/>
     <Match DisplayType="Detail">
         <Place Parts_PublishLater_Metadata="Meta:1"/>
     </Match>

src/Orchard.Web/Modules/Orchard.Widgets/Orchard.Widgets.csproj

@@ -116,12 +116,12 @@
       <SubType>Designer</SubType>
     </None>
     <None Include="Views\Admin\Index.cshtml" />
-    <Content Include="Views\Items_Widget.Editor.cshtml" />
+    <Content Include="Views\Items\Widget.Editor.cshtml" />
-    <None Include="Views\Widget.ControlWrapper.cshtml" />
+    <None Include="Views\Widget.Manage.cshtml" />
     <None Include="Views\EditorTemplates\Parts\Widgets.WidgetPart.cshtml" />
     <None Include="Views\EditorTemplates\Parts\Widgets.LayerPart.cshtml" />
     <None Include="Views\EditorTemplates\Parts\Widgets.WidgetBagPart.cshtml" />
-    <Content Include="Views\Items_Widget.cshtml" />
+    <Content Include="Views\Items\Widget.cshtml" />
     <Content Include="Views\Items\Content-WidgetPage.cshtml" />
     <None Include="Views\Widget.Wrapper.cshtml" />
   </ItemGroup>

src/Orchard.Web/Orchard.Web.csproj

@@ -125,9 +125,27 @@
     <Content Include="Default.aspx" />
     <Content Include="Global.asax" />
     <Content Include="Refresh.html" />
+    <None Include="Themes\Classic\Placement.info" />
+    <Content Include="Themes\Contoso\Styles\search.css" />
+    <Content Include="Themes\Contoso\Zones\Footer.html" />
+    <Content Include="Themes\Corporate\Views\DisplayTemplates\Parts\Blogs.BlogPost.Metadata.ascx" />
+    <Content Include="Themes\Green\Views\Orchard.Search\Search\Index.ascx" />
+    <Content Include="Themes\TheAdmin\Scripts\admin.js" />
+    <Content Include="Themes\TheAdmin\Styles\ie.css" />
+    <Content Include="Themes\TheAdmin\Styles\images\menuClosed.gif" />
+    <Content Include="Themes\TheAdmin\Styles\images\menuClosedHover.gif" />
+    <Content Include="Themes\TheAdmin\Styles\images\menuOpen.gif" />
+    <Content Include="Themes\TheAdmin\Styles\images\menuOpenHover.gif" />
+    <Content Include="Themes\TheThemeMachine\draft.html" />
+    <Content Include="Themes\TheThemeMachine\Styles\Site.css" />
+    <Content Include="Themes\TheThemeMachine\Theme.png" />
+    <Content Include="Themes\TheThemeMachine\Theme.txt" />
+    <None Include="Themes\Classic\App_Data\Localization\fr-FR\orchard.theme.po" />
+    <Content Include="Themes\TheThemeMachine\Views\Items\Widget-HtmlWidget.cshtml" />
     <Content Include="Web.config">
       <SubType>Designer</SubType>
     </Content>
+    <Content Include="Themes\TheThemeMachine\Views\User.cshtml" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Orchard\Orchard.Framework.csproj">
@@ -147,12 +165,163 @@
     <Content Include="Config\Diagnostics.config">
       <SubType>Designer</SubType>
     </Content>
+    <Content Include="Themes\TheAdmin\Styles\images\icons.png" />
+    <Content Include="Themes\TheAdmin\Styles\images\tableHeaderBackgroundRed.gif" />
+    <Content Include="Themes\TheAdmin\Styles\site.css" />
+    <Content Include="Themes\TheAdmin\Theme.txt" />
+    <Content Include="Themes\SafeMode\Views\Document.cshtml" />
+    <Content Include="Themes\TheAdmin\Views\Layout.cshtml" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Config\Sample.Host.config" />
+    <Content Include="Themes\ClassicDark\Views\Footer.cshtml" />
+    <Content Include="Themes\ClassicDark\Views\Layout.cshtml" />
+    <None Include="Themes\TheAdmin\Styles\images\icons.psd" />
+    <Content Include="Themes\ClassicDark\Content\Images\bodyBackgroundgrey.gif" />
+    <Content Include="Themes\ClassicDark\Content\Images\sidebarBackground.gif" />
+    <Content Include="Themes\ClassicDark\Styles\blog.css" />
+    <Content Include="Themes\ClassicDark\Styles\site.css" />
+    <Content Include="Themes\ClassicDark\Theme.png" />
+    <Content Include="Themes\ClassicDark\Theme.txt" />
+    <Content Include="Themes\ClassicDark\Zones\Sidebar.html" />
+    <Content Include="Themes\Classic\Content\Images\sidebarBackground.gif" />
+    <Content Include="Themes\Classic\Zones\Sidebar.html" />
+    <Content Include="Themes\Classic\Styles\blog.css" />
+    <Content Include="Themes\Classic\Styles\site.css" />
+    <Content Include="Themes\Classic\Theme.png" />
+    <Content Include="Themes\Classic\Theme.txt" />
+    <Content Include="Themes\Classic\Views\Footer.cshtml" />
+    <Content Include="Themes\Classic\Views\Layout.cshtml" />
+    <Content Include="Themes\Contoso\Content\Images\bkg.jpg" />
+    <Content Include="Themes\Contoso\Content\Images\comment-arrow.png" />
+    <Content Include="Themes\Contoso\Content\Images\content-bkg.png" />
+    <Content Include="Themes\Contoso\Content\Images\content-bottom.png" />
+    <Content Include="Themes\Contoso\Content\Images\content-top.png" />
+    <Content Include="Themes\Contoso\Content\Images\feature-bkg-bottom.png" />
+    <Content Include="Themes\Contoso\Content\Images\feature-bkg-top.png" />
+    <Content Include="Themes\Contoso\Content\Images\Gallery\feature01.jpg" />
+    <Content Include="Themes\Contoso\Content\Images\Gallery\feature02.jpg" />
+    <Content Include="Themes\Contoso\Content\Images\Gallery\feature03.jpg" />
+    <Content Include="Themes\Contoso\Content\Images\icon-location.png" />
+    <Content Include="Themes\Contoso\Content\Images\menu-divider.png" />
+    <Content Include="Themes\Contoso\Content\Images\menu-hover-left.png" />
+    <Content Include="Themes\Contoso\Content\Images\menu-hover.png" />
+    <Content Include="Themes\Contoso\Content\Images\menu-left.png" />
+    <Content Include="Themes\Contoso\Content\Images\menu-right.png" />
+    <Content Include="Themes\Contoso\Content\Images\nav-arrow-left.png" />
+    <Content Include="Themes\Contoso\Content\Images\nav-arrow-right.png" />
+    <Content Include="Themes\Contoso\Content\Images\sub-header.png" />
+    <Content Include="Themes\Contoso\Zones\Sidebar-w2.html" />
+    <Content Include="Themes\Contoso\Zones\Sidebar-w3.html" />
+    <Content Include="Themes\Contoso\Zones\Highlights.html" />
+    <Content Include="Themes\Contoso\Zones\Home-Headline.html" />
+    <Content Include="Themes\Contoso\Zones\Home-Hero-Gallery.html" />
+    <Content Include="Themes\Contoso\Zones\Home-Hero.html" />
+    <Content Include="Themes\Contoso\Zones\Sidebar-w1.html" />
+    <Content Include="Themes\Contoso\Scripts\easySlider.js" />
+    <Content Include="Themes\Contoso\Styles\site.css" />
+    <Content Include="Themes\Contoso\Theme.png" />
+    <Content Include="Themes\Contoso\Theme.txt" />
+    <Content Include="Themes\Corporate\Content\Images\bkg.jpg" />
+    <Content Include="Themes\Corporate\Content\Images\consult-bkg.png" />
+    <Content Include="Themes\Corporate\Content\Images\content-bkg.png" />
+    <Content Include="Themes\Corporate\Content\Images\content-bottom.png" />
+    <Content Include="Themes\Corporate\Content\Images\content-top.png" />
+    <Content Include="Themes\Corporate\Content\Images\footer-bkg.jpg" />
+    <Content Include="Themes\Corporate\Content\Images\footer-bkg.png" />
+    <Content Include="Themes\Corporate\Content\Images\hm-divider.png" />
+    <Content Include="Themes\Corporate\Content\Images\hm-header.png" />
+    <Content Include="Themes\Corporate\Content\Images\icons\icon-5.png" />
+    <Content Include="Themes\Corporate\Content\Images\icons\icon-4.png" />
+    <Content Include="Themes\Corporate\Content\Images\icons\icon-3.png" />
+    <Content Include="Themes\Corporate\Content\Images\icons\icon-2.png" />
+    <Content Include="Themes\Corporate\Content\Images\icons\icon-1.png" />
+    <Content Include="Themes\Corporate\Content\Images\jumping-people.jpg" />
+    <Content Include="Themes\Corporate\Content\Images\logo.png" />
+    <Content Include="Themes\Corporate\Content\Images\menu-left-over.png" />
+    <Content Include="Themes\Corporate\Content\Images\menu-left.png" />
+    <Content Include="Themes\Corporate\Content\Images\menu-right-over.png" />
+    <Content Include="Themes\Corporate\Content\Images\menu-right.png" />
+    <Content Include="Themes\Corporate\Content\Images\menu_bkg.jpg" />
+    <Content Include="Themes\Corporate\Content\Images\notepad.png" />
+    <Content Include="Themes\Corporate\Scripts\easySlider.js" />
+    <Content Include="Themes\Corporate\Styles\site.css" />
+    <Content Include="Themes\Corporate\Theme.png" />
+    <Content Include="Themes\Corporate\Theme.txt" />
+    <Content Include="Themes\Corporate\Views\DisplayTemplates\Items\Blogs.Blog.ascx" />
+    <Content Include="Themes\Corporate\Views\DisplayTemplates\Items\Blogs.BlogPost.ascx" />
+    <Content Include="Themes\Corporate\Views\DisplayTemplates\Items\Blogs.BlogPost.ListByArchive.ascx" />
+    <Content Include="Themes\Corporate\Views\DisplayTemplates\Items\Contents.Item.ascx" />
+    <Content Include="Themes\Corporate\Views\DisplayTemplates\Parts\Comments.Comments.ascx" />
+    <Content Include="Themes\Corporate\Views\DisplayTemplates\Parts\Common.Metadata.ascx" />
+    <Content Include="Themes\Corporate\Views\DisplayTemplates\Parts\Tags.ShowTags.ascx" />
+    <Content Include="Themes\Corporate\Views\Footer.ascx" />
+    <Content Include="Themes\Corporate\Views\Header.ascx" />
+    <Content Include="Themes\Corporate\Views\Layout.ascx" />
+    <Content Include="Themes\Corporate\Views\Layout.HomePage.ascx" />
+    <Content Include="Themes\Corporate\Views\ListOfComments.ascx" />
+    <Content Include="Themes\Corporate\Views\LogOn.ascx" />
+    <Content Include="Themes\Corporate\Views\User.ascx" />
+    <Content Include="Themes\Corporate\Zones\Home-Headline.html" />
+    <Content Include="Themes\Corporate\Zones\Home-Hero.html" />
+    <Content Include="Themes\Corporate\Zones\Sidebar-w1.html" />
+    <Content Include="Themes\Corporate\Zones\Sidebar-w2.html" />
+    <Content Include="Themes\Corporate\Zones\Sidebar-w3.html" />
+    <Content Include="Themes\Green\Content\Images\bodyBackground.gif" />
+    <Content Include="Themes\Green\Content\Images\bodyBackground.png" />
+    <Content Include="Themes\Green\Content\Images\commentpointer.gif" />
+    <Content Include="Themes\Green\Content\Images\logo.gif" />
+    <Content Include="Themes\Green\Content\Images\logo.png" />
+    <Content Include="Themes\Green\Content\Images\tabLeftOff.gif" />
+    <Content Include="Themes\Green\Content\Images\tabLeftOn.gif" />
+    <Content Include="Themes\Green\Content\Images\tabRightOff.gif" />
+    <Content Include="Themes\Green\Content\Images\tabRightOn.gif" />
+    <Content Include="Themes\Green\Views\Archives.ascx" />
+    <Content Include="Themes\Green\Views\DisplayTemplates\Items\Blogs.BlogPost.ascx" />
+    <Content Include="Themes\Green\Views\DisplayTemplates\Parts\Blogs.BlogPost.Metadata.ascx" />
+    <Content Include="Themes\Green\Zones\sideBarZone1.html" />
+    <Content Include="Themes\Green\Zones\sideBarZone2.html" />
+    <Content Include="Themes\Green\Zones\User2.html" />
+    <Content Include="Themes\Green\Zones\User3.html" />
+    <Content Include="Themes\Green\Zones\User1.html" />
+    <Content Include="Themes\Green\Styles\blog.css" />
+    <Content Include="Themes\Green\Styles\site.css" />
+    <Content Include="Themes\Green\Styles\yui.css" />
+    <Content Include="Themes\Green\Theme.png" />
+    <Content Include="Themes\Green\Theme.txt" />
+    <Content Include="Themes\Green\Views\DisplayTemplates\Parts\Common.Metadata.ascx" />
+    <Content Include="Themes\Green\Views\Layout.HomePage.ascx" />
+    <Content Include="Themes\Green\Views\DisplayTemplates\Items\Blogs.Blog.ascx" />
+    <Content Include="Themes\Green\Views\DisplayTemplates\Items\Blogs.Blog.Summary.ascx" />
+    <Content Include="Themes\Green\Views\DisplayTemplates\Items\Blogs.BlogPost.Summary.ascx" />
+    <Content Include="Themes\Green\Views\Footer.ascx" />
+    <Content Include="Themes\Green\Views\Layout.ascx" />
+    <Content Include="Themes\Green\Views\ListOfComments.ascx" />
+    <Content Include="Themes\SafeMode\Content\orchard.ico" />
+    <Content Include="Themes\SafeMode\Styles\ie6.css" />
+    <Content Include="Themes\SafeMode\Styles\images\backgroundHeader.gif" />
+    <Content Include="Themes\SafeMode\Styles\images\backgroundVines.gif" />
+    <Content Include="Themes\SafeMode\Styles\images\orchardLogo.gif" />
+    <Content Include="Themes\SafeMode\Styles\site.css" />
+    <Content Include="Themes\SafeMode\Theme.png" />
+    <Content Include="Themes\SafeMode\Theme.txt" />
+    <Content Include="Themes\SafeMode\Views\Layout.cshtml" />
+    <Content Include="Themes\TheAdmin\Styles\ie6.css" />
+    <Content Include="Themes\TheAdmin\Styles\images\backgroundGradient.gif" />
+    <Content Include="Themes\TheAdmin\Styles\images\backgroundHeader.gif" />
+    <Content Include="Themes\TheAdmin\Styles\images\orchardLogo.gif" />
+    <Content Include="Themes\TheAdmin\Theme.png" />
+    <Content Include="Themes\TheAdmin\Views\User.cshtml" />
+    <Content Include="Themes\TheAdmin\Views\Header.cshtml" />
+    <Content Include="Themes\TheThemeMachine\Web.config" />
+    <Content Include="Themes\TheThemeMachine\Views\Items\Content.Blog.cshtml" />
+    <Content Include="Themes\TheThemeMachine\Views\Items\Widget-Content.cshtml" />
+    <None Include="Themes\TheThemeMachine\Views\Layout.cshtml" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="App_Data\" />
+    <Folder Include="Themes\ClassicDark\DesignerNotes\" />
+    <Folder Include="Themes\SafeMode\Content\Images\" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />

src/Orchard/ContentManagement/DefaultContentDisplay.cs

@@ -81,7 +81,7 @@ namespace Orchard.ContentManagement {
             if (!contentTypeDefinition.Settings.TryGetValue("Stereotype", out stereotype))
                 stereotype = "Content";
 
-            var actualShapeType = "Items_" + stereotype + "_Editor";
+            var actualShapeType = "Items_" + stereotype + "_Edit";
 
             dynamic itemShape = CreateItemShape(actualShapeType);
             itemShape.ContentItem = content.ContentItem;
@@ -99,7 +99,7 @@ namespace Orchard.ContentManagement {
             if (!contentTypeDefinition.Settings.TryGetValue("Stereotype", out stereotype))
                 stereotype = "Content";
 
-            var actualShapeType = "Items_" + stereotype + "_Editor";
+            var actualShapeType = "Items_" + stereotype + "_Edit";
 
             dynamic itemShape = CreateItemShape(actualShapeType);
             itemShape.ContentItem = content.ContentItem;