--- loncom/publisher/lonretrieve.pm	2011/11/14 00:20:31	1.47
+++ loncom/publisher/lonretrieve.pm	2013/06/07 16:07:49	1.52
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to retrieve an old version of a file
 #
-# $Id: lonretrieve.pm,v 1.47 2011/11/14 00:20:31 raeburn Exp $
+# $Id: lonretrieve.pm,v 1.52 2013/06/07 16:07:49 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -99,7 +99,6 @@ use strict;
 use Apache::File;
 use File::Copy;
 use Apache::Constants qw(:common :http :methods);
-use Apache::loncacc;
 use Apache::loncommon();
 use Apache::lonlocal;
 use Apache::lonnet;
@@ -118,7 +117,7 @@ sub phaseone {
     my ($main,$suffix,$is_meta) = &get_file_info($fn);
     
     if (-e $resfn) {  
-	$r->print('<form action="/adm/retrieve" method="post">'.
+	$r->print('<form action="/adm/retrieve?inhibitmenu=yes" method="post">'.
 		  '<input type="hidden" name="filename" value="/priv/'.$udom.'/'.$uname.$fn.'" />'.
 		  '<input type="hidden" name="phase" value="two" />'.
 		  &Apache::loncommon::start_data_table().
@@ -154,17 +153,18 @@ sub phaseone {
               '<td>'.&Apache::lonlocal::locallocaltime($rmtime).'</td>');
 		
 		if (!$is_meta) {
-		    $r->print('<td><a href="'.$urldir.$filename.'.meta" target="cat">'.
-			      &mt('Metadata Version').' '.$version.'</a></td>');
+		    $r->print('<td>'.
+                              &Apache::loncommon::modal_link($urldir.$filename.'.meta',
+			      &mt('Metadata Version [_1]',$version),550,450).'</td>');
 		}
 		if ($is_meta
 		    || &Apache::loncommon::fileembstyle($suffix) eq 'ssi') {
-		    $r->print(
-			      '<td><a target="cat" href="/adm/diff?filename=/priv/'.
-			      $udom,'/'.$uname.$fn.
-			      '&amp;versiontwo=priv&amp;versionone='.$version.
-			      '">'.&mt('Diffs with Version').' '.$version.
-			      '</a></td>');
+		    $r->print('<td>'.
+                              &Apache::loncommon::modal_link(
+                               '/adm/diff?filename=/priv/'.$udom.'/'.$uname.$fn.
+			      '&amp;versiontwo=priv&amp;versionone='.$version,
+			       &mt('Diffs with Version [_1]',$version),550,450).
+			      '</td>');
 		}
 		$r->print(&Apache::loncommon::end_data_table_row());
 	    }
@@ -177,21 +177,24 @@ sub phaseone {
           '<td>'.&Apache::lonlocal::locallocaltime($rmtime).'</td>'
     );
 	if (!$is_meta) {
-	    $r->print('<td><a href="'.$urldir.$main.'.'.$suffix.'.meta" target="cat">'.
-		      &mt('Metadata current version').'</a></td>');           
+	    $r->print('<td>',
+                      &Apache::loncommon::modal_link($urldir.$main.'.'.$suffix.'.meta',
+		      &mt('Metadata current version'),550,450).'</td>');           
 	}
 	if ($is_meta 
 	    || &Apache::loncommon::fileembstyle($suffix) eq 'ssi') {
-	    $r->print(
-		      '<td><a target="cat" href="/adm/diff?filename=/priv/'.
+	    $r->print('<td>'.
+                      &Apache::loncommon::modal_link(
+                       '/adm/diff?filename=/priv/'.
 		      $udom.'/'.$uname.$fn.
-		      '&amp;versiontwo=priv'.
-		      '">'.&mt('Diffs with current Version').'</a></td>');
+		      '&amp;versiontwo=priv',
+		      &mt('Diffs with current Version'),550,450).
+                      '</td>');
 	}
 	$r->print(&Apache::loncommon::end_data_table_row().
 		  &Apache::loncommon::end_data_table().
 		  '<p>'.'<span class="LC_warning">'.
-		  &mt('Retrieval of an old version will overwrite the file currently in construction space.').'</span></p>');
+		  &mt('Retrieval of an old version will overwrite the file currently in Authoring Space.').'</span></p>');
 	if (!$is_meta) {
 	    $r->print('<p>'.'<span class="LC_warning">'.
 		      &mt('This will only retrieve the resource. If you want to retrieve the metadata, you will need to do that separately.').
@@ -202,23 +205,6 @@ sub phaseone {
 	$r->print('<p class="LC_warning">'.&mt('No previous versions published.').'</p>');
     }
 
-    my $dir =  &Apache::loncommon::authorspace($fn)
-              .&File::Basename::dirname($fn)
-              .'/';
-    $r->print('<br />'
-             .&Apache::loncommon::head_subbox(
-                  &Apache::lonhtmlcommon::start_funclist()
-                 .&Apache::lonhtmlcommon::add_item_funclist(
-                     '<a href="/priv/'.$udom.'/'.$uname.$fn.'">'
-                    .&mt('Back to Resource')
-                    .'</a>')
-                 .&Apache::lonhtmlcommon::add_item_funclist(
-                     '<a href="'.$dir.'">'
-                    .&mt('Back to Directory')
-                    .'</a>')
-                 .&Apache::lonhtmlcommon::end_funclist()
-             )
-    );
 }
 
 # ---------------------------------- Interface for presenting specified version
@@ -259,6 +245,7 @@ sub phasetwo {
                      .&mt('ok')
                      .'</span>');
             print $logfile "Copied sucessfully.\n\n";
+            $r->print(&Apache::lonhtmlcommon::scripttag('parent.location.reload();'));
         } else {
             my $error=$!;
 	    $r->print('<span class="LC_error">'
@@ -266,10 +253,6 @@ sub phasetwo {
                      .'</span>');
             print $logfile "Copy failed: $error\n\n";
         }
-        $r->print('</p>'
-                 .'<p><a href="/priv/'.$udom.'/'.$uname.$fn.'">'
-                 .&mt('Back to Resource')
-                 .'</a></p>');
     } else {
        $r->print('<p class="LC_info">'.&mt('Please pick a version to retrieve:').'</p>');
        &phaseone($r,$fn,$uname,$udom);
@@ -320,7 +303,7 @@ sub handler {
   my $uname;
   my $udom;
 
-  ($uname,$udom) = &Apache::loncacc::constructaccess($fn);
+  ($uname,$udom) = &Apache::lonnet::constructaccess($fn);
   unless (($uname ne '') && ($udom ne '')) {
      $r->log_reason($uname.' at '.$udom.
          ' trying to publish file '.$env{'form.filename'}.
@@ -335,7 +318,7 @@ sub handler {
     # Breadcrumbs
     &Apache::lonhtmlcommon::clear_breadcrumbs();
     &Apache::lonhtmlcommon::add_breadcrumb({
-        'text'  => 'Construction Space',
+        'text'  => 'Authoring Space',
         'href'  => &Apache::loncommon::authorspace($fn),
     });
     &Apache::lonhtmlcommon::add_breadcrumb({