From 5041c6c48153453ed597206d08eeff37cf20e676 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Sat, 15 Mar 2014 14:46:48 -0300 Subject: Squashed 'mod/cool_theme/' content from commit a26f7df git-subtree-dir: mod/cool_theme git-subtree-split: a26f7df43a266f7d1ff04847da330d15f6041e9b --- views/default/river/elements/attachment.php | 25 ++++++++ views/default/river/elements/body.php | 68 ++++++++++++++++++++++ views/default/river/elements/responses.php | 49 ++++++++++++++++ views/default/river/group/create.php | 25 ++++++++ views/default/river/object/blog/create.php | 11 ++++ views/default/river/object/bookmarks/create.php | 14 +++++ views/default/river/object/file/create.php | 13 +++++ .../river/object/groupforumtopic/create.php | 11 ++++ views/default/river/object/messageboard/create.php | 11 ++++ views/default/river/object/page/create.php | 11 ++++ .../river/user/default/profileiconupdate.php | 24 ++++++++ views/default/river/user/default/profileupdate.php | 20 +++++++ 12 files changed, 282 insertions(+) create mode 100644 views/default/river/elements/attachment.php create mode 100644 views/default/river/elements/body.php create mode 100644 views/default/river/elements/responses.php create mode 100644 views/default/river/group/create.php create mode 100644 views/default/river/object/blog/create.php create mode 100644 views/default/river/object/bookmarks/create.php create mode 100644 views/default/river/object/file/create.php create mode 100644 views/default/river/object/groupforumtopic/create.php create mode 100644 views/default/river/object/messageboard/create.php create mode 100644 views/default/river/object/page/create.php create mode 100644 views/default/river/user/default/profileiconupdate.php create mode 100644 views/default/river/user/default/profileupdate.php (limited to 'views/default/river') diff --git a/views/default/river/elements/attachment.php b/views/default/river/elements/attachment.php new file mode 100644 index 000000000..d5c0aab99 --- /dev/null +++ b/views/default/river/elements/attachment.php @@ -0,0 +1,25 @@ +$title"; + +if ($subtitle) { + $body .= "
$subtitle
"; +} + +if ($description) { + $body .= "
$description
"; +} + + +if ($image) { + echo elgg_view_image_block($image, $body); +} else { + echo $body; +} \ No newline at end of file diff --git a/views/default/river/elements/body.php b/views/default/river/elements/body.php new file mode 100644 index 000000000..56d7a09e9 --- /dev/null +++ b/views/default/river/elements/body.php @@ -0,0 +1,68 @@ + $item, + 'sort_by' => 'priority', +)); + +// river item header +if($item->action_type != 'comment') { +$timestamp = elgg_get_friendly_time($item->getPostedTime()); + +$summary = elgg_extract('summary', $vars, elgg_view('river/elements/summary', array('item' => $vars['item']))); +if ($summary === false) { + $subject = $item->getSubjectEntity(); + $summary = elgg_view('output/url', array( + 'href' => $subject->getURL(), + 'text' => $subject->name, + 'class' => 'elgg-river-subject', + )); +} + +$message = elgg_extract('message', $vars, false); +if ($message !== false) { + $message = "
$message
"; +} + +$attachments = elgg_extract('attachments', $vars, false); +if ($attachments !== false) { + $attachments = "
$attachments
"; +} + +$responses = elgg_view('river/elements/responses', $vars); +if ($responses) { + $responses = "
$responses
"; +} + +$group_string = ''; +$object = $item->getObjectEntity(); +$container = $object->getContainerEntity(); +if ($container instanceof ElggGroup && $container->guid != elgg_get_page_owner_guid()) { + $group_link = elgg_view('output/url', array( + 'href' => $container->getURL(), + 'text' => $container->name, + )); + $group_string = elgg_echo('river:ingroup', array($group_link)); +} + +echo <<$summary $group_string +$message +$attachments +$timestamp +$menu +$responses +RIVER; + +} \ No newline at end of file diff --git a/views/default/river/elements/responses.php b/views/default/river/elements/responses.php new file mode 100644 index 000000000..432296737 --- /dev/null +++ b/views/default/river/elements/responses.php @@ -0,0 +1,49 @@ +getObjectEntity(); + +// annotations do not have comments +if (!$object || $item->annotation_id) { + return true; +} + + +$comment_count = $object->countComments(); + +$comments = elgg_get_annotations(array( + 'guid' => $object->getGUID(), + 'annotation_name' => 'generic_comment', + 'limit' => 3, + 'order_by' => 'n_table.time_created desc' +)); + +if ($comments) { + // why is this reversing it? because we're asking for the 3 latest + // comments by sorting desc and limiting by 3, but we want to display + // these comments with the latest at the bottom. + $comments = array_reverse($comments); + + if ($comment_count > count($comments)) { + $link = elgg_view('output/url', array( + 'href' => $object->getURL(), + 'text' => elgg_echo('river:comments:all', array($comment_count)), + )); + + echo elgg_view_image_block(elgg_view_icon('speech-bubble-alt'), $link, array('class' => 'elgg-river-participation')); + } + + echo elgg_view_annotation_list($comments, array('list_class' => 'elgg-river-comments', 'item_class' => 'elgg-river-participation')); + +} + +if ($object->canAnnotate(0, 'generic_comment')) { + // inline comment form + echo elgg_view_form('comments/add', array( + 'id' => "comments-add-{$object->getGUID()}", + 'class' => 'elgg-river-participation elgg-form-small', + ), array('entity' => $object, 'inline' => true)); +} \ No newline at end of file diff --git a/views/default/river/group/create.php b/views/default/river/group/create.php new file mode 100644 index 000000000..6beaf2d7d --- /dev/null +++ b/views/default/river/group/create.php @@ -0,0 +1,25 @@ +getObjectEntity(); +$subject = $vars['item']->getSubjectEntity(); + +$subject_link = elgg_view('output/url', array( + 'href' => $subject->getURL(), + 'text' => $subject->name, + 'class' => 'elgg-actor-name', + 'encode_text' => true, +)); + +$group_link = elgg_view('output/url', array( + 'href' => $object->getURL(), + 'text' => $object->name, + 'encode_text' => true, +)); + +echo elgg_view('river/item', array( + 'item' => $vars['item'], + 'attachments' => elgg_view('group/default/river', array('entity' => $object)), +)); \ No newline at end of file diff --git a/views/default/river/object/blog/create.php b/views/default/river/object/blog/create.php new file mode 100644 index 000000000..2d08a7d86 --- /dev/null +++ b/views/default/river/object/blog/create.php @@ -0,0 +1,11 @@ +getObjectEntity(); + +echo elgg_view('river/item', array( + 'item' => $vars['item'], + 'attachments' => elgg_view('object/blog/river', array('entity' => $object)), +)); \ No newline at end of file diff --git a/views/default/river/object/bookmarks/create.php b/views/default/river/object/bookmarks/create.php new file mode 100644 index 000000000..b4170b8ec --- /dev/null +++ b/views/default/river/object/bookmarks/create.php @@ -0,0 +1,14 @@ +getObjectEntity(); + + +echo elgg_view('river/item', array( + 'item' => $vars['item'], + 'attachments' => elgg_view('object/bookmarks/river', array('entity' => $object)), +)); \ No newline at end of file diff --git a/views/default/river/object/file/create.php b/views/default/river/object/file/create.php new file mode 100644 index 000000000..99af38ace --- /dev/null +++ b/views/default/river/object/file/create.php @@ -0,0 +1,13 @@ +getObjectEntity(); + +echo elgg_view('river/item', array( + 'item' => $vars['item'], + 'attachments' => elgg_view('object/file/river', array('entity' => $object)), +)); \ No newline at end of file diff --git a/views/default/river/object/groupforumtopic/create.php b/views/default/river/object/groupforumtopic/create.php new file mode 100644 index 000000000..291585698 --- /dev/null +++ b/views/default/river/object/groupforumtopic/create.php @@ -0,0 +1,11 @@ +getObjectEntity(); + +echo elgg_view('river/item', array( + 'item' => $vars['item'], + 'attachments' => elgg_view('object/groupforumtopic/river', array('entity' => $object)), +)); \ No newline at end of file diff --git a/views/default/river/object/messageboard/create.php b/views/default/river/object/messageboard/create.php new file mode 100644 index 000000000..7d586450d --- /dev/null +++ b/views/default/river/object/messageboard/create.php @@ -0,0 +1,11 @@ +getObjectEntity(); +$comment = $vars['item']->getAnnotation(); + +echo elgg_view('river/elements/layout', array( + 'item' => $vars['item'], + 'message' => elgg_get_excerpt($comment->value), +)); diff --git a/views/default/river/object/page/create.php b/views/default/river/object/page/create.php new file mode 100644 index 000000000..1f1ab4801 --- /dev/null +++ b/views/default/river/object/page/create.php @@ -0,0 +1,11 @@ +getObjectEntity(); + +echo elgg_view('river/item', array( + 'item' => $vars['item'], + 'attachments' => elgg_view('object/page/river', array('entity' => $object)), +)); \ No newline at end of file diff --git a/views/default/river/user/default/profileiconupdate.php b/views/default/river/user/default/profileiconupdate.php new file mode 100644 index 000000000..255d660ca --- /dev/null +++ b/views/default/river/user/default/profileiconupdate.php @@ -0,0 +1,24 @@ +getSubjectEntity(); + +$subject_link = elgg_view('output/url', array( + 'href' => $subject->getURL(), + 'text' => $subject->name, + 'class' => 'elgg-river-subject', + 'is_trusted' => true, +)); + +$string = elgg_echo('river:update:user:avatar', array($subject_link)); + +echo elgg_view('river/elements/layout', array( + 'item' => $vars['item'], + 'summary' => $string, + 'attachments' => elgg_view_entity_icon($subject, 'medium', array( + 'use_hover' => false, + 'use_link' => false, + )), +)); diff --git a/views/default/river/user/default/profileupdate.php b/views/default/river/user/default/profileupdate.php new file mode 100644 index 000000000..ce72970d6 --- /dev/null +++ b/views/default/river/user/default/profileupdate.php @@ -0,0 +1,20 @@ +getSubjectEntity(); + +$subject_link = elgg_view('output/url', array( + 'href' => $subject->getURL(), + 'text' => $subject->name, + 'class' => 'elgg-river-subject', + 'is_trusted' => true, +)); + +$string = elgg_echo('river:update:user:profile', array($subject_link)); + +echo elgg_view('river/elements/layout', array( + 'item' => $vars['item'], + 'summary' => $string, +)); -- cgit v1.2.3