16 files changed, 557 insertions, 714 deletions

diff --git a/mod/blog/views/default/blog/css.php b/mod/blog/views/default/blog/css.php
index ec58164ca..12ac4df2a 100644
--- a/mod/blog/views/default/blog/css.php
+++ b/mod/blog/views/default/blog/css.php
@@ -3,37 +3,12 @@
  * Blog CSS
  *
  * @package Blog
- * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
- * @author Curverider Ltd
- * @copyright Curverider Ltd 2008-2010
- * @link http://elgg.org/
 */
 ?>
-.blogpost {
-	border-bottom:1px dotted #CCCCCC;
-}
-.blogpost .entity_listing_icon {
-	margin-top:6px;
-}
-.blogpost .entity_listing_info {
-	margin-top:4px;
-}
-.blogpost .body {
-	margin-top:5px;
-	margin-bottom:10px;
-	display:block;
-}
-.blogpost .body p {
-	line-height: 1.4em;
-	padding-bottom:12px;
-}
 
-input.blog_publish_day,
-input.blog_publish_hour,
-input.blog_publish_minute {
-	width: 25px;
-}
+/* Blog Plugin */
 
-input.blog_publish_year {
-	width: 50px;
-}
\ No newline at end of file
+/* force tinymce input height for a more useful editing / blog creation area */
+form#blog-post-edit #description_parent #description_ifr {
+	height:400px !important;
+}
diff --git a/mod/blog/views/default/blog/forms/edit.php b/mod/blog/views/default/blog/forms/edit.php
deleted file mode 100644
index 2b3366e48..000000000
--- a/mod/blog/views/default/blog/forms/edit.php
+++ /dev/null
@@ -1,318 +0,0 @@
-<?php
-/**
- * Edit blog form
- *
- * @package Blog
- * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
- * @author Curverider Ltd
- * @copyright Curverider Ltd 2008-2010
- * @link http://elgg.org/
- */
-
-// input names => defaults
-$values = array(
-	'title' => NULL,
-	'description' => NULL,
-	'status' => 'published',
-	'publish_date' => NULL,
-	'access_id' => ACCESS_DEFAULT,
-	'comments_on' => 'On',
-	'excerpt' => NULL,
-	'tags' => NULL,
-	'container_guid' => NULL,
-	'guid' => NULL
-);
-
-$forward = $_SERVER['HTTP_REFERER'];
-
-$action_buttons = '';
-$delete_link = '';
-$draft_warning = '';
-
-// if entity is set, we're editing.
-if (isset ($vars['entity'])) {
-	$blog = $vars['entity'];
-
-	if (elgg_instanceof($blog, 'object', 'blog')) {
-		// passed in values override sticky values in input views
-		// if in a sticky form, don't send the overrides and let the view figure it out.
-		//if (!elgg_is_sticky_form()) {
-			foreach (array_keys($values) as $field) {
-				$values[$field] = $blog->$field;
-			}
-
-			// load the revision annotation if requested
-			if (isset($vars['revision']) && $vars['revision'] instanceof ElggAnnotation && $vars['revision']->entity_guid == $blog->getGUID()) {
-				$revision = $vars['revision'];
-				$values['description'] = $vars['revision']->value;
-			}
-
-			// display a notice if there's an autosaved annotation
-			// and we're not editing it.
-			if ($auto_save_annotations = $blog->getAnnotations('blog_auto_save', 1)) {
-				$auto_save = $auto_save_annotations[0];
-			} else {
-				$auto_save == FALSE;
-			}
-
-			if ($auto_save && $auto_save->id != $revision->id) {
-				$draft_warning = '<span class="message warning">'
-					. elgg_echo('blog:messages:warning:draft')
-					. '</span>';
-			}
-
-		//}
-	} else {
-		echo elgg_echo('blog:error:post_not_found');
-		return FALSE;
-	}
-
-	// add a delete button if editing
-	$delete_url = "{$vars['url']}action/blog/delete?guid={$blog->getGUID()}";
-	$delete_link = elgg_view('output/confirmlink', array(
-		'href' => $delete_url,
-		'text' => elgg_echo('delete'),
-		'class' => 'action_button disabled'
-	));
-}
-
-$save_button = elgg_view('input/submit', array('value' => elgg_echo('save'), 'class' => 'submit_button'));
-$action_buttons = $save_button . $delete_link;
-
-$title_label = elgg_echo('title');
-$title_input = elgg_view('input/text', array(
-	'internalname' => 'title',
-	'internalid' => 'blog_title',
-	'value' => $values['title']
-));
-
-$excerpt_label = elgg_echo('blog:excerpt');
-$excerpt_input = elgg_view('input/text', array(
-	'internalname' => 'excerpt',
-	'internalid' => 'blog_excerpt',
-	'value' => html_entity_decode($values['excerpt'], ENT_COMPAT, 'UTF-8')
-));
-
-$body_label = elgg_echo('blog:body');
-$body_input = elgg_view('input/longtext', array(
-	'internalname' => 'description',
-	'internalid' => 'blog_description',
-	'value' => $values['description']
-));
-
-$save_status = elgg_echo('blog:save_status');
-if ($values['publish_date']) {
-	$saved = date('F j, Y @ H:i', $values['publish_date']);
-} else {
-	$saved = elgg_echo('blog:never');
-}
-
-$status_label = elgg_echo('blog:status');
-$status_input = elgg_view('input/pulldown', array(
-	'internalname' => 'status',
-	'internalid' => 'blog_status',
-	'value' => $values['status'],
-	'options_values' => array(
-		'draft' => elgg_echo('blog:status:draft'),
-		'published' => elgg_echo('blog:status:published')
-	)
-));
-
-$comments_label = elgg_echo('comments');
-$comments_input = elgg_view('input/pulldown', array(
-	'internalname' => 'comments_on',
-	'internalid' => 'blog_comments_on',
-	'value' => $values['comments_on'],
-	'options_values' => array('On' => elgg_echo('on'), 'Off' => elgg_echo('off'))
-));
-
-$tags_label = elgg_echo('tags');
-$tags_input = elgg_view('input/tags', array(
-	'internalname' => 'tags',
-	'internalid' => 'blog_tags',
-	'value' => $values['tags']
-));
-
-$access_label = elgg_echo('access');
-$access_input = elgg_view('input/access', array(
-	'internalname' => 'access_id',
-	'internalid' => 'blog_access_id',
-	'value' => $values['access_id']
-));
-
-$publish_date_label = elgg_echo('blog:publish_date');
-$publish_date_input = elgg_view('input/datetime', array(
-	'internalname' => 'publish_date',
-	'internalid' => 'blog_publish_date',
-	'value' => $values['publish_date']
-));
-
-$categories_input = elgg_view('categories', $vars);
-
-// hidden inputs
-//$container_guid_input = elgg_view('input/hidden', array('internalname' => 'container_guid', 'value' => $values['container_guid']));
-$guid_input = elgg_view('input/hidden', array('internalname' => 'guid', 'value' => $values['guid']));
-$forward_input = elgg_view('input/hidden', array('internalname' => 'forward', 'value' => $forward));
-$page_title = elgg_echo('blog:edit') . " " . $values['title'];
-
-// display notice if editing an old revision
-if (isset($vars['revision']) && $vars['revision'] instanceof ElggAnnotation) {
-	$page_title .= ' ' . elgg_echo('blog:edit_revision_notice');
-}
-
-$form_body = <<<___END
-<h2>$page_title</h2>
-
-$draft_warning
-
-<p class="margin_top">
-	<label for="blog_title">$title_label</label>
-	$title_input
-</p>
-
-<p>
-	<label for="blog_excerpt">$excerpt_label</label>
-$excerpt_input
-</p>
-
-<label for="blog_description">$body_label</label>
-$body_input
-<br />
-
-<p id="blog_save_status">
-	$save_status <span id="blog_save_status_time">$saved</span>
-</p>
-
-<p>
-	<label for="blog_publish_date">$publish_date_label</label>
-	$publish_date_input
-</p>
-
-
-<p>
-	<label for="blog_tags">$tags_label</label>
-	$tags_input
-</p>
-
-<p>
-	<label for="blog_comments_on">$comments_label</label>
-	$comments_input
-</p>
-
-<p>
-	<label for="blog_access_id">$access_label</label>
-	$access_input
-</p>
-
-<p>
-	<label for="blog_status">$status_label</label>
-	$status_input
-</p>
-
-$categories_input
-
-$guid_input
-$container_guid_input
-$forward_input
-
-$action_buttons
-
-<span>
-
-___END;
-
-echo elgg_view('input/form', array(
-	'internalname' => 'blog_post',
-	'action' => "{$vars['url']}action/blog/save",
-	'body' => $form_body
-));
-
-elgg_clear_sticky_form('blog');
-
-?>
-
-<script type="text/javascript">
-	setInterval("blogSaveDraft()", 60000);
-
-	/*
-	 * Attempt to save and update the input with the guid.
-	 */
-	function blogSaveDraftCallback(data, textStatus, XHR) {
-		if (textStatus == 'success' && data.success == true) {
-			var form = $('form[name=blog_post]');
-
-			// update the guid input element for new posts that now have a guid
-			form.find('input[name=guid]').val(data.guid);
-
-			oldDescription = form.find('textarea[name=description]').val();
-
-			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);
-		} else {
-			$("#blog_save_status_time").html("<?php echo elgg_echo('error'); ?>");
-		}
-	}
-
-	function blogSaveDraft() {
-		if (typeof(tinyMCE) != 'undefined') {
-			tinyMCE.triggerSave();
-		}
-
-		// only save on changed content
-		var form = $('form[name=blog_post]');
-		var description = form.find('textarea[name=description]').val();
-		var title = form.find('input[name=title]').val();
-
-		if (!(description && title) || (description == oldDescription)) {
-			return false;
-		}
-
-		var draftURL = "<?php echo $vars['url']; ?>action/blog/auto_save_revision";
-		var postData = form.serializeArray();
-
-		// force draft status
-		$(postData).each(function(i, e) {
-			if (e.name == 'status') {
-				e.value = 'draft';
-			}
-		});
-
-		$.post(draftURL, postData, blogSaveDraftCallback, 'json');
-	}
-
-	$(document).ready(function() {
-		// get a copy of the body to compare for auto save
-		oldDescription = $('form[name=blog_post]').find('textarea[name=description]').val();
-
-		$('#excerpt.excerpt').each(function(){
-			var allowed = 200;
-
-			// set the initial value
-			$('#countervalue').text(allowed);
-
-			// bind on key up event
-			$(this).keyup(function(){
-				var counter_value = ((allowed - ($(this).val().length)));
-
-				$("#countervalue").removeClass();
-
-				if ((counter_value > 10)) {
-					$("#countervalue").addClass("positive");
-				}
-				else if ((counter_value <= 10) && (counter_value >= 0)) {
-					$("#countervalue").addClass("gettingclose");
-				}
-				else if ((counter_value < 0)) {
-					$("#countervalue").addClass("negative");
-				}
-
-				// insert new length
-				$('#countervalue').text(counter_value);
-
-			});
-		});
-	});
-
-</script>
\ No newline at end of file
diff --git a/mod/blog/views/default/blog/group_module.php b/mod/blog/views/default/blog/group_module.php
new file mode 100644
index 000000000..6082cdafd
--- /dev/null
+++ b/mod/blog/views/default/blog/group_module.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * Group blog module
+ */
+
+$group = elgg_get_page_owner_entity();
+
+if ($group->blog_enable == "no") {
+	return true;
+}
+
+$all_link = elgg_view('output/url', array(
+	'href' => "blog/group/$group->guid/all",
+	'text' => elgg_echo('link:view:all'),
+	'is_trusted' => true,
+));
+
+elgg_push_context('widgets');
+$options = array(
+	'type' => 'object',
+	'subtype' => 'blog',
+	'container_guid' => elgg_get_page_owner_guid(),
+	'metadata_name_value_pairs' => array('name' => 'status', 'value' => 'published'),
+	'limit' => 6,
+	'full_view' => false,
+	'pagination' => false,
+);
+$content = elgg_list_entities_from_metadata($options);
+elgg_pop_context();
+
+if (!$content) {
+	$content = '<p>' . elgg_echo('blog:none') . '</p>';
+}
+
+$new_link = elgg_view('output/url', array(
+	'href' => "blog/add/$group->guid",
+	'text' => elgg_echo('blog:write'),
+	'is_trusted' => true,
+));
+
+echo elgg_view('groups/profile/module', array(
+	'title' => elgg_echo('blog:group'),
+	'content' => $content,
+	'all_link' => $all_link,
+	'add_link' => $new_link,
+));
diff --git a/mod/blog/views/default/blog/sidebar.php b/mod/blog/views/default/blog/sidebar.php
new file mode 100644
index 000000000..0ae2b431c
--- /dev/null
+++ b/mod/blog/views/default/blog/sidebar.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Blog sidebar
+ *
+ * @package Blog
+ */
+
+// fetch & display latest comments
+if ($vars['page'] == 'all') {
+	echo elgg_view('page/elements/comments_block', array(
+		'subtypes' => 'blog',
+	));
+} elseif ($vars['page'] == 'owner') {
+	echo elgg_view('page/elements/comments_block', array(
+		'subtypes' => 'blog',
+		'owner_guid' => elgg_get_page_owner_guid(),
+	));
+}
+
+// only users can have archives at present
+if ($vars['page'] == 'owner' || $vars['page'] == 'group') {
+	echo elgg_view('blog/sidebar/archives', $vars);
+}
+
+if ($vars['page'] != 'friends') {
+	echo elgg_view('page/elements/tagcloud_block', array(
+		'subtypes' => 'blog',
+		'owner_guid' => elgg_get_page_owner_guid(),
+	));
+}
diff --git a/mod/blog/views/default/blog/sidebar/archives.php b/mod/blog/views/default/blog/sidebar/archives.php
new file mode 100644
index 000000000..5098e6e3e
--- /dev/null
+++ b/mod/blog/views/default/blog/sidebar/archives.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Blog archives
+ */
+
+$loggedin_user = elgg_get_logged_in_user_entity();
+$page_owner = elgg_get_page_owner_entity();
+
+if (elgg_instanceof($page_owner, 'user')) {
+	$url_segment = 'blog/archive/' . $page_owner->username;
+} else {
+	$url_segment = 'blog/group/' . $page_owner->getGUID() . '/archive';
+}
+
+// This is a limitation of the URL schema.
+if ($page_owner && $vars['page'] != 'friends') {
+	$dates = array_reverse(get_entity_dates('object', 'blog', $page_owner->getGUID()));
+	
+	if ($dates) {
+		$title = elgg_echo('blog:archives');
+		$content = '<ul class="blog-archives">';
+		foreach ($dates as $date) {
+			$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() . $url_segment . '/' . $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>";
+		}
+		$content .= '</ul>';
+
+		echo elgg_view_module('aside', $title, $content);
+	}
+}
\ No newline at end of file
diff --git a/mod/blog/views/default/blog/sidebar/revisions.php b/mod/blog/views/default/blog/sidebar/revisions.php
new file mode 100644
index 000000000..cd2e7f3d8
--- /dev/null
+++ b/mod/blog/views/default/blog/sidebar/revisions.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * Blog sidebar menu showing revisions
+ *
+ * @package Blog
+ */
+
+//If editing a post, show the previous revisions and drafts.
+$blog = elgg_extract('entity', $vars, FALSE);
+
+if (elgg_instanceof($blog, 'object', 'blog') && $blog->canEdit()) {
+	$owner = $blog->getOwnerEntity();
+	$revisions = array();
+
+	$auto_save_annotations = $blog->getAnnotations('blog_auto_save', 1);
+	if ($auto_save_annotations) {
+		$revisions[] = $auto_save_annotations[0];
+	}
+
+	// count(FALSE) == 1!  AHHH!!!
+	$saved_revisions = $blog->getAnnotations('blog_revision', 10, 0, 'time_created DESC');
+	if ($saved_revisions) {
+		$revision_count = count($saved_revisions);
+	} else {
+		$revision_count = 0;
+	}
+
+	$revisions = array_merge($revisions, $saved_revisions);
+
+	if ($revisions) {
+		$title = elgg_echo('blog:revisions');
+
+		$n = count($revisions);
+		$body = '<ul class="blog-revisions">';
+
+		$load_base_url = "blog/edit/{$blog->getGUID()}";
+
+		// show the "published revision"
+		if ($blog->status == 'published') {
+			$load = elgg_view('output/url', array(
+				'href' => $load_base_url,
+				'text' => elgg_echo('blog:status:published'),
+				'is_trusted' => true,
+			));
+
+			$time = "<span class='elgg-subtext'>"
+				. elgg_view_friendly_time($blog->time_created) . "</span>";
+
+			$body .= "<li>$load : $time</li>";
+		}
+
+		foreach ($revisions as $revision) {
+			$time = "<span class='elgg-subtext'>"
+				. elgg_view_friendly_time($revision->time_created) . "</span>";
+
+			if ($revision->name == 'blog_auto_save') {
+				$revision_lang = elgg_echo('blog:auto_saved_revision');
+			} else {
+				$revision_lang = elgg_echo('blog:revision') . " $n";
+			}
+			$load = elgg_view('output/url', array(
+				'href' => "$load_base_url/$revision->id",
+				'text' => $revision_lang,
+				'is_trusted' => true,
+			));
+
+			$text = "$load: $time";
+			$class = 'class="auto-saved"';
+
+			$n--;
+
+			$body .= "<li $class>$text</li>";
+		}
+
+		$body .= '</ul>';
+
+		echo elgg_view_module('aside', $title, $body);
+	}
+}
\ No newline at end of file
diff --git a/mod/blog/views/default/blog/sidebar_edit.php b/mod/blog/views/default/blog/sidebar_edit.php
deleted file mode 100644
index d75c28aad..000000000
--- a/mod/blog/views/default/blog/sidebar_edit.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-/**
- * Blog sidebar menu for editing / creating a blog post.
- *
- * @package Blog
- * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
- * @author Curverider Ltd
- * @copyright Curverider Ltd 2008-2010
- * @link http://elgg.org/
- */
-
-//If editing a post, show the previous revisions and drafts.
-$blog_guid = isset($vars['blog_guid']) ? $vars['blog_guid'] : FALSE;
-$blog = get_entity($blog_guid);
-
-if (elgg_instanceof($blog, 'object', 'blog') && $blog->canEdit()) {
-	$revisions = array();
-	if ($auto_save_annotations = $blog->getAnnotations('blog_auto_save', 1)) {
-		$revisions[] = $auto_save_annotations[0];
-	}
-
-	// count(FALSE) == 1!  AHHH!!!
-	if ($saved_revisions = $blog->getAnnotations('blog_revision', 10, 0, 'time_created DESC')) {
-		$revision_count = count($saved_revisions);
-	} else {
-		$revision_count = 0;
-	}
-
-	$revisions = array_merge($revisions, $saved_revisions);
-}
-
-if ($revisions) {
-	echo '<ul class="blog_revisions">';
-	$load_base_url = "{$vars['url']}pg/blog/{$owner->username}/edit/{$blog->getGUID()}/";
-
-	foreach ($revisions as $revision) {
-		$time = friendly_time($revision->time_created);
-		$load = elgg_view('output/url', array(
-			'href' => $load_base_url . $revision->id,
-			'text' => elgg_echo('load')
-		));
-
-
-		if ($revision->name == 'blog_auto_save') {
-			$name = elgg_echo('blog:auto_saved_revision');
-			$text = "$name: $time $load";
-			$class = 'class="auto_saved"';
-		} else {
-			$name = elgg_echo('blog:revision');
-			$text = "$name: $time $load";
-			$class = 'class="auto_saved"';
-
-			$revision_count--;
-		}
-
-		echo <<<___END
-<li $class>
-$text
-</li>
-
-___END;
-	}
-
-	echo '</ul>';
-}
\ No newline at end of file
diff --git a/mod/blog/views/default/blog/sidebar_menu.php b/mod/blog/views/default/blog/sidebar_menu.php
deleted file mode 100644
index ecd232c52..000000000
--- a/mod/blog/views/default/blog/sidebar_menu.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-/**
- * Blog sidebar menu.
- *
- * @package Blog
- * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
- * @author Curverider Ltd
- * @copyright Curverider Ltd 2008-2010
- * @link http://elgg.org/
- */
-
-// a few cases to consider:
-// 1. looking at all posts
-// 2. looking at a user's post
-// 3. looking at your posts
-
-/*
-Logged in or not doesn't matter unless you're looking at your blog.
-	Does it matter then on the side bar?
-
-All blogs:
-	Archives
-
-Owned blogs;
-	Archives
-*/
-
-$loggedin_user = get_loggedin_user();
-$page_owner = page_owner_entity();
-
-// include a view for plugins to extend
-echo elgg_view("blogs/sidebar", array("object_type" => 'blog'));
-
-// fetch & display latest comments on all blog posts
-$comments = get_annotations(0, "object", "blog", "generic_comment", "", 0, 4, 0, "desc");
-echo elgg_view('annotation/latest_comments', array('comments' => $comments));
-
-
-// only show archives for users or groups.
-// This is a limitation of the URL schema.
-if ($page_owner) {
-	$dates = blog_get_blog_months($user);
-
-	if ($dates) {
-		echo "<h3>".elgg_echo('blog:archives')."</h3>";
-
-		echo '<ul>';
-		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));
-
-			if (!isset($page_owner)) $page_owner = page_owner_entity();
-			$link = $CONFIG->wwwroot . 'pg/blog/' . $page_owner->username . '/archive/' . $timestamplow . '/' . $timestamphigh;
-			//add_submenu_item(sprintf(elgg_echo('date:month:' . substr($date,4,2)), substr($date, 0, 4)), $link, 'filter');
-			$month = sprintf(elgg_echo('date:month:' . substr($date,4,2)), substr($date, 0, 4));
-			echo "<li><a href=\"$link\" title=\"$month\">$month</a><li>";
-		}
-
-		echo '</ul>';
-	}
-}
-
-// tag-cloud display
-echo display_tagcloud(0, 50, 'tags');
-?>
\ No newline at end of file
diff --git a/mod/blog/views/default/blog/sidebar_revisions.php b/mod/blog/views/default/blog/sidebar_revisions.php
deleted file mode 100644
index 7207d9c95..000000000
--- a/mod/blog/views/default/blog/sidebar_revisions.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-/**
- * Blog sidebar menu showing revisions
- *
- * @package Blog
- * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
- * @author Curverider Ltd
- * @copyright Curverider Ltd 2008-2010
- * @link http://elgg.org/
- */
-
-//If editing a post, show the previous revisions and drafts.
-$blog = isset($vars['entity']) ? $vars['entity'] : FALSE;
-
-if (elgg_instanceof($blog, 'object', 'blog') && $blog->canEdit()) {
-	$owner = $blog->getOwnerEntity();
-	$revisions = array();
-
-	if ($auto_save_annotations = $blog->getAnnotations('blog_auto_save', 1)) {
-		$revisions[] = $auto_save_annotations[0];
-	}
-
-	// count(FALSE) == 1!  AHHH!!!
-	if ($saved_revisions = $blog->getAnnotations('blog_revision', 10, 0, 'time_created DESC')) {
-		$revision_count = count($saved_revisions);
-	} else {
-		$revision_count = 0;
-	}
-
-	$revisions = array_merge($revisions, $saved_revisions);
-
-	if ($revisions) {
-		echo '<h3>' . elgg_echo('blog:revisions') . '</h3>';
-
-		$n = count($revisions);
-		echo '<ul class="blog_revisions">';
-
-		$load_base_url = "{$vars['url']}pg/blog/{$owner->username}/edit/{$blog->getGUID()}/";
-
-		// show the "published revision"
-		if ($blog->status == 'published') {
-			$load = elgg_view('output/url', array(
-				'href' => $load_base_url,
-				'text' => elgg_echo('load')
-			));
-
-			$time = friendly_time($blog->publish_date);
-
-			echo '<li>
-			' . elgg_echo('blog:status:published') . ": $time $load
-			</li>";
-		}
-
-		foreach ($revisions as $revision) {
-			$time = friendly_time($revision->time_created);
-			$load = elgg_view('output/url', array(
-				'href' => $load_base_url . $revision->id,
-				'text' => elgg_echo('load')
-			));
-
-			if ($revision->name == 'blog_auto_save') {
-				$name = elgg_echo('blog:auto_saved_revision');
-			} else {
-				$name = elgg_echo('blog:revision') . " $n";
-			}
-
-			$text = "$name: $time $load";
-			$class = 'class="auto_saved"';
-
-			$n--;
-
-			echo <<<___END
-<li $class>
-$text
-</li>
-
-___END;
-		}
-
-		echo '</ul>';
-	}
-}
\ No newline at end of file
diff --git a/mod/blog/views/default/forms/blog/save.php b/mod/blog/views/default/forms/blog/save.php
new file mode 100644
index 000000000..f825acca1
--- /dev/null
+++ b/mod/blog/views/default/forms/blog/save.php
@@ -0,0 +1,166 @@
+<?php
+/**
+ * Edit blog form
+ *
+ * @package Blog
+ */
+
+$blog = get_entity($vars['guid']);
+$vars['entity'] = $blog;
+
+$draft_warning = $vars['draft_warning'];
+if ($draft_warning) {
+	$draft_warning = '<span class="mbm elgg-text-help">' . $draft_warning . '</span>';
+}
+
+$action_buttons = '';
+$delete_link = '';
+$preview_button = '';
+
+if ($vars['guid']) {
+	// add a delete button if editing
+	$delete_url = "action/blog/delete?guid={$vars['guid']}";
+	$delete_link = elgg_view('output/confirmlink', array(
+		'href' => $delete_url,
+		'text' => elgg_echo('delete'),
+		'class' => 'elgg-button elgg-button-delete float-alt'
+	));
+}
+
+// published blogs do not get the preview button
+if (!$vars['guid'] || ($blog && $blog->status != 'published')) {
+	$preview_button = elgg_view('input/submit', array(
+		'value' => elgg_echo('preview'),
+		'name' => 'preview',
+		'class' => 'mls',
+	));
+}
+
+$save_button = elgg_view('input/submit', array(
+	'value' => elgg_echo('save'),
+	'name' => 'save',
+));
+$action_buttons = $save_button . $preview_button . $delete_link;
+
+$title_label = elgg_echo('title');
+$title_input = elgg_view('input/text', array(
+	'name' => 'title',
+	'id' => 'blog_title',
+	'value' => $vars['title']
+));
+
+$excerpt_label = elgg_echo('blog:excerpt');
+$excerpt_input = elgg_view('input/text', array(
+	'name' => 'excerpt',
+	'id' => 'blog_excerpt',
+	'value' => _elgg_html_decode($vars['excerpt'])
+));
+
+$body_label = elgg_echo('blog:body');
+$body_input = elgg_view('input/longtext', array(
+	'name' => 'description',
+	'id' => 'blog_description',
+	'value' => $vars['description']
+));
+
+$save_status = elgg_echo('blog:save_status');
+if ($vars['guid']) {
+	$entity = get_entity($vars['guid']);
+	$saved = date('F j, Y @ H:i', $entity->time_created);
+} else {
+	$saved = elgg_echo('blog:never');
+}
+
+$status_label = elgg_echo('blog:status');
+$status_input = elgg_view('input/dropdown', array(
+	'name' => 'status',
+	'id' => 'blog_status',
+	'value' => $vars['status'],
+	'options_values' => array(
+		'draft' => elgg_echo('blog:status:draft'),
+		'published' => elgg_echo('blog:status:published')
+	)
+));
+
+$comments_label = elgg_echo('comments');
+$comments_input = elgg_view('input/dropdown', array(
+	'name' => 'comments_on',
+	'id' => 'blog_comments_on',
+	'value' => $vars['comments_on'],
+	'options_values' => array('On' => elgg_echo('on'), 'Off' => elgg_echo('off'))
+));
+
+$tags_label = elgg_echo('tags');
+$tags_input = elgg_view('input/tags', array(
+	'name' => 'tags',
+	'id' => 'blog_tags',
+	'value' => $vars['tags']
+));
+
+$access_label = elgg_echo('access');
+$access_input = elgg_view('input/access', array(
+	'name' => 'access_id',
+	'id' => 'blog_access_id',
+	'value' => $vars['access_id']
+));
+
+$categories_input = elgg_view('input/categories', $vars);
+
+// hidden inputs
+$container_guid_input = elgg_view('input/hidden', array('name' => 'container_guid', 'value' => elgg_get_page_owner_guid()));
+$guid_input = elgg_view('input/hidden', array('name' => 'guid', 'value' => $vars['guid']));
+
+
+echo <<<___HTML
+
+$draft_warning
+
+<div>
+	<label for="blog_title">$title_label</label>
+	$title_input
+</div>
+
+<div>
+	<label for="blog_excerpt">$excerpt_label</label>
+	$excerpt_input
+</div>
+
+<div>
+	<label for="blog_description">$body_label</label>
+	$body_input
+</div>
+
+<div>
+	<label for="blog_tags">$tags_label</label>
+	$tags_input
+</div>
+
+$categories_input
+
+<div>
+	<label for="blog_comments_on">$comments_label</label>
+	$comments_input
+</div>
+
+<div>
+	<label for="blog_access_id">$access_label</label>
+	$access_input
+</div>
+
+<div>
+	<label for="blog_status">$status_label</label>
+	$status_input
+</div>
+
+<div class="elgg-foot">
+	<div class="elgg-subtext mbm">
+	$save_status <span class="blog-save-status-time">$saved</span>
+	</div>
+
+	$guid_input
+	$container_guid_input
+
+	$action_buttons
+</div>
+
+___HTML;
diff --git a/mod/blog/views/default/input/datetime.php b/mod/blog/views/default/input/datetime.php
deleted file mode 100644
index 5586464f1..000000000
--- a/mod/blog/views/default/input/datetime.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * A date-time view for the blog publication date.
- */
-
-// default date to current time
-$publish_date = ($vars['value']) ? $vars['value'] : time();
-
-$months = array();
-for ($i=1; $i <= 12; $i++) {
-	$value = str_pad($i, 2, '0', STR_PAD_LEFT);
-	$months[$value] = date('M', strtotime("$value/01/2010"));
-}
-
-$month = elgg_view('input/pulldown', array(
-	'internalname' => 'publish_month',
-	'value' => date('m', $publish_date),
-	'options_values' => $months,
-	'class' => 'blog_publish_month',
-));
-
-$day = elgg_view('input/text', array(
-	'internalname' => 'publish_day',
-	'value' => date('d', $publish_date),
-	'class' => 'blog_publish_day',
-));
-
-$year = elgg_view('input/text', array(
-	'internalname' => 'publish_year',
-	'value' => date('Y', $publish_date),
-	'class' => 'blog_publish_year',
-));
-
-$hour = elgg_view('input/text', array(
-	'internalname' => 'publish_hour',
-	'value' => date('H', $publish_date),
-	'class' => 'blog_publish_hour',
-));
-
-$minute = elgg_view('input/text', array(
-	'internalname' => 'publish_minute',
-	'value' => date('i', $publish_date),
-	'class' => 'blog_publish_minute',
-));
-
-echo "$month $day, $year @ $hour:$minute";
diff --git a/mod/blog/views/default/js/blog/save_draft.php b/mod/blog/views/default/js/blog/save_draft.php
new file mode 100644
index 000000000..8cd07ff5d
--- /dev/null
+++ b/mod/blog/views/default/js/blog/save_draft.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * Save draft through ajax
+ *
+ * @package Blog
+ */
+?>
+elgg.provide('elgg.blog');
+
+/*
+ * Attempt to save and update the input with the guid.
+ */
+elgg.blog.saveDraftCallback = function(data, textStatus, XHR) {
+	if (textStatus == 'success' && data.success == true) {
+		var form = $('form[id=blog-post-edit]');
+
+		// update the guid input element for new posts that now have a guid
+		form.find('input[name=guid]').val(data.guid);
+
+		oldDescription = form.find('textarea[name=description]').val();
+
+		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);
+	} else {
+		$(".blog-save-status-time").html(elgg.echo('error'));
+	}
+};
+
+elgg.blog.saveDraft = function() {
+	if (typeof(tinyMCE) != 'undefined') {
+		tinyMCE.triggerSave();
+	}
+
+	// only save on changed content
+	var form = $('form[id=blog-post-edit]');
+	var description = form.find('textarea[name=description]').val();
+	var title = form.find('input[name=title]').val();
+
+	if (!(description && title) || (description == oldDescription)) {
+		return false;
+	}
+
+	var draftURL = elgg.config.wwwroot + "action/blog/auto_save_revision";
+	var postData = form.serializeArray();
+
+	// force draft status
+	$(postData).each(function(i, e) {
+		if (e.name == 'status') {
+			e.value = 'draft';
+		}
+	});
+
+	$.post(draftURL, postData, elgg.blog.saveDraftCallback, 'json');
+};
+
+elgg.blog.init = function() {
+	// get a copy of the body to compare for auto save
+	oldDescription = $('form[id=blog-post-edit]').find('textarea[name=description]').val();
+	
+	setInterval(elgg.blog.saveDraft, 60000);
+};
+
+elgg.register_hook_handler('init', 'system', elgg.blog.init);
\ No newline at end of file
diff --git a/mod/blog/views/default/object/blog.php b/mod/blog/views/default/object/blog.php
index 0c8944f7d..4403a6006 100644
--- a/mod/blog/views/default/object/blog.php
+++ b/mod/blog/views/default/object/blog.php
@@ -3,112 +3,97 @@
  * View for blog objects
  *
  * @package Blog
- * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
- * @author Curverider Ltd
- * @copyright Curverider Ltd 2008-2010
- * @link http://elgg.org/
  */
 
-$full = (isset($vars['full'])) ? $vars['full'] : FALSE;
-$blog = (isset($vars['entity'])) ? $vars['entity'] : FALSE;
+$full = elgg_extract('full_view', $vars, FALSE);
+$blog = elgg_extract('entity', $vars, FALSE);
 
 if (!$blog) {
-	return '';
+	return TRUE;
 }
 
-$owner = get_entity($blog->owner_guid);
-$container = get_entity($blog->container_guid);
-$linked_title = "<a href=\"{$blog->getURL()}\" title=\"" . htmlentities($blog->title) . "\">{$blog->title}</a>";
-$categories = elgg_view('categories/view', $vars);
+$owner = $blog->getOwnerEntity();
+$container = $blog->getContainerEntity();
+$categories = elgg_view('output/categories', $vars);
 $excerpt = $blog->excerpt;
-
-// add ellipses to excerpt it not the full post
-if ($excerpt != trim(strip_tags($blog->description))) {
-	$excerpt .= ' &#8230';
+if (!$excerpt) {
+	$excerpt = elgg_get_excerpt($blog->description);
 }
 
-$body = autop($blog->description);
-$owner_icon = elgg_view("profile/icon",array('entity' => $owner, 'size' => 'tiny'));
-$tags = elgg_view('output/tags', array('tags' => $blog->tags));
-$date = friendly_time($blog->publish_date);
+$owner_icon = elgg_view_entity_icon($owner, 'tiny');
+$owner_link = elgg_view('output/url', array(
+	'href' => "blog/owner/$owner->username",
+	'text' => $owner->name,
+	'is_trusted' => true,
+));
+$author_text = elgg_echo('byline', array($owner_link));
+$date = elgg_view_friendly_time($blog->time_created);
 
 // The "on" status changes for comments, so best to check for !Off
 if ($blog->comments_on != 'Off') {
-	$comments_count = elgg_count_comments($blog);
-	$comments_link = "<a href=\"{$blog->getURL()}#annotations\">" . sprintf(elgg_echo("comments"), $comments_count) . '</a>';
+	$comments_count = $blog->countComments();
+	//only display if there are commments
+	if ($comments_count != 0) {
+		$text = elgg_echo("comments") . " ($comments_count)";
+		$comments_link = elgg_view('output/url', array(
+			'href' => $blog->getURL() . '#blog-comments',
+			'text' => $text,
+			'is_trusted' => true,
+		));
+	} else {
+		$comments_link = '';
+	}
 } else {
 	$comments_link = '';
 }
 
-// links to delete or edit.
-$edit = '';
-if ($blog->canEdit()) {
-	$edit_url = "{$vars['url']}pg/blog/{$owner->username}/edit/{$blog->getGUID()}/";
-	$edit_link = "<span class='entity_edit'><a href=\"$edit_url\">" . elgg_echo('edit') . '</a></span>';
+$metadata = elgg_view_menu('entity', array(
+	'entity' => $vars['entity'],
+	'handler' => 'blog',
+	'sort_by' => 'priority',
+	'class' => 'elgg-menu-hz',
+));
 
-	$delete_url = "{$vars['url']}action/blog/delete?guid={$blog->getGUID()}";
-	$delete_link = "<span class='delete_button'>" . elgg_view('output/confirmlink', array(
-		'href' => $delete_url,
-		'text' => elgg_echo('delete'),
-		'confirm' => elgg_echo('deleteconfirm')
-	)) . "</span>";
-
-	$status = '';
-	if ($blog->status != 'published') {
-		$status_text = elgg_echo("blog:status:{$blog->status}");
-		$status = "<span class='blog_status'>$status_text</a>";
-	}
+$subtitle = "$author_text $date $comments_link $categories";
 
-	$edit = "$status $edit_link $delete_link";
+// do not show the metadata and controls in widget view
+if (elgg_in_context('widgets')) {
+	$metadata = '';
 }
 
-	// include a view for plugins to extend
-	$edit = elgg_view("blogs/options", array("object_type" => 'blog', 'entity' => $blog)) .
-			elgg_view_likes($blog) . // include likes
-			$edit;
-
 if ($full) {
 
-echo <<<___END
-<div class="blogpost clearfloat">
-	<div id="content_header" class="clearfloat">
-		<div class="content_header_title"><h2>{$blog->title}</h2></div>
-	</div>
-	<div class="entity_listing_icon">
-		$owner_icon
-	</div>
-	<div class="entity_listing_info">
-		<div class="entity_metadata">$edit</div>
-		<p class="entity_subtext">
-			$date
-			$categories
-			$comments_link
-		</p>
-		<p class="tags">$tags</p>
-		<span class="body">$body</span>
-	</div>
-</div>
-
-___END;
+	$body = elgg_view('output/longtext', array(
+		'value' => $blog->description,
+		'class' => 'blog-post',
+	));
+
+	$params = array(
+		'entity' => $blog,
+		'title' => false,
+		'metadata' => $metadata,
+		'subtitle' => $subtitle,
+	);
+	$params = $params + $vars;
+	$summary = elgg_view('object/elements/summary', $params);
+
+	echo elgg_view('object/elements/full', array(
+		'summary' => $summary,
+		'icon' => $owner_icon,
+		'body' => $body,
+	));
 
 } else {
-	echo <<<___END
-<div class="blog $status_class entity_listing clearfloat">
-	<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">
-			$date
-			$categories
-			$comments_link
-		</p>
-		<p class="tags">$tags</p>
-		<p>$excerpt</p>
-	</div>
-</div>
-
-___END;
-}
\ No newline at end of file
+	// brief view
+
+	$params = array(
+		'entity' => $blog,
+		'metadata' => $metadata,
+		'subtitle' => $subtitle,
+		'content' => $excerpt,
+	);
+	$params = $params + $vars;
+	$list_body = elgg_view('object/elements/summary', $params);
+
+	echo elgg_view_image_block($owner_icon, $list_body);
+}
diff --git a/mod/blog/views/default/river/object/blog/create.php b/mod/blog/views/default/river/object/blog/create.php
index 1eb3b0dc8..b808f1bdc 100644
--- a/mod/blog/views/default/river/object/blog/create.php
+++ b/mod/blog/views/default/river/object/blog/create.php
@@ -3,26 +3,13 @@
  * Blog river view.
  */
 
-$performed_by = get_entity($vars['item']->subject_guid);
-$object = get_entity($vars['item']->object_guid);
-$url = $object->getURL();
-$contents = strip_tags($object->excerpt);
+$object = $vars['item']->getObjectEntity();
 
-$url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
-$title = sprintf(elgg_echo('blog:river:create'), $url);
-$string .= $title . " <a href=\"{$object->getURL()}\">{$object->title}</a> <span class=\"entity_subtext\">" . friendly_time($object->time_created) . '</span>';
+$excerpt = $object->excerpt ? $object->excerpt : $object->description;
+$excerpt = strip_tags($excerpt);
+$excerpt = elgg_get_excerpt($excerpt);
 
-if (get_plugin_setting('activitytype', 'riverdashboard') != 'classic') {
-	$string .= '<a class="river_comment_form_button link">' . elgg_echo('generic_comments:text') . '</a>';
-	$string .= elgg_view('likes/forms/link', array('entity' => $object));
-}
-
-$string .= '<div class="river_content_display">';
-$string .= '<div class="river_object_blog_create"></div>';
-if (strlen($contents) > 200) {
-		$string .= substr($contents, 0, strpos($contents, ' ', 200)) . '&hellip;';
-} else {
-	$string .= $contents;
-}
-$string .= '</div>';
-echo $string;
\ No newline at end of file
+echo elgg_view('river/elements/layout', array(
+	'item' => $vars['item'],
+	'message' => $excerpt,
+));
diff --git a/mod/blog/views/default/widgets/blog/content.php b/mod/blog/views/default/widgets/blog/content.php
new file mode 100644
index 000000000..330171662
--- /dev/null
+++ b/mod/blog/views/default/widgets/blog/content.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * User blog widget display view
+ */
+
+$num = $vars['entity']->num_display;
+
+$options = array(
+	'type' => 'object',
+	'subtype' => 'blog',
+	'container_guid' => $vars['entity']->owner_guid,
+	'limit' => $num,
+	'full_view' => FALSE,
+	'pagination' => FALSE,
+);
+$content = elgg_list_entities($options);
+
+echo $content;
+
+if ($content) {
+	$blog_url = "blog/owner/" . elgg_get_page_owner_entity()->username;
+	$more_link = elgg_view('output/url', array(
+		'href' => $blog_url,
+		'text' => elgg_echo('blog:moreblogs'),
+		'is_trusted' => true,
+	));
+	echo "<span class=\"elgg-widget-more\">$more_link</span>";
+} else {
+	echo elgg_echo('blog:noblogs');
+}
diff --git a/mod/blog/views/default/widgets/blog/edit.php b/mod/blog/views/default/widgets/blog/edit.php
new file mode 100644
index 000000000..30c3b2e73
--- /dev/null
+++ b/mod/blog/views/default/widgets/blog/edit.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * User blog widget edit view
+ */
+
+// set default value
+if (!isset($vars['entity']->num_display)) {
+	$vars['entity']->num_display = 4;
+}
+
+$params = array(
+	'name' => 'params[num_display]',
+	'value' => $vars['entity']->num_display,
+	'options' => array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10),
+);
+$dropdown = elgg_view('input/dropdown', $params);
+
+?>
+<div>
+	<?php echo elgg_echo('blog:numbertodisplay'); ?>:
+	<?php echo $dropdown; ?>
+</div>