aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCash Costello <cash.costello@gmail.com>2009-05-12 01:48:53 +0000
committerCash Costello <cash.costello@gmail.com>2009-05-12 01:48:53 +0000
commit3eb517748157da5d94efc1e6a58e42a55c7e1d0c (patch)
treee6dd180901cdf1afdeb903cfb1afad2d7b72cf2c
parent501af5b28c7fb2ec36658df16849572c14d050a4 (diff)
downloadelgg-3eb517748157da5d94efc1e6a58e42a55c7e1d0c.tar.gz
elgg-3eb517748157da5d94efc1e6a58e42a55c7e1d0c.tar.bz2
Add setting to select between GD and ImageMagick - not using setting yet
-rw-r--r--languages/en.php3
-rw-r--r--views/default/settings/tidypics/edit.php19
2 files changed, 22 insertions, 0 deletions
diff --git a/languages/en.php b/languages/en.php
index 61345174b..068616b6d 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -29,6 +29,9 @@
'tidypics:friendmostviewed' => "%s's most viewed images",
'tidypics:friendmostrecent' => "%s's most recent images",
+ //settings
+ 'tidypics:image_lib' => "Image Library",
+
//actions
'album:create' => "Create new album",
diff --git a/views/default/settings/tidypics/edit.php b/views/default/settings/tidypics/edit.php
index 2c63edff8..455be9bd3 100644
--- a/views/default/settings/tidypics/edit.php
+++ b/views/default/settings/tidypics/edit.php
@@ -1,4 +1,23 @@
<?php
+ $image_lib = $vars['entity']->image_lib;
+ if (!$image_lib) $image_lib = 'GD';
+?>
+<p>
+ <?php echo elgg_echo('tidypics:image_lib'); ?>
+
+ <?php
+ echo elgg_view('input/pulldown', array(
+ 'internalname' => 'params[image_lib]',
+ 'options_values' => array(
+ 'weekly' => 'GD',
+ 'monthly' => 'ImageMagick',
+ ),
+ 'value' => $image_lib
+ ));
+ ?>
+</p>
+
+<?php
$maxfilesize = $vars['entity']->maxfilesize;
if (!$maxfilesize) $maxfilesize = (int) 10240; //set the default maximum file size to 10MB (1024KB * 10 = 10240KB = 10MB)