Changeset 13305

Timestamp:

07/26/2022 02:08:37 PM (4 years ago)

Author:

imath

Message:

Improve the new_blog_post activity type layout

These type of activities are generated when a blog post is published. If [13298] already brought some improvements making the included post featured image clickable, this changeset complement the first one:

• by adding the post title into the activity content and linking it as well as the "read more" ellipsis to the post permalink. This "read more" link is generated using the WordPress the_content_more_link filter which means if your theme is using this filter to adapt the "read more" link, these adaptations will also be applied to the activity "read more" link.
• by changing the markup used into these activities and by adding some CSS rules to make them looks more like WordPress embeds.

Props teeboy4real

Fixes #8052

Location:

trunk

Files:

• src/bp-activity/bp-activity-functions.php (modified) (2 diffs)
• src/bp-templates/bp-legacy/css/buddypress-rtl.css (modified) (1 diff)
• src/bp-templates/bp-legacy/css/buddypress.css (modified) (1 diff)
• src/bp-templates/bp-nouveau/common-styles/_bp_activity_entries.scss (modified) (1 diff)
• src/bp-templates/bp-nouveau/css/buddypress-rtl.css (modified) (1 diff)
• src/bp-templates/bp-nouveau/css/buddypress.css (modified) (1 diff)
• tests/phpunit/testcases/activity/actions.php (modified) (1 diff)

trunk/src/bp-activity/bp-activity-functions.php

@@ -3461 +3461 @@
         );
 
-        $post_url = '';
+        $post_url        = '';
+        $post_title      = '';
+        $bp_excerpt_args = array(
+                'html'              => false,
+                'filter_shortcodes' => true,
+                'strip_tags'        => true,
+                'remove_links'      => true,
+        );
         // Get the WP_Post object if this activity type is a blog post.
         if ( $activity['type'] === 'new_blog_post' ) {
-                $content  = get_post( $activity['secondary_item_id'] );
-                $post_url = $content->guid;
+                $content    = get_post( $activity['secondary_item_id'] );
+                $post_url   = $content->guid;
+                $post_title = sprintf(
+                        '<strong><a href="%1$s">%2$s</a></strong>',
+                        esc_url( $post_url ),
+                        esc_html( $content->post_title )
+                );
+
+                $more_text  = sprintf(
+                        '<span>%s</span>',
+                        trim( __( ' [&hellip;]', 'buddypress' ) )
+                );
+
+                /** This filter is documented in wp-admin/includes/post-template.php */
+                $bp_excerpt_args['ending'] = apply_filters(
+                        'the_content_more_link',
+                        sprintf(
+                                ' <a href="%1$s">%2$s</a>',
+                                esc_url( $post_url ),
+                                $more_text
+                        ),
+                        $more_text
+                );
         }
 
@@ -3580 +3608 @@
 
         // Generate a text excerpt for this activity item (and remove any oEmbeds URLs).
-        $summary = bp_create_excerpt( html_entity_decode( $content ), 225, array(
-                'html' => false,
-                'filter_shortcodes' => true,
-                'strip_tags'        => true,
-                'remove_links'      => true
-        ) );
+        $summary_parts = array(
+                str_replace(
+                        array( "\n", "\r" ),
+                        ' ',
+                        trim( bp_create_excerpt( html_entity_decode( $content ), 225, $bp_excerpt_args ) )
+                ),
+        );
 
         if ( $use_media_type === 'embeds' ) {
-                $summary .= PHP_EOL . PHP_EOL . $extracted_media['url'];
+                $summary_parts[] = PHP_EOL . PHP_EOL . $extracted_media['url'];
         } elseif ( $use_media_type === 'images' ) {
                 $extracted_media_url = isset( $extracted_media['url'] ) ? $extracted_media['url'] : '';
+                $image_tag           = sprintf( '<img src="%s"> ', esc_url( $extracted_media_url ) );
 
                 if ( $post_url ) {
-                        $summary .= sprintf( '<a href="%1$s" class="activity-post-featured-image"><img src="%2$s"></a>', esc_url( $post_url ), esc_url( $extracted_media_url ) );
-                } else {
-                        $summary .= sprintf( ' <img src="%s">', esc_url( $extracted_media_url ) );
+                        $image_tag = sprintf( '<a href="%1$s" class="activity-post-featured-image">%2$s</a> ', esc_url( $post_url ), trim( $image_tag ) );
+                        array_unshift( $summary_parts, $image_tag );
                 }
         } elseif ( in_array( $use_media_type, array( 'audio', 'videos' ), true ) ) {
-                $summary .= PHP_EOL . PHP_EOL . $extracted_media['original'];  // Full shortcode.
-        }
+                $summary_parts[] = PHP_EOL . PHP_EOL . $extracted_media['original'];  // Full shortcode.
+        }
+
+        if ( $post_title ) {
+                array_unshift( $summary_parts, $post_title );
+        }
+
+        // Join summary parts.
+        $summary = implode( '', $summary_parts );
 
         /**

trunk/src/bp-templates/bp-legacy/css/buddypress-rtl.css

@@ -325 +325 @@
         margin-right: 5px;
         padding-right: 10px;
+}
+
+#buddypress .activity-list li.new_blog_post .activity-content .activity-inner strong {
+        display: block;
+        margin-bottom: 0.8em;
+}
+
+#buddypress .activity-list li.new_blog_post .activity-content .activity-inner img {
+        float: right;
+        margin-left: 0.8em;
 }
 

trunk/src/bp-templates/bp-legacy/css/buddypress.css

@@ -325 +325 @@
         margin-left: 5px;
         padding-left: 10px;
+}
+
+#buddypress .activity-list li.new_blog_post .activity-content .activity-inner strong {
+        display: block;
+        margin-bottom: 0.8em;
+}
+
+#buddypress .activity-list li.new_blog_post .activity-content .activity-inner img {
+        float: left;
+        margin-right: 0.8em;
 }
 

trunk/src/bp-templates/bp-nouveau/common-styles/_bp_activity_entries.scss

@@ -90 +90 @@
                         }
                 } // close li forum elements
+
+                &.new_blog_post {
+
+                        .activity-inner {
+
+                                strong {
+                                        display: block;
+                                        margin-bottom: 0.8em;
+                                }
+
+                                img {
+                                        float: left;
+                                        margin-right: 0.8em;
+                                }
+                        }
+                } // close li blog post elements
 
 

trunk/src/bp-templates/bp-nouveau/css/buddypress-rtl.css

@@ -1305 +1305 @@
         margin-right: 10px;
         padding-right: 1em;
+}
+
+.activity-list .activity-item.new_blog_post .activity-inner strong {
+        display: block;
+        margin-bottom: 0.8em;
+}
+
+.activity-list .activity-item.new_blog_post .activity-inner img {
+        float: right;
+        margin-left: 0.8em;
 }
 

trunk/src/bp-templates/bp-nouveau/css/buddypress.css

@@ -1305 +1305 @@
         margin-left: 10px;
         padding-left: 1em;
+}
+
+.activity-list .activity-item.new_blog_post .activity-inner strong {
+        display: block;
+        margin-bottom: 0.8em;
+}
+
+.activity-list .activity-item.new_blog_post .activity-inner img {
+        float: left;
+        margin-right: 0.8em;
 }
 

trunk/tests/phpunit/testcases/activity/actions.php

@@ -242 +242 @@
                 $a = $this->activity_exists_for_post( $post_id, 'new_post', true );
 
-                $this->assertSame( $post->post_content, $a->content, 'The Activity about a published post type should be updated when the post content has changed.' );
+                $this->assertSame( bp_activity_create_summary( $post->post_content, (array) $a ), $a->content, 'The Activity about a published post type should be updated when the post content has changed.' );
         }