summaryrefslogtreecommitdiffstats
path: root/web
diff options
context:
space:
mode:
authorLukas Fleischer <archlinux@cryptocrack.de>2013-08-26 17:53:24 +0200
committerLukas Fleischer <archlinux@cryptocrack.de>2013-08-26 17:53:24 +0200
commita4a170e58e0d795098567e1aea431e49b6956de3 (patch)
tree49722d2f5a7deca6a1f1582615b5e8babd837383 /web
parent2dd3d04f45f8a0e57f0c8686a12d7b95fe5bdb59 (diff)
downloadaur-a4a170e58e0d795098567e1aea431e49b6956de3.tar.gz
aur-a4a170e58e0d795098567e1aea431e49b6956de3.tar.xz
Move "Past Votes" navigation to "Past Votes" box
These are navigation links and do not belong to the action box. Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de>
Diffstat (limited to 'web')
-rw-r--r--web/html/tu.php17
-rw-r--r--web/template/tu_list.php14
2 files changed, 17 insertions, 14 deletions
diff --git a/web/html/tu.php b/web/html/tu.php
index d2216190..fdccdb47 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 f80d2f5f..1f7280ae 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>