--- loncom/interface/lonmeta.pm 2009/04/04 00:38:13 1.228
+++ 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.228 2009/04/04 00:38:13 raeburn 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 {
}
}
$_ = '<li>'.$title.' '.
- &Apache::lonhtmlcommon::crumbs($url,$target,$prefix,$form,'0',$noformat).
- '</li>'
+ &Apache::lonhtmlcommon::crumbs($url,$target,$prefix,$form).
+ '</li>'
} split(/\s*\,\s*/,$value)).'</ul>';
}
# Evaluations
@@ -578,7 +578,7 @@ sub relatedfield {
return $relatedsep.' ';
}
return $relatedsep.'<input type="checkbox" name="'.$fieldname.'_related"'.
- ($relatedvalue?' checked="1"':'').' />';
+ ($relatedvalue?' checked="checked"':'').' />';
}
sub prettyinput {
@@ -691,7 +691,7 @@ sub prettyinput {
# Obsolete
if ($type eq 'obsolete') {
return '<input type="checkbox" name="'.$fieldname.'"'.
- ($value?' checked="1"':'').' />'.
+ ($value?' checked="checked"':'').' />'.
&relatedfield(0,$relatedsearchflag,$relatedsep);
}
# Obsolete replacement file
@@ -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".'<script type="text/javascript">'."\n".
&Apache::loncommon::browser_and_searcher_javascript().
"\n".'</script>',
{'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,})
+ .'<h1>'.&mt('Metadata').'</h1>'
+ );
&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:<br />::g;
+ # crumbify displayed URL uri target prefix form
+ $disuri=&Apache::lonhtmlcommon::crumbs($disuri,undef, undef, undef);
# obsolete
my $obsolete=$content{'obsolete'};
my $obsoletewarning='';
@@ -968,13 +1024,13 @@ sub print_dynamic_metadata {
my %dynmeta=&dynamicmeta($uri);
#
# General Access and Usage Statistics
+ $r->print('<h4>'.&mt('Access and Usage Statistics').'</h4>');
if (exists($dynmeta{'count'}) ||
exists($dynmeta{'sequsage'}) ||
exists($dynmeta{'comefrom'}) ||
exists($dynmeta{'goto'}) ||
exists($dynmeta{'course'})) {
- $r->print('<h4>'.&mt('Access and Usage Statistics').'</h4>'.
- &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 +1046,10 @@ sub print_dynamic_metadata {
}
$r->print(&Apache::lonhtmlcommon::end_pick_box());
} else {
- $r->print('<h4>'.&mt('No Access or Usages Statistics are available for this resource.').'</h4>');
+ $r->print('<p>'
+ .&mt('No Access or Usages Statistics are available for this resource.')
+ .'</p>'
+ );
}
#
# Assessment statistics
@@ -1021,12 +1080,13 @@ sub print_dynamic_metadata {
}
$r->print(&Apache::lonhtmlcommon::end_pick_box());
}
+ #
+ # New assessment statistics
+ $r->print('<h4>'
+ .&mt('Recent Detailed Assessment Statistical Data')
+ .'</h4>'
+ );
if (exists($dynmeta{'stats'})) {
- #
- # New assessment statistics
- $r->print('<h4>'.
- &mt('Recent Detailed Assessment Statistical Data').
- '</h4>');
my $table=&Apache::loncommon::start_data_table()
.&Apache::loncommon::start_data_table_header_row()
.'<th>'.&mt('Course').'</th>'
@@ -1072,7 +1132,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('<p>'
+ .&mt('No new dynamic data found.')
+ .'</p>'
+ );
}
} else {
$r->print('<h4>'.
@@ -1081,14 +1144,14 @@ sub print_dynamic_metadata {
}
#
- #
+ # Evaluation Data
+ $r->print('<h4>'.&mt('Evaluation Data').'</h4>');
if (exists($dynmeta{'clear'}) ||
exists($dynmeta{'depth'}) ||
exists($dynmeta{'helpful'}) ||
exists($dynmeta{'correct'}) ||
exists($dynmeta{'technical'})){
- $r->print('<h4>'.&mt('Evaluation Data').'</h4>'.
- &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 +1165,40 @@ sub print_dynamic_metadata {
}
$r->print(&Apache::lonhtmlcommon::end_pick_box());
} else {
- $r->print('<h4>'.&mt('No Evaluation Data is available for this resource.').'</h4>');
+ $r->print('<p>'
+ .&mt('No Evaluation Data is available for this resource.')
+ .'</p>'
+ );
}
+ # 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('<h4>'.&mt('Evaluation Comments').'</h4>'
+ .'<div>('
+ .&mt('visible to author and co-authors only')
+ .')</div>'
+ );
if (exists($dynmeta{'comments'})) {
- $r->print('<h4>'.&mt('Evaluation Comments').' ('.
- &mt('visible to author and co-authors only').
- ')</h4>'.
- '<blockquote>'.$dynmeta{'comments'}.'</blockquote>');
+ $r->print('<blockquote>'.$dynmeta{'comments'}.'</blockquote>');
} else {
- $r->print('<h4>'.&mt('There are no Evaluation Comments on this resource.').'</h4>');
+ $r->print('<p>'
+ .&mt('There are no Evaluation Comments on this resource.')
+ .'</p>'
+ );
}
my $bombs = &Apache::lonmsg::retrieve_author_res_msg($uri);
if (defined($bombs) && $bombs ne '') {
- $r->print('<a name="bombs" /><h4>'.&mt('Error Messages').' ('.
- &mt('visible to author and co-authors only').')'.
- '</h4>'.$bombs);
- } else {
- $r->print('<h4>'.&mt('There are currently no Error Messages for this resource.').'</h4>');
- }
+ $r->print('<a name="bombs" />'
+ .'<h4 class="LC_error">'.&mt('Error Messages').'</h4>'
+ .'<div>('
+ .&mt('visible to author and co-authors only')
+ .')</div>'
+ .$bombs
+ );
+ } #else {
+ # $r->print('<h4>'.&mt('There are currently no Error Messages for this resource.').'</h4>');
+ #}
}
#
# All other stuff
@@ -1242,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]'
+ ,'<span class="LC_filename">'.$dir.'</span>');
}
%Apache::lonpublisher::metadatafields=();
%Apache::lonpublisher::metadatakeys=();
@@ -1269,7 +1346,7 @@ ENDDEL
}
}
$r->print(<<ENDEDIT);
-<h1>$displayfile</h1>
+<p>$displayfile</p>
<form method="post" action="" name="defaultmeta">
ENDEDIT
my %lt=&fieldnames($file_type);
@@ -1361,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 = '';
@@ -1382,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 .= ('<td><span class="LC_metadata">'.$lt{$field_name}.':</span></td><td> '.
- &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'}).'</td>');
- $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().'<td><span class="LC_metadata">'.$lt{$field_name}.':</span></td><td> '.
- &prettyinput($field_name,
+ $output .= &Apache::lonhtmlcommon::row_title($lt{$field_name})
+ .&prettyinput($field_name,
$Apache::lonpublisher::metadatafields{$field_name},
- 'new_'.$field_name,'defaultmeta').'</td>'.&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.'<br /><input type="submit" title="'.&mt('Save Metadata').'" name="store" value="'.
- &mt('Save').'" />');
+ my $savebutton = '<p><input type="submit" name="store"'
+ .' value="'.&mt('Save').'" title="'.&mt('Save Metadata').'" /></p>';
+ $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 +1559,15 @@ sub store_metadata {
print $mfh ($file_content);
close($mfh);
&update_metadata_table($uri);
- $output .= '<p class="LC_success">';
+ 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).
- '</p>';
+ $output .= &Apache::loncommon::confirmwrapper(
+ &Apache::lonhtmlcommon::confirm_success(
+ $confirmtext.' '.&Apache::lonlocal::locallocaltime(time)));
$outcome = 'ok';
}
}