From: Reini U. <ru...@us...> - 2005-08-06 13:26:37
|
Update of /cvsroot/phpwiki/phpwiki/themes/Sidebar In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23263 Modified Files: themeinfo.php Log Message: update to latest jscalendar Index: themeinfo.php =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/themes/Sidebar/themeinfo.php,v retrieving revision 1.23 retrieving revision 1.24 diff -u -2 -b -p -d -r1.23 -r1.24 --- themeinfo.php 4 Feb 2005 13:25:07 -0000 1.23 +++ themeinfo.php 6 Aug 2005 13:26:25 -0000 1.24 @@ -15,20 +15,7 @@ class Theme_Sidebar extends Theme { function Theme_Sidebar ($theme_name='Sidebar') { - $this->_name = $theme_name; - $this->_themes_dir = NormalizeLocalFileName("themes"); - $this->_path = defined('PHPWIKI_DIR') ? NormalizeLocalFileName("") : ""; - $this->_theme = "themes/$theme_name"; - if (ENABLE_DOUBLECLICKEDIT) // by pixels - $this->initDoubleClickEdit(); - - if ($theme_name != 'default') - $this->_default_theme = new Theme; - $this->_css = array(); - - $this->calendarInit(); + parent::Theme($theme_name); - if (defined("ENABLE_LIVESEARCH") and ENABLE_LIVESEARCH) { // by bitflux.ch - $this->initLiveSearch(); - } + $this->calendarInit(true); } @@ -62,8 +49,8 @@ class Theme_Sidebar extends Theme { } - function calendarInit() { + function calendarInit($force = false) { $dbi = $GLOBALS['request']->getDbh(); - // display flat calender dhtml under the clock - if ($dbi->isWikiPage($this->calendarBase())) { + // display flat calender dhtml in the sidebar + if ($force or $dbi->isWikiPage($this->calendarBase())) { $jslang = @$GLOBALS['LANG']; $this->addMoreHeaders @@ -71,21 +58,18 @@ class Theme_Sidebar extends Theme { $this->_CSSlink(0, $this->_findFile('jscalendar/calendar-phpwiki.css'), 'all')); - $this->addMoreHeaders("\n"); $this->addMoreHeaders (JavaScript('', - array('src' => $this->_findData('jscalendar/calendar_stripped.js')))); - $this->addMoreHeaders("\n"); + array('src' => $this->_findData('jscalendar/calendar'.(DEBUG?'':'_stripped').'.js')))); if (!($langfile = $this->_findData("jscalendar/lang/calendar-$jslang.js"))) $langfile = $this->_findData("jscalendar/lang/calendar-en.js"); $this->addMoreHeaders(JavaScript('',array('src' => $langfile))); - $this->addMoreHeaders("\n"); $this->addMoreHeaders (JavaScript('', array('src' => - $this->_findData('jscalendar/calendar-setup_stripped.js')))); - $this->addMoreHeaders("\n"); + $this->_findData('jscalendar/calendar-setup'.(DEBUG?'':'_stripped').'.js')))); + + // Get existing date entries for the current user require_once("lib/TextSearchQuery.php"); - // get existing date entries for the current user: - $iter = $dbi->titleSearch(new TextSearchQuery("^".$this->calendarBase().SUBPAGE_SEPARATOR, true)); + $iter = $dbi->titleSearch(new TextSearchQuery("^".$this->calendarBase().SUBPAGE_SEPARATOR, true, "auto")); $existing = array(); while ($page = $iter->next()) { @@ -93,11 +77,12 @@ class Theme_Sidebar extends Theme { $existing[] = basename($page->_pagename); } + if (!empty($existing)) { $js_exist = '{"'.join('":1,"',$existing).'":1}'; //var SPECIAL_DAYS = {"2004-05-11":1,"2004-05-12":1,"2004-06-01":1} $this->addMoreHeaders(JavaScript(' -// this table holds the existing calender entries for the current user +// This table holds the existing calender entries for the current user // calculated from the database var SPECIAL_DAYS = '.$js_exist.'; -// this function returns true if the date exists +// This function returns true if the date exists in SPECIAL_DAYS function dateExists(date, y, m, d) { var year = date.getFullYear(); @@ -110,12 +95,17 @@ function dateExists(date, y, m, d) { else return true; } -// this is the actual date status handler. Note that it receives the -// date object as well as separate values of year, month and date, for -// your confort. -function dateStatusHandler(date, y, m, d) { +// This is the actual date status handler. +// Note that it receives the date object as well as separate +// values of year, month and date. +function dateStatusFunc(date, y, m, d) { if (dateExists(date, y, m, d)) return "existing"; else return false; }')); } + else { + $this->addMoreHeaders(JavaScript(' +function dateStatusFunc(date, y, m, d) { return false;}')); + } + } } } |