--- loncom/interface/lonmeta.pm 2009/03/17 20:07:45 1.226
+++ loncom/interface/lonmeta.pm 2012/03/16 02:12:26 1.245
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Metadata display handler
#
-# $Id: lonmeta.pm,v 1.226 2009/03/17 20:07:45 schulted Exp $
+# $Id: lonmeta.pm,v 1.245 2012/03/16 02:12:26 www 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
@@ -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 {
@@ -638,7 +638,7 @@ sub prettyinput {
if ($values) {
if ($only_one) {
- $output .= (&Apache::loncommon::select_form($cur_values_inst[0],'new_'.$type,%meta_options));
+ $output .= (&Apache::loncommon::select_form($cur_values_inst[0],'new_'.$type,\%meta_options));
} else {
$output .= (&Apache::loncommon::multiple_select_form('new_'.$type,\@cur_values_inst,undef,\%meta_options));
}
@@ -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,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($uri),
+ });
+ }
+
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|^/~|) {
+ } elsif ($uri=~m|^/priv|) {
# 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());
@@ -817,7 +874,7 @@ sub report_bombs {
$uri = &Apache::lonnet::declutter($uri);
$r->print(''.&Apache::lonnet::clutter($uri).'
');
my ($domain,$author)=($uri=~/^($match_domain)\/($match_username)\//);
- if (&Apache::loncacc::constructaccess('/~'.$author.'/',$domain)) {
+ if (&Apache::loncacc::constructaccess('/priv/'.$domain.'/'.$author.'/')) {
if ($env{'form.clearbombs'}) {
&Apache::lonmsg::clear_author_res_msg($uri);
}
@@ -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='';
@@ -968,13 +1024,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,11 +1046,14 @@ 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
- if ($uri=~/\.(problem|exam|quiz|assess|survey|form)$/) {
+ if ($uri=~/$LONCAPA::assess_re/) {
if (exists($dynmeta{'stdno'}) ||
exists($dynmeta{'avetries'}) ||
exists($dynmeta{'difficulty'}) ||
@@ -1021,17 +1080,19 @@ 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').' | '
.''.&mt('Section(s)').' | '
.''.&mt('Num Students').' | '
+ .''.&mt('Part').' | '
.''.&mt('Mean Tries').' | '
.''.&mt('Degree of Difficulty').' | '
.''.&mt('Degree of Discrimination').' | '
@@ -1054,6 +1115,8 @@ sub print_dynamic_metadata {
''.$data->{'sections'}.' | ';
$table .=
''.$data->{'stdno'}.' | ';
+ $table .=
+ ''.$data->{'part'}.' | ';
foreach my $item ('avetries','difficulty','disc') {
$table .= '';
if (exists($data->{$item})) {
@@ -1072,7 +1135,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 +1147,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 +1168,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 +1321,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 +1349,7 @@ ENDDEL
}
}
$r->print(<$displayfile
+$displayfile
|