diff options
| -rwxr-xr-x | templates/article_display.tpl | 14 | ||||
| -rwxr-xr-x | templates/article_filter_inc.tpl | 2 | ||||
| -rwxr-xr-x | templates/articles_nav.tpl | 2 | ||||
| -rwxr-xr-x | templates/center_list_articles.tpl | 6 | ||||
| -rwxr-xr-x | templates/edit_article.tpl | 6 | ||||
| -rwxr-xr-x | templates/menu_articles.tpl | 6 |
6 files changed, 18 insertions, 18 deletions
diff --git a/templates/article_display.tpl b/templates/article_display.tpl index b457631..1757881 100755 --- a/templates/article_display.tpl +++ b/templates/article_display.tpl @@ -7,7 +7,7 @@ <div class="{$outer_div|default:"post"}"> <div class="floaticon"> {include file="bitpackage:liberty/services_inc.tpl" serviceLocation='icon' serviceHash=$article} - {if $gContent->hasUserPermission( 'p_articles_read_history' ) && !$version && $article.version > 1} + {if $gContent->hasUserPermission( 'p_articles_read_history' ) and !$version and $article.version > 1} {smartlink ititle="View History" ipackage=articles ifile="article_history.php" booticon="icon-time" article_id=$article.article_id} {/if} {if $gContent->hasUpdatePermission()} @@ -21,7 +21,7 @@ <div class="header"> <h1>{$article.title|escape}</h1> - {if $article.show_author eq 'y' || $article.show_pubdate eq 'y'} + {if $article.show_author eq 'y' or $article.show_pubdate eq 'y'} <div class="date"> {if $article.show_author eq 'y'} {* can't really use the link here since it only works when the user uses his login name *} @@ -39,7 +39,7 @@ <div class="content"> {include file="bitpackage:liberty/services_inc.tpl" serviceLocation='body' serviceHash=$article} {* deal with the article image if there is one *} - {if $article.show_image eq 'y' && ( $article.thumbnail_url || $article.primary_attachment )} + {if $article.show_image eq 'y' and ( $article.thumbnail_url or $article.primary_attachment )} <div class="image"> {assign var=size value=$gBitSystem->getConfig('articles_image_size','small')} {if $showDescriptionsOnly and $article.has_more}<a href="{$article.display_url}">{/if} @@ -53,7 +53,7 @@ {/if} {if $article.show_image eq 'y'}{assign var=hideprimary value=y}{/if} - {if $gBitSystem->isFeatureActive( 'articles_attachments' ) && $gBitSystem->isFeatureActive( 'liberty_auto_display_attachment_thumbs' )} + {if $gBitSystem->isFeatureActive( 'articles_attachments' ) and $gBitSystem->isFeatureActive( 'liberty_auto_display_attachment_thumbs' )} {include file="bitpackage:liberty/storage_thumbs.tpl"} {/if} @@ -104,7 +104,7 @@ {/if} </div> - {if $article.status_id == $smarty.const.ARTICLE_STATUS_PENDING && !$preview} + {if $article.status_id == $smarty.const.ARTICLE_STATUS_PENDING and !$preview} <div class="form-group"> {formlabel label="Approve or deny Submission"} {forminput} @@ -112,7 +112,7 @@ <a href="{$smarty.const.ARTICLES_PKG_URL}list.php?status_id={$article.status_id}&article_id={$article.article_id}&content_id={$article.content_id}&set_status_id=300&action=approve">{biticon ipackage=icons iname="large/dialog-ok" iexplain="Approve Article"}</a> {/if} - {if $gContent->hasUserPermission( 'p_articles_remove' ) || $gContent->hasUserPermission( 'p_articles_remove_submission' )} + {if $gContent->hasUserPermission( 'p_articles_remove' ) or $gContent->hasUserPermission( 'p_articles_remove_submission' )} <a href="{$smarty.const.ARTICLES_PKG_URL}list.php?status_id={$article.status_id}&remove_article_id={$article.article_id}&action=remove">{biticon ipackage=icons iname="large/dialog-cancel" iexplain="Remove Article"}</a> {/if} {/forminput} @@ -122,7 +122,7 @@ </div><!-- end .body --> </div><!-- end .article --> -{if $print_page ne 'y' and $article.allow_comments eq 'y' and !$preview && !$showDescriptionsOnly and $article.status_id eq $smarty.const.ARTICLE_STATUS_APPROVED} +{if $print_page ne 'y' and $article.allow_comments eq 'y' and !$preview and !$showDescriptionsOnly and $article.status_id eq $smarty.const.ARTICLE_STATUS_APPROVED} {include file="bitpackage:liberty/comments.tpl"} {/if} diff --git a/templates/article_filter_inc.tpl b/templates/article_filter_inc.tpl index ce6b8ee..ff99c13 100755 --- a/templates/article_filter_inc.tpl +++ b/templates/article_filter_inc.tpl @@ -1,4 +1,4 @@ -{if ( $gBitUser->isAdmin() || $gBitUser->hasPermission( 'p_articles_admin' ) ) and $gBitSystem->isFeatureActive( 'articles_display_filter_bar' ) and $filter} +{if ( $gBitUser->isAdmin() or $gBitUser->hasPermission( 'p_articles_admin' ) ) and $gBitSystem->isFeatureActive( 'articles_display_filter_bar' ) and $filter} {form} <table class="optionbar"> <caption>{tr}Article Filter{/tr}</caption> diff --git a/templates/articles_nav.tpl b/templates/articles_nav.tpl index 93a9b8e..0703d83 100755 --- a/templates/articles_nav.tpl +++ b/templates/articles_nav.tpl @@ -5,7 +5,7 @@ <li><a href="{$smarty.const.ARTICLES_PKG_URL}list_submissions.php">{tr}List submissions{/tr}</a></li> {if $gBitUser->hasPermission( 'p_articles_submit' )} <li><a href="{$smarty.const.ARTICLES_PKG_URL}edit.php">{tr}Submit article{/tr}</a></li> - {elseif $gBitUser->hasPermission( 'p_articles_auto_approve' ) || $gBitUser->hasPermission( 'p_articles_approve_submission' )} + {elseif $gBitUser->hasPermission( 'p_articles_auto_approve' ) or $gBitUser->hasPermission( 'p_articles_approve_submission' )} <li><a href="{$smarty.const.ARTICLES_PKG_URL}edit.php">{tr}New article{/tr}</a></li> {/if} </ul> diff --git a/templates/center_list_articles.tpl b/templates/center_list_articles.tpl index 41fe4cc..f009ac6 100755 --- a/templates/center_list_articles.tpl +++ b/templates/center_list_articles.tpl @@ -8,7 +8,7 @@ {formfeedback success=$smarty.request.feedback|default:''} {include file="bitpackage:articles/article_filter_inc.tpl"} - {if $gBitUser->hasPermission( 'p_articles_admin' ) && $futures} + {if $gBitUser->hasPermission( 'p_articles_admin' ) and $futures} <h3>{tr}Upcoming Articles{/tr}</h3> <ul> {foreach from=$futures item=future} @@ -16,14 +16,14 @@ {/foreach} </ul> {/if} - {if $gBitUser->hasPermission( 'p_articles_approve_submission' ) && $submissions} + {if $gBitUser->hasPermission( 'p_articles_approve_submission' ) and $submissions} <h3>{tr}Submitted Articles{/tr}</h3> <ul> {foreach from=$submissions item=submission} <li>{$submission.display_link} <small>[ {tr}Submitted{/tr}: {$submission.last_modified|bit_long_datetime} ]</small></li> {/foreach} </ul> - {elseif $submissions && $gBitSystem->isFeatureActive('articles_auto_approve') && $gBitUser->isRegistered()} + {elseif $submissions and $gBitSystem->isFeatureActive('articles_auto_approve') and $gBitUser->isRegistered()} <h3 style="margin-bottom:1em;">{tr}There are <a href="{$smarty.const.ARTICLES_PKG_URL}list.php?status_id={$smarty.const.ARTICLE_STATUS_PENDING}">more articles</a> that haven't made it here yet{/tr}</h3> {/if} diff --git a/templates/edit_article.tpl b/templates/edit_article.tpl index 6f27f40..c0239a1 100755 --- a/templates/edit_article.tpl +++ b/templates/edit_article.tpl @@ -9,7 +9,7 @@ <div class="header"> {if $gContent->mArticleId} <h1>{tr}Edit Article{/tr}: {$article.title|escape}</h1> - {elseif $gContent->hasUserPermission('p_articles_approve_submission') || $gContent->hasUserPermission('p_articles_auto_approve')} + {elseif $gContent->hasUserPermission('p_articles_approve_submission') or $gContent->hasUserPermission('p_articles_auto_approve')} <h1>{tr}Create Article{/tr}</h1> {else} <h1>{tr}Submit Article{/tr}</h1> @@ -115,7 +115,7 @@ {include file="bitpackage:liberty/edit_services_inc.tpl" serviceFile="content_edit_mini_tpl"} - {if $gBitSystem->isFeatureActive( 'articles_submissions_rnd_img' ) && !( $gContent->mArticleId || ( $gContent->hasUserPermission('p_articles_approve_submission') || $gContent->hasUserPermission('p_articles_auto_approve') ) )} + {if $gBitSystem->isFeatureActive( 'articles_submissions_rnd_img' ) and !( $gContent->mArticleId or ( $gContent->hasUserPermission('p_articles_approve_submission') or $gContent->hasUserPermission('p_articles_auto_approve') ) )} <hr /> {formfeedback error=$errors.captcha} {* captcha force=true variant=row *} @@ -158,7 +158,7 @@ {/legend} {/jstab} - {if $gBitSystem->isFeatureActive( 'articles_attachments' ) && $gBitUser->hasPermission('p_liberty_attach_attachments') } + {if $gBitSystem->isFeatureActive( 'articles_attachments' ) and $gBitUser->hasPermission('p_liberty_attach_attachments') } {jstab title="Attachments"} {legend legend="Attachment Browser"} {include file="bitpackage:liberty/edit_storage.tpl" formid="writearticle"} diff --git a/templates/menu_articles.tpl b/templates/menu_articles.tpl index e14b30b..71ee074 100755 --- a/templates/menu_articles.tpl +++ b/templates/menu_articles.tpl @@ -6,7 +6,7 @@ {if $gBitUser->hasPermission( 'p_articles_approve_submission ' ) || $gBitUser->hasPermission( 'p_articles_auto_approve') || $gBitUser->hasPermission( 'p_articles_submit' ) } - {if $gBitUser->hasPermission( 'p_articles_approve_submission ' ) || $gBitUser->hasPermission( 'p_articles_auto_approve' )} + {if $gBitUser->hasPermission( 'p_articles_approve_submission ' ) or $gBitUser->hasPermission( 'p_articles_auto_approve' )} {assign var=iexplain value="Write Article"} {else} {assign var=iexplain value="Submit Article"} @@ -19,14 +19,14 @@ {if $gBitUser->hasPermission( 'p_articles_submit ' ) || $gBitUser->hasPermission( 'p_articles_approve_submission ' ) || $gBitUser->hasPermission( 'p_articles_remove_submission ' ) || - ($gBitSystem->isFeatureActive('articles_auto_approve') && $gBitUser->isRegistered())} + ($gBitSystem->isFeatureActive('articles_auto_approve') and $gBitUser->isRegistered())} <li><a class="item" href="{$smarty.const.ARTICLES_PKG_URL}list.php?status_id="{$smarty.const.ARTICLE_STATUS_PENDING}">{booticon iname="icon-list" ipackage="icons" iexplain="List Submissions" ilocation="menu"}</a></li> {/if} {/if} {if $gBitUser->hasPermission( 'p_articles_admin' )} <li><a class="item" href="{$smarty.const.ARTICLES_PKG_URL}list.php?get_future=1">{booticon iname="icon-list" ipackage="icons" iexplain="List Upcoming" ilocation=menu}</a></li> {/if} - {if $gBitSystem->isFeatureActive( 'articles_rankings' ) && $gBitUser->hasPermission( 'p_articles_read ' )} + {if $gBitSystem->isFeatureActive( 'articles_rankings' ) and $gBitUser->hasPermission( 'p_articles_read ' )} <li><a class="item" href="{$smarty.const.ARTICLES_PKG_URL}rankings.php">{booticon iname="icon-sort" ipackage="icons" iexplain="Article Rankings" ilocation=menu}</a></li> {/if} {if $gBitUser->hasPermission( 'p_articles_read' )} |