--- loncom/interface/lonmeta.pm 2009/03/21 21:37:13 1.227 +++ loncom/interface/lonmeta.pm 2023/07/14 23:15:10 1.256 @@ -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.256 2023/07/14 23:15:10 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -351,7 +351,7 @@ sub pre_select_course { if ($group) { $group_input = ''; } - $r->print('

'. + $r->print(' '. ''. $group_input. ''. @@ -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.').'

'. &Apache::loncommon::start_data_table(). &Apache::loncommon::start_data_table_header_row(). - 'Copy to notes?'."\n". - 'Field name'."\n". - 'Values'."\n". + ''.&mt('Copy to notes?').''."\n". + ''.&mt('Field Name').''."\n". + ''.&mt('Values').''."\n". &Apache::loncommon::end_data_table_header_row(). $transfernotes. &Apache::loncommon::end_data_table().'
'; @@ -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 ' '. + return ' '. &Apache::loncommon::filedescription($value); } # Person @@ -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 @@ -550,15 +550,19 @@ sub direct { } sub selectbox { - my ($name,$value,$functionref,@idlist)=@_; + my ($name,$value,$readonly,$functionref,@idlist)=@_; if (! defined($functionref)) { $functionref=\&direct; } + my $disabled; + if ($readonly) { + $disabled = ' disabled="disabled"'; + } my $selout=''; + ($relatedvalue?' checked="checked"':'').' />'; } 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 +642,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)); } @@ -661,7 +665,7 @@ sub prettyinput { # Language if ($type eq 'language') { return &selectbox($fieldname, - $value, + $value,'', \&Apache::loncommon::languagedescription, (&Apache::loncommon::languageids)). &relatedfield(0,$relatedsearchflag,$relatedsep); @@ -669,7 +673,7 @@ sub prettyinput { # Copyright if ($type eq 'copyright') { return &selectbox($fieldname, - $value, + $value,$readonly, \&Apache::loncommon::copyrightdescription, (&Apache::loncommon::copyrightids)). &relatedfield(0,$relatedsearchflag,$relatedsep); @@ -677,7 +681,7 @@ sub prettyinput { # Source Copyright if ($type eq 'sourceavail') { return &selectbox($fieldname, - $value, + $value,'', \&Apache::loncommon::source_copyrightdescription, (&Apache::loncommon::source_copyrightids)). &relatedfield(0,$relatedsearchflag,$relatedsep); @@ -691,7 +695,7 @@ sub prettyinput { # Obsolete if ($type eq 'obsolete') { return ''. + ($value?' checked="checked"':'').' />'. &relatedfield(0,$relatedsearchflag,$relatedsep); } # Obsolete replacement file @@ -704,11 +708,20 @@ sub prettyinput { } # Customdistribution file if ($type eq 'customdistributionfile') { - return '".&mt('Select').''. - &relatedfield(0,$relatedsearchflag,$relatedsep); + my $disabled; + if ($readonly) { + $disabled = ' disabled="disabled"'; + } + my $output; + $output = ''; + unless ($readonly) { + $output .= '".&mt('Select').''; + } + $output .= &relatedfield(0,$relatedsearchflag,$relatedsep); + return $output; } # Source Customdistribution file if ($type eq 'sourcerights') { @@ -742,11 +755,28 @@ 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; &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, - ['currentpath','changecourse']); + ['currentpath','changecourse','modal']); my $uri=$r->uri; # # Set document type @@ -755,16 +785,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 +841,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".'', {'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').'

    ' + ); + 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('
    '); + } &present_uneditable_metadata($r,$uri); + if ($env{'form.modal'}) { + $r->print('
    '); + } } $r->print(&Apache::loncommon::end_page()); return OK; @@ -815,22 +908,50 @@ sub report_bombs { # Set document type $uri =~ s:/adm/bombs/::; $uri = &Apache::lonnet::declutter($uri); - $r->print('

    '.&Apache::lonnet::clutter($uri).'

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

    '.&mt('Folder: [_1]', + ''.&Apache::lonnet::clutter($uri).'') + .'

    ' + ); 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(< - -$cancel -
    -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( + '
    '. + ''. + ' '. + &mt('Back to Source Directory').''. + '
    ' + ); + # Display all bombs of subdirectory my %brokenurls = &Apache::lonmsg::all_url_author_res_msg($author,$domain); foreach my $key (sort(keys(%brokenurls))) { @@ -842,7 +963,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 +1005,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 +1023,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 +1093,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 +1115,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 +1149,20 @@ 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('Domain').'' .''.&mt('Course').'' .''.&mt('Section(s)').'' .''.&mt('Num Students').'' + .''.&mt('Part').'' .''.&mt('Mean Tries').'' .''.&mt('Degree of Difficulty').'' .''.&mt('Degree of Discrimination').'' @@ -1048,12 +1179,16 @@ sub print_dynamic_metadata { next; } $table .= &Apache::loncommon::start_data_table_row(); + $table .= + ''.$courseinfo{'domain'}.''; $table .= ''.$courseinfo{'description'}.''; $table .= ''.$data->{'sections'}.''; $table .= ''.$data->{'stdno'}.''; + $table .= + ''.$data->{'part'}.''; foreach my $item ('avetries','difficulty','disc') { $table .= ''; if (exists($data->{$item})) { @@ -1072,23 +1207,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('

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

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

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

    '); } - - # # + # 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 +1239,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 @@ -1181,9 +1331,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 +1357,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 -
    -ENDBOMBS - if ($showdel) { - $r->print(< - -ENDDEL + $message=&Apache::lonhtmlcommon::confirm_success( + &mt('Error clearing messages'),1) + .'
    '.&mt('Error: [_1]',$rc); + } + } + if ($message) { + $message=&Apache::loncommon::confirmwrapper($message); + $r->print($message); + } + + $r->print(''); + if ($showbuttons) { + $r->print( + ''. + '' + .'
    '.$bombs + ); } else { - $r->print('

    '.$goback.'

    '); - if ($env{'form.clearmsg'}) { - my ($diruri) = ($disuri =~ m{(.*/)[^/]*}); - $r->print('

    '. - &mt('Back To Directory').'

    '); - } - } - $r->print('
    '.$bombs); + my $functions=&Apache::lonhtmlcommon::start_funclist('Actions'); + $functions.=&Apache::lonhtmlcommon::add_item_funclist( + ''. + &mt('Back to Source File').''); + my ($diruri) = ($disuri =~ m{(.*/)[^/]*}); + $functions.=&Apache::lonhtmlcommon::add_item_funclist( + ''. + &mt('Back to Source Directory').''); + $functions .= &Apache::lonhtmlcommon::end_funclist(); + $r->print('

    '.$functions.'

    '); + } } else { - my $displayfile=&mt('Metadata for [_1]',$disuri); + + # Display Metadata, not Bombs + my $displayfile = + &mt('Metadata for [_1]' + ,''.$disuri.''); 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=(); 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]' + ,'')); + $message = &Apache::loncommon::confirmwrapper($message); + $r->print($message); } else { &Apache::lonpublisher::metaeval($result); } @@ -1269,7 +1460,7 @@ ENDDEL } } $r->print(<$displayfile +

    $displayfile

    ENDEDIT my %lt=&fieldnames($file_type); @@ -1295,7 +1486,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,12 +1499,16 @@ 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; + } if (! $Apache::lonpublisher::metadatafields{'copyright'}) { $Apache::lonpublisher::metadatafields{'copyright'}= 'default'; @@ -1335,21 +1530,29 @@ ENDEDIT if ($Apache::lonpublisher::metadatafields{'courserestricted'} ne 'none') { if ($file_type eq 'portfolio') { - $r->print(&mt('Associated with course [_1]', - ''. - $env{$Apache::lonpublisher::metadatafields{'courserestricted'}. - ".description"}. - '').'
    '); + $r->print( + &mt('Associated with course [_1]' + ,'' + .$env{$Apache::lonpublisher::metadatafields{'courserestricted'} + .".description"}.'') + .' ' + .&mt('Change') + .''.'
    ' + ); + } else { $r->print(&mt('Associated with course [_1]', ''. $env{$Apache::lonpublisher::metadatafields{'courserestricted'}. ".description"}.'').'
    '); } - } else { - $r->print(''.&mt('This resource is not associated with a course.').'
    '); - } - } + } else { + $r->print( + &mt('This resource is not associated with a course.') + .' '.&mt('Change').'
    ' + ); + } + } if (@added_order) { foreach my $field_name (@added_order) { push(@fields,$field_name); @@ -1361,9 +1564,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 +1587,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 .= (''.$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', + $readonly,'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()); + $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.'
    '); + 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); @@ -1437,6 +1642,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; @@ -1479,14 +1695,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'; } }