2 files changed, 15 insertions, 27 deletions
diff --git a/views/default/river/object/event_calendar/create.php b/views/default/river/object/event_calendar/create.php
index e74a8f891..515389411 100644
--- a/views/default/river/object/event_calendar/create.php
+++ b/views/default/river/object/event_calendar/create.php
@@ -1,22 +1,13 @@
 <?php
-
-	/*$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>";*/
-
 /**
- * Event calendar river view.
+ * Event river view.
  */
 
+elgg_load_library('elgg:event_calendar');
+
 $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
+echo elgg_view('river/elements/layout', array(
+	'item' => $vars['item'],
+	'message' => event_calendar_get_formatted_time($object),
+));
diff --git a/views/default/river/object/event_calendar/update.php b/views/default/river/object/event_calendar/update.php
index f4526cd2a..515389411 100644
--- a/views/default/river/object/event_calendar/update.php
+++ b/views/default/river/object/event_calendar/update.php
@@ -1,16 +1,13 @@
 <?php
+/**
+ * Event river view.
+ */
+
+elgg_load_library('elgg:event_calendar');
 
-	/*$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>";*/
-    
 $object = $vars['item']->getObjectEntity();
 
-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',
+echo elgg_view('river/elements/layout', array(
+	'item' => $vars['item'],
+	'message' => event_calendar_get_formatted_time($object),
 ));