From 72423bd9cbe526c2d91701043498863c687f8db9 Mon Sep 17 00:00:00 2001
From: Jon Bergli Heier <snakebite@jvnv.net>
Date: Wed, 11 May 2011 21:48:29 +0200
Subject: Moved menu, fixed login button.

---
 templates/base.tmpl  | 26 +++++++++++++-------------
 templates/login.tmpl |  2 +-
 2 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'templates')

diff --git a/templates/base.tmpl b/templates/base.tmpl
index 5b710f8..b15e62f 100644
--- a/templates/base.tmpl
+++ b/templates/base.tmpl
@@ -12,6 +12,19 @@
 		<div id="page">
 			<div id="page-header">
 				<h1><a href="/">$header</a></h1>
+				<div id="page-menu">
+					<ul>
+						<li><a href="/u">upload</a></li>
+#if $user
+						<li><a href="/o">logout</a></li>
+						<li><a href="/m">myfiles</a></li>
+#else
+						<li><a href="/l">login</a></li>
+						<li><a href="/r">register</a></li>
+#end if
+						<li><a href="/h">help</a></li>
+					</ul>
+				</div>
 			</div>
 			<p class="login">#slurp
 #if $user
@@ -26,18 +39,5 @@ Not logged in.#slurp
 				<div id="page-wrapper"></div>
 			</div>
 		</div>
-		<div id="page-footer">
-			<ul>
-				<li><a href="/u">upload</a></li>
-#if $user
-				<li><a href="/o">logout</a></li>
-				<li><a href="/m">myfiles</a></li>
-#else
-				<li><a href="/l">login</a></li>
-				<li><a href="/r">register</a></li>
-#end if
-				<li><a href="/h">help</a></li>
-			</ul>
-		</div>
 	</body>
 </html>
diff --git a/templates/login.tmpl b/templates/login.tmpl
index 6baee6c..306b0aa 100644
--- a/templates/login.tmpl
+++ b/templates/login.tmpl
@@ -9,6 +9,6 @@
 			<p><input type="text" id="username" name="username" /></p>
 			<p>password</p>
 			<p><input type="password" id="password" name="password" /></p>
-			<p><input type="submit" value="Upload" /></p>
+			<p><input type="submit" value="Login" /></p>
 		</form>
 #end def
-- 
cgit v1.2.3