Changeset 3631 for sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-breathe/header.php

Timestamp:

07/07/2016 06:04:37 AM (10 years ago)

Author:

pento

Message:

Breathe: Simplify the welcome message.

The welcome message is now two columns. Instead of requiring hard coded HTML in the page, it now just requires a <hr> to split the columns, so the page can be safely editing in the visual editor.

Fixes #1803.

File:

• sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-breathe/header.php (modified) (1 diff)

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-breathe/header.php

@@ -27 +27 @@
 $hash = isset( $_COOKIE[ $cookie ] ) ? $_COOKIE[ $cookie ] : '';
 
-if ( $welcome && md5( $welcome->post_content ) !== $hash ) {
+$content_hash = $welcome ? md5( $welcome->post_content ) : '';
+
+if ( $welcome && ( empty( $hash ) || $content_hash !== $hash ) ) {
+    $columns = preg_split( '|<hr\s*/?>|', $welcome->post_content );
+    if ( count( $columns ) === 2 ) {
+        $welcome->post_content = "<div class='first-column'>\n\n{$columns[0]}</div><div class='second-column'>\n\n{$columns[1]}</div>";
+    }
     setup_postdata( $welcome );
 ?>
 <div class="make-welcome-wrapper">
-    <span id="make-welcome-hide" class="dashicons dashicons-no" data-hash="<?php echo md5( $welcome->post_content ); ?>" data-cookie="<?php echo $cookie; ?>" title="<?php _e( 'Hide this message', 'p2-breathe' ); ?>"></span>
+    <span id="make-welcome-hide" class="dashicons dashicons-no" data-hash="<?php echo $content_hash; ?>" data-cookie="<?php echo $cookie; ?>" title="<?php _e( 'Hide this message', 'p2-breathe' ); ?>"></span>
     <div class="make-welcome">
         <?php