visual display of group members

diff --git a/boot.php b/boot.php
index 29e56c78c513b7134f4ab1e230f088d2f2d82e27..5fac9df5aeabb94bbeb53232717e267f93d2124e 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -2045,18 +2045,7 @@ function contact_block() {
        if(count($r)) {
                $o .= '<h4 class="contact-h4">' .  sprintf( tt('%d Contact','%d Contacts', $total),$total) . '</h4><div id="contact-block">';
                foreach($r as $rr) {
-                       $redirect_url = $a->get_baseurl() . '/redir/' . $rr['id'];
-                       if(local_user() && ($rr['uid'] == local_user())
-                               && ($rr['network'] === 'dfrn')) {
-                               $url = $redirect_url;
-                               $sparkle = ' sparkle';
-                       }
-                       else {
-                               $url = $rr['url'];
-                               $sparkle = '';
-                       }
-
-                       $o .= '<div class="contact-block-div"><a class="contact-block-link' . $sparkle . '" href="' . $url . '" ><img class="contact-block-img' . $sparkle . '" src="' . $rr['micro'] . '" title="' . $rr['name'] . ' [' . $rr['url'] . ']" alt="' . $rr['name'] . '" /></a></div>' . "\r\n";
+                       $o .= micropro($rr,true,'mpfriend');
                }
                $o .= '</div><div id="contact-block-end"></div>';
                $o .=  '<div id="viewcontacts"><a id="viewcontacts-link" href="viewcontacts/' . $a->profile['nickname'] . '">' . t('View Contacts') . '</a></div>';
@@ -2070,6 +2059,31 @@ function contact_block() {
 
 }}
 
+if(! function_exists('micropro')) {
+function micropro($contact, $redirect = false, $class = '') {
+
+       if($class)
+               $class = ' ' . $class;
+
+       $url = $contact['url'];
+       $sparkle = '';
+
+       if($redirect) {
+               $a = get_app();
+               $redirect_url = $a->get_baseurl() . '/redir/' . $contact['id'];
+               if(local_user() && ($contact['uid'] == local_user()) && ($contact['network'] === 'dfrn')) {
+                       $url = $redirect_url;
+                       $sparkle = ' sparkle';
+               }
+       }
+
+       return '<div class="contact-block-div' . $class . '"><a class="contact-block-link' . $class . $sparkle 
+               . '" href="' . $url . '" ><img class="contact-block-img' . $class . $sparkle . '" src="' . $contact['micro'] 
+               . '" title="' . $contact['name'] . ' [' . $contact['url'] . ']" alt="' . $contact['name'] . '" /></a></div>' . "\r\n";
+}}
+
+
+
 if(! function_exists('search')) {
 function search($s) {
        $a = get_app();

diff --git a/mod/group.php b/mod/group.php
index 3ee14dd85f0764323209f2a003e237d39e5c1cbc..591c936271c5e5c93b1f79bfa7f34ace6b20f016 100644 (file)
--- a/mod/group.php
+++ b/mod/group.php
@@ -128,11 +128,11 @@ function group_content(&$a) {
                        goaway($a->get_baseurl() . '/contacts');
                }
                $group = $r[0];
-               $ret = group_get_members($group['id']);
+               $members = group_get_members($group['id']);
                $preselected = array();
-               if(count($ret)) {
-                       foreach($ret as $p)
-                               $preselected[] = $p['id'];
+               if(count($members))     {
+                       foreach($members as $member)
+                               $preselected[] = $member['id'];
                }
 
                $drop_tpl = load_view_file('view/group_drop.tpl');
@@ -156,6 +156,13 @@ function group_content(&$a) {
                ));
 
        }
+
+       $o .= '<div id="group-members">';
+       foreach($members as $member) {
+               $o .= micropro($member,true,'mpgroup');
+       }
+       $o .= '</div><div id="group-members-end"></div>';
+
        return $o;
 
 }
\ No newline at end of file

diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index 32d88493cb4f5bbe2657bb7dd14fdfd8501a840a..cc55f7887ba3e6485470a6349243ce954149b7d6 100644 (file)
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -2225,4 +2225,13 @@ a.mail-list-link {
        position: absolute;
        top: 0;
        left: 0;
-)
+}
+
+#group-members {
+       margin-top: 20px;
+}
+
+#group-members-end {
+       clear: both;
+}
+

diff --git a/view/theme/loozah/style.css b/view/theme/loozah/style.css
index 0872691dcd2bafd3bb8a76787af657d30136fcc4..17b4e7fb28b48fbe8392962d1ba2bebafa60a26b 100644 (file)
--- a/view/theme/loozah/style.css
+++ b/view/theme/loozah/style.css
@@ -2248,4 +2248,14 @@ a.mail-list-link {
        position: absolute;
        top: 0;
        left: 0;
-)
+}
+
+
+#group-members {
+       margin-top: 20px;
+}
+
+#group-members-end {
+       clear: both;
+}
+