From eb306be905c9fd78600841070d0796bd99ae7f73 Mon Sep 17 00:00:00 2001
From: cash
Date: Mon, 6 Dec 2010 01:48:53 +0000
Subject: comments use the media view now
git-svn-id: http://code.elgg.org/elgg/trunk@7544 36083f99-b078-4883-b0ff-0f9b5a30f544
---
views/default/annotation/generic_comment.php | 79 ++++++++++------------------
views/default/annotation/list.php | 46 ++++++++++++++++
views/default/comments/forms/edit.php | 20 -------
views/default/forms/comments/add.php | 23 ++++++++
views/default/layout_elements/media.php | 10 +++-
5 files changed, 105 insertions(+), 73 deletions(-)
create mode 100644 views/default/annotation/list.php
delete mode 100644 views/default/comments/forms/edit.php
create mode 100644 views/default/forms/comments/add.php
(limited to 'views/default')
diff --git a/views/default/annotation/generic_comment.php b/views/default/annotation/generic_comment.php
index bb0127bfe..63633d3b5 100644
--- a/views/default/annotation/generic_comment.php
+++ b/views/default/annotation/generic_comment.php
@@ -20,7 +20,6 @@ if (!$entity || !$commenter) {
return true;
}
-
$friendlytime = elgg_view_friendly_time($comment->time_created);
$commenter_icon = elgg_view("profile/icon", array('entity' => $commenter, 'size' => 'tiny'));
@@ -31,6 +30,31 @@ $entity_link = "getURL()}\">$entity_title";
if ($full_view) {
+ $delete_button = '';
+ if ($comment->canEdit()) {
+ $delete_button = elgg_view("output/confirmlink",array(
+ 'href' => "action/comments/delete?annotation_id={$comment->id}",
+ 'text' => elgg_echo('delete'),
+ 'confirm' => elgg_echo('deleteconfirm')
+ ));
+ $delete_button = "$delete_button";
+ }
+
+ $comment_text = elgg_view("output/longtext", array("value" => $comment->value));
+
+ $body = <<
+ $delete_button
+ $commenter_link
+
+ $friendlytime
+
+ $comment_text
+
+HTML;
+
+ echo elgg_view_media($commenter_icon, $body, array('id' => "comment-$comment->id"));
+
} else {
// brief view
@@ -39,57 +63,10 @@ if ($full_view) {
$on = elgg_echo('on');
$body = <<$commenter_link $on $entity_link ($friendlytime)
+
+ $commenter_link $on $entity_link ($friendlytime)
+
HTML;
echo elgg_view_media($commenter_icon, $body);
-
- // @todo remove this once the full view has been rewritten
- return true;
}
-
-
-// @todo - below needs to be rewritten like the brief view
-
-$owner = get_user($vars['annotation']->owner_guid);
-
-?>
-
-
\ No newline at end of file
diff --git a/views/default/annotation/list.php b/views/default/annotation/list.php
new file mode 100644
index 000000000..f432ad640
--- /dev/null
+++ b/views/default/annotation/list.php
@@ -0,0 +1,46 @@
+ $_SERVER['REQUEST_URI'],
+ 'offset' => $offset,
+ 'count' => $count,
+ 'limit' => $limit,
+ 'word' => 'annoff',
+ 'nonefound' => false,
+ ));
+}
+
+if (is_array($annotations) && count($annotations) > 0) {
+ $html .= '';
+ foreach ($annotations as $annotation) {
+ $html .= '- ';
+ $html .= elgg_view_annotation($annotation, true);
+ $html .= '
';
+ }
+ $html .= '
';
+}
+
+if ($count) {
+ $html .= $nav;
+}
+
+echo $html;
diff --git a/views/default/comments/forms/edit.php b/views/default/comments/forms/edit.php
deleted file mode 100644
index 3c26bf7cc..000000000
--- a/views/default/comments/forms/edit.php
+++ /dev/null
@@ -1,20 +0,0 @@
-" . elgg_view('input/longtext',array('internalname' => 'generic_comment')) . "
";
- $form_body .= elgg_view('input/hidden', array('internalname' => 'entity_guid', 'value' => $vars['entity']->getGUID()));
- $form_body .= elgg_view('input/submit', array('value' => elgg_echo("generic_comments:post"))) . "";
-
- echo elgg_view('input/form', array('body' => $form_body, 'action' => "action/comments/add"));
-
- }
-
-?>
\ No newline at end of file
diff --git a/views/default/forms/comments/add.php b/views/default/forms/comments/add.php
new file mode 100644
index 000000000..74ee5ba4b
--- /dev/null
+++ b/views/default/forms/comments/add.php
@@ -0,0 +1,23 @@
+
+
+
+ 'generic_comment')); ?>
+
+ 'entity_guid',
+ 'value' => $vars['entity']->getGUID()
+ ));
+ echo elgg_view('input/submit', array('value' => elgg_echo("generic_comments:post")));
+}
diff --git a/views/default/layout_elements/media.php b/views/default/layout_elements/media.php
index 5f4e51d57..fcf0fba77 100644
--- a/views/default/layout_elements/media.php
+++ b/views/default/layout_elements/media.php
@@ -12,8 +12,9 @@
* @uses $vars['body'] HTML content of the body block
* @uses $vars['icon'] HTML content of the icon block
* @uses $vars['class'] Optional additional class for media element
+ * @uses $vars['id'] Optional id for the media element
* @uses $vars['body_class'] Optional additional class for body block
- * @uses $vars['icon_class'] Optional additional class for icon block
+ * @uses $vars['icon_class'] Optional additional class for icon block
*/
$body = elgg_get_array_value('body', $vars, '');
@@ -25,6 +26,11 @@ if ($additional_class) {
$class = "$class $additional_class";
}
+$id = '';
+if (isset($vars['id'])) {
+ $id = "id=\"{$vars['id']}\"";
+}
+
$body_class = 'elgg-body';
$additional_class = elgg_get_array_value('body_class', $vars, '');
if ($additional_class) {
@@ -42,7 +48,7 @@ if ($icon_block) {
}
echo <<
+
$icon_block$body
HTML;
--
cgit v1.2.3
- name; ?> - - time_created); ?> - -
- -