5 files changed, 20 insertions, 20 deletions
diff --git a/mod/blog/views/default/blog/css.php b/mod/blog/views/default/blog/css.php
index d9e565ee6..0cd539ca4 100644
--- a/mod/blog/views/default/blog/css.php
+++ b/mod/blog/views/default/blog/css.php
@@ -8,10 +8,10 @@
 .blogpost {
 	border-bottom:1px dotted #CCCCCC;
 }
-.blogpost .entity_listing_icon {
+.blogpost .entity-listing-icon {
 	margin-top:6px;
 }
-.blogpost .entity_listing_info {
+.blogpost .entity-listing-info {
 	margin-top:4px;
 }
 .blog_post {
@@ -31,7 +31,7 @@
 }
 
 /* blogs list view */
-.entity_listing.blog .entity_metadata {
+.entity-listing.blog .entity-metadata {
 	min-width:400px;
 	text-align: right;
 }
diff --git a/mod/blog/views/default/blog/forms/edit.php b/mod/blog/views/default/blog/forms/edit.php
index 5da9c3cd1..e9fb7d37f 100644
--- a/mod/blog/views/default/blog/forms/edit.php
+++ b/mod/blog/views/default/blog/forms/edit.php
@@ -167,7 +167,7 @@ $form_body = <<<___END
 
 $draft_warning
 
-<p class="margin_top">
+<p class="margin-top">
 	<label for="blog_title">$title_label</label>
 	$title_input
 </p>
@@ -204,7 +204,7 @@ $body_input
 $categories_input
 
 <div class="divider"></div>
-<p class="margin_none margin_top entity_subtext">
+<p class="margin-none margin-top entity-subtext">
 	$save_status <span class="blog_save_status_time">$saved</span>
 </p>
 
diff --git a/mod/blog/views/default/blog/sidebar_revisions.php b/mod/blog/views/default/blog/sidebar_revisions.php
index e53ba9e52..ecc479812 100644
--- a/mod/blog/views/default/blog/sidebar_revisions.php
+++ b/mod/blog/views/default/blog/sidebar_revisions.php
@@ -40,7 +40,7 @@ if (elgg_instanceof($blog, 'object', 'blog') && $blog->canEdit()) {
 				'text' => elgg_echo('blog:status:published')
 			));
 
-			$time = "<span class='entity_subtext'>".elgg_view_friendly_time($blog->publish_date)."</span>";
+			$time = "<span class='entity-subtext'>".elgg_view_friendly_time($blog->publish_date)."</span>";
 
 			echo '<li>
 			' . $load . ": $time
@@ -48,7 +48,7 @@ if (elgg_instanceof($blog, 'object', 'blog') && $blog->canEdit()) {
 		}
 
 		foreach ($revisions as $revision) {
-			$time = "<span class='entity_subtext'>".elgg_view_friendly_time($revision->time_created)."</span>";
+			$time = "<span class='entity-subtext'>".elgg_view_friendly_time($revision->time_created)."</span>";
 			if ($revision->name == 'blog_auto_save') {
 				$revision_lang = elgg_echo('blog:auto_saved_revision');
 			} else {
diff --git a/mod/blog/views/default/object/blog.php b/mod/blog/views/default/object/blog.php
index 91fc7f594..733d42fa4 100644
--- a/mod/blog/views/default/object/blog.php
+++ b/mod/blog/views/default/object/blog.php
@@ -49,7 +49,7 @@ $edit = elgg_view('output/access', array('entity' => $vars['entity']));
 
 if ($blog->canEdit()) {
 	$edit_url = elgg_get_site_url()."pg/blog/{$owner->username}/edit/{$blog->getGUID()}/";
-	$edit_link = "<span class='entity_edit'><a href=\"$edit_url\">" . elgg_echo('edit') . '</a></span>';
+	$edit_link = "<span class='entity-edit'><a href=\"$edit_url\">" . elgg_echo('edit') . '</a></span>';
 
 	$delete_url = "action/blog/delete?guid={$blog->getGUID()}";
 	$delete_link = "<span class='delete-button'>" . elgg_view('output/confirmlink', array(
@@ -77,15 +77,15 @@ if ($full) {
 echo <<<___END
 <div class="blogpost clearfix">
 	<div id="content_header" class="clearfix">
-		<div class="content_header_title"><h2>{$blog->title}</h2></div>
+		<div class="content-header-title"><h2>{$blog->title}</h2></div>
 	</div>
 	<div class="clearfix">
-	<div class="entity_listing_icon">
+	<div class="entity-listing-icon">
 		$owner_icon
 	</div>
-	<div class="entity_listing_info">
-		<div class="entity_metadata">$edit</div>
-		<p class="entity_subtext">
+	<div class="entity-listing-info">
+		<div class="entity-metadata">$edit</div>
+		<p class="entity-subtext">
 			$author_text
 			$date
 			$categories
@@ -101,14 +101,14 @@ ___END;
 
 } else {
 	echo <<<___END
-<div class="blog $status_class entity_listing clearfix">
-	<div class="entity_listing_icon">
+<div class="blog $status_class entity-listing clearfix">
+	<div class="entity-listing-icon">
 		$owner_icon
 	</div>
-	<div class="entity_listing_info">
-		<div class="entity_metadata">$edit</div>
-		<p class="entity_title">$linked_title</p>
-		<p class="entity_subtext">
+	<div class="entity-listing-info">
+		<div class="entity-metadata">$edit</div>
+		<p class="entity-title">$linked_title</p>
+		<p class="entity-subtext">
 			$author_text
 			$date
 			$categories
diff --git a/mod/blog/views/default/river/object/blog/create.php b/mod/blog/views/default/river/object/blog/create.php
index d311c5883..2b52429a6 100644
--- a/mod/blog/views/default/river/object/blog/create.php
+++ b/mod/blog/views/default/river/object/blog/create.php
@@ -10,7 +10,7 @@ $contents = strip_tags($object->excerpt);
 
 $url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
 $title = elgg_echo('blog:river:create', array($url));
-$string .= $title . " <a href=\"{$object->getURL()}\">{$object->title}</a> <span class='entity_subtext'>" . elgg_view_friendly_time($object->time_created);
+$string .= $title . " <a href=\"{$object->getURL()}\">{$object->title}</a> <span class='entity-subtext'>" . elgg_view_friendly_time($object->time_created);
 
 if (isloggedin()) {
 	$string .= '<a class="river_comment_form_button link">' . elgg_echo('generic_comments:text') . '</a>';