--- loncom/publisher/lonpubdir.pm	2011/12/23 14:54:26	1.139
+++ loncom/publisher/lonpubdir.pm	2012/04/24 10:29:53	1.142
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Construction Space Directory Lister
 #
-# $Id: lonpubdir.pm,v 1.139 2011/12/23 14:54:26 www Exp $
+# $Id: lonpubdir.pm,v 1.142 2012/04/24 10:29:53 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -524,7 +524,7 @@ sub putresource {
     my $css_class='LC_browser_file';
     my $title=' ';
     my $publish_button=&mt('Publish');
-    my $cstr_dir = $r->dir_config('lonDocRoot').'/priv/'.$udom.'/'.$uname.'/'.$thisdisfn.'/';
+    my $cstr_dir = $r->dir_config('lonDocRoot').'/priv'.$thisdisfn;
     my $linkfilename=&HTML::Entities::encode('/priv'.$thisdisfn.'/'.$filename,'<>&"');
 
     if (-e $resdir.'/'.$filename) {
@@ -596,11 +596,21 @@ sub putresource {
 
 	if (!$meta_same) {
 	    $title = &mt('Metadata Modified').'<br />'.$title.
-		'<br /><a href="/adm/diff?filename=/priv/'.$linkfilename.'.meta'.
-		'&amp;versiontwo=priv" target="cat">'.&mt('Metadata Diffs').'</a>';
-	    $title.="\n".'<br /><a href="/adm/retrieve?filename='.$linkfilename.'.meta" target="_parent">'.&mt('Retrieve Metadata').'</a>';
+		'<br />'.
+                &Apache::loncommon::modal_link(
+                    '/adm/diff?filename='.$linkfilename.'.meta'.'&amp;versiontwo=priv',
+                    &mt('Metadata Diffs'),600,500);
+	    $title.="\n".'<br />'.
+                &Apache::loncommon::modal_link(
+                    '/adm/retrieve?filename='.$linkfilename.'.meta&amp;inhibitmenu=yes&amp;add_modal=yes',
+                    &mt('Retrieve Metadata'),600,500);
 	}
-	$status.="\n".'<br /><a href="/adm/retrieve?filename='.$linkfilename.'" target="_parent">'.&mt('Retrieve').'</a>';
+	$status.="\n".'<br />'.
+             &Apache::loncommon::modal_link(
+                 '/adm/retrieve?filename='.$linkfilename.'&amp;inhibitmenu=yes&amp;add_modal=yes',&mt('Retrieve'),600,500);
+    } else {
+        # Allow editing metadata of unpublished resources
+        $title .= '<a href="'.$linkfilename.'.meta">'.&mt('Edit Metadata').'</a>';
     }
     my $editlink='';
     my $editlink2='';