--- loncom/interface/lonmenu.pm	2003/04/04 22:00:26	1.57
+++ loncom/interface/lonmenu.pm	2003/07/05 10:07:11	1.80
@@ -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.80 2003/07/05 10:07:11 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,70 @@ 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 $reg='';
+        if ($registration) {
+           $reg=&innerregister($forcereg,$target);
         }
-	my $output=(<<ENDINLINEMENU);
+	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>
+<td bgcolor="$tabbg">
+<img align="right" src="/adm/lonIcons/minilogo.gif" />
+<b>LON-CAPA</b></td>
+</tr>
+</table>
 <script>
 // END LON-CAPA Internal
 </script>
+$reg
 ENDINLINEMENU
-        if ($registration) { $output.=&innerregister($forcereg,$target); }
-	return $output."</td></tr></table>";
     } else {
 	return '';
     }
@@ -108,7 +164,11 @@ sub registerurl {
     my $forcereg=shift;
     my $target = shift;
     my $result = '';
-    
+    if ($ENV{'REQUEST_URI'} eq '/res/adm/pages/menu.html') { return ''; }
+    my $force_title='';
+    if ($ENV{'request.state'} eq 'construct') {
+	$force_title=&Apache::lonxml::display_title();
+    }
     if ($target eq 'edit') {
         $result .="<script type=\"text/javascript\">\n".
             "if (typeof swmenu != 'undefined') {swmenu.currentURL=null;}\n".
@@ -120,13 +180,13 @@ sub registerurl {
         ((($ENV{'request.publicaccess'}) || 
          (!&Apache::lonnet::is_on_map($ENV{'REQUEST_URI'}))) &&
         (!$forcereg))) {
-	return $result.
-         '<script type="text/javascript">function LONCAPAreg(){;} function LONCAPAstale(){}</script>';
+ 	return $result.
+          '<script type="text/javascript">function LONCAPAreg(){;} function LONCAPAstale(){}</script>'.$force_title;
     }
 # Graphical display after login only
     if ($Apache::lonxml::registered && !$forcereg) { return ''; }
     $result.=&innerregister($forcereg,$target);
-    return $result;
+    return $result.$force_title;
 }
 
 # =========== This gets called in order to register a URL, both with the Remote
@@ -136,6 +196,7 @@ sub innerregister {
     my $forcereg=shift;
     my $target = shift;
     my $result = '';
+    if ($ENV{'REQUEST_URI'} eq '/res/adm/pages/menu.html') { return ''; }
 
     $Apache::lonxml::registered=1;
 
@@ -150,12 +211,33 @@ sub innerregister {
     my $reopen=&Apache::lonmenu::reopenmenu();
 
     my $newmail='';
+    if ($noremote) {
+	$newmail='<table bgcolor="'.$pgbg.'" border="0" cellspacing="3" cellpadding="3" width="100%"><tr><td bgcolor="'.$tabbg.'">';
+    }
+    if (($textual) && ($ENV{'request.symb'}) && ($ENV{'request.course.id'})) {
+	my ($mapurl,$rid,$resurl)=split(/\_\_\_/,$ENV{'request.symb'});
+        $newmail.=$ENV{'course.'.$ENV{'request.course.id'}.'.description'};
+        my $maptitle=&Apache::lonnet::gettitle($mapurl);
+	my $restitle=&Apache::lonnet::gettitle($resurl);
+        if ($maptitle) {
+	    $newmail.=', '.$maptitle;
+        }
+        if ($restitle) {
+	    $newmail.=': '.$restitle;
+        }
+        $newmail.='&nbsp;&nbsp;&nbsp;';
+    }
     if (&Apache::lonmsg::newmail()) { 
        $newmail=($textual?
- '<b><a href="/adm/communicate">You have new messages</a></b><br />':
+ '<b><a href="/adm/communicate" target="_top">You have new messages</a></b><br />':
                           'swmenu.setstatus("you have","messages");');
     }
+    if ($noremote) {
+	$newmail.='</td></tr></table>';
+    }
     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)) {
@@ -163,17 +245,23 @@ sub innerregister {
         my $hwkadd='';
         if 
       ($ENV{'request.filename'}=~/\.(problem|exam|quiz|assess|survey|form)$/) {
-	    if (&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'})) {
-		$hwkadd.=&switch('','',7,1,'subm.gif','view sub','missions',
+	    my $crs='/'.$ENV{'request.course.id'};
+	    if ($ENV{'request.course.sec'}) {
+	        $crs.='_'.$ENV{'request.course.sec'};
+	    }
+	    $crs=~s/\_/\//g;
+
+	    if (&Apache::lonnet::allowed('vgr',$crs)) {
+		$hwkadd.=&switch('','',7,1,'subm.gif','view sub-','missions',
                        "gocmd('/adm/grades','submission')",
 		       'View user submissions for this assessment resource');
             }
-	    if (&Apache::lonnet::allowed('mgr',$ENV{'request.course.id'})) {
+	    if (&Apache::lonnet::allowed('mgr',$crs)) {
 		$hwkadd.=&switch('','',7,2,'pgrd.gif','problem','grades',
                        "gocmd('/adm/grades','gradingmenu')",
                        'Modify user grades for this assessment resource');
             }
-	    if (&Apache::lonnet::allowed('opa',$ENV{'request.course.id'})) {
+	    if (&Apache::lonnet::allowed('opa',$crs)) {
 		$hwkadd.=&switch('','',7,3,'pparm.gif','problem','parms',
                        "gocmd('/adm/parmset','set')",
                        'Modify deadlines, etc, for this assessment resource');
@@ -240,15 +328,22 @@ 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&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
+s&2&3&forw.gif&forward&&gopost('/adm/flip','forward:'+currentURL)&Go to the next resource in the course sequence&3
+c&6&3
+c&8&1
+c&8&2
 s&8&3&prt.gif&prepare&printout&gopost('/adm/printout',currentURL)&Prepare a printable document
 s&9&1&sbkm.gif&set&bookmark&set_bookmark()&Set a bookmark for this resource&2
 s&9&2&vbkm.gif&view&bookmark&edit_bookmarks()&Use or edit my bookmark collection&2
 s&9&3&anot.gif&anno-&tations&annotate()&Make notes and annotations about this resource&2
 ENDMENUITEMS
+        unless ($ENV{'REQUEST_URI'}=~/\/(bulletinboard|smppg|navmaps|syllabus|aboutme)(\?|$)/) {
+	    $menuitems.=(<<ENDREALRES);
+s&6&3&catalog.gif&catalog&info&catalog_info()&Show catalog information
+s&8&1&eval.gif&evaluate&this&gopost('/adm/evaluate',currentURL,1)&Provide my evaluation of this resource
+s&8&2&fdbk.gif&feedback&discuss&gopost('/adm/feedback',currentURL,1)&Provide feedback messages or contribute to the course discussion about this resource
+ENDREALRES
+	}
         my $buttons='';
         foreach (split(/\n/,$menuitems)) {
 	    my ($command,@rest)=split(/\&/,$_);
@@ -271,10 +366,12 @@ $utility
 </script>
 $timesync
 $newmail
+$tablestart
 $inlinebuttons
+$tableend
 $form
 <script>
-//END LON-CAPA Internal
+// END LON-CAPA Internal
 </script>
 
 ENDREGTEXT
@@ -315,7 +412,6 @@ var swmenu=null;
  'clearbut(2,1);clearbut(2,3);clearbut(8,1);clearbut(8,2);clearbut(8,3);'+
  'clearbut(9,1);clearbut(9,2);clearbut(9,3);clearbut(6,3);clearbut(6,1)',
 			  2000);
-
       }
 
 // END LON-CAPA Internal
@@ -367,10 +463,12 @@ ENDDONOTREGTHIS
 }
 
 sub loadevents() {
+    if ($ENV{'REQUEST_URI'} eq '/res/adm/pages/menu.html') { return ''; }
     return 'LONCAPAreg();';
 }
 
 sub unloadevents() {
+    if ($ENV{'REQUEST_URI'} eq '/res/adm/pages/menu.html') { return ''; }
     return 'LONCAPAstale();';
 }
 
@@ -483,6 +581,7 @@ ENDRESIZE
 window.status='Opening LON-CAPA Remote Control';
 var menu=window.open("/res/adm/pages/menu.html","$menuname",
 "height=350,width=150,scrollbars=no,menubar=no,top=5,left=5,screenX=5,screenY=5");
+self.name='loncapaclient';
 ENDOPEN
     return '<script>'.$returnval.'</script>';
 }
@@ -518,18 +617,22 @@ sub switch {
 # Accessibility
        if ($nobreak==2) { return ''; }
        my $text=$top.' '.$bot;
-       $text=~s/\- //;
+       $text=~s/\s*\-\s*//gs;
        $inlineremote[10*$row+$col]="\n".($nobreak?' ':'<br />').
-        '<a href="javascript:'.$act.';" target="_top">'.$text.'</a> '.
+        '<a href="javascript:'.$act.';">'.$text.'</a> '.
         ($nobreak?'':$desc);
    } else {
 # Inline Remote
        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);
+       $text=~s/\s*\-\s*//gs;
+       $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.';"><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 +819,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() {
@@ -728,7 +831,7 @@ ENDUTILITY
 sub serverform {
     return(<<ENDSERVERFORM);
 
-<form name="server" action="/adm/logout" method="post">
+<form name="server" action="/adm/logout" method="post" target="_top">
 <input type="hidden" name="postdata" value="none" />
 <input type="hidden" name="command" value="none" />
 <input type="hidden" name="url" value="none" />
@@ -747,6 +850,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 +879,7 @@ $utility
 </head>
 $bodytag
 ENDHEADER
-    $r->print(&inlinemenu().$form);
+    $r->print('<table>'.&inlinemenu().'</table>'.$form);
     $r->print('</body></html>');
     return OK;
 }