summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--templates/list_galleries.tpl8
-rw-r--r--templates/view_gallery.tpl6
-rw-r--r--templates/view_image.tpl2
3 files changed, 8 insertions, 8 deletions
diff --git a/templates/list_galleries.tpl b/templates/list_galleries.tpl
index a4306a8..bcaafee 100644
--- a/templates/list_galleries.tpl
+++ b/templates/list_galleries.tpl
@@ -44,16 +44,16 @@
{if $gal.access_answer}
{tr}Password{/tr}
{/if}
- {* if $galleryList[ix]->hasUserPermission('p_fisheye_edit')}
+ {* if $galleryList[ix]->hasEditPermission()}
<a title="{tr}Edit{/tr}" href="{$smarty.const.FISHEYE_PKG_URL}edit.php?gallery_id={$galleryId}">{biticon ipackage="icons" iname="document-properties" iexplain="Edit"}</a>
{/if}
- {if $galleryList[ix]->hasUserPermission('p_fisheye_edit')}
+ {if $galleryList[ix]->hasEditPermission()}
<a title="{tr}Image Order{/tr}" href="{$smarty.const.FISHEYE_PKG_URL}image_order.php?gallery_id={$galleryId}">{biticon ipackage="icons" iname="emblem-default" iexplain="Item Order"}</a>
{/if}
- {if $galleryList[ix]->hasUserPermission('p_fisheye_upload')}
+ {if $galleryList[ix]->hasUserPermission('p_fisheye_upload', TRUE, FALSE)}
<a title="{tr}Add Image{/tr}" href="{$smarty.const.FISHEYE_PKG_URL}upload.php?gallery_id={$galleryId}">{biticon ipackage="icons" iname="go-up" iexplain="Add Image"}</a>
{/if}
- {if $galleryList[ix]->hasUserPermission('p_fisheye_admin')}
+ {if $galleryList[ix]->hasAdminPermission()}
<a title="{tr}User Permissions{/tr}" href="{$smarty.const.FISHEYE_PKG_URL}edit_gallery_perms.php?gallery_id={$galleryId}">{biticon ipackage="icons" iname="emblem-shared" iexplain="User Permissions"}</a>
{/if *}
</div>
diff --git a/templates/view_gallery.tpl b/templates/view_gallery.tpl
index e71a36e..57aec85 100644
--- a/templates/view_gallery.tpl
+++ b/templates/view_gallery.tpl
@@ -5,14 +5,14 @@
<div class="header">
<div class="floaticon">
{include file="bitpackage:liberty/services_inc.tpl" serviceLocation='icon' serviceHash=$gContent->mInfo}
- {if $gContent->hasUserPermission( 'p_fisheye_edit' )}
+ {if $gContent->hasEditPermission()}
<a title="{tr}Edit{/tr}" href="{$smarty.const.FISHEYE_PKG_URL}edit.php?gallery_id={$gContent->mGalleryId}">{biticon ipackage="icons" iname="document-properties" iexplain="Edit"}</a>
<a title="{tr}Image Order{/tr}" href="{$smarty.const.FISHEYE_PKG_URL}image_order.php?gallery_id={$gContent->mGalleryId}">{biticon ipackage=fisheye iname="order" iexplain="Image Order"}</a>
{/if}
- {if ( $gBitSystem->isFeatureActive( 'fisheye_show_all_to_admins' ) && $gBitUser->hasPermission( 'p_fisheye_admin' )) || ( $gContent->hasUserPermission('p_fisheye_upload') || $gContent->getPreference('is_public'))}
+ {if $gContent->hasUserPermission('p_fisheye_upload', 1, 0) || $gContent->getPreference('is_public')}
<a title="{tr}Add Image{/tr}" href="{$smarty.const.FISHEYE_PKG_URL}upload.php?gallery_id={$gContent->mGalleryId}">{biticon ipackage="icons" iname="go-up" iexplain="Add Image"}</a>{if $gContent->getPreference('is_public')}<span class="small">({tr}Public{/tr})</span>{/if}
{/if}
- {if $gContent->hasUserPermission('p_fisheye_admin')}
+ {if $gContent->hasAdminPermission()}
<a title="{tr}User Permissions{/tr}" href="{$smarty.const.FISHEYE_PKG_URL}edit.php?gallery_id={$gContent->mGalleryId}&amp;delete=1">{biticon ipackage="icons" iname="edit-delete" iexplain="Delete Gallery"}</a>
{* appears broken at the moment <a title="{tr}User Permissions{/tr}" href="{$smarty.const.FISHEYE_PKG_URL}edit_gallery_perms.php?gallery_id={$gContent->mGalleryId}">{biticon ipackage="icons" iname="emblem-shared" iexplain="User Permissions"}</a> *}
{/if}
diff --git a/templates/view_image.tpl b/templates/view_image.tpl
index 49453a1..c616b94 100644
--- a/templates/view_image.tpl
+++ b/templates/view_image.tpl
@@ -7,7 +7,7 @@
{if !$liberty_preview}
<div class="floaticon">
{include file="bitpackage:liberty/services_inc.tpl" serviceLocation='icon' serviceHash=$gContent->mInfo}
- {if $gContent->hasUserPermission('p_fisheye_edit')}
+ {if $gContent->hasEditPermission()}
<a title="{tr}Edit{/tr}" href="{$smarty.const.FISHEYE_PKG_URL}edit_image.php?image_id={$gContent->mImageId}">{biticon ipackage="icons" iname="accessories-text-editor" iexplain="Edit Image"}</a>
<a title="{tr}Delete{/tr}" href="{$smarty.const.FISHEYE_PKG_URL}edit_image.php?image_id={$gContent->mImageId}&amp;delete=1">{biticon ipackage="icons" iname="edit-delete" iexplain="Delete Image"}</a>
{/if}