--- loncom/interface/lonmeta.pm 2009/04/21 15:23:18 1.230 +++ loncom/interface/lonmeta.pm 2009/12/14 14:39:23 1.239 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Metadata display handler # -# $Id: lonmeta.pm,v 1.230 2009/04/21 15:23:18 bisitz Exp $ +# $Id: lonmeta.pm,v 1.239 2009/12/14 14:39:23 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -425,7 +425,7 @@ sub select_course { # Pretty printing of metadata field sub prettyprint { - my ($type,$value,$target,$prefix,$form,$noformat)=@_; + my ($type,$value,$target,$prefix,$form)=@_; # $target,$prefix,$form are optional and for filecrumbs only if (! defined($value)) { return ' '; @@ -500,8 +500,8 @@ sub prettyprint { } } $_ = '
  • '.$title.' '. - &Apache::lonhtmlcommon::crumbs($url,$target,$prefix,$form,'0',$noformat). - '
    • ' + &Apache::lonhtmlcommon::crumbs($url,$target,$prefix,$form). + '' } split(/\s*\,\s*/,$value)).''; } # Evaluations @@ -742,6 +742,23 @@ sub prettyinput { $relatedvalue); } +# Create pageheader +sub pageheader { + my $output = ''; + # No CSTR? Include breadcrumbs + if ($env{'request.state'} ne 'construct') { + # loncommon::bodytag already includes breadcrumbs for CSTR + # by calling lonmenu::innerregister + $output = &Apache::lonhtmlcommon::breadcrumbs(); + } + # CSTR? Include CSTR header + if ($env{'request.state'} eq 'construct') { + $output .= &Apache::loncommon::head_subbox( + &Apache::loncommon::CSTR_pageheader()); + } + return $output; +} + # Main Handler sub handler { my $r=shift; @@ -755,16 +772,37 @@ sub handler { return OK if $r->header_only; my ($resdomain,$resuser)= (&Apache::lonnet::declutter($uri)=~/^($match_domain)\/($match_username)\//); + + # Breadcrumbs + &Apache::lonhtmlcommon::clear_breadcrumbs(); + + if ($env{'request.state'} eq 'construct') { + &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 +819,41 @@ 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 { - $r->print(&Apache::loncommon::start_page('Metadata', - undef, - {'domain' => $resdomain,})); + &Apache::lonhtmlcommon::add_breadcrumb({ + 'text' => 'Metadata', + 'href' => '', + }); + $r->print( + &Apache::loncommon::start_page( + 'Metadata', + undef, + {'domain' => $resdomain, + 'only_body' => 1,}) + .'

    '.&mt('Metadata').'

    ' + ); &present_uneditable_metadata($r,$uri); } $r->print(&Apache::loncommon::end_page()); @@ -882,9 +939,8 @@ sub present_uneditable_metadata { $versiondisplay='Version: '.$currentversion; } } - # crumbify displayed URL uri target prefix form size - $disuri=&Apache::lonhtmlcommon::crumbs($disuri,undef, undef, undef,'+1'); - $disuri =~ s:
    ::g; + # crumbify displayed URL uri target prefix form + $disuri=&Apache::lonhtmlcommon::crumbs($disuri,undef, undef, undef); # obsolete my $obsolete=$content{'obsolete'}; my $obsoletewarning=''; @@ -1262,7 +1318,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 +1346,7 @@ ENDDEL } } $r->print(<$displayfile +

    $displayfile

    ENDEDIT my %lt=&fieldnames($file_type); @@ -1381,9 +1438,11 @@ ENDEDIT $lt{$field_name} = $$added_metadata_fields{$field_name}; } } - $output .= &Apache::loncommon::start_data_table(); - my $row_alt = 1; + $output .= &Apache::lonhtmlcommon::start_pick_box(); + my $last = $#fields + 1; + my $rowcount = 0; foreach my $field_name (@fields) { + $rowcount++; if (defined($env{'form.new_'.$field_name})) { my @values = &Apache::loncommon::get_env_multiple('form.new_'.$field_name); my $newvalue = ''; @@ -1402,31 +1461,32 @@ ENDEDIT ($field_name eq 'courserestricted'))&& (!($env{$Apache::lonpublisher::metadatafields{'courserestricted'}.'.metadata.'.$field_name.'.options'} =~ m/deleted/))){ - $output .= "\n".&Apache::loncommon::start_data_table_row(); - $output .= (''.$lt{$field_name}.': '. - &prettyinput($field_name, + $output .= &Apache::lonhtmlcommon::row_title($lt{$field_name}) + .&prettyinput($field_name, $Apache::lonpublisher::metadatafields{$field_name}, 'new_'.$field_name,'defaultmeta', undef,undef,undef,undef, - $Apache::lonpublisher::metadatafields{'courserestricted'}).''); - $output .= &Apache::loncommon::end_data_table_row(); + $Apache::lonpublisher::metadatafields{'courserestricted'}); + $output .= &Apache::lonhtmlcommon::row_closure($rowcount == $last?1:0); } } else { - $output.=(&Apache::loncommon::start_data_table_row().''.$lt{$field_name}.': '. - &prettyinput($field_name, + $output .= &Apache::lonhtmlcommon::row_title($lt{$field_name}) + .&prettyinput($field_name, $Apache::lonpublisher::metadatafields{$field_name}, - 'new_'.$field_name,'defaultmeta').''.&Apache::loncommon::end_data_table_row()); + 'new_'.$field_name,'defaultmeta') + .&Apache::lonhtmlcommon::row_closure($rowcount == $last?1:0); } } - $output .= &Apache::loncommon::end_data_table(); + $output .= &Apache::lonhtmlcommon::end_pick_box(); if ($env{'form.store'}) { my ($outcome,$result) = &store_metadata($fn,$uri,'store'); $r->print($result); } - $r->print($output.'
    '); + my $savebutton = '

    '; + $r->print($savebutton.$output.$savebutton); if ($file_type eq 'portfolio' || $file_type eq 'groups') { my ($port_path,$group) = &get_port_path_and_group($uri); @@ -1499,14 +1559,15 @@ sub store_metadata { print $mfh ($file_content); close($mfh); &update_metadata_table($uri); - $output .= '

    '; + my $confirmtext; if ($caller eq 'transfer') { - $output .= &mt('Transferred data in added fields to notes'); + $confirmtext = &mt('Transferred data in added fields to notes'); } else { - $output .= &mt('Wrote Metadata'); + $confirmtext = &mt('Wrote Metadata'); } - $output .= ' '.&Apache::lonlocal::locallocaltime(time). - '

    '; + $output .= &Apache::loncommon::confirmwrapper( + &Apache::lonhtmlcommon::confirm_success( + $confirmtext.' '.&Apache::lonlocal::locallocaltime(time))); $outcome = 'ok'; } }