From 620be743083e3c7c53d71c7686175c8ad341c7cb Mon Sep 17 00:00:00 2001
From: Greg Froese
Date: Fri, 22 May 2009 15:43:19 +0000
Subject: added river activity for uploaded images
---
views/default/river/object/image/create.php | 26 ++++++++++++++++++++++++++
views/default/settings/tidypics/edit.php | 18 ++++++++++++++++++
2 files changed, 44 insertions(+)
(limited to 'views/default')
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 @@
subject_guid);
+ $image = get_entity($vars['item']->object_guid);
+ if($image->title) {
+ $title = $image->title;
+ } else {
+ $title = "untitled";
+ }
+
+ $url = "getURL()}\">{$performed_by->name}";
+ $album = get_entity($image->container_guid);
+
+ $album_link = "" . $album->title . "";
+ $image_link = "getURL() . "\">" . $title . "";
+
+ $string = sprintf(elgg_echo("image:river:created"),$performed_by->name, $image_link, $album_link);
+
+ $string .= "";
+
+ echo $string;
+
+} else {
$statement = $vars['statement'];
$performed_by = $statement->getSubject();
$object = $statement->getObject();
@@ -9,5 +34,6 @@
$string .= "getURL() . "\">" . elgg_echo("image:river:item") . "";
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));
?>
+
+ river_view;
+ if (!$river_view) $river_view = 'all';
+ ?>
+
+ 'params[river_view]',
+ 'options_values' => array(
+ 'all' => 'all',
+ '1' => '1',
+ 'none' => 'none'
+ ),
+ 'value' => $river_view));
+ ?>
+
watermark_text;
--
cgit v1.2.3