[Checkins] SVN: Products.CMFDefault/branches/charlie_formlib_for_folders/Products/CMFDefault/browser/templates/ Folded into batch_widgets.pt

[Charlie Clark]

Log message for revision 102631:
  Folded into batch_widgets.pt

Changed:
  U   Products.CMFDefault/branches/charlie_formlib_for_folders/Products/CMFDefault/browser/templates/batch_widgets.pt
  U   Products.CMFDefault/branches/charlie_formlib_for_folders/Products/CMFDefault/browser/templates/contents.pt
  D   Products.CMFDefault/branches/charlie_formlib_for_folders/Products/CMFDefault/browser/templates/pagination_widgets.pt

-=-
Modified: Products.CMFDefault/branches/charlie_formlib_for_folders/Products/CMFDefault/browser/templates/batch_widgets.pt
===================================================================
--- Products.CMFDefault/branches/charlie_formlib_for_folders/Products/CMFDefault/browser/templates/batch_widgets.pt	2009-08-10 17:09:56 UTC (rev 102630)
+++ Products.CMFDefault/branches/charlie_formlib_for_folders/Products/CMFDefault/browser/templates/batch_widgets.pt	2009-08-10 17:22:44 UTC (rev 102631)
@@ -14,7 +14,7 @@
 ></metal:macro>
 
  <metal:macro metal:define-macro="listing" i18n:domain="cmf_default">
- <p class="BatchListing" tal:repeat="item_info view/list_batch_items"
+ <p class="BatchListing" tal:repeat="item_info view/listBatchItems"
  ><a href="" tal:attributes="href item_info/url"
   ><img src="" alt="" title="" border="0" width="16" height="16"
       tal:attributes="src item_info/icon; alt item_info/type;
@@ -50,5 +50,26 @@
  ></p
 ></metal:macro>
 
+<metal:macro metal:define-macro="pagination"
+  tal:define="current_page view/current_page;
+              prev_info view/navigation_previous;
+              next_info view/navigation_next">
+	<a href="" 
+	   tal:condition="prev_info"
+		 tal:attributes="href prev_info/url">&lt;&lt;</a>
+	<tal:repeat repeat="page view/page_range">
+		<a tal:condition="python: not page['number'] == current_page" 
+		  tal:attributes="href page/url"
+		  tal:content="page/number">Page number</a>
+	  <span tal:condition="python: page['number'] == current_page"
+	        tal:content="page/number">Page number</span>
+		<tal:condition condition="not: repeat/page/end">|</tal:condition> 
+	</tal:repeat>
+	
+	<a href="" 
+	   tal:condition="python: current_page != view.page_count() and next_info" 
+	   tal:attributes="href next_info/url">&gt;&gt;</a>
+</metal:macro>
+
 </body>
 </html>

Modified: Products.CMFDefault/branches/charlie_formlib_for_folders/Products/CMFDefault/browser/templates/contents.pt
===================================================================
--- Products.CMFDefault/branches/charlie_formlib_for_folders/Products/CMFDefault/browser/templates/contents.pt	2009-08-10 17:09:56 UTC (rev 102630)
+++ Products.CMFDefault/branches/charlie_formlib_for_folders/Products/CMFDefault/browser/templates/contents.pt	2009-08-10 17:22:44 UTC (rev 102631)
@@ -73,6 +73,7 @@
 </div>
 </form>
 <metal:macro metal:use-macro="context/@@batch_widget/navigation" />
+<metal:macro metal:use-macro="context/@@batch_widget/pagination" />
 </metal:slot>
 
 </body>

Deleted: Products.CMFDefault/branches/charlie_formlib_for_folders/Products/CMFDefault/browser/templates/pagination_widgets.pt
===================================================================
--- Products.CMFDefault/branches/charlie_formlib_for_folders/Products/CMFDefault/browser/templates/pagination_widgets.pt	2009-08-10 17:09:56 UTC (rev 102630)
+++ Products.CMFDefault/branches/charlie_formlib_for_folders/Products/CMFDefault/browser/templates/pagination_widgets.pt	2009-08-10 17:22:44 UTC (rev 102631)
@@ -1,18 +0,0 @@
-<metal:macro metal:define-macro="pagination"
-  tal:define="current_page view/current_page_number">
-	<a href="" 
-	   tal:condition="python: current_page != 1"
-		 tal:attributes="href view/navigation_previous/url">&lt;&lt;</a>
-	<tal:repeat repeat="page view/getPages">
-		<a tal:condition="python: not page['number'] == current_page" 
-		  tal:attributes="href page/url"
-		  tal:content="page/number">Page number</a>
-	  <span tal:condition="python: page['number'] == current_page"
-	        tal:content="page/number">Page number</span>
-		<tal:condition condition="not: repeat/page/end">|</tal:condition> 
-	</tal:repeat>
-	
-	<a href="" 
-	   tal:condition="python: current_page != view/page_count()" 
-	   tal:attributes="href view/navigation_next/url">&gt;&gt;</a>
-</metal>
\ No newline at end of file