aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>2009-02-07 16:37:00 +0000
committerdave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>2009-02-07 16:37:00 +0000
commitd88866776c0958e7c99d365f3e0fb2e3293294a8 (patch)
treea17f7ac942a55e312d25c5167921f52336342189
parent47f85ed3b5c06e16845a65f4e2d259e0dc0458c2 (diff)
downloadelgg-d88866776c0958e7c99d365f3e0fb2e3293294a8.tar.gz
elgg-d88866776c0958e7c99d365f3e0fb2e3293294a8.tar.bz2
new river views added to groups
git-svn-id: https://code.elgg.org/elgg/trunk@2678 36083f99-b078-4883-b0ff-0f9b5a30f544
-rw-r--r--mod/groups/languages/en.php14
-rw-r--r--mod/groups/views/default/river/object/group/create.php13
-rw-r--r--mod/groups/views/default/river/object/groupforumtopic/annotate.php14
-rw-r--r--mod/groups/views/default/river/object/groupforumtopic/create.php14
-rw-r--r--mod/groups/views/default/river/object/groupforumtopic/update.php13
-rw-r--r--mod/groups/views/default/river/relationship/member/create.php78
6 files changed, 100 insertions, 46 deletions
diff --git a/mod/groups/languages/en.php b/mod/groups/languages/en.php
index cac22b59c..e743ec777 100644
--- a/mod/groups/languages/en.php
+++ b/mod/groups/languages/en.php
@@ -48,9 +48,9 @@
'groups:inviteto' => "Invite friends to '%s'",
'groups:nofriends' => "You have no friends left who have not been invited to this group.",
- 'groups:group' => "Group",
-
- 'groups:notfound' => "Group not found",
+ 'groups:group' => "Group",
+
+ 'groups:notfound' => "Group not found",
'groups:notfound:details' => "The requested group either does not exist or you do not have access to it",
'item:object:groupforumtopic' => "Forum topics",
@@ -62,9 +62,9 @@
'groups:enableforum' => 'Enable group forum',
'groups:enablefiles' => 'Enable group files',
'groups:yes' => 'yes',
- 'groups:no' => 'no',
-
- 'group:created' => 'Created %s with %d posts',
+ 'groups:no' => 'no',
+
+ 'group:created' => 'Created %s with %d posts',
'groups:lastupdated' => 'Last updated %s by %s',
/*
@@ -144,7 +144,7 @@ or click below to confirm request:
'groupforum:river:updated' => '%s has updated',
'groupforum:river:update' => 'this discussion topic',
'groupforum:river:created' => '%s has created',
- 'groupforum:river:create' => 'a new discussion topic',
+ 'groupforum:river:create' => 'a new discussion topic titled',
'groupforum:river:posted' => '%s has posted a new comment',
'groupforum:river:annotate:create' => 'on this discussion topic',
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..8892b6d56
--- /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..c951bcc31
--- /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..4bbf5c474
--- /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..6fda38aa4
--- /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
index 7dc10d693..d484b0d9d 100644
--- a/mod/groups/views/default/river/relationship/member/create.php
+++ b/mod/groups/views/default/river/relationship/member/create.php
@@ -1,40 +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-2009
- * @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;
- }
- }
-
-
+<?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-2009
+ * @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