Pulled in the interface changes.

git-svn-id: http://code.elgg.org/elgg/trunk@5257 36083f99-b078-4883-b0ff-0f9b5a30f544

8 files changed, 161 insertions, 0 deletions

diff --git a/mod/groups/views/default/river/forum/create.php b/mod/groups/views/default/river/forum/create.php
new file mode 100644
index 000000000..fb6cd707c
--- /dev/null
+++ b/mod/groups/views/default/river/forum/create.php
@@ -0,0 +1,27 @@
+<?php
+
+	$performed_by = get_entity($vars['item']->subject_guid); // $statement->getSubject();
+	$object = get_entity($vars['item']->object_guid);
+	//$url = $object->getURL();
+	$forumtopic = $object->guid;
+	$group_guid = $object->container_guid;
+	//grab the annotation, if one exists
+	if($vars['item']->annotation_id != 0)
+		$comment = get_annotation($vars['item']->annotation_id)->value; 
+	$contents = strip_tags($contents);//this is so we don't get large images etc in the activity river
+	$url = $vars['url'] . "mod/groups/topicposts.php?topic=" . $forumtopic . "&group_guid=" . $group_guid;
+	$url_user = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
+	$string = sprintf(elgg_echo("groupforum:river:posted"),$url_user) . " ";
+	$string .= elgg_echo("groupforum:river:annotate:create") . " | <a href=\"" . $url . "\">" . $object->title . "</a>";
+	$string .= "<div class=\"river_content_display\">";
+	if($comment){
+		$contents = strip_tags($comment);//this is so we don't get large images etc in the activity river
+		if(strlen($contents) > 200)
+	        	$string .= substr($contents, 0, strpos($contents, ' ', 200)) . "...";
+	    else
+		    $string .= $contents;
+    }
+	$string .= "</div>";
+?>
+
+<?php echo $string; ?>
\ No newline at end of file
diff --git a/mod/groups/views/default/river/forum/topic/create.php b/mod/groups/views/default/river/forum/topic/create.php
new file mode 100644
index 000000000..f4c4aadfd
--- /dev/null
+++ b/mod/groups/views/default/river/forum/topic/create.php
@@ -0,0 +1,27 @@
+<?php
+
+	$performed_by = get_entity($vars['item']->subject_guid); // $statement->getSubject();
+	$object = get_entity($vars['item']->object_guid);
+	//$url = $object->getURL();
+	$forumtopic = $object->guid;
+	$group_guid = $object->container_guid;
+	$url = $vars['url'] . "mod/groups/topicposts.php?topic=" . $forumtopic . "&group_guid=" . $group_guid;
+	$comment = $object->getAnnotations("group_topic_post", 1, 0, "asc"); 
+	foreach($comment as $c){
+		$contents = $c->value;
+	}
+	$contents = strip_tags($contents);//this is so we don't get large images etc in the activity river
+	$url_user = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
+	$string = sprintf(elgg_echo("groupforum:river:postedtopic"),$url_user) . ": ";
+	$string .= "<a href=\"" . $url . "\">" . $object->title . "</a>";
+	$string .= "<div class=\"river_content_display\">";
+	if(strlen($contents) > 200) {
+        	$string .= substr($contents, 0, strpos($contents, ' ', 200)) . "...";
+    	}else{
+	    	$string .= $contents;
+    	}
+	$string .= "</div>";
+	
+?>
+
+<?php echo $string; ?>
\ No newline at end of file
diff --git a/mod/groups/views/default/river/group/create.php b/mod/groups/views/default/river/group/create.php
new file mode 100644
index 000000000..e96bb9b34
--- /dev/null
+++ b/mod/groups/views/default/river/group/create.php
@@ -0,0 +1,13 @@
+<?php
+
+	$performed_by = get_entity($vars['item']->subject_guid); // $statement->getSubject();
+	$object = get_entity($vars['item']->object_guid);
+	$objecturl = $object->getURL();
+	
+	$url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
+	$string = sprintf(elgg_echo("groups:river:member"),$url) . " ";
+	$string .= " <a href=\"" . $object->getURL() . "\">" . $object->name . "</a>";
+	
+?>
+
+<?php echo $string; ?>
\ No newline at end of file
diff --git a/mod/groups/views/default/river/object/group/create.php b/mod/groups/views/default/river/object/group/create.php
new file mode 100644
index 000000000..94903fd66
--- /dev/null
+++ b/mod/groups/views/default/river/object/group/create.php
@@ -0,0 +1,13 @@
+<?php
+
+	$statement = $vars['statement'];
+	$performed_by = $statement->getSubject();
+	$object = $statement->getObject();
+	
+	$url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
+	$string = sprintf(elgg_echo("group:river:created"),$url) . " ";
+	$string .= "<a href=\"" . $object->getURL() . "\">" . elgg_echo("group:river:create") . "</a>";
+
+?>
+
+<?php echo $string; ?>
\ No newline at end of file
diff --git a/mod/groups/views/default/river/object/groupforumtopic/annotate.php b/mod/groups/views/default/river/object/groupforumtopic/annotate.php
new file mode 100644
index 000000000..c6aa1e5ab
--- /dev/null
+++ b/mod/groups/views/default/river/object/groupforumtopic/annotate.php
@@ -0,0 +1,14 @@
+<?php
+
+	$statement = $vars['statement'];
+	$performed_by = $statement->getSubject();
+	$object = $statement->getObject();
+	
+	$url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
+	$string = sprintf(elgg_echo("groupforum:river:posted"),$url) . " ";
+	$string .= elgg_echo("groupforum:river:annotate:create") . " | <a href=\"" . $object->getURL() . "\">" . $object->title . "</a>";
+	//$string .= "<div class=\"river_content\">Title: " . $object->title . "</div>";
+
+?>
+
+<?php echo $string; ?>
\ No newline at end of file
diff --git a/mod/groups/views/default/river/object/groupforumtopic/create.php b/mod/groups/views/default/river/object/groupforumtopic/create.php
new file mode 100644
index 000000000..7c7d89bad
--- /dev/null
+++ b/mod/groups/views/default/river/object/groupforumtopic/create.php
@@ -0,0 +1,14 @@
+<?php
+
+	$statement = $vars['statement'];
+	$performed_by = $statement->getSubject();
+	$object = $statement->getObject();
+	
+	$url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
+	$string = sprintf(elgg_echo("groupforum:river:created"),$url) . " ";
+	$string .= elgg_echo("groupforum:river:create") . " | <a href=\"" . $object->getURL() . "\">" . $object->title . "</a>";
+	//$string .= "<div class=\"river_content\">Discussion topic: " . $object->title . "</div>";
+
+?>
+
+<?php echo $string; ?>
\ No newline at end of file
diff --git a/mod/groups/views/default/river/object/groupforumtopic/update.php b/mod/groups/views/default/river/object/groupforumtopic/update.php
new file mode 100644
index 000000000..d13c2b61f
--- /dev/null
+++ b/mod/groups/views/default/river/object/groupforumtopic/update.php
@@ -0,0 +1,13 @@
+<?php
+
+	$statement = $vars['statement'];
+	$performed_by = $statement->getSubject();
+	$object = $statement->getObject();
+	
+	$url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
+	$string = sprintf(elgg_echo("groupforum:river:updated"),$url) . " ";
+    $string .= elgg_echo("groupforum:river:update") . " | <a href=\"" . $object->getURL() . "\">" . $object->title . "</a>";
+    
+?>
+
+<?php echo $string; ?>
\ No newline at end of file
diff --git a/mod/groups/views/default/river/relationship/member/create.php b/mod/groups/views/default/river/relationship/member/create.php
new file mode 100644
index 000000000..e5e318ce0
--- /dev/null
+++ b/mod/groups/views/default/river/relationship/member/create.php
@@ -0,0 +1,40 @@
+<?php
+	/**
+	 * Elgg relationship create event for groups
+	 * Display something in the river when a group is joined
+	 * 
+	 * @package ElggGroups
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008-2010
+	 * @link http://elgg.com/
+	 */
+
+	$statement = $vars['statement'];
+	
+	$performed_by = $statement->getSubject();
+	$event = $statement->getEvent();
+	$object = $statement->getObject();
+	
+	if (is_array($object))
+	{
+		switch ($object['relationship'])
+		{
+			// Friending
+			case 'member' :
+				$user = $object['subject'];
+				$group = $object['object'];
+			
+				if (($user instanceof ElggUser) && ($group instanceof ElggGroup))
+				{
+					echo "<a href=\"{$user->getURL()}\">{$user->name}</a> ";
+					echo elgg_echo("groups:river:member");
+					echo " '<a href=\"{$group->getURL()}\">{$group->name}</a>'";
+				}
+		
+			break;
+		}
+	}
+	
+		
+?>
\ No newline at end of file