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

21 files changed, 69 insertions, 69 deletions

diff --git a/mod/groups/groupprofile.php b/mod/groups/groupprofile.php
index e7daddb43..43473e261 100644
--- a/mod/groups/groupprofile.php
+++ b/mod/groups/groupprofile.php
@@ -46,7 +46,7 @@
 		$title = elgg_echo('groups:notfound');
 		
 		$area2 = elgg_view_title($title);
-		$area2 .= "<p class='margin_top'>".elgg_echo('groups:notfound:details')."</p>";
+		$area2 .= "<p class='margin-top'>".elgg_echo('groups:notfound:details')."</p>";
 		
 		$body = elgg_view_layout('one_column_with_sidebar', array('content' => $area2));
 	}
diff --git a/mod/groups/views/default/forms/forums/addtopic.php b/mod/groups/views/default/forms/forums/addtopic.php
index af8c0a447..7d61e2514 100644
--- a/mod/groups/views/default/forms/forums/addtopic.php
+++ b/mod/groups/views/default/forms/forums/addtopic.php
@@ -35,7 +35,7 @@
 
 ?>
 <!-- display the input form -->
-<form id="group_addtopic" action="<?php echo elgg_get_site_url(); ?>action/<?php echo $action; ?>" method="post" class="margin_top">
+<form id="group_addtopic" action="<?php echo elgg_get_site_url(); ?>action/<?php echo $action; ?>" method="post" class="margin-top">
 <?php echo elgg_view('input/securitytoken'); ?>
 
 	<p>
diff --git a/mod/groups/views/default/forms/groups/edit.php b/mod/groups/views/default/forms/groups/edit.php
index 32e9f6ff3..d3eb7ac68 100644
--- a/mod/groups/views/default/forms/groups/edit.php
+++ b/mod/groups/views/default/forms/groups/edit.php
@@ -13,7 +13,7 @@
 	}
 	
 ?>
-<form action="<?php echo elgg_get_site_url(); ?>action/groups/edit" id="edit_group" enctype="multipart/form-data" method="post" class="margin_top">
+<form action="<?php echo elgg_get_site_url(); ?>action/groups/edit" id="edit_group" enctype="multipart/form-data" method="post" class="margin-top">
 
 	<?php echo elgg_view('input/securitytoken'); ?>
 
diff --git a/mod/groups/views/default/forms/groups/invite.php b/mod/groups/views/default/forms/groups/invite.php
index 3298a7450..279e11a20 100644
--- a/mod/groups/views/default/forms/groups/invite.php
+++ b/mod/groups/views/default/forms/groups/invite.php
@@ -12,7 +12,7 @@
 
 if ($friends) {
 ?>
-<form action="<?php echo elgg_get_site_url(); ?>action/groups/invite" method="post" id="invite_to_group" class="margin_top">
+<form action="<?php echo elgg_get_site_url(); ?>action/groups/invite" method="post" id="invite_to_group" class="margin-top">
 
 <?php
 	echo elgg_view('input/securitytoken');
diff --git a/mod/groups/views/default/forum/maintopic.php b/mod/groups/views/default/forum/maintopic.php
index 8cf2e4a76..2c75c0a77 100644
--- a/mod/groups/views/default/forum/maintopic.php
+++ b/mod/groups/views/default/forum/maintopic.php
@@ -13,38 +13,38 @@
 	

 ?>

 

-<div class="entity_listing topic clearfix">

+<div class="entity-listing topic clearfix">

 <a class="anchor_link" name="<?php echo $vars['entity']->id; ?>"></a>

 	<?php

 	// get infomation about the owner of the comment

 	if ($post_owner = get_user($vars['entity']->owner_guid)) {

 	    // display the user icon

-	    echo "<div class='entity_listing_icon'>" . elgg_view("profile/icon",array('entity' => $post_owner, 'size' => 'tiny')) . "</div>";

+	    echo "<div class='entity-listing-icon'>" . elgg_view("profile/icon",array('entity' => $post_owner, 'size' => 'tiny')) . "</div>";

 	    // display the user name

-	    echo "<div class='entity_listing_info'>";

+	    echo "<div class='entity-listing-info'>";

 	    // if comment owner, group owner, or site admin - display edit and delete options

 	    if (groups_can_edit_discussion($vars['entity'], elgg_get_page_owner()->owner_guid)) {

-			echo "<div class='entity_metadata'>";

+			echo "<div class='entity-metadata'>";

 	        echo "<span class='delete-button'>".elgg_view("output/confirmlink",array(

 				'href' => "action/groups/deletepost?post=" . $vars['entity']->id . "&topic=" . get_input('topic') . "&group=" . get_input('group_guid'),

 				'text' => elgg_echo('delete'),

 				'confirm' => elgg_echo('deleteconfirm')

 				))."</span>";

-			echo "<span class='entity_edit'><a class='link' href=\"".elgg_get_site_url()."pg/groups/edittopic/{$group_guid}/{$topic}/\">".elgg_echo('edit')."</a></span>";

+			echo "<span class='entity-edit'><a class='link' href=\"".elgg_get_site_url()."pg/groups/edittopic/{$group_guid}/{$topic}/\">".elgg_echo('edit')."</a></span>";

 			echo "</div>";

 

 		}	    

 	    

-	    echo "<p class='entity_title'><a href='".$post_owner->getURL()."'>" . $post_owner->name . "</a></p>";

+	    echo "<p class='entity-title'><a href='".$post_owner->getURL()."'>" . $post_owner->name . "</a></p>";

 	} else {

-		echo "<div class='entity_listing_icon'><img src=\"" . elgg_view('icon/user/default/tiny') . "\" /></div>";

-		echo "<div class='entity_listing_info'><p class='entity_title'>" . elgg_echo('profile:deleteduser') . "</p>";

+		echo "<div class='entity-listing-icon'><img src=\"" . elgg_view('icon/user/default/tiny') . "\" /></div>";

+		echo "<div class='entity-listing-info'><p class='entity-title'>" . elgg_echo('profile:deleteduser') . "</p>";

 	}

 	

 	//display the date of the comment

-	echo "<p class='entity_subtext'>" . elgg_view_friendly_time($vars['entity']->time_created) . "</p>";

-	echo "</div>"; // close entity_listing_info

-	echo "</div>"; // close entity_listing.topic

+	echo "<p class='entity-subtext'>" . elgg_view_friendly_time($vars['entity']->time_created) . "</p>";

+	echo "</div>"; // close entity-listing-info

+	echo "</div>"; // close entity-listing.topic

 

 	//display the actual message posted

 	echo "<div class='topic_post maintopic'>";

diff --git a/mod/groups/views/default/forum/topics.php b/mod/groups/views/default/forum/topics.php
index 1426ba274..fbe168588 100644
--- a/mod/groups/views/default/forum/topics.php
+++ b/mod/groups/views/default/forum/topics.php
@@ -5,13 +5,13 @@
 ?>
 
 <div id="content_header" class="clearfix">
-	<div class="content_header_title">
+	<div class="content-header-title">
 		<h2><?php echo elgg_echo("groups:forum"); ?></h2>
 	</div>
 	<?php // only show the add topic button if the user is a member
 		if(elgg_get_page_owner()->isMember(get_loggedin_user())) {
 	?>
-		<div class="content_header_options">
+		<div class="content-header-options">
 			<a class="action-button" href="<?php echo elgg_get_site_url(); ?>mod/groups/addtopic.php?group_guid=<?php echo $vars['group_guid']; ?>"><?php echo elgg_echo("groups:addtopic"); ?></a>
 		</div>
 	<?php
@@ -22,4 +22,4 @@
 if($vars['topics'])
 	echo $vars['topics'];
 else
-	echo "<p class='margin_top'>". elgg_echo("grouptopic:notcreated") . "</p>";
\ No newline at end of file
+	echo "<p class='margin-top'>". elgg_echo("grouptopic:notcreated") . "</p>";
\ No newline at end of file
diff --git a/mod/groups/views/default/groups/closedmembership.php b/mod/groups/views/default/groups/closedmembership.php
index bf0db7e22..d5abe1e09 100644
--- a/mod/groups/views/default/groups/closedmembership.php
+++ b/mod/groups/views/default/groups/closedmembership.php
@@ -6,7 +6,7 @@
 	 */
 
 ?>
-<p class="margin_top">
+<p class="margin-top">
 <?php 
 echo elgg_echo('groups:closedgroup');
 if (isloggedin()) {
diff --git a/mod/groups/views/default/groups/css.php b/mod/groups/views/default/groups/css.php
index eb93c4bd9..dcda51fd8 100644
--- a/mod/groups/views/default/groups/css.php
+++ b/mod/groups/views/default/groups/css.php
@@ -14,7 +14,7 @@
 	/* wraps group lists on 
 	latest discussion, newest, popular */
 }
-.entity_subtext.groups {
+.entity-subtext.groups {
 	float:right;
 	width:300px;
 	text-align: right;
@@ -25,10 +25,10 @@
 	padding-bottom:40px;
 	border-bottom:1px solid #CCCCCC;
 }
-.entity_listing.topic .topic_post p {
+.entity-listing.topic .topic_post p {
 	margin:10px 0 5px 0;
 }
-.entity_listing.topic:hover {
+.entity-listing.topic:hover {
 	background-color: white;
 }
 
@@ -42,7 +42,7 @@
 
 
 /* GROUPS SIDEBAR ELEMENTS */
-#groupsearchform .search_input {
+#groupsearchform .search-input {
 	width:196px;
 }
 .featured_group {
@@ -52,7 +52,7 @@
 	float:left;
 	margin-right:10px;
 }
-.featured_group p.entity_title {
+.featured_group p.entity-title {
 	margin-bottom:0;
 }
 .member_icon {
@@ -130,17 +130,17 @@
 .group_tool_widget.activity a.river_comment_form_button,
 .group_tool_widget.activity .river_comments_tabs,
 .group_tool_widget.activity .river_content_display,
-.group_tool_widget.activity .river_comments,
+.group_tool_widget.activity .river-comments,
 .group_tool_widget.activity .river_link_divider,
-.group_tool_widget.activity .river_user_like_button {
+.group_tool_widget.activity .river_user-like_button {
 	display:none;
 }
-.group_tool_widget.activity .river_item .entity_subtext {
+.group_tool_widget.activity .river_item .entity-subtext {
 	padding:0;
 }
 
-/* override default entity_listing_info width */
-.group_tool_widget .entity_listing_info {
+/* override default entity-listing-info width */
+.group_tool_widget .entity-listing-info {
 	width:315px;
 }
 .group_widget_link {
diff --git a/mod/groups/views/default/groups/featured.php b/mod/groups/views/default/groups/featured.php
index 580f1ca0f..0f9a3bedf 100644
--- a/mod/groups/views/default/groups/featured.php
+++ b/mod/groups/views/default/groups/featured.php
@@ -18,8 +18,8 @@
 				'size' => 'tiny',
 			));
 				
-			echo "<div class='featured_group'>".$icon."<p class='entity_title clearfix'><a href=\"" . $group->getUrl() . "\">" . $group->name . "</a></p>";
-			echo "<p class='entity_subtext'>" . $group->briefdescription . "</p></div>";
+			echo "<div class='featured_group'>".$icon."<p class='entity-title clearfix'><a href=\"" . $group->getUrl() . "\">" . $group->name . "</a></p>";
+			echo "<p class='entity-subtext'>" . $group->briefdescription . "</p></div>";
 		}
 	}
 ?>
diff --git a/mod/groups/views/default/groups/find.php b/mod/groups/views/default/groups/find.php
index 70d03e458..0ad9f2018 100644
--- a/mod/groups/views/default/groups/find.php
+++ b/mod/groups/views/default/groups/find.php
@@ -9,6 +9,6 @@ $tag_string = elgg_echo('groups:search:tags');
 ?>
 <h3><?php echo elgg_echo('groups:searchtag'); ?></h3>
 <form id="groupsearchform" action="<?php echo elgg_get_site_url(); ?>pg/groups/world/" method="get">
-	<input type="text" name="tag" value="<?php echo $tag_string; ?>" onclick="if (this.value=='<?php echo $tag_string; ?>') { this.value='' }" class="search_input" />
+	<input type="text" name="tag" value="<?php echo $tag_string; ?>" onclick="if (this.value=='<?php echo $tag_string; ?>') { this.value='' }" class="search-input" />
 	<input type="submit" value="<?php echo elgg_echo('search:go'); ?>" />
 </form>
diff --git a/mod/groups/views/default/groups/forum_latest.php b/mod/groups/views/default/groups/forum_latest.php
index d78a47456..9b6f292e0 100644
--- a/mod/groups/views/default/groups/forum_latest.php
+++ b/mod/groups/views/default/groups/forum_latest.php
@@ -16,18 +16,18 @@ if($vars['entity']->forum_enable != 'no'){
         	    
                 $count_annotations = $f->countAnnotations("generic_comment");
                  
-        	    echo "<div class='entity_listing clearfix'>";
-        	    echo "<div class='entity_listing_icon'>" . elgg_view('profile/icon',array('entity' => $f->getOwnerEntity(), 'size' => 'tiny')) . "</div>";
-    	        echo "<div class='entity_listing_info'><p class='entity_title'><a href=\"".elgg_get_site_url()."mod/groups/topicposts.php?topic={$f->guid}&group_guid={$vars['entity']->guid}\">" . $f->title . "</a></p>";
-    	        echo "<p class='entity_subtext'>".elgg_echo('comments').": " . $count_annotations . "</p></div>";
+        	    echo "<div class='entity-listing clearfix'>";
+        	    echo "<div class='entity-listing-icon'>" . elgg_view('profile/icon',array('entity' => $f->getOwnerEntity(), 'size' => 'tiny')) . "</div>";
+    	        echo "<div class='entity-listing-info'><p class='entity-title'><a href=\"".elgg_get_site_url()."mod/groups/topicposts.php?topic={$f->guid}&group_guid={$vars['entity']->guid}\">" . $f->title . "</a></p>";
+    	        echo "<p class='entity-subtext'>".elgg_echo('comments').": " . $count_annotations . "</p></div>";
     	        echo "</div>";
         }
     } else {
 	    if(elgg_get_page_owner()->isMember(get_loggedin_user())){
 			$create_discussion = elgg_get_site_url() . "mod/groups/addtopic.php?group_guid=" . elgg_get_page_owner_guid();
-			echo "<p class='margin_top'><a href=\"{$create_discussion}\">".elgg_echo("groups:addtopic")."</a></p>";
+			echo "<p class='margin-top'><a href=\"{$create_discussion}\">".elgg_echo("groups:addtopic")."</a></p>";
 		}else{
-			echo "<p class='margin_top'>". elgg_echo("grouptopic:notcreated") . "</p>";
+			echo "<p class='margin-top'>". elgg_echo("grouptopic:notcreated") . "</p>";
 		}
     }
 
diff --git a/mod/groups/views/default/groups/group_sort_menu.php b/mod/groups/views/default/groups/group_sort_menu.php
index aedb3f8e5..58ecf920f 100644
--- a/mod/groups/views/default/groups/group_sort_menu.php
+++ b/mod/groups/views/default/groups/group_sort_menu.php
@@ -14,7 +14,7 @@
 	 $url = elgg_get_site_url() . "pg/groups/world/";
 
 ?>
-<div class="elgg_horizontal_tabbed_nav margin_top">
+<div class="elgg-horizontal-tabbed-nav margin-top">
 <div class="group_count"><?php echo $num_groups . " " . elgg_echo("groups:count"); ?></div>
 <ul>
 	<li <?php if($filter == "newest") echo "class='selected'"; ?>><a href="<?php echo $url; ?>?filter=newest"><?php echo elgg_echo('groups:newest'); ?></a></li>
diff --git a/mod/groups/views/default/groups/grouplisting.php b/mod/groups/views/default/groups/grouplisting.php
index 1466234ab..dc6bdb4a4 100644
--- a/mod/groups/views/default/groups/grouplisting.php
+++ b/mod/groups/views/default/groups/grouplisting.php
@@ -21,7 +21,7 @@ if($membership == ACCESS_PUBLIC) {
 	$mem = elgg_echo("groups:closed");
 }
 
-$info .= "<p class='entity_subtext groups'>" . $mem . " / <b>" . get_group_members($vars['entity']->guid, 10, 0, 0, true) ."</b> " . elgg_echo("groups:member");
+$info .= "<p class='entity-subtext groups'>" . $mem . " / <b>" . get_group_members($vars['entity']->guid, 10, 0, 0, true) ."</b> " . elgg_echo("groups:member");
 
 //for admins only - display the feature or unfeature option
 if(isadminloggedin()) {
@@ -37,8 +37,8 @@ if(isadminloggedin()) {
 }
 
 $info .= "</p>";
-$info .= "<p class='entity_title'><a href=\"" . $vars['entity']->getUrl() . "\">" . $vars['entity']->name . "</a></p>";
-$info .= "<p class='entity_subtext'>" . $vars['entity']->briefdescription . "</p>";
+$info .= "<p class='entity-title'><a href=\"" . $vars['entity']->getUrl() . "\">" . $vars['entity']->name . "</a></p>";
+$info .= "<p class='entity-subtext'>" . $vars['entity']->briefdescription . "</p>";
 
 echo elgg_view_listing($icon, $info);
 
diff --git a/mod/groups/views/default/groups/groupprofile.php b/mod/groups/views/default/groups/groupprofile.php
index 436901368..42928a12f 100644
--- a/mod/groups/views/default/groups/groupprofile.php
+++ b/mod/groups/views/default/groups/groupprofile.php
@@ -50,7 +50,7 @@ if ($vars['entity']->isMember($user)) {
 // build action buttons
 $action_buttons = '';
 if (!empty($actions)) {
-	$action_buttons = '<div class="content_header_options">';
+	$action_buttons = '<div class="content-header-options">';
 	foreach ($actions as $url => $action) {
 		$action_buttons .= "<a class=\"action-button\" href=\"$url\">$action</a>";
 	}
@@ -64,7 +64,7 @@ echo elgg_view('navigation/breadcrumbs');
 // build and display header
 echo <<<__HTML
 <div id="content_header" class="clearfix">
-	<div class="content_header_title">
+	<div class="content-header-title">
 		<h2>{$vars['entity']->name}</h2>
 	</div>
 	$action_buttons
diff --git a/mod/groups/views/default/groups/invitationrequests.php b/mod/groups/views/default/groups/invitationrequests.php
index 4674a3c23..a1cca6489 100644
--- a/mod/groups/views/default/groups/invitationrequests.php
+++ b/mod/groups/views/default/groups/invitationrequests.php
@@ -6,9 +6,9 @@ if (!empty($vars['invitations']) && is_array($vars['invitations'])) {
 		if ($group instanceof ElggGroup) {
 		
 		?>
-		<div class="entity_listing group_invitations clearfix">
+		<div class="entity-listing group_invitations clearfix">
 			<?php
-				echo "<div class='entity_listing_icon'>";
+				echo "<div class='entity-listing-icon'>";
 				echo elgg_view("profile/icon", array(
 					'entity' => $group,
 					'size' => 'tiny',
@@ -17,7 +17,7 @@ if (!empty($vars['invitations']) && is_array($vars['invitations'])) {
 
 			$url = elgg_add_action_tokens_to_url(elgg_get_site_url()."action/groups/join?user_guid={$user->guid}&group_guid={$group->guid}");
 			?>
-			<div class="entity_listing_info">
+			<div class="entity-listing-info">
 			<a href="<?php echo $url; ?>" class="submit-button"><?php echo elgg_echo('accept'); ?></a>
 			<?php		
 				echo str_replace('<a', '<a class="action-button disabled" ', elgg_view('output/confirmlink',array(
@@ -26,8 +26,8 @@ if (!empty($vars['invitations']) && is_array($vars['invitations'])) {
 					'text' => elgg_echo('delete'),
 				)));
 			
-			echo "<p class='entity_title'><a href=\"" . $group->getUrl() . "\">" . $group->name . "</a></p>";
-			echo "<p class='entity_subtext'>" . $group->briefdescription . "</p>";
+			echo "<p class='entity-title'><a href=\"" . $group->getUrl() . "\">" . $group->name . "</a></p>";
+			echo "<p class='entity-subtext'>" . $group->briefdescription . "</p>";
 
 			?>
 		</div></div>
@@ -35,6 +35,6 @@ if (!empty($vars['invitations']) && is_array($vars['invitations'])) {
 		}
 
 	} else {
-		echo "<p class='default_string margin_top'>" . elgg_echo('groups:invitations:none') . "</p>";
+		echo "<p class='default_string margin-top'>" . elgg_echo('groups:invitations:none') . "</p>";
 }
 ?>
\ No newline at end of file
diff --git a/mod/groups/views/default/groups/membershiprequests.php b/mod/groups/views/default/groups/membershiprequests.php
index 6cb5f75f6..714b8e8f9 100644
--- a/mod/groups/views/default/groups/membershiprequests.php
+++ b/mod/groups/views/default/groups/membershiprequests.php
@@ -6,9 +6,9 @@
 				if ($request instanceof ElggUser) {
 	
 	?>
-		<div class="entity_listing group_invitations clearfix">
+		<div class="entity-listing group_invitations clearfix">
 				<?php
-					echo "<div class='entity_listing_icon'>";
+					echo "<div class='entity-listing-icon'>";
 					echo elgg_view("profile/icon", array(
 						'entity' => $request,
 						'size' => 'small',
@@ -18,7 +18,7 @@
 					
 					$url = elgg_add_action_tokens_to_url(elgg_get_site_url()."action/groups/addtogroup?user_guid={$request->guid}&group_guid={$vars['entity']->guid}");
 					?>
-					<div class="entity_listing_info">
+					<div class="entity-listing-info">
 					<a href="<?php echo $url; ?>" class="submit-button"><?php echo elgg_echo('accept'); ?></a>
 					<?php	
 					echo str_replace('<a', '<a class="action-button disabled" ', elgg_view('output/confirmlink',array(
@@ -26,8 +26,8 @@
 						'confirm' => elgg_echo('groups:joinrequest:remove:check'),
 						'text' => elgg_echo('delete'),
 					)));
-				echo "<p class='entity_title'><a href=\"" . $request->getUrl() . "\">" . $request->name . "</a></p>";
-				echo "<p class='entity_subtext'>" . $request->briefdescription . "</p>";
+				echo "<p class='entity-title'><a href=\"" . $request->getUrl() . "\">" . $request->name . "</a></p>";
+				echo "<p class='entity-subtext'>" . $request->briefdescription . "</p>";
 				?>
 			</div>
 		</div>
diff --git a/mod/groups/views/default/object/groupforumtopic.php b/mod/groups/views/default/object/groupforumtopic.php
index efa4dee79..551e256db 100644
--- a/mod/groups/views/default/object/groupforumtopic.php
+++ b/mod/groups/views/default/object/groupforumtopic.php
@@ -27,32 +27,32 @@ $u = get_user($last_user);
 if (elgg_get_context() == "search") {
 	var_export($counter);
 	if($counter == 1){
-		$info = "<p class='entity_subtext groups'>" . elgg_echo('groups:forum:created:single', array($forum_created, $counter)) .  "<br />";
+		$info = "<p class='entity-subtext groups'>" . elgg_echo('groups:forum:created:single', array($forum_created, $counter)) .  "<br />";
 	}else{
-		$info = "<p class='entity_subtext groups'>" . elgg_echo('groups:forum:created', array($forum_created, $counter)) .  "<br />";
+		$info = "<p class='entity-subtext groups'>" . elgg_echo('groups:forum:created', array($forum_created, $counter)) .  "<br />";
 	}
 	if (($last_time) && ($u)) $info.= elgg_echo('groups:lastupdated', array(elgg_view_friendly_time($last_time), " <a href=\"" . $u->getURL() . "\">" . $u->name . "</a>"));
 	$info .= '</p>';
 	//get the group avatar
 	$icon = elgg_view("profile/icon",array('entity' => $u, 'size' => 'tiny'));
 	//get the group and topic title
-	$info .= "<p class='entity_subtext'><b>" . elgg_echo('groups:topic') . ":</b> <a href=\"".elgg_get_site_url()."mod/groups/topicposts.php?topic={$vars['entity']->guid}&group_guid={$group->guid}\">{$title}</a></p>";
+	$info .= "<p class='entity-subtext'><b>" . elgg_echo('groups:topic') . ":</b> <a href=\"".elgg_get_site_url()."mod/groups/topicposts.php?topic={$vars['entity']->guid}&group_guid={$group->guid}\">{$title}</a></p>";
 	if ($group instanceof ElggGroup) {
-		$info .= "<p class='entity_title'><b>" . elgg_echo('group') . ":</b> <a href=\"{$group->getURL()}\">".htmlentities($group->name, ENT_QUOTES, 'UTF-8') ."</a></p>";
+		$info .= "<p class='entity-title'><b>" . elgg_echo('group') . ":</b> <a href=\"{$group->getURL()}\">".htmlentities($group->name, ENT_QUOTES, 'UTF-8') ."</a></p>";
 	}
 
 } else {
 	if($counter == 1){
-		$info = "<p class='entity_subtext groups'>" . elgg_echo('groups:forum:created:single', array($forum_created, $counter)) . "</p>";
+		$info = "<p class='entity-subtext groups'>" . elgg_echo('groups:forum:created:single', array($forum_created, $counter)) . "</p>";
 	}else{
-		$info = "<p class='entity_subtext groups'>" . elgg_echo('groups:forum:created', array($forum_created, $counter)) . "</p>";
+		$info = "<p class='entity-subtext groups'>" . elgg_echo('groups:forum:created', array($forum_created, $counter)) . "</p>";
 	}
-	$info .= "<p class='entity_title'>" . elgg_echo('groups:started') . " " . $topic_owner->name . ": <a href=\"".elgg_get_site_url()."mod/groups/topicposts.php?topic={$vars['entity']->guid}&group_guid={$group->guid}\">{$title}</a></p>";
+	$info .= "<p class='entity-title'>" . elgg_echo('groups:started') . " " . $topic_owner->name . ": <a href=\"".elgg_get_site_url()."mod/groups/topicposts.php?topic={$vars['entity']->guid}&group_guid={$group->guid}\">{$title}</a></p>";
 
 	if (groups_can_edit_discussion($vars['entity'], elgg_get_page_owner()->owner_guid)) {
 			// display the delete link to those allowed to delete
-			$info .= "<div class='entity_metadata'>";
-			$info .= '<span class="entity_edit">' . elgg_view("output/url", array(
+			$info .= "<div class='entity-metadata'>";
+			$info .= '<span class="entity-edit">' . elgg_view("output/url", array(
 																			'href' => "mod/groups/edittopic.php?group={$vars['entity']->container_guid}&topic={$vars['entity']->guid}",
 																			'text' => elgg_echo('edit'),
 																		));
@@ -71,7 +71,7 @@ if (elgg_get_context() == "search") {
 	if (($last_time) && ($u)) {
 		$commenter_link = "<a href\"{$u->getURL()}\">$u->name</a>";
 		$text = elgg_echo('groups:lastcomment', array(elgg_view_friendly_time($last_time), $commenter_link));
-		$info .= "<p class='entity_subtext'>$text</p>";
+		$info .= "<p class='entity-subtext'>$text</p>";
 	}
 	//get the user avatar
 	$icon = elgg_view("profile/icon",array('entity' => $topic_owner, 'size' => 'tiny'));
diff --git a/mod/groups/views/default/river/forum/create.php b/mod/groups/views/default/river/forum/create.php
index 69481e97e..2e8365ec2 100644
--- a/mod/groups/views/default/river/forum/create.php
+++ b/mod/groups/views/default/river/forum/create.php
@@ -17,7 +17,7 @@
 	$url = elgg_get_site_url() . "mod/groups/topicposts.php?topic=" . $forumtopic . "&group_guid=" . $group_guid;
 	$url_user = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
 	$string = elgg_echo("groupforum:river:posted", array($url_user)) . " ";
-	$string .= elgg_echo("groupforum:river:annotate:create") . " | <a href=\"" . $url . "\">" . $object->title . "</a> <span class='entity_subtext'>". elgg_view_friendly_time($object->time_created) ."<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'>". elgg_view_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>";
 	if ($comment) {
diff --git a/mod/groups/views/default/river/forum/topic/create.php b/mod/groups/views/default/river/forum/topic/create.php
index e595b1fdc..e73064e00 100644
--- a/mod/groups/views/default/river/forum/topic/create.php
+++ b/mod/groups/views/default/river/forum/topic/create.php
@@ -16,7 +16,7 @@
 	$string = elgg_echo("groupforum:river:postedtopic", array($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'>". elgg_view_friendly_time($object->time_created);
+	$string .= " <span class='entity-subtext'>". elgg_view_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));
diff --git a/mod/groups/views/default/river/group/create.php b/mod/groups/views/default/river/group/create.php
index ef0aaab1b..4774e7a85 100644
--- a/mod/groups/views/default/river/group/create.php
+++ b/mod/groups/views/default/river/group/create.php
@@ -7,7 +7,7 @@
 	$url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
 	$string = elgg_echo("groups:river:create", array($url)) . " ";
 	$string .= " <a href=\"" . $object->getURL() . "\">" . $object->name . "</a>";
-	$string .= " <span class='entity_subtext'>". elgg_view_friendly_time($object->time_created);
+	$string .= " <span class='entity-subtext'>". elgg_view_friendly_time($object->time_created);
 	if (isloggedin()) {
 		$string .= elgg_view('likes/forms/link', array('entity' => $object));
 	}
diff --git a/mod/groups/views/default/river/relationship/member/create.php b/mod/groups/views/default/river/relationship/member/create.php
index 3ba191676..430e95839 100644
--- a/mod/groups/views/default/river/relationship/member/create.php
+++ b/mod/groups/views/default/river/relationship/member/create.php
@@ -7,7 +7,7 @@
 	$url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
 	$string = elgg_echo("groups:river:member", array($url)) . " ";
 	$string .= " <a href=\"" . $object->getURL() . "\">" . $object->name . "</a>";
-	$string .= " <span class='entity_subtext'>". elgg_view_friendly_time($vars['item']->posted);
+	$string .= " <span class='entity-subtext'>". elgg_view_friendly_time($vars['item']->posted);
 	$string .= "</span>";
 ?>