aboutsummaryrefslogtreecommitdiff
path: root/mod/blog/views
diff options
context:
space:
mode:
authorbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-03-03 17:53:05 +0000
committerbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-03-03 17:53:05 +0000
commit4766f36a4d74924f21ff329c4318ce4e069ffa04 (patch)
tree969b84632f2a8b0db79788a8a6db8e41d63e5cb4 /mod/blog/views
parent57a217fd6b708844407486046a1faa23b46cac08 (diff)
downloadelgg-4766f36a4d74924f21ff329c4318ce4e069ffa04.tar.gz
elgg-4766f36a4d74924f21ff329c4318ce4e069ffa04.tar.bz2
Pulled in the interface changes.
git-svn-id: http://code.elgg.org/elgg/trunk@5257 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'mod/blog/views')
-rw-r--r--mod/blog/views/default/blog/categorylist.php14
-rw-r--r--mod/blog/views/default/blog/css.php210
-rw-r--r--mod/blog/views/default/blog/forms/edit.php200
-rw-r--r--mod/blog/views/default/blog/gallery.php31
-rw-r--r--mod/blog/views/default/blog/listing.php25
-rw-r--r--mod/blog/views/default/blog/menu.php17
-rw-r--r--mod/blog/views/default/blog/notfound.php21
-rw-r--r--mod/blog/views/default/blog/previewpane.php6
-rw-r--r--mod/blog/views/default/blog/view.php26
-rw-r--r--mod/blog/views/default/object/blog.php150
-rw-r--r--mod/blog/views/default/river/object/blog/annotate.php13
-rw-r--r--mod/blog/views/default/river/object/blog/create.php20
-rw-r--r--mod/blog/views/default/river/object/blog/update.php13
13 files changed, 746 insertions, 0 deletions
diff --git a/mod/blog/views/default/blog/categorylist.php b/mod/blog/views/default/blog/categorylist.php
new file mode 100644
index 000000000..90403c550
--- /dev/null
+++ b/mod/blog/views/default/blog/categorylist.php
@@ -0,0 +1,14 @@
+<?php
+ $list = elgg_view('categories/list',$vars);
+ if (!empty($list)) {
+?>
+
+ <div class="blog_categories">
+ <?php echo $list; ?>
+ </div>
+
+<?php
+
+ }
+
+?> \ No newline at end of file
diff --git a/mod/blog/views/default/blog/css.php b/mod/blog/views/default/blog/css.php
new file mode 100644
index 000000000..c9522c901
--- /dev/null
+++ b/mod/blog/views/default/blog/css.php
@@ -0,0 +1,210 @@
+<?php
+
+ /**
+ * Elgg blog CSS extender
+ *
+ * @package ElggBlog
+ * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+ * @author Curverider Ltd <info@elgg.com>
+ * @copyright Curverider Ltd 2008-2010
+ * @link http://elgg.com/
+ */
+
+?>
+#blogs .pagination {
+ margin:5px 10px 0 10px;
+ padding:5px;
+ display:block;
+}
+#blogs #two_column_left_sidebar_maincontent {
+ padding-bottom:10px;
+}
+
+.singleview {
+ margin-top:10px;
+}
+
+.blog_post_icon {
+ float:left;
+ margin:3px 0 0 0;
+ padding:0;
+}
+
+.blog_post h3 {
+ font-size: 150%;
+ margin:0 0 10px 0;
+ padding:0;
+}
+
+.blog_post h3 a {
+ text-decoration: none;
+}
+
+.blog_post p {
+ margin: 0 0 5px 0;
+}
+
+.blog_post .strapline {
+ margin: 0 0 0 35px;
+ padding:0;
+ color: #aaa;
+ line-height:1em;
+}
+.blog_post p.tags {
+ background:transparent url(<?php echo $vars['url']; ?>_graphics/icon_tag.gif) no-repeat scroll left 2px;
+ margin:0 0 7px 35px;
+ padding:0pt 0pt 0pt 16px;
+ min-height:22px;
+}
+.blog_post .options {
+ margin:0;
+ padding:0;
+}
+
+.blog_post_body img[align="left"] {
+ margin: 10px 10px 10px 0;
+ float:left;
+}
+.blog_post_body img[align="right"] {
+ margin: 10px 0 10px 10px;
+ float:right;
+}
+.blog_post_body img {
+ margin: 10px !important;
+}
+
+.blog-comments h3 {
+ font-size: 150%;
+ margin-bottom: 10px;
+}
+.blog-comment {
+ margin-top: 10px;
+ margin-bottom:20px;
+ border-bottom: 1px solid #aaaaaa;
+}
+.blog-comment img {
+ float:left;
+ margin: 0 10px 0 0;
+}
+.blog-comment-menu {
+ margin:0;
+}
+.blog-comment-byline {
+ background: #dddddd;
+ height:22px;
+ padding-top:3px;
+ margin:0;
+}
+.blog-comment-text {
+ margin:5px 0 5px 0;
+}
+
+/* New blog edit column */
+#blog_edit_page {
+ /* background: #bbdaf7; */
+ margin-top:-10px;
+}
+#blog_edit_page #content_area_user_title h2 {
+ background: none;
+ border-top: none;
+ margin:0 0 10px 0px;
+ padding:0px 0 0 0;
+}
+#blog_edit_page #blog_edit_sidebar #content_area_user_title h2 {
+ background:none;
+ border-top:none;
+ margin:inherit;
+ padding:0 0 5px 5px;
+ font-size:1.25em;
+ line-height:1.2em;
+}
+#blog_edit_page #blog_edit_sidebar {
+ margin:0px 0 22px 0;
+ background: #dedede;
+ padding:5px;
+ -webkit-border-radius: 8px;
+ -moz-border-radius: 8px;
+ border-bottom:1px solid #cccccc;
+ border-right:1px solid #cccccc;
+}
+#blog_edit_page #two_column_left_sidebar_210 {
+ width:210px;
+ margin:0px 0 20px 0px;
+ min-height:360px;
+ float:left;
+ padding:0;
+}
+#blog_edit_page #two_column_left_sidebar_maincontent {
+ margin:0 0px 20px 20px;
+ padding:10px 20px 20px 20px;
+ width:670px;
+ background: #bbdaf7;
+}
+/* unsaved blog post preview */
+.blog_previewpane {
+ border:1px solid #D3322A;
+ background:#F7DAD8;
+ padding:10px;
+ margin:10px;
+ -webkit-border-radius: 8px;
+ -moz-border-radius: 8px;
+}
+.blog_previewpane p {
+ margin:0;
+}
+
+#blog_edit_sidebar .publish_controls,
+#blog_edit_sidebar .blog_access,
+#blog_edit_sidebar .publish_options,
+#blog_edit_sidebar .publish_blog,
+#blog_edit_sidebar .allow_comments,
+#blog_edit_sidebar .categories {
+ margin:0 5px 5px 5px;
+ border-top:1px solid #cccccc;
+}
+#blog_edit_page ul {
+ padding-left:0px;
+ margin:5px 0 5px 0;
+ list-style: none;
+}
+#blog_edit_page p {
+ margin:5px 0 5px 0;
+}
+#blog_edit_page #two_column_left_sidebar_maincontent p {
+ margin:0 0 15px 0;
+}
+#blog_edit_page .publish_blog input[type="submit"] {
+ font-weight: bold;
+ padding:2px;
+ height:auto;
+}
+#blog_edit_page .preview_button a {
+ font: 12px/100% Arial, Helvetica, sans-serif;
+ font-weight: bold;
+ background:white;
+ border: 1px solid #cccccc;
+ color:#999999;
+ -webkit-border-radius: 4px;
+ -moz-border-radius: 4px;
+ width: auto;
+ height: auto;
+ padding: 3px;
+ margin:1px 1px 5px 10px;
+ cursor: pointer;
+ float:right;
+}
+#blog_edit_page .preview_button a:hover {
+ background:#4690D6;
+ color:white;
+ text-decoration: none;
+ border: 1px solid #4690D6;
+}
+#blog_edit_page .allow_comments label {
+ font-size: 100%;
+}
+
+
+
+
+
+
diff --git a/mod/blog/views/default/blog/forms/edit.php b/mod/blog/views/default/blog/forms/edit.php
new file mode 100644
index 000000000..d3f4d7e52
--- /dev/null
+++ b/mod/blog/views/default/blog/forms/edit.php
@@ -0,0 +1,200 @@
+<?php
+
+ /**
+ * Elgg blog edit/add page
+ *
+ * @package ElggBlog
+ * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+ * @author Curverider Ltd <info@elgg.com>
+ * @copyright Curverider Ltd 2008-2010
+ * @link http://elgg.com/
+ *
+ * @uses $vars['object'] Optionally, the blog post to edit
+ */
+
+ // Set title, form destination
+ if (isset($vars['entity'])) {
+ $title = sprintf(elgg_echo("blog:editpost"),$object->title);
+ $action = "blog/edit";
+ $title = $vars['entity']->title;
+ $body = $vars['entity']->description;
+ $tags = $vars['entity']->tags;
+ if ($vars['entity']->comments_on == 'Off') {
+ $comments_on = false;
+ } else {
+ $comments_on = true;
+ }
+ $access_id = $vars['entity']->access_id;
+ } else {
+ $title = elgg_echo("blog:addpost");
+ $action = "blog/add";
+ $tags = "";
+ $title = "";
+ $comments_on = true;
+ $description = "";
+ if (defined('ACCESS_DEFAULT'))
+ $access_id = ACCESS_DEFAULT;
+ else
+ $access_id = 0;
+
+ $container = $vars['container_guid'] ? elgg_view('input/hidden', array('internalname' => 'container_guid', 'value' => $vars['container_guid'])) : "";
+ }
+
+ // Just in case we have some cached details
+ if (empty($body)) {
+ $body = $vars['user']->blogbody;
+ if (!empty($body)) {
+ $title = $vars['user']->blogtitle;
+ $tags = $vars['user']->blogtags;
+ }
+ }
+
+ // set the required variables
+
+ $title_label = elgg_echo('title');
+ $title_textbox = elgg_view('input/text', array('internalname' => 'blogtitle', 'value' => $title));
+ $text_label = elgg_echo('blog:text');
+ $text_textarea = elgg_view('input/longtext', array('internalname' => 'blogbody', 'value' => $body));
+ $tag_label = elgg_echo('tags');
+ $tag_input = elgg_view('input/tags', array('internalname' => 'blogtags', 'value' => $tags));
+ $access_label = elgg_echo('access');
+
+ //$comments_select = elgg_view('input/checkboxes', array('internalname' => 'comments_on', 'value' => ''));
+ if($comments_on)
+ $comments_on_switch = "checked=\"checked\"";
+ else
+ $comment_on_switch = "";
+
+ $access_input = elgg_view('input/access', array('internalname' => 'access_id', 'value' => $access_id));
+ $submit_input = elgg_view('input/submit', array('internalname' => 'submit', 'value' => elgg_echo('publish')));
+ $conversation = elgg_echo('Conversation');
+ $publish = elgg_echo('publish');
+ $cat = elgg_echo('categories');
+ $preview = elgg_echo('blog:preview');
+ $privacy = elgg_echo('access');
+ $savedraft = elgg_echo('blog:draft:save');
+ $draftsaved = elgg_echo('blog:draft:saved');
+ $never = elgg_echo('blog:never');
+ $allowcomments = elgg_echo('blog:comments:allow');
+
+ // INSERT EXTRAS HERE
+ $extras = elgg_view('categories',$vars);
+ if (!empty($extras)) $extras = '<div id="blog_edit_sidebar">' . $extras . '</div>';
+
+?>
+
+<?php
+
+ $form_body = <<<EOT
+
+ <div id="two_column_left_sidebar_210">
+
+ <div id="blog_edit_sidebar">
+ <div id="content_area_user_title">
+ <div class="preview_button"><a onclick="javascript:saveDraft(true);return true;">{$preview}</a></div>
+ <h2>{$publish}</h2></div>
+ <div class="publish_controls">
+ <p>
+ <a href="#" onclick="javascript:saveDraft(false);return false;">{$savedraft}</a>
+ </p>
+ </div>
+ <div class="publish_options">
+ <!-- <p><b>{$publish}:</b> now <a href="">edit</a></p> -->
+ <p class="auto_save">{$draftsaved}: <span id="draftSavedCounter">{$never}</span></p>
+ </div>
+ <div class="blog_access">
+ <p>{$privacy}: {$access_input}
+ </p></div>
+ <div class="publish_blog">
+ {$submit_input}
+ </div>
+ </div>
+
+ <div id="blog_edit_sidebar">
+ <div id="content_area_user_title"><h2>{$conversation}</h2></div>
+ <div class="allow_comments">
+ <p><label>
+ <input type="checkbox" name="comments_select" {$comments_on_switch} /> {$allowcomments}
+ </label></p>
+ </div>
+ </div>
+
+ {$extras}
+
+ $container
+
+ </div><!-- /two_column_left_sidebar_210 -->
+
+ <!-- main content -->
+ <div id="two_column_left_sidebar_maincontent">
+EOT;
+
+?>
+
+<?php
+
+ if (isset($vars['entity'])) {
+ $entity_hidden = elgg_view('input/hidden', array('internalname' => 'blogpost', 'value' => $vars['entity']->getGUID()));
+ } else {
+ $entity_hidden = '';
+ }
+
+ $form_body .= <<<EOT
+ <p>
+ <label>$title_label</label><br />
+ $title_textbox
+ </p>
+ <p class='longtext_editarea'>
+ <label>$text_label</label><br />
+ $text_textarea
+ </p>
+ <p>
+ <label>$tag_label</label><br />
+ $tag_input
+ </p>
+ <!-- <p>
+ <label>$access_label</label><br />
+ $access_input
+ </p> -->
+ <p>
+ $entity_hidden
+ <!-- $submit_input -->
+ </p>
+ </div><div class="clearfloat"></div><!-- /two_column_left_sidebar_maincontent -->
+EOT;
+
+ echo elgg_view('input/form', array('action' => "{$vars['url']}action/$action", 'body' => $form_body, 'internalid' => 'blogPostForm'));
+?>
+
+<script type="text/javascript">
+ setInterval( "saveDraft(false)", 120000);
+ function saveDraft(preview) {
+ temppreview = preview;
+
+ if (typeof(tinyMCE) != 'undefined') {
+ tinyMCE.triggerSave();
+ }
+
+ var drafturl = "<?php echo $vars['url']; ?>mod/blog/savedraft.php";
+ var temptitle = $("input[name='blogtitle']").val();
+ var tempbody = $("textarea[name='blogbody']").val();
+ var temptags = $("input[name='blogtags']").val();
+
+ var postdata = { blogtitle: temptitle, blogbody: tempbody, blogtags: temptags };
+
+ $.post(drafturl, postdata, function() {
+ var d = new Date();
+ var mins = d.getMinutes() + '';
+ if (mins.length == 1) mins = '0' + mins;
+ $("span#draftSavedCounter").html(d.getHours() + ":" + mins);
+ if (temppreview == true) {
+ $("form#blogPostForm").attr("action","<?php echo $vars['url']; ?>mod/blog/preview.php");
+ $("input[name='submit']").click();
+ //$("form#blogPostForm").submit();
+ //document.blogPostForm.submit();
+ }
+ });
+
+ }
+
+</script>
diff --git a/mod/blog/views/default/blog/gallery.php b/mod/blog/views/default/blog/gallery.php
new file mode 100644
index 000000000..23f0418bc
--- /dev/null
+++ b/mod/blog/views/default/blog/gallery.php
@@ -0,0 +1,31 @@
+<?php
+
+ /**
+ * Elgg blog listing
+ *
+ * @package ElggBlog
+ * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+ * @author Curverider Ltd <info@elgg.com>
+ * @copyright Curverider Ltd 2008-2010
+ * @link http://elgg.com/
+ */
+
+ $owner = $vars['entity']->getOwnerEntity();
+ $friendlytime = friendly_time($vars['entity']->time_created);
+ $icon = elgg_view(
+ "profile/icon", array(
+ 'entity' => $owner,
+ 'size' => 'small',
+ )
+ );
+ $info = "<p>" . elgg_echo('blog') . ": <a href=\"{$vars['entity']->getURL()}\">{$vars['entity']->title}</a></p>";
+ $info .= "<p><a href=\"{$owner->getURL()}\">{$owner->name}</a> {$friendlytime}</p>";
+
+ //display
+ echo "<div class=\"blog_gallery\">";
+ echo "<div class=\"blog_gallery_icon\">" . $icon . "</div>";
+ echo "<div class=\"blog_gallery_content\">" . $info . "</div>";
+ echo "</div>";
+
+
+?> \ No newline at end of file
diff --git a/mod/blog/views/default/blog/listing.php b/mod/blog/views/default/blog/listing.php
new file mode 100644
index 000000000..b2dad2570
--- /dev/null
+++ b/mod/blog/views/default/blog/listing.php
@@ -0,0 +1,25 @@
+<?php
+
+ /**
+ * Elgg blog listing
+ *
+ * @package ElggBlog
+ * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+ * @author Curverider Ltd <info@elgg.com>
+ * @copyright Curverider Ltd 2008-2010
+ * @link http://elgg.com/
+ */
+
+ $owner = $vars['entity']->getOwnerEntity();
+ $friendlytime = friendly_time($vars['entity']->time_created);
+ $icon = elgg_view(
+ "profile/icon", array(
+ 'entity' => $owner,
+ 'size' => 'small',
+ )
+ );
+ $info = "<p>" . elgg_echo('blog') . ": <a href=\"{$vars['entity']->getURL()}\">{$vars['entity']->title}</a></p>";
+ $info .= "<p class=\"owner_timestamp\"><a href=\"{$owner->getURL()}\">{$owner->name}</a> {$friendlytime}</p>";
+ echo elgg_view_listing($icon,$info);
+
+?> \ No newline at end of file
diff --git a/mod/blog/views/default/blog/menu.php b/mod/blog/views/default/blog/menu.php
new file mode 100644
index 000000000..45384ae72
--- /dev/null
+++ b/mod/blog/views/default/blog/menu.php
@@ -0,0 +1,17 @@
+<?php
+
+ /**
+ * Elgg hoverover extender for blog
+ *
+ * @package ElggBlog
+ * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+ * @author Curverider Ltd <info@elgg.com>
+ * @copyright Curverider Ltd 2008-2010
+ * @link http://elgg.com/
+ */
+
+?>
+
+ <p class="user_menu_blog">
+ <a href="<?php echo $vars['url']; ?>pg/blog/<?php echo $vars['entity']->username; ?>"><?php echo elgg_echo("blog"); ?></a>
+ </p> \ No newline at end of file
diff --git a/mod/blog/views/default/blog/notfound.php b/mod/blog/views/default/blog/notfound.php
new file mode 100644
index 000000000..543b98374
--- /dev/null
+++ b/mod/blog/views/default/blog/notfound.php
@@ -0,0 +1,21 @@
+<?php
+
+ /**
+ * Elgg blog not found page
+ *
+ * @package ElggBlog
+ * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+ * @author Curverider Ltd <info@elgg.com>
+ * @copyright Curverider Ltd 2008-2010
+ * @link http://elgg.com/
+ */
+
+?>
+
+ <p>
+ <?php
+
+ echo elgg_echo("blog:notfound");
+
+ ?>
+ </p> \ No newline at end of file
diff --git a/mod/blog/views/default/blog/previewpane.php b/mod/blog/views/default/blog/previewpane.php
new file mode 100644
index 000000000..0828c06a9
--- /dev/null
+++ b/mod/blog/views/default/blog/previewpane.php
@@ -0,0 +1,6 @@
+<div class="blog_previewpane">
+ <p>
+ <?php echo elgg_echo("blog:preview:description"); ?>
+ <a href="javascript:history.go(-1);"><?php echo elgg_echo("blog:preview:description:link"); ?></a>
+ </p>
+</div> \ No newline at end of file
diff --git a/mod/blog/views/default/blog/view.php b/mod/blog/views/default/blog/view.php
new file mode 100644
index 000000000..18841d224
--- /dev/null
+++ b/mod/blog/views/default/blog/view.php
@@ -0,0 +1,26 @@
+<?php
+
+ /**
+ * Elgg blog view page
+ *
+ * @package ElggBlog
+ * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+ * @author Curverider Ltd <info@elgg.com>
+ * @copyright Curverider Ltd 2008-2010
+ * @link http://elgg.com/
+ *
+ * @uses $vars['posts'] An array of posts to view
+ */
+
+ // If there are any posts to view, view them
+ if (is_array($vars['posts']) && sizeof($vars['posts']) > 0) {
+
+ foreach($vars['posts'] as $post) {
+
+ echo elgg_view_entity($post);
+
+ }
+
+ }
+
+?> \ No newline at end of file
diff --git a/mod/blog/views/default/object/blog.php b/mod/blog/views/default/object/blog.php
new file mode 100644
index 000000000..898705911
--- /dev/null
+++ b/mod/blog/views/default/object/blog.php
@@ -0,0 +1,150 @@
+<?php
+
+ /**
+ * Elgg blog individual post view
+ *
+ * @package ElggBlog
+ * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+ * @author Ben Werdmuller <ben@curverider.co.uk>
+ * @copyright Curverider Ltd 2008-2010
+ * @link http://elgg.com/
+ *
+ * @uses $vars['entity'] Optionally, the blog post to view
+ */
+
+ if (isset($vars['entity'])) {
+
+ //display comments link?
+ if ($vars['entity']->comments_on == 'Off') {
+ $comments_on = false;
+ } else {
+ $comments_on = true;
+ }
+
+ if (get_context() == "search" && $vars['entity'] instanceof ElggObject) {
+
+ //display the correct layout depending on gallery or list view
+ if (get_input('search_viewtype') == "gallery") {
+
+ //display the gallery view
+ echo elgg_view("blog/gallery",$vars);
+
+ } else {
+
+ echo elgg_view("blog/listing",$vars);
+
+ }
+
+
+ } else {
+
+ if ($vars['entity'] instanceof ElggObject) {
+
+ $url = $vars['entity']->getURL();
+ $owner = $vars['entity']->getOwnerEntity();
+ $canedit = $vars['entity']->canEdit();
+
+ } else {
+
+ $url = 'javascript:history.go(-1);';
+ $owner = $vars['user'];
+ $canedit = false;
+
+ }
+?>
+
+ <div class="contentWrapper singleview">
+
+ <div class="blog_post">
+ <h3><a href="<?php echo $url; ?>"><?php echo $vars['entity']->title; ?></a></h3>
+ <!-- display the user icon -->
+ <div class="blog_post_icon">
+ <?php
+ echo elgg_view("profile/icon",array('entity' => $owner, 'size' => 'tiny'));
+ ?>
+ </div>
+ <p class="strapline">
+ <?php
+
+ echo sprintf(elgg_echo("blog:strapline"),
+ date("F j, Y",$vars['entity']->time_created)
+ );
+
+ ?>
+ <?php echo elgg_echo('by'); ?> <a href="<?php echo $vars['url']; ?>pg/blog/<?php echo $owner->username; ?>"><?php echo $owner->name; ?></a> &nbsp;
+ <!-- display the comments link -->
+ <?php
+ if($comments_on && $vars['entity'] instanceof ElggObject){
+ //get the number of comments
+ $num_comments = elgg_count_comments($vars['entity']);
+ ?>
+ <a href="<?php echo $url; ?>"><?php echo sprintf(elgg_echo("comments")) . " (" . $num_comments . ")"; ?></a><br />
+ <?php
+ }
+ ?>
+ </p>
+ <!-- display tags -->
+ <?php
+
+ $tags = elgg_view('output/tags', array('tags' => $vars['entity']->tags));
+ if (!empty($tags)) {
+ echo '<p class="tags">' . $tags . '</p>';
+ }
+
+ $categories = elgg_view('categories/view', $vars);
+ if (!empty($categories)) {
+ echo '<p class="categories">' . $categories . '</p>';
+ }
+
+ ?>
+ <div class="clearfloat"></div>
+ <div class="blog_post_body">
+
+ <!-- display the actual blog post -->
+ <?php
+
+ echo elgg_view('output/longtext',array('value' => $vars['entity']->description));
+
+ ?>
+ </div><div class="clearfloat"></div>
+ <!-- display edit options if it is the blog post owner -->
+ <p class="options">
+ <?php
+
+ if ($canedit) {
+
+ ?>
+ <a href="<?php echo $vars['url']; ?>mod/blog/edit.php?blogpost=<?php echo $vars['entity']->getGUID(); ?>"><?php echo elgg_echo("edit"); ?></a> &nbsp;
+ <?php
+
+ echo elgg_view("output/confirmlink", array(
+ 'href' => $vars['url'] . "action/blog/delete?blogpost=" . $vars['entity']->getGUID(),
+ 'text' => elgg_echo('delete'),
+ 'confirm' => elgg_echo('deleteconfirm'),
+ ));
+
+ // Allow the menu to be extended
+ echo elgg_view("editmenu",array('entity' => $vars['entity']));
+
+ ?>
+ <?php
+ }
+
+ ?>
+ </p>
+ </div>
+ </div>
+
+<?php
+
+ // If we've been asked to display the full view
+ // Now handled by annotation framework
+ /*if (isset($vars['full']) && $vars['full'] == true && $comments_on == 'on' && $vars['entity'] instanceof ElggEntity) {
+ echo elgg_view_comments($vars['entity']);
+ }*/
+
+ }
+
+ }
+
+?>
diff --git a/mod/blog/views/default/river/object/blog/annotate.php b/mod/blog/views/default/river/object/blog/annotate.php
new file mode 100644
index 000000000..77b75c6d9
--- /dev/null
+++ b/mod/blog/views/default/river/object/blog/annotate.php
@@ -0,0 +1,13 @@
+<?php
+
+ $statement = $vars['statement'];
+ $performed_by = $statement->getSubject();
+ $object = $statement->getObject();
+
+ $url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
+ $string = sprintf(elgg_echo("blog:river:posted"),$url) . " ";
+ $string .= elgg_echo("blog:river:annotate:create") . " <a href=\"" . $object->getURL() . "\">" . $object->title . "</a>";
+
+?>
+
+<?php echo $string; ?> \ No newline at end of file
diff --git a/mod/blog/views/default/river/object/blog/create.php b/mod/blog/views/default/river/object/blog/create.php
new file mode 100644
index 000000000..b5b3dc2e4
--- /dev/null
+++ b/mod/blog/views/default/river/object/blog/create.php
@@ -0,0 +1,20 @@
+<?php
+
+ $performed_by = get_entity($vars['item']->subject_guid); // $statement->getSubject();
+ $object = get_entity($vars['item']->object_guid);
+ $url = $object->getURL();
+
+ $url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
+ $contents = strip_tags($object->description); //strip tags from the contents to stop large images etc blowing out the river view
+ $string = sprintf(elgg_echo("blog:river:created"),$url) . " ";
+ $string .= elgg_echo("blog:river:create") . " <a href=\"" . $object->getURL() . "\">" . $object->title . "</a>";
+ $string .= "<div class=\"river_content_display\">";
+ if(strlen($contents) > 200) {
+ $string .= substr($contents, 0, strpos($contents, ' ', 200)) . "...";
+ }else{
+ $string .= $contents;
+ }
+ $string .= "</div>";
+?>
+
+<?php echo $string; ?> \ No newline at end of file
diff --git a/mod/blog/views/default/river/object/blog/update.php b/mod/blog/views/default/river/object/blog/update.php
new file mode 100644
index 000000000..cf98afa8b
--- /dev/null
+++ b/mod/blog/views/default/river/object/blog/update.php
@@ -0,0 +1,13 @@
+<?php
+
+ $performed_by = get_entity($vars['item']->subject_guid); // $statement->getSubject();
+ $object = get_entity($vars['item']->object_guid);
+ $url = $object->getURL();
+
+ $url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
+ $string = sprintf(elgg_echo("blog:river:updated"),$url) . " ";
+ $string .= elgg_echo("blog:river:update") . " <a href=\"" . $object->getURL() . "\">" . $object->title . "</a>";
+
+?>
+
+<?php echo $string; ?> \ No newline at end of file