aboutsummaryrefslogtreecommitdiff
path: root/views
diff options
context:
space:
mode:
authorben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-07-30 12:05:03 +0000
committerben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-07-30 12:05:03 +0000
commit855be2a2b44463da3c9405c25fa1f84848a164fb (patch)
tree1b78c47650566066f04ab7bf227ff23892db8c55 /views
parent85bcd1cf55a895d66b1872d7943dd7daf7aaa1f7 (diff)
downloadelgg-855be2a2b44463da3c9405c25fa1f84848a164fb.tar.gz
elgg-855be2a2b44463da3c9405c25fa1f84848a164fb.tar.bz2
Added friends collections members list
git-svn-id: https://code.elgg.org/elgg/trunk@1595 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'views')
-rw-r--r--views/default/friends/collection.php3
-rw-r--r--views/default/friends/picker.php6
-rw-r--r--views/default/friends/tablelist.php5
3 files changed, 10 insertions, 4 deletions
diff --git a/views/default/friends/collection.php b/views/default/friends/collection.php
index a9f2a392f..d069bd996 100644
--- a/views/default/friends/collection.php
+++ b/views/default/friends/collection.php
@@ -37,7 +37,8 @@
// individual collection panels
if($friends = $vars['collection']->entities){
$members = $vars['collection']->members;
- echo elgg_view('friends/picker',array('entities' => $friends, 'value' => $members));
+ $content = elgg_view('friends/tablelist',array('entities' => $members));
+ echo elgg_view('friends/picker',array('entities' => $friends, 'value' => $members, 'content' => $content));
}
// close friends_picker div and the accordian list item
diff --git a/views/default/friends/picker.php b/views/default/friends/picker.php
index 9f522ca29..e7a2745ec 100644
--- a/views/default/friends/picker.php
+++ b/views/default/friends/picker.php
@@ -58,7 +58,11 @@
<div class="friends_picker">
-
+<?php
+
+ if (isset($vars['content'])) echo $vars['content'];
+
+?>
<div id="friendsPickerNavigationTabs">
<ul>
diff --git a/views/default/friends/tablelist.php b/views/default/friends/tablelist.php
index 716e1cb35..a304e8fda 100644
--- a/views/default/friends/tablelist.php
+++ b/views/default/friends/tablelist.php
@@ -24,7 +24,8 @@
$column = 0;
foreach($vars['entities'] as $entity) {
-
+ if (!($entity instanceof ElggEntity)) $entity = get_entity($entity);
+ if ($entity) {
?>
<td style="width:25px">
@@ -54,7 +55,7 @@
</table>
<?php
-
+ }
}
?> \ No newline at end of file