--- loncom/interface/lonmeta.pm 2009/04/21 15:23:18 1.230
+++ loncom/interface/lonmeta.pm 2013/05/03 14:00:58 1.250
@@ -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.250 2013/05/03 14:00:58 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -351,7 +351,7 @@ sub pre_select_course {
if ($group) {
$group_input = '';
}
- $r->print('
-ENDCLEAR
+ if (!&Apache::lonnet::constructaccess('/priv/'.$domain.'/'.$author.'/')) {
+ $r->print('
'.&mt('Not authorized').'
');
+ return;
+ }
+
+ my $showbuttons=1;
+ my $message='';
+ if ($env{'form.clearbombs'}) {
+ my $rc=&Apache::lonmsg::clear_author_res_msg($uri);
+ if ($rc eq 'ok') {
+ $message=&Apache::lonhtmlcommon::confirm_success(
+ &mt('Messages cleared.'));
+ $showbuttons=0;
+ } else {
+ $message=&Apache::lonhtmlcommon::confirm_success(
+ &mt('Error clearing messages'),1)
+ .' '.&mt('Error: [_1]',$rc);
+ }
+ }
+
+ if ($message) {
+ $message=&Apache::loncommon::confirmwrapper($message);
+ $r->print($message);
+ }
+
+ my $cancelurl=$uri;
+ $cancelurl=~s/^\Q$domain\E/\/priv\/$domain/;
+
+ if ($showbuttons) {
+ $r->print(
+ ''
+ );
+ # Display all bombs of subdirectory
my %brokenurls =
&Apache::lonmsg::all_url_author_res_msg($author,$domain);
foreach my $key (sort(keys(%brokenurls))) {
@@ -842,7 +927,12 @@ ENDCLEAR
}
}
} else {
- $r->print(&mt('Not authorized'));
+ my $functions=&Apache::lonhtmlcommon::start_funclist('Actions');
+ $functions.=&Apache::lonhtmlcommon::add_item_funclist(
+ ''.
+ &mt('Back to Source Directory').'');
+ $functions .= &Apache::lonhtmlcommon::end_funclist();
+ $r->print('
'.$functions.'
');
}
return;
}
@@ -879,12 +969,11 @@ sub present_uneditable_metadata {
$currentversion :
&mt('information not available')).')';
} else {
- $versiondisplay='Version: '.$currentversion;
+ $versiondisplay=&mt('Version: [_1]',$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='';
@@ -898,7 +987,7 @@ sub present_uneditable_metadata {
my $table='';
my $title = $content{'title'};
if (! defined($title)) {
- $title = 'Untitled Resource';
+ $title = &mt('Untitled Resource');
}
my @fields;
if ($uploaded) {
@@ -997,7 +1086,7 @@ sub print_dynamic_metadata {
}
#
# 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'}) ||
@@ -1036,6 +1125,7 @@ sub print_dynamic_metadata {
.'
'.&mt('Course').'
'
.'
'.&mt('Section(s)').'
'
.'
'.&mt('Num Students').'
'
+ .'
'.&mt('Part').'
'
.'
'.&mt('Mean Tries').'
'
.'
'.&mt('Degree of Difficulty').'
'
.'
'.&mt('Degree of Discrimination').'
'
@@ -1058,6 +1148,8 @@ sub print_dynamic_metadata {
'
'.$data->{'sections'}.'
';
$table .=
'
'.$data->{'stdno'}.'
';
+ $table .=
+ '
'.$data->{'part'}.'
';
foreach my $item ('avetries','difficulty','disc') {
$table .= '
';
if (exists($data->{$item})) {
@@ -1086,7 +1178,6 @@ sub print_dynamic_metadata {
&mt('No Assessment Statistical Data is available for this resource').
'');
}
-
#
# Evaluation Data
$r->print('
'.&mt('Evaluation Data').'
');
@@ -1134,7 +1225,7 @@ sub print_dynamic_metadata {
my $bombs = &Apache::lonmsg::retrieve_author_res_msg($uri);
if (defined($bombs) && $bombs ne '') {
$r->print(''
- .'
'.&mt('Error Messages').'
'
+ .'
'.&mt('Error Messages').'
'
.'
('
.&mt('visible to author and co-authors only')
.')
'
@@ -1217,58 +1308,89 @@ sub present_editable_metadata {
$target=~s/\.meta$//;
my $bombs=&Apache::lonmsg::retrieve_author_res_msg($target);
if ($bombs) {
- my $showdel=1;
+ # Display Bombs, not Metadata
+ $r->print(
+ '
'.&mt('Error Messages').'
'
+ .'
'.&mt('Folder: [_1]',
+ ''.$disuri.'')
+ .'
'
+ );
+ my $showbuttons=1;
+ my $message='';
+ my $rc='';
if ($env{'form.delmsg'}) {
- if (&Apache::lonmsg::del_url_author_res_msg($target) eq 'ok') {
- $bombs=&mt('Messages deleted.');
- $showdel=0;
+ $rc=&Apache::lonmsg::del_url_author_res_msg($target);
+ if ($rc eq 'ok') {
+ $message=&Apache::lonhtmlcommon::confirm_success(
+ &mt('Messages deleted.'));
+ $showbuttons=0;
} else {
- $bombs=&mt('Error deleting messages');
+ $message=&Apache::lonhtmlcommon::confirm_success(
+ &mt('Error deleting messages'), 1)
+ .' '.&mt('Error: [_1]',$rc);
}
}
if ($env{'form.clearmsg'}) {
my $cleardir=$target;
- $cleardir=~s/\/[^\/]+$/\//;
- if (&Apache::lonmsg::clear_author_res_msg($cleardir) eq 'ok') {
- $bombs=&mt('Messages cleared.');
- $showdel=0;
+ $cleardir=~s/\/[^\/]+$/\//; # Extract dir: keep path, remove filename
+ $rc=&Apache::lonmsg::clear_author_res_msg($cleardir);
+ if ($rc eq 'ok') {
+ $message=&Apache::lonhtmlcommon::confirm_success(
+ &mt('Messages cleared.'));
+ $showbuttons=0;
} else {
- $bombs=&mt('Error clearing messages');
- }
- }
- my $del=&mt('Delete Messages for this Resource');
- my $clear=&mt('Clear all Messages in Subdirectory');
- my $goback=&mt('Back to Source File');
- $r->print(<$disuri
-