From: cash Date: Wed, 15 Dec 2010 12:34:48 +0000 (+0000) Subject: moved likes forms into forms directory X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=d43e034a36768b945986f827f81618492a58f750;p=lorea%2Felgg.git 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 f9073cf6c..cbb9fbdc9 100644 --- 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 956e84b1c..e31a5ab43 100644 --- 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 .= " " . elgg_view_friendly_time($object->time_created); if (isloggedin()){ $string .= "Comment"; - $string .= elgg_view('likes/forms/link', array('entity' => $object)); + $string .= elgg_view('forms/likes/link', array('entity' => $object)); } $string .= ""; 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 2e8365ec2..4d24011cb 100644 --- a/mod/groups/views/default/river/forum/create.php +++ b/mod/groups/views/default/river/forum/create.php @@ -18,7 +18,7 @@ $url_user = "getURL()}\">{$performed_by->name}"; $string = elgg_echo("groupforum:river:posted", array($url_user)) . " "; $string .= elgg_echo("groupforum:river:annotate:create") . " | " . $object->title . " ". elgg_view_friendly_time($object->time_created) ."Visit discussion"; - $string .= elgg_view('likes/forms/link', array('entity' => $object)); + $string .= elgg_view('forms/likes/link', array('entity' => $object)); $string .= ""; if ($comment) { $string .= "
"; diff --git a/mod/groups/views/default/river/forum/topic/create.php b/mod/groups/views/default/river/forum/topic/create.php index e73064e00..7819eec41 100644 --- 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 .= " ". elgg_view_friendly_time($object->time_created); if (isloggedin() && $object->status != "closed") { $string .= '' . elgg_echo('generic_comments:text') . ''; - $string .= elgg_view('likes/forms/link', array('entity' => $object)); + $string .= elgg_view('forms/likes/link', array('entity' => $object)); } $string .= ""; $string .= "
"; diff --git a/mod/groups/views/default/river/group/create.php b/mod/groups/views/default/river/group/create.php index 4774e7a85..ae55df03b 100644 --- a/mod/groups/views/default/river/group/create.php +++ b/mod/groups/views/default/river/group/create.php @@ -9,7 +9,7 @@ $string .= " getURL() . "\">" . $object->name . ""; $string .= " ". 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 .= ""; diff --git a/mod/pages/views/default/river/object/page/create.php b/mod/pages/views/default/river/object/page/create.php index 221ca0e21..1635de221 100644 --- 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 = "getURL()}\">{$performed_by->name}"; $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") . " getURL() . "\">" . $object->title . " ". elgg_view_friendly_time($object->time_created) ." Comment"; -$string .= elgg_view('likes/forms/link', array('entity' => $object)); +$string .= elgg_view('forms/likes/link', array('entity' => $object)); $string .= "
"; $string .= elgg_get_excerpt($contents, 200); $string .= "
"; diff --git a/mod/riverdashboard/views/default/river/item/wrapper.php b/mod/riverdashboard/views/default/river/item/wrapper.php index 4b50ab69f..4f6100114 100644 --- 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 "" . elgg_echo('comments') . ''; if ($likes_count != 0) { - echo elgg_view('likes/forms/display', array('entity' => $object)); + echo elgg_view('forms/likes/display', array('entity' => $object)); } echo "
"; // 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 b654ccb51..0660b47ff 100644 --- 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 .= " " . elgg_view_friendly_time($object->time_created); if (isloggedin()){ $string .= "Comment"; - $string .= elgg_view('likes/forms/link', array('entity' => $object)); + $string .= elgg_view('forms/likes/link', array('entity' => $object)); } $string .= ""; echo $string; \ No newline at end of file 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 = "getURL()}\">{$performed_by->name}"; $string = elgg_echo("river:posted:generic", array($url)) . " "; $string .= elgg_echo("{$subtype}:river:annotate") . " getURL()}\">" . $title . " " . elgg_view_friendly_time($object->time_created) . "Comment"; -$string .= elgg_view('likes/forms/link', array('entity' => $object)); +$string .= elgg_view('forms/likes/link', array('entity' => $object)); $string .= ""; 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/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