[php-blog-cvs] serendipity serendipity_admin_comments.inc.php,1.7,1.8

[Tom S. <tom...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14036

Modified Files:
	serendipity_admin_comments.inc.php 
Log Message:
Tweak comment moderation layout


Index: serendipity_admin_comments.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_comments.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- serendipity_admin_comments.inc.php	26 Jul 2004 17:12:22 -0000	1.7
+++ serendipity_admin_comments.inc.php	26 Jul 2004 22:15:51 -0000	1.8
@@ -3,7 +3,7 @@
     die ("Don't hack!");
 }
 
-$commentsPerPage = 15;
+$commentsPerPage = 10;
 $summaryLength = 200;
 
 /* We are asked to save the edited comment, and we are not in preview mode */
@@ -136,6 +136,7 @@
     }
 }
 </script>
+<form action="" method="POST"
 <table width="100%" cellspacing="5" cellpadding="0" border="0" class="serendipity_admin_list">
 <tr>
     <td align="center"><?php echo $linkPrevious; ?> (<?php printf(PAGE_BROWSE_COMMENTS, $page, $pages, $totalComments); ?>) <?php echo $linkNext ?></td>
@@ -152,6 +153,9 @@
     if (empty($rs['email'])) {
         $rs['email'] = 'N/A';
     }
+    if (empty($rs['url'])) {
+        $rs['url'] = 'N/A';
+    }
 
     $fullBody = nl2br(strip_tags($rs['body']));
     $summary = substr($fullBody, 0, $summaryLength);
@@ -163,27 +167,36 @@
     $class = 'serendipity_admin_list_item_' . (($i++ % 2 == 0 ) ? 'even' : 'uneven');
 ?>
 <tr>
+    <td><a name="c<?php echo $rs['id'] ?>"></a>
+        <?php echo '#'. $rs['id'] .', '. IN_REPLY_TO .' <strong>'. $rs['title'] .'</strong>, '. ON . ' ' . ucfirst(strftime('%b %e %Y, %H:%M', $rs['timestamp']))?>
+    </td>
+</tr>
+<tr>
     <td class="serendipity_admin_list_item <?php echo $class ?>" style="padding: 3px">
-        <a name="c<?php echo $rs['id'] ?>"></a>
-        <strong><?php echo $rs['title'] ?></strong>
         <table width="100%" cellspacing="0" cellpadding="2" border="0">
             <tr>
-                <td width="30">
+                <td rowspan="2" width="20" align="center">
 <?php
-// TODO; Multi-Delete
-/* <input type="checkbox" name="delete[<?php echo $rs['id'] ?>]"> */
-?>                  &nbsp;</td>
-                <td width="160"><?php echo $rs['author'] ?></td>
-                <td><?php echo $rs['email'] ?></td>
-                <td align="right">(<?php echo $rs['ip'] ?>)</td>
+    // TODO: Multi-Delete - Tom
+    /* <input type="checkbox" name="delete[<?php echo $rs['id'] ?>]"> */
+?>&nbsp;</td>
+                <td width="250"><strong><?php echo AUTHOR ?></strong>: <?php echo $rs['author'] ?></td>
+                <td><strong><?php echo EMAIL ?></strong>: <?php echo $rs['email'] ?></td>
             </tr>
             <tr>
-                <td style="border-top: 1px solid #CCCCCC; border-bottom: 1px solid #CCCCCC" colspan="4"><div id="<?php echo $rs['id'] ?>_summary"><?php echo $summary ?></div><div id="<?php echo $rs['id'] ?>_full" style="display: none"><?php echo nl2br(strip_tags($rs['body'])) ?></div></td>
+                <td><strong>IP</strong>: <?php echo $rs['ip'] ?></td>
+                <td><strong>URL</strong>: <?php echo $rs['url'] ?></a></td>
+            </tr>
+            <tr>
+                <td style="border-top: 1px solid #CCCCCC; border-bottom: 1px solid #CCCCCC" colspan="3">
+                    <div id="<?php echo $rs['id'] ?>_summary"><?php echo $summary ?></div>
+                    <div id="<?php echo $rs['id'] ?>_full" style="display: none"><?php echo nl2br(strip_tags($rs['body'])) ?></div>
+                </td>
             </tr>
         </table>
-<?php       if ($rs['status'] == 'pending') { ?>
-            <strong>[<a href="?serendipity[action]=admin&amp;serendipity[adminModule]=comments&amp;serendipity[adminAction]=approve&amp;serendipity[id]=<?php echo $rs['id'] ?>">Approve</a>]</strong> -
-<?php       } ?>
+<?php if ($rs['status'] == 'pending') { ?>
+          <strong>[<a href="?serendipity[action]=admin&amp;serendipity[adminModule]=comments&amp;serendipity[adminAction]=approve&amp;serendipity[id]=<?php echo $rs['id'] ?>">Approve</a>]</strong> - 
+<?php } ?>
           [<a href="?serendipity[action]=admin&amp;serendipity[adminModule]=comments&amp;serendipity[adminAction]=delete&amp;serendipity[id]=<?php echo $rs['id'] ?>&amp;serendipity[entry_id]=<?php echo $rs['entry_id'] ?>"><?php echo DELETE ?></a>]
         - [<a href="?serendipity[action]=admin&amp;serendipity[adminModule]=comments&amp;serendipity[adminAction]=edit&amp;serendipity[id]=<?php echo $rs['id'] ?>&amp;serendipity[entry_id]=<?php echo $rs['entry_id'] ?>"><?php echo EDIT ?></a>]
 <?php if (strlen($fullBody) > strlen($summary) ) { ?>
@@ -191,8 +204,12 @@
 <?php } ?>
     </td>
 </tr>
+<tr>
+    <td><hr noshade></td>
+</tr>
 <?php } ?>
 <tr>
     <td align="center"><?php echo $linkPrevious; ?> (<?php printf(PAGE_BROWSE_COMMENTS, $page, $pages, $totalComments); ?>) <?php echo $linkNext ?></td>
 </tr>
 </table>
+</form>