<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[6841] sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-breathe: Breathe: Convert close button for Welcome box to a toggle.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/6841">6841</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/6841","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-03-08 02:51:43 +0000 (Thu, 08 Mar 2018)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Breathe: Convert close button for Welcome box to a toggle.
Props dotrex, boemedia.
Fixes <a href="http://meta.trac.wordpress.org/ticket/3393">#3393</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgbreathefunctionsphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-breathe/functions.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgbreathestylecss">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-breathe/style.css</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgbreathefunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-breathe/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-breathe/functions.php 2018-03-07 22:07:35 UTC (rev 6840)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-breathe/functions.php 2018-03-08 02:51:43 UTC (rev 6841)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -46,7 +46,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_enqueue_style( 'p2-breathe', get_template_directory_uri() . '/style.css' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Cacheing hack
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- wp_enqueue_style( 'wporg-breathe', get_stylesheet_uri(), array( 'p2-breathe' ), '20180207a' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wp_enqueue_style( 'wporg-breathe', get_stylesheet_uri(), array( 'p2-breathe' ), '20180208a' );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wp_enqueue_scripts', __NAMESPACE__ . '\styles', 11 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -59,14 +59,25 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $current_site = get_site();
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <script type="text/javascript">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var el = document.getElementById( 'make-welcome-hide' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var el = document.getElementById( 'make-welcome-toggle' );
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( el ) {
</span><span class="cx" style="display: block; padding: 0 10px"> el.addEventListener( 'click', function( e ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 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();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 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();
</ins><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> </script>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -75,35 +86,45 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wp_footer', __NAMESPACE__ . '\inline_scripts' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function welcome_box() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $welcome = get_page_by_path( 'welcome' );
- $cookie = 'welcome-' . get_current_blog_id();
- $hash = isset( $_COOKIE[ $cookie ] ) ? $_COOKIE[ $cookie ] : '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $welcome = get_page_by_path( 'welcome' );
+ $cookie = 'welcome-' . get_current_blog_id();
+ $hash = isset( $_COOKIE[ $cookie ] ) ? $_COOKIE[ $cookie ] : '';
</ins><span class="cx" style="display: block; padding: 0 10px"> $content_hash = $welcome ? md5( $welcome->post_content ) : '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 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>";
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $welcome ) {
+ return;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- setup_postdata( $welcome );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $hash || $content_hash !== $hash ) {
+ $class = '';
+ $label = __( 'Hide welcome box', 'wporg' );
+ } else {
+ $class = 'hidden';
+ $label = __( 'Show welcome box', 'wporg' );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Disable Jetpack sharing buttons
- add_filter( 'sharing_show', '__return_false' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $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' );
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="make-welcome">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="entry-meta">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?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>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?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>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div class="entry-content clear">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="entry-content clear <?php echo $class; ?>"">
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php the_content(); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- remove_filter( 'sharing_show', '__return_false' );
- wp_reset_postdata();
- endif;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ remove_filter( 'sharing_show', '__return_false' );
+ wp_reset_postdata();
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wporg_breathe_after_header', __NAMESPACE__ . '\welcome_box' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgbreathestylecss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-breathe/style.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-breathe/style.css 2018-03-07 22:07:35 UTC (rev 6840)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-breathe/style.css 2018-03-08 02:51:43 UTC (rev 6841)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -786,7 +786,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> .make-welcome .entry-meta {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- margin: 15px;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ margin: 1em;
</ins><span class="cx" style="display: block; padding: 0 10px"> position: absolute;
</span><span class="cx" style="display: block; padding: 0 10px"> right: 0;
</span><span class="cx" style="display: block; padding: 0 10px"> top: 0;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -813,6 +813,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> outline: thin dotted;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.make-welcome .hidden {
+ display: none;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> @media screen and (min-width: 960px) {
</span><span class="cx" style="display: block; padding: 0 10px"> .make-welcome .entry-content p {
</span><span class="cx" style="display: block; padding: 0 10px"> display: block;
</span></span></pre>
</div>
</div>
</body>
</html>