From 9b838be94d37d560b1a05f76cd5ecca5d41119fc Mon Sep 17 00:00:00 2001 From: cash Date: Thu, 1 Dec 2011 22:00:06 -0500 Subject: river views for image and albums - not for batches yet --- classes/TidypicsAlbum.php | 4 +++ languages/en.php | 5 +-- views/default/river/object/album/create.php | 56 ++++++++++++----------------- views/default/river/object/image/create.php | 48 +++++++++++++++---------- 4 files changed, 58 insertions(+), 55 deletions(-) diff --git a/classes/TidypicsAlbum.php b/classes/TidypicsAlbum.php index f85b66d72..028811e55 100644 --- a/classes/TidypicsAlbum.php +++ b/classes/TidypicsAlbum.php @@ -122,6 +122,10 @@ class TidypicsAlbum extends ElggObject { return elgg_view_entity_list($images, $count, $offset, $limit, false, false, true); } + public function getCoverImage() { + return get_entity($this->getCoverImageGuid()); + } + /** * Get the URL for the album cover image * diff --git a/languages/en.php b/languages/en.php index 96b63c170..40be85fd6 100644 --- a/languages/en.php +++ b/languages/en.php @@ -160,13 +160,14 @@ The photo can be viewed here: %s", 'album:more' => "View all albums", // river - 'image:river:created' => "%s added the photo %s to album %s", + 'river:create:object:image' => "%s uploaded the photo %s", + 'image:river:created' => "%s added the photo %s to the album %s", 'image:river:created:multiple' => "%s added %u photos to album %s", 'image:river:item' => "a photo", 'image:river:annotate' => "a comment on the photo", 'image:river:tagged' => "%s tagged %s in the photo %s", 'image:river:tagged:unknown' => "%s tagged %s in a photo", - 'album:river:created' => "%s created a new photo album", + 'river:create:object:album' => "%s created a new photo album %s", 'album:river:group' => "in the group", 'album:river:item' => "an album", 'album:river:annotate' => "a comment on the photo album", 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 @@ 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 = "getURL()}\">{$performed_by->name}"; -$string = sprintf(elgg_echo("album:river:created"), $url) . " "; -$string .= "getURL() . "\">" . $album->title . ""; -if ($group_album) { - $string .= ' ' . elgg_echo('album:river:group') . ' ' . "{$group_name}"; -} - -$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 .= "
wwwroot . 'mod/tidypics/thumbnail.php?file_guid=' . $album_cover_guid . '&size=thumb" class="tidypics_album_cover" alt="thumbnail"/>' . "
"; + $image = $album->getCoverImage(); + if ($image) { + $attachments = elgg_view('output/img', array( + 'src' => $image->getSrcUrl('thumb'), + )); } } else { - - $string .= "
"; - - $images = elgg_get_entities(array( - "type" => "object", - "subtype" => "image", - "container_guid" => $album->guid, - "limit" => 7, - )); + $images = $album->getImages(7); if (count($images)) { + $attachments = ''; } - - $string .= "
"; } -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 @@ 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 = "getURL()}\">{$performed_by->name}"; -$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 = "" . $album->title . ""; -$image_link = "getURL() . "\">" . $title . ""; +$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 .= "
"; - -$string .= "getURL() . "\"> wwwroot . 'mod/tidypics/thumbnail.php?file_guid=' . $image->guid . '&size=thumb" class="tidypics_album_cover" alt="thumbnail"/> '; -$string .= "
"; - -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)), +)); -- cgit v1.2.3