--- loncom/interface/lonmeta.pm 2008/12/13 22:15:53 1.223 +++ loncom/interface/lonmeta.pm 2009/04/04 00:38:13 1.228 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Metadata display handler # -# $Id: lonmeta.pm,v 1.223 2008/12/13 22:15:53 raeburn Exp $ +# $Id: lonmeta.pm,v 1.228 2009/04/04 00:38:13 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -338,7 +338,7 @@ sub pre_select_course { &Apache::lonpublisher::metaeval($result); } $r->print('
'); - $r->print('

'.&mt('If you would like to associate this resource ([_1]) with a current or previous course, please select one from the list below, otherwise select, \'None\'',''.$res_uri.'').'

'); + $r->print('

'.&mt('If you would like to associate this resource ([_1]) with a current or previous course, please select one from the list below, otherwise select, "None".',''.$res_uri.'').'

'); $output = &select_course(); $r->print($output.'
'); @@ -432,7 +432,7 @@ sub prettyprint { } # Title if ($type eq 'title') { - return ''.$value.''; + return $value; } # Dates if (($type eq 'creationdate') || @@ -482,7 +482,7 @@ sub prettyprint { ($type eq 'comefrom_list') || ($type eq 'sequsage_list') || ($type eq 'dependencies')) { - return ''; } # Evaluations if (($type eq 'clear') || @@ -519,7 +519,7 @@ sub prettyprint { # List of courses if ($type=~/\_list/) { my @Courses = split(/\s*\,\s*/,$value); - my $Str=''; } # No pretty print found return $value; @@ -558,7 +558,7 @@ sub selectbox { foreach my $id (@idlist) { $selout.=''; } else { $selout.='>'.&{$functionref}($id).''; } @@ -762,7 +762,7 @@ sub handler { } elsif ($uri=~m|^/editupload/[^/]+/[^/]+/portfolio/|) { ($resdomain,$resuser)= (&Apache::lonnet::declutter($uri)=~m|^($match_domain)/($match_name)/portfolio|); - $r->print(&Apache::loncommon::start_page('Edit Portfolio File Catalog Information', + $r->print(&Apache::loncommon::start_page('Edit Portfolio File Metadata', undef, {'domain' => $resdomain,})); if ($env{'form.store'}) { @@ -781,13 +781,13 @@ sub handler { } } } elsif ($uri=~m|^/editupload/[^/]+/[^/]+/groups/|) { - $r->print(&Apache::loncommon::start_page('Edit Group Portfolio File Catalog Information', + $r->print(&Apache::loncommon::start_page('Edit Group Portfolio File Metadata', undef, {'domain' => $resdomain,})); &present_editable_metadata($r,$uri,'groups'); } elsif ($uri=~m|^/~|) { # Construction space - $r->print(&Apache::loncommon::start_page('Edit Catalog Information', + $r->print(&Apache::loncommon::start_page('Edit Metadata', "\n".'', @@ -1467,26 +1467,26 @@ sub store_metadata { $output .= $result; } else { if (! ($mfh=Apache::File->new('>'.$fn))) { - $output .= '

'; + $output .= '

'; if ($caller eq 'transfer') { $output .= &mt('Could not transfer data in added fields to notes'); } else { $output .= &mt('Could not write metadata'); } - $output .= ', '.&mt('FAIL').'

'; + $output .= ', '.&mt('FAIL').'

'; $outcome = 'fail'; } else { print $mfh ($file_content); close($mfh); &update_metadata_table($uri); - $output .= '

'; + $output .= '

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

'; + '

'; $outcome = 'ok'; } } @@ -1514,25 +1514,25 @@ sub store_portfolio_metadata { $env{'form.'.$formname.'.filename'}=$new_fn; my $result =&Apache::lonnet::userfileupload($formname,'',$path); if ($result =~ /(error|notfound)/) { - $output = '

'; + $output = '

'; if ($caller eq 'transfer') { $output .= &mt('Could not transfer data in added fields to notes'); } else { $output .= &mt('Could not write metadata'); } - $output .= ', '.&mt('FAIL').'

'; + $output .= ', '.&mt('FAIL').'

'; $outcome = 'fail'; } else { &update_metadata_table($uri); - $output = '

'; + $output = '

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

'; + '

'; $outcome = 'ok'; } return ($outcome,$output);