diff options
Diffstat (limited to 'views')
| -rw-r--r-- | views/default/friends/forms/edit.php | 8 | ||||
| -rw-r--r-- | views/default/friends/picker.php | 20 |
2 files changed, 22 insertions, 6 deletions
diff --git a/views/default/friends/forms/edit.php b/views/default/friends/forms/edit.php index 683e0503c..924c479e0 100644 --- a/views/default/friends/forms/edit.php +++ b/views/default/friends/forms/edit.php @@ -18,10 +18,12 @@ // Set title, form destination if (isset($vars['collection'])) { $action = "friends/editcollection"; - $title = $vars['collection'][0]->name; + $title = $vars['collection'][0]->name;
+ $highlight = 'default'; } else { $action = "friends/addcollection"; - $title = ""; + $title = "";
+ $highlight = 'all'; } @@ -46,7 +48,7 @@ $form_body .= "</p>"; $form_body .= "<p><label>" . elgg_echo("friends:addfriends") . "</label>". - elgg_view('friends/picker',array('entities' => $vars['friends'], 'internalname' => 'friends_collection')) . "</p>"; + elgg_view('friends/picker',array('entities' => $vars['friends'], 'internalname' => 'friends_collection', 'highlight' => $highlight)) . "</p>"; $form_body .= "<p>"; if (isset($vars['collection'])) { diff --git a/views/default/friends/picker.php b/views/default/friends/picker.php index 877a07782..5b7227c99 100644 --- a/views/default/friends/picker.php +++ b/views/default/friends/picker.php @@ -24,7 +24,11 @@ $internalname = "friend"; } else { $internalname = $vars['internalname']; - } + }
+
+ // 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'])) { @@ -165,10 +169,20 @@ //echo "<p>" . $user->name . "</p>"; $label = elgg_view("profile/icon",array('entity' => $friend, 'size' => 'tiny', 'override' => true)); - $options[$label] = $friend->getGUID(); + $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)) + if (
+ !in_array($letter,$activeletters)
+ && $vars['highlight'] == 'default'
+ ) $activeletters[] = $letter; } else { $checked = ""; |