index redirects to vhost when on home tab

[sql-web.git] / tpl / menu.php

diff --git a/tpl/menu.php b/tpl/menu.php
index 177f8f99f83e08d6b0cd14c92ad38978aeb8be3c..b96bb464febd04d5a27a84f3602ae6ab15119b6c 100644 (file)
--- a/tpl/menu.php
+++ b/tpl/menu.php
@@ -1,25 +1,36 @@
-<div id="content1">
+                               <div id="hnav">
+                                       <ul id="navlist">
 <?php if (isLoggedIn()): ?>
-<div style="float:left">
-<a href="do/main">Main</a> |
-<a href="do/main?refresh">Refresh</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 as <em><?=$loggedInText?></em> on <?=DBHOST?>
+<div style="text-align: right;">
+Logged in: <em><?=$loggedInText?>@<?=DBHOST?></em>&nbsp;
+</div>
 <?php else: ?>
-<div style="float:left">
-<a href="do/index">Home</a> |
-<a href="do/signup">Signup</a> |
-Login via <a href="do/login?ssl=0">SQL</a> or <a href="do/login?ssl=1">SSL</a>
-</div>&nbsp;
-<?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>
+<?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="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>