From 3130a887e899a34ee826d5c2daf1bfbe1ba93351 Mon Sep 17 00:00:00 2001
From: Lukas Fleischer <archlinux@cryptocrack.de>
Date: Tue, 3 Sep 2013 12:53:02 +0200
Subject: Move "Add Proposal" link to "Current Votes"

The page this links to allows for adding an item to the list of current
votes. Move the link accordingly.

Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de>
---
 web/html/tu.php          | 10 +---------
 web/template/tu_list.php |  7 +++++++
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/web/html/tu.php b/web/html/tu.php
index fdccdb4..a6aa292 100644
--- a/web/html/tu.php
+++ b/web/html/tu.php
@@ -109,20 +109,12 @@ if ($atype == "Trusted User" || $atype == "Developer") {
 		$type = __("Current Votes");
 		$nextresult = 0;
 		include("tu_list.php");
-?>
 
-<?php
 		$result = past_proposal_list($order, $lim);
-
 		$type = __("Past Votes");
 		$nextresult = proposal_count();
 		include("tu_list.php");
-?>
-<div class="box">
-	<p><a href="<?= get_uri('/addvote/'); ?>"><?= __("Add Proposal") ?></a></p>
-</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 1f7280a..c2e2d39 100644
--- a/web/template/tu_list.php
+++ b/web/template/tu_list.php
@@ -1,5 +1,12 @@
 <div class="box">
 	<h2><?= $type ?></h2>
+
+	<?php if ($type == __("Current Votes")): ?>
+	<ul class="admin-actions">
+		<li><a href="<?= get_uri('/addvote/'); ?>"><?= __("Add Proposal") ?></a></li>
+	</ul>
+	<?php endif; ?>
+
 	<table class="results">
 		<thead>
 			<tr>
-- 
cgit v1.2.3-70-g09d2