--- loncom/interface/lonhtmlcommon.pm	2004/10/21 11:18:06	1.94
+++ loncom/interface/lonhtmlcommon.pm	2004/11/11 18:19:41	1.95
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common html routines
 #
-# $Id: lonhtmlcommon.pm,v 1.94 2004/10/21 11:18:06 foxr Exp $
+# $Id: lonhtmlcommon.pm,v 1.95 2004/11/11 18:19:41 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -287,7 +287,7 @@ sub date_setter {
             document.$formname.$dname\_day.value = 30;
         }
     }
-
+    
     function $dname\_disable() {
         document.$formname.$dname\_month.disabled=true;
         document.$formname.$dname\_day.disabled=true;
@@ -319,64 +319,62 @@ document.$formname.$dname\_year.value,
     }
 </script>
 ENDJS
-    $result .= "  <nobr><select name=\"$dname\_month\" ".$special.' '.
-        $state.' '.
-        "onChange=\"javascript:$dname\_checkday()\" >\n";
+    $result .= '  <nobr>';
+    my $monthselector = qq{<select name="$dname\_month" $special $state onChange="javascript:$dname\_checkday()" >};
     # Month
     my @Months = qw/January February  March     April   May      June 
                     July    August    September October November December/;
     # Pad @Months with a bogus value to make indexing easier
     unshift(@Months,'If you can read this an error occurred');
-    if ($includeempty) { $result.="<option value=''></option>"; }
+    if ($includeempty) { $monthselector.="<option value=''></option>"; }
     for(my $m = 1;$m <=$#Months;$m++) {
-        $result .= "      <option value=\"$m\" ";
-        $result .= "selected " if ($m-1 eq $month);
-        $result .= "> ".&mt($Months[$m])." </option>\n";
+        $monthselector .= qq{      <option value="$m" };
+        $monthselector .= "selected " if ($m-1 eq $month);
+        $monthselector .= '> '.&mt($Months[$m]).' </option>';
     }
-    $result .= "  </select>\n";
+    $monthselector.= '  </select>';
     # Day
-    $result .= "  <input type=\"text\" name=\"$dname\_day\" ".$state.' '.
-            "value=\"$mday\" size=\"3\" ".$special.' '.
-            "onChange=\"javascript:$dname\_checkday()\" />\n";
+    my $dayselector = qq{<input type="text" name="$dname\_day" $state value="$mday" size="3" $special onChange="javascript:$dname\_checkday()" />};
     # Year
-    $result .= "  <input type=\"year\" name=\"$dname\_year\" ".$state.' '.
-            "value=\"$year\" size=\"5\" ".$special.' '.
-            "onChange=\"javascript:$dname\_checkday()\" />\n";
-    $result .= "&nbsp;&nbsp;";
-    if (! $no_hh_mm_ss) {
-        # Hours
-        $result .= "  <select name=\"$dname\_hour\" ".$special." ".$state.' '.
-            ">\n";
-        if ($includeempty) { $result.="<option value=''></option>"; }
-        for (my $h = 0;$h<24;$h++) {
-            $result .= "      <option value=\"$h\" ";
-            $result .= "selected " if (defined($hour) && $hour == $h);
-            $result .= "> ";
-            my $timest='';
-            if ($h == 0) {
-                $timest .= "12 am";
-            } elsif($h == 12) {
-                $timest .= "12 noon";
-            } elsif($h < 12) {
-                $timest .= "$h am";
-            } else {
-                $timest .= $h-12 ." pm";
-            }
-            $timest=&mt($timest);
-            $result .= $timest." </option>\n";
-        } 
-        $result .= "  </select>\n";
-        $result .= "  <input type=\"text\" name=\"$dname\_minute\" ".
-            $special.' '.
-            $state.' '.
-            "value=\"$min\" size=\"3\" /> m\n";
-        $result .= "  <input type=\"text\" name=\"$dname\_second\" ".
-            $special.' '.
-            $state.' '.
-            "value=\"$sec\" size=\"3\" /> s\n";
+    my $yearselector = qq{<input type="year" name="$dname\_year" $state value="$year" size="5" $special onChange="javascript:$dname\_checkday()" />};
+    #
+    my $hourselector = qq{<select name="$dname\_hour" $special $state >};
+    if ($includeempty) { 
+        $hourselector.=qq{<option value=''></option>};
+    }
+    for (my $h = 0;$h<24;$h++) {
+        $hourselector .= qq{<option value="$h" };
+        $hourselector .= "selected " if (defined($hour) && $hour == $h);
+        $hourselector .= ">";
+        my $timest='';
+        if ($h == 0) {
+            $timest .= "12 am";
+        } elsif($h == 12) {
+            $timest .= "12 noon";
+        } elsif($h < 12) {
+            $timest .= "$h am";
+        } else {
+            $timest .= $h-12 ." pm";
+        }
+        $timest=&mt($timest);
+        $hourselector .= $timest." </option>\n";
+    }
+    $hourselector .= "  </select>\n";
+    my $minuteselector = qq{<input type="text" name="$dname\_minute" $special $state value="$min" size="3" />};
+    my $secondselector= qq{<input type="text" name="$dname\_second" $special $state value="$sec" size="3" />};
+    my $cal_link = qq{<a href="javascript:$dname\_opencalendar()">};
+    #
+    if ($no_hh_mm_ss) {
+        $result .= &mt('[_1] [_2] [_3] [_4]Select Date[_5]',
+                       $monthselector,$dayselector,$yearselector,
+                       $cal_link,'</a>');
+    } else {
+        $result .= &mt('[_1] [_2] [_3] [_4] [_5]m [_6]s [_7]Select Date[_8]',
+                       $monthselector,$dayselector,$yearselector,
+                       $hourselector,$minuteselector,$secondselector,
+                       $cal_link,'</a>');
     }
-    $result .= "<a href=\"javascript:$dname\_opencalendar()\">".
-    &mt('Select Date')."</a></nobr>\n<!-- end $dname date setting form -->\n";
+    $result .= "</nobr>\n<!-- end $dname date setting form -->\n";
     return $result;
 }