From a91d0e4c787b98fb44bd2205073b79ad90a3f484 Mon Sep 17 00:00:00 2001
From: franck <franck@cqfdev.fr>
Date: Mon, 8 Jul 2013 13:39:37 +0200
Subject: [PATCH 1/2] Fixed method name

---
 core/lib/Thelia/Admin/Controller/BaseAdminController.php | 4 ++--
 core/lib/Thelia/Core/Template/Loop/Product.php           | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/lib/Thelia/Admin/Controller/BaseAdminController.php b/core/lib/Thelia/Admin/Controller/BaseAdminController.php
index 5a4020561..7c66c430b 100755
--- a/core/lib/Thelia/Admin/Controller/BaseAdminController.php
+++ b/core/lib/Thelia/Admin/Controller/BaseAdminController.php
@@ -83,7 +83,7 @@ class BaseAdminController extends ContainerAware
         catch (AuthenticationTokenNotFoundException $ex) {
 
 			// No auth token -> perform login
-        	return new RedirectResponse($this->generateUrl('/admin/login'));
+        	return new RedirectResponse($this->generateUrl('admin/login'));
         }
 
         return $data;
@@ -134,7 +134,7 @@ class BaseAdminController extends ContainerAware
      */
     public function generateUrl($route, $parameters = array(), $referenceType = UrlGeneratorInterface::ABSOLUTE_PATH)
     {
-    	return "$route";
+    	return "thelia2/$route";
 
     	//return $this->container->get('router')->generate($route, $parameters, $referenceType);
     }
diff --git a/core/lib/Thelia/Core/Template/Loop/Product.php b/core/lib/Thelia/Core/Template/Loop/Product.php
index 2d427d6b7..acef5a27d 100755
--- a/core/lib/Thelia/Core/Template/Loop/Product.php
+++ b/core/lib/Thelia/Core/Template/Loop/Product.php
@@ -55,7 +55,7 @@ class Product extends BaseLoop
     /**
      * @return ArgumentCollection
      */
-    protected function defineArgs()
+    protected function getArgDefinitions()
     {
         return new ArgumentCollection(
             Argument::createIntListTypeArgument('id'),

From b130abb9c3b4270c95d1f6af52b27faea7d78d83 Mon Sep 17 00:00:00 2001
From: franck <franck@cqfdev.fr>
Date: Mon, 8 Jul 2013 14:13:38 +0200
Subject: [PATCH 2/2] Added sample to pagination.html

---
 templates/smarty-sample/pagination.html | 43 +++++++++++++++++++++++--
 1 file changed, 41 insertions(+), 2 deletions(-)

diff --git a/templates/smarty-sample/pagination.html b/templates/smarty-sample/pagination.html
index 5a5182177..cb06db66b 100755
--- a/templates/smarty-sample/pagination.html
+++ b/templates/smarty-sample/pagination.html
@@ -19,7 +19,7 @@
         <ul>
         {loop name="prod" type="product" category="#ID" page="{$product_current_page}" limit="2"}
             <li>
-                #REF
+                #ID:#REF
             </li>
         {/loop}
         </ul>
@@ -52,4 +52,43 @@
 {if {$PAGE} != {$LAST}}
     -
 {/if}
-{/pageloop}
\ No newline at end of file
+{/pageloop}
+
+<hr>
+Pagination before loop
+<hr>
+{assign var=product_current_page value={$smarty.get.$this_product_getter|default:1}}
+
+{capture name="prod2"}
+       {loop name="prod2" type="product" page="{$product_current_page}" limit="2"}
+            <li>
+                #ID:#REF
+            </li>
+        {/loop}
+{/capture}
+
+{pageloop rel="prod2"}
+    {if ${PAGE} != {$product_current_page}}
+        <a href="index_dev.php?view=pagination&category_page={$category_current_page}&{$this_product_getter}=#PAGE">#PAGE</a>
+    {else}
+        { #PAGE }
+    {/if}
+    {if {$PAGE} != {$LAST}}
+        -
+    {/if}
+{/pageloop}
+
+{$smarty.capture.prod2}
+
+{pageloop rel="prod2"}
+    {if ${PAGE} != {$product_current_page}}
+        <a href="index_dev.php?view=pagination&category_page={$category_current_page}&{$this_product_getter}=#PAGE">#PAGE</a>
+    {else}
+        { #PAGE }
+    {/if}
+    {if {$PAGE} != {$LAST}}
+        -
+    {/if}
+{/pageloop}
+
+