-<div id="content1">
+ <div id="hnav">
+ <ul id="navlist">
<?php if (isLoggedIn()): ?>
-<div style="float:left">
-<a href="main">Main</a> |
-<a href="logout">Logout</a>
-</div>
-Logged in as <em><?=$User->getUsername()?></em> on <?=DBHOST?>
+<div style="float:left;">
+<li><a href="do/main?refresh">Databases</a></li>
+<li><a href="do/setup">Account</a></li>
+<?php if (isAdmin()) { ?>
+<li><a href="do/admin/main">Admin</a></li>
+<?php } ?>
+<li><a href="do/logout">Logout</a></li>
+</div>
+<?php
+ $loggedInText = $Login->getUsername();
+ if (isImpersonating()) {
+ $loggedInText = '<li><a href="do/admin/main?impersonate">'.$loggedInText.'</a></li>';
+ }
+?>
+<div style="text-align: right;">
+Logged in: <em><?=$loggedInText?>@<?=DBHOST?></em>
+</div>
<?php else: ?>
-<div style="float:left">
-<a href="index">Home</a> |
-<a href="signup">Signup</a> |
-Login via <a href="login?ssl=0">SQL</a> or <a href="login?ssl=1">SSL</a>
-</div>
-<?php endif; ?>
+<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>
+<li><a href="do/index">Home</a></li>
</div>
+<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>
+<?php endif; ?>
+ </ul>
+ </div>