From b4f206c6db7a73635140a48eb804cd868397d859 Mon Sep 17 00:00:00 2001
From: james <james>
Date: Wed, 21 Jul 2010 19:27:50 +0000
Subject: [PATCH] Migrate stuff out of primarynav into the login box

---
 common.inc.php | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/common.inc.php b/common.inc.php
index 5785ef5..f64b0af 100644
--- a/common.inc.php
+++ b/common.inc.php
@@ -187,7 +187,16 @@ if(!$_SESSION['conferences_id']) {
 <?
 if(isset($_SESSION['roles']) && $_SESSION['username']) {
 	echo i18n("Logged in as %1",array($_SESSION['username']))."<br />";
+	echo "<div style=\"margin-top: 8px;\">\n";
+	echo "My: <a href=\"{$config['SFIABDIRECTORY']}/user_account.php\">".i18n("Account")."</a>";
+	echo "&nbsp;|&nbsp;";
+	echo "<a href=\"{$config['SFIABDIRECTORY']}/user_personal.php\">".i18n("Profile")."</a>";
+	echo "&nbsp;|&nbsp;";
+	echo "<a href=\"{$config['SFIABDIRECTORY']}/user_main.php\">".i18n("Main")."</a>";
+	echo "</div>";
+	echo "<div style=\"margin-top: 5px;\">\n";
 	echo "<a href=\"{$config['SFIABDIRECTORY']}/user_login.php?action=logout\">".i18n("Logout")."</a>";
+	echo "</div>";
 	
 } else if(isset($_SESSION['email'])) {
 	/* Backwards compatible login settings */
@@ -304,11 +313,6 @@ if(is_array($_SESSION['roles'])) {
 ?>
 <?
 if(array_key_exists('users_id', $_SESSION)) {
-	echo "<li><a href=\"{$config['SFIABDIRECTORY']}/user_main.php\">".i18n("Main Page").'</a></li>';
-	echo "<li><a href=\"{$config['SFIABDIRECTORY']}/user_personal.php\">".i18n("My Profile").'</a></li>';
-	if(in_array('committee', $_SESSION['roles'])) {
-//		echo "<li><a href=\"{$config['SFIABDIRECTORY']}/committee_main.php\">".i18n("Committee Home").'</a></li>';
-	} 
 	if(in_array('admin', $_SESSION['roles'])) {
 		echo "<li><a href=\"{$config['SFIABDIRECTORY']}/admin/\">".i18n("Administration").' (old) </a></li>';
 	}