--- loncom/publisher/lonpublisher.pm	2009/05/14 11:13:49	1.258
+++ loncom/publisher/lonpublisher.pm	2009/11/19 05:18:08	1.263
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Publication Handler
 #
-# $Id: lonpublisher.pm,v 1.258 2009/05/14 11:13:49 bisitz Exp $
+# $Id: lonpublisher.pm,v 1.263 2009/11/19 05:18:08 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1641,7 +1641,8 @@ sub phasetwo {
         my $srcf=$2;
         my $srct=$3;
         my $srcd=$1;
-        unless ($srcd=~/^\/home\/httpd\/html\/res/) {
+        my $docroot = $Apache::lonnet::perlvar{'lonDocRoot'};
+        unless ($srcd=~/^\Q$docroot\E\/res/) {
             print $logfile "\nPANIC: Target dir is ".$srcd;
             $r->print(
 	 "<span class=\"LC_error\">".&mt('Invalid target directory, FAIL')."</span>");
@@ -1746,7 +1747,8 @@ sub phasetwo {
 # ------------------------------------------------------------- Trigger updates
     push(@{$modified_urls},[$target,$source]);
     unless ($registered_cleanup) {
-	$r->register_cleanup(\&notify);
+        my $handlers = $r->get_handlers('PerlCleanupHandler');
+        $r->set_handlers('PerlCleanupHandler' => [\&notify,@{$handlers}]);
 	$registered_cleanup=1;
     }
 
@@ -1769,15 +1771,26 @@ sub phasetwo {
         my $thissrcdir=$thissrc;
         $thissrcdir=~s/\/[^\/]+$/\//;
         
-        
+        $r->print(&Apache::lonhtmlcommon::start_funclist());
+        unless ($env{'request.role'}=~/^(aa)/) {
+            $r->print(
+                &Apache::lonhtmlcommon::add_item_funclist(
+                    '<a href="'.$thisdistarget.'">'
+                   .&mt('View Published Version')
+                   .'</a>')
+            );
+        }
         $r->print(
-           '<hr /><a href="'.$thisdistarget.'"><font size="+2">'.
-           &mt('View Published Version').'</font></a>'.
-           '<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>');
+            &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;
 }
@@ -2163,10 +2176,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;
@@ -2267,7 +2295,6 @@ ENDDIFF
 	    }
 	} else {
 	    &phasetwo($r,$thisfn,$thistarget,$thisembstyle,$thisdistarget); 
-	    $r->print('<hr />');
 	}
     }
     $r->print(&Apache::loncommon::end_page());