From 73403645808a81425381f43c25e0ea2c92705312 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sun, 25 Jul 2010 02:01:36 +0000 Subject: first go at brining tidypics up to code standards --- views/default/river/object/album/create.php | 65 ++++++++++++++--------------- views/default/river/object/image/create.php | 38 ++++++++--------- views/default/river/object/image/tag.php | 39 +++++++++-------- 3 files changed, 69 insertions(+), 73 deletions(-) (limited to 'views/default/river/object') diff --git a/views/default/river/object/album/create.php b/views/default/river/object/album/create.php index 20f9293d7..ef50f9988 100644 --- a/views/default/river/object/album/create.php +++ b/views/default/river/object/album/create.php @@ -1,42 +1,41 @@ 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(); +$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 = "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'); + +if ($album_river_view == "cover") { + if ($album->cover) { + $string .= "
wwwroot . 'mod/tidypics/thumbnail.php?file_guid=' . $album->cover . '&size=thumb" class="tidypics_album_cover" alt="thumbnail"/>' . "
"; } - - $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'); - - if ($album_river_view == "cover") { - if ($album->cover) { - $string .= "
wwwroot . 'mod/tidypics/thumbnail.php?file_guid=' . $album->cover . '&size=thumb" class="tidypics_album_cover" alt="thumbnail"/>' . "
"; - } - } else { +} else { - $string .= "
"; - - $images = get_entities("object", "image", $album->guid, 'time_created desc', 7); + $string .= "
"; - if (count($images)) { - foreach($images as $image){ - $string .= "getURL() . "\"> wwwroot . 'mod/tidypics/thumbnail.php?file_guid=' . $image->guid . '&size=thumb" class="tidypics_album_cover" alt="thumbnail"/> '; - } - } + $images = get_entities("object", "image", $album->guid, 'time_created desc', 7); - $string .= "
"; + if (count($images)) { + foreach($images as $image) { + $string .= "getURL() . "\"> wwwroot . 'mod/tidypics/thumbnail.php?file_guid=' . $image->guid . '&size=thumb" class="tidypics_album_cover" alt="thumbnail"/> '; + } } -echo $string; + $string .= "
"; +} -?> +echo $string; diff --git a/views/default/river/object/image/create.php b/views/default/river/object/image/create.php index cd2351a2e..188fc6ff1 100644 --- a/views/default/river/object/image/create.php +++ b/views/default/river/object/image/create.php @@ -1,29 +1,27 @@ subject_guid); - $image = get_entity($vars['item']->object_guid); - if($image->title) { - $title = $image->title; - } else { - $title = "untitled"; - } +$performed_by = get_entity($vars['item']->subject_guid); +$image = get_entity($vars['item']->object_guid); +if ($image->title) { + $title = $image->title; +} else { + $title = "untitled"; +} - $url = "getURL()}\">{$performed_by->name}"; - $album = get_entity($image->container_guid); +$url = "getURL()}\">{$performed_by->name}"; +$album = get_entity($image->container_guid); - $album_link = "" . $album->title . ""; - $image_link = "getURL() . "\">" . $title . ""; - - $string = sprintf(elgg_echo("image:river:created"), $url, $image_link, $album_link); - - $string .= "
"; +$album_link = "" . $album->title . ""; +$image_link = "getURL() . "\">" . $title . ""; + +$string = sprintf(elgg_echo("image:river:created"), $url, $image_link, $album_link); + +$string .= "
"; /* // this adds the album cover to the river display $string .= "getURL() . "\"> wwwroot . 'mod/tidypics/thumbnail.php?file_guid=' . $album->cover . '&size=thumb" class="tidypics_album_cover" alt="thumbnail"/> '; */ - $string .= "getURL() . "\"> wwwroot . 'mod/tidypics/thumbnail.php?file_guid=' . $image->guid . '&size=thumb" class="tidypics_album_cover" alt="thumbnail"/> '; - $string .= "
"; - - echo $string; +$string .= "getURL() . "\"> wwwroot . 'mod/tidypics/thumbnail.php?file_guid=' . $image->guid . '&size=thumb" class="tidypics_album_cover" alt="thumbnail"/> '; +$string .= "
"; -?> \ No newline at end of file +echo $string; diff --git a/views/default/river/object/image/tag.php b/views/default/river/object/image/tag.php index 1b3589afb..961761c99 100644 --- a/views/default/river/object/image/tag.php +++ b/views/default/river/object/image/tag.php @@ -1,23 +1,22 @@ subject_guid); - $person_tagged = get_entity($vars['item']->object_guid); - if($image->title) { - $title = $image->title; - } else { - $title = "untitled"; - } - - // viewer may not have permission to view image - if (!$image) - return; - - - $image_url = "getURL()}\">{$title}"; - $person_url = "getURL()}\">{$person_tagged->name}"; - - $string = $person_url . ' ' . elgg_echo('image:river:tagged') . ' ' . $image_url; - - echo $string; +$image = get_entity($vars['item']->subject_guid); +$person_tagged = get_entity($vars['item']->object_guid); +if ($image->title) { + $title = $image->title; +} else { + $title = "untitled"; +} -?> \ No newline at end of file +// viewer may not have permission to view image +if (!$image) { + return; +} + + +$image_url = "getURL()}\">{$title}"; +$person_url = "getURL()}\">{$person_tagged->name}"; + +$string = $person_url . ' ' . elgg_echo('image:river:tagged') . ' ' . $image_url; + +echo $string; -- cgit v1.2.3