<!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>[5603] sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-coming-soon-page: WordCamp Coming Soon: Add Customizer field for custom intro message</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/5603">5603</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/5603","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>coreymckrill</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-06-29 19:13:33 +0000 (Thu, 29 Jun 2017)</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'>WordCamp Coming Soon: Add Customizer field for custom intro message
This adds a new setting and control to the Coming Soon Page section
in the Customizer. Content added to the Custom Message textarea will
replace the default message shown on the Coming Soon page beneath the
header. This allows organizers a bit more flexibility in what they
communicate to site visitors before the site is officially launched.
Fixes <a href="http://meta.trac.wordpress.org/ticket/2901">#2901</a>
Props Kau-Boy</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampcomingsoonpageclasseswccspcustomizerphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-coming-soon-page/classes/wccsp-customizer.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampcomingsoonpageclasseswccspsettingsphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-coming-soon-page/classes/wccsp-settings.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampcomingsoonpageclasseswordcampcomingsoonpagephp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-coming-soon-page/classes/wordcamp-coming-soon-page.php</a></li>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampcomingsoonpageviewstemplatecomingsoonphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-coming-soon-page/views/template-coming-soon.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampcomingsoonpageclasseswccspcustomizerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-coming-soon-page/classes/wccsp-customizer.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-coming-soon-page/classes/wccsp-customizer.php 2017-06-29 14:53:29 UTC (rev 5602)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-coming-soon-page/classes/wccsp-customizer.php 2017-06-29 19:13:33 UTC (rev 5603)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -127,9 +127,42 @@
</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"> );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $wp_customize->add_setting(
+ 'wccsp_settings[introduction]',
+ array(
+ 'default' => '',
+ 'type' => 'option',
+ 'capability' => $GLOBALS['WCCSP_Settings']::REQUIRED_CAPABILITY,
+ 'sanitize_callback' => array( $this, 'sanitize_introduction' ),
+ )
+ );
+
+ $wp_customize->add_control(
+ 'wccsp_settings[introduction]',
+ array(
+ 'label' => __( 'Custom Message', 'wordcamporg' ),
+ 'description' => __( 'This will replace the default message shown beneath the header.', 'wordcamporg' ),
+ 'section' => 'wccsp_live_preview',
+ 'type' => 'textarea',
+ )
+ );
</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"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Sanitize the contents of the Custom Message textarea before storing in the database.
+ *
+ * This uses the same sanitization strategy as menu item descriptions and post content in wp_insert_post.
+ *
+ * @param string $value The unsanitized introduction string.
+ *
+ * @return string The sanitized introduction string.
+ */
+ public function sanitize_introduction( $value ) {
+ return wp_unslash( apply_filters( 'content_save_pre', wp_slash( $value ) ) );
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Enqueue scripts and styles for the Customizer
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function enqueue_customizer_scripts() {
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampcomingsoonpageclasseswccspsettingsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-coming-soon-page/classes/wccsp-settings.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-coming-soon-page/classes/wccsp-settings.php 2017-06-29 14:53:29 UTC (rev 5602)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-coming-soon-page/classes/wccsp-settings.php 2017-06-29 19:13:33 UTC (rev 5603)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -39,6 +39,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'background_id' => 0,
</span><span class="cx" style="display: block; padding: 0 10px"> 'container_background_color' => '#FFFFFF', // deprecated
</span><span class="cx" style="display: block; padding: 0 10px"> 'text_color' => '#000000', // deprecated
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'introduction' => '',
</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"> $settings = shortcode_atts(
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampcomingsoonpageclasseswordcampcomingsoonpagephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-coming-soon-page/classes/wordcamp-coming-soon-page.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-coming-soon-page/classes/wordcamp-coming-soon-page.php 2017-06-29 14:53:29 UTC (rev 5602)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-coming-soon-page/classes/wordcamp-coming-soon-page.php 2017-06-29 19:13:33 UTC (rev 5603)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -118,6 +118,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'active_modules' => Jetpack::$instance->get_active_modules(),
</span><span class="cx" style="display: block; padding: 0 10px"> 'contact_form_shortcode' => $this->get_contact_form_shortcode(),
</span><span class="cx" style="display: block; padding: 0 10px"> 'colors' => $this->get_colors(),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'introduction' => $this->get_introduction(),
</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"> return $variables;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -271,4 +272,15 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $contact_form_shortcode;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * Retrieve the optional introduction overwriting the default string.
+ *
+ * @return string
+ */
+ public function get_introduction() {
+ $settings = $GLOBALS['WCCSP_Settings']->get_settings();
+
+ return $settings['introduction'];
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> } // end WordCamp_Coming_Soon_Page
</span></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampcomingsoonpageviewstemplatecomingsoonphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-coming-soon-page/views/template-coming-soon.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-coming-soon-page/views/template-coming-soon.php 2017-06-29 14:53:29 UTC (rev 5602)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-coming-soon-page/views/template-coming-soon.php 2017-06-29 19:13:33 UTC (rev 5603)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -41,14 +41,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="wccsp-container">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="wccsp-introduction">
</span><span class="cx" style="display: block; padding: 0 10px"> <p id="wccsp-introduction">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php printf(
- // translators: %s is the name of the blog
- __(
- '%s is in the early planning stages. In the meantime, you can subscribe to updates above, or contact the organizers below to get involved.',
- 'wordcamporg'
- ),
- esc_html( get_bloginfo( 'name' ) )
- ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( ! empty( $introduction ) ) : ?>
+ <?php echo wp_kses_post( $introduction ); ?>
+ <?php else : ?>
+ <?php printf(
+ /* translators: %s is the name of the blog. */
+ __(
+ '%s is in the early planning stages. In the meantime, you can subscribe to updates above, or contact the organizers below to get involved.',
+ 'wordcamporg'
+ ),
+ esc_html( get_bloginfo( 'name' ) )
+ ); ?>
+ <?php endif; ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .wccsp-introduction -->
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>