Merge

--HG--
branch : dev

src/Orchard.Web/Core/Themes/DesignerNotes/ZoneManagerEvents.cs

@@ -23,7 +23,7 @@ namespace Orchard.Core.Themes.DesignerNotes {
 
             var requestContext = context.Html.ViewContext.RequestContext;
             var theme = _themeService.GetRequestTheme(requestContext);
-            var virtualPath = "~/Themes/" + theme.ThemeName + "/DesignerNotes/" + context.ZoneName + ".html";
+            var virtualPath = "~/Themes/" + theme.ThemeName + "/Zones/" + context.ZoneName + ".html";
             var physicalPath = requestContext.HttpContext.Server.MapPath(virtualPath);
             if (!File.Exists(physicalPath))
                 return;

src/Orchard.Web/Modules/Futures.Widgets/Controllers/AdminController.cs

@@ -23,7 +23,7 @@ namespace Futures.Widgets.Controllers {
         public ActionResult AddWidget(string zoneName, string themeName, string returnUrl) {
             var hasWidgetsRecord = CurrentSite.As<HasWidgets>().Record;
 
-            var virtualPath = "~/Themes/" + themeName + "/DesignerNotes/" + zoneName + ".html";
+            var virtualPath = "~/Themes/" + themeName + "/Zones/" + zoneName + ".html";
             var physicalPath = Server.MapPath(virtualPath);
 
             if (!System.IO.File.Exists(physicalPath)) {

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

@@ -82,8 +82,8 @@ namespace Orchard.Blogs.Drivers {
 
             return Combined(
                 ContentItemTemplate("Items/Blogs.Blog").LongestMatch(displayType, "Summary", "DetailAdmin", "SummaryAdmin"),
-                ContentPartTemplate(blog, "Parts/Blogs.Blog.Manage").Location("primary:manage"),
-                ContentPartTemplate(blog, "Parts/Blogs.Blog.Metadata").Location("primary:metadata"),
+                ContentPartTemplate(blog, "Parts/Blogs.Blog.Manage").Location("manage"),
+                ContentPartTemplate(blog, "Parts/Blogs.Blog.Metadata").Location("metadata"),
                 ContentPartTemplate(blog, "Parts/Blogs.Blog.Description").Location("primary"),
                 blogPosts == null ? null : ContentPartTemplate(blogPosts, "Parts/Blogs.BlogPost.List", "").Location("primary"));
         }

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

@@ -66,7 +66,7 @@ namespace Orchard.Blogs.Drivers {
         protected override DriverResult Display(BlogPost post, string displayType) {
             return Combined(
                 ContentItemTemplate("Items/Blogs.BlogPost").LongestMatch(displayType, "Summary", "SummaryAdmin"),
-                ContentPartTemplate(post, "Parts/Blogs.BlogPost.Metadata").Location("meta"));
+                ContentPartTemplate(post, "Parts/Blogs.BlogPost.Metadata").LongestMatch(displayType, "Summary", "SummaryAdmin").Location("meta"));
         }
 
         protected override DriverResult Editor(BlogPost post) {

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

@@ -154,6 +154,8 @@
     <Content Include="Views\DisplayTemplates\Parts\Blogs.BlogPost.Metadata.ascx" />
     <Content Include="Views\DisplayTemplates\Parts\Blogs.Blog.Description.ascx" />
     <Content Include="Views\DisplayTemplates\Parts\Blogs.Blog.Metadata.ascx" />
+    <Content Include="Views\DisplayTemplates\Parts\Blogs.BlogPost.Metadata.SummaryAdmin.ascx" />
+    <Content Include="Views\DisplayTemplates\Parts\Blogs.BlogPost.Metadata.Summary.ascx" />
     <Content Include="Views\EditorTemplates\Parts\Blogs.BlogPost.Publish.ascx" />
     <Content Include="Views\BlogPost\Item.ascx" />
     <Content Include="Views\BlogAdmin\Create.ascx" />

src/Orchard.Web/Modules/Orchard.Blogs/Views/BlogAdmin/List.ascx

@@ -19,8 +19,7 @@ if (Model.Entries.Count() > 0) { %>
 
         // Display the summary for the blog post
         return Html.DisplayForItem(entry.ContentItemViewModel).ToHtmlString();
-    }, "blogs contentItems")%>
-<div class="actions"><a class="add button primaryAction" href="<%=Url.BlogCreate() %>"><%=_Encoded("New Blog") %></a></div><%
+    }, "blogs contentItems")%><%
 } else { %>
 <div class="info message"><%=T("There are no blogs for you to see. Want to <a href=\"{0}\">add one</a>?", Url.BlogCreate()).ToString()%></div><%
 } %>

src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.Blog.DetailAdmin.ascx

@@ -5,8 +5,8 @@
 <h1 class="withActions">
     <a href="<%=Url.BlogForAdmin(Model.Item.Slug) %>"><%=Html.TitleForPage(Model.Item.Name) %></a>
 </h1>
-
-<%--<form>
+<% Html.Zone("manage"); %><%--
+<form>
 <div class="actions bulk">
 <fieldset>
     <label for="filterResults"><%=_Encoded("Filter:")%></label>
@@ -18,9 +18,6 @@
 </fieldset>
 </div>
 </form>--%>
-
 <div class="actions"><a href="<%=Url.BlogPostCreate(Model.Item) %>" class="add button primaryAction"><%=_Encoded("New Post")%></a></div>
-
-
 <% Html.Zone("primary");
    Html.ZonesAny(); %>

src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Items/Blogs.Blog.SummaryAdmin.ascx

@@ -3,12 +3,6 @@
 <%@ Import Namespace="Orchard.Blogs.Extensions"%>
 <%@ Import Namespace="Orchard.Blogs.Models"%>
 <div class="summary">
-    <div class="properties">
-        <h3><%=Html.Link(Html.Encode(Model.Item.Name), Url.BlogForAdmin(Model.Item.Slug)) %></h3>
-        <p><% Html.Zone("meta");%></p>
-        <%--<p>[list of authors] [modify blog access]</p>--%>
-        <p><%=Html.Encode(Model.Item.Description) %></p>              
-    </div>
     <div class="related">
         <a href="<%=Url.Blog(Model.Item.Slug) %>" title="<%=_Encoded("View") %>"><%=_Encoded("View") %></a><%=_Encoded(" | ")%>
         <a href="<%=Url.BlogForAdmin(Model.Item.Slug) %>" title="<%=_Encoded("Edit Posts") %>"><%=_Encoded("Edit Posts")%></a><%=_Encoded(" | ")%>
@@ -19,5 +13,11 @@
         <button type="submit" class="linkButton" title="<%=_Encoded("Remove") %>"><%=_Encoded("Remove") %></button><%
         } %>
     </div>
+    <div class="properties">
+        <h3><%=Html.Link(Html.Encode(Model.Item.Name), Url.BlogForAdmin(Model.Item.Slug)) %></h3>
+        <p><% Html.Zone("meta");%></p>
+        <%--<p>[list of authors] [modify blog access]</p>--%>
+        <p><%=Html.Encode(Model.Item.Description) %></p>              
+    </div>
     <div style="clear:both;"></div>
 </div>

src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Parts/Blogs.Blog.Manage.ascx

@@ -3,7 +3,7 @@
 <%@ Import Namespace="Orchard.Blogs.Extensions"%>
 <%@ Import Namespace="Orchard.Blogs.Models"%><%
 if (AuthorizedFor(Permissions.ManageBlogs)) { %>
-<div class="manage">
-    <a href="<%=Url.BlogEdit(Model.Slug) %>" class="edit"><%=_Encoded("Edit") %></a>
+<div class="folderProperties">
+    <p><a href="<%=Url.BlogEdit(Model.Slug) %>" class="edit"><%=_Encoded("Edit") %></a></p>
 </div><%
 } %>

src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Parts/Blogs.BlogPost.List.ascx

@@ -2,4 +2,4 @@
 <%@ Import Namespace="Orchard.Mvc.ViewModels"%>
 <%@ Import Namespace="Orchard.Blogs.Models"%>
 <%=Html.UnorderedList(Model, (bp, i) => Html.DisplayForItem(bp).ToHtmlString(), "blogPosts contentItems") %>
-<% if (Model.Count() < 1) { %><p><%=_Encoded("There are no posts for this blog.") %></p><% } %>
+<% if (Model.Count() < 1) { %><div class="info message"><%=_Encoded("There are no posts for this blog.") %></div><% } %>

src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Parts/Blogs.BlogPost.Metadata.SummaryAdmin.ascx

@@ -0,0 +1,2 @@
+<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<BlogPost>" %>
+<%@ Import Namespace="Orchard.Blogs.Models"%>

src/Orchard.Web/Orchard.Web.csproj

@@ -170,7 +170,7 @@
     <Content Include="Themes\Classic\Content\Images\mainBackgroundgrey.png" />
     <Content Include="Themes\Classic\Content\Images\navDivider.gif" />
     <Content Include="Themes\Classic\Content\Images\sidebarBackground.gif" />
-    <Content Include="Themes\Classic\DesignerNotes\Sidebar.html" />
+    <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" />
@@ -203,13 +203,13 @@
     <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\DesignerNotes\Sidebar-w2.html" />
-    <Content Include="Themes\Contoso\DesignerNotes\Sidebar-w3.html" />
-    <Content Include="Themes\Contoso\DesignerNotes\Highlights.html" />
-    <Content Include="Themes\Contoso\DesignerNotes\Home-Headline.html" />
-    <Content Include="Themes\Contoso\DesignerNotes\Home-Hero-Gallery.html" />
-    <Content Include="Themes\Contoso\DesignerNotes\Home-Hero.html" />
-    <Content Include="Themes\Contoso\DesignerNotes\Sidebar-w1.html" />
+    <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\Views\DisplayTemplates\Items\Blogs.Blog.ascx" />
     <Content Include="Themes\Contoso\Views\DisplayTemplates\Items\Blogs.BlogPost.ascx" />
     <Content Include="Themes\Contoso\Views\DisplayTemplates\Items\Pages.Page.ascx" />
@@ -236,10 +236,10 @@
     <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\DesignerNotes\Sidebar.html" />
-    <Content Include="Themes\Green\DesignerNotes\User2.html" />
-    <Content Include="Themes\Green\DesignerNotes\User3.html" />
-    <Content Include="Themes\Green\DesignerNotes\User1.html" />
+    <Content Include="Themes\Green\Zones\Sidebar.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" />

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

@@ -750,11 +750,14 @@ table.items, textarea, input.text, input.text-box,
 
 /* Added classes for new blog list layout
 ---------------------------------------------------------- */
-
+.blogdescription {
+    margin-top:1em;
+}
 .summary {
     padding:1.2em .4em;
 }
 .actions {
+    clear:right;
     height:auto;
     overflow:visible;
     padding:0;
@@ -766,8 +769,8 @@ table.items, textarea, input.text, input.text-box,
 .properties {
     float:left;
 }
-.orchard-blogs #main p {
-    margin:0;
+.blogs.contentItems .properties {
+    float:none;
 }
 #main .contentItems .properties h3 {
     border-bottom:none;