<!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][12570] trunk/src/bp-templates/bp-nouveau: BP Nouveau: improve `bp_directory_members_item` hook positioning</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 { white-space: pre-line; 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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://buddypress.trac.wordpress.org/changeset/12570">12570</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/12570","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>imath</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-03-15 06:15:19 +0000 (Sun, 15 Mar 2020)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>BP Nouveau: improve `bp_directory_members_item` hook positioning
In 3.0.0, we wrongly positioned this hook into the Members loop's item meta. We are repositioning it at a more consistent place considering BP Legacy, which is outside of the `p.item-meta` tag.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/8183">#8183</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbptemplatesbpnouveaubuddypressmembersmembersloopphp">trunk/src/bp-templates/bp-nouveau/buddypress/members/members-loop.php</a></li>
<li><a href="#trunksrcbptemplatesbpnouveaucommonstyles_bp_members_loopscss">trunk/src/bp-templates/bp-nouveau/common-styles/_bp_members_loop.scss</a></li>
<li><a href="#trunksrcbptemplatesbpnouveaucssbuddypressrtlcss">trunk/src/bp-templates/bp-nouveau/css/buddypress-rtl.css</a></li>
<li><a href="#trunksrcbptemplatesbpnouveaucssbuddypresscss">trunk/src/bp-templates/bp-nouveau/css/buddypress.css</a></li>
<li><a href="#trunksrcbptemplatesbpnouveauincludesmembersfunctionsphp">trunk/src/bp-templates/bp-nouveau/includes/members/functions.php</a></li>
<li><a href="#trunksrcbptemplatesbpnouveauincludesmemberstemplatetagsphp">trunk/src/bp-templates/bp-nouveau/includes/members/template-tags.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbptemplatesbpnouveaubuddypressmembersmembersloopphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-templates/bp-nouveau/buddypress/members/members-loop.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-templates/bp-nouveau/buddypress/members/members-loop.php 2020-03-15 05:30:13 UTC (rev 12569)
+++ trunk/src/bp-templates/bp-nouveau/buddypress/members/members-loop.php 2020-03-15 06:15:19 UTC (rev 12570)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3,7 +3,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * BuddyPress - Members Loop
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.0.0
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @version 3.0.0
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @version 6.0.0
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> bp_nouveau_before_loop(); ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -38,9 +38,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( bp_nouveau_member_has_meta() ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="item-meta last-activity">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php bp_nouveau_member_meta(); ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- </p><!-- #item-meta -->
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ </p><!-- .item-meta -->
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( bp_nouveau_member_has_extra_content() ) : ?>
+ <div class="item-extra-content">
+ <?php bp_nouveau_member_extra_content() ; ?>
+ </div><!-- .item-extra-content -->
+ <?php endif ; ?>
+
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> bp_nouveau_members_loop_buttons(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -48,20 +54,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'button_element' => 'button',
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-?>
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( bp_get_member_latest_update() && ! bp_nouveau_loop_is_grid() ) : ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div class="user-update">
- <p class="update"> <?php bp_member_latest_update(); ?></p>
- </div>
- <?php endif; ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="user-update">
+ <p class="update"> <?php bp_member_latest_update(); ?></p>
+ </div>
+ <?php endif; ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- // .item -->
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
-
-
</del><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> </li>
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcbptemplatesbpnouveaucommonstyles_bp_members_loopscss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-templates/bp-nouveau/common-styles/_bp_members_loop.scss</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-templates/bp-nouveau/common-styles/_bp_members_loop.scss 2020-03-15 05:30:13 UTC (rev 12569)
+++ trunk/src/bp-templates/bp-nouveau/common-styles/_bp_members_loop.scss 2020-03-15 06:15:19 UTC (rev 12570)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,5 +1,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // BP Members loop.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// @version 3.0.0
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// @since 3.0.0
+// @version 6.0.0
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> .buddypress-wrap {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,6 +12,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> margin-bottom: $marg-sml;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ .item-extra-content {
+ clear: both;
+
+ @include font-size(14);
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> .user-update {
</span><span class="cx" style="display: block; padding: 0 10px"> border: 1px solid $light-grey;
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcbptemplatesbpnouveaucssbuddypressrtlcss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-templates/bp-nouveau/css/buddypress-rtl.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-templates/bp-nouveau/css/buddypress-rtl.css 2020-03-15 05:30:13 UTC (rev 12569)
+++ trunk/src/bp-templates/bp-nouveau/css/buddypress-rtl.css 2020-03-15 06:15:19 UTC (rev 12570)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1874,6 +1874,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> margin-bottom: 10px;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.buddypress-wrap .members-list li .item-extra-content {
+ clear: both;
+ font-size: 14px;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> .buddypress-wrap .members-list li .user-update {
</span><span class="cx" style="display: block; padding: 0 10px"> border: 1px solid #eaeaea;
</span><span class="cx" style="display: block; padding: 0 10px"> border-radius: 10px;
</span></span></pre></div>
<a id="trunksrcbptemplatesbpnouveaucssbuddypresscss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-templates/bp-nouveau/css/buddypress.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-templates/bp-nouveau/css/buddypress.css 2020-03-15 05:30:13 UTC (rev 12569)
+++ trunk/src/bp-templates/bp-nouveau/css/buddypress.css 2020-03-15 06:15:19 UTC (rev 12570)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1874,6 +1874,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> margin-bottom: 10px;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.buddypress-wrap .members-list li .item-extra-content {
+ clear: both;
+ font-size: 14px;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> .buddypress-wrap .members-list li .user-update {
</span><span class="cx" style="display: block; padding: 0 10px"> border: 1px solid #eaeaea;
</span><span class="cx" style="display: block; padding: 0 10px"> border-radius: 10px;
</span></span></pre></div>
<a id="trunksrcbptemplatesbpnouveauincludesmembersfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-templates/bp-nouveau/includes/members/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-templates/bp-nouveau/includes/members/functions.php 2020-03-15 05:30:13 UTC (rev 12569)
+++ trunk/src/bp-templates/bp-nouveau/includes/members/functions.php 2020-03-15 06:15:19 UTC (rev 12570)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3,7 +3,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Members functions
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.0.0
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @version 3.1.0
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @version 6.0.0
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Exit if accessed directly.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -159,6 +159,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * and in the members loop.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.0.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 6.0.0 Replace wrongly positioned `bp_directory_members_item`
+ * with `bp_directory_members_item_meta`
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string|false HTML Output if hooked. False otherwise.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -167,11 +169,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $GLOBALS['members_template'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Fires inside the display of a directory member item.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Fires inside the display of metas in the directory member item.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @since 1.1.0
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 6.0.0
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- do_action( 'bp_directory_members_item' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ do_action( 'bp_directory_members_item_meta' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // It's the user's header
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span></span></pre></div>
<a id="trunksrcbptemplatesbpnouveauincludesmemberstemplatetagsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-templates/bp-nouveau/includes/members/template-tags.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-templates/bp-nouveau/includes/members/template-tags.php 2020-03-15 05:30:13 UTC (rev 12569)
+++ trunk/src/bp-templates/bp-nouveau/includes/members/template-tags.php 2020-03-15 06:15:19 UTC (rev 12570)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -589,6 +589,45 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Check if some extra content needs to be displayed into the members directory.
+ *
+ * @since 6.0.0
+ *
+ * @return bool True if some extra content needs to be displayed into the members directory.
+ * False otherwise.
+ */
+function bp_nouveau_member_has_extra_content() {
+ /**
+ * Filter here to display the extra content not only into the Members directory.
+ *
+ * @since 6.0.0
+ *
+ * @param bool $value True if on the Members directory page.
+ * False otherwise.
+ */
+ $members_directory_only = (bool) apply_filters( 'bp_nouveau_member_extra_content_in_members_directory', bp_is_members_directory() );
+
+ // Check if some extra content needs to be included into the item of the loop.
+ $has_action = (bool) has_action( 'bp_directory_members_item' );
+
+ return $members_directory_only && $has_action;
+}
+
+/**
+ * Displays extra content for each item of a members loop.
+ *
+ * @since 6.0.0
+ */
+function bp_nouveau_member_extra_content() {
+ /**
+ * Fires inside the display of a members loop member item.
+ *
+ * @since 1.1.0
+ */
+ do_action( 'bp_directory_members_item' );
+}
+
+/**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Load the appropriate content for the single member pages
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.0.0
</span></span></pre>
</div>
</div>
</body>
</html>