fixed friends picker js include

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

2 files changed, 1 insertions, 330 deletions

diff --git a/views/default/core/friends/collection.php b/views/default/core/friends/collection.php
index 8d4e52e8a..89c44a2b3 100644
--- a/views/default/core/friends/collection.php
+++ b/views/default/core/friends/collection.php
@@ -37,7 +37,7 @@ echo " (<span id=\"friends_membership_count{$vars['friendspicker']}\">{$count}</
 if ($friends = $vars['collection']->entities) {
 	$content = elgg_view('core/friends/collectiontabs', array('owner' => elgg_get_logged_in_user_entity(), 'collection' => $vars['collection'], 'friendspicker' => $vars['friendspicker']));
 
-	echo elgg_view('core/friends/picker', array('entities' => $friends, 'value' => $members, 'content' => $content, 'replacement' => '', 'friendspicker' => $vars['friendspicker']));
+	echo elgg_view('input/friendspicker', array('entities' => $friends, 'value' => $members, 'content' => $content, 'replacement' => '', 'friendspicker' => $vars['friendspicker']));
 	?>
 <?php //@todo JS 1.8: no ?>
 	<script type="text/javascript">
diff --git a/views/default/core/friends/picker.php b/views/default/core/friends/picker.php
deleted file mode 100644
index 3397a219b..000000000
--- a/views/default/core/friends/picker.php
+++ /dev/null
@@ -1,329 +0,0 @@
-<?php
-/**
- * Elgg friends picker
- * Lists the friends picker
- *
- * @package Elgg
- * @subpackage Core
- *
- * @uses $vars['entities'] The array of ElggUser objects
- */
-
-$base = elgg_get_site_url();
-$viewtype = elgg_get_viewtype();
-elgg_register_js("{$base}vendors/jquery/jquery.easing.1.3.packed.js", 'jquery.easing');
-$url = elgg_get_simplecache_url('js', 'friendsPickerv1');
-elgg_register_js($url, 'friendsPicker');
-
-$chararray = elgg_echo('friendspicker:chararray');
-
-// Initialise name
-if (!isset($vars['name'])) {
-	$name = "friend";
-} else {
-	$name = $vars['name'];
-}
-
-// Are we highlighting default or all?
-if (empty($vars['highlight'])) {
-	$vars['highlight'] = 'default';
-}
-if ($vars['highlight'] != 'all') {
-	$vars['highlight'] = 'default';
-}
-
-// Initialise values
-if (!isset($vars['value'])) {
-	$vars['value'] = array();
-} else {
-	if (!is_array($vars['value'])) {
-		$vars['value'] = (int) $vars['value'];
-		$vars['value'] = array($vars['value']);
-	}
-}
-
-// Initialise whether we're calling back or not
-if (isset($vars['callback'])) {
-	$callback = $vars['callback'];
-} else {
-	$callback = false;
-}
-
-// We need to count the number of friends pickers on the page.
-if (!isset($vars['friendspicker'])) {
-	global $friendspicker;
-	if (!isset($friendspicker)) {
-		$friendspicker = 0;
-	}
-	$friendspicker++;
-} else {
-	$friendspicker = $vars['friendspicker'];
-}
-
-$users = array();
-$activeletters = array();
-
-// Are we displaying form tags and submit buttons?
-// (If we've been given a target, then yes! Otherwise, no.)
-if (isset($vars['formtarget'])) {
-	$formtarget = $vars['formtarget'];
-} else {
-	$formtarget = false;
-}
-
-// Sort users by letter
-if (is_array($vars['entities']) && sizeof($vars['entities'])) {
-	foreach($vars['entities'] as $user) {
-		if (is_callable('mb_substr')) {
-			$letter = strtoupper(mb_substr($user->name,0,1));
-		} else {
-			$letter = strtoupper(substr($user->name,0,1));
-		}
-
-		if (!substr_count($chararray,$letter)) {
-			$letter = "*";
-		}
-		if (!isset($users[$letter])) {
-			$users[$letter] = array();
-		}
-		$users[$letter][$user->guid] = $user;
-	}
-}
-
-// sort users in letters alphabetically
-foreach ($users as $letter => $letter_users) {
-	usort($letter_users, create_function('$a, $b', '
-		return strcasecmp($a->name, $b->name);
-	'));
-	$users[$letter] = $letter_users;
-}
-
-if (!$callback) {
-	?>
-
-	<div class="friends-picker">
-
-	<?php
-
-	if (isset($vars['content'])) {
-		echo $vars['content'];
-	}
-	?>
-
-	<div id="friends-picker_placeholder<?php echo $friendspicker; ?>">
-
-	<?php
-}
-
-if (!isset($vars['replacement'])) {
-	if ($formtarget) {
-?>
-<?php //@todo JS 1.8: no ?>
-<script language="text/javascript">
-		$(function() { // onload...do
-		$('#collectionMembersForm<?php echo $friendspicker; ?>').submit(function() {
-			var inputs = [];
-			$(':input', this).each(function() {
-				if (this.type != 'checkbox' || (this.type == 'checkbox' && this.checked != false)) {
-					inputs.push(this.name + '=' + escape(this.value));
-				}
-			});
-			jQuery.ajax({
-				type: "POST",
-				data: inputs.join('&'),
-				url: this.action,
-				success: function(){
-					$('a.collectionmembers<?php echo $friendspicker; ?>').click();
-				}
-
-			});
-			return false;
-		})
-	})
-
-	</script>
-
-<!-- Collection members form -->
-<form id="collectionMembersForm<?php echo $friendspicker; ?>" action="<?php echo $formtarget; ?>" method="post"> <!-- action="" method=""> -->
-
-<?php
-	}
-?>
-
-<div class="friends-picker-wrapper">
-<div id="friends-picker<?php echo $friendspicker; ?>">
-	<div class="friends-picker-container">
-<?php
-
-// Initialise letters
-	$chararray .= "*";
-	if (is_callable('mb_substr')) {
-		$letter = mb_substr($chararray,0,1);
-	} else {
-		$letter = substr($chararray,0,1);
-	}
-	$letpos = 0;
-	while (1 == 1) {
-		?>
-		<div class="panel" title="<?php	echo $letter; ?>">
-			<div class="wrapper">
-				<h3><?php echo $letter; ?></h3>
-		<?php
-
-		if (isset($users[$letter])) {
-			ksort($users[$letter]);
-
-			echo "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\">";
-			$col = 0;
-
-			foreach($users[$letter] as $friend) {
-				if ($col == 0) {
-					echo "<tr>";
-				}
-
-				//echo "<p>" . $user->name . "</p>";
-				$label = elgg_view_entity_icon($friend, 'tiny', array('override' => true));
-				$options[$label] = $friend->getGUID();
-
-				if ($vars['highlight'] == 'all'
-					&& !in_array($letter,$activeletters)) {
-
-					$activeletters[] = $letter;
-				}
-
-
-				if (in_array($friend->getGUID(),$vars['value'])) {
-					$checked = "checked = \"checked\"";
-					if (!in_array($letter,$activeletters) && $vars['highlight'] == 'default') {
-						$activeletters[] = $letter;
-					}
-				} else {
-					$checked = "";
-				}
-				?>
-
-				<td>
-
-					<input type="checkbox" <?php echo $checked; ?> name="<?php echo $name; ?>[]" value="<?php echo $options[$label]; ?>" />
-
-				</td>
-
-				<td>
-
-					<div style="width: 25px; margin-bottom: 15px;">
-				<?php
-					echo $label;
-				?>
-					</div>
-				</td>
-				<td style="width: 200px; padding: 5px;">
-					<?php echo $friend->name; ?>
-				</td>
-				<?php
-				$col++;
-				if ($col == 3){
-					echo "</tr>";
-					$col = 0;
-				}
-			}
-			if ($col < 3) {
-				echo "</tr>";
-			}
-
-			echo "</table>";
-		}
-
-?>
-
-			</div>
-		</div>
-<?php
-			//if ($letter == 'Z') break;
-
-			if (is_callable('mb_substr')) {
-				$substr = mb_substr($chararray,strlen($chararray) - 1,1);
-			} else {
-				$substr = substr($chararray,strlen($chararray) - 1,1);
-			}
-			if ($letter == $substr) {
-				break;
-			}
-			//$letter++;
-			$letpos++;
-			if (is_callable('mb_substr')) {
-				$letter = mb_substr($chararray,$letpos,1);
-			} else {
-				$letter = substr($chararray,$letpos,1);
-			}
-		}
-
-?>
-	</div>
-
-<?php
-
-if ($formtarget) {
-
-	if (isset($vars['formcontents']))
-		echo $vars['formcontents'];
-
-?>
-	<div class="clearfix"></div>
-	<div class="friendspicker-savebuttons">
-		<input type="submit" class="elgg-button elgg-button-submit" value="<?php echo elgg_echo('save'); ?>" />
-		<input type="button" class="elgg-button elgg-button-cancel" value="<?php echo elgg_echo('cancel'); ?>" onclick="$('a.collectionmembers<?php echo $friendspicker; ?>').click();" />
-	<br /></div>
-	</form>
-
-<?php
-
-}
-
-?>
-
-</div>
-</div>
-
-<?php
-} else {
-	echo $vars['replacement'];
-}
-if (!$callback) {
-
-?>
-
-</div>
-</div>
-
-
-<?php
-
-}
-
-if (!isset($vars['replacement'])) {
-?>
-<?php //@todo JS 1.8: no ?>
-<script type="text/javascript">
-	// initialise picker
-	$("div#friends-picker<?php echo $friendspicker; ?>").friendsPicker(<?php echo $friendspicker; ?>);
-</script>
-<script>
-$(document).ready(function () {
-// manually add class to corresponding tab for panels that have content
-<?php
-if (sizeof($activeletters) > 0)
-	//$chararray = elgg_echo('friendspicker:chararray');
-	foreach($activeletters as $letter) {
-		$tab = strpos($chararray, $letter) + 1;
-?>
-$("div#friends-picker-navigation<?php echo $friendspicker; ?> li.tab<?php echo $tab; ?> a").addClass("tabHasContent");
-<?php
-	}
-
-?>
-});
-</script>
-
-<?php
-
-}
\ No newline at end of file