integrated Jeff's batch code into trunk

4 files changed, 57 insertions, 5 deletions

diff --git a/views/default/river/object/image/create.php b/views/default/river/object/image/create.php
index 8a0a8deff..9de043e91 100644
--- a/views/default/river/object/image/create.php
+++ b/views/default/river/object/image/create.php
@@ -5,7 +5,7 @@ $image = get_entity($vars['item']->object_guid);
 if ($image->title) {
 	$title = $image->title;
 } else {
-	$title = "untitled";
+	$title = elgg_echo("untitled");
 }
 
 $url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
diff --git a/views/default/river/object/tidypics_batch/create.php b/views/default/river/object/tidypics_batch/create.php
new file mode 100644
index 000000000..e7a4d1409
--- /dev/null
+++ b/views/default/river/object/tidypics_batch/create.php
@@ -0,0 +1,51 @@
+<?php
+
+$performed_by = get_entity($vars['item']->subject_guid);
+$batch = get_entity($vars['item']->object_guid);
+$album = get_entity($batch->container_guid);
+
+if (!$batch || !$album) {
+	return true;
+}
+
+// Get images related to this batch
+$images = elgg_get_entities_from_relationship(array(
+			'relationship' => 'belongs_to_batch',
+			'relationship_guid' => $batch->getGUID(),
+			'inverse_relationship' => true,
+			'types' => array('object'),
+			'subtypes' => array('image'),
+			'offset' => 0,
+		));
+
+// nothing to show
+if (!$images) {
+	return true;
+}
+
+$user_link = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
+$album_link = "<a href='" . $album->getURL() . "'>" . $album->title . "</a>";
+if (count($images) > 1) {
+	$image_text = elgg_echo("image:river:created:multiple");
+	$string = sprintf($image_text, $user_link, count($images), $album_link);
+} else {
+	$image_text = elgg_echo("image:river:created");
+	$title = $images[0]->title;
+	if (!$title) {
+		$title = elgg_echo("untitled");
+	}
+	$image_link = "<a href=\"" . $images[0]->getURL() . "\">" . $title . "</a>";
+	$string = sprintf($image_text, $user_link, $image_link, $album_link);
+}
+
+$string .= "<div class=\"river_content\">";
+
+if (count($images)) {
+	foreach($images as $image) {
+		$string .= "<a href=\"" . $image->getURL() . "\"> <img src=\"" . $CONFIG->wwwroot . 'mod/tidypics/thumbnail.php?file_guid=' . $image->guid . '&size=thumb" class="tidypics_album_cover"  alt="thumbnail"/> </a>';
+	}
+}
+
+$string .= "</div>";
+
+echo $string;
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