aboutsummaryrefslogtreecommitdiff
path: root/views/default
diff options
context:
space:
mode:
Diffstat (limited to 'views/default')
-rw-r--r--views/default/river/object/album/create.php56
-rw-r--r--views/default/river/object/image/create.php48
2 files changed, 51 insertions, 53 deletions
diff --git a/views/default/river/object/album/create.php b/views/default/river/object/album/create.php
index 4d797d842..a60891ff8 100644
--- a/views/default/river/object/album/create.php
+++ b/views/default/river/object/album/create.php
@@ -1,47 +1,35 @@
<?php
+/**
+ * Album river view
+ */
-$performed_by = get_entity($vars['item']->subject_guid);
-$album = get_entity($vars['item']->object_guid);
-
-$group_album = ($album->owner_guid != $album->container_guid);
-if ($group_album) {
- $group = get_entity($album->container_guid);
- $group_name = $group->name;
- $group_link = $group->getURL();
-}
-
-$url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
-$string = sprintf(elgg_echo("album:river:created"), $url) . " ";
-$string .= "<a href=\"" . $album->getURL() . "\">" . $album->title . "</a>";
-if ($group_album) {
- $string .= ' ' . elgg_echo('album:river:group') . ' ' . "<a href=\"{$group_link}\" >{$group_name}</a>";
-}
-
-$album_river_view = get_plugin_setting('album_river_view', 'tidypics');
+$album = $vars['item']->getObjectEntity();
+$album_river_view = elgg_get_plugin_setting('album_river_view', 'tidypics');
if ($album_river_view == "cover") {
- $album_cover_guid = $album->getCoverImageGuid();
- if ($album_cover_guid) {
- $string .= "<div class=\"river_content\"> <img src=\"" . $CONFIG->wwwroot . 'mod/tidypics/thumbnail.php?file_guid=' . $album_cover_guid . '&size=thumb" class="tidypics_album_cover" alt="thumbnail"/>' . "</div>";
+ $image = $album->getCoverImage();
+ if ($image) {
+ $attachments = elgg_view('output/img', array(
+ 'src' => $image->getSrcUrl('thumb'),
+ ));
}
} else {
-
- $string .= "<div class=\"river_content\">";
-
- $images = elgg_get_entities(array(
- "type" => "object",
- "subtype" => "image",
- "container_guid" => $album->guid,
- "limit" => 7,
- ));
+ $images = $album->getImages(7);
if (count($images)) {
+ $attachments = '<ul>';
foreach($images as $image) {
- $string .= "<a href=\"" . $image->getURL() . "\"> <img src=\"" . $CONFIG->wwwroot . 'mod/tidypics/thumbnail.php?file_guid=' . $image->guid . '&size=thumb" class="tidypics_album_cover" alt="thumbnail"/> </a>';
+ $attachments .= '<li>';
+ $attachments .= elgg_view('output/img', array(
+ 'src' => $image->getSrcUrl('thumb'),
+ ));
+ $attachments .= '</li>';
}
+ $attachments .= '</ul>';
}
-
- $string .= "</div>";
}
-echo $string;
+echo elgg_view('river/elements/layout', array(
+ 'item' => $vars['item'],
+ 'attachments' => $attachments,
+));
diff --git a/views/default/river/object/image/create.php b/views/default/river/object/image/create.php
index 9de043e91..091956125 100644
--- a/views/default/river/object/image/create.php
+++ b/views/default/river/object/image/create.php
@@ -1,24 +1,34 @@
<?php
+/**
+ * Image album view
+ */
-$performed_by = get_entity($vars['item']->subject_guid);
-$image = get_entity($vars['item']->object_guid);
-if ($image->title) {
- $title = $image->title;
-} else {
- $title = elgg_echo("untitled");
-}
+$subject = $vars['item']->getSubjectEntity();
+$subject_link = elgg_view('output/url', array(
+ 'href' => $subject->getURL(),
+ 'text' => $subject->name,
+ 'class' => 'elgg-river-subject',
+ 'is_trusted' => true,
+));
-$url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
-$album = get_entity($image->container_guid);
+$image = $vars['item']->getObjectEntity();
+$attachments = elgg_view('output/img', array(
+ 'src' => $image->getSrcUrl('thumb'),
+));
+$image_link = elgg_view('output/url', array(
+ 'href' => $image->getURL(),
+ 'text' => $image->getTitle(),
+ 'is_trusted' => true,
+));
-$album_link = "<a href='". $album->getURL() . "'>" . $album->title . "</a>";
-$image_link = "<a href=\"" . $image->getURL() . "\">" . $title . "</a>";
+$album_link = elgg_view('output/url', array(
+ 'href' => $image->getContainerEntity()->getURL(),
+ 'text' => $image->getContainerEntity()->getTitle(),
+ 'is_trusted' => true,
+));
-$string = sprintf(elgg_echo("image:river:created"), $url, $image_link, $album_link);
-
-$string .= "<div class=\"river_content\">";
-
-$string .= "<a href=\"" . $image->getURL() . "\"> <img src=\"" . $CONFIG->wwwroot . 'mod/tidypics/thumbnail.php?file_guid=' . $image->guid . '&size=thumb" class="tidypics_album_cover" alt="thumbnail"/> </a>';
-$string .= "</div>";
-
-echo $string;
+echo elgg_view('river/elements/layout', array(
+ 'item' => $vars['item'],
+ 'attachments' => $attachments,
+ 'summary' => elgg_echo('image:river:created', array($subject_link, $image_link, $album_link)),
+));