--- loncom/publisher/lonpublisher.pm 2010/01/27 03:44:48 1.258.2.4 +++ loncom/publisher/lonpublisher.pm 2009/12/03 17:23:00 1.265 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Publication Handler # -# $Id: lonpublisher.pm,v 1.258.2.4 2010/01/27 03:44:48 raeburn Exp $ +# $Id: lonpublisher.pm,v 1.265 2009/12/03 17:23:00 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -1687,7 +1687,6 @@ sub phasetwo { if (-e $target.'.meta') { $r->print(&Apache::lonhtmlcommon::confirm_success( &mt('Failed to write old metadata copy').", $!",1)); - return 0; } } @@ -1727,7 +1726,7 @@ sub phasetwo { &mt('Failed to copy source').", $!",1)); return 0; } - + # ---------------------------------------------- Delete local tmp-preview files unlink($copyfile.'.tmp'); # --------------------------------------------------------------- Copy Metadata @@ -1771,15 +1770,23 @@ sub phasetwo { my $thissrcdir=$thissrc; $thissrcdir=~s/\/[^\/]+$/\//; - - $r->print( - '
'. - &mt('View Published Version').''. - '

'. - &mt('Back to Source').'

'. - '

'. - &mt('Back to Source Directory').'

'); + + $r->print(&Apache::loncommon::head_subbox( + &Apache::lonhtmlcommon::start_funclist(). + &Apache::lonhtmlcommon::add_item_funclist( + ''. + &mt('View Published Version'). + ''). + &Apache::lonhtmlcommon::add_item_funclist( + ''. + &mt('Back to Source'). + ''). + &Apache::lonhtmlcommon::add_item_funclist( + ''. + &mt('Back to Source Directory'). + ''). + &Apache::lonhtmlcommon::end_funclist()) + ); } return 1; } @@ -2165,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=''; - $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; @@ -2269,7 +2291,6 @@ ENDDIFF } } else { &phasetwo($r,$thisfn,$thistarget,$thisembstyle,$thisdistarget); - $r->print('
'); } } $r->print(&Apache::loncommon::end_page());