Get pagination working on index.php

diff --git a/includes/pagination.php b/includes/pagination.php
index 52a69c28ed9e0d1a873a3ac73bfc30496dd600fd..2984e8c44fc6cdfad306a7b0917fbd3b9f26ef5d 100644 (file)
--- a/includes/pagination.php
+++ b/includes/pagination.php
@@ -54,7 +54,8 @@ class Pagination extends BSPagination
                $template->vars = array(
                        'baselink'      => $baselink,
                        'nolink'        => $isCurrent,
-                       'number'        => $pagenumber
+                       'number'        => $pagenumber,
+                       'paginator'     => $this
                );
                return $template->evaluate()->getTemplate();
        }
@@ -62,14 +63,17 @@ class Pagination extends BSPagination
        /**
         * Generates the entire page navigation HTML
         */
-       protected function _navigationProcessor($baselink, $next, $prev, $show, $bits)
+       protected function _navigationProcessor($baselink, $next, $prev, $show2, $bits)
        {
+               global $show;
+               
+               $show = array_merge($show, $show2);
+               
                $template = new BSTemplate('pagenav');
                $template->vars = array(
                        'baselink'      => $baselink,
                        'nextpage'      => $next,
                        'prevpage'      => $prev,
-                       'show'          => $show,
                        'pagebits'      => $bits,
                        'paginator'     => $this
                );

diff --git a/index.php b/index.php
index f83d602a3ae11547275dff0c6ff35f30334fc1e7..eea2ec849afa1da2e8cba89ea2036f804e43f9ec 100644 (file)
--- a/index.php
+++ b/index.php
@@ -76,12 +76,12 @@ $bugs_fetch->free();
 
 $columnHeads = $sort->constructColumnHeaders(true, 'p=' . $pagination->page . '&pp=' . $pagination->perpage);
 $show['pagenav'] = ($pagination->getPageCount() > 1);
-$pagenav = $pagination->constructPageNav($sort->fetch_sort_link($sort->sortkey));
 
 $tpl = new BSTemplate('trackerhome');
 $tpl->vars = array(
        'columnHeads'   => $columnHeads,
-       'bugs'                  => $bugs
+       'bugs'                  => $bugs,
+       'pagenav'               => $pagination->constructPageNav($sort->fetch_sort_link($sort->sortkey))
 );
 $tpl->evaluate()->flush();
 

diff --git a/templates/pagenav.tpl b/templates/pagenav.tpl
index 73784e9d625194073bd00d24facdb582381a60a8..5c9e2524a8a73210717775d494f9e0de958e87e5 100644 (file)
--- a/templates/pagenav.tpl
+++ b/templates/pagenav.tpl
@@ -1,7 +1,7 @@
 <div>
        <% if ($show['first']): %><a href="<%- $baselink %>p=1&amp;pp=<%- $paginator->perpage %>"><%-T("First")%></a> ...<% endif %>
        <% if ($show['prev']): %><a href="<%- $baselink %>p=<%- $prevpage %>&amp;pp=<%- $paginator->perpage %>"><%-T("Prev")%></a> ...<% endif %>
-$pagebits
+<%- $pagebits %>
        <% if ($show['next']): %>... <a href="<%- $baselink %>p=<%- $nextpage %>&amp;pp=<%- $paginator->perpage %>"><%-T("Next")%></a><% endif %>
        <% if ($show['last']): %>... <a href="<%- $baselink %>p=<%- $paginator->pagecount %>&amp;pp=<%- $paginator->perpage %>"><%-T("Last")%></a><% endif %>
 </div>
\ No newline at end of file

diff --git a/templates/pagenav_bit.tpl b/templates/pagenav_bit.tpl
index 9d96fe1a151c7146e3b41025d1a391c162ab7425..5bdd62f40ec941d8a54fbeaef59661e987cab1b3 100644 (file)
--- a/templates/pagenav_bit.tpl
+++ b/templates/pagenav_bit.tpl
@@ -1 +1 @@
-       <% if ($nolink): %><strong><%- $number %></strong><% else: %><a href="<%- $baselink %>p=$number&amp;pp=<%- $paginator->perpage %>"><%- $number %></a><% endif %>
\ No newline at end of file
+       <% if ($nolink): %><strong><%- $number %></strong><% else: %><a href="<%- $baselink %>p=<%- $number %>&amp;pp=<%- $paginator->perpage %>"><%- $number %></a><% endif %>
\ No newline at end of file