--- loncom/interface/lonparmset.pm	2008/10/10 10:54:03	1.411
+++ 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.411 2008/10/10 10:54:03 bisitz 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}=
@@ -1185,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')" |;
         }
@@ -1211,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) {
@@ -1239,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')" |;
         }
@@ -1261,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 {
@@ -1281,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>');
 }
@@ -2946,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') {