added river activity for uploaded images

2 files changed, 44 insertions, 0 deletions

diff --git a/views/default/river/object/image/create.php b/views/default/river/object/image/create.php
index 3f5bbb5e8..bf6d2acbb 100644
--- a/views/default/river/object/image/create.php
+++ b/views/default/river/object/image/create.php
@@ -1,5 +1,30 @@
 <?php

 

+if (function_exists('add_to_river')) { // Elgg 1.5

+	$performed_by = get_entity($vars['item']->subject_guid);

+	$image = get_entity($vars['item']->object_guid);

+	if($image->title) {

+		$title = $image->title;

+	} else {

+		$title = "untitled";

+	}

+

+	$url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";

+	$album = get_entity($image->container_guid);

+

+	$album_link = "<a href='". $album->getURL() . "'>" . $album->title . "</a>";

+	$image_link = "<a href=\"" . $image->getURL() . "\">" . $title . "</a>";

+	

+	$string = sprintf(elgg_echo("image:river:created"),$performed_by->name, $image_link, $album_link);

+		

+	$string .= "<div class=\"river_content\">";

+	$string .= "<a href=\"" . $album->getURL() . "\"> <img src=\"" . $CONFIG->wwwroot . 'mod/tidypics/thumbnail.php?file_guid=' . $album->cover . '&size=thumb" border="0" class="tidypics_album_cover"  alt="thumbnail"/> </a>';

+	$string .= "<a href=\"" . $image->getURL() . "\"> <img src=\"" . $CONFIG->wwwroot . 'mod/tidypics/thumbnail.php?file_guid=' . $image->guid . '&size=thumb" border="0" class="tidypics_album_cover"  alt="thumbnail"/> </a>';

+	$string .= "</div>";

+	

+	echo $string;

+	

+} else {

 	$statement = $vars['statement'];

 	$performed_by = $statement->getSubject();

 	$object = $statement->getObject();

@@ -9,5 +34,6 @@
 	$string .= "<a href=\"" . $object->getURL() . "\">" . elgg_echo("image:river:item") . "</a>";

 

 	echo $string;

+}

 	

 ?>
\ No newline at end of file
diff --git a/views/default/settings/tidypics/edit.php b/views/default/settings/tidypics/edit.php
index ecfee33bd..59ed912d1 100644
--- a/views/default/settings/tidypics/edit.php
+++ b/views/default/settings/tidypics/edit.php
@@ -64,6 +64,24 @@
 			'value' => $download_link));
 	?>
 </p>
+<p>
+	<?php 
+		echo elgg_echo('tidypics:settings:river_view'); 
+		$river_view = $vars['entity']->river_view;
+		if (!$river_view) $river_view = 'all';
+	?>
+	
+	<?php
+		echo elgg_view('input/pulldown', array(
+			'internalname' => 'params[river_view]',
+			'options_values' => array(
+				'all' => 'all',
+				'1' => '1',
+				'none' => 'none'
+			),
+			'value' => $river_view));
+	?>
+</p>
 
 <?php
 	$watermark_text = $vars['entity']->watermark_text;