From: <var...@us...> - 2015-04-01 13:52:56
|
Revision: 9637 http://sourceforge.net/p/phpwiki/code/9637 Author: vargenau Date: 2015-04-01 13:52:48 +0000 (Wed, 01 Apr 2015) Log Message: ----------- Move jscalendar from Sidebar to blog theme Modified Paths: -------------- trunk/themes/blog/themeinfo.php Added Paths: ----------- trunk/themes/blog/jscalendar/ trunk/themes/blog/templates/calendar.tmpl Removed Paths: ------------- trunk/themes/Sidebar/jscalendar/ trunk/themes/Sidebar/templates/calendar.tmpl Deleted: trunk/themes/Sidebar/templates/calendar.tmpl =================================================================== --- trunk/themes/Sidebar/templates/calendar.tmpl 2015-04-01 13:44:45 UTC (rev 9636) +++ trunk/themes/Sidebar/templates/calendar.tmpl 2015-04-01 13:52:48 UTC (rev 9637) @@ -1,13 +0,0 @@ -<div id="calendar"></div> -<?php echo JavaScript(' -function dateChanged(calendar) { - if (calendar.dateClicked) { - var y = calendar.date.getFullYear(); - var m = calendar.date.getMonth() + 1; // integer, 0..11 - var d = calendar.date.getDate(); // integer, 1..31 - m = m < 10 ? "0" + m : m; - d = d < 10 ? "0" + d : d; - window.location = "' . WikiUrl($WikiTheme->calendarBase(),0,1) . '/' . '" + y + "-" + m + "-" + d; - } -}; -Calendar.setup({flat : "calendar", flatCallback : dateChanged, setDateStatusFunc : dateStatusFunc, weekNumbers : false})') ?> Copied: trunk/themes/blog/templates/calendar.tmpl (from rev 9635, trunk/themes/Sidebar/templates/calendar.tmpl) =================================================================== --- trunk/themes/blog/templates/calendar.tmpl (rev 0) +++ trunk/themes/blog/templates/calendar.tmpl 2015-04-01 13:52:48 UTC (rev 9637) @@ -0,0 +1,13 @@ +<div id="calendar"></div> +<?php echo JavaScript(' +function dateChanged(calendar) { + if (calendar.dateClicked) { + var y = calendar.date.getFullYear(); + var m = calendar.date.getMonth() + 1; // integer, 0..11 + var d = calendar.date.getDate(); // integer, 1..31 + m = m < 10 ? "0" + m : m; + d = d < 10 ? "0" + d : d; + window.location = "' . WikiUrl($WikiTheme->calendarBase(),0,1) . '/' . '" + y + "-" + m + "-" + d; + } +}; +Calendar.setup({flat : "calendar", flatCallback : dateChanged, setDateStatusFunc : dateStatusFunc, weekNumbers : false})') ?> Modified: trunk/themes/blog/themeinfo.php =================================================================== --- trunk/themes/blog/themeinfo.php 2015-04-01 13:44:45 UTC (rev 9636) +++ trunk/themes/blog/themeinfo.php 2015-04-01 13:52:48 UTC (rev 9637) @@ -42,16 +42,6 @@ $this->calendarInit(); } - /* overload to load from Sidebar */ - function _findFile($file, $missing_okay = false) - { - if (file_exists($this->_path . "themes/" . $this->_name . "/$file")) - return "themes/" . $this->_name . "/$file"; - if (file_exists($this->_path . "themes/Sidebar/$file")) - return "themes/Sidebar/$file"; - return parent::_findFile($file, $missing_okay); - } - /* Display up/down button with persistent state */ /* persistent state per block in cookie for 30 days */ function folderArrow($id, $init = 'Open') This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |