--- loncom/publisher/lonretrieve.pm	2009/05/14 15:11:00	1.40
+++ loncom/publisher/lonretrieve.pm	2009/08/11 15:15:01	1.41
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to retrieve an old version of a file
 #
-# $Id: lonretrieve.pm,v 1.40 2009/05/14 15:11:00 bisitz Exp $
+# $Id: lonretrieve.pm,v 1.41 2009/08/11 15:15:01 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -152,8 +152,8 @@ sub phaseone {
 		my $rmtime=&Apache::lonnet::metadata($resdir.'/'.$filename,'lastrevisiondate');
 		$r->print(&Apache::loncommon::start_data_table_row().
 			  '<td><input type="radio" name="version" value="'.
-			  $version.'" /></td><td>'.&mt('Previously published version').' '.$version.'</td><td>'.
-			  localtime($rmtime).'</td>');
+			  $version.'" /></td><td>'.&mt('Previously published version').' '.$version.'</td>'.
+              '<td>'.&Apache::lonlocal::locallocaltime($rmtime).'</td>');
 		
 		if (!$is_meta) {
 		    $r->print('<td><a href="'.$urldir.$filename.'.meta" target="cat">'.
@@ -175,8 +175,9 @@ sub phaseone {
 	my $rmtime=&Apache::lonnet::metadata($resfn,'lastrevisiondate');
 	$r->print(&Apache::loncommon::start_data_table_row().
 		  '<td><input type="radio" name="version" value="new" /></td>'.
-		  '<td><b>'.&mt('Currently published version').'</b></td><td>'.localtime($rmtime).
-		  '</td>');
+		  '<td><b>'.&mt('Currently published version').'</b></td>'.
+          '<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>');           
@@ -198,13 +199,25 @@ sub phaseone {
 		      &mt('This will only retrieve the resource. If you want to retrieve the metadata, you will need to do that separately.').
 		      '</span></p>');
 	}
-	$r->print('<input type="submit" value="'.&mt('Retrieve Version').'" /></form>');
+	$r->print('<input type="submit" value="'.&mt('Retrieve selected Version').'" /></form>');
     } else {
 	$r->print('<p class="LC_warning">'.&mt('No previous versions published.').'</p>');
     }
-    $r->print('<p><a href="/priv/'.$uname.$fn.'">'
-             .&mt('Back to [_1]','<span class="LC_filename">'.$fn.'</span>')
-             .'</a></p>'); 
+
+    my $dir =  &Apache::loncommon::authorspace()
+              .&File::Basename::dirname($fn)
+              .'/';
+    $r->print(&Apache::lonhtmlcommon::start_funclist()
+             .&Apache::lonhtmlcommon::add_item_funclist(
+                  '<a href="/priv/'.$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
@@ -254,7 +267,7 @@ sub phasetwo {
         }
         $r->print('</p>'
                  .'<p><a href="/priv/'.$uname.$fn.'">'
-                 .&mt('Back to [_1]',$fn)
+                 .&mt('Back to Resource')
                  .'</a></p>');
     } else {
        $r->print('<p class="LC_info">'.&mt('Please pick a version to retrieve:').'</p>');
@@ -321,7 +334,22 @@ sub handler {
   &Apache::loncommon::content_type($r,'text/html');
   $r->send_http_header;
 
-  $r->print(&Apache::loncommon::start_page('Retrieve Published Resources'));
+    # Breadcrumbs
+    &Apache::lonhtmlcommon::clear_breadcrumbs();
+    &Apache::lonhtmlcommon::add_breadcrumb({
+        'text'  => 'Construction Space',
+        'href'  => &Apache::loncommon::authorspace(),
+    });
+    &Apache::lonhtmlcommon::add_breadcrumb({
+        'text'  => 'Retrieve previous version',
+        'href'  => '',
+    });
+
+  $r->print(&Apache::loncommon::start_page('Retrieve Published Resources')
+           .&Apache::lonhtmlcommon::breadcrumbs()
+           .&Apache::loncommon::head_subbox(
+                &Apache::loncommon::CSTR_pageheader()) # FIXME crumbs broken?
+    );
 
   $r->print('<p>'
            .&mt('Retrieve previous versions of [_1]'