--- loncom/publisher/lonpublisher.pm	2009/11/24 01:11:53	1.258.2.3
+++ loncom/publisher/lonpublisher.pm	2009/11/24 01:44:44	1.264
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Publication Handler
 #
-# $Id: lonpublisher.pm,v 1.258.2.3 2009/11/24 01:11:53 raeburn Exp $
+# $Id: lonpublisher.pm,v 1.264 2009/11/24 01:44:44 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1771,16 +1771,22 @@ sub phasetwo {
         my $thissrcdir=$thissrc;
         $thissrcdir=~s/\/[^\/]+$/\//;
         
-        unless ($env{'request.role'} =~ /^aa/) {
-            $r->print(
-               '<hr /><a href="'.$thisdistarget.'"><font size="+2">'.
-               &mt('View Published Version').'</font></a>');
-        }
-        $r->print('<p><a href="'.$thissrc.'"><font size="+2">'.
-		  &mt('Back to Source').'</font></a></p>'.
-                  '<p><a href="'.$thissrcdir.
-                  '"><font size="+2">'.
-		  &mt('Back to Source Directory').'</font></a></p>');
+        $r->print(&Apache::loncommon::head_subbox(
+            &Apache::lonhtmlcommon::start_funclist().
+            &Apache::lonhtmlcommon::add_item_funclist(
+                '<a href="'.$thisdistarget.'">'.
+                &mt('View Published Version').
+                '</a>').
+            &Apache::lonhtmlcommon::add_item_funclist(
+                '<a href="'.$thissrc.'">'.
+                &mt('Back to Source').
+                '</a>').
+            &Apache::lonhtmlcommon::add_item_funclist(
+                '<a href="'.$thissrcdir.'">'.
+                &mt('Back to Source Directory').
+                '</a>').
+            &Apache::lonhtmlcommon::end_funclist())
+        );
     }
     return 1;
 }
@@ -2166,10 +2172,25 @@ sub handler {
     &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
     
+    # Breadcrumbs
+    &Apache::lonhtmlcommon::clear_breadcrumbs();
+    &Apache::lonhtmlcommon::add_breadcrumb({
+        'text'  => 'Construction Space',
+        'href'  => &Apache::loncommon::authorspace(),
+    });
+    &Apache::lonhtmlcommon::add_breadcrumb({
+        'text'  => 'Resource Publication',
+        'href'  => '',
+    });
+
     my $js='<script type="text/javascript">'.
 	&Apache::loncommon::browser_and_searcher_javascript().
 	'</script>';
-    $r->print(&Apache::loncommon::start_page('Resource Publication',$js));
+    $r->print(&Apache::loncommon::start_page('Resource Publication',$js)
+             .&Apache::lonhtmlcommon::breadcrumbs()
+             .&Apache::loncommon::head_subbox(
+                  &Apache::loncommon::CSTR_pageheader()) # FIXME crumbs broken?
+    );
 
 
     my $thisfn=$fn;
@@ -2270,7 +2291,6 @@ ENDDIFF
 	    }
 	} else {
 	    &phasetwo($r,$thisfn,$thistarget,$thisembstyle,$thisdistarget); 
-	    $r->print('<hr />');
 	}
     }
     $r->print(&Apache::loncommon::end_page());