<body>
<h1 id="logo" style="text-align: center">
<img alt="WordPress" src="wp-admin/images/wordpress-logo.png" />
- <br /> Version 2.7
+ <br /> Version 2.8
</h1>
<p style="text-align: center">Semantic Personal Publishing Platform</p>
<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.7:</h2>
+<h2>Upgrading from any previous WordPress to 2.8:</h2>
<ol>
<li>Delete your old WP files, saving ones you've modified.</li>
<li>Upload the new files.</li>
require_once('../wp-load.php');
require_once('includes/admin.php');
+@header('Content-Type: text/html; charset=' . get_option('blog_charset'));
+
+do_action('admin_init');
if ( ! is_user_logged_in() ) {
$x->send();
}
+ if ( !empty( $_POST['action']) )
+ do_action( 'wp_ajax_nopriv_' . $_POST['action'] );
+
die('-1');
}
if ( isset( $_GET['action'] ) ) :
switch ( $action = $_GET['action'] ) :
case 'ajax-tag-search' :
- if ( !current_user_can( 'manage_categories' ) )
+ if ( !current_user_can( 'edit_posts' ) )
die('-1');
$s = $_GET['q']; // is this slashed already?
+ if ( isset($_GET['tax']) )
+ $taxonomy = sanitize_title($_GET['tax']);
+ else
+ die('0');
+
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 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 . "%')" );
+
+ $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 = '$taxonomy' AND t.name LIKE ('%" . $s . "%')" );
+
echo join( $results, "\n" );
die;
break;
+case 'wp-compression-test' :
+ if ( !current_user_can( 'manage_options' ) )
+ die('-1');
+
+ if ( ini_get('zlib.output_compression') || 'ob_gzhandler' == ini_get('output_handler') ) {
+ update_site_option('can_compress_scripts', 0);
+ die('0');
+ }
+
+ if ( isset($_GET['test']) ) {
+ header( 'Expires: Wed, 11 Jan 1984 05:00:00 GMT' );
+ header( 'Last-Modified: ' . gmdate( 'D, d M Y H:i:s' ) . ' GMT' );
+ header( 'Cache-Control: no-cache, must-revalidate, max-age=0' );
+ header( 'Pragma: no-cache' );
+ header('Content-Type: application/x-javascript; charset=UTF-8');
+ $force_gzip = ( defined('ENFORCE_GZIP') && ENFORCE_GZIP );
+ $test_str = '"wpCompressionTest Lorem ipsum dolor sit amet consectetuer mollis sapien urna ut a. Eu nonummy condimentum fringilla tempor pretium platea vel nibh netus Maecenas. Hac molestie amet justo quis pellentesque est ultrices interdum nibh Morbi. Cras mattis pretium Phasellus ante ipsum ipsum ut sociis Suspendisse Lorem. Ante et non molestie. Porta urna Vestibulum egestas id congue nibh eu risus gravida sit. Ac augue auctor Ut et non a elit massa id sodales. Elit eu Nulla at nibh adipiscing mattis lacus mauris at tempus. Netus nibh quis suscipit nec feugiat eget sed lorem et urna. Pellentesque lacus at ut massa consectetuer ligula ut auctor semper Pellentesque. Ut metus massa nibh quam Curabitur molestie nec mauris congue. Volutpat molestie elit justo facilisis neque ac risus Ut nascetur tristique. Vitae sit lorem tellus et quis Phasellus lacus tincidunt nunc Fusce. Pharetra wisi Suspendisse mus sagittis libero lacinia Integer consequat ac Phasellus. Et urna ac cursus tortor aliquam Aliquam amet tellus volutpat Vestibulum. Justo interdum condimentum In augue congue tellus sollicitudin Quisque quis nibh."';
+
+ if ( 1 == $_GET['test'] ) {
+ echo $test_str;
+ die;
+ } elseif ( 2 == $_GET['test'] ) {
+ if ( false !== strpos( strtolower($_SERVER['HTTP_ACCEPT_ENCODING']), 'deflate') && function_exists('gzdeflate') && ! $force_gzip ) {
+ header('Content-Encoding: deflate');
+ $out = gzdeflate( $test_str, 1 );
+ } elseif ( false !== strpos( strtolower($_SERVER['HTTP_ACCEPT_ENCODING']), 'gzip') && function_exists('gzencode') ) {
+ header('Content-Encoding: gzip');
+ $out = gzencode( $test_str, 1 );
+ } else {
+ die('-1');
+ }
+ echo $out;
+ die;
+ } elseif ( 'no' == $_GET['test'] ) {
+ update_site_option('can_compress_scripts', 0);
+ } elseif ( 'yes' == $_GET['test'] ) {
+ update_site_option('can_compress_scripts', 1);
+ }
+ }
+
+ die('0');
+ break;
default :
do_action( 'wp_ajax_' . $_GET['action'] );
die('0');
endswitch;
endif;
+/**
+ * Sends back current comment total and new page links if they need to be updated.
+ *
+ * Contrary to normal success AJAX response ("1"), die with time() on success.
+ *
+ * @since 2.7
+ *
+ * @param int $comment_id
+ * @return die
+ */
+function _wp_ajax_delete_comment_response( $comment_id ) {
+ $total = (int) @$_POST['_total'];
+ $per_page = (int) @$_POST['_per_page'];
+ $page = (int) @$_POST['_page'];
+ $url = esc_url_raw( @$_POST['_url'] );
+ // JS didn't send us everything we need to know. Just die with success message
+ if ( !$total || !$per_page || !$page || !$url )
+ die( (string) time() );
+
+ if ( --$total < 0 ) // Take the total from POST and decrement it (since we just deleted one)
+ $total = 0;
+
+ if ( 0 != $total % $per_page && 1 != mt_rand( 1, $per_page ) ) // Only do the expensive stuff on a page-break, and about 1 other time per page
+ die( (string) time() );
+
+ $status = 'total_comments'; // What type of comment count are we looking for?
+ $parsed = parse_url( $url );
+ if ( isset( $parsed['query'] ) ) {
+ parse_str( $parsed['query'], $query_vars );
+ if ( !empty( $query_vars['comment_status'] ) )
+ $status = $query_vars['comment_status'];
+ }
+
+ $comment_count = wp_count_comments();
+ $time = time(); // The time since the last comment count
+
+ if ( isset( $comment_count->$status ) ) // We're looking for a known type of comment count
+ $total = $comment_count->$status;
+ // else use the decremented value from above
+
+ $page_links = paginate_links( array(
+ 'base' => add_query_arg( 'apage', '%#%', $url ),
+ 'format' => '',
+ 'prev_text' => __('«'),
+ 'next_text' => __('»'),
+ 'total' => ceil($total / $per_page),
+ 'current' => $page
+ ) );
+ $x = new WP_Ajax_Response( array(
+ 'what' => 'comment',
+ 'id' => $comment_id, // here for completeness - not used
+ 'supplemental' => array(
+ 'pageLinks' => $page_links,
+ 'total' => $total,
+ 'time' => $time
+ )
+ ) );
+ $x->send();
+}
+
$id = isset($_POST['id'])? (int) $_POST['id'] : 0;
switch ( $action = $_POST['action'] ) :
-case 'delete-comment' :
+case 'delete-comment' : // On success, die with time() instead of 1
check_ajax_referer( "delete-comment_$id" );
if ( !$comment = get_comment( $id ) )
- die('1');
+ die( (string) time() );
if ( !current_user_can( 'edit_post', $comment->comment_post_ID ) )
die('-1');
if ( isset($_POST['spam']) && 1 == $_POST['spam'] ) {
if ( 'spam' == wp_get_comment_status( $comment->comment_ID ) )
- die('1');
+ die( (string) time() );
$r = wp_set_comment_status( $comment->comment_ID, 'spam' );
} else {
$r = wp_delete_comment( $comment->comment_ID );
}
-
- die( $r ? '1' : '0' );
+ if ( $r ) // Decide if we need to send back '1' or a more complicated response including page links and comment counts
+ _wp_ajax_delete_comment_response( $comment->comment_ID );
+ die( '0' );
break;
case 'delete-cat' :
check_ajax_referer( "delete-category_$id" );
if ( !current_user_can( 'manage_categories' ) )
die('-1');
- $tag = get_term( $id, 'post_tag' );
+ if ( !empty($_POST['taxonomy']) )
+ $taxonomy = $_POST['taxonomy'];
+ else
+ $taxonomy = 'post_tag';
+
+ $tag = get_term( $id, $taxonomy );
if ( !$tag || is_wp_error( $tag ) )
die('1');
- if ( wp_delete_term($id, 'post_tag'))
+ if ( wp_delete_term($id, $taxonomy))
die('1');
else
die('0');
$cat_name = get_term_field('name', $id, 'link_category');
+ $default = get_option('default_link_category');
+
// Don't delete the default cats.
- if ( $id == get_option('default_link_category') ) {
+ if ( $id == $default ) {
$x = new WP_AJAX_Response( array(
'what' => 'link-cat',
'id' => $id,
$x->send();
}
- $r = wp_delete_term($id, 'link_category');
+ $r = wp_delete_term($id, 'link_category', array('default' => $default));
if ( !$r )
die('0');
if ( is_wp_error($r) ) {
else
die('0');
break;
-case 'dim-comment' :
- if ( !$comment = get_comment( $id ) )
- die('0');
+case 'dim-comment' : // On success, die with time() instead of 1
+
+ if ( !$comment = get_comment( $id ) ) {
+ $x = new WP_Ajax_Response( array(
+ 'what' => 'comment',
+ 'id' => new WP_Error('invalid_comment', sprintf(__('Comment %d does not exist'), $id))
+ ) );
+ $x->send();
+ }
if ( !current_user_can( 'edit_post', $comment->comment_post_ID ) )
die('-1');
$current = wp_get_comment_status( $comment->comment_ID );
if ( $_POST['new'] == $current )
- die('1');
+ die( (string) time() );
+ $r = 0;
if ( in_array( $current, array( 'unapproved', 'spam' ) ) ) {
check_ajax_referer( "approve-comment_$id" );
- if ( wp_set_comment_status( $comment->comment_ID, 'approve' ) )
- die('1');
+ $result = wp_set_comment_status( $comment->comment_ID, 'approve', true );
} else {
check_ajax_referer( "unapprove-comment_$id" );
- if ( wp_set_comment_status( $comment->comment_ID, 'hold' ) )
- die('1');
+ $result = wp_set_comment_status( $comment->comment_ID, 'hold', true );
}
- die('0');
+ if ( is_wp_error($result) ) {
+ $x = new WP_Ajax_Response( array(
+ 'what' => 'comment',
+ 'id' => $result
+ ) );
+ $x->send();
+ }
+
+ // Decide if we need to send back '1' or a more complicated response including page links and comment counts
+ _wp_ajax_delete_comment_response( $comment->comment_ID );
+ die( '0' );
break;
case 'add-category' : // On the Fly
check_ajax_referer( $action );
$cat_id = wp_insert_term( $cat_name, 'link_category' );
}
$cat_id = $cat_id['term_id'];
- $cat_name = wp_specialchars(stripslashes($cat_name));
+ $cat_name = esc_html(stripslashes($cat_name));
$x->add( array(
'what' => 'link-category',
'id' => $cat_id,
- 'data' => "<li id='link-category-$cat_id'><label for='in-link-category-$cat_id' class='selectit'><input value='$cat_id' type='checkbox' checked='checked' name='link_category[]' id='in-link-category-$cat_id'/> $cat_name</label></li>",
+ 'data' => "<li id='link-category-$cat_id'><label for='in-link-category-$cat_id' class='selectit'><input value='" . esc_attr($cat_id) . "' type='checkbox' checked='checked' name='link_category[]' id='in-link-category-$cat_id'/> $cat_name</label></li>",
'position' => -1
) );
}
$x->send();
}
- if ( category_exists( trim( $_POST['cat_name'] ) ) ) {
+ if ( category_exists( trim( $_POST['cat_name'] ), $_POST['category_parent'] ) ) {
$x = new WP_Ajax_Response( array(
'what' => 'cat',
'id' => new WP_Error( 'cat_exists', __('The category you are trying to create already exists.'), array( 'form-field' => 'cat_name' ) ),
$cat_full_name = $_cat->name . ' — ' . $cat_full_name;
$level++;
}
- $cat_full_name = attribute_escape($cat_full_name);
+ $cat_full_name = esc_attr($cat_full_name);
$x = new WP_Ajax_Response( array(
'what' => 'cat',
$x->send();
}
- $tag = wp_insert_term($_POST['name'], 'post_tag', $_POST );
+ if ( !empty($_POST['taxonomy']) )
+ $taxonomy = $_POST['taxonomy'];
+ else
+ $taxonomy = 'post_tag';
+
+ $tag = wp_insert_term($_POST['name'], $taxonomy, $_POST );
if ( is_wp_error($tag) ) {
$x = new WP_Ajax_Response( array(
$x->send();
}
- if ( !$tag || (!$tag = get_term( $tag['term_id'], 'post_tag' )) )
+ if ( !$tag || (!$tag = get_term( $tag['term_id'], $taxonomy )) )
die('0');
$tag_full_name = $tag->name;
- $tag_full_name = attribute_escape($tag_full_name);
+ $tag_full_name = esc_attr($tag_full_name);
$x = new WP_Ajax_Response( array(
'what' => 'tag',
'id' => $tag->term_id,
'position' => '-1',
- 'data' => _tag_row( $tag ),
+ 'data' => _tag_row( $tag, '', $taxonomy ),
'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' ) )
+ if ( !current_user_can( 'edit_posts' ) )
die('-1');
- $tags = get_tags( array( 'number' => 45, 'orderby' => 'count', 'order' => 'DESC' ) );
+ if ( isset($_POST['tax']) )
+ $taxonomy = sanitize_title($_POST['tax']);
+ else
+ die('0');
+
+ $tags = get_terms( $taxonomy, array( 'number' => 45, 'orderby' => 'count', 'order' => 'DESC' ) );
if ( empty( $tags ) )
die( __('No tags found!') );
$tags[ $key ]->id = $tag->term_id;
}
- $return = wp_generate_tag_cloud( $tags );
+ // We need raw tag names here, so don't filter the output
+ $return = wp_generate_tag_cloud( $tags, array('filter' => 0) );
if ( empty($return) )
die('0');
$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;
+ $comments_listing = isset($_POST['comments_listing']) ? $_POST['comments_listing'] : '';
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 );
+ _wp_comment_row( $comment_id, $mode, $comments_listing, $checkbox );
$comment_list_item = ob_get_contents();
ob_end_clean();
if ( isset($_POST['metakeyselect']) || isset($_POST['metakeyinput']) ) {
if ( !current_user_can( 'edit_post', $pid ) )
die('-1');
- if ( '#NONE#' == $_POST['metakeyselect'] && empty($_POST['metakeyinput']) )
+ if ( isset($_POST['metakeyselect']) && '#NONE#' == $_POST['metakeyselect'] && empty($_POST['metakeyinput']) )
die('1');
if ( $pid < 0 ) {
$now = current_time('timestamp', 1);
) );
$x->send();
}
- $mid = add_meta( $pid );
+ if ( !$mid = add_meta( $pid ) )
+ die(__('Please provide a custom field value.'));
} else {
die('0');
}
} else if ( !$mid = add_meta( $pid ) ) {
- die('0');
+ die(__('Please provide a custom field value.'));
}
$meta = get_post_meta_by_id( $mid );
if ( !current_user_can( 'edit_post', $meta->post_id ) )
die('-1');
if ( !$u = update_meta( $mid, $key, $value ) )
- die('1'); // We know meta exists; we also know it's unchanged (or DB error, in which case there are bigger problems).
+ die('0'); // We know meta exists; we also know it's unchanged (or DB error, in which case there are bigger problems).
+
$key = stripslashes($key);
$value = stripslashes($value);
$x = new WP_Ajax_Response( array(
global $current_user;
$_POST['post_category'] = explode(",", $_POST['catslist']);
- $_POST['tags_input'] = explode(",", $_POST['tags_input']);
if($_POST['post_type'] == 'page' || empty($_POST['post_category']))
unset($_POST['post_category']);
$do_lock = true;
$data = '';
- $message = sprintf( __('Draft Saved at %s.'), date_i18n( __('g:i:s a') ) );
+ /* translators: draft saved date format, see http://php.net/date */
+ $draft_saved_date_format = __('g:i:s a');
+ $message = sprintf( __('Draft Saved at %s.'), date_i18n( $draft_saved_date_format ) );
$supplemental = array();
$last_user_name = $last_user ? $last_user->display_name : __( 'Someone' );
$data = new WP_Error( 'locked', sprintf(
$_POST['post_type'] == 'page' ? __( 'Autosave disabled: %s is currently editing this page.' ) : __( 'Autosave disabled: %s is currently editing this post.' ),
- wp_specialchars( $last_user_name )
+ esc_html( $last_user_name )
) );
$supplemental['disable_autosave'] = 'disable';
break;
case 'closed-postboxes' :
check_ajax_referer( 'closedpostboxes', 'closedpostboxesnonce' );
- $closed = isset( $_POST['closed'] )? $_POST['closed'] : '';
+ $closed = isset( $_POST['closed'] ) ? $_POST['closed'] : '';
$closed = explode( ',', $_POST['closed'] );
- $hidden = isset( $_POST['hidden'] )? $_POST['hidden'] : '';
+ $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();
+ $page = isset( $_POST['page'] ) ? $_POST['page'] : '';
+
+ if ( !preg_match( '/^[a-z_-]+$/', $page ) )
+ die('-1');
+
+ if ( ! $user = wp_get_current_user() )
+ die('-1');
+
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;
+ update_usermeta($user->ID, 'closedpostboxes_'.$page, $closed);
+
+ if ( is_array($hidden) ) {
+ $hidden = array_diff( $hidden, array('submitdiv', 'pagesubmitdiv', 'linksubmitdiv') ); // postboxes that are always shown
+ update_usermeta($user->ID, 'meta-box-hidden_'.$page, $hidden);
+ }
+
+ die('1');
+ break;
case 'hidden-columns' :
- check_ajax_referer( 'hiddencolumns', 'hiddencolumnsnonce' );
- $hidden = isset( $_POST['hidden'] )? $_POST['hidden'] : '';
+ check_ajax_referer( 'screen-options-nonce', 'screenoptionnonce' );
+ $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();
+ $page = isset( $_POST['page'] ) ? $_POST['page'] : '';
+
+ if ( !preg_match( '/^[a-z_-]+$/', $page ) )
+ die('-1');
+
+ if ( ! $user = wp_get_current_user() )
+ die('-1');
+
if ( is_array($hidden) )
- update_usermeta($current_user->ID, "manage-$page-columns-hidden", $hidden);
-break;
+ update_usermeta($user->ID, "manage-$page-columns-hidden", $hidden);
+
+ die('1');
+ break;
+case 'meta-box-order':
+ check_ajax_referer( 'meta-box-order' );
+ $order = isset( $_POST['order'] ) ? (array) $_POST['order'] : false;
+ $page_columns = isset( $_POST['page_columns'] ) ? (int) $_POST['page_columns'] : 0;
+ $page = isset( $_POST['page'] ) ? $_POST['page'] : '';
+
+ if ( !preg_match( '/^[a-z_-]+$/', $page ) )
+ die('-1');
+
+ if ( ! $user = wp_get_current_user() )
+ die('-1');
+
+ if ( $order )
+ update_user_option($user->ID, "meta-box-order_$page", $order);
+
+ if ( $page_columns )
+ update_usermeta($user->ID, "screen_layout_$page", $page_columns);
+
+ die('1');
+ break;
case 'get-permalink':
check_ajax_referer( 'getpermalink', 'getpermalinknonce' );
$post_id = isset($_POST['post_id'])? intval($_POST['post_id']) : 0;
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 ) );
+ printf( $_POST['post_type'] == 'page' ? __( 'Saving is disabled: %s is currently editing this page.' ) : __( 'Saving is disabled: %s is currently editing this post.' ), esc_html( $last_user_name ) );
exit;
}
$data = &$_POST;
+
$post = get_post( $post_ID, ARRAY_A );
+ $post = add_magic_quotes($post); //since it is from db
+
$data['content'] = $post['post_content'];
$data['excerpt'] = $post['post_excerpt'];
$data['ping_status'] = 'closed';
// update the post
- $_POST = $data;
edit_post();
$post = array();
break;
case 'tag' :
- $updated = wp_update_term($id, 'post_tag', $_POST);
+ if ( !empty($_POST['taxonomy']) )
+ $taxonomy = $_POST['taxonomy'];
+ else
+ $taxonomy = 'post_tag';
+
+ $tag = get_term( $id, $taxonomy );
+ $_POST['description'] = $tag->description;
+
+ $updated = wp_update_term($id, $taxonomy, $_POST);
if ( $updated && !is_wp_error($updated) ) {
- $tag = get_term( $updated['term_id'], 'post_tag' );
+ $tag = get_term( $updated['term_id'], $taxonomy );
if ( !$tag || is_wp_error( $tag ) )
die( __('Tag not updated.') );
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 ( ! $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>';
+ $html = '<table class="widefat" cellspacing="0"><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 ) {
if ( '0000-00-00 00:00:00' == $post->post_date ) {
$time = '';
} else {
+ /* translators: date format in table columns, see http://php.net/date */
$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 .= '<tr class="found-posts"><td class="found-radio"><input type="radio" id="found-'.$post->ID.'" name="found_post_id" value="' . esc_attr($post->ID) . '"></td>';
+ $html .= '<td><label for="found-'.$post->ID.'">'.esc_html( $post->post_title ).'</label></td><td>'.esc_html( $time ).'</td><td>'.esc_html( $stat ).'</td></tr>'."\n\n";
}
$html .= '</tbody></table>';
));
$x->send();
+ break;
+case 'lj-importer' :
+ check_ajax_referer( 'lj-api-import' );
+ if ( !current_user_can( 'publish_posts' ) )
+ die('-1');
+ if ( empty( $_POST['step'] ) )
+ die( '-1' );
+ define('WP_IMPORTING', true);
+ include( ABSPATH . 'wp-admin/import/livejournal.php' );
+ $result = $lj_api_import->{ 'step' . ( (int) $_POST['step'] ) }();
+ if ( is_wp_error( $result ) )
+ echo $result->get_error_message();
+ die;
+ break;
+case 'widgets-order' :
+ check_ajax_referer( 'save-sidebar-widgets', 'savewidgets' );
+
+ if ( !current_user_can('switch_themes') )
+ die('-1');
+
+ unset( $_POST['savewidgets'], $_POST['action'] );
+
+ // save widgets order for all sidebars
+ if ( is_array($_POST['sidebars']) ) {
+ $sidebars = array();
+ foreach ( $_POST['sidebars'] as $key => $val ) {
+ $sb = array();
+ if ( !empty($val) ) {
+ $val = explode(',', $val);
+ foreach ( $val as $k => $v ) {
+ if ( strpos($v, 'widget-') === false )
+ continue;
+
+ $sb[$k] = substr($v, strpos($v, '_') + 1);
+ }
+ }
+ $sidebars[$key] = $sb;
+ }
+ wp_set_sidebars_widgets($sidebars);
+ die('1');
+ }
+
+ die('-1');
+ break;
+case 'save-widget' :
+ check_ajax_referer( 'save-sidebar-widgets', 'savewidgets' );
+
+ if ( !current_user_can('switch_themes') || !isset($_POST['id_base']) )
+ die('-1');
+
+ unset( $_POST['savewidgets'], $_POST['action'] );
+
+ do_action('load-widgets.php');
+ do_action('widgets.php');
+ do_action('sidebar_admin_setup');
+
+ $id_base = $_POST['id_base'];
+ $widget_id = $_POST['widget-id'];
+ $sidebar_id = $_POST['sidebar'];
+ $multi_number = !empty($_POST['multi_number']) ? (int) $_POST['multi_number'] : 0;
+ $settings = isset($_POST['widget-' . $id_base]) && is_array($_POST['widget-' . $id_base]) ? $_POST['widget-' . $id_base] : false;
+ $error = '<p>' . __('An error has occured. Please reload the page and try again.') . '</p>';
+
+ $sidebars = wp_get_sidebars_widgets();
+ $sidebar = isset($sidebars[$sidebar_id]) ? $sidebars[$sidebar_id] : array();
+
+ // delete
+ if ( isset($_POST['delete_widget']) && $_POST['delete_widget'] ) {
+
+ if ( !isset($wp_registered_widgets[$widget_id]) )
+ die($error);
+
+ $sidebar = array_diff( $sidebar, array($widget_id) );
+ $_POST = array('sidebar' => $sidebar_id, 'widget-' . $id_base => array(), 'the-widget-id' => $widget_id, 'delete_widget' => '1');
+ } elseif ( $settings && preg_match( '/__i__|%i%/', key($settings) ) ) {
+ if ( !$multi_number )
+ die($error);
+
+ $_POST['widget-' . $id_base] = array( $multi_number => array_shift($settings) );
+ $widget_id = $id_base . '-' . $multi_number;
+ $sidebar[] = $widget_id;
+ }
+ $_POST['widget-id'] = $sidebar;
+
+ foreach ( (array) $wp_registered_widget_updates as $name => $control ) {
+
+ if ( $name == $id_base ) {
+ if ( !is_callable( $control['callback'] ) )
+ continue;
+
+ ob_start();
+ call_user_func_array( $control['callback'], $control['params'] );
+ ob_end_clean();
+ break;
+ }
+ }
+
+ if ( isset($_POST['delete_widget']) && $_POST['delete_widget'] ) {
+ $sidebars[$sidebar_id] = $sidebar;
+ wp_set_sidebars_widgets($sidebars);
+ echo "deleted:$widget_id";
+ die();
+ }
+
+ if ( !empty($_POST['add_new']) )
+ die();
+
+ if ( $form = $wp_registered_widget_controls[$widget_id] )
+ call_user_func_array( $form['callback'], $form['params'] );
+
+ die();
break;
default :
do_action( 'wp_ajax_' . $_POST['action'] );
<p id="footer-left" class="alignleft"><?php
do_action( 'in_admin_footer' );
$upgrade = apply_filters( 'update_footer', '' );
-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>'); ?>
+echo apply_filters( 'admin_footer_text', '<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', ''); ?>
+<?php
+do_action('admin_footer', '');
+do_action('admin_print_footer_scripts');
+do_action("admin_footer-$hook_suffix");
+
+// get_site_option() won't exist when auto upgrading from <= 2.7
+if ( function_exists('get_site_option') ) {
+ if ( false === get_site_option('can_compress_scripts') )
+ compression_test();
+}
+
+?>
+
<script type="text/javascript">if(typeof wpOnload=='function')wpOnload();</script>
</body>
-</html>
\ No newline at end of file
+</html>
if (!isset($_GET["page"])) require_once('admin.php');
get_admin_page_title();
-$title = wp_specialchars( strip_tags( $title ) );
+$title = esc_html( strip_tags( $title ) );
wp_user_settings();
+wp_menu_unfold();
?>
<!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') ?> › <?php echo $title; ?> — WordPress</title>
+<title><?php echo $title; ?> ‹ <?php bloginfo('name') ?> — WordPress</title>
<?php
wp_admin_css( 'css/global' );
wp_admin_css();
wp_admin_css( 'css/colors' );
wp_admin_css( 'css/ie' );
+wp_enqueue_script('utils');
+$hook_suffix = '';
+if ( isset($page_hook) )
+ $hook_suffix = "$page_hook";
+else if ( isset($plugin_page) )
+ $hook_suffix = "$plugin_page";
+else if ( isset($pagenow) )
+ $hook_suffix = "$pagenow";
+
+$admin_body_class = preg_replace('/[^a-z0-9_-]+/i', '-', $hook_suffix);
?>
<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;
-};
+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();}}};
+var userSettings = {'url':'<?php echo SITECOOKIEPATH; ?>','uid':'<?php if ( ! isset($current_user) ) $current_user = wp_get_current_user(); echo $current_user->ID; ?>','time':'<?php echo time() ?>'};
+var ajaxurl = '<?php echo admin_url('admin-ajax.php'); ?>', pagenow = '<?php echo substr($pagenow, 0, -4); ?>', adminpage = '<?php echo $admin_body_class; ?>';
//]]>
</script>
<?php
if ( in_array( $pagenow, array('post.php', 'post-new.php', 'page.php', 'page-new.php') ) ) {
- add_action( 'admin_head', 'wp_tiny_mce' );
+ add_action( 'admin_print_footer_scripts', 'wp_tiny_mce', 25 );
+ wp_enqueue_script('quicktags');
}
-$hook_suffix = '';
-if ( isset($page_hook) )
- $hook_suffix = "$page_hook";
-else if ( isset($plugin_page) )
- $hook_suffix = "$plugin_page";
-else if ( isset($pagenow) )
- $hook_suffix = "$pagenow";
-
+do_action('admin_enqueue_scripts', $hook_suffix);
do_action("admin_print_styles-$hook_suffix");
do_action('admin_print_styles');
do_action("admin_print_scripts-$hook_suffix");
do_action("admin_head-$hook_suffix");
do_action('admin_head');
+if ( get_user_setting('mfold') == 'f' ) {
+ $admin_body_class .= ' folded';
+}
+
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', '' ); ?>">
+<body class="wp-admin no-js <?php echo apply_filters( 'admin_body_class', '' ) . " $admin_body_class"; ?>">
+<script type="text/javascript">
+//<![CDATA[
+(function(){
+var c = document.body.className;
+c = c.replace(/no-js/, 'js');
+document.body.className = c;
+})();
+//]]>
+</script>
<div id="wpwrap">
<div id="wpcontent">
}
?>
-<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>
+<img id="header-logo" src="../wp-includes/images/blank.gif" alt="" width="32" height="32" /> <h1 id="site-heading" <?php echo $title_class ?>><a href="<?php echo trailingslashit( get_bloginfo('url') ); ?>" title="<?php _e('Visit Site') ?>"><span id="site-title"><?php echo $blog_name ?></span> <em id="site-visit-button"><?php _e('Visit Site') ?></em></a></h1>
<div id="wphead-info">
<div id="user_info">
<a href="<?php echo wp_logout_url() ?>" title="<?php _e('Log Out') ?>"><?php _e('Log Out'); ?></a></p>
</div>
-<?php favorite_actions(); ?>
+<?php favorite_actions($hook_suffix); ?>
</div>
</div>
-<?php if ( get_user_setting('mfold') == 'f' ) { ?>
-<script type="text/javascript">jQuery('#wpcontent').addClass('folded');</script>
-<?php } ?>
-
<div id="wpbody">
<?php require(ABSPATH . 'wp-admin/menu-header.php'); ?>
require_once(ABSPATH . 'wp-admin/includes/admin.php');
-if ( !wp_validate_auth_cookie() )
- wp_die(__('Cheatin’ uh?'));
-
nocache_headers();
do_action('admin_init');
$action = 'admin_post';
+
+if ( !wp_validate_auth_cookie() )
+ $action .= '_nopriv';
+
if ( !empty($_REQUEST['action']) )
$action .= '_' . $_REQUEST['action'];
*
* @since unknown
*/
-define('WP_ADMIN', TRUE);
+if ( !defined('WP_ADMIN') )
+ define('WP_ADMIN', TRUE);
if ( defined('ABSPATH') )
require_once(ABSPATH . 'wp-load.php');
else
require_once('../wp-load.php');
-if ( get_option('db_version') != $wp_db_version ) {
+if ( get_option('db_upgraded') ) {
+ $wp_rewrite->flush_rules();
+ update_option( 'db_upgraded', false );
+
+ /**
+ * Runs on the next page load after successful upgrade
+ *
+ * @since 2.8
+ */
+ do_action('after_db_upgrade');
+} elseif ( get_option('db_version') != $wp_db_version ) {
wp_redirect(admin_url('upgrade.php?_wp_http_referer=' . urlencode(stripslashes($_SERVER['REQUEST_URI']))));
exit;
}
update_category_cache();
+set_screen_options();
+
$posts_per_page = get_option('posts_per_page');
-$what_to_show = get_option('what_to_show');
$date_format = get_option('date_format');
$time_format = get_option('time_format');
* @subpackage Administration
*/
+define('WP_ADMIN', true);
+
if ( defined('ABSPATH') )
require_once(ABSPATH . 'wp-load.php');
else
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 ));
+ echo get_media_item($id, array( 'send' => false, 'delete' => true ));
} else {
+ add_filter('attachment_fields_to_edit', 'media_post_single_attachment_fields_to_edit', 10, 2);
echo get_media_item($id);
}
exit;
$id = media_handle_upload('async-upload', $_REQUEST['post_id']);
if (is_wp_error($id)) {
- echo '<div id="media-upload-error">'.wp_specialchars($id->get_error_message()).'</div>';
+ echo '<div id="media-upload-error">'.esc_html($id->get_error_message()).'</div>';
exit;
}
echo apply_filters("async_upload_{$type}", $id);
}
-?>
\ No newline at end of file
+?>
if ( !current_user_can('manage_categories') )
wp_die(__('Cheatin’ uh?'));
- if( wp_insert_category($_POST ) ) {
- wp_redirect('categories.php?message=1#addcat');
- } else {
- wp_redirect('categories.php?message=4#addcat');
- }
+ if ( wp_insert_category($_POST ) )
+ wp_safe_redirect( add_query_arg( 'message', 1, wp_get_referer() ) . '#addcat' );
+ else
+ wp_safe_redirect( add_query_arg( 'message', 4, wp_get_referer() ) . '#addcat' );
+
exit;
break;
if ( !current_user_can('manage_categories') )
wp_die(__('Cheatin’ uh?'));
- $cat_name = get_catname($cat_ID);
+ $cat_name = get_cat_name($cat_ID);
// Don't delete the default cats.
- if ( $cat_ID == get_option('default_category') )
+ if ( $cat_ID == get_option('default_category') )
wp_die(sprintf(__("Can’t delete the <strong>%s</strong> category: this is the default one"), $cat_name));
wp_delete_category($cat_ID);
- wp_redirect('categories.php?message=2');
+ wp_safe_redirect( add_query_arg( 'message', 2, wp_get_referer() ) );
exit;
break;
wp_die( __('You are not allowed to delete categories.') );
foreach ( (array) $_GET['delete'] as $cat_ID ) {
- $cat_name = get_catname($cat_ID);
+ $cat_name = get_cat_name($cat_ID);
// Don't delete the default cats.
if ( $cat_ID == get_option('default_category') )
wp_delete_category($cat_ID);
}
- $sendback = wp_get_referer();
-
- wp_redirect($sendback);
+ wp_safe_redirect( wp_get_referer() );
exit();
break;
<div class="wrap nosubsub">
<?php screen_icon(); ?>
-<h2><?php echo wp_specialchars( $title );
+<h2><?php echo esc_html( $title );
if ( isset($_GET['s']) && $_GET['s'] )
- printf( '<span class="subtitle">' . __('Search results for “%s”') . '</span>', wp_specialchars( stripslashes($_GET['s']) ) ); ?>
+ printf( '<span class="subtitle">' . __('Search results for “%s”') . '</span>', esc_html( stripslashes($_GET['s']) ) ); ?>
</h2>
<?php
<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" />
+ <label class="screen-reader-text" for="category-search-input"><?php _e('Search Categories'); ?>:</label>
+ <input type="text" id="category-search-input" name="s" value="<?php _admin_search_query(); ?>" />
+ <input type="submit" value="<?php esc_attr_e( 'Search Categories' ); ?>" class="button" />
</p>
</form>
<br class="clear" />
$pagenum = isset( $_GET['pagenum'] ) ? absint( $_GET['pagenum'] ) : 0;
if ( empty($pagenum) )
$pagenum = 1;
-if( ! isset( $catsperpage ) || $catsperpage < 0 )
- $catsperpage = 20;
+
+$cats_per_page = get_user_option('categories_per_page');
+if ( empty($cats_per_page) )
+ $cats_per_page = 20;
+$cats_per_page = apply_filters('edit_categories_per_page', $cats_per_page);
+
+if ( !empty($_GET['s']) )
+ $num_cats = count(get_categories(array('hide_empty' => 0, 'search' => $_GET['s'])));
+else
+ $num_cats = wp_count_terms('category');
$page_links = paginate_links( array(
'base' => add_query_arg( 'pagenum', '%#%' ),
'format' => '',
'prev_text' => __('«'),
'next_text' => __('»'),
- 'total' => ceil(wp_count_terms('category') / $catsperpage),
+ 'total' => ceil($num_cats / $cats_per_page),
'current' => $pagenum
));
<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" />
+<input type="submit" value="<?php esc_attr_e('Apply'); ?>" name="doaction" id="doaction" class="button-secondary action" />
<?php wp_nonce_field('bulk-categories'); ?>
</div>
<tbody id="the-list" class="list:cat">
<?php
-cat_rows(0, 0, 0, $pagenum, $catsperpage);
+cat_rows(0, 0, 0, $pagenum, $cats_per_page);
?>
</tbody>
</table>
<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" />
+<input type="submit" value="<?php esc_attr_e('Apply'); ?>" name="doaction2" id="doaction2" class="button-secondary action" />
<?php wp_nonce_field('bulk-categories'); ?>
</div>
</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(__('<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_cat_name(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>
<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>
+<p class="submit"><input type="submit" class="button" name="submit" value="<?php esc_attr_e('Add Category'); ?>" /></p>
<?php do_action('edit_category_form', $category); ?>
</form></div>
</div><!-- /col-container -->
</div><!-- /wrap -->
-<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');
<table width="100%">
<tr>
-<td><input type='button' class="button" value='<?php _e('No'); ?>' onclick="self.location='<?php echo admin_url('edit-comments.php'); ?>" /></td>
-<td class="textright"><input type='submit' class="button" value='<?php echo $button; ?>' /></td>
+<td><input type='button' class="button" value='<?php esc_attr_e('No'); ?>' onclick="self.location='<?php echo admin_url('edit-comments.php'); ?>" /></td>
+<td class="textright"><input type='submit' class="button" value='<?php echo esc_attr($button); ?>' /></td>
</tr>
</table>
<?php wp_nonce_field( $nonce_action ); ?>
-<input type='hidden' name='action' value='<?php echo $formaction; ?>' />
+<input type='hidden' name='action' value='<?php echo esc_attr($formaction); ?>' />
<?php if ( 'spam' == $_GET['dt'] ) { ?>
<input type='hidden' name='dt' value='spam' />
<?php } ?>
-<input type='hidden' name='p' value='<?php echo $comment->comment_post_ID; ?>' />
-<input type='hidden' name='c' value='<?php echo $comment->comment_ID; ?>' />
+<input type='hidden' name='p' value='<?php echo esc_attr($comment->comment_post_ID); ?>' />
+<input type='hidden' name='c' value='<?php echo esc_attr($comment->comment_ID); ?>' />
<input type='hidden' name='noredir' value='1' />
</form>
</tr>
<?php } ?>
<tr>
-<th scope="row" valign="top"><?php echo _c('Comment|noun'); ?></th>
+<th scope="row" valign="top"><?php /* translators: field name in comment form */ echo _x('Comment', 'noun'); ?></th>
<td><?php echo $comment->comment_content; ?></td>
</tr>
</table>
case 'editedcomment' :
$comment_id = absint( $_POST['comment_ID'] );
- $comment_post_id = absint( $_POST['comment_post_id'] );
+ $comment_post_id = absint( $_POST['comment_post_ID'] );
check_admin_referer( 'update-comment_' . $comment_id );
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;
+ background: #eee url('../images/menu-bits-rtl-vs.gif') repeat-x scroll right -379px;
}
#upload-menu li.current {
border-right-color: transparent;
}
#adminmenu .wp-submenu .current a.current {
- background: transparent url(../images/menu-bits-rtl.gif) no-repeat scroll right -289px;
+ background: transparent url(../images/menu-bits-rtl-vs.gif) no-repeat scroll right -289px;
}
#adminmenu li.wp-menu-separator {
#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;
+ background: transparent url(../images/menu-bits-rtl-vs.gif) repeat-x scroll right -207px;
}
#adminmenu .wp-has-current-submenu ul li a.current {
#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;
+ background: url(../images/menu-bits-rtl-vs.gif) top right repeat-x;
}
#adminmenu li.wp-has-current-submenu ul li a {
}
#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;
+ background: transparent url(../images/menu-bits-rtl-vs.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;
+ background: transparent url(../images/menu-bits-rtl-vs.gif) repeat-x scroll right -109px;
}
#adminmenu a.wp-has-submenu {
- background: #f1f1f1 url(../images/menu-bits-rtl.gif) repeat-x scroll right -379px;
+ background: #f1f1f1 url(../images/menu-bits-rtl-vs.gif) repeat-x scroll right -379px;
}
#adminmenu .wp-submenu a {
- background: #FFFFFF url(../images/menu-bits-rtl.gif) no-repeat scroll right -310px;
+ background: #FFFFFF url(../images/menu-bits-rtl-vs.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;
+ background: transparent url(../images/menu-bits-rtl-vs.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;
+ background: #b5b5b5 url(../images/menu-bits-rtl-vs.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;
+ background: transparent url(../images/menu-bits-rtl-vs.gif) no-repeat scroll right -111px;
}
html {
- background-color: #F5FCFD;
+ background-color: #f7f6f1;
+}
+
+* html input,
+* html .widget {
+ border-color: #8cbdd5;
+}
+
+textarea,
+input,
+select {
+ border-color: #dfdfdf;
+}
+
+kbd,
+code {
+ background: #eaeaea;
+}
+
+input[readonly] {
+ background-color: #eee;
}
.find-box-search {
border-bottom-color: #fff;
}
-kbd, code {
- background: #eaeaea;
-}
-
-div#current-widgets,
#postcustomstuff table,
#your-profile fieldset,
#rightnow,
#postcustomstuff table {
border-color: #dfdfdf;
- background-color: #F9F9F9;
+ background-color: #f9f9f9;
}
#postcustomstuff thead th {
- background-color: #F1F1F1;
+ background-color: #f1f1f1;
}
#postcustomstuff table input,
}
.widefat {
- border-color: #BBD8E7;
+ border-color: #dfdfdf;
background-color: #fff;
}
background-color: #cfe1ef;
}
-div.dashboard-widget-submit,
-ul.widget-control-list div.widget-control-actions {
+div.dashboard-widget-submit {
border-top-color: #ccc;
}
-div.ui-tabs-panel {
- border-color: #f1f1f1;
+div.tabs-panel,
+ul#category-tabs li.tabs {
+ border-color: #dfdfdf;
}
-ul#category-tabs li.ui-tabs-selected {
+ul#category-tabs li.tabs {
background-color: #f1f1f1;
}
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,
#plugin-information .action-button a,
#plugin-information .action-button a:hover,
color: #fff;
}
-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/blue-grad.png") repeat-x left top;
+.widget .widget-top,
+.postbox h3,
+.stuffbox h3 {
+ background: #d5e6f2 url("../images/blue-grad.png") repeat-x left top;
text-shadow: #fff 0 1px 0;
}
text-shadow: #fff 0 1px 0;
}
-.setting-description, .form-wrap p {
+.description,
+.form-wrap p {
color: #666;
}
-select {
- background-color: #fff;
- border-color: #8CBDD5;
-}
-
strong .post-com-count span {
background-color: #21759b;
}
-ul#widget-list li.widget-list-item h4.widget-title {
- background-color: #f0f0f0;
- color: #000;
-}
-
.sorthelper {
background-color: #ccf3fa;
}
-.ac_match, .subsubsub a.current {
+.ac_match,
+.subsubsub a.current {
color: #000;
}
.wrap h2 {
- color: #093E56;
+ color: #093e56;
}
.ac_over {
color: #101010;
}
-.alternate, .alt {
- background-color: #EDFBFC;
+.alt
+.alternate {
+ background-color: #edfbfc;
}
.available-theme a.screenshot {
#media-upload {
background: #fff;
}
+
#media-upload .slidetoggle {
border-top-color: #dfdfdf;
}
-.error, #login #login_error {
+.error,
+#login #login_error {
background-color: #ffebe8;
border-color: #c00;
}
border-color: #c00 !important;
}
-.form-table input,
-.form-table textarea,
-.search-input,
-.form-field input,
-.form-field textarea,
.submit {
- border-color: #8CBDD5;
+ border-color: #8cbdd5;
}
.highlight {
border-bottom-color: #dadada;
}
-.side-info ul, .widget-description {
+.side-info ul {
color: #666;
}
.submit input,
input[type=button],
input[type=submit] {
- border-color: #8CBDD5;
- color: #093E56;
+ border-color: #dfdfdf;
+ color: #464646;
}
.button:hover,
input[type=button]:hover,
input[type=submit]:hover {
color: #000;
- border-color: #21759B;
+ border-color: #adaca7;
}
.button,
.button-primary,
.submit .button-primary,
#login form .submit input {
- border-color: #298cba !important;
+ border-color: #5b86ab !important;
font-weight: bold;
- color: #FFF !important;
- background: #21759B url(../images/button-grad.png) repeat-x scroll left top;
+ color: #fff !important;
+ background: #5580a6 url(../images/button-grad-vs.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;
+ background: #21759b url(../images/button-grad-active-vs.png) repeat-x scroll left top !important;
}
.button[disabled],
.button-primary[disabled],
.button-primary:disabled {
- color: #2fa0d5 !important;
+ color: #80a3d2 !important;
}
a:active,
#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 {
+div.dashboard-widget-submit input:hover,
+.subsubsub a:hover,
+.subsubsub a.current:hover,
+.ui-tabs-nav a:hover,
+.plugins .inactive a:hover,
+#all-plugins-table .plugins .inactive a:hover,
+#search-plugins-table .plugins .inactive a:hover {
color: #d54e21;
}
border-color: #dfdfdf;
}
+#dashboard_right_now .table {
+ background:#faf9f7 !important;
+}
+
.button-primary:hover,
#login form .submit input:hover {
- border-color: #13455b !important;
- color: #EAF2FA !important;
+ border-color: #2e5475 !important;
+ color: #eaf2fa !important;
}
-#side-info-column #category-tabs .ui-tabs-selected a {
+#side-sortables #category-tabs .tabs a {
color: #333;
}
color: #ccc;
}
-.submitbox .submitdelete, a.delete {
+.plugins a.delete:hover,
+#all-plugins-table .plugins a.delete:hover,
+#search-plugins-table .plugins a.delete:hover,
+.submitbox .submitdelete,
+a.delete {
color: #f00;
border-bottom-color: #f00;
}
.submitbox .submitdelete:hover,
-#media-upload a.delete:hover {
+#media-items a.delete:hover {
color: #fff;
background-color: #f00;
border-bottom-color: #f00;
border-color: #e6db55;
}
+.update-message {
+ color: #000000;
+}
+
a.page-numbers {
- border-bottom-color: #B8D3E2;
+ border-bottom-color: #b8d3e2;
}
-div#available-widgets-filter,
-ul#widget-list li.widget-list-item,
.commentlist li {
border-bottom-color: #ccc;
}
.widefat td,
-.widefat th {
- border-bottom-color: #BBD8E7;
+.widefat th,
+#install-plugins .plugins td,
+#install-plugins .plugins th {
+ border-color: #dfdfdf;
}
.widefat th {
h3.dashboard-widget-title small,
.find-box-head {
color: #333;
- background: #dfdfdf url(../images/blue-grad.png) repeat-x scroll left top;
+ background: #d5e6f2 url(../images/blue-grad.png) repeat-x scroll left top;
}
h3.dashboard-widget-title small a {
color: #fff;
}
+a,
#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;
+#media-items a.delete,
+.plugins a.delete,
+.ui-tabs-nav a {
+ color: #1c6280;
}
/* Because we don't want visited on these links */
-body.press-this .ui-tabs-selected a,
-body.press-this .ui-tabs-selected a:hover {
+body.press-this .tabs a,
+body.press-this .tabs a:hover {
background-color: #fff;
border-color: #c6d9e9;
border-bottom-color: #fff;
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;
+ -moz-box-shadow: rgba(0,0,0,0.2) 0 -1px 0;
+ -khtml-box-shadow: rgba(0,0,0,0.2) 0 -1px 0;
+ -webkit-box-shadow: rgba(0,0,0,0.2) 0 -1px 0;
+ box-shadow: rgba(0,0,0,0.2) 0 -1px 0;
}
#adminmenu li.current a:hover #awaiting-mod,
color: #fff;
}
-div#media-upload-header {
+div#media-upload-header,
+div#plugin-information-header {
background-color: #f9f9f9;
border-bottom-color: #dfdfdf;
}
-div#plugin-information-header {
- background-color: #e4f2fd;
- border-bottom-color: #c6d9e9;
-}
-
#currenttheme img {
border-color: #666;
}
-#current-widgets .drop-widget-here {
- background-color: #ffc;
-}
-
#dashboard_secondary div.dashboard-widget-content ul li a {
background-color: #f9f9f9;
}
background-color: #ddd;
}
-#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,
#ed_reply_toolbar input {
background: #fff url("../images/fade-butt.png") repeat-x 0 -2px;
#footer,
#footer-upgrade {
- background: #073447;
- color: #999;
+ background: #1d507d;
+ color: #b6d1e4;
}
#media-items {
border-color: #dfdfdf;
}
-#pass-strength-result {
- background-color: #eee;
- border-color: #ddd !important;
-}
-
-#pass-strength-result.bad {
- background-color: #ffb78c;
- border-color: #ff853c !important;
-}
-
-#pass-strength-result.good {
- background-color: #ffec8b;
- border-color: #fc0 !important;
-}
-
-#pass-strength-result.short {
- background-color: #ffa0a0;
- border-color: #f04040 !important;
-}
-
-#pass-strength-result.strong {
- background-color: #c3ff88;
- border-color: #8dff1c !important;
-}
-
.checkbox,
.side-info,
+.plugins tr,
+.postbox,
#your-profile #rich_editing {
background-color: #fff;
}
+.plugins .inactive,
+.plugins .inactive th,
+.plugins .inactive td,
+tr.inactive + tr.plugin-update-tr .plugin-update {
+ background-color: #ebeeef;
+}
+
+.plugin-update-tr .update-message {
+ background-color: #fffbe4;
+ border-color: #dfdfdf;
+}
+
.plugins .active,
.plugins .active th,
.plugins .active td {
- background-color: #e7f7d3;
+ color: #000;
+}
+
+.plugins .inactive a {
+ color: #557799;
}
#the-comment-list .unapproved,
color: #bc0b0b;
}
-.plugins tr {
- background-color: #fff;
-}
-
-.metabox-holder .postbox,
-#poststuff .postbox,
+.widget,
+#widget-list .widget-top,
+.postbox,
#titlediv,
#poststuff .postarea,
-#poststuff .stuffbox,
-.postbox input[type="text"],
-.postbox textarea,
-.stuffbox input[type="text"],
-.stuffbox textarea {
- border-color: #BBD8E7;
+.stuffbox {
+ border-color: #dfdfdf;
}
-.metabox-holder .postbox,
-#poststuff .postbox {
- background-color: #FFF;
+.widget,
+.postbox {
+ background-color: #fff;
}
.ui-sortable .postbox h3 {
- color: #093E56;
+ color: #093e56;
}
+.widget .widget-top,
.ui-sortable .postbox h3:hover {
color: #000;
}
color: #448abd;
}
-#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;
}
-#update-nag, .plugin-update {
+#update-nag {
background-color: #fffeeb;
- border-bottom-color: #ccc;
- border-top-color: #ccc;
+ border-color: #ccc;
color: #555;
}
}
#wphead {
- background-color: #073447;
+ background-color: #1d507d;
}
body.login {
- border-top-color: #093E56;
+ border-top-color: #093e56;
}
#wphead h1 a {
color: #555;
}
-#wphead h1 a:hover {
- text-decoration: underline;
-}
-
#user_info {
- color: #999;
-}
-
-#user_info a:link, #user_info a:visited, #footer a:link, #footer a:visited {
- color: #ccc;
- text-decoration: none;
+ color: #b6d1e4;
}
-#user_info a:hover, #footer a:hover {
+#user_info a:link,
+#user_info a:visited,
+#footer a:link,
+#footer a:visited {
color: #fff;
- text-decoration: underline !important;
+ text-decoration: none;
}
-#user_info a:active, #footer a:active {
- color: #ccc !important;
+#user_info a:hover,
+#user_info a:active,
+#footer a:hover,
+#footer a:active {
+ text-decoration: underline;
}
div#media-upload-error,
color: #f00;
}
-#media-upload a.delete {
- color: #888;
+/* password strength meter */
+#pass-strength-result {
+ background-color: #eee;
+ border-color: #ddd !important;
+}
+
+#pass-strength-result.bad {
+ background-color: #ffb78c;
+ border-color: #ff853c !important;
+}
+
+#pass-strength-result.good {
+ background-color: #ffec8b;
+ border-color: #fc0 !important;
+}
+
+#pass-strength-result.short {
+ background-color: #ffa0a0;
+ border-color: #f04040 !important;
+}
+
+#pass-strength-result.strong {
+ background-color: #c3ff88;
+ border-color: #8dff1c !important;
}
/* editors */
}
#ed_toolbar input {
- border-color: #C3C3C3;
+ border-color: #c3c3c3;
}
#ed_toolbar input:hover {
}
#poststuff .wp_themeSkin .mceStatusbar {
- border-color: #EDEDED;
+ border-color: #ededed;
}
#poststuff #edButtonPreview,
#poststuff #edButtonHTML {
- background-color: #f1f1f1;
+ background-color: #f2f1eb;
border-color: #dfdfdf;
color: #999;
}
#poststuff #editor-toolbar .active {
- border-bottom-color: #e9e9e9;
- background-color: #e9e9e9;
+ border-bottom-color: #e3eef7;
+ background-color: #e3eef7;
color: #333;
}
/* TinyMCE */
#post-status-info {
- background-color: #EDEDED;
+ background-color: #ededed;
}
.wp_themeSkin *,
.wp_themeSkin a:link,
.wp_themeSkin a:visited,
.wp_themeSkin a:active {
- color: #000;
+ color: #000;
}
/* Containers */
/* Button */
.wp_themeSkin .mceButton {
background-color: #e9e8e8;
- border-color: #B2B2B2;
+ border-color: #b2b2b2;
}
.wp_themeSkin a.mceButtonEnabled:hover,
/* ListBox */
.wp_themeSkin .mceListBox .mceText,
.wp_themeSkin .mceListBox .mceOpen {
- border-color: #B2B2B2;
+ border-color: #b2b2b2;
background-color: #d5d5d5;
}
}
.wp_themeSkin select.mceListBox {
- border-color: #B2B2B2;
+ border-color: #b2b2b2;
background-color: #fff;
}
/* SplitButton */
.wp_themeSkin .mceSplitButton a.mceAction,
.wp_themeSkin .mceSplitButton a.mceOpen {
- background-color: #e8e8e8;
- border-color: #B2B2B2;
+ border-color: #b2b2b2;
}
.wp_themeSkin .mceSplitButton a.mceOpen:hover,
}
.wp_themeSkin .mceSplitButtonActive {
- background-color: #B2B2B2;
+ background-color: #b2b2b2;
}
/* ColorSplitButton */
.wp_themeSkin div.mceColorSplitMenu table {
background-color: #ebebeb;
- border-color: #B2B2B2;
+ border-color: #b2b2b2;
}
.wp_themeSkin .mceColorSplitMenu a {
- border-color: #B2B2B2;
+ border-color: #b2b2b2;
}
.wp_themeSkin .mceColorSplitMenu a.mceMoreColors {
}
.wp_themeSkin .mceColorSplitMenu a.mceMoreColors:hover {
- border-color: #0A246A;
- background-color: #B6BDD2;
+ border-color: #0a246a;
+ background-color: #b6bdd2;
}
.wp_themeSkin a.mceMoreColors:hover {
- border-color: #0A246A;
+ border-color: #0a246a;
}
/* Menu */
color: #888;
}
+#quicktags,
+.wp_themeSkin tr.mceFirst td.mceToolbar {
+ background: #e3eef7 url("../images/ed-bg-vs.gif") repeat-x scroll left top;
+}
.wp_themeSkin tr.mceFirst td.mceToolbar {
- background-color: #dfdfdf;
border-color: #dfdfdf;
}
}
.wp-admin .clearlooks2 .mceFocus .mceTop .mceLeft {
- background: #444444;
+ background: #444;
border-left: 1px solid #999;
border-top: 1px solid #999;
-moz-border-radius: 4px 0 0 0;
}
.wp-admin .clearlooks2 .mceFocus .mceTop .mceRight {
- background: #444444;
+ background: #444;
border-right: 1px solid #999;
border-top: 1px solid #999;
border-top-right-radius: 4px;
#editorcontainer,
#post-status-info,
-#titlediv #title {
+#titlediv #title,
+.editwidget .widget-inside {
border-color: #dfdfdf;
}
#timestampdiv input,
#namediv input,
-#tagsdiv #the-tagcloud {
- border-color: #ddd;
+#poststuff .inside .the-tagcloud {
+ border-color: #dfdfdf;
}
/* menu */
#adminmenu * {
- border-color: #BBD8E7;
+ border-color: #dfdfdf;
}
#adminmenu li.wp-menu-separator {
#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;
+ background: transparent url(../images/menu-bits-vs.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;
+ background: transparent url(../images/menu-bits-vs.gif) no-repeat scroll left -109px;
}
#adminmenu a.menu-top {
- background: #EAF3FA url(../images/menu-bits.gif) repeat-x scroll left -379px;
+ background: #eaf3fa url(../images/menu-bits-vs.gif) repeat-x scroll left -379px;
}
#adminmenu .wp-submenu a {
- background: #FFFFFF url(../images/menu-bits.gif) no-repeat scroll 0 -310px;
+ background: #fff url(../images/menu-bits-vs.gif) no-repeat scroll 0 -310px;
}
#adminmenu .wp-has-current-submenu ul li a {
#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;
+ background: #3c6b95 url(../images/menu-bits-vs.gif) top left repeat-x;
+ border-color: #1d507d;
color: #fff;
- text-shadow: rgba(0,0,0,0.4) 0px -1px 0px;
+ text-shadow: rgba(0,0,0,0.4) 0 -1px 0;
}
#adminmenu li.wp-has-current-submenu .wp-submenu,
}
#adminmenu li.menu-top .current:hover {
- border-color: #B5B5B5;
+ border-color: #6583c0;
}
#adminmenu .wp-submenu .current a.current {
- background: transparent url(../images/menu-bits.gif) no-repeat scroll 0 -289px;
+ background: transparent url(../images/menu-bits-vs.gif) no-repeat scroll 0 -289px;
}
#adminmenu .wp-submenu a:hover {
- background-color: #EAF2FA !important;
+ background-color: #eaf2fa !important;
color: #333 !important;
}
background-color: #f5f5f5;
background-image: none;
border-color: #e3e3e3;
- text-shadow: rgba(255,255,255,1) 0px 1px 0px;
+ text-shadow: rgba(255,255,255,1) 0 1px 0;
}
#adminmenu .wp-submenu ul {
.folded #adminmenu li.menu-top,
#adminmenu .wp-submenu .wp-submenu-head {
- background-color: #EAF2FA;
+ background-color: #eaf2fa;
}
.folded #adminmenu li.wp-has-current-submenu,
.folded #adminmenu li.menu-top.current {
- background-color: #BBD8E7;
+ background-color: #bbd8e7;
}
#adminmenu .wp-has-current-submenu .wp-submenu .wp-submenu-head {
- background-color: #BBD8E7;
- border-color: #8CBDD5;
+ background-color: #bbd8e7;
+ border-color: #8cbdd5;
}
#adminmenu div.wp-submenu {
/* Diff */
table.diff .diff-deletedline {
- background-color: #ffdddd;
+ background-color: #fdd;
}
+
table.diff .diff-deletedline del {
- background-color: #ff9999;
+ background-color: #f99;
}
+
table.diff .diff-addedline {
- background-color: #ddffdd;
+ background-color: #dfd;
}
+
table.diff .diff-addedline ins {
- background-color: #99ff99;
+ background-color: #9f9;
}
#att-info {
- background-color: #E4F2FD;
+ background-color: #e4f2fd;
}
/* edit image */
#sidemenu a.current {
background-color: #fff;
border-color: #dfdfdf #dfdfdf #fff;
- color: #D54E21;
+ color: #d54e21;
}
-
#screen-options-wrap,
#contextual-help-wrap {
- background-color: #f1f1f1;
+ background-color: #eae9e4;
border-color: #dfdfdf;
}
}
/* table vim shortcuts */
-.vim-current {
- background-color: #E4F2FD !important;
+.vim-current,
+.vim-current th,
+.vim-current td {
+ background-color: #e4f2fd !important;
}
/* Install Plugins */
}
.inline-editor div.title {
- background-color: #EAF3FA;
+ background-color: #eaf3fa;
}
.inline-editor ul.cat-checklist {
- background-color: #FFFFFF;
+ background-color: #fff;
border-color: #ddd;
}
-.inline-edit-row p.submit {
- background-color: #f1f1f1;
-}
-
.inline-editor .categories .catshow,
.inline-editor .categories .cathide {
color: #21759b;
}
.attention {
- color: #D54E21;
+ color: #d54e21;
}
.meta-box-sortables .postbox:hover .handlediv {
- background: transparent url(../images/menu-bits.gif) no-repeat scroll left -111px;
+ background: transparent url(../images/menu-bits-vs.gif) no-repeat scroll left -111px;
}
#major-publishing-actions {
.tablenav .tablenav-pages a {
border-color: #e3e3e3;
- background: #eee url('../images/menu-bits.gif') repeat-x scroll left -379px;
+ background: #eee url('../images/menu-bits-vs.gif') repeat-x scroll left -379px;
}
.tablenav .tablenav-pages a:hover {
background-color: #f5f5f5;
}
-#post-body ul#category-tabs li.ui-tabs-selected a {
+#post-body ul#category-tabs li.tabs a {
color: #333;
}
}
#favorite-first {
- background: #797979 url(../images/fav.png) repeat-x 0 center;
- border-color: #777 !important;
- border-bottom-color: #666 !important;
+ background: #5580a6 url(../images/fav-vs.png) repeat-x 0 center;
+ border-color: #517ea5 !important;
+ border-bottom-color: #416686 !important;
+}
+
+#favorite-actions .slide-down {
+ background-image: url(../images/fav-top-vs.gif);
+ background-position:0 0;
+ background-repeat: repeat-x;
}
#favorite-inside {
- border-color: #797979;
- background-color: #797979;
+ border-color: #5b86ac;
+ background-color: #5580a6;
}
#favorite-toggle {
- background: transparent url(../images/fav-arrow.gif) no-repeat 0 -4px;
+ background: transparent url(../images/fav-arrow-vs.gif) no-repeat 0 -4px;
}
#favorite-actions a {
}
#icon-users,
+#icon-profile,
#icon-user-edit {
background: transparent url(../images/icons32-vs.png) no-repeat -600px -5px;
}
}
#header-logo {
- background: transparent url(../images/wp-logo.gif) no-repeat scroll center center;
+ background: transparent url(../images/wp-logo-vs.gif) no-repeat scroll center center;
+}
+
+#wphead #site-visit-button {
+ background-color: #3c6b95;
+ background-image: url(../images/visit-site-button-grad-vs.gif);
+ color: #b6d1e4;
+ text-shadow: #3f3f3f 0 -1px 0;
+}
+
+#wphead a:hover #site-visit-button {
+ color: #fff;
+}
+
+#wphead a:focus #site-visit-button,
+#wphead a:active #site-visit-button {
+ background-position: 0 -27px;
+}
+
+.popular-tags,
+.feature-filter {
+ background-color: #fff;
+ border-color: #dfdfdf;
+}
+
+#theme-information .action-button {
+ border-top-color: #dfdfdf;
+}
+
+.theme-listing br.line {
+ border-bottom-color: #ccc;
+}
+
+div.widgets-sortables,
+#widgets-left .inactive {
+ background-color: #f1f1f1;
+ border-color: #ddd;
+}
+
+#available-widgets .widget-holder {
+ background-color: #fff;
+ border-color: #ddd;
+}
+
+#widgets-left .sidebar-name {
+ background-color: #aaa;
+ background-image: url(../images/ed-bg-vs.gif);
+ text-shadow: #FFFFFF 0 1px 0;
+ border-color: #dfdfdf;
+}
+
+#widgets-right .sidebar-name {
+ background-image: url(../images/fav-vs.png);
+ text-shadow: #3f3f3f 0 -1px 0;
+ background-color: #636363;
+ border-color: #636363;
+ color: #fff;
+}
+
+.sidebar-name:hover,
+#removing-widget {
+ color: #d54e21;
+}
+
+#removing-widget span {
+ color: black;
+}
+
+#widgets-left .sidebar-name-arrow {
+ background: transparent url(../images/menu-bits-vs.gif) no-repeat scroll left -109px;
+}
+
+#widgets-right .sidebar-name-arrow {
+ background: transparent url(../images/fav-arrow-vs.gif) no-repeat scroll 0 -1px;
+}
+
+.in-widget-title {
+ color: #606060;
+}
+
+.deleting .widget-title * {
+ color: #aaa;
}
background-color: #f9f9f9;
}
+* html input,
+* html .widget {
+ border-color: #dfdfdf;
+}
+
+textarea,
+input,
+select {
+ border-color: #DFDFDF;
+}
+
+kbd,
+code {
+ background: #eaeaea;
+}
+
+input[readonly] {
+ background-color: #eee;
+}
+
.find-box-search {
border-color: #dfdfdf;
background-color: #f1f1f1;
border-bottom-color: #fff;
}
-kbd, code {
- background: #eaeaea;
-}
-
-div#current-widgets,
#postcustomstuff table,
#your-profile fieldset,
#rightnow,
background-color: #cfe1ef;
}
-div.dashboard-widget-submit,
-ul.widget-control-list div.widget-control-actions {
+div.dashboard-widget-submit {
border-top-color: #ccc;
}
-div.ui-tabs-panel {
- border-color: #f1f1f1;
+div.tabs-panel,
+ul#category-tabs li.tabs {
+ border-color: #dfdfdf;
}
-ul#category-tabs li.ui-tabs-selected {
+ul#category-tabs li.tabs {
background-color: #f1f1f1;
}
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,
#plugin-information .action-button a,
#plugin-information .action-button a:hover,
color: #fff;
}
-li.widget-list-control-item div.widget-control {
- background-color: #fff;
- border-color: #dfdfdf;
-}
-
-.metabox-holder .postbox h3,
-#poststuff .postbox h3,
-#poststuff .stuffbox h3 {
+.widget .widget-top,
+.postbox h3,
+.stuffbox h3 {
background: #dfdfdf url("../images/gray-grad.png") repeat-x left top;
text-shadow: #fff 0 1px 0;
}
text-shadow: #fff 0 1px 0;
}
-.setting-description, .form-wrap p {
+.description,
+.form-wrap p {
color: #666;
}
-select {
- background-color: #fff;
- border-color: #ddd;
-}
-
strong .post-com-count span {
background-color: #21759b;
}
-ul#widget-list li.widget-list-item h4.widget-title {
- background-color: #f0f0f0;
- color: #000;
-}
-
.sorthelper {
background-color: #ccf3fa;
}
-.ac_match, .subsubsub a.current {
+.ac_match,
+.subsubsub a.current {
color: #000;
}
color: #101010;
}
-.alternate, .alt {
+.alternate,
+.alt {
background-color: #f9f9f9;
}
#media-upload {
background: #fff;
}
+
#media-upload .slidetoggle {
border-top-color: #dfdfdf;
}
-.error, #login #login_error {
+.error,
+#login #login_error {
background-color: #ffebe8;
border-color: #c00;
}
border-color: #c00 !important;
}
-.form-table input,
-.form-table textarea,
-.search-input,
-.form-field input,
-.form-field textarea,
.submit {
border-color: #DFDFDF;
}
border-bottom-color: #dadada;
}
-.side-info ul, .widget-description {
+.side-info ul {
color: #666;
}
#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 {
+div.dashboard-widget-submit input:hover,
+.subsubsub a:hover,
+.subsubsub a.current:hover,
+.ui-tabs-nav a:hover,
+.plugins .inactive a:hover,
+#all-plugins-table .plugins .inactive a:hover,
+#search-plugins-table .plugins .inactive a:hover {
color: #d54e21;
}
color: #EAF2FA !important;
}
-#side-info-column #category-tabs .ui-tabs-selected a {
+#side-sortables #category-tabs .tabs a {
color: #333;
}
color: #ccc;
}
-.submitbox .submitdelete, a.delete {
+.plugins a.delete:hover,
+#all-plugins-table .plugins a.delete:hover,
+#search-plugins-table .plugins a.delete:hover,
+.submitbox .submitdelete,
+a.delete {
color: #f00;
border-bottom-color: #f00;
}
.submitbox .submitdelete:hover,
-#media-upload a.delete:hover {
+#media-items a.delete:hover {
color: #fff;
background-color: #f00;
border-bottom-color: #f00;
border-color: #e6db55;
}
+.update-message {
+ color: #000000;
+}
+
a.page-numbers {
border-bottom-color: #B8D3E2;
}
-div#available-widgets-filter,
-ul#widget-list li.widget-list-item,
.commentlist li {
border-bottom-color: #ccc;
}
.widefat td,
-.widefat th {
+.widefat th,
+#install-plugins .plugins td,
+#install-plugins .plugins th {
border-color: #dfdfdf;
}
color: #fff;
}
+a,
#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 {
+#media-items a.delete,
+.plugins a.delete,
+.ui-tabs-nav a {
color: #21759b;
}
/* Because we don't want visited on these links */
-body.press-this .ui-tabs-selected a,
-body.press-this .ui-tabs-selected a:hover {
+body.press-this .tabs a,
+body.press-this .tabs a:hover {
background-color: #fff;
border-color: #c6d9e9;
border-bottom-color: #fff;
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;
+ -moz-box-shadow: rgba(0,0,0,0.2) 0 -1px 0;
+ -khtml-box-shadow: rgba(0,0,0,0.2) 0 -1px 0;
+ -webkit-box-shadow: rgba(0,0,0,0.2) 0 -1px 0;
+ box-shadow: rgba(0,0,0,0.2) 0 -1px 0;
}
#adminmenu li.current a:hover #awaiting-mod,
color: #fff;
}
-div#media-upload-header {
+div#media-upload-header,
+div#plugin-information-header {
background-color: #f9f9f9;
border-bottom-color: #dfdfdf;
}
-div#plugin-information-header {
- background-color: #e4f2fd;
- border-bottom-color: #c6d9e9;
-}
-
#currenttheme img {
border-color: #666;
}
-#current-widgets .drop-widget-here {
- background-color: #ffc;
-}
-
#dashboard_secondary div.dashboard-widget-content ul li a {
background-color: #f9f9f9;
}
background-color: #ddd;
}
-#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,
#ed_reply_toolbar input {
background: #fff url("../images/fade-butt.png") repeat-x 0 -2px;
border-color: #dfdfdf;
}
-#pass-strength-result {
- background-color: #eee;
- border-color: #ddd !important;
-}
-
-#pass-strength-result.bad {
- background-color: #ffb78c;
- border-color: #ff853c !important;
-}
-
-#pass-strength-result.good {
- background-color: #ffec8b;
- border-color: #fc0 !important;
-}
-
-#pass-strength-result.short {
- background-color: #ffa0a0;
- border-color: #f04040 !important;
-}
-
-#pass-strength-result.strong {
- background-color: #c3ff88;
- border-color: #8dff1c !important;
-}
-
.checkbox,
.side-info,
+.plugins tr,
#your-profile #rich_editing {
background-color: #fff;
}
+.plugins .inactive,
+.plugins .inactive th,
+.plugins .inactive td,
+tr.inactive + tr.plugin-update-tr .plugin-update {
+ background-color: #eee;
+}
+
+.plugin-update-tr .update-message {
+ background-color: #fffbe4;
+ border-color: #dfdfdf;
+}
+
.plugins .active,
.plugins .active th,
.plugins .active td {
- background-color: #e7f7d3;
+ color: #000;
+}
+
+.plugins .inactive a {
+ color: #557799;
}
#the-comment-list .unapproved,
color: #bc0b0b;
}
-.plugins tr {
- background-color: #fff;
-}
-
-.metabox-holder .postbox,
-#poststuff .postbox,
+.widget,
+#widget-list .widget-top,
+.postbox,
#titlediv,
#poststuff .postarea,
-#poststuff .stuffbox,
-.postbox input[type="text"],
-.postbox textarea,
-.stuffbox input[type="text"],
-.stuffbox textarea {
+.stuffbox {
border-color: #dfdfdf;
}
-.metabox-holder .postbox,
-#poststuff .postbox {
- background-color: #FFF;
+.widget,
+.postbox {
+ background-color: #fff;
}
.ui-sortable .postbox h3 {
color: #464646;
}
+.widget .widget-top,
.ui-sortable .postbox h3:hover {
color: #000;
}
color: #448abd;
}
-#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;
}
-#update-nag, .plugin-update {
+#update-nag {
background-color: #fffeeb;
- border-bottom-color: #ccc;
- border-top-color: #ccc;
+ border-color: #ccc;
color: #555;
}
color: #555;
}
-#wphead h1 a:hover {
- text-decoration: underline;
-}
-
#user_info {
color: #999;
}
-#user_info a:link, #user_info a:visited, #footer a:link, #footer a:visited {
+#user_info a:link,
+#user_info a:visited,
+#footer a:link,
+#footer a:visited {
color: #ccc;
text-decoration: none;
}
-#user_info a:hover, #footer a:hover {
+#user_info a:hover,
+#footer a:hover {
color: #fff;
text-decoration: underline !important;
}
-#user_info a:active, #footer a:active {
+#user_info a:active,
+#footer a:active {
color: #ccc !important;
}
color: #f00;
}
-#media-upload a.delete {
- color: #888;
+#pass-strength-result {
+ background-color: #eee;
+ border-color: #ddd !important;
+}
+
+#pass-strength-result.bad {
+ background-color: #ffb78c;
+ border-color: #ff853c !important;
+}
+
+#pass-strength-result.good {
+ background-color: #ffec8b;
+ border-color: #fc0 !important;
+}
+
+#pass-strength-result.short {
+ background-color: #ffa0a0;
+ border-color: #f04040 !important;
+}
+
+#pass-strength-result.strong {
+ background-color: #c3ff88;
+ border-color: #8dff1c !important;
}
/* editors */
/* SplitButton */
.wp_themeSkin .mceSplitButton a.mceAction,
.wp_themeSkin .mceSplitButton a.mceOpen {
- background-color: #e8e8e8;
border-color: #B2B2B2;
}
}
.wp_themeSkin tr.mceFirst td.mceToolbar {
- background-color: #dfdfdf;
+ background: #dfdfdf url("../images/ed-bg.gif") repeat-x scroll left top;
border-color: #dfdfdf;
}
#editorcontainer,
#post-status-info,
-#titlediv #title {
+#titlediv #title,
+.editwidget .widget-inside {
border-color: #dfdfdf;
}
#timestampdiv input,
#namediv input,
-#tagsdiv #the-tagcloud {
+#poststuff .inside .the-tagcloud {
border-color: #ddd;
}
table.diff .diff-deletedline {
background-color: #ffdddd;
}
+
table.diff .diff-deletedline del {
background-color: #ff9999;
}
+
table.diff .diff-addedline {
background-color: #ddffdd;
}
+
table.diff .diff-addedline ins {
background-color: #99ff99;
}
color: #D54E21;
}
-
#screen-options-wrap,
#contextual-help-wrap {
background-color: #f1f1f1;
}
/* table vim shortcuts */
-.vim-current {
+.vim-current,
+.vim-current th,
+.vim-current td {
background-color: #E4F2FD !important;
}
border-color: #ddd;
}
-.inline-edit-row p.submit {
- background-color: #f1f1f1;
-}
-
.inline-editor .categories .catshow,
.inline-editor .categories .cathide {
color: #21759b;
background-color: #f5f5f5;
}
-#post-body ul#category-tabs li.ui-tabs-selected a {
+#post-body ul#category-tabs li.tabs a {
color: #333;
}
}
#icon-users,
+#icon-profile,
#icon-user-edit {
background: transparent url(../images/icons32.png) no-repeat -600px -5px;
}
#header-logo {
background: transparent url(../images/wp-logo.gif) no-repeat scroll center center;
}
+
+#wphead #site-visit-button {
+ background-color:#585858;
+ background-image: url(../images/visit-site-button-grad.gif);
+ color:#aaa;
+ text-shadow: #3F3F3F 0 -1px 0;
+}
+
+#wphead a:hover #site-visit-button {
+ color:#fff;
+}
+
+#wphead a:focus #site-visit-button,
+#wphead a:active #site-visit-button {
+ background-position:0 -27px;
+}
+
+.popular-tags,
+.feature-filter {
+ background-color: #FFFFFF;
+ border-color: #DFDFDF;
+}
+
+#theme-information .action-button {
+ border-top-color: #DFDFDF;
+}
+
+.theme-listing br.line {
+ border-bottom-color: #ccc;
+}
+
+div.widgets-sortables,
+#widgets-left .inactive {
+ background-color: #f1f1f1;
+ border-color: #ddd;
+}
+
+#available-widgets .widget-holder {
+ background-color: #fff;
+ border-color: #ddd;
+}
+
+#widgets-left .sidebar-name {
+ background-color: #aaa;
+ background-image: url(../images/ed-bg.gif);
+ text-shadow: #FFFFFF 0 1px 0;
+ border-color: #dfdfdf;
+}
+
+#widgets-right .sidebar-name {
+ background-image: url(../images/fav.png);
+ text-shadow: #3f3f3f 0 -1px 0;
+ background-color: #636363;
+ border-color: #636363;
+ color: #fff;
+}
+
+.sidebar-name:hover,
+#removing-widget {
+ color: #d54e21;
+}
+
+#removing-widget span {
+ color: black;
+}
+
+#widgets-left .sidebar-name-arrow {
+ background: transparent url(../images/menu-bits.gif) no-repeat scroll left -109px;
+}
+
+#widgets-right .sidebar-name-arrow {
+ background: transparent url(../images/fav-arrow.gif) no-repeat scroll 0 -1px;
+}
+
+.in-widget-title {
+ color: #606060;
+}
+
+.deleting .widget-title * {
+ color: #aaa;
+}
min-width: 0;
}
-#dashboard-widgets-wrap .has-sidebar {
- margin-right: -51%;
-}
-
-#dashboard-widgets-wrap .inner-sidebar {
- width: 49%;
-}
-
-#dashboard-widgets-wrap .has-sidebar .has-sidebar-content {
- margin-right: 51%;
-}
-
div.postbox div.inside {
margin: 10px;
position: relative;
}
#dashboard_right_now .waiting {
- color: orange;
+ color: #e66f00;
}
#dashboard_right_now .approved {
}
#the-comment-list .comment-item {
- padding: 1em 10px 1em 70px;
+ padding: 1em 10px;
border-top: 1px solid;
}
#the-comment-list .comment-item .avatar {
float: left;
- margin-left: -60px;
+ margin: 0 10px 5px 0;
}
#the-comment-list .comment-item h4 {
margin: 0 0 1.4em;
line-height: 1.4em;
}
+
+.dashboard-comment-wrap {
+ overflow: hidden;
+ word-wrap: break-word;
+}
+
-.farbtastic .color, .farbtastic .overlay {\r
- left: 0;\r
- right: 47px;\r
-}\r
-.farbtastic .marker {\r
- margin: -8px -8px 0 0;\r
-}\r
+.farbtastic .color, .farbtastic .overlay {
+ left: 0;
+ right: 47px;
+}
+.farbtastic .marker {
+ margin: -8px -8px 0 0;
+}
margin-right:-160px;
margin-left: 5px;
}
-div.folded #adminmenu {
+body.folded #adminmenu {
margin-left: 0;
margin-right: -45px;
}
float: left;
clear: left;
}
-.has-sidebar {
- float: right;
- clear: right;
- margin-right: 0;
- margin-left: -340px;
+
+.has-right-sidebar #post-body {
+ clear:right;
+ float:right;
+ margin-right:0;
+ margin-left:-340px;
}
-.has-sidebar .has-sidebar-content {
- margin-right: 0;
- margin-left: 305px;
+
+.has-right-sidebar #post-body-content {
+ margin-left: 300px;
+ margin-right:0;
}
+
#wpbody {
margin-left:0;
margin-right: 175px;
.updated, .error {
clear: both;
}
+
+.screen-reader-text, .screen-reader-text span {
+ left:auto;
+ right:-1000em;
+}
+}
\ No newline at end of file
}
/* inner 2 column liquid layout */
-
.inner-sidebar {
float: right;
clear: right;
- width: 280px;
+ display: none;
+ width: 281px;
position: relative;
}
-.has-sidebar {
+.inner-sidebar #side-sortables {
+ width: 280px;
+ min-height: 300px;
+}
+
+.has-right-sidebar .inner-sidebar {
+ display: block;
+}
+
+.has-right-sidebar #post-body {
float: left;
clear: left;
width: 100%;
margin-right: -340px;
}
-.has-sidebar .has-sidebar-content {
- margin-right: 305px;
+.has-right-sidebar #post-body-content {
+ margin-right: 300px;
}
/* 2 columns main area */
clear: both;
}
+/* Hide visually but not from screen readers */
+.screen-reader-text,
+.screen-reader-text span {
+ position: absolute;
+ left: -1000em;
+ height: 1px;
+ width: 1px;
+ overflow: hidden;
+}
+
.hidden,
-.closed .inside,
-.hide-if-no-js {
+.js .closed .inside,
+.js .hide-if-js,
+.no-js .hide-if-no-js {
display: none;
}
/* include margin and padding in the width calculation of input and textarea */
input[type="text"],
+input[type="password"],
textarea {
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
input[type="checkbox"],
input[type="radio"] {
- vertical-align: text-top;
+ vertical-align: middle;
}
/* styles for use by people extending the WordPress interface */
}
body,
-td {
- font: 13px "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif;
+td,
+textarea,
+input,
+select {
+ font-family: "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif;
+ font-size: 13px;
+}
+
+body,
+textarea {
+ line-height: 1.4em;
+}
+
+input,
+select {
+ line-height: 1em;
}
p {
textarea,
input,
select {
- font: 13px/19px "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif;
margin: 1px;
padding: 3px;
}
h4 {
display: block;
+ font-size: 1em;
font-weight: bold;
margin: 1.33em 0;
}
margin: 2.33em 0;
}
+ul.ul-disc {
+ list-style: disc outside;
+}
+
+ul.ul-square {
+ list-style: square outside;
+}
+
+ol.ol-decimal {
+ list-style: decimal outside;
+}
+
+ul.ul-disc,
+ul.ul-square,
+ol.ol-decimal {
+ margin-left: 1.8em;
+}
+
+ul.ul-disc > li,
+ul.ul-square > li,
+ol.ol-decimal > li {
+ margin: 0 0 0.5em;
+}
+
.subsubsub {
list-style: none;
margin: 8px 0 5px;
}
.widefat td {
- padding: 7px 7px 5px;
+ padding: 3px 7px;
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 {
+.widefat td p,
+.widefat td ol,
+.widefat td ul {
font-size: 11px;
}
.wrap .updated,
.wrap .error {
- margin: 5px 0;
+ margin: 5px 0 15px;
}
.wrap h2 {
padding-right: 0;
padding-left: 1px;
}
-#tagchecklist span a {
+.tagchecklist span a {
margin: 4px -9px 0 0;
}
.widefat th input {
}
#minor-publishing-actions input,
-#major-publishing-actions input,
-#minor-publishing-actions .preview {
+#major-publishing-actions input {
min-width: auto;
padding-left: 0;
padding-right: 0;
margin-bottom: -1px;
}
-* html #side-info-column {
- height: auto;
+* html .inner-sidebar #side-sortables,
+* html .postbox-container .meta-box-sortables {
+ height: 300px;
}
* html #wpbody-content #screen-options-link-wrap {
text-align: center;
}
-/*
-* html body.minwidth {
- _width: expression(document.documentElement.clientWidth < 810 ? "808px" : "99.9%");
-}
-
-* html #wpbody {
- _width: expression(document.documentElement.clientWidth > 982 ? "980px" : "99.9%");
-}
-*/
-
* html #adminmenu {
margin-left: -80px;
}
-* html div.folded #adminmenu {
+* html .folded #adminmenu {
margin-left: -22px;
}
margin: 0;
}
-#wpcontent.folded #adminmenu li.menu-top {
+* html #footer {
+ margin: 0;
+}
+
+.folded #adminmenu li.menu-top {
display: block;
+ zoom: 100%;
}
ul#adminmenu {
zoom: 100%;
}
-#wpcontent.folded #adminmenu li.wp-menu-separator {
+.folded #adminmenu li.wp-menu-separator {
width: 28px;
}
zoom: 100%;
}
-#wpcontent.folded #adminmenu .menu-top {
+.folded #adminmenu .menu-top {
height: 30px;
}
#template,
#template div,
#editcat,
-#addcat {
+#addcat,
+* html .stuffbox h3 {
zoom: 100%;
}
line-height: 20px;
}
-#the-comment-list .comment-item,
-ul#widget-list li.widget-list-item {
- zoom: 100%;
-}
-
#wphead-info {
float: right;
}
a.button {
line-height: 1.4em;
margin: 1px;
+ padding: 4px 6px;
}
-* html div.widget-liquid-left-holder,
+* html div.widget-liquid-left,
* html div.widget-liquid-right {
display: block;
position: relative;
zoom: 100%;
}
+#the-comment-list .comment-item,
#post-status-info,
#wpwrap,
#wpcontent,
-#post,
#wrap,
#postdivrich,
#postdiv,
#post-body,
#editorcontainer,
.tablenav,
-.widget-control-list,
-li.widget-list-control-item,
+.widget-liquid-left,
+.widget-liquid-right,
+#widgets-left,
+.widgets-sortables,
#dragHelper,
-li.widget-list-control-item h4,
-.widget-sortable,
+.widget .widget-top,
+.widget,
.widget-control-actions,
-#tagchecklist,
+.tagchecklist,
#col-container,
#col-left,
#col-right {
padding-right: 1px;
}
-#tagchecklist span, #tagchecklist span a {
+.tagchecklist span, .tagchecklist span a {
display: inline-block;
display: block;
}
-#tagchecklist span a {
+.tagchecklist span a {
margin: 4px 0 0 -9px;
}
display: inline-block;
padding: 2px 5px;
}
+
+* html .stuffbox,
+* html .stuffbox input,
+* html .stuffbox textarea {
+ border: 1px solid #DFDFDF;
+}
+
+* html .feature-filter .feature-group li {
+ width: 145px;
+}
+
+* html .widget-top .widget-title-action a {
+ background: url("../images/menu-bits.gif") no-repeat scroll 0 -110px;
+}
+
+* html div.widget-liquid-left {
+ width: 99%;
+}
+
+#wp_inactive_widgets {
+ padding-bottom: 8px;
+}
+
+* html .widgets-sortables {
+ height: 50px;
+}
+
+* html a#content_resize {
+ right: -2px;
+}
+
+* html .widget-title h4 {
+ width: 205px;
+}
+
+* html #removing-widget .in-widget-title {
+ display: none;
+}
+
+#available-widgets .widget-holder {
+ padding-bottom: 65px;
+}
+
+#widgets-left .inactive {
+ padding-bottom: 10px;
+}
+
+.widget-liquid-right .widget,
+#wp_inactive_widgets .widget {
+ position: relative;
+}
+
border: 1px solid #e5e5e5;
background: #fbfbfb;
}
+
+.clear {
+ clear: both;
+}
max-height: 40px;
}
-.filename.original {
- float: left;
-}
-
-.crunching {
- display: block;
- line-height: 32px;
- text-align: right;
- margin-right: 5px;
-}
-
-button.dismiss {
- position: absolute;
- top: 7px;
- right: 5px;
- z-index: 4;
- width: 8em;
-}
-
-.file-error {
- float: left;
- font-weight: bold;
- padding: 10px;
-}
-
-.progress {
- position: absolute;
- top: 0;
- left: 0;
- width: 623px;
- height: 36px;
-}
-
-.bar {
- width: 0;
- height: 100%;
- border-right-width: 3px;
- border-right-style: solid;
-}
-
#library-form .progress,
#gallery-form .progress,
#flash-upload-ui,
margin: 0 1em 1em 0;
}
-#media-upload .media-upload-form p.ml-submit {
+#media-upload p.ml-submit {
padding: 1em 0;
}
}
#media-upload .media-item {
- position: relative;
border-bottom-width: 1px;
border-bottom-style: solid;
min-height: 36px;
}
.filename {
- float: left;
line-height: 36px;
- margin-left: 10px;
+ padding: 0 10px;
overflow: hidden;
- max-width: 430px;
}
#media-upload .describe {
width: auto;
}
-#media-upload a.delete,
-#media-upload a.del-link {
- padding: 0 3px 1px;
-}
-
#media-upload .del-attachment {
display: none;
margin: 5px 0;
}
.sorthelper {
- z-index: -1;
+ height: 37px;
+ width: 623px;
+ display: block;
}
#gallery-settings th.label {
#gallery-settings select#columns {
width: 6em;
}
+
+#sort-buttons {
+ font-size: 0.8em;
+ margin: 3px 25px -8px 0;
+ text-align: right;
+ max-width: 625px;
+}
+
+#sort-buttons a {
+ text-decoration: none;
+}
+
+#sort-buttons #asc,
+#sort-buttons #showall {
+ padding-left: 5px;
+}
+
+#sort-buttons span {
+ margin-right: 25px;
+}
}
#plugin-information .fyi {
- margin-left: 10px;
- margin-bottom: 50px;
+ margin: 0 10px 50px;
width: 210px;
}
#plugin-information pre {
padding: 7px;
-}
\ No newline at end of file
+}
body {
font-family: Tahoma, Arial;
}
+
#poststuff #edButtonPreview,
#poststuff #edButtonHTML {
- margin: 0px 0 0 5px;
+ margin: 0 0 0 5px;
float: right;
}
+
/* Editor/Main Column */
div#poststuff {
padding-left: 0;
padding-right: 10px;
}
+
.posting {
margin-right: 0;
margin-left: 228px;
- left:auto;
+ left: auto;
right: 0;
}
+
#side-info-column {
float: left;
right: auto;
margin-right: 0;
margin-left: 10px;
}
+
#side-info-column .sleeve {
padding-left: 0;
padding-right: 10px;
}
+
h3.tb {
margin-left: 0;
margin-right: 5px;
}
+
#actions {
float: left;
}
+
#extra_fields #actions {
right: auto;
left: 4px;
}
+
#actions li {
float: right;
margin-right: 0;
margin-left: 10px;
}
+
#extra_fields .button {
margin-right: 0;
margin-left: 5px;
}
+
/* Photo Styles */
#img_container a {
float: right;
}
+
#category-add input, #category-add select {
font-family: Tahoma, Arial;
}
+
#categorydiv ul.categorychecklist ul {
margin-left: 0;
margin-right: 18px;
}
+
/* Tags */
#tagsdiv #newtag {
margin-right: 0;
margin-left: 5px;
}
+
#tagadd {
margin-left: 0;
margin-right: 3px;
}
+
#tagchecklist span {
margin-left: .5em;
margin-right: 10px;
margin: 6px -9px 0 0;
float: right;
}
+
#content {
margin-left: 0;
margin-right: 1%;
}
+
.submit input,
.button,
.button-primary,
.button-secondary,
.button-highlighted,
#postcustomstuff .submit input {
- font-family: tahoma;
+ font-family: Tahoma, Arial, sans-serif;
}
+
.ac_results li {
text-align: right;
}
+
#TB_ajaxContent #options {
right: auto;
left: 25px;
}
+
#post_status {
margin-left: 0;
margin-right: 10px;
}
+
/* Footer */
#footer {
padding: 10px 60px 0 0;
body {
- font: 13px "Lucida Grande", "Bitstream Vera Sans", Verdana, Arial, sans-serif;
+ font: 13px "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif;
color: #333;
margin: 0;
padding: 0;
background: #444 !important;
}
+.tagchecklist span a {
+background: transparent url(../images/xit.gif) no-repeat 0 0;
+}
+
#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;
+ -moz-border-radius: 3px 3px 0 0;
+ -webkit-border-top-right-radius: 3px;
+ -webkit-border-top-left-radius: 3px;
+ -khtml-border-top-right-radius: 3px;
+ -khtml-border-top-left-radius: 3px;
+ border-top-right-radius: 3px;
+ border-top-left-radius: 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;
+ margin: 0 5px 0 0;
+ padding: 0 5px 0;
font-size: 10px;
line-height: 18px;
float: left;
}
#side-info-column .sleeve {
+ padding-top: 5px;
padding-left: 10px;
}
}
#poststuff h2, #poststuff h3 {
- font-size: 14px;
- font-weight: bold;
- padding: 7px;
- margin: 0 0 10px;
- background: #dfdfdf url("../images/gray-grad.png") repeat-x left top;
font-size: 12px;
font-weight: bold;
line-height: 1;
margin: 0 0 10px;
padding: 7px 9px;
- text-shadow: 0 1px 0 #FFFFFF;
}
h3.tb {
- text-shadow: 0 1px 0 #FFFFFF;
+ text-shadow: 0 1px 0 #fff;
font-weight: bold;
font-size: 12px;
margin-left: 5px;
border-radius: 6px;
}
-.metabox-holder .postbox,
.postbox,
.stuffbox {
margin-bottom: 10px;
-khtml-border-radius: 6px;
-webkit-border-radius: 6px;
border-radius: 6px;
- border-color: #DFDFDF;
}
-.titlediv {
- border-color: #DFDFDF;
-}
-
-#title, .tbtitle {
+#title,
+.tbtitle {
-moz-border-radius: 6px;
-khtml-border-radius: 6px;
-webkit-border-radius: 6px;
font-size: 1.7em;
outline: none;
padding: 3px 4px;
- border-color: #DFDFDF;
+ border-color: #dfdfdf;
}
.tbtitle {
width: 98%;
}
-.postbox h2 {
- background-image: url(../images/postbox-bg.gif);
- background-position: left top;
- background-repeat: repeat-x;
- background-color: #DFDFDF;
-}
-
.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;
- border-color: #DFDFDF;
+ border: 1px solid #dfdfdf;
+ background-color: #fff;
}
.postdivrich {
margin-top: -19px;
position: relative;
}
+
#extra_fields #actions {
clear: both;
- position: absolute;
- right: 4px;
- top: 6px;
- margin: 0;
+ position: relative;
+ right: 0px;
+ margin: -24px 0 0;
}
#actions li {
list-style: none;
margin-right: 10px;
}
+
#extra_fields .button {
margin-right: 5px;
+ padding: 3px 6px;
+ border-radius: 10px;
+ -webkit-border-radius: 10px;
+ -khtml-border-radius: 10px;
+ -moz-border-radius: 10px;
}
/* Photo Styles */
#img_container {
background-color: #fff;
- height: 101px;
- width: 100%;
+}
+#img_container_container {
+ overflow: auto;
}
#extra_fields {
vertical-align: center;
}
-#img_container img, #img_container a {
+#img_container img,
+#img_container a {
width: 68px;
height: 68px;
}
#img_container img {
- width: 68px;
- height: 68px;
border: none;
background-color: #f4f4f4;
cursor: pointer;
}
#viewsite .button {
- margin: 0 0 0px 0;
+ margin: 0;
display: block;
}
-.wp-hidden-children .wp-hidden-child {
+.wp-hidden-children
+.wp-hidden-child {
display: none;
}
vertical-align: top;
}
-#category-add input#category-add-sumbit {
+#category-add input,
+#category-add-sumbit {
width: auto;
}
/* Categories */
-#categorydiv ul, #linkcategorydiv ul {
+#categorydiv ul,
+#linkcategorydiv ul {
list-style: none;
padding: 0;
margin: 0;
margin-left: 18px;
}
-#categorydiv div.ui-tabs-panel {
- height: 150px;
+#categorydiv div.tabs-panel {
+ height: 140px;
overflow: auto;
}
}
/* Tags */
-#tagsdiv #newtag {
- padding: 3px;
+.tagsdiv .newtag {
margin-right: 5px;
- width: 16em;
}
-#jaxtag {
+.jaxtag {
clear: both;
margin: 0;
}
-#tagadd {
+.tagadd {
margin-left: 3px;
}
-#tagchecklist {
+.tagchecklist {
margin-top: 3px;
margin-bottom: 1em;
font-size: 12px;
overflow: auto;
}
-#tagchecklist strong {
+.tagchecklist strong {
position: absolute;
font-size: .75em;
}
-#tagchecklist span {
+.tagchecklist span {
margin-right: .5em;
margin-left: 10px;
display: block;
cursor: default;
}
-#tagchecklist span a {
+.tagchecklist span a {
margin: 6px 0 0 -9px;
cursor: pointer;
width: 10px;
width: 96% !important;
margin-left: 1%;
margin-bottom: 10px;
- border: 1px solid #f1f1f1;
+ border: 0 none;
+ height: 365px;
}
/* Submit */
#saving {
display: inline;
+ vertical-align: middle;
}
.submit input,
.button-secondary,
.button-highlighted,
#postcustomstuff .submit input {
- font-family: "Lucida Grande", "Bitstream Vera Sans", Verdana, Arial, sans-serif;
+ font-family: "Lucida Grande", Verdana, Arial, "Bitstream Vera Sans", sans-serif;
text-decoration: none;
font-size: 11px !important;
line-height: 16px;
.button-primary {
background: #21759B url(../images/button-grad.png) repeat-x scroll left top;
border-color: #21759B;
- color: #FFFFFF;
+ color: #fff;
}
.ac_results {
.hidden {
display: none;
}
+
+.postbox input[type="text"],
+.postbox textarea,
+.stuffbox input[type="text"],
+.stuffbox textarea {
+ border-width: 1px;
+ border-style: solid;
+}
div.tablenav {
margin-right: 210px;
}
+
+#documentation {
+ margin-top: 10px;
+}
+#documentation label {
+ line-height: 22px;
+ vertical-align: top;
+ font-weight: bold;
+}
\ No newline at end of file
--- /dev/null
+/* NOTE: the following CSS rules(.star*) are taken more or less straight from the bbPress rating plugin. */
+div.star-holder {
+ position: relative;
+ height: 19px;
+ width: 100px;
+ font-size: 19px;
+}
+
+div.star {
+ height: 100%;
+ position: absolute;
+ top: 0;
+ left: 0;
+ background-color: transparent;
+ letter-spacing: 1ex;
+ border: none;
+}
+
+.star1 { width: 20%; }
+.star2 { width: 40%; }
+.star3 { width: 60%; }
+.star4 { width: 80%; }
+.star5 { width: 100%; }
+
+.star img, div.star a, div.star a:hover, div.star a:visited {
+ display: block;
+ position: absolute;
+ right: 0;
+ border: none;
+ text-decoration: none;
+}
+
+div.star img {
+ width: 19px;
+ height: 19px;
+ border-left: 1px solid #fff;
+ border-right: 1px solid #fff;
+}
+
+.theme-listing .theme-item {
+ display: inline-block;
+ width: 200px;
+ border: thin solid #ccc;
+ vertical-align: top;
+}
+
+.theme-listing .theme-item h3 {
+ text-align: center;
+ font-size: 14px;
+ font-style: italic;
+ margin: 0;
+ padding: 0;
+}
+
+.theme-listing .theme-item img {
+ max-width: 150px;
+ max-height: 150px;
+}
+
+.theme-listing .theme-item-info span {
+ display: none;
+}
+.theme-listing .theme-item:hover .theme-item-info span {
+ display: inline;
+}
+.theme-listing .theme-item:hover .theme-item-info span.dots {
+ display: none;
+}
+.theme-listing .theme-item-info span.action-links {
+ font-weight: bold;
+ text-align: center;
+}
+
+.theme-listing br.line {
+ border-bottom-width: 1px;
+ border-bottom-style: solid;
+ margin-bottom: 3px;
+}
+
+.available-theme {
+ padding: 20px 15px;
+}
+
+#theme-information .theme-preview-img {
+ float: left;
+ margin: 5px 25px 10px 15px;
+ width: 300px;
+}
+
+#theme-information .action-button {
+ border-top-width: 1px;
+ border-top-style: solid;
+ margin: 10px 5px 20px;
+}
+
+#theme-information .action-button #cancel {
+ float: left;
+ margin: 10px 15px;
+}
+
+#theme-information .action-button #install {
+ float: right;
+ margin: 10px 15px;
+}
+
+#theme-information .available-theme h3 {
+ margin: 1em 0;
+}
+
+body#theme-information {
+ height: auto;
+}
+
+.feature-filter {
+ -moz-border-radius: 8px;
+ -khtml-border-radius: 8px;
+ -webkit-border-radius: 8px;
+ border-radius: 8px;
+ border-width: 1px;
+ border-style: solid;
+ padding: 8px 12px 0;
+}
+
+.feature-filter .feature-group {
+ float: left;
+ margin-bottom: 20px;
+ width: 695px;
+}
+
+.feature-filter .feature-name {
+ float: left;
+ text-align: right;
+ width: 95px;
+}
+
+.feature-filter .feature-group li {
+ display: inline;
+ float: left;
+ list-style-type: none;
+ padding-right: 25px;
+ min-width: 145px;
+}
-h4.widget-title span {
- float: right;
-}
-h4.widget-title a {
- float: left;
- margin-left: 0;
- margin-right: 1em;
-}
-ul#widget-list li.widget-list-item h4.widget-title {
- float: right;
-}
+
ul#widget-list li.widget-list-item div.widget-description {
margin: 0 200px 0 0;
padding: 0 4em 0 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;
- left: 1em;
-}
+html,
+body {
+ min-width: 950px;
+}
+
/* 2 column liquid layout */
-div.widget-liquid-left-holder {
+div.widget-liquid-left {
float: left;
clear: left;
width: 100%;
- margin-right: -310px;
+ margin-right: -325px;
}
-div.widget-liquid-left {
- margin-right: 320px;
+div#widgets-left {
+ margin-left: 5px;
+ margin-right: 325px;
+}
+
+div#widgets-right {
+ width: 285px;
+ margin: 0 auto;
}
div.widget-liquid-right {
float: right;
clear: right;
width: 300px;
- position: relative;
}
-/* pasitioning etc. */
-form#widgets-filter {
- position: relative;
+.widget-liquid-right .widget,
+#wp_inactive_widgets .widget {
+ width: 250px;
+ margin: 0 auto 20px;
+ overflow: hidden;
}
-div#available-widgets-filter {
- border-bottom-width: 1px;
- border-bottom-style: solid;
+#wp_inactive_widgets .widget {
+ margin: 0 10px 20px;
+ float: left;
}
-ul#widget-list {
- list-style: none;
+div.sidebar-name h3 {
margin: 0;
- padding: 0;
+ padding: 5px 12px;
+ font-size: 13px;
+ height: 19px;
+ overflow: hidden;
+ white-space: nowrap;
}
-ul#widget-list li.widget-list-item {
- padding: .7em 0.9em;
- margin: 0;
- border-bottom-width: 1px;
- border-bottom-style: solid;
- line-height: 1;
+div.sidebar-name {
+ background-repeat: repeat-x;
+ background-position: 0 0;
+ cursor: pointer;
+ font-size: 13px;
+ border-width: 1px;
+ border-style: solid;
+ -moz-border-radius-topleft: 8px;
+ -moz-border-radius-topright: 8px;
+ -webkit-border-top-right-radius: 8px;
+ -webkit-border-top-left-radius: 8px;
+ -khtml-border-top-right-radius: 8px;
+ -khtml-border-top-left-radius: 8px;
+ border-top-right-radius: 8px;
+ border-top-left-radius: 8px;
+}
+
+.js .closed .sidebar-name {
+ -moz-border-radius-bottomleft: 8px;
+ -moz-border-radius-bottomright: 8px;
+ -webkit-border-bottom-right-radius: 8px;
+ -webkit-border-bottom-left-radius: 8px;
+ -khtml-border-bottom-right-radius: 8px;
+ -khtml-border-bottom-left-radius: 8px;
+ border-bottom-right-radius: 8px;
+ border-bottom-left-radius: 8px;
}
-h4.widget-title span {
+.widget-liquid-right .widgets-sortables,
+#widgets-left .widget-holder {
+ border-width: 0 1px 1px;
+ border-style: none solid solid;
+ -moz-border-radius-bottomleft: 8px;
+ -moz-border-radius-bottomright: 8px;
+ -webkit-border-bottom-right-radius: 8px;
+ -webkit-border-bottom-left-radius: 8px;
+ -khtml-border-bottom-right-radius: 8px;
+ -khtml-border-bottom-left-radius: 8px;
+ border-bottom-right-radius: 8px;
+ border-bottom-left-radius: 8px;
+}
+
+.js .closed .widgets-sortables,
+.js .closed .widget-holder {
+ display: none;
+}
+
+.widget-liquid-right .widgets-sortables {
+ padding: 15px 0 0;
+}
+
+#available-widgets .widget-holder {
+ padding: 7px 5px 0;
+}
+
+#wp_inactive_widgets {
+ padding: 5px 5px 0;
+}
+
+#widget-list .widget {
+ width: 250px;
+ margin: 0 10px 15px;
+ border: 0 none;
float: left;
}
-h4.widget-title a {
- float: right;
- text-decoration: underline;
- border-bottom: none;
- margin-left: 1em;
+#widget-list .widget-description {
+ padding: 5px 8px;
}
-ul#widget-list li.widget-list-item h4.widget-title {
- position: relative;
- margin: 0;
- padding: .5em 1em;
- width: 200px;
+#widget-list .widget-top {
+ border-width: 1px;
+ border-style: solid;
+ -moz-border-radius: 6px;
+ -khtml-border-radius: 6px;
+ -webkit-border-radius: 6px;
+ border-radius: 6px;
+}
+
+.widget-placeholder {
+ border-width: 1px;
+ border-style: dashed;
+ margin: 0 auto 20px;
+ height: 26px;
+ width: 250px;
+}
+
+#wp_inactive_widgets .widget-placeholder {
+ margin: 0 10px 20px;
float: left;
- font-size: 13px;
- -moz-border-radius: 3px;
- -khtml-border-radius: 3px;
- -webkit-border-radius: 3px;
- border-radius: 3px;
}
-#dragHelper h4.widget-title {
- padding: .5em 1em;
+div.widgets-holder-wrap {
+ padding: 0;
+ margin: 10px 0 20px;
+}
+
+#widgets-left #available-widgets {
+ background-color: transparent;
+ border: 0 none;
+}
+
+ul#widget-list {
+ list-style: none;
margin: 0;
+ padding: 0;
+ min-height: 100px;
}
-ul#widget-list li.widget-list-item div.widget-description {
- display: block;
- margin: 0 0 0 200px;
- padding: 0 0 0 4em;
- font-size: 11px;
+.widget .widget-top {
+ font-size: 12px;
+ font-weight: bold;
+ height: 26px;
+ overflow: hidden;
}
-ul#widget-list li.widget-list-item ul.widget-control-info {
+.widget-top .widget-title {
+ padding: 5px 9px;
+}
+
+.widget-top .widget-title-action {
+ float: right;
+}
+
+a.widget-action {
+ display: block;
+ width: 24px;
+ height: 26px;
+}
+
+#available-widgets a.widget-action {
display: none;
}
-div#sidebar-info {
- padding: 0 1em;
- margin-bottom: 1em;
+.widget-top a.widget-action {
+ background: url("../images/menu-bits.gif") no-repeat scroll 0 -110px;
+}
+
+.widget .widget-inside,
+.widget .widget-description {
+ padding: 12px 12px 10px;
font-size: 11px;
+ line-height: 16px;
}
-ul.widget-control-list {
- list-style: none;
- margin: 0;
- padding: 0 1em;
+.widget-inside,
+.widget-description {
+ display: none;
}
-div#current-widgets p.submit {
- padding: 1em;
+#available-widgets .widget-description {
+ display: block;
}
-li.widget-list-control-item {
- margin: 1em 0;
- -moz-border-radius: 3px;
- -khtml-border-radius: 3px;
- -webkit-border-radius: 3px;
- border-radius: 3px;
+.widget .widget-inside p {
+ margin: 0 0 1em;
+ padding: 0;
}
-li.widget-list-control-item h4,
-#dragHelper li.widget-list-control-item h4,
-li.widget-sortable h4 {
+.widget-title h4 {
margin: 0;
- cursor: move;
- font-size: 13px;
- padding: 0.4em 0.8em;
- position: relative;
- -moz-border-radius: 3px;
- -khtml-border-radius: 3px;
- -webkit-border-radius: 3px;
- border-radius: 3px;
+ line-height: 1.3;
+ overflow: hidden;
+ white-space: nowrap;
}
-.widget-control-save,
-.widget-control-remove {
- margin-right: 8px;
- float: left;
+.widgets-sortables {
+ min-height: 90px;
+}
+
+.widget-control-actions {
+ margin-top: 8px;
+}
+
+.widget-control-actions a {
text-decoration: none;
}
-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: 1em;
+.widget-control-actions a:hover {
+ text-decoration: underline;
+}
+
+.widget-control-actions .ajax-feedback {
+ padding-bottom: 3px;
+}
+
+.widget-control-actions div.alignleft {
+ margin-top: 6px;
}
-li.widget-list-control-item h4.widget-title a:hover {
+div#sidebar-info {
+ padding: 0 1em;
+ margin-bottom: 1em;
+ font-size: 11px;
+}
+
+.widget-title a,
+.widget-title a:hover {
text-decoration: none;
border-bottom: none;
}
-li.widget-list-control-item div.widget-control {
- border-width: 0 1px 1px;
- border-style: none solid solid;
- display: none;
- padding: 15px;
+.widget-control-edit {
+ display: block;
font-size: 11px;
- position: relative;
+ font-weight: normal;
+ line-height: 26px;
+ padding: 0 8px 0 0;
}
-li.widget-list-control-item div.widget-control p {
- margin: 0 0 1em;
- padding: 0;
+a.widget-control-edit {
+ text-decoration: none;
+}
+
+.widget-control-edit .add,
+.widget-control-edit .edit {
+ display: none;
}
-ul.widget-control-list div.widget-control-actions {
- padding: 0.5em 0 0;
+#available-widgets .widget-control-edit .add,
+#widgets-right .widget-control-edit .edit,
+#wp_inactive_widgets .widget-control-edit .edit {
+ display: inline;
}
-.widget-control-edit {
- font-size: 10px;
+.editwidget {
+ margin: 0 auto 15px;
+}
+
+.editwidget .widget-inside {
+ display: block;
+ border-width: 1px;
+ border-style: solid;
+ padding: 10px;
+ -moz-border-radius: 6px;
+ -khtml-border-radius: 6px;
+ -webkit-border-radius: 6px;
+ border-radius: 6px;
+}
+
+.inactive p.description {
+ margin: 5px 15px 8px;
+}
+
+#available-widgets p.description {
+ margin: 0 12px 12px;
+}
+
+.widget-position {
+ margin-top: 8px;
+}
+
+.inactive {
+ padding-top: 2px;
+}
+
+.sidebar-name-arrow {
+ float: right;
+ height: 29px;
+ width: 26px;
+}
+
+.widget-title .in-widget-title {
+ font-size: 11px;
+ white-space: nowrap;
+}
+
+#removing-widget {
+ display: none;
font-weight: normal;
+ padding-left: 15px;
+ font-size: 12px;
}
-div#current-widgets {
- padding-top: 1em;
- border-width: 1px 0 0;
- border-style: solid none none;
+.widget-control-noform,
+#access-off,
+.widgets_access .widget-action,
+.widgets_access .sidebar-name-arrow,
+.widgets_access #access-on,
+.widgets_access .widget-holder .description {
+ display: none;
}
-#widget-controls .widefat {
- width: 92%;
- padding: 3px;
+.widgets_access .widget-holder,
+.widgets_access #widget-list {
+ padding-top: 10px;
}
-#widget-controls select.widefat {
- width: auto;
+.widgets_access #access-off {
+ display: inline;
+}
+
+.widgets_access #wpbody-content .widget-title-action,
+.widgets_access #wpbody-content .widget-control-edit,
+.widgets_access .closed .widgets-sortables,
+.widgets_access .closed .widget-holder {
display: block;
}
+
+.widgets_access .closed .sidebar-name {
+ -moz-border-radius-bottomleft: 0;
+ -moz-border-radius-bottomright: 0;
+ -webkit-border-bottom-right-radius: 0;
+ -webkit-border-bottom-left-radius: 0;
+ -khtml-border-bottom-right-radius: 0;
+ -khtml-border-bottom-left-radius: 0;
+ border-bottom-right-radius: 0;
+ border-bottom-left-radius: 0;
+}
+
+.widgets_access .sidebar-name,
+.widgets_access .widget .widget-top {
+ cursor: default;
+}
+
* @since unknown
*/
function init() {
- $page = add_theme_page(__('Custom Image Header'), __('Custom Image Header'), 'edit_themes', 'custom-header', array(&$this, 'admin_page'));
+ $page = add_theme_page(__('Custom Header'), __('Custom 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'));
if ( 1 == $step )
wp_enqueue_script('farbtastic');
elseif ( 2 == $step )
- wp_enqueue_script('cropper');
+ wp_enqueue_script('jcrop');
}
/**
function css_includes() {
$step = $this->step();
- if ( 1 == $step ) {
+ if ( 1 == $step )
wp_enqueue_style('farbtastic');
- }
+ elseif ( 2 == $step )
+ wp_enqueue_style('jcrop');
}
/**
*/
function js_2() { ?>
<script type="text/javascript">
- function onEndCrop( coords, dimensions ) {
- jQuery( '#x1' ).val(coords.x1);
- jQuery( '#y1' ).val(coords.y1);
+ function onEndCrop( coords ) {
+ jQuery( '#x1' ).val(coords.x);
+ jQuery( '#y1' ).val(coords.y);
jQuery( '#x2' ).val(coords.x2);
jQuery( '#y2' ).val(coords.y2);
- jQuery( '#width' ).val(dimensions.width);
- jQuery( '#height' ).val(dimensions.height);
+ jQuery( '#width' ).val(coords.w);
+ jQuery( '#height' ).val(coords.h);
}
// with a supplied ratio
var ratio = xinit / yinit;
var ximg = jQuery('#upload').width();
var yimg = jQuery('#upload').height();
+
+ //set up default values
+ jQuery( '#x1' ).val(0);
+ jQuery( '#y1' ).val(0);
+ jQuery( '#x2' ).val(xinit);
+ jQuery( '#y2' ).val(yinit);
+ jQuery( '#width' ).val(xinit);
+ jQuery( '#height' ).val(yinit);
+
if ( yimg < yinit || ximg < xinit ) {
if ( ximg / yimg > ratio ) {
yinit = yimg;
yinit = xinit / ratio;
}
}
- new Cropper.Img(
- 'upload',
- {
- ratioDim: { x: xinit, y: yinit },
- displayOnInit: true,
- onEndCrop: onEndCrop
- }
- )
+
+ jQuery('#upload').Jcrop({
+ aspectRatio: ratio,
+ setSelect: [ 0, 0, xinit, yinit ],
+ onSelect: onEndCrop
+ });
});
</script>
<?php
<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>
-<div id="headimg" style="background-image: url(<?php clean_url(header_image()) ?>);">
+<div id="headimg" style="background-image: url(<?php esc_url(header_image()) ?>);">
<h1><a onclick="return false;" href="<?php bloginfo('url'); ?>" title="<?php bloginfo('name'); ?>" id="name"><?php bloginfo('name'); ?></a></h1>
<div id="desc"><?php bloginfo('description');?></div>
</div>
<?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'); ?>" id="pickcolor" /><input type="button" value="<?php _e('Use Original Color'); ?>" onclick="colorDefault()" id="defaultcolor" />
+<input type="button" class="button" value="<?php esc_attr_e('Hide Text'); ?>" onclick="hide_text()" id="hidetext" />
+<input type="button" class="button" value="<?php esc_attr_e('Select a Text Color'); ?>" id="pickcolor" /><input type="button" class="button" value="<?php esc_attr_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>
+<input type="hidden" name="textcolor" id="textcolor" value="#<?php esc_attr(header_textcolor()) ?>" /><input name="submit" type="submit" class="button" value="<?php esc_attr_e('Save Changes'); ?>" /></form>
<?php } ?>
<div id="colorPickerDiv" style="z-index: 100;background:#eee;border:1px solid #ccc;position:absolute;display:none;"> </div>
<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>
<p><?php printf(__('Images of exactly <strong>%1$d x %2$d pixels</strong> will be used as-is.'), HEADER_IMAGE_WIDTH, HEADER_IMAGE_HEIGHT); ?></p>
-<form enctype="multipart/form-data" id="uploadForm" method="POST" action="<?php echo attribute_escape(add_query_arg('step', 2)) ?>" style="margin: auto; width: 50%;">
+<form enctype="multipart/form-data" id="uploadForm" method="POST" action="<?php echo esc_attr(add_query_arg('step', 2)) ?>" style="margin: auto; width: 50%;">
<label for="upload"><?php _e('Choose an image from your computer:'); ?></label><br /><input type="file" id="upload" name="import" />
<input type="hidden" name="action" value="save" />
<?php wp_nonce_field('custom-header') ?>
<p class="submit">
-<input type="submit" value="<?php _e('Upload'); ?>" />
+<input type="submit" value="<?php esc_attr_e('Upload'); ?>" />
</p>
</form>
<div class="wrap">
<h2><?php _e('Reset Header Image and Color'); ?></h2>
<p><?php _e('This will restore the original header image and color. You will not be able to retrieve any customizations.') ?></p>
-<form method="post" action="<?php echo attribute_escape(add_query_arg('step', 1)) ?>">
+<form method="post" action="<?php echo esc_attr(add_query_arg('step', 1)) ?>">
<?php wp_nonce_field('custom-header'); ?>
-<input type="submit" name="resetheader" value="<?php _e('Restore Original Header'); ?>" />
+<input type="submit" class="button" name="resetheader" value="<?php esc_attr_e('Restore Original Header'); ?>" />
</form>
</div>
<?php endif;
// Add the meta-data
wp_update_attachment_metadata( $id, wp_generate_attachment_metadata( $id, $file ) );
- set_theme_mod('header_image', clean_url($url));
+ set_theme_mod('header_image', esc_url($url));
do_action('wp_create_file_in_uploads', $file, $id); // For replication
return $this->finished();
} elseif ( $width > HEADER_IMAGE_WIDTH ) {
<div class="wrap">
-<form method="POST" action="<?php echo attribute_escape(add_query_arg('step', 3)) ?>">
+<form method="POST" action="<?php echo esc_attr(add_query_arg('step', 3)) ?>">
<p><?php _e('Choose the part of the image you want to use as your header.'); ?></p>
<div id="testWrap" style="position: relative">
<input type="hidden" name="y2" id="y2" />
<input type="hidden" name="width" id="width" />
<input type="hidden" name="height" id="height" />
-<input type="hidden" name="attachment_id" id="attachment_id" value="<?php echo $id; ?>" />
-<input type="hidden" name="oitar" id="oitar" value="<?php echo $oitar; ?>" />
+<input type="hidden" name="attachment_id" id="attachment_id" value="<?php echo esc_attr($id); ?>" />
+<input type="hidden" name="oitar" id="oitar" value="<?php echo esc_attr($oitar); ?>" />
<?php wp_nonce_field('custom-header') ?>
-<input type="submit" value="<?php _e('Crop Header'); ?>" />
+<input type="submit" value="<?php esc_attr_e('Crop Header'); ?>" />
</p>
</form>
<tbody id="the-list" class="list:post">
<?php
-add_filter('the_title','wp_specialchars');
+add_filter('the_title','esc_html');
$alt = '';
$posts_columns = get_column_headers('upload');
$hidden = get_hidden_columns('upload');
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)); ?>">
+ <a href="media.php?action=edit&attachment_id=<?php the_ID(); ?>" title="<?php echo esc_attr(sprintf(__('Edit “%s”'), $att_title)); ?>">
<?php echo $thumb; ?>
</a>
case 'media':
?>
- <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 />
+ <td <?php echo $attributes ?>><strong><a href="<?php echo get_edit_post_link( $post->ID ); ?>" title="<?php echo esc_attr(sprintf(__('Edit “%s”'), $att_title)); ?>"><?php echo $att_title; ?></a></strong><br />
<?php echo strtoupper(preg_replace('/^.*?\.(\w+)$/', '$1', get_attached_file($post->ID))); ?>
<p>
<?php
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>';
+ $actions['delete'] = "<a class='submitdelete' href='" . wp_nonce_url("post.php?action=delete&post=$post->ID", 'delete-post_' . $post->ID) . "' onclick=\"if ( confirm('" . esc_js(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="' . esc_attr(sprintf(__('View “%s”'), $title)) . '" rel="permalink">' . __('View') . '</a>';
$action_count = count($actions);
$i = 0;
echo '<div class="row-actions">';
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>";
+ $out[] = "<a href='edit.php?tag=$c->slug'> " . esc_html(sanitize_term_field('name', $c->name, $c->term_id, 'post_tag', 'display')) . "</a>";
echo join( ', ', $out );
} else {
_e('No Tags');
} else {
$t_time = get_the_time(__('Y/m/d g:i:s A'));
$m_time = $post->post_date;
- $time = get_post_time( 'G', true, $post );
+ $time = get_post_time( 'G', true, $post, false );
if ( ( abs($t_diff = time() - $time) ) < 86400 ) {
if ( $t_diff < 0 )
$h_time = sprintf( __('%s from now'), human_time_diff( $time ) );
$pending_phrase = sprintf( __('%s pending'), number_format( $left ) );
if ( $left )
echo '<strong>';
- 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>');
+ comments_number("<a href='edit-comments.php?p=$id' title='$pending_phrase' class='post-com-count'><span class='comment-count'>" . /* translators: comment count link */ _x('0', 'comment count') . '</span></a>', "<a href='edit-comments.php?p=$id' title='$pending_phrase' class='post-com-count'><span class='comment-count'>" . /* translators: comment count link */ _x('1', 'comment count') . '</span></a>', "<a href='edit-comments.php?p=$id' title='$pending_phrase' class='post-com-count'><span class='comment-count'>" . /* translators: comment count link: % will be substituted by comment count */ _x('%', 'comment count') . '</span></a>');
if ( $left )
echo '</strong>';
?>
case 'actions':
?>
<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="media.php?action=edit&attachment_id=<?php the_ID(); ?>" title="<?php echo esc_attr(sprintf(__('Edit “%s”'), $att_title)); ?>"><?php _e('Edit'); ?></a> |
<a href="<?php the_permalink(); ?>"><?php _e('Get permalink'); ?></a>
</td>
<?php
</table>
<?php } else { ?>
-<p><?php _e('No posts found.') ?></p>
+<p><?php _e('No media attachments found.') ?></p>
<?php
} // end if ( have_posts() )
<div id="ajax-response"></div>
<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 ?>" />
+<input type="hidden" name="cat_ID" value="<?php echo esc_attr($category->term_id) ?>" />
<?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>
- <td><input name="cat_name" id="cat_name" type="text" value="<?php echo attribute_escape($category->name); ?>" size="40" aria-required="true" /><br />
- <?php _e('The name is used to identify the category almost everywhere, for example under the post or in the category widget.'); ?></td>
+ <td><input name="cat_name" id="cat_name" type="text" value="<?php echo esc_attr($category->name); ?>" size="40" aria-required="true" /><br />
+ <span class="description"><?php _e('The name is used to identify the category almost everywhere, for example under the post or in the category widget.'); ?></span></td>
</tr>
<tr class="form-field">
<th scope="row" valign="top"><label for="category_nicename"><?php _e('Category Slug') ?></label></th>
- <td><input name="category_nicename" id="category_nicename" 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>
+ <td><input name="category_nicename" id="category_nicename" type="text" value="<?php echo esc_attr(apply_filters('editable_slug', $category->slug)); ?>" size="40" /><br />
+ <span class="description"><?php _e('The “slug” is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.'); ?></span></td>
</tr>
<tr class="form-field">
<th scope="row" valign="top"><label for="category_parent"><?php _e('Category Parent') ?></label></th>
<td>
<?php wp_dropdown_categories(array('hide_empty' => 0, 'name' => 'category_parent', 'orderby' => 'name', 'selected' => $category->parent, 'hierarchical' => true, 'show_option_none' => __('None'))); ?><br />
- <?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.'); ?>
+ <span class="description"><?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.'); ?></span>
</td>
</tr>
<tr class="form-field">
<th scope="row" valign="top"><label for="category_description"><?php _e('Description') ?></label></th>
- <td><textarea name="category_description" id="category_description" rows="5" cols="50" style="width: 97%;"><?php echo wp_specialchars($category->description); ?></textarea><br />
- <?php _e('The description is not prominent by default, however some themes may show it.'); ?></td>
+ <td><textarea name="category_description" id="category_description" rows="5" cols="50" style="width: 97%;"><?php echo esc_html($category->description); ?></textarea><br />
+ <span class="description"><?php _e('The description is not prominent by default, however some themes may show it.'); ?></span></td>
</tr>
</table>
-<p class="submit"><input type="submit" class="button-primary" name="submit" value="<?php _e('Update Category'); ?>" /></p>
+<p class="submit"><input type="submit" class="button-primary" name="submit" value="<?php esc_attr_e('Update Category'); ?>" /></p>
<?php do_action('edit_category_form', $category); ?>
</form>
</div>
require_once('admin-header.php');
-$mode = ( ! isset($_GET['mode']) || empty($_GET['mode']) ) ? 'detail' : attribute_escape($_GET['mode']);
+$mode = ( ! isset($_GET['mode']) || empty($_GET['mode']) ) ? 'detail' : esc_attr($_GET['mode']);
-$comment_status = !empty($_GET['comment_status']) ? attribute_escape($_GET['comment_status']) : '';
+$comment_status = isset($_REQUEST['comment_status']) ? $_REQUEST['comment_status'] : 'all';
+if ( !in_array($comment_status, array('all', 'moderated', 'approved', 'spam')) )
+ $comment_status = 'all';
-$comment_type = !empty($_GET['comment_type']) ? attribute_escape($_GET['comment_type']) : '';
+$comment_type = !empty($_GET['comment_type']) ? esc_attr($_GET['comment_type']) : '';
$search_dirty = ( isset($_GET['s']) ) ? $_GET['s'] : '';
-$search = attribute_escape( $search_dirty ); ?>
+$search = esc_attr( $search_dirty ); ?>
<div class="wrap">
<?php screen_icon(); ?>
-<h2><?php echo wp_specialchars( $title );
+<h2><?php echo esc_html( $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>' ); ?>
+ printf( '<span class="subtitle">' . sprintf( __( 'Search results for “%s”' ), wp_html_excerpt( esc_html( stripslashes( $_GET['s'] ) ), 50 ) ) . '</span>' ); ?>
</h2>
<?php
echo '<div id="moderated" class="updated fade"><p>';
if ( $approved > 0 ) {
- printf( __ngettext( '%s comment approved', '%s comments approved', $approved ), $approved );
+ printf( _n( '%s comment approved', '%s comments approved', $approved ), $approved );
echo '<br />';
}
if ( $deleted > 0 ) {
- printf( __ngettext( '%s comment deleted', '%s comments deleted', $deleted ), $deleted );
+ printf( _n( '%s comment deleted', '%s comments deleted', $deleted ), $deleted );
echo '<br />';
}
if ( $spam > 0 ) {
- printf( __ngettext( '%s comment marked as spam', '%s comments marked as spam', $spam ), $spam );
+ printf( _n( '%s comment marked as spam', '%s comments marked as spam', $spam ), $spam );
echo '<br />';
}
//, 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>)')
+ 'all' => _n_noop('All', 'All'), // singular not used
+ 'moderated' => _n_noop('Pending (<span class="pending-count">%s</span>)', 'Pending (<span class="pending-count">%s</span>)'),
+ 'approved' => _n_noop('Approved', 'Approved'), // singular not used
+ 'spam' => _n_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>" . __( '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 ( str_replace( 'all', '', $status ) == $comment_status )
+ if ( $status == $comment_status )
$class = ' class="current"';
if ( !isset( $num_comments->$status ) )
$num_comments->$status = 10;
- if ( 'all' != $status )
- $link = add_query_arg( 'comment_status', $status, $link );
+ $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 );
+ $link = add_query_arg( 's', esc_attr( stripslashes( $_GET['s'] ) ), $link );
*/
$status_links[] = "<li class='$status'><a href='$link'$class>" . sprintf(
- __ngettext( $label[0], $label[1], $num_comments->$status ),
+ _n( $label[0], $label[1], $num_comments->$status ),
number_format_i18n( $num_comments->$status )
) . '</a>';
}
</ul>
<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" />
+ <label class="screen-reader-text" for="comment-search-input"><?php _e( 'Search Comments' ); ?>:</label>
+ <input type="text" id="comment-search-input" name="s" value="<?php _admin_search_query(); ?>" />
+ <input type="submit" value="<?php esc_attr_e( 'Search Comments' ); ?>" class="button" />
</p>
<?php
-$comments_per_page = apply_filters('comments_per_page', 20, $comment_status);
+$comments_per_page = get_user_option('edit_comments_per_page');
+if ( empty($comments_per_page) )
+ $comments_per_page = 20;
+$comments_per_page = apply_filters('comments_per_page', $comments_per_page, $comment_status);
if ( isset( $_GET['apage'] ) )
$page = abs( (int) $_GET['apage'] );
?>
-<input type="hidden" name="mode" value="<?php echo $mode; ?>" />
+<input type="hidden" name="mode" value="<?php echo esc_attr($mode); ?>" />
<?php if ( $post_id ) : ?>
-<input type="hidden" name="p" value="<?php echo intval( $post_id ); ?>" />
+<input type="hidden" name="p" value="<?php echo esc_attr( 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); ?>" />
+<input type="hidden" name="comment_status" value="<?php echo esc_attr($comment_status); ?>" />
+<input type="hidden" name="pagegen_timestamp" value="<?php echo esc_attr(current_time('mysql', 1)); ?>" />
<div class="tablenav">
<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 ),
+ '<span class="total-type-count">' . number_format_i18n( $total ) . '</span>',
$page_links
); echo $page_links_text; ?></div>
+<input type="hidden" name="_total" value="<?php echo esc_attr($total); ?>" />
+<input type="hidden" name="_per_page" value="<?php echo esc_attr($comments_per_page); ?>" />
+<input type="hidden" name="_page" value="<?php echo esc_attr($page); ?>" />
<?php endif; ?>
<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 ): ?>
+<?php if ( 'all' == $comment_status || 'approved' == $comment_status ): ?>
<option value="unapprove"><?php _e('Unapprove'); ?></option>
<?php endif; ?>
-<?php if ( empty($comment_status) || 'moderated' == $comment_status || 'spam' == $comment_status ): ?>
+<?php if ( 'all' == $comment_status || 'moderated' == $comment_status || 'spam' == $comment_status ): ?>
<option value="approve"><?php _e('Approve'); ?></option>
<?php endif; ?>
<?php if ( 'spam' != $comment_status ): ?>
<?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" />
+<input type="submit" name="doaction" id="doaction" value="<?php esc_attr_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
) );
foreach ( $comment_types as $type => $label ) {
- echo " <option value='$type'";
+ echo " <option value='" . esc_attr($type) . "'";
selected( $comment_type, $type );
echo ">$label</option>\n";
}
?>
</select>
-<input type="submit" id="post-query-submit" value="<?php _e('Filter'); ?>" class="button-secondary" />
+<input type="submit" id="post-query-submit" value="<?php esc_attr_e('Filter'); ?>" class="button-secondary" />
<?php if ( isset($_GET['apage']) ) { ?>
- <input type="hidden" name="apage" value="<?php echo absint( $_GET['apage'] ); ?>" />
+ <input type="hidden" name="apage" value="<?php echo esc_attr( absint( $_GET['apage'] ) ); ?>" />
<?php }
if ( 'spam' == $comment_status ) {
- wp_nonce_field('bulk-spam-delete', '_spam_nonce');
+ wp_nonce_field('bulk-spam-delete', '_spam_nonce');
if ( current_user_can ('moderate_comments')) { ?>
- <input type="submit" name="delete_all_spam" value="<?php _e('Delete All Spam'); ?>" class="button-secondary apply" />
+ <input type="submit" name="delete_all_spam" value="<?php esc_attr_e('Delete All Spam'); ?>" class="button-secondary apply" />
<?php }
} ?>
<?php do_action('manage_comments_nav', $comment_status); ?>
<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 ): ?>
+<?php if ( 'all' == $comment_status || 'approved' == $comment_status ): ?>
<option value="unapprove"><?php _e('Unapprove'); ?></option>
<?php endif; ?>
-<?php if ( empty($comment_status) || 'moderated' == $comment_status || 'spam' == $comment_status ): ?>
+<?php if ( 'all' == $comment_status || 'moderated' == $comment_status || 'spam' == $comment_status ): ?>
<option value="approve"><?php _e('Approve'); ?></option>
<?php endif; ?>
<?php if ( 'spam' != $comment_status ): ?>
<?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" />
+<input type="submit" name="doaction2" id="doaction2" value="<?php esc_attr_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" />
+<input type="submit" name="delete_all_spam2" value="<?php esc_attr_e('Delete All Spam'); ?>" class="button-secondary apply" />
<?php } ?>
<?php do_action('manage_comments_nav', $comment_status); ?>
</div>
</form>
<form id="get-extra-comments" method="post" action="" class="add:the-extra-comment-list:" style="display: none;">
- <input type="hidden" name="s" value="<?php echo $search; ?>" />
- <input type="hidden" name="mode" value="<?php echo $mode; ?>" />
- <input type="hidden" name="comment_status" value="<?php echo $comment_status; ?>" />
+ <input type="hidden" name="s" value="<?php echo esc_attr($search); ?>" />
+ <input type="hidden" name="mode" value="<?php echo esc_attr($mode); ?>" />
+ <input type="hidden" name="comment_status" value="<?php echo esc_attr($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 ); ?>" />
+ <input type="hidden" name="p" value="<?php echo esc_attr( $post_id ); ?>" />
+ <input type="hidden" name="comment_type" value="<?php echo esc_attr( $comment_type ); ?>" />
<?php wp_nonce_field( 'add-comment', '_ajax_nonce', false ); ?>
</form>
<div id="ajax-response"></div>
-<?php } elseif ( 'moderated' == $_GET['comment_status'] ) { ?>
+<?php } elseif ( 'moderated' == $comment_status ) { ?>
<p><?php _e('No comments awaiting moderation… yet.') ?></p>
</form>
<?php } ?>
</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 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'); ?>
* @name $post_ID
* @var int
*/
-if ( ! isset( $post_ID ) )
- $post_ID = 0;
-else
- $post_ID = (int) $post_ID;
+$post_ID = isset($post_ID) ? (int) $post_ID : 0;
$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( ( isset( $_GET['_wp_original_http_referer'] ) ? $_GET['_wp_original_http_referer'] : '') ) ) );
+$messages[1] = sprintf(__('Post updated. <a href="%s">View post</a>'), get_permalink($post_ID));
$messages[2] = __('Custom field updated.');
$messages[3] = __('Custom field deleted.');
$messages[4] = __('Post updated.');
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' />";
+ $form_extra = "<input type='hidden' id='post_ID' name='temp_ID' value='" . esc_attr($temp_ID) . "' />";
$autosave = false;
} else {
$form_action = 'editpost';
- $form_extra = "<input type='hidden' id='post_ID' name='post_ID' value='$post_ID' />";
+ $form_extra = "<input type='hidden' id='post_ID' name='post_ID' value='" . esc_attr($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 ) ) {
+ if ( $autosave && mysql2date( 'U', $autosave->post_modified_gmt, false ) > mysql2date( 'U', $post->post_modified_gmt, false ) ) {
foreach ( _wp_post_revision_fields() as $autosave_field => $_autosave_field ) {
if ( normalize_whitespace( $autosave->$autosave_field ) != normalize_whitespace( $post->$autosave_field ) ) {
$notice = sprintf( $notices[1], get_edit_post_link( $autosave->ID ) );
<?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') ); ?>" />
+<input type="submit" name="save" value="<?php esc_attr_e('Save'); ?>" />
</div>
<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" />
+<input <?php if ( 'private' == $post->post_status ) { ?>style="display:none"<?php } ?> type="submit" name="save" id="save-post" value="<?php esc_attr_e('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" />
+<input type="submit" name="save" id="save-post" value="<?php esc_attr_e('Save as Pending'); ?>" tabindex="4" class="button button-highlighted" />
<?php } ?>
</div>
<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)))); ?>
-
-<a class="preview button" href="<?php echo $preview_link; ?>" target="wp-preview" id="post-preview" tabindex="4"><?php _e('Preview'); ?></a>
+<?php
+if ( 'publish' == $post->post_status ) {
+ $preview_link = esc_url(get_permalink($post->ID));
+ $preview_button = __('Preview Changes');
+} else {
+ $preview_link = esc_url(apply_filters('preview_post_link', add_query_arg('preview', 'true', get_permalink($post->ID))));
+ $preview_button = __('Preview');
+}
+?>
+<a class="preview button" href="<?php echo $preview_link; ?>" target="wp-preview" id="post-preview" tabindex="4"><?php echo $preview_button; ?></a>
<input type="hidden" name="wp-preview" id="wp-preview" value="" />
</div>
<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">
+<span id="post-status-display">
<?php
switch ( $post->post_status ) {
case 'private':
break;
}
?>
-</span></b>
+</span>
<?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; ?>" />
+<input type="hidden" name="hidden_post_status" id="hidden_post_status" value="<?php echo esc_attr($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>
</div><?php // /misc-pub-section ?>
<div class="misc-pub-section " id="visibility">
-<?php _e('Visibility:'); ?> <b><span id="post-visibility-display"><?php
+<?php _e('Visibility:'); ?> <span id="post-visibility-display"><?php
if ( 'private' == $post->post_status ) {
$post->post_password = '';
$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>
+?><?php echo
esc_html( $visibility_trans ); ?></span> <?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="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 ); ?>" />
+<input type="hidden" name="hidden_post_password" id="hidden-post-password" value="<?php echo esc_attr($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)); ?> />
+<input type="hidden" name="hidden_post_visibility" id="hidden-post-visibility" value="<?php echo esc_attr( $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 />
-<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>
+<span id="sticky-span"><input id="sticky" name="sticky" type="checkbox" value="sticky" <?php checked(is_sticky($post->ID)); ?> 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>
+<span id="password-span"><label for="post_password"><?php _e('Password:'); ?></label> <input type="text" name="post_password" id="post_password" value="<?php echo esc_attr($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>
<?php
-$datef = _c( 'M j, Y @ G:i|Publish box date format');
+// translators: Publish box date formt, see http://php.net/date
+$datef = __( 'M j, Y @ G:i' );
if ( 0 != $post->ID ) {
if ( 'future' == $post->post_status ) { // scheduled for publishing at a future date
$stamp = __('Scheduled for: <b>%1$s</b>');
$stamp = __('Publish <b>immediately</b>');
$date = date_i18n( $datef, strtotime( current_time('mysql') ) );
}
-?>
-<?php if ( $can_publish ) : // Contributors don't get to choose the date of publish ?>
+
+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>
<div id="delete-action">
<?php
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>
+<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 esc_js(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') ) : ?>
- <?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="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 Post') ?>" />
- <input name="save" type="submit" class="button-primary" id="publish" tabindex="5" accesskey="p" value="<?php _e('Update Post') ?>" />
-<?php } ?>
+if ( !in_array( $post->post_status, array('publish', 'future', 'private') ) || 0 == $post->ID ) {
+ if ( current_user_can('publish_posts') ) :
+ if ( !empty($post->post_date_gmt) && time() < strtotime( $post->post_date_gmt . ' +0000' ) ) : ?>
+ <input name="original_publish" type="hidden" id="original_publish" value="<?php esc_attr_e('Schedule') ?>" />
+ <input name="publish" type="submit" class="button-primary" id="publish" tabindex="5" accesskey="p" value="<?php esc_attr_e('Schedule') ?>" />
+<?php else : ?>
+ <input name="original_publish" type="hidden" id="original_publish" value="<?php esc_attr_e('Publish') ?>" />
+ <input name="publish" type="submit" class="button-primary" id="publish" tabindex="5" accesskey="p" value="<?php esc_attr_e('Publish') ?>" />
+<?php endif;
+ else : ?>
+ <input name="original_publish" type="hidden" id="original_publish" value="<?php esc_attr_e('Submit for Review') ?>" />
+ <input name="publish" type="submit" class="button-primary" id="publish" tabindex="5" accesskey="p" value="<?php esc_attr_e('Submit for Review') ?>" />
+<?php
+ endif;
+} else { ?>
+ <input name="original_publish" type="hidden" id="original_publish" value="<?php esc_attr_e('Update Post') ?>" />
+ <input name="save" type="submit" class="button-primary" id="publish" tabindex="5" accesskey="p" value="<?php esc_attr_e('Update Post') ?>" />
+<?php
+} ?>
</div>
<div class="clear"></div>
</div>
*
* @param object $post
*/
-function post_tags_meta_box($post) {
+function post_tags_meta_box($post, $box) {
+ $tax_name = esc_attr(substr($box['id'], 8));
+ $taxonomy = get_taxonomy($tax_name);
+ $helps = isset($taxonomy->helps) ? esc_attr($taxonomy->helps) : __('Separate tags with commas.');
?>
-<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>
+<div class="tagsdiv" id="<?php echo $tax_name; ?>">
+ <div class="jaxtag">
+ <div class="nojs-tags hide-if-js">
+ <p><?php _e('Add or remove tags'); ?></p>
+ <textarea name="<?php echo "tax_input[$tax_name]"; ?>" class="the-tags" id="tax-input[<?php echo $tax_name; ?>]"><?php echo esc_attr(get_terms_to_edit( $post->ID, $tax_name )); ?></textarea></div>
+
+ <span class="ajaxtag hide-if-no-js">
+ <label class="screen-reader-text" for="new-tag-<?php echo $tax_name; ?>"><?php echo $box['title']; ?></label>
+ <input type="text" id="new-tag-<?php echo $tax_name; ?>" name="newtag[<?php echo $tax_name; ?>]" class="newtag form-input-tip" size="16" autocomplete="off" value="<?php esc_attr_e('Add new tag'); ?>" />
+ <input type="button" class="button tagadd" value="<?php esc_attr_e('Add'); ?>" tabindex="3" />
+ </span></div>
+ <p class="howto"><?php echo $helps; ?></p>
+ <div class="tagchecklist"></div>
+</div>
+<p class="tagcloud-link hide-if-no-js"><a href="#titlediv" class="tagcloud-link" id="link-<?php echo $tax_name; ?>"><?php printf( __('Choose from the most used tags in %s'), $box['title'] ); ?></a></p>
<?php
}
-add_meta_box('tagsdiv', __('Tags'), 'post_tags_meta_box', 'post', 'side', 'core');
+
+// all tag-style post taxonomies
+foreach ( get_object_taxonomies('post') as $tax_name ) {
+ if ( !is_taxonomy_hierarchical($tax_name) ) {
+ $taxonomy = get_taxonomy($tax_name);
+ $label = isset($taxonomy->label) ? esc_attr($taxonomy->label) : $tax_name;
+
+ add_meta_box('tagsdiv-' . $tax_name, $label, 'post_tags_meta_box', 'post', 'side', 'core');
+ }
+}
/**
* Display post categories form fields.
function post_categories_meta_box($post) {
?>
<ul id="category-tabs">
- <li class="
ui-tabs-selected"><a href="#categories-all" tabindex="3"><?php _e( 'All Categories' ); ?></a></li>
+ <li class="
tabs"><a href="#categories-all" tabindex="3"><?php _e( 'All Categories' ); ?></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;">
+<div id="categories-pop" class="tabs-panel" style="display: none;">
<ul id="categorychecklist-pop" class="categorychecklist form-no-clear" >
- <?php $popular_ids = wp_popular_terms_checklist('category'); ?>
+<?php $popular_ids = wp_popular_terms_checklist('category'); ?>
</ul>
</div>
-<div id="categories-all" class="ui-tabs-panel">
+<div id="categories-all" class="tabs-panel">
<ul id="categorychecklist" class="list:category categorychecklist form-no-clear">
- <?php wp_category_checklist($post->ID, false, false, $popular_ids) ?>
+<?php wp_category_checklist($post->ID, false, false, $popular_ids) ?>
</ul>
</div>
<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>
+ <label class="screen-reader-text" for="newcat"><?php _e( 'Add New Category' ); ?></label><input type="text" name="newcat" id="newcat" class="form-required form-input-tip" value="<?php esc_attr_e( 'New category name' ); ?>" tabindex="3" aria-required="true"/>
+ <label class="screen-reader-text" 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 esc_attr_e( 'Add' ); ?>" tabindex="3" />
+<?php wp_nonce_field( 'add-category', '_ajax_nonce', false ); ?>
+ <span id="category-ajax-response"></span></p>
</div>
<?php
endif;
*/
function post_password_meta_box($post) {
?>
-<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>
+<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><label class="screen-reader-text" 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
}
*/
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>
+<label class="screen-reader-text" 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 that can be used in your theme. <a href="http://codex.wordpress.org/Excerpt" target="_blank">Learn more about manual excerpts.</a>'); ?></p>
<?php
}
add_meta_box('postexcerpt', __('Excerpt'), 'post_excerpt_meta_box', 'post', 'normal', 'core');
* @param object $post
*/
function post_trackback_meta_box($post) {
- $form_trackback = '<input type="text" name="trackback_url" id="trackback_url" tabindex="7" value="'. attribute_escape( str_replace("\n", ' ', $post->to_ping) ) .'" />';
+ $form_trackback = '<input type="text" name="trackback_url" id="trackback_url" class="code" tabindex="7" value="'. esc_attr( str_replace("\n", ' ', $post->to_ping) ) .'" />';
if ('' != $post->pinged) {
$pings = '<p>'. __('Already pinged:') . '</p><ul>';
$already_pinged = explode("\n", trim($post->pinged));
foreach ($already_pinged as $pinged_url) {
- $pings .= "\n\t<li>" . wp_specialchars($pinged_url) . "</li>";
+ $pings .= "\n\t<li>" . esc_html($pinged_url) . "</li>";
}
$pings .= '</ul>';
}
<?php
$metadata = has_meta($post->ID);
list_meta($metadata);
-meta_form();
-?>
+meta_form(); ?>
</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
* @param object $post
*/
function post_comment_status_meta_box($post) {
- global $wpdb, $post_ID;
?>
<input name="advanced_view" type="hidden" value="1" />
<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>
+ <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', __('Discussion'), 'post_comment_status_meta_box', 'post', 'normal', 'core');
+
+/**
+ * Display comments for post.
+ *
+ * @since 2.8.0
+ *
+ * @param object $post
+ */
+function post_comment_meta_box($post) {
+ global $wpdb, $post_ID;
+
$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));
- if ( !$post_ID || $post_ID < 0 || 1 > $total )
+ if ( 1 > $total ) {
+ echo '<p>' . __('No comments yet.') . '</p>';
return;
+ }
-wp_nonce_field( 'get-comments', 'add_comment_nonce', false );
+ wp_nonce_field( 'get-comments', 'add_comment_nonce', false );
?>
<table class="widefat comments-box fixed" cellspacing="0" style="display:none;">
-<thead>
- <tr>
+<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>
+ <th scope="col" class="column-comment">
+<?php /* translators: field name in comment form */ echo _x('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>
+<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/wpspin_light.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>
+ if ( ! in_array('commentsdiv', $hidden) ) { ?>
+ <script type="text/javascript">jQuery(document).ready(function(){commentsBox.get(<?php echo $total; ?>, 10);});</script>
<?php
}
}
-add_meta_box('commentstatusdiv', __('Discussion'), 'post_comment_status_meta_box', 'post', 'normal', 'core');
+if ( 'publish' == $post->post_status || 'private' == $post->post_status )
+ add_meta_box('commentsdiv', __('Comments'), 'post_comment_meta_box', 'post', 'normal', 'core');
/**
* Display post slug form fields.
*/
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 ); ?>" />
+<label class="screen-reader-text" for="post_name"><?php _e('Post Slug') ?></label><input name="post_name" type="text" size="13" id="post_name" value="<?php echo esc_attr( $post->post_name ); ?>" />
<?php
}
if ( !( 'pending' == $post->post_status && !current_user_can( 'publish_posts' ) ) )
if ( $post->post_author && !in_array($post->post_author, $authors) )
$authors[] = $post->post_author;
?>
-<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) ); ?>
+<label class="screen-reader-text" 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', 'normal', 'core');
<div class="wrap">
<?php screen_icon(); ?>
-<h2><?php echo wp_specialchars( $title ); ?></h2>
+<h2><?php echo esc_html( $title ); ?></h2>
<?php if ( $notice ) : ?>
<div id="notice" class="error"><p><?php echo $notice ?></p></div>
<?php endif; ?>
?>
<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 ?>
+<input type="hidden" id="hiddenaction" name="action" value="<?php echo esc_attr($form_action) ?>" />
+<input type="hidden" id="originalaction" name="originalaction" value="<?php echo esc_attr($form_action) ?>" />
+<input type="hidden" id="post_author" name="post_author" value="<?php echo esc_attr( $post->post_author ); ?>" />
+<input type="hidden" id="post_type" name="post_type" value="<?php echo esc_attr($post->post_type) ?>" />
+<input type="hidden" id="original_post_status" name="original_post_status" value="<?php echo esc_attr($post->post_status) ?>" />
+<input name="referredby" type="hidden" id="referredby" value="<?php echo esc_url(stripslashes(wp_get_referer())); ?>" />
+<?php
+if ( 'draft' != $post->post_status )
+ wp_original_referer_field(true, 'previous');
-<div id="poststuff" class="metabox-holder">
+echo $form_extra ?>
+<div id="poststuff" class="metabox-holder<?php echo 2 == $screen_layout_columns ? ' has-right-sidebar' : ''; ?>">
<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="post-body">
+<div id="post-body-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" />
+ <label class="screen-reader-text" for="title"><?php _e('Title') ?></label>
+ <input type="text" name="post_title" size="30" tabindex="1" value="<?php echo esc_attr( htmlspecialchars( $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' ) ) ) { ?>
+<?php
+$sample_permalink_html = get_sample_permalink_html($post->ID);
+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;
+<?php
+ if ( ! empty($post->ID) && ! empty($sample_permalink_html) ) :
+ echo $sample_permalink_html;
endif; ?>
</div>
-<?php } ?>
+<?php
+} ?>
</div>
</div>
<?php the_editor($post->post_content); ?>
-<div id="post-status-info">
- <span id="wp-word-count" class="alignleft"></span>
- <span class="alignright">
+<table id="post-status-info" cellspacing="0"><tbody><tr>
+ <td id="wp-word-count"></td>
+ <td class="autosave-info">
<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));
+ printf(__('Last edited by %1$s on %2$s at %3$s'), esc_html( $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>
-
+ } ?>
+ </td>
+</tr></tbody></table>
-<?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 ); ?>
+<?php
+wp_nonce_field( 'autosave', 'autosavenonce', false );
+wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false );
+wp_nonce_field( 'getpermalink', 'getpermalinknonce', false );
+wp_nonce_field( 'samplepermalink', 'samplepermalinknonce', false );
+wp_nonce_field( 'meta-box-order', 'meta-box-order-nonce', false ); ?>
</div>
<?php
do_meta_boxes('post', 'advanced', $post);
-do_action('dbx_post_sidebar');
-
-?>
+do_action('dbx_post_sidebar'); ?>
</div>
</div>
$submitbutton_text = __('Edit Comment');
$toprow_title = sprintf(__('Editing Comment # %s'), $comment->comment_ID);
$form_action = 'editedcomment';
-$form_extra = "' />\n<input type='hidden' name='comment_ID' value='" . $comment->comment_ID . "' />\n<input type='hidden' name='comment_post_ID' value='" . $comment->comment_post_ID;
+$form_extra = "' />\n<input type='hidden' name='comment_ID' value='" . esc_attr($comment->comment_ID) . "' />\n<input type='hidden' name='comment_post_ID' value='" . esc_attr($comment->comment_post_ID);
?>
<form name="post" action="comment.php" method="post" id="post">
<?php screen_icon(); ?>
<h2><?php _e('Edit Comment'); ?></h2>
-<div id="poststuff" class="metabox-holder">
+<div id="poststuff" class="metabox-holder has-right-sidebar">
<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
-$email = attribute_escape( $comment->comment_author_email );
-$url = attribute_escape( $comment->comment_author_url );
+$email = esc_attr( $comment->comment_author_email );
+$url = esc_attr( $comment->comment_author_url );
// add_meta_box('submitdiv', __('Save'), 'comment_submit_meta_box', 'comment', 'side', 'core');
?>
<div id="misc-publishing-actions">
<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>
+<label class="approved"><input type="radio"<?php checked( $comment->comment_approved, '1' ); ?> name="comment_status" value="1" /><?php /* translators: comment type radio button */ echo _x('Approved', 'adjective') ?></label><br />
+<label class="waiting"><input type="radio"<?php checked( $comment->comment_approved, '0' ); ?> name="comment_status" value="0" /><?php /* translators: comment type radio button */ echo _x('Pending', 'adjective') ?></label><br />
+<label class="spam"><input type="radio"<?php checked( $comment->comment_approved, 'spam' ); ?> name="comment_status" value="spam" /><?php /* translators: comment type radio button */ echo _x('Spam', 'adjective'); ?></label>
</div>
<div class="misc-pub-section curtime misc-pub-section-last">
<?php
-$datef = _c( 'M j, Y @ G:i|Publish box date format');
+// translators: Publish box date formt, see http://php.net/date
+$datef = __( 'M j, Y @ G:i' );
$stamp = __('Submitted on: <b>%1$s</b>');
$date = date_i18n( $datef, strtotime( $comment->comment_date ) );
?>
<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>
+<?php echo "<a class='submitdelete deletion' href='" . wp_nonce_url("comment.php?action=deletecomment&c=$comment->comment_ID&_wp_original_http_referer=" . urlencode(wp_get_referer()), 'delete-comment_' . $comment->comment_ID) . "' onclick=\"if ( confirm('" . esc_js(__("You are about to delete this comment. \n 'Cancel' to stop, 'OK' to delete.")) . "') ){return true;}return false;\">" . __('Delete') . "</a>\n"; ?>
</div>
<div id="publishing-action">
-<input type="submit" name="save" value="<?php _e('Update Comment'); ?>" tabindex="4" class="button-primary" />
+<input type="submit" name="save" value="<?php esc_attr_e('Update Comment'); ?>" tabindex="4" class="button-primary" />
</div>
<div class="clear"></div>
</div>
</div>
</div>
-<div id="post-body" class="has-sidebar">
-<div id="post-body-content" class="has-sidebar-content">
-
+<div id="post-body">
+<div id="post-body-content">
<div id="namediv" class="stuffbox">
<h3><label for="name"><?php _e( 'Author' ) ?></label></h3>
<div class="inside">
-<table class="form-table">
+<table class="form-table editcomment">
<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>
+ <td><input type="text" name="newcomment_author" size="30" value="<?php echo esc_attr( $comment->comment_author ); ?>" tabindex="1" id="name" /></td>
</tr>
<tr valign="top">
<td class="first">
_e( 'E-mail:' );
}
?></td>
- <td><input type="text" name="newcomment_author_email" size="30" value="<?php echo $email; ?>" tabindex="2" id="email" /></td>
+ <td><input type="text" name="newcomment_author_email" size="30" value="<?php echo esc_attr($email); ?>" tabindex="2" id="email" /></td>
</tr>
<tr valign="top">
<td class="first">
} 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>
+ <td><input type="text" id="newcomment_author_url" name="newcomment_author_url" size="30" class="code" value="<?php echo esc_attr($url); ?>" tabindex="3" /></td>
</tr>
</tbody>
</table>
<?php do_meta_boxes('comment', 'normal', $comment); ?>
-<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 clean_url(stripslashes(wp_get_referer())); ?>" />
+<input type="hidden" name="c" value="<?php echo esc_attr($comment->comment_ID) ?>" />
+<input type="hidden" name="p" value="<?php echo esc_attr($comment->comment_post_ID) ?>" />
+<input name="referredby" type="hidden" id="referredby" value="<?php echo esc_url(stripslashes(wp_get_referer())); ?>" />
<?php wp_original_referer_field(true, 'previous'); ?>
<input type="hidden" name="noredir" value="1" />
<div class="wrap nosubsub">
<?php screen_icon(); ?>
-<h2><?php echo wp_specialchars( $title );
+<h2><?php echo esc_html( $title );
if ( isset($_GET['s']) && $_GET['s'] )
- printf( '<span class="subtitle">' . __('Search results for “%s”') . '</span>', wp_specialchars( stripslashes($_GET['s']) ) ); ?>
+ printf( '<span class="subtitle">' . __('Search results for “%s”') . '</span>', esc_html( stripslashes($_GET['s']) ) ); ?>
</h2>
<?php if ( isset($_GET['message']) && ( $msg = (int) $_GET['message'] ) ) : ?>
<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" />
+ <label class="screen-reader-text" for="link-category-search-input"><?php _e( 'Search Categories' ); ?>:</label>
+ <input type="text" id="link-category-search-input" name="s" value="<?php _admin_search_query(); ?>" />
+ <input type="submit" value="<?php esc_attr_e( 'Search Categories' ); ?>" class="button" />
</p>
</form>
<br class="clear" />
<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" />
+<input type="submit" value="<?php esc_attr_e('Apply'); ?>" name="doaction" id="doaction" class="button-secondary action" />
<?php wp_nonce_field('bulk-link-categories'); ?>
</div>
<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" />
+<input type="submit" value="<?php esc_attr_e('Apply'); ?>" name="doaction2" id="doaction2" class="button-secondary action" />
</div>
<br class="clear" />
$category = (object) array(); $category->parent = 0; do_action('add_link_category_form_pre', $category); ?>
<div class="form-wrap">
-<h3><?php _e('Add Category'); ?></h3>
+<h3><?php _e('Add Link 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>
+ <label for="name"><?php _e('Link Category name') ?></label>
<input name="name" id="name" type="text" value="" size="40" aria-required="true" />
</div>
<div class="form-field">
- <label for="slug"><?php _e('Category slug') ?></label>
+ <label for="slug"><?php _e('Link 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>
<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>
+<p class="submit"><input type="submit" class="button" name="submit" value="<?php esc_attr_e('Add Category'); ?>" /></p>
<?php do_action('edit_link_category_form', $category); ?>
</form>
</div>
</div><!-- /col-container -->
</div><!-- /wrap -->
-<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'); ?>
<?php echo $heading ?>
<div id="ajax-response"></div>
<?php echo $form ?>
-<input type="hidden" name="action" value="<?php echo $action ?>" />
-<input type="hidden" name="cat_ID" value="<?php echo $category->term_id ?>" />
+<input type="hidden" name="action" value="<?php echo esc_attr($action) ?>" />
+<input type="hidden" name="cat_ID" value="<?php echo esc_attr($category->term_id) ?>" />
<?php wp_original_referer_field(true, 'previous'); wp_nonce_field($nonce_action); ?>
<table class="form-table">
<tr class="form-field form-required">
- <th scope="row" valign="top"><label for="name"><?php _e('Category name') ?></label></th>
- <td><input name="name" id="name" type="text" value="<?php echo $category->name; ?>" size="40" aria-required="true" /></td>
+ <th scope="row" valign="top"><label for="name"><?php _e('Link Category name') ?></label></th>
+ <td><input name="name" id="name" type="text" value="<?php echo esc_attr($category->name); ?>" size="40" aria-required="true" /></td>
</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" /><br />
+ <th scope="row" valign="top"><label for="slug"><?php _e('Link Category slug') ?></label></th>
+ <td><input name="slug" id="slug" type="text" value="<?php echo esc_attr(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">
<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-primary" name="submit" value="<?php echo $submit_text ?>" /></p>
+<p class="submit"><input type="submit" class="button-primary" name="submit" value="<?php echo esc_attr($submit_text) ?>" /></p>
<?php do_action('edit_link_category_form', $category); ?>
</form>
</div>
scripts.mit.edu / autoinstalls / wordpress.git / commitdiff
