6 files changed, 49 insertions, 27 deletions

diff --git a/mod/blog/views/default/river/object/blog/create.php b/mod/blog/views/default/river/object/blog/create.php
index 38ee177ed..9dc0ffdac 100644
--- a/mod/blog/views/default/river/object/blog/create.php
+++ b/mod/blog/views/default/river/object/blog/create.php
@@ -7,12 +7,19 @@ $object = $vars['item']->getObjectEntity();
 $excerpt = strip_tags($object->excerpt);
 $excerpt = elgg_get_excerpt($excerpt);
 
+$params = array(
+	'href' => $object->getURL(),
+	'text' => $object->title,
+);
+$link = elgg_view('output/url', $params);
+
+
 echo elgg_echo('blog:river:create');
 
-echo " <a href=\"{$object->getURL()}\">{$object->title}</a>";
+echo " $link";
 
 if ($excerpt) {
-	echo '<div class="elgg-river-excerpt">';
+	echo '<div class="elgg-river-content">';
 	echo $excerpt;
 	echo '</div>';
 }
diff --git a/mod/bookmarks/languages/en.php b/mod/bookmarks/languages/en.php
index e0c4a9e08..24a77a645 100644
--- a/mod/bookmarks/languages/en.php
+++ b/mod/bookmarks/languages/en.php
@@ -38,9 +38,7 @@ $english = array(
 	'bookmarks:recent' => "Recent bookmarks",
 	'bookmarks:stats' => "Bookmark stats",
 	'bookmarks:resources' => "resources bookmarked",
-	'bookmarks:river:created' => '%s bookmarked',
-	'bookmarks:river:annotate' => 'posted a comment on this bookmarked item',
-	'bookmarks:river:item' => 'an item',
+	'bookmarks:river:create' => 'bookmarked',
 
 	'item:object:bookmarks' => 'Bookmarked items',
 
diff --git a/mod/bookmarks/views/default/river/object/bookmarks/create.php b/mod/bookmarks/views/default/river/object/bookmarks/create.php
index e31a5ab43..f30097dd9 100644
--- a/mod/bookmarks/views/default/river/object/bookmarks/create.php
+++ b/mod/bookmarks/views/default/river/object/bookmarks/create.php
@@ -1,5 +1,30 @@
 <?php
 /**
+ * Bookmarks river view.
+ */
+
+$object = $vars['item']->getObjectEntity();
+$excerpt = strip_tags($object->description);
+$excerpt = elgg_get_excerpt($excerpt);
+
+$params = array(
+	'href' => $object->address,
+	'text' => $object->title,
+);
+$link = elgg_view('output/url', $params);
+
+echo elgg_echo('bookmarks:river:create');
+
+echo " $link";
+
+if ($excerpt) {
+	echo '<div class="elgg-river-content">';
+	echo $excerpt;
+	echo '</div>';
+}
+
+return true;
+/**
  * Elgg bookmark river entry view
  */
 
diff --git a/views/default/css/screen.php b/views/default/css/screen.php
index 6b576f7d3..e75fea1ec 100644
--- a/views/default/css/screen.php
+++ b/views/default/css/screen.php
@@ -246,14 +246,14 @@ a.widget-edit-button:hover, a.widget-delete-button:hover {
     font-style: italic;
     line-height: 1.2em;
 }
-.elgg-river-excerpt {
+.elgg-river-content {
 	border-left: 1px solid #CCCCCC;
 	font-size: 85%;
 	line-height: 1.5em;
 	margin: 8px 0 5px 0;
 	padding-left: 5px;
 }
-.elgg-river-excerpt .usericon {
+.elgg-river-content .usericon {
 	float: left;
 }
 .elgg-river-layout .input-pulldown {
diff --git a/views/default/river/annotation/generic_comment/create.php b/views/default/river/annotation/generic_comment/create.php
index 5198a98a8..aabb6a9c6 100644
--- a/views/default/river/annotation/generic_comment/create.php
+++ b/views/default/river/annotation/generic_comment/create.php
@@ -10,7 +10,11 @@ $title = $object->title;
 if (!$title) {
 	$title = elgg_echo('untitled');
 }
-$object_link = "<a href=\"{$object->getURL()}\">$title</a>";
+$params = array(
+	'href' => $object->getURL(),
+	'text' => $title,
+);
+$object_link = elgg_view('output/url', $params);
 
 $type = $object->getType();
 $subtype = $object->getSubtype();
@@ -20,23 +24,7 @@ echo elgg_echo('river:generic_comment', array($type_string, $object_link));
 
 if ($comment) {
 	$excerpt = elgg_get_excerpt($comment->value);
-	echo '<div class="elgg-river-excerpt">';
+	echo '<div class="elgg-river-content">';
 	echo $excerpt;
 	echo '</div>';
 }
-
-/*
-$string = elgg_echo("river:posted:generic", array($url)) . " ";
-$string .= elgg_echo("{$subtype}:river:annotate") . "  <a href=\"{$object->getURL()}\">" . $title . "</a>";
-$string .= "</span>";
-if (elgg_get_context() != 'riverdashboard') {
-	$comment = elgg_get_excerpt($comment, 200);
-	if ($comment) {
-		$string .= "<div class='river_content_display'>";
-		$string .= $comment;
-		$string .= "</div>";
-	}
-}
-echo $string;
- * 
- */
\ No newline at end of file
diff --git a/views/default/river/relationship/friend/create.php b/views/default/river/relationship/friend/create.php
index 80c567795..1e6514b4a 100644
--- a/views/default/river/relationship/friend/create.php
+++ b/views/default/river/relationship/friend/create.php
@@ -5,13 +5,17 @@
 $subject = $vars['item']->getSubjectEntity();
 $object = $vars['item']->getObjectEntity();
 
-$object_link = "<a href=\"{$object->getURL()}\">$object->name</a>";
+$params = array(
+	'href' => $object->getURL(),
+	'text' => $object->name,
+);
+$object_link = elgg_view('output/url', $params);
 $subject_icon = elgg_view("profile/icon", array('entity' => $subject, 'size' => 'tiny'));
 $object_icon = elgg_view("profile/icon", array('entity' => $object, 'size' => 'tiny'));
 
 echo elgg_echo("friends:river:add", array($object_link));
 
-echo '<div class="elgg-river-excerpt">';
+echo '<div class="elgg-river-content clearfix">';
 echo $subject_icon;
 echo '<span class="elgg-icon elgg-icon-following"></span>';
 echo $object_icon;