diff options
| -rw-r--r-- | includes/classes/Calendar.php | 1 | ||||
| -rwxr-xr-x | templates/calendar_nav_inc.tpl | 89 |
2 files changed, 31 insertions, 59 deletions
diff --git a/includes/classes/Calendar.php b/includes/classes/Calendar.php index 19714b4..6719704 100644 --- a/includes/classes/Calendar.php +++ b/includes/classes/Calendar.php @@ -461,7 +461,6 @@ class Calendar extends LibertyContent { $this->setupDayNames(); if ($gBitSystem->isFeatureActive('calendar_ajax_popups')) { - $gBitThemes->loadAjax( 'mochikit' ); } // TODO: make this a pref diff --git a/templates/calendar_nav_inc.tpl b/templates/calendar_nav_inc.tpl index d6604e9..19fdf93 100755 --- a/templates/calendar_nav_inc.tpl +++ b/templates/calendar_nav_inc.tpl @@ -17,65 +17,38 @@ <div class="clear"></div> <br /> -{if $gBitSystem->isFeatureActive( 'site_use_jscalendar' )} - <table> - <tr> - <td> - <div> - {form method="get" id="f"} - <input type="hidden" id="sort_mode" name="sort_mode" value="{$smarty.request.sort_mode}" /> - <input type="hidden" id="todate" name="todate" value="{$navigation.focus_date|cal_date_format:"%B %e, %Y %H:%M %Z"}" /> - <span class="highlight" style="cursor:pointer;" title="{tr}Date Selector{/tr}" id="datrigger">{$navigation.focus_date|bit_long_date}</span> - <small>« {tr}click to navigate{/tr}</small> - {/form} - </div> +<table> + <tr> + <td rowspan="2" style="text-align:left;"> + <a href="{$baseCalendarUrl}?todate={$navigation.before.day}&{$url_string}" title="{$navigation.before.day|bit_long_date}">« {tr}day{/tr}</a><br /> + <a href="{$baseCalendarUrl}?todate={$navigation.before.week}&{$url_string}" title="{$navigation.before.week|bit_long_date}">« {tr}week{/tr}</a><br /> + <a href="{$baseCalendarUrl}?todate={$navigation.before.month}&{$url_string}" title="{$navigation.before.month|bit_long_date}">« {tr}month{/tr}</a><br /> + <a href="{$baseCalendarUrl}?todate={$navigation.before.year}&{$url_string}" title="{$navigation.before.year|bit_long_date}">« {tr}year{/tr}</a> + </td> - <script type="text/javascript">/* <![CDATA[ */ - function gotocal() {ldelim} - document.getElementById('f').submit(); - {rdelim} - /* ]]> */</script> + <td style="text-align:center;"> + <a href="{$baseCalendarUrl}?todate={$smarty.now}&{$url_string}" title="{$navigation.today|bit_long_date}">{tr}Today{/tr}: <strong>{$navigation.today|bit_long_date} {$navigation.tz_flag}</strong></a><br /> + <form method="get" action="{$baseCalendarUrl}"> + <input type="hidden" name="sort_mode" value="{$smarty.request.sort_mode}" /> + <input type="date" name="todate" value="{$navigation.focus_date|date_format:'%Y-%m-%d'}" onchange="this.form.submit()" title="{tr}Jump to date{/tr}" /> + </form> + </td> - {jscalendar inputField=todate time=$navigation.focus_date onUpdate=gotocal displayArea=datrigger daFormat=$gBitSystem->getConfig('site_long_date_format')} - </td> - <td style="white-space:nowrap; width:140px; text-align:right;"> - <a href="{$baseCalendarUrl}?view_mode=day&{$url_string}" class="{if $smarty.session.calendar.view_mode eq 'day'}highlight{/if}">{biticon ipackage=calendar iname=day iexplain=Day}</a> - <a href="{$baseCalendarUrl}?view_mode=week&{$url_string}" class="{if $smarty.session.calendar.view_mode eq 'week'}highlight{/if}">{biticon ipackage=calendar iname=week iexplain=Week}</a> - <a href="{$baseCalendarUrl}?view_mode=weeklist&{$url_string}" class="{if $smarty.session.calendar.view_mode eq 'weeklist'}highlight{/if}">{biticon ipackage=calendar iname=weeklist iexplain=Weeklist}</a> - <a href="{$baseCalendarUrl}?view_mode=month&{$url_string}" class="{if $smarty.session.calendar.view_mode eq 'month'}highlight{/if}">{biticon ipackage=calendar iname=month iexplain=Month}</a> - </td> - </tr> - </table> -{else} - <table> - <tr> - <td rowspan="2" style="text-align:left;"> - <a href="{$baseCalendarUrl}?todate={$navigation.before.day}&{$url_string}" title="{$navigation.before.day|bit_long_date}">« {tr}day{/tr}</a><br /> - <a href="{$baseCalendarUrl}?todate={$navigation.before.week}&{$url_string}" title="{$navigation.before.week|bit_long_date}">« {tr}week{/tr}</a><br /> - <a href="{$baseCalendarUrl}?todate={$navigation.before.month}&{$url_string}" title="{$navigation.before.month|bit_long_date}">« {tr}month{/tr}</a><br /> - <a href="{$baseCalendarUrl}?todate={$navigation.before.year}&{$url_string}" title="{$navigation.before.year|bit_long_date}">« {tr}year{/tr}</a> - </td> + <td rowspan="2" style="text-align:right;"> + <a href="{$baseCalendarUrl}?todate={$navigation.after.day}&{$url_string}" title="{$navigation.after.day|bit_long_date}">{tr}day{/tr} »</a><br /> + <a href="{$baseCalendarUrl}?todate={$navigation.after.week}&{$url_string}" title="{$navigation.after.week|bit_long_date}">{tr}week{/tr} »</a><br /> + <a href="{$baseCalendarUrl}?todate={$navigation.after.month}&{$url_string}" title="{$navigation.after.month|bit_long_date}">{tr}month{/tr} »</a><br /> + <a href="{$baseCalendarUrl}?todate={$navigation.after.year}&{$url_string}" title="{$navigation.after.year|bit_long_date}">{tr}year{/tr} »</a> + </td> + </tr> - <td style="text-align:center;"> - <a href="{$baseCalendarUrl}?todate={$smarty.now}&{$url_string}" title="{$navigation.today|bit_long_date}">{tr}Today{/tr}: <strong>{$navigation.today|bit_long_date} {$navigation.tz_flag}</strong></a> - </td> - - <td rowspan="2" style="text-align:right;"> - <a href="{$baseCalendarUrl}?todate={$navigation.after.day}&{$url_string}" title="{$navigation.after.day|bit_long_date}">{tr}day{/tr} »</a><br /> - <a href="{$baseCalendarUrl}?todate={$navigation.after.week}&{$url_string}" title="{$navigation.after.week|bit_long_date}">{tr}week{/tr} »</a><br /> - <a href="{$baseCalendarUrl}?todate={$navigation.after.month}&{$url_string}" title="{$navigation.after.month|bit_long_date}">{tr}month{/tr} »</a><br /> - <a href="{$baseCalendarUrl}?todate={$navigation.after.year}&{$url_string}" title="{$navigation.after.year|bit_long_date}">{tr}year{/tr} »</a> - </td> - </tr> - - <tr> - <td style="text-align:center;"> - <a href="{$baseCalendarUrl}?view_mode=day&{$url_string}" class="{if $smarty.session.calendar.view_mode eq 'day'}highlight{/if}">{biticon ipackage=calendar iname=day iexplain=Day}</a> - <a href="{$baseCalendarUrl}?view_mode=week&{$url_string}" class="{if $smarty.session.calendar.view_mode eq 'week'}highlight{/if}">{biticon ipackage=calendar iname=week iexplain=Week}</a> - <a href="{$baseCalendarUrl}?view_mode=weeklist&{$url_string}" class="{if $smarty.session.calendar.view_mode eq 'weeklist'}highlight{/if}">{biticon ipackage=calendar iname=weeklist iexplain=Weeklist}</a> - <a href="{$baseCalendarUrl}?view_mode=month&{$url_string}" class="{if $smarty.session.calendar.view_mode eq 'month'}highlight{/if}">{biticon ipackage=calendar iname=month iexplain=Month}</a> - </td> - </tr> - </table> -{/if} + <tr> + <td style="text-align:center;"> + <a href="{$baseCalendarUrl}?view_mode=day&{$url_string}" class="{if $smarty.session.calendar.view_mode eq 'day'}highlight{/if}">{biticon ipackage=calendar iname=day iexplain=Day}</a> + <a href="{$baseCalendarUrl}?view_mode=week&{$url_string}" class="{if $smarty.session.calendar.view_mode eq 'week'}highlight{/if}">{biticon ipackage=calendar iname=week iexplain=Week}</a> + <a href="{$baseCalendarUrl}?view_mode=weeklist&{$url_string}" class="{if $smarty.session.calendar.view_mode eq 'weeklist'}highlight{/if}">{biticon ipackage=calendar iname=weeklist iexplain=Weeklist}</a> + <a href="{$baseCalendarUrl}?view_mode=month&{$url_string}" class="{if $smarty.session.calendar.view_mode eq 'month'}highlight{/if}">{biticon ipackage=calendar iname=month iexplain=Month}</a> + </td> + </tr> +</table> {/strip} |