moved likes forms into forms directory

git-svn-id: http://code.elgg.org/elgg/trunk@7631 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php
index f9073cf6c88711391fd84a56098104833def1bfb..cbb9fbdc9978f0c9ffb46c1196f763e22297ebb0 100644 (file)
--- a/engine/lib/elgglib.php
+++ b/engine/lib/elgglib.php
@@ -333,7 +333,7 @@ function elgg_get_external_file($type, $location) {
  * @return string|false The HTML for the likes, or false on failure
  *
  * @since 1.8
- * @see @elgg_view likes/forms/edit
+ * @see @elgg_view forms/likes/edit
  */
 function elgg_view_likes($entity) {
        if (!($entity instanceof ElggEntity)) {
@@ -345,7 +345,7 @@ function elgg_view_likes($entity) {
        if ($likes = elgg_trigger_plugin_hook('likes', $entity->getType(), $params, false)) {
                return $likes;
        } else {
-               $likes = elgg_view('likes/forms/edit', $params);
+               $likes = elgg_view('forms/likes/edit', $params);
                return $likes;
        }
 }

diff --git a/mod/bookmarks/views/default/river/object/bookmarks/create.php b/mod/bookmarks/views/default/river/object/bookmarks/create.php
index 956e84b1ce23193d591cd77d8ee3829cc5100637..e31a5ab43a32f93c836c1e5a8a79aa2591d38e7a 100644 (file)
--- a/mod/bookmarks/views/default/river/object/bookmarks/create.php
+++ b/mod/bookmarks/views/default/river/object/bookmarks/create.php
@@ -16,7 +16,7 @@ if (($is_group instanceof ElggGroup) && (elgg_get_context() != 'groups')){
 $string .= " <span class='entity-subtext'>" . elgg_view_friendly_time($object->time_created);
 if (isloggedin()){
        $string .= "<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>";
 echo $string;
\ No newline at end of file

diff --git a/mod/groups/views/default/river/forum/create.php b/mod/groups/views/default/river/forum/create.php
index 2e8365ec28a9a8689996615c019418cb61a09c30..4d24011cb2edd81b5159f49f26da5622f407d2d0 100644 (file)
--- a/mod/groups/views/default/river/forum/create.php
+++ b/mod/groups/views/default/river/forum/create.php
@@ -18,7 +18,7 @@
        $url_user = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
        $string = elgg_echo("groupforum:river:posted", array($url_user)) . " ";
        $string .= elgg_echo("groupforum:river:annotate:create") . " | <a href=\"" . $url . "\">" . $object->title . "</a> <span class='entity-subtext'>". elgg_view_friendly_time($object->time_created) ."<a class='river_comment_form_button link' href=\"{$object_url}\">Visit discussion</a>";
-       $string .= elgg_view('likes/forms/link', array('entity' => $object));
+       $string .= elgg_view('forms/likes/link', array('entity' => $object));
        $string .= "</span>";
        if ($comment) {
                $string .= "<div class=\"river_content_display\">";

diff --git a/mod/groups/views/default/river/forum/topic/create.php b/mod/groups/views/default/river/forum/topic/create.php
index e73064e007447532de009f44fe7b43fd7f7f1bed..7819eec412eb6dd3463df961b7761b4ea19b1bde 100644 (file)
--- a/mod/groups/views/default/river/forum/topic/create.php
+++ b/mod/groups/views/default/river/forum/topic/create.php
@@ -19,7 +19,7 @@
        $string .= " <span class='entity-subtext'>". elgg_view_friendly_time($object->time_created);
        if (isloggedin() && $object->status != "closed") {
                $string .= '<a class="river_comment_form_button link">' . elgg_echo('generic_comments:text') . '</a>';
-               $string .= elgg_view('likes/forms/link', array('entity' => $object));
+               $string .= elgg_view('forms/likes/link', array('entity' => $object));
        }
        $string .= "</span>";
        $string .= "<div class=\"river_content_display\">";

diff --git a/mod/groups/views/default/river/group/create.php b/mod/groups/views/default/river/group/create.php
index 4774e7a85488def2c80ed7baf6008dadb0522317..ae55df03b441f213c959843062eaa4ca0a1008f4 100644 (file)
--- a/mod/groups/views/default/river/group/create.php
+++ b/mod/groups/views/default/river/group/create.php
@@ -9,7 +9,7 @@
        $string .= " <a href=\"" . $object->getURL() . "\">" . $object->name . "</a>";
        $string .= " <span class='entity-subtext'>". elgg_view_friendly_time($object->time_created);
        if (isloggedin()) {
-               $string .= elgg_view('likes/forms/link', array('entity' => $object));
+               $string .= elgg_view('forms/likes/link', array('entity' => $object));
        }
        $string .= "</span>";
 

diff --git a/mod/pages/views/default/river/object/page/create.php b/mod/pages/views/default/river/object/page/create.php
index 221ca0e21311cba641514f10ab31ceba3e43ecf7..1635de2215c2ee294f70f221c14b7b506e59a21d 100644 (file)
--- a/mod/pages/views/default/river/object/page/create.php
+++ b/mod/pages/views/default/river/object/page/create.php
@@ -14,7 +14,7 @@ $url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
 $contents = strip_tags($object->description); //strip tags from the contents to stop large images etc blowing out the river view
 $string = elgg_echo("pages:river:created", array($url)) . " ";
 $string .= elgg_echo("pages:river:create") . " <a href=\"" . $object->getURL() . "\">" . $object->title . "</a> <span class='entity-subtext'>". elgg_view_friendly_time($object->time_created) ."</span> <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 .= "<div class=\"river_content_display\">";
 $string .= elgg_get_excerpt($contents, 200);
 $string .= "</div>";

diff --git a/mod/riverdashboard/views/default/river/item/wrapper.php b/mod/riverdashboard/views/default/river/item/wrapper.php
index 4b50ab69f87f02ad63fa5f7d7a88d2730681fb26..4f61001147edba6d1ce21f279496196c377dce41 100644 (file)
--- a/mod/riverdashboard/views/default/river/item/wrapper.php
+++ b/mod/riverdashboard/views/default/river/item/wrapper.php
@@ -60,7 +60,7 @@ if ($comments){
        echo "<a class='river-more-comments show_comments_button link'>" . elgg_echo('comments') . '</a>';
 
        if ($likes_count != 0) {
-               echo elgg_view('likes/forms/display', array('entity' => $object));
+               echo elgg_view('forms/likes/display', array('entity' => $object));
        }
 
        echo "</div>"; // close river-comments-tabs
@@ -119,7 +119,7 @@ if ($comments){
        }
 
        if ($likes_count != 0) {
-               echo elgg_view('likes/forms/display', array('entity' => $object));
+               echo elgg_view('forms/likes/display', array('entity' => $object));
        }
 
        if ($vars['item']->type != 'user' && $likes_count != 0) {

diff --git a/mod/thewire/views/default/river/object/thewire/create.php b/mod/thewire/views/default/river/object/thewire/create.php
index b654ccb515329141c916d961be5495d9e92bafbd..0660b47ff7b0419943344cb710ebd23ee214487f 100644 (file)
--- a/mod/thewire/views/default/river/object/thewire/create.php
+++ b/mod/thewire/views/default/river/object/thewire/create.php
@@ -11,7 +11,7 @@ $string .= parse_urls($desc);
 $string .= " <span class='entity-subtext'>" . elgg_view_friendly_time($object->time_created);
        if (isloggedin()){
                $string .= "<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>";
 echo $string;
\ No newline at end of file

diff --git a/views/default/annotation/annotate.php b/views/default/annotation/annotate.php
index de25135877d5ffdc7d2999f5b1997e5f9f5bda27..d9deb6301c8a5a2b0abc10515b2fcfe8dc6121d8 100644 (file)
--- 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 7d6feaaddb09fa068bca3e484895bfcbe59e0b30..4ab08745831997d976b9ec88a0f78997def517fa 100644 (file)
--- 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/likes/forms/display.php b/views/default/forms/likes/display.php
similarity index 100%
rename from views/default/likes/forms/display.php
rename to views/default/forms/likes/display.php

diff --git a/views/default/likes/forms/edit.php b/views/default/forms/likes/edit.php
similarity index 100%
rename from views/default/likes/forms/edit.php
rename to views/default/forms/likes/edit.php

diff --git a/views/default/likes/forms/link.php b/views/default/forms/likes/link.php
similarity index 100%
rename from views/default/likes/forms/link.php
rename to views/default/forms/likes/link.php