--- loncom/interface/lonmeta.pm	2005/12/13 11:52:37	1.137
+++ loncom/interface/lonmeta.pm	2005/12/15 22:18:57	1.139
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Metadata display handler
 #
-# $Id: lonmeta.pm,v 1.137 2005/12/13 11:52:37 banghart Exp $
+# $Id: lonmeta.pm,v 1.139 2005/12/15 22:18:57 banghart Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -293,6 +293,7 @@ sub fieldnames {
 sub select_course {
     my %courses;
     my $output;
+    my $selected;
     foreach my $key (keys (%env)) { 
         if ($key =~ m/\.metadata\./) {
             $key =~ m/^course\.(.+)(\.metadata.+$)/;
@@ -302,29 +303,26 @@ sub select_course {
             $courses{$coursekey} = $value;
         }
     }
-    $output = '<h3>Associate resource with a course</h3><br />';
-    $output .= '<form action="" method="post">';
-    $output .= 'Select course <br />';
-    $output .= '<select name="metacourse" >';
     my $meta_not_found = 1;
+    if ($Apache::lonpublisher::metadatafields{'courserestricted'} eq 'none') {
+        $selected = ' SELECTED ';
+    } else {
+        $selected = '';
+    }
+    $output .= '<select name="new_courserestricted" >';
+    $output .= '<option value="none" '.$selected.'>None</option>';
     foreach my $key (keys (%courses)) {    
-        if ($meta_not_found) {
-            undef($meta_not_found);
-            $output .= '<h3>Portfolio Meta-Data</h3><br />';
-            $output .= '<form action="" method="post">';
-            $output .= 'Select your course<br />';
-            $output .= '<select name="metacourse" >';
-        }
         $key =~ m/(^.+)\.description$/;
-        $output .= '<option value="'.$1.'">';
+        if ($Apache::lonpublisher::metadatafields{'courserestricted'} eq $1) {
+            $selected = ' SELECTED ';
+        } else {
+            $selected = '';
+        }
+        $output .= '<option value="'.$1.'"'.$selected.'>';
         $output .= $courses{$key};
         $output .= '</option>';
     }
-    unless ($meta_not_found) {
-        $output .= '</select><br />';
-        $output .= '<input type="submit" value="Associate" />';
-        $output .= '</form>';
-    }
+    $output .= '</select><br />';
     return ($output);
 }
 # Pretty printing of metadata field
@@ -516,7 +514,8 @@ sub prettyinput {
             $cur_values_stu = $value;
         }
         if ($type eq 'courserestricted') {
-            return ('<input type="hidden" name="new_courserestricted" value="'.$course_key.'" />');
+            return (&select_course());
+            # return ('<input type="hidden" name="new_courserestricted" value="'.$course_key.'" />');
         }
         if (($type eq 'keywords') || ($type eq 'subject')
              || ($type eq 'author')||($type eq  'notes')
@@ -604,7 +603,8 @@ sub prettyinput {
             &relatedfield(0,$relatedsearchflag,$relatedsep); 
     }
     if ($type eq 'courserestricted') {
-            return ('<input type="hidden" name="new_courserestricted" value="'.$course_key.'" />');
+        return (&select_course());
+        #return ('<input type="hidden" name="new_courserestricted" value="'.$course_key.'" />');
     }
 
     # Dates
@@ -1002,7 +1002,6 @@ sub present_editable_metadata {
     # Header
     my $disuri=$uri;
     my $fn=&Apache::lonnet::filelocation('',$uri);
-    my $metacourse;
     $disuri=~s/^\/\~/\/priv\//;
     $disuri=~s/\.meta$//;
     $disuri=~s|^/editupload||;
@@ -1083,27 +1082,23 @@ ENDEDIT
                  'lowestgradelevel','highestgradelevel','sourceavail','sourcerights',
                  'obsolete','obsoletereplacement');
         }
-        if ($env{'form.metacourse'} ) {
-            $Apache::lonpublisher::metadatafields{'courserestricted'} = $env{'form.metacourse'};
-            $metacourse = $env{'form.metacourse'};
-         } else {
-            if (! $Apache::lonpublisher::metadatafields{'courserestricted'}) {
-                $Apache::lonpublisher::metadatafields{'courserestricted'}=
-                    'none';
-                $metacourse = 'none';
-            } else {
-                $metacourse = $Apache::lonpublisher::metadatafields{'courserestricted'};
-            }
-        }
+        if ((! $Apache::lonpublisher::metadatafields{'courserestricted'}) &&
+                (! $env{'form.new_courserestricted'})) {
+            $Apache::lonpublisher::metadatafields{'courserestricted'}=
+                'none';
+        } elsif ($env{'form.new_courserestricted'}) {
+            $Apache::lonpublisher::metadatafields{'courserestricted'}=
+                $env{'form.new_courserestricted'}; 
+        }           
         if (! $Apache::lonpublisher::metadatafields{'copyright'}) {
                 $Apache::lonpublisher::metadatafields{'copyright'}=
                 'default';
         }
-        if ($metacourse ne 'none') {
-            $r->print('Using: <strong> '.$env{$metacourse.".description"}.
+        if ($Apache::lonpublisher::metadatafields{'courserestricted'} ne 'none') {
+            $r->print('Using: <strong> '.$env{$Apache::lonpublisher::metadatafields{'courserestricted'}.".description"}.
                         "</strong> metadata framework<br />");
         } else {
-            $r->print("This resources is not associated with a metadata framework<br />");
+            $r->print("This resource is not associated with a metadata framework<br />");
         }
         foreach my $field_name(@fields) {
 
@@ -1111,34 +1106,33 @@ ENDEDIT
                 $Apache::lonpublisher::metadatafields{$field_name}=
                     join(',',&Apache::loncommon::get_env_multiple('form.new_'.$field_name));
             }
-            if ($metacourse ne 'none') {
+            if ($Apache::lonpublisher::metadatafields{'courserestricted'} ne 'none') {
                 # handle restrictions here
-                if ($env{$metacourse.'.metadata.'.$field_name.'.options'} =~ m/active/){
+                if (($env{$Apache::lonpublisher::metadatafields{'courserestricted'}.'.metadata.'.$field_name.'.options'} =~ m/active/) ||
+                    ($field_name eq 'courserestricted')){
                     $output.=('<p>'.$lt{$field_name}.': '.
                               &prettyinput($field_name,
 				   $Apache::lonpublisher::metadatafields{$field_name},
-				   'new_'.$field_name,'defaultmeta',undef,undef,undef,undef,$metacourse).'</p>');
-                 } elsif ($field_name eq 'courserestricted') {
-                            $output.=(
-                                &prettyinput($field_name,
-				    $Apache::lonpublisher::metadatafields{$field_name},
-				    'new_'.$field_name,'defaultmeta',undef,undef,undef,undef,$metacourse));
+				                    'new_'.$field_name,'defaultmeta',
+				                    undef,undef,undef,undef,
+				                    $Apache::lonpublisher::metadatafields{'courserestricted'}).'</p>');
                  }
             } else {
-                if ($field_name ne 'courserestricted') {
+
                     $output.=('<p>'.$lt{$field_name}.': '.
                             &prettyinput($field_name,
 				   $Apache::lonpublisher::metadatafields{$field_name},
 				   'new_'.$field_name,'defaultmeta').'</p>');
-	        } else {
-                    $output.=&prettyinput($field_name,
-				   $Apache::lonpublisher::metadatafields{$field_name},
-				   'new_'.$field_name,'defaultmeta');
-                }
+               
             }
         }
 
-        if ($env{'form.store'}) {
+	    $r->print($output.'<br /><input type="submit" name="store" value="'.
+                  &mt('Store Catalog Information').'">');
+        
+    }
+    $r->print('</form>');
+            if ($env{'form.store'}) {
             my $mfh;
             my $formname='store'; 
             my $file_content;
@@ -1199,14 +1193,6 @@ ENDEDIT
                 }
             }
         }
-	    $r->print($output.'<br /><input type="submit" name="store" value="'.
-                  &mt('Store Catalog Information').'">');
-        
-    }
-    $r->print('</form>');
-    if ($metacourse eq 'none') {
-        $r->print(&select_course());
-    }
     return;
 }