<!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][12415] trunk/src: Site Wide Notices: improve layout and possible customizations</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/12415">12415</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/12415","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>2019-07-25 12:35:00 +0000 (Thu, 25 Jul 2019)</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'>Site Wide Notices: improve layout and possible customizations
By using existing BP Notices template tags into the {{{bp_message_get_notices()}}} function we are:
- improving the way notices containing line feeds are displayed,
- improving customization possibilities using the template tags filters.
Props Venutius, kristianngve
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/8079">#8079</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpmessagesbpmessagestemplatephp">trunk/src/bp-messages/bp-messages-template.php</a></li>
<li><a href="#trunksrcbptemplatesbplegacycssbuddypressrtlcss">trunk/src/bp-templates/bp-legacy/css/buddypress-rtl.css</a></li>
<li><a href="#trunksrcbptemplatesbplegacycssbuddypresscss">trunk/src/bp-templates/bp-legacy/css/buddypress.css</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpmessagesbpmessagestemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-messages/bp-messages-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-messages/bp-messages-template.php 2019-07-25 11:30:59 UTC (rev 12414)
+++ trunk/src/bp-messages/bp-messages-template.php 2019-07-25 12:35:00 UTC (rev 12415)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1155,18 +1155,29 @@
</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"> * Output the subject of the current notice in the loop.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @since 5.0.0 The $notice parameter has been added.
+ *
+ * @param BP_Messages_Notice $notice The notice object.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function bp_message_notice_subject() {
- echo bp_get_message_notice_subject();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function bp_message_notice_subject( $notice = null ) {
+ echo bp_get_message_notice_subject( $notice );
</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"> * Get the subject of the current notice in the loop.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 5.0.0 The $notice parameter has been added.
+ *
+ * @param BP_Messages_Notice $notice The notice object.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return string
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function bp_get_message_notice_subject() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function bp_get_message_notice_subject( $notice = null ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $messages_template;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! isset( $notice->subject ) ) {
+ $notice =& $messages_template->thread;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters the subject of the current notice in the loop.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1174,23 +1185,34 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $subject Subject of the current notice in the loop.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return apply_filters( 'bp_get_message_notice_subject', $messages_template->thread->subject );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return apply_filters( 'bp_get_message_notice_subject', $notice->subject );
</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"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Output the text of the current notice in the loop.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @since 5.0.0 The $notice parameter has been added.
+ *
+ * @param BP_Messages_Notice $notice The notice object.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function bp_message_notice_text() {
- echo bp_get_message_notice_text();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function bp_message_notice_text( $notice = null ) {
+ echo bp_get_message_notice_text( $notice );
</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"> * Get the text of the current notice in the loop.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 5.0.0 The $notice parameter has been added.
+ *
+ * @param BP_Messages_Notice $notice The notice object.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return string
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function bp_get_message_notice_text() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function bp_get_message_notice_text( $notice = null ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> global $messages_template;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! isset( $notice->subject ) ) {
+ $notice =& $messages_template->thread;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters the text of the current notice in the loop.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1198,7 +1220,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $message Text for the current notice in the loop.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return apply_filters( 'bp_get_message_notice_text', $messages_template->thread->message );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return apply_filters( 'bp_get_message_notice_text', $notice->message );
</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"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1334,12 +1356,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !in_array( $notice->id, $closed_notices ) && $notice->id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="message" class="info notice" rel="n-<?php echo esc_attr( $notice->id ); ?>">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p>
- <strong><?php echo stripslashes( wp_filter_kses( $notice->subject ) ) ?></strong><br />
- <?php echo stripslashes( wp_filter_kses( $notice->message) ) ?>
- <button type="button" id="close-notice" class="bp-tooltip" data-bp-tooltip="<?php esc_attr_e( 'Dismiss this notice', 'buddypress' ) ?>"><span class="bp-screen-reader-text"><?php _e( 'Dismiss this notice', 'buddypress' ) ?></span> <span aria-hidden="true">Χ</span></button>
- <?php wp_nonce_field( 'bp_messages_close_notice', 'close-notice-nonce' ); ?>
- </p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <strong><?php bp_message_notice_subject( $notice ); ?></strong>
+ <button type="button" id="close-notice" class="bp-tooltip" data-bp-tooltip="<?php esc_attr_e( 'Dismiss this notice', 'buddypress' ) ?>"><span class="bp-screen-reader-text"><?php _e( 'Dismiss this notice', 'buddypress' ) ?></span> <span aria-hidden="true">Χ</span></button>
+ <?php bp_message_notice_text( $notice ); ?>
+ <?php wp_nonce_field( 'bp_messages_close_notice', 'close-notice-nonce' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcbptemplatesbplegacycssbuddypressrtlcss"></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-legacy/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-legacy/css/buddypress-rtl.css 2019-07-25 11:30:59 UTC (rev 12414)
+++ trunk/src/bp-templates/bp-legacy/css/buddypress-rtl.css 2019-07-25 12:35:00 UTC (rev 12415)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -624,7 +624,8 @@
</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"> #buddypress div#message p,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-#sitewide-notice p {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+#sitewide-notice p,
+#sitewide-notice strong:first-child {
</ins><span class="cx" style="display: block; padding: 0 10px"> font-size: 90%;
</span><span class="cx" style="display: block; padding: 0 10px"> display: block;
</span><span class="cx" style="display: block; padding: 0 10px"> padding: 10px 15px;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1392,8 +1393,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> font-weight: 700;
</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">+#sitewide-notice,
+.bp-site-wide-message {
+ position: relative;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> #buddypress div#message p,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-#sitewide-notice p {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+#sitewide-notice #message {
</ins><span class="cx" style="display: block; padding: 0 10px"> background-color: #ffd;
</span><span class="cx" style="display: block; padding: 0 10px"> border: 1px solid #cb2;
</span><span class="cx" style="display: block; padding: 0 10px"> color: #440;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1405,7 +1411,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> .bp-site-wide-message #message p,
</span><span class="cx" style="display: block; padding: 0 10px"> .admin-bar-on #message p {
</span><span class="cx" style="display: block; padding: 0 10px"> padding-left: 25px;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- position: relative;
</del><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-site-wide-message #message button,
</span></span></pre></div>
<a id="trunksrcbptemplatesbplegacycssbuddypresscss"></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-legacy/css/buddypress.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-templates/bp-legacy/css/buddypress.css 2019-07-25 11:30:59 UTC (rev 12414)
+++ trunk/src/bp-templates/bp-legacy/css/buddypress.css 2019-07-25 12:35:00 UTC (rev 12415)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -624,7 +624,8 @@
</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"> #buddypress div#message p,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-#sitewide-notice p {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+#sitewide-notice p,
+#sitewide-notice strong:first-child {
</ins><span class="cx" style="display: block; padding: 0 10px"> font-size: 90%;
</span><span class="cx" style="display: block; padding: 0 10px"> display: block;
</span><span class="cx" style="display: block; padding: 0 10px"> padding: 10px 15px;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1392,8 +1393,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> font-weight: 700;
</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">+#sitewide-notice,
+.bp-site-wide-message {
+ position: relative;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> #buddypress div#message p,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-#sitewide-notice p {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+#sitewide-notice #message {
</ins><span class="cx" style="display: block; padding: 0 10px"> background-color: #ffd;
</span><span class="cx" style="display: block; padding: 0 10px"> border: 1px solid #cb2;
</span><span class="cx" style="display: block; padding: 0 10px"> color: #440;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1405,7 +1411,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> .bp-site-wide-message #message p,
</span><span class="cx" style="display: block; padding: 0 10px"> .admin-bar-on #message p {
</span><span class="cx" style="display: block; padding: 0 10px"> padding-right: 25px;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- position: relative;
</del><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-site-wide-message #message button,
</span></span></pre>
</div>
</div>
</body>
</html>