--- loncom/interface/lonmeta.pm 2009/04/21 15:38:02 1.231 +++ loncom/interface/lonmeta.pm 2009/05/28 17:08:32 1.235 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Metadata display handler # -# $Id: lonmeta.pm,v 1.231 2009/04/21 15:38:02 bisitz Exp $ +# $Id: lonmeta.pm,v 1.235 2009/05/28 17:08:32 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -742,6 +742,13 @@ sub prettyinput { $relatedvalue); } +# Create pageheader +sub pageheader { + return &Apache::lonhtmlcommon::breadcrumbs() + .&Apache::loncommon::head_subbox( + &Apache::loncommon::CSTR_pageheader()); +} + # Main Handler sub handler { my $r=shift; @@ -755,16 +762,34 @@ sub handler { return OK if $r->header_only; my ($resdomain,$resuser)= (&Apache::lonnet::declutter($uri)=~/^($match_domain)\/($match_username)\//); + + # Breadcrumbs + &Apache::lonhtmlcommon::clear_breadcrumbs(); + &Apache::lonhtmlcommon::add_breadcrumb({ + 'text' => 'Construction Space', + 'href' => &Apache::loncommon::authorspace(), + }); + if ($uri=~m:/adm/bombs/(.*)$:) { + &Apache::lonhtmlcommon::add_breadcrumb({ + 'text' => 'Error Messages', + 'href' => '', + }); $r->print(&Apache::loncommon::start_page('Error Messages')); + $r->print(&pageheader()); # Looking for all bombs? &report_bombs($r,$uri); } elsif ($uri=~m|^/editupload/[^/]+/[^/]+/portfolio/|) { + &Apache::lonhtmlcommon::add_breadcrumb({ + 'text' => 'Edit Portfolio File Metadata', + 'href' => '', + }); ($resdomain,$resuser)= (&Apache::lonnet::declutter($uri)=~m|^($match_domain)/($match_name)/portfolio|); $r->print(&Apache::loncommon::start_page('Edit Portfolio File Metadata', undef, {'domain' => $resdomain,})); + $r->print(&pageheader()); if ($env{'form.store'}) { &present_editable_metadata($r,$uri,'portfolio'); } else { @@ -781,22 +806,37 @@ sub handler { } } } elsif ($uri=~m|^/editupload/[^/]+/[^/]+/groups/|) { + &Apache::lonhtmlcommon::add_breadcrumb({ + 'text' => 'Edit Group Portfolio File Metadata', + 'href' => '', + }); $r->print(&Apache::loncommon::start_page('Edit Group Portfolio File Metadata', undef, {'domain' => $resdomain,})); + $r->print(&pageheader()); &present_editable_metadata($r,$uri,'groups'); } elsif ($uri=~m|^/~|) { # Construction space + &Apache::lonhtmlcommon::add_breadcrumb({ + 'text' => 'Edit Metadata', + 'href' => '', + }); $r->print(&Apache::loncommon::start_page('Edit Metadata', "\n".'', {'domain' => $resdomain,})); + $r->print(&pageheader()); &present_editable_metadata($r,$uri); } else { + &Apache::lonhtmlcommon::add_breadcrumb({ + 'text' => 'Metadata', + 'href' => '', + }); $r->print(&Apache::loncommon::start_page('Metadata', undef, {'domain' => $resdomain,})); + $r->print(&pageheader()); &present_uneditable_metadata($r,$uri); } $r->print(&Apache::loncommon::end_page()); @@ -1123,7 +1163,7 @@ sub print_dynamic_metadata { .&mt('visible to author and co-authors only') .')' ); - if (exists($dynmeta{'comments'}) and $dynmeta{'comments'} ne '') { + if (exists($dynmeta{'comments'})) { $r->print('
'.$dynmeta{'comments'}.''); } else { $r->print('
'
@@ -1262,7 +1302,8 @@ ENDDEL
if ($disuri=~/\/default$/) {
my $dir=$disuri;
$dir=~s/default$//;
- $displayfile=&mt('Default Metadata for Directory [_1]',$dir);
+ $displayfile=&mt('Default Metadata for Directory [_1]'
+ ,''.$dir.'');
}
%Apache::lonpublisher::metadatafields=();
%Apache::lonpublisher::metadatakeys=();
@@ -1289,7 +1330,7 @@ ENDDEL
}
}
$r->print(< $displayfile