--- loncom/interface/lonmeta.pm 2009/03/21 21:37:13 1.227 +++ loncom/interface/lonmeta.pm 2009/10/23 11:01:49 1.236 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Metadata display handler # -# $Id: lonmeta.pm,v 1.227 2009/03/21 21:37:13 bisitz Exp $ +# $Id: lonmeta.pm,v 1.236 2009/10/23 11:01:49 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -558,7 +558,7 @@ sub selectbox { foreach my $id (@idlist) { $selout.=''; } else { $selout.='>'.&{$functionref}($id).''; } @@ -578,7 +578,7 @@ sub relatedfield { return $relatedsep.' '; } return $relatedsep.''; + ($relatedvalue?' checked="checked"':'').' />'; } sub prettyinput { @@ -691,7 +691,7 @@ sub prettyinput { # Obsolete if ($type eq 'obsolete') { return ''. + ($value?' checked="checked"':'').' />'. &relatedfield(0,$relatedsearchflag,$relatedsep); } # Obsolete replacement file @@ -742,6 +742,17 @@ sub prettyinput { $relatedvalue); } +# Create pageheader +sub pageheader { + my $output = &Apache::lonhtmlcommon::breadcrumbs(); + + 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 +766,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 +813,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()); @@ -968,13 +1015,13 @@ sub print_dynamic_metadata { my %dynmeta=&dynamicmeta($uri); # # General Access and Usage Statistics + $r->print('

'.&mt('Access and Usage Statistics').'

'); if (exists($dynmeta{'count'}) || exists($dynmeta{'sequsage'}) || exists($dynmeta{'comefrom'}) || exists($dynmeta{'goto'}) || exists($dynmeta{'course'})) { - $r->print('

'.&mt('Access and Usage Statistics').'

'. - &Apache::lonhtmlcommon::start_pick_box()); + $r->print(&Apache::lonhtmlcommon::start_pick_box()); my @counts = ('count','sequsage','sequsage_list', 'comefrom','comefrom_list','goto', 'goto_list','course','course_list'); @@ -990,7 +1037,10 @@ sub print_dynamic_metadata { } $r->print(&Apache::lonhtmlcommon::end_pick_box()); } else { - $r->print('

'.&mt('No Access or Usages Statistics are available for this resource.').'

'); + $r->print('

' + .&mt('No Access or Usages Statistics are available for this resource.') + .'

' + ); } # # Assessment statistics @@ -1021,12 +1071,13 @@ sub print_dynamic_metadata { } $r->print(&Apache::lonhtmlcommon::end_pick_box()); } + # + # New assessment statistics + $r->print('

' + .&mt('Recent Detailed Assessment Statistical Data') + .'

' + ); if (exists($dynmeta{'stats'})) { - # - # New assessment statistics - $r->print('

'. - &mt('Recent Detailed Assessment Statistical Data'). - '

'); my $table=&Apache::loncommon::start_data_table() .&Apache::loncommon::start_data_table_header_row() .''.&mt('Course').'' @@ -1072,7 +1123,10 @@ sub print_dynamic_metadata { $table .= &Apache::loncommon::end_data_table().$/; $r->print($table); } else { - $r->print(&mt('No new dynamic data found.')); + $r->print('

' + .&mt('No new dynamic data found.') + .'

' + ); } } else { $r->print('

'. @@ -1081,14 +1135,14 @@ sub print_dynamic_metadata { } # - # + # Evaluation Data + $r->print('

'.&mt('Evaluation Data').'

'); if (exists($dynmeta{'clear'}) || exists($dynmeta{'depth'}) || exists($dynmeta{'helpful'}) || exists($dynmeta{'correct'}) || exists($dynmeta{'technical'})){ - $r->print('

'.&mt('Evaluation Data').'

'. - &Apache::lonhtmlcommon::start_pick_box()); + $r->print(&Apache::lonhtmlcommon::start_pick_box()); my @criteria = ('clear','depth','helpful','correct','technical'); my $rownum = 0; foreach my $item (@criteria) { @@ -1102,27 +1156,40 @@ sub print_dynamic_metadata { } $r->print(&Apache::lonhtmlcommon::end_pick_box()); } else { - $r->print('

'.&mt('No Evaluation Data is available for this resource.').'

'); + $r->print('

' + .&mt('No Evaluation Data is available for this resource.') + .'

' + ); } + # Evaluation Comments $uri=~/^\/res\/($match_domain)\/($match_username)\//; if ((($env{'user.domain'} eq $1) && ($env{'user.name'} eq $2)) || ($env{'user.role.ca./'.$1.'/'.$2})) { + $r->print('

'.&mt('Evaluation Comments').'

' + .'
(' + .&mt('visible to author and co-authors only') + .')
' + ); if (exists($dynmeta{'comments'})) { - $r->print('

'.&mt('Evaluation Comments').' ('. - &mt('visible to author and co-authors only'). - ')

'. - '
'.$dynmeta{'comments'}.'
'); + $r->print('
'.$dynmeta{'comments'}.'
'); } else { - $r->print('

'.&mt('There are no Evaluation Comments on this resource.').'

'); + $r->print('

' + .&mt('There are no Evaluation Comments on this resource.') + .'

' + ); } my $bombs = &Apache::lonmsg::retrieve_author_res_msg($uri); if (defined($bombs) && $bombs ne '') { - $r->print('

'.&mt('Error Messages').' ('. - &mt('visible to author and co-authors only').')'. - '

'.$bombs); - } else { - $r->print('

'.&mt('There are currently no Error Messages for this resource.').'

'); - } + $r->print('' + .'

'.&mt('Error Messages').'

' + .'
(' + .&mt('visible to author and co-authors only') + .')
' + .$bombs + ); + } #else { + # $r->print('

'.&mt('There are currently no Error Messages for this resource.').'

'); + #} } # # All other stuff @@ -1242,7 +1309,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=(); @@ -1269,7 +1337,7 @@ ENDDEL } } $r->print(<$displayfile +

$displayfile

ENDEDIT my %lt=&fieldnames($file_type); @@ -1361,9 +1429,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 = ''; @@ -1382,31 +1452,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); @@ -1479,14 +1550,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'; } }