--- loncom/interface/lonparmset.pm	2008/07/01 01:35:28	1.403
+++ loncom/interface/lonparmset.pm	2008/09/19 03:27:04	1.409
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.403 2008/07/01 01:35:28 raeburn Exp $
+# $Id: lonparmset.pm,v 1.409 2008/09/19 03:27:04 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1899,7 +1899,7 @@ ENDTABLEHEADFOUR
                 }
                 $r->print('<div align="center"><h4>'
                          .&mt('Set Defaults for All Resources in [_1]Specifically for [_2][_3]'
-                             ,$foldermap.'<br /><font color="red"><i>$showtitle</i></font><br />'
+                             ,$foldermap.'<br /><font color="red"><i>'.$showtitle.'</i></font><br />'
                              ,$tmp
                              ,'<font color="red"><i>'.$coursename.'</i></font>'
                              )
@@ -2126,6 +2126,8 @@ sub crsenv {
                 $setoutput.=&mt('Set').' <b>'.$name.'</b> '.&mt('to').' <b>';
                 if ($name =~ /^default_enrollment_(start|end)_date$/) {
                     $setoutput .= &Apache::lonlocal::locallocaltime($value);
+                } elsif ($name eq 'categories') {
+                    $setoutput .= $env{'form.categories_display'};
                 } else {
                     $setoutput .= $value;
                 }
@@ -2355,6 +2357,8 @@ sub crsenv {
              'categories'
                  => '<b>'.&mt('Categorize course').'</b> <a href="javascript:catsbrowser()">'.
                     &mt('Display Categories').'</a>',
+             'datelocale' 
+                 => '<b>'.&mt('Locale used for course calendar').'</b>',
              );
         my @Display_Order = ('url','description','courseid','cloners');
         (my $can_toggle_cat,$can_categorize) = &can_modify_catsettings($dom);
@@ -2378,6 +2382,7 @@ sub crsenv {
                              'allow_discussion_post_editing',
                              'languages',
                              'timezone',
+                             'datelocale',
 			     'nothideprivileged',
                              'rndseed',
                              'receiptalg',
@@ -2399,7 +2404,9 @@ sub crsenv {
 			     'disableexampointprint',
 			     'task_messages','task_grading'));
 	foreach my $parameter (sort(keys(%values))) {
-            unless (($parameter =~ m/^internal\./)||($parameter =~ m/^metadata\./)) {
+            unless (($parameter =~ m/^internal\./)||($parameter =~ m/^metadata\./) ||
+                    ($parameter =~ m/^selfenroll_/) || ($parameter =~ /_selfenroll$/)
+                    || ($parameter eq 'type')) {
                 if (! $descriptions{$parameter}) {
                     $descriptions{$parameter}=$parameter;
                     push(@Display_Order,$parameter);
@@ -2429,6 +2436,32 @@ sub crsenv {
                     &Apache::loncommon::select_timezone($parameter.'_value',
                                                         $timezone,
                                                         $onchange,$includeempty).'</td>';
+            } elsif ($parameter eq 'datelocale') {
+                my $includeempty = 1;
+                my $locale_obj = &Apache::lonlocal::getdatelocale();
+                my $currdatelocale;
+                if (ref($locale_obj)) {
+                    $currdatelocale = $locale_obj->id();
+                }
+                $output .= '<td>'.
+                    &Apache::loncommon::select_datelocale($parameter.'_value',
+                                                          $currdatelocale,
+                                                          $onchange,$includeempty).'</td>'; 
+            } elsif ($parameter eq 'categories') {
+                my $catdisplay;
+                if ($values{'categories'} ne '') {
+                    my @curritems = split(/\&/,$values{'categories'});
+                    foreach my $item (@curritems) {
+                        my ($name,$parent,$pos) = split(/:/,$item);
+                        $catdisplay .= &unescape($name).'&';
+                    }
+                    $catdisplay =~ s/\&$//;
+                } 
+                $output .= '<td>'.
+                           '<input type="hidden" name="categories_value" value="'.
+                           $values{'categories'}.'" />'.
+                           '<input type="textbox" name="categories_display" value="'.
+                           $catdisplay.'" readonly="readonly" size="40" /></td>';
             } else {
                 $output .= '<td>'.
                     &Apache::lonhtmlcommon::textbox($parameter.'_value',
@@ -2539,21 +2572,28 @@ sub assign_course_categories {
 
 function updateCategories() {
     var newcategories = '';
+    var unescapedcats = '';
     if (document.chgcats.usecategory.length) {
         for (var i=0; i<document.chgcats.usecategory.length; i++) {
             if (document.chgcats.usecategory[i].checked == true) {
                 newcategories = newcategories + document.chgcats.usecategory[i].value + '&';
+                unescapedcats = unescapedcats + document.chgcats.catname[i].value + ' & ';
             }
         }
         if (newcategories.length > 0) {
             newcategories = newcategories.slice(0,-1);
         }
+        if (unescapedcats.length > 0) {
+            unescapedcats = unescapedcats.slice(0,-3);
+        }
     } else {
          if (document.chgcats.usecategory.checked == true) {
              newcategories = document.chgcats.usecategory.value;
+             unescapedcats = document.chgcats.catname.value;
          }
     }
     opener.document.envform.categories_value.value = newcategories;
+    opener.document.envform.categories_display.value = unescapedcats;
     opener.document.envform.categories_setparmval.checked = true;
     alert("$alert");
     self.close();