diff options
| -rw-r--r-- | admin/admin_liberty_inc.php | 15 | ||||
| -rw-r--r-- | templates/admin_liberty.tpl | 10 | ||||
| -rw-r--r-- | view_file.php | 8 |
3 files changed, 24 insertions, 9 deletions
diff --git a/admin/admin_liberty_inc.php b/admin/admin_liberty_inc.php index 6435d56..20fc473 100644 --- a/admin/admin_liberty_inc.php +++ b/admin/admin_liberty_inc.php @@ -140,6 +140,11 @@ $formImageFeatures = array( 'note' => 'Automatically create JPEG versions of original images named \'original.jpg\' in the attachment directory with other thumbnails.', 'page' => '', ), + "liberty_original_image" => array( + 'label' => 'Display Original', + 'note' => 'Display a link to the original image file. This allows users to link to the originally uploaded image file. For some users this might be disorienting, since it will only display the image in the browser window. We can recommend enabling the fancy zoom option as well.', + 'page' => '', + ), ); $gBitSmarty->assign( 'formImageFeatures', $formImageFeatures ); @@ -151,6 +156,8 @@ $thumbFormats = array( ); $gBitSmarty->assign( 'thumbFormats', $thumbFormats ); +$gBitSmarty->assign( 'imageSizes', get_image_size_options() ); + $formValues = array( 'image_processor', 'liberty_attachment_link_format', 'comments_per_page', 'comments_default_ordering', 'comments_default_display_mode' ); if( !empty( $_REQUEST['change_prefs'] )) { @@ -166,6 +173,7 @@ if( !empty( $_REQUEST['change_prefs'] )) { } simple_set_int( 'liberty_thumbnail_quality', LIBERTY_PKG_NAME ); simple_set_value( 'liberty_thumbnail_format', LIBERTY_PKG_NAME ); + simple_set_value( 'liberty_thumbnail_size', LIBERTY_PKG_NAME ); simple_set_value( 'liberty_attachment_style', LIBERTY_PKG_NAME ); $gBitSystem->storeConfig( 'liberty_cache', $_REQUEST['liberty_cache'], LIBERTY_PKG_NAME ); $gBitSystem->storeConfig( 'liberty_auto_display_attachment_thumbs', $_REQUEST['liberty_auto_display_attachment_thumbs'], LIBERTY_PKG_NAME ); @@ -174,11 +182,4 @@ if( !empty( $_REQUEST['change_prefs'] )) { simple_set_value( $item, LIBERTY_PKG_NAME ); } } - -$thumbSizes[''] = tra( 'Off' ); -foreach( array_keys( $gThumbSizes ) as $thumb ) { - $thumbSizes[$thumb] = tra( ucfirst( $thumb )); -} -$gBitSmarty->assign( 'thumbSizes', $thumbSizes ); - ?> diff --git a/templates/admin_liberty.tpl b/templates/admin_liberty.tpl index 2094610..58052ec 100644 --- a/templates/admin_liberty.tpl +++ b/templates/admin_liberty.tpl @@ -16,7 +16,7 @@ <div class="row"> {formlabel label="Auto-Display Attachment Thumbnails" for="liberty_auto_display_attachment_thumbs"} {forminput} - {html_options options=$thumbSizes name="liberty_auto_display_attachment_thumbs" id="liberty_auto_display_attachment_thumbs" selected=$gBitSystem->getConfig('liberty_auto_display_attachment_thumbs')} + {html_options options=$imageSizes name="liberty_auto_display_attachment_thumbs" id="liberty_auto_display_attachment_thumbs" selected=$gBitSystem->getConfig('liberty_auto_display_attachment_thumbs')} {formhelp note='This will automatically display thumbnails of all attachments of a given page (usually in the top right corner of the page). You can still display the items inline as well.' page=''} {/forminput} </div> @@ -129,6 +129,14 @@ {formhelp note="Every image-type has its pros and cons: jpgs are usually small in size but don't support transparency, gif transparency is limited and pngs can be large. If you let bitweaver select what format to use, we will do our best to pick a sensible filetype based on the format uploaded."} {/forminput} </div> + + <div class="row"> + {formlabel label="Thumbnail Size" for="liberty_thumbnail_size"} + {forminput} + {html_options options=$imageSizes name="liberty_thumbnail_size" id="liberty_thumbnail_size" selected=$gBitSystem->getConfig('liberty_thumbnail_size')|default:medium} + {formhelp note='Set the default thumbnail size when viewing image details.'} + {/forminput} + </div> {/legend} {/jstab} {/jstabs} diff --git a/view_file.php b/view_file.php index 8fc43e9..b966dae 100644 --- a/view_file.php +++ b/view_file.php @@ -1,6 +1,6 @@ <?php /** - * @version $Header: /cvsroot/bitweaver/_bit_liberty/view_file.php,v 1.5 2008/07/18 12:39:38 squareing Exp $ + * @version $Header: /cvsroot/bitweaver/_bit_liberty/view_file.php,v 1.6 2009/01/10 07:58:31 squareing Exp $ * * @author xing <xing@synapse.plus.com> * @package treasury @@ -42,6 +42,12 @@ if( $gLibertySystem->isPluginActive( 'filterattachment' )) { $gBitSmarty->assign( 'usage', attachment_filter_get_usage( $attachment['attachment_id'] )); } +if( empty( $_REQUEST['size'] )) { + $_REQUEST['size'] = $gBitSystem->getConfig( 'liberty_thumbnail_size', 'medium' ); +} + +$attachment['original'] = ( $gContent->isOwner( $attachment ) || $gBitSystem->isFeatureActive( 'liberty_original_image' )); + $gBitSmarty->assign( 'attachment', $attachment ); $gBitSmarty->assign( 'gContent', $gContent ); $gBitSmarty->assign( 'feedback', $feedback ); |