--- loncom/interface/lonmenu.pm	2003/04/03 03:08:12	1.50
+++ loncom/interface/lonmenu.pm	2003/04/18 00:02:34	1.62
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.50 2003/04/03 03:08:12 www Exp $
+# $Id: lonmenu.pm,v 1.62 2003/04/18 00:02:34 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -45,6 +45,10 @@ use Apache::lonhtmlcommon();
 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
 
@@ -52,13 +56,31 @@ sub menubuttons {
     my $forcereg=shift;
     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') {
 # Textual display only
+        if ($ENV{'request.course.id'}) {
+	    $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><br />
+<a href="/adm/menu" target="_top">Main Menu</a>
+$reloadlink $navmaps<br />
 <script>
 // END LON-CAPA Internal
 </script>
@@ -67,18 +89,67 @@ ENDMAINMENU
 	return $output."<hr />";
     } elsif ($ENV{'environment.remote'} eq 'off') {
 # Remote Control is switched off
-	my $output=(<<ENDINLINEMENU);
+# 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);
+<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);
+        }
+	return (<<ENDINLINEMENU);
 <script>
 // BEGIN LON-CAPA Internal
 </script>
-<a href="/adm/menu" target="_top">Main Menu</a>
-<a href="/adm/remote?action=launch" target="_top">Launch Remote Control</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
+<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."<hr />";
     } else {
 	return '';
     }
@@ -98,6 +169,7 @@ sub registerurl {
                 "\n</script>\n";
     }
     if (($ENV{'browser.interface'} eq 'textual') ||
+        ($ENV{'environment.remote'} eq 'off') ||
         ((($ENV{'request.publicaccess'}) || 
          (!&Apache::lonnet::is_on_map($ENV{'REQUEST_URI'}))) &&
         (!$forcereg))) {
@@ -125,15 +197,33 @@ sub innerregister {
     
     my $textual=($textinter || $noremote);
 
+    @inlineremote=();
+    undef @inlineremote;
+
     my $reopen=&Apache::lonmenu::reopenmenu();
 
     my $newmail='';
+    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 />':
                           '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)) {
@@ -218,7 +308,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
@@ -240,6 +330,8 @@ ENDMENUITEMS
 # Registered, textual output
             my $utility=&utilityfunctions();
             my $form=&serverform();
+            my $inlinebuttons=
+                        join('',map { (defined($_)?$_:'') } @inlineremote);
 	    $result =(<<ENDREGTEXT);
 <script>
 // BEGIN LON-CAPA Internal
@@ -247,9 +339,9 @@ $utility
 </script>
 $timesync
 $newmail
-$buttons
-$hwkadd
-$editbutton
+$tablestart
+$inlinebuttons
+$tableend
 $form
 <script>
 //END LON-CAPA Internal
@@ -364,6 +456,8 @@ sub startupremote {
 # The Remote actually gets launched!
 #
     my $configmenu=&rawconfig();
+    my $esclowerurl=&Apache::lonnet::escape($lowerurl);
+
     return(<<ENDREMOTESTARTUP);
 <script>
 
@@ -393,7 +487,7 @@ function wait() {
          $configmenu
          window.location='$lowerurl';  
       } else {
-         alert("Remote Control timed out. It is possible that it was blocked by pop-up window filters.");
+	  window.location='/adm/remote?action=collapse&url=$esclowerurl';
       }
    } else {
       wheelswitch();
@@ -402,7 +496,7 @@ function wait() {
 }
 
 function main() {
-   canceltim=setTimeout('tim=1;',60000);
+   canceltim=setTimeout('tim=1;',30000);
    window.status='-';
    wait();
 }
@@ -471,7 +565,10 @@ sub clear {
     unless (($ENV{'browser.interface'} eq 'textual') ||
             ($ENV{'environment.remote'} eq 'off')) {
        return "\n".qq(window.status+='.';swmenu.clearbut($row,$col););
-   } else { return ''; }
+   } else { 
+       $inlineremote[10*$row+$col]='';
+       return ''; 
+   }
 }
 
 # ============================================ Switch a button or create a link
@@ -492,7 +589,7 @@ sub switch {
        if ($nobreak==2) { return ''; }
        my $text=$top.' '.$bot;
        $text=~s/\- //;
-       return "\n".($nobreak?' ':'<br />').
+       $inlineremote[10*$row+$col]="\n".($nobreak?' ':'<br />').
         '<a href="javascript:'.$act.';" target="_top">'.$text.'</a> '.
         ($nobreak?'':$desc);
    } else {
@@ -500,10 +597,15 @@ sub switch {
        if ($nobreak==2) { return ''; }
        my $text=$top.' '.$bot;
        $text=~s/\- //;
-       return "\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 '';
 }
 
 sub secondlevel {
@@ -528,6 +630,13 @@ sub openmenu {
     return "window.open(".$nothing.",'".$menuname."');";
 }
 
+sub inlinemenu {
+    @inlineremote=();
+    undef @inlineremote;
+    &rawconfig(1);
+    return join('',map { (defined($_)?$_:'') } @inlineremote);
+}
+
 sub rawconfig {
     my $textualoverride=shift;
     my $output='';
@@ -640,7 +749,8 @@ sub footer {
 }
 
 sub utilityfunctions {
-    unless ($ENV{'browser.interface'} eq 'textual') { return ''; }
+    unless (($ENV{'browser.interface'} eq 'textual')  ||
+        ($ENV{'environment.remote'} eq 'off')) { return ''; }
     my $currenturl=$ENV{'REQUEST_URI'};
     my $currentsymb=$ENV{'request.symb'};
 return (<<ENDUTILITY)
@@ -678,13 +788,21 @@ function gocmd(url,cmd) {
       this.document.server.submit();
    }
 }
+
+function catalog_info() {
+   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() {
+   lonchat=window.open('/res/adm/pages/chatroom.html',"LONchat",'height=320,width=280,resizeable=yes,location=no,menubar=no,toolbar=no');
+}
 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" />
@@ -701,10 +819,28 @@ sub handler {
     $r->send_http_header;
     return OK if $r->header_only;
 
-    my $utility=&utilityfunctions();
     my $form=&serverform();
     my $bodytag=&Apache::loncommon::bodytag('Main Menu');
-# ------------------------------------------------------------ Print the screen
+    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';
+    }
+    my $utility=&utilityfunctions();
     $r->print(<<ENDHEADER);
 <html><head>
 <title>LON-CAPA Main Menu</title>
@@ -714,7 +850,7 @@ $utility
 </head>
 $bodytag
 ENDHEADER
-    $r->print(&rawconfig(1).$form);
+    $r->print('<table>'.&inlinemenu().'</table>'.$form);
     $r->print('</body></html>');
     return OK;
 }