aboutsummaryrefslogtreecommitdiff
path: root/views
diff options
context:
space:
mode:
authorCash Costello <cash.costello@gmail.com>2009-03-21 18:50:27 +0000
committerCash Costello <cash.costello@gmail.com>2009-03-21 18:50:27 +0000
commit3b5ce30c7f4c2158f26c8ebb7e7bef3e19ece9e9 (patch)
treead397181660c293054d6eb2846cfbff06bd7fb1d /views
parent7acd3a2947f7bd92ded5bc5f02baa5db87f6b212 (diff)
downloadelgg-3b5ce30c7f4c2158f26c8ebb7e7bef3e19ece9e9.tar.gz
elgg-3b5ce30c7f4c2158f26c8ebb7e7bef3e19ece9e9.tar.bz2
added river integration for 1.5 - did not add update album or create/update image
Diffstat (limited to 'views')
-rw-r--r--views/default/river/object/album/create.php15
-rw-r--r--views/default/tidypics/css.php9
2 files changed, 21 insertions, 3 deletions
diff --git a/views/default/river/object/album/create.php b/views/default/river/object/album/create.php
index 68553309c..fcc87277d 100644
--- a/views/default/river/object/album/create.php
+++ b/views/default/river/object/album/create.php
@@ -1,13 +1,22 @@
<?php
+if (function_exists('add_to_river')) { // Elgg 1.5
+ $performed_by = get_entity($vars['item']->subject_guid);
+ $album = get_entity($vars['item']->object_guid);
+
+ $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>";
+} else { // Elgg 1.2
$statement = $vars['statement'];
$performed_by = $statement->getSubject();
$object = $statement->getObject();
-
+
$url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
$string = sprintf(elgg_echo("album:river:created"),$url) . " ";
- $string .= "<a href=\"" . $object->getURL() . "\">" . elgg_echo("album:river:item") . "</a>";
+ $string .= "<a href=\"" . $object->getURL() . "\">" . $object->title . "</a>";
+}
- echo $string;
+echo $string;
?> \ No newline at end of file
diff --git a/views/default/tidypics/css.php b/views/default/tidypics/css.php
index a682ff677..c1957d5d9 100644
--- a/views/default/tidypics/css.php
+++ b/views/default/tidypics/css.php
@@ -121,6 +121,15 @@
.river_album_create {
background: url(<?php echo $vars['url']; ?>mod/tidypics/graphics/icons/river_icon_album.gif) no-repeat left -1px;
}
+.river_object_album_create {
+ background: url(<?php echo $vars['url']; ?>mod/tidypics/graphics/icons/river_icon_album.gif) no-repeat left -1px;
+}
+.river_object_image_comment {
+ background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_comment.gif) no-repeat left -1px;
+}
+.river_object_album_comment {
+ background: url(<?php echo $vars['url']; ?>_graphics/river_icons/river_icon_comment.gif) no-repeat left -1px;
+}
.pagination {
clear:both !important;