--- /var/www/include/admin/comments.inc.php	2009-12-08 15:03:57.000000000 +0100
+++ /home/onli/Downloads/comments.inc.php	2010-02-27 14:44:45.000000000 +0100
@@ -1,4 +1,4 @@
-<?php # $Id: comments.inc.php 2607 2009-12-08 14:03:57Z garvinhicking $
+<?php # $Id: comments.inc.php 2464 2009-02-11 12:38:50Z garvinhicking $
 # Copyright (c) 2003-2005, Jannis Hermanns (on behalf the Serendipity Developer Team)
 # All rights reserved.  See LICENSE file for licensing details
 
@@ -287,90 +287,83 @@
         }
     }
 }
-
-var origborder = '';
-var origwidth = '';
-
 function highlightComment(id, checkvalue) {
     var comment = document.getElementById(id);
-    
-    if (origborder == '') {
-        origborder = comment.style.borderColor;
-        if (origborder == '') {
-            origborder = '#FFFFFF';
-        }
-    }
-    
-    if (origwidth == '') {
-        origwidth = comment.style.borderWidth;
-        if (origwidth == '' || origwidth == 0) {
-            origwidth = 1;
-        }
-    }
-    
     if (checkvalue) {
         comment.style.borderColor = '#FF0000';
-        comment.style.borderWidth = origwidth;
+        comment.style.borderWidth = 2;
     } else {
         comment.style.borderColor = '';
-        comment.style.borderWidth = origwidth;
+        comment.style.borderWidth = '';
     }
 }
 </script>
-<form action="" method="GET" style="margin: 0">
+<form action="" method="GET">
 <?php echo serendipity_setFormToken(); ?>
 <input type="hidden" name="serendipity[adminModule]" value="comments" />
 <input type="hidden" name="serendipity[page]" value="<?php echo $page ?>" />
-<table class="serendipity_admin_filters" width="100%">
-    <tr>
-        <td colspan="6" class="serendipity_admin_filters_headline"><strong><?php echo FILTERS ?></strong> - <?php echo FIND_COMMENTS ?></td>
-    </tr>
-    <tr>
-        <td><?php echo AUTHOR ?>:</td>
-        <td><input class="input_textbox" type="text" name="serendipity[filter][author]" size="15" value="<?php echo htmlspecialchars($serendipity['GET']['filter']['author']) ?>" /></td>
-        <td><?php echo EMAIL ?>:</td>
-        <td><input class="input_textbox" type="text" name="serendipity[filter][email]" size="15" value="<?php echo htmlspecialchars($serendipity['GET']['filter']['email']) ?>" /></td>
-        <td><?php echo URL ?>:</td>
-        <td><input class="input_textbox" type="text" name="serendipity[filter][url]" size="15" value="<?php echo htmlspecialchars($serendipity['GET']['filter']['url']) ?>" /></td>
-    </tr>
-    <tr>
-        <td>IP:</td>
-        <td><input class="input_textbox" type="text" name="serendipity[filter][ip]" size="15" value="<?php echo htmlspecialchars($serendipity['GET']['filter']['ip']) ?>" /></td>
-        <td><?php echo CONTENT ?>:</td>
-        <td><input class="input_textbox" type="text" name="serendipity[filter][body]" size="15" value="<?php echo htmlspecialchars($serendipity['GET']['filter']['body']) ?>" /></td>
-        <td><?php echo REFERER ?>:</td>
-        <td><input class="input_textbox" type="text" name="serendipity[filter][referer]" size="15" value="<?php echo htmlspecialchars($serendipity['GET']['filter']['referer']) ?>" /></td>
-    </tr>
-    <tr>
-        <td><?php echo COMMENTS; ?>:</td>
-        <td><select name="serendipity[filter][perpage]">
-        <?php
-            $filter_vals = array(10, 20, 50, COMMENTS_FILTER_ALL);
-            foreach($filter_vals AS $filter_val) { ?>
-            <option value="<?php echo $filter_val; ?>" <?php echo ($commentsPerPage == $filter_val ? ' selected="selected"' : ''); ?>><?php echo $filter_val; ?></option>
-        <?php
-            }
-        ?>
-            </select></td>
-        <td><?php echo COMMENTS_FILTER_SHOW ?>:</td>
-        <td><select name="serendipity[filter][show]">
-                <option value="all"<?php if ( $serendipity['GET']['filter']['show'] == 'all' ) echo ' selected="selected"' ?>><?php echo COMMENTS_FILTER_ALL ?></option>
-                <option value="approved"<?php if ( $serendipity['GET']['filter']['show'] == 'approved' ) echo ' selected="selected"' ?>><?php echo COMMENTS_FILTER_APPROVED_ONLY ?></option>
-                <option value="pending"<?php if ( $serendipity['GET']['filter']['show'] == 'pending' ) echo ' selected="selected"' ?>><?php echo COMMENTS_FILTER_NEED_APPROVAL ?></option>
-                <option value="confirm"<?php if ( $serendipity['GET']['filter']['show'] == 'confirm' ) echo ' selected="selected"' ?>><?php echo COMMENTS_FILTER_NEED_CONFIRM ?></option>
-            </select></td>
-        <td><?php echo TYPE; ?></td>
-        <td><select name="serendipity[filter][type]">
+
+<span class="serendipity_admin_filters_headline"><strong><?php echo FILTERS ?></strong> - <?php echo FIND_COMMENTS ?></span>
+<div id="serendipityAdminCommentFilterForm">
+    <div class="serendipityAdminCommentFilterFormBox">
+        <ul class="serendipityAdminCommentFilterFormInput">
+            <li><input class="input_textbox" type="text" name="serendipity[filter][author]" value="<?php echo htmlspecialchars($serendipity['GET']['filter']['author']) ?>" /></li>
+            <li><input class="input_textbox" type="text" name="serendipity[filter][ip]" value="<?php echo htmlspecialchars($serendipity['GET']['filter']['ip']) ?>" /></li>
+            <li><select name="serendipity[filter][perpage]">
+            <?php
+                $filter_vals = array(10, 20, 50, COMMENTS_FILTER_ALL);
+                foreach($filter_vals AS $filter_val) { ?>
+                <option value="<?php echo $filter_val; ?>" <?php echo ($commentsPerPage == $filter_val ? ' selected="selected"' : ''); ?>><?php echo $filter_val; ?></option>
+            <?php
+                }
+            ?>
+                </select></li>
+        </ul>
+        <ul class="serendipityAdminCommentFilterFormLabel">
+            <li><span><?php echo AUTHOR ?>:</span></li>
+            <li><span>IP:</span></li>
+            <li><span><?php echo COMMENTS; ?>:</span></li>
+        </ul>
+    </div>
+    
+    <div class="serendipityAdminCommentFilterFormBox">
+        <ul class="serendipityAdminCommentFilterFormInput">
+            <li><input class="input_textbox" type="text" name="serendipity[filter][email]"  value="<?php echo htmlspecialchars($serendipity['GET']['filter']['email']) ?>" /></li>
+            <li><input class="input_textbox" type="text" name="serendipity[filter][body]" value="<?php echo htmlspecialchars($serendipity['GET']['filter']['body']) ?>" /></li>
+            <li><select name="serendipity[filter][show]">
+                    <option value="all"<?php if ( $serendipity['GET']['filter']['show'] == 'all' ) echo ' selected="selected"' ?>><?php echo COMMENTS_FILTER_ALL ?></option>
+                    <option value="approved"<?php if ( $serendipity['GET']['filter']['show'] == 'approved' ) echo ' selected="selected"' ?>><?php echo COMMENTS_FILTER_APPROVED_ONLY ?></option>
+                    <option value="pending"<?php if ( $serendipity['GET']['filter']['show'] == 'pending' ) echo ' selected="selected"' ?>><?php echo COMMENTS_FILTER_NEED_APPROVAL ?></option>
+                    <option value="confirm"<?php if ( $serendipity['GET']['filter']['show'] == 'confirm' ) echo ' selected="selected"' ?>><?php echo COMMENTS_FILTER_NEED_CONFIRM ?></option>
+                </select></li>
+        </ul>
+        <ul class="serendipityAdminCommentFilterFormLabel" >
+            <li><span><?php echo EMAIL ?>:</span></li>
+            <li><span><?php echo CONTENT ?>:</span></li>
+            <li><span><?php echo COMMENTS_FILTER_SHOW ?>:</span></li>
+        </ul>
+    </div>
+
+    <div class="serendipityAdminCommentFilterFormBox">
+        <ul class="serendipityAdminCommentFilterFormInput">
+        <li><input class="input_textbox" type="text" name="serendipity[filter][url]" value="<?php echo htmlspecialchars($serendipity['GET']['filter']['url']) ?>" /></li>
+        <li><input class="input_textbox" type="text" name="serendipity[filter][referer]" value="<?php echo htmlspecialchars($serendipity['GET']['filter']['referer']) ?>" /></li>        
+        <li><select name="serendipity[filter][type]">
                 <option value=""><?php echo COMMENTS_FILTER_ALL ?></option>
                 <option value="NORMAL"<?php if ($c_type == 'NORMAL') echo ' selected="selected"' ?>><?php echo COMMENTS; ?></option>
                 <option value="TRACKBACK"<?php if ($c_type == 'TRACKBACK') echo ' selected="selected"' ?>><?php echo TRACKBACKS; ?></option>
                 <option value="PINGBACK"<?php if ($c_type == 'PINGBACK') echo ' selected="selected"' ?>><?php echo PINGBACKS; ?></option>
-            </select></td>
-    </tr>
-    <tr>
-        <td colspan="6" align="right"><input type="submit" name="submit" value=" - <?php echo GO ?> - " class="serendipityPrettyButton input_button" /> <?php serendipity_plugin_api::hook_event('backend_comments_top', $sql); ?></td>
-    </tr>
-</table>
+            </select></li>
+        </ul>
+        <ul class="serendipityAdminCommentFilterFormLabel">
+            <li><span><?php echo URL ?>:</span></li>
+            <li><span><?php echo REFERER ?>:</span></li>
+            <li><span><?php echo TYPE; ?></span></li>
+        </ul>
+    </div>
+</div>
+    <input type="submit" name="submit" value=" - <?php echo GO ?> - " class="serendipityPrettyButton input_button" /> <?php serendipity_plugin_api::hook_event('backend_comments_top', $sql); ?>
+
 </form>
 <hr noshade="noshade" /><br />
 <?php
@@ -381,26 +374,22 @@
 <form action="" method="POST" name="formMultiDelete" id="formMultiDelete">
 <?php echo serendipity_setFormToken(); ?>
 <input type="hidden" name="serendipity[formAction]" value="multiDelete" />
-<table width="100%" cellpadding="3" border="0" cellspacing="0">
-<tr>
-    <td align="center">
-        <table width="100%" cellspacing="5" cellpadding="0" border="0">
-            <tr>
-                <td>
+<div id="serendipityAdminCommentForm">
+        <div class="serendipityAdminCommentNavigation">
                 <?php if ( $page != 1 && $page <= $pages ) { ?>
+                <span class="serendipityAdminCommentNavigationBack">
                     <a href="<?php echo $linkPrevious; ?>" class="serendipityIconLink"><img src="<?php echo serendipity_getTemplateFile('admin/img/previous.png') ?>" /><?php echo PREVIOUS ?></a>
+                </span>
                 <?php } ?>
-                </td>
-                <td align="center"><?php printf(PAGE_BROWSE_COMMENTS, $page, $pages, $totalComments); ?></td>
-                <td align="right">
+                <span class="serendipityAdminCommentNavigationNext">
                 <?php if ( $page != $pages ) { ?>
                     <a href="<?php echo $linkNext; ?>" class="serendipityIconLinkRight"><?php echo NEXT ?><img src="<?php echo serendipity_getTemplateFile('admin/img/next.png') ?>" /></a>
                 <?php } ?>
-                </td>
-            </tr>
-        </table>
-    </td>
-</tr>
+                </span>
+                <span><?php printf(PAGE_BROWSE_COMMENTS, $page, $pages, $totalComments); ?></span>
+                
+        </div>
+
 <?php
 
 $i = 0;
@@ -456,57 +445,48 @@
     }
                                 
 ?>
-<tr>
-    <td class="<?php echo $header_class; ?>">
+    <div class="<?php echo $header_class; ?>">
 <?php   if (!empty($header_class)) { ?>
-            <img style="width: 22px; height: 22px; border: 0px; padding-right: 4px; vertical-align: middle" src="<?php echo serendipity_getTemplateFile('admin/img/admin_msg_note.png'); ?>" alt="" />
+            <img class="serendipityAdminCommentHeaderImage" src="<?php echo serendipity_getTemplateFile('admin/img/admin_msg_note.png'); ?>" alt="" />
 <?php   }?>
         <a name="c<?php echo $comment['id'] ?>"></a>
         <?php echo ($comment['type'] == 'NORMAL' ? COMMENT : ($comment['type'] == 'TRACKBACK' ? TRACKBACK : PINGBACK )) . ' #'. $comment['id'] .', '. IN_REPLY_TO .' <strong><a href="' . $comment['entry_url'] . '">'. htmlspecialchars($comment['title']) .'</a></strong>, '. ON . ' ' . serendipity_mb('ucfirst', serendipity_strftime('%b %e %Y, %H:%M', $comment['timestamp']))?>
-    </td>
-</tr>
-<tr>
-    <td class="serendipity_admin_list_item <?php echo $class ?>" id="comment_<?php echo $comment['id'] ?>">
-        <table width="100%" cellspacing="0" cellpadding="3" border="0">
-            <tr>
-                <td rowspan="3" width="20" align="center"><input class="input_checkbox" type="checkbox" name="serendipity[delete][<?php echo $comment['id'] ?>]" value="<?php echo $comment['entry_id'] ?>" onclick="highlightComment('comment_<?php echo $comment['id'] ?>', this.checked)" tabindex="<?php echo $i ?>" /></td>
-                <td width="40%"><strong><?php echo AUTHOR ?></strong>: <?php echo htmlspecialchars(serendipity_truncateString($comment['author'],30)) . $comment['action_author']; ?></td>
-                <td><strong><?php echo EMAIL ?></strong>:
-                    <?php
-                        if ( empty($comment['email']) ) {
-                            echo 'N/A';
-                        } else {
-                    ?>
-                            <a href="mailto:<?php echo htmlspecialchars($comment['email']) ?>" title="<?php echo htmlspecialchars($comment['email']) ?>"><?php echo htmlspecialchars(serendipity_truncateString($comment['email'],30)) ?></a>
-                    <?php } ?>
-                <?php echo $comment['action_email']; ?>
-                </td>
-            </tr>
-            <tr>
-                <td width="40%"><strong>IP</strong>:
-                    <?php
-                        if ( empty($comment['ip']) ) {
-                            echo '0.0.0.0';
-                        } else {
-                            echo htmlspecialchars($comment['ip']);
-                        }
-                    ?>
-                    <?php echo $comment['action_ip']; ?>
-                    </td>
-                <td><strong><?php echo URL; ?></strong>:
-                    <?php
-                        if ( empty($comment['url']) ) {
-                            echo 'N/A';
-                        } else {
-                    ?>
-                            <a href="<?php echo htmlspecialchars($comment['url']) ?>" title="<?php echo htmlspecialchars($comment['url']) ?>" target="_blank"><?php echo htmlspecialchars(serendipity_truncateString($comment['url'],30)) ?></a>
-                    <?php } ?>
-                    <?php echo $comment['action_url']; ?>
-                    </td>
-            </tr>
-            <tr>
-                <td width="40%">&nbsp;</td>
-                <td><strong><?php echo REFERER; ?></strong>:
+    </div>
+
+    <div class="serendipity_admin_list_item <?php echo $class ?>" id="comment_<?php echo $comment['id'] ?>">
+        <div class="serendipity_admin_list_item serendipity_admin_list_item_uneven">
+            <div class="serendipityAdminCommentFormTech">
+                <ul class="serendipityAdminCommentFormList">
+                    <li>
+                        <span><strong><?php echo EMAIL ?></strong>: </span><span id="<?php
+							echo $comment ['id']?>_mail">
+                            <?php
+                                if ( empty($comment['email']) ) {
+                                    echo 'N/A';
+                                } else {
+                            ?>
+                                    <a href="mailto:<?php echo htmlspecialchars($comment['email']) ?>" title="<?php echo htmlspecialchars($comment['email']) ?>"><?php echo htmlspecialchars(serendipity_truncateString($comment['email'],30)) ?></a>
+                            <?php } ?>
+                        <?php echo $comment['action_email']; ?>
+                        </span>
+                    </li>   
+
+                    <li>
+                        <span><strong><?php echo URL; ?></strong>:</span><span id="<?php
+							echo $comment ['id']?>_url">
+                        <?php
+                            if ( empty($comment['url']) ) {
+                                echo 'N/A';
+                            } else {
+                        ?>
+                                <a href="<?php echo htmlspecialchars($comment['url']) ?>" title="<?php echo htmlspecialchars($comment['url']) ?>" target="_blank"><?php echo htmlspecialchars(serendipity_truncateString($comment['url'],30)) ?></a>
+                        <?php } ?>
+                        <?php echo $comment['action_url']; ?>
+                        </span>
+                    </li>
+
+                    <li>
+                    <span><strong><?php echo REFERER; ?></strong>:
                     <?php
                         if ( empty($comment['referer']) ) {
                             echo 'N/A';
@@ -515,58 +495,78 @@
                           <a href="<?php echo htmlspecialchars($comment['referer']) ?>" title="<?php echo htmlspecialchars($comment['referer']) ?>" target="_blank"><?php echo htmlspecialchars(serendipity_truncateString($comment['referer'],30)) ?></a>
                     <?php } ?>
                     <?php echo $comment['action_referer']; ?>
-                    </td>
-            <tr>
-                <td style="border-top: 1px solid #CCCCCC; border-bottom: 1px solid #CCCCCC" colspan="3">
-                    <div id="<?php echo $comment['id'] ?>_summary"><?php echo $comment['summary'] ?></div>
-                    <div id="<?php echo $comment['id'] ?>_full" style="display: none"><?php echo $comment['fullBody'] ?></div>
-                </td>
-            </tr>
-        </table>
+                    </span>
+                    </li>
+                </ul>
+            </div>
+    
+            <div class="serendipityAdminCommentFormMain">
+                <input class="serendipityAdminCommentRemove" class="input_checkbox" type="checkbox" name="serendipity[delete][<?php echo $comment['id'] ?>]" value="<?php echo $comment['entry_id'] ?>" onclick="highlightComment('comment_<?php echo $comment['id'] ?>', this.checked)" tabindex="<?php echo $i ?>" />
+                <div class="serendipityAdminCommentFormName">
+                        <ul class="serendipityAdminCommentFormList">
+                        <li>
+                            <span><strong><?php echo AUTHOR ?></strong>:</span> <span id="<?php
+							echo $comment ['id']?>_author"><?php echo htmlspecialchars(serendipity_truncateString($comment['author'],30)) . $comment['action_author']; ?></span>
+                        </li>
+                          <li><span><strong>IP</strong>:</span> <span id="<?php
+							echo $comment ['id']?>_ip"><?php
+                                if ( empty($comment['ip']) ) {
+                                    echo '0.0.0.0';
+                                } else {
+                                    echo htmlspecialchars($comment['ip']);
+                                }
+                            ?><?php echo $comment['action_ip']; ?>
+                            </span>
+                            </li>
+                        </ul>
+                </div>
+                
+            </div>
+                
+        </div>
+                
+
+        <div class="serendipityAdminCommentBody">
+            <div id="<?php echo $comment['id'] ?>_summary"><?php echo $comment['summary'] ?></div>
+            <div id="<?php echo $comment['id'] ?>_full" class="serendipityAdminCommentFullBody"><?php echo $comment['fullBody'] ?></div>
+        </div>
+        <div class="serendipityAdminCommentControls">
 <?php if ($comment['status'] == 'pending' || strstr($comment['status'], 'confirm')) { ?>
-          <a href="?serendipity[action]=admin&amp;serendipity[adminModule]=comments&amp;serendipity[adminAction]=approve&amp;serendipity[id]=<?php echo $comment['id'] ?>&amp;<?php echo serendipity_setFormToken('url'); ?>" class="serendipityIconLink" title="<?php echo APPROVE; ?>"><img src="<?php echo serendipity_getTemplateFile('admin/img/accept.png'); ?>" alt="<?php echo APPROVE ?>" /><?php echo APPROVE ?></a>
+            <a href="?serendipity[action]=admin&amp;serendipity[adminModule]=comments&amp;serendipity[adminAction]=approve&amp;serendipity[id]=<?php echo $comment['id'] ?>&amp;<?php echo serendipity_setFormToken('url'); ?>" class="serendipityIconLink" title="<?php echo APPROVE; ?>"><img src="<?php echo serendipity_getTemplateFile('admin/img/accept.png'); ?>" alt="<?php echo APPROVE ?>" /><?php echo APPROVE ?></a>
 <?php } ?>
 <?php if ($comment['status'] == 'approved') { ?>
-          <a href="?serendipity[action]=admin&amp;serendipity[adminModule]=comments&amp;serendipity[adminAction]=pending&amp;serendipity[id]=<?php echo $comment['id'] ?>&amp;<?php echo serendipity_setFormToken('url'); ?>" class="serendipityIconLink" title="<?php echo SET_TO_MODERATED; ?>"><img src="<?php echo serendipity_getTemplateFile('admin/img/clock.png'); ?>" alt="<?php echo SET_TO_MODERATED ?>" /><?php echo SET_TO_MODERATED ?></a>
+            <a href="?serendipity[action]=admin&amp;serendipity[adminModule]=comments&amp;serendipity[adminAction]=pending&amp;serendipity[id]=<?php echo $comment['id'] ?>&amp;<?php echo serendipity_setFormToken('url'); ?>" class="serendipityIconLink" title="<?php echo SET_TO_MODERATED; ?>"><img src="<?php echo serendipity_getTemplateFile('admin/img/clock.png'); ?>" alt="<?php echo SET_TO_MODERATED ?>" /><?php echo SET_TO_MODERATED ?></a>
 <?php } ?>
 <?php if ($comment['excerpt']) { ?>
-          <a href="#c<?php echo $comment['id'] ?>" onclick="FT_toggle(<?php echo $comment['id'] ?>); return false;" title="<?php echo VIEW; ?>" class="serendipityIconLink"><img src="<?php echo serendipity_getTemplateFile('admin/img/zoom.png'); ?>" alt="<?php echo TOGGLE_ALL; ?>" /><span id="<?php echo $comment['id'] ?>_text"><?php echo TOGGLE_ALL ?></span></a>
+            <a href="#c<?php echo $comment['id'] ?>" onclick="FT_toggle(<?php echo $comment['id'] ?>); return false;" title="<?php echo VIEW; ?>" class="serendipityIconLink"><img src="<?php echo serendipity_getTemplateFile('admin/img/zoom.png'); ?>" alt="<?php echo TOGGLE_ALL; ?>" /><span id="<?php echo $comment['id'] ?>_text"><?php echo TOGGLE_ALL ?></span></a>
 <?php } ?>
-          <a target="_blank" href="<?php echo $entrylink; ?>" title="<?php echo VIEW; ?>" class="serendipityIconLink"><img src="<?php echo serendipity_getTemplateFile('admin/img/zoom.png'); ?>" alt="<?php echo VIEW; ?>" /><?php echo VIEW ?></a>
-          <a href="?serendipity[action]=admin&amp;serendipity[adminModule]=comments&amp;serendipity[adminAction]=edit&amp;serendipity[id]=<?php echo $comment['id'] ?>&amp;serendipity[entry_id]=<?php echo $comment['entry_id'] ?>&amp;<?php echo serendipity_setFormToken('url'); ?>" title="<?php echo EDIT; ?>" class="serendipityIconLink"><img src="<?php echo serendipity_getTemplateFile('admin/img/edit.png'); ?>" alt="<?php echo EDIT; ?>" /><?php echo EDIT ?></a>
-          <a href="?serendipity[action]=admin&amp;serendipity[adminModule]=comments&amp;serendipity[adminAction]=delete&amp;serendipity[id]=<?php echo $comment['id'] ?>&amp;serendipity[entry_id]=<?php echo $comment['entry_id'] ?>&amp;<?php echo serendipity_setFormToken('url'); ?>" onclick='return confirm("<?php echo sprintf(COMMENT_DELETE_CONFIRM, $comment['id'], htmlspecialchars($comment['author'])) ?>")' title="<?php echo DELETE ?>" class="serendipityIconLink"><img src="<?php echo serendipity_getTemplateFile('admin/img/delete.png'); ?>" alt="<?php echo DELETE; ?>" /><?php echo DELETE ?></a>
-          <a target="_blank" onclick="cf = window.open(this.href, 'CommentForm', 'width=800,height=600,toolbar=no,scrollbars=1,scrollbars,resize=1,resizable=1'); cf.focus(); return false;" href="?serendipity[action]=admin&amp;serendipity[adminModule]=comments&amp;serendipity[adminAction]=reply&amp;serendipity[id]=<?php echo $comment['id'] ?>&amp;serendipity[entry_id]=<?php echo $comment['entry_id'] ?>&amp;serendipity[noBanner]=true&amp;serendipity[noSidebar]=true&amp;<?php echo serendipity_setFormToken('url'); ?>" title="<?php echo REPLY ?>" class="serendipityIconLink"><img src="<?php echo serendipity_getTemplateFile('admin/img/user_editor.png'); ?>" alt="<?php echo REPLY; ?>" /><?php echo REPLY ?></a>
-          <?php echo $comment['action_more']; ?>
-    </td>
-</tr>
-<tr>
-    <td><hr noshade="noshade" /></td>
-</tr>
+            <a target="_blank" href="<?php echo $entrylink; ?>" title="<?php echo VIEW; ?>" class="serendipityIconLink"><img src="<?php echo serendipity_getTemplateFile('admin/img/zoom.png'); ?>" alt="<?php echo VIEW; ?>" /><?php echo VIEW ?></a>
+            <a href="?serendipity[action]=admin&amp;serendipity[adminModule]=comments&amp;serendipity[adminAction]=edit&amp;serendipity[id]=<?php echo $comment['id'] ?>&amp;serendipity[entry_id]=<?php echo $comment['entry_id'] ?>&amp;<?php echo serendipity_setFormToken('url'); ?>" title="<?php echo EDIT; ?>" class="serendipityIconLink"><img src="<?php echo serendipity_getTemplateFile('admin/img/edit.png'); ?>" alt="<?php echo EDIT; ?>" /><?php echo EDIT ?></a>
+            <a href="?serendipity[action]=admin&amp;serendipity[adminModule]=comments&amp;serendipity[adminAction]=delete&amp;serendipity[id]=<?php echo $comment['id'] ?>&amp;serendipity[entry_id]=<?php echo $comment['entry_id'] ?>&amp;<?php echo serendipity_setFormToken('url'); ?>" onclick='return confirm("<?php echo sprintf(COMMENT_DELETE_CONFIRM, $comment['id'], htmlspecialchars($comment['author'])) ?>")' title="<?php echo DELETE ?>" class="serendipityIconLink"><img src="<?php echo serendipity_getTemplateFile('admin/img/delete.png'); ?>" alt="<?php echo DELETE; ?>" /><?php echo DELETE ?></a>
+            <a target="_blank" onclick="cf = window.open(this.href, 'CommentForm', 'width=800,height=600,toolbar=no,scrollbars=1,scrollbars,resize=1,resizable=1'); cf.focus(); return false;" href="?serendipity[action]=admin&amp;serendipity[adminModule]=comments&amp;serendipity[adminAction]=reply&amp;serendipity[id]=<?php echo $comment['id'] ?>&amp;serendipity[entry_id]=<?php echo $comment['entry_id'] ?>&amp;serendipity[noBanner]=true&amp;serendipity[noSidebar]=true&amp;<?php echo serendipity_setFormToken('url'); ?>" title="<?php echo REPLY ?>" class="serendipityIconLink"><img src="<?php echo serendipity_getTemplateFile('admin/img/user_editor.png'); ?>" alt="<?php echo REPLY; ?>" /><?php echo REPLY ?></a>
+            <?php echo $comment['action_more']; ?>
+        </div>
+    </div>
+
+
+<hr noshade="noshade" />
+
 <?php } ?>
-<tr>
-    <td><input type="button" name="toggle" value="<?php echo INVERT_SELECTIONS ?>" onclick="invertSelection()" class="serendipityPrettyButton input_button" /> <input type="submit" name="toggle" value="<?php echo DELETE_SELECTED_COMMENTS ?>" onclick="return confirm('<?php echo COMMENTS_DELETE_CONFIRM ?>')" tabindex="<?php echo ($i+1) ?>" class="serendipityPrettyButton input_button" /></td>
-</tr>
-</table>
-<table width="100%" cellpadding="3" border="0" cellspacing="0">
-<tr>
-    <td align="center">
-        <table width="100%" cellspacing="5" cellpadding="0" border="0">
-            <tr>
-                <td>
+        <div class="serendipityAdminCommentNavigation">
                 <?php if ( $page != 1 && $page <= $pages ) { ?>
+                <span class="serendipityAdminCommentNavigationBack">
                     <a href="<?php echo $linkPrevious; ?>" class="serendipityIconLink"><img src="<?php echo serendipity_getTemplateFile('admin/img/previous.png') ?>" /><?php echo PREVIOUS ?></a>
+                </span>
                 <?php } ?>
-                </td>
-                <td align="center"><?php printf(PAGE_BROWSE_COMMENTS, $page, $pages, $totalComments); ?></td>
-                <td align="right">
+                <span class="serendipityAdminCommentNavigationNext">
                 <?php if ( $page != $pages ) { ?>
                     <a href="<?php echo $linkNext; ?>" class="serendipityIconLinkRight"><?php echo NEXT ?><img src="<?php echo serendipity_getTemplateFile('admin/img/next.png') ?>" /></a>
                 <?php } ?>
-                </td>
-            </tr>
-        </table>
-    </td>
-</tr>
-
+                </span>
+                <span><?php printf(PAGE_BROWSE_COMMENTS, $page, $pages, $totalComments); ?></span>
+                
+        </div>
+  <input type="button" name="toggle" value="<?php echo INVERT_SELECTIONS ?>" onclick="invertSelection()" class="serendipityPrettyButton input_button" /> <input type="submit" name="toggle" value="<?php echo DELETE_SELECTED_COMMENTS ?>" onclick="return confirm('<?php echo COMMENTS_DELETE_CONFIRM ?>')" tabindex="<?php echo ($i+1) ?>" class="serendipityPrettyButton input_button" />
+</div>
 </form>
 <?php } ?>