--- loncom/interface/lonmenu.pm	2006/02/21 20:14:49	1.165
+++ loncom/interface/lonmenu.pm	2006/04/07 22:28:40	1.171
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.165 2006/02/21 20:14:49 raeburn Exp $
+# $Id: lonmenu.pm,v 1.171 2006/04/07 22:28:40 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -40,7 +40,6 @@ package Apache::lonmenu;
 
 use strict;
 use Apache::lonnet;
-use Apache::Constants qw(:common);
 use Apache::lonhtmlcommon();
 use Apache::loncommon();
 use Apache::lonenc();
@@ -279,9 +278,9 @@ $groups
 <td bgcolor="$tabbg">
 <img align="right" src="$logo" alt="Logo" />
 <b>LON-CAPA</b></td>
-$form
 </tr>
 </table>
+$form
 <script type="text/javascript">
 // END LON-CAPA Internal
 </script>
@@ -1177,12 +1176,18 @@ function catalog_info() {
 function chat_win() {
    lonchat=window.open('/res/adm/pages/chatroom.html',"LONchat",'height=320,width=280,resizable=yes,location=no,menubar=no,toolbar=no');
 }
+
+function group_chat(group) {
+   var url = '/adm/groupchat?group='+group;
+   var winName = 'LONchat_'+group;
+   grpchat=window.open(url,winName,'height=320,width=280,resizable=yes,location=no,menubar=no,toolbar=no');
+}
 ENDUTILITY
 }
 
 sub serverform {
     return(<<ENDSERVERFORM);
-<form name="server" action="/adm/logout" method="post" target="_top">
+<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" />
@@ -1193,14 +1198,14 @@ ENDSERVERFORM
 
 sub constspaceform {
     return(<<ENDCONSTSPACEFORM);
-<form name="constspace" action="/adm/logout" method="post" target="_top">
+<form name="constspace" action="/adm/logout" method="POST" target="_top">
 <input type="hidden" name="filename" value="" />
 </form>
-<form name="cstrdelete" action="/adm/cfile" method="post" target="_top">
+<form name="cstrdelete" action="/adm/cfile" method="POST" target="_top">
 <input type="hidden" name="action" value="delete" /> 
 <input type="hidden" name="filename" value="" />
 </form>
-<form name="cstrprint" action="/adm/printout" target="_parent" method="post">
+<form name="cstrprint" action="/adm/printout" target="_parent" method="POST">
 <input type="hidden" name="postdata" value="" />
 <input type="hidden" name="curseed" value="" />
 <input type="hidden" name="problemtype" value="" />
@@ -1220,85 +1225,26 @@ sub get_nav_status {
     return $navstatus;
 }
 
-# ================================================ Handler when called directly
-
-
-sub handler {
-    my $r = shift;
-    &Apache::loncommon::no_cache($r);
-    &Apache::loncommon::content_type($r,'text/html');
-    $r->send_http_header;
-    return OK if $r->header_only;
-
-    my $form;
-    if ($env{'environment.remote'} ne 'off' &&
-	$env{'browser.interface'} ne 'textual') {
-	$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.noversionuri'}=~/^(\/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 $script_tag;
-    if ($env{'environment.remote'} ne 'off') {
-        my $utility=&utilityfunctions('/adm/menu');
-        $script_tag=(<<ENDSCRIPT);
-<script type="text/javascript">
-$utility
-</script>
-ENDSCRIPT
-    }
-# ---- Print the screen, pretend to be in text mode to generate text-based menu
-    unless ($env{'browser.interface'} eq 'textual') {
-	$env{'browser.interface'}='faketextual';
-	$env{'environment.remote'}='off';
-    }
-    my $html=&Apache::lonxml::xmlbegin();
-    $r->print(<<ENDHEADER);
-$html
-<head>
-<title>LON-CAPA Main Menu</title>
-$script_tag
-</head>
-$bodytag
-ENDHEADER
-    $r->print('<table>'.&inlinemenu().'</table>'.$form);
-    $r->print('</body></html>');
-    return OK;
-}
-
 # ================================================================ Main Program
 
 BEGIN {
-  if (! defined($readdesk)) {
-   {
-    my $tabfile = $Apache::lonnet::perlvar{'lonTabDir'}.'/mydesk.tab';
-    if ( CORE::open( my $config,"<$tabfile") ) {
-        while (my $configline=<$config>) {
-            $configline=(split(/\#/,$configline))[0];
-            $configline=~s/^\s+//;
-            chomp($configline);
-            if ($configline) {
-                $desklines[$#desklines+1]=$configline;
-            }
-        }
-        CORE::close($config);
+    if (! defined($readdesk)) {
+	{
+	    my $tabfile = $Apache::lonnet::perlvar{'lonTabDir'}.'/mydesk.tab';
+	    if ( CORE::open( my $config,"<$tabfile") ) {
+		while (my $configline=<$config>) {
+		    $configline=(split(/\#/,$configline))[0];
+		    $configline=~s/^\s+//;
+		    chomp($configline);
+		    if ($configline) {
+			push(@desklines,$configline);
+		    }
+		}
+		CORE::close($config);
+	    }
+	}
+	$readdesk='done';
     }
-   }
-   $readdesk='done';
-  }
 }
 
 1;