diff options
| -rw-r--r-- | templates/admin_calendar.tpl | 2 | ||||
| -rwxr-xr-x | templates/calendar.tpl | 6 | ||||
| -rwxr-xr-x | templates/calendar_box.tpl | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/templates/admin_calendar.tpl b/templates/admin_calendar.tpl index d0909d9..a8ac992 100644 --- a/templates/admin_calendar.tpl +++ b/templates/admin_calendar.tpl @@ -35,7 +35,7 @@ {/forminput} </div> - {if $gBitUser->isAdmin() and $page eq "calendar"} + {if $gBitUser->isAdmin() && $page eq "calendar"} <div class="form-group"> {formlabel label="Individual Calendar Settings" for="calendar_user_prefs"} {forminput} diff --git a/templates/calendar.tpl b/templates/calendar.tpl index 6297d00..9ae5834 100755 --- a/templates/calendar.tpl +++ b/templates/calendar.tpl @@ -47,7 +47,7 @@ </tr> <tr> <td class="calitems {if $day.day eq $navigation.display_focus_date} current{/if}{if $day.day eq $navigation.today} highlight{/if} {cycle values="odd,even"}"> - {if $day.day|cal_date_format:"%m" eq $navigation.focus_month or $smarty.session.calendar.view_mode eq "week"} + {if $day.day|cal_date_format:"%m" eq $navigation.focus_month || $smarty.session.calendar.view_mode eq "week"} {foreach from=$day.items item=item} {assign var=over value=$item.over} {capture assign=itemurl}{$smarty.const.CALENDAR_PKG_URL}box.php?content_id={$item.content_id}{/capture} @@ -87,7 +87,7 @@ {/if} <td class="calitems {if $day.day eq $navigation.display_focus_date} current{/if}{if $day.day eq $navigation.today} highlight{/if} {cycle values="odd,even"}"> - {if $day.day|cal_date_format:"%m" eq $navigation.focus_month or $smarty.session.calendar.view_mode eq "week"} + {if $day.day|cal_date_format:"%m" eq $navigation.focus_month || $smarty.session.calendar.view_mode eq "week"} <div class="calnumber"> <a href="{$baseCalendarUrl}?view_mode=day&todate={$day.day}&{$url_string}">{$day.day|cal_date_format:"%d"}</a> </div> @@ -117,7 +117,7 @@ {/if} </table> {/jstab} - {if $gBitUser->hasPermission('p_calendar_view') and !empty($calContentTypes)} + {if $gBitUser->hasPermission('p_calendar_view') && !empty($calContentTypes)} {jstab title="Display Options"} {include file="bitpackage:calendar/calendar_options_inc.tpl"} {/jstab} diff --git a/templates/calendar_box.tpl b/templates/calendar_box.tpl index aa79bb1..10893df 100755 --- a/templates/calendar_box.tpl +++ b/templates/calendar_box.tpl @@ -8,7 +8,7 @@ {if !empty($cellHash.rendered)} {$cellHash.rendered} {/if} - {if $gBitUser->hasPermission('p_calendar_view_changes') and !empty($cellHash.creator_real_name) } + {if $gBitUser->hasPermission('p_calendar_view_changes') && !empty($cellHash.creator_real_name) } <div class="boxcontent"> {tr}Content Type{/tr}: {$gLibertySystem->getContentTypeName($cellHash.content_type_guid)} |