mirror of
https://github.com/gosticks/wordpress-develop.git
synced 2026-08-12 04:40:26 +00:00
Collapse crazyhorse to trunk. Incoming! see #7552
git-svn-id: https://develop.svn.wordpress.org/trunk@8691 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
+166
-94
@@ -44,9 +44,11 @@ if ( 0 == $post_ID) {
|
||||
|
||||
$temp_ID = (int) $temp_ID;
|
||||
$user_ID = (int) $user_ID;
|
||||
|
||||
?>
|
||||
|
||||
<form name="post" action="page.php" method="post" id="post">
|
||||
<div id="wpbody-content">
|
||||
|
||||
<?php if ( $notice ) : ?>
|
||||
<div id="notice" class="error"><p><?php echo $notice ?></p></div>
|
||||
<?php endif; ?>
|
||||
@@ -54,39 +56,13 @@ $user_ID = (int) $user_ID;
|
||||
<div id="message" class="updated fade"><p><?php echo $messages[$_GET['message']]; ?></p></div>
|
||||
<?php endif; ?>
|
||||
|
||||
<form name="post" action="page.php" method="post" id="post">
|
||||
<div class="wrap">
|
||||
<h2><?php _e('Write Page') ?></h2>
|
||||
|
||||
<?php
|
||||
wp_nonce_field($nonce_action);
|
||||
|
||||
if (isset($mode) && 'bookmarklet' == $mode)
|
||||
echo '<input type="hidden" name="mode" value="bookmarklet" />';
|
||||
function page_submit_meta_box($post) {
|
||||
global $action;
|
||||
?>
|
||||
<input type="hidden" id="user-id" name="user_ID" value="<?php echo $user_ID ?>" />
|
||||
<input type="hidden" id="hiddenaction" name="action" value='<?php echo $form_action ?>' />
|
||||
<input type="hidden" id="originalaction" name="originalaction" value="<?php echo $form_action ?>" />
|
||||
<input type="hidden" id="post_author" name="post_author" value="<?php echo attribute_escape( $post->post_author ); ?>" />
|
||||
<?php echo $form_extra ?>
|
||||
<input type="hidden" id="post_type" name="post_type" value="<?php echo $post->post_type ?>" />
|
||||
<input type="hidden" id="original_post_status" name="original_post_status" value="<?php echo $post->post_status ?>" />
|
||||
<input name="referredby" type="hidden" id="referredby" value="<?php echo clean_url(stripslashes(wp_get_referer())); ?>" />
|
||||
<?php if ( 'draft' != $post->post_status ) wp_original_referer_field(true, 'previous'); ?>
|
||||
|
||||
<div id="poststuff">
|
||||
|
||||
<div class="submitbox" id="submitpage">
|
||||
|
||||
<div id="previewview">
|
||||
<?php if ( 'publish' == $post->post_status ) { ?>
|
||||
<a href="<?php echo clean_url(get_permalink($post->ID)); ?>" target="_blank" tabindex="4"><?php _e('View this Page'); ?></a>
|
||||
<?php } elseif ( 'edit' == $action ) { ?>
|
||||
<a href="<?php echo clean_url(apply_filters('preview_post_link', add_query_arg('preview', 'true', get_permalink($post->ID)))); ?>" target="_blank" tabindex="4"><?php _e('Preview this Page'); ?></a>
|
||||
<?php } ?>
|
||||
</div>
|
||||
|
||||
<div class="inside">
|
||||
<div class="inside-submitbox">
|
||||
<p><strong><label for='post_status'><?php _e('Publish Status') ?></label></strong></p>
|
||||
<p>
|
||||
<select name='post_status' tabindex='4' id='post_status'>
|
||||
@@ -108,7 +84,7 @@ if ( current_user_can('publish_pages') OR ( $post->post_status == 'publish' AND
|
||||
<?php endif; ?>
|
||||
|
||||
<?php
|
||||
if ( 0 != $post_ID ) {
|
||||
if ( 0 != $post->ID ) {
|
||||
if ( 'future' == $post->post_status ) { // scheduled for publishing at a future date
|
||||
$stamp = __('Scheduled for:<br />%1$s at %2$s');
|
||||
} else if ( 'publish' == $post->post_status ) { // already published
|
||||
@@ -137,7 +113,7 @@ if ( 0 != $post_ID ) {
|
||||
<?php do_action('page_submitbox_start'); ?>
|
||||
<input type="submit" name="save" class="button button-highlighted" value="<?php _e('Save'); ?>" tabindex="4" />
|
||||
<?php
|
||||
if ( !in_array( $post->post_status, array('publish', 'future') ) || 0 == $post_ID ) {
|
||||
if ( !in_array( $post->post_status, array('publish', 'future') ) || 0 == $post->ID ) {
|
||||
?>
|
||||
<?php if ( current_user_can('publish_pages') ) : ?>
|
||||
<input name="publish" type="submit" class="button" id="publish" tabindex="5" accesskey="p" value="<?php _e('Publish') ?>" />
|
||||
@@ -147,12 +123,14 @@ if ( !in_array( $post->post_status, array('publish', 'future') ) || 0 == $post_I
|
||||
<?php
|
||||
}
|
||||
|
||||
if ( ('edit' == $action) && current_user_can('delete_page', $post_ID) )
|
||||
echo "<a class='submitdelete' href='" . wp_nonce_url("page.php?action=delete&post=$post_ID", 'delete-page_' . $post_ID) . "' onclick=\"if ( confirm('" . js_escape(sprintf( ('draft' == $post->post_status) ? __("You are about to delete this draft '%s'\n 'Cancel' to stop, 'OK' to delete.") : __("You are about to delete this page '%s'\n 'Cancel' to stop, 'OK' to delete."), $post->post_title )) . "') ) { return true;}return false;\">" . __('Delete page') . "</a>";
|
||||
if ( ('edit' == $action) && current_user_can('delete_page', $post->ID) )
|
||||
echo "<a class='submitdelete' href='" . wp_nonce_url("page.php?action=delete&post=$post->ID", 'delete-page_' . $post->ID) . "' onclick=\"if ( confirm('" . js_escape(sprintf( ('draft' == $post->post_status) ? __("You are about to delete this draft '%s'\n 'Cancel' to stop, 'OK' to delete.") : __("You are about to delete this page '%s'\n 'Cancel' to stop, 'OK' to delete."), $post->post_title )) . "') ) { return true;}return false;\">" . __('Delete page') . "</a>";
|
||||
?>
|
||||
<br class="clear" />
|
||||
<?php if ( 0 != $post_ID ) : ?>
|
||||
<?php if ( $last_id = get_post_meta($post_ID, '_edit_last', true) ) {
|
||||
|
||||
<!-- moved under the editor
|
||||
<?php if ( 0 != $post->ID ) : ?>
|
||||
<?php if ( $last_id = get_post_meta($post->ID, '_edit_last', true) ) {
|
||||
$last_user = get_userdata($last_id);
|
||||
printf(__('Last edited by %1$s on %2$s at %3$s'), wp_specialchars( $last_user->display_name ), mysql2date(get_option('date_format'), $post->post_modified), mysql2date(get_option('time_format'), $post->post_modified));
|
||||
} else {
|
||||
@@ -161,58 +139,14 @@ if ( ('edit' == $action) && current_user_can('delete_page', $post_ID) )
|
||||
?>
|
||||
<br class="clear" />
|
||||
<?php endif; ?>
|
||||
<span id="autosave"></span>
|
||||
<span id="wp-word-count"></span>
|
||||
-->
|
||||
|
||||
</p>
|
||||
|
||||
<div class="side-info">
|
||||
<h5><?php _e('Related') ?></h5>
|
||||
|
||||
<ul>
|
||||
<?php if ( 0 != $post_ID ) : ?>
|
||||
<li><a href="edit-pages.php?page_id=<?php echo $post_ID ?>"><?php _e('See Comments on this Page') ?></a></li>
|
||||
<?php endif; ?>
|
||||
<li><a href="edit-comments.php"><?php _e('Manage All Comments') ?></a></li>
|
||||
<li><a href="edit-pages.php"><?php _e('Manage All Pages') ?></a></li>
|
||||
<?php do_action('page_relatedlinks_list'); ?>
|
||||
</ul>
|
||||
</div>
|
||||
<?php do_action('submitpage_box'); ?>
|
||||
</div>
|
||||
|
||||
<div id="post-body">
|
||||
<div id="titlediv">
|
||||
<h3><label for="title"><?php _e('Title') ?></label></h3>
|
||||
<div id="titlewrap">
|
||||
<input type="text" name="post_title" size="30" tabindex="1" value="<?php echo attribute_escape( $post->post_title ); ?>" id="title" autocomplete="off" />
|
||||
</div>
|
||||
<div class="inside">
|
||||
<?php $sample_permalink_html = get_sample_permalink_html($post->ID); ?>
|
||||
<div id="edit-slug-box">
|
||||
<?php if ( ! empty($post->ID) && ! empty($sample_permalink_html) ) :
|
||||
echo $sample_permalink_html;
|
||||
endif; ?>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div id="<?php echo user_can_richedit() ? 'postdivrich' : 'postdiv'; ?>" class="postarea">
|
||||
<h3><label for="content"><?php _e('Page') ?></label></h3>
|
||||
<?php the_editor($post->post_content); ?>
|
||||
<?php wp_nonce_field( 'autosave', 'autosavenonce', false ); ?>
|
||||
<?php wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); ?>
|
||||
<?php wp_nonce_field( 'getpermalink', 'getpermalinknonce', false ); ?>
|
||||
<?php wp_nonce_field( 'samplepermalink', 'samplepermalinknonce', false ); ?>
|
||||
</div>
|
||||
|
||||
<?php do_meta_boxes('page', 'normal', $post); ?>
|
||||
|
||||
<?php do_action('edit_page_form'); ?>
|
||||
|
||||
<h2><?php _e('Advanced Options'); ?></h2>
|
||||
|
||||
|
||||
<?php
|
||||
}
|
||||
add_meta_box('pagesubmitdiv', __('Publish'), 'page_submit_meta_box', 'page', 'side', 'core');
|
||||
|
||||
function page_custom_meta_box($post){
|
||||
?>
|
||||
<div id="postcustomstuff">
|
||||
@@ -231,7 +165,7 @@ list_meta($metadata);
|
||||
<p><?php _e('Custom fields can be used to add extra metadata to a post that you can <a href="http://codex.wordpress.org/Using_Custom_Fields" target="_blank">use in your theme</a>.'); ?></p>
|
||||
<?php
|
||||
}
|
||||
add_meta_box('pagecustomdiv', __('Custom Fields'), 'page_custom_meta_box', 'page', 'advanced', 'core');
|
||||
add_meta_box('pagecustomdiv', __('Custom Fields'), 'page_custom_meta_box', 'page', 'normal', 'core');
|
||||
|
||||
function page_comments_status_meta_box($post){
|
||||
?>
|
||||
@@ -243,7 +177,7 @@ function page_comments_status_meta_box($post){
|
||||
<p><?php _e('These settings apply to this page only. “Pings” are <a href="http://codex.wordpress.org/Introduction_to_Blogging#Managing_Comments" target="_blank">trackbacks and pingbacks</a>.'); ?></p>
|
||||
<?php
|
||||
}
|
||||
add_meta_box('pagecommentstatusdiv', __('Comments & Pings'), 'page_comments_status_meta_box', 'page', 'advanced', 'core');
|
||||
add_meta_box('pagecommentstatusdiv', __('Comments & Pings'), 'page_comments_status_meta_box', 'page', 'normal', 'core');
|
||||
|
||||
function page_password_meta_box($post){
|
||||
?>
|
||||
@@ -251,14 +185,14 @@ function page_password_meta_box($post){
|
||||
<p><?php _e('Setting a password will require people who visit your blog to enter the above password to view this page and its comments.'); ?></p>
|
||||
<?php
|
||||
}
|
||||
add_meta_box('pagepassworddiv', __('Password Protect This Page'), 'page_password_meta_box', 'page', 'advanced', 'core');
|
||||
add_meta_box('pagepassworddiv', __('Password Protect This Page'), 'page_password_meta_box', 'page', 'normal', 'core');
|
||||
|
||||
function page_slug_meta_box($post){
|
||||
?>
|
||||
<label class="hidden" for="post_name"><?php _e('Page Slug') ?></label><input name="post_name" type="text" size="13" id="post_name" value="<?php echo attribute_escape( $post->post_name ); ?>" />
|
||||
<?php
|
||||
}
|
||||
add_meta_box('pageslugdiv', __('Page Slug'), 'page_slug_meta_box', 'page', 'advanced', 'core');
|
||||
add_meta_box('pageslugdiv', __('Page Slug'), 'page_slug_meta_box', 'page', 'normal', 'core');
|
||||
|
||||
function page_parent_meta_box($post){
|
||||
?>
|
||||
@@ -270,7 +204,7 @@ function page_parent_meta_box($post){
|
||||
<p><?php _e('You can arrange your pages in hierarchies, for example you could have an “About” page that has “Life Story” and “My Dog” pages under it. There are no limits to how deeply nested you can make pages.'); ?></p>
|
||||
<?php
|
||||
}
|
||||
add_meta_box('pageparentdiv', __('Page Parent'), 'page_parent_meta_box', 'page', 'advanced', 'core');
|
||||
add_meta_box('pageparentdiv', __('Page Parent'), 'page_parent_meta_box', 'page', 'normal', 'core');
|
||||
|
||||
if ( 0 != count( get_page_templates() ) ) {
|
||||
function page_template_meta_box($post){
|
||||
@@ -282,7 +216,7 @@ if ( 0 != count( get_page_templates() ) ) {
|
||||
<p><?php _e('Some themes have custom templates you can use for certain pages that might have additional features or custom layouts. If so, you’ll see them above.'); ?></p>
|
||||
<?php
|
||||
}
|
||||
add_meta_box('pagetemplatediv', __('Page Template'), 'page_template_meta_box', 'page', 'advanced', 'core');
|
||||
add_meta_box('pagetemplatediv', __('Page Template'), 'page_template_meta_box', 'page', 'normal', 'core');
|
||||
}
|
||||
|
||||
function page_order_meta_box($post){
|
||||
@@ -291,7 +225,7 @@ function page_order_meta_box($post){
|
||||
<p><?php _e('Pages are usually ordered alphabetically, but you can put a number above to change the order pages appear in. (We know this is a little janky, it’ll be better in future releases.)'); ?></p>
|
||||
<?php
|
||||
}
|
||||
add_meta_box('pageorderdiv', __('Page Order'), 'page_order_meta_box', 'page', 'advanced', 'core');
|
||||
add_meta_box('pageorderdiv', __('Page Order'), 'page_order_meta_box', 'page', 'normal', 'core');
|
||||
|
||||
|
||||
$authors = get_editable_user_ids( $current_user->id ); // TODO: ROLE SYSTEM
|
||||
@@ -307,7 +241,7 @@ if ( $authors && count( $authors ) > 1 ) {
|
||||
<label class="hidden" for="post_author_override"><?php _e('Page Author'); ?></label><?php wp_dropdown_users( array('include' => $authors, 'name' => 'post_author_override', 'selected' => empty($post->ID) ? $user_ID : $post->post_author) ); ?>
|
||||
<?php
|
||||
}
|
||||
add_meta_box('pageauthordiv', __('Page Author'), 'page_author_meta_box', 'page', 'advanced', 'core');
|
||||
add_meta_box('pageauthordiv', __('Page Author'), 'page_author_meta_box', 'page', 'normal', 'core');
|
||||
}
|
||||
|
||||
|
||||
@@ -315,17 +249,155 @@ if ( 0 < $post_ID && wp_get_post_revisions( $post_ID ) ) :
|
||||
function page_revisions_meta_box($post) {
|
||||
wp_list_post_revisions();
|
||||
}
|
||||
add_meta_box('revisionsdiv', __('Page Revisions'), 'page_revisions_meta_box', 'page', 'advanced', 'core');
|
||||
add_meta_box('revisionsdiv', __('Page Revisions'), 'page_revisions_meta_box', 'page', 'normal', 'core');
|
||||
endif;
|
||||
?>
|
||||
|
||||
<div class="wrap">
|
||||
<h2><?php
|
||||
if ( !isset($post_ID) || 0 == $post_ID )
|
||||
printf( __( '<a href="%s">Pages</a> / Write New Page' ), 'edit-pages.php' );
|
||||
else
|
||||
printf( __( '<a href="%s">Pages</a> / Edit Page' ), 'edit-pages.php' );
|
||||
?></h2>
|
||||
|
||||
<div id="previewview">
|
||||
<?php if ( 'publish' == $post->post_status ) { ?>
|
||||
<a class="button" href="<?php echo clean_url(get_permalink($post->ID)); ?>" target="_blank" tabindex="4"><?php _e('View this Page'); ?></a>
|
||||
<?php } elseif ( 'edit' == $action ) { ?>
|
||||
<a class="button" href="<?php echo clean_url(apply_filters('preview_post_link', add_query_arg('preview', 'true', get_permalink($post->ID)))); ?>" target="_blank" tabindex="4"><?php _e('Preview this Page'); ?></a>
|
||||
<?php } ?>
|
||||
</div>
|
||||
|
||||
<?php
|
||||
wp_nonce_field($nonce_action);
|
||||
|
||||
if (isset($mode) && 'bookmarklet' == $mode)
|
||||
echo '<input type="hidden" name="mode" value="bookmarklet" />';
|
||||
?>
|
||||
<input type="hidden" id="user-id" name="user_ID" value="<?php echo $user_ID ?>" />
|
||||
<input type="hidden" id="hiddenaction" name="action" value='<?php echo $form_action ?>' />
|
||||
<input type="hidden" id="originalaction" name="originalaction" value="<?php echo $form_action ?>" />
|
||||
<input type="hidden" id="post_author" name="post_author" value="<?php echo attribute_escape( $post->post_author ); ?>" />
|
||||
<?php echo $form_extra ?>
|
||||
<input type="hidden" id="post_type" name="post_type" value="<?php echo $post->post_type ?>" />
|
||||
<input type="hidden" id="original_post_status" name="original_post_status" value="<?php echo $post->post_status ?>" />
|
||||
<input name="referredby" type="hidden" id="referredby" value="<?php echo clean_url(stripslashes(wp_get_referer())); ?>" />
|
||||
<?php if ( 'draft' != $post->post_status ) wp_original_referer_field(true, 'previous'); ?>
|
||||
|
||||
<!-- TODO
|
||||
<div class="inside">
|
||||
<p><strong><label for='post_status'><?php _e('Publish Status') ?></label></strong></p>
|
||||
<p>
|
||||
<select name='post_status' tabindex='4' id='post_status'>
|
||||
<?php // Show publish in dropdown if user can publish or if they can re-publish this page ('edit_published_pages')
|
||||
// 'publish' option will be selected for published AND private posts (checkbox overrides dropdown)
|
||||
if ( current_user_can('publish_pages') OR ( $post->post_status == 'publish' AND current_user_can('edit_page', $post->ID) ) ) :
|
||||
?>
|
||||
<option<?php selected( $post->post_status, 'publish' ); selected( $post->post_status, 'private' );?> value='publish'><?php _e('Published') ?></option>
|
||||
<?php endif; ?>
|
||||
<?php if ( 'future' == $post->post_status ) : ?>
|
||||
<option<?php selected( $post->post_status, 'future' ); ?> value='future'><?php _e('Pending') ?></option>
|
||||
<?php endif; ?>
|
||||
<option<?php selected( $post->post_status, 'pending' ); ?> value='pending'><?php _e('Pending Review') ?></option>
|
||||
<option<?php selected( $post->post_status, 'draft' ); ?> value='draft'><?php _e('Unpublished') ?></option>
|
||||
</select>
|
||||
</p>
|
||||
<?php if ( current_user_can( 'publish_posts' ) ) : ?>
|
||||
<p><label for="post_status_private" class="selectit"><input id="post_status_private" name="post_status" type="checkbox" value="private" <?php checked($post->post_status, 'private'); ?> tabindex='4' /> <?php _e('Keep this page private') ?></label></p>
|
||||
<?php endif; ?>
|
||||
|
||||
<h5><?php _e('Related') ?></h5>
|
||||
<ul>
|
||||
<?php if ($post_ID): ?>
|
||||
<li><a href="edit-pages.php?page_id=<?php echo $post_ID ?>"><?php _e('See Comments on this Page') ?></a></li>
|
||||
<?php endif; ?>
|
||||
<li><a href="edit-comments.php"><?php _e('Manage All Comments') ?></a></li>
|
||||
<li><a href="edit-pages.php"><?php _e('Manage All Pages') ?></a></li>
|
||||
<?php do_action('page_relatedlinks_list'); ?>
|
||||
</ul>
|
||||
|
||||
-->
|
||||
|
||||
<div id="poststuff">
|
||||
|
||||
<div id="side-info-column" class="inner-sidebar">
|
||||
|
||||
<?php
|
||||
|
||||
do_action('submitpage_box');
|
||||
$side_meta_boxes = do_meta_boxes('page', 'side', $page);
|
||||
|
||||
?>
|
||||
</div>
|
||||
|
||||
<div id="post-body" class="<?php echo $side_meta_boxes ? 'has-sidebar' : ''; ?>">
|
||||
<div id="post-body-content" class="has-sidebar-content">
|
||||
|
||||
<div id="titlediv">
|
||||
<h3><label for="title"><?php _e('Title') ?></label></h3>
|
||||
<div id="titlewrap">
|
||||
<input type="text" name="post_title" size="30" tabindex="1" value="<?php echo attribute_escape( $post->post_title ); ?>" id="title" autocomplete="off" />
|
||||
</div>
|
||||
<div class="inside">
|
||||
<?php $sample_permalink_html = get_sample_permalink_html($post->ID); ?>
|
||||
<div id="edit-slug-box">
|
||||
<?php if ( ! empty($post->ID) && ! empty($sample_permalink_html) ) :
|
||||
echo $sample_permalink_html;
|
||||
endif; ?>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div id="<?php echo user_can_richedit() ? 'postdivrich' : 'postdiv'; ?>" class="postarea">
|
||||
|
||||
<div id="add-media-button"><a href="<?php echo clean_url( admin_url( 'media-upload.php?post_id=' . ( $post_ID ? $post_ID : $temp_ID ) . '&type=image&TB_iframe=true' ) ); ?>" class="thickbox button"><?php _e( 'Add Media' ); ?></a></div>
|
||||
|
||||
<h3><?php _e('Page') ?></h3>
|
||||
<?php the_editor($post->post_content); ?>
|
||||
<div id="post-status-info">
|
||||
<span id="wp-word-count" class="alignleft"></span>
|
||||
<span class="alignright">
|
||||
<span id="autosave"> </span>
|
||||
|
||||
<?php
|
||||
if ($post_ID) {
|
||||
if ( $last_id = get_post_meta($post_ID, '_edit_last', true) ) {
|
||||
$last_user = get_userdata($last_id);
|
||||
printf(__('Last edited by %1$s on %2$s at %3$s'), wp_specialchars( $last_user->display_name ), mysql2date(get_option('date_format'), $post->post_modified), mysql2date(get_option('time_format'), $post->post_modified));
|
||||
} else {
|
||||
printf(__('Last edited on %1$s at %2$s'), mysql2date(get_option('date_format'), $post->post_modified), mysql2date(get_option('time_format'), $post->post_modified));
|
||||
}
|
||||
}
|
||||
?>
|
||||
</span>
|
||||
<br class="clear" />
|
||||
</div>
|
||||
|
||||
|
||||
<?php wp_nonce_field( 'autosave', 'autosavenonce', false ); ?>
|
||||
<?php wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); ?>
|
||||
<?php wp_nonce_field( 'getpermalink', 'getpermalinknonce', false ); ?>
|
||||
<?php wp_nonce_field( 'samplepermalink', 'samplepermalinknonce', false ); ?>
|
||||
<?php wp_nonce_field( 'meta-box-order', 'meta-box-order-nonce', false ); ?>
|
||||
</div>
|
||||
|
||||
<?php
|
||||
|
||||
do_meta_boxes('page', 'normal', $post);
|
||||
do_action('edit_page_form');
|
||||
do_meta_boxes('page', 'advanced', $post);
|
||||
|
||||
?>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<br class="clear" />
|
||||
</div>
|
||||
</form>
|
||||
|
||||
<script type="text/javascript">
|
||||
|
||||
Reference in New Issue
Block a user