Ticket #6772: 6772.09c.two-col.patch

src/bp-activity/bp-activity-embeds.php

@@ -268 +268 @@
 <svg id="Layer_1" style="enable-background:new 0 0 512 512;" version="1.1" viewBox="0 0 512 512" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M405.2,232.9L126.8,67.2c-3.4-2-6.9-3.2-10.9-3.2c-10.9,0-19.8,9-19.8,20H96v344h0.1c0,11,8.9,20,19.8,20  c4.1,0,7.5-1.4,11.2-3.4l278.1-165.5c6.6-5.5,10.8-13.8,10.8-23.1C416,246.7,411.8,238.5,405.2,232.9z"/></svg>
 EOD;
 
-                                $play_icon = sprintf( '<a rel="nofollow" class="play-btn" href="%1$s">%2$s</a>', esc_url( $url ), $play_icon );
+                                $play_icon = sprintf( '<a rel="nofollow" class="play-btn" href="%1$s" onclick="top.location.href=\'%1$s\'">%2$s</a>', esc_url( $url ), $play_icon );
                         }
 
                         // Thumb width
-                        $width = isset( $oembed->thumbnail_width ) && 'photo' !== $oembed->type && (int) $oembed->thumbnail_width < 550 ? (int) $oembed->thumbnail_width : $width;
+                        $thumb_width = isset( $oembed->thumbnail_width ) && 'photo' !== $oembed->type && (int) $oembed->thumbnail_width < 550 ? (int) $oembed->thumbnail_width : $width;
+
+                        $float_width = 350;
 
                         // Set up thumb.
-                        $content = sprintf( '<div class="thumb" style="max-width:%1$spx">%2$s<a href="%3$s" rel="nofollow" onclick="top.location.href=\'%3$s\'"><img src="%4$s" /></a></div>', $width, $play_icon, esc_url( $url ), esc_url( $thumbnail ) );
+                        $content = sprintf( '<div class="thumb" style="max-width:%1$spx">%2$s<a href="%3$s" rel="nofollow" onclick="top.location.href=\'%3$s\'"><img src="%4$s" /></a></div>', $thumb_width, $play_icon, esc_url( $url ), esc_url( $thumbnail ) );
 
                         // Show title.
                         if ( isset( $oembed->title ) ) {
@@ -311 +313 @@
 
                 // Print rich content.
                 if ( '' !== $content ) {
-                        printf( '<div class="bp-activity-embed-display-media" style="max-width:%spx">%s</div>', $width, $content );
+                        printf( '<div class="bp-activity-embed-display-media%s" style="max-width:%spx">%s</div>',
+                                $thumb_width < $float_width ? ' two-col' : ' one-col',
+                                $thumb_width < $float_width ? $width : $thumb_width,
+                                $content
+                        );
                 }
 
         // Video / audio.

src/bp-templates/bp-legacy/buddypress/assets/embeds/css-activity.php

@@ -65 +65 @@
         border-radius: 6px;
 }
 
-.bp-activity-embed-display-media,
-.bp-activity-embed-display-media .thumb,
-.bp-activity-embed-display-media .thumb img {
+.bp-activity-embed-display-media.one-col,
+.bp-activity-embed-display-media.one-col .thumb,
+.bp-activity-embed-display-media.one-col .thumb img {
+        width: 100%;
+}
+
+.bp-activity-embed-display-media.two-col .thumb,
+.bp-activity-embed-display-media.two-col .caption {
+        display: table-cell;
+        vertical-align: top;
+}
+
+.bp-activity-embed-display-media.two-col .thumb img {
+        border-right: 1px solid #ccc;
+        display: block;
         width: 100%;
 }