From 2165e929ddf954f02a589234b2e0faef7ef18df7 Mon Sep 17 00:00:00 2001
From: cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Wed, 15 Dec 2010 12:39:32 +0000
Subject: moved friend forms into forms directory

git-svn-id: http://code.elgg.org/elgg/trunk@7632 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 pages/friends/add.php                            |  2 +-
 pages/friends/edit.php                           |  2 +-
 pages/friends/pickercallback.php                 |  2 +-
 views/default/forms/friends/collectionfields.php | 15 +++++++
 views/default/forms/friends/edit.php             | 53 ++++++++++++++++++++++++
 views/default/friends/forms/collectionfields.php | 15 -------
 views/default/friends/forms/edit.php             | 53 ------------------------
 7 files changed, 71 insertions(+), 71 deletions(-)
 create mode 100644 views/default/forms/friends/collectionfields.php
 create mode 100644 views/default/forms/friends/edit.php
 delete mode 100644 views/default/friends/forms/collectionfields.php
 delete mode 100644 views/default/friends/forms/edit.php

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/forms/friends/collectionfields.php b/views/default/forms/friends/collectionfields.php
new file mode 100644
index 000000000..35db3a962
--- /dev/null
+++ b/views/default/forms/friends/collectionfields.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * Elgg friend collections required hidden fields for js friends picker form
+ *
+ * @package Elgg
+ * @subpackage Core
+ */
+
+if (isset($vars['collection'])) {
+?>
+
+	<input type="hidden" name="collection_id" value="<?php echo $vars['collection']->id; ?>" />
+
+<?php
+}
\ No newline at end of file
diff --git a/views/default/forms/friends/edit.php b/views/default/forms/friends/edit.php
new file mode 100644
index 000000000..632268fb8
--- /dev/null
+++ b/views/default/forms/friends/edit.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Elgg friend collections add/edit
+ *
+ * @package Elgg
+ * @subpackage Core
+ *
+ * @uses $vars['object'] Optionally, the collection edit
+ */
+
+// var_export($vars['collection'][0]->id);
+
+// Set title, form destination
+if (isset($vars['collection'])) {
+	$action = "friends/editcollection";
+	$title = $vars['collection'][0]->name;
+	$highlight = 'default';
+} else  {
+	$action = "friends/addcollection";
+	$title = "";
+	$highlight = 'all';
+}
+
+
+$form_body = "<div class='contentWrapper'><p><label>" . elgg_echo("friends:collectionname") . "<br />" .
+	elgg_view("input/text", array(
+		"internalname" => "collection_name",
+		"value" => $title,
+	)) . "</label></p>";
+
+$form_body .= "<p>";
+
+if($vars['collection_members']){
+	$form_body .= elgg_echo("friends:collectionfriends") . "<br />";
+	foreach($vars['collection_members'] as $mem){
+		$form_body .= elgg_view("profile/icon",array('entity' => $mem, 'size' => 'tiny'));
+		$form_body .= $mem->name;
+	}
+}
+
+$form_body .= "</p>";
+
+$form_body .= "<p><label>" . elgg_echo("friends:addfriends") . "</label>".
+			elgg_view('friends/picker',array('entities' => $vars['friends'], 'internalname' => 'friends_collection', 'highlight' => $highlight)) . "</p>";
+
+$form_body .= "<p>";
+if (isset($vars['collection'])) {
+	$form_body .= elgg_view('input/hidden', array('internalname' => 'collection_id', 'value' => "{$vars['collection'][0]->id}"));
+}
+$form_body .= elgg_view('input/submit', array('internalname' => 'submit', 'value' => elgg_echo('save')));
+$form_body .= "</p></div>";
+
+echo elgg_view('input/form', array('body' => $form_body, 'action' => "action/$action"));
\ No newline at end of file
diff --git a/views/default/friends/forms/collectionfields.php b/views/default/friends/forms/collectionfields.php
deleted file mode 100644
index 35db3a962..000000000
--- a/views/default/friends/forms/collectionfields.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-/**
- * Elgg friend collections required hidden fields for js friends picker form
- *
- * @package Elgg
- * @subpackage Core
- */
-
-if (isset($vars['collection'])) {
-?>
-
-	<input type="hidden" name="collection_id" value="<?php echo $vars['collection']->id; ?>" />
-
-<?php
-}
\ No newline at end of file
diff --git a/views/default/friends/forms/edit.php b/views/default/friends/forms/edit.php
deleted file mode 100644
index 632268fb8..000000000
--- a/views/default/friends/forms/edit.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/**
- * Elgg friend collections add/edit
- *
- * @package Elgg
- * @subpackage Core
- *
- * @uses $vars['object'] Optionally, the collection edit
- */
-
-// var_export($vars['collection'][0]->id);
-
-// Set title, form destination
-if (isset($vars['collection'])) {
-	$action = "friends/editcollection";
-	$title = $vars['collection'][0]->name;
-	$highlight = 'default';
-} else  {
-	$action = "friends/addcollection";
-	$title = "";
-	$highlight = 'all';
-}
-
-
-$form_body = "<div class='contentWrapper'><p><label>" . elgg_echo("friends:collectionname") . "<br />" .
-	elgg_view("input/text", array(
-		"internalname" => "collection_name",
-		"value" => $title,
-	)) . "</label></p>";
-
-$form_body .= "<p>";
-
-if($vars['collection_members']){
-	$form_body .= elgg_echo("friends:collectionfriends") . "<br />";
-	foreach($vars['collection_members'] as $mem){
-		$form_body .= elgg_view("profile/icon",array('entity' => $mem, 'size' => 'tiny'));
-		$form_body .= $mem->name;
-	}
-}
-
-$form_body .= "</p>";
-
-$form_body .= "<p><label>" . elgg_echo("friends:addfriends") . "</label>".
-			elgg_view('friends/picker',array('entities' => $vars['friends'], 'internalname' => 'friends_collection', 'highlight' => $highlight)) . "</p>";
-
-$form_body .= "<p>";
-if (isset($vars['collection'])) {
-	$form_body .= elgg_view('input/hidden', array('internalname' => 'collection_id', 'value' => "{$vars['collection'][0]->id}"));
-}
-$form_body .= elgg_view('input/submit', array('internalname' => 'submit', 'value' => elgg_echo('save')));
-$form_body .= "</p></div>";
-
-echo elgg_view('input/form', array('body' => $form_body, 'action' => "action/$action"));
\ No newline at end of file
-- 
cgit v1.2.3