+
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 "id}\">link\">".i18n("$r->task")."
\n"; + } else { + echo "id}\">".i18n("$r->task")."
\n"; + } echo "- ";
$q2=mysql_query("SELECT * FROM rolestasks WHERE pid='$r->id' AND level=3 ORDER BY ord,task");
while($r2=mysql_fetch_object($q2)) {