Refs #3073 first version of horizontal river menu. css still needs work for likes and the comment text bubble needs to be darkened

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

7 files changed, 16 insertions, 17 deletions

diff --git a/engine/lib/navigation.php b/engine/lib/navigation.php
index 95097334f..953bbe59a 100644
--- a/engine/lib/navigation.php
+++ b/engine/lib/navigation.php
@@ -267,7 +267,8 @@ function elgg_river_menu_setup($hook, $type, $return, $params) {
 				$options = array(
 					'name' => 'comment',
 					'href' => "#comments-add-$object->guid",
-					'text' => elgg_echo('generic_comments:text'),
+					'text' => elgg_view_icon('speech-bubble'),
+					'title' => elgg_echo('comment:this'),
 					'class' => "elgg-toggler",
 					'priority' => 50,
 				);
diff --git a/languages/en.php b/languages/en.php
index 5a112d1f3..427452aa9 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -856,6 +856,7 @@ $english = array(
  */
 	'edit:this' => 'Edit this',
 	'delete:this' => 'Delete this',
+	'comment:this' => 'Comment on this',
 
 /**
  * Input / output strings
diff --git a/mod/likes/start.php b/mod/likes/start.php
index ef46c9ef2..435e7a3ab 100644
--- a/mod/likes/start.php
+++ b/mod/likes/start.php
@@ -56,7 +56,7 @@ function likes_river_menu_setup($hook, $type, $return, $params) {
 					$options = array(
 						'name' => 'like',
 						'href' => $url,
-						'text' => elgg_echo('likes:likethis'),
+						'text' => elgg_view('likes/display', array('entity' => $object)),
 						'is_action' => true,
 						'priority' => 100,
 					);
@@ -71,7 +71,7 @@ function likes_river_menu_setup($hook, $type, $return, $params) {
 					$options = array(
 						'name' => 'like',
 						'href' => $url,
-						'text' => elgg_echo('likes:remove'),
+						'text' => elgg_view('likes/display', array('entity' => $object)),
 						'is_action' => true,
 						'priority' => 100,
 					);
diff --git a/views/default/css/elements/navigation.php b/views/default/css/elements/navigation.php
index 669f44b93..b72124001 100644
--- a/views/default/css/elements/navigation.php
+++ b/views/default/css/elements/navigation.php
@@ -499,7 +499,14 @@ li:hover > .elgg-menu-site-more {
 	RIVER
 *************************************** */
 .elgg-menu-river {
+	float: right;
+	margin-left: 15px;
 	font-size: 90%;
+	color: #aaa;
+}
+.elgg-menu-river > li {
+	display: inline-block;
+	margin-left: 5px;
 }
 
 /* ***************************************
diff --git a/views/default/river/elements/body.php b/views/default/river/elements/body.php
index 01db3fbea..f9ecbc03c 100644
--- a/views/default/river/elements/body.php
+++ b/views/default/river/elements/body.php
@@ -15,7 +15,9 @@ $params = array(
 );
 $subject_link = elgg_view('output/url', $params);
 $timestamp = elgg_get_friendly_time($item->getPostedTime());
-$header = "$subject_link <span class=\"elgg-river-timestamp\">$timestamp</span>";
+
+$header = elgg_view_menu('river', array('item' => $item, 'sort_by' => 'priority'));
+$header .= "$subject_link <span class=\"elgg-river-timestamp\">$timestamp</span>";
 
 // body
 $body = elgg_view($item->getView(), array('item' => $item));
@@ -27,5 +29,5 @@ echo elgg_view('page/components/module', array(
 	'header' => $header,
 	'body' => $body,
 	'footer' => $footer,
-	'show_inner' => false,
+	'class' => 'mbn',
 ));
\ No newline at end of file
diff --git a/views/default/river/elements/controls.php b/views/default/river/elements/controls.php
deleted file mode 100644
index 188d01b5a..000000000
--- a/views/default/river/elements/controls.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-/**
- * Controls on an river item
- *
- * @uses $vars['item']
- */
-
-echo elgg_view_menu('river', array(
-	'item' => $vars['item'],
-	'sort_by' => 'priority',
-));
diff --git a/views/default/river/item.php b/views/default/river/item.php
index 0a32818e9..bf7c80b03 100644
--- a/views/default/river/item.php
+++ b/views/default/river/item.php
@@ -10,7 +10,6 @@ $item = $vars['item'];
 $vars = array(
 	'image' => elgg_view('river/elements/image', array('item' => $item)),
 	'body' => elgg_view('river/elements/body', array('item' => $item)),
-	'image_alt' => elgg_view('river/elements/controls', array('item' => $item)),
 	'class' => 'elgg-river-item',
 );