diff options
Diffstat (limited to 'mod/groups/views/default/river')
8 files changed, 46 insertions, 120 deletions
diff --git a/mod/groups/views/default/river/annotation/group_topic_post/reply.php b/mod/groups/views/default/river/annotation/group_topic_post/reply.php new file mode 100644 index 000000000..afc823bde --- /dev/null +++ b/mod/groups/views/default/river/annotation/group_topic_post/reply.php @@ -0,0 +1,12 @@ +<?php +/** + * Reply river view + */ +$object = $vars['item']->getObjectEntity(); +$reply = $vars['item']->getAnnotation(); +$excerpt = elgg_get_excerpt($reply->value); + +echo elgg_view('river/elements/layout', array( + 'item' => $vars['item'], + 'message' => $excerpt, +));
\ No newline at end of file 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 2e8365ec2..000000000 --- a/mod/groups/views/default/river/forum/create.php +++ /dev/null @@ -1,29 +0,0 @@ -<?php -/** - * Any comment on original post - */ - - $performed_by = get_entity($vars['item']->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 = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>"; - $string = elgg_echo("groupforum:river:posted", array($url_user)) . " "; - $string .= elgg_echo("groupforum:river:annotate:create") . " | <a href=\"" . $url . "\">" . $object->title . "</a> <span class='entity-subtext'>". elgg_view_friendly_time($object->time_created) ."<a class='river_comment_form_button link' href=\"{$object_url}\">Visit discussion</a>"; - $string .= elgg_view('likes/forms/link', array('entity' => $object)); - $string .= "</span>"; - if ($comment) { - $string .= "<div class=\"river_content_display\">"; - $string .= elgg_get_excerpt($comment, 200); - $string .= "</div>"; - } - - 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 e73064e00..000000000 --- a/mod/groups/views/default/river/forum/topic/create.php +++ /dev/null @@ -1,29 +0,0 @@ -<?php - - $performed_by = get_entity($vars['item']->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 = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>"; - $string = elgg_echo("groupforum:river:postedtopic", array($url_user)) . ": "; - $string .= "<a href=\"" . $url . "\">" . $object->title . "</a>"; - $string .= " " . elgg_echo('groups:ingroup') . " <a href=\"{$group->getURL()}\">" . $group->name . "</a>"; - $string .= " <span class='entity-subtext'>". elgg_view_friendly_time($object->time_created); - if (isloggedin() && $object->status != "closed") { - $string .= '<a class="river_comment_form_button link">' . elgg_echo('generic_comments:text') . '</a>'; - $string .= elgg_view('likes/forms/link', array('entity' => $object)); - } - $string .= "</span>"; - $string .= "<div class=\"river_content_display\">"; - $string .= elgg_get_excerpt($contents, 200); - $string .= "</div>"; - - 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 index 4774e7a85..ea42b5b00 100644 --- a/mod/groups/views/default/river/group/create.php +++ b/mod/groups/views/default/river/group/create.php @@ -1,16 +1,13 @@ <?php +/** + * Group creation river view. + */ - $performed_by = get_entity($vars['item']->subject_guid); // $statement->getSubject(); - $object = get_entity($vars['item']->object_guid); - $objecturl = $object->getURL(); +$object = $vars['item']->getObjectEntity(); +$excerpt = strip_tags($object->description); +$excerpt = elgg_get_excerpt($excerpt); - $url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>"; - $string = elgg_echo("groups:river:create", array($url)) . " "; - $string .= " <a href=\"" . $object->getURL() . "\">" . $object->name . "</a>"; - $string .= " <span class='entity-subtext'>". elgg_view_friendly_time($object->time_created); - if (isloggedin()) { - $string .= elgg_view('likes/forms/link', array('entity' => $object)); - } - $string .= "</span>"; - -echo $string;
\ No newline at end of file +echo elgg_view('river/elements/layout', array( + 'item' => $vars['item'], + 'message' => $excerpt, +));
\ 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 @@ -<?php - - $statement = $vars['statement']; - $performed_by = $statement->getSubject(); - $object = $statement->getObject(); - - $url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>"; - $string = elgg_echo("groupforum:river:posted", array($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 index d9bebc003..e7d92bc08 100644 --- a/mod/groups/views/default/river/object/groupforumtopic/create.php +++ b/mod/groups/views/default/river/object/groupforumtopic/create.php @@ -1,14 +1,22 @@ <?php +/** + * Group forum topic create river view. + */ - $statement = $vars['statement']; - $performed_by = $statement->getSubject(); - $object = $statement->getObject(); +$object = $vars['item']->getObjectEntity(); +$excerpt = strip_tags($object->description); +$excerpt = elgg_get_excerpt($excerpt); - $url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>"; - $string = elgg_echo("groupforum:river:created", array($url)) . " "; - $string .= elgg_echo("groupforum:river:create") . " | <a href=\"" . $object->getURL() . "\">" . $object->title . "</a>"; - //$string .= "<div class=\"river_content\">Discussion topic: " . $object->title . "</div>"; +$responses = ''; +if (elgg_is_logged_in() && $object->canAnnotate(0, 'group_topic_post')) { + // inline comment form + $form_vars = array('id' => "groups-reply-{$object->getGUID()}", 'class' => 'hidden'); + $body_vars = array('entity' => $object, 'inline' => true); + $responses = elgg_view_form('discussion/reply/save', $form_vars, $body_vars); +} -?> - -<?php echo $string; ?>
\ No newline at end of file +echo elgg_view('river/elements/layout', array( + 'item' => $vars['item'], + 'message' => $excerpt, + 'responses' => $responses, +)); 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 @@ -<?php - - $statement = $vars['statement']; - $performed_by = $statement->getSubject(); - $object = $statement->getObject(); - - $url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>"; - $string = elgg_echo("groupforum:river:updated", array($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 430e95839..0afd87e4b 100644 --- a/mod/groups/views/default/river/relationship/member/create.php +++ b/mod/groups/views/default/river/relationship/member/create.php @@ -1,14 +1,8 @@ <?php +/** + * Group join river view. + */ - $performed_by = get_entity($vars['item']->subject_guid); - $object = get_entity($vars['item']->object_guid); - $objecturl = $object->getURL(); - - $url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>"; - $string = elgg_echo("groups:river:member", array($url)) . " "; - $string .= " <a href=\"" . $object->getURL() . "\">" . $object->name . "</a>"; - $string .= " <span class='entity-subtext'>". elgg_view_friendly_time($vars['item']->posted); - $string .= "</span>"; -?> - -<?php echo $string; ?>
\ No newline at end of file +echo elgg_view('river/elements/layout', array( + 'item' => $vars['item'], +)); |
