--- loncom/interface/lonmeta.pm	2005/12/29 19:42:44	1.149
+++ loncom/interface/lonmeta.pm	2006/03/02 20:16:10	1.151
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Metadata display handler
 #
-# $Id: lonmeta.pm,v 1.149 2005/12/29 19:42:44 albertel Exp $
+# $Id: lonmeta.pm,v 1.151 2006/03/02 20:16:10 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -71,7 +71,7 @@ sub get_dynamic_metadata_from_sql {
     if (! defined($authordom) || ! defined($author)) {
         return ();
     }
-    my @Fields = ('url','count','course',
+    my @Fields = ('url','count','course','course_list',
                   'goto','goto_list',
                   'comefrom','comefrom_list',
                   'sequsage','sequsage_list',
@@ -358,36 +358,31 @@ sub pre_select_course {
     return;
 }
 sub select_course {
-    my %courses;
-    my $output;
-    my $selected;
-    foreach my $key (keys(%env)) { 
-        if ($key =~ m/\.metadata\./) {
-            $key =~ m/^course\.(.+)(\.metadata.+$)/;
-            my $course = $1;
-            my $coursekey = 'course.'.$course.'.description';
-            my $value = $env{$coursekey};
-            $courses{$coursekey} = $value;
-        }
-    }
-    my $meta_not_found = 1;
-    if ($Apache::lonpublisher::metadatafields{'courserestricted'} eq 'none') {
-        $selected = ' SELECTED ';
-    } else {
-        $selected = '';
-    }
+    my $output=$/;
+    my $current_restriction=
+	$Apache::lonpublisher::metadatafields{'courserestricted'};
+    my $selected = ($current_restriction eq 'none' ? 'selected="selected"' 
+		                                   : '');
+
     $output .= '<select name="new_courserestricted" >';
-    $output .= '<option value="none" '.$selected.'>None</option>';
-    foreach my $key (keys (%courses)) {    
-        $key =~ m/(^.+)\.description$/;
-        if ($Apache::lonpublisher::metadatafields{'courserestricted'} eq $1) {
-            $selected = ' SELECTED ';
-        } else {
-            $selected = '';
-        }
-        $output .= '<option value="'.$1.'"'.$selected.'>';
-        $output .= $courses{$key};
-        $output .= '</option>';
+    $output .= '<option value="none" '.$selected.'>'.
+	&mt('None').'</option>'.$/;
+    my %courses;
+    foreach my $key (keys(%env)) {
+        if ($key !~ m/^course\.(.+)\.description$/) { next; }
+	my $cid = $1;
+        if ($env{$key} !~ /\S/) { next; }
+	$courses{$key} = $cid;
+    }
+    foreach my $key (sort { lc($env{$a}) cmp lc($env{$b}) } (keys(%courses))) {
+	my $cid = 'course.'.$courses{$key};
+	my $selected = ($current_restriction eq $cid ? 'selected="selected"' 
+		                                     : '');
+        if ($env{$key} !~ /\S/) { next; }
+	$output .= '<option value="'.$cid.'" '.$selected.'>';
+	$output .= $env{$key};
+	$output .= '</option>'.$/;
+	$selected = '';
     }
     $output .= '</select><br />';
     return ($output);
@@ -452,7 +447,7 @@ sub prettyprint {
 	($type eq 'comefrom_list') ||
 	($type eq 'sequsage_list') ||
 	($type eq 'dependencies')) {
-	return '<ul><font size="-1">'.join("\n",map {
+	return '<font size="-1"><ul>'.join("\n",map {
             my $url = &Apache::lonnet::clutter($_);
             my $title = &Apache::lonnet::gettitle($url);
             if ($title eq '') {
@@ -489,18 +484,17 @@ sub prettyprint {
     # List of courses
     if ($type=~/\_list/) {
         my @Courses = split(/\s*\,\s*/,$value);
-        my $Str;
+        my $Str='<font size="-1"><ul>';
         foreach my $course (@Courses) {
             my %courseinfo = &Apache::lonnet::coursedescription($course);
             if (! exists($courseinfo{'num'}) || $courseinfo{'num'} eq '') {
                 next;
             }
-            if ($Str ne '') { $Str .= '<br />'; }
-            $Str .= '<a href="/public/'.$courseinfo{'domain'}.'/'.
+            $Str .= '<li><a href="/public/'.$courseinfo{'domain'}.'/'.
                 $courseinfo{'num'}.'/syllabus" target="preview">'.
-                $courseinfo{'description'}.'</a>';
+                $courseinfo{'description'}.'</a></li>';
         }
-	return $Str;
+	return $Str.'</ul></font>';
     }
     # No pretty print found
     return $value;
@@ -549,7 +543,8 @@ sub prettyinput {
         $size = 80;
     }
     my $output;
-    if (defined($course_key)) {
+    if (defined($course_key) 
+	&& exists($env{$course_key.'.metadata.'.$type.'.options'})) {
         my $stu_add;
         my $only_one;
         my %meta_options;
@@ -1183,7 +1178,8 @@ ENDEDIT
                 $Apache::lonpublisher::metadatafields{$field_name}=
                     join(',',&Apache::loncommon::get_env_multiple('form.new_'.$field_name));
             }
-            if ($Apache::lonpublisher::metadatafields{'courserestricted'} ne 'none') {
+            if ($Apache::lonpublisher::metadatafields{'courserestricted'} ne 'none'
+		&& exists($env{$Apache::lonpublisher::metadatafields{'courserestricted'}.'.metadata.'.$field_name.'.options'})) {
                 # handle restrictions here
                 if (($env{$Apache::lonpublisher::metadatafields{'courserestricted'}.'.metadata.'.$field_name.'.options'} =~ m/active/) ||
                     ($field_name eq 'courserestricted')){