aboutsummaryrefslogtreecommitdiff
path: root/views/default/annotation
diff options
context:
space:
mode:
Diffstat (limited to 'views/default/annotation')
-rw-r--r--views/default/annotation/annotate.php57
-rw-r--r--views/default/annotation/generic_comment.php113
2 files changed, 88 insertions, 82 deletions
diff --git a/views/default/annotation/annotate.php b/views/default/annotation/annotate.php
index d2869536a..b4e68c9b2 100644
--- a/views/default/annotation/annotate.php
+++ b/views/default/annotation/annotate.php
@@ -1,27 +1,36 @@
<?php
+/**
+ * Elgg AJAX loader
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ */
- $performed_by = get_entity($vars['item']->subject_guid); // $statement->getSubject();
- $object = get_entity($vars['item']->object_guid);
- $url = $object->getURL();
- $title = $object->title;
- if(!$title)
- $title = 'Untitled';
- $subtype = get_subtype_from_id($object->subtype);
- //grab the annotation, if one exists
- if($vars['item']->annotation_id != 0)
- $comment = get_annotation($vars['item']->annotation_id)->value;
- $url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
- $string = sprintf(elgg_echo("river:posted:generic"),$url) . " ";
- $string .= elgg_echo("{$subtype}:river:annotate") . " | <a href=\"{$object->getURL()}\">" . $title . "</a>";
- $string .= "<div class=\"river_content_display\">";
- if($comment){
- $contents = strip_tags($comment);//this is so we don't get large images etc in the activity river
- if(strlen($contents) > 200)
- $string .= substr($contents, 0, strpos($contents, ' ', 200)) . "...";
- else
- $string .= $contents;
- }
- $string .= "</div>";
-?>
+$performed_by = get_entity($vars['item']->subject_guid); // $statement->getSubject();
+$object = get_entity($vars['item']->object_guid);
+$url = $object->getURL();
+$title = $object->title;
+if(!$title) {
+ $title = 'Untitled';
+}
+$subtype = get_subtype_from_id($object->subtype);
+//grab the annotation, if one exists
+if($vars['item']->annotation_id != 0) {
+ $comment = get_annotation($vars['item']->annotation_id)->value;
+}
+$url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
+$string = sprintf(elgg_echo("river:posted:generic"),$url) . " ";
+$string .= elgg_echo("{$subtype}:river:annotate") . " | <a href=\"{$object->getURL()}\">" . $title . "</a>";
+$string .= "<div class=\"river_content_display\">";
+if($comment){
+ $contents = strip_tags($comment);//this is so we don't get large images etc in the activity river
+ 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
+echo $string; \ No newline at end of file
diff --git a/views/default/annotation/generic_comment.php b/views/default/annotation/generic_comment.php
index 1ecf7ad8e..ca0f69eaf 100644
--- a/views/default/annotation/generic_comment.php
+++ b/views/default/annotation/generic_comment.php
@@ -1,61 +1,58 @@
<?php
-
- /**
- * Elgg generic comment
- *
- * @package Elgg
- * @subpackage Core
-
- * @author Curverider Ltd
-
- * @link http://elgg.org/
- *
- */
-
- $owner = get_user($vars['annotation']->owner_guid);
+/**
+ * Elgg generic comment
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ *
+ */
+
+$owner = get_user($vars['annotation']->owner_guid);
?>
-
-
- <div class="generic_comment"><!-- start of generic_comment div -->
-
- <div class="generic_comment_icon">
- <?php
- echo elgg_view("profile/icon",
- array(
- 'entity' => $owner,
- 'size' => 'small'));
- ?>
- </div>
- <div class="generic_comment_details">
-
- <!-- output the actual comment -->
- <?php echo elgg_view("output/longtext",array("value" => $vars['annotation']->value)); ?>
-
- <p class="generic_comment_owner">
- <a href="<?php echo $owner->getURL(); ?>"><?php echo $owner->name; ?></a> <?php echo friendly_time($vars['annotation']->time_created); ?>
- </p>
-
- <?php
-
- // if the user looking at the comment can edit, show the delete link
- if ($vars['annotation']->canEdit()) {
-
- ?>
- <p>
- <?php
-
- echo elgg_view("output/confirmlink",array(
- 'href' => $vars['url'] . "action/comments/delete?annotation_id=" . $vars['annotation']->id,
- 'text' => elgg_echo('delete'),
- 'confirm' => elgg_echo('deleteconfirm'),
- ));
-
- ?>
- </p>
-
- <?php
- } //end of can edit if statement
- ?>
- </div><!-- end of generic_comment_details -->
- </div><!-- end of generic_comment div --> \ No newline at end of file
+<div class="generic_comment"><!-- start of generic_comment div -->
+
+ <div class="generic_comment_icon">
+ <?php
+ echo elgg_view("profile/icon",
+ array(
+ 'entity' => $owner,
+ 'size' => 'small'
+ )
+ );
+ ?>
+ </div>
+ <div class="generic_comment_details">
+
+ <!-- output the actual comment -->
+ <?php echo elgg_view("output/longtext",array("value" => $vars['annotation']->value)); ?>
+
+ <p class="generic_comment_owner">
+ <a href="<?php echo $owner->getURL(); ?>"><?php echo $owner->name; ?></a> <?php echo friendly_time($vars['annotation']->time_created); ?>
+ </p>
+
+ <?php
+
+ // if the user looking at the comment can edit, show the delete link
+ if ($vars['annotation']->canEdit()) {
+
+ ?>
+ <p>
+ <?php
+
+ echo elgg_view("output/confirmlink",array(
+ 'href' => $vars['url'] . "action/comments/delete?annotation_id=" . $vars['annotation']->id,
+ 'text' => elgg_echo('delete'),
+ 'confirm' => elgg_echo('deleteconfirm'),
+ ));
+
+ ?>
+ </p>
+
+ <?php
+ } //end of can edit if statement
+ ?>
+ </div><!-- end of generic_comment_details -->
+</div><!-- end of generic_comment div --> \ No newline at end of file