Changeset 844

Timestamp:

04/17/07 10:27:50

Author:

mylan

Message:

add batch navigation for simple blog view template

Files:

• SimpleBlog/branches/optimizations/content/blog.py (modified) (3 diffs)
• SimpleBlog/branches/optimizations/skins/SimpleBlog/blog_navigation_macros.pt (modified) (2 diffs)
• SimpleBlog/branches/optimizations/skins/SimpleBlog/simpleblog_view.pt (modified) (2 diffs)

SimpleBlog/branches/optimizations/content/blog.py

@@ -260 +260 @@
-        return [f for f in self.getBRefs('AppearsIn') if self.portal_membership.checkPermission('View', f)]
-
+    def buildBatch(self, b_start):
+        """Return batch for navigation"""
+        len = self._count()
+        ditems = self.getDisplayItems()
+        max_pages = len/ditems
+        batch = []
+        if max_pages:
+            vis_middle = 3  # max number of pages in one of the side around current
+            curr_num = b_start/ditems >= max_pages and max_pages or b_start/ditems+1
+            # first page (when current page far from 1st page)
+            first = []
+            if curr_num-vis_middle > 2:
+                first = [1,"b_start=0"]
+            batch.append(first)
+            # last page (when current page far from terminal page)
+            last = []
+            if max_pages-curr_num > vis_middle+1:
+                last = [max_pages,"b_start=%d" % ((max_pages-1)*ditems)]
+            batch.append(last)
+            # form batch around current page
+            lft_bound =  curr_num-vis_middle > 2 and curr_num-vis_middle or 1
+            rght_bound = max_pages-curr_num > vis_middle+1 and curr_num+vis_middle or max_pages
+            lst = []
+            for p in range(lft_bound, rght_bound+1):
+                q = p!=curr_num and "b_start=%d" % ((p-1)*ditems) or ""
+                lst.append([p,q])
+            batch.append(lst)
+        return batch
+
+    def getStart(self):
+        """ Validate b_start from request and return right value."""
+        request = self.REQUEST
+        try:
+            b_start = int(request.get('b_start', 0)) or 0
+        except:
+            b_start = 0
+        ditems = self.getDisplayItems()
+        count = self._count()
+        if b_start > count:
+            b_start = count - (count % ditems)
+        elif b_start < 0:
+            b_start = 0
+        else:
+            b_start = (b_start % ditems)!=0 and (b_start/ditems)*ditems or b_start
+        return b_start
+
-    def getEntries(self, category=None, maxResults=None, b_start=0, filterState=1, join=0, skipOnTop=0, mode="", **kwargs):
-        """ Return all the contained published entries, real objects, not the brains """
@@ -282 +328 @@
-
-        onBottom = list(self.portal_catalog.searchResults(query))
+        batch = 'navigation' in query.keys() and self.buildBatch(b_start) or []
-        ####  cut the b_start when it is tooo large
-
@@ -299 +346 @@
-                    last = 1
-                results = results[b_start:]
-
-
-
-
-
+
-        else:
-
+, batch
-
-    def getAdminEmail(self):

SimpleBlog/branches/optimizations/skins/SimpleBlog/blog_navigation_macros.pt

@@ -5 +5 @@
-<div class="listingBar"
-     metal:define-macro="navigation"
-
+
+
+
+
+
+
-   <span class="previous"
-      tal:condition="python:int(b_start)>0">
@@ -26 +31 @@
-        </a>
-    </span>
+
+    <!-- Link to first -->
+    <span tal:condition="first_item">
+        <a href=""
+           tal:define="query python:first_item[1];"
+           tal:attributes="href python: '%s?%s' % (url, query);">1</a>
+           ...
+    </span>
+
+    <!-- Pagelist with links to previous pages for quick navigation -->
+    <span tal:condition="batch"
+          tal:repeat="linklist batch"
+          tal:omit-tag="" >
+        <a href=""
+           tal:define="page python:linklist[0];
+                       query python:linklist[1];"
+           tal:content="page"
+           tal:attributes="href python: '%s?%s' % (url,query)"
+           tal:omit-tag="not:query" >
+        </a>
+    </span>
+
+    <!-- Link to last -->
+    <span tal:condition="last_item">
+        ...
+        <a href=""
+           tal:define="page python:last_item[0];
+                       query python:last_item[1];"
+           tal:attributes="href python: '%s?%s' % (url,query);"
+           tal:content="page">3457</a>
+    </span>
+
-</div>
+
-</body>
-</html>

SimpleBlog/branches/optimizations/skins/SimpleBlog/simpleblog_view.pt

@@ -6 +6 @@
-<div metal:fill-slot="main">
-    <tal:main-macro metal:define-macro="main"
-Items python:here.getDisplayItems
-Mode displayMode | python:here.getDisplayMode
+Mode displayMode | python:here.getDisplayMode
+Items python:here.getDisplayItems
-                  b_size python:displayItems;
-
-
-
-
+
+
+
-        <tal:block metal:use-macro="here/SimpleBlog_macros/macros/blogGlobals"/>
-        <div metal:use-macro="here/document_actions/macros/document_actions">
@@ -40 +39 @@
-                <br/>
-                </tal:entry></tal:block>
-
+
+
-        </div>
-        <tal:info tal:condition="not: results">