Changeset 6841

Timestamp:

03/08/2018 02:51:43 AM (9 years ago)

Author:

SergeyBiryukov

Message:

Breathe: Convert close button for Welcome box to a toggle.

Props dotrex, boemedia.
Fixes #3393.

Location:

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

Files:

• functions.php (modified) (3 diffs)
• style.css (modified) (2 diffs)

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

@@ -47 +47 @@
 
         // Cacheing hack
-        wp_enqueue_style( 'wporg-breathe', get_stylesheet_uri(), array( 'p2-breathe' ), '20180207a' );
+        wp_enqueue_style( 'wporg-breathe', get_stylesheet_uri(), array( 'p2-breathe' ), '20180208a' );
 }
 add_action( 'wp_enqueue_scripts', __NAMESPACE__ . '\styles', 11 );
@@ -60 +60 @@
         ?>
         <script type="text/javascript">
-                var el = document.getElementById( 'make-welcome-hide' );
+                var el = document.getElementById( 'make-welcome-toggle' );
                 if ( el ) {
                         el.addEventListener( 'click', function( e ) {
-                                document.cookie = el.dataset.cookie + '=' + el.dataset.hash +
-                                        '; expires=Fri, 31 Dec 9999 23:59:59 GMT' +
-                                        '; domain=<?php echo esc_js( $current_site->domain ); ?>' +
-                                        '; path=<?php echo esc_js( $current_site->path ); ?>';
-                                jQuery( '.make-welcome' ).slideUp();
+                                if ( jQuery( '.make-welcome .entry-content' ).is( ':hidden' ) ) {
+                                        document.cookie = el.dataset.cookie + '=' +
+                                                '; expires=Thu, 01 Jan 1970 00:00:00 GMT' +
+                                                '; domain=<?php echo esc_js( $current_site->domain ); ?>' +
+                                                '; path=<?php echo esc_js( $current_site->path ); ?>';
+                                        jQuery( '#make-welcome-toggle' ).text( '<?php esc_attr_e( 'Hide welcome box', 'wporg' ); ?>' );
+                                } else {
+                                        document.cookie = el.dataset.cookie + '=' + el.dataset.hash +
+                                                '; expires=Fri, 31 Dec 9999 23:59:59 GMT' +
+                                                '; domain=<?php echo esc_js( $current_site->domain ); ?>' +
+                                                '; path=<?php echo esc_js( $current_site->path ); ?>';
+                                        jQuery( '#make-welcome-toggle' ).text( '<?php esc_attr_e( 'Show welcome box', 'wporg' ); ?>' );
+                                }
+
+                                jQuery( '.make-welcome .entry-content' ).slideToggle();
+                                jQuery( '.make-welcome .post-edit-link' ).toggle();
                         } );
                 }
@@ -76 +87 @@
 
 function welcome_box() {
-        $welcome = get_page_by_path( 'welcome' );
-        $cookie  = 'welcome-' . get_current_blog_id();
-        $hash    = isset( $_COOKIE[ $cookie ] ) ? $_COOKIE[ $cookie ] : '';
+        $welcome      = get_page_by_path( 'welcome' );
+        $cookie       = 'welcome-' . get_current_blog_id();
+        $hash         = isset( $_COOKIE[ $cookie ] ) ? $_COOKIE[ $cookie ] : '';
         $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='content-area'>\n\n{$columns[0]}</div><div class='widget-area'>\n\n{$columns[1]}</div>";
-                }
-
-                setup_postdata( $welcome );
-
-                // Disable Jetpack sharing buttons
-                add_filter( 'sharing_show', '__return_false' );
+        if ( ! $welcome ) {
+                return;
+        }
+
+        if ( ! $hash || $content_hash !== $hash ) {
+                $class = '';
+                $label = __( 'Hide welcome box', 'wporg' );
+        } else {
+                $class = 'hidden';
+                $label = __( 'Show welcome box', 'wporg' );
+        }
+
+        $columns = preg_split( '|<hr\s*/?>|', $welcome->post_content );
+        if ( count( $columns ) === 2 ) {
+                $welcome->post_content = "<div class='content-area'>\n\n{$columns[0]}</div><div class='widget-area'>\n\n{$columns[1]}</div>";
+        }
+
+        setup_postdata( $welcome );
+
+        // Disable Jetpack sharing buttons
+        add_filter( 'sharing_show', '__return_false' );
         ?>
         <div class="make-welcome">
                 <div class="entry-meta">
-                        <?php edit_post_link( __( 'Edit', 'wporg' ), '', '', $welcome->ID ); ?>
-                        <button type="button" id="make-welcome-hide" class="toggle dashicons dashicons-no" data-hash="<?php echo $content_hash; ?>" data-cookie="<?php echo $cookie; ?>" title="<?php esc_attr_e( 'Hide this message', 'wporg' ); ?>"></button>
+                        <?php edit_post_link( __( 'Edit', 'wporg' ), '', '', $welcome->ID, 'post-edit-link ' . $class ); ?>
+                        <button type="button" id="make-welcome-toggle" data-hash="<?php echo $content_hash; ?>" data-cookie="<?php echo $cookie; ?>"><?php echo $label; ?></button>
                 </div>
-                <div class="entry-content clear">
+                <div class="entry-content clear <?php echo $class; ?>"">
                         <?php the_content(); ?>
                 </div>
         </div>
         <?php
-                remove_filter( 'sharing_show', '__return_false' );
-                wp_reset_postdata();
-        endif;
+        remove_filter( 'sharing_show', '__return_false' );
+        wp_reset_postdata();
 }
 add_action( 'wporg_breathe_after_header', __NAMESPACE__ . '\welcome_box' );

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

@@ -787 +787 @@
 
 .make-welcome .entry-meta {
-        margin: 15px;
+        margin: 1em;
         position: absolute;
         right: 0;
@@ -812 +812 @@
 .make-welcome .entry-meta [type="button"]:focus {
         outline: thin dotted;
+}
+
+.make-welcome .hidden {
+        display: none;
 }