2 files changed, 37 insertions, 54 deletions

diff --git a/views/default/widgets/friends/content.php b/views/default/widgets/friends/content.php
index e0385027d..98814c244 100644
--- a/views/default/widgets/friends/content.php
+++ b/views/default/widgets/friends/content.php
@@ -1,14 +1,9 @@
 <?php
-
 /**
- * Elgg Friends
  * Friend widget display view
  *
- * @package ElggFriends
- * @subpackage Core
  */
 
-
 // owner of the widget
 $owner = $vars['entity']->getOwnerEntity();
 
@@ -18,20 +13,13 @@ $num = (int) $vars['entity']->num_display;
 // get the correct size
 $size = $vars['entity']->icon_size;
 
-// Get the user's friends
-if ($owner) {
-	$friends = $owner->getFriends("", $num);
-}
-// If there are any friends to view, view them
-if (is_array($friends) && sizeof($friends) > 0) {
-
-	echo "<div id=\"widget_friends_list\">";
-
-	foreach($friends as $friend) {
-		echo "<div class=\"widget_friends_singlefriend\" >";
-		echo elgg_view("profile/icon",array('entity' => get_user($friend->guid), 'size' => $size));
-		echo "</div>";
+if (elgg_instanceof($owner, 'user')) {
+	$html = $owner->listFriends('', $num, array(
+		'size' => $size,
+		'list_type' => 'gallery',
+		'pagination' => false
+	));
+	if ($html) {
+		echo $html;
 	}
-
-	echo "</div>";
 }
diff --git a/views/default/widgets/friends/edit.php b/views/default/widgets/friends/edit.php
index 9a6499ede..c7e6b06ff 100644
--- a/views/default/widgets/friends/edit.php
+++ b/views/default/widgets/friends/edit.php
@@ -1,57 +1,52 @@
 <?php
-
 /**
- * Elgg Friends
  * Friend widget options
  *
- * @package ElggFriends
- * @subpackage Core
  */
 
-$selections = array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 12, 15, 20, 30, 50, 100);
-$icon_sizes = array('small', 'tiny');
-
-// set defaults
+// set default value for display number
 if (!isset($vars['entity']->num_display)) {
 	$vars['entity']->num_display = 12;
-	$vars['entity']->icon_size = 'small';
 }
 
+$params = array(
+	'name' => 'params[num_display]',
+	'value' => $vars['entity']->num_display,
+	'options' => array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 12, 15, 20, 30, 50, 100),
+);
+$display_dropdown = elgg_view('input/dropdown', $params);
+
+
 // handle upgrade to 1.7.2 from previous versions
 if ($vars['entity']->icon_size == 1) {
 	$vars['entity']->icon_size = 'small';
 } elseif ($vars['entity']->icon_size == 2) {
 	$vars['entity']->icon_size = 'tiny';
 }
-?>
 
-<p>
-	<?php echo elgg_echo("friends:num_display"); ?>:
-	<select name="params[num_display]">
-<?php
-foreach ($selections as $selection) {
-	$selected = '';
-	if ($vars['entity']->num_display == $selection) {
-		$selected = 'selected="selected"';
-	}
-	echo "<option value=\"$selection\" $selected>$selection</option>";
+// set default value for icon size
+if (!isset($vars['entity']->icon_size)) {
+	$vars['entity']->icon_size = 'small';
 }
+
+$params = array(
+	'name' => 'params[icon_size]',
+	'value' => $vars['entity']->icon_size,
+	'options_values' => array(
+		'small' => elgg_echo('friends:small'),
+		'tiny' => elgg_echo('friends:tiny'),
+	),
+);
+$size_dropdown = elgg_view('input/dropdown', $params);
+
+
 ?>
-	</select>
+<p>
+	<?php echo elgg_echo('friends:num_display'); ?>:
+	<?php echo $display_dropdown; ?>
 </p>
 
 <p>
-	<?php echo elgg_echo("friends:icon_size"); ?>
-	<select name="params[icon_size]">
-<?php
-foreach ($icon_sizes as $size) {
-	$selected = '';
-	if ($vars['entity']->icon_size == $size) {
-		$selected = 'selected="selected"';
-	}
-	$label = elgg_echo("friends:$size");
-	echo "<option value=\"$size\" $selected>$label</option>";
-}
-?>
-	</select>
+	<?php echo elgg_echo('friends:icon_size'); ?>:
+	<?php echo $size_dropdown; ?>
 </p>