amtrak does not have wifi so here is one big commit with group blogs, blog widget, and improved blog sidebar

git-svn-id: http://code.elgg.org/elgg/trunk@7720 36083f99-b078-4883-b0ff-0f9b5a30f544

3 files changed, 138 insertions, 0 deletions

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..9904be288
--- /dev/null
+++ b/mod/blog/views/default/blog/sidebar/archives.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Blog archives
+ */
+
+$loggedin_user = get_loggedin_user();
+$page_owner = elgg_get_page_owner();
+
+// This is a limitation of the URL schema.
+if ($page_owner && $vars['page'] != 'friends') {
+	$dates = blog_get_blog_months($user);
+
+	if ($dates) {
+		$title = elgg_echo('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/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>";
+		}
+		$content .= '</ul>';
+
+		echo elgg_view('layout/objects/module', array('title' => $title, 'body' => $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..e3919648b
--- /dev/null
+++ b/mod/blog/views/default/blog/sidebar/revisions.php
@@ -0,0 +1,77 @@
+<?php
+/**
+ * Blog sidebar menu showing revisions
+ *
+ * @package Blog
+ */
+
+//If editing a post, show the previous revisions and drafts.
+$blog = elgg_get_array_value('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 = "pg/blog/edit/{$owner->username}/{$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')
+			));
+
+			$time = "<span class='entity-subtext'>"
+				. elgg_view_friendly_time($blog->publish_date) . "</span>";
+
+			$body .= "<li>$load : $time</li>";
+		}
+
+		foreach ($revisions as $revision) {
+			$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 {
+				$revision_lang = elgg_echo('blog:revision') . " $n";
+			}
+			$load = elgg_view('output/url', array(
+				'href' => $load_base_url . $revision->id,
+				'text' => $revision_lang
+			));
+
+			$text = "$load: $time";
+			$class = 'class="auto-saved"';
+
+			$n--;
+
+			$body .= "<li $class>$text</li>";
+		}
+
+		$body .= '</ul>';
+
+		echo elgg_view('layout/objects/module', array('title' => $title, 'body' => $body));
+	}
+}
\ No newline at end of file
diff --git a/mod/blog/views/default/blog/sidebar/tagcloud.php b/mod/blog/views/default/blog/sidebar/tagcloud.php
new file mode 100644
index 000000000..2f5ce3955
--- /dev/null
+++ b/mod/blog/views/default/blog/sidebar/tagcloud.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Blog tag cloud
+ */
+
+$loggedin_user = get_loggedin_user();
+$page_owner = elgg_get_page_owner();
+
+if ($page_owner && $vars['page'] != 'friends') {
+
+	// friends page lists all tags; mine lists owner's
+	$owner_guid = ($vars['page'] == 'friends') ? '' : $page_owner->getGUID();
+	$options = array(
+		'type' => 'object',
+		'subtype' => 'blog',
+		'owner_guid' => $owner_guid,
+		'threshold' => 0,
+		'limit' => 50,
+		'tag_name' => 'tags',
+	);
+	echo elgg_view_tagcloud($options);
+} else {
+	$options = array(
+		'type' => 'object',
+		'subtype' => 'blog',
+		'threshold' => 0,
+		'limit' => 50,
+		'tag_name' => 'tags',
+	);
+	echo elgg_view_tagcloud($options);
+}