<!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][7526] trunk: Introduce functions for outputting notification descriptions and action links, and update template parts to use them.</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 { 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">
<dt>Revision</dt> <dd><a href="http://buddypress.trac.wordpress.org/changeset/7526">7526</a></dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2013-11-08 04:21:15 +0000 (Fri, 08 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Introduce functions for outputting notification descriptions and action links, and update template parts to use them. See <a href="http://buddypress.trac.wordpress.org/ticket/5148">#5148</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpnotificationsbpnotificationstemplatephp">trunk/bp-notifications/bp-notifications-template.php</a></li>
<li><a href="#trunkbptemplatesbplegacybuddypressmemberssinglenotificationsnotificationsloopphp">trunk/bp-templates/bp-legacy/buddypress/members/single/notifications/notifications-loop.php</a></li>
<li><a href="#trunkbptemplatesbplegacybuddypressmemberssinglenotificationsreadphp">trunk/bp-templates/bp-legacy/buddypress/members/single/notifications/read.php</a></li>
<li><a href="#trunkbptemplatesbplegacybuddypressmemberssinglenotificationsunreadphp">trunk/bp-templates/bp-legacy/buddypress/members/single/notifications/unread.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpnotificationsbpnotificationstemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-notifications/bp-notifications-template.php (7525 => 7526)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-notifications/bp-notifications-template.php 2013-11-08 04:12:50 UTC (rev 7525)
+++ trunk/bp-notifications/bp-notifications-template.php 2013-11-08 04:21:15 UTC (rev 7526)
</span><span class="lines">@@ -511,6 +511,95 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Output the timestamp of the current notification.
+ *
+ * @since BuddyPress (1.9.0)
+ */
+function bp_the_notification_time_since() {
+ echo bp_get_the_notification_time_since();
+}
+ /**
+ * Return the timestamp of the current notification.
+ *
+ * @since BuddyPress (1.9.0)
+ *
+ * @return string Timestamp of the current notification.
+ */
+ function bp_get_the_notification_time_since() {
+ return apply_filters( 'bp_get_the_notification_time_since', bp_core_time_since( bp_get_the_notification_date_notified() ) );
+ }
+
+/**
+ * Output full-text description for a specific notification.
+ *
+ * @since BuddyPress (1.9.0)
+ */
+function bp_the_notification_description() {
+ echo bp_get_the_notification_description();
+}
+
+ /**
+ * Get full-text description for a specific notification.
+ *
+ * @since BuddyPress (1.9.0)
+ *
+ * @return string
+ */
+ function bp_get_the_notification_description() {
+
+ // Setup local variables
+ $description = '';
+ $bp = buddypress();
+ $notification = $bp->notifications->query_loop->notification;
+
+ // Skip inactive components
+ if ( ! bp_is_active( $notification->component_name ) ) {
+ return;
+ }
+
+ // Callback function exists
+ if ( isset( $bp->{ $notification->component_name }->notification_callback ) && is_callable( $bp->{ $notification->component_name }->notification_callback ) ) {
+ $description = call_user_func( $bp->{ $notification->component_name }->notification_callback, $notification->component_action, $notification->item_id, $notification->secondary_item_id, 1 );
+
+ // @deprecated format_notification_function - 1.5
+ } elseif ( isset( $bp->{ $notification->component_name }->format_notification_function ) && function_exists( $bp->{ $notification->component_name }->format_notification_function ) ) {
+ $description = call_user_func( $bp->{ $notification->component_name }->format_notification_function, $notification->component_action, $notification->item_id, $notification->secondary_item_id, 1 );
+ }
+
+ // Filter and return
+ return apply_filters( 'bp_get_the_notification_description', $description );
+ }
+
+/**
+ * Output the action links for the current notification.
+ *
+ * @since BuddyPress (1.9.0)
+ */
+function bp_the_notification_action_links() {
+ echo bp_get_the_notification_action_links();
+}
+ /**
+ * Return the action links for the current notification.
+ *
+ * @since BuddyPress (1.9.0)
+ *
+ * @return string HTML links for actions to take on single notifications.
+ */
+ function bp_get_the_notification_action_links() {
+
+ // Setup the return value
+ $retval = '';
+
+ // Start the output buffer
+ ob_start();
+
+ // Get and empty the output buffer
+ $retval = ob_get_clean();
+
+ return apply_filters( 'bp_get_the_notification_action_links', $retval );
+ }
+
+/**
</ins><span class="cx"> * Output the pagination count for the current notification loop.
</span><span class="cx"> *
</span><span class="cx"> * @since BuddyPress (1.9.0)
</span></span></pre></div>
<a id="trunkbptemplatesbplegacybuddypressmemberssinglenotificationsnotificationsloopphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-templates/bp-legacy/buddypress/members/single/notifications/notifications-loop.php (7525 => 7526)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-templates/bp-legacy/buddypress/members/single/notifications/notifications-loop.php 2013-11-08 04:12:50 UTC (rev 7525)
+++ trunk/bp-templates/bp-legacy/buddypress/members/single/notifications/notifications-loop.php 2013-11-08 04:21:15 UTC (rev 7526)
</span><span class="lines">@@ -6,9 +6,9 @@
</span><span class="cx">
</span><span class="cx"> <tr>
</span><span class="cx"> <td></td>
</span><del>- <td><?php bp_the_notification_component_action(); ?></td>
- <td><?php echo bp_core_get_userlink( bp_get_the_notification_item_id() ); ?></td>
- <td><?php echo bp_core_time_since( bp_get_the_notification_date_notified() ); ?></td>
</del><ins>+ <td><?php bp_the_notification_description(); ?></td>
+ <td><?php bp_the_notification_time_since(); ?></td>
+ <td><?php bp_the_notification_action_links(); ?></td>
</ins><span class="cx"> </tr>
</span><span class="cx">
</span><span class="cx"> <?php endwhile;
</span></span></pre></div>
<a id="trunkbptemplatesbplegacybuddypressmemberssinglenotificationsreadphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-templates/bp-legacy/buddypress/members/single/notifications/read.php (7525 => 7526)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-templates/bp-legacy/buddypress/members/single/notifications/read.php 2013-11-08 04:12:50 UTC (rev 7525)
+++ trunk/bp-templates/bp-legacy/buddypress/members/single/notifications/read.php 2013-11-08 04:21:15 UTC (rev 7526)
</span><span class="lines">@@ -10,13 +10,13 @@
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>- <table class="notification-settings">
</del><ins>+ <table class="notifications">
</ins><span class="cx"> <thead>
</span><span class="cx"> <tr>
</span><span class="cx"> <th class="icon"></th>
</span><span class="cx"> <th class="title"><?php _e( 'Notification', 'buddypress' ) ?></th>
</span><del>- <th class="title"><?php _e( 'Member', 'buddypress' ) ?></th>
</del><span class="cx"> <th class="date"><?php _e( 'Date Received', 'buddypress' ) ?></th>
</span><ins>+ <th class="actions"><?php _e( 'Actions', 'buddypress' ); ?></th>
</ins><span class="cx"> </tr>
</span><span class="cx"> </thead>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbptemplatesbplegacybuddypressmemberssinglenotificationsunreadphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-templates/bp-legacy/buddypress/members/single/notifications/unread.php (7525 => 7526)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-templates/bp-legacy/buddypress/members/single/notifications/unread.php 2013-11-08 04:12:50 UTC (rev 7525)
+++ trunk/bp-templates/bp-legacy/buddypress/members/single/notifications/unread.php 2013-11-08 04:21:15 UTC (rev 7526)
</span><span class="lines">@@ -10,13 +10,13 @@
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>- <table class="notification-settings">
</del><ins>+ <table class="notifications">
</ins><span class="cx"> <thead>
</span><span class="cx"> <tr>
</span><span class="cx"> <th class="icon"></th>
</span><del>- <th class="title"><?php _e( 'Notification', 'buddypress' ) ?></th>
- <th class="title"><?php _e( 'Member', 'buddypress' ) ?></th>
- <th class="date"><?php _e( 'Date Received', 'buddypress' ) ?></th>
</del><ins>+ <th class="title"><?php _e( 'Notification', 'buddypress' ); ?></th>
+ <th class="date"><?php _e( 'Date Received', 'buddypress' ); ?></th>
+ <th class="actions"><?php _e( 'Actions', 'buddypress' ); ?></th>
</ins><span class="cx"> </tr>
</span><span class="cx"> </thead>
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>