wp-admin/css/farbtastic-rtl.css wp-admin/css/farbtastic.css wp-admin/css/plugin-install-rtl.css wp-admin/css/plugin-install.css wp-admin/images/archive-link.png wp-admin/images/blue-grad.png wp-admin/images/bubble_bg-rtl.gif wp-admin/images/button-grad-active.png wp-admin/images/button-grad.png wp-admin/images/ed-bg.gif wp-admin/images/fav-arrow-rtl.gif wp-admin/images/fav-arrow.gif wp-admin/images/fav-top.png wp-admin/images/fav.png wp-admin/images/generic.png wp-admin/images/gray-grad.png wp-admin/images/icons32-vs.png wp-admin/images/icons32.png wp-admin/images/list-vs.png wp-admin/images/list.png wp-admin/images/marker.png wp-admin/images/mask.png wp-admin/images/menu-arrows.gif wp-admin/images/menu-bits-rtl.gif wp-admin/images/menu-bits.gif wp-admin/images/menu-dark-rtl.gif wp-admin/images/menu-dark.gif wp-admin/images/menu-vs.png wp-admin/images/menu.png wp-admin/images/resize.gif wp-admin/images/screen-options-left.gif wp-admin/images/screen-options-right-up.gif wp-admin/images/screen-options-right.gif wp-admin/images/se.png wp-admin/images/star.gif wp-admin/images/wheel.png wp-admin/images/white-grad-active.png wp-admin/images/white-grad.png wp-admin/images/wp-logo.gif wp-admin/import/opml.php wp-admin/includes/class-wp-filesystem-ssh2.php wp-admin/includes/plugin-install.php wp-admin/includes/update-core.php wp-admin/js/dashboard.js wp-admin/js/farbtastic.js wp-admin/js/inline-edit-post.js wp-admin/js/inline-edit-tax.js wp-admin/js/plugin-install.js wp-admin/media-new.php wp-admin/options-media.php wp-admin/plugin-install.php wp-admin/tools.php wp-admin/update-core.php wp-admin/user-new.php wp-includes/http.php wp-includes/images/upload.png wp-includes/js/comment-reply.js wp-includes/js/hoverIntent.js wp-includes/js/jquery/jquery.hotkeys.js wp-includes/js/jquery/jquery.table-hotkeys.js wp-includes/js/jquery/ui.dialog.js wp-includes/js/jquery/ui.draggable.js wp-includes/js/jquery/ui.resizable.js wp-includes/js/swfupload/plugins/swfupload.swfobject.js wp-includes/js/swfupload/swfupload.swf wp-includes/js/tinymce/langs/wp-langs-en.js wp-includes/js/tinymce/plugins/spellchecker/classes/EnchantSpell.php wp-includes/js/tinymce/plugins/wpgallery/editor_plugin.js wp-includes/js/tinymce/plugins/wpgallery/img/delete.png wp-includes/js/tinymce/plugins/wpgallery/img/edit.png wp-includes/js/tinymce/plugins/wpgallery/img/gallery.png wp-includes/js/tinymce/plugins/wpgallery/img/t.gif @@ -1,8 +1,9 @@ GNU GENERAL PUBLIC LICENSE Version 2, June 1991 - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 675 Mass Ave, Cambridge, MA 02139, USA + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 51 Franklin St, Fifth Floor, Boston, MA 02110, USA + Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. license.txt @@ -8,7 +8,7 @@ <body> <h1 id="logo" style="text-align: center"> <img alt="WordPress" src="wp-admin/images/wordpress-logo.png" /> - <br /> Version 2.6.1 + <br /> Version 2.7 </h1> <p style="text-align: center">Semantic Personal Publishing Platform</p> @@ -29,7 +29,7 @@ <h1>Upgrading</h1> <p>Before you upgrade anything, make sure you have backup copies of any files you may have modified such as <code>index.php</code>.</p> -<h2>Upgrading from any previous WordPress to 2.6.1:</h2> +<h2>Upgrading from any previous WordPress to 2.7:</h2> <ol> <li>Delete your old WP files, saving ones you've modified.</li> <li>Upload the new files.</li> readme.html @@ -1,29 +1,67 @@ <?php +/** + * WordPress AJAX Process Execution. + * + * @package WordPress + * @subpackage Administration + */ + +/** + * Executing AJAX process. + * + * @since unknown + */ define('DOING_AJAX', true); +define('WP_ADMIN', true); require_once('../wp-load.php'); require_once('includes/admin.php'); -if ( !is_user_logged_in() ) +if ( ! is_user_logged_in() ) { + + if ( $_POST['action'] == 'autosave' ) { + $id = isset($_POST['post_ID'])? (int) $_POST['post_ID'] : 0; + + if ( ! $id ) + die('-1'); + + $message = sprintf( __('<strong>ALERT: You are logged out!</strong> Could not save draft. <a href="%s" target="blank">Please log in again.</a>'), wp_login_url() ); + $x = new WP_Ajax_Response( array( + 'what' => 'autosave', + 'id' => $id, + 'data' => $message + ) ); + $x->send(); + } + die('-1'); +} -if ( isset($_GET['action']) && 'ajax-tag-search' == $_GET['action'] ) { +if ( isset( $_GET['action'] ) ) : +switch ( $action = $_GET['action'] ) : +case 'ajax-tag-search' : if ( !current_user_can( 'manage_categories' ) ) die('-1'); $s = $_GET['q']; // is this slashed already? - if ( strstr( $s, ',' ) ) { - $s = explode( ',', $s ); - $s = $s[count( $s ) - 1]; + if ( false !== strpos( $s, ',' ) ) { + $s = explode( ',', $s ); + $s = $s[count( $s ) - 1]; } $s = trim( $s ); if ( strlen( $s ) < 2 ) - die; // require 2 chars for matching - $results = $wpdb->get_col( "SELECT name FROM $wpdb->terms WHERE name LIKE ('%". $s . "%')" ); + die; // require 2 chars for matching + $results = $wpdb->get_col( "SELECT t.name FROM $wpdb->term_taxonomy AS tt INNER JOIN $wpdb->terms AS t ON tt.term_id = t.term_id WHERE tt.taxonomy = 'post_tag' AND t.name LIKE ('%". $s . "%')" ); echo join( $results, "\n" ); die; -} + break; +default : + do_action( 'wp_ajax_' . $_GET['action'] ); + die('0'); + break; +endswitch; +endif; $id = isset($_POST['id'])? (int) $_POST['id'] : 0; switch ( $action = $_POST['action'] ) : @@ -170,7 +208,7 @@ case 'dim-comment' : if ( $_POST['new'] == $current ) die('1'); - if ( 'unapproved' == $current ) { + if ( in_array( $current, array( 'unapproved', 'spam' ) ) ) { check_ajax_referer( "approve-comment_$id" ); if ( wp_set_comment_status( $comment->comment_ID, 'approve' ) ) die('1'); @@ -278,7 +316,7 @@ case 'add-cat' : // From Manage->Categories ) ); $x->send(); } - + $cat = wp_insert_category( $_POST, true ); if ( is_wp_error($cat) ) { @@ -305,6 +343,7 @@ case 'add-cat' : // From Manage->Categories $x = new WP_Ajax_Response( array( 'what' => 'cat', 'id' => $cat->term_id, + 'position' => -1, 'data' => _cat_row( $cat, $level, $cat_full_name ), 'supplemental' => array('name' => $cat_full_name, 'show-link' => sprintf(__( 'Category <a href="#%s">%s</a> added' ), "cat-$cat->term_id", $cat_full_name)) ) ); @@ -340,6 +379,7 @@ case 'add-link-cat' : // From Blogroll -> Categories $x = new WP_Ajax_Response( array( 'what' => 'link-cat', 'id' => $term_id, + 'position' => -1, 'data' => $link_cat ) ); $x->send(); @@ -376,11 +416,35 @@ case 'add-tag' : // From Manage->Tags $x = new WP_Ajax_Response( array( 'what' => 'tag', 'id' => $tag->term_id, + 'position' => '-1', 'data' => _tag_row( $tag ), 'supplemental' => array('name' => $tag_full_name, 'show-link' => sprintf(__( 'Tag <a href="#%s">%s</a> added' ), "tag-$tag->term_id", $tag_full_name)) ) ); $x->send(); break; +case 'get-tagcloud' : + if ( !current_user_can( 'manage_categories' ) ) + die('-1'); + + $tags = get_tags( array( 'number' => 45, 'orderby' => 'count', 'order' => 'DESC' ) ); + + if ( empty( $tags ) ) + die( __('No tags found!') ); + + foreach ( $tags as $key => $tag ) { + $tags[ $key ]->link = '#'; + $tags[ $key ]->id = $tag->term_id; + } + + $return = wp_generate_tag_cloud( $tags ); + + if ( empty($return) ) + die('0'); + + echo $return; + + exit; + break; case 'add-comment' : check_ajax_referer( $action ); if ( !current_user_can( 'edit_post', $id ) ) @@ -389,8 +453,9 @@ case 'add-comment' : $start = isset($_POST['page']) ? intval($_POST['page']) * 25 - 1: 24; $status = isset($_POST['comment_status']) ? $_POST['comment_status'] : false; $mode = isset($_POST['mode']) ? $_POST['mode'] : 'detail'; - - list($comments, $total) = _wp_get_comment_list( $status, $search, $start, 1 ); + $p = isset($_POST['p']) ? $_POST['p'] : 0; + $comment_type = isset($_POST['comment_type']) ? $_POST['comment_type'] : ''; + list($comments, $total) = _wp_get_comment_list( $status, $search, $start, 1, $p, $comment_type ); if ( get_option('show_avatars') ) add_filter( 'comment_author', 'floated_admin_avatar' ); @@ -401,7 +466,7 @@ case 'add-comment' : foreach ( (array) $comments as $comment ) { get_comment( $comment ); ob_start(); - _wp_comment_row( $comment->comment_ID, $mode, $status ); + _wp_comment_row( $comment->comment_ID, $mode, $status, true, true ); $comment_list_item = ob_get_contents(); ob_end_clean(); $x->add( array( @@ -412,6 +477,142 @@ case 'add-comment' : } $x->send(); break; +case 'get-comments' : + check_ajax_referer( $action ); + + $post_ID = (int) $_POST['post_ID']; + if ( !current_user_can( 'edit_post', $post_ID ) ) + die('-1'); + + $start = isset($_POST['start']) ? intval($_POST['start']) : 0; + $num = isset($_POST['num']) ? intval($_POST['num']) : 10; + + list($comments, $total) = _wp_get_comment_list( false, false, $start, $num, $post_ID ); + + if ( !$comments ) + die('1'); + + $comment_list_item = ''; + $x = new WP_Ajax_Response(); + foreach ( (array) $comments as $comment ) { + get_comment( $comment ); + ob_start(); + _wp_comment_row( $comment->comment_ID, 'single', false, false ); + $comment_list_item .= ob_get_contents(); + ob_end_clean(); + } + $x->add( array( + 'what' => 'comments', + 'data' => $comment_list_item + ) ); + $x->send(); + break; +case 'replyto-comment' : + check_ajax_referer( $action ); + + $comment_post_ID = (int) $_POST['comment_post_ID']; + if ( !current_user_can( 'edit_post', $comment_post_ID ) ) + die('-1'); + + $status = $wpdb->get_var( $wpdb->prepare("SELECT post_status FROM $wpdb->posts WHERE ID = %d", $comment_post_ID) ); + + if ( empty($status) ) + die('1'); + elseif ( in_array($status, array('draft', 'pending') ) ) + die( __('Error: you are replying to a comment on a draft post.') ); + + $user = wp_get_current_user(); + if ( $user->ID ) { + $comment_author = $wpdb->escape($user->display_name); + $comment_author_email = $wpdb->escape($user->user_email); + $comment_author_url = $wpdb->escape($user->user_url); + $comment_content = trim($_POST['content']); + if ( current_user_can('unfiltered_html') ) { + if ( wp_create_nonce('unfiltered-html-comment_' . $comment_post_ID) != $_POST['_wp_unfiltered_html_comment'] ) { + kses_remove_filters(); // start with a clean slate + kses_init_filters(); // set up the filters + } + } + } else { + die( __('Sorry, you must be logged in to reply to a comment.') ); + } + + if ( '' == $comment_content ) + die( __('Error: please type a comment.') ); + + $comment_parent = absint($_POST['comment_ID']); + $commentdata = compact('comment_post_ID', 'comment_author', 'comment_author_email', 'comment_author_url', 'comment_content', 'comment_type', 'comment_parent', 'user_ID'); + + $comment_id = wp_new_comment( $commentdata ); + $comment = get_comment($comment_id); + if ( ! $comment ) die('1'); + + $modes = array( 'single', 'detail', 'dashboard' ); + $mode = isset($_POST['mode']) && in_array( $_POST['mode'], $modes ) ? $_POST['mode'] : 'detail'; + $position = ( isset($_POST['position']) && (int) $_POST['position']) ? (int) $_POST['position'] : '-1'; + $checkbox = ( isset($_POST['checkbox']) && true == $_POST['checkbox'] ) ? 1 : 0; + + if ( get_option('show_avatars') && 'single' != $mode ) + add_filter( 'comment_author', 'floated_admin_avatar' ); + + $x = new WP_Ajax_Response(); + + ob_start(); + if ( 'dashboard' == $mode ) { + require_once( ABSPATH . 'wp-admin/includes/dashboard.php' ); + _wp_dashboard_recent_comments_row( $comment, false ); + } else { + _wp_comment_row( $comment->comment_ID, $mode, false, $checkbox ); + } + $comment_list_item = ob_get_contents(); + ob_end_clean(); + + $x->add( array( + 'what' => 'comment', + 'id' => $comment->comment_ID, + 'data' => $comment_list_item, + 'position' => $position + )); + + $x->send(); + break; +case 'edit-comment' : + check_ajax_referer( 'replyto-comment' ); + + $comment_post_ID = (int) $_POST['comment_post_ID']; + if ( ! current_user_can( 'edit_post', $comment_post_ID ) ) + die('-1'); + + if ( '' == $_POST['content'] ) + die( __('Error: please type a comment.') ); + + $comment_id = (int) $_POST['comment_ID']; + $_POST['comment_status'] = $_POST['status']; + edit_comment(); + + $mode = ( isset($_POST['mode']) && 'single' == $_POST['mode'] ) ? 'single' : 'detail'; + $position = ( isset($_POST['position']) && (int) $_POST['position']) ? (int) $_POST['position'] : '-1'; + $checkbox = ( isset($_POST['checkbox']) && true == $_POST['checkbox'] ) ? 1 : 0; + + if ( get_option('show_avatars') && 'single' != $mode ) + add_filter( 'comment_author', 'floated_admin_avatar' ); + + $x = new WP_Ajax_Response(); + + ob_start(); + _wp_comment_row( $comment_id, $mode, true, $checkbox ); + $comment_list_item = ob_get_contents(); + ob_end_clean(); + + $x->add( array( + 'what' => 'edit_comment', + 'id' => $comment->comment_ID, + 'data' => $comment_list_item, + 'position' => $position + )); + + $x->send(); + break; case 'add-meta' : check_ajax_referer( 'add-meta' ); $c = 0; @@ -616,13 +817,29 @@ case 'closed-postboxes' : check_ajax_referer( 'closedpostboxes', 'closedpostboxesnonce' ); $closed = isset( $_POST['closed'] )? $_POST['closed'] : ''; $closed = explode( ',', $_POST['closed'] ); + $hidden = isset( $_POST['hidden'] )? $_POST['hidden'] : ''; + $hidden = explode( ',', $_POST['hidden'] ); + $page = isset( $_POST['page'] )? $_POST['page'] : ''; + if ( !preg_match( '/^[a-z-_]+$/', $page ) ) { + die(-1); + } + $current_user = wp_get_current_user(); + if ( is_array($closed) ) + update_usermeta($current_user->ID, 'closedpostboxes_'.$page, $closed); + if ( is_array($hidden) ) + update_usermeta($current_user->ID, 'meta-box-hidden_'.$page, $hidden); +break; +case 'hidden-columns' : + check_ajax_referer( 'hiddencolumns', 'hiddencolumnsnonce' ); + $hidden = isset( $_POST['hidden'] )? $_POST['hidden'] : ''; + $hidden = explode( ',', $_POST['hidden'] ); $page = isset( $_POST['page'] )? $_POST['page'] : ''; - if ( !preg_match( '/^[a-z-]+$/', $page ) ) { + if ( !preg_match( '/^[a-z-_]+$/', $page ) ) { die(-1); } - if (!is_array($closed)) break; $current_user = wp_get_current_user(); - update_usermeta($current_user->ID, 'closedpostboxes_'.$page, $closed); + if ( is_array($hidden) ) + update_usermeta($current_user->ID, "manage-$page-columns-hidden", $hidden); break; case 'get-permalink': check_ajax_referer( 'getpermalink', 'getpermalinknonce' ); @@ -636,6 +853,189 @@ case 'sample-permalink': $slug = isset($_POST['new_slug'])? $_POST['new_slug'] : ''; die(get_sample_permalink_html($post_id, $title, $slug)); break; +case 'inline-save': + check_ajax_referer( 'inlineeditnonce', '_inline_edit' ); + + if ( ! isset($_POST['post_ID']) || ! ( $post_ID = (int) $_POST['post_ID'] ) ) + exit; + + if ( 'page' == $_POST['post_type'] ) { + if ( ! current_user_can( 'edit_page', $post_ID ) ) + die( __('You are not allowed to edit this page.') ); + } else { + if ( ! current_user_can( 'edit_post', $post_ID ) ) + die( __('You are not allowed to edit this post.') ); + } + + if ( $last = wp_check_post_lock( $post_ID ) ) { + $last_user = get_userdata( $last ); + $last_user_name = $last_user ? $last_user->display_name : __( 'Someone' ); + printf( $_POST['post_type'] == 'page' ? __( 'Saving is disabled: %s is currently editing this page.' ) : __( 'Saving is disabled: %s is currently editing this post.' ), wp_specialchars( $last_user_name ) ); + exit; + } + + $data = &$_POST; + $post = get_post( $post_ID, ARRAY_A ); + $data['content'] = $post['post_content']; + $data['excerpt'] = $post['post_excerpt']; + + // rename + $data['user_ID'] = $GLOBALS['user_ID']; + + if ( isset($data['post_parent']) ) + $data['parent_id'] = $data['post_parent']; + + // status + if ( isset($data['keep_private']) && 'private' == $data['keep_private'] ) + $data['post_status'] = 'private'; + else + $data['post_status'] = $data['_status']; + + if ( empty($data['comment_status']) ) + $data['comment_status'] = 'closed'; + if ( empty($data['ping_status']) ) + $data['ping_status'] = 'closed'; + + // update the post + $_POST = $data; + edit_post(); + + $post = array(); + if ( 'page' == $_POST['post_type'] ) { + $post[] = get_post($_POST['post_ID']); + page_rows($post); + } elseif ( 'post' == $_POST['post_type'] ) { + $mode = $_POST['post_view']; + $post[] = get_post($_POST['post_ID']); + post_rows($post); + } + + exit; + break; +case 'inline-save-tax': + check_ajax_referer( 'taxinlineeditnonce', '_inline_edit' ); + + if ( ! current_user_can('manage_categories') ) + die( __('Cheatin’ uh?') ); + + if ( ! isset($_POST['tax_ID']) || ! ( $id = (int) $_POST['tax_ID'] ) ) + die(-1); + + switch ($_POST['tax_type']) { + case 'cat' : + $data = array(); + $data['cat_ID'] = $id; + $data['cat_name'] = $_POST['name']; + $data['category_nicename'] = $_POST['slug']; + if ( isset($_POST['parent']) && (int) $_POST['parent'] > 0 ) + $data['category_parent'] = $_POST['parent']; + + $cat = get_category($id, ARRAY_A); + $data['category_description'] = $cat['category_description']; + + $updated = wp_update_category($data); + + if ( $updated && !is_wp_error($updated) ) + echo _cat_row( $updated, 0 ); + else + die( __('Category not updated.') ); + + break; + case 'link-cat' : + $updated = wp_update_term($id, 'link_category', $_POST); + + if ( $updated && !is_wp_error($updated) ) + echo link_cat_row($updated['term_id']); + else + die( __('Category not updated.') ); + + break; + case 'tag' : + $updated = wp_update_term($id, 'post_tag', $_POST); + if ( $updated && !is_wp_error($updated) ) { + $tag = get_term( $updated['term_id'], 'post_tag' ); + if ( !$tag || is_wp_error( $tag ) ) + die( __('Tag not updated.') ); + + echo _tag_row($tag); + } else { + die( __('Tag not updated.') ); + } + + break; + } + + exit; + break; +case 'meta-box-order': + check_ajax_referer( 'meta-box-order' ); + update_user_option( $GLOBALS['current_user']->ID, "meta-box-order_$_POST[page]", $_POST['order'] ); + die('1'); + break; +case 'find_posts': + check_ajax_referer( 'find-posts' ); + + if ( empty($_POST['ps']) ) + exit; + + $what = isset($_POST['pages']) ? 'page' : 'post'; + $s = stripslashes($_POST['ps']); + preg_match_all('/".*?("|$)|((?<=[\\s",+])|^)[^\\s",+]+/', $s, $matches); + $search_terms = array_map(create_function('$a', 'return trim($a, "\\"\'\\n\\r ");'), $matches[0]); + + $searchand = $search = ''; + foreach( (array) $search_terms as $term) { + $term = addslashes_gpc($term); + $search .= "{$searchand}(($wpdb->posts.post_title LIKE '%{$term}%') OR ($wpdb->posts.post_content LIKE '%{$term}%'))"; + $searchand = ' AND '; + } + $term = $wpdb->escape($s); + if ( count($search_terms) > 1 && $search_terms[0] != $s ) + $search .= " OR ($wpdb->posts.post_title LIKE '%{$term}%') OR ($wpdb->posts.post_content LIKE '%{$term}%')"; + + $posts = $wpdb->get_results( "SELECT ID, post_title, post_status, post_date FROM $wpdb->posts WHERE post_type = '$what' AND $search ORDER BY post_date_gmt DESC LIMIT 50" ); + + if ( ! $posts ) + exit( __('No posts found.') ); + + $html = '<table class="widefat"><thead><tr><th class="found-radio"><br /></th><th>'.__('Title').'</th><th>'.__('Time').'</th><th>'.__('Status').'</th></tr></thead><tbody>'; + foreach ( $posts as $post ) { + + switch ( $post->post_status ) { + case 'publish' : + case 'private' : + $stat = __('Published'); + break; + case 'future' : + $stat = __('Scheduled'); + break; + case 'pending' : + $stat = __('Pending Review'); + break; + case 'draft' : + $stat = __('Unpublished'); + break; + } + + if ( '0000-00-00 00:00:00' == $post->post_date ) { + $time = ''; + } else { + $time = mysql2date(__('Y/m/d'), $post->post_date); + } + + $html .= '<tr class="found-posts"><td class="found-radio"><input type="radio" id="found-'.$post->ID.'" name="found_post_id" value="'.$post->ID.'"></td>'; + $html .= '<td><label for="found-'.$post->ID.'">'.wp_specialchars($post->post_title, true).'</label></td><td>'.wp_specialchars($time, true).'</td><td>'.wp_specialchars($stat, true).'</td></tr>'."\n\n"; + } + $html .= '</tbody></table>'; + + $x = new WP_Ajax_Response(); + $x->add( array( + 'what' => $what, + 'data' => $html + )); + $x->send(); + + break; default : do_action( 'wp_ajax_' . $_POST['action'] ); die('0'); wp-admin/admin-ajax.php @@ -1,14 +1,28 @@ -</div> -</div> +<?php +/** + * WordPress Administration Template Footer + * + * @package WordPress + * @subpackage Administration + */ +?> + +<div class="clear"></div></div> +<div class="clear"></div></div> +<div class="clear"></div></div> </div> + <div id="footer"> -<p><?php -do_action('in_admin_footer', ''); +<p id="footer-left" class="alignleft"><?php +do_action( 'in_admin_footer' ); $upgrade = apply_filters( 'update_footer', '' ); -echo __('Thank you for creating with <a href="http://wordpress.org/">WordPress</a>').' | '.__('<a href="http://codex.wordpress.org/">Documentation</a>').' | '.__('<a href="http://wordpress.org/support/forum/4">Feedback</a>').' '.$upgrade; -?></p> +echo '<span id="footer-thankyou">' . __('Thank you for creating with <a href="http://wordpress.org/">WordPress</a>.').'</span> | '.__('<a href="http://codex.wordpress.org/">Documentation</a>').' | '.__('<a href="http://wordpress.org/support/forum/4">Feedback</a>'); ?> +</p> +<?php // if ( $is_IE ) browse_happy(); ?> +<p id="footer-upgrade" class="alignright"><?php echo $upgrade; ?></p> +<div class="clear"></div> </div> <?php do_action('admin_footer', ''); ?> <script type="text/javascript">if(typeof wpOnload=='function')wpOnload();</script> </body> -</html> +</html> \ No newline at end of file wp-admin/admin-footer.php @@ -1,5 +1,16 @@ <?php -// Deprecated. Use includes/admin.php. +/** + * Administration Functions + * + * This file is deprecated, use 'wp-admin/includes/admin.php' instead. + * + * @deprecated 2.5 + * @package WordPress + * @subpackage Administration + */ + _deprecated_file( basename(__FILE__), '2.5', 'wp-admin/includes/admin.php' ); + +/** WordPress Administration API: Includes all Administration functions. */ require_once(ABSPATH . 'wp-admin/includes/admin.php'); -?> +?> \ No newline at end of file wp-admin/admin-functions.php @@ -1,33 +1,23 @@ <?php +/** + * WordPress Administration Template Header + * + * @package WordPress + * @subpackage Administration + */ + @header('Content-Type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset')); if (!isset($_GET["page"])) require_once('admin.php'); -if ( $editing ) { - if ( user_can_richedit() ) - wp_enqueue_script( 'wp_tiny_mce' ); -} -wp_enqueue_script( 'wp-gears' ); - -$min_width_pages = array( 'post.php', 'post-new.php', 'page.php', 'page-new.php', 'widgets.php', 'comment.php', 'link.php' ); -$the_current_page = preg_replace('|^.*/wp-admin/|i', '', $_SERVER['PHP_SELF']); -$ie6_no_scrollbar = true; - -function add_minwidth($c) { - return $c . 'minwidth '; -} - -if ( in_array( $the_current_page, $min_width_pages ) ) { - $ie6_no_scrollbar = false; - add_filter( 'admin_body_class', 'add_minwidth' ); -} get_admin_page_title(); - +$title = wp_specialchars( strip_tags( $title ) ); +wp_user_settings(); ?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" <?php do_action('admin_xml_ns'); ?> <?php language_attributes(); ?>> <head> <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_option('blog_charset'); ?>" /> -<title><?php bloginfo('name') ?> &rsaquo; <?php echo wp_specialchars( strip_tags( $title ) ); ?> — WordPress</title> +<title><?php bloginfo('name') ?> &rsaquo; <?php echo $title; ?> — WordPress</title> <?php wp_admin_css( 'css/global' ); @@ -39,94 +29,104 @@ wp_admin_css( 'css/ie' ); <script type="text/javascript"> //<![CDATA[ addLoadEvent = function(func) {if (typeof jQuery != "undefined") jQuery(document).ready(func); else if (typeof wpOnload!='function'){wpOnload=func;} else {var oldonload=wpOnload; wpOnload=function(){oldonload();func();}}}; + +function convertEntities(o) { + var c = function(s) { + if (/&[^;]+;/.test(s)) { + var e = document.createElement("div"); + e.innerHTML = s; + return !e.firstChild ? s : e.firstChild.nodeValue; + } + return s; + } + + if ( typeof o === 'string' ) + return c(o); + else if ( typeof o === 'object' ) + for (var v in o) { + if ( typeof o[v] === 'string' ) + o[v] = c(o[v]); + } + return o; +}; //]]> </script> -<?php if ( ($parent_file != 'link-manager.php') && ($parent_file != 'options-general.php') && $ie6_no_scrollbar ) : ?> -<style type="text/css">* html { overflow-x: hidden; }</style> -<?php endif; +<?php -$hook_suffixes = array(); +if ( in_array( $pagenow, array('post.php', 'post-new.php', 'page.php', 'page-new.php') ) ) { + add_action( 'admin_head', 'wp_tiny_mce' ); +} +$hook_suffix = ''; if ( isset($page_hook) ) - $hook_suffixes[] = "-$page_hook"; + $hook_suffix = "$page_hook"; else if ( isset($plugin_page) ) - $hook_suffixes[] = "-$plugin_page"; + $hook_suffix = "$plugin_page"; else if ( isset($pagenow) ) - $hook_suffixes[] = "-$pagenow"; - -$hook_suffixes[] = ''; + $hook_suffix = "$pagenow"; -foreach ( $hook_suffixes as $hook_suffix ) - do_action("admin_print_styles$hook_suffix"); // do_action( 'admin_print_styles-XXX' ); do_action( 'admin_print_styles' ); -foreach ( $hook_suffixes as $hook_suffix ) - do_action("admin_print_scripts$hook_suffix"); // do_action( 'admin_print_scripts-XXX' ); do_action( 'admin_print_scripts' ); -foreach ( $hook_suffixes as $hook_suffix ) - do_action("admin_head$hook_suffix"); // do_action( 'admin_head-XXX' ); do_action( 'admin_head' ); -unset($hook_suffixes, $hook_suffix); +do_action("admin_print_styles-$hook_suffix"); +do_action('admin_print_styles'); +do_action("admin_print_scripts-$hook_suffix"); +do_action('admin_print_scripts'); +do_action("admin_head-$hook_suffix"); +do_action('admin_head'); -?> +if ( $is_iphone ) { ?> +<style type="text/css">.row-actions{visibility:visible;}</style> +<?php } ?> </head> <body class="wp-admin <?php echo apply_filters( 'admin_body_class', '' ); ?>"> + <div id="wpwrap"> <div id="wpcontent"> <div id="wphead"> -<h1><?php if ( '' == get_bloginfo('name', 'display') ) echo ' '; else echo get_bloginfo('name', 'display'); ?><span id="viewsite"><a href="<?php echo trailingslashit( get_option('home') ); ?>"><?php _e('Visit Site') ?></a></span></h1> -</div> - <?php -if ( ! $is_opera ) { +$blog_name = get_bloginfo('name', 'display'); +if ( '' == $blog_name ) { + $blog_name = ' '; +} else { + $blog_name_excerpt = wp_html_excerpt($blog_name, 40); + if ( $blog_name != $blog_name_excerpt ) + $blog_name_excerpt = trim($blog_name_excerpt) . '…'; + $blog_name = $blog_name_excerpt; +} +$title_class = ''; +if ( function_exists('mb_strlen') ) { + if ( mb_strlen($blog_name, 'UTF-8') > 30 ) + $title_class = 'class="long-title"'; +} else { + if ( strlen($blog_name) > 30 ) + $title_class = 'class="long-title"'; +} ?> - <div id="gears-info-box" class="info-box" style="display:none;"> - <img src="images/gear.png" title="Gear" alt="" class="gears-img" /> - <div id="gears-msg1"> - <h3 class="info-box-title"><?php _e('Speed up WordPress'); ?></h3> - <p><?php _e('WordPress now has support for Gears, which adds new features to your web browser.'); ?><br /> - <a href="http://gears.google.com/" target="_blank" style="font-weight:normal;"><?php _e('More information...'); ?></a></p> - <p><?php _e('After you install and enable Gears most of WordPress’ images, scripts, and CSS files will be stored locally on your computer. This speeds up page load time.'); ?></p> - <p><strong><?php _e('Don’t install on a public or shared computer.'); ?></strong></p> <div class="submit"><button onclick="window.location = 'http://gears.google.com/?action=install&return=<?php echo urlencode( admin_url() ); ?>';" class="button"><?php _e('Install Now'); ?></button> - <button class="button" style="margin-left:10px;" onclick="document.getElementById('gears-info-box').style.display='none';"><?php _e('Cancel'); ?></button></div> - </div> - - <div id="gears-msg2" style="display:none;"> - <h3 class="info-box-title"><?php _e('Gears Status'); ?></h3> - <p><?php _e('Gears is installed on this computer but is not enabled for use with WordPress.'); ?></p> - <p><?php - - if ( $is_safari ) - _e('To enable it, make sure this web site is not on the denied list in Gears Settings under the Safari menu, then click the button below.'); - else - _e('To enable it, make sure this web site is not on the denied list in Gears Settings under your browser Tools menu, then click the button below.'); - - ?></p> - <p><strong><?php _e('However if this is a public or shared computer, Gears should not be enabled.'); ?></strong></p> - <div class="submit"><button class="button" onclick="wpGears.getPermission();"><?php _e('Enable Gears'); ?></button> - <button class="button" style="margin-left:10px;" onclick="document.getElementById('gears-info-box').style.display='none';"><?php _e('Cancel'); ?></button></div> - </div> - - <div id="gears-msg3" style="display:none;"> - <h3 class="info-box-title"><?php _e('Gears Status'); ?></h3> - <p><?php - - if ( $is_safari ) - _e('Gears is installed and enabled on this computer. You can disable it from the Safari menu.'); - else - _e('Gears is installed and enabled on this computer. You can disable it from your browser Tools menu.'); - - ?></p> - <p><?php _e('If there are any errors, try disabling Gears, then reload the page and enable it again.'); ?></p> - <p><?php _e('Local storage status:'); ?> <span id="gears-wait"><span style="color:#f00;"><?php _e('Please wait! Updating files:'); ?></span> <span id="gears-upd-number"></span></span></p> - <div class="submit"><button class="button" onclick="document.getElementById('gears-info-box').style.display='none';"><?php _e('Close'); ?></button></div> - </div> - </div> + +<img id="header-logo" src="../wp-includes/images/blank.gif" alt="" width="32" height="32" /> <h1 <?php echo $title_class ?>><a href="<?php echo trailingslashit( get_bloginfo('url') ); ?>" title="<?php _e('Visit site') ?>"><?php echo $blog_name ?> <span>← <?php _e('Visit site') ?></span></a></h1> + +<div id="wphead-info"> +<div id="user_info"> +<p><?php printf(__('Howdy, <a href="%1$s" title="Edit your profile">%2$s</a>'), 'profile.php', $user_identity) ?> +<?php if ( ! $is_opera ) { ?><span class="turbo-nag hidden"> | <a href="tools.php"><?php _e('Turbo') ?></a></span><?php } ?> | +<a href="<?php echo wp_logout_url() ?>" title="<?php _e('Log Out') ?>"><?php _e('Log Out'); ?></a></p> +</div> + +<?php favorite_actions(); ?> +</div> +</div> + +<?php if ( get_user_setting('mfold') == 'f' ) { ?> +<script type="text/javascript">jQuery('#wpcontent').addClass('folded');</script> <?php } ?> -<div id="user_info"><p><?php printf(__('Howdy, <a href="%1$s">%2$s</a>!'), 'profile.php', $user_identity) ?> | <a href="<?php echo site_url('wp-login.php?action=logout', 'login') ?>" title="<?php _e('Log Out') ?>"><?php _e('Log Out'); ?></a> | <?php _e('<a href="http://codex.wordpress.org/">Help</a>') ?> | <?php _e('<a href="http://wordpress.org/support/">Forums</a>'); if ( ! $is_opera ) { ?> | <span id="gears-menu"><a href="#" onclick="wpGears.message(1);return false;"><?php _e('Turbo') ?></a></span><?php } ?></p></div> +<div id="wpbody"> +<?php require(ABSPATH . 'wp-admin/menu-header.php'); ?> +<div id="wpbody-content"> <?php -require(ABSPATH . 'wp-admin/menu-header.php'); +screen_meta($hook_suffix); + +do_action('admin_notices'); if ( $parent_file == 'options-general.php' ) { require(ABSPATH . 'wp-admin/options-head.php'); } -?> -<div id="wpbody"> wp-admin/admin-header.php @@ -1,5 +1,13 @@ <?php -define('WP_ADMIN', TRUE); +/** + * WordPress Administration Generic POST Handler. + * + * @package WordPress + * @subpackage Administration + */ + +/** We are located in WordPress Administration Panels */ +define('WP_ADMIN', true); if ( defined('ABSPATH') ) require_once(ABSPATH . 'wp-load.php'); wp-admin/admin-post.php @@ -1,4 +1,16 @@ <?php +/** + * WordPress Administration Bootstrap + * + * @package WordPress + * @subpackage Administration + */ + +/** + * In WordPress Administration Panels + * + * @since unknown + */ define('WP_ADMIN', TRUE); if ( defined('ABSPATH') ) @@ -26,8 +38,8 @@ $time_format = get_option('time_format'); wp_reset_vars(array('profile', 'redirect', 'redirect_url', 'a', 'popuptitle', 'popupurl', 'text', 'trackback', 'pingback')); -wp_admin_css_color('classic', __('Classic'), admin_url("css/colors-classic.css"), array('#07273E', '#14568A', '#D54E21', '#2683AE')); -wp_admin_css_color('fresh', __('Fresh'), admin_url("css/colors-fresh.css"), array('#464646', '#CEE1EF', '#D54E21', '#2683AE')); +wp_admin_css_color('classic', __('Blue'), admin_url("css/colors-classic.css"), array('#073447', '#21759B', '#EAF3FA', '#BBD8E7')); +wp_admin_css_color('fresh', __('Gray'), admin_url("css/colors-fresh.css"), array('#464646', '#6D6D6D', '#F1F1F1', '#DFDFDF')); wp_enqueue_script( 'common' ); wp_enqueue_script( 'jquery-color' ); @@ -45,7 +57,14 @@ do_action('admin_init'); // Handle plugin admin pages. if (isset($plugin_page)) { - $page_hook = get_plugin_page_hook($plugin_page, $pagenow); + if( ! $page_hook = get_plugin_page_hook($plugin_page, $pagenow) ) { + $page_hook = get_plugin_page_hook($plugin_page, $plugin_page); + // backwards compatibility for plugins using add_management_page + if ( empty( $page_hook ) && 'edit.php' == $pagenow && '' != get_plugin_page_hook($plugin_page, 'tools.php') ) { + wp_redirect('tools.php?page=' . $plugin_page); + exit; + } + } if ( $page_hook ) { do_action('load-' . $page_hook); @@ -84,7 +103,7 @@ if (isset($plugin_page)) { } // Allow plugins to define importers as well - if (! is_callable($wp_importers[$importer][2])) + if ( !isset($wp_importers) || !isset($wp_importers[$importer]) || ! is_callable($wp_importers[$importer][2])) { if (! file_exists(ABSPATH . "wp-admin/import/$importer.php")) { @@ -93,7 +112,7 @@ if (isset($plugin_page)) { include(ABSPATH . "wp-admin/import/$importer.php"); } - $parent_file = 'edit.php'; + $parent_file = 'tools.php'; $submenu_file = 'import.php'; $title = __('Import'); @@ -108,6 +127,10 @@ if (isset($plugin_page)) { include(ABSPATH . 'wp-admin/admin-footer.php'); + // Make sure rules are flushed + global $wp_rewrite; + $wp_rewrite->flush_rules(); + exit(); } else { do_action("load-$pagenow"); wp-admin/admin.php @@ -1,8 +1,10 @@ <?php - -/* This accepts file uploads from swfupload or other asynchronous upload methods. - -*/ +/** + * Accepts file uploads from swfupload or other asynchronous upload methods. + * + * @package WordPress + * @subpackage Administration + */ if ( defined('ABSPATH') ) require_once(ABSPATH . 'wp-load.php'); @@ -22,9 +24,14 @@ header('Content-Type: text/plain; charset=' . get_option('blog_charset')); if ( !current_user_can('upload_files') ) wp_die(__('You do not have permission to upload files.')); -// just fetch the detail form for that attachment -if ( ($id = intval($_REQUEST['attachment_id'])) && $_REQUEST['fetch'] ) { - echo get_media_item($id); +// just fetch the detail form for that attachment +if ( isset($_REQUEST['attachment_id']) && ($id = intval($_REQUEST['attachment_id'])) && $_REQUEST['fetch'] ) { + if ( 2 == $_REQUEST['fetch'] ) { + add_filter('attachment_fields_to_edit', 'media_single_attachment_fields_to_edit', 10, 2); + echo get_media_item($id, array( 'send' => false, 'delete' => false )); + } else { + echo get_media_item($id); + } exit; } @@ -46,4 +53,4 @@ else { echo apply_filters("async_upload_{$type}", $id); } -?> +?> \ No newline at end of file wp-admin/async-upload.php @@ -1,12 +1,19 @@ <?php +/** + * Categories Management Panel + * + * @package WordPress + * @subpackage Administration + */ + +/** Load WordPress Bootstrap */ require_once('admin.php'); $title = __('Categories'); -$parent_file = 'edit.php'; -wp_reset_vars(array('action', 'cat')); +wp_reset_vars( array('action', 'cat') ); -if ( isset($_GET['deleteit']) && isset($_GET['delete']) ) +if ( isset( $_GET['action'] ) && isset($_GET['delete']) && ( 'delete' == $_GET['action'] || 'delete' == $_GET['action2'] ) ) $action = 'bulk-delete'; switch($action) { @@ -63,7 +70,6 @@ case 'bulk-delete': } $sendback = wp_get_referer(); - $sendback = preg_replace('|[^a-z0-9-~+_.?#=&;,/:]|i', '', $sendback); wp_redirect($sendback); exit(); @@ -71,6 +77,8 @@ case 'bulk-delete': break; case 'edit': + $title = __('Edit Category'); + require_once ('admin-header.php'); $cat_ID = (int) $_GET['cat_ID']; $category = get_category_to_edit($cat_ID); @@ -85,23 +93,32 @@ case 'editedcat': if ( !current_user_can('manage_categories') ) wp_die(__('Cheatin’ uh?')); + $location = 'categories.php'; + if ( $referer = wp_get_original_referer() ) { + if ( false !== strpos($referer, 'categories.php') ) + $location = $referer; + } + if ( wp_update_category($_POST) ) - wp_redirect('categories.php?message=3'); + $location = add_query_arg('message', 3, $location); else - wp_redirect('categories.php?message=5'); + $location = add_query_arg('message', 5, $location); + + wp_redirect($location); exit; break; default: -if ( !empty($_GET['_wp_http_referer']) ) { - wp_redirect(remove_query_arg(array('_wp_http_referer', '_wpnonce'), stripslashes($_SERVER['REQUEST_URI']))); +if ( isset($_GET['_wp_http_referer']) && ! empty($_GET['_wp_http_referer']) ) { + wp_redirect( remove_query_arg( array('_wp_http_referer', '_wpnonce'), stripslashes($_SERVER['REQUEST_URI']) ) ); exit; } -wp_enqueue_script( 'admin-categories' ); -wp_enqueue_script('admin-forms'); +wp_enqueue_script('admin-categories'); +if ( current_user_can('manage_categories') ) + wp_enqueue_script('inline-edit-tax'); require_once ('admin-header.php'); @@ -112,39 +129,47 @@ $messages[4] = __('Category not added.'); $messages[5] = __('Category not updated.'); ?> -<?php if (isset($_GET['message'])) : ?> -<div id="message" class="updated fade"><p><?php echo $messages[$_GET['message']]; ?></p></div> +<div class="wrap nosubsub"> +<?php screen_icon(); ?> +<h2><?php echo wp_specialchars( $title ); +if ( isset($_GET['s']) && $_GET['s'] ) + printf( '<span class="subtitle">' . __('Search results for “%s”') . '</span>', wp_specialchars( stripslashes($_GET['s']) ) ); ?> +</h2> + +<?php +if ( isset($_GET['message']) && ( $msg = (int) $_GET['message'] ) ) : ?> +<div id="message" class="updated fade"><p><?php echo $messages[$msg]; ?></p></div> <?php $_SERVER['REQUEST_URI'] = remove_query_arg(array('message'), $_SERVER['REQUEST_URI']); endif; ?> -<div class="wrap"> -<form id="posts-filter" action="" method="get"> -<?php if ( current_user_can('manage_categories') ) : ?> - <h2><?php printf(__('Manage Categories (<a href="%s">add new</a>)'), '#addcat') ?> </h2> -<?php else : ?> - <h2><?php _e('Manage Categories') ?> </h2> -<?php endif; ?> - -<p id="post-search"> - <label class="hidden" for="post-search-input"><?php _e('Search Categories'); ?>:</label> - <input type="text" id="post-search-input" name="s" value="<?php echo attribute_escape(stripslashes($_GET['s'])); ?>" /> +<form class="search-form topmargin" action="" method="get"> +<p class="search-box"> + <label class="hidden" for="category-search-input"><?php _e('Search Categories'); ?>:</label> + <input type="text" class="search-input" id="category-search-input" name="s" value="<?php _admin_search_query(); ?>" /> <input type="submit" value="<?php _e( 'Search Categories' ); ?>" class="button" /> </p> - +</form> <br class="clear" /> +<div id="col-container"> + +<div id="col-right"> +<div class="col-wrap"> +<form id="posts-filter" action="" method="get"> <div class="tablenav"> <?php -$pagenum = absint( $_GET['pagenum'] ); +$pagenum = isset( $_GET['pagenum'] ) ? absint( $_GET['pagenum'] ) : 0; if ( empty($pagenum) ) $pagenum = 1; -if( !$catsperpage || $catsperpage < 0 ) +if( ! isset( $catsperpage ) || $catsperpage < 0 ) $catsperpage = 20; $page_links = paginate_links( array( 'base' => add_query_arg( 'pagenum', '%#%' ), 'format' => '', + 'prev_text' => __('«'), + 'next_text' => __('»'), 'total' => ceil(wp_count_terms('category') / $catsperpage), 'current' => $pagenum )); @@ -153,56 +178,135 @@ if ( $page_links ) echo "<div class='tablenav-pages'>$page_links</div>"; ?> -<div class="alignleft"> -<input type="submit" value="<?php _e('Delete'); ?>" name="deleteit" class="button-secondary delete" /> +<div class="alignleft actions"> +<select name="action"> +<option value="" selected="selected"><?php _e('Bulk Actions'); ?></option> +<option value="delete"><?php _e('Delete'); ?></option> +</select> +<input type="submit" value="<?php _e('Apply'); ?>" name="doaction" id="doaction" class="button-secondary action" /> <?php wp_nonce_field('bulk-categories'); ?> </div> <br class="clear" /> </div> -<br class="clear" /> +<div class="clear"></div> -<table class="widefat"> +<table class="widefat fixed" cellspacing="0"> <thead> <tr> - <th scope="col" class="check-column"><input type="checkbox" /></th> - <th scope="col"><?php _e('Name') ?></th> - <th scope="col"><?php _e('Description') ?></th> - <th scope="col" class="num"><?php _e('Posts') ?></th> +<?php print_column_headers('categories'); ?> </tr> </thead> + + <tfoot> + <tr> +<?php print_column_headers('categories', false); ?> + </tr> + </tfoot> + <tbody id="the-list" class="list:cat"> <?php cat_rows(0, 0, 0, $pagenum, $catsperpage); ?> </tbody> </table> -</form> <div class="tablenav"> - <?php if ( $page_links ) echo "<div class='tablenav-pages'>$page_links</div>"; ?> -<br class="clear" /> + +<div class="alignleft actions"> +<select name="action2"> +<option value="" selected="selected"><?php _e('Bulk Actions'); ?></option> +<option value="delete"><?php _e('Delete'); ?></option> +</select> +<input type="submit" value="<?php _e('Apply'); ?>" name="doaction2" id="doaction2" class="button-secondary action" /> +<?php wp_nonce_field('bulk-categories'); ?> </div> -<br class="clear" /> +<br class="clear" /> </div> -<?php if ( current_user_can('manage_categories') ) : ?> -<div class="wrap"> +</form> + +<div class="form-wrap"> <p><?php printf(__('<strong>Note:</strong><br />Deleting a category does not delete the posts in that category. Instead, posts that were only assigned to the deleted category are set to the category <strong>%s</strong>.'), apply_filters('the_category', get_catname(get_option('default_category')))) ?></p> <p><?php printf(__('Categories can be selectively converted to tags using the <a href="%s">category to tag converter</a>.'), 'admin.php?import=wp-cat2tag') ?></p> </div> -<?php include('edit-category-form.php'); ?> +</div> +</div> + +<div id="col-left"> +<div class="col-wrap"> + +<?php if ( current_user_can('manage_categories') ) { ?> +<?php $category = (object) array(); $category->parent = 0; do_action('add_category_form_pre', $category); ?> + +<div class="form-wrap"> +<h3><?php _e('Add Category'); ?></h3> +<div id="ajax-response"></div> +<form name="addcat" id="addcat" method="post" action="categories.php" class="add:the-list: validate"> +<input type="hidden" name="action" value="addcat" /> +<?php wp_original_referer_field(true, 'previous'); wp_nonce_field('add-category'); ?> + +<div class="form-field form-required"> + <label for="cat_name"><?php _e('Category Name') ?></label> + <input name="cat_name" id="cat_name" type="text" value="" size="40" aria-required="true" /> + <p><?php _e('The name is used to identify the category almost everywhere, for example under the post or in the category widget.'); ?></p> +</div> + +<div class="form-field"> + <label for="category_nicename"><?php _e('Category Slug') ?></label> + <input name="category_nicename" id="category_nicename" type="text" value="" size="40" /> + <p><?php _e('The “slug” is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.'); ?></p> +</div> + +<div class="form-field"> + <label for="category_parent"><?php _e('Category Parent') ?></label> + <?php wp_dropdown_categories(array('hide_empty' => 0, 'name' => 'category_parent', 'orderby' => 'name', 'selected' => $category->parent, 'hierarchical' => true, 'show_option_none' => __('None'))); ?> + <p><?php _e('Categories, unlike tags, can have a hierarchy. You might have a Jazz category, and under that have children categories for Bebop and Big Band. Totally optional.'); ?></p> +</div> + +<div class="form-field"> + <label for="category_description"><?php _e('Description') ?></label> + <textarea name="category_description" id="category_description" rows="5" cols="40"></textarea> + <p><?php _e('The description is not prominent by default, however some themes may show it.'); ?></p> +</div> + +<p class="submit"><input type="submit" class="button" name="submit" value="<?php _e('Add Category'); ?>" /></p> +<?php do_action('edit_category_form', $category); ?> +</form></div> -<?php endif; ?> +<?php } ?> + +</div> +</div> + +</div> +</div> + +<script type="text/javascript"> +/* <![CDATA[ */ +(function($){ + $(document).ready(function(){ + $('#doaction, #doaction2').click(function(){ + if ( $('select[name^="action"]').val() == 'delete' ) { + var m = '<?php echo js_escape(__("You are about to delete the selected categories.\n 'Cancel' to stop, 'OK' to delete.")); ?>'; + return showNotice.warn(m); + } + }); + }); +})(jQuery); +/* ]]> */ +</script> <?php +inline_edit_term_row('categories'); + break; } wp-admin/categories.php @@ -1,4 +1,12 @@ <?php +/** + * Comment Management Panel + * + * @package WordPress + * @subpackage Administration + */ + +/** Load WordPress Bootstrap */ require_once('admin.php'); $parent_file = 'edit-comments.php'; @@ -9,7 +17,12 @@ wp_reset_vars( array('action') ); if ( isset( $_POST['deletecomment'] ) ) $action = 'deletecomment'; -function comment_footer_die( $msg ) { // $msg is assumed to contain HTML and be sanitized +/** + * Display error message at bottom of comments. + * + * @param string $msg Error Message. Assumed to contain HTML and be sanitized. + */ +function comment_footer_die( $msg ) { // echo "<div class='wrap'><p>$msg</p></div>"; include('admin-footer.php'); die; @@ -21,7 +34,6 @@ case 'editcomment' : $title = __('Edit Comment'); wp_enqueue_script('comment'); - require_once('admin-header.php'); $comment_id = absint( $_GET['c'] ); @@ -111,7 +123,7 @@ if ( 'spam' == $_GET['dt'] ) { </tr> <?php } ?> <tr> -<th scope="row" valign="top"><?php _e('Comment'); ?></th> +<th scope="row" valign="top"><?php echo _c('Comment|noun'); ?></th> <td><?php echo $comment->comment_content; ?></td> </tr> </table> @@ -171,7 +183,7 @@ case 'unapprovecomment' : if ( '' != wp_get_referer() && false == $noredir ) wp_redirect( wp_get_referer() ); else - wp_redirect( admin_url('edit.php?p=' . absint( $comment->comment_post_ID ) . '#comments') ); + wp_redirect( admin_url('edit-comments.php?p=' . absint( $comment->comment_post_ID ) . '#comments') ); exit(); break; @@ -196,7 +208,7 @@ case 'approvecomment' : if ( '' != wp_get_referer() && false == $noredir ) wp_redirect( wp_get_referer() ); else - wp_redirect( admin_url('edit.php?p=' . absint( $comment->comment_post_ID ) . '#comments') ); + wp_redirect( admin_url('edit-comments.php?p=' . absint( $comment->comment_post_ID ) . '#comments') ); exit(); break; @@ -210,7 +222,7 @@ case 'editedcomment' : edit_comment(); - $location = ( empty( $_POST['referredby'] ) ? "edit.php?p=$comment_post_id" : $_POST['referredby'] ) . '#comment-' . $comment_id; + $location = ( empty( $_POST['referredby'] ) ? "edit-comments.php?p=$comment_post_id" : $_POST['referredby'] ) . '#comment-' . $comment_id; $location = apply_filters( 'comment_edit_redirect', $location, $comment_id ); wp_redirect( $location ); @@ -225,4 +237,4 @@ default: include('admin-footer.php'); -?> +?> \ No newline at end of file wp-admin/comment.php @@ -1,24 +1,80 @@ -.post-com-count { -} -#adminmenu li a #awaiting-mod, #sidemenu li a #update-plugins { - background-image: url(../images/comment-stalk-rtl.gif); - background-position:right bottom; -} -#footer { - background-position:99% 10px; -} -#poststuff .closed .togbox, #poststuff .togbox { - background-image: url(../images/toggle-arrow-rtl.gif) !important; -} .bar { border-right-color: transparent; border-left-color: #99d; } + .plugins .togl { border-right-color: transparent; border-left-color: #ccc; } + +.post-com-count { + background-image: url(../images/bubble_bg-rtl.gif); +} +.tablenav .tablenav-pages a { + background: #eee url('../images/menu-bits-rtl.gif') repeat-x scroll right -379px; +} #upload-menu li.current { border-right-color: transparent; border-left-color: #448abd; } + +#adminmenu .wp-submenu .current a.current { + background: transparent url(../images/menu-bits-rtl.gif) no-repeat scroll right -289px; +} + +#adminmenu li.wp-menu-separator { + background: transparent url(../images/menu-arrows.gif) no-repeat scroll right -34px; +} + +.folded #adminmenu li.wp-menu-separator { + background: transparent url(../images/menu-arrows.gif) no-repeat scroll left 5px; +} + +#adminmenu li.wp-has-current-submenu .wp-menu-toggle, +#adminmenu li.wp-has-current-submenu:hover .wp-menu-toggle { + background: transparent url(../images/menu-bits-rtl.gif) repeat-x scroll right -207px; +} + +#adminmenu .wp-has-current-submenu ul li a.current { + background: url(../images/menu-dark-rtl.gif) top right no-repeat !important; +} + +#adminmenu li.wp-has-current-submenu a.wp-has-current-submenu, +#adminmenu .menu-top .current { + background: url(../images/menu-bits-rtl.gif) top right repeat-x; +} + +#adminmenu li.wp-has-current-submenu ul li a { + background: url(../images/menu-dark-rtl.gif) bottom right no-repeat !important; +} + +#adminmenu li.wp-has-current-submenu.wp-menu-open .wp-menu-toggle, #adminmenu li.wp-has-current-submenu:hover .wp-menu-toggle { + background: transparent url(../images/menu-bits-rtl.gif) no-repeat right -207px; +} + +#adminmenu .wp-has-submenu:hover .wp-menu-toggle, +#adminmenu .wp-menu-open .wp-menu-toggle { + background: transparent url(../images/menu-bits-rtl.gif) repeat-x scroll right -109px; +} + +#adminmenu a.wp-has-submenu { + background: #f1f1f1 url(../images/menu-bits-rtl.gif) repeat-x scroll right -379px; +} + +#adminmenu .wp-submenu a { + background: #FFFFFF url(../images/menu-bits-rtl.gif) no-repeat scroll right -310px; +} + +#adminmenu li.current a, +#adminmenu .wp-submenu a:hover { + background: transparent url(../images/menu-bits-rtl.gif) no-repeat scroll right -289px; +} + +#adminmenu li.wp-has-current-submenu a.wp-has-submenu { + background: #b5b5b5 url(../images/menu-bits-rtl.gif) repeat-x scroll right top; +} + +.meta-box-sortables .postbox:hover .handlediv { + background: transparent url(../images/menu-bits-rtl.gif) no-repeat scroll right -111px; +} wp-admin/css/colors-classic-rtl.css @@ -1,9 +1,27 @@ +html { + background-color: #F5FCFD; +} + +.find-box-search { + border-color: #dfdfdf; + background-color: #f1f1f1; +} + +.find-box { + background-color: #f1f1f1; +} + +.find-box-inside { + background-color: #fff; +} + a.page-numbers:hover { border-color: #999; } -body, .form-table .pre { - background-color: #fff; +body, +#wpbody, +.form-table .pre { color: #333; } @@ -11,51 +29,118 @@ body > #upload-menu { border-bottom-color: #fff; } -div#current-widgets, #postcustomstuff table, #your-profile fieldset, a.page-numbers, #rightnow, div.dashboard-widget, .widefat { +kbd, code { + background: #eaeaea; +} + +div#current-widgets, +#postcustomstuff table, +#your-profile fieldset, +#rightnow, +div.dashboard-widget, +#dashboard-widgets p.dashboard-widget-links, +#replyrow #ed_reply_toolbar input { border-color: #ccc; } +#poststuff .inside label.spam { + color: red; +} + +#poststuff .inside label.waiting { + color: orange; +} + +#poststuff .inside label.approved { + color: green; +} + +#postcustomstuff table { + border-color: #dfdfdf; + background-color: #F9F9F9; +} + +#postcustomstuff thead th { + background-color: #F1F1F1; +} + +#postcustomstuff table input, +#postcustomstuff table textarea { + border-color: #dfdfdf; + background-color: #fff; +} + +.widefat { + border-color: #BBD8E7; + background-color: #fff; +} + div.dashboard-widget-error { background-color: #c43; } div.dashboard-widget-notice { - background-color: #F0F6FB; + background-color: #cfe1ef; } -div.dashboard-widget-submit, ul.widget-control-list div.widget-control-actions { +div.dashboard-widget-submit, +ul.widget-control-list div.widget-control-actions { border-top-color: #ccc; } -input.disabled, textarea.disabled { - background-color: #ccc; +div.ui-tabs-panel { + border-color: #f1f1f1; +} + +ul#category-tabs li.ui-tabs-selected { + background-color: #f1f1f1; } -#user_info a:hover, li.widget-list-control-item h4.widget-title a:hover, .submit a, #dashmenu a:hover, #footer a, #upload-menu li a.upload-tab-link, li.widget-list-control-item h4.widget-title a, +input.disabled, +textarea.disabled { + background-color: #ccc; +} +/* #upload-menu li a.upload-tab-link, */ +li.widget-list-control-item h4.widget-title a:hover, +li.widget-list-control-item h4.widget-title a, #dragHelper li.widget-list-control-item h4.widget-title a, -#draghelper li.widget-list-control-item h4.widget-title a:visited, .login #backtoblog a:hover { +#draghelper li.widget-list-control-item h4.widget-title a:visited, +.login #backtoblog a:hover, +#plugin-information .action-button a, +#plugin-information .action-button a:hover, +#plugin-information .action-button a:visited { color: #fff; } -ul#category-tabs li.ui-tabs-selected, li.widget-list-control-item, div.nav, .tablenav, .submitbox, h3.dashboard-widget-title, h3.dashboard-widget-title span, h3.dashboard-widget-title small, ul.view-switch li.current, .form-table tr, #poststuff h3, .login form, h3.info-box-title { - background-color: #cfebf7; +li.widget-list-control-item div.widget-control { + background-color: #fff; + border-color: #dfdfdf; } -div.ui-tabs-panel { - border-color: #cfebf7; +.metabox-holder .postbox h3, +#poststuff .postbox h3, +#poststuff .stuffbox h3 { + background: #dfdfdf url("../images/blue-grad.png") repeat-x left top; + text-shadow: #fff 0 1px 0; +} + +.form-table th, +.form-wrap label { + color: #222; + text-shadow: #fff 0 1px 0; +} + +.setting-description, .form-wrap p { + color: #666; } select { background-color: #fff; - border-color: #ddd; + border-color: #8CBDD5; } strong .post-com-count span { - background-color: #2583ad; -} - -.button-secondary, #login form .submit input { - background-color: #8ebddc !important; + background-color: #21759b; } ul#widget-list li.widget-list-item h4.widget-title { @@ -67,10 +152,14 @@ ul#widget-list li.widget-list-item h4.widget-title { background-color: #ccf3fa; } -.ac_match, .subsubsub a.current, h2 { +.ac_match, .subsubsub a.current { color: #000; } +.wrap h2 { + color: #093E56; +} + .ac_over { background-color: #f0f0b8; } @@ -84,13 +173,13 @@ ul#widget-list li.widget-list-item h4.widget-title { color: #101010; } -.alternate { - background-color: #f9f9f9; +.alternate, .alt { + background-color: #EDFBFC; } .available-theme a.screenshot { background-color: #f1f1f1; - border-color: #ccc; + border-color: #ddd; } .bar { @@ -98,8 +187,11 @@ ul#widget-list li.widget-list-item h4.widget-title { border-right-color: #99d; } -.describe { - border-top-color: #d0d0d0; +#media-upload { + background: #fff; +} +#media-upload .slidetoggle { + border-top-color: #dfdfdf; } .error, #login #login_error { @@ -119,44 +211,45 @@ ul#widget-list li.widget-list-item h4.widget-title { border-color: #c00 !important; } -.form-table input, .form-table textarea { - border-color: #c6d9e9; -} - -.form-table td, .form-table th { - border-bottom-color: #fff; +.form-table input, +.form-table textarea, +.search-input, +.form-field input, +.form-field textarea, +.submit { + border-color: #8CBDD5; } .highlight { - background-color: #cfebf7; + background-color: #e4f2fd; color: #d54e21; } -.howto, .nonessential, #sidemenu, #edit-slug-box, .form-input-tip, #dashboard_primary span.rss-date, .subsubsub, #dashboard_secondary div.dashboard-widget-content ul li a cite { - color: #999; -} - -#dashmenu a, #user_info a { - color: #88b4d7; +.howto, +.nonessential, +#edit-slug-box, +.form-input-tip, +.rss-widget span.rss-date, +.subsubsub { + color: #666; } .media-item { - border-bottom-color: #d0d0d0; + border-bottom-color: #dfdfdf; } -.media-upload-form label.form-help, td.help { - color: #9a9a9a; +#wpbody-content #media-items .describe { + border-top-color: #dfdfdf; } -.page-numbers { - background-color: #fff; - border-color: #fff; +.describe input[type="text"], +.describe textarea { + border-color: #dfdfdf; } -.page-numbers.current { - background-color: #328ab2; - border-color: #328ab2; - color: #fff; +.media-upload-form label.form-help, +td.help { + color: #9a9a9a; } .post-com-count { @@ -186,46 +279,100 @@ ul#widget-list li.widget-list-item h4.widget-title { color: #666; } -.submit input, .button, .button-secondary, #login form .submit input, div.dashboard-widget-submit input, #edit-slug-buttons a.save { - background-color: #e5e5e5; - color: #07273e; - border-color: #a3a3a3; +.button, +.button-secondary, +.submit input, +input[type=button], +input[type=submit] { + border-color: #8CBDD5; + color: #093E56; } -.button[disabled], .button:disabled { - background-color: #999; +.button:hover, +.button-secondary:hover, +.submit input:hover, +input[type=button]:hover, +input[type=submit]:hover { + color: #000; + border-color: #21759B; } -.tablenav .button-secondary { - border-color: #5396c5; +.button, +.submit input, +.button-secondary { + background: #f2f2f2 url(../images/white-grad.png) repeat-x scroll left top; } -.submit input:hover, .button:hover, #edit-slug-buttons a.save:hover { - border-color: #535353; +.button:active, +.submit input:active, +.button-secondary:active { + background: #eee url(../images/white-grad-active.png) repeat-x scroll left top; } -.submit input:hover, .button:hover, .button-secondary:hover, #wphead #viewsite a:hover, #submenu a.current, #submenu a:hover, .submitbox #previewview a:hover, #the-comment-list .comment a:hover, #rightnow a:hover, a:hover, .subsubsub a:hover, .subsubsub a.current:hover, #login form .submit input:hover, div.dashboard-widget-submit input:hover, #edit-slug-buttons a.save:hover, #media-upload a.del-link:hover { +.button-primary, +.submit .button-primary, +#login form .submit input { + border-color: #298cba !important; + font-weight: bold; + color: #FFF !important; + background: #21759B url(../images/button-grad.png) repeat-x scroll left top; +} + +.button-primary:active, +#login form .submit input:active { + background: #21759b url(../images/button-grad-active.png) repeat-x scroll left top !important; +} + +.button[disabled], +.button:disabled, +.button-secondary[disabled], +.button-secondary:disabled, +a.button.disabled { + color: #ccc !important; + border-color: #ccc; +} + +.button-primary[disabled], +.button-primary:disabled { + color: #2fa0d5 !important; +} + +a:active, +a:focus { color: #d54e21; } -#adminmenu a:hover, #sidemenu a:hover, .ui-tabs-nav a:hover { - color: #97c4d8; +a:hover, +#wphead #viewsite a:hover, +#adminmenu a:hover, +#adminmenu ul.wp-submenu a:hover, +#the-comment-list .comment a:hover, +#rightnow a:hover, +.subsubsub a:hover, +.subsubsub a.current:hover, +#login form .submit input:hover, +div.dashboard-widget-submit input:hover, +#media-upload a.del-link:hover, +.ui-tabs-nav a:hover { + color: #d54e21; } -.button-secondary:hover, #login form .submit input:hover { - border-color: #328ab2; - background-color: #a6d2e5 !important; +#the-comment-list .comment-item, +#dashboard-widgets #dashboard_quick_press form p.submit { + border-color: #dfdfdf; } -.submitbox #autosave .error, ul.view-switch li.current a { - color: #333; +.button-primary:hover, +#login form .submit input:hover { + border-color: #13455b !important; + color: #EAF2FA !important; } -.submitbox #previewview { - background-color: #5488af; +#side-info-column #category-tabs .ui-tabs-selected a { + color: #333; } -.submitbox #previewview a, #rightnow .rbutton { +#rightnow .rbutton { background-color: #ebebeb; color: #264761; } @@ -235,8 +382,9 @@ ul#widget-list li.widget-list-item h4.widget-title { color: #ccc; } -.submitbox .submitdelete { - border-bottom-color: #999; +.submitbox .submitdelete, a.delete { + color: #f00; + border-bottom-color: #f00; } .submitbox .submitdelete:hover, @@ -246,94 +394,136 @@ ul#widget-list li.widget-list-item h4.widget-title { border-bottom-color: #f00; } +#normal-sortables .submitbox .submitdelete:hover { + color: #000; + background-color: #f00; + border-bottom-color: #f00; +} + .tablenav .dots { - background-color: #cfebf7; - border-color: #cfebf7; + border-color: transparent; } -.tablenav .next, .tablenav .prev{ - background-color: #cfebf7; - border-bottom-color: #cfebf7; - border-color: #cfebf7; - color: #2583ad; +.tablenav .next, +.tablenav .prev { + border-color: transparent; + color: #21759b; } -.tablenav .next:hover, .tablenav .prev:hover { - border-bottom-color: #d54e21; - border-color: #cfebf7; +.tablenav .next:hover, +.tablenav .prev:hover { + border-color: transparent; color: #d54e21; } -.updated, .login #login_error, .login .message { +.updated, +.login #login_error, +.login .message { background-color: #ffffe0; border-color: #e6db55; } -.updated a { - border-bottom-color: #2583ad; +a.page-numbers { + border-bottom-color: #B8D3E2; } -.widefat td, .widefat th, div#available-widgets-filter, ul#widget-list li.widget-list-item, .commentlist li { +div#available-widgets-filter, +ul#widget-list li.widget-list-item, +.commentlist li { border-bottom-color: #ccc; } -.widefat thead, .thead { - background-color: #464646; - color: #d7d7d7; +.widefat td, +.widefat th { + border-bottom-color: #BBD8E7; } -.widget-control-save, .widget-control-remove { - background-color: #83b4d5; - color: #246; +.widefat th { + text-shadow: rgba(255,255,255,0.8) 0 1px 0; } -.wrap h2 { - border-bottom-color: #dadada; - color: #5a5a5a; +.widefat thead tr th, +.widefat tfoot tr th, +h3.dashboard-widget-title, +h3.dashboard-widget-title span, +h3.dashboard-widget-title small, +.find-box-head { + color: #333; + background: #dfdfdf url(../images/blue-grad.png) repeat-x scroll left top; } -#poststuff #edButtonPreview, #poststuff #edButtonHTML, #the-comment-list p.comment-author strong a, #media-upload a.del-link, #media-upload a.delete, a { - color: #2e7ca0; +h3.dashboard-widget-title small a { + color: #d7d7d7; } -#adminmenu a, .ui-tabs-nav a { - color: #cfebf6; +h3.dashboard-widget-title small a:hover { + color: #fff; } -#submenu a { - color: #2782af +#adminmenu a, +#poststuff #edButtonPreview, +#poststuff #edButtonHTML, +#the-comment-list p.comment-author strong a, +#media-upload a.del-link, +#media-upload a.delete, +.ui-tabs-nav a, a { + color: #1C6280; } + /* Because we don't want visited on these links */ -#adminmenu a.current, #sidemenu a.current, body.press-this .ui-tabs-selected a, body.press-this .ui-tabs-selected a:hover { +body.press-this .ui-tabs-selected a, +body.press-this .ui-tabs-selected a:hover { background-color: #fff; - border-color: #07273e; + border-color: #c6d9e9; border-bottom-color: #fff; color: #d54e21; - font-weight: bold; } -#adminmenu li a #awaiting-mod, #sidemenu li a #update-plugins { - background-image: url(../images/comment-stalk-classic.gif); -} - -#adminmenu li a #awaiting-mod span, #sidemenu li a #update-plugins span { +#adminmenu #awaiting-mod, +#adminmenu .update-plugins, +#sidemenu a .update-plugins, +#rightnow .reallynow, +#plugin-information .action-button { background-color: #d54e21; color: #fff; } -#rightnow .reallynow { - background-color: #114973; +#adminmenu li a:hover #awaiting-mod, +#adminmenu li a:hover .update-plugins, +#sidemenu li a:hover .update-plugins { + background-color: #264761; color: #fff; } +#adminmenu li.current a #awaiting-mod, +#adminmenu li.current a .update-plugins, +#adminmenu li.wp-has-current-submenu a .update-plugins, +#adminmenu li.wp-has-current-submenu a .update-plugins { + background-color: #ddd; + color: #000; + text-shadow: none; + -moz-box-shadow: rgba(0,0,0,0.2) 0px -1px 0px; + -khtml-box-shadow: rgba(0,0,0,0.2) 0px -1px 0px; + -webkit-box-shadow: rgba(0,0,0,0.2) 0px -1px 0px; + box-shadow: rgba(0,0,0,0.2) 0px -1px 0px; +} + +#adminmenu li.current a:hover #awaiting-mod, +#adminmenu li.current a:hover .update-plugins, +#adminmenu li.wp-has-current-submenu a:hover #awaiting-mod, +#adminmenu li.wp-has-current-submenu a:hover .update-plugins { + background-color: #264761; + color: #fff; +} -#adminmenu li a:hover #awaiting-mod span, #sidemenu li a:hover #update-plugins span { - background-color: #07273E; +div#media-upload-header { + background-color: #f9f9f9; + border-bottom-color: #dfdfdf; } -#adminmenu, div#media-upload-header { - background-color: #14568a; - border-bottom-color: #07273e; +div#plugin-information-header { + background-color: #e4f2fd; + border-bottom-color: #c6d9e9; } #currenttheme img { @@ -348,75 +538,83 @@ ul#widget-list li.widget-list-item h4.widget-title { background-color: #f9f9f9; } -input.readonly { +input.readonly, textarea.readonly { background-color: #ddd; } -#dashmenu a.current { - background-color: #14568a; - color: #cfebf6; -} - -#dragHelper h4.widget-title, li.widget-list-control-item h4, #dragHelper li.widget-list-control-item h4 { +#dragHelper h4.widget-title, +li.widget-list-control-item h4, +#dragHelper li.widget-list-control-item h4 { background-color: #2683ae; color: #fff; } -#ed_toolbar input { - background: url( ../images/fade-butt.png ) #fff repeat-x 0 -2px; +#ed_toolbar input, +#ed_reply_toolbar input { + background: #fff url("../images/fade-butt.png") repeat-x 0 -2px; } #editable-post-name { background-color: #fffbcc; } -#edit-slug-box strong, .login #nav a { +#edit-slug-box strong, +.tablenav .displaying-num, +#submitted-on { color: #777; } -#edit-slug-buttons a.save { - background-color: #ebebeb; +.login #nav a { + color: #21759b !important; +} + +.login #nav a:hover { + color: #d54e21 !important; } -#footer { - background: url(../images/logo-ghost.png) #464646 no-repeat 20px 10px; +#footer, +#footer-upgrade { + background: #073447; color: #999; } #media-items { - border-color: #c0c0c0; + border-color: #dfdfdf; } #pass-strength-result { - background-color: #e3e3e3; - border-color: #000; + background-color: #eee; + border-color: #ddd !important; } #pass-strength-result.bad { - background-color: #ffeff7; - border-color: #c69; + background-color: #ffb78c; + border-color: #ff853c !important; } #pass-strength-result.good { - background-color: #effff4; - border-color: #66cc87; + background-color: #ffec8b; + border-color: #fc0 !important; } #pass-strength-result.short { - background-color: #e3e3e3; + background-color: #ffa0a0; + border-color: #f04040 !important; } #pass-strength-result.strong { - background-color: #59ef86; - border-color: #319f52; + background-color: #c3ff88; + border-color: #8dff1c !important; } -.checkbox, .side-info, #your-profile #rich_editing { +.checkbox, +.side-info, +#your-profile #rich_editing { background-color: #fff; } .plugins .active { - background-color: #BBEEBB; + background-color: #e7f7d3; } .plugins .togl { @@ -427,29 +625,49 @@ input.readonly { background-color: #ffffe0; } +#the-comment-list .approve a { + color: #006505; +} + +#the-comment-list .unapprove a { + color: #d98500; +} + +#the-comment-list .delete a { + color: #bc0b0b; +} + .plugins tr { background-color: #fff; } -#poststuff #editor-toolbar .active { - background-color: #83b4d5; - color: #333; +.metabox-holder .postbox, +#poststuff .postbox, +#titlediv, +#poststuff .postarea, +#poststuff .stuffbox, +.postbox input[type="text"], +.postbox textarea, +.stuffbox input[type="text"], +.stuffbox textarea { + border-color: #BBD8E7; } -#poststuff .closed .togbox { - background-color: #2583ad; - background-image: url(../images/toggle-arrow.gif); +.metabox-holder .postbox, +#poststuff .postbox { + background-color: #FFF; } -#poststuff .postbox, #titlediv, #poststuff .postarea, #poststuff .stuffbox { - border-color: #ebebeb; - border-right-color: #ccc; - border-bottom-color: #ccc; +.ui-sortable .postbox h3 { + color: #093E56; } -#poststuff .togbox { - background-color: #b2b2b2; - background-image: url(../images/toggle-arrow.gif); +.ui-sortable .postbox h3:hover { + color: #000; +} + +.curtime #timestamp { + background-image: url(../images/date-button.gif); } #quicktags #ed_link { @@ -464,26 +682,16 @@ input.readonly { color: #448abd; } -#sidemenu a { - background-color: #14568a; - border-bottom-color: #07273e; - border-top-color: #14568a; - color: #cfebf6; -} - -#tagchecklist span a { +#tagchecklist span a, +#bulk-titles div a { background: url(../images/xit.gif) no-repeat; } -#tagchecklist span a:hover { +#tagchecklist span a:hover, +#bulk-titles div a:hover { background: url(../images/xit.gif) no-repeat -10px 0; } -#the-comment-list .comment a { - border-bottom-color: #ababab; - color: #666; -} - #update-nag, .plugin-update { background-color: #fffeeb; border-bottom-color: #ccc; @@ -491,159 +699,185 @@ input.readonly { color: #555; } -#upload-files a.file-link { - background-color: #d1e2ef; +.login #backtoblog a { + color: #ccc; } -#upload-file-view a img { - border-bottom-color: #69c; +#wphead { + background-color: #073447; } -#upload-menu li #current-tab-nav, #upload-file { - background-color: #f9fcfe; +body.login { + border-top-color: #093E56; } -#upload-menu li span a.page-numbers { - color: #00019b; +#wphead h1 a { + color: #fff; } -#upload-menu li.current { - border-right-color: #448abd; - color: #000; +#login form input { + color: #555; } -#upload-menu li.current a.upload-tab-link, #upload-menu li a:hover { - background-color: #f9fcfe; - color: #000; +#wphead h1 a:hover { + text-decoration: underline; } -#upload-menu, #upload-menu li { - border-top-color: #247fab; +#user_info { + color: #999; } -#user_info, .login #backtoblog a { +#user_info a:link, #user_info a:visited, #footer a:link, #footer a:visited { color: #ccc; + text-decoration: none; } -#wphead { - background-color: #14568a; +#user_info a:hover, #footer a:hover { + color: #fff; + text-decoration: underline !important; } -#wphead, body.login { - border-top-color: #07273e; +#user_info a:active, #footer a:active { + color: #ccc !important; } -#wphead #viewsite a { - background-color: #5488af; - color: #cfebf7; - border-color: #0b3d64; +div#media-upload-error, +.file-error, +abbr.required, +.widget-control-remove:hover, +.delete a:hover { + color: #f00; } -#wphead #viewsite a:hover { - color: #07273e; +#media-upload a.delete { + color: #888; } -#wphead h1, #dashmenu a.current:hover { - color: #cfebf6; +/* editors */ +#quicktags { + border-color: #dfdfdf; + background-color: #dfdfdf; } -div#media-upload-error, .file-error, abbr.required, .widget-control-remove:hover, .delete:hover { - color: #f00; +#ed_toolbar input { + border-color: #C3C3C3; +} + +#ed_toolbar input:hover { + border-color: #aaa; + background: #ddd; +} + +#poststuff .wp_themeSkin .mceStatusbar { + border-color: #EDEDED; +} + +#poststuff #edButtonPreview, +#poststuff #edButtonHTML { + background-color: #f1f1f1; + border-color: #dfdfdf; + color: #999; +} + +#poststuff #editor-toolbar .active { + border-bottom-color: #e9e9e9; + background-color: #e9e9e9; + color: #333; } /* TinyMCE */ +#post-status-info { + background-color: #EDEDED; +} + .wp_themeSkin *, -.wp_themeSkin a:hover, -.wp_themeSkin a:link, -.wp_themeSkin a:visited, +.wp_themeSkin a:hover, +.wp_themeSkin a:link, +.wp_themeSkin a:visited, .wp_themeSkin a:active { color: #000; } /* Containers */ -.wp_themeSkin table, #wp_editbtns { - background: #83B4D5; -} - .wp_themeSkin iframe { background: #fff; } /* Layout */ .wp_themeSkin .mceStatusbar { - color:#000; - background-color: #eaf3fa; + color: #000; + background-color: #f5f5f5; } /* Button */ -.wp_themeSkin .mceButton { +.wp_themeSkin .mceButton { background-color: #e9e8e8; - border-color: #83B4D5; + border-color: #B2B2B2; } .wp_themeSkin a.mceButtonEnabled:hover, -.wp_themeSkin a.mceButtonActive, +.wp_themeSkin a.mceButtonActive, .wp_themeSkin a.mceButtonSelected { - background-color: #d6d8da; - border-color: #7789ba !important; + background-color: #d5d5d5; + border-color: #777 !important; } .wp_themeSkin .mceButtonDisabled { - border-color: #83B4D5 !important; + border-color: #ccc !important; } /* ListBox */ .wp_themeSkin .mceListBox .mceText, .wp_themeSkin .mceListBox .mceOpen { - border-color: #83B4D5; - background-color: #e9e8e8; + border-color: #B2B2B2; + background-color: #d5d5d5; } -.wp_themeSkin table.mceListBoxEnabled:hover .mceOpen, +.wp_themeSkin table.mceListBoxEnabled:hover .mceOpen, .wp_themeSkin .mceListBoxHover .mceOpen, .wp_themeSkin .mceListBoxSelected .mceOpen, .wp_themeSkin .mceListBoxSelected .mceText { - border-color: #7789ba !important; - background-color: #d6d8da; + border-color: #777 !important; + background-color: #d5d5d5; } -.wp_themeSkin table.mceListBoxEnabled:hover .mceText, +.wp_themeSkin table.mceListBoxEnabled:hover .mceText, .wp_themeSkin .mceListBoxHover .mceText { - border-color: #7789ba !important; + border-color: #777 !important; } .wp_themeSkin select.mceListBox { - border-color: #b3c7e1; + border-color: #B2B2B2; background-color: #fff; } /* SplitButton */ -.wp_themeSkin .mceSplitButton a.mceAction, +.wp_themeSkin .mceSplitButton a.mceAction, .wp_themeSkin .mceSplitButton a.mceOpen { - background-color: #e9e8e8; - border-color: #83B4D5; + background-color: #e8e8e8; + border-color: #B2B2B2; } .wp_themeSkin .mceSplitButton a.mceOpen:hover, .wp_themeSkin .mceSplitButtonSelected a.mceOpen, .wp_themeSkin table.mceSplitButtonEnabled:hover a.mceAction, .wp_themeSkin .mceSplitButton a.mceAction:hover { - background-color: #d6d8da; - border-color: #7789ba !important; -} + background-color: #d5d5d5; + border-color: #777 !important; +} .wp_themeSkin .mceSplitButtonActive { - background-color: #d6d8da; + background-color: #B2B2B2; } /* ColorSplitButton */ .wp_themeSkin div.mceColorSplitMenu table { - background-color: #ebeaeb; - border-color: #808080; + background-color: #ebebeb; + border-color: #B2B2B2; } .wp_themeSkin .mceColorSplitMenu a { - border-color: #808080; + border-color: #B2B2B2; } .wp_themeSkin .mceColorSplitMenu a.mceMoreColors { @@ -669,18 +903,18 @@ div#media-upload-error, .file-error, abbr.required, .widget-control-remove:hover } .wp_themeSkin .mceMenu .mceText { - color: #000; + color: #000; } .wp_themeSkin .mceMenu .mceMenuItemEnabled a:hover, -.wp_themeSkin .mceMenu .mceMenuItemActive, #quicktags { - background-color: #83B4D5; +.wp_themeSkin .mceMenu .mceMenuItemActive { + background-color: #f5f5f5; } .wp_themeSkin td.mceMenuItemSeparator { background-color: #aaa; } .wp_themeSkin .mceMenuItemTitle a { - background-color: #ccc; + background-color: #ccc; border-bottom-color: #aaa; } .wp_themeSkin .mceMenuItemTitle span.mceText { @@ -690,23 +924,80 @@ div#media-upload-error, .file-error, abbr.required, .widget-control-remove:hover color: #888; } -/* pop-up */ -.clearlooks2 .mceTop .mceLeft, .clearlooks2 .mceTop .mceRight { - background-color: #cee1ef; - border-color: #c6d9e9; +.wp_themeSkin tr.mceFirst td.mceToolbar { + background-color: #dfdfdf; + border-color: #dfdfdf; } -.clearlooks2 .mceFocus .mceTop .mceLeft, .clearlooks2 .mceFocus .mceTop .mceRight { - background-color: #5488AF; - border-color: #464646; +.wp-admin #mceModalBlocker { + background: #000; } -#editorcontainer { - border-color: #ccc; +.wp-admin .clearlooks2 .mceFocus .mceTop .mceLeft { + background: #444444; + border-left: 1px solid #999; + border-top: 1px solid #999; + -moz-border-radius: 4px 0 0 0; + -webkit-border-top-left-radius: 4px; + -khtml-border-top-left-radius: 4px; + border-top-left-radius: 4px; } -#poststuff #titlewrap { - border-color: #ccc; +.wp-admin .clearlooks2 .mceFocus .mceTop .mceRight { + background: #444444; + border-right: 1px solid #999; + border-top: 1px solid #999; + border-top-right-radius: 4px; + -khtml-border-top-right-radius: 4px; + -webkit-border-top-right-radius: 4px; + -moz-border-radius: 0 4px 0 0; +} + +.wp-admin .clearlooks2 .mceMiddle .mceLeft { + background: #f1f1f1; + border-left: 1px solid #999; +} + +.wp-admin .clearlooks2 .mceMiddle .mceRight { + background: #f1f1f1; + border-right: 1px solid #999; +} + +.wp-admin .clearlooks2 .mceBottom { + background: #f1f1f1; + border-bottom: 1px solid #999; +} + +.wp-admin .clearlooks2 .mceBottom .mceLeft { + background: #f1f1f1; + border-bottom: 1px solid #999; + border-left: 1px solid #999; +} + +.wp-admin .clearlooks2 .mceBottom .mceCenter { + background: #f1f1f1; + border-bottom: 1px solid #999; +} + +.wp-admin .clearlooks2 .mceBottom .mceRight { + background: #f1f1f1; + border-bottom: 1px solid #999; + border-right: 1px solid #999; +} + +.wp-admin .clearlooks2 .mceFocus .mceTop span { + color: #e5e5e5; +} +/* end TinyMCE */ + +#editorcontainer, +#post-status-info, +#titlediv #title { + border-color: #dfdfdf; +} + +#titlediv #title { + background-color: #fff; } #tTips p#tTips_inside { @@ -714,8 +1005,223 @@ div#media-upload-error, .file-error, abbr.required, .widget-control-remove:hover color: #333; } -/* Diff */ +#timestampdiv input, +#namediv input, +#tagsdiv #the-tagcloud { + border-color: #ddd; +} + +/* menu */ +#adminmenu * { + border-color: #BBD8E7; +} + +#adminmenu li.wp-menu-separator { + background: transparent url(../images/menu-arrows.gif) no-repeat scroll left 5px; +} + +.folded #adminmenu li.wp-menu-separator { + background: transparent url(../images/menu-arrows.gif) no-repeat scroll right -34px; +} +#adminmenu li.wp-has-current-submenu.wp-menu-open .wp-menu-toggle, +#adminmenu li.wp-has-current-submenu:hover .wp-menu-toggle { + background: transparent url(../images/menu-bits.gif) no-repeat scroll left -207px; +} + +#adminmenu .wp-has-submenu:hover .wp-menu-toggle, +#adminmenu .wp-menu-open .wp-menu-toggle { + background: transparent url(../images/menu-bits.gif) no-repeat scroll left -109px; +} + +#adminmenu a.menu-top { + background: #EAF3FA url(../images/menu-bits.gif) repeat-x scroll left -379px; +} + +#adminmenu .wp-submenu a { + background: #FFFFFF url(../images/menu-bits.gif) no-repeat scroll 0 -310px; +} + +#adminmenu .wp-has-current-submenu ul li a { + background: none; +} + +#adminmenu .wp-has-current-submenu ul li a.current { + background: url(../images/menu-dark.gif) top left no-repeat !important; +} + +#adminmenu li.wp-has-current-submenu a.wp-has-current-submenu, +#adminmenu .menu-top .current { + background: #6d6d6d url(../images/menu-bits.gif) top left repeat-x; + border-color: #6d6d6d; + color: #fff; + text-shadow: rgba(0,0,0,0.4) 0px -1px 0px; +} + +#adminmenu li.wp-has-current-submenu .wp-submenu, +#adminmenu li.wp-has-current-submenu ul li a { + border-color: #aaa !important; +} + +#adminmenu li.wp-has-current-submenu ul li a { + background: url(../images/menu-dark.gif) bottom left no-repeat !important; +} + +#adminmenu li.wp-has-current-submenu ul { + border-bottom-color: #aaa; +} + +#adminmenu li.menu-top .current:hover { + border-color: #B5B5B5; +} + +#adminmenu .wp-submenu .current a.current { + background: transparent url(../images/menu-bits.gif) no-repeat scroll 0 -289px; +} + +#adminmenu .wp-submenu a:hover { + background-color: #EAF2FA !important; + color: #333 !important; +} + +#adminmenu .wp-submenu li.current, +#adminmenu .wp-submenu li.current a, +#adminmenu .wp-submenu li.current a:hover { + color: #333; + background-color: #f5f5f5; + background-image: none; + border-color: #e3e3e3; + text-shadow: rgba(255,255,255,1) 0px 1px 0px; +} + +#adminmenu .wp-submenu ul { + background-color: #fff; +} + +.folded #adminmenu li.menu-top, +#adminmenu .wp-submenu .wp-submenu-head { + background-color: #EAF2FA; +} + +.folded #adminmenu li.wp-has-current-submenu, +.folded #adminmenu li.menu-top.current { + background-color: #BBD8E7; +} + +#adminmenu .wp-has-current-submenu .wp-submenu .wp-submenu-head { + background-color: #BBD8E7; + border-color: #8CBDD5; +} + +#adminmenu div.wp-submenu { + background-color: transparent; +} + +/* menu icons */ +#adminmenu #menu-dashboard div.wp-menu-image { + background: transparent url("../images/menu-vs.png") no-repeat scroll -61px -33px; +} + +#adminmenu #menu-dashboard:hover div.wp-menu-image, +#adminmenu #menu-dashboard.wp-has-current-submenu div.wp-menu-image, +#adminmenu #menu-dashboard.current div.wp-menu-image { + background: transparent url("../images/menu-vs.png") no-repeat scroll -61px -1px; +} + +#adminmenu #menu-posts div.wp-menu-image { + background: transparent url("../images/menu-vs.png") no-repeat scroll -272px -33px; +} + +#adminmenu #menu-posts:hover div.wp-menu-image, +#adminmenu #menu-posts.wp-has-current-submenu div.wp-menu-image { + background: transparent url("../images/menu-vs.png") no-repeat scroll -272px -1px; +} + +#adminmenu #menu-media div.wp-menu-image { + background: transparent url("../images/menu-vs.png") no-repeat scroll -121px -33px; +} + +#adminmenu #menu-media:hover div.wp-menu-image, +#adminmenu #menu-media.wp-has-current-submenu div.wp-menu-image { + background: transparent url("../images/menu-vs.png") no-repeat scroll -121px -1px; +} + +#adminmenu #menu-links div.wp-menu-image { + background: transparent url("../images/menu-vs.png") no-repeat scroll -91px -33px; +} + +#adminmenu #menu-links:hover div.wp-menu-image, +#adminmenu #menu-links.wp-has-current-submenu div.wp-menu-image { + background: transparent url("../images/menu-vs.png") no-repeat scroll -91px -1px; +} + +#adminmenu #menu-pages div.wp-menu-image { + background: transparent url("../images/menu-vs.png") no-repeat scroll -151px -33px; +} + +#adminmenu #menu-pages:hover div.wp-menu-image, +#adminmenu #menu-pages.wp-has-current-submenu div.wp-menu-image { + background: transparent url("../images/menu-vs.png") no-repeat scroll -151px -1px; +} + +#adminmenu #menu-comments div.wp-menu-image { + background: transparent url("../images/menu-vs.png") no-repeat scroll -31px -33px; +} + +#adminmenu #menu-comments:hover div.wp-menu-image, +#adminmenu #menu-comments.wp-has-current-submenu div.wp-menu-image, +#adminmenu #menu-comments.current div.wp-menu-image { + background: transparent url("../images/menu-vs.png") no-repeat scroll -31px -1px; +} + +#adminmenu #menu-appearance div.wp-menu-image { + background: transparent url("../images/menu-vs.png") no-repeat scroll -1px -33px; +} + +#adminmenu #menu-appearance:hover div.wp-menu-image, +#adminmenu #menu-appearance.wp-has-current-submenu div.wp-menu-image { + background: transparent url("../images/menu-vs.png") no-repeat scroll -1px -1px; +} + +#adminmenu #menu-plugins div.wp-menu-image { + background: transparent url("../images/menu-vs.png") no-repeat scroll -181px -33px; +} + +#adminmenu #menu-plugins:hover div.wp-menu-image, +#adminmenu #menu-plugins.wp-has-current-submenu div.wp-menu-image { + background: transparent url("../images/menu-vs.png") no-repeat scroll -181px -1px; +} + +#adminmenu #menu-users div.wp-menu-image { + background: transparent url("../images/menu-vs.png") no-repeat scroll -301px -33px; +} + +#adminmenu #menu-users:hover div.wp-menu-image, +#adminmenu #menu-users.wp-has-current-submenu div.wp-menu-image { + background: transparent url("../images/menu-vs.png") no-repeat scroll -301px -1px; +} + +#adminmenu #menu-tools div.wp-menu-image { + background: transparent url("../images/menu-vs.png") no-repeat scroll -211px -33px; +} + +#adminmenu #menu-tools:hover div.wp-menu-image, +#adminmenu #menu-tools.wp-has-current-submenu div.wp-menu-image { + background: transparent url("../images/menu-vs.png") no-repeat scroll -211px -1px; +} + +#adminmenu #menu-settings div.wp-menu-image { + background: transparent url("../images/menu-vs.png") no-repeat scroll -241px -33px; +} + +#adminmenu #menu-settings:hover div.wp-menu-image, +#adminmenu #menu-settings.wp-has-current-submenu div.wp-menu-image { + background: transparent url("../images/menu-vs.png") no-repeat scroll -241px -1px; +} +/* end menu */ + + +/* Diff */ table.diff .diff-deletedline { background-color: #ffdddd; } @@ -728,3 +1234,344 @@ table.diff .diff-addedline { table.diff .diff-addedline ins { background-color: #99ff99; } + +#att-info { + background-color: #E4F2FD; +} + +/* edit image */ +#sidemenu a { + background-color: #f9f9f9; + border-color: #f9f9f9; + border-bottom-color: #dfdfdf; +} + +#sidemenu a.current { + background-color: #fff; + border-color: #dfdfdf #dfdfdf #fff; + color: #D54E21; +} + + +#screen-options-wrap, +#contextual-help-wrap { + background-color: #f1f1f1; + border-color: #dfdfdf; +} + +#screen-meta-links a.show-settings { + color: #606060; +} + +#screen-meta-links a.show-settings:hover { + color: #000; +} + +#replysubmit { + background-color: #f1f1f1; + border-top-color: #ddd; +} + +#replyerror { + border-color: #ddd; + background-color: #f9f9f9; +} + +#edithead, +#replyhead { + background-color: #f1f1f1; +} + +#ed_reply_toolbar { + background-color: #e9e9e9; +} + +/* table vim shortcuts */ +.vim-current { + background-color: #E4F2FD !important; +} + +/* Install Plugins */ +.star-average, +.star.star-rating { + background-color: #fc0; +} + +div.star.select:hover { + background-color: #d00; +} + +#plugin-information .fyi ul { + background-color: #eaf3fa; +} + +#plugin-information .fyi h2.mainheader { + background-color: #cee1ef; +} + +#plugin-information pre, +#plugin-information code { + background-color: #ededff; +} + +#plugin-information pre { + border: 1px solid #ccc; +} + +/* inline editor */ +.inline-edit-row fieldset input[type="text"], +.inline-edit-row fieldset textarea, +#bulk-titles, +#replyrow input { + border-color: #ddd; +} + +.inline-editor div.title { + background-color: #EAF3FA; +} + +.inline-editor ul.cat-checklist { + background-color: #FFFFFF; + border-color: #ddd; +} + +.inline-edit-row p.submit { + background-color: #f1f1f1; +} + +.inline-editor .categories .catshow, +.inline-editor .categories .cathide { + color: #21759b; +} + +.inline-editor .quick-edit-save { + background-color: #f1f1f1; +} + +#replyrow #ed_reply_toolbar input:hover { + border-color: #aaa; + background: #ddd; +} + +fieldset.inline-edit-col-right .inline-edit-col { + border-color: #dfdfdf; +} + +.attention { + color: #D54E21; +} + +.meta-box-sortables .postbox:hover .handlediv { + background: transparent url(../images/menu-bits.gif) no-repeat scroll left -111px; +} + +#major-publishing-actions { + background: #eaf2fa; +} + +.tablenav .tablenav-pages { + color: #555; +} + +.tablenav .tablenav-pages a { + border-color: #e3e3e3; + background: #eee url('../images/menu-bits.gif') repeat-x scroll left -379px; +} + +.tablenav .tablenav-pages a:hover { + color: #d54e21; + border-color: #d54321; +} + +.tablenav .tablenav-pages a:active { + color: #fff !important; +} + +.tablenav .tablenav-pages .current { + background: #dfdfdf; + border-color: #d3d3d3; +} + +#availablethemes, +#availablethemes td { + border-color: #ddd; +} + +#current-theme img { + border-color: #999; +} + +#TB_window #TB_title a.tb-theme-preview-link, +#TB_window #TB_title a.tb-theme-preview-link:visited { + color: #999; +} + +#TB_window #TB_title a.tb-theme-preview-link:hover, +#TB_window #TB_title a.tb-theme-preview-link:focus { + color: #ccc; +} + +.misc-pub-section { + border-bottom-color: #eee; +} + +#minor-publishing { + border-bottom-color: #ddd; +} + +#post-body .misc-pub-section { + border-right-color: #eee; +} + +.post-com-count span { + background-color: #bbb; +} + +.form-table .color-palette td { + border-color: #fff; +} + +.sortable-placeholder { + border-color: #bbb; + background-color: #f5f5f5; +} + +#post-body ul#category-tabs li.ui-tabs-selected a { + color: #333; +} + +#wp_editimgbtn, +#wp_delimgbtn, +#wp_editgallery, +#wp_delgallery { + border-color: #999; + background-color: #eee; +} + +#wp_editimgbtn:hover, +#wp_delimgbtn:hover, +#wp_editgallery:hover, +#wp_delgallery:hover { + border-color: #555; + background-color: #ccc; +} + +#favorite-first { + background: #797979 url(../images/fav.png) repeat-x 0 center; + border-color: #777 !important; + border-bottom-color: #666 !important; +} + +#favorite-inside { + border-color: #797979; + background-color: #797979; +} + +#favorite-toggle { + background: transparent url(../images/fav-arrow.gif) no-repeat 0 -4px; +} + +#favorite-actions a { + color: #ddd; +} + +#favorite-actions a:hover { + color: #fff; +} + +#favorite-inside a:hover { + text-decoration: underline; +} + +#favorite-actions .slide-down { + border-bottom-color: #626262; +} + +.submit input, +.button, +.button-primary, +.button-secondary, +.button-highlighted, +#postcustomstuff .submit input { + text-shadow: rgba(255,255,255,1) 0 1px 0; +} + +.button-primary, +.submit .button-primary { + text-shadow: rgba(0,0,0,0.3) 0 -1px 0; +} + +#screen-meta a.show-settings { + background-color: transparent; + text-shadow: rgba(255,255,255,0.7) 0 1px 0; +} + +#icon-edit, +#icon-post { + background: transparent url(../images/icons32-vs.png) no-repeat -552px -5px; +} + +#icon-index { + background: transparent url(../images/icons32-vs.png) no-repeat -137px -5px; +} + +#icon-upload { + background: transparent url(../images/icons32-vs.png) no-repeat -251px -5px; +} + +#icon-link-manager, +#icon-link, +#icon-link-category { + background: transparent url(../images/icons32-vs.png) no-repeat -190px -5px; +} + +#icon-edit-pages, +#icon-page { + background: transparent url(../images/icons32-vs.png) no-repeat -312px -5px; +} + +#icon-edit-comments { + background: transparent url(../images/icons32-vs.png) no-repeat -72px -5px; +} + +#icon-themes { + background: transparent url(../images/icons32-vs.png) no-repeat -11px -5px; +} + +#icon-plugins { + background: transparent url(../images/icons32-vs.png) no-repeat -370px -5px; +} + +#icon-users, +#icon-user-edit { + background: transparent url(../images/icons32-vs.png) no-repeat -600px -5px; +} + +#icon-tools, +#icon-admin { + background: transparent url(../images/icons32-vs.png) no-repeat -432px -5px; +} + +#icon-options-general { + background: transparent url(../images/icons32-vs.png) no-repeat -492px -5px; +} + +.view-switch #view-switch-list { + background: transparent url(../images/list-vs.png) no-repeat 0 0; +} + +.view-switch #view-switch-list.current { + background: transparent url(../images/list-vs.png) no-repeat -40px 0; +} + +.view-switch #view-switch-excerpt { + background: transparent url(../images/list-vs.png) no-repeat -20px 0; +} + +.view-switch #view-switch-excerpt.current { + background: transparent url(../images/list-vs.png) no-repeat -60px 0; +} + +#header-logo { + background: transparent url(../images/wp-logo.gif) no-repeat scroll center center; +} wp-admin/css/colors-classic.css @@ -2,23 +2,82 @@ border-right-color: transparent; border-left-color: #99d; } -.post-com-count { -} -#adminmenu li a #awaiting-mod, #sidemenu li a #update-plugins { - background-image: url(../images/comment-stalk-rtl.gif); - background-position:right bottom; -} -#footer { - background-position:99% 10px; -} + .plugins .togl { border-right-color: transparent; border-left-color: #ccc; } -#poststuff .closed .togbox, #poststuff .togbox { - background-image: url(../images/toggle-arrow-rtl.gif); + +.post-com-count { + background-image: url(../images/bubble_bg-rtl.gif); +} +.tablenav .tablenav-pages a { + background: #eee url('../images/menu-bits-rtl.gif') repeat-x scroll right -379px; } #upload-menu li.current { - border-right-color:transparent; + border-right-color: transparent; border-left-color: #448abd; } + +#adminmenu .wp-submenu .current a.current { + background: transparent url(../images/menu-bits-rtl.gif) no-repeat scroll right -289px; +} + +#adminmenu li.wp-menu-separator { + background: transparent url(../images/menu-arrows.gif) no-repeat scroll right -34px; +} + +.folded #adminmenu li.wp-menu-separator { + background: transparent url(../images/menu-arrows.gif) no-repeat scroll left 5px; +} + +#adminmenu li.wp-has-current-submenu .wp-menu-toggle, +#adminmenu li.wp-has-current-submenu:hover .wp-menu-toggle { + background: transparent url(../images/menu-bits-rtl.gif) repeat-x scroll right -207px; +} + +#adminmenu .wp-has-current-submenu ul li a.current { + background: url(../images/menu-dark-rtl.gif) top right no-repeat !important; +} + +#adminmenu li.wp-has-current-submenu a.wp-has-current-submenu, +#adminmenu .menu-top .current { + background: url(../images/menu-bits-rtl.gif) top right repeat-x; +} + +#adminmenu li.wp-has-current-submenu ul li a { + background: url(../images/menu-dark-rtl.gif) bottom right no-repeat !important; +} + +#adminmenu li.wp-has-current-submenu.wp-menu-open .wp-menu-toggle, #adminmenu li.wp-has-current-submenu:hover .wp-menu-toggle { + background: transparent url(../images/menu-bits-rtl.gif) no-repeat right -207px; +} + +#adminmenu .wp-has-submenu:hover .wp-menu-toggle, +#adminmenu .wp-menu-open .wp-menu-toggle { + background: transparent url(../images/menu-bits-rtl.gif) repeat-x scroll right -109px; +} + +#adminmenu a.wp-has-submenu { + background: #f1f1f1 url(../images/menu-bits-rtl.gif) repeat-x scroll right -379px; +} + +#adminmenu .wp-submenu a { + background: #FFFFFF url(../images/menu-bits-rtl.gif) no-repeat scroll right -310px; +} + +#adminmenu li.current a, +#adminmenu .wp-submenu a:hover { + background: transparent url(../images/menu-bits-rtl.gif) no-repeat scroll right -289px; +} + +#adminmenu li.wp-has-current-submenu a.wp-has-submenu { + background: #b5b5b5 url(../images/menu-bits-rtl.gif) repeat-x scroll right top; +} + +.meta-box-sortables .postbox:hover .handlediv { + background: transparent url(../images/menu-bits-rtl.gif) no-repeat scroll right -111px; +} +#favorite-toggle { + background: transparent url(../images/fav-arrow-rtl.gif) no-repeat right -4px; +} wp-admin/css/colors-fresh-rtl.css @@ -1,9 +1,27 @@ +html { + background-color: #f9f9f9; +} + +.find-box-search { + border-color: #dfdfdf; + background-color: #f1f1f1; +} + +.find-box { + background-color: #f1f1f1; +} + +.find-box-inside { + background-color: #fff; +} + a.page-numbers:hover { border-color: #999; } -body, .form-table .pre { - background-color: #fff; +body, +#wpbody, +.form-table .pre { color: #333; } @@ -11,10 +29,52 @@ body > #upload-menu { border-bottom-color: #fff; } -div#current-widgets, #postcustomstuff table, #your-profile fieldset, a.page-numbers, #rightnow, div.dashboard-widget, .widefat { +kbd, code { + background: #eaeaea; +} + +div#current-widgets, +#postcustomstuff table, +#your-profile fieldset, +#rightnow, +div.dashboard-widget, +#dashboard-widgets p.dashboard-widget-links, +#replyrow #ed_reply_toolbar input { border-color: #ccc; } +#poststuff .inside label.spam { + color: red; +} + +#poststuff .inside label.waiting { + color: orange; +} + +#poststuff .inside label.approved { + color: green; +} + +#postcustomstuff table { + border-color: #dfdfdf; + background-color: #F9F9F9; +} + +#postcustomstuff thead th { + background-color: #F1F1F1; +} + +#postcustomstuff table input, +#postcustomstuff table textarea { + border-color: #dfdfdf; + background-color: #fff; +} + +.widefat { + border-color: #dfdfdf; + background-color: #fff; +} + div.dashboard-widget-error { background-color: #c43; } @@ -23,26 +83,55 @@ div.dashboard-widget-notice { background-color: #cfe1ef; } -div.dashboard-widget-submit, ul.widget-control-list div.widget-control-actions { +div.dashboard-widget-submit, +ul.widget-control-list div.widget-control-actions { border-top-color: #ccc; } div.ui-tabs-panel { - border-color: #cee1ef; + border-color: #f1f1f1; } -input.disabled, textarea.disabled { - background-color: #ccc; +ul#category-tabs li.ui-tabs-selected { + background-color: #f1f1f1; } -#user_info a:hover, li.widget-list-control-item h4.widget-title a:hover, .submit a, #dashmenu a:hover, #footer a, #upload-menu li a.upload-tab-link, li.widget-list-control-item h4.widget-title a, +input.disabled, +textarea.disabled { + background-color: #ccc; +} +/* #upload-menu li a.upload-tab-link, */ +li.widget-list-control-item h4.widget-title a:hover, +li.widget-list-control-item h4.widget-title a, #dragHelper li.widget-list-control-item h4.widget-title a, -#draghelper li.widget-list-control-item h4.widget-title a:visited, .login #backtoblog a:hover { +#draghelper li.widget-list-control-item h4.widget-title a:visited, +.login #backtoblog a:hover, +#plugin-information .action-button a, +#plugin-information .action-button a:hover, +#plugin-information .action-button a:visited { color: #fff; } -li.widget-list-control-item, div.nav, .tablenav, .submitbox, h3.dashboard-widget-title, h3.dashboard-widget-title span, h3.dashboard-widget-title small, ul.view-switch li.current, .form-table tr, #poststuff h3, .login form, h3.info-box-title { - background-color: #eaf3fa; +li.widget-list-control-item div.widget-control { + background-color: #fff; + border-color: #dfdfdf; +} + +.metabox-holder .postbox h3, +#poststuff .postbox h3, +#poststuff .stuffbox h3 { + background: #dfdfdf url("../images/gray-grad.png") repeat-x left top; + text-shadow: #fff 0 1px 0; +} + +.form-table th, +.form-wrap label { + color: #222; + text-shadow: #fff 0 1px 0; +} + +.setting-description, .form-wrap p { + color: #666; } select { @@ -51,11 +140,7 @@ select { } strong .post-com-count span { - background-color: #2583ad; -} - -ul#category-tabs li.ui-tabs-selected, .button-secondary, #quicktags, #login form .submit input { - background-color: #cee1ef !important; + background-color: #21759b; } ul#widget-list li.widget-list-item h4.widget-title { @@ -67,10 +152,14 @@ ul#widget-list li.widget-list-item h4.widget-title { background-color: #ccf3fa; } -.ac_match, .subsubsub a.current, h2 { +.ac_match, .subsubsub a.current { color: #000; } +.wrap h2 { + color: #464646; +} + .ac_over { background-color: #f0f0b8; } @@ -84,13 +173,13 @@ ul#widget-list li.widget-list-item h4.widget-title { color: #101010; } -.alternate { +.alternate, .alt { background-color: #f9f9f9; } .available-theme a.screenshot { background-color: #f1f1f1; - border-color: #ccc; + border-color: #ddd; } .bar { @@ -98,8 +187,11 @@ ul#widget-list li.widget-list-item h4.widget-title { border-right-color: #99d; } -.describe { - border-top-color: #d0d0d0; +#media-upload { + background: #fff; +} +#media-upload .slidetoggle { + border-top-color: #dfdfdf; } .error, #login #login_error { @@ -119,12 +211,13 @@ ul#widget-list li.widget-list-item h4.widget-title { border-color: #c00 !important; } -.form-table input, .form-table textarea { - border-color: #c6d9e9; -} - -.form-table td, .form-table th { - border-bottom-color: #fff; +.form-table input, +.form-table textarea, +.search-input, +.form-field input, +.form-field textarea, +.submit { + border-color: #DFDFDF; } .highlight { @@ -132,27 +225,31 @@ ul#widget-list li.widget-list-item h4.widget-title { color: #d54e21; } -#user_info, .howto, .nonessential, #dashmenu a, #sidemenu, #edit-slug-box, .form-input-tip, #dashboard_primary span.rss-date, .subsubsub, #dashboard_secondary div.dashboard-widget-content ul li a cite { - color: #999; +.howto, +.nonessential, +#edit-slug-box, +.form-input-tip, +.rss-widget span.rss-date, +.subsubsub { + color: #666; } .media-item { - border-bottom-color: #d0d0d0; + border-bottom-color: #dfdfdf; } -.media-upload-form label.form-help, td.help { - color: #9a9a9a; +#wpbody-content #media-items .describe { + border-top-color: #dfdfdf; } -.page-numbers { - background-color: #fff; - border-color: #fff; +.describe input[type="text"], +.describe textarea { + border-color: #dfdfdf; } -.page-numbers.current { - background-color: #328ab2; - border-color: #328ab2; - color: #fff; +.media-upload-form label.form-help, +td.help { + color: #9a9a9a; } .post-com-count { @@ -182,37 +279,100 @@ ul#widget-list li.widget-list-item h4.widget-title { color: #666; } -.submit input, .button, .button-secondary, #login form .submit input, div.dashboard-widget-submit input, #edit-slug-buttons a.save { - background-color: #e5e5e5; - color: #246; - border-color: #80b5d0; +.button, +.button-secondary, +.submit input, +input[type=button], +input[type=submit] { + border-color: #bbb; + color: #464646; +} + +.button:hover, +.button-secondary:hover, +.submit input:hover, +input[type=button]:hover, +input[type=submit]:hover { + color: #000; + border-color: #666; +} + +.button, +.submit input, +.button-secondary { + background: #f2f2f2 url(../images/white-grad.png) repeat-x scroll left top; +} + +.button:active, +.submit input:active, +.button-secondary:active { + background: #eee url(../images/white-grad-active.png) repeat-x scroll left top; +} + +.button-primary, +.submit .button-primary, +#login form .submit input { + border-color: #298cba !important; + font-weight: bold; + color: #FFF !important; + background: #21759B url(../images/button-grad.png) repeat-x scroll left top; +} + +.button-primary:active, +#login form .submit input:active { + background: #21759b url(../images/button-grad-active.png) repeat-x scroll left top !important; } -.button[disabled], .button:disabled { - background-color: #999; +.button[disabled], +.button:disabled, +.button-secondary[disabled], +.button-secondary:disabled, +a.button.disabled { + color: #ccc !important; + border-color: #ccc; } -.submit input:hover, .button:hover, #edit-slug-buttons a.save:hover { - border-color: #535353; +.button-primary[disabled], +.button-primary:disabled { + color: #2fa0d5 !important; } -.submit input:hover, .button:hover, .button-secondary:hover, #wphead #viewsite a:hover, #adminmenu a:hover, #sidemenu a:hover, #submenu a.current, #submenu a:hover, .submitbox #previewview a:hover, #the-comment-list .comment a:hover, #rightnow a:hover, a:hover, .subsubsub a:hover, .subsubsub a.current:hover, #login form .submit input:hover, div.dashboard-widget-submit input:hover, #edit-slug-buttons a.save:hover, #media-upload a.delete:hover, #media-upload a.del-link:hover, .ui-tabs-nav a:hover { +a:active, +a:focus { color: #d54e21; } -.button-secondary:hover, #login form .submit input:hover { - border-color: #328ab2; +a:hover, +#wphead #viewsite a:hover, +#adminmenu a:hover, +#adminmenu ul.wp-submenu a:hover, +#the-comment-list .comment a:hover, +#rightnow a:hover, +.subsubsub a:hover, +.subsubsub a.current:hover, +#login form .submit input:hover, +div.dashboard-widget-submit input:hover, +#media-upload a.del-link:hover, +.ui-tabs-nav a:hover { + color: #d54e21; } -.submitbox #autosave .error, ul.view-switch li.current a { - color: #333; +#the-comment-list .comment-item, +#dashboard-widgets #dashboard_quick_press form p.submit { + border-color: #dfdfdf; } -.submitbox #previewview { - background-color: #2683ae; +.button-primary:hover, +#login form .submit input:hover { + border-color: #13455b !important; + color: #EAF2FA !important; +} + +#side-info-column #category-tabs .ui-tabs-selected a { + color: #333; } -.submitbox #previewview a, #rightnow .rbutton { +#rightnow .rbutton { background-color: #ebebeb; color: #264761; } @@ -222,8 +382,9 @@ ul#widget-list li.widget-list-item h4.widget-title { color: #ccc; } -.submitbox .submitdelete { - border-bottom-color: #999; +.submitbox .submitdelete, a.delete { + color: #f00; + border-bottom-color: #f00; } .submitbox .submitdelete:hover, @@ -233,78 +394,134 @@ ul#widget-list li.widget-list-item h4.widget-title { border-bottom-color: #f00; } +#normal-sortables .submitbox .submitdelete:hover { + color: #000; + background-color: #f00; + border-bottom-color: #f00; +} + .tablenav .dots { - background-color: #e4f2fd; - border-color: #e4f2fd; + border-color: transparent; } -.tablenav .next, .tablenav .prev{ - background-color: #e4f2fd; - border-bottom-color: #2583ad; - border-color: #e4f2fd; - color: #2583ad; +.tablenav .next, +.tablenav .prev { + border-color: transparent; + color: #21759b; } -.tablenav .next:hover, .tablenav .prev:hover { - border-bottom-color: #d54e21; - border-color: #e4f2fd; +.tablenav .next:hover, +.tablenav .prev:hover { + border-color: transparent; color: #d54e21; } -.updated, .login #login_error, .login .message { +.updated, +.login #login_error, +.login .message { background-color: #ffffe0; border-color: #e6db55; } -.updated a { - border-bottom-color: #2583ad; +a.page-numbers { + border-bottom-color: #B8D3E2; } -.widefat td, .widefat th, div#available-widgets-filter, ul#widget-list li.widget-list-item, .commentlist li { +div#available-widgets-filter, +ul#widget-list li.widget-list-item, +.commentlist li { border-bottom-color: #ccc; } -.widefat thead, .thead { - background-color: #464646; - color: #d7d7d7; +.widefat td, +.widefat th { + border-color: #dfdfdf; } -.widget-control-save, .widget-control-remove { - background-color: #cee1ef; - color: #246; +.widefat th { + text-shadow: rgba(255,255,255,0.8) 0 1px 0; } -.wrap h2 { - border-bottom-color: #dadada; - color: #666; +.widefat thead tr th, +.widefat tfoot tr th, +h3.dashboard-widget-title, +h3.dashboard-widget-title span, +h3.dashboard-widget-title small, +.find-box-head { + color: #333; + background: #dfdfdf url(../images/gray-grad.png) repeat-x scroll left top; } -#adminmenu a, #submenu a, #poststuff #edButtonPreview, #poststuff #edButtonHTML, #the-comment-list p.comment-author strong a, #media-upload a.del-link, #media-upload a.delete, .ui-tabs-nav a, a { - color: #2583ad; +h3.dashboard-widget-title small a { + color: #d7d7d7; +} + +h3.dashboard-widget-title small a:hover { + color: #fff; +} + +#adminmenu a, +#poststuff #edButtonPreview, +#poststuff #edButtonHTML, +#the-comment-list p.comment-author strong a, +#media-upload a.del-link, +#media-upload a.delete, +.ui-tabs-nav a, a { + color: #21759b; } /* Because we don't want visited on these links */ -#adminmenu a.current, #sidemenu a.current, body.press-this .ui-tabs-selected a, body.press-this .ui-tabs-selected a:hover { +body.press-this .ui-tabs-selected a, +body.press-this .ui-tabs-selected a:hover { background-color: #fff; border-color: #c6d9e9; border-bottom-color: #fff; color: #d54e21; } -#adminmenu li a #awaiting-mod, #sidemenu li a #update-plugins { - background-image: url(../images/comment-stalk-fresh.gif); +#adminmenu #awaiting-mod, +#adminmenu .update-plugins, +#sidemenu a .update-plugins, +#rightnow .reallynow, +#plugin-information .action-button { + background-color: #d54e21; + color: #fff; } -#adminmenu li a #awaiting-mod span, #sidemenu li a #update-plugins span, #rightnow .reallynow { - background-color: #d54e21; +#adminmenu li a:hover #awaiting-mod, +#adminmenu li a:hover .update-plugins, +#sidemenu li a:hover .update-plugins { + background-color: #264761; color: #fff; } -#adminmenu li a:hover #awaiting-mod span, #sidemenu li a:hover #update-plugins span { +#adminmenu li.current a #awaiting-mod, +#adminmenu li.current a .update-plugins, +#adminmenu li.wp-has-current-submenu a .update-plugins, +#adminmenu li.wp-has-current-submenu a .update-plugins { + background-color: #ddd; + color: #000; + text-shadow: none; + -moz-box-shadow: rgba(0,0,0,0.2) 0px -1px 0px; + -khtml-box-shadow: rgba(0,0,0,0.2) 0px -1px 0px; + -webkit-box-shadow: rgba(0,0,0,0.2) 0px -1px 0px; + box-shadow: rgba(0,0,0,0.2) 0px -1px 0px; +} + +#adminmenu li.current a:hover #awaiting-mod, +#adminmenu li.current a:hover .update-plugins, +#adminmenu li.wp-has-current-submenu a:hover #awaiting-mod, +#adminmenu li.wp-has-current-submenu a:hover .update-plugins { background-color: #264761; + color: #fff; } -#adminmenu, div#media-upload-header { +div#media-upload-header { + background-color: #f9f9f9; + border-bottom-color: #dfdfdf; +} + +div#plugin-information-header { background-color: #e4f2fd; border-bottom-color: #c6d9e9; } @@ -321,66 +538,78 @@ ul#widget-list li.widget-list-item h4.widget-title { background-color: #f9f9f9; } -input.readonly { +input.readonly, textarea.readonly { background-color: #ddd; } -#dashmenu a.current { - background-color: #e4f2fd; - color: #555; -} - -#dragHelper h4.widget-title, li.widget-list-control-item h4, #dragHelper li.widget-list-control-item h4 { +#dragHelper h4.widget-title, +li.widget-list-control-item h4, +#dragHelper li.widget-list-control-item h4 { background-color: #2683ae; color: #fff; } -#ed_toolbar input { - background: url( ../images/fade-butt.png ) #fff repeat-x 0 -2px; +#ed_toolbar input, +#ed_reply_toolbar input { + background: #fff url("../images/fade-butt.png") repeat-x 0 -2px; } #editable-post-name { background-color: #fffbcc; } -#edit-slug-box strong, .login #nav a { +#edit-slug-box strong, +.tablenav .displaying-num, +#submitted-on { color: #777; } -#footer { - background: url(../images/logo-ghost.png) #464646 no-repeat 20px 10px; +.login #nav a { + color: #21759b !important; +} + +.login #nav a:hover { + color: #d54e21 !important; +} + +#footer, +#footer-upgrade { + background: #464646; color: #999; } #media-items { - border-color: #c0c0c0; + border-color: #dfdfdf; } #pass-strength-result { - background-color: #e3e3e3; - border-color: #000; + background-color: #eee; + border-color: #ddd !important; } #pass-strength-result.bad { - background-color: #ffeff7; - border-color: #c69; + background-color: #ffb78c; + border-color: #ff853c !important; } #pass-strength-result.good { - background-color: #effff4; - border-color: #66cc87; + background-color: #ffec8b; + border-color: #fc0 !important; } #pass-strength-result.short { - background-color: #e3e3e3; + background-color: #ffa0a0; + border-color: #f04040 !important; } #pass-strength-result.strong { - background-color: #59ef86; - border-color: #319f52; + background-color: #c3ff88; + border-color: #8dff1c !important; } -.checkbox, .side-info, #your-profile #rich_editing { +.checkbox, +.side-info, +#your-profile #rich_editing { background-color: #fff; } @@ -396,29 +625,49 @@ input.readonly { background-color: #ffffe0; } +#the-comment-list .approve a { + color: #006505; +} + +#the-comment-list .unapprove a { + color: #d98500; +} + +#the-comment-list .delete a { + color: #bc0b0b; +} + .plugins tr { background-color: #fff; } -#poststuff #editor-toolbar .active { - background-color: #cee1ef; - color: #333; +.metabox-holder .postbox, +#poststuff .postbox, +#titlediv, +#poststuff .postarea, +#poststuff .stuffbox, +.postbox input[type="text"], +.postbox textarea, +.stuffbox input[type="text"], +.stuffbox textarea { + border-color: #dfdfdf; } -#poststuff .closed .togbox { - background-color: #2583ad; - background-image: url(../images/toggle-arrow.gif); +.metabox-holder .postbox, +#poststuff .postbox { + background-color: #FFF; } -#poststuff .postbox, #titlediv, #poststuff .postarea, #poststuff .stuffbox { - border-color: #ebebeb; - border-right-color: #ccc; - border-bottom-color: #ccc; +.ui-sortable .postbox h3 { + color: #464646; } -#poststuff .togbox { - background-color: #b2b2b2; - background-image: url(../images/toggle-arrow.gif); +.ui-sortable .postbox h3:hover { + color: #000; +} + +.curtime #timestamp { + background-image: url(../images/date-button.gif); } #quicktags #ed_link { @@ -433,25 +682,16 @@ input.readonly { color: #448abd; } -#sidemenu a { - background-color: #e4f2fd; - border-bottom-color: #c6d9e9; - border-top-color: #e4f2fd; -} - -#tagchecklist span a { +#tagchecklist span a, +#bulk-titles div a { background: url(../images/xit.gif) no-repeat; } -#tagchecklist span a:hover { +#tagchecklist span a:hover, +#bulk-titles div a:hover { background: url(../images/xit.gif) no-repeat -10px 0; } -#the-comment-list .comment a { - border-bottom-color: #ababab; - color: #666; -} - #update-nag, .plugin-update { background-color: #fffeeb; border-bottom-color: #ccc; @@ -459,163 +699,185 @@ input.readonly { color: #555; } -#upload-files a.file-link { - background-color: #d1e2ef; +.login #backtoblog a { + color: #ccc; } -#upload-file-view a img { - border-bottom-color: #69c; +#wphead { + background-color: #464646; } -#upload-menu li #current-tab-nav, #upload-file { - background-color: #f9fcfe; +body.login { + border-top-color: #464646; } -#upload-menu li span a.page-numbers { - color: #00019b; +#wphead h1 a { + color: #fff; } -#upload-menu li.current { - border-right-color: #448abd; - color: #000; +#login form input { + color: #555; } -#upload-menu li.current a.upload-tab-link, #upload-menu li a:hover { - background-color: #f9fcfe; - color: #000; +#wphead h1 a:hover { + text-decoration: underline; } -#upload-menu, #upload-menu li { - border-top-color: #247fab; +#user_info { + color: #999; } -.login #backtoblog a, .curtime, #user_info a { +#user_info a:link, #user_info a:visited, #footer a:link, #footer a:visited { color: #ccc; + text-decoration: none; } -#wphead { - background-color: #e4f2fd; +#user_info a:hover, #footer a:hover { + color: #fff; + text-decoration: underline !important; } -#wphead, body.login { - border-top-color: #464646; +#user_info a:active, #footer a:active { + color: #ccc !important; } -#wphead #viewsite a { - background-color: #c6d9e9; - color: #246; - border-color: #80b5d0; +div#media-upload-error, +.file-error, +abbr.required, +.widget-control-remove:hover, +.delete a:hover { + color: #f00; } -#wphead #viewsite a:hover { - border-color: #328ab2; +#media-upload a.delete { + color: #888; } -#wphead h1, #dashmenu a.current:hover, #login form input { - color: #555; +/* editors */ +#quicktags { + border-color: #dfdfdf; + background-color: #dfdfdf; } -div#media-upload-error, .file-error, abbr.required, .widget-control-remove:hover, .delete:hover { - color: #f00; +#ed_toolbar input { + border-color: #C3C3C3; } -#media-upload a.delete { - color: #888; +#ed_toolbar input:hover { + border-color: #aaa; + background: #ddd; +} + +#poststuff .wp_themeSkin .mceStatusbar { + border-color: #EDEDED; +} + +#poststuff #edButtonPreview, +#poststuff #edButtonHTML { + background-color: #f1f1f1; + border-color: #dfdfdf; + color: #999; +} + +#poststuff #editor-toolbar .active { + border-bottom-color: #e9e9e9; + background-color: #e9e9e9; + color: #333; } /* TinyMCE */ +#post-status-info { + background-color: #EDEDED; +} + .wp_themeSkin *, -.wp_themeSkin a:hover, -.wp_themeSkin a:link, -.wp_themeSkin a:visited, +.wp_themeSkin a:hover, +.wp_themeSkin a:link, +.wp_themeSkin a:visited, .wp_themeSkin a:active { color: #000; } /* Containers */ -.wp_themeSkin table, #wp_editbtns { - background: #cee1ef; -} - .wp_themeSkin iframe { background: #fff; } /* Layout */ .wp_themeSkin .mceStatusbar { - color:#000; - background-color: #eaf3fa; + color: #000; + background-color: #f5f5f5; } /* Button */ -.wp_themeSkin .mceButton { +.wp_themeSkin .mceButton { background-color: #e9e8e8; - border-color: #abc0fb; + border-color: #B2B2B2; } .wp_themeSkin a.mceButtonEnabled:hover, -.wp_themeSkin a.mceButtonActive, +.wp_themeSkin a.mceButtonActive, .wp_themeSkin a.mceButtonSelected { - background-color: #d6d8da; - border-color: #7789ba !important; + background-color: #d5d5d5; + border-color: #777 !important; } .wp_themeSkin .mceButtonDisabled { - border-color: #bdd !important; + border-color: #ccc !important; } /* ListBox */ .wp_themeSkin .mceListBox .mceText, .wp_themeSkin .mceListBox .mceOpen { - border-color: #abc0fb; - background-color: #e9e8e8; + border-color: #B2B2B2; + background-color: #d5d5d5; } -.wp_themeSkin table.mceListBoxEnabled:hover .mceOpen, +.wp_themeSkin table.mceListBoxEnabled:hover .mceOpen, .wp_themeSkin .mceListBoxHover .mceOpen, .wp_themeSkin .mceListBoxSelected .mceOpen, .wp_themeSkin .mceListBoxSelected .mceText { - border-color: #7789ba !important; - background-color: #d6d8da; + border-color: #777 !important; + background-color: #d5d5d5; } -.wp_themeSkin table.mceListBoxEnabled:hover .mceText, +.wp_themeSkin table.mceListBoxEnabled:hover .mceText, .wp_themeSkin .mceListBoxHover .mceText { - border-color: #7789ba !important; + border-color: #777 !important; } .wp_themeSkin select.mceListBox { - border-color: #b3c7e1; + border-color: #B2B2B2; background-color: #fff; } /* SplitButton */ -.wp_themeSkin .mceSplitButton a.mceAction, +.wp_themeSkin .mceSplitButton a.mceAction, .wp_themeSkin .mceSplitButton a.mceOpen { - background-color: #e9e8e8; - border-color: #abc0fb; + background-color: #e8e8e8; + border-color: #B2B2B2; } .wp_themeSkin .mceSplitButton a.mceOpen:hover, .wp_themeSkin .mceSplitButtonSelected a.mceOpen, .wp_themeSkin table.mceSplitButtonEnabled:hover a.mceAction, .wp_themeSkin .mceSplitButton a.mceAction:hover { - background-color: #d6d8da; - border-color: #7789ba !important; -} + background-color: #d5d5d5; + border-color: #777 !important; +} .wp_themeSkin .mceSplitButtonActive { - background-color: #d6d8da; + background-color: #B2B2B2; } /* ColorSplitButton */ .wp_themeSkin div.mceColorSplitMenu table { - background-color: #ebeaeb; - border-color: #808080; + background-color: #ebebeb; + border-color: #B2B2B2; } .wp_themeSkin .mceColorSplitMenu a { - border-color: #808080; + border-color: #B2B2B2; } .wp_themeSkin .mceColorSplitMenu a.mceMoreColors { @@ -641,18 +903,18 @@ div#media-upload-error, .file-error, abbr.required, .widget-control-remove:hover } .wp_themeSkin .mceMenu .mceText { - color: #000; + color: #000; } .wp_themeSkin .mceMenu .mceMenuItemEnabled a:hover, .wp_themeSkin .mceMenu .mceMenuItemActive { - background-color: #CEE1EF; + background-color: #f5f5f5; } .wp_themeSkin td.mceMenuItemSeparator { background-color: #aaa; } .wp_themeSkin .mceMenuItemTitle a { - background-color: #ccc; + background-color: #ccc; border-bottom-color: #aaa; } .wp_themeSkin .mceMenuItemTitle span.mceText { @@ -662,27 +924,80 @@ div#media-upload-error, .file-error, abbr.required, .widget-control-remove:hover color: #888; } -/* pop-up */ -.clearlooks2 .mceTop .mceLeft, .clearlooks2 .mceTop .mceRight { - background-color: #cee1ef; - border-color: #c6d9e9; +.wp_themeSkin tr.mceFirst td.mceToolbar { + background-color: #dfdfdf; + border-color: #dfdfdf; } -.clearlooks2 .mceFocus .mceTop .mceLeft, .clearlooks2 .mceFocus .mceTop .mceRight { - background-color: #2683ae; - border-color: #464646; +.wp-admin #mceModalBlocker { + background: #000; } -#editorcontainer { - border-color: #ccc; +.wp-admin .clearlooks2 .mceFocus .mceTop .mceLeft { + background: #444444; + border-left: 1px solid #999; + border-top: 1px solid #999; + -moz-border-radius: 4px 0 0 0; + -webkit-border-top-left-radius: 4px; + -khtml-border-top-left-radius: 4px; + border-top-left-radius: 4px; } -#poststuff #titlewrap { - border-color: #ccc; +.wp-admin .clearlooks2 .mceFocus .mceTop .mceRight { + background: #444444; + border-right: 1px solid #999; + border-top: 1px solid #999; + border-top-right-radius: 4px; + -khtml-border-top-right-radius: 4px; + -webkit-border-top-right-radius: 4px; + -moz-border-radius: 0 4px 0 0; } -.curtime { - color: #666; +.wp-admin .clearlooks2 .mceMiddle .mceLeft { + background: #f1f1f1; + border-left: 1px solid #999; +} + +.wp-admin .clearlooks2 .mceMiddle .mceRight { + background: #f1f1f1; + border-right: 1px solid #999; +} + +.wp-admin .clearlooks2 .mceBottom { + background: #f1f1f1; + border-bottom: 1px solid #999; +} + +.wp-admin .clearlooks2 .mceBottom .mceLeft { + background: #f1f1f1; + border-bottom: 1px solid #999; + border-left: 1px solid #999; +} + +.wp-admin .clearlooks2 .mceBottom .mceCenter { + background: #f1f1f1; + border-bottom: 1px solid #999; +} + +.wp-admin .clearlooks2 .mceBottom .mceRight { + background: #f1f1f1; + border-bottom: 1px solid #999; + border-right: 1px solid #999; +} + +.wp-admin .clearlooks2 .mceFocus .mceTop span { + color: #e5e5e5; +} +/* end TinyMCE */ + +#editorcontainer, +#post-status-info, +#titlediv #title { + border-color: #dfdfdf; +} + +#titlediv #title { + background-color: #fff; } #tTips p#tTips_inside { @@ -690,8 +1005,223 @@ div#media-upload-error, .file-error, abbr.required, .widget-control-remove:hover color: #333; } -/* Diff */ +#timestampdiv input, +#namediv input, +#tagsdiv #the-tagcloud { + border-color: #ddd; +} + +/* menu */ +#adminmenu * { + border-color: #e3e3e3; +} + +#adminmenu li.wp-menu-separator { + background: transparent url(../images/menu-arrows.gif) no-repeat scroll left 5px; +} + +.folded #adminmenu li.wp-menu-separator { + background: transparent url(../images/menu-arrows.gif) no-repeat scroll right -34px; +} + +#adminmenu li.wp-has-current-submenu.wp-menu-open .wp-menu-toggle, +#adminmenu li.wp-has-current-submenu:hover .wp-menu-toggle { + background: transparent url(../images/menu-bits.gif) no-repeat scroll left -207px; +} + +#adminmenu .wp-has-submenu:hover .wp-menu-toggle, +#adminmenu .wp-menu-open .wp-menu-toggle { + background: transparent url(../images/menu-bits.gif) no-repeat scroll left -109px; +} + +#adminmenu a.menu-top { + background: #f1f1f1 url(../images/menu-bits.gif) repeat-x scroll left -379px; +} + +#adminmenu .wp-submenu a { + background: #FFFFFF url(../images/menu-bits.gif) no-repeat scroll 0 -310px; +} + +#adminmenu .wp-has-current-submenu ul li a { + background: none; +} +#adminmenu .wp-has-current-submenu ul li a.current { + background: url(../images/menu-dark.gif) top left no-repeat !important; +} + +#adminmenu li.wp-has-current-submenu a.wp-has-current-submenu, +#adminmenu .menu-top .current { + background: #6d6d6d url(../images/menu-bits.gif) top left repeat-x; + border-color: #6d6d6d; + color: #fff; + text-shadow: rgba(0,0,0,0.4) 0px -1px 0px; +} + +#adminmenu li.wp-has-current-submenu .wp-submenu, +#adminmenu li.wp-has-current-submenu ul li a { + border-color: #aaa !important; +} + +#adminmenu li.wp-has-current-submenu ul li a { + background: url(../images/menu-dark.gif) bottom left no-repeat !important; +} + +#adminmenu li.wp-has-current-submenu ul { + border-bottom-color: #aaa; +} + +#adminmenu li.menu-top .current:hover { + border-color: #B5B5B5; +} + +#adminmenu .wp-submenu .current a.current { + background: transparent url(../images/menu-bits.gif) no-repeat scroll 0 -289px; +} + +#adminmenu .wp-submenu a:hover { + background-color: #EAF2FA !important; + color: #333 !important; +} + +#adminmenu .wp-submenu li.current, +#adminmenu .wp-submenu li.current a, +#adminmenu .wp-submenu li.current a:hover { + color: #333; + background-color: #f5f5f5; + background-image: none; + border-color: #e3e3e3; + text-shadow: rgba(255,255,255,1) 0px 1px 0px; +} + +#adminmenu .wp-submenu ul { + background-color: #fff; +} + +.folded #adminmenu li.menu-top, +#adminmenu .wp-submenu .wp-submenu-head { + background-color: #F1F1F1; +} + +.folded #adminmenu li.wp-has-current-submenu, +.folded #adminmenu li.menu-top.current { + background-color: #e6e6e6; +} + +#adminmenu .wp-has-current-submenu .wp-submenu .wp-submenu-head { + background-color: #EAEAEA; + border-color: #aaa; +} + +#adminmenu div.wp-submenu { + background-color: transparent; +} + +/* menu icons */ +#adminmenu #menu-dashboard div.wp-menu-image { + background: transparent url("../images/menu.png") no-repeat scroll -61px -33px; +} + +#adminmenu #menu-dashboard:hover div.wp-menu-image, +#adminmenu #menu-dashboard.wp-has-current-submenu div.wp-menu-image, +#adminmenu #menu-dashboard.current div.wp-menu-image { + background: transparent url("../images/menu.png") no-repeat scroll -61px -1px; +} + +#adminmenu #menu-posts div.wp-menu-image { + background: transparent url("../images/menu.png") no-repeat scroll -272px -33px; +} + +#adminmenu #menu-posts:hover div.wp-menu-image, +#adminmenu #menu-posts.wp-has-current-submenu div.wp-menu-image { + background: transparent url("../images/menu.png") no-repeat scroll -272px -1px; +} + +#adminmenu #menu-media div.wp-menu-image { + background: transparent url("../images/menu.png") no-repeat scroll -121px -33px; +} + +#adminmenu #menu-media:hover div.wp-menu-image, +#adminmenu #menu-media.wp-has-current-submenu div.wp-menu-image { + background: transparent url("../images/menu.png") no-repeat scroll -121px -1px; +} + +#adminmenu #menu-links div.wp-menu-image { + background: transparent url("../images/menu.png") no-repeat scroll -91px -33px; +} + +#adminmenu #menu-links:hover div.wp-menu-image, +#adminmenu #menu-links.wp-has-current-submenu div.wp-menu-image { + background: transparent url("../images/menu.png") no-repeat scroll -91px -1px; +} + +#adminmenu #menu-pages div.wp-menu-image { + background: transparent url("../images/menu.png") no-repeat scroll -151px -33px; +} + +#adminmenu #menu-pages:hover div.wp-menu-image, +#adminmenu #menu-pages.wp-has-current-submenu div.wp-menu-image { + background: transparent url("../images/menu.png") no-repeat scroll -151px -1px; +} + +#adminmenu #menu-comments div.wp-menu-image { + background: transparent url("../images/menu.png") no-repeat scroll -31px -33px; +} + +#adminmenu #menu-comments:hover div.wp-menu-image, +#adminmenu #menu-comments.wp-has-current-submenu div.wp-menu-image, +#adminmenu #menu-comments.current div.wp-menu-image { + background: transparent url("../images/menu.png") no-repeat scroll -31px -1px; +} + +#adminmenu #menu-appearance div.wp-menu-image { + background: transparent url("../images/menu.png") no-repeat scroll -1px -33px; +} + +#adminmenu #menu-appearance:hover div.wp-menu-image, +#adminmenu #menu-appearance.wp-has-current-submenu div.wp-menu-image { + background: transparent url("../images/menu.png") no-repeat scroll -1px -1px; +} + +#adminmenu #menu-plugins div.wp-menu-image { + background: transparent url("../images/menu.png") no-repeat scroll -181px -33px; +} + +#adminmenu #menu-plugins:hover div.wp-menu-image, +#adminmenu #menu-plugins.wp-has-current-submenu div.wp-menu-image { + background: transparent url("../images/menu.png") no-repeat scroll -181px -1px; +} + +#adminmenu #menu-users div.wp-menu-image { + background: transparent url("../images/menu.png") no-repeat scroll -301px -33px; +} + +#adminmenu #menu-users:hover div.wp-menu-image, +#adminmenu #menu-users.wp-has-current-submenu div.wp-menu-image { + background: transparent url("../images/menu.png") no-repeat scroll -301px -1px; +} + +#adminmenu #menu-tools div.wp-menu-image { + background: transparent url("../images/menu.png") no-repeat scroll -211px -33px; +} + +#adminmenu #menu-tools:hover div.wp-menu-image, +#adminmenu #menu-tools.wp-has-current-submenu div.wp-menu-image { + background: transparent url("../images/menu.png") no-repeat scroll -211px -1px; +} + +#adminmenu #menu-settings div.wp-menu-image { + background: transparent url("../images/menu.png") no-repeat scroll -241px -33px; +} + +#adminmenu #menu-settings:hover div.wp-menu-image, +#adminmenu #menu-settings.wp-has-current-submenu div.wp-menu-image { + background: transparent url("../images/menu.png") no-repeat scroll -241px -1px; +} +/* end menu */ + + +/* Diff */ table.diff .diff-deletedline { background-color: #ffdddd; } @@ -704,3 +1234,344 @@ table.diff .diff-addedline { table.diff .diff-addedline ins { background-color: #99ff99; } + +#att-info { + background-color: #E4F2FD; +} + +/* edit image */ +#sidemenu a { + background-color: #f9f9f9; + border-color: #f9f9f9; + border-bottom-color: #dfdfdf; +} + +#sidemenu a.current { + background-color: #fff; + border-color: #dfdfdf #dfdfdf #fff; + color: #D54E21; +} + + +#screen-options-wrap, +#contextual-help-wrap { + background-color: #f1f1f1; + border-color: #dfdfdf; +} + +#screen-meta-links a.show-settings { + color: #606060; +} + +#screen-meta-links a.show-settings:hover { + color: #000; +} + +#replysubmit { + background-color: #f1f1f1; + border-top-color: #ddd; +} + +#replyerror { + border-color: #ddd; + background-color: #f9f9f9; +} + +#edithead, +#replyhead { + background-color: #f1f1f1; +} + +#ed_reply_toolbar { + background-color: #e9e9e9; +} + +/* table vim shortcuts */ +.vim-current { + background-color: #E4F2FD !important; +} + +/* Install Plugins */ +.star-average, +.star.star-rating { + background-color: #fc0; +} + +div.star.select:hover { + background-color: #d00; +} + +#plugin-information .fyi ul { + background-color: #eaf3fa; +} + +#plugin-information .fyi h2.mainheader { + background-color: #cee1ef; +} + +#plugin-information pre, +#plugin-information code { + background-color: #ededff; +} + +#plugin-information pre { + border: 1px solid #ccc; +} + +/* inline editor */ +.inline-edit-row fieldset input[type="text"], +.inline-edit-row fieldset textarea, +#bulk-titles, +#replyrow input { + border-color: #ddd; +} + +.inline-editor div.title { + background-color: #EAF3FA; +} + +.inline-editor ul.cat-checklist { + background-color: #FFFFFF; + border-color: #ddd; +} + +.inline-edit-row p.submit { + background-color: #f1f1f1; +} + +.inline-editor .categories .catshow, +.inline-editor .categories .cathide { + color: #21759b; +} + +.inline-editor .quick-edit-save { + background-color: #f1f1f1; +} + +#replyrow #ed_reply_toolbar input:hover { + border-color: #aaa; + background: #ddd; +} + +fieldset.inline-edit-col-right .inline-edit-col { + border-color: #dfdfdf; +} + +.attention { + color: #D54E21; +} + +.meta-box-sortables .postbox:hover .handlediv { + background: transparent url(../images/menu-bits.gif) no-repeat scroll left -111px; +} + +#major-publishing-actions { + background: #eaf2fa; +} + +.tablenav .tablenav-pages { + color: #555; +} + +.tablenav .tablenav-pages a { + border-color: #e3e3e3; + background: #eee url('../images/menu-bits.gif') repeat-x scroll left -379px; +} + +.tablenav .tablenav-pages a:hover { + color: #d54e21; + border-color: #d54321; +} + +.tablenav .tablenav-pages a:active { + color: #fff !important; +} + +.tablenav .tablenav-pages .current { + background: #dfdfdf; + border-color: #d3d3d3; +} + +#availablethemes, +#availablethemes td { + border-color: #ddd; +} + +#current-theme img { + border-color: #999; +} + +#TB_window #TB_title a.tb-theme-preview-link, +#TB_window #TB_title a.tb-theme-preview-link:visited { + color: #999; +} + +#TB_window #TB_title a.tb-theme-preview-link:hover, +#TB_window #TB_title a.tb-theme-preview-link:focus { + color: #ccc; +} + +.misc-pub-section { + border-bottom-color: #eee; +} + +#minor-publishing { + border-bottom-color: #ddd; +} + +#post-body .misc-pub-section { + border-right-color: #eee; +} + +.post-com-count span { + background-color: #bbb; +} + +.form-table .color-palette td { + border-color: #fff; +} + +.sortable-placeholder { + border-color: #bbb; + background-color: #f5f5f5; +} + +#post-body ul#category-tabs li.ui-tabs-selected a { + color: #333; +} + +#wp_editimgbtn, +#wp_delimgbtn, +#wp_editgallery, +#wp_delgallery { + border-color: #999; + background-color: #eee; +} + +#wp_editimgbtn:hover, +#wp_delimgbtn:hover, +#wp_editgallery:hover, +#wp_delgallery:hover { + border-color: #555; + background-color: #ccc; +} + +#favorite-first { + background: #797979 url(../images/fav.png) repeat-x left center; + border-color: #777 !important; + border-bottom-color: #666 !important; +} + +#favorite-inside { + border-color: #797979; + background-color: #797979; +} + +#favorite-toggle { + background: transparent url(../images/fav-arrow.gif) no-repeat 0 -4px; +} + +#favorite-actions a { + color: #ddd; +} + +#favorite-actions a:hover { + color: #fff; +} + +#favorite-inside a:hover { + text-decoration: underline; +} + +#favorite-actions .slide-down { + border-bottom-color: #626262; +} + +.submit input, +.button, +.button-primary, +.button-secondary, +.button-highlighted, +#postcustomstuff .submit input { + text-shadow: rgba(255,255,255,1) 0 1px 0; +} + +.button-primary, +.submit .button-primary { + text-shadow: rgba(0,0,0,0.3) 0 -1px 0; +} + +#screen-meta a.show-settings { + background-color: transparent; + text-shadow: rgba(255,255,255,0.7) 0 1px 0; +} + +#icon-edit, +#icon-post { + background: transparent url(../images/icons32.png) no-repeat -552px -5px; +} + +#icon-index { + background: transparent url(../images/icons32.png) no-repeat -137px -5px; +} + +#icon-upload { + background: transparent url(../images/icons32.png) no-repeat -251px -5px; +} + +#icon-link-manager, +#icon-link, +#icon-link-category { + background: transparent url(../images/icons32.png) no-repeat -190px -5px; +} + +#icon-edit-pages, +#icon-page { + background: transparent url(../images/icons32.png) no-repeat -312px -5px; +} + +#icon-edit-comments { + background: transparent url(../images/icons32.png) no-repeat -72px -5px; +} + +#icon-themes { + background: transparent url(../images/icons32.png) no-repeat -11px -5px; +} + +#icon-plugins { + background: transparent url(../images/icons32.png) no-repeat -370px -5px; +} + +#icon-users, +#icon-user-edit { + background: transparent url(../images/icons32.png) no-repeat -600px -5px; +} + +#icon-tools, +#icon-admin { + background: transparent url(../images/icons32.png) no-repeat -432px -5px; +} + +#icon-options-general { + background: transparent url(../images/icons32.png) no-repeat -492px -5px; +} + +.view-switch #view-switch-list { + background: transparent url(../images/list.png) no-repeat 0 0; +} + +.view-switch #view-switch-list.current { + background: transparent url(../images/list.png) no-repeat -40px 0; +} + +.view-switch #view-switch-excerpt { + background: transparent url(../images/list.png) no-repeat -20px 0; +} + +.view-switch #view-switch-excerpt.current { + background: transparent url(../images/list.png) no-repeat -60px 0; +} + +#header-logo { + background: transparent url(../images/wp-logo.gif) no-repeat scroll center center; +} wp-admin/css/colors-fresh.css @@ -1,62 +1,93 @@ -/* Right Now */ -#rightnow { - margin-right:0; - margin-left: 7px; +#dashboard-widgets-wrap .has-sidebar { + margin-right: 0; + margin-left: -51%; } -#rightnow .reallynow span { - text-align: right; - float: right; +#dashboard-widgets-wrap .has-sidebar .has-sidebar-content { + margin-right: 0; + margin-left: 51%; +} +.view-all { + right: auto; + left: 0; } -#rightnow .reallynow a { +#dashboard_right_now p.sub, #dashboard-widgets h4, #dashboard_quick_press h4, a.rsswidget, #dashboard_plugins h4, #dashboard_plugins h5, #dashboard_recent_comments .comment-meta .approve { + font-family: Tahoma, Arial; +} +#dashboard_right_now td.b { + padding-right: 0; + padding-left: 6px; text-align: left; + font-family: Tahoma, Arial; +} +#dashboard_right_now .t { + padding-right: 0; + padding-left: 12px; +} +#dashboard_right_now .versions a { + font-family: Tahoma, Arial; +} +#dashboard_right_now a.button { float: left; - margin: 1px 0 0 6px; + clear: left; } -/* Widgets */ -div#dashboard-widgets-wrap { - margin-right:0; - margin-left:-13px; +#dashboard-widgets h3 .postbox-title-action { + right: auto; + left: 30px; } -div.dashboard-widget-holder { - float:right; +#the-comment-list .pingback { + padding-left: 0 !important; + padding-right: 9px !important; } -div.dashboard-widget { - margin-right:0; - margin-left: 20px; +/* Recent Comments */ +#the-comment-list .comment-item { + padding: 1em 70px 1em 10px; } -h3.dashboard-widget-title span { - text-align: right; +#the-comment-list .comment-item .avatar { float: right; + margin-left: 0; + margin-right: -60px; } -h3.dashboard-widget-title small { +/* Feeds */ +.rss-widget cite { text-align: left; - float:left; -} -div.dashboard-widget-submit input { - font-family: Tahoma; } -div.dashboard-widget-content ul, div.dashboard-widget-content ol, div.dashboard-widget-content dl { - padding-left:0; - padding-right:15px; +.rss-widget span.rss-date { + font-family: Tahoma, Arial; + margin-left: 0; + margin-right: 3px; } -#dashboard_secondary div.dashboard-widget-content ul li { - float:right; +/* QuickPress */ +#dashboard_quick_press h4 { + float: right; + text-align: left; } -#dashboard_secondary div.dashboard-widget-content ul li .post { - font-family:arial; +#dashboard_quick_press h4 label { + margin-right: 0; + margin-left: 10px; } -#dashboard_secondary div.dashboard-widget-content ul li a { - border-right:0 none; - border-left: 1px solid #dadada; - height:110px; +#dashboard_quick_press .input-text-wrap, #dashboard_quick_press .textarea-wrap { + margin: 0 5em 1em 0; } -#dashboard_secondary div.dashboard-widget-content ul li a cite { - font-family: Tahoma; +#dashboard_quick_press #media-buttons { + margin: 0 5em .5em 0; + padding: 0 10px 0 0; } -#dashboard-widgets .widget_rss ul li span.rss-date { - float:right; +#dashboard-widgets #dashboard_quick_press form p.submit { + margin-left: 0; + margin-right: 4.6em; } -#dashboard-widgets .widget_rss ul li a { +#dashboard-widgets #dashboard_quick_press form p.submit input { float: right; - margin: 0 0 .2em .5em; +} +#dashboard-widgets #dashboard_quick_press form p.submit #save-post { + margin: 0 10px 0 1em; +} +#dashboard-widgets #dashboard_quick_press form p.submit #publish { + float: left; +} +/* Recent Drafts */ +#dashboard_recent_drafts h4 abbr { + font-family: Tahoma, Arial; + margin-left:0; + margin-right: 3px; } wp-admin/css/dashboard-rtl.css @@ -1,282 +1,396 @@ -/* Right Now */ +.postbox p, .postbox ul, .postbox ol, .postbox blockquote, #wp-version-message { font-size: 11px; } + +.edit-box { + display: none; +} + +h3:hover .edit-box { + display: inline; +} -#rightnow { +form .input-text-wrap { + border-style: solid; border-width: 1px; + padding: 2px 3px; + border-color: #ccc; +} + +#dashboard-widgets form .input-text-wrap input { + border: 0 none; + outline: none; + margin: 0; + padding: 0; + width: 99%; + color: #333; +} + +form .textarea-wrap { border-style: solid; + border-width: 1px; padding: 2px; - margin-top: 10px; - margin-right: 7px; + border-color: #ccc; } -#rightnow .reallynow { - padding: 6px; - font-size: 15px; - line-height: 2; +#dashboard-widgets form .textarea-wrap textarea { + border: 0 none; + padding: 0; + outline: none; + width: 99%; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; +} + +#dashboard-widgets .postbox form .submit { + float: none; + margin: .5em 0 0; + padding: 0; + border: none; +} + +#dashboard-widgets-wrap #dashboard-widgets .postbox form .submit input { margin: 0; } -#rightnow .rbutton { - font-weight: normal; - padding: 6px; - border-bottom: none; - -moz-border-radius: 2px; - -khtml-border-radius: 2px; - -webkit-border-radius: 2px; - border-radius: 2px; - text-decoration: none; +#dashboard-widgets-wrap #dashboard-widgets .postbox form .submit #publish { + min-width: 0; } -#rightnow .reallynow span { - display: block; - text-align: left; - float: left; - padding: 0 6px; +#dashboard-widgets-wrap .has-sidebar { + margin-right: -51%; } -#rightnow .reallynow a { - display: block; - text-align: right; - float: right; - padding: 0 6px; - font-size: 14px; - margin: 1px 6px 0 0; +#dashboard-widgets-wrap .inner-sidebar { + width: 49%; } -#rightnow .youhave { - font-size: 14px; - padding: 10px; +#dashboard-widgets-wrap .has-sidebar .has-sidebar-content { + margin-right: 51%; } -#rightnow h3, #rightnow p { - padding: 0 10px; +div.postbox div.inside { + margin: 10px; + position: relative; } -#rightnow a { - font-weight: bold; +#dashboard-widgets a { + text-decoration: none; } -/* Widgets */ +#dashboard-widgets h3 a { + text-decoration: underline; +} -div#dashboard-widgets-wrap { - margin-top: -20px; - margin-right: -13px; /* 20 (div.dashboard-widget margin-right) - 7 (#rightnow margin-right) */ +#dashboard-widgets h3 .postbox-title-action { + position: absolute; + right: 30px; + padding: 0; } -div#dashboard-widgets { - width: 100%; +#dashboard-widgets h4 { + font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif; + font-size: 13px; + margin: 0 0 .2em; + padding: 0; } -div.dashboard-widget-holder { - margin-top: 20px; - width: 50%; - float: left; +/* Right Now */ + +#dashboard_right_now p.sub, +#dashboard_right_now .table, #dashboard_right_now .versions { + margin: -12px; +} + +#dashboard_right_now .inside { + font-size: 12px; } -div.dashboard-widget-holder.third { - width: 33.3%; +#dashboard_right_now p.sub { + font-style: italic; + font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif; + padding: 5px 10px 15px; + color: #777; + font-size: 13px; } -div.dashboard-widget-holder.fourth { - width: 25%; +#dashboard_right_now .table { + background: #f9f9f9; + border-top: #ececec 1px solid; + border-bottom: #ececec 1px solid; + margin: 0 -9px 10px; + padding: 0 10px; } -div.dashboard-widget-holder.full { +#dashboard_right_now table { width: 100%; } -div.dashboard-widget-holder.double div.dashboard-widget { - height: 54em; - padding-bottom: 28px /* lame */ +#dashboard_right_now table td { + border-top: #ececec 1px solid; + padding: 3px 0; + white-space: nowrap; } -div.dashboard-widget { - position: relative; - margin-right: 20px; - border-width: 1px; - border-style: solid; - padding: 2px; - height: 27em; - overflow: auto; - font-size: 11px; +#dashboard_right_now table tr.first td { + border-top: none; } -h3.dashboard-widget-title { - margin: 0; - padding: 0 7px; +#dashboard_right_now td.b { + padding-right: 6px; + text-align: right; + font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif; font-size: 14px; - line-height: 2; } -h3.dashboard-widget-title span { - display: block; - text-align: left; - float: left; +#dashboard_right_now td.b a { + font-size: 18px; } -h3.dashboard-widget-title small { - display: block; - text-align: right; - float: right; - font-size: 75%; - line-height: 2.67; /* math: it works, bitches */ +#dashboard_right_now td.b a:hover { + color: #d54e21; } -h3.dashboard-widget-title img.rss-icon { - vertical-align: middle; - margin: .5em 0; +#dashboard_right_now .t { + font-size: 12px; + padding-right: 12px; + padding-top: 6px; + color: #777; } -div.dashboard-widget-notice { - padding: 0 14px; - font-size: 1.2em; - line-height: 2; +#dashboard_right_now td.first, +#dashboard_right_now td.last { + width: 1px; } -div.dashboard-widget-error { - padding: 0 20px; - font-size: 1.2em; - line-height: 2; +#dashboard_right_now .spam { + color: red; } -div.dashboard-widget-content { - padding: 10px 15px; +#dashboard_right_now .waiting { + color: orange; } -div.dashboard-widget-submit { - border-top: 1px solid #ccc; - padding: 1em 0 0 0; - margin: 10px 0 0 0; +#dashboard_right_now .approved { + color: green; } -div.dashboard-widget-submit input { - font-family: "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif; - padding: 4px 6px; - border: none; - font-size: 13px; - -moz-border-radius: 3px; - -khtml-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; - cursor: pointer; - text-decoration: none; + +#dashboard_right_now .versions { + padding: 6px 10px 12px; } -div.dashboard-widget-content ul, div.dashboard-widget-content ol, div.dashboard-widget-content dl { - margin: 0; - text-indent: 0; - padding-left: 15px; +#dashboard_right_now .versions .b { + font-weight: bold; +} + +#dashboard_right_now a.button { + float: right; + clear: right; + position: relative; + top: -5px; } -div.dashboard-widget-content li { - margin: .5em 0 1em; + +/* Recent Comments */ + +#dashboard_recent_comments h3 { + margin-bottom: 0; } -div.dashboard-widget-content blockquote { - margin: -1em 0; +#dashboard_recent_comments .inside { + margin-top: 0; } -div#dashboard_recent_comments p { - font-size: 14px; +#dashboard_recent_comments .comment-meta .approve { + font-style: italic; + font-family: "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif; + font-size: 10px; } -div.dashboard-widget-content p.comment-meta { - font-size: 11px !important; +#the-comment-list { + position: relative; } -#dashboard_secondary div.dashboard-widget { - height: auto; +#the-comment-list .comment-item { + padding: 1em 10px 1em 70px; + border-top: 1px solid; } -#dashboard_secondary div.dashboard-widget-content ul { - list-style: none; - padding: 0; +#the-comment-list .pingback { + padding-left: 9px !important; } -#dashboard_secondary div.dashboard-widget-content ul li { - display: block; - width: 19.95%; - padding-bottom: 10px; - margin: 0; +#the-comment-list .comment-item, +#the-comment-list #replyrow { + margin: 0 -10px; +} + +#the-comment-list .comment-item:first-child { + border-top: none; +} + +#the-comment-list .comment-item .avatar { float: left; - font-size: 95%; + margin-left: -60px; } -#dashboard_secondary div.dashboard-widget-content { - margin: 10px 5px; - padding: 0; +#the-comment-list .comment-item h4 { + line-height: 1.4; + margin-top: -.2em; + font-weight: normal; + color: #999; } -#dashboard_secondary div.dashboard-widget-content ul li .post { - display:block; - font-family:Georgia,"Times New Roman",Times,serif; - font-size:18px; - line-height: 1.2em; - height:90px; - overflow:hidden; +#the-comment-list .comment-item h4 cite { + font-style: normal; + font-weight: normal; } -#dashboard_secondary div.dashboard-widget-content ul li a { - display: block; - height:100%; - overflow:hidden; - margin: 5px 10px; - text-decoration: none; - padding: .5em; - border-right: 1px solid #dadada; - border-bottom: 1px solid #dadada; +#the-comment-list .comment-item blockquote, +#the-comment-list .comment-item blockquote p { + margin: 0; + padding: 0; + display: inline; } -#dashboard_secondary div.dashboard-widget-content ul li a cite { +#dashboard_recent_comments #the-comment-list .trackback blockquote, +#dashboard_recent_comments #the-comment-list .pingback blockquote { display: block; - font-family: "Lucida Sans", "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif; } -#dashboard-widgets .widget_rss ul { - list-style: none; +#the-comment-list .comment-item p.row-actions { + margin: 3px 0 0; padding: 0; + font-size: 10px; } -#dashboard-widgets .widget_rss ul li { +/* QuickPress */ + +#dashboard_quick_press h4 { + font-family: "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif; + float: left; + width: 5.5em; clear: both; + font-weight: normal; + text-align: right; + padding-top: 5px; + font-size: 12px; +} + +#dashboard_quick_press h4 label { + margin-right: 10px; } -#dashboard-widgets .widget_rss ul li span.rss-date { +#dashboard_quick_press .input-text-wrap, +#dashboard_quick_press .textarea-wrap { + margin: 0 0 1em 5em; +} + +#dashboard_quick_press #media-buttons { + margin: 0 0 .5em 5em; + padding: 0 0 0 10px; + font-size: 11px; +} + +#dashboard_quick_press #media-buttons a { + vertical-align: bottom; +} + +#dashboard-widgets #dashboard_quick_press form p.submit { + margin-left: 4.6em; +} + +#dashboard-widgets #dashboard_quick_press form p.submit input { float: left; +} + +#dashboard-widgets #dashboard_quick_press form p.submit #save-post { + margin: 0 1em 0 10px; +} + +#dashboard-widgets #dashboard_quick_press form p.submit #publish { + float: right; +} + +/* Recent Drafts */ +#dashboard_recent_drafts ul { + margin: 0; + padding: 0; + list-style: none; +} + +#dashboard_recent_drafts ul li { + margin-bottom: 0.6em; +} + +#dashboard_recent_drafts h4 { + font-weight: normal; +} + +#dashboard_recent_drafts h4 abbr { + font-family: "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif; + font-size: 11px; + color: #999; + margin-left: 3px; +} + +#dashboard_recent_drafts p { margin: 0; + padding: 0; } -#dashboard-widgets .widget_rss ul li a { - float: left; - margin: 0 .5em .2em 0; - font-weight: bold; +/* Feeds */ + +.rss-widget ul { + margin: 0; + padding: 0; + list-style: none; } -#dashboard-widgets .widget_rss ul li div { - clear: both; +a.rsswidget { + font-size: 13px; + font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif; + line-height: 1.7em; +} + +.rss-widget ul li { line-height: 1.5em; + margin-bottom: 12px; } -#dashboard_primary a.rsswidget, #dashboard_plugins h5 { - font-size: 14px; +.rss-widget span.rss-date { + margin-left: 3px; } -#dashboard_primary span.rss-date { - font-size: 14px; +.rss-widget cite { + display: block; + text-align: right; + margin: 0 0 1em; + padding: 0; } +.rss-widget cite:before { + content: '\2014'; +} + +/* Plugins */ + #dashboard_plugins h4 { - font-size: 1em; - margin: 0 0 .1em; + font-family: "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif; } #dashboard_plugins h5 { + font-family: Georgia, "Times New Roman", "Bitstream Charter", Times, serif; + font-size: 13px !important; margin: 0; display: inline; line-height: 1.4em; } -#dashboard_plugins p { - margin: 0 0 1em; - line-height: 1.5em; +#dashboard_plugins h5 a { + font-weight: normal; + line-height: 1.7em; } -.widget-loading { +#dashboard_plugins p { + margin: 0 0 1.4em; + line-height: 1.4em; } wp-admin/css/dashboard.css @@ -1,31 +1,74 @@ -body, td { - font-family: Tahoma; +/* 2 column liquid layout */ +#adminmenu { + float: right; + clear: right; + margin-right:-160px; + margin-left: 5px; } -textarea, input, select { - font-family: Tahoma; +div.folded #adminmenu { + margin-left: 0; + margin-right: -45px; } -h1, h2, h3 { - font-family:arial; +/* inner 2 column liquid layout */ +.inner-sidebar { + float: left; + clear: left; } -.widefat td { - padding: 7px 10px 9px 15px; +.has-sidebar { + float: right; + clear: right; + margin-right: 0; + margin-left: -340px; +} +.has-sidebar .has-sidebar-content { + margin-right: 0; + margin-left: 305px; +} +#wpbody { + margin-left:0; + margin-right: 175px; +} +.folded #wpbody { + margin-left: 0; + margin-right: 60px; +} +#wpbody-content { + float: right; +} +/* 2 columns main area */ +#col-right { + float: left; + clear: left; +} +.wrap { + margin: 0 5px 0 15px; +} +/* styles for use by people extending the WordPress interface */ +body, td, textarea, input, select { + font-family: Tahoma, arial; +} +.alignleft { + float: right; +} +.alignright { + float: left; +} +.subsubsub { + float: right; } .widefat th { - padding: 9px 10px 6px 15px; text-align: right; } .widefat th input { margin: 0 8px 0 0; } -.widefat .check-column { - text-align: left; -} .wrap h2 { - font-family:arial; - margin: 5px -4px 0 0; - padding-right:0; - padding-left: 280px; + font-family: arial; + padding: 14px 0 3px 15px; } .wrap h2.long-header { padding-left: 0; } +.updated, .error { + clear: both; +} wp-admin/css/global-rtl.css @@ -1,40 +1,244 @@ -/* styles for use by people extending the WordPress interface */ +/* http://meyerweb.com/eric/tools/css/reset/ */ +/* v1.0 | 20080212 */ + +html, body, div, span, applet, object, iframe, +h1, h2, h3, h4, h5, h6, p, blockquote, pre, +a, abbr, acronym, address, big, cite, code, +del, dfn, em, font, img, ins, kbd, q, s, samp, +small, strike, strong, sub, sup, tt, var, +b, u, i, center, +dl, dt, dd, ol, ul, li, +fieldset, form, label, legend, +table, caption, tbody, tfoot, thead, tr, th, td { + margin: 0; + padding: 0; + border: 0; + outline: 0; +/* font-size: 100%; + vertical-align: baseline; */ + background: transparent; +} +body { + line-height: 1; +} +ol, ul { + list-style: none; +} +blockquote, q { + quotes: none; +} +blockquote:before, blockquote:after, +q:before, q:after { + content: ''; + content: none; +} +/* remember to define focus styles! */ +/* +:focus { + outline: 0; +} +*/ +/* remember to highlight inserts somehow! */ +ins { + text-decoration: none; +} +del { + text-decoration: line-through; +} -body { +/* tables still need 'cellspacing="0"' in the markup */ +/* +table { + border-collapse: collapse; + border-spacing: 0; +} +*/ +/* end reset css */ + + +/* 2 column liquid layout */ +#wpwrap { + height: auto; + min-height: 100%; + width: 100%; +} + +#wpcontent { + height: 100%; + padding-bottom: 50px; +} + +#wpbody { + clear: both; + margin-left: 175px; +} + +.folded #wpbody { + margin-left: 60px; +} + +#wpbody-content { + float: left; + width: 100%; +} + +#adminmenu { + float: left; + clear: left; + width: 145px; + margin-top: 15px; + margin-right: 5px; + margin-bottom: 15px; + margin-left: -160px; + position: relative; + padding: 0; + list-style: none; +} + +.folded #adminmenu { + margin-left: -45px; +} + +.folded #adminmenu, +.folded #adminmenu li.menu-top { + width: 28px; +} + +#footer { + clear: both; + position: relative; + width: 100%; +} + +/* inner 2 column liquid layout */ + +.inner-sidebar { + float: right; + clear: right; + width: 280px; + position: relative; +} + +.has-sidebar { + float: left; + clear: left; + width: 100%; + margin-right: -340px; +} + +.has-sidebar .has-sidebar-content { + margin-right: 305px; +} + +/* 2 columns main area */ + +#col-container { + overflow: hidden; + padding: 0; margin: 0; +} + +#col-left { padding: 0; + margin: 0; + overflow: hidden; + width: 39%; +} + +#col-right { + float: right; + clear: right; + overflow: hidden; + padding: 0; + margin: 0; + width: 59%; +} + +/* utility classes */ +.alignleft { + float: left; +} + +.alignright { + float: right; +} + +.textleft { + text-align: left; } -body, td { - font: 13px "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif; +.textright { + text-align: right; } -form, label input { margin: 0; padding: 0; } +.clear { + clear: both; +} -img { border: 0; } +.hidden, +.closed .inside, +.hide-if-no-js { + display: none; +} -label { cursor: pointer; } +/* include margin and padding in the width calculation of input and textarea */ +input[type="text"], +textarea { + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + -ms-box-sizing: border-box; /* ie8 only */ + box-sizing: border-box; +} + +input[type="checkbox"], +input[type="radio"] { + vertical-align: text-top; +} -li, dd { margin-bottom: 6px; } +/* styles for use by people extending the WordPress interface */ +html, +body { + height: 100%; +} -p, li, dl, dd, dt { line-height: 140%; } +body, +td { + font: 13px "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif; +} -textarea, input, select { - font: 13px Verdana, Arial, Helvetica, sans-serif; - margin: 1px; - padding: 3px; +p { + margin: 1em 0; } -.alignleft { float: left; } -.alignright { float: right; } +blockquote { + margin: 1em; +} -.textleft { text-align: left; } -.textright { text-align: right; } +label { + cursor: pointer; +} -.clear { clear: both; height: 2px; } +li, +dd { + margin-bottom: 6px; +} -.hidden { display: none; } +p, +li, +dl, +dd, +dt { + line-height: 140%; +} + +textarea, +input, +select { + font: 13px/19px "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif; + margin: 1px; + padding: 3px; +} h1 { display: block; @@ -79,50 +283,105 @@ h6 { .subsubsub { list-style: none; - margin: 14px 0 8px 0; + margin: 8px 0 5px; padding: 0; white-space: nowrap; - font-size: 12px; + font-size: 11px; + float: left; } -.subsubsub a { line-height: 200%; padding: 3px; text-decoration: none; } +.subsubsub a { + line-height: 2; + padding: .2em; + text-decoration: none; +} -.subsubsub a.current { font-weight: bold; background: none; border: none;} +.subsubsub a .count, .subsubsub a.current .count { + color: #999; + font-weight: normal; +} -.subsubsub li { display: inline; margin: 0; padding: 0; } +.subsubsub a.current { + font-weight: bold; + background: none; + border: none; +} + +.subsubsub li { + display: inline; + margin: 0; + padding: 0; +} .widefat { border-width: 1px; border-style: solid; - border-collapse: collapse; + border-collapse: separate; + border-spacing: 0; width: 100%; clear: both; margin: 0; + -moz-border-radius: 4px; + -khtml-border-radius: 4px; + -webkit-border-radius: 4px; + border-radius: 4px; } -.widefat a { - text-decoration: none; +.widefat * { + word-wrap: break-word; } -.widefat abbr { - white-space: nowrap; +.widefat a { + text-decoration: none; } -.widefat td, .widefat th { +.widefat td, +.widefat th { border-bottom-width: 1px; border-bottom-style: solid; - border-bottom-color: #ccc; font-size: 11px; vertical-align: text-top; } .widefat td { - padding: 7px 15px 9px 10px; + padding: 7px 7px 5px; vertical-align: top; } +.widefat thead tr th:first { + -moz-border-radius-topleft: 4px; + -webkit-border-top-left-radius: 4px; + -khtml-border-top-left-radius: 4px; + border-top-left-radius: 4px; +} + +.widefat thead tr th:last { + -moz-border-radius-topright: 4px; + -webkit-border-top-right-radius: 4px; + -khtml-border-top-right-radius: 4px; + border-top-right-radius: 4px; +} + +.widefat tfoot tr th:first { + -moz-border-radius-bottomleft: 4px; + -webkit-border-bottom-left-radius: 4px; + -khtml-border-bottom-left-radius: 4px; + border-bottom-left-radius: 4px; +} + +.widefat tfoot tr th:last { + -moz-border-radius-bottomright: 4px; + -webkit-border-bottom-right-radius: 4px; + -khtml-border-bottom-right-radius: 4px; + border-bottom-right-radius: 4px; +} + +.widefat td p { + font-size: 11px; +} + .widefat th { - padding: 9px 15px 6px 10px; + padding: 7px 7px 8px; text-align: left; line-height: 1.3em; } @@ -130,69 +389,65 @@ h6 { .widefat th input { margin: 0 0 0 8px; padding: 0; + vertical-align: text-top; } .widefat .check-column { - text-align: right; - width: 1.5em; + width: 2.2em; padding: 0; } .widefat tbody th.check-column { - padding: 8px 0 22px; -} -/* -th.check-column + th, th.check-column + td { - padding-left: 5px; + padding: 7px 0 22px; } -*/ -.widefat .num { + +.widefat .num, +.column-comments, +.column-links, +.column-posts, +.column-parent { text-align: center; } -.wrap, .updated, .error { - margin: 0; - margin-left: 15px; - margin-right: 15px; - padding: 0; - max-width: 980px; +.widefat th#comments { + vertical-align: middle; } -.updated, .error { +.wrap { + margin: 0 15px 0 5px; +} + +.updated, +.error { border-width: 1px; border-style: solid; padding: 0 0.6em; - max-width: 950px; - margin-bottom: 1em; -} - -.updated p, .error p { - margin: 0.6em 0; + margin: 5px 15px 2px; + -moz-border-radius: 3px; + -khtml-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; } -.wrap .updated, .wrap .error { - margin: auto 0 0; +.updated p, +.error p { + margin: 0.5em 0; + line-height: 1; + padding: 2px; } -.updated a, .error a { - text-decoration: underline; -} - -.updated a { - text-decoration: none; - padding-bottom: 2px; +.wrap .updated, +.wrap .error { + margin: 5px 0; } .wrap h2 { - border-bottom-width: 1px; - border-bottom-style: solid; - clear: both; - font: 24px Georgia, "Times New Roman", Times, serif; - margin: 5px 0 0 -4px; - padding: 0; - padding-bottom: 7px; - padding-right: 280px; + font: italic normal normal 24px/29px Georgia, "Times New Roman", "Bitstream Charter", Times, serif; + margin: 0; + padding: 14px 15px 3px 0; + line-height: 35px; + text-shadow: rgba(255,255,255,1) 0px 1px 0px; } .wrap h2.long-header { wp-admin/css/global.css @@ -1,73 +1,91 @@ -#poststuff .postbox h3 { - padding-left:0; - padding-right: 23px; +* html #wpcontent #adminmenu .wp-has-submenu .wp-menu-toggle { + background: url(../images/menu-bits-rtl.gif) no-repeat scroll right -109px; } -* html #poststuff .postarea, * html #poststuff #titlediv { + +* html #wpcontent #adminmenu li.wp-has-current-submenu .wp-menu-toggle { + background: url(../images/menu-bits-rtl.gif) no-repeat scroll right -206px; +} +* html #adminmenu { margin-left:0; - margin-right: 3%; + margin-right: -80px; +} +* html div.folded #adminmenu { + margin-left: 0; + margin-right: -22px; +} +#wpcontent #adminmenu .wp-submenu li.wp-submenu-head { + padding: 3px 10px 4px 4px; +} +.inline-edit-row fieldset label span.title { + float: right; +} +.inline-edit-row fieldset label span.input-text-wrap { + margin-right: 0; +} +p.search-box { + float: left; } * html #poststuff h2 { margin-right: 0; } #bh { - padding-right:0; - padding-left: 15px; + margin: 7px 10px 0 0; + float: left; +} +#user_info + div#favorite-actions { + right: auto; + left: 15px; +} +#wphead-info { + float: left; } +/* without this dashboard widgets appear in one column for some screen widths */ div#dashboard-widgets { - padding-right:0; + padding-right: 0; padding-left: 1px; } #tagchecklist span a { margin: 4px -9px 0 0; } -#poststuff .togbox { - margin-left:0; - margin-right: -19px; -} .widefat th input { margin: 0 5px 0 0; } /* ---------- add by navid */ -#dashmenu { /* fix top right bottom in admin */ - direction:ltr; -} -#sidemenu a { /* fix left admin buttom ex. plugins, options */ - float:left; +#TB_window { + width: 670px; + position: absolute; + top: 50%; + left: 50%; + margin-right: 335px !important; } -.wrap h2 { - margin:5px 4px 0 0; +#dashboard_plugins { + direction: ltr; } -#editor-toolbar {/* fix hover in media uploader icon */ - direction:ltr; +#dashboard_plugins h3.hndle { + direction: rtl; } -#TB_window { /* fix theme preview */ - left:2%; +#dashboard_incoming_links ul li, +#dashboard_secondary ul li, +#dashboard_primary ul li, +p.row-actions { + width: 100%; } -/* fix widget page */ -form#widgets-filter { - position:static; +#favorite-inside { + position: absolute; + right:0; } -#widget-search { - display:none; +#post-status-info { + height: 25px; } -/* fix manage comment page */ -ul.view-switch li { - float:left; +#screen-meta { + position: static; } -form#posts-filter { - position:static; +p.submit { /* quick edit and reply in edit-comments.php */ + height:22px; } -#post-search { - display:none; +.inner-sidebar { /* fix edit single comment */ + position: static; } -#submenu { - margin-right: 20px; +form#widgets-filter { /* fix widget page */ + position: static; } -/* Fixes for media-upload window */ -/* Center media-upload panel on screen */ -#TB_window { - width: 670px; - position: absolute; - top: 50%; - left: 50%; - margin-right: 335px !important; } wp-admin/css/ie-rtl.css @@ -1,14 +1,44 @@ /* Fixes for IE bugs */ -#poststuff .postbox h3 { - padding-left: 23px; +input.button, +input.button-secondary, +input.button-highlighted { + padding: 0; +} + +#minor-publishing-actions input, +#major-publishing-actions input, +#minor-publishing-actions .preview { + min-width: auto; + padding-left: 0; + padding-right: 0; +} + +#wpbody-content .postbox { + border: 1px solid #dfdfdf; +} + +#wpbody-content .postbox h3 { + margin-bottom: -1px; } -#submenu li a.current { - background:none; - border:none; +* html #side-info-column { + height: auto; } +* html #wpbody-content #screen-options-link-wrap { + display: inline-block; + width: 150px; + text-align: center; +} + +* html #wpbody-content #contextual-help-link-wrap { + display: inline-block; + width: 100px; + text-align: center; +} + +/* * html body.minwidth { _width: expression(document.documentElement.clientWidth < 810 ? "808px" : "99.9%"); } @@ -16,34 +46,225 @@ * html #wpbody { _width: expression(document.documentElement.clientWidth > 982 ? "980px" : "99.9%"); } +*/ -* html #poststuff .postarea, * html #poststuff #titlediv { - width: 95%; - margin-left: 3%; +* html #adminmenu { + margin-left: -80px; +} + +* html div.folded #adminmenu { + margin-left: -22px; +} + +* html #wpcontent #adminmenu li.menu-top { + display: inline; + padding: 0; + margin: 0; +} + +#wpcontent.folded #adminmenu li.menu-top { + display: block; +} + +ul#adminmenu { + z-index: 99; +} + +#adminmenu li.menu-top a.menu-top { + min-width: auto; + width: auto; +} + +#wpcontent #adminmenu li.wp-has-current-submenu a.wp-has-submenu { + font-style: normal; +} + +* html #wpcontent #adminmenu .wp-menu-open .wp-menu-toggle { + background: none; +} + +* html #wpcontent #adminmenu .wp-has-submenu .wp-menu-toggle { + background: url(../images/menu-bits.gif) no-repeat scroll left -109px; +} + +* html #wpcontent #adminmenu li.wp-has-current-submenu .wp-menu-toggle { + background: url(../images/menu-bits.gif) no-repeat scroll left -206px; +} + +* html #adminmenu div.wp-menu-image { + height: 29px; +} + +#wpcontent #adminmenu .wp-submenu li { + padding: 0; +} + +#adminmenu, +.wp-submenu, +.wp-submenu li, +.wp-menu-toggle { + zoom: 100%; +} + +#wpcontent.folded #adminmenu li.wp-menu-separator { + width: 28px; +} + +#wpcontent #adminmenu .wp-submenu li.wp-submenu-head { + padding: 3px 4px 4px 10px; + zoom: 100%; +} + +#wpcontent.folded #adminmenu .menu-top { + height: 30px; +} + +.folded #adminmenu .wp-submenu { + margin: -1px 0 0 0; +} + +#template, +#template div, +#editcat, +#addcat { + zoom: 100%; } .submitbox { margin-top: 10px; } -* html div.widget-liquid-left-holder, * html div.widget-liquid-right { +/* Inline Editor */ +#wpbody-content .quick-edit-row-post .inline-edit-col-left { + width: 39%; +} + +#wpbody-content .inline-edit-row-post .inline-edit-col-center { + width: 19%; +} + +#wpbody-content .quick-edit-row-page .inline-edit-col-left { + width: 49%; +} + +#wpbody-content .bulk-edit-row .inline-edit-col-left { + width: 29%; +} + +.inline-edit-row p.submit { + zoom: 100%; +} + +.inline-edit-row fieldset label span.title { + display: block; + float: left; + width: 5em; +} + +.inline-edit-row fieldset label span.input-text-wrap { + margin-left: 0; + zoom: 100%; +} + +#wpbody-content .inline-edit-row fieldset label span.input-text-wrap input { + line-height: 130%; +} + +#wpbody-content .inline-edit-row .input-text-wrap input { + width: 95%; +} + +#wpbody-content .inline-edit-row .input-text-wrap input.inline-edit-password-input { + width: 8em; +} +/* end Inline Editor */ + +* html .row-actions { + visibility: visible; +} + +#dashboard-widgets h3 a { + height: 20px; + line-height: 20px; +} + +#the-comment-list .comment-item, +ul#widget-list li.widget-list-item { + zoom: 100%; +} + +#wphead-info { + float: right; +} + +#titlediv #title { + width: 98%; +} + +a.button { + line-height: 1.4em; + margin: 1px; +} + +* html div.widget-liquid-left-holder, +* html div.widget-liquid-right { display: block; position: relative; } -#wpwrap, #wpcontent, #post, #wrap, #postdivrich, #postdiv, #poststuff, #titlediv, #post-body, #editorcontainer, .tablenav, .widget-control-list, li.widget-list-control-item, #dragHelper, li.widget-list-control-item h4, .widget-sortable, .widget-control-actions { +#screen-options-wrap { + overflow: hidden; +} + +#favorite-actions { + z-index: 12; +} + +#favorite-inside, +#favorite-inside a, +.favorite-action { + zoom: 100%; +} + +#post-status-info, +#wpwrap, +#wpcontent, +#post, +#wrap, +#postdivrich, +#postdiv, +#poststuff, +.metabox-holder, +#titlediv, +#post-body, +#editorcontainer, +.tablenav, +.widget-control-list, +li.widget-list-control-item, +#dragHelper, +li.widget-list-control-item h4, +.widget-sortable, +.widget-control-actions, +#tagchecklist, +#col-container, +#col-left, +#col-right { display: block; zoom: 100%; } +p.search-box { + position: static; + float: right; + margin: -3px 0 4px; +} + * html #editorcontainer { padding: 0; } -* html #editorcontainer #content { - position: relative; +#editorcontainer #content { overflow: auto; - padding: 6px; margin: auto; width: 98%; } @@ -66,7 +287,8 @@ form#template div { } #bh { - padding-right: 15px; + margin: 7px 10px 0 0; + float: right; } /* without this dashboard widgets appear in one column for some screen widths */ @@ -74,11 +296,6 @@ div#dashboard-widgets { padding-right: 1px; } -#tagchecklist { - display: block; - zoom: 100%; -} - #tagchecklist span, #tagchecklist span a { display: inline-block; display: block; @@ -88,10 +305,6 @@ div#dashboard-widgets { margin: 4px 0 0 -9px; } -#poststuff .togbox { - margin-left: -19px; -} - .tablenav .button-secondary, .nav .button-secondary { padding: 0 1px; vertical-align: middle; @@ -104,23 +317,10 @@ div#dashboard-widgets { margin-top: 2px; } -.tablenav-pages .page-numbers { - display: inline-block; -} - -.tablenav-pages { - display: block; - margin-top: -3px; -} - table.ie-fixed { table-layout: fixed; } -#post-search .button, #widget-search .button { - padding: 1px; -} - .widefat tr, .widefat th { margin-bottom: 0; border-spacing: 0; wp-admin/css/ie.css @@ -1,27 +1,16 @@ body { - font-family: Tahoma; + font-family: Tahoma, arial; } -/* Half the page disapears on IE6 */ -* html body { - width: 700px; - position: absolute; - left: 50%; - margin-right: 350px; -} -ul, ol { - padding: 5px 22px 5px 5px; -} -.step, th { - text-align:right; +h1 { + font-family: arial; + margin: 5px -4px 0 0; } -.submit input, .button, .button-secondary { - font-family: Tahoma; +ul, ol { padding: 5px 22px 5px 5px; } +.step, th { text-align: right; } +.submit input, .button, .button-secondary { + font-family: Tahoma, arial; margin-right:0; } .form-table th { - text-align:right; -} -h1 { - font-family:arial; - margin: 5px -4px 0 0; + text-align: right; } wp-admin/css/install-rtl.css @@ -1,78 +1,83 @@ -html { background: #f1f1f1; } +html { background: #f7f7f7; } body { background: #fff; color: #333; - font-family: "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif; + font-family: "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif; margin: 2em auto 0 auto; width: 700px; padding: 1em 2em; - -moz-border-radius: 12px; - -khtml-border-radius: 12px; - -webkit-border-radius: 12px; - border-radius: 12px; + -moz-border-radius: 11px; + -khtml-border-radius: 11px; + -webkit-border-radius: 11px; + border-radius: 11px; + border: 1px solid #dfdfdf; } a { color: #2583ad; text-decoration: none; } a:hover { color: #d54e21; } - h1 { - font-size: 18px; - margin-bottom: 0; + border-bottom: 1px solid #dadada; + clear: both; + color: #666; + font: 24px Georgia, "Times New Roman", Times, serif; + margin: 5px 0 0 -4px; + padding: 0; + padding-bottom: 7px; } h2 { font-size: 16px; } p, li { padding-bottom: 2px; - font-size: 13px; + font-size: 12px; line-height: 18px; } -code { - font-size: 13px; -} +code { font-size: 13px; } ul, ol { padding: 5px 5px 5px 22px; } -#logo { margin: 6px 0 14px 0px; border-bottom: none;} +#logo { margin: 6px 0 14px 0; border-bottom: none;} .step { margin: 20px 0 15px; } -.step input { - font-size: 18px; -} - -a.button { - font-size: 18px; -} - .step, th { text-align: left; padding: 0; } .submit input, .button, .button-secondary { - font-family: "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif; - padding: 5px 7px 7px; - border: 1px solid #a3a3a3; - margin-left: 0; - -moz-border-radius: 3px; - -khtml-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; - color: #246; - background: #e5e5e5; + font-family: "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif; + text-decoration: none; + font-size: 14px !important; + line-height: 16px; + padding: 6px 12px; + cursor: pointer; + border: 1px solid #bbb; + color: #464646; + -moz-border-radius: 15px; + -khtml-border-radius: 15px; + -webkit-border-radius: 15px; + border-radius: 15px; + -moz-box-sizing: content-box; + -webkit-box-sizing: content-box; + -khtml-box-sizing: content-box; + box-sizing: content-box; +} + +.button:hover, .button-secondary:hover, .submit input:hover { + color: #000; + border-color: #666; } -.button-secondary { - background: #cee1ef; +.button, .submit input, .button-secondary { + background: #f2f2f2 url(../images/white-grad.png) repeat-x scroll left top; } -.submit input:hover, .button:hover, .button-secondary:hover { - color: #d54e21; - border-color: #535353; +.button:active, .submit input:active, .button-secondary:active { + background: #eee url(../images/white-grad-active.png) repeat-x scroll left top; } .form-table { @@ -98,7 +103,7 @@ a.button { } .form-table tr { - background: #eaf3fa; + background: #f3f3f3; } .form-table code { @@ -117,26 +122,12 @@ a.button { padding: 2px; } -h1 { - border-bottom: 1px solid #dadada; - clear: both; - color: #666666; - font: 24px Georgia, "Times New Roman", Times, serif; - margin: 5px 0 0 -4px; - padding: 0; - padding-bottom: 7px; -} - -#error-page { - margin-top: 50px; -} +#error-page { margin-top: 50px; } #error-page p { - font-size: 14px; - line-height: 16px; + font-size: 12px; + line-height: 18px; margin: 25px 0 20px; } -#error-page code { - font-size: 15px; -} \ No newline at end of file +#error-page code { font-family: Consolas, Monaco, Courier, monospace; } wp-admin/css/install.css @@ -1,37 +1,30 @@ body { - font-family: Tahoma; + font-family: Tahoma, arial; } form { - margin-left:0; margin-right: 8px; + margin-left: 0; } form .forgetmenot { - float:right; + float: right; } -#login form .submit input { - font-family: Tahoma; -} -form .submit { - float:left; +#login form .submit input { + font-family: Tahoma, arial; } +form .submit { float: left; } #backtoblog a { - left:auto; - right:15px; + left: auto; + right: 15px; } #login_error, .message { margin: 0 8px 16px 0; } -#nav { - margin:0 8px 0 0; -} +#nav { margin: 0 8px 0 0; } #user_pass, #user_login, #user_email { - margin-right:0; margin-left: 6px; + margin-right: 0; + direction:ltr; } h1 a { - text-decoration:none; -} -/* ltr input */ -#user_login, #user_pass { - direction:ltr; + text-decoration: none; } wp-admin/css/login-rtl.css @@ -3,35 +3,56 @@ body { border-top-width: 30px; border-top-style: solid; - font: 12px "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif; + font: 11px "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif; } form { margin-left: 8px; padding: 16px 16px 40px 16px; - font-weight: bold; - -moz-border-radius: 5px; - -khtml-border-radius: 5px; - -webkit-border-radius: 5px; + font-weight: normal; + -moz-border-radius: 11px; + -khtml-border-radius: 11px; + -webkit-border-radius: 11px; border-radius: 5px; + background: #fff; + border: 1px solid #e5e5e5; + -moz-box-shadow: rgba(200,200,200,1) 0 4px 18px; + -webkit-box-shadow: rgba(200,200,200,1) 0 4px 18px; + -khtml-box-shadow: rgba(200,200,200,1) 0 4px 18px; + box-shadow: rgba(200,200,200,1) 0 4px 18px; } -form .forgetmenot { font-weight: normal; float: left; margin-bottom: 0;} +form .forgetmenot { font-weight: normal; float: left; margin-bottom: 0; } #login form .submit input { - font-family: "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif; - padding: 3px 5px; + font-family: "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif; + padding: 3px 10px; border: none; - font-size: 13px; + font-size: 12px; border-width: 1px; border-style: solid; - -moz-border-radius: 3px; - -khtml-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; - cursor: default; - text-decoration: none; - margin-top: -6px; + -moz-border-radius: 11px; + -khtml-border-radius: 11px; + -webkit-border-radius: 11px; + border-radius: 11px; + cursor: pointer; + text-decoration: none; + margin-top: -3px; + text-shadow: rgba(0,0,0,0.3) 0 -1px 0; +} + +#login form p { + margin-bottom: 0; +} + +label { + color: #777; + font-size: 13px; +} + +form .forgetmenot label { + font-size: 11px; + line-height: 19px; } form .submit { float: right; } @@ -39,15 +60,19 @@ form .submit { float: right; } form p { margin-bottom: 24px; } h1 a { - background: url(../images/logo-login.gif) no-repeat; - width: 292px; - height: 66px; + background: url(../images/logo-login.gif) no-repeat top center; + width: 326px; + height: 67px; text-indent: -9999px; overflow: hidden; padding-bottom: 15px; display: block; } +#nav { + text-shadow: rgba(255,255,255,1) 0 1px 0; +} + #backtoblog a { position: absolute; top: 7px; @@ -55,20 +80,28 @@ h1 a { text-decoration: none; } -#login { width: 292px; margin: 7em auto; } +#login { width: 320px; margin: 7em auto; } #login_error, .message { margin: 0 0 16px 8px; border-width: 1px; border-style: solid; padding: 12px; + -moz-border-radius: 3px; + -khtml-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; } #nav { margin: 0 0 0 8px; padding: 16px; } #user_pass, #user_login, #user_email { - font-size: 20px; + font-size: 24px; width: 97%; padding: 3px; + margin-top: 2px; margin-right: 6px; -} \ No newline at end of file + margin-bottom: 16px; + border: 1px solid #e5e5e5; + background: #fbfbfb; +} wp-admin/css/login.css @@ -1,66 +1,93 @@ body#media-upload ul#sidemenu { - left:auto; - right:0; - width: 620px; + left: auto; + right: 0; } #search-filter { - text-align:left; + text-align: left; } +/* specific to the image upload form */ .align .field label { padding: 0 28px 0 0; margin: 0 0 0 1em; } .image-align-none-label, .image-align-left-label, .image-align-center-label, .image-align-right-label { - background-position:center right; + background-position: center right; +} +tr.image-size div.image-size-item { + float: right; } tr.image-size label { - margin: 0 0 0 1em; + margin: 0 1em 0 0; } .filename.original { float: right; } .crunching { text-align: left; - margin-right:0; + margin-right: 0; margin-left: 5px; } button.dismiss { - right:auto; - left:5px; + right: auto; + left: 5px; } .file-error { margin: 0 50px 5px 0; } .progress { - left:auto; - right:0; + left: auto; + right: 0; +} +.describe td { + padding: 0 0 0 5px; } .bar { - border-right-width:0; + border-right-width: 0; border-left-width: 3px; + border-right-style: none; border-left-style: solid; } .media-item .pinkynail { - float:right; + float: right; } -.describe-toggle-on, .describe-toggle-off { +.describe-toggle-on, +.describe-toggle-off { float: left; - margin-right:0; + margin-right: 0; margin-left: 20px; } /* Specific to Uploader */ - #media-upload .media-upload-form p { margin: 0 0 1em 1em; } .filename { float: right; - margin-left:0; + margin-left: 0; margin-right: 10px; } #media-upload .describe th.label { - text-align:right; + text-align: right; } .menu_order { - float:left; + float: left; +} +.media-upload-form label.form-help, td.help, #media-upload p.help, #media-upload label.help { + font-family: Tahoma, Arial; +} +#gallery-settings #basic th.label { + padding: 5px 0 5px 5px; +} +#gallery-settings .title, h3.media-title { + font-family: Tahoma, Arial; +} +#gallery-settings .describe th.label { + text-align: right; +} +#gallery-settings label, +#gallery-settings legend { + margin-right: 0; + margin-left: 15px; +} +#gallery-settings .align .field label { + margin: 0 0 0 1.5em; } wp-admin/css/media-rtl.css @@ -29,17 +29,21 @@ form { text-align: right; } -.media-upload-form label, .media-upload-form legend { - display:block; +.media-upload-form label, +.media-upload-form legend { + display: block; font-weight: bold; font-size: 13px; margin-bottom: 0.5em; margin: 0 0 0.5em 0; } -th { position: relative; } +th { + position: relative; +} .media-upload-form label.form-help, td.help { + font-family: "Lucida Grande", "Bitstream Vera Sans", Verdana, Arial, sans-serif; font-style: italic; font-weight: normal; } @@ -63,6 +67,7 @@ th { position: relative; } padding: 0 0 0 28px; margin: 0 1em 0 0; } + .image-align-none-label { background: url(../images/align-none.png) no-repeat center left; } @@ -79,14 +84,21 @@ th { position: relative; } background: url(../images/align-right.png) no-repeat center left; } -#flash-upload-ui, .insert-gallery { - display: none; +tr.image-size td { + width: 460px; +} + +tr.image-size div.image-size-item { + float: left; + width: 25%; + margin: 0; } tr.image-size label { display: inline; - margin: 0 1em 0 0; + margin: 0 0 0 1em; } + .pinkynail { max-width: 40px; max-height: 40px; @@ -95,38 +107,49 @@ tr.image-size label { .filename.original { float: left; } + .crunching { display: block; line-height: 32px; text-align: right; margin-right: 5px; } + button.dismiss { position: absolute; - top: 5px; + top: 7px; right: 5px; z-index: 4; + width: 8em; } + .file-error { - margin: 0 0 5px 50px; + float: left; font-weight: bold; + padding: 10px; } .progress { position: absolute; - top: 0px; - left: 0px; + top: 0; + left: 0; width: 623px; height: 36px; } + .bar { - width: 0px; + width: 0; height: 100%; border-right-width: 3px; border-right-style: solid; } -#library-form .progress, #gallery-form .progress { +#library-form .progress, +#gallery-form .progress, +#flash-upload-ui, +.insert-gallery, +.describe.startopen, +.describe.startclosed { display: none; } @@ -134,6 +157,7 @@ button.dismiss { max-width: 128px; max-height: 128px; } + .media-item .pinkynail { float: left; margin: 2px; @@ -144,7 +168,9 @@ button.dismiss { thead.media-item-info tr { background-color: transparent; } -thead.media-item-info th, thead.media-item-info td { + +thead.media-item-info th, +thead.media-item-info td { border: none; margin: 0; } @@ -153,41 +179,46 @@ thead.media-item-info th, thead.media-item-info td { border: 8px solid #fff; } -.describe.startopen, .describe.startclosed { - display: none; -} abbr.required { text-decoration: none; border: none; } + .describe label { display: inline; } + .describe td { vertical-align: middle; + padding: 0 5px 0 0; } + .describe td.A1 { width: 132px; } -.describe input[type="text"], .describe textarea { + +.describe input[type="text"], +.describe textarea { width: 460px; + border-width: 1px; + border-style: solid; } -.describe-toggle-on, .describe-toggle-off { + +.describe-toggle-on, +.describe-toggle-off { display: block; line-height: 36px; float: right; margin-right: 20px; } + .describe-toggle-off { display: none; } -.clickmask { -} - .hidden { - height: 0px; - width: 0px; + height: 0; + width: 0; overflow: hidden; border: none; } @@ -202,13 +233,17 @@ abbr.required { padding: 1em 0; } -#media-upload p.help { +#media-upload p.help, +#media-upload label.help { + font-family: "Lucida Grande", "Bitstream Vera Sans", Verdana, Arial, sans-serif; font-style: italic; font-weight: normal; } + #media-upload tr.image-size td.field { text-align: center; } + #media-upload #media-items { border-width: 1px; border-style: solid; @@ -235,21 +270,29 @@ abbr.required { overflow: hidden; max-width: 430px; } + #media-upload .describe { - border-top-width: 1px; - border-top-style: solid; padding: 5px; width: 100%; clear: both; cursor: default; } + +#media-upload .slidetoggle { + border-top-width: 1px; + border-top-style: solid; +} + #media-upload .describe th.label { padding-top: .5em; text-align: left; + min-width: 120px; } + #media-upload tr.align td.field { text-align: center; } + #media-upload tr.image-size { margin-bottom: 1em; height: 3em; @@ -264,10 +307,11 @@ abbr.required { } #filter .tablenav select { - border-style:solid; - border-width:1px; - padding:2px; - vertical-align:top; + border-style: solid; + border-width: 1px; + padding: 2px; + vertical-align: top; + width: auto; } #media-upload a.delete, @@ -287,7 +331,7 @@ abbr.required { } .menu_order_input { - border: 1px solid #DDDDDD; + border: 1px solid #ddd; font-size: 10px; padding: 1px; width: 23px; @@ -301,8 +345,8 @@ abbr.required { } #media-upload th.order-head { - width: 25%; - text-align: center; + width: 25%; + text-align: center; } #media-upload .widefat { @@ -313,3 +357,70 @@ abbr.required { .sorthelper { z-index: -1; } + +#gallery-settings th.label { + width: 160px; +} + +#gallery-settings #basic th.label { + padding: 5px 5px 5px 0; +} + +#gallery-settings .title { + clear: both; + padding: 0 0 3px; + border-bottom-style: solid; + border-bottom-width: 1px; + font-family: Georgia,"Times New Roman",Times,serif; + font-size: 1.6em; + border-bottom-color: #DADADA; + color: #5A5A5A; +} + +h3.media-title { + color: #5A5A5A; + font-family: Georgia,"Times New Roman",Times,serif; + font-size: 1.6em; + font-weight: normal; +} + +#gallery-settings .describe td { + vertical-align: middle; + height: 3.5em; +} + +#gallery-settings .describe th.label { + padding-top: .5em; + text-align: left; +} + +#gallery-settings .describe { + padding: 5px; + width: 615px; + clear: both; + cursor: default; +} + +#gallery-settings .describe select { + width: 15em; + border: 1px solid #dfdfdf; +} + +#gallery-settings label, +#gallery-settings legend { + font-size: 13px; + color: #464646; + margin-right: 15px; +} + +#gallery-settings .align .field label { + margin: 0 1.5em 0 0; +} + +#gallery-settings p.ml-submit { + border-top: 1px solid #dfdfdf; +} + +#gallery-settings select#columns { + width: 6em; +} wp-admin/css/media.css @@ -1,98 +1,106 @@ body { - font-family: Tahoma; + font-family: Tahoma, Arial; } -.ui-tabs-nav { - padding-left:0; - padding-right:8px; -} -.ui-tabs-nav li { +#poststuff #edButtonPreview, +#poststuff #edButtonHTML { + margin: 0px 0 0 5px; float: right; } -.button { - font-family: Tahoma; - margin-left:0; - margin-right: 5px; +/* Editor/Main Column */ +div#poststuff { + padding-left: 0; + padding-right: 10px; } -#wphead #viewsite { - margin-left:0; - margin-right: 10px; +.posting { + margin-right: 0; + margin-left: 228px; + left:auto; + right: 0; } -#viewsite { - right:auto; - left: 8px; +#side-info-column { + float: left; + right: auto; + left: 0; + margin-right: 0; + margin-left: 10px; } -#wphead #viewsite a { - font-family: Tahoma; +#side-info-column .sleeve { + padding-left: 0; + padding-right: 10px; } -h1 { - right:auto; - left:0; +h3.tb { + margin-left: 0; + margin-right: 5px; } -div#posting { - padding-left:0; - padding-right: 16px; +#actions { + float: left; } -#photo_directions span { - right:auto; - left:3px; +#extra_fields #actions { + right: auto; + left: 4px; } -#img_container a { - float:right; +#actions li { + float: right; + margin-right: 0; + margin-left: 10px; +} +#extra_fields .button { + margin-right: 0; + margin-left: 5px; } -#img_container a, #img_container a:link, #img_container a:visited { - margin:0 0 4px 4px; +/* Photo Styles */ +#img_container a { + float: right; } -div#categories { - right:auto; - left:16px; +#category-add input, #category-add select { + font-family: Tahoma, Arial; } -div#categories h2 { - margin: .5em 1em .5em 0; +#categorydiv ul.categorychecklist ul { + margin-left: 0; + margin-right: 18px; } +/* Tags */ #tagsdiv #newtag { - margin-right:0; - margin-left: 5px; -} -#jaxtag { - padding-left:0; - padding-right: 1em; + margin-right: 0; + margin-left: 5px; } -#tagchecklist { - padding-left:0; - padding-right: 1em; +#tagadd { + margin-left: 0; + margin-right: 3px; } #tagchecklist span { - margin-right: 10px; margin-left: .5em; + margin-right: 10px; float: right; } #tagchecklist span a { - margin: 6px -9px 0pt 0; + margin: 6px -9px 0 0; float: right; } -.submitbox { - float: left; -} -.submitbox .submit input { - text-align:right; +#content { + margin-left: 0; + margin-right: 1%; } -.video_split #extra_fields { - float:right; -} -.video_split .editor_area { - float: left; +.submit input, +.button, +.button-primary, +.button-secondary, +.button-highlighted, +#postcustomstuff .submit input { + font-family: tahoma; } .ac_results li { - text-align:right; + text-align: right; } #TB_ajaxContent #options { - right:auto; - left:25px; + right: auto; + left: 25px; } #post_status { - margin-left:0; + margin-left: 0; margin-right: 10px; } +/* Footer */ #footer { padding: 10px 60px 0 0; } wp-admin/css/press-this-rtl.css @@ -1,235 +1,240 @@ body { - font: 13px "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif; + font: 13px "Lucida Grande", "Bitstream Vera Sans", Verdana, Arial, sans-serif; color: #333; - margin: 0px; - padding: 0px; + margin: 0; + padding: 0; } -img { border: 0; } -/* Tabs */ -@media projection , screen { - .ui-tabs-hide { - display: none; - } +img { + border: none; } -@media print { - .ui-tabs-nav { - display: none; - } +/* Header */ +#wphead { + border-top: none; + padding-top: 4px; + background: #444 !important; } -.ui-tabs-nav { - list-style: none; - border-bottom: 1px solid #C6D9E9; - padding-left: 8px; - margin-bottom: .5em; - margin-top: -2em; +#poststuff #edButtonPreview, +#poststuff #edButtonHTML { + -moz-border-radius-bottomleft: 0; + -moz-border-radius-bottomright: 0; + -moz-border-radius-topleft: 3px; + -moz-border-radius-topright: 3px; + -khtml-border-radius-bottomleft: 0; + -khtml-border-radius-bottomright: 0; + -khtml-border-radius-topleft: 3px; + -khtml-border-radius-topright: 3px; + -webkit-border-radius-bottomleft: 0; + -webkit-border-radius-bottomright: 0; + -webkit-border-radius-topleft: 3px; + -webkit-border-radius-topright: 3px; + border-radius-bottomleft: 0; + border-radius-bottomright: 0; + border-radius-topleft: 3px; + border-radius-topright: 3px; + border-style: solid; + border-width: 1px; + cursor: pointer; + display: block; + height: 18px; + margin: 0px 5px 0 0; + padding: 0px 5px 0px; + background-color: #E9E9E9; + border-bottom-color: #E9E9E9; + color: #333333; + font-size: 10px; + line-height: 18px; + float: left; } -/* Additional IE specific bug fixes... */ -* html .ui-tabs-nav { /* auto clear, @ IE 6 & IE 7 Quirks Mode */ - display: inline-block; +.howto { + margin-top: 2px; + margin-bottom: 3px; + font-size: 11px; + font-style: italic; + display: block; } -* :first-child+html .ui-tabs-nav { - /* @ IE 7 Standards Mode - do not group selectors, otherwise IE 6 will ignore complete rule (because of the unknown + combinator)... */ - display: inline-block; +input.text { + outline-color: -moz-use-text-color; + outline-style: none; + outline-width: medium; + width: 100%; } -.ui-tabs-nav:after { - /* clearing without presentational markup, IE gets extra treatment */ - display: block; - clear: both; - content: " "; +#message { + -moz-border-radius: 6px; + -khtml-border-radius: 6px; + -webkit-border-radius: 6px; + border-radius: 6px; } -.ui-tabs-nav li { - float: left; - margin: 0; - height: 2em; - line-height: 2em; +/* Editor/Main Column */ +div#poststuff { + padding-left: 10px; + margin-top: 10px; } -.ui-tabs-nav a,.ui-tabs-nav a span { - display: block; +div.zerosize { + border: 0 none; + height: 0; + margin: 0; + overflow: hidden; + padding: 0; + position: absolute; + width: 0; } -.ui-tabs-nav a { - margin: 1px 0 0; - /* position: relative makes opacity fail for disabled tab in IE */ - padding-left: 0; - color: #27537a; - font-weight: bold; - line-height: 2em; - text-align: center; - text-decoration: none; - white-space: nowrap; /* required in IE 6 */ - outline: 0; /* prevent dotted border in Firefox */ - padding: 0 1em; +#poststuff #edButtonPreview.active, +#poststuff #edButtonHTML.active { + display: none; } -.ui-tabs-nav .ui-tabs-selected a { +.posting { + margin-right: 228px; position: relative; - top: 1px; - z-index: 2; - margin-top: 0; - -moz-border-radius-topleft: 4px; - -moz-border-radius-topright: 4px; - -webkit-border-top-left-radius: 4px; - -webkit-border-top-right-radius: 4px; - border-style: solid; - border-width: 1px; - background: white; - border-bottom-width: 2px; - margin-top: -2px; + left: 0; } -.ui-tabs-nav a:hover,.ui-tabs-nav a:focus,.ui-tabs-nav a:active, -.ui-tabs-nav .ui-tabs-selected a:link,.ui-tabs-nav .ui-tabs-selected a:visited { - cursor: pointer; +#side-info-column { + float: right; + width: 218px; + position: absolute; + right: 0; + margin-right: 10px; } -/* Header */ -#wphead { - border-top: none; - height: 2em; - padding-top: 8px; +#side-info-column .sleeve { + padding-left: 10px; } -.button { - font-family: "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif; - padding: 3px 5px; - font-size: 12px; - line-height: 1.5em; - border-width: 1px; - border-style: solid; - -moz-border-radius: 3px; - -khtml-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; - cursor: pointer; - margin-left: 5px; - text-decoration: none; +#poststuff .inside { + font-size: 11px; + margin: 0 12px 12px; } -.howto { - font-size: 11px; - font-style: italic; - display: block; +#poststuff h2, #poststuff h3 { + font-size: 14px; + font-weight: bold; + padding: 7px; + margin: 0 0 10px; + background-image: url(../images/postbox-bg.gif); + background-position: left top; + background-repeat: repeat-x; + font-size: 12px; + font-weight: bold; + line-height: 1; + margin: 0 0 10px; + padding: 7px 9px; + text-shadow: 0 1px 0 #FFFFFF; } -#wphead #viewsite { - position: absolute; - margin-top: 12px; - margin-left: 10px; +h3.tb { + text-shadow: 0 1px 0 #FFFFFF; + font-weight: bold; + font-size: 12px; + margin-left: 5px; } -#viewsite { - position: relative; - right: 8px; - top: 6px; - margin: 0 !important; +#TB_window { + border: 1px solid #333; + -moz-border-radius: 6px; + -khtml-border-radius: 6px; + -webkit-border-radius: 6px; + border-radius: 6px; } -#wphead #viewsite a { - font: 12px "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana, sans-serif; - padding: 3px 4px; - display: block; - letter-spacing: normal; +.metabox-holder .postbox, +.postbox, +.stuffbox { + margin-bottom: 10px; border-width: 1px; border-style: solid; - -moz-border-radius: 3px; - -khtml-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; - text-decoration: none; + line-height: 1; + -moz-border-radius: 6px; + -khtml-border-radius: 6px; + -webkit-border-radius: 6px; + border-radius: 6px; + border-color: #DFDFDF; } -#previewview { - padding-top: 8px !important; - padding-bottom: 8px !important; -} - -h1 { - font-size: .75em; - line-height: 2.666em; - top: .5em; - right: 0; - margin: 0 !important; - padding: 0 !important; - width: 236px; - background: none; +.titlediv { + border-color: #DFDFDF; } -input.text { - border: 0pt none; - outline-color: -moz-use-text-color; - outline-style: none; - outline-width: medium; - padding: 0pt; - width: 100%; +#title, .tbtitle { + -moz-border-radius: 6px; + -khtml-border-radius: 6px; + -webkit-border-radius: 6px; + border-radius: 6px; border-style: solid; - color: #333333; -} - -/* Editor/Main Column */ - -div#container { - margin: 0; - min-width: 500px; + border-width: 1px; + font-size: 1.7em; + outline: none; + padding: 3px 4px; + border-color: #DFDFDF; } -div#container form { - margin: 0px; - padding: 0px; +.tbtitle { + font-size: 12px; + padding: 3px; } -div#posting { - padding-left: 16px; - position: absolute; - z-index: 1; - width: 66%; +#title { + width: 98%; } -#post_title { - width: 99%; +.postbox h2 { + background-image: url(../images/postbox-bg.gif); + background-position: left top; + background-repeat: repeat-x; + background-color: #DFDFDF; } -.titlewrap { +.editor-container { + -moz-border-radius: 6px; + -khtml-border-radius: 6px; + -webkit-border-radius: 6px; + border-radius: 6px; + border-collapse: separate; border-style: solid; border-width: 1px; - padding: 2px 3px; - border-color: #CCCCCC; + border-color: #DFDFDF; } -div#posting h2 { - margin: .5em 0 .25em 0; - font-size: 12px; - padding: 3px; - background: ; +.postdivrich { + position: relative; + padding-top: 25px; } -.editor-container { - border-width: 1px; - border-color: #ccc; - border-style: solid; - margin-bottom: 1em; +#actions { + clear: both; + float: right; + margin-top: -19px; + position: relative; +} +#extra_fields #actions { + clear: both; + position: absolute; + right: 4px; + top: 6px; + margin: 0; } -/* Photo Styles */ - -#photo_directions { - margin-top: .25em; - display: block; - position: relative; +#actions li { + float: left; + list-style: none; + margin-right: 10px; +} +#extra_fields .button { + margin-right: 5px; } -#photo_directions span { - display: block; - position: absolute; - top: 0; - right: 3px; +/* Photo Styles */ +.photolist { + margin-top: -10px; } #photo_saving { @@ -239,77 +244,162 @@ div#posting h2 { #img_container { background-color: #fff; + height: 101px; + width: 100%; +} + +#extra_fields { + margin-top: 10px; + position: relative; +} + +#extra_fields .postbox { + margin-bottom: 5px; +} + +#extra_fields .titlewrap { + padding: 0; overflow: auto; height: 100px; } +#img_container { + position: relative; +} + #img_container a { display: block; - width: 79px; - height: 79px; float: left; + overflow: hidden; + vertical-align: center; +} + +#img_container img, #img_container a { + width: 68px; + height: 68px; } #img_container img { - width: 75px; - height: 75px; - border: 0px; - padding: 2px; + width: 68px; + height: 68px; + border: none; background-color: #f4f4f4; cursor: pointer; } -#img_container a, #img_container a:link, #img_container a:visited { - border: 2px solid #ccc; - margin: 0 4px 4px 0; -} -#img_container a:hover, #img_container a:active { - border: 2px solid #000; + +#img_container a, +#img_container a:link, +#img_container a:visited { + border: 1px solid #ccc; + display: block; + position: relative; +} + +#img_container a:hover, +#img_container a:active { + border-color: #000; + z-index: 1000; + border-width: 2px; + margin: -1px; +} + +/* Video */ +#embed-code { + width: 100%; + height: 98px; } /* Submit Column */ +#viewsite { + padding: 0; + margin: 0 0 20px 0; + font-size: 10px; + clear: both; +} -div#categories { - font-size: 85%; - position: absolute; - top: 50px; - right: 16px; - width: 27%; - z-index: 2; +#viewsite .button { + margin: 0 0 0px 0; + display: block; } -div#categories h2 { - color: #333; +.wp-hidden-children .wp-hidden-child { + display: none; +} + +#category-adder { + padding: 4px 0; +} + +#category-adder h4 { + margin: 0 0 8px; +} + +#category-add input { + width: 94%; + font-family: Verdana, Arial, Helvetica, sans-serif; + font-size: 13px; + margin: 1px; + padding: 3px; +} + +#category-add select { + width: 70%; + -x-system-font: none; + border-style: solid; + border-width: 1px; + font-family: "Lucida Grande", "Bitstream Vera Sans", Verdana, Arial, sans-serif; font-size: 12px; - margin: .5em 0 .5em 1em; - padding: 0; + height: 2em; + line-height: 20px; + padding: 2px; + margin: 1px; + vertical-align: top; } -#categories-all { - overflow: auto; - padding: 0 1em 1em 1em; - height: 15em; +#category-add input#category-add-sumbit { + width: auto; } -#categories ul { +/* Categories */ +#categorydiv ul, #linkcategorydiv ul { list-style: none; padding: 0; margin: 0; } +#categorydiv ul.categorychecklist ul { + margin-left: 18px; +} + +#categorydiv div.ui-tabs-panel { + height: 150px; + overflow: auto; +} + +ul.categorychecklist li { + margin: 0; + padding: 0; + line-height: 19px; +} + +/* Tags */ #tagsdiv #newtag { padding: 3px; margin-right: 5px; - width: 16em; + width: 16em; } #jaxtag { clear: both; - padding-left: 1em; margin: 0; } +#tagadd { + margin-left: 3px; +} + #tagchecklist { - padding-left: 1em; + margin-top: 3px; margin-bottom: 1em; font-size: 12px; overflow: auto; @@ -332,7 +422,7 @@ div#categories h2 { } #tagchecklist span a { - margin: 6px 0pt 0pt -9px; + margin: 6px 0 0 -9px; cursor: pointer; width: 10px; height: 10px; @@ -342,68 +432,44 @@ div#categories h2 { overflow: hidden; position: absolute; } -.submit { - -moz-border-radius-bottomleft: 3px; - -khtml-border-bottom-left-radius: 3px; - -webkit-border-bottom-left-radius: 3px; - border-bottom-left-radius: 3px; - -moz-border-radius-bottomright: 3px; - -khtml-border-bottom-right-radius: 3px; - -webkit-border-bottom-right-radius: 3px; - border-bottom-right-radius: 3px; - margin: 0; - padding: 10px; -} -.submitbox { - width: 100%; - float: right; -} -.submitbox .submit a:hover { - border-bottom-width: 1px; - border-bottom-style: solid; +#content { + width: 96% !important; + margin-left: 1%; + margin-bottom: 10px; + border: 1px solid #f1f1f1; } -.submitbox .submit input { - border: none; - text-align: left; - padding: 6px 4px; - font-size: 12px; - margin: 2px; - -moz-border-radius: 3px; - -khtml-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; - cursor: pointer; -} +/* Submit */ -.submitbox #previewview { - padding: 15px 10px; - -moz-border-radius-topleft: 3px; - -khtml-border-top-left-radius: 3px; - -webkit-border-top-left-radius: 3px; - border-top-left-radius: 3px; - -moz-border-radius-topright: 3px; - -khtml-border-top-right-radius: 3px; - -webkit-border-top-right-radius: 3px; - border-top-right-radius: 3px; +#saving { + display: inline; } -/* Video Styles */ -.video_split #extra_fields { - width: 27%; - height: 300px; - float: left; +.submit input, +.button, +.button-primary, +.button-secondary, +.button-highlighted, +#postcustomstuff .submit input { + font-family: "Lucida Grande", "Bitstream Vera Sans", Verdana, Arial, sans-serif; + text-decoration: none; + font-size: 11px !important; + line-height: 16px; + padding: 2px 8px; + cursor: pointer; + border-width: 1px; + border-style: solid; + -moz-border-radius: 11px; + -khtml-border-radius: 11px; + -webkit-border-radius: 11px; + border-radius: 11px; } -#embed_code { - border: 0; - width: 99%; - height: 200px; -} -.video_split .editor_area { - width: 70%; - float: right; +.button-primary { + background: #21759B url(../images/button-grad.png) repeat-x scroll left top; + border-color: #21759B; + color: #FFFFFF; } .ac_results { @@ -431,45 +497,32 @@ div#categories h2 { text-decoration: underline; } -.photolist { - display: none; -} - -#extra_fields small { - display: block; - margin-top: .5em; - padding-bottom: .25em; -} - #TB_ajaxContent #options { position: absolute; top: 20px; right: 25px; padding: 5px; } + #TB_ajaxContent h3 { margin-bottom: .25em; } .updated { - margin: 0; - margin-left: 15px; - margin-right: 15px; + margin: 10px 0; padding: 0; - max-width: 980px; border-width: 1px; border-style: solid; - padding: 0 0.6em; - max-width: 950px; - margin-top: 1em; - margin-bottom: 1em; + width: 99%; } -.updated p, .error p { +.updated p, +.error p { margin: 0.6em 0; + padding: 0 0.6em; } -.updated a, .error a { +.error a { text-decoration: underline; } @@ -485,7 +538,6 @@ div#categories h2 { } /* Footer */ - #footer { height: 65px; display: block; @@ -505,12 +557,10 @@ div#categories h2 { #footer p a { text-decoration: none; } - #footer p a:hover { text-decoration: underline; } - /* Utility Classes */ .centered { text-align: center; @@ -518,4 +568,4 @@ div#categories h2 { .hidden { display: none; -} \ No newline at end of file +} wp-admin/css/press-this.css @@ -1,15 +1,12 @@ -#template textarea { - font-family:monospace; -} #templateside { - float:left; + float: left; } #themeselector { - padding-right:0; + padding-right: 0; padding-left: 5px; float: left; } div.tablenav { - margin-right:0; + margin-right: 0; margin-left: 210px; } wp-admin/css/theme-editor-rtl.css @@ -1,5 +1,5 @@ #template textarea { - font-family: 'Courier New', Courier, monospace; + font-family: Consolas, Monaco, Courier, monospace; font-size: 12px; width: 97%; } @@ -11,7 +11,6 @@ #templateside { float: right; width: 190px; - margin-top:-3.4em; } #templateside h3, #postcustomstuff p.submit { @@ -23,7 +22,7 @@ h3#bordertitle { } #templateside h4 { - margin-bottom: 0px; + margin-bottom: 0; } #templateside ol, #templateside ul { @@ -33,7 +32,7 @@ h3#bordertitle { } #templateside ol li, #templateside ul li { - margin: 1px 0px; + margin: 1px 0; } #themeselector { @@ -41,6 +40,7 @@ h3#bordertitle { float: right; position: relative; bottom: 25px; + top:20px; } #themeselector select { @@ -58,7 +58,7 @@ h3#bordertitle { div.bordertitle h2 { border: none; - padding-bottom: 0px; + padding-bottom: 0; } div.tablenav { wp-admin/css/theme-editor.css @@ -1,45 +1,27 @@ -/* 2 column liquid layout */ -div.widget-liquid-left-holder { - float: right; - clear: right; - margin-right:0; - margin-left: -310px; -} -div.widget-liquid-left { - margin-right:0; - margin-left: 320px; -} -div.widget-liquid-right { - float: left; - clear: left; -} -p#widget-search { - right:auto; - left:0; -} h4.widget-title span { float: right; } h4.widget-title a { float: left; - margin-left:0; + margin-left: 0; margin-right: 1em; } ul#widget-list li.widget-list-item h4.widget-title { - float:right; + float: right; } ul#widget-list li.widget-list-item div.widget-description { margin: 0 200px 0 0; padding: 0 4em 0 0; } -.widget-control-save, .widget-control-remove { - margin-right:0; +.widget-control-save, +.widget-control-remove { + margin-right: 0; margin-left: 8px; float: right; } li.widget-list-control-item h4.widget-title a, #dragHelper li.widget-list-control-item h4.widget-title a, #draghelper li.widget-list-control-item h4.widget-title a:visited { - right:auto; + right: auto; left: 1em; } wp-admin/css/widgets-rtl.css @@ -27,13 +27,6 @@ div#available-widgets-filter { border-bottom-style: solid; } -p#widget-search { - position: absolute; - right: 0; - top: 0; - margin: 0; -} - ul#widget-list { list-style: none; margin: 0; @@ -112,8 +105,8 @@ li.widget-list-control-item { border-radius: 3px; } -li.widget-list-control-item h4, -#dragHelper li.widget-list-control-item h4, +li.widget-list-control-item h4, +#dragHelper li.widget-list-control-item h4, li.widget-sortable h4 { margin: 0; cursor: move; @@ -126,12 +119,8 @@ li.widget-sortable h4 { border-radius: 3px; } -.widget-control-save, .widget-control-remove { - padding: 3px 5px; - -moz-border-radius: 3px; - -khtml-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; +.widget-control-save, +.widget-control-remove { margin-right: 8px; float: left; text-decoration: none; @@ -149,6 +138,8 @@ li.widget-list-control-item h4.widget-title a:hover { } li.widget-list-control-item div.widget-control { + border-width: 0 1px 1px; + border-style: none solid solid; display: none; padding: 15px; font-size: 11px; @@ -161,8 +152,6 @@ li.widget-list-control-item div.widget-control p { } ul.widget-control-list div.widget-control-actions { - border-top-width: 1px; - border-top-style: solid; padding: 0.5em 0 0; } @@ -173,7 +162,7 @@ ul.widget-control-list div.widget-control-actions { div#current-widgets { padding-top: 1em; - border-width: 1px; + border-width: 1px 0 0; border-style: solid none none; } wp-admin/css/widgets.css @@ -1,36 +1,105 @@ <?php - +/** + * The custom header image script. + * + * @package WordPress + * @subpackage Administration + */ + +/** + * The custom header image class. + * + * @since unknown + * @package WordPress + * @subpackage Administration + */ class Custom_Image_Header { + + /** + * Callback for administration header. + * + * @var callback + * @since unknown + * @access private + */ var $admin_header_callback; + /** + * PHP4 Constructor - Register administration header callback. + * + * @since unknown + * @param callback $admin_header_callback + * @return Custom_Image_Header + */ function Custom_Image_Header($admin_header_callback) { $this->admin_header_callback = $admin_header_callback; } + /** + * Setup the hooks for the Custom Header admin page. + * + * @since unknown + */ function init() { $page = add_theme_page(__('Custom Image Header'), __('Custom Image Header'), 'edit_themes', 'custom-header', array(&$this, 'admin_page')); add_action("admin_print_scripts-$page", array(&$this, 'js_includes')); + add_action("admin_print_styles-$page", array(&$this, 'css_includes')); add_action("admin_head-$page", array(&$this, 'take_action'), 50); add_action("admin_head-$page", array(&$this, 'js'), 50); add_action("admin_head-$page", $this->admin_header_callback, 51); } + /** + * Get the current step. + * + * @since unknown + * + * @return int Current step + */ function step() { - $step = (int) @$_GET['step']; + if ( ! isset( $_GET['step'] ) ) + return 1; + + $step = (int) $_GET['step']; if ( $step < 1 || 3 < $step ) $step = 1; + return $step; } + /** + * Setup the enqueue for the JavaScript files. + * + * @since unknown + */ function js_includes() { $step = $this->step(); + if ( 1 == $step ) - wp_enqueue_script('colorpicker'); - elseif ( 2 == $step ) + wp_enqueue_script('farbtastic'); + elseif ( 2 == $step ) wp_enqueue_script('cropper'); } + /** + * Setup the enqueue for the CSS files + * + * @since 2.7 + */ + function css_includes() { + $step = $this->step(); + + if ( 1 == $step ) { + wp_enqueue_style('farbtastic'); + } + } + + /** + * Execute custom header modification. + * + * @since unknown + */ function take_action() { if ( isset( $_POST['textcolor'] ) ) { check_admin_referer('custom-header'); @@ -48,6 +117,11 @@ class Custom_Image_Header { } } + /** + * Execute Javascript depending on step. + * + * @since unknown + */ function js() { $step = $this->step(); if ( 1 == $step ) @@ -56,123 +130,134 @@ class Custom_Image_Header { $this->js_2(); } + /** + * Display Javascript based on Step 1. + * + * @since unknown + */ function js_1() { ?> <script type="text/javascript"> - var cp = new ColorPicker(); + var buttons = ['#name', '#desc', '#pickcolor', '#defaultcolor']; + var farbtastic; function pickColor(color) { - $('name').style.color = color; - $('desc').style.color = color; - $('textcolor').value = color; - } - function PopupWindow_hidePopup(magicword) { - if ( magicword != 'prettyplease' ) - return false; - if (this.divName != null) { - if (this.use_gebi) { - document.getElementById(this.divName).style.visibility = "hidden"; - } - else if (this.use_css) { - document.all[this.divName].style.visibility = "hidden"; - } - else if (this.use_layers) { - document.layers[this.divName].visibility = "hidden"; - } - } - else { - if (this.popupWindow && !this.popupWindow.closed) { - this.popupWindow.close(); - this.popupWindow = null; - } - } - return false; - } - function colorSelect(t,p) { - if ( cp.p == p && document.getElementById(cp.divName).style.visibility != "hidden" ) { - cp.hidePopup('prettyplease'); - } else { - cp.p = p; - cp.select(t,p); - } + jQuery('#name').css('color', color); + jQuery('#desc').css('color', color); + jQuery('#textcolor').val(color); + farbtastic.setColor(color); } + + jQuery(document).ready(function() { + jQuery('#pickcolor').click(function() { + jQuery('#colorPickerDiv').show(); + }); + + jQuery('#hidetext').click(function() { + toggle_text(); + }); + + farbtastic = jQuery.farbtastic('#colorPickerDiv', function(color) { pickColor(color); }); + pickColor('#<?php echo get_theme_mod('header_textcolor', HEADER_TEXTCOLOR); ?>'); + + <?php if ( 'blank' == get_theme_mod('header_textcolor', HEADER_TEXTCOLOR) ) { ?> + toggle_text(); + <?php } ?> + }); + + jQuery(document).mousedown(function(){ + // Make the picker disappear, since we're using it in an independant div + hide_picker(); + }); + function colorDefault() { pickColor('#<?php echo HEADER_TEXTCOLOR; ?>'); } - function hide_text() { - $('name').style.display = 'none'; - $('desc').style.display = 'none'; - $('pickcolor').style.display = 'none'; - $('defaultcolor').style.display = 'none'; - $('textcolor').value = 'blank'; - $('hidetext').value = '<?php _e('Show Text'); ?>'; -// $('hidetext').onclick = 'show_text()'; - Event.observe( $('hidetext'), 'click', show_text ); + function hide_picker(what) { + var update = false; + jQuery('#colorPickerDiv').each(function(){ + var id = jQuery(this).attr('id'); + if (id == what) { + return; + } + var display = jQuery(this).css('display'); + if (display == 'block') { + jQuery(this).fadeOut(2); + } + }); } - function show_text() { - $('name').style.display = 'block'; - $('desc').style.display = 'block'; - $('pickcolor').style.display = 'inline'; - $('defaultcolor').style.display = 'inline'; - $('textcolor').value = '<?php echo HEADER_TEXTCOLOR; ?>'; - $('hidetext').value = '<?php _e('Hide Text'); ?>'; - Event.stopObserving( $('hidetext'), 'click', show_text ); - Event.observe( $('hidetext'), 'click', hide_text ); + function toggle_text(force) { + if(jQuery('#textcolor').val() == 'blank') { + //Show text + jQuery( buttons.toString() ).show(); + jQuery('#textcolor').val('<?php echo HEADER_TEXTCOLOR; ?>'); + jQuery('#hidetext').val('<?php _e('Hide Text'); ?>'); + } + else { + //Hide text + jQuery( buttons.toString() ).hide(); + jQuery('#textcolor').val('blank'); + jQuery('#hidetext').val('<?php _e('Show Text'); ?>'); + } } - <?php if ( 'blank' == get_theme_mod('header_textcolor', HEADER_TEXTCOLOR) ) { ?> -Event.observe( window, 'load', hide_text ); - <?php } ?> + </script> <?php } + /** + * Display Javascript based on Step 2. + * + * @since unknown + */ function js_2() { ?> <script type="text/javascript"> function onEndCrop( coords, dimensions ) { - $( 'x1' ).value = coords.x1; - $( 'y1' ).value = coords.y1; - $( 'x2' ).value = coords.x2; - $( 'y2' ).value = coords.y2; - $( 'width' ).value = dimensions.width; - $( 'height' ).value = dimensions.height; + jQuery( '#x1' ).val(coords.x1); + jQuery( '#y1' ).val(coords.y1); + jQuery( '#x2' ).val(coords.x2); + jQuery( '#y2' ).val(coords.y2); + jQuery( '#width' ).val(dimensions.width); + jQuery( '#height' ).val(dimensions.height); } // with a supplied ratio - Event.observe( - window, - 'load', - function() { - var xinit = <?php echo HEADER_IMAGE_WIDTH; ?>; - var yinit = <?php echo HEADER_IMAGE_HEIGHT; ?>; - var ratio = xinit / yinit; - var ximg = $('upload').width; - var yimg = $('upload').height; - if ( yimg < yinit || ximg < xinit ) { - if ( ximg / yimg > ratio ) { - yinit = yimg; - xinit = yinit * ratio; - } else { - xinit = ximg; - yinit = xinit / ratio; - } + jQuery(document).ready(function() { + var xinit = <?php echo HEADER_IMAGE_WIDTH; ?>; + var yinit = <?php echo HEADER_IMAGE_HEIGHT; ?>; + var ratio = xinit / yinit; + var ximg = jQuery('#upload').width(); + var yimg = jQuery('#upload').height(); + if ( yimg < yinit || ximg < xinit ) { + if ( ximg / yimg > ratio ) { + yinit = yimg; + xinit = yinit * ratio; + } else { + xinit = ximg; + yinit = xinit / ratio; } - new Cropper.Img( - 'upload', - { - ratioDim: { x: xinit, y: yinit }, - displayOnInit: true, - onEndCrop: onEndCrop - } - ) } - ); + new Cropper.Img( + 'upload', + { + ratioDim: { x: xinit, y: yinit }, + displayOnInit: true, + onEndCrop: onEndCrop + } + ) + }); </script> <?php } + /** + * Display first step of custom header image page. + * + * @since unknown + */ function step_1() { if ( $_GET['updated'] ) { ?> <div id="message" class="updated fade"> @@ -181,6 +266,7 @@ Event.observe( window, 'load', hide_text ); <?php } ?> <div class="wrap"> +<?php screen_icon(); ?> <h2><?php _e('Your Header Image'); ?></h2> <p><?php _e('This is your header image. You can change the text color or upload and crop a new image.'); ?></p> @@ -191,12 +277,12 @@ Event.observe( window, 'load', hide_text ); <?php if ( !defined( 'NO_HEADER_TEXT' ) ) { ?> <form method="post" action="<?php echo admin_url('themes.php?page=custom-header&updated=true') ?>"> <input type="button" value="<?php _e('Hide Text'); ?>" onclick="hide_text()" id="hidetext" /> -<input type="button" value="<?php _e('Select a Text Color'); ?>" onclick="colorSelect($('textcolor'), 'pickcolor')" id="pickcolor" /><input type="button" value="<?php _e('Use Original Color'); ?>" onclick="colorDefault()" id="defaultcolor" /> +<input type="button" value="<?php _e('Select a Text Color'); ?>" id="pickcolor" /><input type="button" value="<?php _e('Use Original Color'); ?>" onclick="colorDefault()" id="defaultcolor" /> <?php wp_nonce_field('custom-header') ?> <input type="hidden" name="textcolor" id="textcolor" value="#<?php attribute_escape(header_textcolor()) ?>" /><input name="submit" type="submit" value="<?php _e('Save Changes'); ?>" /></form> <?php } ?> -<div id="colorPickerDiv" style="z-index: 100;background:#eee;border:1px solid #ccc;position:absolute;visibility:hidden;"> </div> +<div id="colorPickerDiv" style="z-index: 100;background:#eee;border:1px solid #ccc;position:absolute;display:none;"> </div> </div> <div class="wrap"> <h2><?php _e('Upload New Header Image'); ?></h2><p><?php _e('Here you can upload a custom header image to be shown at the top of your blog instead of the default one. On the next screen you will be able to crop the image.'); ?></p> @@ -226,6 +312,11 @@ Event.observe( window, 'load', hide_text ); } + /** + * Display second step of custom header image page. + * + * @since unknown + */ function step_2() { check_admin_referer('custom-header'); $overrides = array('test_form' => false); @@ -298,6 +389,11 @@ Event.observe( window, 'load', hide_text ); <?php } + /** + * Display third step of custom header image page. + * + * @since unknown + */ function step_3() { check_admin_referer('custom-header'); if ( $_POST['oitar'] > 1 ) { @@ -339,6 +435,11 @@ Event.observe( window, 'load', hide_text ); return $this->finished(); } + /** + * Display last step of custom header image page. + * + * @since unknown + */ function finished() { ?> <div class="wrap"> @@ -350,6 +451,11 @@ Event.observe( window, 'load', hide_text ); <?php } + /** + * Display the page based on the current step. + * + * @since unknown + */ function admin_page() { $step = $this->step(); if ( 1 == $step ) wp-admin/custom-header.php @@ -1,69 +1,127 @@ -<?php if ( ! defined('ABSPATH') ) die(); ?> -<table class="widefat"> - <thead> - <tr> +<?php +/** + * Edit attachments table for inclusion in administration panels. + * + * @package WordPress + * @subpackage Administration + */ -<?php $posts_columns = wp_manage_media_columns(); ?> -<?php foreach($posts_columns as $post_column_key => $column_display_name) { - if ( 'cb' === $post_column_key ) - $class = ' class="check-column"'; - elseif ( 'comments' === $post_column_key ) - $class = ' class="num"'; - else - $class = ''; -?> - <th scope="col"<?php echo $class; ?>><?php echo $column_display_name; ?></th> -<?php } ?> +if ( ! defined('ABSPATH') ) die(); +if ( have_posts() ) { ?> +<table class="widefat fixed" cellspacing="0"> + <thead> + <tr> +<?php print_column_headers('upload'); ?> </tr> </thead> + + <tfoot> + <tr> +<?php print_column_headers('upload', false); ?> + </tr> + </tfoot> + <tbody id="the-list" class="list:post"> <?php -if ( have_posts() ) { -$bgcolor = ''; add_filter('the_title','wp_specialchars'); +$alt = ''; +$posts_columns = get_column_headers('upload'); +$hidden = get_hidden_columns('upload'); while (have_posts()) : the_post(); -$class = 'alternate' == $class ? '' : 'alternate'; +$alt = ( 'alternate' == $alt ) ? '' : 'alternate'; global $current_user; $post_owner = ( $current_user->ID == $post->post_author ? 'self' : 'other' ); -$att_title = get_the_title(); -if ( empty($att_title) ) - $att_title = __('(no title)'); +$att_title = _draft_or_post_title(); ?> - <tr id='post-<?php echo $id; ?>' class='<?php echo trim( $class . ' author-' . $post_owner . ' status-' . $post->post_status ); ?>' valign="top"> + <tr id='post-<?php echo $id; ?>' class='<?php echo trim( $alt . ' author-' . $post_owner . ' status-' . $post->post_status ); ?>' valign="top"> <?php +foreach ($posts_columns as $column_name => $column_display_name ) { + $class = "class=\"$column_name column-$column_name\""; -foreach($posts_columns as $column_name=>$column_display_name) { + $style = ''; + if ( in_array($column_name, $hidden) ) + $style = ' style="display:none;"'; + + $attributes = "$class$style"; switch($column_name) { case 'cb': ?> - <th scope="row" class="check-column"><input type="checkbox" name="delete[]" value="<?php the_ID(); ?>" /></th> + <th scope="row" class="check-column"><input type="checkbox" name="media[]" value="<?php the_ID(); ?>" /></th> <?php break; case 'icon': + $attributes = 'class="column-icon media-icon"' . $style; ?> - <td class="media-icon"><?php echo wp_get_attachment_link($post->ID, array(80, 60), false, true); ?></td> + <td <?php echo $attributes ?>><?php + if ( $thumb = wp_get_attachment_image( $post->ID, array(80, 60), true ) ) { +?> + + <a href="media.php?action=edit&attachment_id=<?php the_ID(); ?>" title="<?php echo attribute_escape(sprintf(__('Edit "%s"'), $att_title)); ?>"> + <?php echo $thumb; ?> + </a> + +<?php } + ?></td> <?php // TODO break; case 'media': ?> - <td><strong><a href="media.php?action=edit&attachment_id=<?php the_ID(); ?>" title="<?php echo attribute_escape(sprintf(__('Edit "%s"'), $att_title)); ?>"><?php echo $att_title; ?></a></strong><br /> + <td <?php echo $attributes ?>><strong><a href="<?php echo get_edit_post_link( $post->ID ); ?>" title="<?php echo attribute_escape(sprintf(__('Edit "%s"'), $att_title)); ?>"><?php echo $att_title; ?></a></strong><br /> <?php echo strtoupper(preg_replace('/^.*?\.(\w+)$/', '$1', get_attached_file($post->ID))); ?> - <?php do_action('manage_media_media_column', $post->ID); ?> - </td> + <p> + <?php + $actions = array(); + if ( current_user_can('edit_post', $post->ID) ) + $actions['edit'] = '<a href="' . get_edit_post_link($post->ID, true) . '">' . __('Edit') . '</a>'; + if ( current_user_can('delete_post', $post->ID) ) + $actions['delete'] = "<a class='submitdelete' href='" . wp_nonce_url("post.php?action=delete&post=$post->ID", 'delete-post_' . $post->ID) . "' onclick=\"if ( confirm('" . js_escape(sprintf( ('draft' == $post->post_status) ? __("You are about to delete this attachment '%s'\n 'Cancel' to stop, 'OK' to delete.") : __("You are about to delete this attachment '%s'\n 'Cancel' to stop, 'OK' to delete."), $post->post_title )) . "') ) { return true;}return false;\">" . __('Delete') . "</a>"; + $actions['view'] = '<a href="' . get_permalink($post->ID) . '" title="' . attribute_escape(sprintf(__('View "%s"'), $title)) . '" rel="permalink">' . __('View') . '</a>'; + $action_count = count($actions); + $i = 0; + echo '<div class="row-actions">'; + foreach ( $actions as $action => $link ) { + ++$i; + ( $i == $action_count ) ? $sep = '' : $sep = ' | '; + echo "<span class='$action'>$link$sep</span>"; + } + echo '</div>'; + ?></p></td> + <?php + break; + + case 'author': + ?> + <td <?php echo $attributes ?>><?php the_author() ?></td> + <?php + break; + + case 'tags': + ?> + <td <?php echo $attributes ?>><?php + $tags = get_the_tags(); + if ( !empty( $tags ) ) { + $out = array(); + foreach ( $tags as $c ) + $out[] = "<a href='edit.php?tag=$c->slug'> " . wp_specialchars(sanitize_term_field('name', $c->name, $c->term_id, 'post_tag', 'display')) . "</a>"; + echo join( ', ', $out ); + } else { + _e('No Tags'); + } + ?></td> <?php break; case 'desc': ?> - <td><?php echo has_excerpt() ? $post->post_excerpt : ''; ?></td> + <td <?php echo $attributes ?>><?php echo has_excerpt() ? $post->post_excerpt : ''; ?></td> <?php break; @@ -73,7 +131,7 @@ foreach($posts_columns as $column_name=>$column_display_name) { } else { $t_time = get_the_time(__('Y/m/d g:i:s A')); $m_time = $post->post_date; - $time = get_post_time( 'G', true ); + $time = get_post_time( 'G', true, $post ); if ( ( abs($t_diff = time() - $time) ) < 86400 ) { if ( $t_diff < 0 ) $h_time = sprintf( __('%s from now'), human_time_diff( $time ) ); @@ -84,38 +142,36 @@ foreach($posts_columns as $column_name=>$column_display_name) { } } ?> - <td><?php echo $h_time ?></td> + <td <?php echo $attributes ?>><?php echo $h_time ?></td> <?php break; case 'parent': - $title = __('(no title)'); // override below if ( $post->post_parent > 0 ) { if ( get_post($post->post_parent) ) { - $parent_title = get_the_title($post->post_parent); - if ( !empty($parent_title) ) - $title = $parent_title; + $title =_draft_or_post_title($post->post_parent); } ?> - <td><strong><a href="post.php?action=edit&post=<?php echo $post->post_parent; ?>"><?php echo $title ?></a></strong></td> + <td <?php echo $attributes ?>><strong><a href="<?php echo get_edit_post_link( $post->post_parent ); ?>"><?php echo $title ?></a></strong>, <?php echo get_the_time(__('Y/m/d')); ?></td> <?php } else { ?> - <td> </td> + <td <?php echo $attributes ?>> </td> <?php } break; case 'comments': + $attributes = 'class="comments column-comments num"' . $style; ?> - <td class="num"><div class="post-com-count-wrapper"> + <td <?php echo $attributes ?>><div class="post-com-count-wrapper"> <?php $left = get_pending_comments_num( $post->ID ); $pending_phrase = sprintf( __('%s pending'), number_format( $left ) ); if ( $left ) echo '<strong>'; - comments_number("<a href='upload.php?attachment_id=$id' title='$pending_phrase' class='post-com-count'><span class='comment-count'>" . __('0') . '</span></a>', "<a href='upload.php?attachment_id=$id' title='$pending_phrase' class='post-com-count'><span class='comment-count'>" . __('1') . '</span></a>', "<a href='upload.php?attachment_id=$id' title='$pending_phrase' class='post-com-count'><span class='comment-count'>" . __('%') . '</span></a>'); + comments_number("<a href='edit-comments.php?p=$id' title='$pending_phrase' class='post-com-count'><span class='comment-count'>" . __('0') . '</span></a>', "<a href='edit-comments.php?p=$id' title='$pending_phrase' class='post-com-count'><span class='comment-count'>" . __('1') . '</span></a>', "<a href='edit-comments.php?p=$id' title='$pending_phrase' class='post-com-count'><span class='comment-count'>" . __('%') . '</span></a>'); if ( $left ) echo '</strong>'; ?> @@ -123,30 +179,32 @@ foreach($posts_columns as $column_name=>$column_display_name) { <?php break; - case 'location': + case 'actions': ?> - <td><a href="<?php the_permalink(); ?>"><?php _e('Permalink'); ?></a></td> + <td <?php echo $attributes ?>> + <a href="media.php?action=edit&attachment_id=<?php the_ID(); ?>" title="<?php echo attribute_escape(sprintf(__('Edit "%s"'), $att_title)); ?>"><?php _e('Edit'); ?></a> | + <a href="<?php the_permalink(); ?>"><?php _e('Get permalink'); ?></a> + </td> <?php break; default: ?> - <td><?php do_action('manage_media_custom_column', $column_name, $id); ?></td> + <td <?php echo $attributes ?>><?php do_action('manage_media_custom_column', $column_name, $id); ?></td> <?php break; } } ?> </tr> -<?php -endwhile; -} else { -?> - <tr style='background-color: <?php echo $bgcolor; ?>'> - <td colspan="8"><?php _e('No posts found.') ?></td> - </tr> +<?php endwhile; ?> + </tbody> +</table> +<?php } else { ?> + +<p><?php _e('No posts found.') ?></p> + <?php } // end if ( have_posts() ) ?> - </tbody> -</table> + wp-admin/edit-attachment-rows.php @@ -1,28 +1,51 @@ <?php -if ( ! empty($cat_ID) ) { - $heading = __('Edit Category'); - $submit_text = __('Edit Category'); - $form = '<form name="editcat" id="editcat" method="post" action="categories.php" class="validate">'; - $action = 'editedcat'; - $nonce_action = 'update-category_' . $cat_ID; - do_action('edit_category_form_pre', $category); -} else { - $heading = __('Add Category'); - $submit_text = __('Add Category'); - $form = '<form name="addcat" id="addcat" method="post" action="categories.php" class="add:the-list: validate">'; - $action = 'addcat'; - $nonce_action = 'add-category'; - do_action('add_category_form_pre', $category); +/** + * Edit category form for inclusion in administration panels. + * + * @package WordPress + * @subpackage Administration + */ + +/** + * @var object + */ +if ( ! isset( $category ) ) + $category = (object) array(); + +/** + * @ignore + * @since 2.7 + * @internal Used to prevent errors in page when no category is being edited. + * + * @param object $category + */ +function _fill_empty_category(&$category) { + if ( ! isset( $category->name ) ) + $category->name = ''; + + if ( ! isset( $category->slug ) ) + $category->slug = ''; + + if ( ! isset( $category->parent ) ) + $category->parent = ''; + + if ( ! isset( $category->description ) ) + $category->description = ''; } + +do_action('edit_category_form_pre', $category); + +_fill_empty_category($category); ?> <div class="wrap"> -<h2><?php echo $heading ?></h2> +<?php screen_icon(); ?> +<h2><?php _e('Edit Category'); ?></h2> <div id="ajax-response"></div> -<?php echo $form ?> -<input type="hidden" name="action" value="<?php echo $action ?>" /> +<form name="editcat" id="editcat" method="post" action="categories.php" class="validate"> +<input type="hidden" name="action" value="editedcat" /> <input type="hidden" name="cat_ID" value="<?php echo $category->term_id ?>" /> -<?php wp_nonce_field($nonce_action); ?> +<?php wp_original_referer_field(true, 'previous'); wp_nonce_field('update-category_' . $cat_ID); ?> <table class="form-table"> <tr class="form-field form-required"> <th scope="row" valign="top"><label for="cat_name"><?php _e('Category Name') ?></label></th> @@ -47,7 +70,7 @@ if ( ! empty($cat_ID) ) { <?php _e('The description is not prominent by default, however some themes may show it.'); ?></td> </tr> </table> -<p class="submit"><input type="submit" class="button" name="submit" value="<?php echo $submit_text ?>" /></p> +<p class="submit"><input type="submit" class="button-primary" name="submit" value="<?php _e('Update Category'); ?>" /></p> <?php do_action('edit_category_form', $category); ?> </form> </div> wp-admin/edit-category-form.php @@ -1,35 +1,64 @@ <?php +/** + * Edit Comments Administration Panel. + * + * @package WordPress + * @subpackage Administration + */ + +/** WordPress Administration Bootstrap */ require_once('admin.php'); -$title = __('Edit Comments'); -$parent_file = 'edit-comments.php'; -wp_enqueue_script( 'admin-comments' ); -wp_enqueue_script('admin-forms'); +wp_enqueue_script('admin-comments'); +enqueue_comment_hotkeys_js(); -if ( !empty( $_REQUEST['delete_comments'] ) ) { +$post_id = isset($_REQUEST['p']) ? (int) $_REQUEST['p'] : 0; + +if ( ( isset( $_REQUEST['delete_all_spam'] ) || isset( $_REQUEST['delete_all_spam2'] ) ) && !empty( $_REQUEST['pagegen_timestamp'] ) ) { + check_admin_referer('bulk-spam-delete', '_spam_nonce'); + + $delete_time = $wpdb->escape( $_REQUEST['pagegen_timestamp'] ); + $deleted_spam = $wpdb->query( "DELETE FROM $wpdb->comments WHERE comment_approved = 'spam' AND '$delete_time' > comment_date_gmt" ); + + $redirect_to = 'edit-comments.php?comment_status=spam&deleted=' . (int) $deleted_spam; + if ( $post_id ) + $redirect_to = add_query_arg( 'p', absint( $post_id ), $redirect_to ); + wp_redirect( $redirect_to ); +} elseif ( isset($_REQUEST['delete_comments']) && isset($_REQUEST['action']) && ( -1 != $_REQUEST['action'] || -1 != $_REQUEST['action2'] ) ) { check_admin_referer('bulk-comments'); + $doaction = ( -1 != $_REQUEST['action'] ) ? $_REQUEST['action'] : $_REQUEST['action2']; + + $deleted = $approved = $unapproved = $spammed = 0; + foreach ( (array) $_REQUEST['delete_comments'] as $comment_id) : // Check the permissions on each + $comment_id = (int) $comment_id; + $_post_id = (int) $wpdb->get_var( $wpdb->prepare( "SELECT comment_post_ID FROM $wpdb->comments WHERE comment_ID = %d", $comment_id) ); - $comments_deleted = $comments_approved = $comments_unapproved = $comments_spammed = 0; - foreach ($_REQUEST['delete_comments'] as $comment) : // Check the permissions on each - $comment = (int) $comment; - $post_id = (int) $wpdb->get_var( $wpdb->prepare( "SELECT comment_post_ID FROM $wpdb->comments WHERE comment_ID = %d", $comment) ); - if ( !current_user_can('edit_post', $post_id) ) + if ( !current_user_can('edit_post', $_post_id) ) continue; - if ( !empty( $_REQUEST['spamit'] ) ) { - wp_set_comment_status($comment, 'spam'); - $comments_spammed++; - } elseif ( !empty( $_REQUEST['deleteit'] ) ) { - wp_set_comment_status($comment, 'delete'); - $comments_deleted++; - } elseif ( !empty( $_REQUEST['approveit'] ) ) { - wp_set_comment_status($comment, 'approve'); - $comments_approved++; - } elseif ( !empty( $_REQUEST['unapproveit'] ) ) { - wp_set_comment_status($comment, 'hold'); - $comments_unapproved++; + + switch( $doaction ) { + case 'markspam' : + wp_set_comment_status($comment_id, 'spam'); + $spammed++; + break; + case 'delete' : + wp_set_comment_status($comment_id, 'delete'); + $deleted++; + break; + case 'approve' : + wp_set_comment_status($comment_id, 'approve'); + $approved++; + break; + case 'unapprove' : + wp_set_comment_status($comment_id, 'hold'); + $unapproved++; + break; } endforeach; - $redirect_to = basename( __FILE__ ) . '?deleted=' . $comments_deleted . '&approved=' . $comments_approved . '&spam=' . $comments_spammed . '&unapproved=' . $comments_unapproved; + + $redirect_to = 'edit-comments.php?deleted=' . $deleted . '&approved=' . $approved . '&spam=' . $spammed . '&unapproved=' . $unapproved; + if ( $post_id ) + $redirect_to = add_query_arg( 'p', absint( $post_id ), $redirect_to ); if ( isset($_REQUEST['apage']) ) $redirect_to = add_query_arg( 'apage', absint($_REQUEST['apage']), $redirect_to ); if ( !empty($_REQUEST['mode']) ) @@ -39,29 +68,34 @@ if ( !empty( $_REQUEST['delete_comments'] ) ) { if ( !empty($_REQUEST['s']) ) $redirect_to = add_query_arg('s', $_REQUEST['s'], $redirect_to); wp_redirect( $redirect_to ); -} elseif ( !empty($_GET['_wp_http_referer']) ) { - wp_redirect(remove_query_arg(array('_wp_http_referer', '_wpnonce'), stripslashes($_SERVER['REQUEST_URI']))); +} elseif ( isset($_GET['_wp_http_referer']) && ! empty($_GET['_wp_http_referer']) ) { + wp_redirect( remove_query_arg( array('_wp_http_referer', '_wpnonce'), stripslashes($_SERVER['REQUEST_URI']) ) ); exit; } +if ( $post_id ) + $title = sprintf(__('Edit Comments on “%s”'), wp_html_excerpt(_draft_or_post_title($post_id), 50)); +else + $title = __('Edit Comments'); + require_once('admin-header.php'); -if ( empty($_GET['mode']) ) - $mode = 'detail'; -else - $mode = attribute_escape($_GET['mode']); +$mode = ( ! isset($_GET['mode']) || empty($_GET['mode']) ) ? 'detail' : attribute_escape($_GET['mode']); -if ( isset($_GET['comment_status']) ) - $comment_status = attribute_escape($_GET['comment_status']); -else - $comment_status = ''; +$comment_status = !empty($_GET['comment_status']) ? attribute_escape($_GET['comment_status']) : ''; + +$comment_type = !empty($_GET['comment_type']) ? attribute_escape($_GET['comment_type']) : ''; + +$search_dirty = ( isset($_GET['s']) ) ? $_GET['s'] : ''; +$search = attribute_escape( $search_dirty ); ?> + +<div class="wrap"> +<?php screen_icon(); ?> +<h2><?php echo wp_specialchars( $title ); +if ( isset($_GET['s']) && $_GET['s'] ) + printf( '<span class="subtitle">' . sprintf( __( 'Search results for “%s”' ), wp_html_excerpt( wp_specialchars( stripslashes( $_GET['s'] ) ), 50 ) ) . '</span>' ); ?> +</h2> -if ( isset($_GET['s']) ) - $search_dirty = $_GET['s']; -else - $search_dirty = ''; -$search = attribute_escape( $search_dirty ); -?> <?php if ( isset( $_GET['approved'] ) || isset( $_GET['deleted'] ) || isset( $_GET['spam'] ) ) { $approved = isset( $_GET['approved'] ) ? (int) $_GET['approved'] : 0; @@ -90,50 +124,61 @@ if ( isset( $_GET['approved'] ) || isset( $_GET['deleted'] ) || isset( $_GET['sp } } ?> -<div class="wrap"> -<form id="posts-filter" action="" method="get"> -<h2><?php _e('Manage Comments'); ?></h2> +<form id="comments-form" action="" method="get"> <ul class="subsubsub"> <?php $status_links = array(); -$num_comments = wp_count_comments(); -$stati = array('moderated' => sprintf(__ngettext('Awaiting Moderation (%s)', 'Awaiting Moderation (%s)', number_format_i18n($num_comments->moderated) ), "<span class='comment-count'>" . number_format_i18n($num_comments->moderated) . "</span>"), 'approved' => _c('Approved|plural')); +$num_comments = ( $post_id ) ? wp_count_comments( $post_id ) : wp_count_comments(); +//, number_format_i18n($num_comments->moderated) ), "<span class='comment-count'>" . number_format_i18n($num_comments->moderated) . "</span>"), +//, number_format_i18n($num_comments->spam) ), "<span class='spam-comment-count'>" . number_format_i18n($num_comments->spam) . "</span>") +$stati = array( + 'all' => __ngettext_noop('All', 'All'), // singular not used + 'moderated' => __ngettext_noop('Pending (<span class="pending-count">%s</span>)', 'Pending (<span class="pending-count">%s</span>)'), + 'approved' => __ngettext_noop('Approved', 'Approved'), // singular not used + 'spam' => __ngettext_noop('Spam (<span class="spam-count">%s</span>)', 'Spam (<span class="spam-count">%s</span>)') + ); $class = ( '' === $comment_status ) ? ' class="current"' : ''; -$status_links[] = "<li><a href=\"edit-comments.php\"$class>".__('Show All Comments')."</a>"; +// $status_links[] = "<li><a href='edit-comments.php'$class>" . __( 'All' ) . '</a>'; +$link = 'edit-comments.php'; +if ( !empty($comment_type) && 'all' != $comment_type ) + $link = add_query_arg( 'comment_type', $comment_type, $link ); foreach ( $stati as $status => $label ) { $class = ''; - if ( $status == $comment_status ) + if ( str_replace( 'all', '', $status ) == $comment_status ) $class = ' class="current"'; - - $status_links[] = "<li><a href=\"edit-comments.php?comment_status=$status\"$class>" . $label . '</a>'; + if ( !isset( $num_comments->$status ) ) + $num_comments->$status = 10; + if ( 'all' != $status ) + $link = add_query_arg( 'comment_status', $status, $link ); + if ( $post_id ) + $link = add_query_arg( 'p', absint( $post_id ), $link ); + /* + // I toyed with this, but decided against it. Leaving it in here in case anyone thinks it is a good idea. ~ Mark + if ( !empty( $_GET['s'] ) ) + $link = add_query_arg( 's', attribute_escape( stripslashes( $_GET['s'] ) ), $link ); + */ + $status_links[] = "<li class='$status'><a href='$link'$class>" . sprintf( + __ngettext( $label[0], $label[1], $num_comments->$status ), + number_format_i18n( $num_comments->$status ) + ) . '</a>'; } $status_links = apply_filters( 'comment_status_links', $status_links ); -echo implode(' | </li>', $status_links) . '</li>'; +echo implode( " |</li>\n", $status_links) . '</li>'; unset($status_links); ?> </ul> -<p id="post-search"> - <label class="hidden" for="post-search-input"><?php _e( 'Search Comments' ); ?>:</label> - <input type="text" id="post-search-input" name="s" value="<?php echo $search; ?>" /> +<p class="search-box"> + <label class="hidden" for="comment-search-input"><?php _e( 'Search Comments' ); ?>:</label> + <input type="text" class="search-input" id="comment-search-input" name="s" value="<?php _admin_search_query(); ?>" /> <input type="submit" value="<?php _e( 'Search Comments' ); ?>" class="button" /> </p> -<input type="hidden" name="mode" value="<?php echo $mode; ?>" /> -<input type="hidden" name="comment_status" value="<?php echo $comment_status; ?>" /> -</form> - -<ul class="view-switch"> - <li <?php if ( 'detail' == $mode ) echo "class='current'" ?>><a href="<?php echo clean_url(add_query_arg('mode', 'detail', $_SERVER['REQUEST_URI'])) ?>"><?php _e('Detail View') ?></a></li> - <li <?php if ( 'list' == $mode ) echo "class='current'" ?>><a href="<?php echo clean_url(add_query_arg('mode', 'list', $_SERVER['REQUEST_URI'])) ?>"><?php _e('List View') ?></a></li> -</ul> - <?php - $comments_per_page = apply_filters('comments_per_page', 20, $comment_status); if ( isset( $_GET['apage'] ) ) @@ -143,7 +188,17 @@ else $start = $offset = ( $page - 1 ) * $comments_per_page; -list($_comments, $total) = _wp_get_comment_list( $comment_status, $search_dirty, $start, $comments_per_page + 5 ); // Grab a few extra +list($_comments, $total) = _wp_get_comment_list( $comment_status, $search_dirty, $start, $comments_per_page + 5, $post_id, $comment_type ); // Grab a few extra + +$_comment_post_ids = array(); +foreach ( $_comments as $_c ) { + $_comment_post_ids[] = $_c->comment_post_ID; +} +$_comment_pending_count_temp = (array) get_pending_comments_num($_comment_post_ids); +foreach ( (array) $_comment_post_ids as $_cpid ) + $_comment_pending_count[$_cpid] = isset( $_comment_pending_count_temp[$_cpid] ) ? $_comment_pending_count_temp[$_cpid] : 0; +if ( empty($_comment_pending_count) ) + $_comment_pending_count = array(); $comments = array_slice($_comments, 0, $comments_per_page); $extra_comments = array_slice($_comments, $comments_per_page); @@ -151,54 +206,98 @@ $extra_comments = array_slice($_comments, $comments_per_page); $page_links = paginate_links( array( 'base' => add_query_arg( 'apage', '%#%' ), 'format' => '', + 'prev_text' => __('«'), + 'next_text' => __('»'), 'total' => ceil($total / $comments_per_page), 'current' => $page )); ?> -<form id="comments-form" action="" method="post"> +<input type="hidden" name="mode" value="<?php echo $mode; ?>" /> +<?php if ( $post_id ) : ?> +<input type="hidden" name="p" value="<?php echo intval( $post_id ); ?>" /> +<?php endif; ?> +<input type="hidden" name="comment_status" value="<?php echo $comment_status; ?>" /> +<input type="hidden" name="pagegen_timestamp" value="<?php echo current_time('mysql', 1); ?>" /> <div class="tablenav"> -<?php -if ( $page_links ) - echo "<div class='tablenav-pages'>$page_links</div>"; -?> +<?php if ( $page_links ) : ?> +<div class="tablenav-pages"><?php $page_links_text = sprintf( '<span class="displaying-num">' . __( 'Displaying %s–%s of %s' ) . '</span>%s', + number_format_i18n( $start + 1 ), + number_format_i18n( min( $page * $comments_per_page, $total ) ), + number_format_i18n( $total ), + $page_links +); echo $page_links_text; ?></div> +<?php endif; ?> -<div class="alignleft"> -<?php if ( 'approved' != $comment_status ): ?> -<input type="submit" value="<?php _e('Approve'); ?>" name="approveit" class="button-secondary" /> +<div class="alignleft actions"> +<select name="action"> +<option value="-1" selected="selected"><?php _e('Bulk Actions') ?></option> +<?php if ( empty($comment_status) || 'approved' == $comment_status ): ?> +<option value="unapprove"><?php _e('Unapprove'); ?></option> <?php endif; ?> -<input type="submit" value="<?php _e('Mark as Spam'); ?>" name="spamit" class="button-secondary" /> -<?php if ( 'moderated' != $comment_status ): ?> -<input type="submit" value="<?php _e('Unapprove'); ?>" name="unapproveit" class="button-secondary" /> +<?php if ( empty($comment_status) || 'moderated' == $comment_status || 'spam' == $comment_status ): ?> +<option value="approve"><?php _e('Approve'); ?></option> <?php endif; ?> -<input type="submit" value="<?php _e('Delete'); ?>" name="deleteit" class="button-secondary delete" /> -<?php do_action('manage_comments_nav', $comment_status); ?> +<?php if ( 'spam' != $comment_status ): ?> +<option value="markspam"><?php _e('Mark as Spam'); ?></option> +<?php endif; ?> +<option value="delete"><?php _e('Delete'); ?></option> +</select> +<input type="submit" name="doaction" id="doaction" value="<?php _e('Apply'); ?>" class="button-secondary apply" /> <?php wp_nonce_field('bulk-comments'); ?> + +<?php if ( $comment_status ) echo "<input type='hidden' name='comment_status' value='$comment_status' />\n"; ?> +<select name="comment_type"> + <option value="all"><?php _e('Show all comment types'); ?></option> +<?php + $comment_types = apply_filters( 'admin_comment_types_dropdown', array( + 'comment' => __('Comments'), + 'pings' => __('Pings'), + ) ); + + foreach ( $comment_types as $type => $label ) { + echo " <option value='$type'"; + selected( $comment_type, $type ); + echo ">$label</option>\n"; + } +?> +</select> +<input type="submit" id="post-query-submit" value="<?php _e('Filter'); ?>" class="button-secondary" /> + <?php if ( isset($_GET['apage']) ) { ?> <input type="hidden" name="apage" value="<?php echo absint( $_GET['apage'] ); ?>" /> +<?php } + +if ( 'spam' == $comment_status ) { + wp_nonce_field('bulk-spam-delete', '_spam_nonce'); ?> +<input type="submit" name="delete_all_spam" value="<?php _e('Delete All Spam'); ?>" class="button-secondary apply" /> <?php } ?> +<?php do_action('manage_comments_nav', $comment_status); ?> </div> <br class="clear" /> </div> -<br class="clear" /> -<?php -if ($comments) { -?> -<table class="widefat"> +<div class="clear"></div> + +<?php if ( $comments ) { ?> +<table class="widefat comments fixed" cellspacing="0"> <thead> - <tr> - <th scope="col" class="check-column"><input type="checkbox" /></th> - <th scope="col"><?php _e('Comment') ?></th> - <th scope="col"><?php _e('Date') ?></th> - <th scope="col" class="action-links"><?php _e('Actions') ?></th> - </tr> + <tr> +<?php print_column_headers('edit-comments'); ?> + </tr> </thead> + +<tfoot> + <tr> +<?php print_column_headers('edit-comments', false); ?> + </tr> +</tfoot> + <tbody id="the-comment-list" class="list:comment"> <?php foreach ($comments as $comment) @@ -213,6 +312,37 @@ if ($comments) { </tbody> </table> +<div class="tablenav"> +<?php +if ( $page_links ) + echo "<div class='tablenav-pages'>$page_links_text</div>"; +?> + +<div class="alignleft actions"> +<select name="action2"> +<option value="-1" selected="selected"><?php _e('Bulk Actions') ?></option> +<?php if ( empty($comment_status) || 'approved' == $comment_status ): ?> +<option value="unapprove"><?php _e('Unapprove'); ?></option> +<?php endif; ?> +<?php if ( empty($comment_status) || 'moderated' == $comment_status ): ?> +<option value="approve"><?php _e('Approve'); ?></option> +<?php endif; ?> +<?php if ( 'spam' != $comment_status ): ?> +<option value="markspam"><?php _e('Mark as Spam'); ?></option> +<?php endif; ?> +<option value="delete"><?php _e('Delete'); ?></option> +</select> +<input type="submit" name="doaction2" id="doaction2" value="<?php _e('Apply'); ?>" class="button-secondary apply" /> + +<?php if ( 'spam' == $comment_status ) { ?> +<input type="submit" name="delete_all_spam2" value="<?php _e('Delete All Spam'); ?>" class="button-secondary apply" /> +<?php } ?> +<?php do_action('manage_comments_nav', $comment_status); ?> +</div> + +<br class="clear" /> +</div> + </form> <form id="get-extra-comments" method="post" action="" class="add:the-extra-comment-list:" style="display: none;"> @@ -220,33 +350,39 @@ if ($comments) { <input type="hidden" name="mode" value="<?php echo $mode; ?>" /> <input type="hidden" name="comment_status" value="<?php echo $comment_status; ?>" /> <input type="hidden" name="page" value="<?php echo isset($_REQUEST['page']) ? absint( $_REQUEST['page'] ) : 1; ?>" /> + <input type="hidden" name="p" value="<?php echo attribute_escape( $post_id ); ?>" /> + <input type="hidden" name="comment_type" value="<?php echo attribute_escape( $comment_type ); ?>" /> <?php wp_nonce_field( 'add-comment', '_ajax_nonce', false ); ?> </form> <div id="ajax-response"></div> -<?php -} elseif ( 'moderated' == $_GET['comment_status'] ) { -?> -<p> -<?php _e('No comments awaiting moderation… yet.') ?> -</p> -<?php -} else { -?> -<p> -<?php _e('No results found.') ?> -</p> -<?php -} -?> -<div class="tablenav"> -<?php -if ( $page_links ) - echo "<div class='tablenav-pages'>$page_links</div>"; -?> -<br class="clear" /> -</div> +<?php } elseif ( 'moderated' == $_GET['comment_status'] ) { ?> +<p><?php _e('No comments awaiting moderation… yet.') ?></p> +</form> + +<?php } else { ?> +<p><?php _e('No results found.') ?></p> +</form> + +<?php } ?> </div> -<?php include('admin-footer.php'); ?> +<script type="text/javascript"> +/* <![CDATA[ */ +(function($){ + $(document).ready(function(){ + $('#doaction, #doaction2').click(function(){ + if ( $('select[name^="action"]').val() == 'delete' ) { + var m = '<?php echo js_escape(__("You are about to delete the selected comments.\n 'Cancel' to stop, 'OK' to delete.")); ?>'; + return showNotice.warn(m); + } + }); + }); +})(jQuery); +/* ]]> */ +</script> + +<?php +wp_comment_reply('-1', true, 'detail'); +include('admin-footer.php'); ?> wp-admin/edit-comments.php @@ -1,12 +1,31 @@ <?php +/** + * Post advanced form for inclusion in the administration panels. + * + * @package WordPress + * @subpackage Administration + */ + +/** + * Post ID global + * @name $post_ID + * @var int + */ +if ( ! isset( $post_ID ) ) + $post_ID = 0; +else + $post_ID = (int) $post_ID; $action = isset($action) ? $action : ''; if ( isset($_GET['message']) ) $_GET['message'] = absint( $_GET['message'] ); -$messages[1] = sprintf( __( 'Post updated. Continue editing below or <a href="%s">go back</a>.' ), attribute_escape( stripslashes( $_GET['_wp_original_http_referer'] ) ) ); +$messages[1] = sprintf( __( 'Post updated. Continue editing below or <a href="%s">go back</a>.' ), attribute_escape( stripslashes( ( isset( $_GET['_wp_original_http_referer'] ) ? $_GET['_wp_original_http_referer'] : '') ) ) ); $messages[2] = __('Custom field updated.'); $messages[3] = __('Custom field deleted.'); $messages[4] = __('Post updated.'); +$messages[6] = sprintf(__('Post published. <a href="%s">View post</a>'), get_permalink($post_ID)); +$messages[7] = __('Post saved.'); +$messages[8] = sprintf(__('Post submitted. <a href="%s">Preview post</a>'), add_query_arg( 'preview', 'true', get_permalink($post_ID) ) ); if ( isset($_GET['revision']) ) $messages[5] = sprintf( __('Post restored to revision from %s'), wp_post_revision_title( (int) $_GET['revision'], false ) ); @@ -14,21 +33,20 @@ if ( isset($_GET['revision']) ) $notice = false; $notices[1] = __( 'There is an autosave of this post that is more recent than the version below. <a href="%s">View the autosave</a>.' ); -if ( !isset($post_ID) || 0 == $post_ID ) { +if ( 0 == $post_ID ) { $form_action = 'post'; $temp_ID = -1 * time(); // don't change this formula without looking at wp_write_post() $form_extra = "<input type='hidden' id='post_ID' name='temp_ID' value='$temp_ID' />"; $autosave = false; } else { - $post_ID = (int) $post_ID; $form_action = 'editpost'; $form_extra = "<input type='hidden' id='post_ID' name='post_ID' value='$post_ID' />"; - $autosave = wp_get_post_autosave( $post_id ); + $autosave = wp_get_post_autosave( $post_ID ); // Detect if there exists an autosave newer than the post and if that autosave is different than the post if ( $autosave && mysql2date( 'U', $autosave->post_modified_gmt ) > mysql2date( 'U', $post->post_modified_gmt ) ) { foreach ( _wp_post_revision_fields() as $autosave_field => $_autosave_field ) { - if ( wp_text_diff( $autosave->$autosave_field, $post->$autosave_field ) ) { + if ( normalize_whitespace( $autosave->$autosave_field ) != normalize_whitespace( $post->$autosave_field ) ) { $notice = sprintf( $notices[1], get_edit_post_link( $autosave->ID ) ); break; } @@ -37,215 +55,235 @@ if ( !isset($post_ID) || 0 == $post_ID ) { } } +// All meta boxes should be defined and added before the first do_meta_boxes() call (or potentially during the do_meta_boxes action). + +/** + * Display post submit form fields. + * + * @since 2.7.0 + * + * @param object $post + */ +function post_submit_meta_box($post) { + global $action; + + $can_publish = current_user_can('publish_posts'); ?> -<?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; ?> +<div class="submitbox" id="submitpost"> -<form name="post" action="post.php" method="post" id="post"> -<?php if ( (isset($mode) && 'bookmarklet' == $mode) || isset($_GET['popupurl']) ): ?> -<input type="hidden" name="mode" value="bookmarklet" /> -<?php endif; ?> +<div id="minor-publishing"> -<div class="wrap"> -<h2><?php _e('Write Post') ?></h2> -<?php +<?php // Hidden submit button early on so that the browser chooses the right button when form is submitted with Return key ?> +<div style="display:none;"> +<input type="submit" name="save" value="<?php echo attribute_escape( __('Save') ); ?>" /> +</div> -if ( !isset($post_ID) || 0 == $post_ID) - wp_nonce_field('add-post'); -else - wp_nonce_field('update-post_' . $post_ID); +<div id="minor-publishing-actions"> +<div id="save-action"> +<?php if ( 'publish' != $post->post_status && 'future' != $post->post_status && 'pending' != $post->post_status ) { ?> +<input <?php if ( 'private' == $post->post_status ) { ?>style="display:none"<?php } ?> type="submit" name="save" id="save-post" value="<?php echo attribute_escape( __('Save Draft') ); ?>" tabindex="4" class="button button-highlighted" /> +<?php } elseif ( 'pending' == $post->post_status && $can_publish ) { ?> +<input type="submit" name="save" id="save-post" value="<?php echo attribute_escape( __('Save as Pending') ); ?>" tabindex="4" class="button button-highlighted" /> +<?php } ?> +</div> -$form_pingback = '<input type="hidden" name="post_pingback" value="' . (int) get_option('default_pingback_flag') . '" id="post_pingback" />'; +<div id="preview-action"> +<?php $preview_link = 'publish' == $post->post_status ? clean_url(get_permalink($post->ID)) : clean_url(apply_filters('preview_post_link', add_query_arg('preview', 'true', get_permalink($post->ID)))); ?> -$form_prevstatus = '<input type="hidden" name="prev_status" value="' . attribute_escape( $post->post_status ) . '" />'; +<a class="preview button" href="<?php echo $preview_link; ?>" target="wp-preview" id="post-preview" tabindex="4"><?php _e('Preview'); ?></a> +<input type="hidden" name="wp-preview" id="wp-preview" value="" /> +</div> + +<div class="clear"></div> +</div><?php // /minor-publishing-actions ?> -$saveasdraft = '<input name="save" type="submit" id="save" class="button" tabindex="3" value="' . attribute_escape( __('Save and Continue Editing') ) . '" />'; +<div id="misc-publishing-actions"> +<div class="misc-pub-section<?php if ( !$can_publish ) { echo ' misc-pub-section-last'; } ?>"><label for="post_status"><?php _e('Status:') ?></label> +<b><span id="post-status-display"> +<?php +switch ( $post->post_status ) { + case 'private': + _e('Privately Published'); + break; + case 'publish': + _e('Published'); + break; + case 'future': + _e('Scheduled'); + break; + case 'pending': + _e('Pending Review'); + break; + case 'draft': + _e('Draft'); + break; +} ?> +</span></b> +<?php if ( 'publish' == $post->post_status || 'private' == $post->post_status || $can_publish ) { ?> +<a href="#post_status" <?php if ( 'private' == $post->post_status ) { ?>style="display:none;" <?php } ?>class="edit-post-status hide-if-no-js" tabindex='4'><?php _e('Edit') ?></a> -<input type="hidden" id="user-id" name="user_ID" value="<?php echo (int) $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 ); ?>" /> -<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="post-status-select" class="hide-if-js"> +<input type="hidden" name="hidden_post_status" id="hidden_post_status" value="<?php echo $post->post_status; ?>" /> +<select name='post_status' id='post_status' tabindex='4'> +<?php if ( 'publish' == $post->post_status ) : ?> +<option<?php selected( $post->post_status, 'publish' ); ?> value='publish'><?php _e('Published') ?></option> +<?php elseif ( 'private' == $post->post_status ) : ?> +<option<?php selected( $post->post_status, 'private' ); ?> value='publish'><?php _e('Privately Published') ?></option> +<?php elseif ( 'future' == $post->post_status ) : ?> +<option<?php selected( $post->post_status, 'future' ); ?> value='future'><?php _e('Scheduled') ?></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('Draft') ?></option> +</select> + <a href="#post_status" class="save-post-status hide-if-no-js button"><?php _e('OK'); ?></a> + <a href="#post_status" class="cancel-post-status hide-if-no-js"><?php _e('Cancel'); ?></a> +</div> -<?php echo $form_extra ?> +<?php } ?> +</div><?php // /misc-pub-section ?> + +<div class="misc-pub-section " id="visibility"> +<?php _e('Visibility:'); ?> <b><span id="post-visibility-display"><?php + +if ( 'private' == $post->post_status ) { + $post->post_password = ''; + $visibility = 'private'; + $visibility_trans = __('Private'); +} elseif ( !empty( $post->post_password ) ) { + $visibility = 'password'; + $visibility_trans = __('Password protected'); +} elseif ( is_sticky( $post->ID ) ) { + $visibility = 'public'; + $visibility_trans = __('Public, Sticky'); +} else { + $visibility = 'public'; + $visibility_trans = __('Public'); +} -<div id="poststuff"> +?><?php echo wp_specialchars( $visibility_trans ); ?></span></b> <?php if ( $can_publish ) { ?> <a href="#visibility" class="edit-visibility hide-if-no-js"><?php _e('Edit'); ?></a> -<div class="submitbox" id="submitpost"> +<div id="post-visibility-select" class="hide-if-js"> +<input type="hidden" name="hidden_post_password" id="hidden-post-password" value="<?php echo attribute_escape($post->post_password); ?>" /> +<input type="checkbox" style="display:none" name="hidden_post_sticky" id="hidden-post-sticky" value="sticky" <?php checked(is_sticky($post->ID), true); ?> /> +<input type="hidden" name="hidden_post_visibility" id="hidden-post-visibility" value="<?php echo attribute_escape( $visibility ); ?>" /> -<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 Post'); ?></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 Post'); ?></a> -<?php } ?> -</div> -<div class="inside"> +<input type="radio" name="visibility" id="visibility-radio-public" value="public" <?php checked( $visibility, 'public' ); ?> /> <label for="visibility-radio-public" class="selectit"><?php _e('Public'); ?></label><br /> +<span id="sticky-span"><input id="sticky" name="sticky" type="checkbox" value="sticky" <?php checked(is_sticky($post->ID), true); ?> tabindex="4" /> <label for="sticky" class="selectit"><?php _e('Stick this post to the front page') ?></label><br /></span> +<input type="radio" name="visibility" id="visibility-radio-password" value="password" <?php checked( $visibility, 'password' ); ?> /> <label for="visibility-radio-password" class="selectit"><?php _e('Password protected'); ?></label><br /> +<span id="password-span"><label for="post_password"><?php _e('Password:'); ?></label> <input type="text" name="post_password" id="post_password" value="<?php echo attribute_escape($post->post_password); ?>" /><br /></span> +<input type="radio" name="visibility" id="visibility-radio-private" value="private" <?php checked( $visibility, 'private' ); ?> /> <label for="visibility-radio-private" class="selectit"><?php _e('Private'); ?></label><br /> -<p><strong><label for='post_status'><?php _e('Publish Status') ?></label></strong></p> <p> -<select name='post_status' id='post_status' tabindex='4'> -<?php -// only show the publish menu item if they are allowed to publish posts or they are allowed to edit this post (accounts for 'edit_published_posts' capability) -if ( current_user_can('publish_posts') OR ( $post->post_status == 'publish' AND current_user_can('edit_post', $post->ID) ) ) : -?> -<option<?php selected( $post->post_status, 'publish' ); selected( $post->post_status, 'private' );?> value='publish'><?php _e('Published') ?></option> -<?php if ( 'future' == $post->post_status ) : ?> -<option<?php selected( $post->post_status, 'future' ); ?> value='future'><?php _e('Scheduled') ?></option> -<?php endif; ?> -<?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> + <a href="#visibility" class="save-post-visibility hide-if-no-js button"><?php _e('OK'); ?></a> + <a href="#visibility" class="cancel-post-visibility hide-if-no-js"><?php _e('Cancel'); ?></a> </p> +</div> +<?php } ?> + +</div><?php // /misc-pub-section ?> + -<?php if ( current_user_can( 'publish_posts' ) ) : ?> -<p id="private-checkbox"><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 post private') ?></label></p> -<?php endif; ?> <?php -if ($post_ID) { +$datef = _c( 'M j, Y @ G:i|Publish box date format'); +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 - $stamp = __('Published on:<br />%1$s at %2$s'); - } else if ( '0000-00-00 00:00:00' == $post->post_date ) { // draft, 1 or more saves, no date specified - $stamp = __('Publish immediately'); + $stamp = __('Scheduled for: <b>%1$s</b>'); + } else if ( 'publish' == $post->post_status || 'private' == $post->post_status ) { // already published + $stamp = __('Published on: <b>%1$s</b>'); + } else if ( '0000-00-00 00:00:00' == $post->post_date_gmt ) { // draft, 1 or more saves, no date specified + $stamp = __('Publish <b>immediately</b>'); + } else if ( time() < strtotime( $post->post_date_gmt . ' +0000' ) ) { // draft, 1 or more saves, future date specified + $stamp = __('Schedule for: <b>%1$s</b>'); } else { // draft, 1 or more saves, date specified - $stamp = __('Publish on:<br />%1$s at %2$s'); + $stamp = __('Publish on: <b>%1$s</b>'); } - $date = mysql2date(get_option('date_format'), $post->post_date); - $time = mysql2date(get_option('time_format'), $post->post_date); + $date = date_i18n( $datef, strtotime( $post->post_date ) ); } else { // draft (no saves, and thus no date specified) - $stamp = __('Publish immediately'); - $date = mysql2date(get_option('date_format'), current_time('mysql')); - $time = mysql2date(get_option('time_format'), current_time('mysql')); + $stamp = __('Publish <b>immediately</b>'); + $date = date_i18n( $datef, strtotime( current_time('mysql') ) ); } ?> -<?php if ( current_user_can( 'publish_posts' ) ) : // Contributors don't get to choose the date of publish ?> -<p class="curtime"><?php printf($stamp, $date, $time); ?> - <a href="#edit_timestamp" class="edit-timestamp hide-if-no-js" tabindex='4'><?php _e('Edit') ?></a></p> - -<div id='timestampdiv' class='hide-if-js'><?php touch_time(($action == 'edit'),1,4); ?></div> +<?php if ( $can_publish ) : // Contributors don't get to choose the date of publish ?> +<div class="misc-pub-section curtime misc-pub-section-last"> + <span id="timestamp"> + <?php printf($stamp, $date); ?></span> + <a href="#edit_timestamp" class="edit-timestamp hide-if-no-js" tabindex='4'><?php _e('Edit') ?></a> + <div id="timestampdiv" class="hide-if-js"><?php touch_time(($action == 'edit'),1,4); ?></div> +</div><?php // /misc-pub-section ?> <?php endif; ?> </div> +<div class="clear"></div> +</div> -<p class="submit"> -<input type="submit" name="save" id="save-post" value="<?php _e('Save'); ?>" tabindex="4" class="button button-highlighted" /> +<div id="major-publishing-actions"> +<?php do_action('post_submitbox_start'); ?> +<div id="delete-action"> <?php -if ( !in_array( $post->post_status, array('publish', 'future') ) || 0 == $post_ID ) { -?> +if ( ( 'edit' == $action ) && current_user_can('delete_post', $post->ID) ) { ?> +<a class="submitdelete deletion" href="<?php echo wp_nonce_url("post.php?action=delete&post=$post->ID", 'delete-post_' . $post->ID); ?>" onclick="if ( confirm('<?php echo 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 post '%s'\n 'Cancel' to stop, 'OK' to delete."), $post->post_title )); ?>') ) {return true;}return false;"><?php _e('Delete'); ?></a> +<?php } ?> +</div> + +<div id="publishing-action"> +<?php +if ( !in_array( $post->post_status, array('publish', 'future', 'private') ) || 0 == $post->ID ) { ?> <?php if ( current_user_can('publish_posts') ) : ?> - <input name="publish" type="submit" class="button" id="publish" tabindex="5" accesskey="p" value="<?php _e('Publish') ?>" /> + <?php if ( !empty($post->post_date_gmt) && time() < strtotime( $post->post_date_gmt . ' +0000' ) ) : ?> + <input name="original_publish" type="hidden" id="original_publish" value="<?php _e('Schedule') ?>" /> + <input name="publish" type="submit" class="button-primary" id="publish" tabindex="5" accesskey="p" value="<?php _e('Schedule') ?>" /> + <?php else : ?> + <input name="original_publish" type="hidden" id="original_publish" value="<?php _e('Publish') ?>" /> + <input name="publish" type="submit" class="button-primary" id="publish" tabindex="5" accesskey="p" value="<?php _e('Publish') ?>" /> + <?php endif; ?> <?php else : ?> - <input name="publish" type="submit" class="button" id="publish" tabindex="5" accesskey="p" value="<?php _e('Submit for Review') ?>" /> + <input name="original_publish" type="hidden" id="original_publish" value="<?php _e('Submit for Review') ?>" /> + <input name="publish" type="submit" class="button-primary" id="publish" tabindex="5" accesskey="p" value="<?php _e('Submit for Review') ?>" /> <?php endif; ?> -<?php -} - -if ( ( 'edit' == $action) && current_user_can('delete_post', $post_ID) ) - echo "<a class='submitdelete' href='" . wp_nonce_url("post.php?action=delete&post=$post_ID", 'delete-post_' . $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 post '%s'\n 'Cancel' to stop, 'OK' to delete."), $post->post_title )) . "') ) { return true;}return false;\">" . __('Delete post') . "</a>"; -?> -<br class="clear" /> -<?php if ($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 { - 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)); -} -?> -<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 ($post_ID): ?> -<li><a href="edit.php?p=<?php echo $post_ID ?>"><?php _e('See Comments on this Post') ?></a></li> -<?php endif; ?> -<li><a href="edit-comments.php"><?php _e('Manage All Comments') ?></a></li> -<li><a href="edit.php"><?php _e('Manage All Posts') ?></a></li> -<li><a href="categories.php"><?php _e('Manage All Categories') ?></a></li> -<li><a href="edit-tags.php"><?php _e('Manage All Tags') ?></a></li> -<li><a href="edit.php?post_status=draft"><?php _e('View Drafts'); ?></a></li> -<?php do_action('post_relatedlinks_list'); ?> -</ul> - -<h5><?php _e('Shortcuts') ?></h5> -<p><?php _e('Drag-and-drop the following link to your bookmarks bar or right click it and add it to your favorites for a posting shortcut.') ?> <a href="<?php echo get_shortcut_link(); ?>" title="<?php echo attribute_escape(__('Press This')) ?>"><?php _e('Press This') ?></a></p> -</div> - -<?php do_action('submitpost_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> +<?php } else { ?> + <input name="original_publish" type="hidden" id="original_publish" value="<?php _e('Update Post') ?>" /> + <input name="save" type="submit" class="button-primary" id="publish" tabindex="5" accesskey="p" value="<?php _e('Update Post') ?>" /> +<?php } ?> </div> +<div class="clear"></div> </div> - -<div id="<?php echo user_can_richedit() ? 'postdivrich' : 'postdiv'; ?>" class="postarea"> -<h3><label for="content"><?php _e('Post') ?></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 echo $form_pingback ?> -<?php echo $form_prevstatus ?> - <?php +} +add_meta_box('submitdiv', __('Publish'), 'post_submit_meta_box', 'post', 'side', 'core'); + +/** + * Display post tags form fields. + * + * @since 2.6.0 + * + * @param object $post + */ function post_tags_meta_box($post) { ?> <p id="jaxtag"><label class="hidden" for="newtag"><?php _e('Tags'); ?></label><input type="text" name="tags_input" class="tags-input" id="tags-input" size="40" tabindex="3" value="<?php echo get_tags_to_edit( $post->ID ); ?>" /></p> <div id="tagchecklist"></div> +<p id="tagcloud-link" class="hide-if-no-js"><a href='#'><?php _e( 'Choose from the most popular tags' ); ?></a></p> <?php } -add_meta_box('tagsdiv', __('Tags'), 'post_tags_meta_box', 'post', 'normal', 'core'); - +add_meta_box('tagsdiv', __('Tags'), 'post_tags_meta_box', 'post', 'side', 'core'); + +/** + * Display post categories form fields. + * + * @since 2.6.0 + * + * @param object $post + */ function post_categories_meta_box($post) { ?> -<div id="category-adder" class="wp-hidden-children"> - <h4><a id="category-add-toggle" href="#category-add" class="hide-if-no-js" tabindex="3"><?php _e( '+ Add New Category' ); ?></a></h4> - <p id="category-add" class="wp-hidden-child"> - <label class="hidden" for="newcat"><?php _e( 'Add New Category' ); ?></label><input type="text" name="newcat" id="newcat" class="form-required form-input-tip" value="<?php _e( 'New category name' ); ?>" tabindex="3" aria-required="true"/> - <label class="hidden" for="newcat_parent"><?php _e('Parent category'); ?>:</label><?php wp_dropdown_categories( array( 'hide_empty' => 0, 'name' => 'newcat_parent', 'orderby' => 'name', 'hierarchical' => 1, 'show_option_none' => __('Parent category'), 'tab_index' => 3 ) ); ?> - <input type="button" id="category-add-sumbit" class="add:categorychecklist:category-add button" value="<?php _e( 'Add' ); ?>" tabindex="3" /> - <?php wp_nonce_field( 'add-category', '_ajax_nonce', false ); ?> - <span id="category-ajax-response"></span> - </p> -</div> - <ul id="category-tabs"> <li class="ui-tabs-selected"><a href="#categories-all" tabindex="3"><?php _e( 'All Categories' ); ?></a></li> - <li class="wp-no-js-hidden"><a href="#categories-pop" tabindex="3"><?php _e( 'Most Used' ); ?></a></li> + <li class="hide-if-no-js"><a href="#categories-pop" tabindex="3"><?php _e( 'Most Used' ); ?></a></li> </ul> <div id="categories-pop" class="ui-tabs-panel" style="display: none;"> @@ -259,28 +297,67 @@ function post_categories_meta_box($post) { <?php wp_category_checklist($post->ID, false, false, $popular_ids) ?> </ul> </div> + +<?php if ( current_user_can('manage_categories') ) : ?> +<div id="category-adder" class="wp-hidden-children"> + <h4><a id="category-add-toggle" href="#category-add" class="hide-if-no-js" tabindex="3"><?php _e( '+ Add New Category' ); ?></a></h4> + <p id="category-add" class="wp-hidden-child"> + <label class="hidden" for="newcat"><?php _e( 'Add New Category' ); ?></label><input type="text" name="newcat" id="newcat" class="form-required form-input-tip" value="<?php _e( 'New category name' ); ?>" tabindex="3" aria-required="true"/> + <label class="hidden" for="newcat_parent"><?php _e('Parent category'); ?>:</label><?php wp_dropdown_categories( array( 'hide_empty' => 0, 'name' => 'newcat_parent', 'orderby' => 'name', 'hierarchical' => 1, 'show_option_none' => __('Parent category'), 'tab_index' => 3 ) ); ?> + <input type="button" id="category-add-sumbit" class="add:categorychecklist:category-add button" value="<?php _e( 'Add' ); ?>" tabindex="3" /> + <?php wp_nonce_field( 'add-category', '_ajax_nonce', false ); ?> + <span id="category-ajax-response"></span> + </p> +</div> <?php +endif; + } -add_meta_box('categorydiv', __('Categories'), 'post_categories_meta_box', 'post', 'normal', 'core'); +add_meta_box('categorydiv', __('Categories'), 'post_categories_meta_box', 'post', 'side', 'core'); + +/** + * Display post password form fields. + * + * @since 2.6.0 + * + * @param object $post + */ +function post_password_meta_box($post) { ?> - -<?php do_meta_boxes('post', 'normal', $post); ?> - -<?php do_action('edit_form_advanced'); ?> - -<h2><?php _e('Advanced Options'); ?></h2> - +<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 post private') ?></label> +</p> +<h4><?php _e( 'Post Password' ); ?></h4> +<p><label class="hidden" for="post_password"><?php _e('Password Protect This Post') ?></label><input name="post_password" type="text" size="25" id="post_password" value="<?php the_post_password(); ?>" /></p> +<p><?php _e('Setting a password will require people who visit your blog to enter the above password to view this post and its comments.'); ?></p> <?php +} +// add_meta_box('passworddiv', __('Privacy Options'), 'post_password_meta_box', 'post', 'side', 'core'); + +/** + * Display post excerpt form fields. + * + * @since 2.6.0 + * + * @param object $post + */ function post_excerpt_meta_box($post) { ?> <label class="hidden" for="excerpt"><?php _e('Excerpt') ?></label><textarea rows="1" cols="40" name="excerpt" tabindex="6" id="excerpt"><?php echo $post->post_excerpt ?></textarea> <p><?php _e('Excerpts are optional hand-crafted summaries of your content. You can <a href="http://codex.wordpress.org/Template_Tags/the_excerpt" target="_blank">use them in your template</a>'); ?></p> <?php } -add_meta_box('postexcerpt', __('Excerpt'), 'post_excerpt_meta_box', 'post', 'advanced', 'core'); - +add_meta_box('postexcerpt', __('Excerpt'), 'post_excerpt_meta_box', 'post', 'normal', 'core'); + +/** + * Display trackback links form fields. + * + * @since 2.6.0 + * + * @param object $post + */ function post_trackback_meta_box($post) { - $form_trackback = '<input type="text" name="trackback_url" style="width: 415px" id="trackback" tabindex="7" value="'. attribute_escape( str_replace("\n", ' ', $post->to_ping) ) .'" />'; + $form_trackback = '<input type="text" name="trackback_url" id="trackback_url" tabindex="7" value="'. attribute_escape( str_replace("\n", ' ', $post->to_ping) ) .'" />'; if ('' != $post->pinged) { $pings = '<p>'. __('Already pinged:') . '</p><ul>'; $already_pinged = explode("\n", trim($post->pinged)); @@ -291,67 +368,108 @@ function post_trackback_meta_box($post) { } ?> -<p><label for="trackback"><?php _e('Send trackbacks to:'); ?></label> <?php echo $form_trackback; ?><br /> (<?php _e('Separate multiple URLs with spaces'); ?>)</p> +<p><label for="trackback_url"><?php _e('Send trackbacks to:'); ?></label> <?php echo $form_trackback; ?><br /> (<?php _e('Separate multiple URLs with spaces'); ?>)</p> <p><?php _e('Trackbacks are a way to notify legacy blog systems that you’ve linked to them. If you link other WordPress blogs they’ll be notified automatically using <a href="http://codex.wordpress.org/Introduction_to_Blogging#Managing_Comments" target="_blank">pingbacks</a>, no other action necessary.'); ?></p> <?php if ( ! empty($pings) ) echo $pings; } -add_meta_box('trackbacksdiv', __('Trackbacks'), 'post_trackback_meta_box', 'post', 'advanced', 'core'); - +add_meta_box('trackbacksdiv', __('Send Trackbacks'), 'post_trackback_meta_box', 'post', 'normal', 'core'); + +/** + * Display custom fields for the post form fields. + * + * @since 2.6.0 + * + * @param object $post + */ function post_custom_meta_box($post) { ?> <div id="postcustomstuff"> -<table cellpadding="3"> +<div id="ajax-response"></div> <?php $metadata = has_meta($post->ID); list_meta($metadata); +meta_form(); ?> - -</table> -<?php - meta_form(); -?> -<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> <?php } -add_meta_box('postcustom', __('Custom Fields'), 'post_custom_meta_box', 'post', 'advanced', 'core'); +add_meta_box('postcustom', __('Custom Fields'), 'post_custom_meta_box', 'post', 'normal', 'core'); do_action('dbx_post_advanced'); +/** + * Display comment status for post form fields. + * + * @since 2.6.0 + * + * @param object $post + */ function post_comment_status_meta_box($post) { + global $wpdb, $post_ID; ?> <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 post only. “Pings” are <a href="http://codex.wordpress.org/Introduction_to_Blogging#Managing_Comments" target="_blank">trackbacks and pingbacks</a>.'); ?></p> +<p class="meta-options"> + <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 on this post') ?></label><br /> + <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 <a href="http://codex.wordpress.org/Introduction_to_Blogging#Managing_Comments" target="_blank">trackbacks and pingbacks</a> on this post') ?></label> +</p> <?php -} -add_meta_box('commentstatusdiv', __('Comments & Pings'), 'post_comment_status_meta_box', 'post', 'advanced', 'core'); + $total = $wpdb->get_var($wpdb->prepare("SELECT count(1) FROM $wpdb->comments WHERE comment_post_ID = '%d' AND ( comment_approved = '0' OR comment_approved = '1')", $post_ID)); -function post_password_meta_box($post) { + if ( !$post_ID || $post_ID < 0 || 1 > $total ) + return; + +wp_nonce_field( 'get-comments', 'add_comment_nonce', false ); ?> -<p><label class="hidden" for="post_password"><?php _e('Password Protect This Post') ?></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 post and its comments.'); ?></p> + +<table class="widefat comments-box fixed" cellspacing="0" style="display:none;"> +<thead> + <tr> + <th scope="col" class="column-author"><?php _e('Author') ?></th> + <th scope="col" class="column-comment"><?php echo _c('Comment|noun') ?></th> + </tr> +</thead> +<tbody id="the-comment-list" class="list:comment"> +</tbody> +</table> +<p class="hide-if-no-js"><a href="#commentstatusdiv" id="show-comments" onclick="commentsBox.get(<?php echo $total; ?>);return false;"><?php _e('Show comments'); ?></a> <img class="waiting" style="display:none;" src="images/loading.gif" alt="" /></p> <?php + $hidden = get_hidden_meta_boxes('post'); + if ( ! in_array('commentstatusdiv', $hidden) ) { ?> + <script type="text/javascript">commentsBox.get(<?php echo $total; ?>, 10);</script> +<?php + } } -add_meta_box('passworddiv', __('Password Protect This Post'), 'post_password_meta_box', 'post', 'advanced', 'core'); - +add_meta_box('commentstatusdiv', __('Discussion'), 'post_comment_status_meta_box', 'post', 'normal', 'core'); + +/** + * Display post slug form fields. + * + * @since 2.6.0 + * + * @param object $post + */ function post_slug_meta_box($post) { ?> <label class="hidden" for="post_name"><?php _e('Post 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('slugdiv', __('Post Slug'), 'post_slug_meta_box', 'post', 'advanced', 'core'); +if ( !( 'pending' == $post->post_status && !current_user_can( 'publish_posts' ) ) ) + add_meta_box('slugdiv', __('Post Slug'), 'post_slug_meta_box', 'post', 'normal', '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 ) : +/** + * Display form field with list of authors. + * + * @since 2.6.0 + * + * @param object $post + */ function post_author_meta_box($post) { global $current_user, $user_ID; $authors = get_editable_user_ids( $current_user->id ); // TODO: ROLE SYSTEM @@ -361,26 +479,144 @@ function post_author_meta_box($post) { <label class="hidden" for="post_author_override"><?php _e('Post 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('authordiv', __('Post Author'), 'post_author_meta_box', 'post', 'advanced', 'core'); +add_meta_box('authordiv', __('Post Author'), 'post_author_meta_box', 'post', 'normal', 'core'); endif; -if ( isset($post_ID) && 0 < $post_ID && wp_get_post_revisions( $post_ID ) ) : +if ( 0 < $post_ID && wp_get_post_revisions( $post_ID ) ) : +/** + * Display list of post revisions. + * + * @since 2.6.0 + * + * @param object $post + */ function post_revisions_meta_box($post) { wp_list_post_revisions(); } -add_meta_box('revisionsdiv', __('Post Revisions'), 'post_revisions_meta_box', 'post', 'advanced', 'core'); +add_meta_box('revisionsdiv', __('Post Revisions'), 'post_revisions_meta_box', 'post', 'normal', 'core'); endif; -do_meta_boxes('post', 'advanced', $post); +do_action('do_meta_boxes', 'post', 'normal', $post); +do_action('do_meta_boxes', 'post', 'advanced', $post); +do_action('do_meta_boxes', 'post', 'side', $post); + +require_once('admin-header.php'); -do_action('dbx_post_sidebar'); ?> + +<?php if ( (isset($mode) && 'bookmarklet' == $mode) || isset($_GET['popupurl']) ): ?> +<input type="hidden" name="mode" value="bookmarklet" /> +<?php endif; ?> + +<div class="wrap"> +<?php screen_icon(); ?> +<h2><?php echo wp_specialchars( $title ); ?></h2> +<?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="post.php" method="post" id="post"> +<?php + +if ( 0 == $post_ID) + wp_nonce_field('add-post'); +else + wp_nonce_field('update-post_' . $post_ID); + +?> + +<input type="hidden" id="user-id" name="user_ID" value="<?php echo (int) $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 ); ?>" /> +<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'); ?> + +<?php echo $form_extra ?> + +<div id="poststuff" class="metabox-holder"> + +<div id="side-info-column" class="inner-sidebar"> + +<?php do_action('submitpost_box'); ?> + +<?php $side_meta_boxes = do_meta_boxes('post', 'side', $post); ?> +</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"> +<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); ?> +<?php if ( !( 'pending' == $post->post_status && !current_user_can( 'publish_posts' ) ) ) { ?> + <div id="edit-slug-box"> +<?php if ( ! empty($post->ID) && ! empty($sample_permalink_html) ) : + echo $sample_permalink_html; +endif; ?> + </div> +<?php } ?> </div> </div> +<div id="<?php echo user_can_richedit() ? 'postdivrich' : 'postdiv'; ?>" class="postarea"> + +<?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 ) { + echo '<span id="last-edit">'; + 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)); + } + echo '</span>'; + } +?> + </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('post', 'normal', $post); + +do_action('edit_form_advanced'); + +do_meta_boxes('post', 'advanced', $post); + +do_action('dbx_post_sidebar'); + +?> + +</div> +</div> +<br class="clear" /> +</div> </form> +</div> + +<?php wp_comment_reply(); ?> <?php if ((isset($post->post_title) && '' == $post->post_title) || (isset($_GET['message']) && 2 > $_GET['message'])) : ?> <script type="text/javascript"> wp-admin/edit-form-advanced.php @@ -1,4 +1,14 @@ <?php +/** + * Edit comment form for inclusion in another file. + * + * @package WordPress + * @subpackage Administration + */ + +/** + * @var string + */ $submitbutton_text = __('Edit Comment'); $toprow_title = sprintf(__('Editing Comment # %s'), $comment->comment_ID); $form_action = 'editedcomment'; @@ -8,84 +18,110 @@ $form_extra = "' />\n<input type='hidden' name='comment_ID' value='" . $comment- <form name="post" action="comment.php" method="post" id="post"> <?php wp_nonce_field('update-comment_' . $comment->comment_ID) ?> <div class="wrap"> -<h2><?php echo $toprow_title; ?></h2> +<?php screen_icon(); ?> +<h2><?php _e('Edit Comment'); ?></h2> + +<div id="poststuff" class="metabox-holder"> <input type="hidden" name="user_ID" value="<?php echo (int) $user_ID ?>" /> <input type="hidden" name="action" value='<?php echo $form_action . $form_extra ?>' /> +<?php -<div id="poststuff"> +$email = attribute_escape( $comment->comment_author_email ); +$url = attribute_escape( $comment->comment_author_url ); +// add_meta_box('submitdiv', __('Save'), 'comment_submit_meta_box', 'comment', 'side', 'core'); +?> +<div id="side-info-column" class="inner-sidebar"> +<div id="submitdiv" class="stuffbox" > +<h3><span class='hndle'><?php _e('Status') ?></span></h3> +<div class="inside"> <div class="submitbox" id="submitcomment"> +<div id="minor-publishing"> -<div id="previewview"> -<a href="<?php echo get_comment_link(); ?>" target="_blank"><?php _e('View this Comment'); ?></a> +<div id="minor-publishing-actions"> +<div id="preview-action"> +<a class="preview button" href="<?php echo get_comment_link(); ?>" target="_blank"><?php _e('View Comment'); ?></a> +</div> +<div class="clear"></div> </div> -<div class="inside"> +<div id="misc-publishing-actions"> -<p><strong><label for='comment_status'><?php _e('Approval Status') ?></label></strong></p> -<p> -<select name='comment_status' id='comment_status'> -<option<?php selected( $comment->comment_approved, '1' ); ?> value='1'><?php _e('Approved') ?></option> -<option<?php selected( $comment->comment_approved, '0' ); ?> value='0'><?php _e('Moderated') ?></option> -<option<?php selected( $comment->comment_approved, 'spam' ); ?> value='spam'><?php _e('Spam') ?></option> -</select> -</p> +<div class="misc-pub-section" id="comment-status-radio"> +<label class="approved"><input type="radio"<?php checked( $comment->comment_approved, '1' ); ?> name="comment_status" value="1" /><?php echo _c('Approved|adjective') ?></label><br /> +<label class="waiting"><input type="radio"<?php checked( $comment->comment_approved, '0' ); ?> name="comment_status" value="0" /><?php echo _c('Pending|adjective') ?></label><br /> +<label class="spam"><input type="radio"<?php checked( $comment->comment_approved, 'spam' ); ?> name="comment_status" value="spam" /><?php echo _c('Spam|adjective'); ?></label> +</div> +<div class="misc-pub-section curtime misc-pub-section-last"> <?php -$stamp = __('%1$s at %2$s'); -$date = mysql2date(get_option('date_format'), $comment->comment_date); -$time = mysql2date(get_option('time_format'), $comment->comment_date); +$datef = _c( 'M j, Y @ G:i|Publish box date format'); +$stamp = __('Submitted on: <b>%1$s</b>'); +$date = date_i18n( $datef, strtotime( $comment->comment_date ) ); ?> -<p class="curtime"><?php printf($stamp, $date, $time); ?> - <a href="#edit_timestamp" class="edit-timestamp hide-if-no-js"><?php _e('Edit') ?></a></p> - +<span id="timestamp"><?php printf($stamp, $date); ?></span> <a href="#edit_timestamp" class="edit-timestamp hide-if-no-js" tabindex='4'><?php _e('Edit') ?></a> <div id='timestampdiv' class='hide-if-js'><?php touch_time(('editcomment' == $action), 0, 5); ?></div> - +</div> +</div>  +<div class="clear"></div> </div> -<p class="submit"> -<input type="submit" name="save" value="<?php _e('Save'); ?>" tabindex="4" class="button button-highlighted" /> -<?php -echo "<a class='submitdelete' href='" . wp_nonce_url("comment.php?action=deletecomment&c=$comment->comment_ID&_wp_original_http_referer=" . wp_get_referer(), 'delete-comment_' . $comment->comment_ID) . "' onclick=\"if ( confirm('" . js_escape(__("You are about to delete this comment. \n 'Cancel' to stop, 'OK' to delete.")) . "') ) { return true;}return false;\">" . __('Delete comment') . "</a>"; -?> -</p> - -<div class="side-info"> -<h5><?php _e('Related') ?></h5> - -<ul> -<li><a href="edit-comments.php"><?php _e('Manage All Comments') ?></a></li> -<li><a href="edit-comments.php?comment_status=moderated"><?php _e('Moderate Comments') ?></a></li> -<?php do_action('comment_relatedlinks_list'); ?> -</ul> +<div id="major-publishing-actions"> +<div id="delete-action"> +<a class='submitdelete deletion' href='<?php echo wp_nonce_url("comment.php?action=deletecomment&c=$comment->comment_ID&_wp_original_http_referer=" . wp_get_referer(), 'delete-comment_' . $comment->comment_ID) . "' onclick=\"if ( confirm('" . js_escape(__("You are about to delete this comment. \n 'Cancel' to stop, 'OK' to delete.")) . "') ) { return true;}return false;\">" . __('Delete'); ?></a> </div> -<?php do_action('submitcomment_box'); ?> +<div id="publishing-action"> +<input type="submit" name="save" value="<?php _e('Update Comment'); ?>" tabindex="4" class="button-primary" /> </div> - -<div id="post-body"> -<div id="namediv" class="stuffbox"> -<h3><label for="name"><?php _e('Name') ?></label></h3> -<div class="inside"> -<input type="text" name="newcomment_author" size="30" value="<?php echo attribute_escape( $comment->comment_author ); ?>" tabindex="1" id="name" /> +<div class="clear"></div> </div> </div> - -<div id="emaildiv" class="stuffbox"> -<h3><label for="email"><?php _e('E-mail') ?></label></h3> -<div class="inside"> -<input type="text" name="newcomment_author_email" size="30" value="<?php echo attribute_escape( $comment->comment_author_email ); ?>" tabindex="2" id="email" /> </div> </div> +</div> + +<div id="post-body" class="has-sidebar"> +<div id="post-body-content" class="has-sidebar-content"> -<div id="uridiv" class="stuffbox"> -<h3><label for="newcomment_author_url"><?php _e('URL') ?></label></h3> +<div id="namediv" class="stuffbox"> +<h3><label for="name"><?php _e( 'Author' ) ?></label></h3> <div class="inside"> -<input type="text" id="newcomment_author_url" name="newcomment_author_url" size="30" value="<?php echo attribute_escape( $comment->comment_author_url ); ?>" tabindex="3" /> +<table class="form-table"> +<tbody> +<tr valign="top"> + <td class="first"><?php _e( 'Name:' ); ?></td> + <td><input type="text" name="newcomment_author" size="30" value="<?php echo attribute_escape( $comment->comment_author ); ?>" tabindex="1" id="name" /></td> +</tr> +<tr valign="top"> + <td class="first"> + <?php + if ( $email ) { + printf( __( 'E-mail (%s):' ), get_comment_author_email_link( __( 'send e-mail' ), '', '' ) ); + } else { + _e( 'E-mail:' ); + } +?></td> + <td><input type="text" name="newcomment_author_email" size="30" value="<?php echo $email; ?>" tabindex="2" id="email" /></td> +</tr> +<tr valign="top"> + <td class="first"> + <?php + $url = get_comment_author_url(); + if ( ! empty( $url ) && 'http://' != $url ) { + $link = "<a href='$url' rel='external nofollow' target='_blank'>" . __('visit site') . "</a>"; + printf( __( 'URL (%s):' ), apply_filters('get_comment_author_link', $link ) ); + } else { + _e( 'URL:' ); + } ?></td> + <td><input type="text" id="newcomment_author_url" name="newcomment_author_url" size="30" value="<?php echo $url; ?>" tabindex="3" /></td> +</tr> +</tbody> +</table> +<br /> </div> </div> <div id="postdiv" class="postarea"> -<h3><label for="content"><?php _e('Comment') ?></label></h3> <?php the_editor($comment->comment_content, 'content', 'newcomment_author_url', false, 4); ?> <?php wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); ?> </div> @@ -94,13 +130,14 @@ echo "<a class='submitdelete' href='" . wp_nonce_url("comment.php?action=deletec <input type="hidden" name="c" value="<?php echo $comment->comment_ID ?>" /> <input type="hidden" name="p" value="<?php echo $comment->comment_post_ID ?>" /> -<input name="referredby" type="hidden" id="referredby" value="<?php echo wp_get_referer(); ?>" /> +<input name="referredby" type="hidden" id="referredby" value="<?php echo clean_url(stripslashes(wp_get_referer())); ?>" /> <?php wp_original_referer_field(true, 'previous'); ?> <input type="hidden" name="noredir" value="1" /> + +</div> </div> </div> </div> - </form> <script type="text/javascript"> wp-admin/edit-form-comment.php @@ -1,43 +1,54 @@ <?php +/** + * Edit Link Categories Administration Panel. + * + * @package WordPress + * @subpackage Administration + */ + +/** WordPress Administration Bootstrap */ require_once('admin.php'); -// Handle bulk deletes -if ( isset($_GET['deleteit']) && isset($_GET['delete']) ) { +// Handle bulk actions +if ( isset($_GET['action']) && isset($_GET['delete']) ) { check_admin_referer('bulk-link-categories'); + $doaction = $_GET['action'] ? $_GET['action'] : $_GET['action2']; if ( !current_user_can('manage_categories') ) wp_die(__('Cheatin’ uh?')); - foreach( (array) $_GET['delete'] as $cat_ID ) { - $cat_name = get_term_field('name', $cat_ID, 'link_category'); - $default_cat_id = get_option('default_link_category'); - - // Don't delete the default cats. - if ( $cat_ID == $default_cat_id ) - wp_die(sprintf(__("Can’t delete the <strong>%s</strong> category: this is the default one"), $cat_name)); + if ( 'delete' == $doaction ) { + foreach( (array) $_GET['delete'] as $cat_ID ) { + $cat_name = get_term_field('name', $cat_ID, 'link_category'); + $default_cat_id = get_option('default_link_category'); - wp_delete_term($cat_ID, 'link_category', array('default' => $default_cat_id)); - } + // Don't delete the default cats. + if ( $cat_ID == $default_cat_id ) + wp_die(sprintf(__("Can’t delete the <strong>%s</strong> category: this is the default one"), $cat_name)); - $location = 'edit-link-categories.php'; - if ( $referer = wp_get_referer() ) { - if ( false !== strpos($referer, 'edit-link-categories.php') ) - $location = $referer; - } + wp_delete_term($cat_ID, 'link_category', array('default' => $default_cat_id)); + } + + $location = 'edit-link-categories.php'; + if ( $referer = wp_get_referer() ) { + if ( false !== strpos($referer, 'edit-link-categories.php') ) + $location = $referer; + } - $location = add_query_arg('message', 6, $location); - wp_redirect($location); - exit(); -} elseif ( !empty($_GET['_wp_http_referer']) ) { - wp_redirect(remove_query_arg(array('_wp_http_referer', '_wpnonce'), stripslashes($_SERVER['REQUEST_URI']))); + $location = add_query_arg('message', 6, $location); + wp_redirect($location); + exit(); + } +} elseif ( isset($_GET['_wp_http_referer']) && ! empty($_GET['_wp_http_referer']) ) { + wp_redirect( remove_query_arg( array('_wp_http_referer', '_wpnonce'), stripslashes($_SERVER['REQUEST_URI']) ) ); exit; } $title = __('Link Categories'); -$parent_file = 'edit.php'; -wp_enqueue_script( 'admin-categories' ); -wp_enqueue_script('admin-forms'); +wp_enqueue_script('admin-categories'); +if ( current_user_can('manage_categories') ) + wp_enqueue_script('inline-edit-tax'); require_once ('admin-header.php'); @@ -46,42 +57,48 @@ $messages[2] = __('Category deleted.'); $messages[3] = __('Category updated.'); $messages[4] = __('Category not added.'); $messages[5] = __('Category not updated.'); -$messages[6] = __('Categories deleted.'); +$messages[6] = __('Categories deleted.'); ?> + +<div class="wrap nosubsub"> +<?php screen_icon(); ?> +<h2><?php echo wp_specialchars( $title ); +if ( isset($_GET['s']) && $_GET['s'] ) + printf( '<span class="subtitle">' . __('Search results for “%s”') . '</span>', wp_specialchars( stripslashes($_GET['s']) ) ); ?> +</h2> -if (isset($_GET['message'])) : ?> -<div id="message" class="updated fade"><p><?php echo $messages[$_GET['message']]; ?></p></div> +<?php if ( isset($_GET['message']) && ( $msg = (int) $_GET['message'] ) ) : ?> +<div id="message" class="updated fade"><p><?php echo $messages[$msg]; ?></p></div> <?php $_SERVER['REQUEST_URI'] = remove_query_arg(array('message'), $_SERVER['REQUEST_URI']); endif; ?> -<div class="wrap"> - -<form id="posts-filter" action="" method="get"> -<?php if ( current_user_can('manage_categories') ) : ?> - <h2><?php printf(__('Manage Link Categories (<a href="%s">add new</a>)'), '#addcat') ?> </h2> -<?php else : ?> - <h2><?php _e('Manage Link Categories') ?> </h2> -<?php endif; ?> - -<p id="post-search"> - <label class="hidden" for="post-search-input"><?php _e( 'Search Categories' ); ?>:</label> - <input type="text" id="post-search-input" name="s" value="<?php echo attribute_escape(stripslashes($_GET['s'])); ?>" /> +<form class="search-form" action="" method="get"> +<p class="search-box"> + <label class="hidden" for="link-category-search-input"><?php _e( 'Search Categories' ); ?>:</label> + <input type="text" class="search-input" id="link-category-search-input" name="s" value="<?php _admin_search_query(); ?>" /> <input type="submit" value="<?php _e( 'Search Categories' ); ?>" class="button" /> </p> - +</form> <br class="clear" /> +<div id="col-container"> + +<div id="col-right"> +<div class="col-wrap"> +<form id="posts-filter" action="" method="get"> <div class="tablenav"> <?php -$pagenum = absint( $_GET['pagenum'] ); +$pagenum = isset( $_GET['pagenum'] ) ? absint( $_GET['pagenum'] ) : 0; if ( empty($pagenum) ) $pagenum = 1; -if( !$catsperpage || $catsperpage < 0 ) +if( ! isset( $catsperpage ) || $catsperpage < 0 ) $catsperpage = 20; $page_links = paginate_links( array( 'base' => add_query_arg( 'pagenum', '%#%' ), 'format' => '', + 'prev_text' => __('«'), + 'next_text' => __('»'), 'total' => ceil(wp_count_terms('link_category') / $catsperpage), 'current' => $pagenum )); @@ -90,25 +107,33 @@ if ( $page_links ) echo "<div class='tablenav-pages'>$page_links</div>"; ?> -<div class="alignleft"> -<input type="submit" value="<?php _e('Delete'); ?>" name="deleteit" class="button-secondary delete" /> +<div class="alignleft actions"> +<select name="action"> +<option value="" selected="selected"><?php _e('Bulk Actions'); ?></option> +<option value="delete"><?php _e('Delete'); ?></option> +</select> +<input type="submit" value="<?php _e('Apply'); ?>" name="doaction" id="doaction" class="button-secondary action" /> <?php wp_nonce_field('bulk-link-categories'); ?> </div> <br class="clear" /> </div> -<br class="clear" /> +<div class="clear"></div> -<table class="widefat"> +<table class="widefat fixed" cellspacing="0"> <thead> <tr> - <th scope="col" class="check-column"><input type="checkbox" /></th> - <th scope="col"><?php _e('Name') ?></th> - <th scope="col"><?php _e('Description') ?></th> - <th scope="col" class="num" style="width: 90px;"><?php _e('Links') ?></th> +<?php print_column_headers('edit-link-categories'); ?> </tr> </thead> + + <tfoot> + <tr> +<?php print_column_headers('edit-link-categories', false); ?> + </tr> + </tfoot> + <tbody id="the-list" class="list:link-cat"> <?php $start = ($pagenum - 1) * $catsperpage; @@ -120,10 +145,8 @@ $categories = get_terms( 'link_category', $args ); if ( $categories ) { $output = ''; foreach ( $categories as $category ) { - $category = sanitize_term($category, 'link_category', 'display'); $output .= link_cat_row($category); } - $output = apply_filters('cat_rows', $output); echo $output; unset($category); } @@ -131,27 +154,90 @@ if ( $categories ) { ?> </tbody> </table> -</form> <div class="tablenav"> - <?php if ( $page_links ) echo "<div class='tablenav-pages'>$page_links</div>"; ?> + +<div class="alignleft actions"> +<select name="action2"> +<option value="" selected="selected"><?php _e('Bulk Actions'); ?></option> +<option value="delete"><?php _e('Delete'); ?></option> +</select> +<input type="submit" value="<?php _e('Apply'); ?>" name="doaction2" id="doaction2" class="button-secondary action" /> +</div> + <br class="clear" /> </div> <br class="clear" /> +</form> +<div class="form-wrap"> +<p><?php printf(__('<strong>Note:</strong><br />Deleting a category does not delete the links in that category. Instead, links that were only assigned to the deleted category are set to the category <strong>%s</strong>.'), get_term_field('name', get_option('default_link_category'), 'link_category')) ?></p> </div> -<?php if ( current_user_can('manage_categories') ) : ?> -<div class="wrap"> -<p><?php printf(__('<strong>Note:</strong><br />Deleting a category does not delete the links in that category. Instead, links that were only assigned to the deleted category are set to the category <strong>%s</strong>.'), get_term_field('name', get_option('default_link_category'), 'link_category')) ?></p> + +</div> +</div> + +<div id="col-left"> +<div class="col-wrap"> + +<?php if ( current_user_can('manage_categories') ) { + $category = (object) array(); $category->parent = 0; do_action('add_link_category_form_pre', $category); ?> + +<div class="form-wrap"> +<h3><?php _e('Add Category'); ?></h3> +<div id="ajax-response"></div> +<form name="addcat" id="addcat" class="add:the-list: validate" method="post" action="link-category.php"> +<input type="hidden" name="action" value="addcat" /> +<?php wp_original_referer_field(true, 'previous'); wp_nonce_field('add-link-category'); ?> + +<div class="form-field form-required"> + <label for="name"><?php _e('Category name') ?></label> + <input name="name" id="name" type="text" value="" size="40" aria-required="true" /> </div> -<?php include('edit-link-category-form.php'); ?> +<div class="form-field"> + <label for="slug"><?php _e('Category slug') ?></label> + <input name="slug" id="slug" type="text" value="" size="40" /> + <p><?php _e('The “slug” is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.'); ?></p> +</div> -<?php endif; ?> +<div class="form-field"> + <label for="description"><?php _e('Description (optional)') ?></label> + <textarea name="description" id="description" rows="5" cols="40"></textarea> +</div> +<p class="submit"><input type="submit" class="button" name="submit" value="<?php _e('Add Category'); ?>" /></p> +<?php do_action('edit_link_category_form', $category); ?> +</form> +</div> + +<?php } ?> + +</div> +</div> + +</div> +</div> + +<script type="text/javascript"> +/* <![CDATA[ */ +(function($){ + $(document).ready(function(){ + $('#doaction, #doaction2').click(function(){ + if ( $('select[name^="action"]').val() == 'delete' ) { + var m = '<?php echo js_escape(__("You are about to delete the selected link categories.\n 'Cancel' to stop, 'OK' to delete.")); ?>'; + return showNotice.warn(m); + } + }); + }); +})(jQuery); +/* ]]> */ +</script> + +<?php inline_edit_term_row('edit-link-categories'); ?> <?php include('admin-footer.php'); ?> wp-admin/edit-link-categories.php @@ -1,23 +1,60 @@ <?php +/** + * Edit link category form for inclusion in administration panels. + * + * @package WordPress + * @subpackage Administration + */ + +/** + * @var object + */ +if ( ! isset( $category ) ) + $category = (object) array(); + if ( ! empty($cat_ID) ) { - $heading = __('Edit Category'); - $submit_text = __('Edit Category'); + /** + * @var string + */ + $heading = '<h2>' . __('Edit Link Category') . '</h2>'; + $submit_text = __('Update Category'); $form = '<form name="editcat" id="editcat" method="post" action="link-category.php" class="validate">'; $action = 'editedcat'; $nonce_action = 'update-link-category_' . $cat_ID; do_action('edit_link_category_form_pre', $category); } else { - $heading = __('Add Category'); + $heading = '<h2>' . __('Add Link Category') . '</h2>'; $submit_text = __('Add Category'); $form = '<form name="addcat" id="addcat" class="add:the-list: validate" method="post" action="link-category.php">'; $action = 'addcat'; $nonce_action = 'add-link-category'; do_action('add_link_category_form_pre', $category); } + +/** + * @ignore + * @since 2.7 + * @internal Used to prevent errors in page when no category is being edited. + * + * @param object $category + */ +function _fill_empty_link_category(&$category) { + if ( ! isset( $category->name ) ) + $category->name = ''; + + if ( ! isset( $category->slug ) ) + $category->slug = ''; + + if ( ! isset( $category->description ) ) + $category->description = ''; +} + +_fill_empty_link_category($category); ?> <div class="wrap"> -<h2><?php echo $heading ?></h2> +<?php screen_icon(); ?> +<?php echo $heading ?> <div id="ajax-response"></div> <?php echo $form ?> <input type="hidden" name="action" value="<?php echo $action ?>" /> @@ -30,7 +67,7 @@ if ( ! empty($cat_ID) ) { </tr> <tr class="form-field"> <th scope="row" valign="top"><label for="slug"><?php _e('Category slug') ?></label></th> - <td><input name="slug" id="slug" type="text" value="<?php echo attribute_escape(apply_filters('editable_slug', $category->slug)); ?>" size="40" /> + <td><input name="slug" id="slug" type="text" value="<?php echo attribute_escape(apply_filters('editable_slug', $category->slug)); ?>" size="40" /><br /> <?php _e('The “slug” is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.'); ?></td> </tr> <tr class="form-field"> @@ -38,7 +75,7 @@ if ( ! empty($cat_ID) ) { <td><textarea name="description" id="description" rows="5" cols="50" style="width: 97%;"><?php echo $category->description; ?></textarea></td> </tr> </table> -<p class="submit"><input type="submit" class="button" name="submit" value="<?php echo $submit_text ?>" /></p> +<p class="submit"><input type="submit" class="button-primary" name="submit" value="<?php echo $submit_text ?>" /></p> <?php do_action('edit_link_category_form', $category); ?> </form> </div> wp-admin/edit-link-category-form.php @@ -1,20 +1,36 @@ <?php +/** + * Edit links form for inclusion in administration panels. + * + * @package WordPress + * @subpackage Administration + */ + if ( ! empty($link_id) ) { - $heading = __('Edit Link'); - $submit_text = __('Save Changes'); + $heading = sprintf( __( '<a href="%s">Links</a> / Edit Link' ), 'link-manager.php' ); + $submit_text = __('Update Link'); $form = '<form name="editlink" id="editlink" method="post" action="link.php">'; $nonce_action = 'update-bookmark_' . $link_id; } else { - $heading = __('Add Link'); + $heading = sprintf( __( '<a href="%s">Links</a> / Add New Link' ), 'link-manager.php' ); $submit_text = __('Add Link'); $form = '<form name="addlink" id="addlink" method="post" action="link.php">'; $nonce_action = 'add-bookmark'; } +/** + * Display checked checkboxes attribute for xfn microformat options. + * + * @since 1.0.1 + * + * @param string $class + * @param string $value + * @param mixed $deprecated Not used. + */ function xfn_check($class, $value = '', $deprecated = '') { global $link; - $link_rel = $link->link_rel; + $link_rel = isset( $link->link_rel ) ? $link->link_rel : ''; // In PHP 5.3: $link_rel = $link->link_rel ?: ''; $rels = preg_split('/\s+/', $link_rel); if ('' != $value && in_array($value, $rels) ) { @@ -28,76 +44,75 @@ function xfn_check($class, $value = '', $deprecated = '') { if ('identity' == $class && in_array('me', $rels) ) echo ' checked="checked"'; } } -?> - -<?php echo $form ?> -<?php wp_nonce_field($nonce_action); ?> -<?php wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); ?> - -<div class="wrap"> -<h2><?php echo $heading; ?></h2> - -<div id="poststuff"> +/** + * Display link create form fields. + * + * @since 2.7.0 + * + * @param object $link + */ +function link_submit_meta_box($link) { +?> <div class="submitbox" id="submitlink"> -<div id="previewview"> -<?php if ( !empty($link_id) ) { ?> -<a href="<?php echo $link->link_url; ?>" target="_blank"><?php _e('Visit Link'); ?></a> -<?php } ?> -</div> +<div id="minor-publishing"> -<div class="inside"> -<p><label for="link_private" class="selectit"><input id="link_private" name="link_visible" type="checkbox" value="N" <?php checked($link->link_visible, 'N'); ?> /> <?php _e('Keep this link private') ?></label></p> +<?php // Hidden submit button early on so that the browser chooses the right button when form is submitted with Return key ?> +<div style="display:none;"> +<input type="submit" name="save" value="<?php echo attribute_escape( __('Save') ); ?>" /> </div> -<p class="submit"> -<input type="submit" class="button button-highlighted" name="save" value="<?php _e('Save'); ?>" tabindex="4" /> -<?php -if ( ( 'edit' == $action) && current_user_can('manage_links') ) - echo "<a class='submitdelete' href='" . wp_nonce_url("link.php?action=delete&link_id=$link_id", 'delete-bookmark_' . $link_id) . "' onclick=\"if ( confirm('" . js_escape( sprintf( __("You are about to delete this link '%s'\n'Cancel' to stop, 'OK' to delete."), $link->link_name )) . "') ) { return true;}return false;\">" . __('Delete link') . "</a>"; -?> -</p> - -<div class="side-info"> -<h5><?php _e('Related') ?></h5> - -<ul> -<li><a href="link-manager.php"><?php _e('Manage All Links') ?></a></li> -<li><a href="edit-link-categories.php"><?php _e('Manage All Link Categories') ?></a></li> -<li><a href="link-import.php"><?php _e('Import Links') ?></a></li> -<?php do_action('link_relatedlinks_list'); ?> -</ul> +<div id="minor-publishing-actions"> +<div id="preview-action"> +<?php if ( !empty($link->link_id) ) { ?> + <a class="preview button" href="<?php echo $link->link_url; ?>" target="_blank" tabindex="4"><?php _e('Visit Link'); ?></a> +<?php } ?> </div> -<?php do_action('submitlink_box'); ?> +<div class="clear"></div> </div> -<div id="post-body"> -<div id="namediv" class="stuffbox"> -<h3><label for="link_name"><?php _e('Name') ?></label></h3> -<div class="inside"> - <input type="text" name="link_name" size="30" tabindex="1" value="<?php echo $link->link_name; ?>" id="link_name" /><br /> - <?php _e('Example: Nifty blogging software'); ?> +<div id="misc-publishing-actions"> +<div class="misc-pub-section misc-pub-section-last"> + <label for="link_private" class="selectit"><input id="link_private" name="link_visible" type="checkbox" value="N" <?php checked($link->link_visible, 'N'); ?> /> <?php _e('Keep this link private') ?></label> </div> </div> -<div id="addressdiv" class="stuffbox"> -<h3><label for="link_url"><?php _e('Web Address') ?></label></h3> -<div class="inside"> - <input type="text" name="link_url" size="30" tabindex="1" value="<?php echo $link->link_url; ?>" id="link_url" /><br /> - <?php _e('Example: <code>http://wordpress.org/</code> — don’t forget the <code>http://</code>'); ?> </div> + +<div id="major-publishing-actions"> +<?php do_action('post_submitbox_start'); ?> +<div id="delete-action"> +<?php +if ( !empty($_GET['action']) && 'edit' == $_GET['action'] && current_user_can('manage_links') ) { ?> + <a class="submitdelete deletion" href="<?php echo wp_nonce_url("link.php?action=delete&link_id=$link->link_id", 'delete-bookmark_' . $link->link_id); ?>" onclick="if ( confirm('<?php echo js_escape(sprintf(__("You are about to delete this link '%s'\n 'Cancel' to stop, 'OK' to delete."), $link->link_name )); ?>') ) {return true;}return false;"><?php _e('Delete'); ?></a> +<?php } ?> </div> -<div id="descriptiondiv" class="stuffbox"> -<h3><label for="link_description"><?php _e('Description') ?></label></h3> -<div class="inside"> - <input type="text" name="link_description" size="30" tabindex="1" value="<?php echo $link->link_description; ?>" id="link_description" /><br /> - <?php _e('This will be shown when someone hovers over the link in the blogroll, or optionally below the link.'); ?> +<div id="publishing-action"> +<?php if ( !empty($link->link_id) ) { ?> + <input name="save" type="submit" class="button-primary" id="publish" tabindex="4" accesskey="p" value="<?php _e('Update Link') ?>" /> +<?php } else { ?> + <input name="save" type="submit" class="button-primary" id="publish" tabindex="4" accesskey="p" value="<?php _e('Add Link') ?>" /> +<?php } ?> </div> +<div class="clear"></div> </div> +<?php do_action('submitlink_box'); ?> +<div class="clear"></div> +</div> +<?php +} +add_meta_box('linksubmitdiv', __('Save'), 'link_submit_meta_box', 'link', 'side', 'core'); -<?php function link_categories_meta_box($link) { ?> +/** + * Display link categories form fields. + * + * @since 2.6.0 + * + * @param object $link + */ +function link_categories_meta_box($link) { ?> <div id="category-adder" class="wp-hidden-children"> <h4><a id="category-add-toggle" href="#category-add"><?php _e( '+ Add New Category' ); ?></a></h4> <p id="link-category-add" class="wp-hidden-child"> @@ -111,12 +126,17 @@ if ( ( 'edit' == $action) && current_user_can('manage_links') ) <ul id="category-tabs"> <li class="ui-tabs-selected"><a href="#categories-all"><?php _e( 'All Categories' ); ?></a></li> - <li class="wp-no-js-hidden"><a href="#categories-pop"><?php _e( 'Most Used' ); ?></a></li> + <li class="hide-if-no-js"><a href="#categories-pop"><?php _e( 'Most Used' ); ?></a></li> </ul> <div id="categories-all" class="ui-tabs-panel"> <ul id="categorychecklist" class="list:category categorychecklist form-no-clear"> - <?php wp_link_category_checklist($link->link_id); ?> + <?php + if ( isset($link->link_id) ) + wp_link_category_checklist($link->link_id); + else + wp_link_category_checklist(); + ?> </ul> </div> @@ -128,35 +148,44 @@ if ( ( 'edit' == $action) && current_user_can('manage_links') ) <?php } add_meta_box('linkcategorydiv', __('Categories'), 'link_categories_meta_box', 'link', 'normal', 'core'); -?> - -<?php do_meta_boxes('link', 'normal', $link); ?> - -<h2><?php _e('Advanced Options'); ?></h2> -<?php function link_target_meta_box($link) { ?> +/** + * Display form fields for changing link target. + * + * @since 2.6.0 + * + * @param object $link + */ +function link_target_meta_box($link) { ?> <fieldset><legend class="hidden"><?php _e('Target') ?></legend> <label for="link_target_blank" class="selectit"> -<input id="link_target_blank" type="radio" name="link_target" value="_blank" <?php echo(($link->link_target == '_blank') ? 'checked="checked"' : ''); ?> /> +<input id="link_target_blank" type="radio" name="link_target" value="_blank" <?php echo ( isset( $link->link_target ) && ($link->link_target == '_blank') ? 'checked="checked"' : ''); ?> /> <code>_blank</code></label><br /> <label for="link_target_top" class="selectit"> -<input id="link_target_top" type="radio" name="link_target" value="_top" <?php echo(($link->link_target == '_top') ? 'checked="checked"' : ''); ?> /> +<input id="link_target_top" type="radio" name="link_target" value="_top" <?php echo ( isset( $link->link_target ) && ($link->link_target == '_top') ? 'checked="checked"' : ''); ?> /> <code>_top</code></label><br /> <label for="link_target_none" class="selectit"> -<input id="link_target_none" type="radio" name="link_target" value="" <?php echo(($link->link_target == '') ? 'checked="checked"' : ''); ?> /> +<input id="link_target_none" type="radio" name="link_target" value="" <?php echo ( isset( $link->link_target ) && ($link->link_target == '') ? 'checked="checked"' : ''); ?> /> <?php _e('none') ?></label> </fieldset> <p><?php _e('Choose the frame your link targets. Essentially this means if you choose <code>_blank</code> your link will open in a new window.'); ?></p> <?php } -add_meta_box('linktargetdiv', __('Target'), 'link_target_meta_box', 'link', 'advanced', 'core'); +add_meta_box('linktargetdiv', __('Target'), 'link_target_meta_box', 'link', 'normal', 'core'); +/** + * Display xfn form fields. + * + * @since 2.6.0 + * + * @param object $link + */ function link_xfn_meta_box($link) { ?> <table class="editform" style="width: 100%;" cellspacing="2" cellpadding="5"> <tr> <th style="width: 20%;" scope="row"><label for="link_rel"><?php _e('rel:') ?></label></th> - <td style="width: 80%;"><input type="text" name="link_rel" id="link_rel" size="50" value="<?php echo $link->link_rel; ?>" /></td> + <td style="width: 80%;"><input type="text" name="link_rel" id="link_rel" size="50" value="<?php echo ( isset( $link->link_rel ) ? $link->link_rel : ''); ?>" /></td> </tr> <tr> <td colspan="2"> @@ -262,22 +291,29 @@ function link_xfn_meta_box($link) { <p><?php _e('If the link is to a person, you can specify your relationship with them using the above form. If you would like to learn more about the idea check out <a href="http://gmpg.org/xfn/">XFN</a>.'); ?></p> <?php } -add_meta_box('linkxfndiv', __('Link Relationship (XFN)'), 'link_xfn_meta_box', 'link', 'advanced', 'core'); +add_meta_box('linkxfndiv', __('Link Relationship (XFN)'), 'link_xfn_meta_box', 'link', 'normal', 'core'); +/** + * Display advanced link options form fields. + * + * @since 2.6.0 + * + * @param object $link + */ function link_advanced_meta_box($link) { ?> <table class="form-table" style="width: 100%;" cellspacing="2" cellpadding="5"> <tr class="form-field"> <th valign="top" scope="row"><label for="link_image"><?php _e('Image Address') ?></label></th> - <td><input type="text" name="link_image" id="link_image" size="50" value="<?php echo $link->link_image; ?>" style="width: 95%" /></td> + <td><input type="text" name="link_image" id="link_image" size="50" value="<?php echo ( isset( $link->link_image ) ? $link->link_image : ''); ?>" style="width: 95%" /></td> </tr> <tr class="form-field"> <th valign="top" scope="row"><label for="rss_uri"><?php _e('RSS Address') ?></label></th> - <td><input name="link_rss" type="text" id="rss_uri" value="<?php echo $link->link_rss; ?>" size="50" style="width: 95%" /></td> + <td><input name="link_rss" type="text" id="rss_uri" value="<?php echo ( isset( $link->link_rss ) ? $link->link_rss : ''); ?>" size="50" style="width: 95%" /></td> </tr> <tr class="form-field"> <th valign="top" scope="row"><label for="link_notes"><?php _e('Notes') ?></label></th> - <td><textarea name="link_notes" id="link_notes" cols="50" rows="10" style="width: 95%"><?php echo $link->link_notes; ?></textarea></td> + <td><textarea name="link_notes" id="link_notes" cols="50" rows="10" style="width: 95%"><?php echo ( isset( $link->link_notes ) ? $link->link_notes : ''); ?></textarea></td> </tr> <tr class="form-field"> <th valign="top" scope="row"><label for="link_rating"><?php _e('Rating') ?></label></th> @@ -285,7 +321,7 @@ function link_advanced_meta_box($link) { <?php for ($r = 0; $r < 10; $r++) { echo(' <option value="'.$r.'" '); - if ($link->link_rating == $r) + if ( isset($link->link_rating) && $link->link_rating == $r) echo 'selected="selected"'; echo('>'.$r.'</option>'); } @@ -295,7 +331,75 @@ function link_advanced_meta_box($link) { </table> <?php } -add_meta_box('linkadvanceddiv', __('Advanced'), 'link_advanced_meta_box', 'link', 'advanced', 'core'); +add_meta_box('linkadvanceddiv', __('Advanced'), 'link_advanced_meta_box', 'link', 'normal', 'core'); + +do_action('do_meta_boxes', 'link', 'normal', $link); +do_action('do_meta_boxes', 'link', 'advanced', $link); +do_action('do_meta_boxes', 'link', 'side', $link); + +require_once ('admin-header.php'); + +?> + + +<div class="wrap"> +<?php screen_icon(); ?> +<h2><?php echo wp_specialchars( $title ); ?></h2> + +<?php if ( isset( $_GET['added'] ) ) : ?> +<div id="message" class="updated fade"><p><?php _e('Link added.'); ?></p></div> +<?php endif; ?> + +<?php +if ( !empty($form) ) + echo $form; +if ( !empty($link_added) ) + echo $link_added; + +wp_nonce_field( $nonce_action ); +wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); +wp_nonce_field( 'meta-box-order', 'meta-box-order-nonce', false ); ?> + +<div id="poststuff" class="metabox-holder"> + +<div id="side-info-column" class="inner-sidebar"> +<?php + +do_action('submitlink_box'); +$side_meta_boxes = do_meta_boxes( 'link', 'side', $link ); + +?> +</div> + +<div id="post-body" class="<?php echo $side_meta_boxes ? 'has-sidebar' : ''; ?>"> +<div id="post-body-content" class="has-sidebar-content"> +<div id="namediv" class="stuffbox"> +<h3><label for="link_name"><?php _e('Name') ?></label></h3> +<div class="inside"> + <input type="text" name="link_name" size="30" tabindex="1" value="<?php echo $link->link_name; ?>" id="link_name" /> + <p><?php _e('Example: Nifty blogging software'); ?></p> +</div> +</div> + +<div id="addressdiv" class="stuffbox"> +<h3><label for="link_url"><?php _e('Web Address') ?></label></h3> +<div class="inside"> + <input type="text" name="link_url" size="30" tabindex="1" value="<?php echo $link->link_url; ?>" id="link_url" /> + <p><?php _e('Example: <code>http://wordpress.org/</code> — don’t forget the <code>http://</code>'); ?></p> +</div> +</div> + +<div id="descriptiondiv" class="stuffbox"> +<h3><label for="link_description"><?php _e('Description') ?></label></h3> +<div class="inside"> + <input type="text" name="link_description" size="30" tabindex="1" value="<?php echo isset($link->link_description) ? $link->link_description : ''; ?>" id="link_description" /> + <p><?php _e('This will be shown when someone hovers over the link in the blogroll, or optionally below the link.'); ?></p> +</div> +</div> + +<?php + +do_meta_boxes('link', 'normal', $link); do_meta_boxes('link', 'advanced', $link); @@ -310,7 +414,7 @@ if ( $link_id ) : ?> </div> </div> - </div> </form> +</div> wp-admin/edit-link-form.php @@ -1,10 +1,29 @@ <?php +/** + * Edit page form for inclusion in the administration panels. + * + * @package WordPress + * @subpackage Administration + */ + +/** + * Post ID global. + * @name $post_ID + * @var int + */ +if ( ! isset( $post_ID ) ) + $post_ID = 0; +if ( ! isset( $temp_ID ) ) + $temp_ID = 0; + if ( isset($_GET['message']) ) $_GET['message'] = absint( $_GET['message'] ); -$messages[1] = sprintf( __( 'Page updated. Continue editing below or <a href="%s">go back</a>.' ), attribute_escape( stripslashes( $_GET['_wp_original_http_referer'] ) ) ); +$messages[1] = sprintf( __( 'Page updated. Continue editing below or <a href="%s">go back</a>.' ), attribute_escape( stripslashes( ( isset( $_GET['_wp_original_http_referer'] ) ? $_GET['_wp_original_http_referer'] : '') ) ) ); $messages[2] = __('Custom field updated.'); $messages[3] = __('Custom field deleted.'); $messages[4] = __('Page updated.'); +$messages[5] = sprintf(__('Page published. <a href="%s">View page</a>'), get_permalink($post_ID)); +$messages[6] = sprintf(__('Page submitted. <a href="%s">Preview page</a>'), add_query_arg( 'preview', 'true', get_permalink($post_ID) ) ); if ( isset($_GET['revision']) ) $messages[5] = sprintf( __('Page restored to revision from %s'), wp_post_revision_title( (int) $_GET['revision'], false ) ); @@ -12,7 +31,7 @@ if ( isset($_GET['revision']) ) $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) { +if ( 0 == $post_ID) { $form_action = 'post'; $nonce_action = 'add-page'; $temp_ID = -1 * time(); // don't change this formula without looking at wp_write_post() @@ -22,7 +41,7 @@ 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 ); + $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 ) ); } @@ -30,193 +49,277 @@ if (!isset($post_ID) || 0 == $post_ID) { $temp_ID = (int) $temp_ID; $user_ID = (int) $user_ID; +/** + * Display submit form fields. + * + * @since 2.7.0 + * + * @param object $post + */ +function page_submit_meta_box($post) { + global $action; + + $can_publish = current_user_can('publish_pages'); ?> +<div class="submitbox" id="submitpage"> -<?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; ?> +<div id="minor-publishing"> -<form name="post" action="page.php" method="post" id="post"> -<div class="wrap"> -<h2><?php _e('Write Page') ?></h2> +<?php // Hidden submit button early on so that the browser chooses the right button when form is submitted with Return key ?> +<div style="display:none;"> +<input type="submit" name="save" value="<?php echo attribute_escape( __('Save') ); ?>" /> +</div> -<?php -wp_nonce_field($nonce_action); +<div id="minor-publishing-actions"> +<div id="save-action"> +<?php if ( 'publish' != $post->post_status && 'future' != $post->post_status && 'pending' != $post->post_status ) { ?> +<input <?php if ( 'private' == $post->post_status ) { ?>style="display:none"<?php } ?> type="submit" name="save" id="save-post" value="<?php echo attribute_escape( __('Save Draft') ); ?>" tabindex="4" class="button button-highlighted" /> +<?php } elseif ( 'pending' == $post->post_status && $can_publish ) { ?> +<input type="submit" name="save" id="save-post" value="<?php echo attribute_escape( __('Save as Pending') ); ?>" tabindex="4" class="button button-highlighted" /> +<?php } ?> +</div> -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'); ?> +<div id="preview-action"> +<?php $preview_link = 'publish' == $post->post_status ? clean_url(get_permalink($post->ID)) : clean_url(apply_filters('preview_post_link', add_query_arg('preview', 'true', get_permalink($post->ID)))); ?> -<div id="poststuff"> +<a class="preview button" href="<?php echo $preview_link; ?>" target="wp-preview" id="post-preview" tabindex="4"><?php _e('Preview'); ?></a> +<input type="hidden" name="wp-preview" id="wp-preview" value="" /> +</div> -<div class="submitbox" id="submitpage"> +<div class="clear"></div> +</div><?php // /minor-publishing-actions ?> -<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 id="misc-publishing-actions"> -<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) ) ) : +<div class="misc-pub-section<?php if ( !$can_publish ) { echo ' misc-pub-section-last'; } ?>"><label for="post_status"><?php _e('Status:') ?></label> +<b><span id="post-status-display"> +<?php +switch ( $post->post_status ) { + case 'private': + _e('Privately Published'); + break; + case 'publish': + _e('Published'); + break; + case 'future': + _e('Scheduled'); + break; + case 'pending': + _e('Pending Review'); + break; + case 'draft': + _e('Draft'); + break; +} ?> -<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> +</span></b> +<?php if ( 'publish' == $post->post_status || 'private' == $post->post_status || $can_publish ) { ?> +<a href="#post_status" <?php if ( 'private' == $post->post_status ) { ?>style="display:none;" <?php } ?>class="edit-post-status hide-if-no-js" tabindex='4'><?php _e('Edit') ?></a> + +<div id="post-status-select" class="hide-if-js"> +<input type="hidden" name="hidden_post_status" id="hidden_post_status" value="<?php echo $post->post_status; ?>" /> +<select name='post_status' id='post_status' tabindex='4'> +<?php if ( 'publish' == $post->post_status ) : ?> +<option<?php selected( $post->post_status, 'publish' ); ?> value='publish'><?php _e('Published') ?></option> +<?php elseif ( 'private' == $post->post_status ) : ?> +<option<?php selected( $post->post_status, 'private' ); ?> value='publish'><?php _e('Privately Published') ?></option> +<?php elseif ( 'future' == $post->post_status ) : ?> +<option<?php selected( $post->post_status, 'future' ); ?> value='future'><?php _e('Scheduled') ?></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> +<option<?php selected( $post->post_status, 'draft' ); ?> value='draft'><?php _e('Draft') ?></option> </select> + + <a href="#post_status" class="save-post-status hide-if-no-js button"><?php _e('OK'); ?></a> + <a href="#post_status" class="cancel-post-status hide-if-no-js"><?php _e('Cancel'); ?></a> +</div> + +<?php } ?> +</div><?php // /misc-pub-section ?> + +<div class="misc-pub-section " id="visibility"> +<?php _e('Visibility:'); ?> <b><span id="post-visibility-display"><?php + +if ( 'private' == $post->post_status ) { + $post->post_password = ''; + $visibility = 'private'; + $visibility_trans = __('Private'); +} elseif ( !empty( $post->post_password ) ) { + $visibility = 'password'; + $visibility_trans = __('Password protected'); +} else { + $visibility = 'public'; + $visibility_trans = __('Public'); +} + +?><?php echo wp_specialchars( $visibility_trans ); ?></span></b> <?php if ( $can_publish ) { ?> <a href="#visibility" class="edit-visibility hide-if-no-js"><?php _e('Edit'); ?></a> + +<div id="post-visibility-select" class="hide-if-js"> +<input type="hidden" name="hidden_post_password" id="hidden-post-password" value="<?php echo attribute_escape($post->post_password); ?>" /> +<input type="hidden" name="hidden_post_visibility" id="hidden-post-visibility" value="<?php echo attribute_escape( $visibility ); ?>" /> + + +<input type="radio" name="visibility" id="visibility-radio-public" value="public" <?php checked( $visibility, 'public' ); ?> /> <label for="visibility-radio-public" class="selectit"><?php _e('Public'); ?></label><br /> +<input type="radio" name="visibility" id="visibility-radio-password" value="password" <?php checked( $visibility, 'password' ); ?> /> <label for="visibility-radio-password" class="selectit"><?php _e('Password protected'); ?></label><br /> +<span id="password-span"><label for="post_password"><?php _e('Password:'); ?></label> <input type="text" name="post_password" id="post_password" value="<?php echo attribute_escape($post->post_password); ?>" /><br /></span> +<input type="radio" name="visibility" id="visibility-radio-private" value="private" <?php checked( $visibility, 'private' ); ?> /> <label for="visibility-radio-private" class="selectit"><?php _e('Private'); ?></label><br /> + +<p> + <a href="#visibility" class="save-post-visibility hide-if-no-js button"><?php _e('OK'); ?></a> + <a href="#visibility" class="cancel-post-visibility hide-if-no-js"><?php _e('Cancel'); ?></a> </p> -<?php if ( current_user_can( 'publish_posts' ) ) : ?> -<p id="private-checkbox"><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; ?> +</div> +<?php } ?> + +</div><?php // /misc-pub-section ?> <?php -if ($post_ID) { +$datef = _c( 'M j, Y @ G:i|Publish box date format'); +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 - $stamp = __('Published on:<br />%1$s at %2$s'); - } else if ( '0000-00-00 00:00:00' == $post->post_date ) { // draft, 1 or more saves, no date specified - $stamp = __('Publish immediately'); + $stamp = __('Scheduled for: <b>%1$s</b>'); + } else if ( 'publish' == $post->post_status || 'private' == $post->post_status ) { // already published + $stamp = __('Published on: <b>%1$s</b>'); + } else if ( '0000-00-00 00:00:00' == $post->post_date_gmt ) { // draft, 1 or more saves, no date specified + $stamp = __('Publish <b>immediately</b>'); + } else if ( time() < strtotime( $post->post_date_gmt . ' +0000' ) ) { // draft, 1 or more saves, future date specified + $stamp = __('Schedule for: <b>%1$s</b>'); } else { // draft, 1 or more saves, date specified - $stamp = __('Publish on:<br />%1$s at %2$s'); + $stamp = __('Publish on: <b>%1$s</b>'); } - $date = mysql2date(get_option('date_format'), $post->post_date); - $time = mysql2date(get_option('time_format'), $post->post_date); + $date = date_i18n( $datef, strtotime( $post->post_date ) ); } else { // draft (no saves, and thus no date specified) - $stamp = __('Publish immediately'); - $date = mysql2date(get_option('date_format'), current_time('mysql')); - $time = mysql2date(get_option('time_format'), current_time('mysql')); + $stamp = __('Publish <b>immediately</b>'); + $date = date_i18n( $datef, strtotime( current_time('mysql') ) ); } ?> -<p class="curtime"><?php printf($stamp, $date, $time); ?> - <a href="#edit_timestamp" class="edit-timestamp hide-if-no-js" tabindex='4'><?php _e('Edit') ?></a></p> +<?php if ( $can_publish ) : // Contributors don't get to choose the date of publish ?> +<div class="misc-pub-section curtime misc-pub-section-last"> + <span id="timestamp"> + <?php printf($stamp, $date); ?></span> + <a href="#edit_timestamp" class="edit-timestamp hide-if-no-js" tabindex='4'><?php _e('Edit') ?></a> + <div id="timestampdiv" class="hide-if-js"><?php touch_time(($action == 'edit'),1,4); ?></div> +</div><?php // /misc-pub-section ?> +<?php endif; ?> -<div id='timestampdiv' class='hide-if-js'><?php touch_time(($action == 'edit'),1,4); ?></div> +</div> +<div class="clear"></div> +</div> +<div id="major-publishing-actions"> +<?php do_action('post_submitbox_start'); ?> +<div id="delete-action"> +<?php +if ( ( 'edit' == $action ) && current_user_can('delete_page', $post->ID) ) { ?> +<a class="submitdelete deletion" href="<?php echo wp_nonce_url("page.php?action=delete&post=$post->ID", 'delete-page_' . $post->ID); ?>" onclick="if ( confirm('<?php echo 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;"><?php _e('Delete'); ?></a> +<?php } ?> </div> -<p class="submit"> -<input type="submit" name="save" class="button button-highlighted" value="<?php _e('Save'); ?>" tabindex="4" /> +<div id="publishing-action"> <?php -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') ?>" /> +if ( !in_array( $post->post_status, array('publish', 'future', 'private') ) || 0 == $post->ID ) { ?> +<?php if ( $can_publish ) : ?> + <?php if ( !empty($post->post_date_gmt) && time() < strtotime( $post->post_date_gmt . ' +0000' ) ) : ?> + <input name="original_publish" type="hidden" id="original_publish" value="<?php _e('Schedule') ?>" /> + <input name="publish" type="submit" class="button-primary" id="publish" tabindex="5" accesskey="p" value="<?php _e('Schedule') ?>" /> + <?php else : ?> + <input name="original_publish" type="hidden" id="original_publish" value="<?php _e('Publish') ?>" /> + <input name="publish" type="submit" class="button-primary" id="publish" tabindex="5" accesskey="p" value="<?php _e('Publish') ?>" /> + <?php endif; ?> <?php else : ?> - <input name="publish" type="submit" class="button" id="publish" tabindex="5" accesskey="p" value="<?php _e('Submit for Review') ?>" /> + <input name="original_publish" type="hidden" id="original_publish" value="<?php _e('Submit for Review') ?>" /> + <input name="publish" type="submit" class="button-primary" id="publish" tabindex="5" accesskey="p" value="<?php _e('Submit for Review') ?>" /> <?php endif; ?> +<?php } else { ?> + <input name="original_publish" type="hidden" id="original_publish" value="<?php _e('Update Page') ?>" /> + <input name="save" type="submit" class="button-primary" id="publish" tabindex="5" accesskey="p" value="<?php _e('Update Page') ?>" /> +<?php } ?> +</div> +<div class="clear"></div> +</div> +</div> <?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>"; +add_meta_box('pagesubmitdiv', __('Publish'), 'page_submit_meta_box', 'page', 'side', 'core'); + +/** + * Display page password form fields. + * + * @since 2.6.0 + * + * @param object $post + */ +function page_password_meta_box($post){ ?> -<br class="clear" /> -<?php if ($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 { - 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)); +<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> +<h4><?php _e( 'Page Password' ); ?></h4> +<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 the_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> +<?php } +// add_meta_box('pagepassworddiv', __('Privacy Options'), 'page_password_meta_box', 'page', 'side', 'core'); + +/** + * Display page attributes form fields. + * + * @since 2.7.0 + * + * @param object $post + */ +function page_attributes_meta_box($post){ ?> -<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 ($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 +<h5><?php _e('Parent') ?></h5> +<label class="hidden" for="parent_id"><?php _e('Page Parent') ?></label> +<?php wp_dropdown_pages(array('exclude_tree' => $post->ID, 'selected' => $post->post_parent, 'name' => 'parent_id', 'show_option_none' => __('Main Page (no parent)'), 'sort_column'=> 'menu_order, post_title')); ?> +<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 + if ( 0 != count( get_page_templates() ) ) { +?> +<h5><?php _e('Template') ?></h5> +<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> +<?php + } +?> +<h5><?php _e('Order') ?></h5> +<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> +<?php +} +add_meta_box('pageparentdiv', __('Attributes'), 'page_attributes_meta_box', 'page', 'side', 'core'); + +/** + * Display custom field for page form fields. + * + * @since 2.6.0 + * + * @param object $post + */ function page_custom_meta_box($post){ ?> <div id="postcustomstuff"> -<table cellpadding="3"> <?php $metadata = has_meta($post->ID); list_meta($metadata); -?> - -</table> -<?php - meta_form(); +meta_form(); ?> <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> <?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'); + +/** + * Display comments status form fields. + * + * @since 2.6.0 + * + * @param object $post + */ function page_comments_status_meta_box($post){ ?> <input name="advanced_view" type="hidden" value="1" /> @@ -225,92 +328,168 @@ function page_comments_status_meta_box($post){ <?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> -<?php -} -add_meta_box('pagecommentstatusdiv', __('Comments & Pings'), 'page_comments_status_meta_box', 'page', 'advanced', 'core'); - -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> <?php } -add_meta_box('pagepassworddiv', __('Password Protect This Page'), 'page_password_meta_box', 'page', 'advanced', 'core'); - +add_meta_box('pagecommentstatusdiv', __('Discussion'), 'page_comments_status_meta_box', 'page', 'normal', 'core'); + +/** + * Display page slug form fields. + * + * @since 2.6.0 + * + * @param object $post + */ 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'); - -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> -<?php -} -add_meta_box('pageparentdiv', __('Page Parent'), 'page_parent_meta_box', 'page', 'advanced', 'core'); - -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> -<?php - } - add_meta_box('pagetemplatediv', __('Page Template'), 'page_template_meta_box', 'page', 'advanced', 'core'); -} - -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> -<?php -} -add_meta_box('pageorderdiv', __('Page Order'), 'page_order_meta_box', 'page', 'advanced', 'core'); - +add_meta_box('pageslugdiv', __('Page Slug'), 'page_slug_meta_box', 'page', 'normal', 'core'); -$authors = get_editable_user_ids( $current_user->id ); // TODO: ROLE SYSTEM +$authors = get_editable_user_ids( $current_user->id, true, 'page' ); // TODO: ROLE SYSTEM if ( $post->post_author && !in_array($post->post_author, $authors) ) $authors[] = $post->post_author; if ( $authors && count( $authors ) > 1 ) { + /** + * Display page author form fields, when more than one author exists. + * + * @since 2.6.0 + * + * @param object $post + */ function page_author_meta_box($post){ global $current_user, $user_ID; - $authors = get_editable_user_ids( $current_user->id ); // TODO: ROLE SYSTEM + $authors = get_editable_user_ids( $current_user->id, true, 'page' ); // TODO: ROLE SYSTEM if ( $post->post_author && !in_array($post->post_author, $authors) ) $authors[] = $post->post_author; ?> <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'); } - -if ( isset($post_ID) && 0 < $post_ID && wp_get_post_revisions( $post_ID ) ) : +if ( 0 < $post_ID && wp_get_post_revisions( $post_ID ) ) : +/** + * Display list of page revisions. + * + * @since 2.6.0 + * + * @param object $post + */ 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; -do_meta_boxes('page', 'advanced', $post); +do_action('do_meta_boxes', 'page', 'normal', $post); +do_action('do_meta_boxes', 'page', 'advanced', $post); +do_action('do_meta_boxes', 'page', 'side', $post); + +require_once('admin-header.php'); +?> + +<div class="wrap"> +<?php screen_icon(); ?> +<h2><?php echo wp_specialchars( $title ); ?></h2> + +<form name="post" action="page.php" method="post" id="post"> +<?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; ?> + +<?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'); ?> + +<div id="poststuff" class="metabox-holder"> + +<div id="side-info-column" class="inner-sidebar"> + +<?php + +do_action('submitpage_box'); +$side_meta_boxes = do_meta_boxes('page', 'side', $post); + ?> +</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"> +<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"> + +<?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> </form> +</div> <script type="text/javascript"> try{document.post.title.focus();}catch(e){} wp-admin/edit-page-form.php @@ -1,199 +1,277 @@ <?php +/** + * Edit Pages Administration Panel. + * + * @package WordPress + * @subpackage Administration + */ + +/** WordPress Administration Bootstrap */ require_once('admin.php'); -// Handle bulk deletes -if ( isset($_GET['deleteit']) && isset($_GET['delete']) ) { - check_admin_referer('bulk-pages'); - foreach( (array) $_GET['delete'] as $post_id_del ) { - $post_del = & get_post($post_id_del); - - if ( !current_user_can('delete_page', $post_id_del) ) - wp_die( __('You are not allowed to delete this page.') ); - - if ( $post_del->post_type == 'attachment' ) { - if ( ! wp_delete_attachment($post_id_del) ) - wp_die( __('Error in deleting...') ); - } else { - if ( !wp_delete_post($post_id_del) ) - wp_die( __('Error in deleting...') ); - } +// Handle bulk actions +if ( isset($_GET['action']) && ( -1 != $_GET['action'] || -1 != $_GET['action2'] ) ) { + $doaction = ( -1 != $_GET['action'] ) ? $_GET['action'] : $_GET['action2']; + + switch ( $doaction ) { + case 'delete': + if ( isset($_GET['post']) && ! isset($_GET['bulk_edit']) && (isset($_GET['doaction']) || isset($_GET['doaction2'])) ) { + check_admin_referer('bulk-pages'); + $deleted = 0; + foreach( (array) $_GET['post'] as $post_id_del ) { + $post_del = & get_post($post_id_del); + + if ( !current_user_can('delete_page', $post_id_del) ) + wp_die( __('You are not allowed to delete this page.') ); + + if ( $post_del->post_type == 'attachment' ) { + if ( ! wp_delete_attachment($post_id_del) ) + wp_die( __('Error in deleting...') ); + } else { + if ( !wp_delete_post($post_id_del) ) + wp_die( __('Error in deleting...') ); + } + $deleted++; + } + } + break; + case 'edit': + if ( isset($_GET['post']) && isset($_GET['bulk_edit']) ) { + check_admin_referer('bulk-pages'); + + if ( -1 == $_GET['_status'] ) { + $_GET['post_status'] = null; + unset($_GET['_status'], $_GET['post_status']); + } else { + $_GET['post_status'] = $_GET['_status']; + } + + $done = bulk_edit_posts($_GET); + } + break; } $sendback = wp_get_referer(); if (strpos($sendback, 'page.php') !== false) $sendback = admin_url('page-new.php'); elseif (strpos($sendback, 'attachments.php') !== false) $sendback = admin_url('attachments.php'); - $sendback = preg_replace('|[^a-z0-9-~+_.?#=&;,/:]|i', '', $sendback); - + if ( isset($done) ) { + $done['updated'] = count( $done['updated'] ); + $done['skipped'] = count( $done['skipped'] ); + $done['locked'] = count( $done['locked'] ); + $sendback = add_query_arg( $done, $sendback ); + } + if ( isset($deleted) ) + $sendback = add_query_arg('deleted', $deleted, $sendback); wp_redirect($sendback); exit(); -} elseif ( !empty($_GET['_wp_http_referer']) ) { - wp_redirect(remove_query_arg(array('_wp_http_referer', '_wpnonce'), stripslashes($_SERVER['REQUEST_URI']))); +} elseif ( isset($_GET['_wp_http_referer']) && ! empty($_GET['_wp_http_referer']) ) { + wp_redirect( remove_query_arg( array('_wp_http_referer', '_wpnonce'), stripslashes($_SERVER['REQUEST_URI']) ) ); exit; } -$title = __('Pages'); -$parent_file = 'edit.php'; -wp_enqueue_script('admin-forms'); +if ( empty($title) ) + $title = __('Edit Pages'); +$parent_file = 'edit-pages.php'; +wp_enqueue_script('inline-edit-post'); $post_stati = array( // array( adj, noun ) - 'publish' => array(__('Published'), __('Published pages'), __ngettext_noop('Published (%s)', 'Published (%s)')), - 'future' => array(__('Scheduled'), __('Scheduled pages'), __ngettext_noop('Scheduled (%s)', 'Scheduled (%s)')), - 'pending' => array(__('Pending Review'), __('Pending pages'), __ngettext_noop('Pending Review (%s)', 'Pending Review (%s)')), - 'draft' => array(__('Draft'), _c('Drafts|manage posts header'), __ngettext_noop('Draft (%s)', 'Drafts (%s)')), - 'private' => array(__('Private'), __('Private pages'), __ngettext_noop('Private (%s)', 'Private (%s)')) + 'publish' => array(__('Published|page'), __('Published pages'), _n_noop('Published <span class="count">(%s)</span>|page', 'Published <span class="count">(%s)</span>')), + 'future' => array(__('Scheduled|page'), __('Scheduled pages'), _n_noop('Scheduled <span class="count">(%s)</span>|page', 'Scheduled <span class="count">(%s)</span>')), + 'pending' => array(__('Pending Review|page'), __('Pending pages'), _n_noop('Pending Review <span class="count">(%s)</span>|page', 'Pending Review <span class="count">(%s)</span>')), + 'draft' => array(__('Draft|page'), _c('Drafts|manage posts header'), _n_noop('Draft <span class="count">(%s)</span>|page', 'Drafts <span class="count">(%s)</span>')), + 'private' => array(__('Private|page'), __('Private pages'), _n_noop('Private <span class="count">(%s)</span>|page', 'Private <span class="count">(%s)</span>')) ); -$post_status_label = __('Manage Pages'); -$post_status_q = ''; +$query = array('post_type' => 'page', 'orderby' => 'menu_order title', 'what_to_show' => 'posts', + 'posts_per_page' => -1, 'posts_per_archive_page' => -1, 'order' => 'asc'); + +$post_status_label = __('Pages'); if ( isset($_GET['post_status']) && in_array( $_GET['post_status'], array_keys($post_stati) ) ) { $post_status_label = $post_stati[$_GET['post_status']][1]; - $post_status_q = '&post_status=' . $_GET['post_status']; - $post_status_q .= '&perm=readable'; + $query['post_status'] = $_GET['post_status']; + $query['perm'] = 'readable'; } -$query_str = "post_type=page&orderby=menu_order title&what_to_show=posts$post_status_q&posts_per_page=-1&posts_per_archive_page=-1&order=asc"; +$query = apply_filters('manage_pages_query', $query); +wp($query); -$query_str = apply_filters('manage_pages_query', $query_str); -wp($query_str); - -if ( is_singular() ) +if ( is_singular() ) { wp_enqueue_script( 'admin-comments' ); -require_once('admin-header.php'); + enqueue_comment_hotkeys_js(); +} + +require_once('admin-header.php'); ?> -?> <div class="wrap"> -<form id="posts-filter" action="" method="get"> -<h2><?php -// Use $_GET instead of is_ since they can override each other -$h2_search = isset($_GET['s']) && $_GET['s'] ? ' ' . sprintf(__('matching “%s”'), wp_specialchars( stripslashes( $_GET['s'] ) ) ) : ''; -$h2_author = ''; -if ( isset($_GET['author']) && $_GET['author'] ) { - $author_user = get_userdata( (int) $_GET['author'] ); - $h2_author = ' ' . sprintf(__('by %s'), wp_specialchars( $author_user->display_name )); +<?php screen_icon(); ?> +<h2><?php echo wp_specialchars( $title ); +if ( isset($_GET['s']) && $_GET['s'] ) + printf( '<span class="subtitle">' . __('Search results for “%s”') . '</span>', wp_specialchars( get_search_query() ) ); ?> +</h2> + +<?php if ( isset($_GET['locked']) || isset($_GET['skipped']) || isset($_GET['updated']) || isset($_GET['deleted']) ) { ?> +<div id="message" class="updated fade"><p> +<?php if ( isset($_GET['updated']) && (int) $_GET['updated'] ) { + printf( __ngettext( '%s page updated.', '%s pages updated.', $_GET['updated'] ), number_format_i18n( $_GET['updated'] ) ); + unset($_GET['updated']); +} + +if ( isset($_GET['skipped']) && (int) $_GET['skipped'] ) { + printf( __ngettext( '%s page not updated, invalid parent page specified.', '%s pages not updated, invalid parent page specified.', $_GET['skipped'] ), number_format_i18n( $_GET['skipped'] ) ); + unset($_GET['skipped']); +} + +if ( isset($_GET['locked']) && (int) $_GET['locked'] ) { + printf( __ngettext( '%s page not updated, somebody is editing it.', '%s pages not updated, somebody is editing them.', $_GET['locked'] ), number_format_i18n( $_GET['skipped'] ) ); + unset($_GET['locked']); +} + +if ( isset($_GET['deleted']) && (int) $_GET['deleted'] ) { + printf( __ngettext( 'Page deleted.', '%s pages deleted.', $_GET['deleted'] ), number_format_i18n( $_GET['deleted'] ) ); + unset($_GET['deleted']); } -printf( _c( '%1$s%2$s%3$s|You can reorder these: 1: Pages, 2: by {s}, 3: matching {s}' ), $post_status_label, $h2_author, $h2_search ); -?></h2> +$_SERVER['REQUEST_URI'] = remove_query_arg( array('locked', 'skipped', 'updated', 'deleted'), $_SERVER['REQUEST_URI'] ); +?> +</p></div> +<?php } ?> + +<?php if ( isset($_GET['posted']) && $_GET['posted'] ) : $_GET['posted'] = (int) $_GET['posted']; ?> +<div id="message" class="updated fade"><p><strong><?php _e('Your page has been saved.'); ?></strong> <a href="<?php echo get_permalink( $_GET['posted'] ); ?>"><?php _e('View page'); ?></a> | <a href="<?php echo get_edit_post_link( $_GET['posted'] ); ?>"><?php _e('Edit page'); ?></a></p></div> +<?php $_SERVER['REQUEST_URI'] = remove_query_arg(array('posted'), $_SERVER['REQUEST_URI']); +endif; ?> +<form id="posts-filter" action="" method="get"> <ul class="subsubsub"> <?php $avail_post_stati = get_available_post_statuses('page'); - +if ( empty($locked_post_status) ) : $status_links = array(); $num_posts = wp_count_posts('page', 'readable'); +$total_posts = array_sum( (array) $num_posts ); $class = empty($_GET['post_status']) ? ' class="current"' : ''; -$status_links[] = "<li><a href=\"edit-pages.php\"$class>".__('All Pages')."</a>"; +$status_links[] = "<li><a href='edit-pages.php'$class>" . sprintf( __ngettext( 'All <span class="count">(%s)</span>', 'All <span class="count">(%s)</span>', $total_posts ), number_format_i18n( $total_posts ) ) . '</a>'; foreach ( $post_stati as $status => $label ) { $class = ''; if ( !in_array($status, $avail_post_stati) ) continue; - if ( $status == $_GET['post_status'] ) + if ( isset( $_GET['post_status'] ) && $status == $_GET['post_status'] ) $class = ' class="current"'; - $status_links[] = "<li><a href=\"edit-pages.php?post_status=$status\"$class>" . - sprintf(__ngettext($label[2][0], $label[2][1], $num_posts->$status), number_format_i18n( $num_posts->$status ) ) . '</a>'; + $status_links[] = "<li><a href='edit-pages.php?post_status=$status'$class>" . sprintf( _nc( $label[2][0], $label[2][1], $num_posts->$status ), number_format_i18n( $num_posts->$status ) ) . '</a>'; } -echo implode(' |</li>', $status_links) . '</li>'; +echo implode( " |</li>\n", $status_links ) . '</li>'; unset($status_links); +endif; ?> </ul> +<p class="search-box"> + <label class="hidden" for="page-search-input"><?php _e( 'Search Pages' ); ?>:</label> + <input type="text" class="search-input" id="page-search-input" name="s" value="<?php _admin_search_query(); ?>" /> + <input type="submit" value="<?php _e( 'Search Pages' ); ?>" class="button" /> +</p> + <?php if ( isset($_GET['post_status'] ) ) : ?> <input type="hidden" name="post_status" value="<?php echo attribute_escape($_GET['post_status']) ?>" /> -<?php -endif; -if ( isset($_GET['posted']) && $_GET['posted'] ) : $_GET['posted'] = (int) $_GET['posted']; ?> -<div id="message" class="updated fade"><p><strong><?php _e('Your page has been saved.'); ?></strong> <a href="<?php echo get_permalink( $_GET['posted'] ); ?>"><?php _e('View page'); ?></a> | <a href="page.php?action=edit&post=<?php echo $_GET['posted']; ?>"><?php _e('Edit page'); ?></a></p></div> -<?php $_SERVER['REQUEST_URI'] = remove_query_arg(array('posted'), $_SERVER['REQUEST_URI']); -endif; -?> +<?php endif; ?> -<p id="post-search"> - <label class="hidden" for="post-search-input"><?php _e( 'Search Pages' ); ?>:</label> - <input type="text" id="post-search-input" name="s" value="<?php echo attribute_escape(stripslashes($_GET['s'])); ?>" /> - <input type="submit" value="<?php _e( 'Search Pages' ); ?>" class="button" /> -</p> +<?php if ($posts) { ?> <div class="tablenav"> <?php -$pagenum = absint( $_GET['pagenum'] ); +$pagenum = isset( $_GET['pagenum'] ) ? absint( $_GET['pagenum'] ) : 0; if ( empty($pagenum) ) $pagenum = 1; -if( !$per_page || $per_page < 0 ) +if( ! isset( $per_page ) || $per_page < 0 ) $per_page = 20; -$num_pages = ceil(count($posts) / $per_page); +$num_pages = ceil($wp_query->post_count / $per_page); $page_links = paginate_links( array( 'base' => add_query_arg( 'pagenum', '%#%' ), 'format' => '', + 'prev_text' => __('«'), + 'next_text' => __('»'), 'total' => $num_pages, 'current' => $pagenum )); -if ( $page_links ) - echo "<div class='tablenav-pages'>$page_links</div>"; -?> - -<div class="alignleft"> -<input type="submit" value="<?php _e('Delete'); ?>" name="deleteit" class="button-secondary delete" /> +if ( $page_links ) : ?> +<div class="tablenav-pages"><?php $page_links_text = sprintf( '<span class="displaying-num">' . __( 'Displaying %s–%s of %s' ) . '</span>%s', + number_format_i18n( ( $pagenum - 1 ) * $per_page + 1 ), + number_format_i18n( min( $pagenum * $per_page, $wp_query->post_count ) ), + number_format_i18n( $wp_query->post_count ), + $page_links +); echo $page_links_text; ?></div> +<?php endif; ?> + +<div class="alignleft actions"> +<select name="action"> +<option value="-1" selected="selected"><?php _e('Bulk Actions'); ?></option> +<option value="edit"><?php _e('Edit'); ?></option> +<option value="delete"><?php _e('Delete'); ?></option> +</select> +<input type="submit" value="<?php _e('Apply'); ?>" name="doaction" id="doaction" class="button-secondary action" /> <?php wp_nonce_field('bulk-pages'); ?> </div> <br class="clear" /> </div> -<br class="clear" /> +<div class="clear"></div> -<?php - -$all = !( $h2_search || $post_status_q ); - -if ($posts) { -?> -<table class="widefat"> +<table class="widefat page fixed" cellspacing="0"> <thead> <tr> -<?php $posts_columns = wp_manage_pages_columns(); ?> -<?php foreach($posts_columns as $post_column_key => $column_display_name) { - if ( 'cb' === $post_column_key ) - $class = ' class="check-column"'; - elseif ( 'comments' === $post_column_key ) - $class = ' class="num"'; - else - $class = ''; -?> - <th scope="col"<?php echo $class; ?>><?php echo $column_display_name; ?></th> -<?php } ?> +<?php print_column_headers('edit-pages'); ?> </tr> </thead> + + <tfoot> + <tr> +<?php print_column_headers('edit-pages', false); ?> + </tr> + </tfoot> + <tbody> <?php page_rows($posts, $pagenum, $per_page); ?> </tbody> </table> -</form> - -<div id="ajax-response"></div> - +<div class="tablenav"> <?php -} else { +if ( $page_links ) + echo "<div class='tablenav-pages'>$page_links_text</div>"; ?> -</form> + +<div class="alignleft actions"> +<select name="action2"> +<option value="-1" selected="selected"><?php _e('Bulk Actions'); ?></option> +<option value="edit"><?php _e('Edit'); ?></option> +<option value="delete"><?php _e('Delete'); ?></option> +</select> +<input type="submit" value="<?php _e('Apply'); ?>" name="doaction2" id="doaction2" class="button-secondary action" /> +</div> + +<br class="clear" /> +</div> + +<?php } else { ?> +<div class="clear"></div> <p><?php _e('No pages found.') ?></p> <?php } // end if ($posts) ?> -<div class="tablenav"> -<?php -if ( $page_links ) - echo "<div class='tablenav-pages'>$page_links</div>"; -?> -<br class="clear" /> -</div> +</form> + +<?php inline_edit_row( 'page' ) ?> + +<div id="ajax-response"></div> + <?php @@ -209,24 +287,24 @@ if ( 1 == count($posts) && is_singular() ) : <br class="clear" /> -<table class="widefat" style="margin-top: .5em"> +<table class="widefat" cellspacing="0"> <thead> <tr> - <th scope="col"><?php _e('Comment') ?></th> - <th scope="col"><?php _e('Date') ?></th> - <th scope="col"><?php _e('Actions') ?></th> + <th scope="col" class="column-comment"><?php echo _c('Comment|noun') ?></th> + <th scope="col" class="column-author"><?php _e('Author') ?></th> + <th scope="col" class="column-date"><?php _e('Submitted') ?></th> </tr> </thead> <tbody id="the-comment-list" class="list:comment"> <?php foreach ($comments as $comment) - _wp_comment_row( $comment->comment_ID, 'detail', false, false ); + _wp_comment_row( $comment->comment_ID, 'single', false, false ); ?> </tbody> </table> <?php - +wp_comment_reply(); endif; // comments endif; // posts; @@ -234,4 +312,20 @@ endif; // posts; </div> +<script type="text/javascript"> +/* <![CDATA[ */ +(function($){ + $(document).ready(function(){ + $('#doaction, #doaction2').click(function(){ + if ( $('select[name^="action"]').val() == 'delete' ) { + var m = '<?php echo js_escape(__("You are about to delete the selected pages.\n 'Cancel' to stop, 'OK' to delete.")); ?>'; + return showNotice.warn(m); + } + }); + }); +})(jQuery); +columns.init('edit-pages'); +/* ]]> */ +</script> + <?php include('admin-footer.php'); ?> wp-admin/edit-pages.php @@ -1,206 +1,27 @@ -<?php if ( ! defined('ABSPATH') ) die(); ?> -<table class="widefat"> +<?php +/** + * Edit posts rows table for inclusion in administration panels. + * + * @package WordPress + * @subpackage Administration + */ + +if ( ! defined('ABSPATH') ) die(); +?> +<table class="widefat post fixed" cellspacing="0"> <thead> <tr> - -<?php $posts_columns = wp_manage_posts_columns(); ?> -<?php foreach($posts_columns as $post_column_key => $column_display_name) { - if ( 'cb' === $post_column_key ) - $class = ' class="check-column"'; - elseif ( 'comments' === $post_column_key ) - $class = ' class="num"'; - else - $class = ''; -?> - <th scope="col"<?php echo $class; ?>><?php echo $column_display_name; ?></th> -<?php } ?> - +<?php print_column_headers('edit'); ?> </tr> </thead> - <tbody> -<?php -if ( have_posts() ) { -$bgcolor = ''; -add_filter('the_title','wp_specialchars'); - -// Create array of post IDs. -$post_ids = array(); -foreach ( $wp_query->posts as $a_post ) - $post_ids[] = $a_post->ID; - -$comment_pending_count = get_pending_comments_num($post_ids); - -while (have_posts()) : the_post(); -$class = 'alternate' == $class ? '' : 'alternate'; -global $current_user; -$post_owner = ( $current_user->ID == $post->post_author ? 'self' : 'other' ); -$title = get_the_title(); -if ( empty($title) ) - $title = __('(no title)'); -?> - <tr id='post-<?php echo $id; ?>' class='<?php echo trim( $class . ' author-' . $post_owner . ' status-' . $post->post_status ); ?>' valign="top"> - -<?php - -foreach($posts_columns as $column_name=>$column_display_name) { - - switch($column_name) { - - case 'cb': - ?> - <th scope="row" class="check-column"><?php if ( current_user_can( 'edit_post', $post->ID ) ) { ?><input type="checkbox" name="delete[]" value="<?php the_ID(); ?>" /><?php } ?></th> - <?php - break; - case 'modified': - case 'date': - if ( '0000-00-00 00:00:00' == $post->post_date && 'date' == $column_name ) { - $t_time = $h_time = __('Unpublished'); - } else { - if ( 'modified' == $column_name ) { - $t_time = get_the_modified_time(__('Y/m/d g:i:s A')); - $m_time = $post->post_modified; - $time = get_post_modified_time('G', true); - } else { - $t_time = get_the_time(__('Y/m/d g:i:s A')); - $m_time = $post->post_date; - $time = get_post_time('G', true); - } - if ( ( abs(time() - $time) ) < 86400 ) { - if ( ( 'future' == $post->post_status) ) - $h_time = sprintf( __('%s from now'), human_time_diff( $time ) ); - else - $h_time = sprintf( __('%s ago'), human_time_diff( $time ) ); - } else { - $h_time = mysql2date(__('Y/m/d'), $m_time); - } - } - ?> - <td><abbr title="<?php echo $t_time ?>"><?php echo apply_filters('post_date_column_time', $h_time, $post, $column_name) ?></abbr></td> - <?php - break; - case 'title': - ?> - <td><strong><?php if ( current_user_can( 'edit_post', $post->ID ) ) { ?><a class="row-title" href="post.php?action=edit&post=<?php the_ID(); ?>" title="<?php echo attribute_escape(sprintf(__('Edit "%s"'), $title)); ?>"><?php echo $title ?></a><?php } else { echo $title; } ?></strong> - <?php if ( !empty($post->post_password) ) { _e(' — <strong>Protected</strong>'); } elseif ('private' == $post->post_status) { _e(' — <strong>Private</strong>'); } ?></td> - <?php - break; - case 'categories': - ?> - <td><?php - $categories = get_the_category(); - if ( !empty( $categories ) ) { - $out = array(); - foreach ( $categories as $c ) - $out[] = "<a href='edit.php?category_name=$c->slug'> " . wp_specialchars(sanitize_term_field('name', $c->name, $c->term_id, 'category', 'display')) . "</a>"; - echo join( ', ', $out ); - } else { - _e('Uncategorized'); - } - ?></td> - <?php - break; - - case 'tags': - ?> - <td><?php - $tags = get_the_tags(); - if ( !empty( $tags ) ) { - $out = array(); - foreach ( $tags as $c ) - $out[] = "<a href='edit.php?tag=$c->slug'> " . wp_specialchars(sanitize_term_field('name', $c->name, $c->term_id, 'post_tag', 'display')) . "</a>"; - echo join( ', ', $out ); - } else { - _e('No Tags'); - } - ?></td> - <?php - break; - - case 'comments': - ?> - <td class="num"><div class="post-com-count-wrapper"> - <?php - $left = isset($comment_pending_count) ? $comment_pending_count[$post->ID] : 0; - $pending_phrase = sprintf( __('%s pending'), number_format( $left ) ); - if ( $left ) - echo '<strong>'; - comments_number("<a href='edit.php?p=$id' title='$pending_phrase' class='post-com-count'><span class='comment-count'>" . __('0') . '</span></a>', "<a href='edit.php?p=$id' title='$pending_phrase' class='post-com-count'><span class='comment-count'>" . __('1') . '</span></a>', "<a href='edit.php?p=$id' title='$pending_phrase' class='post-com-count'><span class='comment-count'>" . __('%') . '</span></a>'); - if ( $left ) - echo '</strong>'; - ?> - </div></td> - <?php - break; - - case 'author': - ?> - <td><a href="edit.php?author=<?php the_author_ID(); ?>"><?php the_author() ?></a></td> - <?php - break; - - case 'status': - ?> - <td> - <a href="<?php the_permalink(); ?>" title="<?php echo attribute_escape(sprintf(__('View "%s"'), $title)); ?>" rel="permalink"> - <?php - switch ( $post->post_status ) { - case 'publish' : - case 'private' : - _e('Published'); - break; - case 'future' : - _e('Scheduled'); - break; - case 'pending' : - _e('Pending Review'); - break; - case 'draft' : - _e('Unpublished'); - break; - } - ?> - </a> - </td> - <?php - break; - - case 'control_view': - ?> - <td><a href="<?php the_permalink(); ?>" rel="permalink" class="view"><?php _e('View'); ?></a></td> - <?php - break; - - case 'control_edit': - ?> - <td><?php if ( current_user_can('edit_post',$post->ID) ) { echo "<a href='post.php?action=edit&post=$id' class='edit'>" . __('Edit') . "</a>"; } ?></td> - <?php - break; - - case 'control_delete': - ?> - <td><?php if ( current_user_can('delete_post',$post->ID) ) { echo "<a href='" . wp_nonce_url("post.php?action=delete&post=$id", 'delete-post_' . $post->ID) . "' class='delete'>" . __('Delete') . "</a>"; } ?></td> - <?php - break; - - default: - ?> - <td><?php do_action('manage_posts_custom_column', $column_name, $id); ?></td> - <?php - break; - } -} -?> + <tfoot> + <tr> +<?php print_column_headers('edit', false); ?> </tr> -<?php -endwhile; -} else { -?> - <tr style='background-color: <?php echo $bgcolor; ?>'> - <td colspan="8"><?php _e('No posts found.') ?></td> - </tr> -<?php -} // end if ( have_posts() ) -?> + </tfoot> + + <tbody> +<?php post_rows(); ?> </tbody> -</table> +</table> \ No newline at end of file wp-admin/edit-post-rows.php @@ -1,41 +1,40 @@ <?php -if ( ! empty($tag_ID) ) { - $heading = __('Edit Tag'); - $submit_text = __('Edit Tag'); - $form = '<form name="edittag" id="edittag" method="post" action="edit-tags.php" class="validate">'; - $action = 'editedtag'; - $nonce_action = 'update-tag_' . $tag_ID; - do_action('edit_tag_form_pre', $tag); -} else { - $heading = __('Add Tag'); - $submit_text = __('Add Tag'); - $form = '<form name="addtag" id="addtag" method="post" action="edit-tags.php" class="add:the-list: validate">'; - $action = 'addtag'; - $nonce_action = 'add-tag'; - do_action('add_tag_form_pre', $tag); +/** + * Edit tag form for inclusion in administration panels. + * + * @package WordPress + * @subpackage Administration + */ + +if ( empty($tag_ID) ) { ?> + <div id="message" class="updated fade"><p><strong><?php _e('A tag was not selected for editing.'); ?></strong></p></div> +<?php + return; } -?> + +do_action('edit_tag_form_pre', $tag); ?> <div class="wrap"> -<h2><?php echo $heading ?></h2> +<?php screen_icon(); ?> +<h2><?php _e('Edit Tag'); ?></h2> <div id="ajax-response"></div> -<?php echo $form ?> -<input type="hidden" name="action" value="<?php echo $action ?>" /> +<form name="edittag" id="edittag" method="post" action="edit-tags.php" class="validate"> +<input type="hidden" name="action" value="editedtag" /> <input type="hidden" name="tag_ID" value="<?php echo $tag->term_id ?>" /> -<?php wp_original_referer_field(true, 'previous'); wp_nonce_field($nonce_action); ?> +<?php wp_original_referer_field(true, 'previous'); wp_nonce_field('update-tag_' . $tag_ID); ?> <table class="form-table"> <tr class="form-field form-required"> <th scope="row" valign="top"><label for="name"><?php _e('Tag name') ?></label></th> - <td><input name="name" id="name" type="text" value="<?php echo attribute_escape($tag->name); ?>" size="40" aria-required="true" /> + <td><input name="name" id="name" type="text" value="<?php if ( isset( $tag->name ) ) echo attribute_escape($tag->name); ?>" size="40" aria-required="true" /> <p><?php _e('The name is how the tag appears on your site.'); ?></p></td> </tr> <tr class="form-field"> <th scope="row" valign="top"><label for="slug"><?php _e('Tag slug') ?></label></th> - <td><input name="slug" id="slug" type="text" value="<?php echo attribute_escape(apply_filters('editable_slug', $tag->slug)); ?>" size="40" /> + <td><input name="slug" id="slug" type="text" value="<?php if ( isset( $tag->slug ) ) echo attribute_escape(apply_filters('editable_slug', $tag->slug)); ?>" size="40" /> <p><?php _e('The “slug” is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.'); ?></p></td> </tr> </table> -<p class="submit"><input type="submit" class="button" name="submit" value="<?php echo $submit_text ?>" /></p> +<p class="submit"><input type="submit" class="button-primary" name="submit" value="<?php _e('Update Tag'); ?>" /></p> <?php do_action('edit_tag_form', $tag); ?> </form> </div> wp-admin/edit-tag-form.php @@ -1,12 +1,19 @@ <?php +/** + * Edit Tags Administration Panel. + * + * @package WordPress + * @subpackage Administration + */ + +/** WordPress Administration Bootstrap */ require_once('admin.php'); $title = __('Tags'); -$parent_file = 'edit.php'; -wp_reset_vars(array('action', 'tag')); +wp_reset_vars( array('action', 'tag') ); -if ( isset($_GET['deleteit']) && isset($_GET['delete_tags']) ) +if ( isset( $_GET['action'] ) && isset($_GET['delete_tags']) && ( 'delete' == $_GET['action'] || 'delete' == $_GET['action2'] ) ) $action = 'bulk-delete'; switch($action) { @@ -65,6 +72,7 @@ case 'bulk-delete': break; case 'edit': + $title = __('Edit Tag'); require_once ('admin-header.php'); $tag_ID = (int) $_GET['tag_ID']; @@ -100,13 +108,16 @@ break; default: -if ( !empty($_GET['_wp_http_referer']) ) { - wp_redirect(remove_query_arg(array('_wp_http_referer', '_wpnonce'), stripslashes($_SERVER['REQUEST_URI']))); +if ( isset($_GET['_wp_http_referer']) && ! empty($_GET['_wp_http_referer']) ) { + wp_redirect( remove_query_arg( array('_wp_http_referer', '_wpnonce'), stripslashes($_SERVER['REQUEST_URI']) ) ); exit; } -wp_enqueue_script( 'admin-tags' ); -wp_enqueue_script('admin-forms'); +$can_manage = current_user_can('manage_categories'); + +wp_enqueue_script('admin-tags'); +if ( $can_manage ) + wp_enqueue_script('inline-edit-tax'); require_once ('admin-header.php'); @@ -115,43 +126,47 @@ $messages[2] = __('Tag deleted.'); $messages[3] = __('Tag updated.'); $messages[4] = __('Tag not added.'); $messages[5] = __('Tag not updated.'); -$messages[6] = __('Tags deleted.'); -?> +$messages[6] = __('Tags deleted.'); ?> + +<div class="wrap nosubsub"> +<?php screen_icon(); ?> +<h2><?php echo wp_specialchars( $title ); +if ( isset($_GET['s']) && $_GET['s'] ) + printf( '<span class="subtitle">' . __('Search results for “%s”') . '</span>', wp_specialchars( stripslashes($_GET['s']) ) ); ?> +</h2> -<?php if (isset($_GET['message'])) : ?> -<div id="message" class="updated fade"><p><?php echo $messages[$_GET['message']]; ?></p></div> +<?php if ( isset($_GET['message']) && ( $msg = (int) $_GET['message'] ) ) : ?> +<div id="message" class="updated fade"><p><?php echo $messages[$msg]; ?></p></div> <?php $_SERVER['REQUEST_URI'] = remove_query_arg(array('message'), $_SERVER['REQUEST_URI']); endif; ?> -<div class="wrap"> - -<form id="posts-filter" action="" method="get"> -<?php if ( current_user_can('manage_categories') ) : ?> - <h2><?php printf(__('Manage Tags (<a href="%s">add new</a>)'), '#addtag') ?> </h2> -<?php else : ?> - <h2><?php _e('Manage Tags') ?> </h2> -<?php endif; ?> - -<p id="post-search"> - <label class="hidden" for="post-search-input"><?php _e( 'Search Tags' ); ?>:</label> - <input type="text" id="post-search-input" name="s" value="<?php echo attribute_escape(stripslashes($_GET['s'])); ?>" /> +<form class="search-form" action="" method="get"> +<p class="search-box"> + <label class="hidden" for="tag-search-input"><?php _e( 'Search Tags' ); ?>:</label> + <input type="text" class="search-input" id="tag-search-input" name="s" value="<?php _admin_search_query(); ?>" /> <input type="submit" value="<?php _e( 'Search Tags' ); ?>" class="button" /> </p> - +</form> <br class="clear" /> -<div class="tablenav"> +<div id="col-container"> +<div id="col-right"> +<div class="col-wrap"> +<form id="posts-filter" action="" method="get"> +<div class="tablenav"> <?php -$pagenum = absint( $_GET['pagenum'] ); +$pagenum = isset( $_GET['pagenum'] ) ? absint( $_GET['pagenum'] ) : 0; if ( empty($pagenum) ) $pagenum = 1; -if( !$tagsperpage || $tagsperpage < 0 ) - $tagsperpage = 20; + +$tagsperpage = apply_filters("tagsperpage",20); $page_links = paginate_links( array( 'base' => add_query_arg( 'pagenum', '%#%' ), 'format' => '', + 'prev_text' => __('«'), + 'next_text' => __('»'), 'total' => ceil(wp_count_terms('post_tag') / $tagsperpage), 'current' => $pagenum )); @@ -160,53 +175,127 @@ if ( $page_links ) echo "<div class='tablenav-pages'>$page_links</div>"; ?> -<div class="alignleft"> -<input type="submit" value="<?php _e('Delete'); ?>" name="deleteit" class="button-secondary delete" /> +<div class="alignleft actions"> +<select name="action"> +<option value="" selected="selected"><?php _e('Bulk Actions'); ?></option> +<option value="delete"><?php _e('Delete'); ?></option> +</select> +<input type="submit" value="<?php _e('Apply'); ?>" name="doaction" id="doaction" class="button-secondary action" /> <?php wp_nonce_field('bulk-tags'); ?> </div> <br class="clear" /> </div> -<br class="clear" /> +<div class="clear"></div> -<table class="widefat"> +<table class="widefat tag fixed" cellspacing="0"> <thead> <tr> - <th scope="col" class="check-column"><input type="checkbox" /></th> - <th scope="col"><?php _e('Name') ?></th> - <th scope="col" class="num" style="width: 90px"><?php _e('Posts') ?></th> +<?php print_column_headers('edit-tags'); ?> </tr> </thead> + + <tfoot> + <tr> +<?php print_column_headers('edit-tags', false); ?> + </tr> + </tfoot> + <tbody id="the-list" class="list:tag"> <?php -$searchterms = trim( $_GET['s'] ); +$searchterms = isset( $_GET['s'] ) ? trim( $_GET['s'] ) : ''; $count = tag_rows( $pagenum, $tagsperpage, $searchterms ); ?> </tbody> </table> -</form> <div class="tablenav"> - <?php if ( $page_links ) echo "<div class='tablenav-pages'>$page_links</div>"; ?> + +<div class="alignleft actions"> +<select name="action2"> +<option value="" selected="selected"><?php _e('Bulk Actions'); ?></option> +<option value="delete"><?php _e('Delete'); ?></option> +</select> +<input type="submit" value="<?php _e('Apply'); ?>" name="doaction2" id="doaction2" class="button-secondary action" /> +</div> + <br class="clear" /> </div> + <br class="clear" /> +</form> +</div> +</div> + +<div id="col-left"> +<div class="col-wrap"> +<div class="tagcloud"> +<h3><?php _e('Popular Tags'); ?></h3> +<?php +if ( $can_manage ) + wp_tag_cloud(array('link' => 'edit')); +else + wp_tag_cloud(); +?> +</div> + +<?php if ( $can_manage ) { + do_action('add_tag_form_pre'); ?> + +<div class="form-wrap"> +<h3><?php _e('Add a New Tag'); ?></h3> +<div id="ajax-response"></div> +<form name="addtag" id="addtag" method="post" action="edit-tags.php" class="add:the-list: validate"> +<input type="hidden" name="action" value="addtag" /> +<?php wp_original_referer_field(true, 'previous'); wp_nonce_field('add-tag'); ?> + +<div class="form-field form-required"> + <label for="name"><?php _e('Tag name') ?></label> + <input name="name" id="name" type="text" value="" size="40" aria-required="true" /> + <p><?php _e('The name is how the tag appears on your site.'); ?></p> </div> -<?php if ( current_user_can('manage_categories') ) : ?> +<div class="form-field"> + <label for="slug"><?php _e('Tag slug') ?></label> + <input name="slug" id="slug" type="text" value="" size="40" /> + <p><?php _e('The “slug” is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.'); ?></p> +</div> -<br /> -<?php include('edit-tag-form.php'); ?> +<p class="submit"><input type="submit" class="button" name="submit" value="<?php _e('Add Tag'); ?>" /></p> +<?php do_action('add_tag_form'); ?> +</form></div> +<?php } ?> -<?php endif; ?> +</div> +</div> + +</div> +</div> + +<script type="text/javascript"> +/* <![CDATA[ */ +(function($){ + $(document).ready(function(){ + $('#doaction, #doaction2').click(function(){ + if ( $('select[name^="action"]').val() == 'delete' ) { + var m = '<?php echo js_escape(__("You are about to delete the selected tags.\n 'Cancel' to stop, 'OK' to delete.")); ?>'; + return showNotice.warn(m); + } + }); + }); +})(jQuery); +/* ]]> */ +</script> + +<?php inline_edit_term_row('edit-tags'); ?> <?php break; wp-admin/edit-tags.php @@ -1,90 +1,149 @@ <?php +/** + * Edit Posts Administration Panel. + * + * @package WordPress + * @subpackage Administration + */ + +/** WordPress Administration Bootstrap */ require_once('admin.php'); -// Handle bulk deletes -if ( isset($_GET['deleteit']) && isset($_GET['delete']) ) { - check_admin_referer('bulk-posts'); - foreach( (array) $_GET['delete'] as $post_id_del ) { - $post_del = & get_post($post_id_del); - - if ( !current_user_can('delete_post', $post_id_del) ) - wp_die( __('You are not allowed to delete this post.') ); - - if ( $post_del->post_type == 'attachment' ) { - if ( ! wp_delete_attachment($post_id_del) ) - wp_die( __('Error in deleting...') ); - } else { - if ( !wp_delete_post($post_id_del) ) - wp_die( __('Error in deleting...') ); - } +// Back-compat for viewing comments of an entry +if ( $_redirect = intval( max( @$_GET['p'], @$_GET['attachment_id'], @$_GET['page_id'] ) ) ) { + wp_redirect( admin_url('edit-comments.php?p=' . $_redirect ) ); + exit; +} else { + unset( $_redirect ); +} + +// Handle bulk actions +if ( isset($_GET['action']) && ( -1 != $_GET['action'] || -1 != $_GET['action2'] ) ) { + $doaction = ( -1 != $_GET['action'] ) ? $_GET['action'] : $_GET['action2']; + + switch ( $doaction ) { + case 'delete': + if ( isset($_GET['post']) && ! isset($_GET['bulk_edit']) && (isset($_GET['doaction']) || isset($_GET['doaction2'])) ) { + check_admin_referer('bulk-posts'); + $deleted = 0; + foreach( (array) $_GET['post'] as $post_id_del ) { + $post_del = & get_post($post_id_del); + + if ( !current_user_can('delete_post', $post_id_del) ) + wp_die( __('You are not allowed to delete this post.') ); + + if ( $post_del->post_type == 'attachment' ) { + if ( ! wp_delete_attachment($post_id_del) ) + wp_die( __('Error in deleting...') ); + } else { + if ( !wp_delete_post($post_id_del) ) + wp_die( __('Error in deleting...') ); + } + $deleted++; + } + } + break; + case 'edit': + if ( isset($_GET['post']) && isset($_GET['bulk_edit']) ) { + check_admin_referer('bulk-posts'); + + if ( -1 == $_GET['_status'] ) { + $_GET['post_status'] = null; + unset($_GET['_status'], $_GET['post_status']); + } else { + $_GET['post_status'] = $_GET['_status']; + } + + $done = bulk_edit_posts($_GET); + } + break; } $sendback = wp_get_referer(); - if (strpos($sendback, 'post.php') !== false) $sendback = admin_url('post-new.php'); - elseif (strpos($sendback, 'attachments.php') !== false) $sendback = admin_url('attachments.php'); - $sendback = preg_replace('|[^a-z0-9-~+_.?#=&;,/:]|i', '', $sendback); - + if ( strpos($sendback, 'post.php') !== false ) $sendback = admin_url('post-new.php'); + elseif ( strpos($sendback, 'attachments.php') !== false ) $sendback = admin_url('attachments.php'); + if ( isset($done) ) { + $done['updated'] = count( $done['updated'] ); + $done['skipped'] = count( $done['skipped'] ); + $done['locked'] = count( $done['locked'] ); + $sendback = add_query_arg( $done, $sendback ); + } + if ( isset($deleted) ) + $sendback = add_query_arg('deleted', $deleted, $sendback); wp_redirect($sendback); exit(); -} elseif ( !empty($_GET['_wp_http_referer']) ) { - wp_redirect(remove_query_arg(array('_wp_http_referer', '_wpnonce'), stripslashes($_SERVER['REQUEST_URI']))); +} elseif ( isset($_GET['_wp_http_referer']) && ! empty($_GET['_wp_http_referer']) ) { + wp_redirect( remove_query_arg( array('_wp_http_referer', '_wpnonce'), stripslashes($_SERVER['REQUEST_URI']) ) ); exit; } -$title = __('Posts'); +if ( empty($title) ) + $title = __('Edit Posts'); $parent_file = 'edit.php'; -wp_enqueue_script('admin-forms'); +wp_enqueue_script('inline-edit-post'); list($post_stati, $avail_post_stati) = wp_edit_posts_query(); -if ( 1 == count($posts) && is_singular() ) - wp_enqueue_script( 'admin-comments' ); require_once('admin-header.php'); if ( !isset( $_GET['paged'] ) ) $_GET['paged'] = 1; -?> +if ( empty($_GET['mode']) ) + $mode = 'list'; +else + $mode = attribute_escape($_GET['mode']); ?> <div class="wrap"> +<?php screen_icon(); ?> +<h2><?php echo wp_specialchars( $title ); +if ( isset($_GET['s']) && $_GET['s'] ) + printf( '<span class="subtitle">' . __('Search results for “%s”') . '</span>', wp_specialchars( get_search_query() ) ); ?> +</h2> -<form id="posts-filter" action="" method="get"> -<h2><?php -if ( is_single() ) { - printf(__('Comments on %s'), apply_filters( "the_title", $post->post_title)); -} else { - $post_status_label = _c('Manage Posts|manage posts header'); - if ( isset($_GET['post_status']) && in_array( $_GET['post_status'], array_keys($post_stati) ) ) - $post_status_label = $post_stati[$_GET['post_status']][1]; - if ( $post_listing_pageable && !is_archive() && !is_search() ) - $h2_noun = is_paged() ? sprintf(__( 'Previous %s' ), $post_status_label) : sprintf(__('Latest %s'), $post_status_label); - else - $h2_noun = $post_status_label; - // Use $_GET instead of is_ since they can override each other - $h2_author = ''; - $_GET['author'] = (int) $_GET['author']; - if ( $_GET['author'] != 0 ) { - if ( $_GET['author'] == '-' . $user_ID ) { // author exclusion - $h2_author = ' ' . __('by other authors'); - } else { - $author_user = get_userdata( get_query_var( 'author' ) ); - $h2_author = ' ' . sprintf(__('by %s'), wp_specialchars( $author_user->display_name )); - } - } - $h2_search = isset($_GET['s']) && $_GET['s'] ? ' ' . sprintf(__('matching “%s”'), wp_specialchars( get_search_query() ) ) : ''; - $h2_cat = isset($_GET['cat']) && $_GET['cat'] ? ' ' . sprintf( __('in “%s”'), single_cat_title('', false) ) : ''; - $h2_tag = isset($_GET['tag']) && $_GET['tag'] ? ' ' . sprintf( __('tagged with “%s”'), single_tag_title('', false) ) : ''; - $h2_month = isset($_GET['m']) && $_GET['m'] ? ' ' . sprintf( __('during %s'), single_month_title(' ', false) ) : ''; - printf( _c( '%1$s%2$s%3$s%4$s%5$s%6$s|You can reorder these: 1: Posts, 2: by {s}, 3: matching {s}, 4: in {s}, 5: tagged with {s}, 6: during {s}' ), $h2_noun, $h2_author, $h2_search, $h2_cat, $h2_tag, $h2_month ); +<?php +if ( isset($_GET['posted']) && $_GET['posted'] ) : $_GET['posted'] = (int) $_GET['posted']; ?> +<div id="message" class="updated fade"><p><strong><?php _e('Your post has been saved.'); ?></strong> <a href="<?php echo get_permalink( $_GET['posted'] ); ?>"><?php _e('View post'); ?></a> | <a href="<?php echo get_edit_post_link( $_GET['posted'] ); ?>"><?php _e('Edit post'); ?></a></p></div> +<?php $_SERVER['REQUEST_URI'] = remove_query_arg(array('posted'), $_SERVER['REQUEST_URI']); +endif; ?> + +<?php if ( isset($_GET['locked']) || isset($_GET['skipped']) || isset($_GET['updated']) || isset($_GET['deleted']) ) { ?> +<div id="message" class="updated fade"><p> +<?php if ( isset($_GET['updated']) && (int) $_GET['updated'] ) { + printf( __ngettext( '%s post updated.', '%s posts updated.', $_GET['updated'] ), number_format_i18n( $_GET['updated'] ) ); + unset($_GET['updated']); +} + +if ( isset($_GET['skipped']) && (int) $_GET['skipped'] ) + unset($_GET['skipped']); + +if ( isset($_GET['locked']) && (int) $_GET['locked'] ) { + printf( __ngettext( '%s post not updated, somebody is editing it.', '%s posts not updated, somebody is editing them.', $_GET['locked'] ), number_format_i18n( $_GET['locked'] ) ); + unset($_GET['locked']); +} + +if ( isset($_GET['deleted']) && (int) $_GET['deleted'] ) { + printf( __ngettext( 'Post deleted.', '%s posts deleted.', $_GET['deleted'] ), number_format_i18n( $_GET['deleted'] ) ); + unset($_GET['deleted']); } -?></h2> + +$_SERVER['REQUEST_URI'] = remove_query_arg( array('locked', 'skipped', 'updated', 'deleted'), $_SERVER['REQUEST_URI'] ); +?> +</p></div> +<?php } ?> + +<form id="posts-filter" action="" method="get"> <ul class="subsubsub"> <?php +if ( empty($locked_post_status) ) : $status_links = array(); $num_posts = wp_count_posts( 'post', 'readable' ); +$total_posts = array_sum( (array) $num_posts ); $class = empty( $_GET['post_status'] ) ? ' class="current"' : ''; -$status_links[] = "<li><a href='edit.php' $class>" . __('All Posts') . '</a>'; +$status_links[] = "<li><a href='edit.php' $class>" . sprintf( __ngettext( 'All <span class="count">(%s)</span>', 'All <span class="count">(%s)</span>', $total_posts ), number_format_i18n( $total_posts ) ) . '</a>'; + + foreach ( $post_stati as $status => $label ) { $class = ''; @@ -93,52 +152,53 @@ foreach ( $post_stati as $status => $label ) { if ( empty( $num_posts->$status ) ) continue; - if ( $status == $_GET['post_status'] ) + if ( isset($_GET['post_status']) && $status == $_GET['post_status'] ) $class = ' class="current"'; - $status_links[] = "<li><a href='edit.php?post_status=$status' $class>" . - sprintf( __ngettext( $label[2][0], $label[2][1], $num_posts->$status ), number_format_i18n( $num_posts->$status ) ) . '</a>'; + $status_links[] = "<li><a href='edit.php?post_status=$status' $class>" . sprintf( __ngettext( $label[2][0], $label[2][1], $num_posts->$status ), number_format_i18n( $num_posts->$status ) ) . '</a>'; } -echo implode( ' |</li>', $status_links ) . '</li>'; +echo implode( " |</li>\n", $status_links ) . '</li>'; unset( $status_links ); -?> -</ul> - -<?php if ( isset($_GET['post_status'] ) ) : ?> -<input type="hidden" name="post_status" value="<?php echo attribute_escape($_GET['post_status']) ?>" /> -<?php -endif; - -if ( isset($_GET['posted']) && $_GET['posted'] ) : $_GET['posted'] = (int) $_GET['posted']; ?> -<div id="message" class="updated fade"><p><strong><?php _e('Your post has been saved.'); ?></strong> <a href="<?php echo get_permalink( $_GET['posted'] ); ?>"><?php _e('View post'); ?></a> | <a href="post.php?action=edit&post=<?php echo $_GET['posted']; ?>"><?php _e('Edit post'); ?></a></p></div> -<?php $_SERVER['REQUEST_URI'] = remove_query_arg(array('posted'), $_SERVER['REQUEST_URI']); endif; ?> +</ul> -<p id="post-search"> +<p class="search-box"> <label class="hidden" for="post-search-input"><?php _e( 'Search Posts' ); ?>:</label> - <input type="text" id="post-search-input" name="s" value="<?php the_search_query(); ?>" /> + <input type="text" class="search-input" id="post-search-input" name="s" value="<?php the_search_query(); ?>" /> <input type="submit" value="<?php _e( 'Search Posts' ); ?>" class="button" /> </p> -<div class="tablenav"> +<?php if ( isset($_GET['post_status'] ) ) : ?> +<input type="hidden" name="post_status" value="<?php echo attribute_escape($_GET['post_status']) ?>" /> +<?php endif; ?> +<input type="hidden" name="mode" value="<?php echo $mode; ?>" /> +<?php if ( have_posts() ) { ?> + +<div class="tablenav"> <?php $page_links = paginate_links( array( 'base' => add_query_arg( 'paged', '%#%' ), 'format' => '', + 'prev_text' => __('«'), + 'next_text' => __('»'), 'total' => $wp_query->max_num_pages, 'current' => $_GET['paged'] )); -if ( $page_links ) - echo "<div class='tablenav-pages'>$page_links</div>"; ?> -<div class="alignleft"> -<input type="submit" value="<?php _e('Delete'); ?>" name="deleteit" class="button-secondary delete" /> +<div class="alignleft actions"> +<select name="action"> +<option value="-1" selected="selected"><?php _e('Bulk Actions'); ?></option> +<option value="edit"><?php _e('Edit'); ?></option> +<option value="delete"><?php _e('Delete'); ?></option> +</select> +<input type="submit" value="<?php _e('Apply'); ?>" name="doaction" id="doaction" class="button-secondary action" /> <?php wp_nonce_field('bulk-posts'); ?> -<?php + +<?php // view filters if ( !is_singular() ) { $arc_query = "SELECT DISTINCT YEAR(post_date) AS yyear, MONTH(post_date) AS mmonth FROM $wpdb->posts WHERE post_type = 'post' ORDER BY post_date DESC"; @@ -146,16 +206,18 @@ $arc_result = $wpdb->get_results( $arc_query ); $month_count = count($arc_result); -if ( $month_count && !( 1 == $month_count && 0 == $arc_result[0]->mmonth ) ) { ?> +if ( $month_count && !( 1 == $month_count && 0 == $arc_result[0]->mmonth ) ) { +$m = isset($_GET['m']) ? (int)$_GET['m'] : 0; +?> <select name='m'> -<option<?php selected( @$_GET['m'], 0 ); ?> value='0'><?php _e('Show all dates'); ?></option> +<option<?php selected( $m, 0 ); ?> value='0'><?php _e('Show all dates'); ?></option> <?php foreach ($arc_result as $arc_row) { if ( $arc_row->yyear == 0 ) continue; $arc_row->mmonth = zeroise( $arc_row->mmonth, 2 ); - if ( $arc_row->yyear . $arc_row->mmonth == $_GET['m'] ) + if ( $arc_row->yyear . $arc_row->mmonth == $m ) $default = ' selected="selected"'; else $default = ''; @@ -179,66 +241,75 @@ do_action('restrict_manage_posts'); <?php } ?> </div> -<br class="clear" /> -</div> +<?php if ( $page_links ) { ?> +<div class="tablenav-pages"><?php $page_links_text = sprintf( '<span class="displaying-num">' . __( 'Displaying %s–%s of %s' ) . '</span>%s', + number_format_i18n( ( $_GET['paged'] - 1 ) * $wp_query->query_vars['posts_per_page'] + 1 ), + number_format_i18n( min( $_GET['paged'] * $wp_query->query_vars['posts_per_page'], $wp_query->found_posts ) ), + number_format_i18n( $wp_query->found_posts ), + $page_links +); echo $page_links_text; ?></div> +<?php } ?> -<br class="clear" /> +<div class="view-switch"> + <a href="<?php echo clean_url(add_query_arg('mode', 'list', $_SERVER['REQUEST_URI'])) ?>"><img <?php if ( 'list' == $mode ) echo 'class="current"'; ?> id="view-switch-list" src="../wp-includes/images/blank.gif" width="20" height="20" title="<?php _e('List View') ?>" alt="<?php _e('List View') ?>" /></a> + <a href="<?php echo clean_url(add_query_arg('mode', 'excerpt', $_SERVER['REQUEST_URI'])) ?>"><img <?php if ( 'excerpt' == $mode ) echo 'class="current"'; ?> id="view-switch-excerpt" src="../wp-includes/images/blank.gif" width="20" height="20" title="<?php _e('Excerpt View') ?>" alt="<?php _e('Excerpt View') ?>" /></a> +</div> -<?php include( 'edit-post-rows.php' ); ?> +<div class="clear"></div> +</div> -</form> +<div class="clear"></div> -<div id="ajax-response"></div> +<?php include( 'edit-post-rows.php' ); ?> <div class="tablenav"> <?php if ( $page_links ) - echo "<div class='tablenav-pages'>$page_links</div>"; + echo "<div class='tablenav-pages'>$page_links_text</div>"; ?> +<div class="alignleft actions"> +<select name="action2"> +<option value="-1" selected="selected"><?php _e('Bulk Actions'); ?></option> +<option value="edit"><?php _e('Edit'); ?></option> +<option value="delete"><?php _e('Delete'); ?></option> +</select> +<input type="submit" value="<?php _e('Apply'); ?>" name="doaction2" id="doaction2" class="button-secondary action" /> <br class="clear" /> </div> - <br class="clear" /> +</div> -<?php - -if ( 1 == count($posts) && is_singular() ) : - - $comments = $wpdb->get_results( $wpdb->prepare("SELECT * FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_approved != 'spam' ORDER BY comment_date", $id) ); - if ( $comments ) : - // Make sure comments, post, and post_author are cached - update_comment_cache($comments); - $post = get_post($id); - $authordata = get_userdata($post->post_author); - ?> - -<br class="clear" /> +<?php } else { // have_posts() ?> +<div class="clear"></div> +<p><?php _e('No posts found') ?></p> +<?php } ?> -<table class="widefat" style="margin-top: .5em"> -<thead> - <tr> - <th scope="col"><?php _e('Comment') ?></th> - <th scope="col"><?php _e('Date') ?></th> - <th scope="col"><?php _e('Actions') ?></th> - </tr> -</thead> -<tbody id="the-comment-list" class="list:comment"> -<?php - foreach ($comments as $comment) - _wp_comment_row( $comment->comment_ID, 'detail', false, false ); -?> -</tbody> -</table> +</form> -<?php +<?php inline_edit_row( 'post' ); ?> -endif; // comments -endif; // posts; +<div id="ajax-response"></div> -?> +<br class="clear" /> </div> +<script type="text/javascript"> +/* <![CDATA[ */ +(function($){ + $(document).ready(function(){ + $('#doaction, #doaction2').click(function(){ + if ( $('select[name^="action"]').val() == 'delete' ) { + var m = '<?php echo js_escape(__("You are about to delete the selected posts.\n 'Cancel' to stop, 'OK' to delete.")); ?>'; + return showNotice.warn(m); + } + }); + }); +})(jQuery); +columns.init('edit'); +/* ]]> */ +</script> + <?php include('admin-footer.php'); ?> wp-admin/edit.php @@ -1,11 +1,21 @@ <?php +/** + * WordPress Export Administration Panel + * + * @package WordPress + * @subpackage Administration + */ + +/** Load WordPress Bootstrap */ require_once ('admin.php'); + +/** Load WordPress export API */ require_once('includes/export.php'); $title = __('Export'); -$parent_file = 'edit.php'; if ( isset( $_GET['download'] ) ) { - export_wp( $_GET['author'] ); + $author = isset($_GET['author']) ? $_GET['author'] : 'all'; + export_wp( $author ); die(); } @@ -13,7 +23,9 @@ require_once ('admin-header.php'); ?> <div class="wrap"> -<h2><?php _e('Export'); ?></h2> +<?php screen_icon(); ?> +<h2><?php echo wp_specialchars( $title ); ?></h2> + <p><?php _e('When you click the button below WordPress will create an XML file for you to save to your computer.'); ?></p> <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> <p><?php _e('Once you’ve saved the download file, you can use the Import function on another WordPress blog to import this blog.'); ?></p> @@ -37,7 +49,7 @@ foreach ( $authors as $id ) { </td> </tr> </table> -<p class="submit"><input type="submit" name="submit" value="<?php _e('Download Export File'); ?>" /> +<p class="submit"><input type="submit" name="submit" class="button" value="<?php _e('Download Export File'); ?>" /> <input type="hidden" name="download" value="true" /> </p> </form> wp-admin/export.php @@ -1,20 +1,83 @@ <?php +/** + * Defines the Gears manifest file for Google Gears offline storage. + * + * @package WordPress + * @subpackage Administration + */ +/** Set ABSPATH for execution */ define( 'ABSPATH', dirname(dirname(__FILE__)) ); define( 'WPINC', '/wp-includes' ); +/** + * @ignore + */ function __() {} + +/** + * @ignore + */ +function _c() {} + +/** + * @ignore + */ function add_filter() {} + +/** + * @ignore + */ function attribute_escape() {} + +/** + * @ignore + */ function apply_filters() {} + +/** + * @ignore + */ function get_option() {} + +/** + * @ignore + */ function is_lighttpd_before_150() {} + +/** + * @ignore + */ function add_action() {} + +/** + * @ignore + */ function do_action_ref_array() {} + +/** + * @ignore + */ function get_bloginfo() {} + +/** + * @ignore + */ function is_admin() {return true;} + +/** + * @ignore + */ function site_url() {} + +/** + * @ignore + */ function admin_url() {} + +/** + * @ignore + */ function wp_guess_url() {} require(ABSPATH . '/wp-includes/script-loader.php'); @@ -28,8 +91,9 @@ wp_default_styles($wp_styles); $defaults = $man_version = ''; foreach ( $wp_scripts->registered as $script ) { - if ( empty($script->src) || strpos($script->src, 'tiny_mce_config.php') ) continue; + if ( empty($script->src) ) continue; $ver = empty($script->ver) ? $wp_version : $script->ver; + if ( 'editor' == $script->handle ) $mce_ver = $script->ver; $src = str_replace( array( '/wp-admin/', '/wp-includes/' ), array( '', '../wp-includes/' ), $script->src ); $defaults .= '{ "url" : "' . $src . '?ver=' . $ver . '" },' . "\n"; $man_version .= $ver; @@ -46,7 +110,7 @@ foreach ( $wp_styles->registered as $style ) { if ( isset($style->extra['rtl']) && $style->extra['rtl'] ) { if ( is_bool( $style->extra['rtl'] ) ) $rtl_href = str_replace( '.css', '-rtl.css', $src ); - else + else $rtl_href = str_replace( array( '/wp-admin/', '/wp-includes/' ), array( '', '../wp-includes/' ), $style->extra['rtl'] ); $defaults .= '{ "url" : "' . $rtl_href . '?ver=' . $ver . '" },' . "\n"; @@ -64,7 +128,7 @@ header( 'Content-Type: application/x-javascript; charset=UTF-8' ); ?> { "betaManifestVersion" : 1, -"version" : "<?php echo $man_version; ?>_20080810", +"version" : "<?php echo $man_version; ?>_20081201", "entries" : [ <?php echo $defaults; ?> @@ -72,85 +136,126 @@ header( 'Content-Type: application/x-javascript; charset=UTF-8' ); { "url" : "images/align-left.png" }, { "url" : "images/align-none.png" }, { "url" : "images/align-right.png" }, +{ "url" : "images/archive-link.png" }, +{ "url" : "images/blue-grad.png" }, { "url" : "images/browse-happy.gif" }, { "url" : "images/bubble_bg.gif" }, +{ "url" : "images/bubble_bg-rtl.gif" }, +{ "url" : "images/button-grad.png" }, +{ "url" : "images/button-grad-active.png" }, { "url" : "images/comment-grey-bubble.png" }, -{ "url" : "images/comment-pill.gif" }, -{ "url" : "images/comment-stalk-classic.gif" }, -{ "url" : "images/comment-stalk-fresh.gif" }, -{ "url" : "images/comment-stalk-rtl.gif" }, { "url" : "images/date-button.gif" }, +{ "url" : "images/ed-bg.gif" }, { "url" : "images/fade-butt.png" }, -{ "url" : "images/gear.png" }, +{ "url" : "images/fav.png" }, +{ "url" : "images/fav-arrow.gif" }, +{ "url" : "images/fav-arrow-rtl.gif" }, +{ "url" : "images/fav-top.png" }, +{ "url" : "images/generic.png" }, +{ "url" : "images/gray-grad.png" }, +{ "url" : "images/icons32.png" }, +{ "url" : "images/icons32-vs.png" }, +{ "url" : "images/list.png" }, +{ "url" : "images/list-vs.png" }, +{ "url" : "images/loading.gif" }, +{ "url" : "images/loading-publish.gif" }, +{ "url" : "images/logo.gif" }, { "url" : "images/logo-ghost.png" }, { "url" : "images/logo-login.gif" }, -{ "url" : "images/logo.gif" }, -{ "url" : "images/media-button-gallery.gif" }, { "url" : "images/media-button-image.gif" }, { "url" : "images/media-button-music.gif" }, { "url" : "images/media-button-other.gif" }, { "url" : "images/media-button-video.gif" }, -{ "url" : "images/media-buttons.gif" }, -{ "url" : "images/tab.png" }, -{ "url" : "images/tail.gif" }, -{ "url" : "images/toggle-arrow-rtl.gif" }, +{ "url" : "images/menu.png" }, +{ "url" : "images/menu-vs.png" }, +{ "url" : "images/menu-arrows.gif" }, +{ "url" : "images/menu-bits.gif" }, +{ "url" : "images/menu-bits-rtl.gif" }, +{ "url" : "images/menu-dark.gif" }, +{ "url" : "images/menu-dark-rtl.gif" }, +{ "url" : "images/no.png" }, +{ "url" : "images/required.gif" }, +{ "url" : "images/resize.gif" }, +{ "url" : "images/screen-options-left.gif" }, +{ "url" : "images/screen-options-right.gif" }, +{ "url" : "images/screen-options-right-up.gif" }, +{ "url" : "images/se.png" }, +{ "url" : "images/star.gif" }, { "url" : "images/toggle-arrow.gif" }, +{ "url" : "images/toggle-arrow-rtl.gif" }, +{ "url" : "images/white-grad.png" }, +{ "url" : "images/white-grad-active.png" }, { "url" : "images/wordpress-logo.png" }, +{ "url" : "images/wp-logo.gif" }, { "url" : "images/xit.gif" }, -{ "url" : "images/loading-publish.gif" }, -{ "url" : "images/loading.gif" }, -{ "url" : "images/required.gif" }, -{ "url" : "images/no.png" }, { "url" : "images/yes.png" }, -<?php if ( is_file(ABSPATH.'/wp-includes/js/tinymce/tiny_mce.js') ) { ?> -{ "url" : "../wp-includes/js/tinymce/tiny_mce_popup.js?ver=311" }, -{ "url" : "../wp-includes/js/tinymce/utils/mctabs.js?ver=311" }, -{ "url" : "../wp-includes/js/tinymce/utils/validate.js?ver=311" }, -{ "url" : "../wp-includes/js/tinymce/utils/form_utils.js?ver=311" }, -{ "url" : "../wp-includes/js/tinymce/utils/editable_selects.js?ver=311" }, -{ "url" : "../wp-includes/js/tinymce/plugins/paste/js/pasteword.js?ver=311" }, -{ "url" : "../wp-includes/js/tinymce/plugins/paste/js/pastetext.js?ver=311" }, -{ "url" : "../wp-includes/js/tinymce/plugins/media/js/media.js?ver=311" }, -{ "url" : "../wp-includes/js/tinymce/themes/advanced/js/color_picker.js?ver=311" }, -{ "url" : "../wp-includes/js/tinymce/themes/advanced/js/charmap.js?ver=311" }, -{ "url" : "../wp-includes/js/tinymce/themes/advanced/js/image.js?ver=311" }, -{ "url" : "../wp-includes/js/tinymce/themes/advanced/js/link.js?ver=311" }, -{ "url" : "../wp-includes/js/tinymce/themes/advanced/js/source_editor.js?ver=311" }, -{ "url" : "../wp-includes/js/tinymce/themes/advanced/js/anchor.js?ver=311" }, -{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js?ver=311g" }, -{ "url" : "../wp-includes/js/tinymce/tiny_mce.js?ver=311" }, -{ "url" : "../wp-includes/js/tinymce/themes/advanced/editor_template.js?ver=311" }, -{ "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/editor_plugin.js?ver=311" }, - -{ "url" : "../wp-includes/js/tinymce/themes/advanced/source_editor.htm?ver=311" }, -{ "url" : "../wp-includes/js/tinymce/themes/advanced/anchor.htm?ver=311" }, -{ "url" : "../wp-includes/js/tinymce/themes/advanced/image.htm?ver=311" }, -{ "url" : "../wp-includes/js/tinymce/themes/advanced/link.htm?ver=311" }, -{ "url" : "../wp-includes/js/tinymce/themes/advanced/color_picker.htm?ver=311" }, -{ "url" : "../wp-includes/js/tinymce/themes/advanced/charmap.htm?ver=311" }, -{ "url" : "../wp-includes/js/tinymce/plugins/media/media.htm?ver=311" }, -{ "url" : "../wp-includes/js/tinymce/plugins/paste/pasteword.htm?ver=311" }, -{ "url" : "../wp-includes/js/tinymce/plugins/paste/blank.htm?ver=311" }, -{ "url" : "../wp-includes/js/tinymce/plugins/paste/pastetext.htm?ver=311" }, -{ "url" : "../wp-includes/js/tinymce/plugins/fullscreen/fullscreen.htm?ver=311" }, -{ "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/template.htm?ver=311" }, -{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/editimage.html?ver=311g" }, -{ "url" : "../wp-includes/js/tinymce/wp-mce-help.php?ver=311" }, - -{ "url" : "../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/ui.css?ver=311" }, -{ "url" : "../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/content.css?ver=311" }, -{ "url" : "../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/dialog.css?ver=311" }, -{ "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/window.css?ver=311" }, -{ "url" : "../wp-includes/js/tinymce/plugins/spellchecker/css/content.css?ver=311" }, -{ "url" : "../wp-includes/js/tinymce/plugins/wordpress/css/content.css?ver=311" }, -{ "url" : "../wp-includes/js/tinymce/plugins/media/css/content.css?ver=311" }, -{ "url" : "../wp-includes/js/tinymce/plugins/media/css/media.css?ver=311" }, -{ "url" : "../wp-includes/js/tinymce/plugins/paste/css/pasteword.css?ver=311" }, -{ "url" : "../wp-includes/js/tinymce/plugins/paste/css/blank.css?ver=311" }, -{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage.css?ver=311g" }, -{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage-rtl.css?ver=311" }, -{ "url" : "../wp-includes/js/tinymce/wordpress.css?ver=311" }, +<?php if ( is_file('../wp-includes/js/tinymce/tiny_mce.js') ) { ?> +{ "url" : "../wp-includes/js/tinymce/tiny_mce.js", "src" : "../wp-includes/js/tinymce/tiny_mce.js?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, +{ "url" : "../wp-includes/js/tinymce/langs/wp-langs-en.js", "src" : "../wp-includes/js/tinymce/langs/wp-langs-en.js?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, +{ "url" : "../wp-includes/js/tinymce/wordpress.css", "src" : "../wp-includes/js/tinymce/wordpress.css?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, +{ "url" : "../wp-includes/js/tinymce/utils/mctabs.js", "src" : "../wp-includes/js/tinymce/utils/mctabs.js?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, +{ "url" : "../wp-includes/js/tinymce/utils/validate.js", "src" : "../wp-includes/js/tinymce/utils/validate.js?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, +{ "url" : "../wp-includes/js/tinymce/utils/form_utils.js", "src" : "../wp-includes/js/tinymce/utils/form_utils.js?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, +{ "url" : "../wp-includes/js/tinymce/utils/editable_selects.js", "src" : "../wp-includes/js/tinymce/utils/editable_selects.js?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, +{ "url" : "../wp-includes/js/tinymce/tiny_mce_popup.js", "src" : "../wp-includes/js/tinymce/tiny_mce_popup.js?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, + +{ "url" : "../wp-includes/js/tinymce/themes/advanced/editor_template.js", "src" : "../wp-includes/js/tinymce/themes/advanced/editor_template.js?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, +{ "url" : "../wp-includes/js/tinymce/themes/advanced/source_editor.htm", "src" : "../wp-includes/js/tinymce/themes/advanced/source_editor.htm?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, +{ "url" : "../wp-includes/js/tinymce/themes/advanced/anchor.htm", "src" : "../wp-includes/js/tinymce/themes/advanced/anchor.htm?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, +{ "url" : "../wp-includes/js/tinymce/themes/advanced/image.htm", "src" : "../wp-includes/js/tinymce/themes/advanced/image.htm?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, +{ "url" : "../wp-includes/js/tinymce/themes/advanced/link.htm", "src" : "../wp-includes/js/tinymce/themes/advanced/link.htm?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, +{ "url" : "../wp-includes/js/tinymce/themes/advanced/color_picker.htm", "src" : "../wp-includes/js/tinymce/themes/advanced/color_picker.htm?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, +{ "url" : "../wp-includes/js/tinymce/themes/advanced/charmap.htm", "src" : "../wp-includes/js/tinymce/themes/advanced/charmap.htm?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, +{ "url" : "../wp-includes/js/tinymce/themes/advanced/js/color_picker.js", "src" : "../wp-includes/js/tinymce/themes/advanced/js/color_picker.js?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, +{ "url" : "../wp-includes/js/tinymce/themes/advanced/js/charmap.js", "src" : "../wp-includes/js/tinymce/themes/advanced/js/charmap.js?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, +{ "url" : "../wp-includes/js/tinymce/themes/advanced/js/image.js", "src" : "../wp-includes/js/tinymce/themes/advanced/js/image.js?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, +{ "url" : "../wp-includes/js/tinymce/themes/advanced/js/link.js", "src" : "../wp-includes/js/tinymce/themes/advanced/js/link.js?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, +{ "url" : "../wp-includes/js/tinymce/themes/advanced/js/source_editor.js", "src" : "../wp-includes/js/tinymce/themes/advanced/js/source_editor.js?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, +{ "url" : "../wp-includes/js/tinymce/themes/advanced/js/anchor.js", "src" : "../wp-includes/js/tinymce/themes/advanced/js/anchor.js?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, +{ "url" : "../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/ui.css", "src" : "../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/ui.css?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, +{ "url" : "../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/content.css", "src" : "../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/content.css?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, +{ "url" : "../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/dialog.css", "src" : "../wp-includes/js/tinymce/themes/advanced/skins/wp_theme/dialog.css?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, + +{ "url" : "../wp-includes/js/tinymce/plugins/autosave/editor_plugin.js", "src" : "../wp-includes/js/tinymce/plugins/autosave/editor_plugin.js?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, + +{ "url" : "../wp-includes/js/tinymce/plugins/fullscreen/editor_plugin.js", "src" : "../wp-includes/js/tinymce/plugins/fullscreen/editor_plugin.js?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, +{ "url" : "../wp-includes/js/tinymce/plugins/fullscreen/fullscreen.htm", "src" : "../wp-includes/js/tinymce/plugins/fullscreen/fullscreen.htm?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, + +{ "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/editor_plugin.js", "src" : "../wp-includes/js/tinymce/plugins/inlinepopups/editor_plugin.js?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, +{ "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/template.htm", "src" : "../wp-includes/js/tinymce/plugins/inlinepopups/template.htm?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, +{ "url" : "../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/window.css", "src" : "../wp-includes/js/tinymce/plugins/inlinepopups/skins/clearlooks2/window.css?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, + +{ "url" : "../wp-includes/js/tinymce/plugins/media/editor_plugin.js", "src" : "../wp-includes/js/tinymce/plugins/media/editor_plugin.js?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, +{ "url" : "../wp-includes/js/tinymce/plugins/media/js/media.js", "src" : "../wp-includes/js/tinymce/plugins/media/js/media.js?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, +{ "url" : "../wp-includes/js/tinymce/plugins/media/media.htm", "src" : "../wp-includes/js/tinymce/plugins/media/media.htm?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, +{ "url" : "../wp-includes/js/tinymce/plugins/media/css/content.css", "src" : "../wp-includes/js/tinymce/plugins/media/css/content.css?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, +{ "url" : "../wp-includes/js/tinymce/plugins/media/css/media.css", "src" : "../wp-includes/js/tinymce/plugins/media/css/media.css?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, + +{ "url" : "../wp-includes/js/tinymce/plugins/paste/editor_plugin.js", "src" : "../wp-includes/js/tinymce/plugins/paste/editor_plugin.js?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, +{ "url" : "../wp-includes/js/tinymce/plugins/paste/js/pasteword.js", "src" : "../wp-includes/js/tinymce/plugins/paste/js/pasteword.js?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, +{ "url" : "../wp-includes/js/tinymce/plugins/paste/js/pastetext.js", "src" : "../wp-includes/js/tinymce/plugins/paste/js/pastetext.js?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, +{ "url" : "../wp-includes/js/tinymce/plugins/paste/pasteword.htm", "src" : "../wp-includes/js/tinymce/plugins/paste/pasteword.htm?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, +{ "url" : "../wp-includes/js/tinymce/plugins/paste/blank.htm", "src" : "../wp-includes/js/tinymce/plugins/paste/blank.htm?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, +{ "url" : "../wp-includes/js/tinymce/plugins/paste/pastetext.htm", "src" : "../wp-includes/js/tinymce/plugins/paste/pastetext.htm?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, +{ "url" : "../wp-includes/js/tinymce/plugins/paste/css/pasteword.css", "src" : "../wp-includes/js/tinymce/plugins/paste/css/pasteword.css?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, +{ "url" : "../wp-includes/js/tinymce/plugins/paste/css/blank.css", "src" : "../wp-includes/js/tinymce/plugins/paste/css/blank.css?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, + +{ "url" : "../wp-includes/js/tinymce/plugins/safari/editor_plugin.js", "src" : "../wp-includes/js/tinymce/plugins/safari/editor_plugin.js?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, + +{ "url" : "../wp-includes/js/tinymce/plugins/spellchecker/editor_plugin.js", "src" : "../wp-includes/js/tinymce/plugins/spellchecker/editor_plugin.js?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, +{ "url" : "../wp-includes/js/tinymce/plugins/spellchecker/css/content.css", "src" : "../wp-includes/js/tinymce/plugins/spellchecker/css/content.css?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, + +{ "url" : "../wp-includes/js/tinymce/plugins/wordpress/editor_plugin.js", "src" : "../wp-includes/js/tinymce/plugins/wordpress/editor_plugin.js?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, +{ "url" : "../wp-includes/js/tinymce/plugins/wordpress/css/content.css", "src" : "../wp-includes/js/tinymce/plugins/wordpress/css/content.css?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, + +{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.js", "src" : "../wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin.js?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, +{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/editimage.html", "src" : "../wp-includes/js/tinymce/plugins/wpeditimage/editimage.html?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, +{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js", "src" : "../wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.js?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, +{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage.css", "src" : "../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage.css?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, +{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage-rtl.css", "src" : "../wp-includes/js/tinymce/plugins/wpeditimage/css/editimage-rtl.css?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, + +{ "url" : "../wp-includes/js/tinymce/plugins/wpgallery/editor_plugin.js", "src" : "../wp-includes/js/tinymce/plugins/wpgallery/editor_plugin.js?ver=<?php echo $mce_ver; ?>", "ignoreQuery" : true }, { "url" : "../wp-includes/js/tinymce/themes/advanced/img/icons.gif" }, { "url" : "../wp-includes/js/tinymce/themes/advanced/img/colorpicker.jpg" }, @@ -179,18 +284,22 @@ header( 'Content-Type: application/x-javascript; charset=UTF-8' ); { "url" : "../wp-includes/js/tinymce/plugins/media/img/shockwave.gif" }, { "url" : "../wp-includes/js/tinymce/plugins/media/img/windowsmedia.gif" }, { "url" : "../wp-includes/js/tinymce/plugins/media/img/trans.gif" }, +{ "url" : "../wp-includes/js/tinymce/plugins/spellchecker/img/wline.gif" }, { "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/more.gif" }, { "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/more_bug.gif" }, { "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/page.gif" }, { "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/page_bug.gif" }, { "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/toolbars.gif" }, -{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/img/image.png" }, -{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/img/delete.png" }, { "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/help.gif" }, { "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/image.gif" }, { "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/media.gif" }, { "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/video.gif" }, { "url" : "../wp-includes/js/tinymce/plugins/wordpress/img/audio.gif" }, +{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/img/image.png" }, +{ "url" : "../wp-includes/js/tinymce/plugins/wpeditimage/img/delete.png" }, +{ "url" : "../wp-includes/js/tinymce/plugins/wpgallery/img/delete.png" }, +{ "url" : "../wp-includes/js/tinymce/plugins/wpgallery/img/edit.png" }, +{ "url" : "../wp-includes/js/tinymce/plugins/wpgallery/img/gallery.png" }, <?php } ?> { "url" : "../wp-includes/images/crystal/archive.png" }, @@ -204,6 +313,5 @@ header( 'Content-Type: application/x-javascript; charset=UTF-8' ); { "url" : "../wp-includes/images/crystal/spreadsheet.png" }, { "url" : "../wp-includes/images/rss.png" }, { "url" : "../wp-includes/js/thickbox/loadingAnimation.gif" }, -{ "url" : "../wp-includes/js/thickbox/tb-close.png" }, -{ "url" : "../wp-includes/js/swfupload/swfupload_f9.swf" } +{ "url" : "../wp-includes/js/thickbox/tb-close.png" } ]} wp-admin/gears-manifest.php wp-admin/images/browse-happy.gif wp-admin/images/loading-publish.gif wp-admin/images/logo-ghost.png wp-admin/images/logo-login.gif wp-admin/images/logo.gif @@ -1,12 +1,21 @@ <?php +/** + * Import WordPress Administration Panel + * + * @package WordPress + * @subpackage Administration + */ + +/** Load WordPress Bootstrap */ require_once ('admin.php'); $title = __('Import'); -$parent_file = 'edit.php'; require_once ('admin-header.php'); +$parent_file = 'tools.php'; ?> <div class="wrap"> -<h2><?php _e('Import'); ?></h2> +<?php screen_icon(); ?> +<h2><?php echo wp_specialchars( $title ); ?></h2> <p><?php _e('If you have posts or comments in another system, WordPress can import those into this blog. To get started, choose a system to import from below:'); ?></p> <?php @@ -32,7 +41,7 @@ if (empty ($importers)) { echo '<p>'.__('No importers are available.').'</p>'; // TODO: make more helpful } else { ?> -<table class="widefat"> +<table class="widefat" cellspacing="0"> <?php $style = ''; wp-admin/import.php @@ -1,14 +1,51 @@ <?php - -define( 'MAX_RESULTS', 50 ); // How many records per GData query -define( 'MAX_EXECUTION_TIME', 20 ); // How many seconds to let the script run -define( 'STATUS_INTERVAL', 3 ); // How many seconds between status bar updates - +/** + * Blogger Importer + * + * @package WordPress + * @subpackage Importer + */ + +/** + * How many records per GData query + * + * @package WordPress + * @subpackage Blogger_Import + * @var int + * @since unknown + */ +define( 'MAX_RESULTS', 50 ); + +/** + * How many seconds to let the script run + * + * @package WordPress + * @subpackage Blogger_Import + * @var int + * @since unknown + */ +define( 'MAX_EXECUTION_TIME', 20 ); + +/** + * How many seconds between status bar updates + * + * @package WordPress + * @subpackage Blogger_Import + * @var int + * @since unknown + */ +define( 'STATUS_INTERVAL', 3 ); + +/** + * Blogger Importer class + * + * @since unknown + */ class Blogger_Import { // Shows the welcome screen and the magic auth link. function greet() { - $next_url = get_option('siteurl') . '/wp-admin/index.php?import=blogger&noheader=true'; + $next_url = get_option('siteurl') . '/wp-admin/index.php?import=blogger&noheader=true'; $auth_url = "https://www.google.com/accounts/AuthSubRequest"; $title = __('Import Blogger'); $welcome = __('Howdy! This importer allows you to import posts and comments from your Blogger account into your WordPress blog.'); @@ -17,7 +54,10 @@ class Blogger_Import { $auth = __('Authorize'); echo " - <div class='wrap'><h2>$title</h2><p>$welcome</p><p>$prereqs</p><p>$stepone</p> + <div class='wrap'> + ".screen_icon()." + <h2>$title</h2> + <p>$welcome</p><p>$prereqs</p><p>$stepone</p> <form action='$auth_url' method='get'> <p class='submit' style='text-align:left;'> <input type='submit' class='button' value='$auth' /> @@ -31,7 +71,9 @@ class Blogger_Import { } function uh_oh($title, $message, $info) { - echo "<div class='wrap'><h2>$title</h2><p>$message</p><pre>$info</pre></div>"; + echo "<div class='wrap'>"; + screen_icon(); + echo "<h2>$title</h2><p>$message</p><pre>$info</pre></div>"; } function auth() { @@ -181,9 +223,10 @@ class Blogger_Import { $rows .= "<tr id='blog$i'><td class='blogtitle'>$blogtitle</td><td class='bloghost'>{$blog['host']}</td><td class='bar'>$pstat</td><td class='bar'>$cstat</td><td class='submit'><input type='submit' class='button' id='submit$i' value='$value' /><input type='hidden' name='blog' value='$i' /></td></tr>\n"; } - echo "<div class='wrap'><h2>$title</h2><noscript>$noscript</noscript><table cellpadding='5px'><thead><td>$name</td><td>$url</td><td>$posts</td><td>$comments</td><td>$action</td></thead>\n$rows</table></form></div>"; + echo "<div class='wrap'><h2>$title</h2><noscript>$noscript</noscript><table cellpadding='5px'><thead><tr><td>$name</td><td>$url</td><td>$posts</td><td>$comments</td><td>$action</td></tr></thead>\n$rows</table></div>"; echo " <script type='text/javascript'> + /* <![CDATA[ */ var strings = {cont:'$continue',stop:'$stop',stopping:'$stopping',authors:'$authors',nothing:'$nothing'}; var blogs = {}; function blog(i, title, mode, status){ @@ -296,6 +339,7 @@ class Blogger_Import { }; $init jQuery.each(blogs, function(i, me){me.init();}); + /* ]]> */ </script>\n"; } @@ -485,7 +529,7 @@ class Blogger_Import { } function import_post( $entry ) { - global $wpdb, $importing_blog; + global $importing_blog; // The old permalink is all Blogger gives us to link comments to their posts. if ( isset( $entry->draft ) ) @@ -618,11 +662,11 @@ class Blogger_Import { foreach ( $blog['authors'] as $i => $author ) $rows .= "<tr><td><label for='authors[$i]'>{$author[0]}</label></td><td><select name='authors[$i]' id='authors[$i]'>" . $this->get_user_options($author[1]) . "</select></td></tr>"; - return "<div class='wrap'><h2>$heading</h2><h3>$blogtitle</h3><p>$directions</p><form action='index.php?import=blogger&noheader=true&saveauthors=1' method='post'><input type='hidden' name='blog' value='$importing_blog' /><table cellpadding='5'><thead><td>$mapthis</td><td>$tothis</td></thead>$rows<tr><td></td><td class='submit'><input type='submit' class='button authorsubmit' value='$submit' /></td></tr></table></form></div>"; + return "<div class='wrap'><h2>$heading</h2><h3>$blogtitle</h3><p>$directions</p><form action='index.php?import=blogger&noheader=true&saveauthors=1' method='post'><input type='hidden' name='blog' value='$importing_blog' /><table cellpadding='5'><thead><td>$mapthis</td><td>$tothis</td></thead>$rows<tr><td></td><td class='submit'><input type='submit' class='button authorsubmit' value='$submit' /></td></tr></table></form></div>"; } function get_user_options($current) { - global $wpdb, $importer_users; + global $importer_users; if ( ! isset( $importer_users ) ) $importer_users = (array) get_users_of_blog(); @@ -777,7 +821,7 @@ class Blogger_Import { echo $result->get_error_message(); } elseif ( isset($_GET['token']) ) $this->auth(); - elseif ( $this->token && $this->token_is_valid() ) + elseif ( isset($this->token) && $this->token_is_valid() ) $this->show_blogs(); else $this->greet(); @@ -788,7 +832,7 @@ class Blogger_Import { $restart = __('Restart'); $message = __('We have saved some information about your Blogger account in your WordPress database. Clearing this information will allow you to start over. Restarting will not affect any posts you have already imported. If you attempt to re-import a blog, duplicate posts and comments will be skipped.'); $submit = __('Clear account information'); - echo "<div class='wrap'><h2>$restart</h2><p>$message</p><form method='post' action='?import=blogger&noheader=true'><p class='submit' style='text-align:left;'><input type='submit' class='button' value='$submit' name='restart' /></p></form></div>"; + echo "<div class='wrap'><h2>$restart</h2><p>$message</p><form method='post' action='?import=blogger&noheader=true'><p class='submit' style='text-align:left;'><input type='submit' class='button' value='$submit' name='restart' /></p></form></div>"; } } wp-admin/import/blogger.php @@ -1,13 +1,27 @@ <?php - -/* By Shayne Sweeney - http://www.theshayne.com/ */ - +/** + * Blogware XML Importer + * + * @package WordPress + * @subpackage Importer + * @author Shayne Sweeney + * @link http://www.theshayne.com/ + */ + +/** + * Blogware XML Importer class + * + * Extract posts from Blogware XML export file into your blog. + * + * @since unknown + */ class BW_Import { var $file; function header() { echo '<div class="wrap">'; + screen_icon(); echo '<h2>'.__('Import Blogware').'</h2>'; } wp-admin/import/blogware.php @@ -1,9 +1,24 @@ <?php - +/** + * BunnyTags Plugin Tag Importer + * + * @package WordPress + * @subpackage Importer + */ + +/** + * BunnyTags Plugin tag converter + * + * This will process the BunnyTags plugin tags and convert them to the WordPress + * 2.3 taxonomy. + * + * @since unknown + */ class BunnyTags_Import { function header() { echo '<div class="wrap">'; + screen_icon(); echo '<h2>'.__('Import Bunny’s Technorati Tags').'</h2>'; echo '<p>'.__('Steps may take a few minutes depending on the size of your database. Please be patient.').'<br /><br /></p>'; } @@ -20,7 +35,7 @@ class BunnyTags_Import { echo '<p><strong>'.__('Don’t be stupid - backup your database before proceeding!').'</strong></p>'; echo '<form action="admin.php?import=btt&step=1" method="post">'; wp_nonce_field('import-btt'); - echo '<p class="submit"><input type="submit" name="submit" value="'.__('Import Tags').'" /></p>'; + echo '<p class="submit"><input type="submit" name="submit" class="button" value="'.__('Import Tags').'" /></p>'; echo '</form>'; echo '</div>'; } @@ -90,7 +105,7 @@ class BunnyTags_Import { echo '<form action="admin.php?import=btt&step='.($precheck? 2:3).'" method="post">'; wp_nonce_field('import-btt'); - echo '<p class="submit"><input type="submit" name="submit" value="'.__('Next').'" /></p>'; + echo '<p class="submit"><input type="submit" name="submit" class="button" value="'.__('Next').'" /></p>'; echo '</form>'; echo '</div>'; } wp-admin/import/btt.php @@ -1,7 +1,11 @@ <?php -/* - * DotClear import plugin - * by Thomas Quinot - http://thomas.quinot.org/ +/** + * DotClear Importer + * + * @package WordPress + * @subpackage Importer + * @author Thomas Quinot + * @link http://thomas.quinot.org/ */ /** @@ -10,6 +14,15 @@ if(!function_exists('get_comment_count')) { + /** + * Get the comment count for posts. + * + * @package WordPress + * @subpackage Dotclear_Import + * + * @param int $post_ID Post ID + * @return int + */ function get_comment_count($post_ID) { global $wpdb; @@ -19,6 +32,15 @@ if(!function_exists('get_comment_count')) if(!function_exists('link_exists')) { + /** + * Check whether link already exists. + * + * @package WordPress + * @subpackage Dotclear_Import + * + * @param string $linkname + * @return int + */ function link_exists($linkname) { global $wpdb; @@ -40,31 +62,73 @@ if(!function_exists('link_exists')) // This cries out for a C-implementation to be included in PHP core // +/** + * @package WordPress + * @subpackage Dotclear_Import + * + * @param string $char + * @return string + */ function valid_1byte($char) { if(!is_int($char)) return false; return ($char & 0x80) == 0x00; } +/** + * @package WordPress + * @subpackage Dotclear_Import + * + * @param string $char + * @return string + */ function valid_2byte($char) { if(!is_int($char)) return false; return ($char & 0xE0) == 0xC0; } +/** + * @package WordPress + * @subpackage Dotclear_Import + * + * @param string $char + * @return string + */ function valid_3byte($char) { if(!is_int($char)) return false; return ($char & 0xF0) == 0xE0; } +/** + * @package WordPress + * @subpackage Dotclear_Import + * + * @param string $char + * @return string + */ function valid_4byte($char) { if(!is_int($char)) return false; return ($char & 0xF8) == 0xF0; } +/** + * @package WordPress + * @subpackage Dotclear_Import + * + * @param string $char + * @return string + */ function valid_nextbyte($char) { if(!is_int($char)) return false; return ($char & 0xC0) == 0x80; } +/** + * @package WordPress + * @subpackage Dotclear_Import + * + * @param string $string + * @return string + */ function valid_utf8($string) { $len = strlen($string); $i = 0; @@ -92,6 +156,13 @@ function valid_utf8($string) { return true; // done } +/** + * @package WordPress + * @subpackage Dotclear_Import + * + * @param string $s + * @return string + */ function csc ($s) { if (valid_utf8 ($s)) { return $s; @@ -100,18 +171,34 @@ function csc ($s) { } } +/** + * @package WordPress + * @subpackage Dotclear_Import + * + * @param string $s + * @return string + */ function textconv ($s) { return csc (preg_replace ('|(?<!<br />)\s*\n|', ' ', $s)); } /** - The Main Importer Class -**/ + * Dotclear Importer class + * + * Will process the WordPress eXtended RSS files that you upload from the export + * file. + * + * @package WordPress + * @subpackage Importer + * + * @since unknown + */ class Dotclear_Import { function header() { echo '<div class="wrap">'; + screen_icon(); echo '<h2>'.__('Import DotClear').'</h2>'; echo '<p>'.__('Steps may take a few minutes depending on the size of your database. Please be patient.').'</p>'; } @@ -128,7 +215,7 @@ class Dotclear_Import { echo '<form action="admin.php?import=dotclear&step=1" method="post">'; wp_nonce_field('import-dotclear'); $this->db_form(); - echo '<p class="su