--- loncom/interface/lonmenu.pm	2004/11/13 21:07:19	1.129
+++ loncom/interface/lonmenu.pm	2004/11/30 19:08:18	1.131
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.129 2004/11/13 21:07:19 albertel Exp $
+# $Id: lonmenu.pm,v 1.131 2004/11/30 19:08:18 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -69,6 +69,7 @@ sub menubuttons {
     my $forcereg=shift;
     my $target  =shift;
     my $registration=shift;
+    my $titletable=shift;
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
 					    ['inhibitmenu']);
     if ($ENV{'form.inhibitmenu'} eq 'yes') { return ''; }
@@ -96,6 +97,7 @@ ENDNAV
 ENDRELOAD
             }
         }
+        my $form=&serverform();
         my $utility=&utilityfunctions();
 	my $output=(<<ENDMAINMENU);
 <script type="text/javascript">
@@ -107,6 +109,7 @@ $reloadlink $navmaps<br />
 <script type="text/javascript">
 // END LON-CAPA Internal
 </script>
+$form
 ENDMAINMENU
         if ($registration) { $output.=&innerregister($forcereg,$target); }
 	return $output."<hr />";
@@ -151,8 +154,9 @@ ENDRELOAD
         }
         my $reg='';
         if ($registration) {
-           $reg=&innerregister($forcereg,$target);
+           $reg=&innerregister($forcereg,$target,$titletable);
         }
+        my $form=&serverform();
 	my $utility=&utilityfunctions();
 	return (<<ENDINLINEMENU);
 <script type="text/javascript">
@@ -172,6 +176,7 @@ $navmaps
 <td bgcolor="$tabbg">
 <img align="right" src="/adm/lonIcons/minilogo.gif" />
 <b>LON-CAPA</b></td>
+$form
 </tr>
 </table>
 </font>
@@ -225,9 +230,11 @@ sub registerurl {
 sub innerregister {
     my $forcereg=shift;
     my $target = shift;
+    my $titletable = shift;
     my $result = '';
     my ($uname,$thisdisfn);
     my $const_space = ($ENV{'request.state'} eq 'construct');
+    my $is_const_dir = 0;
 
     if ($ENV{'request.noversionuri'} eq '/res/adm/pages/menu.html') { return ''; }
 
@@ -265,6 +272,9 @@ sub innerregister {
  '<b><a href="/adm/communicate" target="_top">You have new messages</a></b><br />':
                           'swmenu.setstatus("you have","messages");');
     }
+    if ($ENV{'request.state'} eq 'construct') {
+        $newmail = $titletable;
+    }
     if ($noremote) {
 	$newmail.='</td></tr></table></font>';
     }
@@ -367,14 +377,18 @@ sub innerregister {
 	    my ($uname,$thisdisfn) =
 		($ENV{'request.filename'}=~m|^/home/([^/]+)/public_html/(.*)|);
             my $currdir = '/priv/'.$uname.'/'.$thisdisfn;
-            $currdir =~ s#[^/]+$##;
-            $menuitems=(<<ENDMENUITEMS);
-s&6&1&list.gif&list[_1]&dir[_1]&go('$currdir')&List current directory
-s&6&2&rtrv.gif&retrieve[_1]&version[_1]&gocstr('/adm/retrieve','/~$uname/$thisdisfn')&Retreive old version
+            if ($currdir =~ m-/$-) {
+                $is_const_dir = 1;
+            } else {
+                $currdir =~ s#[^/]+$##;
+                $menuitems=(<<ENDMENUITEMS);
+s&6&1&list.gif&list[_1]&dir[_1]&golist('$currdir')&List current directory
+s&6&2&rtrv.gif&retrieve[_1]&version[_1]&gocstr('/adm/retrieve','/~$uname/$thisdisfn')&Retrieve old version
 s&6&3&pub.gif&publish[_1]&resource[_1]&gocstr('/adm/publish','/~$uname/$thisdisfn')&Publish this resource
 s&7&1&del.gif&delete[_1]&resource[_2]&gocstr('/adm/cfile?action=delete','/~$uname/$thisdisfn')&Delete this resource
 s&7&2&prt.gif&prepare[_1]&printout[_1]&gopost('/adm/printout','/~$uname/$thisdisfn')&Prepare a printable document
 ENDMENUITEMS
+            }
         } else {
 	    $menuitems=(<<ENDMENUITEMS);
 c&3&1
@@ -406,7 +420,6 @@ ENDREALRES
         }
         if ($textual) {
 # Registered, textual output
-            my $form=&serverform();
 	    my $inlinebuttons='';
 
 	    if ($ENV{'browser.interface'} eq 'textual') {
@@ -421,6 +434,9 @@ ENDREALRES
 <tr><td>$inlineremote[91]</td><td>$inlineremote[92]</td><td>$inlineremote[93]</td></tr>
 ENDINLINE
 	    }
+            if ($const_space && $is_const_dir) {
+                $inlinebuttons = '';
+            }
 	    $result =(<<ENDREGTEXT);
 <script type="text/javascript">
 // BEGIN LON-CAPA Internal
@@ -430,7 +446,6 @@ $newmail
 $tablestart
 $inlinebuttons
 $tableend
-$form
 <script type="text/javascript">
 // END LON-CAPA Internal
 </script>
@@ -1002,6 +1017,15 @@ function gocstr(url,filename) {
     }
 }
 
+function golist(url) {
+   if (url!='' && url!= null) {
+       currentURL = null;
+       currentSymb= null;
+       top.location.href=url;
+   }
+}
+
+
 
 function catalog_info() {
    loncatinfo=window.open(window.location.pathname+'.meta',"LONcatInfo",'height=320,width=280,resizable=yes,scrollbars=yes,location=no,menubar=no,toolbar=no');
@@ -1057,7 +1081,11 @@ sub handler {
     $r->send_http_header;
     return OK if $r->header_only;
 
-    my $form=&serverform();
+    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)/) {