From: cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Wed, 15 Dec 2010 12:39:32 +0000 (+0000)
Subject: moved friend forms into forms directory
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=2165e929ddf954f02a589234b2e0faef7ef18df7;p=lorea%2Felgg.git

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 23881b7c5..a1142d0da 100644
--- 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 94527a243..cd65d96ae 100644
--- 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 338511708..16cef1110 100644
--- 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