From 43ffa1d95e62f553f7d0d7164c9c1a356abfcf93 Mon Sep 17 00:00:00 2001
From: cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Fri, 17 Dec 2010 12:37:21 +0000
Subject: added pages and thewire river entries

git-svn-id: http://code.elgg.org/elgg/trunk@7659 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 mod/thewire/languages/en.php                       |  2 +-
 .../views/default/river/object/thewire/create.php  | 35 +++++++++++++---------
 2 files changed, 22 insertions(+), 15 deletions(-)

(limited to 'mod/thewire')

diff --git a/mod/thewire/languages/en.php b/mod/thewire/languages/en.php
index 7a6853dc4..581ac5506 100644
--- a/mod/thewire/languages/en.php
+++ b/mod/thewire/languages/en.php
@@ -39,7 +39,7 @@
 	        'thewire:river:created' => "%s posted",
 	        
 	        //these get inserted into the river links to take the user to the entity
-	        'thewire:river:create' => "on the wire.",
+	        'thewire:river:create' => "posted to the wire",
 	        
 	    /**
 	     * Wire widget
diff --git a/mod/thewire/views/default/river/object/thewire/create.php b/mod/thewire/views/default/river/object/thewire/create.php
index 0660b47ff..b1142e0f4 100644
--- a/mod/thewire/views/default/river/object/thewire/create.php
+++ b/mod/thewire/views/default/river/object/thewire/create.php
@@ -1,17 +1,24 @@
 <?php
+/**
+ * File river view.
+ */
 
-$performed_by = get_entity($vars['item']->subject_guid); // $statement->getSubject();
-$object = get_entity($vars['item']->object_guid);
-$url = $object->getURL();
+$object = $vars['item']->getObjectEntity();
+$excerpt = strip_tags($object->description);
+$excerpt = elgg_get_excerpt($excerpt);
 
-$string = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}:</a> ";
-$desc = $object->description;
-//$desc = preg_replace('/\@([A-Za-z0-9\_\.\-]*)/i','@<a href="' . elgg_get_site_url() . 'pg/thewire/$1">$1</a>',$desc);
-$string .= parse_urls($desc);
-$string .= " <span class='entity-subtext'>" . elgg_view_friendly_time($object->time_created);
-	if (isloggedin()){
-		$string .= "<a class='river_comment_form_button link'>Comment</a>";
-		$string .= elgg_view('forms/likes/link', array('entity' => $object));
-	}
-$string .= "</span>";
-echo $string;
\ No newline at end of file
+$params = array(
+	'href' => $object->getURL(),
+	'text' => $object->title,
+);
+$link = elgg_view('output/url', $params);
+
+echo elgg_echo('thewire:river:create');
+
+echo " $link";
+
+if ($excerpt) {
+	echo '<div class="elgg-river-content">';
+	echo $excerpt;
+	echo '</div>';
+}
-- 
cgit v1.2.3