Make it possible for packages (like events) to keep control of calendar urls.

5 files changed, 36 insertions, 28 deletions

diff --git a/Calendar.php b/Calendar.php
index 4b59fab..ea3d059 100644
--- a/Calendar.php
+++ b/Calendar.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version $Header: /cvsroot/bitweaver/_bit_calendar/Calendar.php,v 1.44 2008/01/13 22:28:36 nickpalmer Exp $
+ * @version $Header: /cvsroot/bitweaver/_bit_calendar/Calendar.php,v 1.45 2008/02/10 12:18:52 nickpalmer Exp $
  * @package calendar
  * 
  * @copyright Copyright (c) 2004-2006, bitweaver.org
@@ -14,6 +14,7 @@
 include_once( KERNEL_PKG_PATH . 'BitDate.php' );
 // set week offset - start with a day other than monday
 define( 'WEEK_OFFSET', !empty( $gBitUser->mUserPrefs['calendar_week_offset'] ) ? $gBitUser->mUserPrefs['calendar_week_offset'] : $gBitSystem->getConfig( 'calendar_week_offset', 0 ) );
+
 /**
  * @package calendar
  */
@@ -442,11 +443,18 @@ class Calendar extends LibertyContent {
 	}
 
 	// Display the actual calendar doing any other work required for the template
-	function display($pTitle, $pShowContentOptions = TRUE) {
-		global $gBitSystem;
+	function display($pTitle, $pShowContentOptions = TRUE, $pBaseUrl=NULL) {
+		global $gBitSystem, $gBitSmarty;
 
 		$this->setupCalendar($pShowContentOptions);
 
+		// A default base for the calendar
+		if( empty($pBaseUrl) ){
+			$pBaseUrl = CALENDAR_PKG_URL.'index.php';
+		}
+		// Asssign it so templates see it.
+		$gBitSmarty->assign('baseCalendarUrl', $pBaseUrl);
+
 		$gBitSystem->display( 'bitpackage:calendar/calendar.tpl', $pTitle );
 
 	}
diff --git a/modules/mod_minical.php b/modules/mod_minical.php
index bb57f50..91288d2 100644
--- a/modules/mod_minical.php
+++ b/modules/mod_minical.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version $Header: /cvsroot/bitweaver/_bit_calendar/modules/mod_minical.php,v 1.3 2007/11/18 12:00:25 lsces Exp $
+ * @version $Header: /cvsroot/bitweaver/_bit_calendar/modules/mod_minical.php,v 1.4 2008/02/10 12:18:52 nickpalmer Exp $
  * @package calendar
  * @subpackage modules
  */
@@ -12,5 +12,5 @@ global $gBitSmarty;
 
 // Make sure we know how to do the data_calendar
 require_once(LIBERTY_PKG_PATH.'plugins/data.calendar.php');
-$gBitSmarty->assign( 'mini_cal',data_calendar( '', '' ) );
+$gBitSmarty->assign( 'mini_cal',data_calendar( '', empty($moduleParams['module_params']) ? NULL : $moduleParams['module_params'] ) );
 ?>
\ No newline at end of file
diff --git a/templates/calendar.tpl b/templates/calendar.tpl
index 4b3a3d5..1953c67 100644
--- a/templates/calendar.tpl
+++ b/templates/calendar.tpl
@@ -1,4 +1,4 @@
-{* $Header: /cvsroot/bitweaver/_bit_calendar/templates/calendar.tpl,v 1.49 2007/09/30 18:53:58 nickpalmer Exp $ *}
+{* $Header: /cvsroot/bitweaver/_bit_calendar/templates/calendar.tpl,v 1.50 2008/02/10 12:18:52 nickpalmer Exp $ *}
 {strip}
 {if !$gBitSystem->isFeatureActive( 'site_help_popup' )}
 	{popup_init src="`$smarty.const.UTIL_PKG_URL`javascript/libs/overlib.js"}
@@ -44,7 +44,7 @@
 							{foreach from=$week item=day}
 								<tr>
 									<th style="width:10%">
-										<a href="{$smarty.const.CALENDAR_PKG_URL}index.php?view_mode=day&amp;todate={$day.day}&amp;{$url_string}">
+										<a href="{$baseCalendarUrl}?view_mode=day&amp;todate={$day.day}&amp;{$url_string}">
 											{$dayNames.$weekday} - {$day.day|cal_date_format:"%d"}
 										</a>
 										{counter assign=weekday print=false}
@@ -79,7 +79,7 @@
 
 						{foreach from=$calMonth key=week_num item=week}
 							<tr>
-								<th><a href="{$smarty.const.CALENDAR_PKG_URL}index.php?view_mode=week&amp;todate={$week.6.day}">{$week_num}</a></th>
+								<th><a href="{$baseCalendarUrl}?view_mode=week&amp;todate={$week.6.day}">{$week_num}</a></th>
 								{foreach from=$week item=day}
 									{if $smarty.session.calendar.view_mode eq "month"}
 										{if $day.day|cal_date_format:"%m" eq $navigation.focus_month}
@@ -94,7 +94,7 @@
 									<td class="calitems {if $day.day eq $navigation.display_focus_date} current{/if}{if $day.day eq $navigation.today} highlight{/if} {cycle values="odd,even"}">
 										{if $day.day|cal_date_format:"%m" eq $navigation.focus_month or $smarty.session.calendar.view_mode eq "week"}
 											<div class="calnumber">
-												<a href="{$smarty.const.CALENDAR_PKG_URL}index.php?view_mode=day&amp;todate={$day.day}&amp;{$url_string}">{$day.day|cal_date_format:"%d"}</a>
+												<a href="{$baseCalendarUrl}?view_mode=day&amp;todate={$day.day}&amp;{$url_string}">{$day.day|cal_date_format:"%d"}</a>
 											</div>
 
 											{* - Cell Content - *}
diff --git a/templates/calendar_nav_inc.tpl b/templates/calendar_nav_inc.tpl
index 3aed2b2..d6604e9 100644
--- a/templates/calendar_nav_inc.tpl
+++ b/templates/calendar_nav_inc.tpl
@@ -39,10 +39,10 @@
 				{jscalendar inputField=todate time=$navigation.focus_date onUpdate=gotocal displayArea=datrigger daFormat=$gBitSystem->getConfig('site_long_date_format')}
 			</td>
 			<td style="white-space:nowrap; width:140px; text-align:right;">
-				<a href="{$smarty.const.CALENDAR_PKG_URL}index.php?view_mode=day&amp;{$url_string}" class="{if $smarty.session.calendar.view_mode eq 'day'}highlight{/if}">{biticon ipackage=calendar iname=day iexplain=Day}</a>
-				<a href="{$smarty.const.CALENDAR_PKG_URL}index.php?view_mode=week&amp;{$url_string}" class="{if $smarty.session.calendar.view_mode eq 'week'}highlight{/if}">{biticon ipackage=calendar iname=week iexplain=Week}</a>
-				<a href="{$smarty.const.CALENDAR_PKG_URL}index.php?view_mode=weeklist&amp;{$url_string}" class="{if $smarty.session.calendar.view_mode eq 'weeklist'}highlight{/if}">{biticon ipackage=calendar iname=weeklist iexplain=Weeklist}</a>
-				<a href="{$smarty.const.CALENDAR_PKG_URL}index.php?view_mode=month&amp;{$url_string}" class="{if $smarty.session.calendar.view_mode eq 'month'}highlight{/if}">{biticon ipackage=calendar iname=month iexplain=Month}</a>
+				<a href="{$baseCalendarUrl}?view_mode=day&amp;{$url_string}" class="{if $smarty.session.calendar.view_mode eq 'day'}highlight{/if}">{biticon ipackage=calendar iname=day iexplain=Day}</a>
+				<a href="{$baseCalendarUrl}?view_mode=week&amp;{$url_string}" class="{if $smarty.session.calendar.view_mode eq 'week'}highlight{/if}">{biticon ipackage=calendar iname=week iexplain=Week}</a>
+				<a href="{$baseCalendarUrl}?view_mode=weeklist&amp;{$url_string}" class="{if $smarty.session.calendar.view_mode eq 'weeklist'}highlight{/if}">{biticon ipackage=calendar iname=weeklist iexplain=Weeklist}</a>
+				<a href="{$baseCalendarUrl}?view_mode=month&amp;{$url_string}" class="{if $smarty.session.calendar.view_mode eq 'month'}highlight{/if}">{biticon ipackage=calendar iname=month iexplain=Month}</a>
 			</td>
 		</tr>
 	</table>
@@ -50,30 +50,30 @@
 	<table>
 		<tr>
 			<td rowspan="2" style="text-align:left;">
-				<a href="{$smarty.const.CALENDAR_PKG_URL}index.php?todate={$navigation.before.day}&amp;{$url_string}" title="{$navigation.before.day|bit_long_date}">&laquo; {tr}day{/tr}</a><br />
-				<a href="{$smarty.const.CALENDAR_PKG_URL}index.php?todate={$navigation.before.week}&amp;{$url_string}" title="{$navigation.before.week|bit_long_date}">&laquo; {tr}week{/tr}</a><br />
-				<a href="{$smarty.const.CALENDAR_PKG_URL}index.php?todate={$navigation.before.month}&amp;{$url_string}" title="{$navigation.before.month|bit_long_date}">&laquo; {tr}month{/tr}</a><br />
-				<a href="{$smarty.const.CALENDAR_PKG_URL}index.php?todate={$navigation.before.year}&amp;{$url_string}" title="{$navigation.before.year|bit_long_date}">&laquo; {tr}year{/tr}</a>
+				<a href="{$baseCalendarUrl}?todate={$navigation.before.day}&amp;{$url_string}" title="{$navigation.before.day|bit_long_date}">&laquo; {tr}day{/tr}</a><br />
+				<a href="{$baseCalendarUrl}?todate={$navigation.before.week}&amp;{$url_string}" title="{$navigation.before.week|bit_long_date}">&laquo; {tr}week{/tr}</a><br />
+				<a href="{$baseCalendarUrl}?todate={$navigation.before.month}&amp;{$url_string}" title="{$navigation.before.month|bit_long_date}">&laquo; {tr}month{/tr}</a><br />
+				<a href="{$baseCalendarUrl}?todate={$navigation.before.year}&amp;{$url_string}" title="{$navigation.before.year|bit_long_date}">&laquo; {tr}year{/tr}</a>
 			</td>
 
 			<td style="text-align:center;">
-				<a href="{$smarty.const.CALENDAR_PKG_URL}index.php?todate={$smarty.now}&amp;{$url_string}" title="{$navigation.today|bit_long_date}">{tr}Today{/tr}: <strong>{$navigation.today|bit_long_date} {$navigation.tz_flag}</strong></a>
+				<a href="{$baseCalendarUrl}?todate={$smarty.now}&amp;{$url_string}" title="{$navigation.today|bit_long_date}">{tr}Today{/tr}: <strong>{$navigation.today|bit_long_date} {$navigation.tz_flag}</strong></a>
 			</td>
 
 			<td rowspan="2" style="text-align:right;">
-				<a href="{$smarty.const.CALENDAR_PKG_URL}index.php?todate={$navigation.after.day}&amp;{$url_string}" title="{$navigation.after.day|bit_long_date}">{tr}day{/tr} &raquo;</a><br />
-				<a href="{$smarty.const.CALENDAR_PKG_URL}index.php?todate={$navigation.after.week}&amp;{$url_string}" title="{$navigation.after.week|bit_long_date}">{tr}week{/tr} &raquo;</a><br />
-				<a href="{$smarty.const.CALENDAR_PKG_URL}index.php?todate={$navigation.after.month}&amp;{$url_string}" title="{$navigation.after.month|bit_long_date}">{tr}month{/tr} &raquo;</a><br />
-				<a href="{$smarty.const.CALENDAR_PKG_URL}index.php?todate={$navigation.after.year}&amp;{$url_string}" title="{$navigation.after.year|bit_long_date}">{tr}year{/tr} &raquo;</a>
+				<a href="{$baseCalendarUrl}?todate={$navigation.after.day}&amp;{$url_string}" title="{$navigation.after.day|bit_long_date}">{tr}day{/tr} &raquo;</a><br />
+				<a href="{$baseCalendarUrl}?todate={$navigation.after.week}&amp;{$url_string}" title="{$navigation.after.week|bit_long_date}">{tr}week{/tr} &raquo;</a><br />
+				<a href="{$baseCalendarUrl}?todate={$navigation.after.month}&amp;{$url_string}" title="{$navigation.after.month|bit_long_date}">{tr}month{/tr} &raquo;</a><br />
+				<a href="{$baseCalendarUrl}?todate={$navigation.after.year}&amp;{$url_string}" title="{$navigation.after.year|bit_long_date}">{tr}year{/tr} &raquo;</a>
 			</td>
 		</tr>
 
 		<tr>
 			<td style="text-align:center;">
-				<a href="{$smarty.const.CALENDAR_PKG_URL}index.php?view_mode=day&amp;{$url_string}" class="{if $smarty.session.calendar.view_mode eq 'day'}highlight{/if}">{biticon ipackage=calendar iname=day iexplain=Day}</a>
-				<a href="{$smarty.const.CALENDAR_PKG_URL}index.php?view_mode=week&amp;{$url_string}" class="{if $smarty.session.calendar.view_mode eq 'week'}highlight{/if}">{biticon ipackage=calendar iname=week iexplain=Week}</a>
-				<a href="{$smarty.const.CALENDAR_PKG_URL}index.php?view_mode=weeklist&amp;{$url_string}" class="{if $smarty.session.calendar.view_mode eq 'weeklist'}highlight{/if}">{biticon ipackage=calendar iname=weeklist iexplain=Weeklist}</a>
-				<a href="{$smarty.const.CALENDAR_PKG_URL}index.php?view_mode=month&amp;{$url_string}" class="{if $smarty.session.calendar.view_mode eq 'month'}highlight{/if}">{biticon ipackage=calendar iname=month iexplain=Month}</a>
+				<a href="{$baseCalendarUrl}?view_mode=day&amp;{$url_string}" class="{if $smarty.session.calendar.view_mode eq 'day'}highlight{/if}">{biticon ipackage=calendar iname=day iexplain=Day}</a>
+				<a href="{$baseCalendarUrl}?view_mode=week&amp;{$url_string}" class="{if $smarty.session.calendar.view_mode eq 'week'}highlight{/if}">{biticon ipackage=calendar iname=week iexplain=Week}</a>
+				<a href="{$baseCalendarUrl}?view_mode=weeklist&amp;{$url_string}" class="{if $smarty.session.calendar.view_mode eq 'weeklist'}highlight{/if}">{biticon ipackage=calendar iname=weeklist iexplain=Weeklist}</a>
+				<a href="{$baseCalendarUrl}?view_mode=month&amp;{$url_string}" class="{if $smarty.session.calendar.view_mode eq 'month'}highlight{/if}">{biticon ipackage=calendar iname=month iexplain=Month}</a>
 			</td>
 		</tr>
 	</table>
diff --git a/templates/minical.tpl b/templates/minical.tpl
index 4b40f4c..e5f6bcb 100644
--- a/templates/minical.tpl
+++ b/templates/minical.tpl
@@ -1,6 +1,6 @@
 {strip}
-{assign var=calendar_url value="`$smarty.const.CALENDAR_PKG_URL`index.php?todate="}
-{assign var=calendar_day_url value="`$smarty.const.CALENDAR_PKG_URL`index.php?view_mode=day&amp;todate="}
+{assign var=calendar_url value="`$baseCalendarUrl`?todate="}
+{assign var=calendar_day_url value="`$baseCalendarUrl`?view_mode=day&amp;todate="}
 <table class="minical" border="0" cellpadding="1" cellspacing="1">
 	<tr>
 		<th class="month odd" colspan="7">