-<script type="text/javascript">
-function focusit() { // focus on first input field
- document.post.name.focus();
-}
-addLoadEvent(focusit);
-</script>
-<fieldset id="namediv">
- <legend><?php _e('Name:') ?></legend>
- <div>
- <input type="text" name="newcomment_author" size="22" value="<?php echo $comment->comment_author ?>" tabindex="1" id="name" />
- </div>
-</fieldset>
-<fieldset id="emaildiv">
- <legend><?php _e('E-mail:') ?></legend>
- <div>
- <input type="text" name="newcomment_author_email" size="30" value="<?php echo $comment->comment_author_email ?>" tabindex="2" id="email" />
- </div>
-</fieldset>
-<fieldset id="uridiv">
- <legend><?php _e('URI:') ?></legend>
- <div>
- <input type="text" id="newcomment_author_url" name="newcomment_author_url" size="35" value="<?php echo $comment->comment_author_url ?>" tabindex="3" id="URL" />
- </div>
+<div id="poststuff">
+<input type="hidden" name="action" value="editedcomment" />
+<input type="hidden" name="comment_ID" value="<?php echo esc_attr( $comment->comment_ID ); ?>" />
+<input type="hidden" name="comment_post_ID" value="<?php echo esc_attr( $comment->comment_post_ID ); ?>" />
+
+<div id="post-body" class="metabox-holder columns-2">
+<div id="post-body-content" class="edit-form-section edit-comment-section">
+<?php
+if ( $comment->comment_post_ID > 0 ):
+ $comment_link = get_comment_link( $comment );
+?>
+<div class="inside">
+ <div id="comment-link-box">
+ <strong><?php _ex( 'Permalink:', 'comment' ); ?></strong>
+ <span id="sample-permalink"><a href="<?php echo $comment_link; ?>"><?php echo $comment_link; ?></a></span>
+ </div>
+</div>
+<?php endif; ?>
+<div id="namediv" class="stuffbox">
+<div class="inside">
+<fieldset>
+<legend class="edit-comment-author"><?php _e( 'Author' ) ?></legend>
+<table class="form-table editcomment">
+<tbody>
+<tr>
+ <td class="first"><label for="name"><?php _e( 'Name:' ); ?></label></td>
+ <td><input type="text" name="newcomment_author" size="30" value="<?php echo esc_attr( $comment->comment_author ); ?>" id="name" /></td>
+</tr>
+<tr>
+ <td class="first"><label for="email"><?php _e( 'Email:' ); ?></label></td>
+ <td>
+ <input type="text" name="newcomment_author_email" size="30" value="<?php echo $comment->comment_author_email; ?>" id="email" />
+ </td>
+</tr>
+<tr>
+ <td class="first"><label for="newcomment_author_url"><?php _e( 'URL:' ); ?></label></td>
+ <td>
+ <input type="text" id="newcomment_author_url" name="newcomment_author_url" size="30" class="code" value="<?php echo esc_attr($comment->comment_author_url); ?>" />
+ </td>
+</tr>
+</tbody>
+</table>
+<br />