Merge

--HG--
branch : dev

src/Orchard.Web/Modules/Orchard.Blogs/AdminMenu.cs

@@ -33,14 +33,15 @@ namespace Orchard.Blogs {
                     item =>
                     item.Action("Item", "BlogAdmin", new {area = "Orchard.Blogs", blogSlug = singleBlog.Slug}).Permission(Permissions.MetaListBlogs));
 
-            menu.Add(T("Create New Blog"), "1.1",
+            if ( singleBlog != null )
+                menu.Add(T("Create New Post"), "1.1",
+                         item =>
+                         item.Action("Create", "BlogPostAdmin", new { area = "Orchard.Blogs", blogSlug = singleBlog.Slug }).Permission(Permissions.PublishBlogPost));
+
+            menu.Add(T("Create New Blog"), "1.2",
                      item =>
                      item.Action("Create", "BlogAdmin", new { area = "Orchard.Blogs" }).Permission(Permissions.ManageBlogs));
 
-            if (singleBlog != null)
-                menu.Add(T("Create New Post"), "1.2",
-                         item =>
-                         item.Action("Create", "BlogPostAdmin", new {area = "Orchard.Blogs", blogSlug = singleBlog.Slug}).Permission(Permissions.PublishBlogPost));
         }
     }
 }

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

@@ -1,3 +1,4 @@
+using System;
 using System.Linq;
 using System.Web;
 using System.Web.Mvc;
@@ -6,6 +7,7 @@ using System.Xml.Linq;
 using Orchard.Blogs.Models;
 using Orchard.Blogs.Routing;
 using Orchard.Blogs.Services;
+using Orchard.Blogs.ViewModels;
 using Orchard.DisplayManagement;
 using Orchard.Logging;
 using Orchard.Mvc.Results;
@@ -16,12 +18,14 @@ namespace Orchard.Blogs.Controllers {
     public class BlogController : Controller {
         private readonly IOrchardServices _services;
         private readonly IBlogService _blogService;
+        private readonly IBlogPostService _blogPostService;
         private readonly IBlogSlugConstraint _blogSlugConstraint;
         private readonly RouteCollection _routeCollection;
 
-        public BlogController(IOrchardServices services, IBlogService blogService, IBlogSlugConstraint blogSlugConstraint, RouteCollection routeCollection, IShapeHelperFactory shapeHelperFactory) {
+        public BlogController(IOrchardServices services, IBlogService blogService, IBlogPostService blogPostService, IBlogSlugConstraint blogSlugConstraint, RouteCollection routeCollection, IShapeHelperFactory shapeHelperFactory) {
             _services = services;
             _blogService = blogService;
+            _blogPostService = blogPostService;
             _blogSlugConstraint = blogSlugConstraint;
             _routeCollection = routeCollection;
             Logger = NullLogger.Instance;
@@ -44,18 +48,31 @@ namespace Orchard.Blogs.Controllers {
         }
 
         //TODO: (erikpo) Should move the slug parameter and get call and null check up into a model binder
-        public ActionResult Item(string blogSlug) {
+        public ActionResult Item(string blogSlug, int page) {
+            const int pageSize = 10;
+
             var correctedSlug = _blogSlugConstraint.FindSlug(blogSlug);
             if (correctedSlug == null)
                 return new NotFoundResult();
 
-            var blog = _blogService.Get(correctedSlug);
+            BlogPart blog = _blogService.Get(correctedSlug);
             if (blog == null)
                 return new NotFoundResult();
 
-            //todo: (heskew) "Blog" should be an alternative instead of a display type
+            var blogPosts = _blogPostService.Get(blog, (page - 1)*pageSize, pageSize).Select(b => _services.ContentManager.BuildDisplay(b, "Summary.BlogPost"));
-            var model = _services.ContentManager.BuildDisplay(blog, "Blog");
+
+            var list = Shape.List();
+            list.AddRange(blogPosts);
+
+            var model = new DisplayBlogViewModel {
+                BlogPostList = list,
+                BlogPart = blog,
+                Page = page,
+                PageSize = pageSize
+            };
+
             return View(model);
+
         }
 
         public ActionResult LiveWriterManifest(string blogSlug) {

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

@@ -107,6 +107,7 @@
     <Compile Include="Services\IBlogService.cs" />
     <Compile Include="Services\XmlRpcHandler.cs" />
     <Compile Include="ViewModels\BlogPostArchiveViewModel.cs" />
+    <Compile Include="ViewModels\DisplayBlogViewModel.cs" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Content\Admin\images\draft.gif" />
@@ -118,6 +119,7 @@
     <Content Include="Scripts\archives.js" />
     <Content Include="Styles\admin.css" />
     <Content Include="Styles\archives.css" />
+    <Content Include="Styles\pagination.css" />
     <Content Include="Views\BlogAdmin\Create.cshtml" />
     <Content Include="Views\BlogAdmin\Edit.cshtml" />
     <Content Include="Views\BlogAdmin\Item.cshtml" />
@@ -131,7 +133,6 @@
     <Content Include="Views\Parts\Blogs.Blog.Manage.cshtml" />
     <Content Include="Views\Parts\Blogs.Blog.Description.cshtml" />
     <Content Include="Views\Parts\Common.Metadata.Admin.Blog.cshtml" />
-    <Content Include="Views\Parts\Blogs.BlogPost.List.cshtml" />
     <Content Include="Views\EditorTemplates\Parts\Blogs.Blog.Fields.cshtml" />
     <Content Include="Views\Parts\Blogs.BlogPost.List.Admin.cshtml">
       <SubType>Code</SubType>
@@ -190,6 +191,7 @@
     <None Include="Views\DisplayTemplates\Parts\Blogs.BlogArchives.cshtml" />
     <None Include="Views\EditorTemplates\Parts\Blogs.RecentBlogPosts.cshtml" />
     <None Include="Views\EditorTemplates\Parts\Blogs.BlogArchives.cshtml" />
+    <None Include="Views\Parts\Blogs.BlogPost.List.cshtml" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />

src/Orchard.Web/Modules/Orchard.Blogs/Routes.cs

@@ -259,6 +259,24 @@ namespace Orchard.Blogs {
                                                     Priority = 11,
                                                     Route = new Route(
                                                          "{blogSlug}",
+                                                         new RouteValueDictionary {
+                                                                                      {"area", "Orchard.Blogs"},
+                                                                                      {"controller", "Blog"},
+                                                                                      {"action", "Item"},
+                                                                                      {"page", 1}
+                                                                                  },
+                                                         new RouteValueDictionary {
+                                                                                      {"blogSlug", _blogSlugConstraint}
+                                                                                  },
+                                                         new RouteValueDictionary {
+                                                                                      {"area", "Orchard.Blogs"}
+                                                                                  },
+                                                         new MvcRouteHandler())
+                                                 },
+                             new RouteDescriptor {
+                                                    Priority = 11,
+                                                    Route = new Route(
+                                                         "{blogSlug}/Page/{*page}",
                                                          new RouteValueDictionary {
                                                                                       {"area", "Orchard.Blogs"},
                                                                                       {"controller", "Blog"},

src/Orchard.Web/Modules/Orchard.Blogs/Services/BlogPostService.cs

@@ -49,6 +49,11 @@ namespace Orchard.Blogs.Services {
             return GetBlogQuery(blogPart, versionOptions).List().Select(ci => ci.As<BlogPostPart>());
         }
 
+
+        public IEnumerable<BlogPostPart> Get(BlogPart blogPart, int skip, int count) {
+            return GetBlogQuery(blogPart, VersionOptions.Published).Slice(skip, count).ToList().Select(ci => ci.As<BlogPostPart>());
+        }
+
         public IEnumerable<BlogPostPart> Get(BlogPart blogPart, ArchiveData archiveData) {
             var query = GetBlogQuery(blogPart, VersionOptions.Published);
 

src/Orchard.Web/Modules/Orchard.Blogs/Services/IBlogPostService.cs

@@ -12,6 +12,7 @@ namespace Orchard.Blogs.Services {
         IEnumerable<BlogPostPart> Get(BlogPart blogPart);
         IEnumerable<BlogPostPart> Get(BlogPart blogPart, VersionOptions versionOptions);
         IEnumerable<BlogPostPart> Get(BlogPart blogPart, ArchiveData archiveData);
+        IEnumerable<BlogPostPart> Get(BlogPart blogPart, int skip, int count);
         IEnumerable<KeyValuePair<ArchiveData, int>> GetArchives(BlogPart blogPart);
         void Delete(BlogPostPart blogPostPart);
         void Publish(BlogPostPart blogPostPart);

src/Orchard.Web/Modules/Orchard.Blogs/Styles/pagination.css

@@ -0,0 +1,19 @@
+ul.pagination
+{
+    list-style-type:none;
+}
+
+ul.pagination li a
+{
+    font-size:13px;
+}
+
+ul.pagination li.newer 
+{
+    float:left;
+}
+
+ul.pagination li.older
+{
+    float:right;
+}

src/Orchard.Web/Modules/Orchard.Blogs/ViewModels/DisplayBlogViewModel.cs

@@ -0,0 +1,10 @@
+using Orchard.Blogs.Models;
+
+namespace Orchard.Blogs.ViewModels {
+    public class DisplayBlogViewModel {
+        public BlogPart BlogPart { get; set; }
+        public dynamic BlogPostList { get; set; }
+        public int Page { get; set; }
+        public int PageSize { get; set; }
+    }
+}

src/Orchard.Web/Modules/Orchard.Blogs/Views/Blog/Item.cshtml

@@ -1 +1,28 @@
-@Display(Model)
+@model Orchard.Blogs.ViewModels.DisplayBlogViewModel
+@using Orchard.Blogs.Extensions;
+
+@{
+    Style.Include("pagination.css");
+}
+
+@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.BlogPart.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.BlogPart.Slug, page = Model.Page - 1 })
+        </li>
+    }
+    </ul>
+}
+else {
+    <p>@T("There are no posts for this blog.")</p>
+}
+

src/Orchard.Web/Modules/Orchard.Search/Controllers/SearchController.cs

@@ -54,7 +54,7 @@ namespace Orchard.Search.Controllers {
 
             var searchViewModel = new SearchViewModel {
                 Query = q,
-                DefaultPageSize = 10, // <- yeah, I know :|
+                DefaultPageSize = 10, // TODO: sebastien <- yeah, I know :|
                 PageOfResults = pageOfItems
             };
 

src/Orchard.Web/Modules/Orchard.Search/Migrations.cs

@@ -24,7 +24,7 @@ namespace Orchard.Search {
                     .WithSetting("Stereotype", "Widget")
                 );
 
-            return 5;
+            return 2;
         }
     }
 }

src/Orchard.Web/Modules/Orchard.Search/Models/SearchFormPart.cs

@@ -2,7 +2,7 @@
 
 namespace Orchard.Search.Models {
     /// <summary>
-    /// Cotnent part for the search form widget
+    /// Content part for the search form widget
     /// </summary>
     public class SearchFormPart : ContentPart {
     }

src/Orchard.Web/Modules/Orchard.Setup/Controllers/SetupController.cs

@@ -81,6 +81,13 @@ namespace Orchard.Setup.Controllers {
                 ModelState.AddModelError("ConfirmPassword", T("Password confirmation must match").ToString());
             }
 
+            if(!model.DatabaseOptions && !String.IsNullOrWhiteSpace(model.DatabaseTablePrefix)) {
+                model.DatabaseTablePrefix = model.DatabaseTablePrefix.Trim();
+                if(!Char.IsLetter(model.DatabaseTablePrefix[0])) {
+                    ModelState.AddModelError("DatabaseTablePrefix", T("The table prefix must begin with a letter").Text);
+                }
+            }
+
             ValidateMachineKey();
 
             if (!ModelState.IsValid) {

src/Orchard.Web/Modules/Orchard.Users/Orchard.Users.csproj

@@ -118,6 +118,11 @@
       <Name>Orchard.Framework</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Items\User.Editor.cshtml">
+      <SubType>Designer</SubType>
+    </Content>
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

src/Orchard.Web/Modules/Orchard.Users/Views/Items/User.Editor.cshtml

@@ -0,0 +1,8 @@
+<div class="sections">
+    <div class="primary">
+      @Display(Model.Primary)
+    </div>
+    <div class="secondary">
+        @Display(Model.Secondary)
+    </div>
+</div>

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

@@ -106,7 +106,7 @@ namespace Orchard.Widgets.Controllers {
             }
             catch (Exception exception) {
                 Services.Notifier.Error(T("Creating widget failed: {0}", exception.Message));
-                return RedirectToAction("Index");
+                return RedirectToAction("Index", "Admin", new { id = layerId });
             }
         }
 
@@ -128,12 +128,12 @@ namespace Orchard.Widgets.Controllers {
                 }
 
                 Services.Notifier.Information(T("Your {0} has been created.", widgetPart.TypeDefinition.DisplayName));
-                return RedirectToAction("Index");
             }
             catch (Exception exception) {
                 Services.Notifier.Error(T("Creating widget failed: {0}", exception.Message));
-                return RedirectToAction("Index");
             }
+
+            return RedirectToAction("Index", "Admin", new { id = layerId });
         }
 
         public ActionResult AddLayer() {
@@ -171,7 +171,7 @@ namespace Orchard.Widgets.Controllers {
                 }
 
                 Services.Notifier.Information(T("Your {0} has been created.", layerPart.TypeDefinition.DisplayName));
-                return RedirectToAction("Index");
+                return RedirectToAction("Index", "Admin", new { id = layerPart.Id });
             }
             catch (Exception exception) {
                 Services.Notifier.Error(T("Creating layer failed: {0}", exception.Message));
@@ -194,7 +194,7 @@ namespace Orchard.Widgets.Controllers {
             }
             catch (Exception exception) {
                 Services.Notifier.Error(T("Editing layer failed: {0}", exception.Message));
-                return RedirectToAction("Index");
+                return RedirectToAction("Index", "Admin", new { id });
             }
         }
 
@@ -216,12 +216,12 @@ namespace Orchard.Widgets.Controllers {
                 }
 
                 Services.Notifier.Information(T("Your {0} has been saved.", layerPart.TypeDefinition.DisplayName));
-                return RedirectToAction("Index");
             }
             catch (Exception exception) {
                 Services.Notifier.Error(T("Editing layer failed: {0}", exception.Message));
-                return RedirectToAction("Index");
             }
+
+            return RedirectToAction("Index", "Admin", new { id });
         }
 
         [HttpPost, ActionName("EditLayer")]
@@ -238,15 +238,16 @@ namespace Orchard.Widgets.Controllers {
                 Services.Notifier.Error(T("Removing Layer failed: {0}", exception.Message));
             }
 
-            return RedirectToAction("Index");
+            return RedirectToAction("Index", "Admin", new { id });
         }
 
         public ActionResult EditWidget(int id) {
             if (!Services.Authorizer.Authorize(Permissions.ManageWidgets, T(NotAuthorizedManageWidgetsLabel)))
                 return new HttpUnauthorizedResult();
 
+            WidgetPart widgetPart = null;
             try {
-                WidgetPart widgetPart = _widgetsService.GetWidget(id);
+                widgetPart = _widgetsService.GetWidget(id);
                 if (widgetPart == null) {
                     Services.Notifier.Error(T("Widget not found: {1}", id));
                     return RedirectToAction("Index");
@@ -257,6 +258,10 @@ namespace Orchard.Widgets.Controllers {
             }
             catch (Exception exception) {
                 Services.Notifier.Error(T("Editing widget failed: {0}", exception.Message));
+
+                if (widgetPart != null)
+                    return RedirectToAction("Index", "Admin", new { id = widgetPart.LayerPart.Id });
+
                 return RedirectToAction("Index");
             }
         }
@@ -267,8 +272,9 @@ namespace Orchard.Widgets.Controllers {
             if (!Services.Authorizer.Authorize(Permissions.ManageWidgets, T(NotAuthorizedManageWidgetsLabel)))
                 return new HttpUnauthorizedResult();
 
+            WidgetPart widgetPart = null;
             try {
-                WidgetPart widgetPart = _widgetsService.GetWidget(id);
+                widgetPart = _widgetsService.GetWidget(id);
                 if (widgetPart == null)
                     return new NotFoundResult();
 
@@ -279,12 +285,14 @@ namespace Orchard.Widgets.Controllers {
                 }
 
                 Services.Notifier.Information(T("Your {0} has been saved.", widgetPart.TypeDefinition.DisplayName));
-                return RedirectToAction("Index");
             }
             catch (Exception exception) {
                 Services.Notifier.Error(T("Editing widget failed: {0}", exception.Message));
-                return RedirectToAction("Index");
             }
+
+            return widgetPart != null ?
+                RedirectToAction("Index", "Admin", new { id = widgetPart.LayerPart.Id }) :
+                RedirectToAction("Index");
         }
 
         [HttpPost, ActionName("EditWidget")]
@@ -293,15 +301,22 @@ namespace Orchard.Widgets.Controllers {
             if (!Services.Authorizer.Authorize(Permissions.ManageWidgets, T(NotAuthorizedManageWidgetsLabel)))
                 return new HttpUnauthorizedResult();
 
+            WidgetPart widgetPart = null;
             try {
-                _widgetsService.DeleteWidget(id);
+                widgetPart = _widgetsService.GetWidget(id);
+                if (widgetPart == null)
+                    return new NotFoundResult();
+
+                _widgetsService.DeleteWidget(widgetPart.Id);
                 Services.Notifier.Information(T("Widget was successfully deleted"));
             } 
             catch (Exception exception) {
                 Services.Notifier.Error(T("Removing Widget failed: {0}", exception.Message));
             }
 
-            return RedirectToAction("Index");
+            return widgetPart != null ?
+                RedirectToAction("Index", "Admin", new { id = widgetPart.LayerPart.Id }) : 
+                RedirectToAction("Index");
         }
 
         bool IUpdateModel.TryUpdateModel<TModel>(TModel model, string prefix, string[] includeProperties, string[] excludeProperties) {

src/Orchard.Web/Modules/Orchard.jQuery/ResourceManifest.cs

@@ -9,7 +9,7 @@ namespace Orchard.UI.Resources {
             manifest.DefineScript("jQueryUI_Core").SetUrl("jquery.ui.core.js").SetVersion("1.8b1").SetDependencies("jQuery");
             manifest.DefineScript("jQueryUI_Widget").SetUrl("jquery.ui.widget.js").SetVersion("1.8b1").SetDependencies("jQuery");
             manifest.DefineScript("jQueryUI_DatePicker").SetUrl("jquery.ui.datepicker.js").SetVersion("1.8b1").SetDependencies("jQueryUI_Core", "jQueryUI_Widget");
-            manifest.DefineScript("jQueryUtils_TimePicker").SetUrl("ui.timepickr.js").SetVersion("0.7.0a").SetDependencies("jQueryUtils", "jQueryUI_Core");
+            manifest.DefineScript("jQueryUtils_TimePicker").SetUrl("ui.timepickr.js").SetVersion("0.7.0a").SetDependencies("jQueryUtils", "jQueryUI_Core", "jQueryUI_Widget");
 
             manifest.DefineStyle("jQueryUtils_TimePicker").SetUrl("ui.timepickr.css");
             manifest.DefineStyle("jQueryUI_Orchard").SetUrl("jquery-ui-1.7.2.custom.css").SetVersion("1.7.2");