From 71b0489493685fe4bf933a6f6a1cfb00c38d61c4 Mon Sep 17 00:00:00 2001
From: james <james>
Date: Fri, 20 Aug 2010 15:42:18 +0000
Subject: [PATCH] A few more cleanups, and link the admin and config primary
 menu icons to real pages so we can remove the (old) links

---
 common.inc.php          | 6 +++++-
 theme/default/sfiab.css | 4 ++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/common.inc.php b/common.inc.php
index 267c08b..a153cde 100644
--- a/common.inc.php
+++ b/common.inc.php
@@ -257,7 +257,9 @@ if(is_array($_SESSION['roles'])) {
 			 $cl="class=\"selected\"";
 		 }
 		 echo "<li id=\"primary_nav_{$r->id}\" $cl>";
-		 echo "<a href=\"#\" onclick=\"return taskNavLevel($r->id,0,0,0)\">".i18n($r->task)."</a>";
+		 if($r->link) $href=$config['SFIABDIRECTORY'].$r->link;
+		 else $href="#";
+		 echo "<a href=\"$href\" onclick=\"return taskNavLevel($r->id,0,0,0)\">".i18n($r->task)."</a>";
 		 echo "</li>\n";
 	 }
  }
@@ -266,12 +268,14 @@ if(is_array($_SESSION['roles'])) {
 ?>
 <?
 if(array_key_exists('users_id', $_SESSION)) {
+	/*
 	if(in_array('admin', $_SESSION['roles'])) {
 		echo "<li><a href=\"{$config['SFIABDIRECTORY']}/admin/\">".i18n("Administration").' (old) </a></li>';
 	} 
 	if(in_array('config', $_SESSION['roles'])) {
 		echo "<li><a href=\"{$config['SFIABDIRECTORY']}/config/\">".i18n("Configuration").' (old) </a></li>';
 	} 
+	*/
 	if($_SESSION['superuser'] == 'yes') {
 		echo "<li><a href=\"{$config['SFIABDIRECTORY']}/super/\">".i18n("System Setup").'</a></li>';
 	}
diff --git a/theme/default/sfiab.css b/theme/default/sfiab.css
index af8f28d..2a83e00 100644
--- a/theme/default/sfiab.css
+++ b/theme/default/sfiab.css
@@ -127,6 +127,10 @@ div#help-icon {
 	float: right;
 }
 
+#main-title {
+	min-height: 45px;
+}
+
 div.link-icon {
 	padding: 4px;
 }