Moved all river entry metadata inside span (pushed onto new line) and added relevant css

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

8 files changed, 21 insertions, 12 deletions

diff --git a/mod/blog/views/default/river/object/blog/create.php b/mod/blog/views/default/river/object/blog/create.php
index c14bd56e8..eadd4381d 100644
--- a/mod/blog/views/default/river/object/blog/create.php
+++ b/mod/blog/views/default/river/object/blog/create.php
@@ -10,12 +10,13 @@ $contents = strip_tags($object->excerpt);
 
 $url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
 $title = sprintf(elgg_echo('blog:river:create'), $url);
-$string .= $title . " <a href=\"{$object->getURL()}\">{$object->title}</a> <span class=\"entity_subtext\">" . friendly_time($object->time_created) . '</span>';
+$string .= $title . " <a href=\"{$object->getURL()}\">{$object->title}</a> <span class='entity_subtext'>" . friendly_time($object->time_created);
 
 if (isloggedin()) {
 	$string .= '<a class="river_comment_form_button link">' . elgg_echo('generic_comments:text') . '</a>';
 	$string .= elgg_view('likes/forms/link', array('entity' => $object));
 }
+$string .= "</span>";
 
 $string .= '<div class="river_content_display">';
 $string .= '<div class="river_object_blog_create"></div>';
diff --git a/mod/bookmarks/views/default/river/object/bookmarks/create.php b/mod/bookmarks/views/default/river/object/bookmarks/create.php
index d5124e4ca..2e27961c0 100644
--- a/mod/bookmarks/views/default/river/object/bookmarks/create.php
+++ b/mod/bookmarks/views/default/river/object/bookmarks/create.php
@@ -13,9 +13,10 @@ $string .= "<a href=\"" . $object->address . "\">" . $object->title . "</a>";
 if(($is_group instanceof ElggGroup) && (get_context() != 'groups')){
 	$string .= " " . elgg_echo('bookmarks:ingroup') . " <a href=\"{$is_group->getURL()}\">" . $is_group->name . "</a>";
 }
-$string .= " <span class='entity_subtext'>" . friendly_time($object->time_created) . "</span>";
+$string .= " <span class='entity_subtext'>" . friendly_time($object->time_created);
 if (isloggedin()){
 	$string .= "<a class='river_comment_form_button link'>Comment</a>";
 	$string .= elgg_view('likes/forms/link', array('entity' => $object));
 }
+$string .= "</span>";
 echo $string;
\ No newline at end of file
diff --git a/mod/groups/views/default/river/forum/create.php b/mod/groups/views/default/river/forum/create.php
index 4906fc869..e99c77a4e 100644
--- a/mod/groups/views/default/river/forum/create.php
+++ b/mod/groups/views/default/river/forum/create.php
@@ -16,8 +16,9 @@
 	$url = $vars['url'] . "mod/groups/topicposts.php?topic=" . $forumtopic . "&group_guid=" . $group_guid;
 	$url_user = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
 	$string = sprintf(elgg_echo("groupforum:river:posted"),$url_user) . " ";
-	$string .= elgg_echo("groupforum:river:annotate:create") . " | <a href=\"" . $url . "\">" . $object->title . "</a> <span class='entity_subtext'>". friendly_time($object->time_created) ."</span> <a class='river_comment_form_button link' href=\"{$object_url}\">Visit discussion</a>";
+	$string .= elgg_echo("groupforum:river:annotate:create") . " | <a href=\"" . $url . "\">" . $object->title . "</a> <span class='entity_subtext'>". friendly_time($object->time_created) ."<a class='river_comment_form_button link' href=\"{$object_url}\">Visit discussion</a>";
 	$string .= elgg_view('likes/forms/link', array('entity' => $object));
+	$string .= "</span>";
 	$string .= "<div class=\"river_content_display\">";
 	$string .= elgg_make_excerpt($contents, 200);
 	$string .= "</div>";
diff --git a/mod/groups/views/default/river/forum/topic/create.php b/mod/groups/views/default/river/forum/topic/create.php
index fb2a3556d..b44922022 100644
--- a/mod/groups/views/default/river/forum/topic/create.php
+++ b/mod/groups/views/default/river/forum/topic/create.php
@@ -16,11 +16,12 @@
 	$string = sprintf(elgg_echo("groupforum:river:postedtopic"),$url_user) . ": ";
 	$string .= "<a href=\"" . $url . "\">" . $object->title . "</a>";
 	$string .= " " . elgg_echo('groups:ingroup') . " <a href=\"{$group->getURL()}\">" . $group->name . "</a>";
-	$string .= " <span class='entity_subtext'>". friendly_time($object->time_created) ."</span>";
+	$string .= " <span class='entity_subtext'>". friendly_time($object->time_created);
 	if (isloggedin() && $object->status != "closed") {
 		$string .= '<a class="river_comment_form_button link">' . elgg_echo('generic_comments:text') . '</a>';
 		$string .= elgg_view('likes/forms/link', array('entity' => $object));
 	}
+	$string .= "</span>";
 	$string .= "<div class=\"river_content_display\">";
 	$string .= elgg_make_excerpt($contents, 200);
 	$string .= "</div>";
diff --git a/mod/riverdashboard/views/default/river/item/wrapper.php b/mod/riverdashboard/views/default/river/item/wrapper.php
index 40b5f09b5..482057ed4 100644
--- a/mod/riverdashboard/views/default/river/item/wrapper.php
+++ b/mod/riverdashboard/views/default/river/item/wrapper.php
@@ -104,7 +104,7 @@ if ($comments){
 		$contents = elgg_make_excerpt($comment->value, 150);
 
 		echo "<div class='river_comment_contents'>";
-		echo "<a href=\"{$comment_owner_url}\">" . $comment_owner->name . '</a>&nbsp;<span class="twitter_anywhere">' . parse_urls($contents) . '</span>';
+		echo "<a href=\"{$comment_owner_url}\">" . $comment_owner->name . '</a>&nbsp;<span class="elgg_excerpt">' . parse_urls($contents) . '</span>';
 		echo "<span class='entity_subtext'>" . friendly_time($comment->time_created) . "</span>";
 		echo "</div></div>";
 		$counter++;
diff --git a/mod/riverdashboard/views/default/riverdashboard/css.php b/mod/riverdashboard/views/default/riverdashboard/css.php
index 24c960fbc..20da6ebeb 100644
--- a/mod/riverdashboard/views/default/riverdashboard/css.php
+++ b/mod/riverdashboard/views/default/riverdashboard/css.php
@@ -37,9 +37,8 @@
 	margin:0;
 }
 .river_item .entity_subtext {
-	padding-left:5px;
-	padding-right:12px;
-	/*font-size:85%;*/
+	display: block;
+	line-height: 1.4em;
 }
 .river_item_useravatar {
 	float:left;
@@ -110,11 +109,15 @@
 }
 .river_link_divider {
 	color:#999999;
+	font-style: normal;
 }
 .river_item_contents .river_comment_form_button,
 .river_item_contents .river_user_like_button {
-	font-size:85%;
 	font-weight:normal;
+	font-style: normal;
+}
+.river_item_contents .river_comment_form_button {
+	margin-left: 7px;
 }
 /* hidden list of users that liked item */
 .river_item .elgg_likes_user {
@@ -134,7 +137,7 @@
 	margin-top:3px;
 }
 .river_item p.elgg_likes_owner {
-	padding-top:4px;
+	padding-top:0;
 }
 .river_item a.river_more_comments {
 	display:block;
diff --git a/mod/thewire/views/default/river/object/thewire/create.php b/mod/thewire/views/default/river/object/thewire/create.php
index 8114e969e..d8d8ba3b5 100644
--- a/mod/thewire/views/default/river/object/thewire/create.php
+++ b/mod/thewire/views/default/river/object/thewire/create.php
@@ -8,9 +8,10 @@ $string = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}:</a> ";
 $desc = $object->description;
 //$desc = preg_replace('/\@([A-Za-z0-9\_\.\-]*)/i','@<a href="' . $vars['url'] . 'pg/thewire/$1">$1</a>',$desc);
 $string .= parse_urls($desc);
-$string .= " <span class='entity_subtext'>" . friendly_time($object->time_created) . "</span>";
+$string .= " <span class='entity_subtext'>" . friendly_time($object->time_created);
 	if (isloggedin()){
 		$string .= "<a class='river_comment_form_button link'>Comment</a>";
 		$string .= elgg_view('likes/forms/link', array('entity' => $object));
 	}
+$string .= "</span>";
 echo $string;
\ No newline at end of file
diff --git a/views/default/annotation/annotate.php b/views/default/annotation/annotate.php
index 2cb35798b..5cd2879c2 100644
--- a/views/default/annotation/annotate.php
+++ b/views/default/annotation/annotate.php
@@ -12,8 +12,9 @@
 		$comment = get_annotation($vars['item']->annotation_id)->value; 
 	$url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
 	$string = sprintf(elgg_echo("river:posted:generic"),$url) . " ";
-	$string .= elgg_echo("{$subtype}:river:annotate") . "  <a href=\"{$object->getURL()}\">" . $title . "</a> <span class='entity_subtext'>". friendly_time($object->time_created) ."</span> <a class='river_comment_form_button link'>Comment</a>";
+	$string .= elgg_echo("{$subtype}:river:annotate") . "  <a href=\"{$object->getURL()}\">" . $title . "</a> <span class='entity_subtext'>". friendly_time($object->time_created) ."<a class='river_comment_form_button link'>Comment</a>";
 	$string .= elgg_view('likes/forms/link', array('entity' => $object));
+	$string .= "</span>";
 	if(get_context() != 'riverdashboard'){
 		$string .= "<div class='river_content_display'>";
 		if($comment){