From d43e034a36768b945986f827f81618492a58f750 Mon Sep 17 00:00:00 2001
From: cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Wed, 15 Dec 2010 12:34:48 +0000
Subject: moved likes forms into forms directory

git-svn-id: http://code.elgg.org/elgg/trunk@7631 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 views/default/annotation/annotate.php |  2 +-
 views/default/core/river/controls.php |  2 +-
 views/default/forms/likes/display.php | 23 ++++++++++++++++++
 views/default/forms/likes/edit.php    | 45 +++++++++++++++++++++++++++++++++++
 views/default/forms/likes/link.php    | 17 +++++++++++++
 views/default/likes/forms/display.php | 23 ------------------
 views/default/likes/forms/edit.php    | 45 -----------------------------------
 views/default/likes/forms/link.php    | 17 -------------
 8 files changed, 87 insertions(+), 87 deletions(-)
 create mode 100644 views/default/forms/likes/display.php
 create mode 100644 views/default/forms/likes/edit.php
 create mode 100644 views/default/forms/likes/link.php
 delete mode 100644 views/default/likes/forms/display.php
 delete mode 100644 views/default/likes/forms/edit.php
 delete mode 100644 views/default/likes/forms/link.php

(limited to 'views/default')

diff --git a/views/default/annotation/annotate.php b/views/default/annotation/annotate.php
index de2513587..d9deb6301 100644
--- a/views/default/annotation/annotate.php
+++ b/views/default/annotation/annotate.php
@@ -18,7 +18,7 @@ if ($vars['item']->annotation_id != 0) {
 $url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
 $string = elgg_echo("river:posted:generic", array($url)) . " ";
 $string .= elgg_echo("{$subtype}:river:annotate") . "  <a href=\"{$object->getURL()}\">" . $title . "</a> <span class='entity-subtext'>" . elgg_view_friendly_time($object->time_created) . "<a class='river_comment_form_button link'>Comment</a>";
-$string .= elgg_view('likes/forms/link', array('entity' => $object));
+$string .= elgg_view('forms/likes/link', array('entity' => $object));
 $string .= "</span>";
 if (elgg_get_context() != 'riverdashboard') {
 	$comment = elgg_get_excerpt($comment, 200);
diff --git a/views/default/core/river/controls.php b/views/default/core/river/controls.php
index 7d6feaadd..4ab087458 100644
--- a/views/default/core/river/controls.php
+++ b/views/default/core/river/controls.php
@@ -17,6 +17,6 @@ if (isloggedin()) {
 			'internalid' => "elgg-toggler-{$object->getGUID()}",
 		);
 		echo elgg_view('output/url', $params);
-		//echo elgg_view('likes/forms/link', array('entity' => $object));
+		//echo elgg_view('forms/likes/link', array('entity' => $object));
 	}
 }
\ No newline at end of file
diff --git a/views/default/forms/likes/display.php b/views/default/forms/likes/display.php
new file mode 100644
index 000000000..36e2cddc2
--- /dev/null
+++ b/views/default/forms/likes/display.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Elgg likes - display users liked link/text
+ *
+ * @package Elgg
+ *
+ * @uses $vars['entity']
+ */
+
+if (isset($vars['entity']) && isloggedin()) {
+
+	//display the number of likes
+	$numoflikes = elgg_count_likes($vars['entity']);
+	if ($numoflikes != 0) {
+		if ($numoflikes == 1) {
+			$user_string = elgg_echo('likes:userlikedthis');
+		} else {
+			$user_string = elgg_echo('likes:userslikedthis');
+		}
+
+		echo "<a class='river_more_comments off likes_user_list_button link'>" . elgg_count_likes($vars['entity']) . " " . $user_string . "</a>";
+	}
+}
\ No newline at end of file
diff --git a/views/default/forms/likes/edit.php b/views/default/forms/likes/edit.php
new file mode 100644
index 000000000..33527b53a
--- /dev/null
+++ b/views/default/forms/likes/edit.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Elgg likes add form
+ *
+ * @package Elgg
+ *
+ * @uses $vars['entity']
+ */
+
+if (isset($vars['entity']) && isloggedin()) {
+	$guid = $vars['entity']->getGuid();
+	$url = elgg_add_action_tokens_to_url(elgg_get_site_url() . "action/likes/add?guid={$guid}");
+	
+	echo "<span class='likes-list-holder'>";
+	//check to see if the user has already liked
+	if (!elgg_annotation_exists($guid, 'likes') ) {
+		echo "<a class='user-like link' title='".elgg_echo('likes:likethis')."' href=\"{$url}\">" . elgg_echo('likes:likethis') . "</a>";
+		$likes_classname = "not-liked";
+		$likes_titletag = "";
+	} else {
+		$likes_titletag = "title='".elgg_echo('likes:remove')."'";
+	}
+	//display the number of likes
+	$numoflikes = elgg_count_likes($vars['entity']);
+	if ($numoflikes != 0) {
+		if ($numoflikes == 1) {
+			$user_string = elgg_echo('likes:userlikedthis');
+		} else {
+			$user_string = elgg_echo('likes:userslikedthis');
+		}
+
+		echo "<a class='likes-list-button link {$likes_classname}' {$likes_titletag}>" . elgg_count_likes($vars['entity']) . " " . $user_string . "</a>";
+
+		//show the users who liked the object
+		echo "<div class='likes-list hidden clearfix'>";
+		echo list_annotations($vars['entity']->getGUID(), 'likes', 99);
+		echo "</div>";	
+	}
+	echo "</span>";	
+}
+
+
+
+
+
diff --git a/views/default/forms/likes/link.php b/views/default/forms/likes/link.php
new file mode 100644
index 000000000..decb4aa7f
--- /dev/null
+++ b/views/default/forms/likes/link.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * Elgg likes link form - used on riverdashboard where we want the likes link separate from the list of users that liked the object
+ *
+ * @package Elgg
+ *
+ * @uses $vars['entity']
+ */
+
+if (isset($vars['entity']) && isloggedin()) {
+	$guid = $vars['entity']->getGuid();
+	$url = elgg_add_action_tokens_to_url(elgg_get_site_url() . "action/likes/add?guid={$guid}");
+	//check to see if the user has already liked
+	if (!elgg_annotation_exists($guid, 'likes') ) {
+		echo "<span class='river_link_divider'> | </span><a class='river_user-like_button link' href=\"{$url}\">" . elgg_echo('likes:likethis') . "</a>";
+	}
+}
\ No newline at end of file
diff --git a/views/default/likes/forms/display.php b/views/default/likes/forms/display.php
deleted file mode 100644
index 36e2cddc2..000000000
--- a/views/default/likes/forms/display.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * Elgg likes - display users liked link/text
- *
- * @package Elgg
- *
- * @uses $vars['entity']
- */
-
-if (isset($vars['entity']) && isloggedin()) {
-
-	//display the number of likes
-	$numoflikes = elgg_count_likes($vars['entity']);
-	if ($numoflikes != 0) {
-		if ($numoflikes == 1) {
-			$user_string = elgg_echo('likes:userlikedthis');
-		} else {
-			$user_string = elgg_echo('likes:userslikedthis');
-		}
-
-		echo "<a class='river_more_comments off likes_user_list_button link'>" . elgg_count_likes($vars['entity']) . " " . $user_string . "</a>";
-	}
-}
\ No newline at end of file
diff --git a/views/default/likes/forms/edit.php b/views/default/likes/forms/edit.php
deleted file mode 100644
index 33527b53a..000000000
--- a/views/default/likes/forms/edit.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * Elgg likes add form
- *
- * @package Elgg
- *
- * @uses $vars['entity']
- */
-
-if (isset($vars['entity']) && isloggedin()) {
-	$guid = $vars['entity']->getGuid();
-	$url = elgg_add_action_tokens_to_url(elgg_get_site_url() . "action/likes/add?guid={$guid}");
-	
-	echo "<span class='likes-list-holder'>";
-	//check to see if the user has already liked
-	if (!elgg_annotation_exists($guid, 'likes') ) {
-		echo "<a class='user-like link' title='".elgg_echo('likes:likethis')."' href=\"{$url}\">" . elgg_echo('likes:likethis') . "</a>";
-		$likes_classname = "not-liked";
-		$likes_titletag = "";
-	} else {
-		$likes_titletag = "title='".elgg_echo('likes:remove')."'";
-	}
-	//display the number of likes
-	$numoflikes = elgg_count_likes($vars['entity']);
-	if ($numoflikes != 0) {
-		if ($numoflikes == 1) {
-			$user_string = elgg_echo('likes:userlikedthis');
-		} else {
-			$user_string = elgg_echo('likes:userslikedthis');
-		}
-
-		echo "<a class='likes-list-button link {$likes_classname}' {$likes_titletag}>" . elgg_count_likes($vars['entity']) . " " . $user_string . "</a>";
-
-		//show the users who liked the object
-		echo "<div class='likes-list hidden clearfix'>";
-		echo list_annotations($vars['entity']->getGUID(), 'likes', 99);
-		echo "</div>";	
-	}
-	echo "</span>";	
-}
-
-
-
-
-
diff --git a/views/default/likes/forms/link.php b/views/default/likes/forms/link.php
deleted file mode 100644
index decb4aa7f..000000000
--- a/views/default/likes/forms/link.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/**
- * Elgg likes link form - used on riverdashboard where we want the likes link separate from the list of users that liked the object
- *
- * @package Elgg
- *
- * @uses $vars['entity']
- */
-
-if (isset($vars['entity']) && isloggedin()) {
-	$guid = $vars['entity']->getGuid();
-	$url = elgg_add_action_tokens_to_url(elgg_get_site_url() . "action/likes/add?guid={$guid}");
-	//check to see if the user has already liked
-	if (!elgg_annotation_exists($guid, 'likes') ) {
-		echo "<span class='river_link_divider'> | </span><a class='river_user-like_button link' href=\"{$url}\">" . elgg_echo('likes:likethis') . "</a>";
-	}
-}
\ No newline at end of file
-- 
cgit v1.2.3