Merge

--HG--
branch : dev

src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogAdminController.cs

@@ -151,7 +151,7 @@ namespace Orchard.Blogs.Controllers {
                 return new NotFoundResult();
 
             //TODO: (erikpo) Need to make templatePath be more convention based so if my controller name has "Admin" in it then "Admin/{type}" is assumed
-            var model = Services.ContentManager.BuildDisplay(blogPart, "Admin.Blog");
+            var model = Services.ContentManager.BuildDisplay(blogPart, "Blog_Admin");
             return View(model);
         }
 

src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogPostAdminController.cs

@@ -36,9 +36,6 @@ namespace Orchard.Blogs.Controllers {
 
             var model = Services.ContentManager.BuildEditor(blogPost);
 
-            //todo: (heskew) unhack
-            model.Metadata.Type += ".BlogPost";
-
             return View(model);
         }
 
@@ -82,9 +79,6 @@ namespace Orchard.Blogs.Controllers {
 
             var model = Services.ContentManager.BuildEditor(post);
 
-            //todo: (heskew) unhack
-            model.Metadata.Type += ".BlogPost";
-
             return View(model);
         }
 

src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogPartDriver.cs

@@ -38,28 +38,24 @@ namespace Orchard.Blogs.Drivers {
             var driverResults = new List<DriverResult>();
 
             var metadata = shapeHelper.Parts_Blogs_Blog_Manage(ContentPart: part);
-            metadata.Metadata.Type = "Parts_Blogs_Blog.Manage";
             driverResults.Add(ContentShape(metadata).Location("manage"));
 
             var description = shapeHelper.Parts_Blogs_Blog_Description(ContentPart: part);
-            description.Metadata.Type = "Parts_Blogs_Blog.Description";
             driverResults.Add(ContentShape(description).Location("manage", "after"));
 
             if (displayType.StartsWith("Admin")) {
                 var list = shapeHelper.List();
                 list.AddRange(_blogPostService.Get(part, VersionOptions.Latest)
-                                          .Select(bp => _contentManager.BuildDisplay(bp, "SummaryAdmin.BlogPost")));
+                                          .Select(bp => _contentManager.BuildDisplay(bp, "BlogPost_SummaryAdmin")));
-                var blogPostList = shapeHelper.Parts_Blogs_BlogPost_List(ContentPart: part, BlogPosts: list);
+                var blogPostList = shapeHelper.Parts_Blogs_BlogPost_List_Admin(ContentPart: part, BlogPosts: list);
-                blogPostList.Metadata.Type = "Parts_Blogs_BlogPost.List.Admin";
                 var contentShape = ContentShape(blogPostList).Location("Primary");
                 driverResults.Add(contentShape);
             }
             else if (!displayType.Contains("Summary")) {
                 var list = shapeHelper.List();
                 list.AddRange(_blogPostService.Get(part)
-                                          .Select(bp => _contentManager.BuildDisplay(bp, "Summary.BlogPost")));
+                                          .Select(bp => _contentManager.BuildDisplay(bp, "BlogPost_Summary")));
                 var blogPostList = shapeHelper.Parts_Blogs_BlogPost_List(ContentPart: part, BlogPosts: list);
-                blogPostList.Metadata.Type = "Parts_Blogs_BlogPost.List";
                 var contentShape = ContentShape(blogPostList).Location("Primary");
                 driverResults.Add(contentShape);
 

src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj

@@ -136,13 +136,13 @@
     <Content Include="Views\Parts\Blogs.BlogPost.List.Admin.cshtml">
       <SubType>Code</SubType>
     </Content>
-    <Content Include="Views\Items\Content.Admin.Blog.cshtml" />
+    <Content Include="Views\Items\Content.Blog.Admin.cshtml" />
     <Content Include="Views\Items\Content.Blog.cshtml" />
     <Content Include="Views\Items\Content.Detail.BlogPost.cshtml" />
     <Content Include="Views\Items\Content.Edit.Blog.cshtml">
       <SubType>Code</SubType>
     </Content>
-    <Content Include="Views\Items\Content.Edit.BlogPost.cshtml" />
+    <Content Include="Views\Items\Content.Editor-BlogPost.cshtml" />
     <Content Include="Views\Items\Content.Summary.Blog.cshtml" />
     <Content Include="Views\Items\Content.Summary.BlogPost.cshtml" />
     <Content Include="Views\Items\Content.SummaryAdmin.Blog.cshtml" />

src/Orchard.Web/Modules/Orchard.Blogs/Views/Items_Content_Editor-BlogPost.cshtml

@@ -8,7 +8,7 @@
 @Display(Model.Primary)
     </div>
     <div class="secondary">
-@Display(Model.secondary)
+@Display(Model.Secondary)
         <fieldset>
             <input class="button primaryAction" type="submit" name="submit.Save" value="@T("Save")"/>
             @* TODO: (erikpo) In the future, remove the HasPublished check so the user can delete the content item from here if the choose to *@

src/Orchard.Web/Modules/Orchard.Widgets/Shapes.cs

@@ -13,6 +13,7 @@ namespace Orchard.Widgets {
         public void Discover(ShapeTableBuilder builder) {
             builder.Describe("Items_Widget")
                 .Configure(descriptor => {
+                    // todo: have "alternates" for chrome
                     if (_orchardServices.Authorizer.Authorize(Permissions.ManageWidgets))
                         descriptor.Wrappers.Add("Widget_Manage");
                     else

src/Orchard.Web/Modules/Orchard.Widgets/Views/Admin/Index.cshtml

@@ -1,14 +1,15 @@
 @model WidgetsIndexViewModel
 @using Orchard.Widgets.Models;
 @using Orchard.Widgets.ViewModels;
-@{ Style.Require("WidgetsAdmin"); }
+@{
-
+    Style.Require("WidgetsAdmin");
+}
 <h1>@Html.TitleForPage(T("Manage Widgets").ToString())</h1>
+<div class="manage">@Html.ActionLink(T("Add a layer").ToString(), "AddLayer", new { }, new { @class = "button primaryAction" })</div>
 
 @using(Html.BeginFormAntiForgeryPost()) {
     Html.ValidationSummary();
 
-	<div class="manage">@Html.ActionLink(T("Add a layer").ToString(), "AddLayer", new { }, new { @class = "button primaryAction" })</div>
 
 	<div id="widgets">
 		
@@ -39,7 +40,7 @@
 		</div>
 
 		<div class="widgets-availableLayers">
-				<h2>Widget Layers</h2>
+				<h2>Widget Zones</h2>
 
 			<fieldset>
 				<div>

src/Orchard.Web/Themes/TheThemeMachine/Styles/site.css

@@ -141,22 +141,6 @@ p {
     margin-top:12px;
 }
        
-/*Two Sidebars on */
-.has-sidebars #content {
-	background-color:#e8e8e8;
-	width: 600px;
-}
-
-.has-sidebars .sidebar {
-    background-color:#f6f6f6;
-    width: 180px;
-}
-
-.has-sidebars .primary, .has-sidebars .secondary, .has-sidebars #content {
-    float:left;
-}
-
-       
 /* Navigation */
 
 #navigation {