arman/science-ation
1
1
Fork 0
forked from science-ation/science-ation
Code Pull Requests Activity

Remove the accordion from the tertiary menu, and move the tertiary menu <div> to the <div id="main"> as specified in TUAG's prototype

Browse Source
This commit is contained in:
james 2010-08-20 18:16:21 +00:00
parent 4143f289af
commit 358d413365
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common.inc.php
View File

@ -304,10 +304,6 @@ if(array_key_exists('users_id', $_SESSION)) {
</div> </div>
<div id="secondarymenu"> <div id="secondarymenu">
</div> </div>
<div id="tertiarymenu">
<div id="tertiarymenu_accordion">
</div>
</div>
</div> </div>
<? <?
@ -370,6 +366,8 @@ if(is_array($nav)) {
?> ?>
<div id="main" class="clear"> <div id="main" class="clear">
<div id="tertiarymenu">
</div>
<? <?
if(is_array($_SESSION['roles'])) { if(is_array($_SESSION['roles'])) {

8
js/nav.js
View File

@ -5,9 +5,9 @@ function taskNavLevel(l1,l2,l3,l4) {
$("#secondarymenu").load(config.SFIABDIRECTORY+"/nav.php?level=1&id="+l1,null,function() { $("#secondarymenu").load(config.SFIABDIRECTORY+"/nav.php?level=1&id="+l1,null,function() {
$("#secondarymenu").show(); $("#secondarymenu").show();
$("#tertiarymenu_accordion").accordion("destroy"); // $("#tertiarymenu_accordion").accordion("destroy");
$("#tertiarymenu_accordion").load(config.SFIABDIRECTORY+"/nav.php?level=2&id="+l2,null,function() { $("#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_accordion").accordion({clearStyle: true, collapsible: true, active: false}); //"option", "collapsible", true);
$("#tertiarymenu").show(); $("#tertiarymenu").show();
$(".primarynav-selected").removeClass("primarynav-selected"); $(".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 we have a 3rd level nav, open up the accordion to the appropriate place
if(l3) { 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 we have a 4th level nav, set the selected class on the appropriate item in the list
if(l4) { if(l4) {

4
nav.php
View File

@ -56,7 +56,11 @@
unset($_SESSION['nav']['tertiarylink']); unset($_SESSION['nav']['tertiarylink']);
$q=mysql_query("SELECT * FROM rolestasks WHERE pid='$id' AND level=2 ORDER By ord,task"); $q=mysql_query("SELECT * FROM rolestasks WHERE pid='$id' AND level=2 ORDER By ord,task");
while($r=mysql_fetch_object($q)) { 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"; 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\">"; echo "<ul class=\"tertiary_nav\">";
$q2=mysql_query("SELECT * FROM rolestasks WHERE pid='$r->id' AND level=3 ORDER BY ord,task"); $q2=mysql_query("SELECT * FROM rolestasks WHERE pid='$r->id' AND level=3 ORDER BY ord,task");
while($r2=mysql_fetch_object($q2)) { while($r2=mysql_fetch_object($q2)) {