From 621177abc2bc60e9edb3ca723a4afaa9d9e713ef Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 12 Dec 2009 19:51:49 +0000 Subject: convert line endings to Unix --- views/default/river/object/album/create.php | 84 ++++++++++++++--------------- views/default/river/object/image/create.php | 56 +++++++++---------- views/default/river/object/image/tag.php | 44 +++++++-------- 3 files changed, 92 insertions(+), 92 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 a9b261566..20f9293d7 100644 --- a/views/default/river/object/album/create.php +++ b/views/default/river/object/album/create.php @@ -1,42 +1,42 @@ -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"/>' . "
"; - } - } else { - - $string .= "
"; - - $images = get_entities("object", "image", $album->guid, 'time_created desc', 7); - - 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"/> '; - } - } - - $string .= "
"; - } - -echo $string; - -?> +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"/>' . "
"; + } + } else { + + $string .= "
"; + + $images = get_entities("object", "image", $album->guid, 'time_created desc', 7); + + 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"/> '; + } + } + + $string .= "
"; + } + +echo $string; + +?> diff --git a/views/default/river/object/image/create.php b/views/default/river/object/image/create.php index 5229e109a..2f1777f64 100644 --- a/views/default/river/object/image/create.php +++ b/views/default/river/object/image/create.php @@ -1,29 +1,29 @@ -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); - - $album_link = "" . $album->title . ""; - $image_link = "getURL() . "\">" . $title . ""; - - $string = sprintf(elgg_echo("image:river:created"),$performed_by->name, $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; - +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); + + $album_link = "" . $album->title . ""; + $image_link = "getURL() . "\">" . $title . ""; + + $string = sprintf(elgg_echo("image:river:created"),$performed_by->name, $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; + ?> \ No newline at end of file diff --git a/views/default/river/object/image/tag.php b/views/default/river/object/image/tag.php index 6e60d5af3..1b3589afb 100644 --- a/views/default/river/object/image/tag.php +++ b/views/default/river/object/image/tag.php @@ -1,23 +1,23 @@ -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; - +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; + ?> \ No newline at end of file -- cgit v1.2.3