From 3405a97ed4c7d7fb4e6c85d927ef58d2feb923ea Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Thu, 8 Oct 2015 21:26:34 +0200
Subject: [PATCH] U4-7215 Shared pagination for all layouts

---
 .../src/less/listview.less                    |  6 +++-
 .../listview/layouts/list/list.html           | 32 -------------------
 .../propertyeditors/listview/listview.html    | 27 ++++++++++++++++
 3 files changed, 32 insertions(+), 33 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/listview.less b/src/Umbraco.Web.UI.Client/src/less/listview.less
index cb5500e5f9..5e792bc4bf 100644
--- a/src/Umbraco.Web.UI.Client/src/less/listview.less
+++ b/src/Umbraco.Web.UI.Client/src/less/listview.less
@@ -181,6 +181,10 @@
   color: #b0b0b0
 }
 
+.umb-listview .pagination {
+   text-align: center;
+}
+
 .umb-listview .pagination ul {
   -webkit-border-radius: 0px;
   -moz-border-radius: 0px;
@@ -195,7 +199,7 @@
   border:none;
   padding: 8px 4px 2px 4px;
   background: none;
-  font-size: 11px;
+  font-size: 12px;
   color: #b0b0b0
 }
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/list/list.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/list/list.html
index d3363f613d..07f6bffd29 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/list/list.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/list/list.html
@@ -48,36 +48,4 @@
         </tr>
     </tbody>
 
-    <tfoot ng-show="pagination.length > 1">
-        <tr>
-            <th colspan="{{options.includeProperties.length + 2}}">
-                <div class="pull-left">
-                </div>
-                <div class="pagination pagination-right">
-                    <ul>
-                        <li ng-class="{disabled:options.pageNumber <= 1}">
-                            <a href="#" ng-click="prev()" prevent-default>
-                                <localize key="general_previous">Previous</localize>
-                            </a>
-                        </li>
-
-                        <li ng-repeat="pgn in pagination"
-                            ng-class="{active:pgn.isActive}">
-
-                            <a href="#" ng-click="goToPage(pgn.val - 1)" prevent-default
-                               ng-bind="pgn.name ? pgn.name : pgn.val"
-                               ng-if="pgn.val != '...'"></a>
-                            <span ng-bind="pgn.val" ng-if="pgn.val == '...'"></span>
-                        </li>
-
-                        <li ng-class="{disabled:options.pageNumber >= listViewResultSet.totalPages}">
-                            <a href="#" ng-click="next()" prevent-default>
-                                <localize key="general_next">Next</localize>
-                            </a>
-                        </li>
-                    </ul>
-                </div>
-            </th>
-        </tr>
-    </tfoot>
 </table>
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
index 6bed8145a4..645c8cee8e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
@@ -65,5 +65,32 @@
 
         <div ng-include="layout.activeLayout.path"></div>
 
+        <div class="pagination" ng-show="pagination.length > 1">
+
+           <ul>
+              <li ng-class="{disabled:options.pageNumber <= 1}">
+                   <a href="#" ng-click="prev()" prevent-default>
+                      <localize key="general_previous">Previous</localize>
+                   </a>
+              </li>
+
+              <li ng-repeat="pgn in pagination"
+                   ng-class="{active:pgn.isActive}">
+
+                   <a href="#" ng-click="goToPage(pgn.val - 1)" prevent-default
+                      ng-bind="pgn.name ? pgn.name : pgn.val"
+                      ng-if="pgn.val != '...'"></a>
+                   <span ng-bind="pgn.val" ng-if="pgn.val == '...'"></span>
+              </li>
+
+              <li ng-class="{disabled:options.pageNumber >= listViewResultSet.totalPages}">
+                   <a href="#" ng-click="next()" prevent-default>
+                      <localize key="general_next">Next</localize>
+                   </a>
+              </li>
+           </ul>
+
+        </div>
+
     </div>
 </div>