move day building section to Calendar class, move navigation to a hash, introduce time offset depending on user location

2 files changed, 16 insertions, 16 deletions

diff --git a/templates/calendar.tpl b/templates/calendar.tpl
index eeb0e66..8fc1205 100644
--- a/templates/calendar.tpl
+++ b/templates/calendar.tpl
@@ -1,4 +1,4 @@
-{* $Header: /cvsroot/bitweaver/_bit_calendar/templates/calendar.tpl,v 1.17 2005/08/21 09:54:50 squareing Exp $ *}
+{* $Header: /cvsroot/bitweaver/_bit_calendar/templates/calendar.tpl,v 1.18 2005/08/21 11:16:26 squareing Exp $ *}
 {strip}
 
 {if !$gBitSystem->isFeatureActive( 'feature_helppopup' )}
@@ -19,13 +19,13 @@
 		{include file="bitpackage:calendar/calendar_nav_inc.tpl"}
 
 		<table class="data {$smarty.session.calendar.view_mode}">
-			<caption>{tr}Selection: {$focus_date|bit_long_date}{/tr}</caption>
+			<caption>{tr}Selection: {$navigation.focus_date|bit_long_date}{/tr}</caption>
 			{if $smarty.session.calendar.view_mode eq 'day'}
 				<tr>
 					<th style="width:15%;">{tr}Time{/tr}</th>
 					<th>{tr}Events{/tr}</th>
 				</tr>
-				{foreach item=t from=$dayTime}
+				{foreach item=t from=$calDay}
 					<tr class="{cycle values="odd,even"}">
 						<td style="text-align:right; vertical-align:top; padding-right:15px;">{$t.time|date_format:"%R"}</td>
 						<td>
@@ -49,12 +49,12 @@
 					{/foreach}
 				</tr>
 
-				{foreach from=$calendar key=week_num item=week}
+				{foreach from=$calMonth key=week_num item=week}
 					<tr style="height:6em;">
 						<th>{$week_num}</th>
 						{foreach from=$week item=day}
 							{if $smarty.session.calendar.view_mode eq "month"}
-								{if $day.day|date_format:"%m" eq $focusmonth}
+								{if $day.day|date_format:"%m" eq $navigation.focus_month}
 									{cycle values="odd,even" print=false advance=false}
 								{else}
 									{cycle values="notmonth" print=false advance=false}
@@ -64,10 +64,10 @@
 							{/if}
 
 							<td class="calday {cycle}" style="vertical-align:top;">
-								{if $day.day|date_format:"%m" eq $focusmonth or $smarty.session.calendar.view_mode eq "week"}
-									{if $day.day eq $focus_date}<strong>{/if}
+								{if $day.day|date_format:"%m" eq $navigation.focus_month or $smarty.session.calendar.view_mode eq "week"}
+									{if $day.day eq $navigation.focus_date}<strong>{/if}
 									<a href="{$gBitLoc.CALENDAR_PKG_URL}index.php?todate={$day.day}&amp;{$url_string}">{$day.day|date_format:"%d"}</a>
-									{if $day.day eq $focus_date}</strong>{/if}
+									{if $day.day eq $navigation.focus_date}</strong>{/if}
 									<hr />
 
 									{* - Calendar Content - *}
diff --git a/templates/calendar_nav_inc.tpl b/templates/calendar_nav_inc.tpl
index 1a73cbd..03fd4f8 100644
--- a/templates/calendar_nav_inc.tpl
+++ b/templates/calendar_nav_inc.tpl
@@ -36,10 +36,10 @@
 	<table>
 		<tr>
 			<td rowspan="2" style="text-align:left;">
-				<a href="{$gBitLoc.CALENDAR_PKG_URL}index.php?todate={$daybefore}&amp;{$url_string}" title="{$daybefore|bit_long_date}">&laquo; {tr}day{/tr}</a><br />
-				<a href="{$gBitLoc.CALENDAR_PKG_URL}index.php?todate={$weekbefore}&amp;{$url_string}" title="{$weekbefore|bit_long_date}">&laquo; {tr}week{/tr}</a><br />
-				<a href="{$gBitLoc.CALENDAR_PKG_URL}index.php?todate={$monthbefore}&amp;{$url_string}" title="{$monthbefore|bit_long_date}">&laquo; {tr}month{/tr}</a><br />
-				<a href="{$gBitLoc.CALENDAR_PKG_URL}index.php?todate={$yearbefore}&amp;{$url_string}" title="{$yearbefore|bit_long_date}">&laquo; {tr}year{/tr}</a>
+				<a href="{$gBitLoc.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="{$gBitLoc.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="{$gBitLoc.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="{$gBitLoc.CALENDAR_PKG_URL}index.php?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;">
@@ -47,10 +47,10 @@
 			</td>
 
 			<td rowspan="2" style="text-align:right;">
-				<a href="{$gBitLoc.CALENDAR_PKG_URL}index.php?todate={$dayafter}&amp;{$url_string}" title="{$dayafter|bit_long_date}">{tr}day{/tr} &raquo;</a><br />
-				<a href="{$gBitLoc.CALENDAR_PKG_URL}index.php?todate={$weekafter}&amp;{$url_string}" title="{$weekafter|bit_long_date}">{tr}week{/tr} &raquo;</a><br />
-				<a href="{$gBitLoc.CALENDAR_PKG_URL}index.php?todate={$monthafter}&amp;{$url_string}" title="{$monthafter|bit_long_date}">{tr}month{/tr} &raquo;</a><br />
-				<a href="{$gBitLoc.CALENDAR_PKG_URL}index.php?todate={$yearafter}&amp;{$url_string}" title="{$yearafter|bit_long_date}">{tr}year{/tr} &raquo;</a>
+				<a href="{$gBitLoc.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="{$gBitLoc.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="{$gBitLoc.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="{$gBitLoc.CALENDAR_PKG_URL}index.php?todate={$navigation.after.year}&amp;{$url_string}" title="{$navigation.after.year|bit_long_date}">{tr}year{/tr} &raquo;</a>
 			</td>
 		</tr>