From 60be23ed73270e55359dc3ccf0feaad34ccf7a74 Mon Sep 17 00:00:00 2001
From: Nicholas Mayne <Jetski5822@gmail.com>
Date: Sat, 26 Apr 2014 11:11:20 +0100
Subject: [PATCH 1/6] #20638: Changing ContainerPart to ContainablePart in
 settings

Work Item: 20638
---
 src/Orchard.Web/Core/Containers/Settings/ContainableSettings.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Orchard.Web/Core/Containers/Settings/ContainableSettings.cs b/src/Orchard.Web/Core/Containers/Settings/ContainableSettings.cs
index fabf93b2c..9781bcb98 100644
--- a/src/Orchard.Web/Core/Containers/Settings/ContainableSettings.cs
+++ b/src/Orchard.Web/Core/Containers/Settings/ContainableSettings.cs
@@ -21,7 +21,7 @@ namespace Orchard.Core.Containers.Settings {
         }
 
         public override IEnumerable<TemplateViewModel> TypePartEditorUpdate(ContentTypePartDefinitionBuilder builder, IUpdateModel updateModel) {
-            if (builder.Name != "ContainerPart")
+            if (builder.Name != "ContainablePart")
                 yield break;
 
             var model = new ContainableTypePartSettings();

From 3689cf8bf4896adca547e58e2a49a01ce82c5184 Mon Sep 17 00:00:00 2001
From: planetClaire <marshy@zeta.com.au>
Date: Sat, 8 Mar 2014 15:44:53 +0800
Subject: [PATCH 2/6] #19093 Displaying widget type in list & edit widgets

Work Item: 19093
---
 .../Modules/Orchard.Widgets/Styles/orchard-widgets-admin.css  | 4 ++++
 .../Views/EditorTemplates/Parts.Widgets.WidgetPart.cshtml     | 1 +
 .../Orchard.Widgets/Views/WidgetPlacement.Zones.cshtml        | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Styles/orchard-widgets-admin.css b/src/Orchard.Web/Modules/Orchard.Widgets/Styles/orchard-widgets-admin.css
index 792067b05..eead10c7f 100644
--- a/src/Orchard.Web/Modules/Orchard.Widgets/Styles/orchard-widgets-admin.css
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Styles/orchard-widgets-admin.css
@@ -132,6 +132,10 @@ position:absolute;
 top:1px;
 width:20px;
 }
+.widgets-listed .widgets-zone-widgets h3, 
+.widgets-listed .widgets-zone-widgets .contentType {
+display: inline;
+}
 .widgets-listed .widgets-move {
 background:url(images/arrows.png) 7px -31px no-repeat;
 border:0;
diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Views/EditorTemplates/Parts.Widgets.WidgetPart.cshtml b/src/Orchard.Web/Modules/Orchard.Widgets/Views/EditorTemplates/Parts.Widgets.WidgetPart.cshtml
index 21afb9cb6..3376ef9d2 100644
--- a/src/Orchard.Web/Modules/Orchard.Widgets/Views/EditorTemplates/Parts.Widgets.WidgetPart.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Views/EditorTemplates/Parts.Widgets.WidgetPart.cshtml
@@ -1,4 +1,5 @@
 @model Orchard.Widgets.Models.WidgetPart
+<h2>@Model.TypeDefinition.DisplayName</h2>
 <fieldset>
     @Html.LabelFor(widget => widget.Zone, T("Zone"))
     @Html.DropDownListFor(widget => widget.Zone, new SelectList(Model.AvailableZones))
diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Views/WidgetPlacement.Zones.cshtml b/src/Orchard.Web/Modules/Orchard.Widgets/Views/WidgetPlacement.Zones.cshtml
index 1f8be0473..d8e2d911a 100644
--- a/src/Orchard.Web/Modules/Orchard.Widgets/Views/WidgetPlacement.Zones.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Views/WidgetPlacement.Zones.cshtml
@@ -22,7 +22,7 @@
                     foreach (WidgetPart widget in widgets.Where(w => w.Zone == zone).OrderBy(w => w.Position, new Orchard.UI.FlatPositionComparer())) {
                         <li class="widgets-@(widget.LayerId == Model.CurrentLayer.Id ? "this" : "other")-layer widgets-layer-@widget.LayerId@(i == 0 ? " first" : (i == count ? " last" : ""))">
                             @using (Html.BeginFormAntiForgeryPost()) {
-                                <h3>@Html.ActionLink(HasText(widget.Title) ? widget.Title : widget.TypeDefinition.DisplayName, "EditWidget", new { @widget.Id, returnUrl })</h3>
+                                <h3>@Html.ActionLink(HasText(widget.Title) ? widget.Title : widget.TypeDefinition.DisplayName, "EditWidget", new { @widget.Id, returnUrl })</h3><div class="contentType"> - @widget.TypeDefinition.DisplayName</div>
                                 <div class="widgets-actions">
                                     @if (widget.LayerId != Model.CurrentLayer.Id) {
                                     <button name="moveHere" class="link" type="submit" value="1">@T("Move to current layer")</button>

From a956c331d8367e476bd4bf8615bd71497862b6cc Mon Sep 17 00:00:00 2001
From: Stanley Goldman <stanley.goldman@thelifestylepress.com>
Date: Fri, 10 Jan 2014 15:32:22 -0500
Subject: [PATCH 3/6] #18656 Adding ContainablePart.Weight for Sorting in
 ContainerWidget

Work Item: 18656
---
 .../Core/Containers/Views/EditorTemplates/ContainerWidget.cshtml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Orchard.Web/Core/Containers/Views/EditorTemplates/ContainerWidget.cshtml b/src/Orchard.Web/Core/Containers/Views/EditorTemplates/ContainerWidget.cshtml
index 04bfbc8d0..9be03b722 100644
--- a/src/Orchard.Web/Core/Containers/Views/EditorTemplates/ContainerWidget.cshtml
+++ b/src/Orchard.Web/Core/Containers/Views/EditorTemplates/ContainerWidget.cshtml
@@ -16,6 +16,7 @@
 <fieldset>
     @Html.LabelFor(m => m.Part.Record.OrderByProperty, T("Order by"))
     <select id="@Html.FieldIdFor(m => m.Part.Record.OrderByProperty)" name="@Html.FieldNameFor(m => m.Part.Record.OrderByProperty)">
+        @Html.SelectOption(Model.Part.Record.OrderByProperty, "ContainablePart.Weight", T("Weight").Text)
         @Html.SelectOption(Model.Part.Record.OrderByProperty, "CommonPart.CreatedUtc", T("Date Created").Text)
         @Html.SelectOption(Model.Part.Record.OrderByProperty, "CommonPart.PublishedUtc", T("Date Published").Text)
         @Html.SelectOption(Model.Part.Record.OrderByProperty, "TitlePart.Title", T("Title (Title Part)").Text)

From 15cdb77938999d71766ffb878fa8c4e32d9e600b Mon Sep 17 00:00:00 2001
From: Sebastien Ros <sebastien.ros@microsoft.com>
Date: Wed, 23 Apr 2014 10:48:59 -0700
Subject: [PATCH 4/6] Fixing Rsd constraint

---
 src/Orchard.Web/Modules/Orchard.Blogs/Routing/RsdConstraint.CS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Routing/RsdConstraint.CS b/src/Orchard.Web/Modules/Orchard.Blogs/Routing/RsdConstraint.CS
index c617c8997..d41b9fde6 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Routing/RsdConstraint.CS
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Routing/RsdConstraint.CS
@@ -39,6 +39,7 @@ namespace Orchard.Blogs.Routing {
                     routeValues["action"] == "Item"
                     ;
 
+                return isBlog;
             }
 
             return false;

From 20a120c657a44d705d18c3594d48eb2957c84301 Mon Sep 17 00:00:00 2001
From: Sebastien Ros <sebastien.ros@microsoft.com>
Date: Mon, 28 Apr 2014 13:19:40 -0700
Subject: [PATCH 5/6] Fixing PathResolutionService

---
 .../Modules/Orchard.Autoroute/Services/PathResolutionService.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Orchard.Web/Modules/Orchard.Autoroute/Services/PathResolutionService.cs b/src/Orchard.Web/Modules/Orchard.Autoroute/Services/PathResolutionService.cs
index 763cc4ade..afdf7e61b 100644
--- a/src/Orchard.Web/Modules/Orchard.Autoroute/Services/PathResolutionService.cs
+++ b/src/Orchard.Web/Modules/Orchard.Autoroute/Services/PathResolutionService.cs
@@ -17,7 +17,7 @@ namespace Orchard.Autoroute.Services {
 
         public AutoroutePart GetPath(string path) {
             var autorouteRecord = _autorouteRepository.Table
-                .Where(part => part.DisplayAlias == path && part.ContentItemVersionRecord.Latest && part.ContentItemVersionRecord.Published)
+                .Where(part => part.DisplayAlias == path && part.ContentItemVersionRecord.Published)
                 .FirstOrDefault();
 
             if (autorouteRecord == null) {

From 52ec22612593f2f36f66e3b3963d001c8f738a03 Mon Sep 17 00:00:00 2001
From: Sebastien Ros <sebastien.ros@microsoft.com>
Date: Mon, 28 Apr 2014 13:20:42 -0700
Subject: [PATCH 6/6] Disable public caching when querystring is present

---
 .../Modules/Orchard.OutputCache/Filters/OutputCacheFilter.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/Orchard.Web/Modules/Orchard.OutputCache/Filters/OutputCacheFilter.cs b/src/Orchard.Web/Modules/Orchard.OutputCache/Filters/OutputCacheFilter.cs
index dea8cec14..f33d89a6a 100644
--- a/src/Orchard.Web/Modules/Orchard.OutputCache/Filters/OutputCacheFilter.cs
+++ b/src/Orchard.Web/Modules/Orchard.OutputCache/Filters/OutputCacheFilter.cs
@@ -228,6 +228,11 @@ namespace Orchard.OutputCache.Filters {
                 }
             }
 
+            // don't enable public caching for requests with query string 
+            if (queryString.AllKeys.Any()) {
+                _maxAge = 0;
+            }
+
             // compute the cache key
             _cacheKey = ComputeCacheKey(filterContext, parameters);