From c5cc2821311012a8a4385a304a043c4b41f2afbb Mon Sep 17 00:00:00 2001
From: brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Mon, 31 Aug 2009 19:05:21 +0000
Subject: All line endings are now Unix-style.

git-svn-id: https://code.elgg.org/elgg/trunk@3451 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 views/default/annotation/annotate.php        |  46 +++++-----
 views/default/annotation/generic_comment.php | 120 +++++++++++++--------------
 2 files changed, 83 insertions(+), 83 deletions(-)

(limited to 'views/default/annotation')

diff --git a/views/default/annotation/annotate.php b/views/default/annotation/annotate.php
index cc42e1035..dfff81e83 100644
--- a/views/default/annotation/annotate.php
+++ b/views/default/annotation/annotate.php
@@ -1,24 +1,24 @@
-<?php
-
-	$performed_by = get_entity($vars['item']->subject_guid); // $statement->getSubject();
-	$object = get_entity($vars['item']->object_guid);
-	$url = $object->getURL();
-	$subtype = get_subtype_from_id($object->subtype);
-	$comment = $object->getAnnotations("generic_comment", 1, 0, "desc"); 
-	foreach($comment as $c){
-		$contents = $c->value;
-	}
-	$contents = strip_tags($contents);//this is so we don't get large images etc in the activity river
-	$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() . "\">" . $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
+
+	$performed_by = get_entity($vars['item']->subject_guid); // $statement->getSubject();
+	$object = get_entity($vars['item']->object_guid);
+	$url = $object->getURL();
+	$subtype = get_subtype_from_id($object->subtype);
+	$comment = $object->getAnnotations("generic_comment", 1, 0, "desc"); 
+	foreach($comment as $c){
+		$contents = $c->value;
+	}
+	$contents = strip_tags($contents);//this is so we don't get large images etc in the activity river
+	$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() . "\">" . $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/views/default/annotation/generic_comment.php b/views/default/annotation/generic_comment.php
index 43254d610..1ecf7ad8e 100644
--- a/views/default/annotation/generic_comment.php
+++ b/views/default/annotation/generic_comment.php
@@ -1,61 +1,61 @@
-<?php
-
-	/**
-	 * 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 -->
+<?php
+
+	/**
+	 * 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
-- 
cgit v1.2.3