Add ability to set default content types to show.

Make ajax popups sticky with a nice close icon.

3 files changed, 15 insertions, 4 deletions

diff --git a/templates/admin_calendar.tpl b/templates/admin_calendar.tpl
index e20aaa0..da1d9b5 100644
--- a/templates/admin_calendar.tpl
+++ b/templates/admin_calendar.tpl
@@ -48,6 +48,11 @@
 				{formhelp note="Use ajax for calendar popups. This saves page load time and bandwidth at the expense of requiring javascript."}
 			{/forminput}
 
+			{formlabel label="Default Content Types"}
+			{forminput}
+				{html_checkboxes name="defaultTypes" options=$calendarTypeDefaults selected=$calendarTypesSelected separator="<br />"}
+				{formhelp note="Default content types to show on the calendar when users do not have permission to change types of content viewed."}
+			{/forminput}
 		</div>
 	{/if}
 	
diff --git a/templates/calendar.tpl b/templates/calendar.tpl
index 786b62b..e2b5605 100644
--- a/templates/calendar.tpl
+++ b/templates/calendar.tpl
@@ -1,4 +1,4 @@
-{* $Header: /cvsroot/bitweaver/_bit_calendar/templates/calendar.tpl,v 1.45 2007/04/05 21:21:04 nickpalmer Exp $ *}
+{* $Header: /cvsroot/bitweaver/_bit_calendar/templates/calendar.tpl,v 1.46 2007/04/06 12:38:44 nickpalmer Exp $ *}
 {strip}
 {if !$gBitSystem->isFeatureActive( 'site_help_popup' )}
 	{popup_init src="`$smarty.const.UTIL_PKG_URL`javascript/libs/overlib.js"}
@@ -32,7 +32,7 @@
 										<div class="cal{$item.content_type_guid}">
 	<a href="{$smarty.const.BIT_ROOT_URL}index.php?content_id={$item.content_id}">
 		{capture assign=itemurl}{$smarty.const.CALENDAR_PKG_URL}box.php?content_id={$item.content_id}{/capture}
-		<img style="padding:0px 4px;" src="{biticon ipackage="icons" iname="list-add" iexplain="Detailed Information" url=true}" title="{tr}Detailed Information{/tr}" {if $gBitSystem->isFeatureActive('calendar_ajax_popups')}{popup fullhtml="1" target=$itemurl}{else}{popup fullhtml="1" text=$over|escape:"javascript"|escape:"html"}{/if} /> {$item.title|escape|default:"?"}
+		<img style="padding:0px 4px;" src="{biticon ipackage="icons" iname="list-add" iexplain="Detailed Information" url=true}" title="{tr}Detailed Information{/tr}" {if $gBitSystem->isFeatureActive('calendar_ajax_popups')}{popup fullhtml=1 sticky=1 closeclick=1 target=$itemurl}{else}{popup fullhtml=1 text=$over|escape:"javascript"|escape:"html"}{/if} /> {$item.title|escape|default:"?"}
 	</a>
 										</div>
 									{/foreach}
@@ -59,7 +59,7 @@
 		{capture assign=itemurl}{$smarty.const.CALENDAR_PKG_URL}box.php?content_id={$item.content_id}{/capture}
 												<div class="cal{$item.content_type_guid}" style="float:left;width:50%;">
 													<a href="{$smarty.const.BIT_ROOT_URL}index.php?content_id={$item.content_id}">
-				<img style="padding:0px 4px;" src="{biticon ipackage="icons" iname="list-add" iexplain="Detailed Information" url=true}" title="{tr}Detailed Information{/tr}" {if $gBitSystem->isFeatureActive('calendar_ajax_popups')}{popup fullhtml="1" target=$itemurl}{else}{popup fullhtml="1" text=$over|escape:"javascript"|escape:"html"}{/if} /> {$item.title|escape|default:"?"}
+				<img style="padding:0px 4px;" src="{biticon ipackage="icons" iname="list-add" iexplain="Detailed Information" url=true}" title="{tr}Detailed Information{/tr}" {if $gBitSystem->isFeatureActive('calendar_ajax_popups')}{popup fullhtml=1 sticky=1 closeclick=1 target=$itemurl}{else}{popup fullhtml=1 text=$over|escape:"javascript"|escape:"html"}{/if} /> {$item.title|escape|default:"?"}
 			</a>
 												</div>
 											{/foreach}
@@ -104,7 +104,7 @@
 		{capture assign=itemurl}{$smarty.const.CALENDAR_PKG_URL}box.php?content_id={$item.content_id}{/capture}
 												<div class="cal{$item.content_type_guid}">
 													<a href="{$smarty.const.BIT_ROOT_URL}index.php?content_id={$item.content_id}">
-				<img style="padding:0px 4px;" src="{biticon ipackage="icons" iname="list-add" iexplain="Detailed Information" url=true}" title="{tr}Detailed Information{/tr}" {if $gBitSystem->isFeatureActive('calendar_ajax_popups')}{popup fullhtml="1" target=$itemurl}{else}{popup fullhtml="1" text=$over|escape:"javascript"|escape:"html"}{/if} /> {$item.title|escape|truncate:$trunc:"..."|default:"?"}
+				<img style="padding:0px 4px;" src="{biticon ipackage="icons" iname="list-add" iexplain="Detailed Information" url=true}" title="{tr}Detailed Information{/tr}" {if $gBitSystem->isFeatureActive('calendar_ajax_popups')}{popup fullhtml=1 target=$itemurl sticky=1 closeclick=1}{else}{popup fullhtml=1 text=$over|escape:"javascript"|escape:"html"}{/if} /> {$item.title|escape|truncate:$trunc:"..."|default:"?"}
 			</a>
 												</div>
 											{/foreach}
diff --git a/templates/calendar_box.tpl b/templates/calendar_box.tpl
index f72bdf2..0fb10bf 100644
--- a/templates/calendar_box.tpl
+++ b/templates/calendar_box.tpl
@@ -1,11 +1,17 @@
 {strip}
 <div class="calendar popup box">
 {if $cellHash.content_id}
+	{if $gBitSystem->isFeatureActive('calendar_ajax_popups')}
+		<div class="floaticon"><a onclick="javascript:return cClick();">{biticon ipackage=icons iname=window-close iexplain="Close Popup"}</a></div>
+	{/if}
 	<h3>{$cellHash.title|escape}</h3>
 	{if $cellHash.content_type_guid == 'bitevents' && $gBitSystem->isPackageActive('events')}
 		<div class="center">
 			{include file="bitpackage:events/render_header_inc.tpl" contentHash=$cellHash}
 		</div>
+		{if $gBitSystem->isFeatureActive('calendar_ajax_popups')}
+			{$cellHash.parsed_data}
+		{/if}
 	{/if}
 	{if $gBitUser->hasPermission('p_calendar_view_changes')}
 	<div class="boxcontent">