--- loncom/interface/lonmeta.pm 2009/03/17 20:07:45 1.226
+++ loncom/interface/lonmeta.pm 2025/03/18 18:57:28 1.258
@@ -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.258 2025/03/18 18:57:28 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -351,7 +351,7 @@ sub pre_select_course {
if ($group) {
$group_input = '<input type="hidden" name="group" value="'.$group.'" />';
}
- $r->print('<br /><br /><form method="post" action="'.$port_path.'">'.
+ $r->print(' <form method="post" action="'.$port_path.'">'.
'<input type="hidden" name="currentpath" value="'.$path.'" />'.
$group_input.
'<input type="submit" name="cancel" value="'.&mt('Cancel').'" />'.
@@ -389,9 +389,9 @@ sub select_course {
&mt('You can choose to transfer data from the added fields to the "Notes" field if you are planning to change the course association.').'<br /><br />'.
&Apache::loncommon::start_data_table().
&Apache::loncommon::start_data_table_header_row().
- '<th>Copy to notes?</th>'."\n".
- '<th>Field name</th>'."\n".
- '<th>Values</th>'."\n".
+ '<th>'.&mt('Copy to notes?').'</th>'."\n".
+ '<th>'.&mt('Field Name').'</th>'."\n".
+ '<th>'.&mt('Values').'</th>'."\n".
&Apache::loncommon::end_data_table_header_row().
$transfernotes.
&Apache::loncommon::end_data_table().'<br />';
@@ -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 ' ';
@@ -455,7 +455,7 @@ sub prettyprint {
}
# MIME
if ($type eq 'mime') {
- return '<img src="'.&Apache::loncommon::icon($value).'" /> '.
+ return '<img src="'.&Apache::loncommon::icon($value).'" alt="" /> '.
&Apache::loncommon::filedescription($value);
}
# Person
@@ -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
@@ -550,15 +550,22 @@ sub direct {
}
sub selectbox {
- my ($name,$value,$functionref,@idlist)=@_;
+ my ($name,$value,$readonly,$id,$functionref,@idlist)=@_;
if (! defined($functionref)) {
$functionref=\&direct;
}
- my $selout='<select name="'.$name.'">';
+ my $disabled;
+ if ($readonly) {
+ $disabled = ' disabled="disabled"';
+ }
+ if ($id ne '') {
+ $id = ' id="'.$id.'"';
+ }
+ my $selout='<select name="'.$name.'"'.$id.'>';
foreach my $id (@idlist) {
- $selout.='<option value="'.$id.'"';
+ $selout.='<option value="'.$id.'"'.$disabled;
if ($id eq $value) {
- $selout.=' selected>'.&{$functionref}($id).'</option>';
+ $selout.=' selected="selected">'.&{$functionref}($id).'</option>';
} else {
$selout.='>'.&{$functionref}($id).'</option>';
}
@@ -578,11 +585,11 @@ sub relatedfield {
return $relatedsep.' ';
}
return $relatedsep.'<input type="checkbox" name="'.$fieldname.'_related"'.
- ($relatedvalue?' checked="1"':'').' />';
+ ($relatedvalue?' checked="checked"':'').' id="'.$fieldname.'_related" />';
}
sub prettyinput {
- my ($type,$value,$fieldname,$formname,
+ my ($type,$value,$readonly,$fieldname,$formname,
$relatedsearchflag,$relatedsep,$relatedvalue,$size,$course_key)=@_;
if (! defined($size)) {
$size = 80;
@@ -638,7 +645,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));
}
@@ -653,7 +660,7 @@ sub prettyinput {
}
if (($type eq 'lowestgradelevel') ||
($type eq 'highestgradelevel')) {
- return &Apache::loncommon::select_level_form($value,$fieldname).
+ return &Apache::loncommon::select_level_form($value,$fieldname,$fieldname).
&relatedfield(0,$relatedsearchflag,$relatedsep);
}
return();
@@ -661,7 +668,7 @@ sub prettyinput {
# Language
if ($type eq 'language') {
return &selectbox($fieldname,
- $value,
+ $value,'',$fieldname,
\&Apache::loncommon::languagedescription,
(&Apache::loncommon::languageids)).
&relatedfield(0,$relatedsearchflag,$relatedsep);
@@ -669,7 +676,7 @@ sub prettyinput {
# Copyright
if ($type eq 'copyright') {
return &selectbox($fieldname,
- $value,
+ $value,$readonly,$fieldname,
\&Apache::loncommon::copyrightdescription,
(&Apache::loncommon::copyrightids)).
&relatedfield(0,$relatedsearchflag,$relatedsep);
@@ -677,7 +684,7 @@ sub prettyinput {
# Source Copyright
if ($type eq 'sourceavail') {
return &selectbox($fieldname,
- $value,
+ $value,'',$fieldname,
\&Apache::loncommon::source_copyrightdescription,
(&Apache::loncommon::source_copyrightids)).
&relatedfield(0,$relatedsearchflag,$relatedsep);
@@ -685,35 +692,44 @@ sub prettyinput {
# Gradelevels
if (($type eq 'lowestgradelevel') ||
($type eq 'highestgradelevel')) {
- return &Apache::loncommon::select_level_form($value,$fieldname).
+ return &Apache::loncommon::select_level_form($value,$fieldname,$fieldname).
&relatedfield(0,$relatedsearchflag,$relatedsep);
}
# Obsolete
if ($type eq 'obsolete') {
return '<input type="checkbox" name="'.$fieldname.'"'.
- ($value?' checked="1"':'').' />'.
+ ($value?' checked="checked"':'').' id="'.$fieldname.'" />'.
&relatedfield(0,$relatedsearchflag,$relatedsep);
}
# Obsolete replacement file
if ($type eq 'obsoletereplacement') {
return '<input type="text" name="'.$fieldname.
- '" size="60" value="'.$value.'" /><a href="javascript:openbrowser'.
+ '" size="60" value="'.$value.'" id="'.$fieldname.'" /><a href="javascript:openbrowser'.
"('".$formname."','".$fieldname."'".
",'')\">".&mt('Select').'</a>'.
- &relatedfield(0,$relatedsearchflag,$relatedsep);
+ &relatedfield(0,$relatedsearchflag,$relatedsep);
}
# Customdistribution file
if ($type eq 'customdistributionfile') {
- return '<input type="text" name="'.$fieldname.
- '" size="60" value="'.$value.'" /><a href="javascript:openbrowser'.
- "('".$formname."','".$fieldname."'".
- ",'rights')\">".&mt('Select').'</a>'.
- &relatedfield(0,$relatedsearchflag,$relatedsep);
+ my $disabled;
+ if ($readonly) {
+ $disabled = ' disabled="disabled"';
+ }
+ my $output;
+ $output = '<input type="text" name="'.$fieldname.
+ '" size="60" value="'.$value.'"'.$disabled.' id="'.$fieldname.'" />';
+ unless ($readonly) {
+ $output .= '<a href="javascript:openbrowser'.
+ "('".$formname."','".$fieldname."'".
+ ",'rights')\">".&mt('Select').'</a>';
+ }
+ $output .= &relatedfield(0,$relatedsearchflag,$relatedsep);
+ return $output;
}
# Source Customdistribution file
if ($type eq 'sourcerights') {
return '<input type="text" name="'.$fieldname.
- '" size="60" value="'.$value.'" /><a href="javascript:openbrowser'.
+ '" size="60" value="'.$value.'" id="'.$fieldname.'" /><a href="javascript:openbrowser'.
"('".$formname."','".$fieldname."'".
",'rights')\">".&mt('Select').'</a>'.
&relatedfield(0,$relatedsearchflag,$relatedsep);
@@ -737,16 +753,33 @@ sub prettyinput {
$value=~s/\"/\"\;/gs;
return
'<input type="text" name="'.$fieldname.'" size="'.$size.'" '.
- 'value="'.$value.'" />'.
+ 'value="'.$value.'" id="'.$fieldname.'" />'.
&relatedfield(1,$relatedsearchflag,$relatedsep,$fieldname,
- $relatedvalue);
+ $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;
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
- ['currentpath','changecourse']);
+ ['currentpath','changecourse','modal']);
my $uri=$r->uri;
#
# Set document type
@@ -755,16 +788,46 @@ 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') {
+ my $text = 'Authoring Space';
+ my $href = &Apache::loncommon::authorspace($uri);
+ if ($env{'request.course.id'}) {
+ my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+ my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+ if ($href eq "/priv/$cdom/$cnum/") {
+ $text = 'Course Authoring Space';
+ }
+ }
+ &Apache::lonhtmlcommon::add_breadcrumb({
+ 'text' => $text,
+ 'href' => $href,
+ });
+ }
+
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,23 +844,56 @@ 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
+ } elsif ($uri=~m|^/priv|) {
+ # Authoring 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>'
+ );
+ if ($env{'form.modal'}) {
+ my $width = 500;
+ my $height = 400;
+ my $machine = &Apache::lonnet::absolute_url();
+ $r->print(&Apache::loncommon::nicescroll_javascript('metadatawrapper',
+ {cursorcolor => '#00F',
+ railalign => 'right',
+ railoffset => '{top:5,left:40}'},
+ undef,1,$machine.$uri));
+ $r->print('<div id="metadatawrapper" style="height:'.$height.'px; width:'.$width.'px; overflow: auto;">');
+ }
&present_uneditable_metadata($r,$uri);
+ if ($env{'form.modal'}) {
+ $r->print('</div>');
+ }
}
$r->print(&Apache::loncommon::end_page());
return OK;
@@ -815,22 +911,50 @@ sub report_bombs {
# Set document type
$uri =~ s:/adm/bombs/::;
$uri = &Apache::lonnet::declutter($uri);
- $r->print('<h1>'.&Apache::lonnet::clutter($uri).'</h1>');
+ $r->print(
+ '<p>'.&mt('Folder: [_1]',
+ '<span class="LC_filename">'.&Apache::lonnet::clutter($uri).'</span>')
+ .'</p>'
+ );
my ($domain,$author)=($uri=~/^($match_domain)\/($match_username)\//);
- if (&Apache::loncacc::constructaccess('/~'.$author.'/',$domain)) {
- if ($env{'form.clearbombs'}) {
- &Apache::lonmsg::clear_author_res_msg($uri);
- }
- my $clear=&mt('Clear all Messages in Subdirectory');
- my $cancel=&mt('Back to Directory');
- my $cancelurl=$uri;
- $cancelurl=~s/^\Q$domain\E/\/priv/;
- $r->print(<<ENDCLEAR);
-<form method="post">
-<input type="submit" name="clearbombs" value="$clear" />
-<a href="$cancelurl">$cancel</a>
-</form><hr />
-ENDCLEAR
+ if (!&Apache::lonnet::constructaccess('/priv/'.$domain.'/'.$author.'/')) {
+ $r->print('<p class="LC_error">'.&mt('Not authorized').'</p>');
+ 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)
+ .'<br />'.&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(
+ '<form method="post" action="">'.
+ '<input type="submit" name="clearbombs" value="'.
+ &mt('Clear all Messages in Subdirectory').'" />'.
+ ' <a href="'.$cancelurl.'">'.
+ &mt('Back to Source Directory').'</a>'.
+ '</form><hr />'
+ );
+ # Display all bombs of subdirectory
my %brokenurls =
&Apache::lonmsg::all_url_author_res_msg($author,$domain);
foreach my $key (sort(keys(%brokenurls))) {
@@ -842,7 +966,12 @@ ENDCLEAR
}
}
} else {
- $r->print(&mt('Not authorized'));
+ my $functions=&Apache::lonhtmlcommon::start_funclist('Actions');
+ $functions.=&Apache::lonhtmlcommon::add_item_funclist(
+ '<a href="'.$cancelurl.'">'.
+ &mt('Back to Source Directory').'</a>');
+ $functions .= &Apache::lonhtmlcommon::end_funclist();
+ $r->print('<p>'.$functions.'</p>');
}
return;
}
@@ -879,12 +1008,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:<br />::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 +1026,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) {
@@ -968,13 +1096,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,11 +1118,14 @@ 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
- 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 +1152,20 @@ 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('Domain').'</th>'
.'<th>'.&mt('Course').'</th>'
.'<th>'.&mt('Section(s)').'</th>'
.'<th>'.&mt('Num Students').'</th>'
+ .'<th>'.&mt('Part').'</th>'
.'<th>'.&mt('Mean Tries').'</th>'
.'<th>'.&mt('Degree of Difficulty').'</th>'
.'<th>'.&mt('Degree of Discrimination').'</th>'
@@ -1048,12 +1182,16 @@ sub print_dynamic_metadata {
next;
}
$table .= &Apache::loncommon::start_data_table_row();
+ $table .=
+ '<td><span class="LC_nobreak">'.$courseinfo{'domain'}.'</span></td>';
$table .=
'<td><span class="LC_nobreak">'.$courseinfo{'description'}.'</span></td>';
$table .=
'<td align="right">'.$data->{'sections'}.'</td>';
$table .=
'<td align="right">'.$data->{'stdno'}.'</td>';
+ $table .=
+ '<td align="right">'.$data->{'part'}.'</td>';
foreach my $item ('avetries','difficulty','disc') {
$table .= '<td align="right">';
if (exists($data->{$item})) {
@@ -1072,23 +1210,25 @@ 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>'.
&mt('No Assessment Statistical Data is available for this resource').
'</h4>');
}
-
- #
#
+ # 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 +1242,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_warning">'.&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
@@ -1181,9 +1334,19 @@ sub print_dynamic_metadata {
#####################################################
sub present_editable_metadata {
my ($r,$uri,$file_type) = @_;
- # Construction Space Call
+ # Authoring Space Call
# Header
my $disuri=$uri;
+ my ($courseauthor,$crsaurights,$readonly);
+ if ($env{'request.course.id'}) {
+ my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+ my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+ if ($uri =~ m{^\Q/priv/$cdom/$cnum/\E}) {
+ $courseauthor = $cnum.':'.$cdom;
+ $crsaurights = "/res/$cdom/$cnum/default.rights";
+ $readonly = 1;
+ }
+ }
my $fn=&Apache::lonnet::filelocation('',$uri);
$disuri=~s{^/\~}{/priv/};
$disuri=~s/\.meta$//;
@@ -1197,58 +1360,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(
+ '<h2>'.&mt('Error Messages').'</h2>'
+ .'<p>'.&mt('Folder: [_1]',
+ '<span class="LC_filename">'.$disuri.'</span>')
+ .'</p>'
+ );
+ 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)
+ .'<br />'.&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(<<ENDBOMBS);
-<h1>$disuri</h1>
-<form method="post" action="" name="defaultmeta">
-ENDBOMBS
- if ($showdel) {
- $r->print(<<ENDDEL);
-<input type="submit" name="delmsg" value="$del" />
-<input type="submit" name="clearmsg" value="$clear" />
-ENDDEL
+ $message=&Apache::lonhtmlcommon::confirm_success(
+ &mt('Error clearing messages'),1)
+ .'<br />'.&mt('Error: [_1]',$rc);
+ }
+ }
+ if ($message) {
+ $message=&Apache::loncommon::confirmwrapper($message);
+ $r->print($message);
+ }
+
+ $r->print('<form method="post" action="" name="defaultmeta">');
+ if ($showbuttons) {
+ $r->print(
+ '<input type="submit" name="delmsg" value="'.
+ &mt('Delete Messages for this Resource').'" />'.
+ '<input type="submit" name="clearmsg" value="'.
+ &mt('Clear all Messages in Subdirectory').'" />'
+ .'<br />'.$bombs
+ );
} else {
- $r->print('<p><a href="'.$disuri.'">'.$goback.'</a></p>');
- if ($env{'form.clearmsg'}) {
- my ($diruri) = ($disuri =~ m{(.*/)[^/]*});
- $r->print('<p><a href="'.$diruri.'">'.
- &mt('Back To Directory').'</a></p>');
- }
- }
- $r->print('<br />'.$bombs);
+ my $functions=&Apache::lonhtmlcommon::start_funclist('Actions');
+ $functions.=&Apache::lonhtmlcommon::add_item_funclist(
+ '<a href="'.$disuri.'">'.
+ &mt('Back to Source File').'</a>');
+ my ($diruri) = ($disuri =~ m{(.*/)[^/]*});
+ $functions.=&Apache::lonhtmlcommon::add_item_funclist(
+ '<a href="'.$diruri.'">'.
+ &mt('Back to Source Directory').'</a>');
+ $functions .= &Apache::lonhtmlcommon::end_funclist();
+ $r->print('<p>'.$functions.'</p>');
+ }
} else {
- my $displayfile=&mt('Metadata for [_1]',$disuri);
+
+ # Display Metadata, not Bombs
+ my $displayfile =
+ &mt('Metadata for [_1]'
+ ,'<span class="LC_filename">'.$disuri.'</span>');
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=();
my $result=&Apache::lonnet::getfile($fn);
if ($result == -1){
- $r->print(&mt('Creating new file [_1]'),$meta_uri);
+ my $message = &Apache::lonhtmlcommon::confirm_success(
+ &mt('Creating new file [_1]'
+ ,'<span class="LC_filename"'.$meta_uri.'</span>'));
+ $message = &Apache::loncommon::confirmwrapper($message);
+ $r->print($message);
} else {
&Apache::lonpublisher::metaeval($result);
}
@@ -1269,7 +1463,7 @@ ENDDEL
}
}
$r->print(<<ENDEDIT);
-<h1>$displayfile</h1>
+<h2>$displayfile</h2>
<form method="post" action="" name="defaultmeta">
ENDEDIT
my %lt=&fieldnames($file_type);
@@ -1295,7 +1489,7 @@ ENDEDIT
@fields = (split(/,/,$env{$Apache::lonpublisher::metadatafields{'courserestricted'}.'.metadata.fieldlist'}));
} else {
# no saved field list, use default list
- @fields = ('author','title','subject','keywords','abstract',
+ @fields = ('title','author','subject','keywords','abstract',
'notes','lowestgradelevel',
'highestgradelevel','standards');
if ($Apache::lonpublisher::metadatafields{'courserestricted'} =~ /^course\.($match_domain\_$match_courseid)$/) {
@@ -1308,15 +1502,58 @@ ENDEDIT
}
}
} else {
- @fields = ('author','title','subject','keywords','abstract','notes',
+ @fields = ('title','author','subject','keywords','abstract','notes',
'copyright','customdistributionfile','language',
'standards',
'lowestgradelevel','highestgradelevel','sourceavail','sourcerights',
'obsolete','obsoletereplacement');
}
+ if ($courseauthor) {
+ $Apache::lonpublisher::metadatafields{'copyright'}='custom';
+ $Apache::lonpublisher::metadatafields{'customdistributionfile'}=$crsaurights;
+ }
+ my (%domdefs,$got_domdefs);
if (! $Apache::lonpublisher::metadatafields{'copyright'}) {
- $Apache::lonpublisher::metadatafields{'copyright'}=
- 'default';
+ my $copyright = 'default';
+ if ($env{'environment.copyright'} ne '') {
+ $copyright = $env{'environment.copyright'};
+ } else {
+ my $defdom = $env{'request.role.domain'};
+ if ($disuri =~ m{^/priv/($match_domain)/}) {
+ $defdom = $1;
+ }
+ if ($defdom ne '') {
+ %domdefs = &Apache::lonnet::get_domain_defaults($defdom);
+ $got_domdefs = 1;
+ if ($domdefs{'copyright'} ne '') {
+ $copyright = $domdefs{'copyright'};
+ }
+ }
+ }
+ $Apache::lonpublisher::metadatafields{'copyright'}=
+ $copyright;
+ }
+ if (! $Apache::lonpublisher::metadatafields{'sourceavail'}) {
+ my $sourceavail = 'closed';
+ if ($env{'environment.sourceavail'} ne '') {
+ $sourceavail = $env{'environment.sourceavail'};
+ } else {
+ my $defdom = $env{'request.role.domain'};
+ if ($disuri =~ m{^/priv/($match_domain)/}) {
+ $defdom = $1;
+ }
+ if ($defdom ne '') {
+ unless ($got_domdefs) {
+ %domdefs = &Apache::lonnet::get_domain_defaults($defdom);
+ $got_domdefs = 1;
+ }
+ if ($domdefs{'sourceavail'} ne '') {
+ $sourceavail = $domdefs{'sourceavail'};
+ }
+ }
+ }
+ $Apache::lonpublisher::metadatafields{'sourceavail'}=
+ $sourceavail;
}
if (($file_type eq 'portfolio') || ($file_type eq 'groups')) {
if (! $Apache::lonpublisher::metadatafields{'mime'}) {
@@ -1335,21 +1572,29 @@ ENDEDIT
if ($Apache::lonpublisher::metadatafields{'courserestricted'} ne 'none') {
if ($file_type eq 'portfolio') {
- $r->print(&mt('Associated with course [_1]',
- '<strong><a href="'.$uri.'?changecourse=true">'.
- $env{$Apache::lonpublisher::metadatafields{'courserestricted'}.
- ".description"}.
- '</a></strong>').'<br />');
+ $r->print(
+ &mt('Associated with course [_1]'
+ ,'<strong>'
+ .$env{$Apache::lonpublisher::metadatafields{'courserestricted'}
+ .".description"}.'</strong>')
+ .' <a href="'.$uri.'?changecourse=true">'
+ .&mt('Change')
+ .'</a>'.'<br />'
+ );
+
} else {
$r->print(&mt('Associated with course [_1]',
'<strong>'.
$env{$Apache::lonpublisher::metadatafields{'courserestricted'}.
".description"}.'</strong>').'<br />');
}
- } else {
- $r->print('<a href="'.$uri.'?changecourse=true">'.&mt('This resource is not associated with a course.').'</a><br />');
- }
- }
+ } else {
+ $r->print(
+ &mt('This resource is not associated with a course.')
+ .' <a href="'.$uri.'?changecourse=true">'.&mt('Change').'</a><br />'
+ );
+ }
+ }
if (@added_order) {
foreach my $field_name (@added_order) {
push(@fields,$field_name);
@@ -1361,9 +1606,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 +1629,31 @@ 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',
+ $readonly,'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());
+ $readonly,'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);
@@ -1437,6 +1684,17 @@ sub store_metadata {
$Apache::lonpublisher::metadatafields{'keywords'} =
join (',', &Apache::loncommon::get_env_multiple('form.new_keywords'));
}
+ if (($caller eq 'store') && ($env{'request.course.id'})) {
+ my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+ my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+ if ($uri =~ m{^\Q/priv/$cdom/$cnum/\E}) {
+ unless ($uri eq "/priv/$cdom/$cnum/default.rights.meta") {
+ $Apache::lonpublisher::metadatafields{'copyright'} = 'custom';
+ $Apache::lonpublisher::metadatafields{'customdistributionfile'} =
+ "/res/$cdom/$cnum/default.rights";
+ }
+ }
+ }
foreach my $field (sort(keys(%Apache::lonpublisher::metadatafields))) {
next if ($field =~ /\./);
my $unikey=$field;
@@ -1467,26 +1725,27 @@ sub store_metadata {
$output .= $result;
} else {
if (! ($mfh=Apache::File->new('>'.$fn))) {
- $output .= '<p><font color="red">';
+ $output .= '<p class="LC_error">';
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').'</font></p>';
+ $output .= ', '.&mt('FAIL').'</p>';
$outcome = 'fail';
} else {
print $mfh ($file_content);
close($mfh);
&update_metadata_table($uri);
- $output .= '<p><font color="blue">';
+ 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).
- '</font></p>';
+ $output .= &Apache::loncommon::confirmwrapper(
+ &Apache::lonhtmlcommon::confirm_success(
+ $confirmtext.' '.&Apache::lonlocal::locallocaltime(time)));
$outcome = 'ok';
}
}
@@ -1514,25 +1773,25 @@ sub store_portfolio_metadata {
$env{'form.'.$formname.'.filename'}=$new_fn;
my $result =&Apache::lonnet::userfileupload($formname,'',$path);
if ($result =~ /(error|notfound)/) {
- $output = '<p><font color="red">';
+ $output = '<p class="LC_error">';
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').'</font></p>';
+ $output .= ', '.&mt('FAIL').'</p>';
$outcome = 'fail';
} else {
&update_metadata_table($uri);
- $output = '<p><font color="blue">';
+ $output = '<p class="LC_success">';
if ($caller eq 'transfer') {
$output .= &mt('Transferred data in added fields to notes');
} else {
$output .= &mt('Wrote Metadata');
}
$output .= ' '.&Apache::lonlocal::locallocaltime(time).
- '</font></p>';
+ '</p>';
$outcome = 'ok';
}
return ($outcome,$output);