--- loncom/interface/lonmenu.pm	2003/04/04 22:00:26	1.57
+++ loncom/interface/lonmenu.pm	2003/04/12 15:57:30	1.59
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.57 2003/04/04 22:00:26 www Exp $
+# $Id: lonmenu.pm,v 1.59 2003/04/12 15:57:30 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -46,6 +46,9 @@ use Apache::loncommon;
 use Apache::File;
 use vars qw(@desklines $readdesk);
 my @inlineremote;
+my $font;
+my $tabbg;
+my $pgbg;
 
 # ============================= This gets called at the top of the body section
 
@@ -54,6 +57,7 @@ sub menubuttons {
     my $target  =shift;
     my $registration=shift;
     my $navmaps='';
+    my $reloadlink='';
     my $escurl=&Apache::lonnet::escape($ENV{'REQUEST_URI'});
     my $escsymb=&Apache::lonnet::escape($ENV{'request.symb'});
     if ($ENV{'browser.interface'} eq 'textual') {
@@ -62,13 +66,21 @@ sub menubuttons {
 	    $navmaps=(<<ENDNAV);
 <a href="/adm/navmaps?postdata=$escurl&postsymb=$escsymb" target="_top">Navigate Contents</a>
 ENDNAV
+            if (($ENV{'REQUEST_URI'}=~/^\/adm\//) &&
+         ($ENV{'REQUEST_URI'}!~/^\/adm\/wrapper\//) &&
+         ($ENV{'REQUEST_URI'}!~/^\/adm\/.*\/(smppg|bulletinboard|aboutme)(\?|$)/)) {
+                my $escreload=&Apache::lonnet::escape('return:');
+                $reloadlink=(<<ENDRELOAD);
+<a href="/adm/flip?postdata=$escreload" target="_top"><font color="$font">Return to Last Location</font></a>
+ENDRELOAD
+            }
         }
 	my $output=(<<ENDMAINMENU);
 <script>
 // BEGIN LON-CAPA Internal
 </script>
 <a href="/adm/menu" target="_top">Main Menu</a>
-$navmaps<br />
+$reloadlink $navmaps<br />
 <script>
 // END LON-CAPA Internal
 </script>
@@ -77,26 +89,67 @@ ENDMAINMENU
 	return $output."<hr />";
     } elsif ($ENV{'environment.remote'} eq 'off') {
 # Remote Control is switched off
+# figure out colors
+	my $function='student';
+        if ($ENV{'request.role'}=~/^(cc|in|ta|ep)/) {
+	    $function='coordinator';
+        }
+	if ($ENV{'request.role'}=~/^(su|dc|ad|li)/) {
+            $function='admin';
+        }
+        if (($ENV{'request.role'}=~/^(au|ca)/) ||
+            ($ENV{'REQUEST_URI'}=~/^(\/priv|\~)/)) {
+            $function='author';
+        }
+        my $domain=&Apache::loncommon::determinedomain();
+        $pgbg=&Apache::loncommon::designparm($function.'.pgbg',$domain);
+        $tabbg=&Apache::loncommon::designparm($function.'.tabbg',$domain);
+        $font=&Apache::loncommon::designparm($function.'.font',$domain);
+        my $link=&Apache::loncommon::designparm($function.'.link',$domain);
+        my $alink=&Apache::loncommon::designparm($function.'.alink',$domain);
+        my $vlink=&Apache::loncommon::designparm($function.'.vlink',$domain);
+        my $sidebg=&Apache::loncommon::designparm($function.'.sidebg',$domain);
+# Do we have a NAV link?
         if ($ENV{'request.course.id'}) {
 	    $navmaps=(<<ENDNAVREM);
-<a href="/adm/navmaps?postdata=$escurl&postsymb=$escsymb" target="_top">Navigate Contents</a>
+<td bgcolor="$tabbg">
+<a href="/adm/navmaps?postdata=$escurl&postsymb=$escsymb" target="_top"><font color="$font">Navigate Contents</font></a></td>
 ENDNAVREM
+            if (($ENV{'REQUEST_URI'}=~/^\/adm\//) &&
+                ($ENV{'REQUEST_URI'}!~/^\/adm\/wrapper\//) &&
+         ($ENV{'REQUEST_URI'}!~/^\/adm\/.*\/(smppg|bulletinboard|aboutme)(\?|$)/)) {
+                my $escreload=&Apache::lonnet::escape('return:');
+                $reloadlink=(<<ENDRELOAD);
+<td bgcolor="$tabbg">
+<a href="/adm/flip?postdata=$escreload" target="_top"><font color="$font">Return to Last Location</font></a></td>
+ENDRELOAD
+            }
         }
-	my $output=(<<ENDINLINEMENU);
+        my $reg='';
+        if ($registration) {
+           $reg=&innerregister($forcereg,$target);
+        }
+	return (<<ENDINLINEMENU);
 <script>
 // BEGIN LON-CAPA Internal
 </script>
-<table bgcolor="#AAAAAA" width="100%" border="2"><tr><td>
-<a href="/adm/menu" target="_top">Main Menu</a>
+<table bgcolor="$pgbg" width="100%" border="0" cellpadding="3" cellspacing="3">
+<tr>
+<td bgcolor="$tabbg">
+<a href="/adm/menu" target="_top"><font color="$font">Main Menu</font></a>
+</td>
+$reloadlink
 $navmaps
-<a href="/adm/remote?action=launch&url=$escurl" target="_top">Launch Remote Control</a>
-<br />
+<td bgcolor="$tabbg">
+<a href="/adm/remote?action=launch&url=$escurl" target="_top">
+<font color="$font">Launch Remote Control</font></a></td>
+</tr>
+</table>
 <script>
 // END LON-CAPA Internal
 </script>
+$reg
 ENDINLINEMENU
-        if ($registration) { $output.=&innerregister($forcereg,$target); }
-	return $output."</td></tr></table>";
     } else {
 	return '';
     }
@@ -156,6 +209,8 @@ sub innerregister {
                           'swmenu.setstatus("you have","messages");');
     }
     my $timesync=($textual?'':'swmenu.syncclock(1000*'.time.');');
+    my $tablestart=($noremote?'<table bgcolor="'.$pgbg.'" border="0" cellspacing="3" cellpadding="3" width="100%">':'');
+    my $tableend=($noremote?'</table>':'');
 # =============================================================================
 # ============================ This is for URLs that actually can be registered
     if (($ENV{'REQUEST_URI'}!~/^\/(res\/)*adm\//) || ($forcereg)) {
@@ -240,7 +295,7 @@ sub innerregister {
 	my $menuitems=(<<ENDMENUITEMS);
 c&3&1
 s&2&1&back.gif&backward&&gopost('/adm/flip','back:'+currentURL)&Go to the previous resource in the course sequence&1
-s&2&3&forw.gif&forward&&gopost('/adm/flip','forward:'+currentURL)&Go to the next resource in the course sequence&1
+s&2&3&forw.gif&forward&&gopost('/adm/flip','forward:'+currentURL)&Go to the next resource in the course sequence&3
 s&6&3&catalog.gif&catalog&info&catalog_info()&Show catalog information
 s&8&1&eval.gif&evaluate&this&gopost('/adm/evaluate',currentURL)&Provide my evaluation of this resource
 s&8&2&fdbk.gif&feedback&discuss&gopost('/adm/feedback',currentURL)&Provide feedback messages or contribute to the course discussion about this resource
@@ -271,7 +326,9 @@ $utility
 </script>
 $timesync
 $newmail
+$tablestart
 $inlinebuttons
+$tableend
 $form
 <script>
 //END LON-CAPA Internal
@@ -527,9 +584,13 @@ sub switch {
        if ($nobreak==2) { return ''; }
        my $text=$top.' '.$bot;
        $text=~s/\- //;
-       $inlineremote[10*$row+$col]="\n".($nobreak?' ':'<br />').
-        '<a href="javascript:'.$act.';" target="_top">'.$text.'</a> '.
-        ($nobreak?'':$desc);
+       $inlineremote[10*$row+$col]="\n".
+         ($nobreak==3?'<td width="50%" colspan="2" align="right"':'<tr><td').
+         ' bgcolor="'.$tabbg.'"'.($nobreak==1?' width="50%" colspan="2"':'').
+     '"><a href="javascript:'.$act.';" target="_top"><font color="'.$font.'"'.
+          ($nobreak?' size="+1"':'').
+     '>'.$text.'</font></a></td>'.
+     ($nobreak?'':'<td colspan="3" width="80%"><font color="'.$font.'" size="-1">'.$desc.'</font>').($nobreak!=1?'</tr>':'');
    }
     return '';
 }
@@ -716,7 +777,7 @@ function gocmd(url,cmd) {
 }
 
 function catalog_info() {
-   loncatinfo=window.open(window.location.pathname+'.meta',"LONcatInfo",'height=320,width=280,resizeable=yes,location=no,menubar=no,toolbar=no');
+   loncatinfo=window.open(window.location.pathname+'.meta',"LONcatInfo",'height=320,width=280,resizeable=yes,scrollbars=yes,location=no,menubar=no,toolbar=no');
 }
 
 function chat_win() {
@@ -747,6 +808,21 @@ sub handler {
 
     my $form=&serverform();
     my $bodytag=&Apache::loncommon::bodytag('Main Menu');
+    my $function='student';
+    if ($ENV{'request.role'}=~/^(cc|in|ta|ep)/) {
+	$function='coordinator';
+    }
+    if ($ENV{'request.role'}=~/^(su|dc|ad|li)/) {
+	$function='admin';
+    }
+    if (($ENV{'request.role'}=~/^(au|ca)/) ||
+	($ENV{'REQUEST_URI'}=~/^(\/priv|\~)/)) {
+	$function='author';
+    }
+    my $domain=&Apache::loncommon::determinedomain();
+    $pgbg=&Apache::loncommon::designparm($function.'.pgbg',$domain);
+    $tabbg=&Apache::loncommon::designparm($function.'.tabbg',$domain);
+    $font=&Apache::loncommon::designparm($function.'.font',$domain);
 # ---- Print the screen, pretent to be in text mode to generate text-based menu
     unless ($ENV{'brower.interface'} eq 'textual') {
 	$ENV{'environment.remote'}='off';
@@ -761,7 +837,7 @@ $utility
 </head>
 $bodytag
 ENDHEADER
-    $r->print(&inlinemenu().$form);
+    $r->print('<table>'.&inlinemenu().'</table>'.$form);
     $r->print('</body></html>');
     return OK;
 }