diff options
Diffstat (limited to 'mod/blog/views')
| -rw-r--r-- | mod/blog/views/default/object/blog-comment.php | 27 | ||||
| -rw-r--r-- | mod/blog/views/default/object/blog-comments.php | 27 | ||||
| -rw-r--r-- | mod/blog/views/default/object/blog.php | 43 |
3 files changed, 59 insertions, 38 deletions
diff --git a/mod/blog/views/default/object/blog-comment.php b/mod/blog/views/default/object/blog-comment.php index ecbf5fcff..a36490ec2 100644 --- a/mod/blog/views/default/object/blog-comment.php +++ b/mod/blog/views/default/object/blog-comment.php @@ -16,9 +16,9 @@ ?>
<li>
-
- <?php echo elgg_view("output/longtext",array("value" => $vars['entity']->value)); ?>
- <p>
+ <div class="blog-comment">
+ <p class="blog-comment-text"><?php echo elgg_view("output/longtext",array("value" => $vars['entity']->value)); ?></p>
+ <p class="blog-comment-byline">
<?php
if ($owner = get_entity($vars['entity']->owner_guid)) {
@@ -27,5 +27,24 @@ ?>, <?php echo date("F j, g:i a",$vars['entity']->time_created); ?>
</p>
-
+ <?php
+
+ if ($vars['entity']->canEdit()) {
+?>
+ <p class="blog-comment-menu">
+ <?php
+
+ echo elgg_view("output/confirmlink",array(
+ 'href' => $vars['url'] . "action.php?action=blog/comments/delete&comment_id=" . $vars['entity']->id,
+ 'text' => elgg_echo('delete'),
+ 'confirm' => elgg_echo('deleteconfirm'),
+ ));
+
+ ?>
+ </p>
+<?php
+ }
+
+ ?>
+ </div>
</li>
\ No newline at end of file diff --git a/mod/blog/views/default/object/blog-comments.php b/mod/blog/views/default/object/blog-comments.php index 991c42301..188214ff1 100644 --- a/mod/blog/views/default/object/blog-comments.php +++ b/mod/blog/views/default/object/blog-comments.php @@ -12,6 +12,11 @@ * @uses $vars['comments'] Array of comments
*/
+?>
+
+ <div class="blog-comments">
+
+<?php
if (isset($vars['comments']) && is_array($vars['comments']) && sizeof($vars['comments']) > 0) {
echo "<h3>". elgg_echo("comments") ."</h3><ol>";
@@ -24,4 +29,24 @@ }
-?>
\ No newline at end of file +?>
+ <form action="<?php echo $vars['url']; ?>action/blog/comments/add" method="post">
+ <h3>
+ <?php echo elgg_echo("blog:comment:add"); ?>
+ </h3>
+ <p>
+ <label><?php echo elgg_echo("blog:comment:text"); ?>
+ <?php
+
+ echo elgg_view("input/longtext",array('internalname' => 'comment'));
+
+ ?>
+ </label>
+ </p>
+ <p>
+ <input type="hidden" name="blogpost_guid" value="<?php echo $vars['entity']->getGUID(); ?>" />
+ <input type="submit" value="<?php echo elgg_echo("save"); ?>" />
+ </p>
+ </form>
+
+ </div>
\ 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 01fbe4b4c..c4b718045 100644 --- a/mod/blog/views/default/object/blog.php +++ b/mod/blog/views/default/object/blog.php @@ -47,10 +47,16 @@ <?php
if ($vars['entity']->canEdit()) {
+
?>
<a href="<?php echo $vars['url']; ?>mod/blog/edit.php?blogpost=<?php echo $vars['entity']->getGUID(); ?>"><?php echo elgg_echo("edit"); ?></a>
- <a href="<?php echo $vars['url']; ?>action.php?action=blog/delete&blogpost=<?php echo $vars['entity']->getGUID(); ?>"><?php echo elgg_echo("delete"); ?></a>
<?php
+
+ echo elgg_view("output/confirmlink", array(
+ 'href' => $vars['url'] . "action.php?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']));
@@ -66,41 +72,12 @@ // If we've been asked to display the full view
if (isset($vars['full']) && $vars['full'] == true) {
-
-?>
-
- <div class="blog-comments">
-
-<?php
+ echo elgg_view('object/blog-comments',array('entity' => $vars['entity'], 'comments' => $vars['comments']));
+ }
// Display comments if any
- echo elgg_view('object/blog-comments',array('comments' => $vars['comments']));
+ // echo elgg_view('object/blog-comments',array('entity' => $vars['entity'], 'comments' => $vars['comments']));
-?>
- <form action="<?php echo $vars['url']; ?>action/blog/comments/add" method="post">
- <h3>
- <?php echo elgg_echo("blog:comment:add"); ?>
- </h3>
- <p>
- <label><?php echo elgg_echo("blog:comment:text"); ?>
- <?php
-
- echo elgg_view("input/longtext",array('internalname' => 'comment'));
-
- ?>
- </label>
- </p>
- <p>
- <input type="hidden" name="blogpost_guid" value="<?php echo $vars['entity']->getGUID(); ?>" />
- <input type="submit" value="<?php echo elgg_echo("save"); ?>" />
- </p>
- </form>
-
- </div>
-
-<?php
-
- }
}
?>
\ No newline at end of file |