major changes for Elgg 1.8

2 files changed, 22 insertions, 8 deletions

diff --git a/views/default/river/object/event_calendar/create.php b/views/default/river/object/event_calendar/create.php
index f144ca610..e74a8f891 100644
--- a/views/default/river/object/event_calendar/create.php
+++ b/views/default/river/object/event_calendar/create.php
@@ -1,12 +1,22 @@
 <?php
 
-	$performed_by = get_entity($vars['item']->subject_guid); 
+	/*$performed_by = get_entity($vars['item']->subject_guid); 
 	$object = get_entity($vars['item']->object_guid);
 	
 	$url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
 	$string = sprintf(elgg_echo("event_calendar:river:created"),$url) . " ";
-	$string .= elgg_echo("event_calendar:river:create")." <a href=\"" . $object->getURL() . "\">" . $object->title . "</a>";
+	$string .= elgg_echo("event_calendar:river:create")." <a href=\"" . $object->getURL() . "\">" . $object->title . "</a>";*/
 
-?>
+/**
+ * Event calendar river view.
+ */
 
-<?php echo $string; ?>
\ No newline at end of file
+$object = $vars['item']->getObjectEntity();
+$excerpt = strip_tags($object->description);
+$vars['excerpt'] = elgg_get_excerpt($excerpt);
+
+echo elgg_view('page/components/image_block', array(
+	'image' => '<img src="'.$vars['url'] . 'mod/event_calendar/images/event_icon.gif" />',
+	'body' => elgg_view('river/elements/body', $vars),
+	'class' => 'elgg-river-item',
+));
\ No newline at end of file
diff --git a/views/default/river/object/event_calendar/update.php b/views/default/river/object/event_calendar/update.php
index 5a5d376b1..f4526cd2a 100644
--- a/views/default/river/object/event_calendar/update.php
+++ b/views/default/river/object/event_calendar/update.php
@@ -1,12 +1,16 @@
 <?php
 
-	$performed_by = get_entity($vars['item']->subject_guid); 
+	/*$performed_by = get_entity($vars['item']->subject_guid); 
 	$object = get_entity($vars['item']->object_guid);
 	
 	$url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
 	$string = sprintf(elgg_echo("event_calendar:river:updated"),$url) . " ";
-    $string .= elgg_echo("event_calendar:river:the_event")." <a href=\"" . $object->getURL() . "\">" . $object->title . "</a>";
+    $string .= elgg_echo("event_calendar:river:the_event")." <a href=\"" . $object->getURL() . "\">" . $object->title . "</a>";*/
     
-?>
+$object = $vars['item']->getObjectEntity();
 
-<?php echo $string; ?>
\ No newline at end of file
+echo elgg_view('page/components/image_block', array(
+	'image' => '<img src="'.$vars['url'] . 'mod/event_calendar/images/event_icon.gif" />',
+	'body' => elgg_view('river/elements/body', $vars),
+	'class' => 'elgg-river-item',
+));