--- loncom/interface/lonmeta.pm	2006/10/23 20:53:46	1.184
+++ loncom/interface/lonmeta.pm	2006/11/20 18:54:55	1.187
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Metadata display handler
 #
-# $Id: lonmeta.pm,v 1.184 2006/10/23 20:53:46 banghart Exp $
+# $Id: lonmeta.pm,v 1.187 2006/11/20 18:54:55 banghart Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -746,7 +746,17 @@ sub handler {
         if ($env{'form.store'}) {
             &present_editable_metadata($r,$uri,'portfolio');
         } else {
-            &pre_select_course($r,$uri);
+            my $fn=&Apache::lonnet::filelocation('',$uri);
+            %Apache::lonpublisher::metadatafields=();
+            %Apache::lonpublisher::metadatakeys=();
+            my $result=&Apache::lonnet::getfile($fn);
+            &Apache::lonpublisher::metaeval($result);
+            &Apache::lonnet::logthis("restricted is: ".$Apache::lonpublisher::metadatafields{'courserestricted'});
+            if (!$Apache::lonpublisher::metadatafields{'courserestricted'}) {
+                &pre_select_course($r,$uri);
+            } else {
+                &present_editable_metadata($r,$uri,'portfolio');
+            }
         }
     } elsif ($uri=~m|^/editupload/[^/]+/[^/]+/groups/|) {
         $r->print(&Apache::loncommon::start_page('Edit Group Portfolio File Catalog Information',
@@ -1196,7 +1206,7 @@ ENDEDIT
 	if ($file_type eq 'portfolio' || $file_type eq 'groups') {
 	    if(exists ($env{$Apache::lonpublisher::metadatafields{'courserestricted'}.'.metadata.fieldlist'})) {
 	        # retrieve fieldnames (in order) from the course restricted list
-	        @fields = (split /,/,$env{$Apache::lonpublisher::metadatafields{'courserestricted'}.'.metadata.fieldlist'});
+	        @fields = (split(/,/,$env{$Apache::lonpublisher::metadatafields{'courserestricted'}.'.metadata.fieldlist'}));
 	    } else {
 	        # no saved field list, use default list
 	        @fields =  ('author','title','subject','keywords','abstract',
@@ -1204,16 +1214,16 @@ ENDEDIT
 	                    'highestgradelevel','standards');
 	        $added_metadata_fields = &Apache::lonparmset::get_added_meta_fieldnames();
 	        if ($env{'course.'.$env{'request.course.id'}.'.metadata.addedorder'}) {
-	            @added_order = split /,/,$env{'course.'.$env{'request.course.id'}.'.metadata.addedorder'};
+	            @added_order = split(/,/,$env{'course.'.$env{'request.course.id'}.'.metadata.addedorder'});
 	        }
-	        $env{$Apache::lonpublisher::metadatafields{'courserestricted'}.'.metadata.fieldlist'} = join (",",@fields);
+	        $env{$Apache::lonpublisher::metadatafields{'courserestricted'}.'.metadata.fieldlist'} = join(",",@fields);
 	    }
 	} else {
 	    @fields = ('author','title','subject','keywords','abstract','notes',
-                 'copyright','customdistributionfile','language',
-                 'standards',
-                 'lowestgradelevel','highestgradelevel','sourceavail','sourcerights',
-                 'obsolete','obsoletereplacement');
+		       'copyright','customdistributionfile','language',
+		       'standards',
+		       'lowestgradelevel','highestgradelevel','sourceavail','sourcerights',
+		       'obsolete','obsoletereplacement');
         }
         if ($file_type eq 'groups') {
             $Apache::lonpublisher::metadatafields{'courserestricted'}=
@@ -1249,17 +1259,21 @@ ENDEDIT
 	    }
 	}
 	if (@added_order) {
-	    foreach my $field_name(@added_order) {
-                push (@fields,$field_name);
+	    foreach my $field_name (@added_order) {
+                push(@fields,$field_name);
                 $lt{$field_name} = $$added_metadata_fields{$field_name};
 	    }
 	} else {
-            foreach my $field_name(keys (%$added_metadata_fields)) {
-                push (@fields,$field_name);
+            foreach my $field_name (keys(%$added_metadata_fields)) {
+                push(@fields,$field_name);
                 $lt{$field_name} = $$added_metadata_fields{$field_name};
             }
         }
+        $output.='<table>';
+        my $row_alt = 1;
         foreach my $field_name (@fields) {
+            # $row_alt = ($row_alt) ? 0 : 1;
+            my $row_class = ($row_alt) ? ' class="LC_metadata_light" ' : ' class="LC_metadata_dark" ';
             if (defined($env{'form.new_'.$field_name})) {
                 $Apache::lonpublisher::metadatafields{$field_name}=
                     join(',',&Apache::loncommon::get_env_multiple('form.new_'.$field_name));
@@ -1270,22 +1284,24 @@ ENDEDIT
                 if ((($env{$Apache::lonpublisher::metadatafields{'courserestricted'}.'.metadata.'.$field_name.'.options'} =~ m/active/) ||
                     ($field_name eq 'courserestricted'))&&
                     (!($env{$Apache::lonpublisher::metadatafields{'courserestricted'}.'.metadata.'.$field_name.'.options'} =~ m/deleted/))){
-                    $output.=("\n".'<p>'.$lt{$field_name}.': '.
+                    
+                    $output.=("\n".'<tr '.$row_class.'><td><span class="LC_metadata">'.$lt{$field_name}.':</span></td><td> '.
                               &prettyinput($field_name,
 				   $Apache::lonpublisher::metadatafields{$field_name},
 				                    'new_'.$field_name,'defaultmeta',
 				                    undef,undef,undef,undef,
-				                    $Apache::lonpublisher::metadatafields{'courserestricted'}).'</p>'."\n");
+				                    $Apache::lonpublisher::metadatafields{'courserestricted'}).'</td></tr>'."\n");
                  }
             } else {
 
-                    $output.=('<p>'.$lt{$field_name}.': '.
-                            &prettyinput($field_name,
-				   $Apache::lonpublisher::metadatafields{$field_name},
-				   'new_'.$field_name,'defaultmeta').'</p>');
+                    $output.=('<tr'.$row_class.'><td><span class="LC_metadata">'.$lt{$field_name}.':</span></td><td> '.
+			      &prettyinput($field_name,
+					   $Apache::lonpublisher::metadatafields{$field_name},
+					   'new_'.$field_name,'defaultmeta').'</td></tr>');
                
             }
         }
+        $output.='</table>';
 	if ($env{'form.store'}) {
 	    my $mfh;
 	    my $formname='store'; 
@@ -1294,7 +1310,7 @@ ENDEDIT
 		$Apache::lonpublisher::metadatafields{'keywords'} = 
 		    join (',', &Apache::loncommon::get_env_multiple('form.new_keywords'));
 	    }
-	    foreach my $field (sort keys %Apache::lonpublisher::metadatafields) {
+	    foreach my $field (sort(keys(%Apache::lonpublisher::metadatafields))) {
 		next if ($field =~ /\./);
 		my $unikey=$field;
 		$unikey=~/^([A-Za-z_]+)/;
@@ -1302,8 +1318,8 @@ ENDEDIT
 		$tag=~tr/A-Z/a-z/;
 		$file_content.= "\n\<$tag";
 		foreach my $key (split(/\,/,
-			       $Apache::lonpublisher::metadatakeys{$unikey})
-			 ) {
+				       $Apache::lonpublisher::metadatakeys{$unikey})
+				 ) {
 		    my $value=
 			$Apache::lonpublisher::metadatafields{$unikey.'.'.$key};
 		    $value=~s/\"/\'\'/g;
@@ -1325,12 +1341,12 @@ ENDEDIT
                 $r->print(&store_portfolio_metadata($formname,$file_content,$path,
                                                     $new_fn));
             } else {
-		if (!  ($mfh=Apache::File->new('>'.$fn))) {
+		if (! ($mfh=Apache::File->new('>'.$fn))) {
 		    $r->print('<p><font color="red">'.
 			      &mt('Could not write metadata').', '.
 			      &mt('FAIL').'</font></p>');
 		} else {
-		    print $mfh $file_content;
+		    print $mfh ($file_content);
 		    $r->print('<p><font color="blue">'.&mt('Wrote Metadata').
 			      ' '.&Apache::lonlocal::locallocaltime(time).
 			      '</font></p>');