<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[15810] trunk/wp-admin: Introduce submit_button().</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15810">15810</a></dd>
<dt>Author</dt> <dd>scribu</dd>
<dt>Date</dt> <dd>2010-10-14 19:58:06 +0000 (Thu, 14 Oct 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>Introduce submit_button(). Props markjaquith for initial patch. See <a href="http://trac.wordpress.org/ticket/15064">#15064</a></pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludestemplatephp">trunk/wp-admin/includes/template.php</a></li>
<li><a href="#trunkwpadminoptionsdiscussionphp">trunk/wp-admin/options-discussion.php</a></li>
<li><a href="#trunkwpadminoptionsgeneralphp">trunk/wp-admin/options-general.php</a></li>
<li><a href="#trunkwpadminoptionsmediaphp">trunk/wp-admin/options-media.php</a></li>
<li><a href="#trunkwpadminoptionspermalinkphp">trunk/wp-admin/options-permalink.php</a></li>
<li><a href="#trunkwpadminoptionsprivacyphp">trunk/wp-admin/options-privacy.php</a></li>
<li><a href="#trunkwpadminoptionsreadingphp">trunk/wp-admin/options-reading.php</a></li>
<li><a href="#trunkwpadminoptionswritingphp">trunk/wp-admin/options-writing.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludestemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/template.php (15809 => 15810)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/template.php        2010-10-14 19:07:05 UTC (rev 15809)
+++ trunk/wp-admin/includes/template.php        2010-10-14 19:58:06 UTC (rev 15810)
</span><span class="lines">@@ -2086,3 +2086,41 @@
</span><span class="cx">         $current_screen = apply_filters('current_screen', $current_screen);
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+/**
+ * Echos a paragraph-wrapped submit button, with provided text and appropriate class
+ *
+ * @since 3.1.0
+ *
+ * @param string $text The text of the button (defaults to 'Save Changes')
+ * @param string $type The type of button. One of: primary, secondary, delete
+ * @param string $name The HTML name of the submit button. Defaults to &quot;submit&quot;
+ */
+function submit_button( $text = NULL, $type = 'primary', $name = 'submit' ) {
+        echo get_submit_button( $text, $type, $name );
+}
+
+/**
+ * Returns a paragraph-wrapped submit button, with provided text and appropriate class
+ *
+ * @since 3.1.0
+ *
+ * @param string $text The text of the button (defaults to 'Save Changes')
+ * @param string $type The type of button. One of: primary, secondary, delete
+ * @param string $name The HTML name of the submit button. Defaults to &quot;submit&quot;
+ */
+function get_submit_button( $text = NULL, $type = 'primary', $name = 'submit' ) {
+        switch ( $type ) :
+                case 'primary' :
+                case 'secondary' :
+                        $class = 'button-' . $type;
+                        break;
+                case 'delete' :
+                        $class = 'button-secondary delete';
+                        break;
+                default :
+                        $class = $type; // Custom cases can just pass in the classes they want to be used
+        endswitch;
+        $text = ( NULL == $text ) ? __( 'Save Changes' ) : $text;
+        return '&lt;p class=&quot;submit&quot;&gt;&lt;input type=&quot;submit&quot; name=&quot;' . esc_attr( $name ) . '&quot; class=&quot;' . esc_attr( $class ) . '&quot; value=&quot;' . esc_attr( $text ) . '&quot; /&gt;&lt;/p&gt;';
+}
+
</ins></span></pre></div>
<a id="trunkwpadminoptionsdiscussionphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options-discussion.php (15809 => 15810)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options-discussion.php        2010-10-14 19:07:05 UTC (rev 15809)
+++ trunk/wp-admin/options-discussion.php        2010-10-14 19:58:06 UTC (rev 15810)
</span><span class="lines">@@ -240,9 +240,7 @@
</span><span class="cx"> 
</span><span class="cx"> &lt;?php do_settings_sections('discussion'); ?&gt;
</span><span class="cx"> 
</span><del>-&lt;p class=&quot;submit&quot;&gt;
-&lt;input type=&quot;submit&quot; name=&quot;Submit&quot; class=&quot;button-primary&quot; value=&quot;&lt;?php esc_attr_e('Save Changes') ?&gt;&quot; /&gt;
-&lt;/p&gt;
</del><ins>+&lt;?php submit_button(); ?&gt;
</ins><span class="cx"> &lt;/form&gt;
</span><span class="cx"> &lt;/div&gt;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkwpadminoptionsgeneralphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options-general.php (15809 => 15810)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options-general.php        2010-10-14 19:07:05 UTC (rev 15809)
+++ trunk/wp-admin/options-general.php        2010-10-14 19:58:06 UTC (rev 15810)
</span><span class="lines">@@ -347,9 +347,7 @@
</span><span class="cx"> 
</span><span class="cx"> &lt;?php do_settings_sections('general'); ?&gt;
</span><span class="cx"> 
</span><del>-&lt;p class=&quot;submit&quot;&gt;
-&lt;input type=&quot;submit&quot; name=&quot;Submit&quot; class=&quot;button-primary&quot; value=&quot;&lt;?php esc_attr_e('Save Changes') ?&gt;&quot; /&gt;
-&lt;/p&gt;
</del><ins>+&lt;?php submit_button(); ?&gt;
</ins><span class="cx"> &lt;/form&gt;
</span><span class="cx"> 
</span><span class="cx"> &lt;/div&gt;
</span></span></pre></div>
<a id="trunkwpadminoptionsmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options-media.php (15809 => 15810)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options-media.php        2010-10-14 19:07:05 UTC (rev 15809)
+++ trunk/wp-admin/options-media.php        2010-10-14 19:58:06 UTC (rev 15810)
</span><span class="lines">@@ -132,9 +132,7 @@
</span><span class="cx"> 
</span><span class="cx"> &lt;?php do_settings_sections('media'); ?&gt;
</span><span class="cx"> 
</span><del>-&lt;p class=&quot;submit&quot;&gt;
-        &lt;input type=&quot;submit&quot; name=&quot;Submit&quot; class=&quot;button-primary&quot; value=&quot;&lt;?php esc_attr_e('Save Changes') ?&gt;&quot; /&gt;
-&lt;/p&gt;
</del><ins>+&lt;?php submit_button(); ?&gt;
</ins><span class="cx"> 
</span><span class="cx"> &lt;/form&gt;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkwpadminoptionspermalinkphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options-permalink.php (15809 => 15810)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options-permalink.php        2010-10-14 19:07:05 UTC (rev 15809)
+++ trunk/wp-admin/options-permalink.php        2010-10-14 19:58:06 UTC (rev 15810)
</span><span class="lines">@@ -221,9 +221,7 @@
</span><span class="cx"> 
</span><span class="cx"> &lt;?php do_settings_sections('permalink'); ?&gt;
</span><span class="cx"> 
</span><del>-&lt;p class=&quot;submit&quot;&gt;
-        &lt;input type=&quot;submit&quot; name=&quot;submit&quot; class=&quot;button-primary&quot; value=&quot;&lt;?php esc_attr_e('Save Changes') ?&gt;&quot; /&gt;
-&lt;/p&gt;
</del><ins>+&lt;?php submit_button(); ?&gt;
</ins><span class="cx">   &lt;/form&gt;
</span><span class="cx"> &lt;?php if ( !is_multisite() ) { ?&gt;
</span><span class="cx"> &lt;?php if ( $iis7_permalinks ) :
</span></span></pre></div>
<a id="trunkwpadminoptionsprivacyphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options-privacy.php (15809 => 15810)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options-privacy.php        2010-10-14 19:07:05 UTC (rev 15809)
+++ trunk/wp-admin/options-privacy.php        2010-10-14 19:58:06 UTC (rev 15810)
</span><span class="lines">@@ -50,9 +50,7 @@
</span><span class="cx"> 
</span><span class="cx"> &lt;?php do_settings_sections('privacy'); ?&gt;
</span><span class="cx"> 
</span><del>-&lt;p class=&quot;submit&quot;&gt;
-        &lt;input type=&quot;submit&quot; name=&quot;Submit&quot; class=&quot;button-primary&quot; value=&quot;&lt;?php esc_attr_e('Save Changes') ?&gt;&quot; /&gt;
-&lt;/p&gt;
</del><ins>+&lt;?php submit_button(); ?&gt;
</ins><span class="cx"> &lt;/form&gt;
</span><span class="cx"> 
</span><span class="cx"> &lt;/div&gt;
</span></span></pre></div>
<a id="trunkwpadminoptionsreadingphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options-reading.php (15809 => 15810)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options-reading.php        2010-10-14 19:07:05 UTC (rev 15809)
+++ trunk/wp-admin/options-reading.php        2010-10-14 19:58:06 UTC (rev 15810)
</span><span class="lines">@@ -94,9 +94,7 @@
</span><span class="cx"> 
</span><span class="cx"> &lt;?php do_settings_sections( 'reading' ); ?&gt;
</span><span class="cx"> 
</span><del>-&lt;p class=&quot;submit&quot;&gt;
-        &lt;input type=&quot;submit&quot; name=&quot;Submit&quot; class=&quot;button-primary&quot; value=&quot;&lt;?php esc_attr_e( 'Save Changes' ); ?&gt;&quot; /&gt;
-&lt;/p&gt;
</del><ins>+&lt;?php submit_button(); ?&gt;
</ins><span class="cx"> &lt;/form&gt;
</span><span class="cx"> &lt;/div&gt;
</span><span class="cx"> &lt;?php include( './admin-footer.php' ); ?&gt;
</span></span></pre></div>
<a id="trunkwpadminoptionswritingphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options-writing.php (15809 => 15810)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options-writing.php        2010-10-14 19:07:05 UTC (rev 15809)
+++ trunk/wp-admin/options-writing.php        2010-10-14 19:58:06 UTC (rev 15810)
</span><span class="lines">@@ -148,9 +148,7 @@
</span><span class="cx"> 
</span><span class="cx"> &lt;?php do_settings_sections('writing'); ?&gt;
</span><span class="cx"> 
</span><del>-&lt;p class=&quot;submit&quot;&gt;
-        &lt;input type=&quot;submit&quot; name=&quot;Submit&quot; class=&quot;button-primary&quot; value=&quot;&lt;?php esc_attr_e('Save Changes') ?&gt;&quot; /&gt;
-&lt;/p&gt;
</del><ins>+&lt;?php submit_button(); ?&gt;
</ins><span class="cx"> &lt;/form&gt;
</span><span class="cx"> &lt;/div&gt;
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>