Index: lib/TWiki/Plugins/EditTablePlugin.pm
===================================================================
RCS file: /e/www/CVS/twiki-cairo/lib/TWiki/Plugins/EditTablePlugin.pm,v
retrieving revision 1.1.1.2
retrieving revision 1.1.1.2.4.1
diff -c -r1.1.1.2 -r1.1.1.2.4.1
*** lib/TWiki/Plugins/EditTablePlugin.pm	26 Dec 2004 12:10:35 -0000	1.1.1.2
--- lib/TWiki/Plugins/EditTablePlugin.pm	7 Feb 2005 02:31:09 -0000	1.1.1.2.4.1
***************
*** 126,147 ****
  
      &TWiki::Func::writeDebug( "- EditTablePlugin::commonTagsHandler( $_[2].$_[1] )" ) if $debug;
  
-     # Add style sheet for date calendar to skin if needed.
-     # Handling of the common tags is done separately for the topic text and view skin
-     # The following if statement must be done before the early escape.
-     #
-     # NOTE:
-     # When adding a new button to the table that needs the table to be in the edit mode,
-     # be sure to add it below.
-     if( ( $_[0] =~ m/^[<][!]DOCTYPE/ ) &&
-         ( $query->param( 'etedit' ) || $query->param( 'etaddrow' ) || $query->param( 'etdelrow') ) &&
-         (!($_[0] =~ m/calendar-system/) ) ) {
- 
-         my $string = " <link type=\"text/css\" rel=\"stylesheet\""
-                    . " href=\"%PUBURL%/$installWeb/EditTablePlugin/calendar-system.css\" />\n";
-         $_[0] =~ s/([<]\/head[>])/$string$1/i;
-     }
- 
      return unless $_[0] =~ /%EDIT(TABLE|CELL){(.*)}%/os;
  
      unless( $prefsInitialized ) {
--- 126,131 ----
***************
*** 151,162 ****
                      &TWiki::Func::getPreferencesValue("EDITTABLEPLUGIN_QUIETSAVE") || "on";
          $prefEDITBUTTON           = &TWiki::Func::getPreferencesValue("EDITBUTTON") ||
                      &TWiki::Func::getPreferencesValue("EDITTABLEPLUGIN_EDITBUTTON") || "Edit table";
!         $prefJSCALENDARDATEFORMAT = &TWiki::Func::getPreferencesValue("JSCALENDARDATEFORMAT") ||
!                     &TWiki::Func::getPreferencesValue("EDITTABLEPLUGIN_JSCALENDARDATEFORMAT") || "%Y/%m/%d";
!         $prefJSCALENDARLANGUAGE   = &TWiki::Func::getPreferencesValue("JSCALENDARLANGUAGE") ||
!                     &TWiki::Func::getPreferencesValue("EDITTABLEPLUGIN_JSCALENDARLANGUAGE") || "en";
!         $prefJSCALENDAROPTIONS    = &TWiki::Func::getPreferencesValue("JSCALENDAROPTIONS") ||
!                     &TWiki::Func::getPreferencesValue("EDITTABLEPLUGIN_JSCALENDAROPTIONS") || "";
          $prefsInitialized = 1;
      }
  
--- 135,143 ----
                      &TWiki::Func::getPreferencesValue("EDITTABLEPLUGIN_QUIETSAVE") || "on";
          $prefEDITBUTTON           = &TWiki::Func::getPreferencesValue("EDITBUTTON") ||
                      &TWiki::Func::getPreferencesValue("EDITTABLEPLUGIN_EDITBUTTON") || "Edit table";
!         $prefJSCALENDARDATEFORMAT = &TWiki::Func::getPreferencesValue("JSCALENDARDATEFORMAT") || "%d %b %Y";
!         $prefJSCALENDARLANGUAGE   = &TWiki::Func::getPreferencesValue("JSCALENDARLANGUAGE") || "en";
!         $prefJSCALENDAROPTIONS    = &TWiki::Func::getPreferencesValue("JSCALENDAROPTIONS") || "";
          $prefsInitialized = 1;
      }
  
***************
*** 401,411 ****
                  . "\#edittable$theTableNr";
      my $text = "";
      if( $doEdit ) {
!         my $dir = "%PUBURL%/$installWeb/EditTablePlugin";
!         $text .= "$preSp<script type=\"text/javascript\" src=\"$dir/calendar.js\"></script>\n";
!         $text .= "$preSp<script type=\"text/javascript\" src=\"$dir/calendar-"
!                . "$prefJSCALENDARLANGUAGE.js\"></script>\n";
!         $text .= "$preSp<script type=\"text/javascript\" src=\"$dir/calendar-setup.js\"></script>\n";
      }
      $text .= "$preSp<noautolink>\n" if $doEdit;
      $text .= "$preSp<a name=\"edittable$theTableNr\"></a>\n";
--- 382,393 ----
                  . "\#edittable$theTableNr";
      my $text = "";
      if( $doEdit ) {
!       my $dir = "$TWiki::urlHost$TWiki::pubUrlPath/$TWiki::twikiWebname/JSCalendarContrib";
!       my $text = "<link rel=\"stylesheet\" type=\"text/css\" media=\"all\" href=\"$dir/calendar-blue.css\" />\n";
!       $text .= "<script type=\"text/javascript\" src=\"$dir/calendar.js\"></script>\n";
!       $text .= "<script type=\"text/javascript\" src=\"$dir/lang/calendar-"
!        . "$prefJSCALENDARLANGUAGE.js\"></script>\n";
!       $text .= "<script type=\"text/javascript\" src=\"$dir/calendar-setup.js\"></script>\n";
      }
      $text .= "$preSp<noautolink>\n" if $doEdit;
      $text .= "$preSp<a name=\"edittable$theTableNr\"></a>\n";