--- loncom/interface/lonmeta.pm	2012/11/09 18:56:50	1.248
+++ loncom/interface/lonmeta.pm	2023/11/07 21:31:11	1.257
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Metadata display handler
 #
-# $Id: lonmeta.pm,v 1.248 2012/11/09 18:56:50 bisitz Exp $
+# $Id: lonmeta.pm,v 1.257 2023/11/07 21:31:11 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -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 />';
@@ -455,7 +455,7 @@ sub prettyprint {
     }
     # MIME
     if ($type eq 'mime') {
-        return '<img src="'.&Apache::loncommon::icon($value).'" />&nbsp;'.
+        return '<img src="'.&Apache::loncommon::icon($value).'" alt="" />&nbsp;'.
             &Apache::loncommon::filedescription($value);
     }
     # Person
@@ -550,13 +550,17 @@ 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='<select name="'.$name.'">';
     foreach my $id (@idlist) {
-        $selout.='<option value="'.$id.'"';
+        $selout.='<option value="'.$id.'"'.$disabled;
         if ($id eq $value) {
 	    $selout.=' selected="selected">'.&{$functionref}($id).'</option>';
         } else {
@@ -582,7 +586,7 @@ sub relatedfield {
 }
 
 sub prettyinput {
-    my ($type,$value,$fieldname,$formname,
+    my ($type,$value,$readonly,$fieldname,$formname,
 	$relatedsearchflag,$relatedsep,$relatedvalue,$size,$course_key)=@_;
     if (! defined($size)) {
         $size = 80;
@@ -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);
@@ -704,11 +708,20 @@ sub prettyinput {
     }
     # 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.' />';
+        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') {
@@ -763,7 +776,7 @@ sub pageheader {
 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
@@ -777,9 +790,18 @@ sub handler {
     &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'  => 'Construction Space',
-            'href'  => &Apache::loncommon::authorspace($uri),
+            'text'  => $text,
+            'href'  => $href,
         });
     }
 
@@ -829,7 +851,7 @@ sub handler {
         $r->print(&pageheader());
         &present_editable_metadata($r,$uri,'groups');    
     } elsif ($uri=~m|^/priv|) { 
-        # Construction space
+        # Authoring space
         &Apache::lonhtmlcommon::add_breadcrumb({
             'text'  => 'Edit Metadata',
             'href'  => '',
@@ -854,7 +876,21 @@ sub handler {
                 '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;
@@ -872,7 +908,11 @@ 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::lonnet::constructaccess('/priv/'.$domain.'/'.$author.'/')) {
         $r->print('<p class="LC_error">'.&mt('Not authorized').'</p>');
@@ -965,7 +1005,7 @@ 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 
@@ -983,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) {
@@ -1118,6 +1158,7 @@ sub print_dynamic_metadata {
         if (exists($dynmeta{'stats'})) {
             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>'
@@ -1138,6 +1179,8 @@ 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 .= 
@@ -1174,7 +1217,6 @@ sub print_dynamic_metadata {
           &mt('No Assessment Statistical Data is available for this resource').
                   '</h4>');
     }
-
     #
     # Evaluation Data
     $r->print('<h4>'.&mt('Evaluation Data').'</h4>');
@@ -1289,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$//;
@@ -1306,7 +1358,12 @@ sub present_editable_metadata {
     my $bombs=&Apache::lonmsg::retrieve_author_res_msg($target);
     if ($bombs) {
         # Display Bombs, not Metadata
-        $r->print("<h1>$disuri</h1>");
+        $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='';
@@ -1367,7 +1424,7 @@ sub present_editable_metadata {
         # Display Metadata, not Bombs
         my $displayfile =
             &mt('Metadata for [_1]'
-               ,'<span class="LC_filename"'.$disuri.'</span>');
+               ,'<span class="LC_filename">'.$disuri.'</span>');
         if ($disuri=~/\/default$/) {
             my $dir=$disuri;
             $dir=~s/default$//;
@@ -1403,7 +1460,7 @@ sub present_editable_metadata {
             }
         }
         $r->print(<<ENDEDIT);
-<p>$displayfile</p>
+<h2>$displayfile</h2>
 <form method="post" action="" name="defaultmeta">
 ENDEDIT
         my %lt=&fieldnames($file_type);
@@ -1429,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)$/) {
@@ -1442,15 +1499,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'}) {
@@ -1529,17 +1629,16 @@ ENDEDIT
                     $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::lonhtmlcommon::row_closure($rowcount == $last?1:0);
                  }
             } else {
-
                     $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')
                               .&Apache::lonhtmlcommon::row_closure($rowcount == $last?1:0);
                
             }
@@ -1582,6 +1681,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;