fix module calendar and other minor stuff

2 files changed, 21 insertions, 25 deletions

diff --git a/modules/mod_calendar.php b/modules/mod_calendar.php
index 1e93e0a..a89ca9d 100644
--- a/modules/mod_calendar.php
+++ b/modules/mod_calendar.php
@@ -20,13 +20,13 @@ $calHash = array(
 
 // set up daynames for the calendar
 $dayNames = array(
-	tra( "Mon" ),
-	tra( "Tue" ),
-	tra( "Wed" ),
-	tra( "Thu" ),
-	tra( "Fri" ),
-	tra( "Sat" ),
-	tra( "Sun" ),
+	tra( "Monday" ),
+	tra( "Tuesday" ),
+	tra( "Wednesday" ),
+	tra( "Thursday" ),
+	tra( "Friday" ),
+	tra( "Saturday" ),
+	tra( "Sunday" ),
 );
 
 // depending on what day we want to view first, we need to adjust the dayNames array
diff --git a/modules/mod_calendar.tpl b/modules/mod_calendar.tpl
index 837acd5..0606d37 100644
--- a/modules/mod_calendar.tpl
+++ b/modules/mod_calendar.tpl
@@ -1,49 +1,45 @@
 {bitmodule title="$moduleTitle" name="calendar"}
-	<table>
-		<caption>{$modCalNavigation.focus_date|date_format:"%B"}</caption>
+	<table class="caltable">
+		<caption>{$modCalNavigation.focus_date|date_format:"%B %Y"}</caption>
 		<tr>
 			<td style="text-align:left;">
-				<a href="{$gBitLoc.CALENDAR_PKG_URL}index.php?todate={$navigation.before.month}&amp;{$url_string}" title="{$navigation.before.month|bit_long_date}">&laquo;{tr}m{/tr}</a><br />
+				<a href="{$smarty.server.PHP_SELF}?todate={$modCalNavigation.before.year}&amp;{$url_string}" title="{$modCalNavigation.before.year|bit_long_date}">&laquo;{tr}y{/tr}</a>
 			</td>
 			<td style="text-align:left;">
-				<a href="{$gBitLoc.CALENDAR_PKG_URL}index.php?todate={$navigation.before.year}&amp;{$url_string}" title="{$navigation.before.year|bit_long_date}">&laquo;{tr}y{/tr}</a>
+				<a href="{$smarty.server.PHP_SELF}?todate={$modCalNavigation.before.month}&amp;{$url_string}" title="{$modCalNavigation.before.month|bit_long_date}">&laquo;{tr}m{/tr}</a><br />
 			</td>
 
 			<td colspan="3" style="text-align:center;">
-				<a href="{$gBitLoc.CALENDAR_PKG_URL}index.php?todate={$smarty.now}&amp;{$url_string}" title="{$smarty.now|bit_long_date}">{tr}Today{/tr}</a>
+				<a href="{$smarty.server.PHP_SELF}?todate={$smarty.now}&amp;{$url_string}" title="{$smarty.now|bit_long_date}">{tr}Today{/tr}</a>
 			</td>
 
 			<td style="text-align:right;">
-				<a href="{$gBitLoc.CALENDAR_PKG_URL}index.php?todate={$navigation.after.month}&amp;{$url_string}" title="{$navigation.after.month|bit_long_date}">{tr}m{/tr}&raquo;</a><br />
+				<a href="{$smarty.server.PHP_SELF}?todate={$modCalNavigation.after.month}&amp;{$url_string}" title="{$modCalNavigation.after.month|bit_long_date}">{tr}m{/tr}&raquo;</a><br />
 			</td>
 			<td style="text-align:right;">
-				<a href="{$gBitLoc.CALENDAR_PKG_URL}index.php?todate={$navigation.after.year}&amp;{$url_string}" title="{$navigation.after.year|bit_long_date}">{tr}y{/tr}&raquo;</a>
+				<a href="{$smarty.server.PHP_SELF}?todate={$modCalNavigation.after.year}&amp;{$url_string}" title="{$modCalNavigation.after.year|bit_long_date}">{tr}y{/tr}&raquo;</a>
 			</td>
 		</tr>
 
 		<tr>
 			{foreach from=$dayNames item=name}
-				<th width="14%">{$name}</th>
+				<th width="14%">{$name|truncate:"1":""}</th>
 			{/foreach}
 		</tr>
 
-		{foreach from=$modCalMonth key=week_num item=week}
+		{foreach from=$modCalMonth item=week}
 			<tr>
 				{foreach from=$week item=day}
-					{if $smarty.session.calendar.view_mode eq "month"}
-						{if $day.day|date_format:"%m" eq $modCalNavigation.focus_month}
-							{cycle values="odd,even" print=false advance=false}
-						{else}
-							{cycle values="notmonth" print=false advance=false}
-						{/if}
-					{else}
+					{if $day.day|date_format:"%m" eq $modCalNavigation.focus_month}
 						{cycle values="odd,even" print=false advance=false}
+					{else}
+						{cycle values="notmonth" print=false advance=false}
 					{/if}
 
 					<td class="{cycle}" style="text-align:right;">
-						{if $day.day|date_format:"%m" eq $modCalNavigation.focus_month or $smarty.session.calendar.view_mode eq "week"}
+						{if $day.day|date_format:"%m" eq $modCalNavigation.focus_month}
 							{if $day.day eq $modCalNavigation.focus_date}<strong>{/if}
-							<a href="{$gBitLoc.CALENDAR_PKG_URL}index.php?todate={$day.day}&amp;{$url_string}">{$day.day|date_format:"%d"}</a>
+							<a href="{$smarty.const.CALENDAR_PKG_URL}index.php?todate={$day.day}&amp;{$url_string}">{$day.day|date_format:"%d"}</a>
 							{if $day.day eq $modCalNavigation.focus_date}</strong>{/if}
 						{else}
 							&nbsp;