--- loncom/interface/lonparmset.pm	2008/07/15 20:00:58	1.405
+++ loncom/interface/lonparmset.pm	2008/10/23 14:26:17	1.413
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set parameters for assessments
 #
-# $Id: lonparmset.pm,v 1.405 2008/07/15 20:00:58 raeburn Exp $
+# $Id: lonparmset.pm,v 1.413 2008/10/23 14:26:17 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -325,14 +325,31 @@ sub date_sanity_info {
    my $crsprefix='course.'.$env{'request.course.id'}.'.';
    if ($env{$crsprefix.'default_enrollment_end_date'}) {
       if ($checkdate>$env{$crsprefix.'default_enrollment_end_date'}) {
-         $result.='<br />'.&mt('After course enrollment end!');
+         $result.='<div class="LC_warning">'
+                 .&mt('After course enrollment end!')
+                 .'</div>';
       }
    }
    if ($env{$crsprefix.'default_enrollment_start_date'}) {
       if ($checkdate<$env{$crsprefix.'default_enrollment_start_date'}) {
-         $result.='<br />'.&mt('Before course enrollment start!');
+         $result.='<div class="LC_warning">'
+                 .&mt('Before course enrollment start!')
+                 .'</div>';
       }
    }
+# Preparation for additional warnings about dates in the past/future.
+# An improved, more context sensitive version is recommended,
+# e.g. warn for due and answer dates which are defined before the corresponding open date, etc.
+#   if ($checkdate<time) {
+#      $result.='<div class="LC_info">'
+#              .'('.&mt('in the past').')'
+#              .'</div>';
+#      }
+#   if ($checkdate>time) {
+#      $result.='<div class="LC_info">'
+#              .'('.&mt('in the future').')'
+#              .'</div>';
+#      }
    return $result;
 }
 ##################################################
@@ -551,27 +568,38 @@ sub valout {
     } else {
         if ($type eq 'date_interval') {
             my ($sec,$min,$hour,$mday,$mon,$year)=gmtime($value);
+            my @timer;
             $year=$year-70;
             $mday--;
             if ($year) {
-		$result.=$year.' yrs ';
+#               $result.=&mt('[quant,_1,yr]',$year).' ';
+                push(@timer,&mt('[quant,_1,yr]',$year));
             }
             if ($mon) {
-		$result.=$mon.' mths ';
+#               $result.=&mt('[quant,_1,mth]',$mon).' ';
+                push(@timer,&mt('[quant,_1,mth]',$mon));
             }
             if ($mday) {
-		$result.=$mday.' days ';
+#               $result.=&mt('[quant,_1,day]',$mday).' ';
+                push(@timer,&mt('[quant,_1,day]',$mday));
             }
             if ($hour) {
-		$result.=$hour.' hrs ';
+#               $result.=&mt('[quant,_1,hr]',$hour).' ';
+                push(@timer,&mt('[quant,_1,hr]',$hour));
             }
             if ($min) {
-		$result.=$min.' mins ';
+#               $result.=&mt('[quant,_1,min]',$min).' ';
+                push(@timer,&mt('[quant,_1,min]',$min));
             }
             if ($sec) {
-		$result.=$sec.' secs ';
+#               $result.=&mt('[quant,_1,sec]',$sec).' ';
+                push(@timer,&mt('[quant,_1,sec]',$sec));
             }
-            $result=~s/\s+$//;
+#           $result=~s/\s+$//;
+            if (!@timer) { # Special case: all entries 0 -> display "0 secs" intead of empty field to keep this field editable
+                push(@timer,&mt('[quant,_1,sec]',0));
+            }
+            $result.=join(", ",@timer);
         } elsif (&isdateparm($type)) {
             $result = &Apache::lonlocal::locallocaltime($value).
 		&date_sanity_info($value);
@@ -973,7 +1001,7 @@ sub extractResourceInformation {
 	    if (!exists($$allparms{$name}) || $$allparms{$name} =~ m/^\s*$/ ) {
 		my $display= &Apache::lonnet::metadata($srcf,$key.'.display');
 		my $parmdis = $display;
-		$parmdis =~ s/\[Part.*$//g;
+		$parmdis =~ s/\s*\[Part.*$//g;
 		$$allparms{$name}=$parmdis;
 		if (ref($defkeytype)) {
 		    $$defkeytype{$name}=
@@ -985,7 +1013,7 @@ sub extractResourceInformation {
 # allparts is a hash of all parts
 #
 	    my $part= &Apache::lonnet::metadata($srcf,$key.'.part');
-	    $$allparts{$part} = "Part: $part";
+	    $$allparts{$part} = &mt('Part: [_1]',$part);
 #
 # Remember all keys going with this resource
 #
@@ -1107,8 +1135,8 @@ ENDSCRIPT
 	if ($$pscat[0] eq "all" || grep $_ eq $tempkey, @{$pscat}) {
 	    $r->print(' checked');
 	}
-	$r->print('>'.($$allparms{$tempkey}=~/\S/ ? $$allparms{$tempkey}
-		                                  : $tempkey)
+	$r->print('>'.($$allparms{$tempkey}=~/\S/ ? &mt($$allparms{$tempkey})
+		                                  : &mt($tempkey))
 		  .'</label></td>');
  	$cnt++;
         if ($cnt==3) {
@@ -1116,21 +1144,46 @@ ENDSCRIPT
 	    $cnt=0;
 	}
     }
-    $r->print('
-</tr><tr id=\"LC_parm_overview_parm_menu_selectors\"><td>
-<a href="javascript:checkall(true, \'pscat\')">Select&nbsp;All</a><br />
-<a href="javascript:checkstandard()">Select&nbsp;Common&nbsp;Only</a>
-</td><td>
-<a href="javascript:checkdates()">Add&nbsp;Problem&nbsp;Dates</a>
-<a href="javascript:checkcontdates()">Add&nbsp;Content&nbsp;Dates</a><br />
-<a href="javascript:checkdisset()">Add&nbsp;Discussion&nbsp;Settings</a>
-<a href="javascript:checkvisi()">Add&nbsp;Visibilities</a><br />
-<a href="javascript:checkparts()">Add&nbsp;Part&nbsp;Parameters</a>
-</td><td>
-<a href="javascript:checkall(false, \'pscat\')">Unselect&nbsp;All</a>
-</td>
-');
-    $r->print('</tr></table>');
+    $r->print('</tr>'
+             .'<tr id=\"LC_parm_overview_parm_menu_selectors\">'
+             .'<td valign="top">'
+             .'<fieldset><legend><b>'.&mt('Parameter Selection').'</b></legend>'
+             .'<span class="LC_nobreak">'
+             .'&bull; <a href="javascript:checkall(true, \'pscat\')">'.&mt('Select All').'</a>'
+             .'</span>'
+             .'<br />'
+             .'<span class="LC_nobreak">'
+             .'&bull; <a href="javascript:checkstandard()">'.&mt('Select Common Only').'</a>'
+             .'</span>'
+             .'<br />'
+             .'<span class="LC_nobreak">'
+             .'&bull; <a href="javascript:checkall(false, \'pscat\')">'.&mt('Unselect All').'</a>'
+             .'</span>'
+             .'</fieldset>'
+             .'</td>'
+             .'<td colspan="2" valign="top">'
+             .'<fieldset><legend><b>'.&mt('Add Selection for...').'</b></legend>'
+             .'<span class="LC_nobreak">'
+             .'&bull; <a href="javascript:checkdates()">'.&mt('Problem Dates').'</a>'
+             .'</span>'
+             .'<span class="LC_nobreak">'
+             .' &bull; <a href="javascript:checkcontdates()">'.&mt('Content Dates').'</a>'
+             .'</span>'
+#            .'<br />'
+             .'<span class="LC_nobreak">'
+             .' &bull; <a href="javascript:checkdisset()">'.&mt('Discussion Settings').'</a>'
+             .'</span>'
+             .'<span class="LC_nobreak">'
+             .' &bull; <a href="javascript:checkvisi()">'.&mt('Visibilities').'</a>'
+             .'</span>'
+#            .'<br />'
+             .'<span class="LC_nobreak">'
+             .' &bull; <a href="javascript:checkparts()">'.&mt('Part Parameters').'</a>'
+             .'</span>'
+             .'</fieldset>'
+             .'</td>'
+             .'</tr></table>'
+    );
 }
 
 sub partmenu {
@@ -1160,21 +1213,18 @@ sub usermenu {
     my $chooseopt=&Apache::loncommon::select_dom_form($udom,'udom').' '.
         &Apache::loncommon::selectstudent_link('parmform','uname','udom');
     my $selscript=&Apache::loncommon::studentbrowser_javascript();
-    my %lt=&Apache::lonlocal::texthash(
-		    'se'    => "Section",
-                    'gr'    => "Group",
-		    'fu'    => "For User",
-		    'oi'    => "or ID",
-		    'ad'    => "at Domain"
-				       );
+
     my $sections='';
     my %sectionhash = &Apache::loncommon::get_sections();
 
     my $groups;
     my %grouphash = &Apache::longroup::coursegroups();
 
+    my $g_s_header='';
+    my $g_s_footer='';
+
     if (%sectionhash) {
-        $sections=$lt{'se'}.': <select name="csec"';
+        $sections=&mt('Section:').' <select name="csec"';
         if (%grouphash && $parmlev ne 'full') {
             $sections .= qq| onchange="group_or_section('csec')" |;
         }
@@ -1186,8 +1236,9 @@ sub usermenu {
         }
         $sections.='</select>';
     }
+
     if (%sectionhash && %grouphash && $parmlev ne 'full') {
-        $sections .= '&nbsp;or&nbsp;';
+        $sections .= '&nbsp;'.&mt('or').'&nbsp;';
         $sections .= qq|
 <script type="text/javascript">
 function group_or_section(caller) {
@@ -1214,7 +1265,7 @@ function group_or_section(caller) {
     } 
 
     if (%grouphash) {
-        $groups=$lt{'gr'}.': <select name="cgroup"';
+        $groups=&mt('Group:').' <select name="cgroup"';
         if (%sectionhash && $env{'form.action'} eq 'settable') {
             $groups .= qq| onchange="group_or_section('cgroup')" |;
         }
@@ -1236,19 +1287,25 @@ function group_or_section(caller) {
         }
         $groups.='</select>';
     }
-    $r->print(<<ENDMENU);
-<b>
-$sections
-$groups
-<br />
-$lt{'fu'} 
-<input type="text" value="$uname" size="12" name="uname" />
-$lt{'oi'}
-<input type="text" value="$id" size="12" name="id" /> 
-$lt{'ad'}
-$chooseopt
-</b>
-ENDMENU
+
+    if (%sectionhash || %grouphash) {
+        $g_s_header='<fieldset><legend>'.&mt('Group/Section').'</legend><div>';
+        $g_s_footer='</div></fieldset>';
+    }
+
+    $r->print('<b>'
+             .$g_s_header
+             .$sections
+             .$groups
+             .$g_s_footer
+             .'<fieldset><legend>'.&mt('User').'</legend><div>'
+             .&mt('For User [_1] or Student/Employee ID [_2] at Domain [_3]'
+                 ,'<input type="text" value="'.$uname.'" size="12" name="uname" />'
+                 ,'<input type="text" value="'.$id.'" size="12" name="id" /> '
+                 ,$chooseopt)
+             .'</div></fieldset>'
+             .'</b>'
+    );
 }
 
 sub displaymenu {
@@ -1256,7 +1313,7 @@ sub displaymenu {
     $r->print('<table border="1"><tr><th>'.&mt('Select Parameters to View').'</th><th>'.
 	     &mt('Select Parts to View').'</th></tr><tr><td>');  
     &parmmenu($r,$allparms,$pscat,$keyorder);
-    $r->print('</td><td>');
+    $r->print('</td><td valign="top" align="center">');
     &partmenu($r,$allparts,$psprt);
     $r->print('</td></tr></table>');
 }
@@ -2126,6 +2183,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 +2414,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 +2439,7 @@ sub crsenv {
                              'allow_discussion_post_editing',
                              'languages',
                              'timezone',
+                             'datelocale',
 			     'nothideprivileged',
                              'rndseed',
                              'receiptalg',
@@ -2431,6 +2493,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',
@@ -2541,21 +2629,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();
@@ -2883,8 +2978,8 @@ sub listdata {
 						      $$resourcedata{$thiskey},
 							      '',1,'','').
 '<input type="hidden" name="datepointer_'.$thiskey.'" value="'.$jskey.'" />'.
-(($$resourcedata{$thiskey}!=0)?'<a href="/adm/parmset?&action=dateshift1&timebase='.$$resourcedata{$thiskey}.'">'.
-&mt('Shift all dates based on this date').'</a>':'').
+(($$resourcedata{$thiskey}!=0)?'<span class="LC_nobreak"><a href="/adm/parmset?&action=dateshift1&timebase='.$$resourcedata{$thiskey}.'">'.
+&mt('Shift all dates based on this date').'</a></span>':'').
 &date_sanity_info($$resourcedata{$thiskey})
 			  );
 	    } elsif ($thistype eq 'date_interval') {