diff options
| -rw-r--r-- | templates/insert_menu_item_inc.tpl | 4 | ||||
| -rw-r--r-- | templates/menus.tpl | 2 | ||||
| -rw-r--r-- | templates/tikiwiki/item.tpl | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/templates/insert_menu_item_inc.tpl b/templates/insert_menu_item_inc.tpl index 659678e..ec47e0b 100644 --- a/templates/insert_menu_item_inc.tpl +++ b/templates/insert_menu_item_inc.tpl @@ -1,10 +1,10 @@ {strip} -{if $gBitUser->hasPermission( 'p_nexus_insert_item' ) and $nexusList} +{if $gBitUser->hasPermission( 'p_nexus_insert_item' ) && $nexusList} {jstab title="Menu"} {legend legend="Insert in Menu"} {if !$inNexusMenu} {foreach from=$nexusList item=menu} - {if $menu.editable or $gBitUser->isAdmin()} + {if $menu.editable || $gBitUser->isAdmin()} <div class="form-group"> {formlabel label="Menu"} {forminput} diff --git a/templates/menus.tpl b/templates/menus.tpl index 3cdd7f6..42ab5aa 100644 --- a/templates/menus.tpl +++ b/templates/menus.tpl @@ -48,7 +48,7 @@ {if $plugin.is_active eq 'y'} <label> <input type="radio" name="plugin_guid" value="{$plugin.plugin_guid}" - {if $editMenu.plugin_guid eq $plugin.plugin_guid or ( $editMenu.plugin_guid eq '' and $plugin.plugin_guid eq 'suckerfish' )} + {if $editMenu.plugin_guid eq $plugin.plugin_guid || ( $editMenu.plugin_guid eq '' && $plugin.plugin_guid eq 'suckerfish' )} checked="checked" {/if} /> {$plugin.title} diff --git a/templates/tikiwiki/item.tpl b/templates/tikiwiki/item.tpl index 4e842fd..8f82e8a 100644 --- a/templates/tikiwiki/item.tpl +++ b/templates/tikiwiki/item.tpl @@ -3,11 +3,11 @@ {if $item.head}head{else}item{/if}{if $item.rsrc_type eq 'ext'} external{/if}{if $item.rsrc_type eq 'content_id'}{ldelim}if $gContent->mContentId == {$item.rsrc}{rdelim} selected{ldelim}/if{rdelim}{/if} {/capture} -{if $type eq 'ieo' or $type eq 'iec'} +{if $type eq 'ieo' || $type eq 'iec'} <span style="display:block;"> {if $item.expand_url} <a style="float:left;padding:0 3px;" href="{$item.expand_url}"> - {ldelim}if $smarty.cookies.{$tog_next} == 'c' or (!$smarty.cookies.{$tog_next} and '{$type}' == 'iec'){rdelim} + {ldelim}if $smarty.cookies.{$tog_next} == 'c' || (!$smarty.cookies.{$tog_next} and '{$type}' == 'iec'){rdelim} {biticon ipackage="liberty" iname="collapsed" id="`$tog_next`img" iexplain="Collapsed menu"} {ldelim}else{rdelim} {biticon ipackage="liberty" iname="expanded" id="`$tog_next`img" iexplain="Expanded menu"} @@ -19,11 +19,11 @@ {$item.title|escape} </a> </span> -{elseif $type eq 'iho' or $type eq 'ihc'} +{elseif $type eq 'iho' || $type eq 'ihc'} <span style="display:block;"> {if $item.expand_url} <a style="float:left;padding:0 3px;" href="{$item.expand_url}"> - {ldelim}if $smarty.cookies.{$tog_next} == 'c' or (!$smarty.cookies.{$tog_next} and '{$type}' == 'ihc'){rdelim} + {ldelim}if $smarty.cookies.{$tog_next} == 'c' || (!$smarty.cookies.{$tog_next} and '{$type}' == 'ihc'){rdelim} {biticon ipackage="liberty" iname="collapsed" id="`$tog_next`img" iexplain="Collapsed menu"} {ldelim}else{rdelim} {biticon ipackage="liberty" iname="expanded" id="`$tog_next`img" iexplain="Expanded menu"} |