From 358d413365963b0ac2bbf3c621dfb5062985a1f7 Mon Sep 17 00:00:00 2001
From: james <james>
Date: Fri, 20 Aug 2010 18:16:21 +0000
Subject: [PATCH] Remove the accordion from the tertiary menu, and move the
 tertiary menu <div> to the <div id="main"> as specified in TUAG's prototype

---
 common.inc.php | 6 ++----
 js/nav.js      | 8 ++++----
 nav.php        | 4 ++++
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/common.inc.php b/common.inc.php
index 8be848c7..c1435cc0 100644
--- a/common.inc.php
+++ b/common.inc.php
@@ -304,10 +304,6 @@ if(array_key_exists('users_id', $_SESSION)) {
     </div>
     <div id="secondarymenu">
     </div>
-    <div id="tertiarymenu">
-     <div id="tertiarymenu_accordion">
-     </div>
-    </div>
    </div>
 
 <?
@@ -370,6 +366,8 @@ if(is_array($nav)) {
 ?>
 
 <div id="main" class="clear">
+ <div id="tertiarymenu">
+ </div>
 <?
 
 if(is_array($_SESSION['roles'])) {
diff --git a/js/nav.js b/js/nav.js
index 181bddf0..85a674e1 100644
--- a/js/nav.js
+++ b/js/nav.js
@@ -5,9 +5,9 @@ function taskNavLevel(l1,l2,l3,l4) {
 		$("#secondarymenu").load(config.SFIABDIRECTORY+"/nav.php?level=1&id="+l1,null,function() {
 			$("#secondarymenu").show();
 
-			$("#tertiarymenu_accordion").accordion("destroy");
-			$("#tertiarymenu_accordion").load(config.SFIABDIRECTORY+"/nav.php?level=2&id="+l2,null,function() {
-				$("#tertiarymenu_accordion").accordion({clearStyle: true, collapsible: true, active: false}); //"option", "collapsible", true);
+//			$("#tertiarymenu_accordion").accordion("destroy");
+			$("#tertiarymenu").load(config.SFIABDIRECTORY+"/nav.php?level=2&id="+l2,null,function() {
+//				$("#tertiarymenu_accordion").accordion({clearStyle: true, collapsible: true, active: false}); //"option", "collapsible", true);
 				$("#tertiarymenu").show();
 
 				$(".primarynav-selected").removeClass("primarynav-selected");
@@ -18,7 +18,7 @@ function taskNavLevel(l1,l2,l3,l4) {
 
 				//if we have a 3rd level nav, open up the accordion to the appropriate place
 				if(l3) {
-					$("#tertiarymenu_accordion").accordion("activate",$("#tertiary_nav_"+l3));
+//					$("#tertiarymenu_accordion").accordion("activate",$("#tertiary_nav_"+l3));
 				}
 				//if we have a 4th level nav, set the selected class on the appropriate item in the list
 				if(l4) {
diff --git a/nav.php b/nav.php
index 8017fa6f..d996e92d 100644
--- a/nav.php
+++ b/nav.php
@@ -56,7 +56,11 @@
 		 unset($_SESSION['nav']['tertiarylink']);
 		 $q=mysql_query("SELECT * FROM rolestasks WHERE pid='$id' AND level=2 ORDER By ord,task");
 		 while($r=mysql_fetch_object($q)) {
+			 if($r->link) {
 			 echo "<h3 id=\"tertiary_nav_{$r->id}\"><a href=\"{$config['SFIABDIRECTORY']}$r->link\">".i18n("$r->task")."</a></h3>\n";
+			 } else {
+			 echo "<h3 id=\"tertiary_nav_{$r->id}\">".i18n("$r->task")."</h3>\n";
+			 }
 			 echo "<ul class=\"tertiary_nav\">";
 			 $q2=mysql_query("SELECT * FROM rolestasks WHERE pid='$r->id' AND level=3 ORDER BY ord,task");
 			 while($r2=mysql_fetch_object($q2)) {