--- loncom/interface/lonmenu.pm	2006/07/18 21:55:24	1.198
+++ loncom/interface/lonmenu.pm	2006/07/31 22:53:07	1.201
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.198 2006/07/18 21:55:24 albertel Exp $
+# $Id: lonmenu.pm,v 1.201 2006/07/31 22:53:07 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -90,6 +90,10 @@ sub menubuttons {
     my $escurl=&escape(&Apache::lonenc::check_encrypt($env{'request.noversionuri'}));
     my $escsymb=&escape(&Apache::lonenc::check_encrypt($env{'request.symb'}));
 
+    my $logo=&Apache::loncommon::lonhttpdurl("/adm/lonIcons/minilogo.gif");
+    $logo = '<td class="LC_top_nav_logo"><a href="/adm/about.html"><img src="'.
+	$logo.'" alt="LON-CAPA Logo" /></a></td>';
+
     if ($env{'request.state'} eq 'construct') {
         if (($env{'request.noversionuri'} eq '') || (!defined($env{'request.noversionuri'}))) {
             my $returnurl = $env{'request.filename'};
@@ -167,14 +171,14 @@ ENDMAINMENU
         my $vlink=&Apache::loncommon::designparm($function.'.vlink',$domain);
         my $sidebg=&Apache::loncommon::designparm($function.'.sidebg',$domain);
 	if ($env{'user.name'} eq 'public' && $env{'user.domain'} eq 'public') {
-	    my $logo=&Apache::loncommon::lonhttpdurl("/adm/lonIcons/minilogo.gif");
 	    return (<<ENDINLINEMENU);
    <table id="LC_top_nav">
     <tr>
-      <td>
+      $logo
+      <td></td>
+      <td class="LC_top_nav_exit">
         <a href="/adm/logout" target="_top">$lt{'exit'}</a>
      </td>
-     <td class="LC_top_nav_logo">LON-CAPA<img src="$logo" alt="Logo" /></td>
     </tr>
   </table>
 </font>
@@ -230,7 +234,6 @@ ENDCRELOAD
         }
         my $form=&serverform();
 	my $utility=&utilityfunctions();
-	my $logo=&Apache::loncommon::lonhttpdurl("/adm/lonIcons/minilogo.gif");
 	my $remote;
 	if ($env{'user.adv'}) {
 	    $remote = '<td><a href="/adm/remote?action=launch&amp;url='.$escurl.'" target="_top">'.$lt{'launch'}.'</a></td>'
@@ -246,8 +249,7 @@ $utility
 </script>
 <table id="LC_top_nav">
 <tr>
-<td class="LC_top_nav_logo">
-<a href="/adm/about.html"><img src="$logo" alt="LON-CAPA Logo" align="left" border="0" /></a></td>
+$logo
 <td><a href="/adm/menu" target="_top">$lt{'main'}</a></td>
 $reloadlink
 $navmaps
@@ -255,8 +257,8 @@ $docs
 $groups
 $remote
 <td><a href="/adm/roles" target="_top">$lt{'roles'}</a></td>
-<td>$helplink</td>
-<td class="LC_top_logout"><a href="/adm/logout" target="_top">$lt{'exit'}</a></td>
+<td class="LC_top_nav_help">$helplink</td>
+<td class="LC_top_nav_exit"><a href="/adm/logout" target="_top">$lt{'exit'}</a></td>
 </tr>
 </table>
 $form
@@ -459,12 +461,13 @@ 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'}) &&