*** lib/TWiki/Form.pm.orig	Thu Jan  6 17:53:08 2005
--- lib/TWiki/Form.pm	Thu Jan  6 19:02:49 2005
***************
*** 407,418 ****
              $val =~ s/\n<\/tr><tr>$//;
              $value = "$val\n</tr></table>\n";
   	} elsif ( $type eq "date" ) { # calendar.js
   	  $value =~ s/"/"/go; # Make sure double quote don't kill us
   	  $value =~ s/&/&\;/go;
   	  $value =~ s/</<\;/go;
   	  $value =~ s/>/>\;/go;
!  	  $value = "<input type=\"text\" name=\"$name\" id=\"id$name\"size=\"$size\" value=\"$value\" /><button type=\"reset\" id=\"trigger$name\">...</button><script type=\"text/javascript\">Calendar.setup({inputField : \"id$name\", ifFormat : \"%JSCALENDARDATEFORMAT%\", button : \"trigger$name\", singleClick  : true  %JSCALENDAROPTIONS%}); </script>";
!  	  $query->{'jscalendar'} = 1;
          } elsif( $type eq "radio" ) {
              my $val = "<table  cellspacing=\"0\" cellpadding=\"0\"><tr>";
              my $matched = "";
--- 407,426 ----
              $val =~ s/\n<\/tr><tr>$//;
              $value = "$val\n</tr></table>\n";
   	} elsif ( $type eq "date" ) { # calendar.js
+ 	  my $ifFormat = "@fieldInfo";
+ 	  $ifFormat = $ifFormat || 
+ 	    TWiki::Prefs::getPreferencesValue("JSCALENDARDATEFORMAT", "$web");
+ 	  my $ifOptions = TWiki::Prefs::getPreferencesValue("JSCALENDAROPTIONS", "$web");
+ 	  $size = 10 if $size < 1;
   	  $value =~ s/"/"/go; # Make sure double quote don't kill us
   	  $value =~ s/&/&\;/go;
   	  $value =~ s/</<\;/go;
   	  $value =~ s/>/>\;/go;
! 	  $value = "<input type=\"text\" name=\"$name\" id=\"id$name\"size=\"$size\" value=\"$value\" />";
! 	  $value .= "<button type=\"reset\" id=\"trigger$name\">...</button>";
! 	  $value .= "<script type=\"text/javascript\">Calendar.setup({inputField : \"id$name\", ifFormat ";
! 	  $value .= ": \"$ifFormat\", button : \"trigger$name\", singleClick : true $ifOptions });</script>";
!         $query->{'jscalendar'} = 1;
          } elsif( $type eq "radio" ) {
              my $val = "<table  cellspacing=\"0\" cellpadding=\"0\"><tr>";
              my $matched = "";
*** lib/TWiki/UI/Edit.pm.orig	Thu Jan  6 17:53:08 2005
--- lib/TWiki/UI/Edit.pm	Thu Jan  6 18:53:23 2005
***************
*** 75,80 ****
--- 75,81 ----
    my $meta = "";
    my $extra = "";
    my $topicExists  = &TWiki::Store::topicExists( $webName, $topic );
+   $query->{'jscalendar'} = 0;
  
    # Prevent editing existing topic?
    if( $onlyNewTopic && $topicExists ) {
***************
*** 263,268 ****
--- 264,280 ----
    $tmpl =~ s/%FORMTEMPLATE%//go; # Clear if not being used
    $tmpl =~ s/%TEXT%/$text/go;
    $tmpl =~ s/( ?) *<\/?(nop|noautolink)\/?>\n?/$1/gois;   # remove <nop> and <noautolink> tags
+ 
+   if ($query->{'jscalendar'}) {
+      # add header data for jscalendar if used. Use header in jscalendar.tmpl
+     my $dir = "$TWiki::pubUrlPath/$TWiki::twikiWebname/JSCalendarContrib";
+     my $calhead = "<script type=\"text/javascript\" src=\"$dir/calendar.js\"></script>\n";
+     $calhead .= "<script type=\"text/javascript\" src=\"$dir/lang/calendar-"
+       . TWiki::Prefs::getPreferencesValue("JSCALENDARLANGUAGE", "$webName") . ".js\"></script>\n";
+     $calhead .= "<script type=\"text/javascript\" src=\"$dir/calendar-setup.js\"></script>\n";
+     $calhead .= "<link type=\"text/css\" rel=\"stylesheet\" href=\"$dir/calendar-system.css\" />\n";
+     $tmpl =~ s/<\/head>/$calhead<\/head>/i;
+   }
  
    TWiki::writeHeaderFull ( $query, 'edit', $cgiAppType, length($tmpl) );