5 files changed, 17 insertions, 45 deletions

diff --git a/mod/blog/views/default/blog/css.php b/mod/blog/views/default/blog/css.php
index 5808cc167..12ac4df2a 100644
--- a/mod/blog/views/default/blog/css.php
+++ b/mod/blog/views/default/blog/css.php
@@ -5,40 +5,10 @@
  * @package Blog
 */
 ?>
-.blogpost .entity-listing-icon {
-	margin-top:6px;
-}
-.blogpost .entity-listing-info {
-	margin-top:4px;
-}
-.blog_post {
-	border-top:1px solid #CCCCCC;
-	border-bottom:1px dotted #CCCCCC;
-	margin:10px 0 0;
-	padding-bottom:40px;
-	padding-top:10px;
-}
-.blog_post p {
-	line-height: 1.4em;
-	padding-bottom:12px;
-}
-.blog_archives {
-	list-style: none;
-	margin-bottom:0;
-	padding-left:0;
-}
 
-/* blogs list view */
-.entity-listing.blog .entity-metadata {
-	min-width:400px;
-	text-align: right;
-}
+/* Blog Plugin */
 
-/* blogs edit/create form */
-form#blog_post_edit .submit-button {
-	margin-right:15px;
-}
 /* force tinymce input height for a more useful editing / blog creation area */
-form#blog_post_edit #description_parent #description_ifr {
+form#blog-post-edit #description_parent #description_ifr {
 	height:400px !important;
-}
\ No newline at end of file
+}
diff --git a/mod/blog/views/default/blog/forms/edit.php b/mod/blog/views/default/blog/forms/edit.php
index e9fb7d37f..8900fed25 100644
--- a/mod/blog/views/default/blog/forms/edit.php
+++ b/mod/blog/views/default/blog/forms/edit.php
@@ -205,7 +205,7 @@ $categories_input
 
 <div class="divider"></div>
 <p class="margin-none margin-top entity-subtext">
-	$save_status <span class="blog_save_status_time">$saved</span>
+	$save_status <span class="blog-save-status-time">$saved</span>
 </p>
 
 $guid_input
@@ -217,7 +217,7 @@ $action_buttons
 ___END;
 
 echo elgg_view('input/form', array(
-	'internalid' => 'blog_post_edit',
+	'internalid' => 'blog-post-edit',
 	'internalname' => 'blog_post',
 	'action' => "action/blog/save",
 	'body' => $form_body
@@ -244,10 +244,12 @@ elgg_clear_sticky_form('blog');
 
 			var d = new Date();
 			var mins = d.getMinutes() + '';
-			if (mins.length == 1) mins = '0' + mins;
-			$(".blog_save_status_time").html(d.toLocaleDateString() + " @ " + d.getHours() + ":" + mins);
+			if (mins.length == 1) {
+				mins = '0' + mins;
+			}
+			$(".blog-save-status-time").html(d.toLocaleDateString() + " @ " + d.getHours() + ":" + mins);
 		} else {
-			$(".blog_save_status_time").html("<?php echo elgg_echo('error'); ?>");
+			$(".blog-save-status-time").html("<?php echo elgg_echo('error'); ?>");
 		}
 	}
 
diff --git a/mod/blog/views/default/blog/sidebar_menu.php b/mod/blog/views/default/blog/sidebar_menu.php
index 10798d7a4..0be818c5a 100644
--- a/mod/blog/views/default/blog/sidebar_menu.php
+++ b/mod/blog/views/default/blog/sidebar_menu.php
@@ -40,14 +40,14 @@ if ($page_owner && $vars['page'] != 'friends') {
 
 	if ($dates) {
 		$title = elgg_echo('blog:archives');
-		$content = '<ul class="blog_archives">';
+		$content = '<ul class="blog-archives">';
 		foreach($dates as $date) {
 			$date = $date->yearmonth;
 
 			$timestamplow = mktime(0, 0, 0, substr($date,4,2) , 1, substr($date, 0, 4));
 			$timestamphigh = mktime(0, 0, 0, ((int) substr($date, 4, 2)) + 1, 1, substr($date, 0, 4));
 
-			$link = elgg_get_site_url() . 'pg/blog/' . $page_owner->username . '/archive/' . $timestamplow . '/' . $timestamphigh;
+			$link = elgg_get_site_url() . 'pg/blog/archive/' . $page_owner->username . '/' . $timestamplow . '/' . $timestamphigh;
 			$month = elgg_echo('date:month:' . substr($date, 4, 2), array(substr($date, 0, 4)));
 			$content .= "<li><a href=\"$link\" title=\"$month\">$month</a></li>";
 		}
diff --git a/mod/blog/views/default/blog/sidebar_revisions.php b/mod/blog/views/default/blog/sidebar_revisions.php
index fc5170ddc..ca0a642f2 100644
--- a/mod/blog/views/default/blog/sidebar_revisions.php
+++ b/mod/blog/views/default/blog/sidebar_revisions.php
@@ -31,9 +31,9 @@ if (elgg_instanceof($blog, 'object', 'blog') && $blog->canEdit()) {
 		$title = elgg_echo('blog:revisions');
 
 		$n = count($revisions);
-		$body = '<ul class="blog_revisions">';
+		$body = '<ul class="blog-revisions">';
 
-		$load_base_url = "pg/blog/{$owner->username}/edit/{$blog->getGUID()}/";
+		$load_base_url = "pg/blog/edit/{$owner->username}/{$blog->getGUID()}/";
 
 		// show the "published revision"
 		if ($blog->status == 'published') {
@@ -63,7 +63,7 @@ if (elgg_instanceof($blog, 'object', 'blog') && $blog->canEdit()) {
 			));
 
 			$text = "$load: $time";
-			$class = 'class="auto_saved"';
+			$class = 'class="auto-saved"';
 
 			$n--;
 
diff --git a/mod/blog/views/default/object/blog.php b/mod/blog/views/default/object/blog.php
index 0638c2fc4..7e6be0b21 100644
--- a/mod/blog/views/default/object/blog.php
+++ b/mod/blog/views/default/object/blog.php
@@ -20,7 +20,7 @@ $excerpt = $blog->excerpt;
 
 $body = autop($blog->description);
 $owner_icon = elgg_view('profile/icon', array('entity' => $owner, 'size' => 'tiny'));
-$owner_blog_link = "<a href=\"" . elgg_get_site_url() . "pg/blog/$owner->username\">{$owner->name}</a>";
+$owner_blog_link = "<a href=\"" . elgg_get_site_url() . "pg/blog/owner/$owner->username\">{$owner->name}</a>";
 $author_text = elgg_echo('blog:author_by_line', array($owner_blog_link));
 if ($blog->tags) {
 	$tags = "<p class=\"elgg-tags\">" . elgg_view('output/tags', array('tags' => $blog->tags)) . "</p>";
@@ -48,7 +48,7 @@ $edit = elgg_view('output/access', array('entity' => $vars['entity']));
 
 // links to delete or edit.
 if ($blog->canEdit()) {
-	$edit_url = elgg_get_site_url()."pg/blog/{$owner->username}/edit/{$blog->getGUID()}/";
+	$edit_url = elgg_get_site_url()."pg/blog/edit/{$owner->username}/{$blog->getGUID()}/";
 	$edit_link = "<span class='entity-edit'><a href=\"$edit_url\">" . elgg_echo('edit') . '</a></span>';
 
 	$delete_url = "action/blog/delete?guid={$blog->getGUID()}";