From ead7d07b0f7699cbbe6a616037f9da9be47cd769 Mon Sep 17 00:00:00 2001
From: Dave Reed <dareed@microsoft.com>
Date: Thu, 9 Dec 2010 13:49:04 -0800
Subject: [PATCH 01/25] Fix typo

--HG--
branch : dev
---
 .../Environment/Extensions/ExtensionLoaderCoordinator.cs        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Orchard/Environment/Extensions/ExtensionLoaderCoordinator.cs b/src/Orchard/Environment/Extensions/ExtensionLoaderCoordinator.cs
index 1b9bbb979..138ca86a4 100644
--- a/src/Orchard/Environment/Extensions/ExtensionLoaderCoordinator.cs
+++ b/src/Orchard/Environment/Extensions/ExtensionLoaderCoordinator.cs
@@ -165,7 +165,7 @@ namespace Orchard.Environment.Extensions {
                 foreach(var dup in duplicates) {
                     sb.Append(T("Extension '{0}' has been found from the following locations: {1}.\r\n", dup.Key, string.Join(", ", dup.Select(e => e.Location + "/" + e.Id))));
                 }
-                sb.Append(T("This issue can be usually by solved by removing or renamig the conflicting extension."));
+                sb.Append(T("This issue can be usually by solved by removing or renaming the conflicting extension."));
                 Logger.Error(sb.ToString());
                 throw new OrchardException(new LocalizedString(sb.ToString()));
             }

From 7469d2d0b14370cf9a2722076c91a9249cbe2e91 Mon Sep 17 00:00:00 2001
From: Suha Can <suhacan@microsoft.com>
Date: Thu, 9 Dec 2010 14:22:58 -0800
Subject: [PATCH 02/25] 16992 Content Types admin not ordered alphabetically

--HG--
branch : dev
---
 .../Orchard.ContentTypes/Services/ContentDefinitionService.cs   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Services/ContentDefinitionService.cs b/src/Orchard.Web/Modules/Orchard.ContentTypes/Services/ContentDefinitionService.cs
index 6fdb834a1..dcf88ab96 100644
--- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Services/ContentDefinitionService.cs
+++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Services/ContentDefinitionService.cs
@@ -36,7 +36,7 @@ namespace Orchard.ContentTypes.Services {
         public Localizer T { get; set; }
 
         public IEnumerable<EditTypeViewModel> GetTypes() {
-            return _contentDefinitionManager.ListTypeDefinitions().Select(ctd => new EditTypeViewModel(ctd));
+            return _contentDefinitionManager.ListTypeDefinitions().Select(ctd => new EditTypeViewModel(ctd)).OrderBy(m => m.DisplayName);
         }
 
         public EditTypeViewModel GetType(string name) {

From d9cbc9925990abac86e8f61560616faac67a722f Mon Sep 17 00:00:00 2001
From: Jonathan Wall <none@none>
Date: Thu, 9 Dec 2010 14:36:09 -0800
Subject: [PATCH 03/25] Removed gray box that contained the save button. Work
 Item: 16999

--HG--
branch : dev
---
 src/Orchard.Web/Themes/TheAdmin/Styles/site.css | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css
index 730fb88c6..17e499f67 100644
--- a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css
+++ b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css
@@ -859,21 +859,6 @@ table.items th, table.items td {
 }
 /* Core Contents and Orchard.PublishLater */
 
-
-.edit-item-sidebar 
-{
-    border:1px solid #d3d3d3;
-    padding:8px;
-    
-    /*CSS3 properties*/
-        filter:progid:DXImageTransform.Microsoft.Gradient(GradientType=0, startColorstr='#f7f7f7', endColorstr='#f5f5f5');
-        background: -webkit-gradient(linear, 0 0, 0 100%, from(#f7f7f7), to(#f5f5f5));
-        background: -moz-linear-gradient(top, #f7f7f7, #f5f5f5);
-        border-radius: 3px;
-        -webkit-border-radius: 3px;
-        -moz-border-radius: 3px;
-}
-
 .edit-item-sidebar fieldset {
     margin:0;
     padding:0;

From 0042b49dd7a5b8f031f5cb1b12e5938a6ca8f7e0 Mon Sep 17 00:00:00 2001
From: Nathan Heskew <nathan.heskew@microsoft.com>
Date: Thu, 9 Dec 2010 14:54:27 -0800
Subject: [PATCH 04/25] Moving the widget and layer delete button into its own
 (placed) template to drop it in by the save button

--HG--
branch : dev
---
 .../Modules/Orchard.Widgets/Drivers/LayerPartDriver.cs    | 8 ++++++--
 .../Modules/Orchard.Widgets/Drivers/WidgetPartDriver.cs   | 8 ++++++--
 .../Modules/Orchard.Widgets/Orchard.Widgets.csproj        | 3 +++
 src/Orchard.Web/Modules/Orchard.Widgets/Placement.info    | 1 +
 .../Modules/Orchard.Widgets/Views/Admin/EditLayer.cshtml  | 4 ----
 .../Modules/Orchard.Widgets/Views/Admin/EditWidget.cshtml | 4 ----
 .../Orchard.Widgets/Views/Widget.DeleteButton.cshtml      | 3 +++
 7 files changed, 19 insertions(+), 12 deletions(-)
 create mode 100644 src/Orchard.Web/Modules/Orchard.Widgets/Views/Widget.DeleteButton.cshtml

diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Drivers/LayerPartDriver.cs b/src/Orchard.Web/Modules/Orchard.Widgets/Drivers/LayerPartDriver.cs
index 9267afece..f70c0e384 100644
--- a/src/Orchard.Web/Modules/Orchard.Widgets/Drivers/LayerPartDriver.cs
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Drivers/LayerPartDriver.cs
@@ -27,8 +27,12 @@ namespace Orchard.Widgets.Drivers {
         public Localizer T { get; set; }
 
         protected override DriverResult Editor(LayerPart layerPart, dynamic shapeHelper) {
-            return ContentShape("Parts_Widgets_LayerPart",
-                () => shapeHelper.EditorTemplate(TemplateName: "Parts.Widgets.LayerPart", Model: layerPart, Prefix: Prefix));
+            return Combined(
+                ContentShape("Parts_Widgets_LayerPart",
+                    () => shapeHelper.EditorTemplate(TemplateName: "Parts.Widgets.LayerPart", Model: layerPart, Prefix: Prefix)),
+                ContentShape("Widget_DeleteButton",
+                    deleteButton => deleteButton)
+                );
         }
 
         protected override DriverResult Editor(LayerPart layerPart, IUpdateModel updater, dynamic shapeHelper) {
diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Drivers/WidgetPartDriver.cs b/src/Orchard.Web/Modules/Orchard.Widgets/Drivers/WidgetPartDriver.cs
index 0448be887..7cb52d329 100644
--- a/src/Orchard.Web/Modules/Orchard.Widgets/Drivers/WidgetPartDriver.cs
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Drivers/WidgetPartDriver.cs
@@ -18,8 +18,12 @@ namespace Orchard.Widgets.Drivers {
             widgetPart.AvailableZones = _widgetsService.GetZones();
             widgetPart.AvailableLayers = _widgetsService.GetLayers();
 
-            return ContentShape("Parts_Widgets_WidgetPart",
-                () => shapeHelper.EditorTemplate(TemplateName: "Parts.Widgets.WidgetPart", Model: widgetPart, Prefix: Prefix));
+            return Combined(
+                ContentShape("Parts_Widgets_WidgetPart",
+                    () => shapeHelper.EditorTemplate(TemplateName: "Parts.Widgets.WidgetPart", Model: widgetPart, Prefix: Prefix)),
+                ContentShape("Widget_DeleteButton",
+                    deleteButton => deleteButton)
+                );
         }
 
         protected override DriverResult Editor(WidgetPart widgetPart, IUpdateModel updater, dynamic shapeHelper) {
diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Orchard.Widgets.csproj b/src/Orchard.Web/Modules/Orchard.Widgets/Orchard.Widgets.csproj
index d5d1068cc..354226b77 100644
--- a/src/Orchard.Web/Modules/Orchard.Widgets/Orchard.Widgets.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Orchard.Widgets.csproj
@@ -130,6 +130,9 @@
     <Content Include="Views\EditorTemplates\Parts.Widgets.LayerPart.cshtml" />
     <Content Include="Views\EditorTemplates\Parts.Widgets.WidgetPart.cshtml" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="Views\Widget.DeleteButton.cshtml" />
+  </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. 
diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Placement.info b/src/Orchard.Web/Modules/Orchard.Widgets/Placement.info
index 9ab08b4dd..c7ef9f44b 100644
--- a/src/Orchard.Web/Modules/Orchard.Widgets/Placement.info
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Placement.info
@@ -1,4 +1,5 @@
 <Placement>
+    <Place Widget_DeleteButton="Sidebar:25"/>
     <Place Parts_Widgets_LayerPart="Content:1"/>
     <Place Parts_Widgets_WidgetPart="Content:1"/>
     <Place Parts_Widgets_WidegetBagPart="Content:5"/>
diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Views/Admin/EditLayer.cshtml b/src/Orchard.Web/Modules/Orchard.Widgets/Views/Admin/EditLayer.cshtml
index d5292641b..95f9d7da5 100644
--- a/src/Orchard.Web/Modules/Orchard.Widgets/Views/Admin/EditLayer.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Views/Admin/EditLayer.cshtml
@@ -2,8 +2,4 @@
     @using (Html.BeginFormAntiForgeryPost()) {
     @Html.ValidationSummary()
     @Display(Model)
-
-    <fieldset>
-        <button type="submit" name="submit.Delete" value="@T("Delete")">@T("Delete")</button>
-    </fieldset>
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Views/Admin/EditWidget.cshtml b/src/Orchard.Web/Modules/Orchard.Widgets/Views/Admin/EditWidget.cshtml
index c94adb991..ddb5ce9c9 100644
--- a/src/Orchard.Web/Modules/Orchard.Widgets/Views/Admin/EditWidget.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Views/Admin/EditWidget.cshtml
@@ -2,8 +2,4 @@
     @using (Html.BeginFormAntiForgeryPost()) {
     @Html.ValidationSummary()
     @Display(Model)
-
-    <fieldset>
-        <button type="submit" name="submit.Delete" value="@T("Delete")">@T("Delete")</button>
-    </fieldset>
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Views/Widget.DeleteButton.cshtml b/src/Orchard.Web/Modules/Orchard.Widgets/Views/Widget.DeleteButton.cshtml
new file mode 100644
index 000000000..791c01106
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Views/Widget.DeleteButton.cshtml
@@ -0,0 +1,3 @@
+<fieldset class="delete-button">
+    <button type="submit" name="submit.Delete" value="@T("Delete")">@T("Delete")</button>
+</fieldset>
\ No newline at end of file

From 9d61b3d09002e2377a2680be734a091f0803e89b Mon Sep 17 00:00:00 2001
From: Jonathan Wall <none@none>
Date: Thu, 9 Dec 2010 15:06:56 -0800
Subject: [PATCH 05/25] Added back line separators between lists of content
 items in the admin. Work item: 16996

--HG--
branch : dev
---
 .../Orchard.ContentTypes/Styles/orchard-contenttypes-admin.css   | 1 +
 src/Orchard.Web/Themes/TheAdmin/Styles/site.css                  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Styles/orchard-contenttypes-admin.css b/src/Orchard.Web/Modules/Orchard.ContentTypes/Styles/orchard-contenttypes-admin.css
index c4c3f0c7d..235b2adaa 100644
--- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Styles/orchard-contenttypes-admin.css
+++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Styles/orchard-contenttypes-admin.css
@@ -1,5 +1,6 @@
 .orchard-contenttypes #main h2 {
     margin:1.5em 0 0;
+    border-bottom:1px solid #ccc;
 }
 
 #main .properties p {
diff --git a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css
index 17e499f67..871f59a38 100644
--- a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css
+++ b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css
@@ -748,6 +748,7 @@ table.items th, table.items td {
     margin:0;
     overflow:hidden;
     padding:0 1.4em .8em;
+    border-bottom:1px solid #eaeaea;
 }
 .contentItems li.last {
     border-bottom:none;

From d025d9232ddc2474e240921e5266fd2f9186929c Mon Sep 17 00:00:00 2001
From: Jonathan Wall <none@none>
Date: Thu, 9 Dec 2010 15:20:13 -0800
Subject: [PATCH 06/25] Added CSS so delete button renders next to the save
 button.

--HG--
branch : dev
---
 src/Orchard.Web/Themes/TheAdmin/Styles/site.css | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css
index 871f59a38..1f8290f8e 100644
--- a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css
+++ b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css
@@ -865,18 +865,17 @@ table.items th, table.items td {
     padding:0;
 }
 
-fieldset.publish-button {
+fieldset.publish-button, fieldset.delete-button, fieldset.save-button { 
     clear:none;
     float:left;
+}
+fieldset.publish-button {
     margin: 0 12px;
     padding: 0 12px;
     border-left:1px solid #ccc;
 }
-fieldset.save-button {
-    clear:none;
-    float:left;
-    padding-right:0;
-    width:auto;
+fieldset.delete-button {
+    margin: 0 0 0 12px;
 }
 fieldset.publish-later-datetime {
     float:left;

From c88c13c2e14522a64e6f693321b321fbcbb211fc Mon Sep 17 00:00:00 2001
From: Nathan Heskew <nathan.heskew@microsoft.com>
Date: Thu, 9 Dec 2010 15:29:07 -0800
Subject: [PATCH 07/25] Adding pagination to the tag search page.

work item: 16924

--HG--
branch : dev
---
 .../Controllers/HomeController.cs             | 16 ++++++++------
 .../Orchard.Tags/Services/ITagService.cs      |  4 ++++
 .../Orchard.Tags/Services/TagService.cs       | 21 +++++++++++++++++++
 .../ViewModels/TagsSearchViewModel.cs         |  1 +
 .../Orchard.Tags/Views/Home/Search.cshtml     |  3 +--
 5 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/src/Orchard.Web/Modules/Orchard.Tags/Controllers/HomeController.cs b/src/Orchard.Web/Modules/Orchard.Tags/Controllers/HomeController.cs
index 1e6bbb33d..abfbdfbeb 100644
--- a/src/Orchard.Web/Modules/Orchard.Tags/Controllers/HomeController.cs
+++ b/src/Orchard.Web/Modules/Orchard.Tags/Controllers/HomeController.cs
@@ -7,6 +7,7 @@ using Orchard.Logging;
 using Orchard.Tags.Services;
 using Orchard.Tags.ViewModels;
 using Orchard.Themes;
+using Orchard.UI.Navigation;
 
 namespace Orchard.Tags.Controllers {
     [ValidateInput(false), Themed]
@@ -34,21 +35,24 @@ namespace Orchard.Tags.Controllers {
             return View(model);
         }
 
-        public ActionResult Search(string tagName) {
+        public ActionResult Search(string tagName, Pager pager) {
             var tag = _tagService.GetTagByName(tagName);
 
             if (tag == null) {
                 return RedirectToAction("Index");
             }
 
-            var list = _shapeFactory.List();
-            foreach (var taggedContentItem in _tagService.GetTaggedContentItems(tag.Id)) {
-                list.Add(_contentManager.BuildDisplay(taggedContentItem, "Summary"));
-            }
+            var taggedItems = _tagService.GetTaggedContentItems(tag.Id, pager.GetStartIndex(), pager.PageSize)
+                .Select(item => _contentManager.BuildDisplay(item, "Summary"));
 
+            var list = _shapeFactory.List();
+            list.AddRange(taggedItems);
+
+            var totalItemCount = _tagService.GetTaggedContentItemCount(tag.Id);
             var viewModel = new TagsSearchViewModel {
                 TagName = tag.TagName,
-                List = list
+                List = list,
+                Pager = _shapeFactory.Pager(pager).TotalItemCount(totalItemCount)
             };
 
             return View(viewModel);
diff --git a/src/Orchard.Web/Modules/Orchard.Tags/Services/ITagService.cs b/src/Orchard.Web/Modules/Orchard.Tags/Services/ITagService.cs
index 5aa2e455d..10208db39 100644
--- a/src/Orchard.Web/Modules/Orchard.Tags/Services/ITagService.cs
+++ b/src/Orchard.Web/Modules/Orchard.Tags/Services/ITagService.cs
@@ -9,6 +9,10 @@ namespace Orchard.Tags.Services {
         TagRecord GetTagByName(string tagName);
         IEnumerable<IContent> GetTaggedContentItems(int tagId);
         IEnumerable<IContent> GetTaggedContentItems(int tagId, VersionOptions options);
+        IEnumerable<IContent> GetTaggedContentItems(int tagId, int skip, int count);
+        IEnumerable<IContent> GetTaggedContentItems(int tagId, int skip, int count, VersionOptions versionOptions);
+        int GetTaggedContentItemCount(int tagId);
+        int GetTaggedContentItemCount(int tagId, VersionOptions versionOptions);
 
         TagRecord CreateTag(string tagName);
 
diff --git a/src/Orchard.Web/Modules/Orchard.Tags/Services/TagService.cs b/src/Orchard.Web/Modules/Orchard.Tags/Services/TagService.cs
index 53f91f57d..b78a1e1b8 100644
--- a/src/Orchard.Web/Modules/Orchard.Tags/Services/TagService.cs
+++ b/src/Orchard.Web/Modules/Orchard.Tags/Services/TagService.cs
@@ -119,6 +119,27 @@ namespace Orchard.Tags.Services {
                 .Where(c => c != null);
         }
 
+        public IEnumerable<IContent> GetTaggedContentItems(int tagId, int skip, int take) {
+            return GetTaggedContentItems(tagId, skip, take, VersionOptions.Published);
+        }
+
+        public IEnumerable<IContent> GetTaggedContentItems(int tagId, int skip, int take, VersionOptions options) {
+            return _contentTagRepository
+                .Fetch(x => x.TagRecord.Id == tagId)
+                .Skip(skip)
+                .Take(take)
+                .Select(t => _orchardServices.ContentManager.Get(t.TagsPartRecord.Id, options))
+                .Where(c => c != null);
+        }
+
+        public int GetTaggedContentItemCount(int tagId) {
+            return GetTaggedContentItemCount(tagId, VersionOptions.Published);
+        }
+
+        public int GetTaggedContentItemCount(int tagId, VersionOptions options) {
+            return GetTaggedContentItems(tagId, options).Count();
+        }
+
         private void TagContentItem(TagsPartRecord tagsPartRecord, string tagName) {
             var tagRecord = GetTagByName(tagName);
             var tagsContentItems = new ContentTagRecord { TagsPartRecord = tagsPartRecord, TagRecord = tagRecord };
diff --git a/src/Orchard.Web/Modules/Orchard.Tags/ViewModels/TagsSearchViewModel.cs b/src/Orchard.Web/Modules/Orchard.Tags/ViewModels/TagsSearchViewModel.cs
index 13b91c9c4..043b684f5 100644
--- a/src/Orchard.Web/Modules/Orchard.Tags/ViewModels/TagsSearchViewModel.cs
+++ b/src/Orchard.Web/Modules/Orchard.Tags/ViewModels/TagsSearchViewModel.cs
@@ -2,5 +2,6 @@
     public class TagsSearchViewModel {
         public string TagName { get; set; }
         public dynamic List { get; set; }
+        public dynamic Pager { get; set; }
     }
 }
diff --git a/src/Orchard.Web/Modules/Orchard.Tags/Views/Home/Search.cshtml b/src/Orchard.Web/Modules/Orchard.Tags/Views/Home/Search.cshtml
index 5f12fa237..c26b89bb7 100644
--- a/src/Orchard.Web/Modules/Orchard.Tags/Views/Home/Search.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Tags/Views/Home/Search.cshtml
@@ -1,11 +1,10 @@
 @model Orchard.Tags.ViewModels.TagsSearchViewModel
-
 @{ 
     Html.AddTitleParts(T("Tags").ToString()); 
     Html.AddTitleParts(T("Contents tagged with {0}", Model.TagName).ToString());
     Model.List.Classes.Add("tagged-posts");
     Model.List.Classes.Add("content-items");
 }
-
 <h1 class="page-title">@T("Contents tagged with <span>{0}</span>", Model.TagName)</h1>
 @Display(Model.List)
+@Display(Model.Pager)
\ No newline at end of file

From ef5eea48fafb824ea5215372e58d43c0568cfa25 Mon Sep 17 00:00:00 2001
From: Sebastien Ros <none@none>
Date: Thu, 9 Dec 2010 15:47:25 -0800
Subject: [PATCH 08/25] Checking site ownership for all gallery actions

Work Item: 16978

--HG--
branch : dev
---
 .../Modules/Orchard.Packaging/AdminMenu.cs    | 10 ++++---
 .../Controllers/GalleryController.cs          | 27 ++++++++++++++++++-
 .../PackagingServicesController.cs            | 26 +++++++++++++++++-
 3 files changed, 58 insertions(+), 5 deletions(-)

diff --git a/src/Orchard.Web/Modules/Orchard.Packaging/AdminMenu.cs b/src/Orchard.Web/Modules/Orchard.Packaging/AdminMenu.cs
index f34d93011..fbfe5565b 100644
--- a/src/Orchard.Web/Modules/Orchard.Packaging/AdminMenu.cs
+++ b/src/Orchard.Web/Modules/Orchard.Packaging/AdminMenu.cs
@@ -1,6 +1,7 @@
 using Orchard.Environment.Extensions;
 using Orchard.Localization;
 using Orchard.UI.Navigation;
+using Orchard.Security;
 
 namespace Orchard.Packaging {
     [OrchardFeature("Gallery")]
@@ -12,11 +13,14 @@ namespace Orchard.Packaging {
         public void GetNavigation(NavigationBuilder builder) {
             builder.Add(T("Gallery"), "30", menu => menu
                         .Add(T("Modules"), "1.0", item => item
-                             .Action("Modules", "Gallery", new { area = "Orchard.Packaging" }))
+                             .Action("Modules", "Gallery", new { area = "Orchard.Packaging" })
+                             .Permission(StandardPermissions.SiteOwner))
                         .Add(T("Themes"), "2.0", item => item
-                             .Action("Themes", "Gallery", new { area = "Orchard.Packaging" }))
+                             .Action("Themes", "Gallery", new { area = "Orchard.Packaging" })
+                             .Permission(StandardPermissions.SiteOwner))
                         .Add(T("Feeds"), "3.0", item => item
-                             .Action("Sources", "Gallery", new { area = "Orchard.Packaging" })));
+                             .Action("Sources", "Gallery", new { area = "Orchard.Packaging" })
+                             .Permission(StandardPermissions.SiteOwner)));
         }
     }
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Packaging/Controllers/GalleryController.cs b/src/Orchard.Web/Modules/Orchard.Packaging/Controllers/GalleryController.cs
index 57654a990..c07eecccf 100644
--- a/src/Orchard.Web/Modules/Orchard.Packaging/Controllers/GalleryController.cs
+++ b/src/Orchard.Web/Modules/Orchard.Packaging/Controllers/GalleryController.cs
@@ -9,6 +9,7 @@ using Orchard.Localization;
 using Orchard.Logging;
 using Orchard.Packaging.Services;
 using Orchard.Packaging.ViewModels;
+using Orchard.Security;
 using Orchard.Themes;
 using Orchard.UI.Admin;
 using Orchard.UI.Notify;
@@ -26,36 +27,51 @@ namespace Orchard.Packaging.Controllers {
         public GalleryController(
             IPackageManager packageManager,
             IPackagingSourceManager packagingSourceManager,
-            INotifier notifier) {
+            INotifier notifier,
+            IOrchardServices services) {
             _packageManager = packageManager;
             _packagingSourceManager = packagingSourceManager;
             _notifier = notifier;
+            Services = services;
 
             T = NullLocalizer.Instance;
             Logger = NullLogger.Instance;
         }
 
+        public IOrchardServices Services { get; set; }
         public Localizer T { get; set; }
         public ILogger Logger { get; set; }
 
         public ActionResult Sources() {
+            if (!Services.Authorizer.Authorize(StandardPermissions.SiteOwner, T("Not authorized to list sources")))
+                return new HttpUnauthorizedResult();
+
             return View(new PackagingSourcesViewModel {
                 Sources = _packagingSourceManager.GetSources(),
             });
         }
 
         public ActionResult Remove(int id) {
+            if (!Services.Authorizer.Authorize(StandardPermissions.SiteOwner, T("Not authorized to remove sources")))
+                return new HttpUnauthorizedResult();
+
             _packagingSourceManager.RemoveSource(id);
             _notifier.Information(T("The feed has been removed successfully."));
             return RedirectToAction("Sources");
         }
 
         public ActionResult AddSource() {
+            if (!Services.Authorizer.Authorize(StandardPermissions.SiteOwner, T("Not authorized to add sources")))
+                return new HttpUnauthorizedResult();
+
             return View(new PackagingAddSourceViewModel());
         }
 
         [HttpPost]
         public ActionResult AddSource(string url) {
+            if (!Services.Authorizer.Authorize(StandardPermissions.SiteOwner, T("Not authorized to add sources")))
+                return new HttpUnauthorizedResult();
+
             try {
                 if (!String.IsNullOrEmpty(url)) {
                     if (!url.StartsWith("http")) {
@@ -96,6 +112,9 @@ namespace Orchard.Packaging.Controllers {
         }
 
         public ActionResult Modules(int? sourceId) {
+            if (!Services.Authorizer.Authorize(StandardPermissions.SiteOwner, T("Not authorized to list modules")))
+                return new HttpUnauthorizedResult();
+
             var selectedSource = _packagingSourceManager.GetSources().Where(s => s.Id == sourceId).FirstOrDefault();
 
             var sources = selectedSource != null
@@ -123,6 +142,9 @@ namespace Orchard.Packaging.Controllers {
         }
 
         public ActionResult Themes(int? sourceId) {
+            if (!Services.Authorizer.Authorize(StandardPermissions.SiteOwner, T("Not authorized to list themes")))
+                return new HttpUnauthorizedResult();
+
             var selectedSource = _packagingSourceManager.GetSources().Where(s => s.Id == sourceId).FirstOrDefault();
 
             var sources = selectedSource != null
@@ -138,6 +160,9 @@ namespace Orchard.Packaging.Controllers {
         }
 
         public ActionResult Install(string packageId, string version, int sourceId, string redirectTo) {
+            if (!Services.Authorizer.Authorize(StandardPermissions.SiteOwner, T("Not authorized to install packages")))
+                return new HttpUnauthorizedResult();
+
             var source = _packagingSourceManager.GetSources().Where(s => s.Id == sourceId).FirstOrDefault();
 
             if (source == null) {
diff --git a/src/Orchard.Web/Modules/Orchard.Packaging/Controllers/PackagingServicesController.cs b/src/Orchard.Web/Modules/Orchard.Packaging/Controllers/PackagingServicesController.cs
index e51d385f1..08a5abb83 100644
--- a/src/Orchard.Web/Modules/Orchard.Packaging/Controllers/PackagingServicesController.cs
+++ b/src/Orchard.Web/Modules/Orchard.Packaging/Controllers/PackagingServicesController.cs
@@ -8,6 +8,7 @@ using Orchard.Environment.Extensions;
 using Orchard.FileSystems.AppData;
 using Orchard.Localization;
 using Orchard.Packaging.Services;
+using Orchard.Security;
 using Orchard.Themes;
 using Orchard.UI.Admin;
 using Orchard.UI.Notify;
@@ -25,7 +26,8 @@ namespace Orchard.Packaging.Controllers {
         public PackagingServicesController(
             IPackageManager packageManager,
             INotifier notifier,
-            IAppDataFolderRoot appDataFolderRoot) {
+            IAppDataFolderRoot appDataFolderRoot,
+            IOrchardServices services) {
             _packageManager = packageManager;
             _notifier = notifier;
             _appDataFolderRoot = appDataFolderRoot;
@@ -34,31 +36,50 @@ namespace Orchard.Packaging.Controllers {
         }
 
         public Localizer T { get; set; }
+        public IOrchardServices Services { get; set; }
 
         public ActionResult AddTheme(string returnUrl) {
+            if (!Services.Authorizer.Authorize(StandardPermissions.SiteOwner, T("Not authorized to add themes")))
+                return new HttpUnauthorizedResult();
+
             return View();
         }
 
         [HttpPost, ActionName("AddTheme")]
         public ActionResult AddThemePOST(string returnUrl) {
+            if (!Services.Authorizer.Authorize(StandardPermissions.SiteOwner, T("Not authorized to add themes")))
+                return new HttpUnauthorizedResult();
+
             return InstallPackage(returnUrl, Request.RawUrl);
         }
 
         [HttpPost, ActionName("RemoveTheme")]
         public ActionResult RemoveThemePOST(string themeId, string returnUrl, string retryUrl) {
+            if (!Services.Authorizer.Authorize(StandardPermissions.SiteOwner, T("Not authorized to remove themes")))
+                return new HttpUnauthorizedResult();
+
             return UninstallPackage(PackagingSourceManager.ThemesPrefix + themeId, returnUrl, retryUrl);
         }
 
         public ActionResult AddModule(string returnUrl) {
+            if (!Services.Authorizer.Authorize(StandardPermissions.SiteOwner, T("Not authorized to add modules")))
+                return new HttpUnauthorizedResult();
+
             return View();
         }
 
         [HttpPost, ActionName("AddModule")]
         public ActionResult AddModulePOST(string returnUrl) {
+            if (!Services.Authorizer.Authorize(StandardPermissions.SiteOwner, T("Not authorized to add modules")))
+                return new HttpUnauthorizedResult();
+
             return InstallPackage(returnUrl, Request.RawUrl);
         }
 
         public ActionResult InstallPackage(string returnUrl, string retryUrl) {
+            if (!Services.Authorizer.Authorize(StandardPermissions.SiteOwner, T("Not authorized to install packages")))
+                return new HttpUnauthorizedResult();
+
             try {
                 if (Request.Files != null &&
                     Request.Files.Count > 0 &&
@@ -90,6 +111,9 @@ namespace Orchard.Packaging.Controllers {
         }
 
         public ActionResult UninstallPackage(string id, string returnUrl, string retryUrl) {
+            if (!Services.Authorizer.Authorize(StandardPermissions.SiteOwner, T("Not authorized to uninstall packages")))
+                return new HttpUnauthorizedResult();
+
             try {
                 _packageManager.Uninstall(id, HostingEnvironment.MapPath("~/"));
 

From ef724fd6c3981de4dfac545a425cf7f50422b700 Mon Sep 17 00:00:00 2001
From: Sebastien Ros <none@none>
Date: Thu, 9 Dec 2010 15:49:19 -0800
Subject: [PATCH 09/25] Correcting SqlCe reference in Azure

--HG--
branch : dev
---
 src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj b/src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj
index 981db132f..4db91e723 100644
--- a/src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj
+++ b/src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj
@@ -75,8 +75,9 @@
     <Reference Include="System.Data.DataSetExtensions">
       <Private>False</Private>
     </Reference>
-    <Reference Include="System.Data.SqlServerCe, Version=3.5.1.0, PublicKeyToken=89845dcd8080cc91">
-      <Private>True</Private>
+    <Reference Include="System.Data.SqlServerCe, Version=3.5.1.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\lib\sqlce\System.Data.SqlServerCe.dll</HintPath>
     </Reference>
     <Reference Include="System.Web.ApplicationServices">
       <Private>False</Private>

From f26cb60a9e3efc80c4069b78369cdf19f1543e37 Mon Sep 17 00:00:00 2001
From: Sebastien Ros <none@none>
Date: Thu, 9 Dec 2010 15:49:32 -0800
Subject: [PATCH 10/25] Updating ShellSettingsManager for Azure

--HG--
branch : dev
---
 .../AzureShellSettingsManager.cs              | 51 +++++++++++--------
 1 file changed, 30 insertions(+), 21 deletions(-)

diff --git a/src/Orchard.Azure/Environment/Configuration/AzureShellSettingsManager.cs b/src/Orchard.Azure/Environment/Configuration/AzureShellSettingsManager.cs
index 5c5e33d98..524c02777 100644
--- a/src/Orchard.Azure/Environment/Configuration/AzureShellSettingsManager.cs
+++ b/src/Orchard.Azure/Environment/Configuration/AzureShellSettingsManager.cs
@@ -83,32 +83,27 @@ namespace Orchard.Azure.Environment.Configuration {
             }
         }
 
-        class Content {
-            public string Name { get; set; }
-            public string DataProvider { get; set; }
-            public string DataConnectionString { get; set; }
-            public string DataPrefix { get; set; }
-            public string RequestUrlHost { get; set; }
-            public string RequestUrlPrefix { get; set; }
-            public string State { get; set; }
-        }
-
-        static ShellSettings ParseSettings(string text) {
+        static ShellSettings ParseSettings(string text)
+        {
             var shellSettings = new ShellSettings();
-            if ( String.IsNullOrEmpty(text) )
+            if (String.IsNullOrEmpty(text))
                 return shellSettings;
 
             string[] settings = text.Split(new[] { "\r\n" }, StringSplitOptions.RemoveEmptyEntries);
-            foreach ( var setting in settings ) {
+            foreach (var setting in settings)
+            {
                 string[] settingFields = setting.Split(new[] { ":" }, StringSplitOptions.RemoveEmptyEntries);
                 int fieldsLength = settingFields.Length;
-                if ( fieldsLength != 2 )
+                if (fieldsLength != 2)
                     continue;
-                for ( int i = 0; i < fieldsLength; i++ ) {
+                for (int i = 0; i < fieldsLength; i++)
+                {
                     settingFields[i] = settingFields[i].Trim();
                 }
-                if ( settingFields[1] != "null" ) {
-                    switch ( settingFields[0] ) {
+                if (settingFields[1] != "null")
+                {
+                    switch (settingFields[0])
+                    {
                         case "Name":
                             shellSettings.Name = settingFields[1];
                             break;
@@ -130,24 +125,38 @@ namespace Orchard.Azure.Environment.Configuration {
                         case "RequestUrlPrefix":
                             shellSettings.RequestUrlPrefix = settingFields[1];
                             break;
+                        case "EncryptionAlgorithm":
+                            shellSettings.EncryptionAlgorithm = settingFields[1];
+                            break;
+                        case "EncryptionKey":
+                            shellSettings.EncryptionKey = settingFields[1];
+                            break;
+                        case "EncryptionIV":
+                            shellSettings.EncryptionIV = settingFields[1];
+                            break;
                     }
                 }
             }
             return shellSettings;
         }
 
-        static string ComposeSettings(ShellSettings settings) {
-            if ( settings == null )
+        static string ComposeSettings(ShellSettings settings)
+        {
+            if (settings == null)
                 return "";
 
-            return string.Format("Name: {0}\r\nDataProvider: {1}\r\nDataConnectionString: {2}\r\nDataPrefix: {3}\r\nRequestUrlHost: {4}\r\nRequestUrlPrefix: {5}\r\nState: {6}\r\n",
+            return string.Format("Name: {0}\r\nDataProvider: {1}\r\nDataConnectionString: {2}\r\nDataPrefix: {3}\r\nRequestUrlHost: {4}\r\nRequestUrlPrefix: {5}\r\nState: {6}\r\nEncryptionAlgorithm: {7}\r\nEncryptionKey: {8}\r\nEncryptionIV: {9}\r\n",
                      settings.Name,
                      settings.DataProvider,
                      settings.DataConnectionString ?? "null",
                      settings.DataTablePrefix ?? "null",
                      settings.RequestUrlHost ?? "null",
                      settings.RequestUrlPrefix ?? "null",
-                     settings.State != null ? settings.State.ToString() : String.Empty);
+                     settings.State != null ? settings.State.ToString() : String.Empty,
+                     settings.EncryptionAlgorithm ?? "null",
+                     settings.EncryptionKey ?? "null",
+                     settings.EncryptionIV ?? "null"
+                     );
         }
     }
 }

From a88f2a74bfbcbfa2ca8f7bc85d9192fd8b966a56 Mon Sep 17 00:00:00 2001
From: Sebastien Ros <none@none>
Date: Thu, 9 Dec 2010 15:49:48 -0800
Subject: [PATCH 11/25] Removing full IIS mode from Azure config file

--HG--
branch : dev
---
 .../Orchard.Azure.CloudService/ServiceDefinition.csdef     | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/Orchard.Azure/Orchard.Azure.CloudService/ServiceDefinition.csdef b/src/Orchard.Azure/Orchard.Azure.CloudService/ServiceDefinition.csdef
index fb41cf303..462e8f2ae 100644
--- a/src/Orchard.Azure/Orchard.Azure.CloudService/ServiceDefinition.csdef
+++ b/src/Orchard.Azure/Orchard.Azure.CloudService/ServiceDefinition.csdef
@@ -1,13 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ServiceDefinition name="OrchardCloudService" xmlns="http://schemas.microsoft.com/ServiceHosting/2008/10/ServiceDefinition">
   <WebRole name="Orchard.Azure.Web">
-    <Sites>
-      <Site name="Web">
-        <Bindings>
-          <Binding name="HttpIn" endpointName="HttpIn" />
-        </Bindings>
-      </Site>
-    </Sites>
     <ConfigurationSettings>
       <Setting name="DiagnosticsConnectionString" />
       <Setting name="DataConnectionString" />

From 147dcf9badd1248b837497c989f84f727afd9c65 Mon Sep 17 00:00:00 2001
From: Sebastien Ros <none@none>
Date: Thu, 9 Dec 2010 15:50:20 -0800
Subject: [PATCH 12/25] Using more adapted when no connection string is found

--HG--
branch : dev
---
 src/Orchard/Data/Providers/SqlServerDataServicesProvider.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Orchard/Data/Providers/SqlServerDataServicesProvider.cs b/src/Orchard/Data/Providers/SqlServerDataServicesProvider.cs
index acce27bd0..a266af81a 100644
--- a/src/Orchard/Data/Providers/SqlServerDataServicesProvider.cs
+++ b/src/Orchard/Data/Providers/SqlServerDataServicesProvider.cs
@@ -18,7 +18,7 @@ namespace Orchard.Data.Providers {
         public override IPersistenceConfigurer GetPersistenceConfigurer(bool createDatabase) {
             var persistence = MsSqlConfiguration.MsSql2008;
             if (string.IsNullOrEmpty(_connectionString)) {
-                throw new NotImplementedException();
+                throw new ArgumentException("The connection string is empty");
             }
             persistence = persistence.ConnectionString(_connectionString);
             return persistence;

From c1c06d599155196cdfb3c70c63315d6f8245572b Mon Sep 17 00:00:00 2001
From: Sebastien Ros <none@none>
Date: Thu, 9 Dec 2010 16:09:07 -0800
Subject: [PATCH 13/25] Adding script to run Azure in dev fabric

Work Item: 16874

--HG--
branch : dev
---
 ClickToRunAzureInDevFabric.cmd | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 ClickToRunAzureInDevFabric.cmd

diff --git a/ClickToRunAzureInDevFabric.cmd b/ClickToRunAzureInDevFabric.cmd
new file mode 100644
index 000000000..3e1ba1773
--- /dev/null
+++ b/ClickToRunAzureInDevFabric.cmd
@@ -0,0 +1,5 @@
+SET CDIR = %CD%
+call "%ProgramFiles%\Windows Azure SDK\v1.3\bin\setenv.cmd"
+csrun /devstore 
+csrun /run:"%CDIR %\build\Compile\Orchard.Azure.CloudService.csx";"%CDIR %\src\Orchard.Azure\Orchard.Azure.CloudService\ServiceConfiguration.cscfg" /launchbrowser 
+pause
\ No newline at end of file

From cc7f77a75794689d5a838c900ffa55020b5a1c5e Mon Sep 17 00:00:00 2001
From: Jonathan Wall <none@none>
Date: Thu, 9 Dec 2010 16:26:50 -0800
Subject: [PATCH 14/25] Changed list to manage blogs in the admin menu. Work
 Item: 17001

--HG--
branch : dev
---
 src/Orchard.Web/Modules/Orchard.Blogs/AdminMenu.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/AdminMenu.cs b/src/Orchard.Web/Modules/Orchard.Blogs/AdminMenu.cs
index d54c11dc2..258b630ee 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/AdminMenu.cs
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/AdminMenu.cs
@@ -25,7 +25,7 @@ namespace Orchard.Blogs {
             var singleBlog = blogCount == 1 ? blogs.ElementAt(0) : null;
 
             if (blogCount > 0 && singleBlog == null) {
-                menu.Add(T("List"), "3",
+                menu.Add(T("Manage Blogs"), "3",
                          item => item.Action("List", "BlogAdmin", new {area = "Orchard.Blogs"}).Permission(Permissions.MetaListOwnBlogs));
             }
             else if (singleBlog != null)

From 2c165811067750ace027bd0a106bedb0df4144a1 Mon Sep 17 00:00:00 2001
From: Andre Rodrigues <andrerod@microsoft.com>
Date: Thu, 9 Dec 2010 16:39:06 -0800
Subject: [PATCH 15/25] #16797: Adding setting for global paging. Fixing issue
 with query string specified pagesize being the same as default size.

--HG--
branch : dev
---
 .../Stubs/StubWorkContextAccessor.cs          |  5 ++
 .../Containers/Controllers/ItemController.cs  | 16 ++++--
 .../Contents/Controllers/AdminController.cs   |  7 ++-
 src/Orchard.Web/Core/Settings/Migrations.cs   |  1 +
 .../Core/Settings/Models/SiteSettingsPart.cs  | 11 ++++
 .../Settings/Models/SiteSettingsPartRecord.cs | 14 +++++
 .../ViewModels/SiteSettingsPartViewModel.cs   |  8 ++-
 .../Parts.Settings.SiteSettingsPart.cshtml    |  5 ++
 .../Controllers/BlogAdminController.cs        |  8 ++-
 .../Controllers/BlogController.cs             | 10 +++-
 .../Modules/Orchard.Blogs/Migrations.cs       |  8 +--
 .../Controllers/AdminController.cs            | 14 ++++-
 .../Controllers/SearchController.cs           | 12 +++--
 .../Modules/Orchard.Setup/SetupMode.cs        |  6 +++
 .../Controllers/HomeController.cs             | 12 +++--
 src/Orchard/Orchard.Framework.csproj          |  1 +
 src/Orchard/Settings/ISite.cs                 |  3 +-
 src/Orchard/UI/Navigation/Pager.cs            | 51 ++++++++++++++-----
 src/Orchard/UI/Navigation/PagerParameters.cs  | 13 +++++
 19 files changed, 171 insertions(+), 34 deletions(-)
 create mode 100644 src/Orchard/UI/Navigation/PagerParameters.cs

diff --git a/src/Orchard.Tests/Stubs/StubWorkContextAccessor.cs b/src/Orchard.Tests/Stubs/StubWorkContextAccessor.cs
index ee299df51..80fde47de 100644
--- a/src/Orchard.Tests/Stubs/StubWorkContextAccessor.cs
+++ b/src/Orchard.Tests/Stubs/StubWorkContextAccessor.cs
@@ -60,6 +60,11 @@ namespace Orchard.Tests.Stubs {
                     get { throw new NotImplementedException(); }
                     set { throw new NotImplementedException(); }
                 }
+
+                public int PageSize {
+                    get { throw new NotImplementedException(); }
+                    set { throw new NotImplementedException(); }
+                }
             }
 
             public class StubUser : IUser {
diff --git a/src/Orchard.Web/Core/Containers/Controllers/ItemController.cs b/src/Orchard.Web/Core/Containers/Controllers/ItemController.cs
index db89f21be..6bb1e3618 100644
--- a/src/Orchard.Web/Core/Containers/Controllers/ItemController.cs
+++ b/src/Orchard.Web/Core/Containers/Controllers/ItemController.cs
@@ -11,20 +11,29 @@ using Orchard.Themes;
 using Orchard.UI.Navigation;
 
 namespace Orchard.Core.Containers.Controllers {
+    using Orchard.Settings;
+
     public class ItemController : Controller {
         private readonly IContentManager _contentManager;
         private readonly IContainersPathConstraint _containersPathConstraint;
+        private readonly ISiteService _siteService;
+
+        public ItemController(
+            IContentManager contentManager, 
+            IContainersPathConstraint containersPathConstraint, 
+            IShapeFactory shapeFactory,
+            ISiteService siteService) {
 
-        public ItemController(IContentManager contentManager, IContainersPathConstraint containersPathConstraint, IShapeFactory shapeFactory) {
             _contentManager = contentManager;
             _containersPathConstraint = containersPathConstraint;
+            _siteService = siteService;
             Shape = shapeFactory;
         }
 
         dynamic Shape { get; set; }
 
         [Themed]
-        public ActionResult Display(string path, Pager pager) {
+        public ActionResult Display(string path, PagerParameters pagerParameters) {
             var matchedPath = _containersPathConstraint.FindPath(path);
             if (string.IsNullOrEmpty(matchedPath)) {
                 throw new ApplicationException("404 - should not have passed path constraint");
@@ -51,7 +60,8 @@ namespace Orchard.Core.Containers.Controllers {
             var descendingOrder = container.As<ContainerPart>().Record.OrderByDirection == (int) OrderByDirection.Descending;
             query = query.OrderBy(container.As<ContainerPart>().Record.OrderByProperty, descendingOrder);
 
-            pager.PageSize = pager.PageSize != Pager.PageSizeDefault && container.As<ContainerPart>().Record.Paginated
+            Pager pager = new Pager(_siteService.GetSiteSettings(), pagerParameters);
+            pager.PageSize = pagerParameters.PageSize != null && container.As<ContainerPart>().Record.Paginated
                                ? pager.PageSize
                                : container.As<ContainerPart>().Record.PageSize;
             var pagerShape = Shape.Pager(pager).TotalItemCount(query.Count());
diff --git a/src/Orchard.Web/Core/Contents/Controllers/AdminController.cs b/src/Orchard.Web/Core/Contents/Controllers/AdminController.cs
index c638153f0..f8a16d634 100644
--- a/src/Orchard.Web/Core/Contents/Controllers/AdminController.cs
+++ b/src/Orchard.Web/Core/Contents/Controllers/AdminController.cs
@@ -17,6 +17,7 @@ using Orchard.Localization;
 using Orchard.Logging;
 using Orchard.UI.Navigation;
 using Orchard.UI.Notify;
+using Orchard.Settings;
 
 namespace Orchard.Core.Contents.Controllers {
     [ValidateInput(false)]
@@ -24,17 +25,20 @@ namespace Orchard.Core.Contents.Controllers {
         private readonly IContentManager _contentManager;
         private readonly IContentDefinitionManager _contentDefinitionManager;
         private readonly ITransactionManager _transactionManager;
+        private readonly ISiteService _siteService;
 
         public AdminController(
             IOrchardServices orchardServices,
             IContentManager contentManager,
             IContentDefinitionManager contentDefinitionManager,
             ITransactionManager transactionManager,
+            ISiteService siteService,
             IShapeFactory shapeFactory) {
             Services = orchardServices;
             _contentManager = contentManager;
             _contentDefinitionManager = contentDefinitionManager;
             _transactionManager = transactionManager;
+            _siteService = siteService;
             T = NullLocalizer.Instance;
             Logger = NullLogger.Instance;
             Shape = shapeFactory;
@@ -45,7 +49,8 @@ namespace Orchard.Core.Contents.Controllers {
         public Localizer T { get; set; }
         public ILogger Logger { get; set; }
 
-        public ActionResult List(ListContentsViewModel model, Pager pager) {
+        public ActionResult List(ListContentsViewModel model, PagerParameters pagerParameters) {
+            Pager pager = new Pager(_siteService.GetSiteSettings(), pagerParameters);
             if (model.ContainerId != null && _contentManager.GetLatest((int)model.ContainerId) == null)
                 return HttpNotFound();
 
diff --git a/src/Orchard.Web/Core/Settings/Migrations.cs b/src/Orchard.Web/Core/Settings/Migrations.cs
index 17c0b9561..57d45a144 100644
--- a/src/Orchard.Web/Core/Settings/Migrations.cs
+++ b/src/Orchard.Web/Core/Settings/Migrations.cs
@@ -90,6 +90,7 @@ namespace Orchard.Core.Settings {
                     .Column<string>("HomePage")
                     .Column<string>("SiteCulture")
                     .Column<string>("ResourceDebugMode", c => c.WithDefault("FromAppSetting"))
+                    .Column<int>("PageSize")
                 );
 
             return 1;
diff --git a/src/Orchard.Web/Core/Settings/Models/SiteSettingsPart.cs b/src/Orchard.Web/Core/Settings/Models/SiteSettingsPart.cs
index fa6d8fdc3..3e5094699 100644
--- a/src/Orchard.Web/Core/Settings/Models/SiteSettingsPart.cs
+++ b/src/Orchard.Web/Core/Settings/Models/SiteSettingsPart.cs
@@ -8,28 +8,39 @@ namespace Orchard.Core.Settings.Models {
             get { return Record.PageTitleSeparator; }
             set { Record.PageTitleSeparator = value; }
         }
+
         public string SiteName {
             get { return Record.SiteName; }
             set { Record.SiteName = value; }
         }
+
         public string SiteSalt {
             get { return Record.SiteSalt; }
         }
+
         public string SuperUser {
             get { return Record.SuperUser; }
             set { Record.SuperUser = value; }
         }
+
         public string HomePage {
             get { return Record.HomePage; }
             set { Record.HomePage = value; }
         }
+
         public string SiteCulture {
             get { return Record.SiteCulture; }
             set { Record.SiteCulture = value; }
         }
+
         public ResourceDebugMode ResourceDebugMode {
             get { return Record.ResourceDebugMode; }
             set { Record.ResourceDebugMode = value; }
         }
+
+        public int PageSize {
+            get { return Record.PageSize; }
+            set { Record.PageSize = value; }
+        }
     }
 }
diff --git a/src/Orchard.Web/Core/Settings/Models/SiteSettingsPartRecord.cs b/src/Orchard.Web/Core/Settings/Models/SiteSettingsPartRecord.cs
index 2478ff91f..eb87877f5 100644
--- a/src/Orchard.Web/Core/Settings/Models/SiteSettingsPartRecord.cs
+++ b/src/Orchard.Web/Core/Settings/Models/SiteSettingsPartRecord.cs
@@ -3,12 +3,26 @@ using Orchard.Settings;
 
 namespace Orchard.Core.Settings.Models {
     public class SiteSettingsPartRecord : ContentPartRecord {
+        public const int DefaultPageSize = 10;
+
+        public SiteSettingsPartRecord() {
+            PageSize = DefaultPageSize;
+        }
+
         public virtual string SiteSalt { get; set; }
+
         public virtual string SiteName { get; set; }
+
         public virtual string SuperUser { get; set; }
+
         public virtual string PageTitleSeparator { get; set; }
+
         public virtual string HomePage { get; set; }
+
         public virtual string SiteCulture { get; set; }
+
         public virtual ResourceDebugMode ResourceDebugMode { get; set; }
+
+        public virtual int PageSize { get; set; }
     }
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Core/Settings/ViewModels/SiteSettingsPartViewModel.cs b/src/Orchard.Web/Core/Settings/ViewModels/SiteSettingsPartViewModel.cs
index 3c5624ff2..8bbb87d40 100644
--- a/src/Orchard.Web/Core/Settings/ViewModels/SiteSettingsPartViewModel.cs
+++ b/src/Orchard.Web/Core/Settings/ViewModels/SiteSettingsPartViewModel.cs
@@ -15,8 +15,7 @@ namespace Orchard.Core.Settings.ViewModels {
             get { return Site.ContentItem.Id; }
         }
 
-        public string PageTitleSeparator
-        {
+        public string PageTitleSeparator {
             get { return Site.Record.PageTitleSeparator; }
             set { Site.Record.PageTitleSeparator = value; }
         }
@@ -40,5 +39,10 @@ namespace Orchard.Core.Settings.ViewModels {
             get { return Site.As<SiteSettingsPart>().ResourceDebugMode; }
             set { Site.As<SiteSettingsPart>().ResourceDebugMode = value; }
         }
+
+        public int PageSize {
+            get { return Site.As<SiteSettingsPart>().PageSize; }
+            set { Site.As<SiteSettingsPart>().PageSize = value; }
+        }
     }
 }
diff --git a/src/Orchard.Web/Core/Settings/Views/EditorTemplates/Parts.Settings.SiteSettingsPart.cshtml b/src/Orchard.Web/Core/Settings/Views/EditorTemplates/Parts.Settings.SiteSettingsPart.cshtml
index ba9a67d96..e8d36de86 100644
--- a/src/Orchard.Web/Core/Settings/Views/EditorTemplates/Parts.Settings.SiteSettingsPart.cshtml
+++ b/src/Orchard.Web/Core/Settings/Views/EditorTemplates/Parts.Settings.SiteSettingsPart.cshtml
@@ -36,4 +36,9 @@
         @Html.DropDownList("ResourceDebugMode", resourceDebugMode)
         <span class="hint">@T("Determines whether scripts and stylesheets load in their debuggable or minified form.")</span>
     </div>
+    <div>
+        <label for="DefaultPageSize">@T("Default number of items per page")</label>
+        @Html.TextBoxFor(m => m.PageSize, new { @class = "textMedium" })
+        <span class="hint">@T("Determines the default number of items that are shown per page.")</span>
+    </div>
 </fieldset>
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogAdminController.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogAdminController.cs
index c9a0686d1..d7ce86253 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogAdminController.cs
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogAdminController.cs
@@ -15,6 +15,8 @@ using Orchard.UI.Navigation;
 using Orchard.UI.Notify;
 
 namespace Orchard.Blogs.Controllers {
+    using Orchard.Settings;
+
     [ValidateInput(false), Admin]
     public class BlogAdminController : Controller, IUpdateModel {
         private readonly IBlogService _blogService;
@@ -22,6 +24,7 @@ namespace Orchard.Blogs.Controllers {
         private readonly IContentManager _contentManager;
         private readonly ITransactionManager _transactionManager;
         private readonly IBlogSlugConstraint _blogSlugConstraint;
+        private readonly ISiteService _siteService;
 
         public BlogAdminController(
             IOrchardServices services,
@@ -30,6 +33,7 @@ namespace Orchard.Blogs.Controllers {
             IContentManager contentManager,
             ITransactionManager transactionManager,
             IBlogSlugConstraint blogSlugConstraint,
+            ISiteService siteService,
             IShapeFactory shapeFactory) {
             Services = services;
             _blogService = blogService;
@@ -37,6 +41,7 @@ namespace Orchard.Blogs.Controllers {
             _contentManager = contentManager;
             _transactionManager = transactionManager;
             _blogSlugConstraint = blogSlugConstraint;
+            _siteService = siteService;
             T = NullLocalizer.Instance;
             Shape = shapeFactory;
         }
@@ -147,7 +152,8 @@ namespace Orchard.Blogs.Controllers {
             return View((object)viewModel);
         }
 
-        public ActionResult Item(int blogId, Pager pager) {
+        public ActionResult Item(int blogId, PagerParameters pagerParameters) {
+            Pager pager = new Pager(_siteService.GetSiteSettings(), pagerParameters);
             BlogPart blogPart = _blogService.Get(blogId, VersionOptions.Latest).As<BlogPart>();
 
             if (blogPart == null)
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogController.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogController.cs
index 5661a51ce..43a78d750 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogController.cs
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogController.cs
@@ -13,6 +13,8 @@ using Orchard.Themes;
 using Orchard.UI.Navigation;
 
 namespace Orchard.Blogs.Controllers {
+    using Orchard.Settings;
+
     [Themed]
     public class BlogController : Controller {
         private readonly IOrchardServices _services;
@@ -22,6 +24,7 @@ namespace Orchard.Blogs.Controllers {
         private readonly IFeedManager _feedManager;
         private readonly IWorkContextAccessor _workContextAccessor;
         private readonly IHomePageProvider _routableHomePageProvider;
+        private readonly ISiteService _siteService;
 
         public BlogController(
             IOrchardServices services, 
@@ -31,13 +34,15 @@ namespace Orchard.Blogs.Controllers {
             IFeedManager feedManager, 
             IShapeFactory shapeFactory,
             IWorkContextAccessor workContextAccessor,
-            IEnumerable<IHomePageProvider> homePageProviders) {
+            IEnumerable<IHomePageProvider> homePageProviders,
+            ISiteService siteService) {
             _services = services;
             _blogService = blogService;
             _blogPostService = blogPostService;
             _blogSlugConstraint = blogSlugConstraint;
             _feedManager = feedManager;
             _workContextAccessor = workContextAccessor;
+            _siteService = siteService;
             _routableHomePageProvider = homePageProviders.SingleOrDefault(p => p.GetProviderName() == RoutableHomePageProvider.Name);
             Logger = NullLogger.Instance;
             Shape = shapeFactory;
@@ -59,7 +64,8 @@ namespace Orchard.Blogs.Controllers {
             return View((object)viewModel);
         }
 
-        public ActionResult Item(string blogSlug, Pager pager) {
+        public ActionResult Item(string blogSlug, PagerParameters pagerParameters) {
+            Pager pager = new Pager(_siteService.GetSiteSettings(), pagerParameters);
             var correctedSlug = _blogSlugConstraint.FindSlug(blogSlug);
             if (correctedSlug == null)
                 return HttpNotFound();
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Migrations.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Migrations.cs
index 90e71d88d..1fc750a75 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Migrations.cs
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Migrations.cs
@@ -5,7 +5,7 @@ namespace Orchard.Blogs {
     public class Migrations : DataMigrationImpl {
 
         public int Create() {
-            SchemaBuilder.CreateTable("BlogPartArchiveRecord", 
+            SchemaBuilder.CreateTable("BlogPartArchiveRecord",
                 table => table
                     .Column<int>("Id", column => column.PrimaryKey().Identity())
                     .Column<int>("Year")
@@ -14,21 +14,21 @@ namespace Orchard.Blogs {
                     .Column<int>("BlogPart_id")
                 );
 
-            SchemaBuilder.CreateTable("BlogPartRecord", 
+            SchemaBuilder.CreateTable("BlogPartRecord",
                 table => table
                     .ContentPartRecord()
                     .Column<string>("Description", c => c.Unlimited())
                     .Column<int>("PostCount")
                 );
 
-            SchemaBuilder.CreateTable("RecentBlogPostsPartRecord", 
+            SchemaBuilder.CreateTable("RecentBlogPostsPartRecord",
                 table => table
                     .ContentPartRecord()
                     .Column<string>("BlogSlug")
                     .Column<int>("Count")
                 );
 
-            SchemaBuilder.CreateTable("BlogArchivesPartRecord", 
+            SchemaBuilder.CreateTable("BlogArchivesPartRecord",
                 table => table
                     .ContentPartRecord()
                     .Column<string>("BlogSlug", c => c.WithLength(255))
diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Controllers/AdminController.cs b/src/Orchard.Web/Modules/Orchard.Comments/Controllers/AdminController.cs
index c5164d4ad..69d543b72 100644
--- a/src/Orchard.Web/Modules/Orchard.Comments/Controllers/AdminController.cs
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Controllers/AdminController.cs
@@ -14,12 +14,20 @@ using Orchard.Comments.ViewModels;
 using Orchard.Comments.Services;
 
 namespace Orchard.Comments.Controllers {
+    using Orchard.Settings;
+
     [ValidateInput(false)]
     public class AdminController : Controller {
         private readonly ICommentService _commentService;
+        private readonly ISiteService _siteService;
 
-        public AdminController(IOrchardServices services, ICommentService commentService, IShapeFactory shapeFactory) {
+        public AdminController(
+            IOrchardServices services, 
+            ICommentService commentService, 
+            ISiteService siteService,
+            IShapeFactory shapeFactory) {
             _commentService = commentService;
+            _siteService = siteService;
             Services = services;
             Logger = NullLogger.Instance;
             T = NullLocalizer.Instance;
@@ -31,7 +39,9 @@ namespace Orchard.Comments.Controllers {
         public Localizer T { get; set; }
         dynamic Shape { get; set; }
 
-        public ActionResult Index(CommentIndexOptions options, Pager pager) {
+        public ActionResult Index(CommentIndexOptions options, PagerParameters pagerParameters) {
+            Pager pager = new Pager(_siteService.GetSiteSettings(), pagerParameters);
+
             // Default options
             if (options == null)
                 options = new CommentIndexOptions();
diff --git a/src/Orchard.Web/Modules/Orchard.Search/Controllers/SearchController.cs b/src/Orchard.Web/Modules/Orchard.Search/Controllers/SearchController.cs
index 5b78dac13..d0cbfef66 100644
--- a/src/Orchard.Web/Modules/Orchard.Search/Controllers/SearchController.cs
+++ b/src/Orchard.Web/Modules/Orchard.Search/Controllers/SearchController.cs
@@ -15,19 +15,24 @@ using Orchard.Collections;
 using Orchard.Themes;
 
 namespace Orchard.Search.Controllers {
+    using Orchard.Settings;
+
     [ValidateInput(false), Themed]
     public class SearchController : Controller {
         private readonly ISearchService _searchService;
         private readonly IContentManager _contentManager;
+        private readonly ISiteService _siteService;
 
         public SearchController(
             IOrchardServices services,
-            ISearchService searchService, 
-            IContentManager contentManager, 
+            ISearchService searchService,
+            IContentManager contentManager,
+            ISiteService siteService,
             IShapeFactory shapeFactory) {
              Services = services;
             _searchService = searchService;
             _contentManager = contentManager;
+            _siteService = siteService;
 
             T = NullLocalizer.Instance;
             Logger = NullLogger.Instance;
@@ -39,7 +44,8 @@ namespace Orchard.Search.Controllers {
         public ILogger Logger { get; set; }
         dynamic Shape { get; set; }
 
-        public ActionResult Index(Pager pager, string q = "") {
+        public ActionResult Index(PagerParameters pagerParameters, string q = "") {
+            Pager pager = new Pager(_siteService.GetSiteSettings(), pagerParameters);
             var searchFields = Services.WorkContext.CurrentSite.As<SearchSettingsPart>().SearchedFields;
 
             IPageOfItems<ISearchHit> searchHits = new PageOfItems<ISearchHit>(new ISearchHit[] { });
diff --git a/src/Orchard.Web/Modules/Orchard.Setup/SetupMode.cs b/src/Orchard.Web/Modules/Orchard.Setup/SetupMode.cs
index 5db72cf02..4e45cd581 100644
--- a/src/Orchard.Web/Modules/Orchard.Setup/SetupMode.cs
+++ b/src/Orchard.Web/Modules/Orchard.Setup/SetupMode.cs
@@ -8,6 +8,7 @@ using Orchard.Commands.Builtin;
 using Orchard.ContentManagement;
 using Orchard.ContentManagement.Handlers;
 using Orchard.ContentManagement.MetaData.Builders;
+using Orchard.Core.Settings.Models;
 using Orchard.Data.Migration.Interpreters;
 using Orchard.Data.Providers;
 using Orchard.Data.Migration;
@@ -172,6 +173,11 @@ namespace Orchard.Setup {
                 get { return ResourceDebugMode.FromAppSetting; }
                 set { throw new NotImplementedException(); }
             }
+
+            public int PageSize {
+                get { return SiteSettingsPartRecord.DefaultPageSize; }
+                set { throw new NotImplementedException(); }
+            }
         }
     }
 }
diff --git a/src/Orchard.Web/Modules/Orchard.Tags/Controllers/HomeController.cs b/src/Orchard.Web/Modules/Orchard.Tags/Controllers/HomeController.cs
index abfbdfbeb..63cff0658 100644
--- a/src/Orchard.Web/Modules/Orchard.Tags/Controllers/HomeController.cs
+++ b/src/Orchard.Web/Modules/Orchard.Tags/Controllers/HomeController.cs
@@ -4,6 +4,7 @@ using Orchard.ContentManagement;
 using Orchard.DisplayManagement;
 using Orchard.Localization;
 using Orchard.Logging;
+using Orchard.Settings;
 using Orchard.Tags.Services;
 using Orchard.Tags.ViewModels;
 using Orchard.Themes;
@@ -14,14 +15,17 @@ namespace Orchard.Tags.Controllers {
     public class HomeController : Controller {
         private readonly ITagService _tagService;
         private readonly IContentManager _contentManager;
+        private readonly ISiteService _siteService;
         private readonly dynamic _shapeFactory;
 
         public HomeController(
-            ITagService tagService, 
-            IContentManager contentManager, 
+            ITagService tagService,
+            IContentManager contentManager,
+            ISiteService siteService,
             IShapeFactory shapeFactory) {
             _tagService = tagService;
             _contentManager = contentManager;
+            _siteService = siteService;
             _shapeFactory = shapeFactory;
             T = NullLocalizer.Instance;
         }
@@ -35,7 +39,9 @@ namespace Orchard.Tags.Controllers {
             return View(model);
         }
 
-        public ActionResult Search(string tagName, Pager pager) {
+        public ActionResult Search(string tagName, PagerParameters pagerParameters) {
+            Pager pager = new Pager(_siteService.GetSiteSettings(), pagerParameters);
+
             var tag = _tagService.GetTagByName(tagName);
 
             if (tag == null) {
diff --git a/src/Orchard/Orchard.Framework.csproj b/src/Orchard/Orchard.Framework.csproj
index faed86f55..a85f5d542 100644
--- a/src/Orchard/Orchard.Framework.csproj
+++ b/src/Orchard/Orchard.Framework.csproj
@@ -188,6 +188,7 @@
     <Compile Include="Themes\ThemeManager.cs" />
     <Compile Include="UI\FlatPositionComparer.cs" />
     <Compile Include="UI\Navigation\Pager.cs" />
+    <Compile Include="UI\Navigation\PagerParameters.cs" />
     <Compile Include="UI\Resources\IResourceManifestProvider.cs" />
     <Compile Include="UI\Resources\ResourceManifestBuilder.cs" />
     <Compile Include="UI\Zones\LayoutWorkContext.cs" />
diff --git a/src/Orchard/Settings/ISite.cs b/src/Orchard/Settings/ISite.cs
index 23f046363..f215673e7 100644
--- a/src/Orchard/Settings/ISite.cs
+++ b/src/Orchard/Settings/ISite.cs
@@ -2,7 +2,7 @@
 
 namespace Orchard.Settings {
     /// <summary>
-    /// Interface provided by the "settings" model. 
+    /// Interface provided by the "settings" model.
     /// </summary>
     public interface ISite : IContent {
         string PageTitleSeparator { get; }
@@ -12,5 +12,6 @@ namespace Orchard.Settings {
         string HomePage { get; set; }
         string SiteCulture { get; set; }
         ResourceDebugMode ResourceDebugMode { get; set; }
+        int PageSize { get; set; }
     }
 }
diff --git a/src/Orchard/UI/Navigation/Pager.cs b/src/Orchard/UI/Navigation/Pager.cs
index 2adaef763..9783e6ed8 100644
--- a/src/Orchard/UI/Navigation/Pager.cs
+++ b/src/Orchard/UI/Navigation/Pager.cs
@@ -1,22 +1,49 @@
-namespace Orchard.UI.Navigation {
+using Orchard.Settings;
+
+namespace Orchard.UI.Navigation {
     public class Pager {
-        private const int PageDefault = 1;
-        public const int PageSizeDefault = 10;
-        private int _pageSize;
-        private int _size;
+        /// <summary>
+        /// The default page number.
+        /// </summary>
+        public const int PageDefault = 1;
 
-        public int Page {
-            get { return _pageSize > 0 ? _pageSize : PageDefault; }
-            set { _pageSize = value; }
+        /// <summary>
+        /// Constructs a new pager.
+        /// </summary>
+        /// <param name="site">The site settings.</param>
+        /// <param name="pagerParameters">The pager parameters.</param>
+        public Pager(ISite site, PagerParameters pagerParameters) 
+            : this(site, pagerParameters.Page, pagerParameters.PageSize) {
         }
 
-        public int PageSize {
-            get { return _size > 0 ? _size : PageSizeDefault; }
-            set { _size = value; }
+        /// <summary>
+        /// Constructs a new pager.
+        /// </summary>
+        /// <param name="site">The site settings.</param>
+        /// <param name="page">The page parameter.</param>
+        /// <param name="pageSize">The page size parameter.</param>
+        public Pager(ISite site, int? page, int? pageSize) {
+            Page = (int) (page != null ? (page > 0 ? page : PageDefault) : PageDefault);
+            PageSize = pageSize ?? site.PageSize;
         }
 
+        /// <summary>
+        /// Gets or sets the current page number or the default page number if none is specified.
+        /// </summary>
+        public int Page { get; set; }
+
+        /// <summary>
+        /// Gets or sets the current page size or the site default size if none is specified.
+        /// </summary>
+        public int PageSize { get; set; }
+
+        /// <summary>
+        /// Gets the current page start index.
+        /// </summary>
+        /// <param name="page">The current page number.</param>
+        /// <returns>The index in which the page starts.</returns>
         public int GetStartIndex(int? page = null) {
-            return ((page ?? Page) - 1)*PageSize;
+            return ((page ?? Page) - PageDefault) * PageSize;
         }
     }
 }
\ No newline at end of file
diff --git a/src/Orchard/UI/Navigation/PagerParameters.cs b/src/Orchard/UI/Navigation/PagerParameters.cs
new file mode 100644
index 000000000..efefed885
--- /dev/null
+++ b/src/Orchard/UI/Navigation/PagerParameters.cs
@@ -0,0 +1,13 @@
+namespace Orchard.UI.Navigation {
+    public class PagerParameters {
+        /// <summary>
+        /// Gets or sets the current page number or null if none specified.
+        /// </summary>
+        public int? Page { get; set; }
+
+        /// <summary>
+        /// Gets or sets the current page size or null if none specified.
+        /// </summary>
+        public int? PageSize { get; set; }
+    }
+}

From 4a9fb5a857bfa7c5427affe71344c7e76e414b6e Mon Sep 17 00:00:00 2001
From: Sebastien Ros <none@none>
Date: Thu, 9 Dec 2010 16:57:04 -0800
Subject: [PATCH 16/25] Applying security checks to remote publishing

--HG--
branch : dev
---
 .../Orchard.Blogs/Services/XmlRpcHandler.cs        | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Services/XmlRpcHandler.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Services/XmlRpcHandler.cs
index bd48b5c8a..616086921 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Services/XmlRpcHandler.cs
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Services/XmlRpcHandler.cs
@@ -123,7 +123,7 @@ namespace Orchard.Blogs.Services {
             string password) {
 
             var user = _membershipService.ValidateUser(userName, password);
-            _authorizationService.CheckAccess(StandardPermissions.AccessFrontEnd, user, null);
+            _authorizationService.CheckAccess(Permissions.EditOthersBlogPost, user, null);
 
             var array = new XRpcArray();
             foreach (var blog in _blogService.Get()) {
@@ -144,7 +144,7 @@ namespace Orchard.Blogs.Services {
             int numberOfPosts) {
 
             var user = _membershipService.ValidateUser(userName, password);
-            _authorizationService.CheckAccess(StandardPermissions.AccessFrontEnd, user, null);
+            _authorizationService.CheckAccess(Permissions.EditOthersBlogPost, user, null);
 
             var blog = _contentManager.Get<BlogPart>(Convert.ToInt32(blogId));
             if (blog == null)
@@ -166,7 +166,7 @@ namespace Orchard.Blogs.Services {
             IEnumerable<IXmlRpcDriver> drivers) {
 
             var user = _membershipService.ValidateUser(userName, password);
-            _authorizationService.CheckAccess(Permissions.EditOwnBlogPost, user, null);
+            _authorizationService.CheckAccess(publish ? Permissions.PublishOthersBlogPost : Permissions.EditOthersBlogPost, user, null);
 
             var blog = _contentManager.Get<BlogPart>(Convert.ToInt32(blogId));
             if (blog == null)
@@ -216,7 +216,7 @@ namespace Orchard.Blogs.Services {
             IEnumerable<IXmlRpcDriver> drivers) {
 
             var user = _membershipService.ValidateUser(userName, password);
-            _authorizationService.CheckAccess(StandardPermissions.AccessFrontEnd, user, null);
+            _authorizationService.CheckAccess(Permissions.EditOthersBlogPost, user, null);
 
             var blogPost = _blogPostService.Get(postId, VersionOptions.Latest);
             if (blogPost == null)
@@ -231,15 +231,13 @@ namespace Orchard.Blogs.Services {
         }
 
         private bool MetaWeblogEditPost(int postId, string userName, string password, XRpcStruct content, bool publish, IEnumerable<IXmlRpcDriver> drivers) {
-
             var user = _membershipService.ValidateUser(userName, password);
-            _authorizationService.CheckAccess(StandardPermissions.AccessFrontEnd, user, null);
+            _authorizationService.CheckAccess(publish ? Permissions.PublishOthersBlogPost : Permissions.EditOthersBlogPost, user, null);
 
             var blogPost = _blogPostService.Get(postId, VersionOptions.DraftRequired);
             if (blogPost == null)
                 throw new ArgumentException();
 
-
             var title = content.Optional<string>("title");
             var description = content.Optional<string>("description");
             var slug = content.Optional<string>("wp_slug");
@@ -259,7 +257,7 @@ namespace Orchard.Blogs.Services {
 
         private bool MetaWeblogDeletePost(string appkey, string postId, string userName, string password, bool publish, IEnumerable<IXmlRpcDriver> drivers) {
             var user = _membershipService.ValidateUser(userName, password);
-            _authorizationService.CheckAccess(StandardPermissions.AccessFrontEnd, user, null);
+            _authorizationService.CheckAccess(Permissions.DeleteOthersBlogPost, user, null);
 
             var blogPost = _blogPostService.Get(Convert.ToInt32(postId), VersionOptions.Latest);
             if (blogPost == null)

From 035f3d3e9c03f9930d1fcaaa4c2e4d3b339e73c3 Mon Sep 17 00:00:00 2001
From: Andre Rodrigues <andrerod@microsoft.com>
Date: Thu, 9 Dec 2010 18:03:27 -0800
Subject: [PATCH 17/25] #16803: International characters are allowed to go
 through and accents are removed.

--HG--
branch : dev
---
 .../Core/Routable/Services/RoutableService.cs | 23 +++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/Orchard.Web/Core/Routable/Services/RoutableService.cs b/src/Orchard.Web/Core/Routable/Services/RoutableService.cs
index 2ddea2f21..68dc30218 100644
--- a/src/Orchard.Web/Core/Routable/Services/RoutableService.cs
+++ b/src/Orchard.Web/Core/Routable/Services/RoutableService.cs
@@ -1,6 +1,8 @@
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
+using System.Text;
 using System.Text.RegularExpressions;
 using Orchard.ContentManagement;
 using Orchard.ContentManagement.Aspects;
@@ -27,14 +29,28 @@ namespace Orchard.Core.Routable.Services {
             }
         }
 
+        public static string RemoveDiacritics(string slug) {
+            string stFormD = slug.Normalize(NormalizationForm.FormD);
+            StringBuilder sb = new StringBuilder();
+
+            for (int ich = 0; ich < stFormD.Length; ich++) {
+                UnicodeCategory uc = CharUnicodeInfo.GetUnicodeCategory(stFormD[ich]);
+                if (uc != UnicodeCategory.NonSpacingMark) {
+                    sb.Append(stFormD[ich]);
+                }
+            }
+
+            return (sb.ToString().Normalize(NormalizationForm.FormC));
+        }
+
         public void FillSlugFromTitle<TModel>(TModel model) where TModel : IRoutableAspect {
             if (!string.IsNullOrEmpty(model.Slug) || string.IsNullOrEmpty(model.Title))
                 return;
 
             var slug = model.Title;
-            var dissallowed = new Regex(@"[/:?#\[\]@!$&'()*+,;=\s\""\<\>]+");
+            var disallowed = new Regex(@"[/:?#\[\]@!$&'()*+,;=\s\""\<\>]+");
 
-            slug = dissallowed.Replace(slug, "-");
+            slug = disallowed.Replace(slug, "-");
             slug = slug.Trim('-');
 
             if (slug.Length > 1000)
@@ -42,8 +58,7 @@ namespace Orchard.Core.Routable.Services {
 
             // dots are not allowed at the begin and the end of routes
             slug = slug.Trim('.');
-
-            model.Slug = slug.ToLowerInvariant();
+            model.Slug = RemoveDiacritics(slug.ToLower());
         }
 
         public string GenerateUniqueSlug(IRoutableAspect part, IEnumerable<string> existingPaths) {

From ca9c5d7b6add9513cfe5f43c5c9f5f4160675187 Mon Sep 17 00:00:00 2001
From: Andre Rodrigues <andrerod@microsoft.com>
Date: Thu, 9 Dec 2010 18:39:03 -0800
Subject: [PATCH 18/25] #16802: Making slug logic extensible / replaceable
 through events.

--HG--
branch : dev
---
 src/Orchard.Web/Core/Orchard.Core.csproj      |  1 +
 .../Core/Routable/Events/ISlugEventHandler.cs | 17 ++++++++++
 .../Core/Routable/Services/RoutableService.cs | 34 +++++++++++++------
 3 files changed, 42 insertions(+), 10 deletions(-)
 create mode 100644 src/Orchard.Web/Core/Routable/Events/ISlugEventHandler.cs

diff --git a/src/Orchard.Web/Core/Orchard.Core.csproj b/src/Orchard.Web/Core/Orchard.Core.csproj
index c06905952..0c9308d99 100644
--- a/src/Orchard.Web/Core/Orchard.Core.csproj
+++ b/src/Orchard.Web/Core/Orchard.Core.csproj
@@ -104,6 +104,7 @@
     <Compile Include="Contents\Shapes.cs" />
     <Compile Include="Contents\ViewModels\PublishContentViewModel.cs" />
     <Compile Include="Navigation\Services\MainMenuNavigationProvider.cs" />
+    <Compile Include="Routable\Events\ISlugEventHandler.cs" />
     <Compile Include="Routable\ResourceManifest.cs" />
     <Compile Include="Routable\Services\RoutableHomePageProvider.cs" />
     <Compile Include="Contents\ViewModels\ListContentsViewModel.cs" />
diff --git a/src/Orchard.Web/Core/Routable/Events/ISlugEventHandler.cs b/src/Orchard.Web/Core/Routable/Events/ISlugEventHandler.cs
new file mode 100644
index 000000000..a178aed71
--- /dev/null
+++ b/src/Orchard.Web/Core/Routable/Events/ISlugEventHandler.cs
@@ -0,0 +1,17 @@
+using Orchard.Events;
+
+namespace Orchard.Core.Routable.Events {
+    public interface ISlugEventHandler : IEventHandler {
+        void FillingSlugFromTitle(FillSlugContext context);
+        void FilledSlugFromTitle(FillSlugContext context);
+    }
+
+    public class FillSlugContext {
+        public FillSlugContext(string slug) {
+            Slug = slug;
+        }
+
+        public string Slug { get; set; }
+        public bool Adjusted { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Core/Routable/Services/RoutableService.cs b/src/Orchard.Web/Core/Routable/Services/RoutableService.cs
index 68dc30218..889720db9 100644
--- a/src/Orchard.Web/Core/Routable/Services/RoutableService.cs
+++ b/src/Orchard.Web/Core/Routable/Services/RoutableService.cs
@@ -7,14 +7,17 @@ using System.Text.RegularExpressions;
 using Orchard.ContentManagement;
 using Orchard.ContentManagement.Aspects;
 using Orchard.Core.Common.Models;
+using Orchard.Core.Routable.Events;
 using Orchard.Core.Routable.Models;
 
 namespace Orchard.Core.Routable.Services {
     public class RoutableService : IRoutableService {
         private readonly IContentManager _contentManager;
+        private readonly IEnumerable<ISlugEventHandler> _slugEventHandlers;
 
-        public RoutableService(IContentManager contentManager) {
+        public RoutableService(IContentManager contentManager, IEnumerable<ISlugEventHandler> slugEventHandlers) {
             _contentManager = contentManager;
+            _slugEventHandlers = slugEventHandlers;
         }
 
         public void FixContainedPaths(IRoutableAspect part) {
@@ -47,18 +50,29 @@ namespace Orchard.Core.Routable.Services {
             if (!string.IsNullOrEmpty(model.Slug) || string.IsNullOrEmpty(model.Title))
                 return;
 
-            var slug = model.Title;
-            var disallowed = new Regex(@"[/:?#\[\]@!$&'()*+,;=\s\""\<\>]+");
+            FillSlugContext slugContext = new FillSlugContext(model.Title);
 
-            slug = disallowed.Replace(slug, "-");
-            slug = slug.Trim('-');
+            foreach(ISlugEventHandler slugEventHandler in _slugEventHandlers) {
+                slugEventHandler.FillingSlugFromTitle(slugContext);
+            }
 
-            if (slug.Length > 1000)
-                slug = slug.Substring(0, 1000);
+            if (!slugContext.Adjusted) {
+                var disallowed = new Regex(@"[/:?#\[\]@!$&'()*+,;=\s\""\<\>]+");
 
-            // dots are not allowed at the begin and the end of routes
-            slug = slug.Trim('.');
-            model.Slug = RemoveDiacritics(slug.ToLower());
+                slugContext.Slug = disallowed.Replace(slugContext.Slug, "-").Trim('-');
+
+                if (slugContext.Slug.Length > 1000)
+                    slugContext.Slug = slugContext.Slug.Substring(0, 1000);
+
+                // dots are not allowed at the begin and the end of routes
+                slugContext.Slug = RemoveDiacritics(slugContext.Slug.Trim('.').ToLower());
+            }
+
+            foreach (ISlugEventHandler slugEventHandler in _slugEventHandlers) {
+                slugEventHandler.FilledSlugFromTitle(slugContext);
+            }
+
+            model.Slug = slugContext.Slug;
         }
 
         public string GenerateUniqueSlug(IRoutableAspect part, IEnumerable<string> existingPaths) {

From 0ed0750dbfd99dfc4869c5b9388c69273c1d4ede Mon Sep 17 00:00:00 2001
From: Nathan Heskew <nathan.heskew@microsoft.com>
Date: Fri, 10 Dec 2010 08:32:50 -0800
Subject: [PATCH 19/25] Changing the Widget.DeleteButton.cshtml from None ->
 Content

--HG--
branch : dev
---
 src/Orchard.Web/Modules/Orchard.Widgets/Orchard.Widgets.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Orchard.Widgets.csproj b/src/Orchard.Web/Modules/Orchard.Widgets/Orchard.Widgets.csproj
index 354226b77..253620edc 100644
--- a/src/Orchard.Web/Modules/Orchard.Widgets/Orchard.Widgets.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Orchard.Widgets.csproj
@@ -131,7 +131,7 @@
     <Content Include="Views\EditorTemplates\Parts.Widgets.WidgetPart.cshtml" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Views\Widget.DeleteButton.cshtml" />
+    <Content Include="Views\Widget.DeleteButton.cshtml" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />

From a04dabfa7d05f4989c0573fc967793238a82c0ca Mon Sep 17 00:00:00 2001
From: Jonathan Wall <none@none>
Date: Fri, 10 Dec 2010 08:57:33 -0800
Subject: [PATCH 20/25] Fixed comment UI in the admin.

--HG--
branch : dev
---
 .../Modules/Orchard.Comments/Styles/orchard-comments-admin.css  | 2 +-
 src/Orchard.Web/Themes/TheAdmin/Styles/site.css                 | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Styles/orchard-comments-admin.css b/src/Orchard.Web/Modules/Orchard.Comments/Styles/orchard-comments-admin.css
index 23bd8bd41..4138d1b3d 100644
--- a/src/Orchard.Web/Modules/Orchard.Comments/Styles/orchard-comments-admin.css
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Styles/orchard-comments-admin.css
@@ -2,7 +2,7 @@
     white-space:nowrap;   
 }
 table.items tr {
-    background:#f7f7f7;   
+    background:#fff;   
 }
 table.items tr.anonymous {
     background:#fff;   
diff --git a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css
index 1f8290f8e..e57b9d212 100644
--- a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css
+++ b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css
@@ -732,7 +732,6 @@ table.items th, table.items td {
     border-spacing:0px;
     display:table-cell;
     padding:8px 12px;
-    vertical-align:middle;
 }
 
 /* Content item lists

From 23fd612bce68137222b27c07425b30a564bb5db6 Mon Sep 17 00:00:00 2001
From: Jonathan Wall <none@none>
Date: Fri, 10 Dec 2010 09:33:37 -0800
Subject: [PATCH 21/25] Removed search input field that was hard-coded in the
 results page. Work item: 16895

--HG--
branch : dev
---
 .../Modules/Orchard.Search/Views/Search/Index.cshtml  | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/Orchard.Web/Modules/Orchard.Search/Views/Search/Index.cshtml b/src/Orchard.Web/Modules/Orchard.Search/Views/Search/Index.cshtml
index b573cde0e..8567c40ae 100644
--- a/src/Orchard.Web/Modules/Orchard.Search/Views/Search/Index.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Search/Views/Search/Index.cshtml
@@ -7,17 +7,12 @@
     Model.ContentItems.Classes.Add("search-results");
 }
 <h1>@Html.TitleForPage(T("Search").Text)</h1>
-@using(Html.BeginForm("index", "search", new { area = "Orchard.Search" }, FormMethod.Get, new { @class = "search group" })) { 
-    <fieldset>
-        @Html.TextBox("q", Model.Query)
-        <button type="submit">@T("Search")</button>
-    </fieldset>
-} 
+
 @if (HasText(Model.Query)) {
     if (searchResults.Count() == 0) { 
-        <p class="search-summary">@T.Plural("the <em>one</em> result", "<em>zero</em> results", searchResults.Count())</p>
+        <p class="search-summary">@T.Plural("There is <em>one</em> result", "<em>zero</em> results", searchResults.Count())</p>
     } else { 
-        <p class="search-summary">@T.Plural("the <em>one</em> result", "<em>{1} - {2}</em> of <em>{0}</em> results", Model.TotalItemCount, Model.StartPosition, Model.EndPosition)</p>
+        <p class="search-summary">@T.Plural("There is <em>one</em> result", "<em>{1} - {2}</em> of <em>{0}</em> results", Model.TotalItemCount, Model.StartPosition, Model.EndPosition)</p>
     }
 }
 @if (searchResults != null && searchResults.Count() > 0) {

From ce506d2bf990c45e92a12fdbd50cdd86e2117750 Mon Sep 17 00:00:00 2001
From: Nathan Heskew <nathan.heskew@microsoft.com>
Date: Fri, 10 Dec 2010 09:54:20 -0800
Subject: [PATCH 22/25] Making the layer and widget delete button only show up
 when editing an layer or widget

work item: 17013

--HG--
branch : dev
---
 .../Orchard.Widgets/Drivers/LayerPartDriver.cs  | 15 ++++++++++-----
 .../Orchard.Widgets/Drivers/WidgetPartDriver.cs | 17 +++++++++++------
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Drivers/LayerPartDriver.cs b/src/Orchard.Web/Modules/Orchard.Widgets/Drivers/LayerPartDriver.cs
index f70c0e384..c3300434b 100644
--- a/src/Orchard.Web/Modules/Orchard.Widgets/Drivers/LayerPartDriver.cs
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Drivers/LayerPartDriver.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using JetBrains.Annotations;
 using Orchard.ContentManagement;
@@ -27,12 +28,16 @@ namespace Orchard.Widgets.Drivers {
         public Localizer T { get; set; }
 
         protected override DriverResult Editor(LayerPart layerPart, dynamic shapeHelper) {
-            return Combined(
+            var results = new List<DriverResult> {
                 ContentShape("Parts_Widgets_LayerPart",
-                    () => shapeHelper.EditorTemplate(TemplateName: "Parts.Widgets.LayerPart", Model: layerPart, Prefix: Prefix)),
-                ContentShape("Widget_DeleteButton",
-                    deleteButton => deleteButton)
-                );
+                             () => shapeHelper.EditorTemplate(TemplateName: "Parts.Widgets.LayerPart", Model: layerPart, Prefix: Prefix))
+            };
+
+            if (layerPart.Id > 0)
+                results.Add(ContentShape("Widget_DeleteButton",
+                    deleteButton => deleteButton));
+
+            return Combined(results.ToArray());
         }
 
         protected override DriverResult Editor(LayerPart layerPart, IUpdateModel updater, dynamic shapeHelper) {
diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Drivers/WidgetPartDriver.cs b/src/Orchard.Web/Modules/Orchard.Widgets/Drivers/WidgetPartDriver.cs
index 7cb52d329..d1a8374bb 100644
--- a/src/Orchard.Web/Modules/Orchard.Widgets/Drivers/WidgetPartDriver.cs
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Drivers/WidgetPartDriver.cs
@@ -1,4 +1,5 @@
-using JetBrains.Annotations;
+using System.Collections.Generic;
+using JetBrains.Annotations;
 using Orchard.ContentManagement;
 using Orchard.ContentManagement.Drivers;
 using Orchard.Widgets.Models;
@@ -18,12 +19,16 @@ namespace Orchard.Widgets.Drivers {
             widgetPart.AvailableZones = _widgetsService.GetZones();
             widgetPart.AvailableLayers = _widgetsService.GetLayers();
 
-            return Combined(
+            var results = new List<DriverResult> {
                 ContentShape("Parts_Widgets_WidgetPart",
-                    () => shapeHelper.EditorTemplate(TemplateName: "Parts.Widgets.WidgetPart", Model: widgetPart, Prefix: Prefix)),
-                ContentShape("Widget_DeleteButton",
-                    deleteButton => deleteButton)
-                );
+                             () => shapeHelper.EditorTemplate(TemplateName: "Parts.Widgets.WidgetPart", Model: widgetPart, Prefix: Prefix))
+            };
+
+            if (widgetPart.Id > 0)
+                results.Add(ContentShape("Widget_DeleteButton",
+                    deleteButton => deleteButton));
+
+            return Combined(results.ToArray());
         }
 
         protected override DriverResult Editor(WidgetPart widgetPart, IUpdateModel updater, dynamic shapeHelper) {

From 625880f9e12de5bcdc6fae831297a478e58a18d5 Mon Sep 17 00:00:00 2001
From: Dave Reed <dareed@microsoft.com>
Date: Fri, 10 Dec 2010 11:12:29 -0800
Subject: [PATCH 23/25] #16998: Publish Later UI now much less confusing with 3
 buttons: Save, Publish Now, and Publish Later. This also moves some
 publish-later specific css from the admin css to the publish later css, and
 makes the _Archive_ Later UI look better when active.

--HG--
branch : dev
---
 .../Drivers/PublishLaterPartDriver.cs         | 27 ++++++++++---------
 .../Orchard.PublishLater/Placement.info       |  2 +-
 .../Styles/orchard-publishlater-datetime.css  | 22 ++++++++++++---
 .../EditorTemplates/Parts/PublishLater.cshtml |  1 +
 .../Themes/TheAdmin/Styles/site.css           | 15 +++--------
 5 files changed, 40 insertions(+), 27 deletions(-)

diff --git a/src/Orchard.Web/Modules/Orchard.PublishLater/Drivers/PublishLaterPartDriver.cs b/src/Orchard.Web/Modules/Orchard.PublishLater/Drivers/PublishLaterPartDriver.cs
index 492f0b1b0..78a3d8789 100644
--- a/src/Orchard.Web/Modules/Orchard.PublishLater/Drivers/PublishLaterPartDriver.cs
+++ b/src/Orchard.Web/Modules/Orchard.PublishLater/Drivers/PublishLaterPartDriver.cs
@@ -2,6 +2,7 @@
 using Orchard.ContentManagement;
 using Orchard.ContentManagement.Drivers;
 using Orchard.Core.Common.Services;
+using Orchard.Mvc;
 using Orchard.PublishLater.Models;
 using Orchard.PublishLater.Services;
 using Orchard.PublishLater.ViewModels;
@@ -58,22 +59,24 @@ namespace Orchard.PublishLater.Drivers {
 
             updater.TryUpdateModel(model, Prefix, null, null);
 
-            if (!string.IsNullOrWhiteSpace(model.ScheduledPublishDate) && !string.IsNullOrWhiteSpace(model.ScheduledPublishTime)) {
-                DateTime scheduled;
-                string parseDateTime = String.Concat(model.ScheduledPublishDate, " ", model.ScheduledPublishTime);
+            if (Services.WorkContext.Resolve<IHttpContextAccessor>().Current().Request.Form["submit.Save"] == "submit.PublishLater") {
+                if (!string.IsNullOrWhiteSpace(model.ScheduledPublishDate) && !string.IsNullOrWhiteSpace(model.ScheduledPublishTime)) {
+                    DateTime scheduled;
+                    string parseDateTime = String.Concat(model.ScheduledPublishDate, " ", model.ScheduledPublishTime);
 
-                // use an english culture as it is the one used by jQuery.datepicker by default
-                if (DateTime.TryParse(parseDateTime, CultureInfo.GetCultureInfo("en-US"), DateTimeStyles.AssumeLocal, out scheduled)) {
-                    model.ScheduledPublishUtc = part.ScheduledPublishUtc.Value = scheduled.ToUniversalTime();
-                    _publishLaterService.Publish(model.ContentItem, model.ScheduledPublishUtc.Value);
+                    // use an english culture as it is the one used by jQuery.datepicker by default
+                    if (DateTime.TryParse(parseDateTime, CultureInfo.GetCultureInfo("en-US"), DateTimeStyles.AssumeLocal, out scheduled)) {
+                        model.ScheduledPublishUtc = part.ScheduledPublishUtc.Value = scheduled.ToUniversalTime();
+                        _publishLaterService.Publish(model.ContentItem, model.ScheduledPublishUtc.Value);
+                    }
+                    else {
+                        updater.AddModelError(Prefix, T("{0} is an invalid date and time", parseDateTime));
+                    }
                 }
-                else {
-                    updater.AddModelError(Prefix, T("{0} is an invalid date and time", parseDateTime));
+                else if (!string.IsNullOrWhiteSpace(model.ScheduledPublishDate) || !string.IsNullOrWhiteSpace(model.ScheduledPublishTime)) {
+                    updater.AddModelError(Prefix, T("Both the date and time need to be specified for when this is to be published. If you don't want to schedule publishing then click Save or Publish Now."));
                 }
             }
-            else if (!string.IsNullOrWhiteSpace(model.ScheduledPublishDate) || !string.IsNullOrWhiteSpace(model.ScheduledPublishTime)) {
-                updater.AddModelError(Prefix, T("Both the date and time need to be specified for when this is to be published. If you don't want to schedule publishing then clear both the date and time fields."));
-            }
 
             return ContentShape("Parts_PublishLater_Edit",
                                 () => shapeHelper.EditorTemplate(TemplateName: TemplateName, Model: model, Prefix: Prefix));
diff --git a/src/Orchard.Web/Modules/Orchard.PublishLater/Placement.info b/src/Orchard.Web/Modules/Orchard.PublishLater/Placement.info
index 540beb062..44407210b 100644
--- a/src/Orchard.Web/Modules/Orchard.PublishLater/Placement.info
+++ b/src/Orchard.Web/Modules/Orchard.PublishLater/Placement.info
@@ -7,7 +7,7 @@
     -->
     <!-- edit shape just get default placement -->
     <!-- edit "shape" -->
-    <Place Parts_PublishLater_Edit="Sidebar:22"/><!-- immediately following the contents module's save button -->
+    <Place Parts_PublishLater_Edit="Sidebar:25"/><!-- immediately following the contents module's Publish Now button -->
     <!-- default positioning -->
     <Match DisplayType="SummaryAdmin">
         <Place Parts_PublishLater_Metadata_SummaryAdmin="Meta:1"/>
diff --git a/src/Orchard.Web/Modules/Orchard.PublishLater/Styles/orchard-publishlater-datetime.css b/src/Orchard.Web/Modules/Orchard.PublishLater/Styles/orchard-publishlater-datetime.css
index af6b87158..3ada88ce5 100644
--- a/src/Orchard.Web/Modules/Orchard.PublishLater/Styles/orchard-publishlater-datetime.css
+++ b/src/Orchard.Web/Modules/Orchard.PublishLater/Styles/orchard-publishlater-datetime.css
@@ -6,9 +6,25 @@ html.dyn input.hinted {
     color:#ccc;
     font-style:italic;
 }
+
+fieldset.publish-later-datetime {
+    float:left;
+    clear:none;
+    white-space: nowrap;
+    vertical-align: middle;
+}
+fieldset.publish-later-datetime legend {
+    display:none;
+}
+fieldset.publish-later-datetime input {
+    padding:1px;
+    text-align:center;
+    color:#666;
+}
+
 input#PublishLater_ScheduledPublishDate {
-    width:49%;
+    width:39%;
 }
 input#PublishLater_ScheduledPublishTime {
-    width:43%;
-}
\ No newline at end of file
+    width:33%;
+}
diff --git a/src/Orchard.Web/Modules/Orchard.PublishLater/Views/EditorTemplates/Parts/PublishLater.cshtml b/src/Orchard.Web/Modules/Orchard.PublishLater/Views/EditorTemplates/Parts/PublishLater.cshtml
index d0678e18b..ab6ad2dfa 100644
--- a/src/Orchard.Web/Modules/Orchard.PublishLater/Views/EditorTemplates/Parts/PublishLater.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.PublishLater/Views/EditorTemplates/Parts/PublishLater.cshtml
@@ -12,6 +12,7 @@
     @Html.EditorFor(m => m.ScheduledPublishDate)
     <label class="forpicker" for="@ViewData.TemplateInfo.GetFullHtmlFieldId("ScheduledPublishTime")">@T("Time")</label>
     @Html.EditorFor(m => m.ScheduledPublishTime)
+	<button type="submit" name="submit.Save" value="submit.PublishLater">@T("Publish Later")</button>
 </fieldset>
 @using(Script.Foot()) {
 <script type="text/javascript">
diff --git a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css
index e57b9d212..9a41675c6 100644
--- a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css
+++ b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css
@@ -868,6 +868,9 @@ fieldset.publish-button, fieldset.delete-button, fieldset.save-button {
     clear:none;
     float:left;
 }
+fieldset.save-button {
+    clear:left;
+}
 fieldset.publish-button {
     margin: 0 12px;
     padding: 0 12px;
@@ -876,17 +879,7 @@ fieldset.publish-button {
 fieldset.delete-button {
     margin: 0 0 0 12px;
 }
-fieldset.publish-later-datetime {
-    float:left;
-}
-fieldset.publish-later-datetime legend {
-    display:none;
-}
-fieldset.publish-later-datetime input {
-    padding:1px;
-    text-align:center;
-    color:#666;
-}
+
 
 /* Fields
 ***************************************************************/

From 1ea1551ba6aa800c1277fd88b230340443a16042 Mon Sep 17 00:00:00 2001
From: Suha Can <suhacan@microsoft.com>
Date: Fri, 10 Dec 2010 11:43:12 -0800
Subject: [PATCH 24/25] =?UTF-8?q?16451=20Role=20without=20check=20?=
 =?UTF-8?q?=E2=80=9CEdit=20any=20blog=20posts=E2=80=9D=20can=20edit=20post?=
 =?UTF-8?q?s=20by=20others=20if=20he=20has=20"EditOwn"=20permission?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--HG--
branch : dev
---
 .../Controllers/BlogPostAdminController.cs    |  8 +--
 .../Orchard.Blogs/Orchard.Blogs.csproj        |  1 +
 .../Security/BlogAuthorizationEventHandler.cs | 49 +++++++++++++++++++
 3 files changed, 55 insertions(+), 3 deletions(-)
 create mode 100644 src/Orchard.Web/Modules/Orchard.Blogs/Security/BlogAuthorizationEventHandler.cs

diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogPostAdminController.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogPostAdminController.cs
index d60e3e56d..47bfce9df 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogPostAdminController.cs
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Controllers/BlogPostAdminController.cs
@@ -9,6 +9,8 @@ using Orchard.ContentManagement.Aspects;
 using Orchard.Core.Contents.Settings;
 using Orchard.Localization;
 using Orchard.Mvc.AntiForgery;
+using Orchard.Security;
+using Orchard.Security.Permissions;
 using Orchard.UI.Admin;
 using Orchard.UI.Notify;
 
@@ -84,9 +86,6 @@ namespace Orchard.Blogs.Controllers {
         //todo: the content shape template has extra bits that the core contents module does not (remove draft functionality)
         //todo: - move this extra functionality there or somewhere else that's appropriate?
         public ActionResult Edit(int blogId, int postId) {
-            if (!Services.Authorizer.Authorize(Permissions.EditOwnBlogPost, T("Couldn't edit blog post")))
-                return new HttpUnauthorizedResult();
-
             var blog = _blogService.Get(blogId, VersionOptions.Latest);
             if (blog == null)
                 return HttpNotFound();
@@ -95,6 +94,9 @@ namespace Orchard.Blogs.Controllers {
             if (post == null)
                 return HttpNotFound();
 
+            if (!Services.Authorizer.Authorize(Permissions.EditOthersBlogPost, post.ContentItem, T("Couldn't edit blog post")))
+                return new HttpUnauthorizedResult();
+
             dynamic model = Services.ContentManager.BuildEditor(post);
             // Casting to avoid invalid (under medium trust) reflection over the protected View method and force a static invocation.
             return View((object)model);
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj b/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj
index 485adb414..2283d6feb 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj
@@ -82,6 +82,7 @@
     <Compile Include="Routing\IsArchiveConstraint.cs" />
     <Compile Include="Routing\BlogSlugConstraint.cs" />
     <Compile Include="Routing\BlogSlugConstraintUpdator.cs" />
+    <Compile Include="Security\BlogAuthorizationEventHandler.cs" />
     <Compile Include="Services\BlogService.cs" />
     <Compile Include="Controllers\BlogController.cs" />
     <Compile Include="Models\BlogPart.cs" />
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Security/BlogAuthorizationEventHandler.cs b/src/Orchard.Web/Modules/Orchard.Blogs/Security/BlogAuthorizationEventHandler.cs
new file mode 100644
index 000000000..fb0585f71
--- /dev/null
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Security/BlogAuthorizationEventHandler.cs
@@ -0,0 +1,49 @@
+using JetBrains.Annotations;
+using Orchard.ContentManagement;
+using Orchard.ContentManagement.Aspects;
+using Orchard.Security;
+using Orchard.Security.Permissions;
+
+namespace Orchard.Blogs.Security {
+    [UsedImplicitly]
+    public class BlogAuthorizationEventHandler : IAuthorizationServiceEventHandler {
+        public void Checking(CheckAccessContext context) { }
+        public void Complete(CheckAccessContext context) { }
+
+        public void Adjust(CheckAccessContext context) {
+            if (!context.Granted &&
+                context.Content.Is<ICommonPart>()) {
+                if (OwnerVariationExists(context.Permission) &&
+                    HasOwnership(context.User, context.Content)) {
+                    context.Adjusted = true;
+                    context.Permission = GetOwnerVariation(context.Permission);
+                }
+            }
+        }
+
+        private static bool HasOwnership(IUser user, IContent content) {
+            if (user == null || content == null)
+                return false;
+
+            var common = content.As<ICommonPart>();
+            if (common == null || common.Owner == null)
+                return false;
+
+            return user.Id == common.Owner.Id;
+        }
+
+        private static bool OwnerVariationExists(Permission permission) {
+            return GetOwnerVariation(permission) != null;
+        }
+
+        private static Permission GetOwnerVariation(Permission permission) {
+            if (permission.Name == Permissions.PublishOthersBlogPost.Name)
+                return Permissions.PublishOwnBlogPost;
+            if (permission.Name == Permissions.EditOthersBlogPost.Name)
+                return Permissions.EditOwnBlogPost;
+            if (permission.Name == Permissions.DeleteOthersBlogPost.Name)
+                return Permissions.DeleteOwnBlogPost;
+            return null;
+        }
+    }
+}
\ No newline at end of file

From 66b9ae5d4f3efb18a70a7c39d7d3795222b313d4 Mon Sep 17 00:00:00 2001
From: Andre Rodrigues <andrerod@microsoft.com>
Date: Fri, 10 Dec 2010 11:54:12 -0800
Subject: [PATCH 25/25] #17022: Initializing services.

--HG--
branch : dev
---
 .../Orchard.Packaging/Controllers/PackagingServicesController.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Orchard.Web/Modules/Orchard.Packaging/Controllers/PackagingServicesController.cs b/src/Orchard.Web/Modules/Orchard.Packaging/Controllers/PackagingServicesController.cs
index 08a5abb83..1686dcfb3 100644
--- a/src/Orchard.Web/Modules/Orchard.Packaging/Controllers/PackagingServicesController.cs
+++ b/src/Orchard.Web/Modules/Orchard.Packaging/Controllers/PackagingServicesController.cs
@@ -31,6 +31,7 @@ namespace Orchard.Packaging.Controllers {
             _packageManager = packageManager;
             _notifier = notifier;
             _appDataFolderRoot = appDataFolderRoot;
+            Services = services;
 
             T = NullLocalizer.Instance;
         }