<!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>[3877] sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-forms-to-drafts: WordCamp Forms to Drafts: Restore a disabled version of form to avoid confusion</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/3877">3877</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/3877","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>iandunn</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-08-29 21:15:57 +0000 (Mon, 29 Aug 2016)</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 Forms to Drafts: Restore a disabled version of form to avoid confusion
Hiding the form can confuse people because they expect to see a form and don't, making them wonder if they are on the wrong page, etc.
Showing a disabled version of it, along with making the warning message stand out more, makes it much more obvious that they need to perform an action before they can fill it out.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampformstodraftswordcampformstodraftsphp">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-forms-to-drafts/wordcamp-forms-to-drafts.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampformstodraftsfrontendcss">sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-forms-to-drafts/front-end.css</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampformstodraftsfrontendcss"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-forms-to-drafts/front-end.css</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-forms-to-drafts/front-end.css (rev 0)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-forms-to-drafts/front-end.css 2016-08-29 21:15:57 UTC (rev 3877)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,45 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.wcfd-disabled-form {
+ position: relative;
+}
+
+ .wcfd-disabled-form #wcorg-login-message {
+ position: absolute;
+ z-index: 10;
+ margin: 2.4em;
+ padding: 1.8em;
+ background-color: #F56E28;
+ border-radius: .25em;
+ margin-bottom: 2em;
+ }
+
+ .wcfd-disabled-form #wcorg-login-message p {
+ color: white !important /* !important to prevent theme from unintentionally overriding */;
+ }
+
+ .wcfd-disabled-form #wcorg-login-message p:last-child {
+ margin-bottom: 0;
+ }
+
+ .wcfd-disabled-form #wcorg-login-message a {
+ color: #a20000 !important /* !important to prevent theme from unintentionally overriding */;
+ font-weight: bold;
+ }
+
+ .wcfd-overlay {
+ position: absolute;
+ z-index: 5;
+ width: 100%;
+ height: 100%;
+ background-color: black;
+ opacity: .5;
+ }
+
+ .wcfd-disabled-form div[id^="contact-form-"] {
+ padding: 1.8em;
+ }
+
+@media screen and ( min-width: 470px ) {
+ .wcfd-disabled-form #wcorg-login-message {
+ margin: 4em;
+ }
+}
</ins></span></pre></div>
<a id="sitestrunkwordcamporgpublic_htmlwpcontentpluginswordcampformstodraftswordcampformstodraftsphp"></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-forms-to-drafts/wordcamp-forms-to-drafts.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-forms-to-drafts/wordcamp-forms-to-drafts.php 2016-08-29 21:15:53 UTC (rev 3876)
+++ sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-forms-to-drafts/wordcamp-forms-to-drafts.php 2016-08-29 21:15:57 UTC (rev 3877)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -21,22 +21,41 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Constructor
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function __construct() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- add_filter( 'the_content', array( $this, 'force_login_to_view_form' ), 9 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_action( 'wp_print_styles', array( $this, 'print_front_end_styles' ) );
+ add_filter( 'the_content', array( $this, 'force_login_to_use_form' ), 9 );
</ins><span class="cx" style="display: block; padding: 0 10px"> add_action( 'template_redirect', array( $this, 'populate_form_based_on_user' ), 9 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'grunion_pre_message_sent', array( $this, 'call_for_sponsors' ), 10, 3 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'grunion_pre_message_sent', array( $this, 'call_for_speakers' ), 10, 3 );
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Force user to login to view certain forms.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Print CSS for the front-end
+ */
+ public function print_front_end_styles() {
+ if ( ! $this->form_requires_login( $this->get_current_form_id() ) ) {
+ return;
+ }
+
+ ?>
+
+ <style>
+ <?php require_once( __DIR__ . '/front-end.css' ); ?>
+ </style>
+
+ <?php
+ }
+
+ /**
+ * Force user to login to use certain forms.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $content
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function force_login_to_view_form( $content ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function force_login_to_use_form( $content ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $form_id = $this->get_current_form_id();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $shortcode_pattern = '/\[contact-form[\D\S]+\[\/contact-form\]/';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $please_login_message = '';
+ // todo realign
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $this->form_requires_login( $form_id ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return $content;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -51,16 +70,31 @@
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</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 ( ! empty( $please_login_message ) ) {
- $please_login_message = str_replace(
- __( 'Please use your <strong>WordPress.org</strong>* account to log in.', 'wordcamporg' ),
- $please_login_message,
- wcorg_login_message( '', get_permalink() )
- );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return $this->inject_disabled_form_elements( $content, $please_login_message );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $content = preg_replace( $shortcode_pattern, $please_login_message, $content );
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Inject the HTML elements that are used to disable a form until the user logs in
+ *
+ * @param string $content
+ * @param string $please_login_message
+ *
+ * @return string
+ */
+ protected function inject_disabled_form_elements( $content, $please_login_message ) {
+ $please_login_message = str_replace(
+ __( 'Please use your <strong>WordPress.org</strong>* account to log in.', 'wordcamporg' ),
+ $please_login_message,
+ wcorg_login_message( '', get_permalink() )
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Prevent wpautop() from converting tabs into empty paragraphs in #wcorg-login-message
+ $please_login_message = trim( str_replace( "\t", '', $please_login_message ) );
+
+ $form_wrapper = '<div class="wcfd-disabled-form">' . $please_login_message . '<div class="wcfd-overlay"></div> [contact-form';
+ $content = str_replace( '[contact-form', $form_wrapper, $content );
+ $content = str_replace( '[/contact-form]', '[/contact-form]</div>', $content );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> return $content;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>