diff options
Diffstat (limited to 'wp-admin')
| -rw-r--r-- | wp-admin/admin-functions.php | 118 | ||||
| -rw-r--r-- | wp-admin/comment.php | 127 | ||||
| -rw-r--r-- | wp-admin/edit-comments.php | 14 | ||||
| -rw-r--r-- | wp-admin/edit-form-comment.php | 4 | ||||
| -rw-r--r-- | wp-admin/edit-page-form.php | 3 | ||||
| -rw-r--r-- | wp-admin/edit.php | 4 | ||||
| -rw-r--r-- | wp-admin/import/wordpress.php | 27 | ||||
| -rw-r--r-- | wp-admin/install-rtl.css | 6 | ||||
| -rw-r--r-- | wp-admin/link-add.php | 8 | ||||
| -rw-r--r-- | wp-admin/menu-header.php | 10 | ||||
| -rw-r--r-- | wp-admin/moderation.php | 2 | ||||
| -rw-r--r-- | wp-admin/options.php | 36 | ||||
| -rw-r--r-- | wp-admin/post-new.php | 2 | ||||
| -rw-r--r-- | wp-admin/profile-update.php | 8 | ||||
| -rw-r--r-- | wp-admin/profile.php | 5 | ||||
| -rw-r--r-- | wp-admin/rtl.css | 143 | ||||
| -rw-r--r-- | wp-admin/upload-js.php | 2 | ||||
| -rw-r--r-- | wp-admin/upload-rtl.css | 42 | ||||
| -rw-r--r-- | wp-admin/upload.css | 2 | ||||
| -rw-r--r-- | wp-admin/user-edit.php | 2 | ||||
| -rw-r--r-- | wp-admin/wp-admin.css | 6 |
21 files changed, 329 insertions, 242 deletions
diff --git a/wp-admin/admin-functions.php b/wp-admin/admin-functions.php index cedf1a7..0f80efd 100644 --- a/wp-admin/admin-functions.php +++ b/wp-admin/admin-functions.php @@ -122,12 +122,12 @@ function fix_attachment_links($post_ID) { return; $i = 0; - $search = "# id=(\"|')p(\d+)\\1#i"; + $search = "#[\s]+rel=(\"|')(.*?)wp-att-(\d+)\\1#i"; foreach ( $anchor_matches[0] as $anchor ) { if ( 0 == preg_match($search, $anchor, $id_matches) ) continue; - $id = $id_matches[2]; + $id = $id_matches[3]; // While we have the attachment ID, let's adopt any orphans. $attachment = & get_post($id, ARRAY_A); @@ -287,12 +287,10 @@ function edit_comment() { // Get an existing post and format it for editing. function get_post_to_edit($id) { - global $richedit; - $richedit = ( 'true' == get_user_option('rich_editing') ) ? true : false; $post = get_post($id); - $post->post_content = format_to_edit($post->post_content, $richedit); + $post->post_content = format_to_edit($post->post_content, user_can_richedit()); $post->post_content = apply_filters('content_edit_pre', $post->post_content); $post->post_excerpt = format_to_edit($post->post_excerpt); @@ -350,12 +348,9 @@ function get_default_post_to_edit() { } function get_comment_to_edit($id) { - global $richedit; - $richedit = ( 'true' == get_user_option('rich_editing') ) ? true : false; - $comment = get_comment($id); - $comment->comment_content = format_to_edit($comment->comment_content, $richedit); + $comment->comment_content = format_to_edit($comment->comment_content, user_can_richedit()); $comment->comment_content = apply_filters('comment_edit_pre', $comment->comment_content); $comment->comment_author = format_to_edit($comment->comment_author); @@ -993,6 +988,18 @@ function list_meta($meta) { $style = ''; if ('_' == $entry['meta_key'] { 0 }) $style .= ' hidden'; + + if ( is_serialized($entry['meta_value']) ) { + if ( is_serialized_string($entry['meta_value']) ) { + // this is a serialized string, so we should display it + $entry['meta_value'] = maybe_unserialize($entry['meta_value']); + } else { + // this is a serialized array/object so we should NOT display it + --$count; + continue; + } + } + $key_js = js_escape($entry['meta_key']); $entry['meta_key'] = wp_specialchars( $entry['meta_key'], true ); $entry['meta_value'] = wp_specialchars( $entry['meta_value'], true ); @@ -1024,12 +1031,14 @@ function get_meta_keys() { function meta_form() { global $wpdb; + $limit = (int) apply_filters('postmeta_form_limit', 30); $keys = $wpdb->get_col(" - SELECT meta_key - FROM $wpdb->postmeta - GROUP BY meta_key - ORDER BY meta_id DESC - LIMIT 10"); + SELECT meta_key + FROM $wpdb->postmeta + GROUP BY meta_key + ORDER BY meta_id DESC + LIMIT $limit"); + natcasesort($keys); ?> <h3><?php _e('Add a new custom field:') ?></h3> <table id="newmeta" cellspacing="3" cellpadding="3"> @@ -1039,12 +1048,12 @@ function meta_form() { </tr> <tr valign="top"> <td align="right" width="18%"> -<?php if ($keys) : ?> +<?php if ( $keys ) : ?> <select id="metakeyselect" name="metakeyselect" tabindex="7"> <option value="#NONE#"><?php _e('- Select -'); ?></option> <?php - foreach ($keys as $key) { + foreach ( $keys as $key ) { $key = wp_specialchars($key, 1); echo "\n\t<option value='$key'>$key</option>"; } @@ -1068,7 +1077,8 @@ function add_meta($post_ID) { $metakeyselect = $wpdb->escape(stripslashes(trim($_POST['metakeyselect']))); $metakeyinput = $wpdb->escape(stripslashes(trim($_POST['metakeyinput']))); - $metavalue = $wpdb->escape(stripslashes(trim($_POST['metavalue']))); + $metavalue = maybe_serialize(stripslashes((trim($_POST['metavalue'])))); + $metavalue = $wpdb->escape($metavalue); if ( ('0' === $metavalue || !empty ($metavalue)) && ((('#NONE#' != $metakeyselect) && !empty ($metakeyselect)) || !empty ($metakeyinput)) ) { // We have a key/value pair. If both the select and the @@ -1099,8 +1109,9 @@ function delete_meta($mid) { function update_meta($mid, $mkey, $mvalue) { global $wpdb; + $mvalue = maybe_serialize(stripslashes($mvalue)); + $mvalue = $wpdb->escape($mvalue); $mid = (int) $mid; - return $wpdb->query("UPDATE $wpdb->postmeta SET meta_key = '$mkey', meta_value = '$mvalue' WHERE meta_id = '$mid'"); } @@ -1108,7 +1119,10 @@ function get_post_meta_by_id($mid) { global $wpdb; $mid = (int) $mid; - return $wpdb->get_row("SELECT * FROM $wpdb->postmeta WHERE meta_id = '$mid'"); + $meta = $wpdb->get_row("SELECT * FROM $wpdb->postmeta WHERE meta_id = '$mid'"); + if ( is_serialized_string($meta->meta_value) ) + $meta->meta_value = maybe_unserialize($meta->meta_value); + return $meta; } function touch_time($edit = 1, $for_post = 1) { @@ -1936,11 +1950,21 @@ function wp_import_cleanup($id) { } function wp_import_upload_form($action) { + $size = strtolower( ini_get('upload_max_filesize') ); + $bytes = 0; + if ( strstr( $size, 'k' ) ) + $bytes = $size * 1024; + if ( strstr( $size, 'm' ) ) + $bytes = $size * 1024 * 1024; + if ( strstr( $size, 'g' ) ) + $bytes = $size * 1024 * 1024 * 1024; ?> <form enctype="multipart/form-data" id="import-upload-form" method="post" action="<?php echo $action ?>"> <p> -<label for="upload"><?php _e('Choose a file from your computer:'); ?></label> <input type="file" id="upload" name="import" size="25" /> +<label for="upload"><?php _e('Choose a file from your computer:'); ?></label> (<?php printf( __('Maximum size: %s'), $size ); ?>) +<input type="file" id="upload" name="import" size="25" /> <input type="hidden" name="action" value="save" /> +<input type="hidden" name="max_file_size" value="<?php echo $bytes; ?>" /> </p> <p class="submit"> <input type="submit" value="<?php _e('Upload file and import'); ?> »" /> @@ -1996,11 +2020,11 @@ function the_attachment_links($id = false) { <?php if ( $icon ) : ?> <tr> <th scope="row"><?php $thumb ? _e('Thumbnail linked to file') : _e('Image linked to file'); ?></th> - <td><textarea rows="1" cols="40" type="text" class="attachmentlinks" readonly="readonly"><a href="<?php echo $post->guid; ?>" id="<?php echo $post->ID ?>"><?php echo $icon ?></a></textarea></td> + <td><textarea rows="1" cols="40" type="text" class="attachmentlinks" readonly="readonly"><a href="<?php echo $post->guid; ?>"><?php echo $icon ?></a></textarea></td> </tr> <tr> <th scope="row"><?php $thumb ? _e('Thumbnail linked to page') : _e('Image linked to file'); ?></th> - <td><textarea rows="1" cols="40" type="text" class="attachmentlinks" readonly="readonly"><a href="<?php echo get_attachment_link($post->ID) ?>" rel="attachment" id="<?php echo $post->ID ?>"><?php echo $icon ?></a></textarea></td> + <td><textarea rows="1" cols="40" type="text" class="attachmentlinks" readonly="readonly"><a href="<?php echo get_attachment_link($post->ID) ?>" rel="attachment wp-att-<?php echo $post->ID; ?>"><?php echo $icon ?></a></textarea></td> </tr> <?php else : ?> <tr> @@ -2009,7 +2033,7 @@ function the_attachment_links($id = false) { </tr> <tr> <th scope="row"><?php _e('Link to page') ?></th> - <td><textarea rows="1" cols="40" type="text" class="attachmentlinks" readonly="readonly"><a href="<?php echo get_attachment_link($post->ID) ?>" rel="attachment" id="<?php echo $post->ID ?>"><?php the_title(); ?></a></textarea></td> + <td><textarea rows="1" cols="40" type="text" class="attachmentlinks" readonly="readonly"><a href="<?php echo get_attachment_link($post->ID) ?>" rel="attachment wp-att-<?php echo $post->ID ?>"><?php the_title(); ?></a></textarea></td> </tr> <?php endif; ?> </table> @@ -2139,4 +2163,52 @@ The Webmaster" ); } add_action('update_option_new_admin_email', 'update_option_new_admin_email', 10, 2); + +function wp_crop_image($src_file, $src_x, $src_y, $src_w, $src_h, $dst_w, $dst_h, $src_abs = false, $dst_file = false) { + if ( ctype_digit($src_file) ) // Handle int as attachment ID + $src_file = get_attached_file($src_file); + + $src = wp_load_image($src_file); + + if ( !is_resource($src) ) + return $src; + + $dst = imagecreatetruecolor($dst_w, $dst_h); + + if ( $src_abs ) { + $src_w -= $src_x; + $src_h -= $src_y; + } + + imageantialias($dst, true); + imagecopyresampled($dst, $src, 0, 0, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h); + + if ( !$dst_file ) + $dst_file = str_replace(basename($src_file), 'cropped-'.basename($src_file), $src_file); + + $dst_file = preg_replace('/\\.[^\\.]+$/', '.jpg', $dst_file); + + if ( imagejpeg($dst, $dst_file) ) + return $dst_file; + else + return false; +} + +function wp_load_image($file) { + if ( ctype_digit($file) ) + $file = get_attached_file($file); + + if ( !file_exists($file) ) + return "File '$file' doesn't exist?"; + + $contents = file_get_contents($file); + + $image = imagecreatefromstring($contents); + + if ( !is_resource($image) ) + return "File '$file' is not image?"; + + return $image; +} + ?> diff --git a/wp-admin/comment.php b/wp-admin/comment.php index 6589d8b..065bd39 100644 --- a/wp-admin/comment.php +++ b/wp-admin/comment.php @@ -12,11 +12,10 @@ if ( isset( $_POST['deletecomment'] ) ) switch($action) { case 'editcomment': $title = __('Edit Comment'); - if ( user_can_richedit() ) - wp_enqueue_script( 'wp_tiny_mce' ); + require_once ('admin-header.php'); - $comment = (int) $_GET['comment']; + $comment = (int) $_GET['c']; if ( ! $comment = get_comment($comment) ) wp_die(sprintf(__('Oops, no comment with this ID. <a href="%s">Go back</a>!'), 'javascript:history.go(-1)')); @@ -30,75 +29,99 @@ case 'editcomment': break; -case 'confirmdeletecomment': -case 'mailapprovecomment': +case 'cdc': +case 'mac': require_once('./admin-header.php'); - $comment = (int) $_GET['comment']; - $p = (int) $_GET['p']; - $formaction = 'confirmdeletecomment' == $action ? 'deletecomment' : 'approvecomment'; - $nonce_action = 'confirmdeletecomment' == $action ? 'delete-comment_' : 'approve-comment_'; + $comment = (int) $_GET['c']; + $formaction = 'cdc' == $action ? 'deletecomment' : 'approvecomment'; + $nonce_action = 'cdc' == $action ? 'delete-comment_' : 'approve-comment_'; $nonce_action .= $comment; if ( ! $comment = get_comment($comment) ) wp_die(sprintf(__('Oops, no comment with this ID. <a href="%s">Go back</a>!'), 'edit.php')); if ( !current_user_can('edit_post', $comment->comment_post_ID) ) - wp_die( 'confirmdeletecomment' == $action ? __('You are not allowed to delete comments on this post.') : __('You are not allowed to edit comments on this post, so you cannot approve this comment.') ); - - echo "<div class='wrap'>\n"; - if ( 'spam' == $_GET['delete_type'] ) - echo "<p>" . __('<strong>Caution:</strong> You are about to mark the following comment as spam:') . "</p>\n"; - elseif ( 'confirmdeletecomment' == $action ) - echo "<p>" . __('<strong>Caution:</strong> You are about to delete the following comment:') . "</p>\n"; - else - echo "<p>" . __('<strong>Caution:</strong> You are about to approve the following comment:') . "</p>\n"; - echo "<table border='0'>\n"; - echo "<tr><td>" . __('Author:') . "</td><td>$comment->comment_author</td></tr>\n"; - echo "<tr><td>" . __('E-mail:') . "</td><td>$comment->comment_author_email</td></tr>\n"; - echo "<tr><td>". __('URL:') . "</td><td>$comment->comment_author_url</td></tr>\n"; - echo "<tr><td>". __('Comment:') . "</td><td>$comment->comment_content</td></tr>\n"; - echo "</table>\n"; - echo "<p>" . __('Are you sure you want to do that?') . "</p>\n"; - - echo "<form action='".get_option('siteurl')."/wp-admin/comment.php' method='get'>\n"; - wp_nonce_field($nonce_action); - echo "<input type='hidden' name='action' value='$formaction' />\n"; - if ( 'spam' == $_GET['delete_type'] ) - echo "<input type='hidden' name='delete_type' value='spam' />\n"; - echo "<input type='hidden' name='p' value='$p' />\n"; - echo "<input type='hidden' name='comment' value='{$comment->comment_ID}' />\n"; - echo "<input type='hidden' name='noredir' value='1' />\n"; - echo "<input type='submit' value='" . __('Yes') . "' />"; - echo " "; - echo "<input type='button' value='" . __('No') . "' onclick=\"self.location='". get_option('siteurl') ."/wp-admin/edit-comments.php';\" />\n"; - echo "</form>\n"; - echo "</div>\n"; - + wp_die( 'cdc' == $action ? __('You are not allowed to delete comments on this post.') : __('You are not allowed to edit comments on this post, so you cannot approve this comment.') ); +?> +<div class='wrap'> + +<div class="narrow"> +<?php if ( 'spam' == $_GET['dt'] ) { ?> +<p><?php _e('<strong>Caution:</strong> You are about to mark the following comment as spam:'); ?></p> +<?php } elseif ( 'cdc' == $action ) { ?> +<p><?php _e('<strong>Caution:</strong> You are about to delete the following comment:'); ?></p> +<?php } else { ?> +<p><?php _e('<strong>Caution:</strong> You are about to approve the following comment:'); ?></p> +<?php } ?> + +<p><?php _e('Are you sure you want to do that?'); ?></p> + +<form action='<?php echo get_option('siteurl'); ?>/wp-admin/comment.php' method='get'> + +<table width="100%"> +<tr> +<td><input type='button' value='<?php _e('No'); ?>' onclick="self.location='<?php echo get_option('siteurl'); ?>/wp-admin/edit-comments.php';" /></td> +<td align="right"><input type='submit' value='<?php _e('Yes'); ?>' /></td> +</tr> +</table> + +<?php wp_nonce_field($nonce_action); ?> +<input type='hidden' name='action' value='<?php echo $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='noredir' value='1' /> +</form> + +<table class="editform" cellpadding="5"> +<tr class="alt"> +<th scope="row"><?php _e('Author:'); ?></th> +<td><?php echo $comment->comment_author; ?></td> +</tr> +<?php if ( $comment->comment_author_email ) { ?> +<tr> +<th scope="row"><?php _e('E-mail:'); ?></th> +<td><?php echo $comment->comment_author_email; ?></td> +</tr> +<?php } ?> +<?php if ( $comment->comment_author_url ) { ?> +<tr> +<th scope="row"><?php _e('URL:'); ?></th> +<td><?php echo $comment->comment_author_url; ?></td> +</tr> +<?php } ?> +<tr> +<th scope="row" valign="top"><p><?php _e('Comment:'); ?></p></th> +<td><?php echo apply_filters( 'comment_text', $comment->comment_content ); ?></td> +</tr> +</table> + +</div> +</div> +<?php break; case 'deletecomment': - $comment = (int) $_REQUEST['comment']; + $comment = (int) $_REQUEST['c']; check_admin_referer('delete-comment_' . $comment); - $p = (int) $_REQUEST['p']; if ( isset($_REQUEST['noredir']) ) { $noredir = true; } else { $noredir = false; } - $postdata = get_post($p) or - wp_die(sprintf(__('Oops, no post with this ID. <a href="%s">Go back</a>!'), 'edit.php')); - if ( ! $comment = get_comment($comment) ) wp_die(sprintf(__('Oops, no comment with this ID. <a href="%s">Go back</a>!'), 'edit-comments.php')); if ( !current_user_can('edit_post', $comment->comment_post_ID) ) wp_die( __('You are not allowed to edit comments on this post.') ); - if ( 'spam' == $_REQUEST['delete_type'] ) + if ( 'spam' == $_REQUEST['dt'] ) wp_set_comment_status($comment->comment_ID, 'spam'); else wp_delete_comment($comment->comment_ID); @@ -112,10 +135,9 @@ case 'deletecomment': break; case 'unapprovecomment': - $comment = (int) $_GET['comment']; + $comment = (int) $_GET['c']; check_admin_referer('unapprove-comment_' . $comment); - - $p = (int) $_GET['p']; + if (isset($_GET['noredir'])) { $noredir = true; } else { @@ -133,16 +155,15 @@ case 'unapprovecomment': if ((wp_get_referer() != "") && (false == $noredir)) { wp_redirect(wp_get_referer()); } else { - wp_redirect(get_option('siteurl') .'/wp-admin/edit.php?p='.$p.'&c=1#comments'); + wp_redirect(get_option('siteurl') .'/wp-admin/edit.php?p='.$comment->comment_post_ID.'&c=1#comments'); } exit(); break; case 'approvecomment': - $comment = (int) $_GET['comment']; + $comment = (int) $_GET['c']; check_admin_referer('approve-comment_' . $comment); - $p = (int) $_GET['p']; if (isset($_GET['noredir'])) { $noredir = true; } else { @@ -164,7 +185,7 @@ case 'approvecomment': if ((wp_get_referer() != "") && (false == $noredir)) { wp_redirect(wp_get_referer()); } else { - wp_redirect(get_option('siteurl') .'/wp-admin/edit.php?p='.$p.'&c=1#comments'); + wp_redirect(get_option('siteurl') .'/wp-admin/edit.php?p='.$comment->comment_post_ID.'&c=1#comments'); } exit(); break; diff --git a/wp-admin/edit-comments.php b/wp-admin/edit-comments.php index ae23c63..6227ef7 100644 --- a/wp-admin/edit-comments.php +++ b/wp-admin/edit-comments.php @@ -118,13 +118,13 @@ if ('view' == $mode) { <p><?php comment_date('M j, g:i A'); ?> — [ <?php if ( current_user_can('edit_post', $comment->comment_post_ID) ) { - echo " <a href='comment.php?action=editcomment&comment=".$comment->comment_ID."'>" . __('Edit') . '</a>'; - echo ' | <a href="' . wp_nonce_url('comment.php?action=deletecomment&p=' . $comment->comment_post_ID . '&comment=' . $comment->comment_ID, 'delete-comment_' . $comment->comment_ID) . '" onclick="return deleteSomething( \'comment\', ' . $comment->comment_ID . ', \'' . sprintf(__("You are about to delete this comment by "%s".\\n"Cancel" to stop, "OK" to delete."), js_escape($comment->comment_author)) . "', theCommentList );\">" . __('Delete') . '</a> '; + echo " <a href='comment.php?action=editcomment&c=".$comment->comment_ID."'>" . __('Edit') . '</a>'; + echo ' | <a href="' . wp_nonce_url('comment.php?action=deletecomment&p=' . $comment->comment_post_ID . '&c=' . $comment->comment_ID, 'delete-comment_' . $comment->comment_ID) . '" onclick="return deleteSomething( \'comment\', ' . $comment->comment_ID . ', \'' . sprintf(__("You are about to delete this comment by "%s".\\n"Cancel" to stop, "OK" to delete."), js_escape($comment->comment_author)) . "', theCommentList );\">" . __('Delete') . '</a> '; if ( ('none' != $comment_status) && ( current_user_can('moderate_comments') ) ) { - echo '<span class="unapprove"> | <a href="' . wp_nonce_url('comment.php?action=unapprovecomment&p=' . $comment->comment_post_ID . '&comment=' . $comment->comment_ID, 'unapprove-comment_' . $comment->comment_ID) . '" onclick="return dimSomething( \'comment\', ' . $comment->comment_ID . ', \'unapproved\', theCommentList );">' . __('Unapprove') . '</a> </span>'; - echo '<span class="approve"> | <a href="' . wp_nonce_url('comment.php?action=approvecomment&p=' . $comment->comment_post_ID . '&comment=' . $comment->comment_ID, 'approve-comment_' . $comment->comment_ID) . '" onclick="return dimSomething( \'comment\', ' . $comment->comment_ID . ', \'unapproved\', theCommentList );">' . __('Approve') . '</a> </span>'; + echo '<span class="unapprove"> | <a href="' . wp_nonce_url('comment.php?action=unapprovecomment&p=' . $comment->comment_post_ID . '&c=' . $comment->comment_ID, 'unapprove-comment_' . $comment->comment_ID) . '" onclick="return dimSomething( \'comment\', ' . $comment->comment_ID . ', \'unapproved\', theCommentList );">' . __('Unapprove') . '</a> </span>'; + echo '<span class="approve"> | <a href="' . wp_nonce_url('comment.php?action=approvecomment&p=' . $comment->comment_post_ID . '&c=' . $comment->comment_ID, 'approve-comment_' . $comment->comment_ID) . '" onclick="return dimSomething( \'comment\', ' . $comment->comment_ID . ', \'unapproved\', theCommentList );">' . __('Approve') . '</a> </span>'; } - echo " | <a href=\"" . wp_nonce_url("comment.php?action=deletecomment&delete_type=spam&p=" . $comment->comment_post_ID . "&comment=" . $comment->comment_ID, 'delete-comment_' . $comment->comment_ID) . "\" onclick=\"return deleteSomething( 'comment-as-spam', $comment->comment_ID, '" . sprintf(__("You are about to mark as spam this comment by "%s".\\n"Cancel" to stop, "OK" to mark as spam."), js_escape( $comment->comment_author)) . "', theCommentList );\">" . __('Spam') . "</a> "; + echo " | <a href=\"" . wp_nonce_url("comment.php?action=deletecomment&dt=spam&p=" . $comment->comment_post_ID . "&c=" . $comment->comment_ID, 'delete-comment_' . $comment->comment_ID) . "\" onclick=\"return deleteSomething( 'comment-as-spam', $comment->comment_ID, '" . sprintf(__("You are about to mark as spam this comment by "%s".\\n"Cancel" to stop, "OK" to mark as spam."), js_escape( $comment->comment_author)) . "', theCommentList );\">" . __('Spam') . "</a> "; } $post = get_post($comment->comment_post_ID); $post_title = wp_specialchars( $post->post_title, 'double' ); @@ -183,9 +183,9 @@ $post_title = ('' == $post_title) ? "# $comment->comment_post_ID" : $post_title; <?php } ?> </td> <td><?php if ( current_user_can('edit_post', $comment->comment_post_ID) ) { - echo "<a href='comment.php?action=editcomment&comment=$comment->comment_ID' class='edit'>" . __('Edit') . "</a>"; } ?></td> + echo "<a href='comment.php?action=editcomment&c=$comment->comment_ID' class='edit'>" . __('Edit') . "</a>"; } ?></td> <td><?php if ( current_user_can('edit_post', $comment->comment_post_ID) ) { - echo "<a href=\"comment.php?action=deletecomment&p=".$comment->comment_post_ID."&comment=".$comment->comment_ID."\" onclick=\"return deleteSomething( 'comment', $comment->comment_ID, '" . sprintf(__("You are about to delete this comment by "%s".\\n"Cancel" to stop, "OK" to delete."), js_escape( $comment->comment_author )) . "', theCommentList );\" class='delete'>" . __('Delete') . "</a> "; + echo "<a href=\"comment.php?action=deletecomment&p=".$comment->comment_post_ID."&c=".$comment->comment_ID."\" onclick=\"return deleteSomething( 'comment', $comment->comment_ID, '" . sprintf(__("You are about to delete this comment by "%s".\\n"Cancel" to stop, "OK" to delete."), js_escape( $comment->comment_author )) . "', theCommentList );\" class='delete'>" . __('Delete') . "</a> "; } ?></td> </tr> <?php diff --git a/wp-admin/edit-form-comment.php b/wp-admin/edit-form-comment.php index 26d79eb..893e3f7 100644 --- a/wp-admin/edit-form-comment.php +++ b/wp-admin/edit-form-comment.php @@ -36,7 +36,7 @@ addLoadEvent(focusit); </div> </fieldset> -<fieldset id="<?php echo user_can_richedit() ? 'commentdivrich' : 'commentdiv'; ?>" style="clear: both;"> +<fieldset style="clear: both;"> <legend><?php _e('Comment') ?></legend> <?php the_editor($comment->comment_content, 'content', 'newcomment_author_url'); ?> </fieldset> @@ -68,7 +68,7 @@ addLoadEvent(focusit); <tr> <th scope="row" valign="top"><?php _e('Delete'); $delete_nonce = wp_create_nonce( 'delete-comment_' . $comment->comment_ID ); ?>:</th> <td><input name="deletecomment" class="button delete" type="submit" id="deletecomment" tabindex="10" value="<?php _e('Delete this comment') ?>" <?php echo "onclick=\"if ( confirm('" . __("You are about to delete this comment \\n \'Cancel\' to stop, \'OK\' to delete.") . "') ) { document.forms.post._wpnonce.value = '$delete_nonce'; return true; } return false;\""; ?> /> - <input type="hidden" name="comment" value="<?php echo $comment->comment_ID ?>" /> + <input type="hidden" name="c" value="<?php echo $comment->comment_ID ?>" /> <input type="hidden" name="p" value="<?php echo $comment->comment_post_ID ?>" /> <input type="hidden" name="noredir" value="1" /> </td> diff --git a/wp-admin/edit-page-form.php b/wp-admin/edit-page-form.php index 2e4c19b..ae52683 100644 --- a/wp-admin/edit-page-form.php +++ b/wp-admin/edit-page-form.php @@ -1,7 +1,6 @@ <div class="wrap"> -<h2 id="write-post"><?php _e('Write Page'); ?><?php if ( 0 != $post_ID ) : ?> -<small class="quickjump"><a href="#preview-post"><?php _e('preview ↓'); ?></a></small><?php endif; ?></h2> +<h2 id="write-post"><?php _e('Write Page'); ?></h2> <?php if (0 == $post_ID) { $form_action = 'post'; diff --git a/wp-admin/edit.php b/wp-admin/edit.php index bd570d0..e96b6d0 100644 --- a/wp-admin/edit.php +++ b/wp-admin/edit.php @@ -282,13 +282,13 @@ foreach ($comments as $comment) { <p><?php comment_date('M j, g:i A'); ?> — [ <?php if ( current_user_can('edit_post', $comment->comment_post_ID) ) { - echo " <a href='comment.php?action=editcomment&comment=".$comment->comment_ID."\'>" . __('Edit') . '</a>'; + echo " <a href='comment.php?action=editcomment&c=".$comment->comment_ID."\'>" . __('Edit') . '</a>'; echo ' | <a href="' . wp_nonce_url('comment.php?action=deletecomment&p=' . $post->ID . '&comment=' . $comment->comment_ID, 'delete-comment_' . $comment->comment_ID) . '" onclick="return deleteSomething( \'comment\', ' . $comment->comment_ID . ', \'' . sprintf(__("You are about to delete this comment by "%s".\\n"Cancel" to stop, "OK" to delete."), js_escape($comment->comment_author)) . "', theCommentList );\">" . __('Delete') . '</a> '; if ( ('none' != $comment_status) && ( current_user_can('moderate_comments') ) ) { echo '<span class="unapprove"> | <a href="' . wp_nonce_url('comment.php?action=unapprovecomment&p=' . $post->ID . '&comment=' . $comment->comment_ID, 'unapprove-comment_' . $comment->comment_ID) . '" onclick="return dimSomething( \'comment\', ' . $comment->comment_ID . ', \'unapproved\', theCommentList );">' . __('Unapprove') . '</a> </span>'; echo '<span class="approve"> | <a href="' . wp_nonce_url('comment.php?action=approvecomment&p=' . $post->ID . '&comment=' . $comment->comment_ID, 'approve-comment_' . $comment->comment_ID) . '" onclick="return dimSomething( \'comment\', ' . $comment->comment_ID . ', \'unapproved\', theCommentList );">' . __('Approve') . '</a> </span>'; } - echo " | <a href=\"" . wp_nonce_url("comment.php?action=deletecomment&delete_type=spam&p=".$comment->comment_post_ID."&comment=".$comment->comment_ID, 'delete-comment_' . $comment->comment_ID) . "\" onclick=\"return deleteSomething( 'comment-as-spam', $comment->comment_ID, '" . sprintf(__("You are about to mark as spam this comment by "%s".\\n"Cancel" to stop, "OK" to mark as spam."), js_escape( $comment->comment_author)) . "', theCommentList );\">" . __('Spam') . "</a> ]"; + echo " | <a href=\"" . wp_nonce_url("comment.php?action=deletecomment&dt=spam&p=".$comment->comment_post_ID."&comment=".$comment->comment_ID, 'delete-comment_' . $comment->comment_ID) . "\" onclick=\"return deleteSomething( 'comment-as-spam', $comment->comment_ID, '" . sprintf(__("You are about to mark as spam this comment by "%s".\\n"Cancel" to stop, "OK" to mark as spam."), js_escape( $comment->comment_author)) . "', theCommentList );\">" . __('Spam') . "</a> ]"; } // end if any comments to show ?> </p> diff --git a/wp-admin/import/wordpress.php b/wp-admin/import/wordpress.php index 46f5892..b850382 100644 --- a/wp-admin/import/wordpress.php +++ b/wp-admin/import/wordpress.php @@ -54,26 +54,10 @@ class WP_Import { //function to check the authorname and do the mapping
function checkauthor($author) {
global $wpdb;
- //mtnames is an array with the names in the mt import file
- $pass = 'changeme';
- if (!(in_array($author, $this->mtnames))) { //a new mt author name is found
- ++ $this->j;
- $this->mtnames[$this->j] = $author; //add that new mt author name to an array
- $user_id = username_exists($this->newauthornames[$this->j]); //check if the new author name defined by the user is a pre-existing wp user
- if (!$user_id) { //banging my head against the desk now.
- if ($newauthornames[$this->j] == 'left_blank') { //check if the user does not want to change the authorname
- $user_id = wp_create_user($author, $pass);
- $this->newauthornames[$this->j] = $author; //now we have a name, in the place of left_blank.
- } else {
- $user_id = wp_create_user($this->newauthornames[$this->j], $pass);
- }
- } else {
- return $user_id; // return pre-existing wp username if it exists
- }
- } else {
- $key = array_search($author, $this->mtnames); //find the array key for $author in the $mtnames array
- $user_id = username_exists($this->newauthornames[$key]); //use that key to get the value of the author's name from $newauthornames
- }
+
+ $map = $_POST['userselect'];
+
+ $user_id = username_exists($map[$author]); //use that key to get the value of the author's name from $newauthornames
return $user_id;
}
@@ -140,7 +124,6 @@ class WP_Import { ?>
<h2><?php _e('Assign Authors'); ?></h2>
<p><?php _e('To make it easier for you to edit and save the imported posts and drafts, you may want to change the name of the author of the posts. For example, you may want to import all the entries as <code>admin</code>s entries.'); ?></p>
-<p><?php _e('If a new user is created by WordPress, the password will be set, by default, to "changeme". Quite suggestive, eh? ;)'); ?></p>
<?php
@@ -151,7 +134,7 @@ class WP_Import { foreach ($authors as $author) {
++ $j;
echo '<li>Current author: <strong>'.$author.'</strong><br />'.'Map to existing: ';
- $this->users_form($author);
+ $this->users_form($j);
echo '</li>';
}
diff --git a/wp-admin/install-rtl.css b/wp-admin/install-rtl.css index 06b67f6..6cf6b34 100644 --- a/wp-admin/install-rtl.css +++ b/wp-admin/install-rtl.css @@ -1 +1,5 @@ -body { font-family: Tahoma, Georgia, "Times New Roman", Times, serif; }
\ No newline at end of file +body { font-family: Tahoma, Georgia, "Times New Roman", Times, serif; } + +ul, ol { padding: 5px 20px 5px 5px; } + +.step, th { text-align: left; } diff --git a/wp-admin/link-add.php b/wp-admin/link-add.php index 087fc45..22dcc64 100644 --- a/wp-admin/link-add.php +++ b/wp-admin/link-add.php @@ -17,7 +17,7 @@ if ( current_user_can( 'manage_categories' ) ) require('admin-header.php'); ?> -<?php if ($_GET['added']) : ?> +<?php if ($_GET['added'] && '' != $_POST['link_name']) : ?> <div id="message" class="updated fade"><p><?php _e('Link added.'); ?></p></div> <?php endif; ?> @@ -26,8 +26,10 @@ require('admin-header.php'); include('edit-link-form.php'); ?> -<div class="wrap"> -<?php printf(__('<p>You can drag <a href="%s" title="Link add bookmarklet">Link This</a> to your toolbar and when you click it a window will pop up that will allow you to add whatever site you’re on to your bookmarks! Right now this only works on Mozilla or Netscape, but we’re working on it.</p>'), "javascript:void(linkmanpopup=window.open('" . get_option('siteurl') . "/wp-admin/link-add.php?action=popup&linkurl='+escape(location.href)+'&name='+escape(document.title),'LinkManager','scrollbars=yes,width=750,height=550,left=15,top=15,status=yes,resizable=yes'));linkmanpopup.focus();window.focus();linkmanpopup.focus();") ?> +<div id="wp-link-bookmarklet" class="wrap"> +<h3><?php _e('Add Link Bookmarklet'); ?></h3> +<p><?php _e('Right click on the following link and choose "Bookmark This Link..." to create an add link shortcut. Right now this only works on Mozilla or Netscape, but we’re working on it.'); ?></p> +<?php printf(__('<p><a href="%s" title="Link add bookmarklet">Link This</a></p>'), "javascript:void(linkmanpopup=window.open('" . get_option('siteurl') . "/wp-admin/link-add.php?action=popup&linkurl='+escape(location.href)+'&name='+escape(document.title),'LinkManager','scrollbars=yes,width=750,height=550,left=15,top=15,status=yes,resizable=yes'));linkmanpopup.focus();window.focus();linkmanpopup.focus();") ?> </div> <?php diff --git a/wp-admin/menu-header.php b/wp-admin/menu-header.php index 8e1d213..d113276 100644 --- a/wp-admin/menu-header.php +++ b/wp-admin/menu-header.php @@ -13,9 +13,9 @@ foreach ($menu as $item) { if ( !empty($submenu[$item[2]]) || current_user_can($item[1]) ) { if ( file_exists(ABSPATH . PLUGINDIR . "/{$item[2]}") ) - echo "\n\t<li><a href='" . get_option('siteurl') . "/wp-admin/admin.php?page={$item[2]}'$class>{$item[0]}</a></li>"; + echo "\n\t<li><a href='admin.php?page={$item[2]}'$class>{$item[0]}</a></li>"; else - echo "\n\t<li><a href='" . get_option('siteurl') . "/wp-admin/{$item[2]}'$class>{$item[0]}</a></li>"; + echo "\n\t<li><a href='{$item[2]}'$class>{$item[0]}</a></li>"; } } @@ -42,11 +42,11 @@ $menu_hook = get_plugin_page_hook($item[2], $parent_file); if (file_exists(ABSPATH . PLUGINDIR . "/{$item[2]}") || ! empty($menu_hook)) { if ( 'admin.php' == $pagenow ) - echo "\n\t<li><a href='" . get_option('siteurl') . "/wp-admin/admin.php?page={$item[2]}'$class>{$item[0]}</a></li>"; + echo "\n\t<li><a href='admin.php?page={$item[2]}'$class>{$item[0]}</a></li>"; else - echo "\n\t<li><a href='" . get_option('siteurl') . "/wp-admin/{$parent_file}?page={$item[2]}'$class>{$item[0]}</a></li>"; + echo "\n\t<li><a href='{$parent_file}?page={$item[2]}'$class>{$item[0]}</a></li>"; } else { - echo "\n\t<li><a href='" . get_option('siteurl') . "/wp-admin/{$item[2]}'$class>{$item[0]}</a></li>"; + echo "\n\t<li><a href='{$item[2]}'$class>{$item[0]}</a></li>"; } endforeach; ?> diff --git a/wp-admin/moderation.php b/wp-admin/moderation.php index 1989368..b9e3f06 100644 --- a/wp-admin/moderation.php +++ b/wp-admin/moderation.php @@ -134,7 +134,7 @@ $i = 0; <p><strong><?php comment_author() ?></strong> <?php if ($comment->comment_author_email) { ?>| <?php comment_author_email_link() ?> <?php } if ($comment->comment_author_url && 'http://' != $comment->comment_author_url) { ?> | <?php comment_author_url_link() ?> <?php } ?>| <?php _e('IP:') ?> <a href="http://ws.arin.net/cgi-bin/whois.pl?queryinput=<?php comment_author_IP() ?>"><?php comment_author_IP() ?></a></p> <?php comment_text() ?> <p><?php comment_date('M j, g:i A'); ?> — [ <?php -echo '<a href="comment.php?action=editcomment&comment='.$comment->comment_ID.'">' . __('Edit') . '</a> | '; +echo '<a href="comment.php?action=editcomment&c='.$comment->comment_ID.'">' . __('Edit') . '</a> | '; echo " <a href=\"post.php?action=deletecomment&p=".$comment->comment_post_ID."&comment=".$comment->comment_ID."\" onclick=\"return deleteSomething( 'comment', $comment->comment_ID, '" . sprintf(__("You are about to delete this comment by "%s".\\n"Cancel" to stop, "OK" to delete."), js_escape($comment->comment_author)) . "', theCommentList );\">" . __('Delete ') . "</a> | "; ?> <?php $post = get_post($comment->comment_post_ID); diff --git a/wp-admin/options.php b/wp-admin/options.php index 33f5acd..ceb4830 100644 --- a/wp-admin/options.php +++ b/wp-admin/options.php @@ -11,9 +11,10 @@ if ( !current_user_can('manage_options') ) wp_die(__('Cheatin’ uh?')); if( $_GET[ 'adminhash' ] ) { - $new_admin_details = get_option( 'new_admin_email' ); + $new_admin_details = get_option( 'adminhash' ); if( is_array( $new_admin_details ) && $new_admin_details[ 'hash' ] == $_GET[ 'adminhash' ] && $new_admin_details[ 'newemail' ] != '' ) { update_option( "admin_email", $new_admin_details[ 'newemail' ] ); + delete_option( "adminhash" ); delete_option( "new_admin_email" ); } wp_redirect( get_option( "siteurl" ) . "/wp-admin/options-general.php?updated=true" ); @@ -24,6 +25,7 @@ function sanitize_option($option, $value) { // Remember to call stripslashes! switch ($option) { case 'admin_email': + case 'new_admin_email': $value = stripslashes($value); $value = sanitize_email($value); break; @@ -137,23 +139,32 @@ if (!is_site_admin()) <table width="98%"> <?php $options = $wpdb->get_results("SELECT * FROM $wpdb->options ORDER BY option_name"); -foreach ( (array) $options as $option ) - $options_to_update[] = $option->option_name; -$options_to_update = implode(',', $options_to_update); -?> - -<input type="hidden" name="page_options" value="<?php echo $options_to_update; ?>" /> -<?php foreach ( (array) $options as $option) : - $value = wp_specialchars($option->option_value, 'single'); + $disabled = ''; + if ( is_serialized($option->option_value) ) { + if ( is_serialized_string($option->option_value) ) { + // this is a serialized string, so we should display it + $value = wp_specialchars(maybe_unserialize($option->option_value), 'single'); + $options_to_update[] = $option->option_name; + $class = 'all-options'; + } else { + $value = 'SERIALIZED DATA'; + $disabled = ' disabled="disabled"'; + $class = 'all-options disabled'; + } + } else { + $value = wp_specialchars($option->option_value, 'single'); + $options_to_update[] = $option->option_name; + $class = 'all-options'; + } echo " <tr> <th scope='row'><label for='$option->option_name'>$option->option_name</label></th> <td>"; - if (stristr($value, "\n")) echo "<textarea class='all-options' name='$option->option_name' id='$option->option_name' cols='30' rows='5'>$value</textarea>"; - else echo "<input class='all-options' type='text' name='$option->option_name' id='$option->option_name' size='30' value='" . $value . "' />"; + if (stristr($value, "\n")) echo "<textarea class='$class' name='$option->option_name' id='$option->option_name' cols='30' rows='5'>$value</textarea>"; + else echo "<input class='$class' type='text' name='$option->option_name' id='$option->option_name' size='30' value='" . $value . "'$disabled />"; echo "</td> <td>$option->option_description</td> @@ -161,7 +172,8 @@ foreach ( (array) $options as $option) : endforeach; ?> </table> -<p class="submit"><input type="submit" name="Update" value="<?php _e('Update Options »') ?>" /></p> +<?php $options_to_update = implode(',', $options_to_update); ?> +<p class="submit"><input type="hidden" name="page_options" value="<?php echo wp_specialchars($options_to_update, true); ?>" /><input type="submit" name="Update" value="<?php _e('Update Options »') ?>" /></p> </form> </div> diff --git a/wp-admin/post-new.php b/wp-admin/post-new.php index 4ecc804..9cbcdc3 100644 --- a/wp-admin/post-new.php +++ b/wp-admin/post-new.php @@ -55,7 +55,7 @@ include('edit-form-advanced.php'); <?php if ( $is_NS4 || $is_gecko || $is_winIE ) { ?> <div id="wp-bookmarklet" class="wrap"> -<h3><?php _e('WordPress bookmarklet'); ?></h3> +<h3><?php _e('WordPress Bookmarklet'); ?></h3> <p><?php _e('Right click on the following link and choose "Add to favorites" to create a posting shortcut.'); ?></p> <p> diff --git a/wp-admin/profile-update.php b/wp-admin/profile-update.php index 944f799..d4fd657 100644 --- a/wp-admin/profile-update.php +++ b/wp-admin/profile-update.php @@ -17,9 +17,11 @@ if ( is_wp_error( $errors ) ) { exit; } -if ( !isset( $_POST['rich_editing'] ) ) - $_POST['rich_editing'] = 'false'; -update_user_option( $current_user->id, 'rich_editing', $_POST['rich_editing'], true ); +if ( rich_edit_exists() ) { + if ( !isset( $_POST['rich_editing'] ) ) + $_POST['rich_editing'] = 'false'; + update_user_option( $current_user->id, 'rich_editing', $_POST['rich_editing'], true ); +} if ( isset( $_POST['primary_blog'] ) ) { $primary_blog = (int) $_POST['primary_blog']; diff --git a/wp-admin/profile.php b/wp-admin/profile.php index cc2506c..f1c38b4 100644 --- a/wp-admin/profile.php +++ b/wp-admin/profile.php @@ -36,6 +36,7 @@ $bookmarklet_height= 440; <?php do_action('profile_personal_options'); ?> <p class="submit"><input type="submit" value="<?php _e('Update Profile »') ?>" name="submit" /></p> +<div style="clear: both"></div> <fieldset> <legend><?php _e('Name'); ?></legend> @@ -88,14 +89,14 @@ $bookmarklet_height= 440; <input type="text" name="yim" value="<?php echo $profileuser->yim ?>" /> </label></p> -<p><label><?php _e('Jabber / Google Talk:') ?> +<p><label><?php _e('Jabber / Google Talk:') ?><br /> <input type="text" name="jabber" value="<?php echo $profileuser->jabber ?>" /></label> </p> </fieldset> <br clear="all" /> <fieldset> <legend><?php _e('About Yourself'); ?></legend> -<p class="desc"><?php _e('Share a little biographical information to fill out your profile. This may be shown publicly.'); ?></p> +<p class="desc"><?php _e('Share a little biographical information. '); ?></p> <p><textarea name="description" rows="5" cols="30"><?php echo $profileuser->description ?></textarea></p> </fieldset> diff --git a/wp-admin/rtl.css b/wp-admin/rtl.css index 2f03a4d..ad4af49 100644 --- a/wp-admin/rtl.css +++ b/wp-admin/rtl.css @@ -1,47 +1,45 @@ -#viewarc, #viewcat, #namediv, #emaildiv, #uridiv, #planetnews li, #login ul li, #your-profile fieldset, .alignleft .available-theme { - float: right -} +#viewarc, #viewcat, #namediv, #emaildiv, #uridiv, #planetnews li, #login ul li, #your-profile fieldset, + #footer .logo, .alignleft .available-theme { float: right; } -#templateside, .alignright { - float: left; -} +#templateside, .alignright { float: left; } -#login, #send, .widefat th { - text-align: right -} +#login #send, .readmore, .widefat th { text-align: right; } -#postcustomsubmit, form#upload th, .submit, .editform th { - text-align: left -} +#postcustomsubmit, form#upload th, .submit, .editform th { text-align: left; } -body, td { - font: 13px Tahoma, "Lucida Grande", "Lucida Sans Unicode", Verdana; -} +#devnews h4, #wphead h1, #your-profile legend, fieldset.options legend, + #planetnews li .post { font-family: Tahoma, Georgia, "Times New Roman", Times, serif; } -fieldset.options legend { - font-family: Tahoma, Georgia, "Times New Roman", Times, serif; -} +#wphead { padding: .8em 2em .8em 19em; } -textarea, input, select { - font: 13px Tahoma, Verdana, Arial, Helvetica, sans-serif; -} +#wphead h1 { font-size: 2.4em; } -.quicktags, .search { - font: 12px Tahoma, Georgia, "Times New Roman", Times, serif; -} +#postdiv , #titlediv, #guiddiv { margin: 0 0 0 8px; } + +#ed_toolbar input { margin: 3px 0 2px 2px; } + +#edButtons input, #edButtons input:active { margin: 0px 0 -1px 2px; } + +body, td { font: 13px Tahoma, "Lucida Grande", "Lucida Sans Unicode", Verdana; } + +h2 { font: normal 32px/5px serif; } -.submit input, .submit input:focus, .button { +textarea, input, select { font: 13px Tahoma, Verdana, Arial, Helvetica, sans-serif; } + +.quicktags, .search { font: 12px Tahoma, Georgia, "Times New Roman", Times, serif; } + +.updated, .confirm { padding: 0 3em 0 1em; } + +.submit input, .submit input:focus, .button, .button:focus { + border-left-color: #999; border-right-color: #ccc; } .submit input:active, .button:active { + border-left-color: #ccc; border-right-color: #999; } -.updated, .confirm { - padding: 0 3em 0 1em; -} - #adminmenu { padding: .2em 2em .3em .2em; height: 30px; @@ -53,29 +51,28 @@ textarea, input, select { float: right; } -#submenu { - height: 21px; - padding: 3px 3em 0 2em; +#adminmenu a.current { + border-right: 0; + border-left: 2px solid #4f96c8; } +#adminmenu li { line-height: 180%; } + +#submenu, #minisub { padding: 3px 3em 0 2em; } + #submenu .current { + border-right: 0; border-left: 2px solid #045290; } #submenu a { - padding: .3em .4em .33em .4em; + padding: .3em .4em .4em .4em; margin: 0 0 0 10px; display: block; float: right; } -#submenu li { - line-height: 100%; -} - -#postdiv , #titlediv, #guiddiv { - margin: 0 0 0 8px; -} +#submenu li { line-height: 120%; } #currenttheme img { float: right; @@ -84,36 +81,24 @@ textarea, input, select { } #postdiv #quicktags { - padding-right: auto; + padding-right: 0; padding-left: 6px; } -#quicktags #ed_toolbar { - padding: 0px 0 0 2px; -} - -#ed_toolbar input { - margin: 3px 0 2px 2px; +.readmore { + margin-right: auto; + margin-left: 5em; } * html #postexcerpt .dbx-toggle-open, * html #postexcerpt .dbx-toggle-open, #postexcerpt div, #attachmentlinks div { - padding-right: auto; + padding-right: 0; padding-left: 8px; } -#login h1 { - left: auto; - right: 137px; -} - -#login h1 a { - display: none; -} - #searchform { float: right; margin-right: auto; - margin-left: 3em; + margin-left: 1em; } #poststuff { @@ -136,15 +121,6 @@ textarea, input, select { left: 1em; } -#wphead { - padding: .8em 2em .8em 19em; -} - -#wphead h1 { - font-size: 2.4em; - font-family: Tahoma, Georgia, "Times New Roman", Times, serif -} - #zeitgeist { float: left; margin-left: auto; @@ -156,37 +132,29 @@ textarea, input, select { padding: 0 .6em 0 0; } -#moremeta fieldset div { - margin: 2px 0px 0 0; +#categorydiv ul { + margin-left: auto; + margin-right: 10px; } + +#moremeta fieldset div { margin: 2px 0px 0 0; } + #moremeta { margin-right: auto; margin-left: 15px; right: auto; left: 5%; } -#categorydiv ul { - margin-left: auto; - margin-right: 10px; -} - -#your-profile legend { - font-family: Tahoma, Georgia, "Times New Roman", Times, serif; -} #moremeta .dbx-content { background: url(images/box-butt.gif) no-repeat bottom left; - padding-right: auto; + padding-right: 0; padding-left: 2px; } -#moremeta .dbx-handle { - background: #2685af url(images/box-head.gif) no-repeat left; -} +#moremeta .dbx-handle { background: #2685af url(images/box-head.gif) no-repeat left; } -#moremeta .dbx-box { - background: url(images/box-bg.gif) repeat-y left; -} +#moremeta .dbx-box { background: url(images/box-bg.gif) repeat-y left; } a.dbx-toggle, a.dbx-toggle:visited { right: auto; @@ -214,10 +182,11 @@ a.dbx-toggle, a.dbx-toggle:visited { } #postdivrich #edButtons { - padding-left: auto; + padding-left: 0; padding-right: 3px; } -#edButtons input, #edButtons input:active { - margin: 0px 0 -1px 2px; +.page-numbers { + margin-right: auto; + margin-left: 3px; } diff --git a/wp-admin/upload-js.php b/wp-admin/upload-js.php index 4d5b21f..c92439f 100644 --- a/wp-admin/upload-js.php +++ b/wp-admin/upload-js.php @@ -221,7 +221,7 @@ addLoadEvent( function() { display = 'full'; if ( 'none' != link ) - h += "<a href='" + ( 'file' == link ? ( this.currentImage.srcBase + this.currentImage.src ) : ( this.currentImage.page + "' rel='attachment" ) ) + "' title='" + this.currentImage.title + "'>"; + h += "<a href='" + ( 'file' == link ? ( this.currentImage.srcBase + this.currentImage.src ) : ( this.currentImage.page + "' rel='attachment wp-att-" + this.currentImage.ID + "'" ) ) + "' title='" + this.currentImage.title + "'>"; if ( display ) h += "<img src='" + ( 'thumb' == display ? ( this.currentImage.thumbBase + this.currentImage.thumb ) : ( this.currentImage.srcBase + this.currentImage.src ) ) + "' alt='" + this.currentImage.title + "' />"; else diff --git a/wp-admin/upload-rtl.css b/wp-admin/upload-rtl.css index b7bb3ae..a085c86 100644 --- a/wp-admin/upload-rtl.css +++ b/wp-admin/upload-rtl.css @@ -1,22 +1,40 @@ -body { font: 13px Tahoma, "Lucida Grande", "Lucida Sans Unicode", Verdana; } +table { float: right; } + +#upload-file th, #the-attachment-links textarea { text-align: left; } -#upload-menu li { margin: 0 .75em 0 0; } +h2 { margin: 0 0 0 .2em; } + +#upload-files li { margin: 0 15px 15px 0; } + +#upload-file-view { padding: 0 75px 0 0; } + +#upload-menu li { + margin: 0 .75em 0 0; + display: block; + float: right; +} #upload-menu .current div { border-right: 0; border-left: 2px solid #448abd; } -#upload-file-view { 0 15px 0 0 } - -#file-title { margin: 0 15px .2em 0; } - -h2 { margin: 0 0 0 .2em; } - -#upload-files li { margin: 0 15px 15px 0; } +#upload-file { + left: auto; + right: 0; +} -table { float: right; } +#file-title { + margin: 0 75px .2em 0; + font-family: Tahoma, Georgia, "Times New Roman", Times, serif; +} -#the-attachment-links { float: left; } +.back { + left: auto; + right: 14px; +} -#th { text-align: left; } +#uploadoptions td { + padding-left: 0; + padding-right: 1em; +} diff --git a/wp-admin/upload.css b/wp-admin/upload.css index 0358471..601f7e7 100644 --- a/wp-admin/upload.css +++ b/wp-admin/upload.css @@ -62,7 +62,7 @@ body { background: #f9fcfe; } background: #f9fcfe; } -#uupload-file th { +#upload-file th { width: 8em; } diff --git a/wp-admin/user-edit.php b/wp-admin/user-edit.php index 164464d..e1bdcc5 100644 --- a/wp-admin/user-edit.php +++ b/wp-admin/user-edit.php @@ -162,7 +162,7 @@ echo $role_list . '</select>'; <input type="text" name="yim" value="<?php echo $profileuser->yim ?>" /> </label></p> -<p><label><?php _e('Jabber / Google Talk:') ?> +<p><label><?php _e('Jabber / Google Talk:') ?><br /> <input type="text" name="jabber" value="<?php echo $profileuser->jabber ?>" /></label> </p> </fieldset> diff --git a/wp-admin/wp-admin.css b/wp-admin/wp-admin.css index 3b8595c..6fcffa8 100644 --- a/wp-admin/wp-admin.css +++ b/wp-admin/wp-admin.css @@ -458,6 +458,10 @@ textarea.all-options, input.all-options { width: 250px; } +input.disabled, textarea.disabled { + background: #ccc; +} + #adminmenu { background: #83B4D8; border-top: 3px solid #448abd; @@ -505,7 +509,6 @@ textarea.all-options, input.all-options { border-bottom: none; margin: 0; padding: 3px 2em 0 3em; - height: 25px; } #minisub { @@ -533,6 +536,7 @@ textarea.all-options, input.all-options { #submenu li { line-height: 180%; + height: 25px; } |