--- loncom/interface/lonmenu.pm	2006/07/19 10:52:27	1.199
+++ loncom/interface/lonmenu.pm	2006/08/14 09:11:55	1.203
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.199 2006/07/19 10:52:27 albertel Exp $
+# $Id: lonmenu.pm,v 1.203 2006/08/14 09:11:55 foxr Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -52,6 +52,8 @@ use vars qw(@desklines $readdesk);
 
 my @inlineremote;
 
+
+
 # ================================================================ Little texts
 
 sub initlittle {
@@ -62,6 +64,7 @@ sub initlittle {
                                                     'Roles':'Courses'),
                                        'docs' => 'Course Documents',
                                        'exit' => 'Exit',
+                                       'login' => 'Log In',
 				       'launch' => 'Launch Remote Control',
                                        'groups' => 'Groups',
                                        'gdoc' => 'Group Documents',
@@ -176,8 +179,8 @@ ENDMAINMENU
     <tr>
       $logo
       <td></td>
-      <td class="LC_top_nav_exit">
-        <a href="/adm/logout" target="_top">$lt{'exit'}</a>
+      <td class="LC_top_nav_login">
+        <a href="/adm/roles" target="_top">$lt{'login'}</a>
      </td>
     </tr>
   </table>
@@ -461,16 +464,17 @@ sub innerregister {
                 $is_const_dir = 1;
             } else {
                 $currdir =~ s#[^/]+$##;
+		my $cleandisfn = &Apache::loncommon::escape_single($thisdisfn);
                 $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]&gocstr('/adm/printout','/~$uname/$thisdisfn')&Prepare a printable document
+s&6&2&rtrv.gif&retrieve[_1]&version[_1]&gocstr('/adm/retrieve','/~$uname/$cleandisfn')&Retrieve old version
+s&6&3&pub.gif&publish[_1]&resource[_1]&gocstr('/adm/publish','/~$uname/$cleandisfn')&Publish this resource
+s&7&1&del.gif&delete[_1]&resource[_2]&gocstr('/adm/cfile?action=delete','/~$uname/$cleandisfn')&Delete this resource
+s&7&2&prt.gif&prepare[_1]&printout[_1]&gocstr('/adm/printout','/~$uname/$cleandisfn')&Prepare a printable document
 ENDMENUITEMS
             }
-        } elsif (defined($env{'request.course.id'}) && 
-		 $env{'request.symb'} ne '') {
+        } elsif ( defined($env{'request.course.id'}) && 
+		 $env{'request.symb'} ne '' ) {
 	    $menuitems=(<<ENDMENUITEMS);
 c&3&1
 s&2&1&back.gif&backward[_1]&&gopost('/adm/flip','back:'+currentURL)&Go to the previous resource in the course sequence&1
@@ -490,6 +494,12 @@ s&8&2&fdbk.gif&feedback[_1]&discuss[_1]&
 ENDREALRES
 	    }
         }
+	if ($env{'request.uri'} =~ /^\/res/) {
+	    $menuitems .= (<<ENDMENUITEMS);
+s&8&3&prt.gif&prepare[_1]&printout[_1]&gopost('/adm/printout',currentURL)&Prepare a printable document
+ENDMENUITEMS
+	}
+        &Apache::lonnet::logthis("Menu items:\n$menuitems\n");
         my $buttons='';
         foreach (split(/\n/,$menuitems)) {
 	    my ($command,@rest)=split(/\&/,$_);
@@ -499,6 +509,7 @@ ENDREALRES
                 $buttons.=&clear(@rest);
             }
         }
+	&Apache::lonnet::logthis("buttons = $buttons");
 
         if ($textual) {
 	    my $addremote=0;
@@ -520,6 +531,7 @@ ENDREALRES
 ENDINLINE
                 }
 	    }
+	    &Apache::lonnet::logthis("Inline:\n $inlinebuttons \n");
 	    $result =(<<ENDREGTEXT);
 <script type="text/javascript">
 // BEGIN LON-CAPA Internal