Merge

--HG-- branch : dev
2025-10-15 19:54:57 +08:00 · 2010-10-15 14:52:20 -07:00
parent 0a1ed98ac2 72f65432cf
commit cd6e1fb7c9
45 changed files with 416 additions and 197 deletions
--- a/src/Orchard.Web/Core/Contents/Controllers/AdminController.cs
+++ b/src/Orchard.Web/Core/Contents/Controllers/AdminController.cs
@@ -288,8 +288,7 @@ namespace Orchard.Core.Contents.Controllers {
            return RedirectToAction("Edit", new RouteValueDictionary { { "Id", contentItem.Id } });
        }

-        [HttpPost, ActionName("Remove")]
-        public ActionResult RemovePOST(int id, string returnUrl) {
+        public ActionResult Remove(int id, string returnUrl) {
            var contentItem = _contentManager.Get(id, VersionOptions.Latest);

            if (!Services.Authorizer.Authorize(Permissions.DeleteContent, contentItem, T("Couldn't remove content")))
--- a/src/Orchard.Web/Core/Contents/Views/Items/Content.SummaryAdmin.cshtml
+++ b/src/Orchard.Web/Core/Contents/Views/Items/Content.SummaryAdmin.cshtml
@@ -1,8 +1,8 @@
@using Orchard.ContentManagement;
@using Orchard.Utility.Extensions;
@{
-	ContentItem contentItem = Model.ContentItem;
-	var returnUrl = ViewContext.RequestContext.HttpContext.Request.ToUrlString();
+    ContentItem contentItem = Model.ContentItem;
+    var returnUrl = ViewContext.RequestContext.HttpContext.Request.ToUrlString();
 }
 <div class="summary" itemscope="itemscope" itemid="@contentItem.Id" itemtype="http://orchardproject.net/data/ContentItem">
    <div class="properties">
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogController.cs
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogController.cs
@@ -6,7 +6,7 @@ using System.Xml.Linq;
 using Orchard.Blogs.Models;
 using Orchard.Blogs.Routing;
 using Orchard.Blogs.Services;
-using Orchard.Blogs.ViewModels;
+using Orchard.ContentManagement;
 using Orchard.DisplayManagement;
 using Orchard.Logging;
 using Orchard.Themes;
@@ -53,25 +53,27 @@ namespace Orchard.Blogs.Controllers {
            if (correctedSlug == null)
                return HttpNotFound();

-            BlogPart blog = _blogService.Get(correctedSlug);
-            if (blog == null)
+            var blogPart = _blogService.Get(correctedSlug);
+            if (blogPart == null)
                return HttpNotFound();

-            var blogPosts = _blogPostService.Get(blog, (page - 1)*pageSize, pageSize).Select(b => _services.ContentManager.BuildDisplay(b, "Summary"));
+            var blogPosts = _blogPostService.Get(blogPart, (page - 1) * pageSize, pageSize)
+                .Select(b => _services.ContentManager.BuildDisplay(b, "Summary"));
+
+            blogPart.As<BlogPagerPart>().Page = page;
+            blogPart.As<BlogPagerPart>().PageSize = pageSize;
+            blogPart.As<BlogPagerPart>().BlogSlug = correctedSlug;
+            blogPart.As<BlogPagerPart>().ThereIsANextPage = _blogPostService.Get(blogPart, (page) * pageSize, pageSize).Any();
+
+            var blog = _services.ContentManager.BuildDisplay(blogPart);

            var list = Shape.List();
            list.AddRange(blogPosts);

-            var blogShape = _services.ContentManager.BuildDisplay(blog);
-            var model = new DisplayBlogViewModel {
-                Blog = blogShape,
-                BlogPostList = list,
-                Page = page,
-                PageSize = pageSize
-            };
-
-            return View(model);
+            blog.ContentItem = blogPart;
+            blog.Content.Add(Shape.Parts_Blogs_BlogPost_List(ContentItems: list), "5");

+            return View("Display", blog);
        }

        public ActionResult LiveWriterManifest(string blogSlug) {
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogArchivesPartDriver.cs
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogArchivesPartDriver.cs
@@ -1,6 +1,5 @@
 using Orchard.Blogs.Models;
 using Orchard.Blogs.Services;
-using Orchard.Blogs.ViewModels;
 using Orchard.ContentManagement;
 using Orchard.ContentManagement.Drivers;
 using Orchard.Core.ContentsLocation.Models;
@@ -16,16 +15,17 @@ namespace Orchard.Blogs.Drivers {
        }

        protected override DriverResult Display(BlogArchivesPart part, string displayType, dynamic shapeHelper) {
-            BlogPart blog = null;
-            if (!string.IsNullOrWhiteSpace(part.ForBlog))
-                blog = _blogService.Get(part.ForBlog);
+            return ContentShape("Parts_Blogs_BlogArchives",
+                                () => {
+                                    BlogPart blog = null;
+                                    if (!string.IsNullOrWhiteSpace(part.ForBlog))
+                                        blog = _blogService.Get(part.ForBlog);

-            if ( blog != null ) {
-                var model = new BlogPostArchiveViewModel {BlogPart = blog, Archives = _blogPostService.GetArchives(blog)};
-                return ContentPartTemplate(model, "Parts/Blogs.BlogArchives");
-            }
+                                    if (blog == null)
+                                        return null;

-            return null;
+                                    return shapeHelper.Parts_Blogs_BlogArchives(ContentItem: part, Blog: blog, Archives: _blogPostService.GetArchives(blog));
+                                }).Location("Content");
        }

        protected override DriverResult Editor(BlogArchivesPart part, dynamic shapeHelper) {
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogPagerPartDriver.cs
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogPagerPartDriver.cs
@@ -0,0 +1,11 @@
+using Orchard.Blogs.Models;
+using Orchard.ContentManagement.Drivers;
+
+namespace Orchard.Blogs.Drivers {
+    public class BlogPagerPartDriver : ContentPartDriver<BlogPagerPart> {
+        protected override DriverResult Display(BlogPagerPart part, string displayType, dynamic shapeHelper) {
+            return ContentShape("Parts_Blogs_Blog_Pager",
+                                () => shapeHelper.Parts_Blogs_Blog_Pager(ContentPart: part, Page: part.Page, PageSize: part.PageSize, BlogSlug: part.BlogSlug, ThereIsANextPage: part.ThereIsANextPage));
+        }
+    }
+}
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogPartDriver.cs
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/BlogPartDriver.cs
@@ -38,13 +38,15 @@ namespace Orchard.Blogs.Drivers {
                             () => shapeHelper.Parts_Blogs_Blog_Manage(ContentPart: part)),
                ContentShape("Parts_Blogs_Blog_Description",
                             () => shapeHelper.Parts_Blogs_Blog_Description(ContentPart: part, Description: part.Description)),
+                // todo: (heskew) implement a paging solution that doesn't require blog posts to be tied to the blog within the controller
                ContentShape("Parts_Blogs_BlogPost_List",
                             () => {
                                 _feedManager.Register(part);
-                                 var list = shapeHelper.List();
-                                 list.AddRange(_blogPostService.Get(part)
-                                                           .Select(bp => _contentManager.BuildDisplay(bp, "Summary")));
-                                 return shapeHelper.Parts_Blogs_BlogPost_List(ContentPart: part, ContentItems: list);
+                                 return null;
+                //                 var list = shapeHelper.List();
+                //                 list.AddRange(_blogPostService.Get(part)
+                //                                           .Select(bp => _contentManager.BuildDisplay(bp, "Summary")));
+                //                 return shapeHelper.Parts_Blogs_BlogPost_List(ContentPart: part, ContentItems: list);
                             }),
                ContentShape("Parts_Blogs_BlogPost_List_Admin",
                             () => {
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/RecentBlogPostsPartDriver.cs
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Drivers/RecentBlogPostsPartDriver.cs
@@ -18,7 +18,7 @@ namespace Orchard.Blogs.Drivers {
        }

        protected override DriverResult Display(RecentBlogPostsPart part, string displayType, dynamic shapeHelper) {
-            IEnumerable<BlogPostPart> blogPosts = null;
+            IEnumerable<BlogPostPart> blogPosts;

            BlogPart blog = null;
            if (!string.IsNullOrWhiteSpace(part.ForBlog))
@@ -32,7 +32,6 @@ namespace Orchard.Blogs.Drivers {
                    .Select(ci => ci.As<BlogPostPart>());
            }
            else {
-                var blogs = _blogService.Get().ToList();
                blogPosts = _contentManager.Query(VersionOptions.Published, "BlogPost")
                    .Join<CommonPartRecord>()
                    .OrderByDescending(cr => cr.CreatedUtc)
@@ -41,12 +40,11 @@ namespace Orchard.Blogs.Drivers {
            }

            var list = shapeHelper.List();
-            list.AddRange(blogPosts.Select(bp => _contentManager.BuildDisplay(bp, "Summary.BlogPost")));
+            list.AddRange(blogPosts.Select(bp => _contentManager.BuildDisplay(bp, "Summary")));

-            var blogPostList = shapeHelper.Parts_Blogs_BlogPost_List(ContentPart: part, BlogPosts: list);
-            blogPostList.Metadata.Type = "Parts_Blogs_BlogPost.List";
+            var blogPostList = shapeHelper.Parts_Blogs_BlogPost_List(ContentPart: part, ContentItems: list);

-            return ContentShape(blogPostList).Location("Primary");
+            return ContentShape(shapeHelper.Parts_Blogs_RecentBlogPosts(ContentItem: part, ContentItems: blogPostList));
        }

        protected override DriverResult Editor(RecentBlogPostsPart part, dynamic shapeHelper) {
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Migrations.cs
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Migrations.cs
@@ -89,5 +89,11 @@ namespace Orchard.Blogs {
            
            return 5;
        }
+
+        public int UpdateFrom5() {
+            ContentDefinitionManager.AlterTypeDefinition("Blog",
+                cfg => cfg.WithPart("BlogPagerPart"));
+            return 6;
+        }
    }
 }
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Models/BlogPagerPart.cs
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Models/BlogPagerPart.cs
@@ -0,0 +1,10 @@
+using Orchard.ContentManagement;
+
+namespace Orchard.Blogs.Models {
+    public class BlogPagerPart : ContentPart {
+        public int Page { get; set; }
+        public int PageSize { get; set; }
+        public string BlogSlug { get; set; }
+        public bool ThereIsANextPage { get; set; }
+    }
+}
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj
@@ -68,11 +68,13 @@
  <ItemGroup>
    <Compile Include="AdminMenu.cs" />
    <Compile Include="Drivers\BlogArchivesPartDriver.cs" />
+    <Compile Include="Drivers\BlogPagerPartDriver.cs" />
    <Compile Include="Drivers\RecentBlogPostsPartDriver.cs" />
    <Compile Include="Handlers\BlogArchivesPartHandler.cs" />
    <Compile Include="Handlers\RecentBlogPostsPartHandler.cs" />
    <Compile Include="Models\BlogArchivesPart.cs" />
    <Compile Include="Models\BlogArchivesPartRecord.cs" />
+    <Compile Include="Models\BlogPagerPart.cs" />
    <Compile Include="Models\RecentBlogPostsPart.cs" />
    <Compile Include="Models\RecentBlogPostsPartRecord.cs" />
    <Compile Include="ResourceManifest.cs" />
@@ -107,8 +109,7 @@
    <Compile Include="Services\IBlogService.cs" />
    <Compile Include="Services\XmlRpcHandler.cs" />
    <Compile Include="RemoteBlogPublishingShapes.cs" />
-    <Compile Include="ViewModels\BlogPostArchiveViewModel.cs" />
-    <Compile Include="ViewModels\DisplayBlogViewModel.cs" />
+    <Compile Include="Shapes.cs" />
  </ItemGroup>
  <ItemGroup>
    <Content Include="Content\Admin\images\draft.gif" />
@@ -161,7 +162,7 @@
      <SubType>Designer</SubType>
    </None>
    <Content Include="Views\RemoteBlogPublishing.cshtml" />
-    <None Include="Views\DisplayTemplates\Parts\Blogs.BlogArchives.cshtml" />
+    <None Include="Views\Parts\Blogs.BlogArchives.cshtml" />
    <None Include="Views\EditorTemplates\Parts\Blogs.RecentBlogPosts.cshtml" />
    <None Include="Views\EditorTemplates\Parts\Blogs.BlogArchives.cshtml" />
    <None Include="Views\Items\Blog.DetailAdmin.cshtml" />
@@ -169,6 +170,8 @@
    <None Include="Views\Items\BlogPost.Editor.cshtml" />
    <None Include="Views\Items\BlogPost.SummaryAdmin.cshtml" />
    <None Include="Views\Parts\Blogs.BlogPost.List.cshtml" />
+    <None Include="Views\Parts\Blogs.Blog.Pager.cshtml" />
+    <None Include="Views\Parts\Blogs.RecentBlogPosts.cshtml" />
  </ItemGroup>
  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Placement.info
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Placement.info
@@ -1,13 +1,23 @@
 <Placement>
-    <Place Parts_Blogs_Blog_Manage="-"/>
-    <Place Parts_Blogs_Blog_Description="-"/>
-    <Place Parts_Blogs_BlogPost_List="-"/>
-    <Place Parts_Blogs_BlogPost_List_Admin="-"/>
+    <!-- available display shapes -->
+    <!--
+        Parts_Blogs_Blog_Manage
+        Parts_Blogs_Blog_Description
+        Parts_Blogs_Blog_Pager
+        Parts_Blogs_BlogPost_List -> when in the blog detail display the blog post list is currently hard-coded to Content:5 to enable the current state of blog paging
+        Parts_Blogs_BlogPost_List_Admin
+    -->
+    <!-- widget and edit shapes just get default placement -->
+    <!-- edit "shapes" -->
    <Place Parts_Blogs_Blog_Fields="Primary:2"/>
+    <!-- widgets -->
+    <Place Parts_Blogs_BlogArchives="Content"/>
+    <Place Parts_Blogs_RecentBlogPosts="Content"/>
    <Match ContentType="Blog">
        <Match DisplayType="Detail">
-            <!-- current paging solution makes this redundant
-                <Place Parts_Blogs_BlogPost_List="Content:5" /> -->
+            <!-- blog posts currently added to the blog within the controller into Content:5 <Place Parts_Blogs_BlogPost_List="Content:5" />-->
+            <Place Parts_Blogs_Blog_Pager="Content:after"
+                   Parts_Blogs_Blog_Description="Content:before" />
        </Match>
        <Match DisplayType="DetailAdmin">
            <Place Parts_Blogs_BlogPost_List_Admin="Content:5"
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Shapes.cs
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Shapes.cs
@@ -0,0 +1,22 @@
+//using Orchard.ContentManagement;
+//using Orchard.DisplayManagement.Descriptors;
+
+//namespace Orchard.Blogs {
+//    public class Shapes : IShapeTableProvider {
+//        public void Discover(ShapeTableBuilder builder) {
+//            builder.Describe("Items_Content__Blog")
+//                .OnCreated(created => {
+//                    var blog = created.Shape;
+//                    blog.Content.Add(created.New.Parts_Blogs_BlogPost_List(ContentPart: blog.ContentItem, ContentItems: blog.));
+//                })
+//                .OnDisplaying(displaying => {
+//                    ContentItem contentItem = displaying.Shape.ContentItem;
+//                    if (contentItem != null) {
+//                        var zoneName = contentItem.As<WidgetPart>().Zone;
+//                        displaying.ShapeMetadata.Alternates.Add("Items_Widget__" + contentItem.ContentType);
+//                        displaying.ShapeMetadata.Alternates.Add("Items_Widget__" + zoneName);
+//                    }
+//                });
+//        }
+//    }
+//}
--- a/src/Orchard.Web/Modules/Orchard.Blogs/ViewModels/BlogPostArchiveViewModel.cs
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/ViewModels/BlogPostArchiveViewModel.cs
@@ -1,9 +0,0 @@
-using System.Collections.Generic;
-using Orchard.Blogs.Models;
-
-namespace Orchard.Blogs.ViewModels {
-    public class BlogPostArchiveViewModel {
-        public BlogPart BlogPart { get; set; }
-        public IEnumerable<KeyValuePair<ArchiveData, int>> Archives { get; set; }
-    }
-}
--- a/src/Orchard.Web/Modules/Orchard.Blogs/ViewModels/DisplayBlogViewModel.cs
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/ViewModels/DisplayBlogViewModel.cs
@@ -1,8 +0,0 @@
-namespace Orchard.Blogs.ViewModels {
-    public class DisplayBlogViewModel {
-        public dynamic Blog { get; set; }
-        public dynamic BlogPostList { get; set; }
-        public int Page { get; set; }
-        public int PageSize { get; set; }
-    }
-}
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Blog/Item.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Blog/Item.cshtml
@@ -1,26 +1,2 @@
-@model Orchard.Blogs.ViewModels.DisplayBlogViewModel
-@using Orchard.Blogs.Extensions;
-@{
-    Style.Include("pagination.css");
-}
-@Display(Model.Blog)
-@if (Model.BlogPostList.Items.Count > 0) {
-    @Display(Model.BlogPostList)
-
-    <ul class="pagination">
-    @if(Model.BlogPostList.Items.Count == Model.PageSize) {
-        <li class="older">
-        @Html.ActionLink(T("Older Posts").Text, "Item", new { Area = "Orchard.Blogs", blogSlug = Model.Blog.Slug, page = Model.Page + 1 })
-        </li>
-    }
-
-    @if(Model.Page > 1) {
-        <li class="newer">
-        @Html.ActionLink(T("Newer Posts").Text, "Item", new { Area = "Orchard.Blogs", blogSlug = Model.Blog.Slug, page = Model.Page - 1 })
-        </li>
-    }
-    </ul>
-}
-else {
-    <p>@T("There are no posts for this blog.")</p>
-}
+@Display(Model.Meta)
+@Display(Model.Content)
--- 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
@@ -3,6 +3,6 @@
    <div>
        @Html.LabelFor(m => m.ForBlog)
 	    @Html.TextBoxFor(m => m.ForBlog)
-        <span class="hint">@T("The blog's slug to display the archives for.")</span>
+        <span class="hint">@T("Show the archives for which blog? Note: specify the blog's slug.")</span>
    </div>
 </fieldset>
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/BlogPost.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/BlogPost.cshtml
@@ -1,9 +1,11 @@
-<h1>@Html.TitleForPage((string)Model.Title)</h1>
-@if (Model.Meta != null) {
-<div class="metadata">
-    @Display(Model.Meta)
-</div>
-}
-<div class="content">
+<article>
+  <header>
+    @Display(Model.Header)
+    <p class="metadata">
+      @Display(Model.Meta)
+    </p>
+  </header>
+  <section>
    @Display(Model.Content)
-</div>
+  </section>
+</article>
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Blogs.Blog.Pager.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Blogs.Blog.Pager.cshtml
@@ -0,0 +1,18 @@
+@using Orchard.Blogs.Extensions;
+@{
+    Style.Include("pagination.css");
+}
+@if (Model.ThereIsANextPage || Model.Page > 1) {
+    <ul class="blog-pagination">
+    @if(Model.ThereIsANextPage) {
+        <li class="older">
+        @Html.ActionLink(T("Older Posts").Text, "Item", new { Area = "Orchard.Blogs", blogSlug = Model.BlogSlug, page = Model.Page + 1 })
+        </li>
+    }
+    @if(Model.Page > 1) {
+        <li class="newer">
+        @Html.ActionLink(T("Newer Posts").Text, "Item", new { Area = "Orchard.Blogs", blogSlug = Model.BlogSlug, page = Model.Page - 1 })
+        </li>
+    }
+    </ul>
+}
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Parts/Blogs.BlogArchives.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/DisplayTemplates/Parts/Blogs.BlogArchives.cshtml
@@ -1,23 +1,20 @@
-@model Orchard.Blogs.ViewModels.BlogPostArchiveViewModel
-@using Orchard.Blogs.Extensions;
-
+@using Orchard.Blogs.Extensions;
+@using Orchard.Blogs.Models;
@{
    Style.Require("BlogsArchives");
    Script.Require("BlogsArchives");
+    IEnumerable<KeyValuePair<ArchiveData, int>> archives = Model.Archives;
 }
-
 <div class="archives">
    <h3>@T("Archives")</h3>
-    @if (Model.Archives.Count() > 20) {
+    @if (archives.Count() > 20) {
    <ul class="years">
        @{
-            int lastYear = Model.Archives.First().Key.Year;
-            int firstYear = Model.Archives.Last().Key.Year;
+            int lastYear = archives.First().Key.Year;
+            int firstYear = archives.Last().Key.Year;
        }
-            
-            
        @for (int year = lastYear; year >= firstYear; year--) {
-            var yearMonths = Model.Archives.Where(m => m.Key.Year == year);
+            var yearMonths = archives.Where(m => m.Key.Year == year);
            
            if (year == lastYear) {
        <li>
@@ -28,15 +25,14 @@
            if (year != lastYear) {
        <li class="previous">
            <h4>@year <span>(@yearMonths.Sum(ym => ym.Value))</span></h4>
-            @Html.UnorderedList(yearMonths, (t, i) => Html.Link(string.Format("{0:MMMM} ({1})", t.Key.ToDateTime(), t.Value), Url.BlogArchiveMonth(Model.BlogPart.Slug, t.Key.Year, t.Key.Month)), "archiveMonthList")
+            @Html.UnorderedList(yearMonths, (t, i) => Html.Link(string.Format("{0:MMMM} ({1})", t.Key.ToDateTime(), t.Value), Url.BlogArchiveMonth((string)Model.BlogPart.Slug, t.Key.Year, t.Key.Month)), "archiveMonthList")
        </li>
            }
        }
-
    </ul>
    } 
-    else if (Model.Archives.Count() > 0) {
-        @Html.UnorderedList(Model.Archives, (t, i) => Html.Link(string.Format("{0:MMMM yyyy} ({1})", t.Key.ToDateTime(), t.Value), Url.BlogArchiveMonth(Model.BlogPart.Slug, t.Key.Year, t.Key.Month)), "archiveMonthList")
+    else if (archives.Count() > 0) {
+        @Html.UnorderedList(archives, (t, i) => Html.Link(string.Format("{0:MMMM yyyy} ({1})", t.Key.ToDateTime(), t.Value), Url.BlogArchiveMonth((string)Model.BlogPart.Slug, t.Key.Year, t.Key.Month)), "archiveMonthList")
    }
    else {
    <div class="message info">@T("None found")</div>
--- 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
@@ -1,9 +1,7 @@
@{
-    IEnumerable<object> blogPosts = Model.BlogPosts;
+    IEnumerable<object> blogPosts = Model.ContentItems;
 }
-@Display(ContentItems)
+@Display(Model.ContentItems)
@if (blogPosts == null || blogPosts.Count() < 1) {
 <p>@T("There are no posts for this blog.")</p>
-}
-
-hi
+}
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Blogs.RecentBlogPosts.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Parts/Blogs.RecentBlogPosts.cshtml
@@ -0,0 +1 @@
+@Display(Model.ContentItems)
--- a/src/Orchard.Web/Modules/Orchard.Comments/Views/ListOfComments.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Views/ListOfComments.cshtml
@@ -2,15 +2,20 @@
@using Orchard.Comments.Models;

 <ul class="comments">
-@foreach (var comment in Model) { 
-    <li>
-        <div class="comment">
-            <span class="who">@Html.LinkOrDefault(comment.Record.UserName, comment.Record.SiteName, new { rel = "nofollow" })</span>
-            <span>said @Html.Link(Html.DateTimeRelative(comment.Record.CommentDateUtc.GetValueOrDefault(), T).ToString(), "#")</span>
-        </div>
-        <div class="text">
-            <p>@comment.Record.CommentText</p>
-        </div>
-    </li>
+@foreach (var comment in Model) {
+	<li>
+		<article class="comment">
+			<header>
+				<h4>
+					<span class="who">@Html.LinkOrDefault(comment.Record.UserName, comment.Record.SiteName, new { rel = "nofollow" })
+					</span>
+					<span class="when">said <time datetime="@comment.Record.CommentDateUtc.GetValueOrDefault()">@Html.Link(Html.DateTimeRelative(comment.Record.CommentDateUtc.GetValueOrDefault(), T).ToString(), "#")</time>
+					</span>
+				</h4>
+			</header>
+			<p class="text">@comment.Record.CommentText</p>
+		</article>
+	</li>
 } 
-</ul>
+</ul>
+
--- a/src/Orchard.Web/Modules/Orchard.Comments/Views/Parts/Comments.Comments.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Views/Parts/Comments.Comments.cshtml
@@ -19,37 +19,44 @@ else if(!Request.IsAuthenticated && !AuthorizedFor(Permissions.AddComment)) {
 } else {
 using (Html.BeginForm("Create", "Comment", new { area = "Orchard.Comments" }, FormMethod.Post, new { @class = "comment" })) { 
    @Html.ValidationSummary() 
-    <h2 id="addacomment">@T("Add a Comment")</h2>
-    if (!Request.IsAuthenticated) { 
+    if (!Request.IsAuthenticated) {
+
    <fieldset class="who">
-        <div>
+        <legend id="addacomment">@T("Add a Comment")</legend> 
+    <ol>
+        <li>
            <label for="Name">@T("Name")</label>
            <input id="Name" class="text" name="Name" type="text" />
-        </div>
-        <div>
+        </li>
+        <li>
            <label for="Email">@T("Email")</label>
            <input id="Email" class="text" name="Email" type="text" />
-        </div>
-        <div>
+        </li>
+        <li>
            <label for="SiteName">@T("Url")</label>
            <input id="SiteName" class="text" name="SiteName" type="text" />
-        </div>
+        </li>
+     </ol>
    </fieldset>
    } else {
        @Html.Hidden("Name", WorkContext.CurrentUser.UserName ?? "")
        @Html.Hidden("Email", WorkContext.CurrentUser.Email ?? "")
    }
+
+    <h2 id="commenter">@if (Request.IsAuthenticated) { @T("Hi, {0}!", Html.Encode(WorkContext.CurrentUser.UserName))}</h2>
    <fieldset class="what">
-        <div>
-            <label for="CommentText">@if (Request.IsAuthenticated) { @T("Hi, {0}!", Html.Encode(WorkContext.CurrentUser.UserName))<br /> } @T("Comment")</label>
+    <ol>
+        <li>
+            <label for="CommentText">@T("Comment")</label>
            <textarea id="CommentText" rows="10" cols="30" name="CommentText"></textarea>
-        </div>
-        <div>
+        </li>
+        <li>
            <input type="submit" class="button" value="@T("Submit Comment")" />
            @Html.Hidden("CommentedOn", (int)Model.ContentPart.ContentItem.Id) 
            @Html.Hidden("ReturnUrl", Context.Request.ToUrlString()) 
            @Html.AntiForgeryTokenOrchard() 
-        </div>
+        </li>
+    </ol>
    </fieldset>
    }
-} 
+} 
--- a/src/Orchard.Web/Modules/Orchard.Migrations/Commands/DataMigrationCommands.cs
+++ b/src/Orchard.Web/Modules/Orchard.Migrations/Commands/DataMigrationCommands.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using Orchard.Commands;
 using Orchard.Data.Migration;
@@ -11,27 +12,29 @@ namespace Orchard.Migrations.Commands {
    [OrchardFeature("Orchard.Migrations")]
    public class DataMigrationCommands : DefaultOrchardCommandHandler {
        private readonly IDataMigrationManager _dataMigrationManager;
-        private readonly IDataMigrationInterpreter _dataMigrationInterpreter;
-        private readonly ISchemaCommandGenerator _schemaCommandGenerator;
+        private readonly IExtensionManager _extensionManager;

        public DataMigrationCommands(
            IDataMigrationManager dataMigrationManager,
-            IDataMigrationInterpreter dataMigrationInterpreter,
-            ISchemaCommandGenerator schemaCommandGenerator
+            IExtensionManager extensionManager
            ) {
            _dataMigrationManager = dataMigrationManager;
-            _dataMigrationInterpreter = dataMigrationInterpreter;
-            _schemaCommandGenerator = schemaCommandGenerator;
+            _extensionManager = extensionManager;
        }

-        [OrchardSwitch]
-        public bool Drop { get; set; }
-
        [CommandName("upgrade database")]
-        [CommandHelp("upgrade database <feature-name> \r\n\t" + "Upgrades or create the database tables for the <feature-name>")]
-        public string UpgradeDatabase(string featureName) {
+        [CommandHelp("upgrade database <feature-name-1> ... <feature-name-n> \r\n\t" + "Upgrades or create the database tables for the <feature-name> or all features if not available")]
+        public string UpgradeDatabase(params string[] featureNames) {
            try {
-                _dataMigrationManager.Update(featureName);
+                IEnumerable<string> features = featureNames.Any()
+                                                   ? featureNames
+                                                   : _extensionManager.AvailableExtensions()
+                                                         .SelectMany(ext => ext.Features)
+                                                         .Select(f => f.Name);
+
+                foreach(var feature in features) {
+                    _dataMigrationManager.Update(feature);    
+                }
            }
            catch ( Exception ex ) {
                Context.Output.WriteLine(T("An error occured while upgrading the database: " + ex.Message));
@@ -40,6 +43,22 @@ namespace Orchard.Migrations.Commands {

            return "Database upgraded";
        }
+    }
+    [OrchardFeature("DatabaseUpdate")]
+    public class DatabaseUpdateCommands : DefaultOrchardCommandHandler {
+        private readonly IDataMigrationInterpreter _dataMigrationInterpreter;
+        private readonly ISchemaCommandGenerator _schemaCommandGenerator;
+
+        [OrchardSwitch]
+        public bool Drop { get; set; }
+
+        public DatabaseUpdateCommands(
+            IDataMigrationInterpreter dataMigrationInterpreter,
+            ISchemaCommandGenerator schemaCommandGenerator
+            ) {
+            _dataMigrationInterpreter = dataMigrationInterpreter;
+            _schemaCommandGenerator = schemaCommandGenerator;
+        }

        [CommandName("update database")]
        [CommandHelp("update database \r\n\t" + "Automatically updates the database schema for the enabled features")]
--- a/src/Orchard.Web/Modules/Orchard.Modules/Commands/FeatureCommands.cs
+++ b/src/Orchard.Web/Modules/Orchard.Modules/Commands/FeatureCommands.cs
@@ -79,7 +79,7 @@ namespace Orchard.Modules.Commands {
        [CommandName("feature disable")]
        public void Disable(params string[] featureNames) {
            Context.Output.WriteLine(T("Disabling features {0}", string.Join(",", featureNames)));
-            _moduleService.DisableFeatures(featureNames);
+            _moduleService.DisableFeatures(featureNames, true);
            Context.Output.WriteLine(T("Disabled features  {0}", string.Join(",", featureNames)));
        }
    }
--- a/src/Orchard.Web/Modules/Orchard.Modules/Services/ModuleService.cs
+++ b/src/Orchard.Web/Modules/Orchard.Modules/Services/ModuleService.cs
@@ -95,9 +95,10 @@ namespace Orchard.Modules.Services {
        public void DisableFeatures(IEnumerable<string> features, bool force) {
            var shellDescriptor = _shellDescriptorManager.GetShellDescriptor();
            var enabledFeatures = shellDescriptor.Features.ToList();
+            var availableFeatures = GetAvailableFeatures().ToList();

            var featuresToDisable =
-                features.Select(s => DisableFeature(s, GetAvailableFeatures(), force)).SelectMany(
+                features.Select(s => DisableFeature(s, availableFeatures, force)).SelectMany(
                    ies => ies.Select(s => s));

            if (featuresToDisable.Count() == 0)
--- a/src/Orchard.Web/Modules/Orchard.Search/Controllers/SearchController.cs
+++ b/src/Orchard.Web/Modules/Orchard.Search/Controllers/SearchController.cs
@@ -1,10 +1,14 @@
 using System.Web.Mvc;
+using System.Web.Query.Dynamic;
 using JetBrains.Annotations;
 using Orchard.ContentManagement;
+using Orchard.Indexing;
+using Orchard.Localization;
 using Orchard.Search.Services;
 using Orchard.Search.ViewModels;
 using Orchard.Settings;
 using Orchard.Search.Models;
+using Orchard.UI.Notify;
 using System.Collections.Generic;
 using Orchard.Collections;
 using Orchard.Themes;
@@ -15,20 +19,38 @@ namespace Orchard.Search.Controllers {
        private readonly ISearchService _searchService;
        private readonly IContentManager _contentManager;

-        public SearchController(ISearchService searchService, IContentManager contentManager) {
+        public SearchController(
+            IOrchardServices services,
+            ISearchService searchService, 
+            IContentManager contentManager) {
+
+             Services = services;
            _searchService = searchService;
            _contentManager = contentManager;
+
+            T = NullLocalizer.Instance;
        }

+        private IOrchardServices Services { get; set; }
+        public Localizer T { get; set; }
+
        protected virtual ISite CurrentSite { get; [UsedImplicitly] private set; }

        public ActionResult Index(string q, int page = 1, int pageSize = 10) {
            var searchFields = CurrentSite.As<SearchSettingsPart>().SearchedFields;

-            var searchHits = _searchService.Query(q, page, pageSize, 
-                    CurrentSite.As<SearchSettingsPart>().Record.FilterCulture,
-                    searchFields, 
-                    searchHit => searchHit);
+            IPageOfItems<ISearchHit> searchHits;
+            
+            if (q.Trim().StartsWith("?") || q.Trim().StartsWith("*")) {
+                searchHits = new PageOfItems<ISearchHit>(new ISearchHit[] { });
+                Services.Notifier.Error(T("'*' or '?' not allowed as first character in WildcardQuery"));
+            } 
+            else {
+                searchHits = _searchService.Query(q, page, pageSize,
+                                                      CurrentSite.As<SearchSettingsPart>().Record.FilterCulture,
+                                                      searchFields,
+                                                      searchHit => searchHit);
+            }

            var searchResultViewModels = new List<SearchResultViewModel>();

--- a/src/Orchard.Web/Modules/Orchard.Search/Drivers/SearchFormPartDriver.cs
+++ b/src/Orchard.Web/Modules/Orchard.Search/Drivers/SearchFormPartDriver.cs
@@ -7,7 +7,13 @@ namespace Orchard.Search.Drivers {

        protected override DriverResult Display(SearchFormPart part, string displayType, dynamic shapeHelper) {
            var model = new SearchViewModel();
-            return ContentPartTemplate(model, "Parts/Search.SearchForm");
+            return ContentShape("Parts_Search_SearchForm", "Content:1",
+                                () => {
+                                    var shape = shapeHelper.Parts_Search_SearchForm();
+                                    shape.ContentPart = part;
+                                    shape.ViewModel = model;
+                                    return shape;
+                                });
        }
    }
 }
--- a/src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Search/Orchard.Search.csproj
@@ -101,11 +101,10 @@
  </ItemGroup>
  <ItemGroup>
    <Content Include="Views\EditorTemplates\Parts\Search.SiteSettings.cshtml" />
-    <Content Include="Views\EditorTemplates\Parts\Search.SearchForm.cshtml" />
    <Content Include="Views\Search\Index.cshtml" />
  </ItemGroup>
  <ItemGroup>
-    <Content Include="Views\DisplayTemplates\Parts\Search.SearchForm.cshtml" />
+    <Content Include="Views\Parts\Search.SearchForm.cshtml" />
  </ItemGroup>
  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />
--- a/src/Orchard.Web/Modules/Orchard.Search/Views/EditorTemplates/Parts/Search.SearchForm.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Search/Views/EditorTemplates/Parts/Search.SearchForm.cshtml
@@ -1 +0,0 @@
-
--- a/src/Orchard.Web/Modules/Orchard.Search/Views/DisplayTemplates/Parts/Search.SearchForm.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Search/Views/DisplayTemplates/Parts/Search.SearchForm.cshtml
@@ -1,8 +1,8 @@
-@model Orchard.Search.ViewModels.SearchViewModel
+@using Orchard.Search.ViewModels;

@using(Html.BeginForm("index", "search", new { area = "Orchard.Search" }, FormMethod.Get, new { @class = "search" })) { 
    <fieldset>
-        @Html.TextBox("q", Model.Query)
+        @Html.TextBox("q", (SearchViewModel)Model.ViewModel.Query)
        <button type="submit">@T("Search")</button>
    </fieldset>
-} 
+}
--- a/src/Orchard.Web/Modules/Orchard.Tags/Drivers/TagsPartDriver.cs
+++ b/src/Orchard.Web/Modules/Orchard.Tags/Drivers/TagsPartDriver.cs
@@ -2,7 +2,6 @@
 using JetBrains.Annotations;
 using Orchard.ContentManagement;
 using Orchard.ContentManagement.Drivers;
-using Orchard.Core.ContentsLocation.Models;
 using Orchard.Security;
 using Orchard.Tags.Helpers;
 using Orchard.Tags.Models;
@@ -12,6 +11,7 @@ using Orchard.Tags.ViewModels;
 namespace Orchard.Tags.Drivers {
    [UsedImplicitly]
    public class TagsPartDriver : ContentPartDriver<TagsPart> {
+        private const string TemplateName = "Parts/Tags";
        private readonly ITagService _tagService;
        private readonly IAuthorizationService _authorizationService;

@@ -23,6 +23,10 @@ namespace Orchard.Tags.Drivers {

        public virtual IUser CurrentUser { get; set; }

+        protected override string Prefix {
+            get { return "Tags"; }
+        }
+
        protected override DriverResult Display(TagsPart part, string displayType, dynamic shapeHelper) {
            return ContentShape("Parts_Tags_ShowTags",
                            () => shapeHelper.Parts_Tags_ShowTags(ContentPart: part, Tags: part.CurrentTags));
@@ -35,7 +39,9 @@ namespace Orchard.Tags.Drivers {
            var model = new EditTagsViewModel {
                                                  Tags = string.Join(", ", part.CurrentTags.Select((t, i) => t.TagName).ToArray())
                                              };
-            return ContentPartTemplate(model, "Parts/Tags.EditTags").Location(part.GetLocation("Editor"));
+
+            return ContentShape("Parts_Tags_Editor",
+                    () => shapeHelper.EditorTemplate(TemplateName: TemplateName, Model: model, Prefix: Prefix));
        }

        protected override DriverResult Editor(TagsPart part, IUpdateModel updater, dynamic shapeHelper) {
@@ -50,7 +56,8 @@ namespace Orchard.Tags.Drivers {
                _tagService.UpdateTagsForContentItem(part.ContentItem.Id, tagNames);
            }

-            return ContentPartTemplate(model, "Parts/Tags.EditTags").Location(part.GetLocation("Editor"));
+            return ContentShape("Parts_Tags_Editor",
+                    () => shapeHelper.EditorTemplate(TemplateName: TemplateName, Model: model, Prefix: Prefix));
        }
    }
 }
--- a/src/Orchard.Web/Modules/Orchard.Tags/Orchard.Tags.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Tags/Orchard.Tags.csproj
@@ -98,7 +98,7 @@
    <Content Include="Views\Admin\Index.cshtml" />
    <Content Include="Views\Admin\Search.cshtml" />
    <Content Include="Views\Parts\Tags.ShowTags.cshtml" />
-    <Content Include="Views\EditorTemplates\Parts\Tags.EditTags.cshtml" />
+    <Content Include="Views\EditorTemplates\Parts\Tags.cshtml" />
    <Content Include="Views\Home\Index.cshtml" />
    <Content Include="Views\Home\Search.cshtml" />
  </ItemGroup>
--- a/src/Orchard.Web/Modules/Orchard.Tags/Placement.info
+++ b/src/Orchard.Web/Modules/Orchard.Tags/Placement.info
@@ -1,3 +1,4 @@
 <Placement>
  <Place Parts_Tags_ShowTags="Header:after.7"/>
+  <Place Parts_Tags_Editor="Primary:7"/>
 </Placement>
--- a/src/Orchard.Web/Modules/Orchard.Tags/Views/EditorTemplates/Parts/Tags.EditTags.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Tags/Views/EditorTemplates/Parts/Tags.EditTags.cshtml
--- a/src/Orchard.Web/Modules/Orchard.Users/Views/Account/LogOn.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Users/Views/Account/LogOn.cshtml
@@ -5,21 +5,23 @@
@Html.ValidationSummary(T("Login was unsuccessful. Please correct the errors and try again.").ToString())

@using (Html.BeginFormAntiForgeryPost(Url.Action("LogOn", new {ReturnUrl = Request.QueryString["ReturnUrl"]}))) {
-<fieldset class="login-form">
+<fieldset class="login-form group">
    <legend>@T("Account Information")</legend>
-    <div class="group">
+    <ol>
+    <li>
        <label for="userNameOrEmail">@T("Username:")</label>
        @Html.TextBox("userNameOrEmail", "", new { autofocus = "autofocus" })
        @Html.ValidationMessage("userNameOrEmail")
-    </div>
-    <div class="group">
+    </li>
+    <li>
        <label for="password">@T("Password:")</label>
        @Html.Password("password")
        @Html.ValidationMessage("password")
-    </div>
-    <div class="group">
+    </li>
+    <li>
        @Html.CheckBox("rememberMe")<label class="forcheckbox" for="rememberMe">@T("Remember me?")</label>
-    </div>
+    </li>
    <input type="submit" value="@T("Log On")" />
+    </ol>
 </fieldset>
 }
--- a/src/Orchard.Web/Modules/Orchard.Widgets/Controllers/AdminController.cs
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Controllers/AdminController.cs
@@ -51,7 +51,7 @@ namespace Orchard.Widgets.Controllers {
                    return RedirectToAction("Index");
                }

-                currentLayerWidgets = _widgetsService.GetWidgets().Where(widgetPart => widgetPart.LayerPart.Id == currentLayer.Id);
+                currentLayerWidgets = _widgetsService.GetWidgets(currentLayer.Id);
            }
            else {
                currentLayer = null;
--- a/src/Orchard.Web/Modules/TinyMce/Scripts/plugins/addmedia/js/addmedia.js
+++ b/src/Orchard.Web/Modules/TinyMce/Scripts/plugins/addmedia/js/addmedia.js
@@ -27,7 +27,12 @@ var AddMediaDialog = {
                var result = window.frames[iframeName].result, close = 0;

                if (result && result.url) {
-                    window.parent.AddMediaDialog.insertMedia(result.url);
+            	    if (window.parent && window.parent.AddMediaDialog) {
+                        window.parent.AddMediaDialog.insertMedia(result.url);
+                    } else {
+                        AddMediaDialog.insertMedia(result.url);
+                    }
+
                    close = 1;
                } else if (result && result.error) {
                    alert(tinyMCEPopup.getLang("addmedia_dlg.msg_error") + "\n\r\n\r" + result.error);
@@ -48,7 +53,14 @@ var AddMediaDialog = {
                    tinymce.dom.Event.remove(iframe, 'load', iframeLoadHandler);
                    tinymce.DOM.remove(iframe);
                    iframe = null;
-                    if (close) window.parent.tinyMCEPopup.close();
+
+                    if (close) {
+                        if (window.parent && window.parent.tinyMCEPopup) {
+                            window.parent.tinyMCEPopup.close();
+                        } else {
+                            tinyMCEPopup.close();
+                        }
+                    }
                },
                123);
            } catch (ex) {
--- a/src/Orchard.Web/Themes/TheThemeMachine/Styles/Site.css
+++ b/src/Orchard.Web/Themes/TheThemeMachine/Styles/Site.css
@@ -190,7 +190,7 @@ pre,code,tt { font: 1em 'andale mono', 'lucida console', monospace; line-height:

 #layout-main 
 {
-    border-top: 1px solid #dbdbdb;
+    border-top: 1px solid #fff;
 }

 #layout-after-main 
@@ -303,7 +303,6 @@ label.forcheckbox { margin:0 0 0 .4em; display:inline; }
 fieldset          { padding:0em; margin: 0 0 0em 0; border: 0px solid #dbdbdb; }
 legend            { font-weight: 600; font-size:1.2em; }

-
 input[type="text"], #CommentText, #password, #confirmPassword {
    border:1px solid #999;
    display: block;
@@ -320,7 +319,9 @@ form.search {
    width:17em;
 }

-fieldset div {margin:1.6em 0 0 0}
+fieldset ol {list-style-type:none;}
+
+fieldset ol li {margin:1.6em 0 0 0}
    
 legend {
 	font-size: 1.4em;
@@ -400,35 +401,38 @@ button:focus, .button:focus {


 /* For testing purposes */
-#comments {
+#comments, #commenter {
    font-size:1.6em;
    font-weight:600;
    margin:1.2em 0 1.8em 1.2em;
 }

+#commenter {
+    margin:1.2em 0 0 1em;
+}
+
 ul.comments, form.comment {
    margin:1.2em 0 1.2em 1.8em;
+    list-style: none;
 }

-div.comment {
-    font-size:1.3em;
-    font-style:italic;
-    color:#484848;
+article.comment h4 {
+    font-size:1.4em;
 }

-div.comment a {
+article.comment a {
    color:#484848;
    text-decoration:none;
 }

-div.comment span.who {
+article.comment span.who {
    font-weight:600;
    font-style:normal;
    text-transform:capitalize;
    color:#333;
 }

-ul.comments li div.text {
+article.comment p.text {
    margin:.6em 0 2.4em 0;
 }