<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[BuddyPress][4489] trunk: Moves group admin > members markup out of the templatetag and into the template.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd>4489</dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2011-06-12 12:14:45 +0000 (Sun, 12 Jun 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Moves group admin > members markup out of the templatetag and into the template. Fixes #3271, props hnla</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpgroupsbpgroupstemplatephp">trunk/bp-groups/bp-groups-template.php</a></li>
<li><a href="#trunkbpthemesbpdefaultgroupssingleadminphp">trunk/bp-themes/bp-default/groups/single/admin.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpgroupsbpgroupstemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-groups/bp-groups-template.php (4488 => 4489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-groups/bp-groups-template.php 2011-06-12 12:04:50 UTC (rev 4488)
+++ trunk/bp-groups/bp-groups-template.php 2011-06-12 12:14:45 UTC (rev 4489)
</span><span class="lines">@@ -578,6 +578,66 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/**
+ * Return a list of user_ids for a group's admins
+ *
+ * @package BuddyPress
+ * @since 1.3
+ *
+ * @param obj $group (optional) The group being queried. Defaults to the current group in the loop
+ * @param str $format 'string' to get a comma-separated string, 'array' to get an array
+ * @return mixed $admin_ids A string or array of user_ids
+ */
+function bp_group_admin_ids( $group = false, $format = 'string' ) {
+ global $groups_template;
+
+ if ( !$group )
+ $group =& $groups_template->group;
+
+ $admin_ids = array();
+
+ if ( $group->admins ) {
+ foreach( $group->admins as $admin ) {
+ $admin_ids[] = $admin->user_id;
+ }
+ }
+
+ if ( 'string' == $format )
+ $admin_ids = implode( ',', $admin_ids );
+
+ return apply_filters( 'bp_group_admin_ids', $admin_ids );
+}
+
+/**
+ * Return a list of user_ids for a group's moderators
+ *
+ * @package BuddyPress
+ * @since 1.3
+ *
+ * @param obj $group (optional) The group being queried. Defaults to the current group in the loop
+ * @param str $format 'string' to get a comma-separated string, 'array' to get an array
+ * @return mixed $mod_ids A string or array of user_ids
+ */
+function bp_group_mod_ids( $group = false, $format = 'string' ) {
+ global $groups_template;
+
+ if ( !$group )
+ $group =& $groups_template->group;
+
+ $mod_ids = array();
+
+ if ( $group->mods ) {
+ foreach( $group->mods as $mod ) {
+ $mod_ids[] = $mod->user_id;
+ }
+ }
+
+ if ( 'string' == $format )
+ $mod_ids = implode( ',', $mod_ids );
+
+ return apply_filters( 'bp_group_mod_ids', $mod_ids );
+}
+
</ins><span class="cx"> function bp_group_all_members_permalink() {
</span><span class="cx"> echo bp_get_group_all_members_permalink();
</span><span class="cx"> }
</span><span class="lines">@@ -959,7 +1019,7 @@
</span><span class="cx"> global $members_template, $groups_template, $bp;
</span><span class="cx">
</span><span class="cx"> $defaults = array(
</span><del>- 'user_id' => $members_template->member->user_id,
</del><ins>+ 'user_id' => !empty( $members_template->member->user_id ) ? $members_template->member->user_id : false,
</ins><span class="cx"> 'group' => &$groups_template->group
</span><span class="cx"> );
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultgroupssingleadminphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/groups/single/admin.php (4488 => 4489)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/groups/single/admin.php 2011-06-12 12:04:50 UTC (rev 4488)
+++ trunk/bp-themes/bp-default/groups/single/admin.php 2011-06-12 12:14:45 UTC (rev 4489)
</span><span class="lines">@@ -147,20 +147,58 @@
</span><span class="cx"> <?php if ( bp_is_group_admin_screen( 'manage-members' ) ) : ?>
</span><span class="cx">
</span><span class="cx"> <?php do_action( 'bp_before_group_manage_members_admin' ); ?>
</span><del>-
</del><ins>+
</ins><span class="cx"> <div class="bp-widget">
</span><span class="cx"> <h4><?php _e( 'Administrators', 'buddypress' ); ?></h4>
</span><del>- <?php bp_group_admin_memberlist( true ) ?>
</del><ins>+
+ <?php if ( bp_has_members( '&include='. bp_group_admin_ids() ) ) : ?>
+
+ <ul id="admins-list" class="item-list single-line>">
+
+ <?php while ( bp_members() ) : bp_the_member(); ?>
+ <li>
+ <?php echo bp_core_fetch_avatar( array( 'item_id' => bp_get_member_user_id(), 'type' => 'thumb', 'width' => 30, 'height' => 30, 'alt' => __( 'Profile picture of %s', 'buddypress' ) ) ) ?>
+ <h5>
+ <a href="<?php bp_member_permalink(); ?>"> <?php bp_member_name(); ?></a>
+ <span class="small">
+ <a class="button confirm admin-demote-to-member" href="<?php bp_group_member_demote_link( bp_get_member_user_id() ) ?>"><?php _e( 'Demote to Member', 'buddypress' ) ?></a>
+ </span>
+ </h5>
+ </li>
+ <?php endwhile; ?>
+
+ </ul>
+
+ <?php endif; ?>
+
</ins><span class="cx"> </div>
</span><del>-
</del><ins>+
</ins><span class="cx"> <?php if ( bp_group_has_moderators() ) : ?>
</span><del>-
</del><span class="cx"> <div class="bp-widget">
</span><del>- <h4><?php _e( 'Moderators', 'buddypress' ) ?></h4>
- <?php bp_group_mod_memberlist( true ) ?>
</del><ins>+ <h4><?php _e( 'Moderators', 'buddypress' ) ?></h4>
+
+ <?php if ( bp_has_members( '&include=' . bp_group_mod_ids() ) ) : ?>
+ <ul id="mods-list" class="item-list">
+
+ <?php while ( bp_members() ) : bp_the_member(); ?>
+ <li>
+ <?php echo bp_core_fetch_avatar( array( 'item_id' => bp_get_member_user_id(), 'type' => 'thumb', 'width' => 30, 'height' => 30, 'alt' => __( 'Profile picture of %s', 'buddypress' ) ) ) ?>
+ <h5>
+ <a href="<?php bp_member_permalink(); ?>"> <?php bp_member_name(); ?></a>
+ <span class="small">
+ <a href="<?php bp_group_member_promote_admin_link( array( 'user_id' => bp_get_member_user_id() ) ) ?>" class="button confirm mod-promote-to-admin" title="<?php _e( 'Promote to Admin', 'buddypress' ); ?>"><?php _e( 'Promote to Admin', 'buddypress' ); ?></a>
+ <a class="button confirm mod-demote-to-member" href="<?php bp_group_member_demote_link( bp_get_member_user_id() ) ?>"><?php _e( 'Demote to Member', 'buddypress' ) ?></a>
+ </span>
+ </h5>
+ </li>
+ <?php endwhile; ?>
+
+ </ul>
+
+ <?php endif; ?>
</ins><span class="cx"> </div>
</span><ins>+ <?php endif ?>
</ins><span class="cx">
</span><del>- <?php endif; ?>
</del><span class="cx">
</span><span class="cx"> <div class="bp-widget">
</span><span class="cx"> <h4><?php _e("Members", "buddypress"); ?></h4>
</span></span></pre>
</div>
</div>
</body>
</html>