Refs #2700 replaced most underscores with hyphens - there may be broken display code due to extent of this change

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

3 files changed, 27 insertions, 27 deletions

diff --git a/mod/riverdashboard/views/default/river/item/list.php b/mod/riverdashboard/views/default/river/item/list.php
index a0f547e45..fdd5b24df 100644
--- a/mod/riverdashboard/views/default/river/item/list.php
+++ b/mod/riverdashboard/views/default/river/item/list.php
@@ -5,7 +5,7 @@ if (isset($vars['items']) && is_array($vars['items'])) {
 	$i = 0;
 	if (!empty($vars['items'])) {
 		foreach($vars['items'] as $item) {
-			echo elgg_view_river_item($item);
+			echo elgg_view_river-item($item);
 			$i++;
 			if ($i >= $vars['limit']) {
 				break;
@@ -29,7 +29,7 @@ if ($vars['pagination'] !== false) {
 			$nexturl=$baseurl . '?' . $urladdition;
 		}
 
-		$nav .= '<a class="pagination_previous" href="'.$nexturl.'">&laquo; ' . elgg_echo('previous') . '</a> ';
+		$nav .= '<a class="pagination-previous" href="'.$nexturl.'">&laquo; ' . elgg_echo('previous') . '</a> ';
 	}
 
 	if ($vars['offset'] > 0) {
@@ -44,7 +44,7 @@ if ($vars['pagination'] !== false) {
 			$prevurl=$baseurl . '?' . $urladdition;
 		}
 
-		$nav .= '<a class="pagination_next" href="'.$prevurl.'">' . elgg_echo('next') . ' &raquo;</a> ';
+		$nav .= '<a class="pagination-next" href="'.$prevurl.'">' . elgg_echo('next') . ' &raquo;</a> ';
 	}
 
 	if (!empty($nav)) {
diff --git a/mod/riverdashboard/views/default/river/item/wrapper.php b/mod/riverdashboard/views/default/river/item/wrapper.php
index 0413775d6..8e93b25b5 100644
--- a/mod/riverdashboard/views/default/river/item/wrapper.php
+++ b/mod/riverdashboard/views/default/river/item/wrapper.php
@@ -41,12 +41,12 @@ if ($comment_count < 3) {
 }
 
 ?>
-<div class="river_item riverdashboard" id="river_entity_<?php echo $object->guid; ?>">
-	<span class="river_item_useravatar">
+<div class="river-item riverdashboard" id="river_entity_<?php echo $object->guid; ?>">
+	<span class="river-item-useravatar">
 		<?php echo elgg_view("profile/icon",array('entity' => $user, 'size' => 'small')); ?>
 	</span>
 
-	<div class="river_item_contents clearfix">
+	<div class="river-item-contents clearfix">
 <?php
 
 // body contents, generated by the river view in each plugin
@@ -56,30 +56,30 @@ echo $vars['body'];
 if ($comments){
 	$counter = 0;
 
-	echo "<div class='river_comments_tabs clearfix'>";
-	echo "<a class='river_more_comments show_comments_button link'>" . elgg_echo('comments') . '</a>';
+	echo "<div class='river-comments-tabs clearfix'>";
+	echo "<a class='river-more-comments show_comments_button link'>" . elgg_echo('comments') . '</a>';
 
 	if ($likes_count != 0) {
 		echo elgg_view('likes/forms/display', array('entity' => $object));
 	}
 
-	echo "</div>"; // close river_comments_tabs
+	echo "</div>"; // close river-comments-tabs
 
-	echo "<div class='river_comments'>";
+	echo "<div class='river-comments'>";
 
 	if ($likes_count != 0) {
 		//show the users who liked the object
 		// this is loaded via ajax to avoid pounding the server with avatar requests.
-		echo "<div class='likes_list hidden'></div>";
+		echo "<div class='likes-list hidden'></div>";
 	}
 
 	echo "<div class=\"comments_container\">";
 	// display appropriate comment link
 	if ($more_comments_count > 0) {
-		echo "<a class=\"river_more_comments show_more_button link\">" .
+		echo "<a class=\"river-more-comments show_more_button link\">" .
 		elgg_echo('riverdashboard:n_more_comments', array($more_comments_count)) . '</a>';
 
-		echo "<a style=\"display: none\" class=\"river_more_comments show_less_button link\">" . elgg_echo('riverdashboard:show_less') . '</a>';
+		echo "<a style=\"display: none\" class=\"river-more-comments show_less_button link\">" . elgg_echo('riverdashboard:show_less') . '</a>';
 	}
 	echo "<div class=\"comments_list\">";
 	foreach ($comments as $comment) {
@@ -95,27 +95,27 @@ if ($comments){
 			$alt = 'penultimate';
 		}
 		//display comment
-		echo "<div class='river_comment $alt clearfix'>";
-		echo "<span class='river_comment_owner_icon'>";
+		echo "<div class='river-comment $alt clearfix'>";
+		echo "<span class='river-comment-owner-icon'>";
 		echo elgg_view("profile/icon", array('entity' => $comment_owner, 'size' => 'tiny'));
 		echo "</span>";
 
 		//truncate comment to 150 characters and strip tags
 		$contents = elgg_get_excerpt($comment->value, 150);
 
-		echo "<div class='river_comment_contents'>";
+		echo "<div class='river-comment-contents'>";
 		echo "<a href=\"{$comment_owner_url}\">" . $comment_owner->name . '</a>&nbsp;<span class="elgg_excerpt">' . parse_urls($contents) . '</span>';
-		echo "<span class='entity_subtext'>" . elgg_view_friendly_time($comment->time_created) . "</span>";
+		echo "<span class='entity-subtext'>" . elgg_view_friendly_time($comment->time_created) . "</span>";
 		echo "</div></div>";
 		$counter++;
 	}
 
-	// close comments_list, comments_container and river_comments
-	echo '</div></div>' . elgg_make_river_comment($object) . '</div>';
+	// close comments_list, comments_container and river-comments
+	echo '</div></div>' . elgg_make_river-comment($object) . '</div>';
 } else {
 	// tab bar nav - for users that liked object
 	if ($vars['item']->type != 'user' && $likes_count != 0) {
-		echo "<div class='river_comments_tabs clearfix'>";
+		echo "<div class='river-comments-tabs clearfix'>";
 	}
 
 	if ($likes_count != 0) {
@@ -123,15 +123,15 @@ if ($comments){
 	}
 
 	if ($vars['item']->type != 'user' && $likes_count != 0) {
-		echo "</div>"; // close river_comments_tabs
+		echo "</div>"; // close river-comments-tabs
 	}
 
 	if ($vars['item']->type != 'user') {
-		echo "<div class='river_comments'>";
+		echo "<div class='river-comments'>";
 	}
 	if ($likes_count != 0) {
 		//show the users who liked the object
-		echo "<div class='likes_list hidden'>";
+		echo "<div class='likes-list hidden'>";
 		echo list_annotations($object->getGUID(), 'likes', 99);
 		echo "</div>";
 	}
@@ -139,7 +139,7 @@ if ($comments){
 	// if there are no comments to display
 	// and this is not a user - include the inline comment form
 	if ($vars['item']->type != 'user') {
-		echo elgg_make_river_comment($object);
+		echo elgg_make_river-comment($object);
 	}
 	if ($vars['item']->type != 'user') {
 		echo "</div>";
diff --git a/mod/riverdashboard/views/default/river/item/wrapper_classic.php b/mod/riverdashboard/views/default/river/item/wrapper_classic.php
index 60568642a..58fe938f4 100644
--- a/mod/riverdashboard/views/default/river/item/wrapper_classic.php
+++ b/mod/riverdashboard/views/default/river/item/wrapper_classic.php
@@ -6,13 +6,13 @@
  * @package Elgg

  */

 ?>

-<div class="river_item riverdashboard">

-	<span class="river_item_useravatar">

+<div class="river-item riverdashboard">

+	<span class="river-item-useravatar">

 <?php

 echo elgg_view("profile/icon",array('entity' => get_entity($vars['item']->subject_guid), 'size' => 'small'));

 ?>

 	</span>

-	<div class="river_item_contents clearfix">

+	<div class="river-item-contents clearfix">

 <?php

 echo $vars['body'];

 ?>