<!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>[16061] trunk: Expand submit_button() capabilities.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/16061">16061</a></dd>
<dt>Author</dt> <dd>markjaquith</dd>
<dt>Date</dt> <dd>2010-10-28 21:56:43 +0000 (Thu, 28 Oct 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Expand submit_button() capabilities. Replace all (or almost all) manual HTML instances in WP. props sbressler. see <a href="http://trac.wordpress.org/ticket/15064">#15064</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmincommentphp">trunk/wp-admin/comment.php</a></li>
<li><a href="#trunkwpadmincustombackgroundphp">trunk/wp-admin/custom-background.php</a></li>
<li><a href="#trunkwpadmincustomheaderphp">trunk/wp-admin/custom-header.php</a></li>
<li><a href="#trunkwpadmineditcommentsphp">trunk/wp-admin/edit-comments.php</a></li>
<li><a href="#trunkwpadmineditformcommentphp">trunk/wp-admin/edit-form-comment.php</a></li>
<li><a href="#trunkwpadminedittagsphp">trunk/wp-admin/edit-tags.php</a></li>
<li><a href="#trunkwpadmineditphp">trunk/wp-admin/edit.php</a></li>
<li><a href="#trunkwpadminexportphp">trunk/wp-admin/export.php</a></li>
<li><a href="#trunkwpadminincludesclasswplisttablephp">trunk/wp-admin/includes/class-wp-list-table.php</a></li>
<li><a href="#trunkwpadminincludesdashboardphp">trunk/wp-admin/includes/dashboard.php</a></li>
<li><a href="#trunkwpadminincludesfilephp">trunk/wp-admin/includes/file.php</a></li>
<li><a href="#trunkwpadminincludeslisttablecommentsphp">trunk/wp-admin/includes/list-table-comments.php</a></li>
<li><a href="#trunkwpadminincludeslisttablelinksphp">trunk/wp-admin/includes/list-table-links.php</a></li>
<li><a href="#trunkwpadminincludeslisttablemediaphp">trunk/wp-admin/includes/list-table-media.php</a></li>
<li><a href="#trunkwpadminincludeslisttablepluginsphp">trunk/wp-admin/includes/list-table-plugins.php</a></li>
<li><a href="#trunkwpadminincludeslisttablepostsphp">trunk/wp-admin/includes/list-table-posts.php</a></li>
<li><a href="#trunkwpadminincludeslisttableusersphp">trunk/wp-admin/includes/list-table-users.php</a></li>
<li><a href="#trunkwpadminincludesmediaphp">trunk/wp-admin/includes/media.php</a></li>
<li><a href="#trunkwpadminincludesmetaboxesphp">trunk/wp-admin/includes/meta-boxes.php</a></li>
<li><a href="#trunkwpadminincludesnavmenuphp">trunk/wp-admin/includes/nav-menu.php</a></li>
<li><a href="#trunkwpadminincludesplugininstallphp">trunk/wp-admin/includes/plugin-install.php</a></li>
<li><a href="#trunkwpadminincludestemplatephp">trunk/wp-admin/includes/template.php</a></li>
<li><a href="#trunkwpadminincludesthemeinstallphp">trunk/wp-admin/includes/theme-install.php</a></li>
<li><a href="#trunkwpadminincludeswidgetsphp">trunk/wp-admin/includes/widgets.php</a></li>
<li><a href="#trunkwpadmininstallphp">trunk/wp-admin/install.php</a></li>
<li><a href="#trunkwpadminlinkmanagerphp">trunk/wp-admin/link-manager.php</a></li>
<li><a href="#trunkwpadminmediauploadphp">trunk/wp-admin/media-upload.php</a></li>
<li><a href="#trunkwpadminmediaphp">trunk/wp-admin/media.php</a></li>
<li><a href="#trunkwpadminmsdeletesitephp">trunk/wp-admin/ms-delete-site.php</a></li>
<li><a href="#trunkwpadminmysitesphp">trunk/wp-admin/my-sites.php</a></li>
<li><a href="#trunkwpadminnavmenusphp">trunk/wp-admin/nav-menus.php</a></li>
<li><a href="#trunkwpadminnetworkeditphp">trunk/wp-admin/network/edit.php</a></li>
<li><a href="#trunkwpadminnetworksitesphp">trunk/wp-admin/network/sites.php</a></li>
<li><a href="#trunkwpadminnetworkthemesphp">trunk/wp-admin/network/themes.php</a></li>
<li><a href="#trunkwpadminnetworkusersphp">trunk/wp-admin/network/users.php</a></li>
<li><a href="#trunkwpadminnetworkphp">trunk/wp-admin/network.php</a></li>
<li><a href="#trunkwpadminoptionsphp">trunk/wp-admin/options.php</a></li>
<li><a href="#trunkwpadminplugineditorphp">trunk/wp-admin/plugin-editor.php</a></li>
<li><a href="#trunkwpadminpluginsphp">trunk/wp-admin/plugins.php</a></li>
<li><a href="#trunkwpadminpressthisphp">trunk/wp-admin/press-this.php</a></li>
<li><a href="#trunkwpadminsetupconfigphp">trunk/wp-admin/setup-config.php</a></li>
<li><a href="#trunkwpadminthemeeditorphp">trunk/wp-admin/theme-editor.php</a></li>
<li><a href="#trunkwpadminthemesphp">trunk/wp-admin/themes.php</a></li>
<li><a href="#trunkwpadminupdatecorephp">trunk/wp-admin/update-core.php</a></li>
<li><a href="#trunkwpadminuploadphp">trunk/wp-admin/upload.php</a></li>
<li><a href="#trunkwpadminusernewphp">trunk/wp-admin/user-new.php</a></li>
<li><a href="#trunkwpadminusersphp">trunk/wp-admin/users.php</a></li>
<li><a href="#trunkwpadminwidgetsphp">trunk/wp-admin/widgets.php</a></li>
<li><a href="#trunkwpincludescommenttemplatephp">trunk/wp-includes/comment-template.php</a></li>
<li><a href="#trunkwpincludesgeneraltemplatephp">trunk/wp-includes/general-template.php</a></li>
<li><a href="#trunkwpincludesposttemplatephp">trunk/wp-includes/post-template.php</a></li>
<li><a href="#trunkwpincludespostphp">trunk/wp-includes/post.php</a></li>
<li><a href="#trunkwpincludesthemecompatcommentspopupphp">trunk/wp-includes/theme-compat/comments-popup.php</a></li>
<li><a href="#trunkwpincludesthemecompatcommentsphp">trunk/wp-includes/theme-compat/comments.php</a></li>
<li><a href="#trunkwploginphp">trunk/wp-login.php</a></li>
<li><a href="#trunkwpsignupphp">trunk/wp-signup.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadmincommentphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/comment.php (16060 => 16061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/comment.php 2010-10-28 21:03:16 UTC (rev 16060)
+++ trunk/wp-admin/comment.php 2010-10-28 21:56:43 UTC (rev 16061)
</span><span class="lines">@@ -180,7 +180,7 @@
</span><span class="cx"> <table width="100%">
</span><span class="cx"> <tr>
</span><span class="cx"> <td><a class="button" href="<?php echo admin_url('edit-comments.php'); ?>"><?php esc_attr_e('No'); ?></a></td>
</span><del>-<td class="textright"><input type='submit' class="button" value='<?php echo esc_attr($button); ?>' /></td>
</del><ins>+<td class="textright"><?php submit_button( $button, 'button' ); ?></td>
</ins><span class="cx"> </tr>
</span><span class="cx"> </table>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadmincustombackgroundphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/custom-background.php (16060 => 16061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/custom-background.php 2010-10-28 21:03:16 UTC (rev 16060)
+++ trunk/wp-admin/custom-background.php 2010-10-28 21:56:43 UTC (rev 16061)
</span><span class="lines">@@ -210,7 +210,7 @@
</span><span class="cx"> <td>
</span><span class="cx"> <form method="post" action="">
</span><span class="cx"> <?php wp_nonce_field('custom-background-remove', '_wpnonce-custom-background-remove'); ?>
</span><del>-<input type="submit" class="button" name="remove-background" value="<?php esc_attr_e('Remove Background Image'); ?>" /><br/>
</del><ins>+<?php submit_button( __( 'Remove Background Image' ), 'button', 'remove-background', false ); ?><br/>
</ins><span class="cx"> <?php _e('This will remove the background image. You will not be able to restore any customizations.') ?>
</span><span class="cx"> </form>
</span><span class="cx"> </td>
</span><span class="lines">@@ -223,7 +223,7 @@
</span><span class="cx"> <td>
</span><span class="cx"> <form method="post" action="">
</span><span class="cx"> <?php wp_nonce_field('custom-background-reset', '_wpnonce-custom-background-reset'); ?>
</span><del>-<input type="submit" class="button" name="reset-background" value="<?php esc_attr_e('Restore Original Image'); ?>" /><br/>
</del><ins>+<?php submit_button( __( 'Restore Original Image' ), 'button', 'reset-background', false ); ?><br/>
</ins><span class="cx"> <?php _e('This will restore the original background image. You will not be able to restore any customizations.') ?>
</span><span class="cx"> </form>
</span><span class="cx"> </td>
</span><span class="lines">@@ -236,7 +236,7 @@
</span><span class="cx"> <label for="upload"><?php _e('Choose an image from your computer:'); ?></label><br /><input type="file" id="upload" name="import" />
</span><span class="cx"> <input type="hidden" name="action" value="save" />
</span><span class="cx"> <?php wp_nonce_field('custom-background-upload', '_wpnonce-custom-background-upload') ?>
</span><del>-<input type="submit" class="button" value="<?php esc_attr_e('Upload'); ?>" />
</del><ins>+<?php submit_button( __( 'Upload' ), 'button', 'submit', false ); ?>
</ins><span class="cx"> </p>
</span><span class="cx"> </form>
</span><span class="cx"> </td>
</span></span></pre></div>
<a id="trunkwpadmincustomheaderphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/custom-header.php (16060 => 16061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/custom-header.php 2010-10-28 21:03:16 UTC (rev 16060)
+++ trunk/wp-admin/custom-header.php 2010-10-28 21:56:43 UTC (rev 16061)
</span><span class="lines">@@ -468,7 +468,7 @@
</span><span class="cx"> <input type="file" id="upload" name="import" />
</span><span class="cx"> <input type="hidden" name="action" value="save" />
</span><span class="cx"> <?php wp_nonce_field( 'custom-header-upload', '_wpnonce-custom-header-upload' ) ?>
</span><del>- <input type="submit" class="button" value="<?php esc_attr_e( 'Upload' ); ?>" />
</del><ins>+ <?php submit_button( __( 'Upload' ), 'button', 'submit', false ); ?>
</ins><span class="cx"> </p>
</span><span class="cx"> </form>
</span><span class="cx"> </td>
</span><span class="lines">@@ -501,7 +501,7 @@
</span><span class="cx"> <th scope="row"><?php _e( 'Remove Image' ); ?></th>
</span><span class="cx"> <td>
</span><span class="cx"> <p><?php _e( 'This will remove the header image. You will not be able to restore any customizations.' ) ?></p>
</span><del>- <input type="submit" class="button" name="removeheader" value="<?php esc_attr_e( 'Remove Header Image' ); ?>" />
</del><ins>+ <?php submit_button( __( 'Remove Header Image' ), 'button', 'removeheader', false ); ?>
</ins><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><span class="cx"> <?php endif;
</span><span class="lines">@@ -511,7 +511,7 @@
</span><span class="cx"> <th scope="row"><?php _e( 'Reset Image' ); ?></th>
</span><span class="cx"> <td>
</span><span class="cx"> <p><?php _e( 'This will restore the original header image. You will not be able to restore any customizations.' ) ?></p>
</span><del>- <input type="submit" class="button" name="resetheader" value="<?php esc_attr_e( 'Restore Original Header Image' ); ?>" />
</del><ins>+ <?php submit_button( __( 'Restore Original Header Image' ), 'button', 'resetheader', false ); ?>
</ins><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><span class="cx"> <?php endif; ?>
</span><span class="lines">@@ -550,7 +550,7 @@
</span><span class="cx"> <th scope="row"><?php _e('Reset Text Color'); ?></th>
</span><span class="cx"> <td>
</span><span class="cx"> <p><?php _e( 'This will restore the original header text. You will not be able to restore any customizations.' ) ?></p>
</span><del>- <input type="submit" class="button" name="resettext" value="<?php esc_attr_e( 'Restore Original Header Text' ); ?>" />
</del><ins>+ <?php submit_button( __( 'Restore Original Header Text' ), 'button', 'resettext', false ); ?>
</ins><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><span class="cx"> <?php } ?>
</span><span class="lines">@@ -563,7 +563,7 @@
</span><span class="cx">
</span><span class="cx"> wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?>
</span><span class="cx">
</span><del>-<?php submit_button(); ?>
</del><ins>+<?php submit_button( null, 'primary', 'save-header-options' ); ?>
</ins><span class="cx"> </form>
</span><span class="cx"> </div>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadmineditcommentsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-comments.php (16060 => 16061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-comments.php 2010-10-28 21:03:16 UTC (rev 16060)
+++ trunk/wp-admin/edit-comments.php 2010-10-28 21:56:43 UTC (rev 16061)
</span><span class="lines">@@ -202,7 +202,7 @@
</span><span class="cx"> <p class="search-box">
</span><span class="cx"> <label class="screen-reader-text" for="comment-search-input"><?php _e( 'Search Comments' ); ?>:</label>
</span><span class="cx"> <input type="text" id="comment-search-input" name="s" value="<?php _admin_search_query(); ?>" />
</span><del>- <input type="submit" value="<?php esc_attr_e( 'Search Comments' ); ?>" class="button" />
</del><ins>+ <?php submit_button( __( 'Search Comments' ), 'button', 'submit', false ); ?>
</ins><span class="cx"> </p>
</span><span class="cx">
</span><span class="cx"> <input type="hidden" name="mode" value="<?php echo esc_attr($mode); ?>" />
</span></span></pre></div>
<a id="trunkwpadmineditformcommentphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-form-comment.php (16060 => 16061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-form-comment.php 2010-10-28 21:03:16 UTC (rev 16060)
+++ trunk/wp-admin/edit-form-comment.php 2010-10-28 21:56:43 UTC (rev 16061)
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx"> <?php echo "<a class='submitdelete deletion' href='" . wp_nonce_url("comment.php?action=" . ( !EMPTY_TRASH_DAYS ? 'deletecomment' : 'trashcomment' ) . "&amp;c=$comment->comment_ID&amp;_wp_original_http_referer=" . urlencode(wp_get_referer()), 'delete-comment_' . $comment->comment_ID) . "'>" . ( !EMPTY_TRASH_DAYS ? __('Delete Permanently') : __('Move to Trash') ) . "</a>\n"; ?>
</span><span class="cx"> </div>
</span><span class="cx"> <div id="publishing-action">
</span><del>-<input type="submit" name="save" value="<?php esc_attr_e('Update Comment'); ?>" tabindex="4" class="button-primary" />
</del><ins>+<?php submit_button( __( 'Update Comment' ), 'primary', 'save', true, array( 'tabindex' => '4' ) ); ?>
</ins><span class="cx"> </div>
</span><span class="cx"> <div class="clear"></div>
</span><span class="cx"> </div>
</span></span></pre></div>
<a id="trunkwpadminedittagsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-tags.php (16060 => 16061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-tags.php 2010-10-28 21:03:16 UTC (rev 16060)
+++ trunk/wp-admin/edit-tags.php 2010-10-28 21:56:43 UTC (rev 16061)
</span><span class="lines">@@ -225,7 +225,7 @@
</span><span class="cx"> <p class="search-box">
</span><span class="cx"> <label class="screen-reader-text" for="tag-search-input"><?php echo $tax->labels->search_items; ?>:</label>
</span><span class="cx"> <input type="text" id="tag-search-input" name="s" value="<?php _admin_search_query(); ?>" />
</span><del>- <input type="submit" value="<?php echo esc_attr( $tax->labels->search_items ); ?>" class="button" />
</del><ins>+ <?php submit_button( $tax->labels->search_items, 'button', 'submit', false ); ?>
</ins><span class="cx"> </p>
</span><span class="cx"> </form>
</span><span class="cx"> <br class="clear" />
</span><span class="lines">@@ -334,9 +334,9 @@
</span><span class="cx"> if ( ! is_taxonomy_hierarchical($taxonomy) )
</span><span class="cx"> do_action('add_tag_form_fields', $taxonomy);
</span><span class="cx"> do_action($taxonomy . '_add_form_fields', $taxonomy);
</span><del>-?>
-<p class="submit"><input type="submit" class="button" name="submit" id="submit" value="<?php echo esc_attr( $tax->labels->add_new_item ); ?>" /></p>
-<?php
</del><ins>+
+submit_button( $tax->labels->add_new_item );
+
</ins><span class="cx"> // Back compat hooks. Deprecated in preference to {$taxonomy}_add_form
</span><span class="cx"> if ( 'category' == $taxonomy )
</span><span class="cx"> do_action('edit_category_form', (object)array('parent' => 0) );
</span></span></pre></div>
<a id="trunkwpadmineditphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit.php (16060 => 16061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit.php 2010-10-28 21:03:16 UTC (rev 16060)
+++ trunk/wp-admin/edit.php 2010-10-28 21:56:43 UTC (rev 16061)
</span><span class="lines">@@ -223,7 +223,7 @@
</span><span class="cx"> <p class="search-box">
</span><span class="cx"> <label class="screen-reader-text" for="post-search-input"><?php echo $post_type_object->labels->search_items; ?>:</label>
</span><span class="cx"> <input type="text" id="post-search-input" name="s" value="<?php the_search_query(); ?>" />
</span><del>- <input type="submit" value="<?php echo esc_attr( $post_type_object->labels->search_items ); ?>" class="button" />
</del><ins>+ <?php submit_button( $post_type_object->labels->search_items, 'button', 'submit', false ); ?>
</ins><span class="cx"> </p>
</span><span class="cx">
</span><span class="cx"> <input type="hidden" name="post_status" class="post_status_page" value="<?php echo !empty($_REQUEST['post_status']) ? esc_attr($_REQUEST['post_status']) : 'all'; ?>" />
</span></span></pre></div>
<a id="trunkwpadminexportphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/export.php (16060 => 16061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/export.php 2010-10-28 21:03:16 UTC (rev 16060)
+++ trunk/wp-admin/export.php 2010-10-28 21:56:43 UTC (rev 16061)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> <p><?php _e('This format, which we call WordPress eXtended RSS or WXR, will contain your posts, pages, comments, custom fields, categories, and tags.'); ?></p>
</span><span class="cx"> <p><?php _e('Once you&#8217;ve saved the download file, you can use the Import function on another WordPress site to import this site.'); ?></p>
</span><span class="cx"> <form action="" method="get">
</span><del>-<?php submit_button( __('Download Export File'), 'secondary' ); ?>
</del><ins>+<?php submit_button( __('Download Export File'), 'button' ); ?>
</ins><span class="cx"> <input type="hidden" name="download" value="true" />
</span><span class="cx"> </p>
</span><span class="cx"> </form>
</span></span></pre></div>
<a id="trunkwpadminincludesclasswplisttablephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-list-table.php (16060 => 16061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-list-table.php 2010-10-28 21:03:16 UTC (rev 16060)
+++ trunk/wp-admin/includes/class-wp-list-table.php 2010-10-28 21:56:43 UTC (rev 16061)
</span><span class="lines">@@ -253,7 +253,8 @@
</span><span class="cx"> echo "\t<option value='$name'>$title</option>\n";
</span><span class="cx"> echo "</select>\n";
</span><span class="cx">
</span><del>- echo "<input type='submit' value='" . esc_attr__( 'Apply' ) . "' name='doaction$two' id='doaction$two' class='button-secondary action' />\n";
</del><ins>+ submit_button( __( 'Apply' ), 'button-secondary action', "doaction$two", false );
+ echo "\n";
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunkwpadminincludesdashboardphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/dashboard.php (16060 => 16061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/dashboard.php 2010-10-28 21:03:16 UTC (rev 16060)
+++ trunk/wp-admin/includes/dashboard.php 2010-10-28 21:56:43 UTC (rev 16061)
</span><span class="lines">@@ -479,7 +479,7 @@
</span><span class="cx"> <input type="hidden" name="quickpress_post_ID" value="<?php echo $post_ID; ?>" />
</span><span class="cx"> <input type="hidden" name="post_type" value="post" />
</span><span class="cx"> <?php wp_nonce_field('add-post'); ?>
</span><del>- <input type="submit" name="save" id="save-post" class="button" tabindex="4" value="<?php esc_attr_e('Save Draft'); ?>" />
</del><ins>+ <?php submit_button( __( 'Save Draft' ), 'button', 'save', false, array( 'id' => 'save-post', 'tabindex'=> 4 ) ); ?>
</ins><span class="cx"> <input type="reset" value="<?php esc_attr_e( 'Reset' ); ?>" class="button" />
</span><span class="cx"> <span id="publishing-action">
</span><span class="cx"> <input type="submit" name="publish" id="publish" accesskey="p" tabindex="5" class="button-primary" value="<?php current_user_can('publish_posts') ? esc_attr_e('Publish') : esc_attr_e('Submit for Review'); ?>" />
</span></span></pre></div>
<a id="trunkwpadminincludesfilephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/file.php (16060 => 16061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/file.php 2010-10-28 21:03:16 UTC (rev 16060)
+++ trunk/wp-admin/includes/file.php 2010-10-28 21:56:43 UTC (rev 16061)
</span><span class="lines">@@ -1066,10 +1066,8 @@
</span><span class="cx"> if ( isset( $_POST[ $field ] ) )
</span><span class="cx"> echo '<input type="hidden" name="' . esc_attr( $field ) . '" value="' . esc_attr( stripslashes( $_POST[ $field ] ) ) . '" />';
</span><span class="cx"> }
</span><ins>+submit_button( __( 'Proceed' ), 'button', 'upgrade' );
</ins><span class="cx"> ?>
</span><del>-<p class="submit">
-<input id="upgrade" name="upgrade" type="submit" class="button" value="<?php esc_attr_e('Proceed'); ?>" />
-</p>
</del><span class="cx"> </div>
</span><span class="cx"> </form>
</span><span class="cx"> <?php
</span></span></pre></div>
<a id="trunkwpadminincludeslisttablecommentsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/list-table-comments.php (16060 => 16061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/list-table-comments.php 2010-10-28 21:03:16 UTC (rev 16060)
+++ trunk/wp-admin/includes/list-table-comments.php 2010-10-28 21:56:43 UTC (rev 16061)
</span><span class="lines">@@ -201,19 +201,15 @@
</span><span class="cx"> echo "\t<option value='" . esc_attr( $type ) . "'" . selected( $comment_type, $type, false ) . ">$label</option>\n";
</span><span class="cx"> ?>
</span><span class="cx"> </select>
</span><del>- <input type="submit" id="post-query-submit" value="<?php esc_attr_e( 'Filter' ); ?>" class="button-secondary" />
</del><span class="cx"> <?php
</span><ins>+ submit_button( __( 'Filter' ), 'secondary', 'post-query-submit', false );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( ( 'spam' == $comment_status || 'trash' == $comment_status ) && current_user_can( 'moderate_comments' ) ) {
</span><span class="cx"> wp_nonce_field( 'bulk-destroy', '_destroy_nonce' );
</span><span class="cx"> $title = ( 'spam' == $comment_status ) ? esc_attr__( 'Empty Spam' ) : esc_attr__( 'Empty Trash' );
</span><del>-?>
- <input type="submit" name="delete_all" id="delete_all" value="<?php echo $title ?>" class="button-secondary apply" />
-<?php
</del><ins>+ submit_button( $title, 'button-secondary apply', 'delete_all', false );
</ins><span class="cx"> }
</span><del>-?>
-<?php
</del><span class="cx"> do_action( 'manage_comments_nav', $comment_status );
</span><span class="cx"> echo '</div>';
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminincludeslisttablelinksphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/list-table-links.php (16060 => 16061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/list-table-links.php 2010-10-28 21:03:16 UTC (rev 16060)
+++ trunk/wp-admin/includes/list-table-links.php 2010-10-28 21:56:43 UTC (rev 16061)
</span><span class="lines">@@ -69,8 +69,8 @@
</span><span class="cx"> 'orderby' => 'name',
</span><span class="cx"> );
</span><span class="cx"> wp_dropdown_categories( $dropdown_options );
</span><ins>+ submit_button( __( 'Filter' ), 'secondary', 'post-query-submit', false );
</ins><span class="cx"> ?>
</span><del>- <input type="submit" id="post-query-submit" value="<?php esc_attr_e( 'Filter' ); ?>" class="button-secondary" />
</del><span class="cx"> </div>
</span><span class="cx"> <?php
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminincludeslisttablemediaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/list-table-media.php (16060 => 16061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/list-table-media.php 2010-10-28 21:03:16 UTC (rev 16060)
+++ trunk/wp-admin/includes/list-table-media.php 2010-10-28 21:56:43 UTC (rev 16061)
</span><span class="lines">@@ -98,16 +98,14 @@
</span><span class="cx"> $this->months_dropdown( $post_type );
</span><span class="cx">
</span><span class="cx"> do_action( 'restrict_manage_posts' );
</span><del>-?>
- <input type="submit" id="post-query-submit" value="<?php esc_attr_e( 'Filter' ); ?>" class="button-secondary" />
-<?php
</del><ins>+ submit_button( __( 'Filter' ), 'secondary', 'post-query-submit', false );
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- if ( $detached ) { ?>
- <input type="submit" id="find_detached" name="find_detached" value="<?php esc_attr_e( 'Scan for lost attachments' ); ?>" class="button-secondary" />
- <?php } elseif ( $this->is_trash && current_user_can( $post_type_obj->cap->edit_others_posts ) ) { ?>
- <input type="submit" id="delete_all" name="delete_all" value="<?php esc_attr_e( 'Empty Trash' ); ?>" class="button-secondary apply" />
- <?php } ?>
</del><ins>+ if ( $detached ) {
+ submit_button( __( 'Scan for lost attachments' ), 'secondary', 'find_detached', false );
+ } elseif ( $this->is_trash && current_user_can( 'edit_others_posts' ) ) {
+ submit_button( __( 'Empty Trash' ), 'button-secondary apply', 'delete_all', false );
+ } ?>
</ins><span class="cx"> </div>
</span><span class="cx"> <?php
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminincludeslisttablepluginsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/list-table-plugins.php (16060 => 16061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/list-table-plugins.php 2010-10-28 21:03:16 UTC (rev 16060)
+++ trunk/wp-admin/includes/list-table-plugins.php 2010-10-28 21:56:43 UTC (rev 16061)
</span><span class="lines">@@ -287,7 +287,7 @@
</span><span class="cx">
</span><span class="cx"> if ( 'recently_activated' == $status ) { ?>
</span><span class="cx"> <div class="alignleft actions">
</span><del>- <input type="submit" name="clear-recent-list" value="<?php esc_attr_e( 'Clear List' ) ?>" class="button-secondary" />
</del><ins>+ <?php submit_button( __( 'Clear List' ), 'secondary', 'clear-recent-list', false ); ?>
</ins><span class="cx"> </div>
</span><span class="cx"> <?php }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminincludeslisttablepostsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/list-table-posts.php (16060 => 16061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/list-table-posts.php 2010-10-28 21:03:16 UTC (rev 16060)
+++ trunk/wp-admin/includes/list-table-posts.php 2010-10-28 21:56:43 UTC (rev 16061)
</span><span class="lines">@@ -223,16 +223,14 @@
</span><span class="cx"> wp_dropdown_categories( $dropdown_options );
</span><span class="cx"> }
</span><span class="cx"> do_action( 'restrict_manage_posts' );
</span><ins>+ submit_button( __( 'Filter' ), 'secondary', 'post-query-submit', false );
</ins><span class="cx"> ?>
</span><del>- <input type="submit" id="post-query-submit" value="<?php esc_attr_e( 'Filter' ); ?>" class="button-secondary" />
</del><span class="cx"> </div>
</span><span class="cx"> <?php
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ( $this->is_trash && current_user_can( $post_type_object->cap->edit_others_posts ) ) {
</span><del>-?>
- <input type="submit" name="delete_all" id="delete_all" value="<?php esc_attr_e( 'Empty Trash' ); ?>" class="button-secondary apply" />
-<?php
</del><ins>+ submit_button( __( 'Empty Trash' ), 'button-secondary apply', 'delete_all', false );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -985,10 +983,8 @@
</span><span class="cx"> <a accesskey="s" href="#inline-edit" title="<?php _e( 'Update' ); ?>" class="button-primary save alignright"><?php echo esc_attr( $update_text ); ?></a>
</span><span class="cx"> <img class="waiting" style="display:none;" src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" />
</span><span class="cx"> <?php } else {
</span><del>- $update_text = __( 'Update' );
- ?>
- <input accesskey="s" class="button-primary alignright" type="submit" name="bulk_edit" value="<?php echo esc_attr( $update_text ); ?>" />
- <?php } ?>
</del><ins>+ submit_button( __( 'Update' ), 'button-primary alignright', 'bulk_edit', false, array( 'accesskey' => 's' ) );
+ } ?>
</ins><span class="cx"> <input type="hidden" name="post_view" value="<?php echo esc_attr( $m ); ?>" />
</span><span class="cx"> <input type="hidden" name="screen" value="<?php echo esc_attr( $screen->id ); ?>" />
</span><span class="cx"> <br class="clear" />
</span></span></pre></div>
<a id="trunkwpadminincludeslisttableusersphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/list-table-users.php (16060 => 16061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/list-table-users.php 2010-10-28 21:03:16 UTC (rev 16060)
+++ trunk/wp-admin/includes/list-table-users.php 2010-10-28 21:56:43 UTC (rev 16061)
</span><span class="lines">@@ -112,7 +112,7 @@
</span><span class="cx"> <option value=''><?php _e( 'Change role to&hellip;' ) ?></option>
</span><span class="cx"> <?php wp_dropdown_roles(); ?>
</span><span class="cx"> </select>
</span><del>- <input type="submit" value="<?php esc_attr_e( 'Change' ); ?>" name="changeit" class="button-secondary" />
</del><ins>+ <?php submit_button( __( 'Change' ), 'secondary', 'changeit', false ); ?>
</ins><span class="cx"> </div>
</span><span class="cx"> <?php
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/media.php (16060 => 16061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/media.php 2010-10-28 21:03:16 UTC (rev 16060)
+++ trunk/wp-admin/includes/media.php 2010-10-28 21:56:43 UTC (rev 16061)
</span><span class="lines">@@ -1218,7 +1218,7 @@
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> if ( $send )
</span><del>- $send = "<input type='submit' class='button' name='send[$attachment_id]' value='" . esc_attr__( 'Insert into Post' ) . "' />";
</del><ins>+ $send = get_submit_button( __( 'Insert into Post' ), 'button', "send[$attachment_id]", false );
</ins><span class="cx"> if ( $delete && current_user_can( 'delete_post', $attachment_id ) ) {
</span><span class="cx"> if ( !EMPTY_TRASH_DAYS ) {
</span><span class="cx"> $delete = "<a href='" . wp_nonce_url( "post.php?action=delete&amp;post=$attachment_id", 'delete-attachment_' . $attachment_id ) . "' id='del[$attachment_id]' class='delete'>" . __( 'Delete Permanently' ) . '</a>';
</span><span class="lines">@@ -1459,8 +1459,10 @@
</span><span class="cx"> <div id="html-upload-ui">
</span><span class="cx"> <?php do_action('pre-html-upload-ui'); ?>
</span><span class="cx"> <p id="async-upload-wrap">
</span><del>- <label class="screen-reader-text" for="async-upload"><?php _e('Upload'); ?></label>
- <input type="file" name="async-upload" id="async-upload" /> <input type="submit" class="button" name="html-upload" value="<?php esc_attr_e('Upload'); ?>" /> <a href="#" onclick="try{top.tb_remove();}catch(e){}; return false;"><?php _e('Cancel'); ?></a>
</del><ins>+ <label class="screen-reader-text" for="async-upload"><?php _e('Upload'); ?></label>
+ <input type="file" name="async-upload" id="async-upload" />
+ <?php submit_button( __( 'Upload' ), 'button', 'html-upload', false ); ?>
+ <a href="#" onclick="try{top.tb_remove();}catch(e){}; return false;"><?php _e('Cancel'); ?></a>
</ins><span class="cx"> </p>
</span><span class="cx"> <div class="clear"></div>
</span><span class="cx"> <p class="media-upload-size"><?php printf( __( 'Maximum upload file size: %d%s' ), $upload_size_unit, $sizes[$u] ); ?></p>
</span><span class="lines">@@ -1492,7 +1494,7 @@
</span><span class="cx"> ?>
</span><span class="cx">
</span><span class="cx"> <form enctype="multipart/form-data" method="post" action="<?php echo esc_attr($form_action_url); ?>" class="media-upload-form type-form validate" id="<?php echo $type; ?>-form">
</span><del>-<input type="submit" class="hidden" name="save" value="" />
</del><ins>+<?php submit_button( '', 'hidden', 'save', false ); ?>
</ins><span class="cx"> <input type="hidden" name="post_id" id="post_id" value="<?php echo (int) $post_id; ?>" />
</span><span class="cx"> <?php wp_nonce_field('media-form'); ?>
</span><span class="cx">
</span><span class="lines">@@ -1525,7 +1527,7 @@
</span><span class="cx"> ?>
</span><span class="cx"> </div>
</span><span class="cx"> <p class="savebutton ml-submit">
</span><del>-<input type="submit" class="button" name="save" value="<?php esc_attr_e( 'Save all changes' ); ?>" />
</del><ins>+<?php submit_button( __( 'Save all changes' ), 'button', 'save', false ); ?>
</ins><span class="cx"> </p>
</span><span class="cx"> </form>
</span><span class="cx"> <?php
</span><span class="lines">@@ -1705,7 +1707,7 @@
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <p class="ml-submit">
</span><del>-<input type="submit" class="button savebutton" style="display:none;" name="save" id="save-all" value="<?php esc_attr_e( 'Save all changes' ); ?>" />
</del><ins>+<?php submit_button( __( 'Save all changes' ), 'button savebutton', 'save', false, array( 'id' => 'save-all', 'style' => 'display: none;' ) ); ?>
</ins><span class="cx"> <input type="hidden" name="post_id" id="post_id" value="<?php echo (int) $post_id; ?>" />
</span><span class="cx"> <input type="hidden" name="type" value="<?php echo esc_attr( $GLOBALS['type'] ); ?>" />
</span><span class="cx"> <input type="hidden" name="tab" value="<?php echo esc_attr( $GLOBALS['tab'] ); ?>" />
</span><span class="lines">@@ -1828,7 +1830,7 @@
</span><span class="cx"> <p id="media-search" class="search-box">
</span><span class="cx"> <label class="screen-reader-text" for="media-search-input"><?php _e('Search Media');?>:</label>
</span><span class="cx"> <input type="text" id="media-search-input" name="s" value="<?php the_search_query(); ?>" />
</span><del>- <input type="submit" value="<?php esc_attr_e( 'Search Media' ); ?>" class="button" />
</del><ins>+ <?php submit_button( __( 'Search Media' ), 'button', '', false ); ?>
</ins><span class="cx"> </p>
</span><span class="cx">
</span><span class="cx"> <ul class="subsubsub">
</span><span class="lines">@@ -1915,7 +1917,7 @@
</span><span class="cx"> </select>
</span><span class="cx"> <?php } ?>
</span><span class="cx">
</span><del>-<input type="submit" id="post-query-submit" value="<?php echo esc_attr( __( 'Filter &#187;' ) ); ?>" class="button-secondary" />
</del><ins>+<?php submit_button( __( 'Filter &#187;' ), 'secondary', 'post-query-submit', false ); ?>
</ins><span class="cx">
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="lines">@@ -1945,7 +1947,7 @@
</span><span class="cx"> <?php echo get_media_items(null, $errors); ?>
</span><span class="cx"> </div>
</span><span class="cx"> <p class="ml-submit">
</span><del>-<input type="submit" class="button savebutton" name="save" value="<?php esc_attr_e( 'Save all changes' ); ?>" />
</del><ins>+<?php submit_button( __( 'Save all changes' ), 'button savebutton', 'save', false ); ?>
</ins><span class="cx"> <input type="hidden" name="post_id" id="post_id" value="<?php echo (int) $post_id; ?>" />
</span><span class="cx"> </p>
</span><span class="cx"> </form>
</span><span class="lines">@@ -2143,7 +2145,7 @@
</span><span class="cx"> <tr>
</span><span class="cx"> <td></td>
</span><span class="cx"> <td>
</span><del>- <input type="submit" class="button" name="insertonlybutton" value="' . esc_attr__('Insert into Post') . '" />
</del><ins>+ ' . get_submit_button( __( 'Insert into Post' ), 'button', 'insertonlybutton', false ) . '
</ins><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><span class="cx"> ';
</span></span></pre></div>
<a id="trunkwpadminincludesmetaboxesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/meta-boxes.php (16060 => 16061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/meta-boxes.php 2010-10-28 21:03:16 UTC (rev 16060)
+++ trunk/wp-admin/includes/meta-boxes.php 2010-10-28 21:56:43 UTC (rev 16061)
</span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx">
</span><span class="cx"> <?php // Hidden submit button early on so that the browser chooses the right button when form is submitted with Return key ?>
</span><span class="cx"> <div style="display:none;">
</span><del>-<input type="submit" name="save" value="<?php esc_attr_e('Save'); ?>" />
</del><ins>+<?php submit_button( __( 'Save' ), 'button', 'save' ); ?>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div id="minor-publishing-actions">
</span><span class="lines">@@ -211,14 +211,14 @@
</span><span class="cx"> if ( $can_publish ) :
</span><span class="cx"> if ( !empty($post->post_date_gmt) && time() < strtotime( $post->post_date_gmt . ' +0000' ) ) : ?>
</span><span class="cx"> <input name="original_publish" type="hidden" id="original_publish" value="<?php esc_attr_e('Schedule') ?>" />
</span><del>- <input name="publish" type="submit" class="button-primary" id="publish" tabindex="5" accesskey="p" value="<?php esc_attr_e('Schedule') ?>" />
</del><ins>+ <?php submit_button( __( 'Schedule' ), 'primary', 'publish', false, array( 'tabindex' => '5', 'accesskey' => 'p' ) ); ?>
</ins><span class="cx"> <?php else : ?>
</span><span class="cx"> <input name="original_publish" type="hidden" id="original_publish" value="<?php esc_attr_e('Publish') ?>" />
</span><del>- <input name="publish" type="submit" class="button-primary" id="publish" tabindex="5" accesskey="p" value="<?php esc_attr_e('Publish') ?>" />
</del><ins>+ <?php submit_button( __( 'Publish' ), 'primary', 'publish', false, array( 'tabindex' => '5', 'accesskey' => 'p' ) ); ?>
</ins><span class="cx"> <?php endif;
</span><span class="cx"> else : ?>
</span><span class="cx"> <input name="original_publish" type="hidden" id="original_publish" value="<?php esc_attr_e('Submit for Review') ?>" />
</span><del>- <input name="publish" type="submit" class="button-primary" id="publish" tabindex="5" accesskey="p" value="<?php esc_attr_e('Submit for Review') ?>" />
</del><ins>+ <?php submit_button( __( 'Submit for Review' ), 'primary', 'publish', false, array( 'tabindex' => '5', 'accesskey' => 'p' ) ); ?>
</ins><span class="cx"> <?php
</span><span class="cx"> endif;
</span><span class="cx"> } else { ?>
</span><span class="lines">@@ -582,7 +582,7 @@
</span><span class="cx">
</span><span class="cx"> <?php // Hidden submit button early on so that the browser chooses the right button when form is submitted with Return key ?>
</span><span class="cx"> <div style="display:none;">
</span><del>-<input type="submit" name="save" value="<?php esc_attr_e('Save'); ?>" />
</del><ins>+<?php submit_button( __( 'Save' ), 'button', 'save', false ); ?>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div id="minor-publishing-actions">
</span></span></pre></div>
<a id="trunkwpadminincludesnavmenuphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/nav-menu.php (16060 => 16061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/nav-menu.php 2010-10-28 21:03:16 UTC (rev 16060)
+++ trunk/wp-admin/includes/nav-menu.php 2010-10-28 21:56:43 UTC (rev 16061)
</span><span class="lines">@@ -495,7 +495,7 @@
</span><span class="cx"> ?>
</span><span class="cx"> <p class="button-controls">
</span><span class="cx"> <img class="waiting" src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" />
</span><del>- <input type="submit"<?php disabled( $nav_menu_selected_id, 0 ); ?> class="button-primary" name="nav-menu-locations" value="<?php esc_attr_e( 'Save' ); ?>" />
</del><ins>+ <?php submit_button( __( 'Save' ), 'primary', 'nav-menu-locations', false, disabled( $nav_menu_selected_id, 0, false ) ); ?>
</ins><span class="cx"> </p>
</span><span class="cx"> <?php
</span><span class="cx"> }
</span><span class="lines">@@ -671,7 +671,7 @@
</span><span class="cx"> <p class="quick-search-wrap">
</span><span class="cx"> <input type="text" class="quick-search regular-text input-with-default-title" title="<?php esc_attr_e('Search'); ?>" value="<?php echo $searched; ?>" name="quick-search-posttype-<?php echo $post_type_name; ?>" />
</span><span class="cx"> <img class="waiting" src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" />
</span><del>- <input type="submit" class="quick-search-submit button-secondary hide-if-js" value="<?php esc_attr_e('Search'); ?>" />
</del><ins>+ <?php submit_button( __( 'Search' ), 'quick-search-submit button-secondary hide-if-js', 'submit', false ); ?>
</ins><span class="cx"> </p>
</span><span class="cx">
</span><span class="cx"> <ul id="<?php echo $post_type_name; ?>-search-checklist" class="list:<?php echo $post_type_name?> categorychecklist form-no-clear">
</span><span class="lines">@@ -898,7 +898,7 @@
</span><span class="cx"> <p class="quick-search-wrap">
</span><span class="cx"> <input type="text" class="quick-search regular-text input-with-default-title" title="<?php esc_attr_e('Search'); ?>" value="<?php echo $searched; ?>" name="quick-search-taxonomy-<?php echo $taxonomy_name; ?>" />
</span><span class="cx"> <img class="waiting" src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" />
</span><del>- <input type="submit" class="quick-search-submit button-secondary hide-if-js" value="<?php esc_attr_e('Search'); ?>" />
</del><ins>+ <?php submit_button( __( 'Search' ), 'quick-search-submit button-secondary hide-if-js', 'submit', false ); ?>
</ins><span class="cx"> </p>
</span><span class="cx">
</span><span class="cx"> <ul id="<?php echo $taxonomy_name; ?>-search-checklist" class="list:<?php echo $taxonomy_name?> categorychecklist form-no-clear">
</span></span></pre></div>
<a id="trunkwpadminincludesplugininstallphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/plugin-install.php (16060 => 16061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/plugin-install.php 2010-10-28 21:03:16 UTC (rev 16060)
+++ trunk/wp-admin/includes/plugin-install.php 2010-10-28 21:56:43 UTC (rev 16061)
</span><span class="lines">@@ -129,7 +129,7 @@
</span><span class="cx"> </select>
</span><span class="cx"> <input type="text" name="s" value="<?php echo esc_attr($term) ?>" />
</span><span class="cx"> <label class="screen-reader-text" for="plugin-search-input"><?php _e('Search Plugins'); ?></label>
</span><del>- <input type="submit" id="plugin-search-input" value="<?php esc_attr_e('Search Plugins'); ?>" class="button" />
</del><ins>+ <?php submit_button( __( 'Search Plugins' ), 'button', 'plugin-search-input', false ); ?>
</ins><span class="cx"> </form><?php
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminincludestemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/template.php (16060 => 16061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/template.php 2010-10-28 21:03:16 UTC (rev 16060)
+++ trunk/wp-admin/includes/template.php 2010-10-28 21:56:43 UTC (rev 16061)
</span><span class="lines">@@ -495,9 +495,11 @@
</span><span class="cx"> $r .= "\n\t<tr id='meta-{$entry['meta_id']}' class='$style'>";
</span><span class="cx"> $r .= "\n\t\t<td class='left'><label class='screen-reader-text' for='meta[{$entry['meta_id']}][key]'>" . __( 'Key' ) . "</label><input name='meta[{$entry['meta_id']}][key]' id='meta[{$entry['meta_id']}][key]' tabindex='6' type='text' size='20' value='{$entry['meta_key']}' />";
</span><span class="cx">
</span><del>- $r .= "\n\t\t<div class='submit'><input name='deletemeta[{$entry['meta_id']}]' type='submit' ";
- $r .= "class='delete:the-list:meta-{$entry['meta_id']}::_ajax_nonce=$delete_nonce deletemeta' tabindex='6' value='". esc_attr__( 'Delete' ) ."' />";
- $r .= "\n\t\t<input name='updatemeta' type='submit' tabindex='6' value='". esc_attr__( 'Update' ) ."' class='add:the-list:meta-{$entry['meta_id']}::_ajax_nonce-add-meta=$update_nonce updatemeta' /></div>";
</del><ins>+ $r .= "\n\t\t<div class='submit'>";
+ $r .= get_submit_button( __( 'Delete' ), "delete:the-list:meta-{$entry['meta_id']}::_ajax_nonce=$delete_nonce deletemeta", "deletemeta[{$entry['meta_id']}]", false, array( 'tabindex' => '6' ) );
+ $r .= "\n\t\t";
+ $r .= get_submit_button( __( 'Update' ), "add:the-list:meta-{$entry['meta_id']}::_ajax_nonce-add-meta=$update_nonce updatemeta" , 'updatemeta', false, array( 'tabindex' => '6' ) );
+ $r .= "</div>";
</ins><span class="cx"> $r .= wp_nonce_field( 'change-meta', '_ajax_nonce', false, false );
</span><span class="cx"> $r .= "</td>";
</span><span class="cx">
</span><span class="lines">@@ -557,7 +559,7 @@
</span><span class="cx"> </tr>
</span><span class="cx">
</span><span class="cx"> <tr><td colspan="2" class="submit">
</span><del>-<input type="submit" id="addmetasub" name="addmeta" class="add:the-list:newmeta" tabindex="9" value="<?php esc_attr_e( 'Add Custom Field' ) ?>" />
</del><ins>+<?php submit_button( __( 'Add Custom Field' ), 'add:the-list:newmeta', 'addmeta', false, array( 'id' => 'addmetasub', 'tabindex' => '9' ) ); ?>
</ins><span class="cx"> <?php wp_nonce_field( 'add-meta', '_ajax_nonce-add-meta', false ); ?>
</span><span class="cx"> </td></tr>
</span><span class="cx"> </tbody>
</span><span class="lines">@@ -843,7 +845,7 @@
</span><span class="cx"> <input type="hidden" name="action" value="save" />
</span><span class="cx"> <input type="hidden" name="max_file_size" value="<?php echo $bytes; ?>" />
</span><span class="cx"> </p>
</span><del>-<?php submit_button( __('Upload file and import'), 'secondary' ); ?>
</del><ins>+<?php submit_button( __('Upload file and import'), 'button' ); ?>
</ins><span class="cx"> </form>
</span><span class="cx"> <?php
</span><span class="cx"> endif;
</span><span class="lines">@@ -1357,7 +1359,7 @@
</span><span class="cx"> </div>
</span><span class="cx"> <div class="find-box-buttons">
</span><span class="cx"> <input id="find-posts-close" type="button" class="button alignleft" value="<?php esc_attr_e('Close'); ?>" />
</span><del>- <input id="find-posts-submit" type="submit" class="button-primary alignright" value="<?php esc_attr_e('Select'); ?>" />
</del><ins>+ <?php submit_button( __( 'Select' ), 'button-primary alignright', 'find-posts-submit', false ); ?>
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx"> <?php
</span><span class="lines">@@ -1889,7 +1891,7 @@
</span><span class="cx"> $return = "<div class='screen-options'>\n";
</span><span class="cx"> if ( !empty($per_page_label) )
</span><span class="cx"> $return .= "<input type='text' class='screen-per-page' name='wp_screen_options[value]' id='$option' maxlength='3' value='$per_page' /> <label for='$option'>$per_page_label</label>\n";
</span><del>- $return .= "<input type='submit' class='button' value='" . esc_attr__('Apply') . "' />";
</del><ins>+ $return .= get_submit_button( __( 'Apply' ), 'button', '', false );
</ins><span class="cx"> $return .= "<input type='hidden' name='wp_screen_options[option]' value='" . esc_attr($option) . "' />";
</span><span class="cx"> $return .= "</div>\n";
</span><span class="cx"> return $return;
</span><span class="lines">@@ -2086,28 +2088,44 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Echos a paragraph-wrapped submit button, with provided text and appropriate class
</del><ins>+ * Echos a submit button, with provided text and appropriate class
</ins><span class="cx"> *
</span><span class="cx"> * @since 3.1.0
</span><span class="cx"> *
</span><span class="cx"> * @param string $text The text of the button (defaults to 'Save Changes')
</span><span class="cx"> * @param string $type The type of button. One of: primary, secondary, delete
</span><del>- * @param string $name The HTML name of the submit button. Defaults to "submit"
</del><ins>+ * @param string $name The HTML name of the submit button. Defaults to "submit". If no id attribute
+ * is given in $other_attributes below, $name will be used as the button's id.
+ * @param bool $wrap True if the output button should be wrapped in a paragraph tag,
+ * false otherwise. Defaults to true
+ * @param array|string $other_attributes Other attributes that should be output with the button,
+ * mapping attributes to their values, such as array( 'tabindex' => '1' ).
+ * These attributes will be ouput as attribute="value", such as tabindex="1".
+ * Defaults to no other attributes. Other attributes can also be provided as a
+ * string such as 'tabindex="1"', though the array format is typically cleaner.
</ins><span class="cx"> */
</span><del>-function submit_button( $text = NULL, $type = 'primary', $name = 'submit' ) {
- echo get_submit_button( $text, $type, $name );
</del><ins>+function submit_button( $text = NULL, $type = 'primary', $name = 'submit', $wrap = true, $other_attributes = NULL ) {
+ echo get_submit_button( $text, $type, $name, $wrap, $other_attributes );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Returns a paragraph-wrapped submit button, with provided text and appropriate class
</del><ins>+ * Returns a submit button, with provided text and appropriate class
</ins><span class="cx"> *
</span><span class="cx"> * @since 3.1.0
</span><span class="cx"> *
</span><span class="cx"> * @param string $text The text of the button (defaults to 'Save Changes')
</span><span class="cx"> * @param string $type The type of button. One of: primary, secondary, delete
</span><del>- * @param string $name The HTML name of the submit button. Defaults to "submit"
</del><ins>+ * @param string $name The HTML name of the submit button. Defaults to "submit". If no id attribute
+ * is given in $other_attributes below, $name will be used as the button's id.
+ * @param bool $wrap True if the output button should be wrapped in a paragraph tag,
+ * false otherwise. Defaults to true
+ * @param array|string $other_attributes Other attributes that should be output with the button,
+ * mapping attributes to their values, such as array( 'tabindex' => '1' ).
+ * These attributes will be ouput as attribute="value", such as tabindex="1".
+ * Defaults to no other attributes. Other attributes can also be provided as a
+ * string such as 'tabindex="1"', though the array format is typically cleaner.
</ins><span class="cx"> */
</span><del>-function get_submit_button( $text = NULL, $type = 'primary', $name = 'submit' ) {
</del><ins>+function get_submit_button( $text = NULL, $type = 'primary', $name = 'submit', $wrap = true, $other_attributes = NULL ) {
</ins><span class="cx"> switch ( $type ) :
</span><span class="cx"> case 'primary' :
</span><span class="cx"> case 'secondary' :
</span><span class="lines">@@ -2120,6 +2138,29 @@
</span><span class="cx"> $class = $type; // Custom cases can just pass in the classes they want to be used
</span><span class="cx"> endswitch;
</span><span class="cx"> $text = ( NULL == $text ) ? __( 'Save Changes' ) : $text;
</span><del>- return '<p class="submit"><input type="submit" name="' . esc_attr( $name ) . '" class="' . esc_attr( $class ) . '" value="' . esc_attr( $text ) . '" /></p>';
</del><ins>+
+ $attributes = '';
+ if ( is_array( $other_attributes ) ) {
+ foreach ( $other_attributes as $attribute => $value ) {
+ $attributes .= $attribute . '="' . esc_attr( $value ) . '" '; // Trailing space is important
+ }
+ } else if ( !empty( $other_attributes ) ) { // Attributes provided as a string
+ $attributes = $other_attributes;
+ }
+
+ // Default the id attribute to $name unless an id was specifically provided in $other_attributes
+ $id = 'id="' . esc_attr( $name ) . '" ';
+ if ( is_array( $other_attributes ) && array_key_exists( 'id', $other_attributes ) ) {
+ $id = 'id="' . esc_attr( $other_attributes['id'] ) . '" ';
+ }
+
+ $button = '<input type="submit" name="' . esc_attr( $name ) . '" id="' . $id . '" class="' . esc_attr( $class );
+ $button .= '" value="' . esc_attr( $text ) . '" ' . $attributes . ' />';
+
+ if ( $wrap ) {
+ $button = '<p class="submit">' . $button . '</p>';
+ }
+
+ return $button;
</ins><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminincludesthemeinstallphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/theme-install.php (16060 => 16061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/theme-install.php 2010-10-28 21:03:16 UTC (rev 16060)
+++ trunk/wp-admin/includes/theme-install.php 2010-10-28 21:56:43 UTC (rev 16061)
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx"> <option value="tag" <?php selected('tag', $type) ?>><?php _ex('Tag', 'Theme Installer'); ?></option>
</span><span class="cx"> </select>
</span><span class="cx"> <input type="text" name="s" size="30" value="<?php echo esc_attr($term) ?>" />
</span><del>- <input type="submit" name="search" value="<?php esc_attr_e('Search'); ?>" class="button" />
</del><ins>+ <?php submit_button( __( 'Search' ), 'button', 'search', false ); ?>
</ins><span class="cx"> </form>
</span><span class="cx"> <?php
</span><span class="cx"> }
</span><span class="lines">@@ -106,7 +106,7 @@
</span><span class="cx">
</span><span class="cx"> </div>
</span><span class="cx"> <br class="clear" />
</span><del>-<p><input type="submit" name="search" value="<?php esc_attr_e('Find Themes'); ?>" class="button" /></p>
</del><ins>+<?php submit_button( __( 'Find Themes' ), 'button', 'search' ); ?>
</ins><span class="cx"> </form>
</span><span class="cx"> <?php
</span><span class="cx"> }
</span><span class="lines">@@ -119,8 +119,7 @@
</span><span class="cx"> <form method="post" enctype="multipart/form-data" action="<?php echo self_admin_url('update.php?action=upload-theme') ?>">
</span><span class="cx"> <?php wp_nonce_field( 'theme-upload') ?>
</span><span class="cx"> <input type="file" name="themezip" />
</span><del>- <input type="submit"
- class="button" value="<?php esc_attr_e('Install Now') ?>" />
</del><ins>+ <?php submit_button( __( 'Install Now' ), 'button', '', false ); ?>
</ins><span class="cx"> </form>
</span><span class="cx"> <?php
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminincludeswidgetsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/widgets.php (16060 => 16061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/widgets.php 2010-10-28 21:03:16 UTC (rev 16060)
+++ trunk/wp-admin/includes/widgets.php 2010-10-28 21:56:43 UTC (rev 16061)
</span><span class="lines">@@ -203,7 +203,7 @@
</span><span class="cx"> </div>
</span><span class="cx"> <div class="alignright<?php if ( 'noform' === $has_form ) echo ' widget-control-noform'; ?>">
</span><span class="cx"> <img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" class="ajax-feedback " title="" alt="" />
</span><del>- <input type="submit" name="savewidget" class="button-primary widget-control-save" value="<?php esc_attr_e('Save'); ?>" />
</del><ins>+ <?php submit_button( __( 'Save' ), 'button-primary widget-control-save', 'savewidget', false ); ?>
</ins><span class="cx"> </div>
</span><span class="cx"> <br class="clear" />
</span><span class="cx"> </div>
</span></span></pre></div>
<a id="trunkwpadmininstallphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/install.php (16060 => 16061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/install.php 2010-10-28 21:03:16 UTC (rev 16060)
+++ trunk/wp-admin/install.php 2010-10-28 21:56:43 UTC (rev 16061)
</span><span class="lines">@@ -133,7 +133,7 @@
</span><span class="cx"> <td colspan="2"><label><input type="checkbox" name="blog_public" value="1" <?php checked( $blog_public ); ?> /> <?php _e( 'Allow my site to appear in search engines like Google and Technorati.' ); ?></label></td>
</span><span class="cx"> </tr>
</span><span class="cx"> </table>
</span><del>- <p class="step"><input type="submit" name="Submit" value="<?php esc_attr_e( 'Install WordPress' ); ?>" class="button" /></p>
</del><ins>+ <p class="step"><?php submit_button( __( 'Install WordPress' ), 'button', 'Submit', false ); ?></p>
</ins><span class="cx"> </form>
</span><span class="cx"> <?php
</span><span class="cx"> } // end display_setup_form()
</span></span></pre></div>
<a id="trunkwpadminlinkmanagerphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/link-manager.php (16060 => 16061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/link-manager.php 2010-10-28 21:03:16 UTC (rev 16060)
+++ trunk/wp-admin/link-manager.php 2010-10-28 21:56:43 UTC (rev 16061)
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx"> <p class="search-box">
</span><span class="cx"> <label class="screen-reader-text" for="link-search-input"><?php _e( 'Search Links' ); ?>:</label>
</span><span class="cx"> <input type="text" id="link-search-input" name="s" value="<?php _admin_search_query(); ?>" />
</span><del>- <input type="submit" value="<?php esc_attr_e( 'Search Links' ); ?>" class="button" />
</del><ins>+ <?php submit_button( __( 'Search Links' ), 'button', '', false ); ?>
</ins><span class="cx"> </p>
</span><span class="cx"> </form>
</span><span class="cx"> <br class="clear" />
</span></span></pre></div>
<a id="trunkwpadminmediauploadphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/media-upload.php (16060 => 16061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/media-upload.php 2010-10-28 21:03:16 UTC (rev 16060)
+++ trunk/wp-admin/media-upload.php 2010-10-28 21:56:43 UTC (rev 16061)
</span><span class="lines">@@ -90,9 +90,7 @@
</span><span class="cx"> <input type="hidden" name="post_id" id="post_id" value="0" />
</span><span class="cx"> <?php wp_nonce_field('media-form'); ?>
</span><span class="cx"> <div id="media-items" class="hide-if-no-js"> </div>
</span><del>- <p>
- <input type="submit" class="button savebutton hide-if-no-js" name="save" value="<?php esc_attr_e( 'Save all changes' ); ?>" />
- </p>
</del><ins>+ <?php submit_button( __( 'Save all changes' ), 'button savebutton hide-if-no-js', 'save' ); ?>
</ins><span class="cx"> </form>
</span><span class="cx"> </div>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/media.php (16060 => 16061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/media.php 2010-10-28 21:03:16 UTC (rev 16060)
+++ trunk/wp-admin/media.php 2010-10-28 21:56:43 UTC (rev 16061)
</span><span class="lines">@@ -91,7 +91,7 @@
</span><span class="cx">
</span><span class="cx"> <form method="post" action="" class="media-upload-form" id="media-single-form">
</span><span class="cx"> <p class="submit" style="padding-bottom: 0;">
</span><del>-<input type="submit" class="button-primary" name="save" value="<?php esc_attr_e('Update Media'); ?>" />
</del><ins>+<?php submit_button( __( 'Update Media' ), 'primary', 'save', false ); ?>
</ins><span class="cx"> </p>
</span><span class="cx">
</span><span class="cx"> <div class="media-single">
</span><span class="lines">@@ -100,7 +100,7 @@
</span><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>-<?php submit_button( __('Update Media') ); ?>
</del><ins>+<?php submit_button( __( 'Update Media' ), 'primary', 'save' ); ?>
</ins><span class="cx"> <input type="hidden" name="post_id" id="post_id" value="<?php echo isset($post_id) ? esc_attr($post_id) : ''; ?>" />
</span><span class="cx"> <input type="hidden" name="attachment_id" id="attachment_id" value="<?php echo esc_attr($att_id); ?>" />
</span><span class="cx"> <input type="hidden" name="action" value="editattachment" />
</span></span></pre></div>
<a id="trunkwpadminmsdeletesitephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-delete-site.php (16060 => 16061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-delete-site.php 2010-10-28 21:03:16 UTC (rev 16060)
+++ trunk/wp-admin/ms-delete-site.php 2010-10-28 21:56:43 UTC (rev 16061)
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx"> <form method="post" name="deletedirect">
</span><span class="cx"> <input type="hidden" name="action" value="deleteblog" />
</span><span class="cx"> <p><input id="confirmdelete" type="checkbox" name="confirmdelete" value="1" /> <label for="confirmdelete"><strong><?php printf( __( "I'm sure I want to permanently disable my site, and I am aware I can never get it back or use %s again." ), is_subdomain_install() ? $current_blog->domain : $current_blog->domain . $current_blog->path ); ?></strong></label></p>
</span><del>- <p class="submit"><input type="submit" value="<?php esc_attr_e( 'Delete My Site Permanently' ) ?>" /></p>
</del><ins>+ <?php submit_button( __( 'Delete My Site Permanently' ) ); ?>
</ins><span class="cx"> </form>
</span><span class="cx"> <?php
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminmysitesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/my-sites.php (16060 => 16061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/my-sites.php 2010-10-28 21:03:16 UTC (rev 16060)
+++ trunk/wp-admin/my-sites.php 2010-10-28 21:56:43 UTC (rev 16061)
</span><span class="lines">@@ -102,9 +102,7 @@
</span><span class="cx"> </table>
</span><span class="cx"> <input type="hidden" name="action" value="updateblogsettings" />
</span><span class="cx"> <?php wp_nonce_field( 'update-my-sites' ); ?>
</span><del>- <p>
- <input type="submit" class="button-primary" value="<?php _e( 'Save Changes' ) ?>" />
- </p>
</del><ins>+ <?php submit_button(); ?>
</ins><span class="cx"> </form>
</span><span class="cx"> </div>
</span><span class="cx"> <?php
</span></span></pre></div>
<a id="trunkwpadminnavmenusphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/nav-menus.php (16060 => 16061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/nav-menus.php 2010-10-28 21:03:16 UTC (rev 16060)
+++ trunk/wp-admin/nav-menus.php 2010-10-28 21:56:43 UTC (rev 16061)
</span><span class="lines">@@ -494,7 +494,7 @@
</span><span class="cx"> <option value="0"><?php esc_html_e('Add New Menu'); ?></option>
</span><span class="cx"> </select>
</span><span class="cx"> <input type="hidden" name="action" value="edit" />
</span><del>- <input class="button-secondary" name="select_menu" type="submit" value="<?php esc_attr_e('Select'); ?>" />
</del><ins>+ <?php submit_button( __( 'Select' ), 'secondary', 'select_menu', false ); ?>
</ins><span class="cx"> </form>
</span><span class="cx"> </div>
</span><span class="cx"> <div class="nav-tabs-wrapper">
</span><span class="lines">@@ -556,7 +556,7 @@
</span><span class="cx"> <?php endif; ?>
</span><span class="cx"> <br class="clear" />
</span><span class="cx"> <div class="publishing-action">
</span><del>- <input class="button-primary menu-save" name="save_menu" type="submit" value="<?php empty($nav_menu_selected_id) ? esc_attr_e('Create Menu') : esc_attr_e('Save Menu'); ?>" />
</del><ins>+ <?php submit_button( empty( $nav_menu_selected_id ) ? __( 'Create Menu' ) : __( 'Save Menu' ), 'button-primary menu-save', 'save_menu', false ); ?>
</ins><span class="cx"> </div><!-- END .publishing-action -->
</span><span class="cx">
</span><span class="cx"> <?php if ( ! empty( $nav_menu_selected_id ) ) : ?>
</span><span class="lines">@@ -593,7 +593,7 @@
</span><span class="cx"> <div id="nav-menu-footer">
</span><span class="cx"> <div class="major-publishing-actions">
</span><span class="cx"> <div class="publishing-action">
</span><del>- <input class="button-primary menu-save" name="save_menu" type="submit" value="<?php empty($nav_menu_selected_id) ? esc_attr_e('Create Menu') : esc_attr_e('Save Menu'); ?>" />
</del><ins>+ <?php submit_button( empty( $nav_menu_selected_id ) ? __( 'Create Menu' ) : __( 'Save Menu' ), 'button-primary menu-save', 'save_menu', false ); ?>
</ins><span class="cx"> </div>
</span><span class="cx"> </div>
</span><span class="cx"> </div><!-- /#nav-menu-footer -->
</span></span></pre></div>
<a id="trunkwpadminnetworkeditphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/edit.php (16060 => 16061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/edit.php 2010-10-28 21:03:16 UTC (rev 16060)
+++ trunk/wp-admin/network/edit.php 2010-10-28 21:56:43 UTC (rev 16061)
</span><span class="lines">@@ -347,7 +347,7 @@
</span><span class="cx"> <input type="hidden" name="_wp_http_referer" value="<?php echo esc_attr( wp_get_referer() ); ?>" />
</span><span class="cx"> <?php wp_nonce_field( $_GET['action2'], '_wpnonce', false ); ?>
</span><span class="cx"> <p><?php echo esc_html( stripslashes( $_GET['msg'] ) ); ?></p>
</span><del>- <?php submit_button( __('Confirm'), 'secondary' ); ?>
</del><ins>+ <?php submit_button( __('Confirm'), 'button' ); ?>
</ins><span class="cx"> </form>
</span><span class="cx"> </body>
</span><span class="cx"> </html>
</span></span></pre></div>
<a id="trunkwpadminnetworksitesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/sites.php (16060 => 16061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/sites.php 2010-10-28 21:03:16 UTC (rev 16060)
+++ trunk/wp-admin/network/sites.php 2010-10-28 21:56:43 UTC (rev 16061)
</span><span class="lines">@@ -99,7 +99,7 @@
</span><span class="cx"> <p class="search-box">
</span><span class="cx"> <input type="hidden" name="action" value="blogs" />
</span><span class="cx"> <input type="text" name="s" value="<?php echo esc_attr( $s ); ?>" />
</span><del>-<input type="submit" class="button" value="<?php esc_attr_e( 'Search Site by' ) ?>" />
</del><ins>+<?php submit_button( __( 'Search Site by' ), 'button', 'submit', false ); ?>
</ins><span class="cx"> <select name="searchaction">
</span><span class="cx"> <option value="name" selected="selected"><?php _e( 'Name' ); ?></option>
</span><span class="cx"> <option value="id"><?php _e( 'ID' ); ?></option>
</span></span></pre></div>
<a id="trunkwpadminnetworkthemesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/themes.php (16060 => 16061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/themes.php 2010-10-28 21:03:16 UTC (rev 16060)
+++ trunk/wp-admin/network/themes.php 2010-10-28 21:56:43 UTC (rev 16061)
</span><span class="lines">@@ -40,8 +40,7 @@
</span><span class="cx"> <?php screen_icon(); ?>
</span><span class="cx"> <h2><?php _e( 'Network Themes' ) ?></h2>
</span><span class="cx"> <p><?php _e( 'Themes must be enabled for your network before they will be available to individual sites.' ) ?></p>
</span><del>- <p class="submit">
- <input type="submit" value="<?php _e( 'Apply Changes' ) ?>" /></p>
</del><ins>+ <?php submit_button( __( 'Apply Changes' ), '', '' ); ?>
</ins><span class="cx"> <table class="widefat">
</span><span class="cx"> <thead>
</span><span class="cx"> <tr>
</span><span class="lines">@@ -83,9 +82,8 @@
</span><span class="cx"> <?php } ?>
</span><span class="cx"> </tbody>
</span><span class="cx"> </table>
</span><del>-
- <p class="submit">
- <input type="submit" value="<?php _e( 'Apply Changes' ) ?>" /></p>
</del><ins>+
+ <?php submit_button( __( 'Apply Changes' ), '', '' ); ?>
</ins><span class="cx"> </form>
</span><span class="cx">
</span><span class="cx"> <h3><?php _e( 'Total' )?></h3>
</span></span></pre></div>
<a id="trunkwpadminnetworkusersphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network/users.php (16060 => 16061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network/users.php 2010-10-28 21:03:16 UTC (rev 16060)
+++ trunk/wp-admin/network/users.php 2010-10-28 21:56:43 UTC (rev 16061)
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx"> <form action="" method="get" class="search-form">
</span><span class="cx"> <p class="search-box">
</span><span class="cx"> <input type="text" name="s" value="<?php echo esc_attr( $usersearch ); ?>" class="search-input" id="user-search-input" />
</span><del>- <input type="submit" id="post-query-submit" value="<?php esc_attr_e( 'Search Users' ) ?>" class="button" />
</del><ins>+ <?php submit_button( __( 'Search Users' ), 'button', 'post-query-submit', false ); ?>
</ins><span class="cx"> </p>
</span><span class="cx"> </form>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminnetworkphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network.php (16060 => 16061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network.php 2010-10-28 21:03:16 UTC (rev 16060)
+++ trunk/wp-admin/network.php 2010-10-28 21:56:43 UTC (rev 16061)
</span><span class="lines">@@ -275,9 +275,9 @@
</span><span class="cx"> </td>
</span><span class="cx"> </tr>
</span><span class="cx"> </table>
</span><del>- <p class='submit'><input class="button-primary" name='submit' type='submit' value='<?php esc_attr_e( 'Install' ); ?>' /></p>
</del><ins>+ <?php submit_button( __( 'Install' ), 'primary', 'submit' ); ?>
</ins><span class="cx"> </form>
</span><del>- <?php
</del><ins>+ <?php
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunkwpadminoptionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/options.php (16060 => 16061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options.php 2010-10-28 21:03:16 UTC (rev 16060)
+++ trunk/wp-admin/options.php 2010-10-28 21:56:43 UTC (rev 16061)
</span><span class="lines">@@ -212,7 +212,7 @@
</span><span class="cx">
</span><span class="cx"> <input type="hidden" name="page_options" value="<?php echo esc_attr( implode( ',', $options_to_update ) ); ?>" />
</span><span class="cx">
</span><del>-<?php submit_button( __('Save Changes') ); ?>
</del><ins>+<?php submit_button( __( 'Save Changes' ), 'primary', 'Update' ); ?>
</ins><span class="cx">
</span><span class="cx"> </form>
</span><span class="cx"> </div>
</span></span></pre></div>
<a id="trunkwpadminplugineditorphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/plugin-editor.php (16060 => 16061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/plugin-editor.php 2010-10-28 21:03:16 UTC (rev 16060)
+++ trunk/wp-admin/plugin-editor.php 2010-10-28 21:56:43 UTC (rev 16061)
</span><span class="lines">@@ -185,7 +185,7 @@
</span><span class="cx"> }
</span><span class="cx"> ?>
</span><span class="cx"> </select>
</span><del>- <input type="submit" name="Submit" value="<?php esc_attr_e('Select') ?>" class="button" />
</del><ins>+ <?php submit_button( __( 'Select' ), 'button', 'Submit', false ); ?>
</ins><span class="cx"> </form>
</span><span class="cx"> </div>
</span><span class="cx"> <br class="clear" />
</span><span class="lines">@@ -229,10 +229,12 @@
</span><span class="cx"> <?php } ?>
</span><span class="cx"> <p class="submit">
</span><span class="cx"> <?php
</span><del>- if ( isset($_GET['phperror']) )
- echo "<input type='hidden' name='phperror' value='1' /><input type='submit' name='submit' class='button-primary' value='" . esc_attr__('Update File and Attempt to Reactivate') . "' tabindex='2' />";
- else
- echo "<input type='submit' name='submit' class='button-primary' value='" . esc_attr__('Update File') . "' tabindex='2' />";
</del><ins>+ if ( isset($_GET['phperror']) ) {
+ echo "<input type='hidden' name='phperror' value='1' />";
+ submit_button( __( 'Update File and Attempt to Reactivate' ), 'primary', 'submit', false, array( 'tabindex' => '2' ) );
+ } else {
+ submit_button( __( 'Update File' ), 'primary', 'submit', false, array( 'tabindex' => '2' ) );
+ }
</ins><span class="cx"> ?>
</span><span class="cx"> </p>
</span><span class="cx"> <?php else : ?>
</span></span></pre></div>
<a id="trunkwpadminpluginsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/plugins.php (16060 => 16061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/plugins.php 2010-10-28 21:03:16 UTC (rev 16060)
+++ trunk/wp-admin/plugins.php 2010-10-28 21:56:43 UTC (rev 16061)
</span><span class="lines">@@ -253,10 +253,10 @@
</span><span class="cx"> echo '<input type="hidden" name="checked[]" value="' . esc_attr($plugin) . '" />';
</span><span class="cx"> ?>
</span><span class="cx"> <?php wp_nonce_field('bulk-plugins') ?>
</span><del>- <input type="submit" name="submit" value="<?php $data_to_delete ? esc_attr_e('Yes, Delete these files and data') : esc_attr_e('Yes, Delete these files') ?>" class="button" />
</del><ins>+ <?php submit_button( $data_to_delete ? __( 'Yes, Delete these files and data' ) : __( 'Yes, Delete these files' ), 'button', 'submit', false ); ?>
</ins><span class="cx"> </form>
</span><span class="cx"> <form method="post" action="<?php echo esc_url(wp_get_referer()); ?>" style="display:inline;">
</span><del>- <input type="submit" name="submit" value="<?php esc_attr_e('No, Return me to the plugin list') ?>" class="button" />
</del><ins>+ <?php submit_button( __( 'No, Return me to the plugin list' ), 'button', 'submit', false ); ?>
</ins><span class="cx"> </form>
</span><span class="cx">
</span><span class="cx"> <p><a href="#" onclick="jQuery('#files-list').toggle(); return false;"><?php _e('Click to view entire list of files which will be deleted'); ?></a></p>
</span><span class="lines">@@ -357,7 +357,7 @@
</span><span class="cx"> <p class="search-box">
</span><span class="cx"> <label class="screen-reader-text" for="plugin-search-input"><?php _e( 'Search Plugins' ); ?>:</label>
</span><span class="cx"> <input type="text" id="plugin-search-input" name="s" value="<?php _admin_search_query(); ?>" />
</span><del>- <input type="submit" value="<?php esc_attr_e( 'Search Installed Plugins' ); ?>" class="button" />
</del><ins>+ <?php submit_button( __( 'Search Installed Plugins' ), 'button', '', false ); ?>
</ins><span class="cx"> </p>
</span><span class="cx"> </form>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminpressthisphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/press-this.php (16060 => 16061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/press-this.php 2010-10-28 21:03:16 UTC (rev 16060)
+++ trunk/wp-admin/press-this.php 2010-10-28 21:56:43 UTC (rev 16061)
</span><span class="lines">@@ -472,12 +472,14 @@
</span><span class="cx"> <h3><?php _e('Publish') ?></h3>
</span><span class="cx"> <div class="inside">
</span><span class="cx"> <p>
</span><del>- <input class="button" type="submit" name="draft" value="<?php esc_attr_e('Save Draft') ?>" id="save" />
- <?php if ( current_user_can('publish_posts') ) { ?>
- <input class="button-primary" type="submit" name="publish" value="<?php esc_attr_e('Publish') ?>" id="publish" />
- <?php } else { ?>
- <br /><br /><input class="button-primary" type="submit" name="review" value="<?php esc_attr_e('Submit for Review') ?>" id="review" />
- <?php } ?>
</del><ins>+ <?php
+ submit_button( __( 'Save Draft' ), 'button', 'draft', false, array( 'id' => 'save' ) );
+ if ( current_user_can('publish_posts') ) {
+ submit_button( __( 'Publish' ), 'primary', 'publish', false );
+ } else {
+ echo '<br /><br />';
+ submit_button( __( 'Submit for Review' ), 'primary', 'review', false );
+ } ?>
</ins><span class="cx"> <img src="<?php echo esc_url( admin_url( 'images/wpspin_light.gif' ) ); ?>" alt="" id="saving" style="display:none;" />
</span><span class="cx"> </p>
</span><span class="cx"> </div>
</span></span></pre></div>
<a id="trunkwpadminsetupconfigphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/setup-config.php (16060 => 16061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/setup-config.php 2010-10-28 21:03:16 UTC (rev 16060)
+++ trunk/wp-admin/setup-config.php 2010-10-28 21:56:43 UTC (rev 16061)
</span><span class="lines">@@ -146,7 +146,7 @@
</span><span class="cx"> </tr>
</span><span class="cx"> </table>
</span><span class="cx"> <?php if ( isset( $_GET['noapi'] ) ) { ?><input name="noapi" type="hidden" value="true" /><?php } ?>
</span><del>- <p class="step"><input name="submit" type="submit" value="Submit" class="button" /></p>
</del><ins>+ <p class="step"><?php submit_button( __( 'Submit' ), 'button', 'submit', false ); ?></p>
</ins><span class="cx"> </form>
</span><span class="cx"> <?php
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkwpadminthemeeditorphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/theme-editor.php (16060 => 16061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/theme-editor.php 2010-10-28 21:03:16 UTC (rev 16060)
+++ trunk/wp-admin/theme-editor.php 2010-10-28 21:56:43 UTC (rev 16061)
</span><span class="lines">@@ -149,7 +149,7 @@
</span><span class="cx"> }
</span><span class="cx"> ?>
</span><span class="cx"> </select>
</span><del>- <input type="submit" name="Submit" value="<?php esc_attr_e('Select') ?>" class="button" />
</del><ins>+ <?php submit_button( __( 'Select' ), 'button', 'Submit', false ); ?>
</ins><span class="cx"> </form>
</span><span class="cx"> </div>
</span><span class="cx"> <br class="clear" />
</span><span class="lines">@@ -224,13 +224,10 @@
</span><span class="cx"> <?php } ?>
</span><span class="cx">
</span><span class="cx"> <div>
</span><del>-<?php if ( is_writeable($file) ) : ?>
- <p class="submit">
</del><span class="cx"> <?php
</span><del>- echo "<input type='submit' name='submit' class='button-primary' value='" . esc_attr__('Update File') . "' tabindex='2' />";
-?>
-</p>
-<?php else : ?>
</del><ins>+ if ( is_writeable($file) ) :
+ submit_button( __( 'Update File' ), 'primary', 'submit', true, array( 'tabindex' => '2' ) );
+ else : ?>
</ins><span class="cx"> <p><em><?php _e('You need to make this file writable before you can save your changes. See <a href="http://codex.wordpress.org/Changing_File_Permissions">the Codex</a> for more information.'); ?></em></p>
</span><span class="cx"> <?php endif; ?>
</span><span class="cx"> </div>
</span></span></pre></div>
<a id="trunkwpadminthemesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/themes.php (16060 => 16061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/themes.php 2010-10-28 21:03:16 UTC (rev 16060)
+++ trunk/wp-admin/themes.php 2010-10-28 21:56:43 UTC (rev 16061)
</span><span class="lines">@@ -133,7 +133,7 @@
</span><span class="cx"> <p class="search-box">
</span><span class="cx"> <label class="screen-reader-text" for="theme-search-input"><?php _e('Search Themes'); ?>:</label>
</span><span class="cx"> <input type="text" id="theme-search-input" name="s" value="<?php _admin_search_query(); ?>" />
</span><del>- <input type="submit" value="<?php esc_attr_e('Search Themes'); ?>" class="button" />
</del><ins>+ <?php submit_button( __( 'Search Themes' ), 'button', 'submit', false ); ?>
</ins><span class="cx"> <a id="filter-click" href="?filter=1"><?php _e( 'Feature Filter' ); ?></a>
</span><span class="cx"> </p>
</span><span class="cx">
</span><span class="lines">@@ -166,7 +166,7 @@
</span><span class="cx"> <?php endforeach; ?>
</span><span class="cx">
</span><span class="cx"> <div class="feature-container">
</span><del>- <input style="margin-left: 120px" type="submit" class="button-secondary submitter" value="<?php esc_attr_e( 'Apply Filters' ); ?>" />
</del><ins>+ <?php submit_button( __( 'Apply Filters' ), 'button-secondary submitter', 'submit', false, array( 'style' => 'margin-left: 120px' ) ); ?>
</ins><span class="cx"> &nbsp;
</span><span class="cx"> <small><a id="mini-filter-click" href="<?php echo admin_url( 'themes.php' ); ?>"><?php _e( 'Close filters' )?></a></small>
</span><span class="cx"> </div>
</span></span></pre></div>
<a id="trunkwpadminupdatecorephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/update-core.php (16060 => 16061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/update-core.php 2010-10-28 21:03:16 UTC (rev 16060)
+++ trunk/wp-admin/update-core.php 2010-10-28 21:56:43 UTC (rev 16061)
</span><span class="lines">@@ -58,14 +58,14 @@
</span><span class="cx"> echo '<input name="version" value="'. esc_attr($update->current) .'" type="hidden"/>';
</span><span class="cx"> echo '<input name="locale" value="'. esc_attr($update->locale) .'" type="hidden"/>';
</span><span class="cx"> if ( $show_buttons ) {
</span><del>- echo '<input id="upgrade" class="button" type="submit" value="' . esc_attr($submit) . '" name="upgrade" />&nbsp;';
- echo '<a href="' . esc_url($update->package) . '" class="button">' . $download . '</a>&nbsp;';
</del><ins>+ submit_button( $submit, 'button', 'upgrade', false );
+ echo '&nbsp;<a href="' . esc_url($update->package) . '" class="button">' . $download . '</a>&nbsp;';
</ins><span class="cx"> }
</span><span class="cx"> if ( 'en_US' != $update->locale )
</span><span class="cx"> if ( !isset( $update->dismissed ) || !$update->dismissed )
</span><del>- echo '<input id="dismiss" class="button" type="submit" value="' . esc_attr__('Hide this update') . '" name="dismiss" />';
</del><ins>+ submit_button( __('Hide this update'), 'button', 'dismiss', false );
</ins><span class="cx"> else
</span><del>- echo '<input id="undismiss" class="button" type="submit" value="' . esc_attr__('Bring back this update') . '" name="undismiss" />';
</del><ins>+ submit_button( __('Bring back this update'), 'button', 'undismiss', false );
</ins><span class="cx"> echo '</p>';
</span><span class="cx"> if ( 'en_US' != $update->locale && ( !isset($wp_local_package) || $wp_local_package != $update->locale ) )
</span><span class="cx"> echo '<p class="hint">'.__('This localized version contains both the translation and various other localization fixes. You can skip upgrading if you want to keep your current translation.').'</p>';
</span></span></pre></div>
<a id="trunkwpadminuploadphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/upload.php (16060 => 16061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/upload.php 2010-10-28 21:03:16 UTC (rev 16060)
+++ trunk/wp-admin/upload.php 2010-10-28 21:56:43 UTC (rev 16061)
</span><span class="lines">@@ -206,7 +206,7 @@
</span><span class="cx"> <p class="search-box">
</span><span class="cx"> <label class="screen-reader-text" for="media-search-input"><?php _e( 'Search Media' ); ?>:</label>
</span><span class="cx"> <input type="text" id="media-search-input" name="s" value="<?php the_search_query(); ?>" />
</span><del>- <input type="submit" value="<?php esc_attr_e( 'Search Media' ); ?>" class="button" />
</del><ins>+ <?php submit_button( __( 'Search Media' ), 'button', 'submit', false ); ?>
</ins><span class="cx"> </p>
</span><span class="cx"> </form>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminusernewphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/user-new.php (16060 => 16061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/user-new.php 2010-10-28 21:03:16 UTC (rev 16060)
+++ trunk/wp-admin/user-new.php 2010-10-28 21:56:43 UTC (rev 16061)
</span><span class="lines">@@ -262,8 +262,9 @@
</span><span class="cx"> </tr>
</span><span class="cx"> <?php } ?>
</span><span class="cx"> </table>
</span><del>-
-<?php submit_button( __('Add User'), 'primary', 'adduser' ); ?>
</del><ins>+<p class="submit">
+ <input name="adduser" type="submit" id="addusersub" class="button-primary" value="<?php esc_attr_e('Add User') ?>" />
+</p>
</ins><span class="cx"> </form>
</span><span class="cx">
</span><span class="cx"> </div>
</span></span></pre></div>
<a id="trunkwpadminusersphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/users.php (16060 => 16061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/users.php 2010-10-28 21:03:16 UTC (rev 16060)
+++ trunk/wp-admin/users.php 2010-10-28 21:56:43 UTC (rev 16061)
</span><span class="lines">@@ -357,7 +357,7 @@
</span><span class="cx"> <p class="search-box">
</span><span class="cx"> <label class="screen-reader-text" for="user-search-input"><?php _e( 'Search Users' ); ?>:</label>
</span><span class="cx"> <input type="text" id="user-search-input" name="usersearch" value="<?php echo esc_attr($usersearch); ?>" />
</span><del>- <input type="submit" value="<?php esc_attr_e( 'Search Users' ); ?>" class="button" />
</del><ins>+ <?php submit_button( __( 'Search Users' ), 'submit', 'submit', false ); ?>
</ins><span class="cx"> </p>
</span><span class="cx"> </form>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminwidgetsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/widgets.php (16060 => 16061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/widgets.php 2010-10-28 21:03:16 UTC (rev 16060)
+++ trunk/wp-admin/widgets.php 2010-10-28 21:56:43 UTC (rev 16061)
</span><span class="lines">@@ -306,12 +306,14 @@
</span><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <div class="widget-control-actions">
</span><del>-<?php if ( isset($_GET['addnew']) ) { ?>
</del><ins>+<?php
+ if ( isset($_GET['addnew']) ) { ?>
</ins><span class="cx"> <a href="widgets.php" class="button alignleft"><?php _e('Cancel'); ?></a>
</span><del>-<?php } else { ?>
- <input type="submit" name="removewidget" class="button alignleft" value="<?php esc_attr_e('Delete'); ?>" />
-<?php } ?>
- <input type="submit" name="savewidget" class="button-primary alignright" value="<?php esc_attr_e('Save Widget'); ?>" />
</del><ins>+<?php
+ } else {
+ submit_button( __( 'Delete' ), 'button alignleft', 'removewidget', false );
+ }
+ submit_button( __( 'Save Widget' ), 'button-primary alignright', 'savewidget', false ); ?>
</ins><span class="cx"> <input type="hidden" name="widget-id" class="widget-id" value="<?php echo esc_attr($widget_id); ?>" />
</span><span class="cx"> <input type="hidden" name="id_base" class="id_base" value="<?php echo esc_attr($id_base); ?>" />
</span><span class="cx"> <input type="hidden" name="multi_number" class="multi_number" value="<?php echo esc_attr($multi_number); ?>" />
</span></span></pre></div>
<a id="trunkwpincludescommenttemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/comment-template.php (16060 => 16061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/comment-template.php 2010-10-28 21:03:16 UTC (rev 16060)
+++ trunk/wp-includes/comment-template.php 2010-10-28 21:56:43 UTC (rev 16061)
</span><span class="lines">@@ -1572,7 +1572,7 @@
</span><span class="cx"> <?php echo apply_filters( 'comment_form_field_comment', $args['comment_field'] ); ?>
</span><span class="cx"> <?php echo $args['comment_notes_after']; ?>
</span><span class="cx"> <p class="form-submit">
</span><del>- <input name="submit" type="submit" id="<?php echo esc_attr( $args['id_submit'] ); ?>" value="<?php echo esc_attr( $args['label_submit'] ); ?>" />
</del><ins>+ <?php submit_button( $args['label_submit'], 'button', 'submit', false, array( 'id' => $args['id_submit'] ) ); ?>
</ins><span class="cx"> <?php comment_id_fields(); ?>
</span><span class="cx"> </p>
</span><span class="cx"> <?php do_action( 'comment_form', $post_id ); ?>
</span></span></pre></div>
<a id="trunkwpincludesgeneraltemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/general-template.php (16060 => 16061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/general-template.php 2010-10-28 21:03:16 UTC (rev 16060)
+++ trunk/wp-includes/general-template.php 2010-10-28 21:56:43 UTC (rev 16061)
</span><span class="lines">@@ -160,7 +160,7 @@
</span><span class="cx"> $form = '<form role="search" method="get" id="searchform" action="' . home_url( '/' ) . '" >
</span><span class="cx"> <div><label class="screen-reader-text" for="s">' . __('Search for:') . '</label>
</span><span class="cx"> <input type="text" value="' . get_search_query() . '" name="s" id="s" />
</span><del>- <input type="submit" id="searchsubmit" value="'. esc_attr__('Search') .'" />
</del><ins>+ ' . get_submit_button( __( 'Search' ), '', 'searchsubmit', false ) . '
</ins><span class="cx"> </div>
</span><span class="cx"> </form>';
</span><span class="cx">
</span><span class="lines">@@ -283,7 +283,7 @@
</span><span class="cx"> ' . apply_filters( 'login_form_middle', '' ) . '
</span><span class="cx"> ' . ( $args['remember'] ? '<p class="login-remember"><label><input name="rememberme" type="checkbox" id="' . esc_attr( $args['id_remember'] ) . '" value="forever" tabindex="90"' . ( $args['value_remember'] ? ' checked="checked"' : '' ) . ' /> ' . esc_html( $args['label_remember'] ) . '</label></p>' : '' ) . '
</span><span class="cx"> <p class="login-submit">
</span><del>- <input type="submit" name="wp-submit" id="' . esc_attr( $args['id_submit'] ) . '" class="button-primary" value="' . esc_attr( $args['label_log_in'] ) . '" tabindex="100" />
</del><ins>+ ' . get_submit_button( $args['label_log_in'], 'primary', 'wp-submit', false, array( 'id' => $args['id_submit'], 'tabindex' => 100 ) ) . '
</ins><span class="cx"> <input type="hidden" name="redirect_to" value="' . esc_attr( $args['redirect'] ) . '" />
</span><span class="cx"> </p>
</span><span class="cx"> ' . apply_filters( 'login_form_bottom', '' ) . '
</span></span></pre></div>
<a id="trunkwpincludesposttemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post-template.php (16060 => 16061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post-template.php 2010-10-28 21:03:16 UTC (rev 16060)
+++ trunk/wp-includes/post-template.php 2010-10-28 21:56:43 UTC (rev 16061)
</span><span class="lines">@@ -1025,7 +1025,11 @@
</span><span class="cx"> $label = 'pwbox-'.(empty($post->ID) ? rand() : $post->ID);
</span><span class="cx"> $output = '<form action="' . get_option('siteurl') . '/wp-pass.php" method="post">
</span><span class="cx"> <p>' . __("This post is password protected. To view it please enter your password below:") . '</p>
</span><del>- <p><label for="' . $label . '">' . __("Password:") . ' <input name="post_password" id="' . $label . '" type="password" size="20" /></label> <input type="submit" name="Submit" value="' . esc_attr__("Submit") . '" /></p>
</del><ins>+ <p>
+ <label for="' . $label . '">' . __("Password:") . '
+ <input name="post_password" id="' . $label . '" type="password" size="20" />
+ </label>' . get_submit_button( __( 'Submit' ), '', 'Submit', false ) . '
+ </p>
</ins><span class="cx"> </form>
</span><span class="cx"> ';
</span><span class="cx"> return apply_filters('the_password_form', $output);
</span><span class="lines">@@ -1208,7 +1212,7 @@
</span><span class="cx">
</span><span class="cx"> <div class="tablenav">
</span><span class="cx"> <div class="alignleft">
</span><del>- <input type="submit" class="button-secondary" value="<?php esc_attr_e( 'Compare Revisions' ); ?>" />
</del><ins>+ <?php submit_button( __( 'Compare Revisions' ), 'secondary', '', false ); ?>
</ins><span class="cx"> <input type="hidden" name="action" value="diff" />
</span><span class="cx"> <input type="hidden" name="post_type" value="<?php echo esc_attr($post->post_type); ?>" />
</span><span class="cx"> </div>
</span></span></pre></div>
<a id="trunkwpincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post.php (16060 => 16061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post.php 2010-10-28 21:03:16 UTC (rev 16060)
+++ trunk/wp-includes/post.php 2010-10-28 21:56:43 UTC (rev 16061)
</span><span class="lines">@@ -5123,14 +5123,14 @@
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> $submit_fields = array(
</span><del>- 'save' => '<input type="submit" name="save" id="save-post" class="button" tabindex="%s" value="'. esc_attr('Save Draft') .'" />',
</del><ins>+ 'save' => get_submit_button( __( 'Save Draft' ), 'button', 'save', false, array( 'id' => 'save-post', 'tabindex' => '%s' ) ),
</ins><span class="cx"> 'reset' => '<input type="reset" tabindex="%s" value="'. esc_attr( 'Reset' ).'" class="button" />',
</span><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> $publishing_action = current_user_can('publish_posts') ? esc_attr('Publish') : esc_attr('Submit for Review');
</span><span class="cx">
</span><span class="cx"> $publishing_fields = array(
</span><del>- 'submit' => '<input type="submit" name="publish" id="publish" accesskey="p" tabindex="%s" class="button-primary" value="' . $publishing_action . '" />',
</del><ins>+ 'submit' => get_submit_button( $publishing_action, 'primary', 'publish', false, array( 'accesskey' => 'p', 'tabindex' => '%s' ) ),
</ins><span class="cx"> /*'test' => '<input type="submit" name="publish" id="publish" accesskey="p" tabindex="%n" class="button-primary" value="'. esc_attr('Publish') .'" />', */
</span><span class="cx">
</span><span class="cx"> );
</span></span></pre></div>
<a id="trunkwpincludesthemecompatcommentspopupphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/theme-compat/comments-popup.php (16060 => 16061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/theme-compat/comments-popup.php 2010-10-28 21:03:16 UTC (rev 16060)
+++ trunk/wp-includes/theme-compat/comments-popup.php 2010-10-28 21:56:43 UTC (rev 16061)
</span><span class="lines">@@ -95,7 +95,7 @@
</span><span class="cx"> <p>
</span><span class="cx"> <input type="hidden" name="comment_post_ID" value="<?php echo $id; ?>" />
</span><span class="cx"> <input type="hidden" name="redirect_to" value="<?php echo esc_attr($_SERVER["REQUEST_URI"]); ?>" />
</span><del>- <input name="submit" type="submit" tabindex="5" value="<?php _e('Say It!' ); ?>" />
</del><ins>+ <?php submit_button( __( 'Say It!' ), '', 'submit', false, array( 'tabindex' => '5' ) ); ?>
</ins><span class="cx"> </p>
</span><span class="cx"> <?php do_action('comment_form', $post->ID); ?>
</span><span class="cx"> </form>
</span></span></pre></div>
<a id="trunkwpincludesthemecompatcommentsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/theme-compat/comments.php (16060 => 16061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/theme-compat/comments.php 2010-10-28 21:03:16 UTC (rev 16060)
+++ trunk/wp-includes/theme-compat/comments.php 2010-10-28 21:56:43 UTC (rev 16061)
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx">
</span><span class="cx"> <p><textarea name="comment" id="comment" cols="58" rows="10" tabindex="4"></textarea></p>
</span><span class="cx">
</span><del>-<p><input name="submit" type="submit" id="submit" tabindex="5" value="<?php _e('Submit Comment'); ?>" />
</del><ins>+<p><?php submit_button( __( 'Submit Comment' ), '', 'submit', false, array( 'tabindex' => '5' ) ); ?>
</ins><span class="cx"> <?php comment_id_fields(); ?>
</span><span class="cx"> </p>
</span><span class="cx"> <?php do_action('comment_form', $post->ID); ?>
</span></span></pre></div>
<a id="trunkwploginphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-login.php (16060 => 16061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-login.php 2010-10-28 21:03:16 UTC (rev 16060)
+++ trunk/wp-login.php 2010-10-28 21:56:43 UTC (rev 16061)
</span><span class="lines">@@ -411,7 +411,7 @@
</span><span class="cx"> </p>
</span><span class="cx"> <?php do_action('lostpassword_form'); ?>
</span><span class="cx"> <input type="hidden" name="redirect_to" value="<?php echo esc_attr( $redirect_to ); ?>" />
</span><del>- <p class="submit"><input type="submit" name="wp-submit" id="wp-submit" class="button-primary" value="<?php esc_attr_e('Get New Password'); ?>" tabindex="100" /></p>
</del><ins>+ <?php submit_button( __( 'Get New Password' ), 'primary', 'wp-submit', true, array( 'tabindex' => '100' ) ); ?>
</ins><span class="cx"> </form>
</span><span class="cx">
</span><span class="cx"> <p id="nav">
</span><span class="lines">@@ -467,7 +467,7 @@
</span><span class="cx"> <p class="description indicator-hint"><?php _e('Hint: The password should be at least seven characters long. To make it stronger, use upper and lower case letters, numbers and symbols like ! " ? $ % ^ &amp; ).'); ?></p>
</span><span class="cx">
</span><span class="cx"> <br class="clear" />
</span><del>- <p class="submit"><input type="submit" name="wp-submit" id="wp-submit" class="button-primary" value="<?php esc_attr_e('Reset Password'); ?>" tabindex="100" /></p>
</del><ins>+ <?php submit_button( __( 'Reset Password' ), 'primary', 'wp-submit', true, array( 'tabindex' => '100' ) ); ?>
</ins><span class="cx"> </form>
</span><span class="cx">
</span><span class="cx"> <p id="nav">
</span><span class="lines">@@ -523,7 +523,7 @@
</span><span class="cx"> <p id="reg_passmail"><?php _e('A password will be e-mailed to you.') ?></p>
</span><span class="cx"> <br class="clear" />
</span><span class="cx"> <input type="hidden" name="redirect_to" value="<?php echo esc_attr( $redirect_to ); ?>" />
</span><del>- <p class="submit"><input type="submit" name="wp-submit" id="wp-submit" class="button-primary" value="<?php esc_attr_e('Register'); ?>" tabindex="100" /></p>
</del><ins>+ <?php submit_button( __( 'Register' ), 'primary', 'wp-submit', true, array( 'tabindex' => '100' ) ); ?>
</ins><span class="cx"> </form>
</span><span class="cx">
</span><span class="cx"> <p id="nav">
</span><span class="lines">@@ -640,7 +640,7 @@
</span><span class="cx"> <?php do_action('login_form'); ?>
</span><span class="cx"> <p class="forgetmenot"><label><input name="rememberme" type="checkbox" id="rememberme" value="forever" tabindex="90"<?php checked( $rememberme ); ?> /> <?php esc_attr_e('Remember Me'); ?></label></p>
</span><span class="cx"> <p class="submit">
</span><del>- <input type="submit" name="wp-submit" id="wp-submit" class="button-primary" value="<?php esc_attr_e('Log In'); ?>" tabindex="100" />
</del><ins>+ <?php submit_button( __( 'Log In' ), 'primary', 'wp-submit', false, array( 'tabindex' => '100' ) ); ?>
</ins><span class="cx"> <?php if ( $interim_login ) { ?>
</span><span class="cx"> <input type="hidden" name="interim-login" value="1" />
</span><span class="cx"> <?php } else { ?>
</span></span></pre></div>
<a id="trunkwpsignupphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-signup.php (16060 => 16061)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-signup.php 2010-10-28 21:03:16 UTC (rev 16060)
+++ trunk/wp-signup.php 2010-10-28 21:56:43 UTC (rev 16061)
</span><span class="lines">@@ -191,7 +191,7 @@
</span><span class="cx"> <input type="hidden" name="stage" value="gimmeanotherblog" />
</span><span class="cx"> <?php do_action( "signup_hidden_fields" ); ?>
</span><span class="cx"> <?php show_blog_form($blogname, $blog_title, $errors); ?>
</span><del>- <p class="submit"><input type="submit" name="submit" class="submit" value="<?php esc_attr_e( 'Create Site' ) ?>" /></p>
</del><ins>+ <?php submit_button( __( 'Create Site' ), 'submit', 'submit' ); ?>
</ins><span class="cx"> </form>
</span><span class="cx"> <?php
</span><span class="cx"> }
</span><span class="lines">@@ -270,7 +270,7 @@
</span><span class="cx"> <?php } ?>
</span><span class="cx"> </p>
</span><span class="cx">
</span><del>- <p class="submit"><input type="submit" name="submit" class="submit" value="<?php esc_attr_e('Next') ?>" /></p>
</del><ins>+ <?php submit_button( __( 'Next' ), 'submit', 'submit' ); ?>
</ins><span class="cx"> </form>
</span><span class="cx"> <?php
</span><span class="cx"> }
</span><span class="lines">@@ -326,7 +326,7 @@
</span><span class="cx"> <input type="hidden" name="user_email" value="<?php echo esc_attr($user_email) ?>" />
</span><span class="cx"> <?php do_action( "signup_hidden_fields" ); ?>
</span><span class="cx"> <?php show_blog_form($blogname, $blog_title, $errors); ?>
</span><del>- <p class="submit"><input type="submit" name="submit" class="submit" value="<?php esc_attr_e('Signup') ?>" /></p>
</del><ins>+ <?php submit_button( __( 'Signup' ), 'submit', 'submit', true ); ?>
</ins><span class="cx"> </form>
</span><span class="cx"> <?php
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>