diff options
| -rw-r--r-- | icons/calendar.gif | bin | 122 -> 0 bytes | |||
| -rw-r--r-- | icons/calendar2.gif | bin | 127 -> 0 bytes | |||
| -rw-r--r-- | icons/calendar3.gif | bin | 355 -> 0 bytes | |||
| -rw-r--r-- | icons/calendar4.gif | bin | 235 -> 0 bytes | |||
| -rw-r--r-- | icons/day.gif | bin | 310 -> 282 bytes | |||
| -rw-r--r-- | icons/month.gif | bin | 299 -> 271 bytes | |||
| -rw-r--r-- | icons/week.gif | bin | 315 -> 287 bytes | |||
| -rw-r--r-- | icons/weeklist.gif | bin | 1056 -> 287 bytes | |||
| -rw-r--r-- | icons/year.gif | bin | 313 -> 286 bytes | |||
| -rw-r--r-- | templates/calendar.tpl | 197 | ||||
| -rw-r--r-- | templates/calendar_nav_inc.tpl | 17 | ||||
| -rw-r--r-- | templates/calendar_options_inc.tpl | 28 |
12 files changed, 120 insertions, 122 deletions
diff --git a/icons/calendar.gif b/icons/calendar.gif Binary files differdeleted file mode 100644 index 1831720..0000000 --- a/icons/calendar.gif +++ /dev/null diff --git a/icons/calendar2.gif b/icons/calendar2.gif Binary files differdeleted file mode 100644 index 8526cf5..0000000 --- a/icons/calendar2.gif +++ /dev/null diff --git a/icons/calendar3.gif b/icons/calendar3.gif Binary files differdeleted file mode 100644 index 954393c..0000000 --- a/icons/calendar3.gif +++ /dev/null diff --git a/icons/calendar4.gif b/icons/calendar4.gif Binary files differdeleted file mode 100644 index 4228a24..0000000 --- a/icons/calendar4.gif +++ /dev/null diff --git a/icons/day.gif b/icons/day.gif Binary files differindex 0e19bf3..0783700 100644 --- a/icons/day.gif +++ b/icons/day.gif diff --git a/icons/month.gif b/icons/month.gif Binary files differindex c7da143..7ef3128 100644 --- a/icons/month.gif +++ b/icons/month.gif diff --git a/icons/week.gif b/icons/week.gif Binary files differindex 4621306..9db43fc 100644 --- a/icons/week.gif +++ b/icons/week.gif diff --git a/icons/weeklist.gif b/icons/weeklist.gif Binary files differindex 0defcbd..98c0e0f 100644 --- a/icons/weeklist.gif +++ b/icons/weeklist.gif diff --git a/icons/year.gif b/icons/year.gif Binary files differindex 17272f9..064a07d 100644 --- a/icons/year.gif +++ b/icons/year.gif diff --git a/templates/calendar.tpl b/templates/calendar.tpl index d73d7ad..1683f3c 100644 --- a/templates/calendar.tpl +++ b/templates/calendar.tpl @@ -1,4 +1,4 @@ -{* $Header: /cvsroot/bitweaver/_bit_calendar/templates/calendar.tpl,v 1.30 2005/08/31 16:10:44 lsces Exp $ *} +{* $Header: /cvsroot/bitweaver/_bit_calendar/templates/calendar.tpl,v 1.31 2005/08/31 17:13:47 squareing Exp $ *} {strip} {if !$gBitSystem->isFeatureActive( 'feature_helppopup' )} @@ -11,55 +11,25 @@ </div> <div class="body"> - {include file="bitpackage:calendar/calendar_options_inc.tpl"} + {jstabs} + {jstab title="Calendar"} + {* this is used to keep stuff like sort_mode persistent in all links on this page *} + {assign var=url_string value="sort_mode=`$smarty.request.sort_mode`&user_id=`$smarty.request.user_id`"} - {* this is used to keep stuff like sort_mode persistent in all links on this page *} - {assign var=url_string value="sort_mode=`$smarty.request.sort_mode`&user_id=`$smarty.request.user_id`"} + {include file="bitpackage:calendar/calendar_nav_inc.tpl"} - {include file="bitpackage:calendar/calendar_nav_inc.tpl"} - - <table class="data caltable {$smarty.session.calendar.view_mode}"> - <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:15%;">{tr}Time{/tr}</th> - <th>{tr}Events{/tr}</th> - </tr> - {foreach item=time from=$calDay} - <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> - {/foreach} - {elseif $smarty.session.calendar.view_mode eq 'weeklist'} - {foreach from=$calMonth item=week} - {counter assign=weekday print=false start=0} - {foreach from=$week item=day} + <table class="data caltable {$smarty.session.calendar.view_mode}"> + <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:10%"> - {$dayNames.$weekday} - {counter assign=weekday print=false} - - <div class="calnumber"> - <a href="{$smarty.const.CALENDAR_PKG_URL}index.php?view_mode=day&todate={$day.day}&{$url_string}">{$day.day|cal_date_format:"%d"}</a> - </div> - </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} + <th style="width:15%;">{tr}Time{/tr}</th> + <th>{tr}Events{/tr}</th> + </tr> + {foreach item=time from=$calDay} + <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}"> @@ -67,59 +37,98 @@ </a> </div> {/foreach} - {else} - - {/if} - </td> + </td> + </tr> + {/foreach} + {elseif $smarty.session.calendar.view_mode eq 'weeklist'} + <tr> + <th style="width:15%;">{tr}Day{/tr}</th> + <th>{tr}Events{/tr}</th> </tr> - {/foreach} - {/foreach} - {else} - <tr> - <th style="width:2%;"></th> - {foreach from=$dayNames item=dayName} - <th style="width:14%">{$dayName}</th> - {/foreach} - </tr> + {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&todate={$day.day}&{$url_string}">{$day.day|cal_date_format:"%d"}</a> + </div> + </th> - {foreach from=$calMonth key=week_num item=week} - <tr style="height:6em;"> - <th><a href="{$smarty.const.CALENDAR_PKG_URL}index.php?view_mode=week&todate={$week.6.day}">{$week_num}</a></th> - {foreach from=$week item=day} - {if $smarty.session.calendar.view_mode eq "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} - {/if} - {else} - {cycle values="odd,even" print=false advance=false} - {/if} - <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&todate={$day.day}&{$url_string}">{$day.day|cal_date_format:"%d"}</a> - </div> + <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"} + {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} + + {/if} + </td> + </tr> + {/foreach} + {/foreach} + {else} + <tr> + <th style="width:2%;"></th> + {foreach from=$dayNames item=dayName} + <th style="width:14%">{$dayName}</th> + {/foreach} + </tr> + + {foreach from=$calMonth key=week_num item=week} + <tr style="height:6em;"> + <th><a href="{$smarty.const.CALENDAR_PKG_URL}index.php?view_mode=week&todate={$week.6.day}">{$week_num}</a></th> + {foreach from=$week item=day} + {if $smarty.session.calendar.view_mode eq "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} + {/if} + {else} + {cycle values="odd,even" print=false advance=false} + {/if} - {* - 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|truncate:$trunc:"..."|default:"?"} - </a> - </div> - {/foreach} - {else} - - {/if} - </td> + <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&todate={$day.day}&{$url_string}">{$day.day|cal_date_format:"%d"}</a> + </div> + + {* - 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|truncate:$trunc:"..."|default:"?"} + </a> + </div> + {/foreach} + {else} + + {/if} + </td> + {/foreach} + </tr> {/foreach} - </tr> - {/foreach} - {/if} - </table> + {/if} + </table> + {/jstab} + + {jstab title="Display Options"} + {include file="bitpackage:calendar/calendar_options_inc.tpl"} + {/jstab} + {/jstabs} </div><!-- end .body --> </div><!-- end .calendar --> {/strip} diff --git a/templates/calendar_nav_inc.tpl b/templates/calendar_nav_inc.tpl index 38afce1..7fa3406 100644 --- a/templates/calendar_nav_inc.tpl +++ b/templates/calendar_nav_inc.tpl @@ -1,3 +1,18 @@ +<div class="navbar"> + <ul> + {if $smarty.request.user_id} + <li>{smartlink ititle="Show all" sort_mode=$smarty.request.sort_mode}</li> + {else} + <li>{smartlink ititle="Only my items" user_id=$gBitUser->mUserId sort_mode=$smarty.request.sort_mode}</li> + {/if} + <li>{smartlink ititle="Creation date" isort="created"}</li> + <li>{smartlink ititle="Modification date" idefault=1 isort="last_modified"}</li> + </ul> +</div> + +<div class="clear"></div> +<br /> + {if $gBitSystemPrefs.feature_jscalendar eq 'y'} <table> <tr> @@ -14,7 +29,7 @@ {rdelim} Calendar.setup( {ldelim} - date : "{$focus_date|bit_date_format:"%m/%d/%Y %H:%M"}", // initial date + date : "{$focus_date|bit_date_format:"%m/%d/%Y %H:%M"}", // initial date inputField : "todate", // ID of the input field ifFormat : "%s", // the date format displayArea : "datrigger", // ID of the span where the date is to be shown diff --git a/templates/calendar_options_inc.tpl b/templates/calendar_options_inc.tpl index 02ef288..cfb76cb 100644 --- a/templates/calendar_options_inc.tpl +++ b/templates/calendar_options_inc.tpl @@ -1,26 +1,4 @@ -<div class="navbar"> - <ul> - <script type="text/javascript">//<![CDATA[ - document.write("<li><a href=\"javascript:toggle('tabcal');\">{tr}Show / Hide Options{/tr}</a></li>"); - //]]></script> - {if $smarty.request.user_id} - <li>{smartlink ititle="Show all" sort_mode=$smarty.request.sort_mode}</li> - {else} - <li>{smartlink ititle="Only my items" user_id=$gBitUser->mUserId sort_mode=$smarty.request.sort_mode}</li> - {/if} - <li>{smartlink ititle="Creation date" isort="created"}</li> - <li>{smartlink ititle="Modification date" idefault=1 isort="last_modified"}</li> - </ul> -</div> - -<div class="clear"></div> -<br /> - -<script type="text/javascript">//<![CDATA[ - document.write("<div id=\"tabcal\" style=\"display:{if $smarty.cookies.tabcal eq 'o'}block{else}none{/if};\">"); -//]]></script> - -{form legend="Display Options" id="display_options"} +{form legend="Data Options" id="data_options"} <div class="row"> {forminput} {html_checkboxes values=$contentTypes options=$contentTypes name=content_type_guid selected=$smarty.session.calendar.content_type_guid separator="<br />"} @@ -34,7 +12,3 @@ <input type="submit" name="refresh" value="{tr}Update Calendar{/tr}" /> </div> {/form} - -<script type="text/javascript">//<![CDATA[ - document.write("</div>"); -//]]></script> |
