X-Git-Url: http://andersk.mit.edu/gitweb/sql-web.git/blobdiff_plain/1050fbb732198f8336ab0708c2aed221d864a1b7..7654fe787e1be12afdaa8b5b5d866f9712b5e3fb:/tpl/menu.php

diff --git a/tpl/menu.php b/tpl/menu.php
index 3060e24..b96bb46 100644
--- a/tpl/menu.php
+++ b/tpl/menu.php
@@ -1,29 +1,36 @@
-<div id="content1">
+				<div id="hnav">
+					<ul id="navlist">
 <?php if (isLoggedIn()): ?>
-<div style="float:left">
-<a href="do/main?refresh">Databases</a> |
-<a href="do/setup">Account</a> |
+<div style="float:left;">
+<li><a href="do/main?refresh">Databases</a></li>
+<li><a href="do/setup">Account</a></li>
 <?php if (isAdmin()) { ?>
-<a href="do/admin/main">Admin</a> |
+<li><a href="do/admin/main">Admin</a></li>
 <?php } ?>
-<a href="do/logout">Logout</a>
-</div>&nbsp;
+<li><a href="do/logout">Logout</a></li>
+</div>
 <?php
 	$loggedInText = $Login->getUsername();
 	if (isImpersonating()) {
-		$loggedInText = '<a href="do/admin/main?impersonate">'.$loggedInText.'</a>';
+		$loggedInText = '<li><a href="do/admin/main?impersonate">'.$loggedInText.'</a></li>';
 	}
 ?>
-Logged in: <em><?=$loggedInText?>@<?=DBHOST?></em>
+<div style="text-align: right;">
+Logged in: <em><?=$loggedInText?>@<?=DBHOST?></em>&nbsp;
+</div>
 <?php else: ?>
-<div style="float:left; position: relative;">
-<a href="do/signup">Sign up</a> |
-<a href="/~sql/phpMyAdmin/" target="_blank">phpMyAdmin</a> |
-<a href="do/index">Home</a>
+<div style="float:left;">
+<li><a href="do/signup">Sign up</a></li>
+<li><a href="https://scripts.mit.edu/~sql/phpMyAdmin/" target="_blank">phpMyAdmin</a></li>
+<?php if (DEBUG) { ?>
+<li><a href="do/index">Home</a></li>
+<?php } else { ?>
+<li><a href="http://sql.mit.edu/">Home</a></li>
+<?php } ?>
 </div>
-<div style="float: right;">
-Login via <a href="do/login?ssl=0">SQL Password</a> or <a href="do/login?ssl=1">MIT Certificate</a>
+<div style="text-align: right;">
+Login via: <li><a href="do/login?ssl=0">SQL Password</a></li><li><a href="do/login?ssl=1">MIT Certificate</a></li>
 </div>
-&nbsp;
 <?php endif; ?>
-</div>
+					</ul>
+				</div>