diff options
Diffstat (limited to 'wp-admin/edit-page-form.php')
| -rw-r--r-- | wp-admin/edit-page-form.php | 160 |
1 files changed, 94 insertions, 66 deletions
diff --git a/wp-admin/edit-page-form.php b/wp-admin/edit-page-form.php index e800a46..89ac2b2 100644 --- a/wp-admin/edit-page-form.php +++ b/wp-admin/edit-page-form.php @@ -5,10 +5,9 @@ $messages[1] = sprintf( __( 'Page updated. Continue editing below or <a href="%s $messages[2] = __('Custom field updated.'); $messages[3] = __('Custom field deleted.'); $messages[4] = __('Page updated.'); -?> -<?php if (isset($_GET['message'])) : ?> -<div id="message" class="updated fade"><p><?php echo $messages[$_GET['message']]; ?></p></div> -<?php endif; + +$notice = false; +$notices[1] = __( 'There is an autosave of this page that is more recent than the version below. <a href="%s">View the autosave</a>.' ); if (!isset($post_ID) || 0 == $post_ID) { $form_action = 'post'; @@ -20,6 +19,9 @@ if (!isset($post_ID) || 0 == $post_ID) { $form_action = 'editpost'; $nonce_action = 'update-page_' . $post_ID; $form_extra = "<input type='hidden' id='post_ID' name='post_ID' value='$post_ID' />"; + $autosave = wp_get_post_autosave( $post_id ); + if ( $autosave && mysql2date( 'U', $autosave->post_modified_gmt ) > mysql2date( 'U', $post->post_modified_gmt ) ) + $notice = sprintf( $notices[1], get_edit_post_link( $autosave->ID ) ); } $temp_ID = (int) $temp_ID; @@ -31,6 +33,13 @@ if ( 0 != $post_ID && $sendto == get_permalink($post_ID) ) $sendto = 'redo'; ?> +<?php if ( $notice ) : ?> +<div id="notice" class="error"><p><?php echo $notice ?></p></div> +<?php endif; ?> +<?php if (isset($_GET['message'])) : ?> +<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> @@ -44,6 +53,7 @@ if (isset($mode) && 'bookmarklet' == $mode) <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 ?>" /> @@ -68,14 +78,14 @@ else </div> <div class="inside"> - -<p><strong><?php _e('Publish Status') ?></strong></p> +<p><strong><label for='post_status'><?php _e('Publish Status') ?></label></strong></p> <p> -<select name='post_status' tabindex='4'> -<?php if ( current_user_can('publish_pages') ) : ?> +<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 else: ?> -<option<?php selected( $post->post_status, 'private' ); ?> value='private'><?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> @@ -84,8 +94,10 @@ else <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; ?> + <?php if ($post_ID) { if ( 'future' == $post->post_status ) { // scheduled for publishing at a future date @@ -140,6 +152,7 @@ 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"> @@ -159,7 +172,7 @@ if ( ('edit' == $action) && current_user_can('delete_page', $post_ID) ) <div id="post-body"> <div id="titlediv"> -<h3><?php _e('Title') ?></h3> +<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> @@ -174,7 +187,7 @@ endif; ?> </div> <div id="<?php echo user_can_richedit() ? 'postdivrich' : 'postdiv'; ?>" class="postarea"> -<h3><?php _e('Page') ?></h3> +<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 ); ?> @@ -188,13 +201,14 @@ endif; ?> <h2><?php _e('Advanced Options'); ?></h2> -<div id="pagepostcustom" class="postbox <?php echo postbox_classes('pagepostcustom', 'page'); ?>"> -<h3><?php _e('Custom Fields') ?></h3> -<div class="inside"> + +<?php +function page_custom_meta_box($post){ +?> <div id="postcustomstuff"> <table cellpadding="3"> <?php -$metadata = has_meta($post_ID); +$metadata = has_meta($post->ID); list_meta($metadata); ?> @@ -205,83 +219,97 @@ list_meta($metadata); <div id="ajax-response"></div> </div> <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> -</div> -</div> +<?php +} +add_meta_box('pagecustomdiv', __('Custom Fields'), 'page_custom_meta_box', 'page', 'advanced', 'core'); -<div id="pagecommentstatusdiv" class="postbox <?php echo postbox_classes('pagecommentstatusdiv', 'page'); ?>"> -<h3><?php _e('Comments & Pings') ?></h3> -<div class="inside"> +function page_comments_status_meta_box($post){ +?> <input name="advanced_view" type="hidden" value="1" /> <p><label for="comment_status" class="selectit"> <input name="comment_status" type="checkbox" id="comment_status" value="open" <?php checked($post->comment_status, 'open'); ?> /> <?php _e('Allow Comments') ?></label></p> <p><label for="ping_status" class="selectit"><input name="ping_status" type="checkbox" id="ping_status" value="open" <?php checked($post->ping_status, 'open'); ?> /> <?php _e('Allow Pings') ?></label></p> <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> -</div> -</div> +<?php +} +add_meta_box('pagecommentstatusdiv', __('Comments & Pings'), 'page_comments_status_meta_box', 'page', 'advanced', 'core'); -<div id="pagepassworddiv" class="postbox <?php echo postbox_classes('pagepassworddiv', 'page'); ?>"> -<h3><?php _e('Password Protect This Page') ?></h3> -<div class="inside"> -<p><input name="post_password" type="text" size="25" id="post_password" value="<?php echo attribute_escape( $post->post_password ); ?>" /></p> +function page_password_meta_box($post){ +?> +<p><label class="hidden" for="post_password"><?php _e('Password Protect This Page') ?></label><input name="post_password" type="text" size="25" id="post_password" value="<?php echo attribute_escape( $post->post_password ); ?>" /></p> <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> -</div> -</div> +<?php +} +add_meta_box('pagepassworddiv', __('Password Protect This Page'), 'page_password_meta_box', 'page', 'advanced', 'core'); -<div id="pageslugdiv" class="postbox <?php echo postbox_classes('pageslugdiv', 'page'); ?>"> -<h3><?php _e('Page Slug') ?></h3> -<div class="inside"> -<input name="post_name" type="text" size="13" id="post_name" value="<?php echo attribute_escape( $post->post_name ); ?>" /> -</div> -</div> +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'); -<div id="pageparentdiv" class="postbox <?php echo postbox_classes('pageparentdiv', 'page'); ?>"> -<h3><?php _e('Page Parent') ?></h3> -<div class="inside"> -<select name="parent_id"> +function page_parent_meta_box($post){ +?> +<label class="hidden" for="parent_id"><?php _e('Page Parent') ?></label> +<select name="parent_id" id="parent_id"> <option value='0'><?php _e('Main Page (no parent)'); ?></option> <?php parent_dropdown($post->post_parent); ?> </select> <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> -</div> -</div> +<?php +} +add_meta_box('pageparentdiv', __('Page Parent'), 'page_parent_meta_box', 'page', 'advanced', 'core'); -<?php if ( 0 != count( get_page_templates() ) ) { ?> -<div id="pagetemplatediv" class="postbox <?php echo postbox_classes('pagetemplatediv', 'page'); ?>"> -<h3><?php _e('Page Template') ?></h3> -<div class="inside"> -<select name="page_template"> +if ( 0 != count( get_page_templates() ) ) { + function page_template_meta_box($post){ +?> +<label class="hidden" for="page_template"><?php _e('Page Template') ?></label><select name="page_template" id="page_template"> <option value='default'><?php _e('Default Template'); ?></option> <?php page_template_dropdown($post->page_template); ?> </select> <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> -</div> -</div> -<?php } ?> +<?php + } + add_meta_box('pagetemplatediv', __('Page Template'), 'page_template_meta_box', 'page', 'advanced', 'core'); +} -<div id="pageorderdiv" class="postbox <?php echo postbox_classes('pageorderdiv', 'page'); ?>"> -<h3><?php _e('Page Order') ?></h3> -<div class="inside"> -<p><input name="menu_order" type="text" size="4" id="menu_order" value="<?php echo $post->menu_order ?>" /></p> +function page_order_meta_box($post){ +?> +<p><label class="hidden" for="menu_order"><?php _e('Page Order') ?></label><input name="menu_order" type="text" size="4" id="menu_order" value="<?php echo $post->menu_order ?>" /></p> <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> -</div> -</div> - <?php +} +add_meta_box('pageorderdiv', __('Page Order'), 'page_order_meta_box', 'page', 'advanced', 'core'); + + $authors = get_editable_user_ids( $current_user->id ); // TODO: ROLE SYSTEM if ( $post->post_author && !in_array($post->post_author, $authors) ) $authors[] = $post->post_author; -if ( $authors && count( $authors ) > 1 ) : +if ( $authors && count( $authors ) > 1 ) { + function page_author_meta_box($post){ + global $current_user, $user_ID; + $authors = get_editable_user_ids( $current_user->id ); // TODO: ROLE SYSTEM + if ( $post->post_author && !in_array($post->post_author, $authors) ) + $authors[] = $post->post_author; ?> -<div id="pageauthordiv" class="postbox <?php echo postbox_classes('pageauthordiv', 'page'); ?>"> -<h3><?php _e('Page Author'); ?></h3> -<div class="inside"> -<?php wp_dropdown_users( array('include' => $authors, 'name' => 'post_author_override', 'selected' => empty($post_ID) ? $user_ID : $post->post_author) ); ?> -</div> -</div> -<?php endif; ?> +<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'); +} -<?php do_meta_boxes('page', 'advanced', $post); ?> + +if ( isset($post_ID) && 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'); +endif; + +do_meta_boxes('page', 'advanced', $post); +?> </div> </div> |