--- loncom/interface/lonmeta.pm	2006/11/04 01:50:31	1.186
+++ loncom/interface/lonmeta.pm	2006/11/20 20:58:30	1.189
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Metadata display handler
 #
-# $Id: lonmeta.pm,v 1.186 2006/11/04 01:50:31 banghart Exp $
+# $Id: lonmeta.pm,v 1.189 2006/11/20 20:58:30 banghart Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -724,7 +724,7 @@ sub prettyinput {
 sub handler {
     my $r=shift;
     &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
-         ['currentpath']);
+         ['currentpath','changecourse']);
     my $uri=$r->uri;
     #
     # Set document type
@@ -752,7 +752,8 @@ sub handler {
             my $result=&Apache::lonnet::getfile($fn);
             &Apache::lonpublisher::metaeval($result);
             &Apache::lonnet::logthis("restricted is: ".$Apache::lonpublisher::metadatafields{'courserestricted'});
-            if (!$Apache::lonpublisher::metadatafields{'courserestricted'}) {
+            if ((!$Apache::lonpublisher::metadatafields{'courserestricted'}) ||
+                ($env{'form.changecourse'} eq 'true')) {
                 &pre_select_course($r,$uri);
             } else {
                 &present_editable_metadata($r,$uri,'portfolio');
@@ -1252,10 +1253,13 @@ ENDEDIT
 	    }
 
 	    if ($Apache::lonpublisher::metadatafields{'courserestricted'} ne 'none') {
-		$r->print(&mt('Associated with course [_1]','<strong>'.$env{$Apache::lonpublisher::metadatafields{'courserestricted'}.".description"}.
-			      '</strong>').'<br />');
+		$r->print(&mt('Associated with course [_1]',
+		        '<strong><a href="'.$uri.'?changecourse=true">'.
+		        $env{$Apache::lonpublisher::metadatafields{'courserestricted'}.
+		        ".description"}.
+			      '</a></strong>').'<br />');
 	    } else {
-		$r->print("This resource is not associated with a course.<br />");
+		$r->print('<a href="'.$uri.'?changecourse=true">This resource is not associated with a course.</a><br />');
 	    }
 	}
 	if (@added_order) {
@@ -1269,6 +1273,8 @@ ENDEDIT
                 $lt{$field_name} = $$added_metadata_fields{$field_name};
             }
         }
+        $output .= &Apache::loncommon::start_data_table();
+        my $row_alt = 1;
         foreach my $field_name (@fields) {
             if (defined($env{'form.new_'.$field_name})) {
                 $Apache::lonpublisher::metadatafields{$field_name}=
@@ -1280,22 +1286,26 @@ 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".&Apache::loncommon::start_data_table_row();
+                    $output .= ('<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>');
+                    $output .= &Apache::loncommon::end_data_table_row();
                  }
             } else {
 
-                    $output.=('<p>'.$lt{$field_name}.': '.
+                    $output.=(&Apache::loncommon::start_data_table_row().'<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>'.&Apache::loncommon::end_data_table_row());
                
             }
         }
+        $output .= &Apache::loncommon::end_data_table();
 	if ($env{'form.store'}) {
 	    my $mfh;
 	    my $formname='store';