diff options
| author | Cash Costello <cash.costello@gmail.com> | 2010-10-31 12:47:25 +0000 |
|---|---|---|
| committer | Cash Costello <cash.costello@gmail.com> | 2010-10-31 12:47:25 +0000 |
| commit | 92ec25ec441330323e4fcbdfa33ebcf900420097 (patch) | |
| tree | 5516b59d4feced2cd7bc1b60f2b897ce42a63354 /views/default/tidypics/forms | |
| parent | f1b63cb2469bd332a20ed8f47109ab52f6381f4c (diff) | |
| download | elgg-92ec25ec441330323e4fcbdfa33ebcf900420097.tar.gz elgg-92ec25ec441330323e4fcbdfa33ebcf900420097.tar.bz2 | |
integrated Jeff's batch code into trunk
Diffstat (limited to 'views/default/tidypics/forms')
| -rw-r--r-- | views/default/tidypics/forms/ajax_upload.php | 3 | ||||
| -rw-r--r-- | views/default/tidypics/forms/settings.php | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/views/default/tidypics/forms/ajax_upload.php b/views/default/tidypics/forms/ajax_upload.php index c703d293b..c81c9173d 100644 --- a/views/default/tidypics/forms/ajax_upload.php +++ b/views/default/tidypics/forms/ajax_upload.php @@ -112,7 +112,8 @@ $("#uploadify").uploadify({ { album_guid : '<?php echo $album->guid; ?>', __elgg_token : '<?php echo $token; ?>', - __elgg_ts : '<?php echo $ts; ?>' + __elgg_ts : '<?php echo $ts; ?>', + batch : '<?php echo $batch; ?>' } ); }, diff --git a/views/default/tidypics/forms/settings.php b/views/default/tidypics/forms/settings.php index dc5c02f15..c8a1b4bd9 100644 --- a/views/default/tidypics/forms/settings.php +++ b/views/default/tidypics/forms/settings.php @@ -93,7 +93,7 @@ $form_body .= elgg_view('input/pulldown', array( )); $form_body .= '<br/>Note: If you want to select ImageMagick Command Line, first confirm that it is installed on your server.</p>'; -if (is_callable('exec') && !in_array('exec',$disablefunc)) { +if (is_callable('exec') && !in_array('exec', $disablefunc)) { // Image Magick Path $im_path = $plugin->im_path; if(!$im_path) { @@ -108,14 +108,14 @@ if (is_callable('exec') && !in_array('exec',$disablefunc)) { $form_body .= '<h3>' . elgg_echo('tidypics:settings:heading:river') . '</h3>'; $img_river_view = $plugin->img_river_view; if (!$img_river_view) { - $img_river_view = '1'; + $img_river_view = 'batch'; } $form_body .= '<p>' . elgg_echo('tidypics:settings:img_river_view'); $form_body .= elgg_view('input/pulldown', array( 'internalname' => 'params[img_river_view]', 'options_values' => array( 'all' => 'all', - '1' => '1', + 'batch' => '1', 'none' => 'none', ), 'value' => $img_river_view |