--- loncom/interface/lonmeta.pm	2006/10/23 21:09:21	1.185
+++ 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.185 2006/10/23 21:09:21 albertel 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',
@@ -1259,7 +1269,11 @@ ENDEDIT
                 $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}.': '.
+                    $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').'</p>');
+					   'new_'.$field_name,'defaultmeta').'</td></tr>');
                
             }
         }
+        $output.='</table>';
 	if ($env{'form.store'}) {
 	    my $mfh;
 	    my $formname='store';