php-blog-cvs

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

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

Modified Files:
	comments.inc.php entries.inc.php 
Log Message:
- Add prettier (non-javascript and non-fake button) navigation links


Index: comments.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/comments.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- comments.inc.php	22 Dec 2004 18:05:45 -0000	1.12
+++ comments.inc.php	26 Dec 2004 18:34:34 -0000	1.13
@@ -144,17 +144,8 @@
     $page = 1;
 }
 
-if ( $page != 1 && $page <= $pages ) {
-    $linkPrevious = '<input type="button" name="serendipity[previouspage]" value="&lt;&lt;&lt;" onclick="location.href=\'serendipity_admin.php?serendipity[adminModule]=comments&amp;serendipity[page]='. ($page-1) . $searchString . '\'" />';
-} else {
-    $linkPrevious = '<input type="button" name="serendipity[previouspage]" value="&lt;&lt;&lt;" disabled="disabled" />';
-}
-
-if ( $page != $pages ) {
-    $linkNext = '<input type="button" name="serendipity[nextpage]" value="&gt;&gt;&gt;" onclick="location.href=\'serendipity_admin.php?serendipity[adminModule]=comments&amp;serendipity[page]='. ($page+1) . $searchString . '\'" />';
-} else {
-    $linkNext = '<input type="button" name="serendipity[nextpage]" value="&gt;&gt;&gt;" disabled="disabled" />';
-}
+$linkPrevious = 'serendipity_admin.php?serendipity[adminModule]=comments&amp;serendipity[page]='. ($page-1) . $searchString;
+$linkNext = 'serendipity_admin.php?serendipity[adminModule]=comments&amp;serendipity[page]='. ($page+1) . $searchString;
 
 $limit = serendipity_db_limit_sql(serendipity_db_limit(($page-1)*$commentsPerPage, $commentsPerPage));
 $sql = serendipity_db_query("SELECT c.*, e.title FROM {$serendipity['dbPrefix']}comments c
@@ -250,9 +241,17 @@
     <td align="center">
         <table width="100%" cellspacing="5" cellpadding="0" border="0">
             <tr>
-                <td><?php echo $linkPrevious; ?></td>
+                <td>
+                <?php if ( $page != 1 && $page <= $pages ) { ?>
+                    <a href="<?php echo $linkPrevious; ?>" class="serendipityIconLink"><img src="<?php echo serendipity_getTemplateFile('admin/img/previous.png') ?>" /><?php echo PREVIOUS ?></a>
+                <?php } ?>
+                </td>
                 <td align="center"><?php printf(PAGE_BROWSE_COMMENTS, $page, $pages, $totalComments); ?></td>
-                <td align="right"><?php echo $linkNext ?></td>
+                <td align="right">
+                <?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>
@@ -334,17 +333,6 @@
 <tr>
     <td><input type="button" name="toggle" value="<?php echo INVERT_SELECTIONS ?>" onclick="invertSelection()" /> <input type="submit" name="toggle" value="<?php echo DELETE_SELECTED_COMMENTS ?>" onclick="return confirm('<?php echo COMMENTS_DELETE_CONFIRM ?>')" tabindex="<?php echo ($i+1) ?>" /></td>
 </tr>
-<tr>
-    <td align="center">
-           <table width="100%" cellspacing="5" cellpadding="0" border="0">
-            <tr>
-                <td><?php echo $linkPrevious; ?></td>
-                <td align="center"><?php printf(PAGE_BROWSE_COMMENTS, $page, $pages, $totalComments); ?></td>
-                <td align="right"><?php echo $linkNext ?></td>
-            </tr>
-        </table>
-    </td>
-</tr>
 </table>
 </form>
 <?php } ?>

Index: entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/entries.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- entries.inc.php	23 Dec 2004 01:31:23 -0000	1.15
+++ entries.inc.php	26 Dec 2004 18:34:34 -0000	1.16
@@ -162,17 +162,13 @@
 ?>
         <tr>
             <td>
-                <?php if ($offSet <= 0) { ?>
-                    <a name="dummy_linkPrevious" class="button_disabled">&lt;&lt;&lt;</a>
-                <?php } else { ?>
-                    <a href="<?php echo $linkPrevious ?>" class="button">&lt;&lt;&lt;</a>
+                <?php if ($offSet > 0) { ?>
+                    <a href="<?php echo $linkPrevious ?>" class="serendipityIconLink"><img src="<?php echo serendipity_getTemplateFile('admin/img/previous.png') ?>" /><?php echo PREVIOUS ?></a>
                 <?php } ?>
             </td>
             <td align="right">
-                <?php if ($count != $perPage) { ?>
-                    <a name="dummy_linkNext" class="button_disabled">&gt;&gt;&gt;</a>
-                <?php } else { ?>
-                    <a href="<?php echo $linkNext ?>" class="button">&gt;&gt;&gt;</a>
+                <?php if ($count == $perPage) { ?>
+                    <a href="<?php echo $linkNext ?>" class="serendipityIconLinkRight"><?php echo NEXT ?><img src="<?php echo serendipity_getTemplateFile('admin/img/next.png') ?>" /></a>
                 <?php } ?>
             </td>
         </tr>