moved friend forms into forms directory

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

diff --git a/pages/friends/add.php b/pages/friends/add.php
index 23881b7c53d2ac13f398cd050a8ef75ee33c97de..a1142d0dab96ffcd1cd133f2bd5ad5736e1beab9 100644 (file)
--- a/pages/friends/add.php
+++ b/pages/friends/add.php
@@ -13,7 +13,7 @@ $title = elgg_echo('friends:collections:add');
 
 $content = elgg_view_title($title);
 
-$content .= elgg_view('friends/forms/edit', array(
+$content .= elgg_view('forms/friends/edit', array(
        'friends' => get_user_friends(get_loggedin_userid(), "", 9999)
        )
 );

diff --git a/pages/friends/edit.php b/pages/friends/edit.php
index 94527a24330f323de65ac3306c64d20e277f4cb1..cd65d96ae89eae0fb0875cd5a26f04248c8cb047 100644 (file)
--- a/pages/friends/edit.php
+++ b/pages/friends/edit.php
@@ -22,7 +22,7 @@ $collection = get_access_collection($collection_id);
 //get all members of the collection
 $collection_members = get_members_of_access_collection($collection_id);
 
-$content .= elgg_view('friends/forms/edit', array('collection' => $collection,
+$content .= elgg_view('forms/friends/edit', array('collection' => $collection,
        'collection_members' => $collection_members));
 
 $body = elgg_view_layout('one_column_with_sidebar', array('content' => $content));

diff --git a/pages/friends/pickercallback.php b/pages/friends/pickercallback.php
index 3385117082cafcba5cb1b3c54ceedd20e64b033a..16cef111072e9f2ffd306ec67f75638ffcb18770 100644 (file)
--- a/pages/friends/pickercallback.php
+++ b/pages/friends/pickercallback.php
@@ -44,7 +44,7 @@ switch($type) {
                        'value' => $members,
                        'callback' => true,
                        'friendspicker' => $friendspicker,
-                       'formcontents' => elgg_view('friends/forms/collectionfields',
+                       'formcontents' => elgg_view('forms/friends/collectionfields',
                                array('collection' => get_access_collection($collection))),
                        'formtarget' => $site_url . 'action/friends/editcollection',
                ));

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

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