*** EditTablePlugin_bak_AS.pm	Wed Nov 12 16:01:28 2003
--- EditTablePlugin.pm	Thu Nov 13 12:52:28 2003
***************
*** 505,513 ****
          $text .= "<textarea$style rows=\"$rows\" cols=\"$cols\" name=\"$theName\">$theValue</textarea>";
          
      } elsif( $type eq "date" ) {
          $size = 10 if $size < 1;
          $theValue = $encodeStart . encodeValue( $theValue ) . $encodeEnd if $theValue;
!         $text .= "<input type=\"text\" name=\"$theName\" id=\"id$theName\"size=\"$size\" value=\"$theValue\" /><button type=\"reset\" id=\"trigger$theName\">...</button><script type=\"text/javascript\">Calendar.setup({inputField : \"id$theName\", ifFormat   : \"dd M y\", button : \"trigger$theName\", singleClick : true %JSCALENDAROPTIONS%});</script>";
  	$query->{'jscalendar'} = 1;
      } else { #  if( $type eq "text") 
          $size = 16 if $size < 1;
--- 505,516 ----
          $text .= "<textarea$style rows=\"$rows\" cols=\"$cols\" name=\"$theName\">$theValue</textarea>";
          
      } elsif( $type eq "date" ) {
+         my $ifFormat = $bits[3];
+         $ifFormat = &TWiki::Func::getPreferencesValue("DATEDEFAULT") unless $ifFormat;
+         $ifFormat = "dd M y" unless $ifFormat;
          $size = 10 if $size < 1;
          $theValue = $encodeStart . encodeValue( $theValue ) . $encodeEnd if $theValue;
!         $text .= "<input type=\"text\" name=\"$theName\" id=\"id$theName\"size=\"$size\" value=\"$theValue\" /><button type=\"reset\" id=\"trigger$theName\">...</button><script type=\"text/javascript\">Calendar.setup({inputField : \"id$theName\", ifFormat   : \"$ifFormat\", button : \"trigger$theName\", singleClick : true %JSCALENDAROPTIONS%});</script>";
  	$query->{'jscalendar'} = 1;
      } else { #  if( $type eq "text") 
          $size = 16 if $size < 1;
***************
*** 577,583 ****
                       # default value of "| select, 1, a, b, c |" cell is "a"
                       $val = $1;  # type
                       $cell = $3 || "";
!                      $cell =~ s/\,.*$//o if( $val eq "select" );
                  }
                  $text .= inputElement( $theTableNr, $theRowNr, $col-1, "etcell${theRowNr}x$col", $cell ) . " \|";
              }
--- 580,587 ----
                       # default value of "| select, 1, a, b, c |" cell is "a"
                       $val = $1;  # type
                       $cell = $3 || "";
!                      $cell =~ s/\,.*$//o if(   $val eq "select" 
!                                             || $val eq "date" );
                  }
                  $text .= inputElement( $theTableNr, $theRowNr, $col-1, "etcell${theRowNr}x$col", $cell ) . " \|";
              }