updated river views for content display and added new bookmarks river view code

git-svn-id: http://code.elgg.org/elgg/trunk@7657 36083f99-b078-4883-b0ff-0f9b5a30f544

3 files changed, 35 insertions, 5 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
  */