*** twiki-beijing-orig/bin/view	Thu Jan 30 00:21:26 2003
--- twiki-beijing/bin/view	Mon Dec 29 14:49:22 2003
***************
*** 1,4 ****
! #!/usr/bin/perl -wT
  #
  # TWiki Collaboration Platform, http://TWiki.org/
  #
--- 1,4 ----
! #!/usr/local/bin/perl -wT
  #
  # TWiki Collaboration Platform, http://TWiki.org/
  #
***************
*** 76,81 ****
--- 76,82 ----
      my $revuser = "";
      my $viewRaw = $query->param( "raw" ) || "";
      my $unlock  = $query->param( "unlock" ) || "";
+     $query->{'jscalendar'} = 0;
      my $skin    = $query->param( "skin" ) || &TWiki::Prefs::getPreferencesValue( "SKIN" );
  
      # Set page generation mode to RSS if using an RSS skin
***************
*** 292,297 ****
--- 293,307 ----
          return;
      }
  
+     if ($query->{'jscalendar'}) {
+       # add header data for jscalendar if used. Use header in jscalendar.tmpl
+       my $jstmpl = &TWiki::Store::readTemplate( "jscalendar", $skin );
+       my $jscalendaroptions = &TWiki::Store::readTemplate( "jscalendaroptions", $skin );
+       $jstmpl = &TWiki::handleCommonTags( $jstmpl, $topic );
+       $tmpl =~ s/%JSCALENDAROPTIONS%/$jscalendaroptions/go;
+       $tmpl =~ s/<\/head>/$jstmpl<\/head>/o;
+     }
+   
      writeDebugTimes( "view - checked access permissions" );
  
      # Write header based on "contenttype" parameter, used to produce