Commit 019f02d2 authored by sept_7's avatar sept_7

[FIX] Preparation patch for Smarty 3. Templates fixes compatible with both...

[FIX] Preparation patch for Smarty 3. Templates fixes compatible with both Samrty 2 and Smarty 3. This will reduce the patch to Smarty 3
parent 7b78248c
{if $blog_post_context eq 'view_blog_post' }
{if $blog_post_context eq 'view_blog_post'}
<div class="postfooter-nav clearfix">
{if $post_info.adjacent.prev}
<div class="postfooter-nav-prev">
......
......@@ -7,7 +7,7 @@
<h2>{$post_info.title|escape}</h2>
{/if}
</div>
{if $blog_post_context eq 'preview' }
{if $blog_post_context eq 'preview'}
{include file='freetag_list.tpl' freetags=$post_info.freetags links_inactive='y'}
{else}
{include file='freetag_list.tpl' freetags=$post_info.freetags}
......
......@@ -52,9 +52,9 @@
{assign var=propval value=$propval|kbsize:true}
{/if}
{if isset($gal_info.$propkey) and $propval neq '' and $propname neq 'name' and ( $gal_info.$propkey eq 'a' or $gal_info.$propkey eq 'o' or ( $gal_info.$propkey eq 'y' and $show_details neq 'y' ) ) }
{if isset($gal_info.$propkey) and $propval neq '' and $propname neq 'name' and ( $gal_info.$propkey eq 'a' or $gal_info.$propkey eq 'o' or ( $gal_info.$propkey eq 'y' and $show_details neq 'y' ) )}
<b>{$fgal_listing_conf.$propname.name}</b>: {$propval}<br />
{assign var=nb_over_infos value=`$nb_over_infos+1`}
{assign var=nb_over_infos value=$nb_over_infos+1}
{/if}
{/foreach}
</div>
......@@ -114,7 +114,7 @@
{else}
{assign var=key_name value="show_$propname"}
{/if}
{if isset($gal_info.$key_name) and ( $gal_info.$key_name eq 'y' or $gal_info.$key_name eq 'a' or $gal_info.$key_name eq 'i' or $propname eq 'name' ) }
{if isset($gal_info.$key_name) and ( $gal_info.$key_name eq 'y' or $gal_info.$key_name eq 'a' or $gal_info.$key_name eq 'i' or $propname eq 'name' )}
{assign var=propval value=$files[changes].$propname|truncate:$key_name_len|escape}
{* Format property values *}
......
......@@ -14,7 +14,7 @@
{if $comment.userName ne $user and $comment.approved eq 'y' and (
( $forum_mode neq 'y' and $tiki_p_vote_comments eq 'y' )
or ( $forum_mode eq 'y' and $forum_info.vote_threads eq 'y' and ( $tiki_p_forum_vote eq 'y' or $tiki_p_admin_forum eq 'y' ) )
) }
)}
<b>{tr}Vote{/tr}</b>:
{if $first eq 'y'}
......@@ -41,13 +41,11 @@
<div class="actions">
{if ( $prefs.feature_comments_locking neq 'y' or $thread_is_locked neq 'y' ) and
( ( $forum_mode neq 'y' and $tiki_p_post_comments == 'y' )
or ( $forum_mode eq 'y' and $tiki_p_forum_post eq 'y' and ( $forum_is_locked neq 'y' or $prefs.feature_comments_locking neq 'y' ) ) )
}
or ( $forum_mode eq 'y' and $tiki_p_forum_post eq 'y' and ( $forum_is_locked neq 'y' or $prefs.feature_comments_locking neq 'y' ) ) )}
{if $forum_mode neq 'y'}
{button href="?post_reply=1&comments_threshold=`$comments_threshold`&comments_reply_threadId=`$comment.threadId`&comments_offset=`$comments_offset`&thread_sort_mode=`$thread_sort_mode`&comments_per_page=`$comments_per_page`&comments_parentId=`$comment.threadId`&thread_style=`$thread_style`#form"
_auto_args='*'
_text="{tr}Reply{/tr}"
}
_text="{tr}Reply{/tr}"}
{else}
{if $first eq 'y'}
......@@ -55,13 +53,11 @@
{elseif $comments_grandParentId}
{button href="?post_reply=1&comments_threshold=`$comments_threshold`&comments_reply_threadId=`$comment.threadId`&comments_offset=`$comments_offset`&thread_sort_mode=`$thread_sort_mode`&comments_per_page=`$comments_per_page`&comments_grandParentId=`$comment_grandParentId`&comments_parentId=`$comments_grandParentId`&thread_style=`$thread_style`#form"
_auto_args='*'
_text="{tr}Reply{/tr}"
}
_text="{tr}Reply{/tr}"}
{elseif $forum_info.is_flat neq 'y'}
{button href="?post_reply=1&comments_threshold=`$comments_threshold`&comments_reply_threadId=`$comment.threadId`&comments_offset=`$comments_offset`&thread_sort_mode=`$thread_sort_mode`&comments_per_page=`$comments_per_page`&comments_grandParentId=`$comment.parentId`&comments_parentId=`$comment.parentId`&thread_style=`$thread_style`#form"
_auto_args='*'
_text="{tr}Reply{/tr}"
}
_text="{tr}Reply{/tr}"}
{/if}
{/if}
{/if}
......
......@@ -2,16 +2,14 @@
<div class="clearfix postbody-title">
{if $prefs.feature_comments_locking neq 'y' or
( $forum_mode neq 'y' and $comment.locked neq 'y' and $thread_is_locked neq 'y' )
or ( $forum_mode eq 'y' and $comment.locked neq 'y' and $thread_is_locked neq 'y' )
}
or ( $forum_mode eq 'y' and $comment.locked neq 'y' and $thread_is_locked neq 'y' )}
{assign var='this_is_locked' value='n'}
{else}
{assign var='this_is_locked' value='y'}
{/if}
{if $thread_style != 'commentStyle_headers' and $this_is_locked eq 'n' and $comment.threadId > 0
and ( $forum_mode neq 'y' || ( $forum_mode eq 'y' and $forumId > 0 and $comments_parentId > 0 ) )
}
and ( $forum_mode neq 'y' || ( $forum_mode eq 'y' and $forumId > 0 and $comments_parentId > 0 ) )}
<div class="actions">
{if $forum_mode neq 'y' && $tiki_p_admin_comments eq 'y'}
{if $prefs.feature_comments_moderation eq 'y' && $comment.approved eq 'n'}
......@@ -34,8 +32,7 @@
|| $forum_mode eq 'y' && (
$tiki_p_admin_forum eq 'y'
|| ( $comment.userName == $user && $tiki_p_forum_edit_own_posts eq 'y' )
)
}
)}
<a title="{tr}Edit{/tr}"
{if $first eq 'y'}
class="admlink" href="tiki-view_forum.php?comments_offset={$smarty.request.topics_offset}{$thread_sort_mode_param}&amp;comments_threshold={$smarty.request.topics_threshold}{$comments_find_param}&amp;comments_threadId={$comment.threadId}&amp;openpost=1&amp;forumId={$forum_info.forumId}{$comments_per_page_param}"
......@@ -47,8 +44,7 @@
{if
( $forum_mode neq 'y' and $tiki_p_remove_comments eq 'y' )
|| ( $forum_mode eq 'y' and $tiki_p_admin_forum eq 'y' )
}
|| ( $forum_mode eq 'y' and $tiki_p_admin_forum eq 'y' )}
<a title="{tr}Delete{/tr}"
{if $first eq 'y'}
class="admlink" href="tiki-view_forum.php?comments_offset={$smarty.request.topics_offset}{$thread_sort_mode_param}&amp;comments_threshold={$smarty.request.topics_threshold}{$comments_find_param}&amp;comments_remove=1&amp;comments_threadId={$comment.threadId}&amp;forumId={$forum_info.forumId}{$comments_per_page_param}"
......
{* $Id$ *}
{if $comment.doNotShow != 1 }
{if $comment.doNotShow != 1}
<div class="post {$thread_style}{if $prefs.feature_comments_moderation eq 'y'} post-approved-{$comment.approved}{/if} {if $prefs.comments_archive eq 'y' && $comment.archived eq 'y'}archived_comment{/if}" id="threadId{$comment.threadId}" {if $prefs.comments_archive eq 'y' && $comment.archived eq 'y'}style="display: none;"{/if}>
<div class="inner"><span class="corners-top"><span></span></span>
......@@ -19,12 +19,12 @@
{if $first neq 'y' and $comment.replies_info.numReplies > 0 && $comment.replies_info.numReplies != ''}
{foreach from=$comment.replies_info.replies item="comment"}
{if $comment.doNotShow != 1 && $thread_style != 'commentStyle_plain' }
{if $comment.doNotShow != 1 && $thread_style != 'commentStyle_plain'}
<div class="sub_comment_area">
<div class="sub_comment">
{/if}
{include file='comment.tpl' comment=$comment}
{if $comment.doNotShow != 1 && $thread_style != 'commentStyle_plain' }
{if $comment.doNotShow != 1 && $thread_style != 'commentStyle_plain'}
</div>
</div>
{/if}
......
......@@ -3,7 +3,7 @@
{* Display command results if we have smth to show... *}
{if $result_type ne 0 } {*NO_RESULT *}
{if $result_type ne 0} {*NO_RESULT *}
<pre>&gt;&nbsp;{$command|escape:"html"}</pre>
......
......@@ -12,7 +12,7 @@
{/if}
<td>
<span class="o{if $command_result[i].value == 'y' }n{else}ff{/if}-option">
<span class="o{if $command_result[i].value == 'y'}n{else}ff{/if}-option">
{$command_result[i].name}
</span>
</td>
......
......@@ -11,7 +11,7 @@
{/if}
<td>
<span class="o{if $command_result[i].value == 'y' }n{else}ff{/if}-option" title="{$command_result[i].description}">
<span class="o{if $command_result[i].value == 'y'}n{else}ff{/if}-option" title="{$command_result[i].description}">
{$command_result[i].name}
</span>
</td>
......
......@@ -173,7 +173,7 @@ $('#fgal_template').change( function() {
{capture name='use'}
{math equation="round((100*x)/(1024*1024*y))" x=$gal_info.usedSize y=$gal_info.quota}
{/capture}
{quotabar length='100' value=`$smarty.capture.use`}
{quotabar length='100' value=$smarty.capture.use}
{/if}
{if !empty($gal_info.maxQuota)}<br />{tr}Max:{/tr} {$gal_info.maxQuota} {tr}Mb{/tr}{/if}
{if !empty($gal_info.minQuota)}<br />{tr}Min:{/tr} {$gal_info.minQuota} {tr}Mb{/tr}{/if}
......
......@@ -20,9 +20,9 @@ close();
{else}
{if $errortype eq 401 && empty($user) and $prefs.permission_denied_login_box eq 'y'} {* permission denied *}
{assign var='errortitle' value="{tr}Please log in{/tr}" }
{assign var='errortitle' value="{tr}Please log in{/tr}"}
{else}
{assign var='errortitle' value="{tr}Error{/tr}" }
{assign var='errortitle' value="{tr}Error{/tr}"}
{/if}
{if ($errortype eq "404")}
......
......@@ -4,7 +4,7 @@
<div id="tiki-mid">
<div class="cbox">
<div class="cbox-title">{icon _id=exclamation alt="{tr}Error{/tr}" style=vertical-align:middle"} {tr}Error{/tr}</div>
<div class="cbox-title">{icon _id=exclamation alt="{tr}Error{/tr}" style="vertical-align:middle"} {tr}Error{/tr}</div>
<div class="cbox-data">
{$msg}<br /><br />
</div>
......
......@@ -10,7 +10,7 @@
{/if}
<div id="tiki-mid">
<div class="cbox">
<div class="cbox-title">{icon _id=exclamation alt="{tr}Error{/tr}" style=vertical-align:middle"}{tr}Error{/tr}</div>
<div class="cbox-title">{icon _id=exclamation alt="{tr}Error{/tr}" style="vertical-align:middle"}{tr}Error{/tr}</div>
<div class="cbox-data">
{$msg}<br /><br />
<a href="javascript:window.close()" class="linkmenu">{tr}Close Window{/tr}</a><br /><br />
......
......@@ -29,7 +29,7 @@
<td id="centercolumn"><div id="tiki-center">
<br />
<div class="cbox">
<div class="cbox-title">{icon _id=exclamation alt="{tr}Error{/tr}" style=vertical-align:middle"} {$errortitle|default:"{tr}Error{/tr}"}
<div class="cbox-title">{icon _id=exclamation alt="{tr}Error{/tr}" style="vertical-align:middle"} {$errortitle|default:"{tr}Error{/tr}"}
</div>
<div class="cbox-data">
<br />{$msg}
......
......@@ -9,7 +9,7 @@
{self_link _icon='page_edit' _menu_text=$menu_text _menu_icon=$menu_icon edit_mode=1 galleryId=$files[changes].id}{tr}Properties{/tr}{/self_link}
{/if}
{if $files[changes].perms.tiki_p_upload_files eq 'y' and ( $files[changes].perms.tiki_p_admin_file_galleries eq 'y' or ($user and $files[changes].user eq $user) or $files[changes].public eq 'y' ) }
{if $files[changes].perms.tiki_p_upload_files eq 'y' and ( $files[changes].perms.tiki_p_admin_file_galleries eq 'y' or ($user and $files[changes].user eq $user) or $files[changes].public eq 'y' )}
<a href="tiki-upload_file.php?galleryId={$files[changes].id}{if $filegals_manager neq ''}&amp;filegals_manager={$filegals_manager|escape}{/if}">{icon _menu_text=$menu_text _menu_icon=$menu_icon _id='upload'}</a>
{/if}
......@@ -49,7 +49,7 @@
{/if}
{/if}
{if $files[changes].type|truncate:6:'':true eq 'image/' }
{if $files[changes].type|truncate:6:'':true eq 'image/'}
<a href="{$files[changes].id|sefurl:display}">
{icon _id='magnifier' _menu_text=$menu_text _menu_icon=$menu_icon alt="{tr}Display{/tr}"}
</a>
......@@ -102,7 +102,7 @@
{* can edit if I am admin or the owner of the file or the locker of the file or if I have the perm to edit file on this gallery *}
{if $files[changes].perms.tiki_p_admin_file_galleries eq 'y'
or ($files[changes].lockedby and $files[changes].lockedby eq $user)
or (!$files[changes].lockedby and (($user and $user eq $files[changes].user) or $files[changes].perms.tiki_p_edit_gallery_file eq 'y')) }
or (!$files[changes].lockedby and (($user and $user eq $files[changes].user) or $files[changes].perms.tiki_p_edit_gallery_file eq 'y'))}
{if $files[changes].archiveId == 0}
{if $prefs.feature_file_galleries_save_draft eq 'y' and $files[changes].nbDraft gt 0}
{self_link _icon='accept' _menu_text=$menu_text _menu_icon=$menu_icon validate=$files[changes].fileId galleryId=$files[changes].galleryId}{tr}Validate your draft{/tr}{/self_link}
......@@ -177,7 +177,7 @@
{/if}
{if $files[changes].perms.tiki_p_admin_file_galleries eq 'y'
or (!$files[changes].lockedby and (($user and $user eq $files[changes].user) or ($files[changes].perms.tiki_p_edit_gallery_file eq 'y' and $files[changes].perms.tiki_p_remove_file eq 'y'))) }
or (!$files[changes].lockedby and (($user and $user eq $files[changes].user) or ($files[changes].perms.tiki_p_edit_gallery_file eq 'y' and $files[changes].perms.tiki_p_remove_file eq 'y')))}
{self_link _icon='cross' _menu_text=$menu_text _menu_icon=$menu_icon remove=$files[changes].fileId galleryId=$files[changes].galleryId}{tr}Delete{/tr}{/self_link}
{/if}
......
......@@ -61,7 +61,7 @@
</label>
{/if}
{if !empty($types) and ( !isset($types_tag) or $types_tag eq 'select' ) }
{if !empty($types) and ( !isset($types_tag) or $types_tag eq 'select' )}
<select name="type" class="findtypes">
<option value='' {if $find_type eq ''}selected="selected"{/if}>{tr}any type{/tr}</option>
{section name=t loop=$types}
......@@ -160,7 +160,7 @@
</div>
{/if}
{if !empty($types) and isset($types_tag) and $types_tag eq 'checkbox' }
{if !empty($types) and isset($types_tag) and $types_tag eq 'checkbox'}
<div class="findtypes">
<ul>
<li>
......
......@@ -6,42 +6,42 @@
<meta name="generator" content="Tiki Wiki CMS Groupware - http://tiki.org" />
{* --- Canonical URL --- *}
{include file='canonical.tpl'}
{include file="canonical.tpl"}
{if !empty($forum_info.name) & $prefs.metatag_threadtitle eq 'y'}
<meta name="keywords" content="{tr}Forum{/tr} {$forum_info.name|escape} {$thread_info.title|escape} {if $prefs.feature_freetags eq 'y'}{foreach from=$freetags.data item=taginfo}{$taginfo.tag|escape} {/foreach}{/if}" />
{elseif isset($galleryId) && $galleryId ne '' & $prefs.metatag_imagetitle ne 'n'}
{elseif isset($galleryId) && $galleryId neq '' && $prefs.metatag_imagetitle neq 'n'}
<meta name="keywords" content="{tr}Images Galleries{/tr} {$title|escape} {if $prefs.feature_freetags eq 'y'}{foreach from=$freetags.data item=taginfo}{$taginfo.tag|escape} {/foreach}{/if}" />
{elseif $prefs.metatag_keywords ne '' or !empty($metatag_local_keywords)}
<meta name="keywords" content="{$prefs.metatag_keywords|escape} {if $prefs.feature_freetags eq 'y'}{foreach from=$freetags.data item=taginfo}{$taginfo.tag|escape} {/foreach}{/if} {$metatag_local_keywords|escape}" />
{elseif $prefs.metatag_keywords neq '' or !empty($metatag_local_keywords)}
<meta name="keywords" content="{$prefs.metatag_keywords|escape} {if $prefs.feature_freetags eq 'y'}{foreach from=$freetags.data item="taginfo"}{$taginfo.tag|escape} {/foreach}{/if} {$metatag_local_keywords|escape}" />
{/if}
{if $prefs.metatag_author ne ''}
{if $prefs.metatag_author neq ''}
<meta name="author" content="{$prefs.metatag_author|escape}" />
{/if}
{if $prefs.metatag_pagedesc eq 'y' and $description ne ''}
{if $prefs.metatag_pagedesc eq 'y' and $description neq ''}
<meta name="description" content="{$description|escape}" />
{elseif $prefs.metatag_description ne '' or (isset($description) and $description eq '')}
{elseif $prefs.metatag_description neq '' or (isset($description) and $description eq '')}
<meta name="description" content="{$prefs.metatag_description|escape}" />
{/if}
{if $prefs.metatag_geoposition ne ''}
{if $prefs.metatag_geoposition neq ''}
<meta name="geo.position" content="{$prefs.metatag_geoposition|escape}" />
{/if}
{if $prefs.metatag_georegion ne ''}
{if $prefs.metatag_georegion neq ''}
<meta name="geo.region" content="{$prefs.metatag_georegion|escape}" />
{/if}
{if $prefs.metatag_geoplacename ne ''}
{if $prefs.metatag_geoplacename neq ''}
<meta name="geo.placename" content="{$prefs.metatag_geoplacename|escape}" />
{/if}
{if $prefs.metatag_robots ne '' && $metatag_robots eq '' }
{if $prefs.metatag_robots neq '' and $metatag_robots eq ''}
<meta name="robots" content="{$prefs.metatag_robots|escape}" />
{/if}
{if $prefs.metatag_robots eq '' && $metatag_robots ne '' }
{if $prefs.metatag_robots eq '' and $metatag_robots neq ''}
<meta name="robots" content="{$metatag_robots|escape}" />
{/if}
{if $prefs.metatag_robots ne '' && $metatag_robots ne '' }
{if $prefs.metatag_robots neq '' and $metatag_robots neq ''}
<meta name="robots" content="{$prefs.metatag_robots|escape}, {$metatag_robots|escape}" />
{/if}
{if $prefs.metatag_revisitafter ne ''}
{if $prefs.metatag_revisitafter neq ''}
<meta name="revisit-after" content="{$prefs.metatag_revisitafter|escape}" />
{/if}
......
......@@ -13,13 +13,13 @@
{/if}
{if $prefs.metatag_description ne ''}<meta name="description" content="{$prefs.metatag_description|escape}" />
{/if}
{if $prefs.metatag_robots ne '' && $metatag_robots eq '' }
{if $prefs.metatag_robots ne '' && $metatag_robots eq ''}
<meta name="robots" content="{$prefs.metatag_robots|escape}" />
{/if}
{if $prefs.metatag_robots eq '' && $metatag_robots ne '' }
{if $prefs.metatag_robots eq '' && $metatag_robots ne ''}
<meta name="robots" content="{$metatag_robots|escape}" />
{/if}
{if $prefs.metatag_robots eq '' && $metatag_robots eq '' }
{if $prefs.metatag_robots eq '' && $metatag_robots eq ''}
<meta name="robots" content="{$prefs.metatag_robots|escape}, {$metatag_robots|escape}" />
{/if}
{if $prefs.metatag_revisitafter ne ''}<meta name="revisit-after" content="{$prefs.metatag_revisitafter|escape}" />
......
{* $Id$ *}
{if ( isset($tree) and count($tree) gt 0 && $tiki_p_list_file_galleries != 'n' && $fgal_options.show_explorer.value eq 'y' && $tiki_p_view_fgal_explorer eq 'y' ) or ( $gallery_path neq '' && $fgal_options.show_path.value eq 'y' && $tiki_p_view_fgal_path eq 'y' ) }
{if ( isset($tree) and count($tree) gt 0 && $tiki_p_list_file_galleries != 'n' && $fgal_options.show_explorer.value eq 'y' && $tiki_p_view_fgal_explorer eq 'y' ) or ( $gallery_path neq '' && $fgal_options.show_path.value eq 'y' && $tiki_p_view_fgal_path eq 'y' )}
<div class="fgal_top_bar" style="height:16px; vertical-align:middle">
......@@ -35,7 +35,7 @@
<table border="0" cellpadding="3" cellspacing="3" width="100%" style="clear: both">
<tr>
{if isset($tree) && count($tree) gt 0 && $tiki_p_list_file_galleries != 'n' && $fgal_options.show_explorer.value eq 'y' && $tiki_p_view_fgal_explorer eq 'y'}
<td width="25%" class="fgalexplorer" id="fgalexplorer" style="{if ( isset($smarty.session.tiki_cookie_jar.show_fgalexplorer) and $smarty.session.tiki_cookie_jar.show_fgalexplorer neq 'y') and ( ! isset($smarty.request.show_fgalexplorer) or $smarty.request.show_fgalexplorer neq 'y' ) }display:none;{/if} width: 25%">
<td width="25%" class="fgalexplorer" id="fgalexplorer" style="{if ( isset($smarty.session.tiki_cookie_jar.show_fgalexplorer) and $smarty.session.tiki_cookie_jar.show_fgalexplorer neq 'y') and ( ! isset($smarty.request.show_fgalexplorer) or $smarty.request.show_fgalexplorer neq 'y' )}display:none;{/if} width: 25%">
<div style="overflow-x:auto; overflow-y:hidden">
{include file='file_galleries.tpl'}
</div>
......@@ -129,7 +129,7 @@
</select>
<select name="groups[]" multiple="multiple" size="5">
{section name=grp loop=$groups}
<option value="{$groups[grp].groupName|escape}" {if $groupName eq $groups[grp].groupName }selected="selected"{/if}>{$groups[grp].groupName|escape}</option>
<option value="{$groups[grp].groupName|escape}" {if $groupName eq $groups[grp].groupName}selected="selected"{/if}>{$groups[grp].groupName|escape}</option>
{/section}
</select>
<input type="submit" name="permsel" value="{tr}Assign{/tr}" />
......
......@@ -3,12 +3,12 @@
<table class="normal">
<tr>
{if $gal_info.show_checked ne 'n' and ($tiki_p_admin_file_galleries eq 'y' or $tiki_p_upload_files eq 'y')}
{assign var=nbCols value=`$nbCols+1`}
{assign var=nbCols value=$nbCols+1}
<th style="width:1%">&nbsp;</th>
{/if}
{if ( $prefs.use_context_menu_icon eq 'y' or $prefs.use_context_menu_text eq 'y' ) and $gal_info.show_action neq 'n' and $prefs.javascript_enabled eq 'y'}
{assign var=nbCols value=`$nbCols+1`}
{assign var=nbCols value=$nbCols+1}
<th style="width:1%">&nbsp;</th>
{/if}
......@@ -37,12 +37,12 @@
{/if}
{/if}
{if isset($gal_info.$key_name) and ( $gal_info.$key_name eq 'y' or $gal_info.$key_name eq 'i' or $gal_info.$key_name eq 'a' or $propname eq 'name' ) }
{if isset($gal_info.$key_name) and ( $gal_info.$key_name eq 'y' or $gal_info.$key_name eq 'i' or $gal_info.$key_name eq 'a' or $propname eq 'name' )}
{assign var=propval value=$item.name}
{assign var=link_title value=''}
{assign var=td_args value=''}
{if $gal_info.$key_name eq 'i' or $propname eq 'type' or ( $propname eq 'lockedby' and $gal_info.$key_name eq 'a') }
{if $gal_info.$key_name eq 'i' or $propname eq 'type' or ( $propname eq 'lockedby' and $gal_info.$key_name eq 'a')}
{if isset($item.icon)}
{assign var=propicon value=$item.icon}
{else}
......@@ -52,15 +52,15 @@
{assign var=td_args value=$td_args|cat:' style="width:1%;text-align:center"'}
{/if}
{if $propname eq 'name' and ( $gal_info.show_name eq 'a' or $gal_info.show_name eq 'f' ) }
{assign var=nbCols value=`$nbCols+1`}
{if $propname eq 'name' and ( $gal_info.show_name eq 'a' or $gal_info.show_name eq 'f' )}
{assign var=nbCols value=$nbCols+1}
<th{$td_args}>
{self_link _sort_arg=$sort_arg _sort_field='filename'}{tr}Filename{/tr}{/self_link}
</th>
{/if}
{if !($galleryId eq 0 and $propname eq 'lockedby') and ($propname neq 'name' or ( $gal_info.show_name eq 'a' or $gal_info.show_name eq 'n' )) }
{assign var=nbCols value=`$nbCols+1`}
{if !($galleryId eq 0 and $propname eq 'lockedby') and ($propname neq 'name' or ( $gal_info.show_name eq 'a' or $gal_info.show_name eq 'n' ))}
{assign var=nbCols value=$nbCols+1}
<th{$td_args}>
{self_link _sort_arg=$sort_arg _sort_field=$propname _title=$link_title}
{if $propicon}{icon _id=$propicon alt=$link_title}{else}{$propval}{/if}
......@@ -88,7 +88,7 @@
{/if}
{if $other_columns_selected neq ''}
{assign var=nbCols value=`$nbCols+1`}
{assign var=nbCols value=$nbCols+1}
<th>
{self_link _sort_arg=$sort_arg _sort_field=$other_columns_selected _title=$fgal_listing_conf.$other_columns_selected.name}
{$fgal_listing_conf.$other_columns_selected.name}
......@@ -97,12 +97,12 @@
{/if}
{if ( $prefs.use_context_menu_icon neq 'y' and $prefs.use_context_menu_text neq 'y' ) or $gal_info.show_action eq 'y' or $prefs.javascript_enabled neq 'y'}
{assign var=nbCols value=`$nbCols+1`}
{assign var=nbCols value=$nbCols+1}
<th>{tr}Actions{/tr}</th>
{/if}
{if ( $other_columns neq '' or $other_columns_selected neq '' ) and $prefs.javascript_enabled eq 'y'}
{assign var=nbCols value=`$nbCols+1`}
{assign var=nbCols value=$nbCols+1}
<th style="width:1%">
{if $other_columns neq ''}
<a href='#' {popup trigger="onClick" sticky=1 mouseoff=1 fullhtml="1" text=$smarty.capture.over_other_columns|escape:"javascript"|escape:"html"} title="{tr}Other Sorts{/tr}">
......@@ -118,7 +118,7 @@
{cycle values="odd,even" print=false}
{section name=changes loop=$files}
{if ( ( ! isset($fileId) ) || $fileId == 0 ) || ( $fileId == $files[changes].id ) }
{if ( ( ! isset($fileId) ) || $fileId == 0 ) || ( $fileId == $files[changes].id )}
{if ( $prefs.use_context_menu_icon eq 'y' or $prefs.use_context_menu_text eq 'y' ) and $gal_info.show_action neq 'y'}
{capture name=over_actions}
{strip}
......@@ -172,10 +172,10 @@
{assign var=propval value=$files[changes].nbBacklinks}
{/if}
{if isset($gal_info.$propkey) and $propval neq '' and ( $gal_info.$propkey eq 'a' or $gal_info.$propkey eq 'o' ) }
{if isset($gal_info.$propkey) and $propval neq '' and ( $gal_info.$propkey eq 'a' or $gal_info.$propkey eq 'o' )}
<b>{$fgal_listing_conf.$propname.name}</b>: {$propval}
<br />
{assign var=nb_over_infos value=`$nb_over_infos+1`}
{assign var=nb_over_infos value=$nb_over_infos+1}
{/if}
{/foreach}
</div>
......@@ -198,7 +198,7 @@
<div>
{foreach item=prop key=propname from=$files[changes].share.data}
<b>{$prop.email}</b>: {$prop.visit} / {$prop.maxhits}<br />
{assign var=nb_over_share value=`$nb_over_share+1`}
{assign var=nb_over_share value=$nb_over_share+1}
{/foreach}
</div>
</div>
......@@ -244,7 +244,7 @@
{assign var=key_name value="show_$propname"}
{/if}
{if isset($gal_info.$key_name) and ( $gal_info.$key_name eq 'y' or $gal_info.$key_name eq 'a' or $gal_info.$key_name eq 'i' or $propname eq 'name' or ( $other_columns_selected neq '' and $propname eq $other_columns_selected ) ) }
{if isset($gal_info.$key_name) and ( $gal_info.$key_name eq 'y' or $gal_info.$key_name eq 'a' or $gal_info.$key_name eq 'i' or $propname eq 'name' or ( $other_columns_selected neq '' and $propname eq $other_columns_selected ) )}
{assign var=propval value=$files[changes].$propname|escape}
{* build link *}
......@@ -299,7 +299,7 @@
{/if}
{elseif $propname eq 'description' and $gal_info.max_desc gt 0}
{assign var=propval value=$propval|truncate:$gal_info.max_desc:"...":false|nl2br}
{elseif $propname eq 'description' }
{elseif $propname eq 'description'}
{assign var=propval value=$propval|nl2br}
{elseif $propname eq 'lockedby' and $propval neq ''}
{if $gal_info.show_lockedby eq 'i' or $gal_info.show_lockedby eq 'a'}
......@@ -345,7 +345,7 @@
{/if}
{/if}
{/if}
{if $propname eq 'name' and ( $gal_info.show_name eq 'a' or $gal_info.show_name eq 'f' ) }
{if $propname eq 'name' and ( $gal_info.show_name eq 'a' or $gal_info.show_name eq 'f' )}
<td>
{if $link neq ''}<a class='fgalname fileLink' fileId='{$files[changes].id}' type='{$files[changes].type}' {$link}>{/if}{$files[changes].filename|escape}{if $link neq ''}</a>{/if}
</td>
......@@ -354,7 +354,7 @@
{if $other_columns_selected neq '' and $propname eq $other_columns_selected}
{assign var=other_columns_selected_val value=$propval}
{else}
{if !($galleryId eq 0 and $propname eq 'lockedby') and ($propname neq 'name' or ( $gal_info.show_name eq 'a' or $gal_info.show_name eq 'n' )) }
{if !($galleryId eq 0 and $propname eq 'lockedby') and ($propname neq 'name' or ( $gal_info.show_name eq 'a' or $gal_info.show_name eq 'n' ))}
<td>{$propval}</td>
{/if}
{/if}
......
......@@ -149,7 +149,7 @@
<small>{tr}select zoom/pan/query and image size{/tr}</small>
</td></tr>
<tr><td align="center">
{if $map_view eq "" }
{if $map_view eq ""}
{*if view is empty do not display empty list*}
{else}
<select name="view" size="1">
......@@ -208,7 +208,7 @@
<th><img src="pics/icons/disk.png" width="16" height="16" alt="{tr}Download{/tr}" title="{tr}Download{/tr}" /></th>
</tr>
{section name=j loop=$my_layers}
{if $my_layers[j]->group neq "" }
{if $my_layers[j]->group neq ""}
{if $my_layers[j]->group eq $unique_layer_group[j]}
<tr>
{if $smarty.section.j.index % 2}
......@@ -228,7 +228,7 @@
<div id='submenu{$unique_layer_group[j]}' style="{$mnu_submenu}">
<table class="normal">
{section name=i loop=$my_layers}
{if $my_layers[i]->group neq "" }
{if $my_layers[i]->group neq ""}
{if $my_layers[i]->group == $my_layers[j]->group}
<tr>
......
......@@ -22,8 +22,8 @@
</a>
</span>
{/if}
{if $module_notitle ne 'y' }
<span class="moduletitle">{$module_title}</span>
{if $module_notitle ne 'y'}
<span class="moduletitle">{$module_title}</span>
{/if}
{if $module_flip eq 'y' and $prefs.javascript_enabled ne 'n'}
<span class="moduleflip" id="moduleflip-{$smarty.capture.name}">
......@@ -32,18 +32,18 @@
</a>
</span>
{if $prefs.menus_items_icons eq 'y'}
<span class="moduleflip moduleflip-vert" id="moduleflip-vert-{$smarty.capture.name}">
<a title="{tr}Toggle module contents{/tr}" class="flipmodtitle" href="javascript:flip_class('main','minimize-modules-left','maximize-modules');icntoggle('modv-{$smarty.capture.name}','vmodule.png');">
{capture name=name}
icnmodv-{$smarty.capture.name}
{/capture}
{icon name=icnmod-"|cat:$smarty.capture.name class="flipmodimage" _id="trans" alt="[{tr}Toggle Vertically{/tr}]" _defaultdir="pics"}
</a>
</span>
<span class="moduleflip moduleflip-vert" id="moduleflip-vert-{$smarty.capture.name}">
<a title="{tr}Toggle module contents{/tr}" class="flipmodtitle" href="javascript:flip_class('main','minimize-modules-left','maximize-modules');icntoggle('modv-{$smarty.capture.name}','vmodule.png');">
{capture name='name'}
icnmodv-{$smarty.capture.name}
{/capture}
{icon name="icnmod-"|cat:$smarty.capture.name class="flipmodimage" _id="trans" alt="[{tr}Toggle Vertically{/tr}]" _defaultdir="pics"}
</a>
</span>
{/if}
{/if}
<!--[if IE]><br class="clear" style="height: 1px !important" /><![endif]--></h3>
{elseif $module_notitle ne 'y' }
{elseif $module_notitle ne 'y'}
{if $module_flip eq 'y' and $prefs.javascript_enabled ne 'n'}
<h3 class="box-title" ondblclick="javascript:icntoggle('mod-{$smarty.capture.name}','module.png');"{if !empty($module_params.color)} style="color:{$module_params.color};"{/if}>
{else}
......@@ -53,11 +53,11 @@
{if $module_flip eq 'y' and $prefs.javascript_enabled ne 'n'}
<span id="moduleflip-{$smarty.capture.name}">
<a title="{tr}Toggle module contents{/tr}" class="flipmodtitle" href="javascript:icntoggle('mod-{$smarty.capture.name}','module.png');">
{assign var=name value=`icnmod-$smarty.capture.name`}
{assign var="name" value="icnmod-"|cat:$smarty.capture.name}
{capture name=name}
icnmod-{$smarty.capture.name}
{/capture}
{icon name=icnmod-"|cat:$smarty.capture.name class="flipmodimage" _id="module" alt="[{tr}Hide{/tr}]"}
{icon name="icnmod-"|cat:$smarty.capture.name class="flipmodimage" _id="module" alt="[{tr}Hide{/tr}]"}
</a>
</span>
{/if}
......
......@@ -15,7 +15,7 @@
<legend>{tr}Your Groups{/tr}</legend>
<ul >
{foreach from=$userGroups key=groupname item=inclusion name=ix}
{if $inclusion eq 'included' }
{if $inclusion eq 'included'}
<li><i>{$groupname|escape}</i></li>
{else}
<li>{$groupname|escape}</li>
......@@ -24,7 +24,7 @@
</ul >