Fix time offseting for time zone/daylight saving when using UTC/Local switch

This SHOULD now work with and TZ offset we want to apply, but is only set up for the user options at present

3 files changed, 10 insertions, 10 deletions

diff --git a/templates/calendar.tpl b/templates/calendar.tpl
index f932e23..31283bb 100644
--- a/templates/calendar.tpl
+++ b/templates/calendar.tpl
@@ -1,4 +1,4 @@
-{* $Header: /cvsroot/bitweaver/_bit_calendar/templates/calendar.tpl,v 1.25 2005/08/25 06:58:48 squareing Exp $ *}
+{* $Header: /cvsroot/bitweaver/_bit_calendar/templates/calendar.tpl,v 1.26 2005/08/28 08:27:06 lsces Exp $ *}
 {strip}
 
 {if !$gBitSystem->isFeatureActive( 'feature_helppopup' )}
@@ -19,7 +19,7 @@
 		{include file="bitpackage:calendar/calendar_nav_inc.tpl"}
 
 		<table class="data caltable {$smarty.session.calendar.view_mode}">
-			<caption>{tr}Selection: {$navigation.focus_date|bit_long_date}{/tr}</caption>
+			<caption>{tr}Selection: {$navigation.focus_date|cal_date_format:"%A %d of %B, %Y %Z"}{/tr}</caption>
 			{if $smarty.session.calendar.view_mode eq 'day'}
 				<tr>
 					<th style="width:5%;">{tr}Time{/tr}</th>
@@ -27,12 +27,12 @@
 				</tr>
 				{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:"%H:%M"}</td>
+						<td style="text-align:right; vertical-align:top; padding-right:15px;">{$t.time|cal_date_format:"%H:%M"}</td>
 						<td>
 							{foreach from=$t.items item=item}
 								{assign var=over value=$item.over}
 								<div class="cal cal{$item.content_type_guid}">
-									{$item.last_modified|date_format:"%H:%M"}: &nbsp;
+									{$item.last_modified|cal_date_format:"%H:%M"}: &nbsp;
 									<a href="{$smarty.const.BIT_ROOT_URL}index.php?content_id={$item.content_id}" {popup fullhtml="1" sticky="1" timeout="2500" text=$over|escape:"javascript"|escape:"html"}>
 										 {$item.title|default:"..."}
 									</a>
@@ -54,7 +54,7 @@
 						<th><a href="{$smarty.const.CALENDAR_PKG_URL}index.php?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|date_format:"%m" eq $navigation.focus_month}
+								{if $day.day|cal_date_format:"%m" eq $navigation.focus_month}
 									{cycle values="odd,even" print=false advance=false}
 								{else}
 									{cycle values="notmonth" print=false advance=false}
@@ -64,9 +64,9 @@
 							{/if}
 
 							<td class="calday {if $day.day eq $navigation.server_focus_date}current{/if} {cycle}" style="vertical-align:top;">
-								{if $day.day|date_format:"%m" eq $navigation.focus_month or $smarty.session.calendar.view_mode eq "week"}
+								{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|date_format:"%d"}</a>
+										<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>
 									</div>
 
 									{* - Cell Content - *}
diff --git a/templates/calendar_box.tpl b/templates/calendar_box.tpl
index 72215e6..81206f6 100644
--- a/templates/calendar_box.tpl
+++ b/templates/calendar_box.tpl
@@ -4,9 +4,9 @@
 		{tr}Content Type{/tr}: {$cellHash.content_description}
 		<small>
 			<br />
-			{tr}First created by {displayname login=$cellHash.creator_user real_name=$cellHash.creator_real_name}<br /> on {$cellHash.created|date_format:"%Y-%m-%d - %H:%M"}{/tr}
+			{tr}First created by {displayname login=$cellHash.creator_user real_name=$cellHash.creator_real_name}<br /> on {$cellHash.created|cal_date_format:"%Y-%m-%d - %H:%M %Z"}{/tr}
 			<br />
-			{tr}Last modified by {displayname login=$cellHash.modifier_user real_name=$cellHash.modifier_real_name}<br /> on {$cellHash.last_modified|date_format:"%Y-%m-%d - %H:%M"}{/tr}
+			{tr}Last modified by {displayname login=$cellHash.modifier_user real_name=$cellHash.modifier_real_name}<br /> on {$cellHash.last_modified|cal_date_format:"%Y-%m-%d - %H:%M %Z"}{/tr}
 		</small>
 	</div>
 </div>
diff --git a/templates/calendar_nav_inc.tpl b/templates/calendar_nav_inc.tpl
index 0b661be..77e0909 100644
--- a/templates/calendar_nav_inc.tpl
+++ b/templates/calendar_nav_inc.tpl
@@ -3,7 +3,7 @@
 		<tr>
 			<td>
 				<form action="{$gBitLoc.CALENDAR_PKG_URL}index.php" method="get" id="f">
-					<input type="hidden" id="todate" name="todate" value="{$focus_date|date_format:"%B %e, %Y %H:%M"}" />
+					<input type="hidden" id="todate" name="todate" value="{$focus_date|cal_date_format:"%B %e, %Y %H:%M %Z"}" />
 					<span title="{tr}Date Selector{/tr}" id="datrigger">{$focus_date|bit_long_date}</span>
 					&lt;- {tr}click to navigate{/tr}
 				</form>