diff options
| author | Max Kremmel <xing@synapse.plus.com> | 2005-11-22 07:25:48 +0000 |
|---|---|---|
| committer | Max Kremmel <xing@synapse.plus.com> | 2005-11-22 07:25:48 +0000 |
| commit | 71866708351b4afcf2788e9d14b09648ae2344a5 (patch) | |
| tree | 92dc917773700ec3b1f204761a2d861a199f999c /admin | |
| parent | dafea8f5bb826fba9321e08ec18ab3bdddac19e1 (diff) | |
| download | fisheye-71866708351b4afcf2788e9d14b09648ae2344a5.tar.gz fisheye-71866708351b4afcf2788e9d14b09648ae2344a5.tar.bz2 fisheye-71866708351b4afcf2788e9d14b09648ae2344a5.zip | |
merge recent changes into HEAD
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/admin_fisheye_inc.php | 4 | ||||
| -rw-r--r-- | admin/schema_inc.php | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/admin/admin_fisheye_inc.php b/admin/admin_fisheye_inc.php index 6776759..9fb8844 100644 --- a/admin/admin_fisheye_inc.php +++ b/admin/admin_fisheye_inc.php @@ -101,6 +101,10 @@ $formImageLists = array( 'label' => 'Use icons in the gallery bar', 'note' => 'When viewing an image, show <strong>previous</strong> and <strong>next</strong> links as images instead of words', ), + "gallery_bar_use_thumbnails" => array( + 'label' => 'Use Thumbnails in gallery bar', + 'note' => 'When viewing an image, show previous and next <strong>thumbnails</strong> with the appropriate links.', + ), ); $gBitSmarty->assign( 'formImageLists', $formImageLists); diff --git a/admin/schema_inc.php b/admin/schema_inc.php index 5dc5317..a649975 100644 --- a/admin/schema_inc.php +++ b/admin/schema_inc.php @@ -95,7 +95,8 @@ $gBitInstaller->registerUserPermissions( FISHEYE_PKG_NAME, array( array('bit_p_create_fisheye', 'Can create an image gallery', 'registered', FISHEYE_PKG_NAME), array('bit_p_edit_fisheye', 'Can edit image gallery', 'registered', FISHEYE_PKG_NAME), array('bit_p_upload_fisheye', 'Can upload images to gallery', 'registered', FISHEYE_PKG_NAME), - array('bit_p_admin_fisheye', 'Can admin image galleries', 'editors', FISHEYE_PKG_NAME) + array('bit_p_admin_fisheye', 'Can admin image galleries', 'editors', FISHEYE_PKG_NAME), + array('bit_p_fisheye_upload_nonimages', 'Can upload non_image files', 'editors', FISHEYE_PKG_NAME) ) ); ?> |