From 57d865b09630ba9ea9cdf9a16067c01c818564dc Mon Sep 17 00:00:00 2001 From: cash Date: Fri, 17 Dec 2010 18:33:00 +0000 Subject: updated group member and group forum topics to new river git-svn-id: http://code.elgg.org/elgg/trunk@7661 36083f99-b078-4883-b0ff-0f9b5a30f544 --- engine/lib/upgrades/2010121701.php | 10 ++++++ mod/groups/languages/en.php | 15 +++------ mod/groups/views/default/river/forum/create.php | 29 ---------------- .../views/default/river/forum/topic/create.php | 29 ---------------- .../river/object/groupforumtopic/annotate.php | 14 -------- .../river/object/groupforumtopic/create.php | 39 +++++++++++++++++----- .../river/object/groupforumtopic/update.php | 13 -------- .../default/river/relationship/member/create.php | 23 +++++++------ version.php | 2 +- 9 files changed, 58 insertions(+), 116 deletions(-) create mode 100644 engine/lib/upgrades/2010121701.php delete mode 100644 mod/groups/views/default/river/forum/create.php delete mode 100644 mod/groups/views/default/river/forum/topic/create.php delete mode 100644 mod/groups/views/default/river/object/groupforumtopic/annotate.php delete mode 100644 mod/groups/views/default/river/object/groupforumtopic/update.php diff --git a/engine/lib/upgrades/2010121701.php b/engine/lib/upgrades/2010121701.php new file mode 100644 index 000000000..375654bac --- /dev/null +++ b/engine/lib/upgrades/2010121701.php @@ -0,0 +1,10 @@ +dbprefix}river + SET view='river/object/groupforumtopic/create' + WHERE view='river/forum/topic/create' AND action_type='create'"; +update_data($query); + diff --git a/mod/groups/languages/en.php b/mod/groups/languages/en.php index 45872277e..47c570c7f 100644 --- a/mod/groups/languages/en.php +++ b/mod/groups/languages/en.php @@ -180,17 +180,10 @@ or click below to view the group's join requests: */ 'groups:river:create' => 'created the group', - 'groups:river:member' => '%s is now a member of', - '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 titled', - 'groupforum:river:posted' => '%s has posted a new comment', - 'groupforum:river:annotate:create' => 'on this discussion topic', - 'groupforumtopic:river:annotate' => 'a new comment on this discussion topic', - 'groupforum:river:postedtopic' => '%s has started a new discussion topic titled', - 'groups:river:togroup' => 'to the group', - + 'groups:river:join' => 'joined the group', + 'forumtopic:river:create' => 'added a new discussion topic', + 'river:commented:object:groupforumtopic' => 'the discussion topic', + 'groups:nowidgets' => 'No widgets have been defined for this group.', diff --git a/mod/groups/views/default/river/forum/create.php b/mod/groups/views/default/river/forum/create.php deleted file mode 100644 index 4d24011cb..000000000 --- a/mod/groups/views/default/river/forum/create.php +++ /dev/null @@ -1,29 +0,0 @@ -subject_guid); - $object = get_entity($vars['item']->object_guid); - $object_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; - } - $comment = strip_tags($comment);//this is so we don't get large images etc in the activity river - $url = elgg_get_site_url() . "mod/groups/topicposts.php?topic=" . $forumtopic . "&group_guid=" . $group_guid; - $url_user = "getURL()}\">{$performed_by->name}"; - $string = elgg_echo("groupforum:river:posted", array($url_user)) . " "; - $string .= elgg_echo("groupforum:river:annotate:create") . " | " . $object->title . " ". elgg_view_friendly_time($object->time_created) ."Visit discussion"; - $string .= elgg_view('forms/likes/link', array('entity' => $object)); - $string .= ""; - if ($comment) { - $string .= "
"; - $string .= elgg_get_excerpt($comment, 200); - $string .= "
"; - } - - echo $string; diff --git a/mod/groups/views/default/river/forum/topic/create.php b/mod/groups/views/default/river/forum/topic/create.php deleted file mode 100644 index 7819eec41..000000000 --- a/mod/groups/views/default/river/forum/topic/create.php +++ /dev/null @@ -1,29 +0,0 @@ -subject_guid); // $statement->getSubject(); - $object = get_entity($vars['item']->object_guid); - $object_url = $object->getURL(); - $forumtopic = $object->guid; - $group_guid = $object->container_guid; - $group = get_entity($group_guid); - $url = elgg_get_site_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 = $object->description; - //} - $contents = strip_tags($contents);//this is so we don't get large images etc in the activity river - $url_user = "getURL()}\">{$performed_by->name}"; - $string = elgg_echo("groupforum:river:postedtopic", array($url_user)) . ": "; - $string .= "" . $object->title . ""; - $string .= " " . elgg_echo('groups:ingroup') . " getURL()}\">" . $group->name . ""; - $string .= " ". elgg_view_friendly_time($object->time_created); - if (isloggedin() && $object->status != "closed") { - $string .= '' . elgg_echo('generic_comments:text') . ''; - $string .= elgg_view('forms/likes/link', array('entity' => $object)); - } - $string .= ""; - $string .= "
"; - $string .= elgg_get_excerpt($contents, 200); - $string .= "
"; - - 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 deleted file mode 100644 index 5456b8302..000000000 --- a/mod/groups/views/default/river/object/groupforumtopic/annotate.php +++ /dev/null @@ -1,14 +0,0 @@ -getSubject(); - $object = $statement->getObject(); - - $url = "getURL()}\">{$performed_by->name}"; - $string = elgg_echo("groupforum:river:posted", array($url)) . " "; - $string .= elgg_echo("groupforum:river:annotate:create") . " | getURL() . "\">" . $object->title . ""; - //$string .= "
Title: " . $object->title . "
"; - -?> - - \ 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 index d9bebc003..1ca871b58 100644 --- a/mod/groups/views/default/river/object/groupforumtopic/create.php +++ b/mod/groups/views/default/river/object/groupforumtopic/create.php @@ -1,14 +1,35 @@ getSubject(); - $object = $statement->getObject(); +$object = $vars['item']->getObjectEntity(); +$excerpt = strip_tags($object->description); +$excerpt = elgg_get_excerpt($excerpt); - $url = "getURL()}\">{$performed_by->name}"; - $string = elgg_echo("groupforum:river:created", array($url)) . " "; - $string .= elgg_echo("groupforum:river:create") . " | getURL() . "\">" . $object->title . ""; - //$string .= "
Discussion topic: " . $object->title . "
"; +$params = array( + 'href' => $object->getURL(), + 'text' => $object->title, +); +$link = elgg_view('output/url', $params); -?> +$group_string = ''; +$container = $object->getContainerEntity(); +if ($container instanceof ElggGroup) { + $params = array( + 'href' => $container->getURL(), + 'text' => $container->name, + ); + $group_link = elgg_view('output/url', $params); + $group_string = elgg_echo('river:ingroup', array($group_link)); +} - \ No newline at end of file +echo elgg_echo('forumtopic:river:create'); + +echo " $link $group_string"; + +if ($excerpt) { + echo '
'; + echo $excerpt; + echo '
'; +} diff --git a/mod/groups/views/default/river/object/groupforumtopic/update.php b/mod/groups/views/default/river/object/groupforumtopic/update.php deleted file mode 100644 index ba9b91d2c..000000000 --- a/mod/groups/views/default/river/object/groupforumtopic/update.php +++ /dev/null @@ -1,13 +0,0 @@ -getSubject(); - $object = $statement->getObject(); - - $url = "getURL()}\">{$performed_by->name}"; - $string = elgg_echo("groupforum:river:updated", array($url)) . " "; - $string .= elgg_echo("groupforum:river:update") . " | getURL() . "\">" . $object->title . ""; - -?> - - \ 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 430e95839..5123964c3 100644 --- a/mod/groups/views/default/river/relationship/member/create.php +++ b/mod/groups/views/default/river/relationship/member/create.php @@ -1,14 +1,17 @@ subject_guid); - $object = get_entity($vars['item']->object_guid); - $objecturl = $object->getURL(); +$object = $vars['item']->getObjectEntity(); - $url = "getURL()}\">{$performed_by->name}"; - $string = elgg_echo("groups:river:member", array($url)) . " "; - $string .= " getURL() . "\">" . $object->name . ""; - $string .= " ". elgg_view_friendly_time($vars['item']->posted); - $string .= ""; -?> +$params = array( + 'href' => $object->getURL(), + 'text' => $object->name, +); +$link = elgg_view('output/url', $params); - \ No newline at end of file + +echo elgg_echo('groups:river:join'); + +echo " $link"; diff --git a/version.php b/version.php index 0fdd6a7fa..2a445de6e 100644 --- a/version.php +++ b/version.php @@ -11,7 +11,7 @@ // YYYYMMDD = Elgg Date // XX = Interim incrementer -$version = 2010121602; +$version = 2010121701; // Human-friendly version name $release = '1.8-svn'; -- cgit v1.2.3