<!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>[2615] sites/branches/wcb-payment-request-statuses/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments: WordCamp.org: Better status flow for payment requests.</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/2615">2615</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/2615","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>kovshenin</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-02-25 19:02:13 +0000 (Thu, 25 Feb 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.org: Better status flow for payment requests.

Network administrators (super deputies) can see and change
the current request status and add incomplete notes.

Regular users (admins) can only take the request from draft
to pending-approval, or from incomplete to draft/pending-approval.
After a request is pending approval or any further status, the
author can no longer edit it, unless a network admin explicitly
set it to draft or incomplete.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#sitesbrancheswcbpaymentrequeststatuseswordcamporgpublic_htmlwpcontentpluginswordcamppaymentscsswordcampbudgetscss">sites/branches/wcb-payment-request-statuses/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/css/wordcamp-budgets.css</a></li>
<li><a href="#sitesbrancheswcbpaymentrequeststatuseswordcamporgpublic_htmlwpcontentpluginswordcamppaymentsincludespaymentrequestphp">sites/branches/wcb-payment-request-statuses/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/payment-request.php</a></li>
<li><a href="#sitesbrancheswcbpaymentrequeststatuseswordcamporgpublic_htmlwpcontentpluginswordcamppaymentsviewspaymentrequestmetaboxstatusphp">sites/branches/wcb-payment-request-statuses/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/payment-request/metabox-status.php</a></li>
</ul>

<h3>Property Changed</h3>
<ul>
<li><a href="#sitesbrancheswcbpaymentrequeststatuseswordcamporgpublic_htmlwpcontentpluginswordcamppayments">sites/branches/wcb-payment-request-statuses/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: sites/branches/wcb-payment-request-statuses/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments
</span><span class="cx" style="display: block; padding: 0 10px">===================================================================
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">--- sites/branches/wcb-payment-request-statuses/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments    2016-02-25 18:44:43 UTC (rev 2614)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ sites/branches/wcb-payment-request-statuses/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments     2016-02-25 19:02:13 UTC (rev 2615)
</ins><a id="sitesbrancheswcbpaymentrequeststatuseswordcamporgpublic_htmlwpcontentpluginswordcamppayments"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: sites/branches/wcb-payment-request-statuses/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: svn:mergeinfo</h4></div>
<del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments:2603-2609
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/sites/trunk/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments:2603-2612
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="sitesbrancheswcbpaymentrequeststatuseswordcamporgpublic_htmlwpcontentpluginswordcamppaymentscsswordcampbudgetscss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/branches/wcb-payment-request-statuses/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/css/wordcamp-budgets.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/branches/wcb-payment-request-statuses/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/css/wordcamp-budgets.css        2016-02-25 18:44:43 UTC (rev 2614)
+++ sites/branches/wcb-payment-request-statuses/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/css/wordcamp-budgets.css  2016-02-25 19:02:13 UTC (rev 2615)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,6 +13,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">        width: 100%;
</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">+#submitpost.wcb .misc-pub-section select {
+       font-weight: normal;
+}
+
+#wcb-save-draft {
+       float: left;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /* Forms */
</span><span class="cx" style="display: block; padding: 0 10px"> .wcb-form {
</span><span class="cx" style="display: block; padding: 0 10px">        display: table;
</span></span></pre></div>
<a id="sitesbrancheswcbpaymentrequeststatuseswordcamporgpublic_htmlwpcontentpluginswordcamppaymentsincludespaymentrequestphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/branches/wcb-payment-request-statuses/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/payment-request.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/branches/wcb-payment-request-statuses/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/payment-request.php    2016-02-25 18:44:43 UTC (rev 2614)
+++ sites/branches/wcb-payment-request-statuses/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/includes/payment-request.php      2016-02-25 19:02:13 UTC (rev 2615)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,7 +22,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( 'display_post_states',    array( $this, 'display_post_states' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                // Saving posts
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                add_filter( 'wp_insert_post_data',    array( $this, 'ensure_post_date_gmt_set' ), 10, 2 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         add_filter( 'wp_insert_post_data',    array( $this, 'wp_insert_post_data' ), 10, 2 );
</ins><span class="cx" style="display: block; padding: 0 10px">                 add_action( 'save_post',              array( $this, 'save_payment' ), 10, 2 );
</span><span class="cx" style="display: block; padding: 0 10px">                add_filter( 'map_meta_cap',           array( $this, 'modify_capabilities' ), 10, 4 );
</span><span class="cx" style="display: block; padding: 0 10px">                add_action( 'transition_post_status', array( $this, 'transition_post_status' ), 10, 3 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -287,10 +287,17 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        $post->post_status = $back_compat_statuses[ $post->post_status ];
</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">-                $submit_text = 'auto-draft' == $post->post_status ? __( 'Submit', 'wordcamporg' ) : __( 'Update', 'wordcamporg' );
</del><span class="cx" style="display: block; padding: 0 10px">                 $editable_statuses = array( 'auto-draft', 'draft', 'wcb-incomplete' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $current_user_can_edit_request = in_array( $post->post_status, $editable_statuses ) || current_user_can( 'manage_network' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $current_user_can_edit_request = false;
+               $submit_text = _x( 'Update', 'payment request', 'wordcamporg' );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                if ( current_user_can( 'manage_network' ) ) {
+                       $current_user_can_edit_request = true;
+               } elseif ( in_array( $post->post_status, $editable_statuses ) ) {
+                       $submit_text = __( 'Submit for Review', 'wordcamporg' );
+                       $current_user_can_edit_request = true;
+               }
+
</ins><span class="cx" style="display: block; padding: 0 10px">                 $date_vendor_paid = get_post_meta( $post->ID, '_camppayments_date_vendor_paid', true );
</span><span class="cx" style="display: block; padding: 0 10px">                if ( current_user_can( 'manage_network' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px">                        $date_vendor_paid_readonly = false;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -299,6 +306,8 @@
</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">                $incomplete_notes = get_post_meta( $post->ID, '_wcp_incomplete_notes', true );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                $incomplete_readonly = ! current_user_can( 'manage_network' ) ? 'readonly' : '';
+
</ins><span class="cx" style="display: block; padding: 0 10px">                 require_once( dirname( __DIR__ ) . '/views/payment-request/metabox-status.php' );
</span><span class="cx" style="display: block; padding: 0 10px">        }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -584,22 +593,36 @@
</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">-         * Ensure that new posts have the `post_date_gmt` field populated.
</del><span class="cx" style="display: block; padding: 0 10px">          *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * Core only handles this for post types that use the `draft` status (see r8636).
-        *
</del><span class="cx" style="display: block; padding: 0 10px">          * @param array $post_data
</span><span class="cx" style="display: block; padding: 0 10px">         * @param array $post_data_raw
</span><span class="cx" style="display: block; padding: 0 10px">         *
</span><span class="cx" style="display: block; padding: 0 10px">         * @return array
</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 ensure_post_date_gmt_set( $post_data, $post_data_raw ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function wp_insert_post_data( $post_data, $post_data_raw ) {
+               if ( $post_data['post_type'] != self::POST_TYPE )
+                       return $post_data;
+
+               // Ensure that new posts have the `post_date_gmt` field populated.
</ins><span class="cx" style="display: block; padding: 0 10px">                 if ( 'auto-draft' !== $post_data['post_status'] ) {
</span><span class="cx" style="display: block; padding: 0 10px">                        if ( '0000-00-00 00:00:00' === $post_data['post_date_gmt'] ) {
</span><span class="cx" style="display: block; padding: 0 10px">                                $post_data['post_date_gmt'] = get_gmt_from_date( $post_data['post_date'] );
</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">+                // Save Draft button was clicked.
+               if ( ! empty( $post_data_raw['wcb-save-draft'] ) ) {
+                       $post_data['post_status'] = 'draft';
+               }
+
+               // Submit for Review button was clicked.
+               if ( ! current_user_can( 'manage_network' ) ) {
+                       $editable_statuses = array( 'auto-draft', 'draft', 'wcb-incomplete' );
+                       if ( ! empty( $post_data_raw['wcb-update'] ) && in_array( $post_data['post_status'], $editable_statuses ) ) {
+                               $post_data['post_status'] = 'wcb-pending-approval';
+                       }
+               }
+
</ins><span class="cx" style="display: block; padding: 0 10px">                 return $post_data;
</span><span class="cx" style="display: block; padding: 0 10px">        }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span></span></pre></div>
<a id="sitesbrancheswcbpaymentrequeststatuseswordcamporgpublic_htmlwpcontentpluginswordcamppaymentsviewspaymentrequestmetaboxstatusphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/branches/wcb-payment-request-statuses/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/payment-request/metabox-status.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/branches/wcb-payment-request-statuses/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/payment-request/metabox-status.php        2016-02-25 18:44:43 UTC (rev 2614)
+++ sites/branches/wcb-payment-request-statuses/wordcamp.org/public_html/wp-content/plugins/wordcamp-payments/views/payment-request/metabox-status.php  2016-02-25 19:02:13 UTC (rev 2615)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,7 +1,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="submitpost" class="wcb submitbox">
</span><span class="cx" style="display: block; padding: 0 10px">        <div id="minor-publishing">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+               <?php if ( $current_user_can_edit_request && ! current_user_can( 'manage_network' ) ) : ?>
+               <div id="minor-publishing-actions">
+                       <div id="save-action">
+                               <?php submit_button( __( 'Save Draft', 'wordcamporg' ), 'button', 'wcb-save-draft', false ); ?>
+                               <span class="spinner"></span>
+                       </div>
+                       <div class="clear"></div>
+               </div>
+               <?php endif; ?>
+
</ins><span class="cx" style="display: block; padding: 0 10px">                 <div id="misc-publishing-actions">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px">                         <div class="misc-pub-section">
</span><span class="cx" style="display: block; padding: 0 10px">                                <?php _e( 'ID:', 'wordcamporg' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">                                <span>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -16,6 +26,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                                </span>
</span><span class="cx" style="display: block; padding: 0 10px">                        </div>
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                        <?php if ( $post->post_status != 'auto-draft' ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px">                         <div class="misc-pub-section">
</span><span class="cx" style="display: block; padding: 0 10px">                                <?php $this->render_text_input( $post, 'Date Vendor was Paid', 'date_vendor_paid', '', 'date', array(), $date_vendor_paid_readonly ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">                        </div>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -40,16 +51,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                                                        <?php $status = get_post_status_object( $post->post_status ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">                                                        <?php echo esc_html( $status->label ); ?>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                                        <input type="hidden" name="post_status" value="<?php echo esc_attr( $post->post_status ); ?>" />
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                                                <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">                                        </span>
</span><span class="cx" style="display: block; padding: 0 10px">                                </label>
</span><span class="cx" style="display: block; padding: 0 10px">                        </div>
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                        <?php endif; ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        <div class="misc-pub-section hide-if-js wcb-mark-incomplete-notes">
</span><span class="cx" style="display: block; padding: 0 10px">                                <label for="wcp_mark_incomplete_notes">What information is needed?</label>
</span><span class="cx" style="display: block; padding: 0 10px">                                <textarea id="wcp_mark_incomplete_notes" name="wcp_mark_incomplete_notes" class="large-text" rows="5"
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                        placeholder="Need to attach receipt, etc"><?php echo esc_textarea( $incomplete_notes ); ?></textarea>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                                 placeholder="Need to attach receipt, etc" <?php echo $incomplete_readonly; ?>><?php echo esc_textarea( $incomplete_notes ); ?></textarea>
</ins><span class="cx" style="display: block; padding: 0 10px">                         </div>
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        <div class="clear"></div>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -72,14 +85,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        <div id="publishing-action">
</span><span class="cx" style="display: block; padding: 0 10px">                                <input name="original_publish" type="hidden" id="original_publish" value="<?php esc_attr( $submit_text ) ?>" />
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                <?php submit_button( $submit_text, 'primary button-large', 'save', false, array( 'accesskey' => 'p' ) ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         <?php submit_button( $submit_text, 'primary button-large', 'wcb-update', false, array( 'accesskey' => 'p' ) ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px">                         </div>
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        <div class="clear"></div>
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                <?php else : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                        <p><?php _e( 'Paid requests are closed and cannot be edited.', 'wordcamporg' ); ?></p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 <?php _e( 'This request can not be edited.', 'wordcamporg' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px">        </div> <!-- #major-publishing-actions -->
</span></span></pre>
</div>
</div>

</body>
</html>