[aur-dev] [PATCH 2/2] Move "Past Votes" navigation to "Past Votes" box

[Lukas Fleischer]

These are navigation links and do not belong to the action box.

Signed-off-by: Lukas Fleischer <archli...@cryptocrack.de>
---
 web/html/tu.php          | 17 +++--------------
 web/template/tu_list.php | 14 ++++++++++++++
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/web/html/tu.php b/web/html/tu.php
index d221619..fdccdb4 100644
--- a/web/html/tu.php
+++ b/web/html/tu.php
@@ -107,6 +107,7 @@ if ($atype == "Trusted User" || $atype == "Developer") {
 
                $result = current_proposal_list($order);
                $type = __("Current Votes");
+               $nextresult = 0;
                include("tu_list.php");
 ?>
 
@@ -114,25 +115,13 @@ if ($atype == "Trusted User" || $atype == "Developer") {
                $result = past_proposal_list($order, $lim);
 
                $type = __("Past Votes");
-               include("tu_list.php");
-
                $nextresult = proposal_count();
+               include("tu_list.php");
 ?>
 <div class="box">
        <p><a href="<?= get_uri('/addvote/'); ?>"><?= __("Add Proposal") 
?></a></p>
-
-       <?php if ($result):
-               $by = htmlentities($by, ENT_QUOTES); ?>
-               <?php if ($off != 0):
-                       $back = (($off - $limit) <= 0) ? 0 : $off - $limit; ?>
-                       <a href='<?= get_uri('/tu/'); ?>?off=<?= $back 
?>&amp;by=<?= $by ?>'><?= __("Back") ?></a>
-               <?php endif; ?>
-               <?php if (($off + $limit) < $nextresult):
-                       $forw = $off + $limit; ?>
-               <a href="<?= get_uri('/tu/'); ?>?off=<?= $forw ?>&amp;by=<?= 
$by ?>"><?= __("Next") ?></a>
-               <?php endif; ?>
-       <?php endif; ?>
 </div>
+       </p>
 <?php
                $result = last_votes_list();
                include("tu_last_votes_list.php");
diff --git a/web/template/tu_list.php b/web/template/tu_list.php
index f80d2f5..1f7280a 100644
--- a/web/template/tu_list.php
+++ b/web/template/tu_list.php
@@ -53,4 +53,18 @@
                        ?>
                </tbody>
        </table>
+       <div class="pkglist-stats">
+               <p class="pkglist-nav">
+               <?php if ($result):
+                       $by = htmlentities($by, ENT_QUOTES); ?>
+                       <?php if ($nextresult > 0 && $off != 0):
+                               $back = (($off - $limit) <= 0) ? 0 : $off - 
$limit; ?>
+                               <a class="page" href='<?= get_uri('/tu/'); 
?>?off=<?= $back ?>&amp;by=<?= $by ?>'>&lsaquo; <?= __("Back") ?></a>
+                       <?php endif; ?>
+                       <?php if (($off + $limit) < $nextresult):
+                               $forw = $off + $limit; ?>
+                       <a class="page" href="<?= get_uri('/tu/'); ?>?off=<?= 
$forw ?>&amp;by=<?= $by ?>"><?= __("Next") ?> &rsaquo;</a>
+                       <?php endif; ?>
+               <?php endif; ?>
+       </div>
 </div>
-- 
1.8.4.rc3.500.gc3113b0