diff options
| author | wjames5 <will@tekimaki.com> | 2008-10-03 17:20:15 +0000 |
|---|---|---|
| committer | wjames5 <will@tekimaki.com> | 2008-10-03 17:20:15 +0000 |
| commit | c0f6195ecc9afe97048757cf681a8e091a795052 (patch) | |
| tree | 7410335273b701f5b0ff051a922978070aa2117b /templates | |
| parent | f1c6b066757e7c52b27ace41717c691e1f45d69a (diff) | |
| download | articles-c0f6195ecc9afe97048757cf681a8e091a795052.tar.gz articles-c0f6195ecc9afe97048757cf681a8e091a795052.tar.bz2 articles-c0f6195ecc9afe97048757cf681a8e091a795052.zip | |
CORE CHANGE: cleave Create permission from Edit permission so that they are distinct. See mailing list for more detailspre_update_permission
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/article_display.tpl | 6 | ||||
| -rw-r--r-- | templates/print_article.tpl | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/templates/article_display.tpl b/templates/article_display.tpl index d9b896a..a17046e 100644 --- a/templates/article_display.tpl +++ b/templates/article_display.tpl @@ -1,4 +1,4 @@ -{* $Header: /cvsroot/bitweaver/_bit_articles/templates/article_display.tpl,v 1.52 2008/07/25 19:28:17 bitweaver Exp $ *} +{* $Header: /cvsroot/bitweaver/_bit_articles/templates/article_display.tpl,v 1.53 2008/10/03 17:20:15 wjames5 Exp $ *} {strip} {if !$showDescriptionsOnly} {include file="bitpackage:liberty/services_inc.tpl" serviceLocation='nav' serviceHash=$article} @@ -10,7 +10,7 @@ {if $gContent->hasUserPermission( 'p_articles_read_history' ) && !$version && $article.version > 1} {smartlink ititle="View History" ipackage=articles ifile="article_history.php" ibiticon="icons/appointment-new" article_id=$article.article_id} {/if} - {if $gContent->hasUserPermission( 'p_articles_edit' ) || ( $gBitUser->getField( 'user_id' ) != $smarty.const.ANONYMOUS_USER_ID && $gContent->isOwner( $article )) } + {if $gContent->hasEditPermission()} <a href="{$smarty.const.ARTICLES_PKG_URL}edit.php?article_id={$article.article_id}">{biticon ipackage="icons" iname="accessories-text-editor" iexplain=edit}</a> {/if} {*<a style="display:none;" href="{$smarty.const.ARTICLES_PKG_URL}print.php?article_id={$article.article_id}">{biticon ipackage="icons" iname="document-print" iexplain=print}</a>*} @@ -35,7 +35,7 @@ {/if} </div> - <div class="body"{if $gBitUser->getPreference( 'users_double_click' ) and $gContent->hasUserPermission( 'p_articles_edit' )} ondblclick="location.href='{$smarty.const.ARTICLES_PKG_URL}edit.php?article_id={$article.article_id}';"{/if}> + <div class="body"{if $gBitUser->getPreference( 'users_double_click' ) and $gContent->hasEditPermission()} ondblclick="location.href='{$smarty.const.ARTICLES_PKG_URL}edit.php?article_id={$article.article_id}';"{/if}> <div class="content"> {include file="bitpackage:liberty/services_inc.tpl" serviceLocation='body' serviceHash=$article} {* deal with the article image if there is one *} diff --git a/templates/print_article.tpl b/templates/print_article.tpl index 8db66db..ccafce8 100644 --- a/templates/print_article.tpl +++ b/templates/print_article.tpl @@ -1,4 +1,4 @@ -{* $Header: /cvsroot/bitweaver/_bit_articles/templates/print_article.tpl,v 1.5 2007/07/06 16:37:22 squareing Exp $ *} +{* $Header: /cvsroot/bitweaver/_bit_articles/templates/print_article.tpl,v 1.6 2008/10/03 17:20:15 wjames5 Exp $ *} {* Index we display a wiki page here *} {include file="bitpackage:kernel/header.tpl"} @@ -28,7 +28,7 @@ </div> {* end articleheading *} <div class="articletrailer"> ({$size} bytes - {if $gContent->hasUserPermission( 'p_articles_edit' )} + {if $gContent->hasEditPermission()} [<a href="{$smarty.const.ARTICLES_PKG_URL}edit.php?article_id={$article_id}">{tr}Edit{/tr}</a>] {/if} {if $gContent->hasUserPermission( 'p_articles_remove' )} |