From a2250e1854f23351b2a39e304e2bd5977f3fd867 Mon Sep 17 00:00:00 2001
From: cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Sat, 26 Feb 2011 20:57:09 +0000
Subject: Fixes #2982 friends collections work even if the code is convoluted
 and poorly written.

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

(limited to 'views/default/forms/friends')

diff --git a/views/default/forms/friends/collections/add.php b/views/default/forms/friends/collections/add.php
new file mode 100644
index 000000000..644c7adb9
--- /dev/null
+++ b/views/default/forms/friends/collections/add.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Form body for editing or adding a friend collection
+ *
+ * @package Elgg
+ * @subpackage Core
+ *
+ * @uses $vars['collection'] Optionally, the collection to edit
+ */
+
+// Set title, form destination
+if (isset($vars['collection'])) {
+	$title = $vars['collection']->name;
+	$highlight = 'default';
+} else  {
+	$title = "";
+	$highlight = 'all';
+}
+
+echo "<div class=\"mtm\"><label>" . elgg_echo("friends:collectionname") . "<br/>";
+echo elgg_view("input/text", array(
+		"name" => "collection_name",
+		"value" => $title,
+	));
+echo "</label></div>";
+
+echo "<div>";
+if ($vars['collection_members']) {
+	echo elgg_echo("friends:collectionfriends") . "<br />";
+	foreach ($vars['collection_members'] as $mem) {
+		echo elgg_view_entity_icon($mem, 'tiny');
+		echo $mem->name;
+	}
+}
+echo "</div>";
+
+echo "<div><label>" . elgg_echo("friends:addfriends") . "</label>";
+echo elgg_view('input/friendspicker', array(
+	'entities' => $vars['friends'],
+	'name' => 'friends_collection',
+	'highlight' => $highlight,
+));
+echo "</div>";
+
+echo "<div>";
+if (isset($vars['collection'])) {
+	echo elgg_view('input/hidden', array(
+		'name' => 'collection_id',
+		'value' => $vars['collection']->id,
+	));
+}
+echo elgg_view('input/submit', array('name' => 'submit', 'value' => elgg_echo('save')));
+echo "</div>";
diff --git a/views/default/forms/friends/collections/edit.php b/views/default/forms/friends/collections/edit.php
deleted file mode 100644
index 975307085..000000000
--- a/views/default/forms/friends/collections/edit.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/**
- * Form body for editing or adding a friend collection
- *
- * @package Elgg
- * @subpackage Core
- *
- * @uses $vars['collection'] Optionally, the collection to edit
- */
-
-// Set title, form destination
-if (isset($vars['collection'])) {
-	$title = $vars['collection']->name;
-	$highlight = 'default';
-} else  {
-	$title = "";
-	$highlight = 'all';
-}
-
-echo "<div><label>" . elgg_echo("friends:collectionname") . "<br/>";
-echo elgg_view("input/text", array(
-		"name" => "collection_name",
-		"value" => $title,
-	));
-echo "</label></div>";
-
-echo "<div>";
-if ($vars['collection_members']) {
-	echo elgg_echo("friends:collectionfriends") . "<br />";
-	foreach ($vars['collection_members'] as $mem) {
-		echo elgg_view_entity_icon($mem, 'tiny');
-		echo $mem->name;
-	}
-}
-echo "</div>";
-
-echo "<div><label>" . elgg_echo("friends:addfriends") . "</label>";
-echo elgg_view('input/friendspicker', array(
-	'entities' => $vars['friends'],
-	'name' => 'friends_collection',
-	'highlight' => $highlight,
-));
-echo "</div>";
-
-echo "<div>";
-if (isset($vars['collection'])) {
-	echo elgg_view('input/hidden', array(
-		'name' => 'collection_id',
-		'value' => $vars['collection']->id,
-	));
-}
-echo elgg_view('input/submit', array('name' => 'submit', 'value' => elgg_echo('save')));
-echo "</div>";
-- 
cgit v1.2.3