various calendar UI changes - basically making page look cleaner and reducing amount of information on page

2 files changed, 70 insertions, 33 deletions

diff --git a/styles/plain.css b/styles/plain.css
index 3ff640f..1ff38c4 100644
--- a/styles/plain.css
+++ b/styles/plain.css
@@ -1,19 +1,21 @@
 /* simple calendar styling to avaoid cumbersome maintenance of calendar css section */
 /* any of these settings can be overridden in your theme css file */
 /* hopefully we can select calendar styling options for the admin area soon */
-.caloptions div 		{border-width:0 0 2px 0; border-style:solid; padding:3px 0 0 0;}
-.calday div a			{border-width:0 0 2px 0; border-style:solid; display:block; padding:3px 2px;}
-.calday .calnumber a	{border-width:0; padding:0;}
+.caltable th,.caltable td	{vertical-align:top;}
+.caltable .current			{border:2px solid red; background:#ffc;}
+.caloptions div 			{border-width:0 0 2px 0; border-style:solid; padding:3px 0 0 0;}
+.calitems div a				{border-width:0 0 2px 0; border-style:solid; display:block; padding:3px 2px;}
+.calitems .calnumber a		{border-width:0; padding:0;}
 
 /* now for the individual content type settings */
-.caloptions .calbitarticle		,.calday .calbitarticle		a	{border-bottom-color:#f80;}
-.caloptions .calbitblog			,.calday .calbitblog		a	{border-bottom-color:#fc9;}
-.caloptions .calbitblogpost		,.calday .calbitblogpost	a	{border-bottom-color:#fd9;}
-.caloptions .calbitcomment		,.calday .calbitcomment		a	{border-bottom-color:#f9f;}
-.caloptions .calbituser			,.calday .calbituser		a	{border-bottom-color:#af8;}
-.caloptions .calfisheyegallery	,.calday .calfisheyegallery	a	{border-bottom-color:#acf;}
-.caloptions .calfisheyeimage	,.calday .calfisheyeimage	a	{border-bottom-color:#7af;}
-.caloptions .calpigeonholes		,.calday .calpigeonholes	a	{border-bottom-color:#f99;}
-.caloptions .caltikisticky		,.calday .caltikisticky		a	{border-bottom-color:#ff9;}
-.caloptions .calbitbook			,.calday .calbitbook		a	{border-bottom-color:#777;}
-.caloptions .calbitpage			,.calday .calbitpage		a	{border-bottom-color:#bbb;}
+.caloptions .calbitarticle		,.calitems .calbitarticle		a	{border-bottom-color:#f80;}
+.caloptions .calbitblog			,.calitems .calbitblog			a	{border-bottom-color:#fc9;}
+.caloptions .calbitblogpost		,.calitems .calbitblogpost		a	{border-bottom-color:#fd9;}
+.caloptions .calbitcomment		,.calitems .calbitcomment		a	{border-bottom-color:#f9f;}
+.caloptions .calbituser			,.calitems .calbituser			a	{border-bottom-color:#af8;}
+.caloptions .calfisheyegallery	,.calitems .calfisheyegallery	a	{border-bottom-color:#acf;}
+.caloptions .calfisheyeimage	,.calitems .calfisheyeimage		a	{border-bottom-color:#7af;}
+.caloptions .calpigeonholes		,.calitems .calpigeonholes		a	{border-bottom-color:#f99;}
+.caloptions .caltikisticky		,.calitems .caltikisticky		a	{border-bottom-color:#ff9;}
+.caloptions .calbitbook			,.calitems .calbitbook			a	{border-bottom-color:#777;}
+.caloptions .calbitpage			,.calitems .calbitpage			a	{border-bottom-color:#bbb;}
diff --git a/templates/calendar.tpl b/templates/calendar.tpl
index 3628a1a..9c810c4 100644
--- a/templates/calendar.tpl
+++ b/templates/calendar.tpl
@@ -1,4 +1,4 @@
-{* $Header: /cvsroot/bitweaver/_bit_calendar/templates/calendar.tpl,v 1.27 2005/08/31 09:44:32 lsces Exp $ *}
+{* $Header: /cvsroot/bitweaver/_bit_calendar/templates/calendar.tpl,v 1.28 2005/08/31 10:33:31 squareing Exp $ *}
 {strip}
 
 {if !$gBitSystem->isFeatureActive( 'feature_helppopup' )}
@@ -22,24 +22,59 @@
 			<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>
+					<th style="width:15%;">{tr}Time{/tr}</th>
 					<th>{tr}Events{/tr}</th>
 				</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|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|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>
+				{foreach item=time from=$calDay}
+					{if $time.items}
+						<tr class="{cycle values="odd,even"}">
+							<th>{$time.time|cal_date_format:"%H:%M"}</th>
+							<td class="calitems">
+								{foreach from=$time.items item=item}
+									{assign var=over value=$item.over}
+									<div class="cal{$item.content_type_guid}">
+										<a href="{$smarty.const.BIT_ROOT_URL}index.php?content_id={$item.content_id}">
+											<img src="{biticon ipackage=liberty iname=collapsed iexplain="Detailed Information" url=true}" title="{tr}Detailed Information{/tr}" {popup fullhtml="1" sticky="1" timeout="2500" text=$over|escape:"javascript"|escape:"html"} /> {$item.title|default:"?"}
+										</a>
+									</div>
+								{/foreach}
+							</td>
+						</tr>
+					{/if}
+				{/foreach}
+			{elseif $smarty.session.calendar.view_mode eq 'week'}
+				{foreach from=$calMonth item=week}
+					{counter assign=weekday print=false start=0}
+					{foreach from=$week item=day}
+						<tr>
+							<th style="width:10%">
+								{$dayNames.$weekday}
+								{counter assign=weekday print=false}
+
+								<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>
 								</div>
-							{/foreach}
-						</td>
-					</tr>
+							</th>
+
+							{cycle values="odd,even" print=false advance=false}
+
+							<td class="calitems {if $day.day eq $navigation.focus_date}current{/if} {cycle}">
+								{if $day.day|cal_date_format:"%m" eq $navigation.focus_month or $smarty.session.calendar.view_mode eq "week"}
+									{* - Cell Content - *}
+									{foreach from=$day.items item=item}
+										{assign var=over value=$item.over}
+										<div class="cal{$item.content_type_guid}">
+											<a href="{$smarty.const.BIT_ROOT_URL}index.php?content_id={$item.content_id}">
+												<img src="{biticon ipackage=liberty iname=collapsed iexplain="Detailed Information" url=true}" title="{tr}Detailed Information{/tr}" {popup fullhtml="1" sticky="1" timeout="2500" text=$over|escape:"javascript"|escape:"html"} /> {$item.title|default:"?"}
+											</a>
+										</div>
+									{/foreach}
+								{else}
+									&nbsp;
+								{/if}
+							</td>
+						</tr>
+					{/foreach}
 				{/foreach}
 			{else}
 				<tr>
@@ -63,7 +98,7 @@
 								{cycle values="odd,even" print=false advance=false}
 							{/if}
 
-							<td class="calday {if $day.day eq $navigation.focus_date}current{/if} {cycle}" style="vertical-align:top;">
+							<td class="calitems {if $day.day eq $navigation.focus_date}current{/if} {cycle}">
 								{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>
@@ -73,8 +108,8 @@
 									{foreach from=$day.items item=item}
 										{assign var=over value=$item.over}
 										<div class="cal{$item.content_type_guid}">
-											<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|truncate:$trunc:"..."|default:"?"}
+											<a href="{$smarty.const.BIT_ROOT_URL}index.php?content_id={$item.content_id}">
+												<img src="{biticon ipackage=liberty iname=collapsed iexplain="Detailed Information" url=true}" title="{tr}Detailed Information{/tr}" {popup fullhtml="1" sticky="1" timeout="2500" text=$over|escape:"javascript"|escape:"html"} /> {$item.title|truncate:$trunc:"..."|default:"?"}
 											</a>
 										</div>
 									{/foreach}