diff options
| -rw-r--r-- | actions/admin/imtest.php | 2 | ||||
| -rw-r--r-- | languages/en.php | 18 | ||||
| -rw-r--r-- | start.php | 2 | ||||
| -rw-r--r-- | views/default/admin/administer_utilities/tidypics_tools.php (renamed from views/default/admin/administer_utilities/tidypics_server_info.php) | 40 | ||||
| -rw-r--r-- | views/default/tidypics/admin/imagelib.php | 62 |
5 files changed, 57 insertions, 67 deletions
diff --git a/actions/admin/imtest.php b/actions/admin/imtest.php index 293a9b2e8..a58643d0e 100644 --- a/actions/admin/imtest.php +++ b/actions/admin/imtest.php @@ -2,7 +2,7 @@ /** * Tidypics ImageMagick Location Test * - * Called through ajax + * Called through ajax. Not a registered Elgg action. */ $location = $_GET['location']; diff --git a/languages/en.php b/languages/en.php index 4e56c0074..cb3b370f9 100644 --- a/languages/en.php +++ b/languages/en.php @@ -15,7 +15,7 @@ $english = array( 'tidypics:enabled' => 'Enabled', 'admin:settings:tidypics' => 'Tidypics', 'admin:statistics:tidypics' => 'Tidypics', - 'admin:administer_utilities:tidypics_server_info' => 'Tidypics Server Analysis', + 'admin:administer_utilities:tidypics_tools' => 'Tidypics Tools', 'photos:add' => "Create album", 'images:upload' => "Upload photos", @@ -103,6 +103,7 @@ $english = array( 'tidypics:stats:tags' => 'Total tags', // server analysis + 'tidypics:server_info' => 'Server information', 'tidypics:server_info:gd_desc' => 'Elgg requires the GD extension to be loaded', 'tidypics:server_info:exec_desc' => 'Required for ImageMagick command line', 'tidypics:server_info:memory_limit_desc' => 'Change memory_limit to increase', @@ -124,6 +125,21 @@ $english = array( 'tidypics:server_configuration_doc' => 'Server configuration documentation', + // library tools + 'tidypics:lib_tools' => 'Image library tools', + 'tidypics:lib_tools:overview' => + 'An image library is required by Tidypics to perform various manipulations: resizing on upload, watermarking, rotation, and cropping. + There are three image library options with Tidypics: PHP extension <a href="http://www.php.net/manual/en/book.image.php">GD</a>, + <a href="http://www.imagemagick.org/">ImageMagick</a> called via a system call, and the PHP extension + <a href="http://pecl.php.net/package/imagick/">imagick</a>. GD is the most common of the three on hosted servers but suffers + from serious memory usage problems when resizing photos. If you have access to ImageMagick (whether through system calls or the + PHP extension), we recommend that you use that.', + 'tidypics:lib_tools:testing' => + 'To use the ImageMagick executables, PHP must be configured to allow calls to exec(). You can see the + configuration of your server above. Next, you need to determine the path to ImageMagick on your server. Your hosting service should + be able to provide this to you. You can test if the location is correct below. If successful, it should display the version of + ImageMagick installed on your server.', + //actions 'album:create' => "Create new album", 'album:add' => "Add Photo Album", @@ -51,7 +51,7 @@ function tidypics_init() { // Add admin menu items elgg_register_admin_menu_item('configure', 'tidypics', 'settings'); elgg_register_admin_menu_item('administer', 'tidypics', 'statistics'); - elgg_register_admin_menu_item('administer', 'tidypics_server_info', 'administer_utilities'); + elgg_register_admin_menu_item('administer', 'tidypics_tools', 'administer_utilities'); // Register for search elgg_register_entity_type('object', 'image'); diff --git a/views/default/admin/administer_utilities/tidypics_server_info.php b/views/default/admin/administer_utilities/tidypics_tools.php index 6a034a561..1df664be8 100644 --- a/views/default/admin/administer_utilities/tidypics_server_info.php +++ b/views/default/admin/administer_utilities/tidypics_tools.php @@ -3,8 +3,9 @@ * Tidypics server analysis */ -$title = elgg_echo('admin:administer_utilities:tidypics_server_info'); +$title = elgg_echo('admin:administer_utilities:tidypics_tools'); +// server info function tp_readable_size($bytes) { if (strpos($bytes, 'M')) { return $bytes . 'B'; @@ -127,4 +128,39 @@ ob_start(); $content = ob_get_clean(); -echo elgg_view_module('inline', elgg_echo('admin:administer_utilities:tidypics_server_info'), $content); +echo elgg_view_module('inline', elgg_echo('tidypics:server_info'), $content); + +// image library tools +$content = '<p>' . elgg_echo('tidypics:lib_tools:overview') . '</p>'; +$content .= '<p>' . elgg_echo('tidypics:lib_tools:testing') . '</p>'; +$content .= '<p><label>' . elgg_echo('tidypics:settings:im_path'); +$content .= elgg_view('input/text', array( + 'name' => 'im_location' +)); +$content .= elgg_view('input/submit', array( + 'value' => elgg_echo('submit'), + 'id' => 'tidypics-im-test' +)); +$content .= '</p>'; +$content .= '<p id="tidypics-im-results"></p>'; + +echo elgg_view_module('inline', elgg_echo('tidypics:lib_tools'), $content); + +?> +<script type="text/javascript"> + $(function() { + $('#tidypics-im-test').click(function() { + var loc = $('input[name=im_location]').val(); + $("#tidypics-im-results").html(""); + $.ajax({ + type: "GET", + url: elgg.normalize_url('mod/tidypics/actions/admin/imtest.php'), + data: {location: loc}, + cache: false, + success: function(html){ + $("#tidypics-im-results").html(html); + } + }); + }); + }); +</script> diff --git a/views/default/tidypics/admin/imagelib.php b/views/default/tidypics/admin/imagelib.php deleted file mode 100644 index 2b7a3a7b0..000000000 --- a/views/default/tidypics/admin/imagelib.php +++ /dev/null @@ -1,62 +0,0 @@ -<?php - -$img_type = get_subtype_id('object', 'image'); -$query = "SELECT count(guid) as total from {$CONFIG->dbprefix}entities where subtype={$img_type}"; -$total = get_data_row($query); -$num_images = $total->total; - -$img_type = get_subtype_id('object', 'album'); -$query = "SELECT count(guid) as total from {$CONFIG->dbprefix}entities where subtype={$img_type}"; -$total = get_data_row($query); -$num_albums = $total->total; - -$num_comments_photos = count_annotations(0, 'object', 'image', 'generic_comment'); -$num_comments_albums = count_annotations(0, 'object', 'album', 'generic_comment'); - -$num_views = count_annotations(0, 'object', 'image', 'tp_view'); - -if (get_plugin_setting('tagging', 'tidypics') != "disabled") - $num_tags = count_annotations(0, 'object', 'image', 'phototag'); -?> -<br /> -<h3>Overview</h3> -<p> - An image library is required by Tidypics to perform various manipulations: resizing on upload, watermarking, rotation, and cropping. - There are three image library options with Tidypics: PHP extension <a href="http://www.php.net/manual/en/book.image.php">GD</a>, - <a href="http://www.imagemagick.org/">ImageMagick</a> called via a system call, and the PHP extension - <a href="http://pecl.php.net/package/imagick/">imagick</a>. GD is the most common of the three on hosted servers but suffers - from serious memory usage problems when resizing photos. If you have access to ImageMagick (whether through system calls or the - PHP extension), we recommend that you use that. -</p> -<h3>Testing ImageMagick Commandline</h3> -<p> - To use the ImageMagick executables, PHP must be configured to allow calls to exec(). You can check our - <a href="<?php echo $CONFIG->wwwroot . 'mod/tidypics/pages/server_analysis.php'; ?>">server analysis page</a> to find out the - configuration of your server. Next, you need to determine the path to ImageMagick on your server. Your hosting service should - be able to provide this to you. You can test if the location is correct below. If successful, it should display the version of - ImageMagick installed on your server. -</p> -<br /> -<p> - <?php echo elgg_echo('tidypics:settings:im_path'); ?><br /> - <input name="im_location" type="text" /> - <input type="submit" value="Submit" onclick="TestImageMagickLocation();" /> -</p> -<div id="im_results"></div> - -<script type="text/javascript"> - function TestImageMagickLocation() - { - var loc = $('input[name=im_location]').val(); - $("#im_results").html(""); - $.ajax({ - type: "GET", - url: "<?php echo $CONFIG->wwwroot . 'mod/tidypics/actions/admin/imtest.php'; ?>", - data: {location: loc}, - cache: false, - success: function(html){ - $("#im_results").html(html); - } - }); - } -</script>
\ No newline at end of file |