From 77656edc7fc80d484742babccbfdba80b16bbada Mon Sep 17 00:00:00 2001
From: "piedone@pyrocenter.hu" <piedone@pyrocenter.hu>
Date: Sun, 27 Nov 2011 22:50:16 +0100
Subject: [PATCH] Fixing that container pager shape was not displayed

--HG--
branch : 1.x
extra : rebase_source : 80295bb54f53c656d8da9113f4dfcb43d2040fe9
---
 .../Containers/Drivers/ContainerPartDriver.cs     | 15 +++++++++------
 .../Views/Parts.Container.Contained.cshtml        |  3 +++
 src/Orchard.Web/Core/Orchard.Core.csproj          |  3 +++
 .../Modules/Orchard.Lists/Orchard.Lists.csproj    |  5 ++++-
 4 files changed, 19 insertions(+), 7 deletions(-)
 create mode 100644 src/Orchard.Web/Core/Containers/Views/Parts.Container.Contained.cshtml

diff --git a/src/Orchard.Web/Core/Containers/Drivers/ContainerPartDriver.cs b/src/Orchard.Web/Core/Containers/Drivers/ContainerPartDriver.cs
index 18191c499..b28e89407 100644
--- a/src/Orchard.Web/Core/Containers/Drivers/ContainerPartDriver.cs
+++ b/src/Orchard.Web/Core/Containers/Drivers/ContainerPartDriver.cs
@@ -68,17 +68,20 @@ namespace Orchard.Core.Containers.Drivers {
                                                     ? pager.PageSize
                                                     : part.PageSize;
 
-                                 // var pagerShape = _shapeFactory.Pager(pager).TotalItemCount(query.Count());
+                                 var pagerShape = shapeHelper.Pager(pager).TotalItemCount(query.Count());
 
                                  var startIndex = part.Paginated ? pager.GetStartIndex() : 0;
                                  var pageOfItems = query.Slice(startIndex, pager.PageSize).ToList();
 
-                                 var list = _shapeFactory.List();
-                                 list.AddRange(pageOfItems.Select(item => _contentManager.BuildDisplay(item, "Summary")));
-                                 list.Classes.Add("content-items");
-                                 list.Classes.Add("list-items");
+                                 var listShape = shapeHelper.List();
+                                 listShape.AddRange(pageOfItems.Select(item => _contentManager.BuildDisplay(item, "Summary")));
+                                 listShape.Classes.Add("content-items");
+                                 listShape.Classes.Add("list-items");
 
-                                 return list;
+                                 return shapeHelper.Parts_Container_Contained(
+                                        List: listShape,
+                                        Pager: pagerShape
+                                    );
                              }),
                 ContentShape("Parts_Container_Contained_Summary",
                              () => shapeHelper.Parts_Container_Contained_Summary(ContentPart: part)),
diff --git a/src/Orchard.Web/Core/Containers/Views/Parts.Container.Contained.cshtml b/src/Orchard.Web/Core/Containers/Views/Parts.Container.Contained.cshtml
new file mode 100644
index 000000000..31455c080
--- /dev/null
+++ b/src/Orchard.Web/Core/Containers/Views/Parts.Container.Contained.cshtml
@@ -0,0 +1,3 @@
+@Display(Model.List)
+
+@Display(Model.Pager)
\ No newline at end of file
diff --git a/src/Orchard.Web/Core/Orchard.Core.csproj b/src/Orchard.Web/Core/Orchard.Core.csproj
index c16be04f5..a9464d60f 100644
--- a/src/Orchard.Web/Core/Orchard.Core.csproj
+++ b/src/Orchard.Web/Core/Orchard.Core.csproj
@@ -490,6 +490,9 @@
   <ItemGroup>
     <Content Include="Shapes\Views\ErrorPage.cshtml" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="Containers\Views\Parts.Container.Contained.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.Lists/Orchard.Lists.csproj b/src/Orchard.Web/Modules/Orchard.Lists/Orchard.Lists.csproj
index a59b9e679..d6a89f778 100644
--- a/src/Orchard.Web/Modules/Orchard.Lists/Orchard.Lists.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Lists/Orchard.Lists.csproj
@@ -18,6 +18,7 @@
     <OldToolsVersion>3.5</OldToolsVersion>
     <UpgradeBackupLocation />
     <TargetFrameworkProfile />
+    <UseIISExpress>false</UseIISExpress>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -83,7 +84,9 @@
     </Content>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Placement.info" />
+    <Content Include="Placement.info">
+      <SubType>Designer</SubType>
+    </Content>
   </ItemGroup>
   <ItemGroup>
     <Content Include="Views\Admin\List.cshtml" />