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

9 files changed, 84 insertions, 84 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'];

 ?>

diff --git a/mod/riverdashboard/views/default/riverdashboard/container.php b/mod/riverdashboard/views/default/riverdashboard/container.php
index 9f0164b43..09a593622 100644
--- a/mod/riverdashboard/views/default/riverdashboard/container.php
+++ b/mod/riverdashboard/views/default/riverdashboard/container.php
@@ -30,7 +30,7 @@ function activityUpdateChecker(interval) {
 			'data': {'seconds_passed': this.seconds_passed},
 			'success': function(data) {
 				if (data) {
-					$('#riverdashboard_updates').html(data).slideDown();
+					$('#riverdashboard-updates').html(data).slideDown();
 					// could crank down the interval here.
 					// if we change the message to simply "New Posts!"
 					// we could stop the polling altogether.
diff --git a/mod/riverdashboard/views/default/riverdashboard/css.php b/mod/riverdashboard/views/default/riverdashboard/css.php
index a09a32712..18ba7c0dc 100644
--- a/mod/riverdashboard/views/default/riverdashboard/css.php
+++ b/mod/riverdashboard/views/default/riverdashboard/css.php
@@ -4,10 +4,10 @@
  *
  */
 ?>
-#riverdashboard_updates {
+#riverdashboard-updates {
 	border-bottom:1px solid #cccccc;
 }
-#riverdashboard_updates a.update_link {
+#riverdashboard-updates a.update-link {
 	display: inline-table;
 	color:white;
 	font-weight: bold;
@@ -18,47 +18,47 @@
 	-webkit-border-radius: 10px;
 	-moz-border-radius: 10px;
 }
-#riverdashboard_updates a.update_link:hover {
+#riverdashboard-updates a.update-link:hover {
 	background: #4690D6 url("<?php echo elgg_get_site_url(); ?>mod/riverdashboard/graphics/refresh.png") no-repeat 5px -22px;
 	color:white;
 	text-decoration: none;
 }
-.riverdashboard_filtermenu {
+.riverdashboard-filtermenu {
 	margin:10px 0 10px 0;
 	float:right;
 }
 
 /* RIVER ENTRY */
-.river_item {
+.river-item {
 	border-bottom:1px solid #cccccc;
 	padding:7px 0 7px 0;
 }
-.river_item p {
+.river-item p {
 	margin:0;
 }
-.river_item .entity_subtext {
+.river-item .entity-subtext {
 	display: block;
 	line-height: 1.4em;
 }
-.river_item_useravatar {
+.river-item-useravatar {
 	float:left;
 	margin-top:3px;
 	margin-left:1px;
 }
-.river_item_contents {
+.river-item-contents {
 	margin-left:55px;
 }
-.river_item_contents a {
+.river-item-contents a {
 	font-weight: bold;
 }
-.river_content_display {
+.river-content-display {
 	border-left:1px solid #DDDDDD;
 	font-size:85%;
 	line-height:1.5em;
 	margin:8px 0 5px 0;
 	padding-left:5px;
 }
-.following_icon {
+.following-icon {
 	width:20px;
 	height:25px;
 	margin:0 2px 0 2px;
@@ -66,11 +66,11 @@
 }
 
 /* LATEST COMMENTS IN RIVER */
-.river_comments_tabs {
+.river-comments-tabs {
 	max-height: 19px;
 	overflow:hidden;
 }
-.river_comments {
+.river-comments {
 	-moz-border-radius-bottomleft:5px;
 	-moz-border-radius-bottomright:5px;
 	-moz-border-radius-topleft:5px;
@@ -81,65 +81,65 @@
 	-webkit-border-bottom-left-radius:5px;
 	background-color: #eeeeee;
 }
-.river_comment {
+.river-comment {
 	padding:3px;
 	border-bottom:1px solid white;
 }
-.river_comment.penultimate {
+.river-comment.penultimate {
 
 }
-.river_comment.latest {
+.river-comment.latest {
 
 }
 /* hidden inline comment form */
-.river_comment_form.hidden {
+.river-comment_form.hidden {
 	padding:5px;
 	height:26px;
 }
-.river_comment_form.hidden .input-text {
+.river-comment_form.hidden .input-text {
 	width:560px;
 	padding:3px;
 }
-#profile_content .river_comment_form.hidden .input-text { /* when activity is displayed on profile page */
+#profile-content .river-comment_form.hidden .input-text { /* when activity is displayed on profile page */
 	width:535px;
 }
-.river_comment_form.hidden .submit-button {
+.river-comment_form.hidden .submit-button {
 	margin:0 0 0 10px;
 	float:right;
 }
-.river_link_divider {
+.river-link-divider {
 	color:#999999;
 	font-style: normal;
 }
-.river_item_contents .river_comment_form_button,
-.river_item_contents .river_user_like_button {
+.river-item-contents .river-comment-form-button,
+.river-item-contents .river_user-like-button {
 	font-weight:normal;
 	font-style: normal;
 }
-.river_item_contents .river_comment_form_button {
+.river-item-contents .river-comment-form-button {
 	margin-left: 7px;
 }
 /* hidden list of users that liked item */
-.river_item .elgg_likes_user {
+.river-item .elgg-likes-user {
 	border-bottom:1px solid white;
 	padding:3px;
 }
-.river_item .elgg_likes_user .entity_listing_icon {
+.river-item .elgg-likes-user .entity-listing-icon {
 	margin:3px 0 4px 2px;
 }
-.river_item .elgg_likes_user .entity_listing_info {
+.river-item .elgg-likes-user .entity-listing-info {
 	width:635px;
 }
-#profile_content .river_item .elgg_likes_user .entity_listing_info { /* when likes is displayed on profile page activity stream */
+#profile-content .river-item .elgg-likes-user .entity-listing-info { /* when likes is displayed on profile page activity stream */
 	width:600px;
 }
-.river_item .elgg_likes_user .entity_metadata {
+.river-item .elgg-likes-user .entity-metadata {
 	margin-top:3px;
 }
-.river_item p.elgg_likes_owner {
+.river-item p.elgg-likes-owner {
 	padding-top:0;
 }
-.river_item a.river_more_comments {
+.river-item a.river-more-comments {
 	display:block;
 	float:right;
 	padding:1px 7px 1px 7px;
@@ -154,17 +154,17 @@
 	-webkit-border-top-left-radius:4px;
 	-webkit-border-top-right-radius:4px;
 }
-.river_item a.river_more_comments.off {
+.river-item a.river-more-comments.off {
 	background-color: white;
 }
-.river_item .river_comment_owner_icon {
+.river-item .river-comment-owner-icon {
 	float:left;
 	margin:3px 8px 4px 2px;
 }
-.river_item .river_comment_contents {
+.river-item .river-comment-contents {
 	margin-left:34px;
 }
-a.river_more_comments {
+a.river-more-comments {
 	float:right;
 	font-size:85%;
 	padding-right:7px;
diff --git a/mod/riverdashboard/views/default/riverdashboard/ecml/activity.php b/mod/riverdashboard/views/default/riverdashboard/ecml/activity.php
index d24a8ffc2..2a76f0c68 100644
--- a/mod/riverdashboard/views/default/riverdashboard/ecml/activity.php
+++ b/mod/riverdashboard/views/default/riverdashboard/ecml/activity.php
@@ -18,7 +18,7 @@ if ($owner && !is_numeric($owner)) {
 	}
 }
 
-$river = elgg_view_river_items($owner, NULL, NULL, $type, $subtype, '', $limit, 0, 0, true, false)  . "</div>";
+$river = elgg_view_river-items($owner, NULL, NULL, $type, $subtype, '', $limit, 0, 0, true, false)  . "</div>";
 
 // Replacing callback calls in the nav with something meaningless
 $river = str_replace('callback=true','replaced=88,334', $river);
diff --git a/mod/riverdashboard/views/default/riverdashboard/js.php b/mod/riverdashboard/views/default/riverdashboard/js.php
index 4eec41149..09b1113d8 100644
--- a/mod/riverdashboard/views/default/riverdashboard/js.php
+++ b/mod/riverdashboard/views/default/riverdashboard/js.php
@@ -1,16 +1,16 @@
 <script type="text/javascript">
 	$(document).ready(function() {
-		$('.river_comment_form_button').click(function() {
-			elgg_slide_toggle(this, '.river_item', '.river_comment_form');
+		$('.river-comment-form-button').click(function() {
+			elgg_slide_toggle(this, '.river-item', '.river-comment_form');
 		});
 
 		$('.likes_user_list_button').click(function() {
-			var myParent = $(this).closest('.river_item');
-			var likesList = myParent.find('.likes_list');
+			var myParent = $(this).closest('.river-item');
+			var likesList = myParent.find('.likes-list');
 
 			if (likesList.css('display') == 'none') {
 				// pull in likes via ajax to save on loading many avatars
-				var riverItem = $(this).closest('.river_item');
+				var riverItem = $(this).closest('.river-item');
 				var guid = riverItem.attr('id').replace('river_entity_', '');
 
 				var params = {
@@ -24,33 +24,33 @@
 					myParent.find('.show_comments_button').addClass('off');
 					myParent.find('.likes_user_list_button').removeClass('off');
 					// show users that liked object
-					elgg_slide_toggle(this, '.river_item', '.likes_list');
+					elgg_slide_toggle(this, '.river-item', '.likes-list');
 				});
 			}
 		});
 
 		$('.show_comments_button').click(function() {
-			var myParent = $(this).closest('.river_item');
+			var myParent = $(this).closest('.river-item');
 			if (myParent.find('.comments_container').css('display') == 'none') {
 				// hide likes
-				myParent.find('.likes_list').animate({"height": "toggle", "opacity": "toggle"}, { duration: 400 });
+				myParent.find('.likes-list').animate({"height": "toggle", "opacity": "toggle"}, { duration: 400 });
 				// change selected tab
 				myParent.find('.show_comments_button').removeClass('off');
 				myParent.find('.likes_user_list_button').addClass('off');
 				// show users that liked object
-				elgg_slide_toggle(this, '.river_item', '.comments_container');
+				elgg_slide_toggle(this, '.river-item', '.comments_container');
 			}
 		});
 
 		// grab more comments
-		$('.river_more_comments.show_more_button').click(function() {
+		$('.river-more-comments.show_more_button').click(function() {
 			var showLess = $(this).next('.show_less_button');
 			var showMore = $(this);
-			var riverItem = $(this).closest('.river_item');
+			var riverItem = $(this).closest('.river-item');
 
 			var guid = riverItem.attr('id').replace('river_entity_', '');
 			var commentsList = riverItem.find('.comments_list');
-			var numComments = riverItem.find('.river_comment').length;
+			var numComments = riverItem.find('.river-comment').length;
 
 			var params = {
 				'entity_guid': guid,
@@ -67,12 +67,12 @@
 		});
 
 		// hide more comments
-		$('.river_more_comments.show_less_button').click(function() {
+		$('.river-more-comments.show_less_button').click(function() {
 			var showLess = $(this);
 			var showMore = $(this).prev('.show_more_button');
-			var riverItem = $(this).closest('.river_item');
+			var riverItem = $(this).closest('.river-item');
 			// want to keep the latest 3 comments
-			var comments = riverItem.find('.river_comment')
+			var comments = riverItem.find('.river-comment')
 			comments = $.makeArray(comments).reverse();
 			//reverse().splice(0, 3);
 
@@ -92,5 +92,5 @@
 	});
 
 	// re-add avatar menus for new avatars
-	//setup_avatar_menu($('.river_item_list'));
+	//setup_avatar_menu($('.river-item_list'));
 </script>
diff --git a/mod/riverdashboard/views/default/riverdashboard/nav.php b/mod/riverdashboard/views/default/riverdashboard/nav.php
index 820ebb5ae..cae3d7bcd 100644
--- a/mod/riverdashboard/views/default/riverdashboard/nav.php
+++ b/mod/riverdashboard/views/default/riverdashboard/nav.php
@@ -32,7 +32,7 @@ switch($vars['orient']) {
 		break;
 }
 ?>
-<div class="riverdashboard_filtermenu"> 
+<div class="riverdashboard-filtermenu"> 
 	<?php
 		$location_filter = "<select onchange=\"window.open(this.options[this.selectedIndex].value,'_top')\" name=\"file_filter\" class='Notstyled' >";
 		$current = get_input('subtype');
@@ -54,4 +54,4 @@ switch($vars['orient']) {
 	?>
 	<input type="hidden" name="display" id="display" value="<?php echo htmlentities($vars['orient']); ?>" />
 </div>
-<div id="riverdashboard_updates" class="clearfix"></div>
+<div id="riverdashboard-updates" class="clearfix"></div>
diff --git a/mod/riverdashboard/views/default/riverdashboard/rivercomment.php b/mod/riverdashboard/views/default/riverdashboard/rivercomment.php
index 03bd91d10..d6037557d 100644
--- a/mod/riverdashboard/views/default/riverdashboard/rivercomment.php
+++ b/mod/riverdashboard/views/default/riverdashboard/rivercomment.php
@@ -5,7 +5,7 @@
  */
 
 if (isset($vars['entity']) && isloggedin()) {
-	$form_body = "<div class='river_comment_form hidden'>";
+	$form_body = "<div class='river-comment_form hidden'>";
 	$form_body .= elgg_view('input/text',array(
 							'internalname' => 'generic_comment',
 							'value' => 'Add a comment...',