Changeset 3631

Timestamp:

07/07/2016 06:04:37 AM (9 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.

Location:

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

Files:

• functions.php (modified) (1 diff)
• header.php (modified) (1 diff)
• style.css (modified) (4 diffs)

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

@@ -7 +7 @@
 
     // Cacheing hack
-    wp_enqueue_style( 'wporg-breathe', get_stylesheet_uri(), array( 'p2-breathe' ), '20160707' );
+    wp_enqueue_style( 'wporg-breathe', get_stylesheet_uri(), array( 'p2-breathe' ), '20160707a' );
 }
 add_action( 'wp_enqueue_scripts', __NAMESPACE__ . '\styles', 11 );

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

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-breathe/style.css

@@ -314 +314 @@
 #make-welcome-hide {
     float: right;
-    margin: 30px;
+    margin: 15px;
     cursor: pointer;
 }
@@ -349 +349 @@
 }
 
+.make-welcome .first-column {
+    width: 71%;
+    display: inline-block;
+}
+
+.make-welcome .second-column {
+    width: 25%;
+    float: right;
+}
+
 .make-welcome .welcome {
     padding-top: 1%;
@@ -362 +372 @@
     text-align: right;
     margin: 0 5px 5px 0;
+    clear: both;
 }
 
@@ -387 +398 @@
     }
 }
+
+@media screen and (max-width: 1000px) {
+    .make-welcome .first-column,
+    .make-welcome .second-column {
+        width: 100%;
+        float: none;
+        clear: both;
+    }
+}