|
From: Tom S. <tom...@us...> - 2004-05-13 17:45:11
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32393 Modified Files: serendipity_functions_images.inc.php serendipity_admin_entries.inc.php Log Message: Clean up the new layout a little Fixed bug where it would say "POSTED BY x IN" when there was no category Added css class to style filter panel Index: serendipity_functions_images.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_functions_images.inc.php,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- serendipity_functions_images.inc.php 4 Apr 2004 16:24:47 -0000 1.9 +++ serendipity_functions_images.inc.php 13 May 2004 17:44:58 -0000 1.10 @@ -426,7 +426,7 @@ </tr> <tr> - <td align="center" colspan="<?php echo $lineBreak; ?>"><?php echo $sort; ?></td> + <td align="center" class="serendipity_admin_filters" colspan="<?php echo $lineBreak; ?>"><?php echo $sort; ?></td> </tr> <tr> @@ -481,7 +481,7 @@ </tr> <tr> - <td align="center" colspan="<?php echo $lineBreak; ?>"><?php echo $sort; ?></td> + <td align="center" class="serendipity_admin_filters" colspan="<?php echo $lineBreak; ?>"><?php echo $sort; ?></td> </tr> <tr> Index: serendipity_admin_entries.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_entries.inc.php,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- serendipity_admin_entries.inc.php 13 May 2004 13:10:51 -0000 1.21 +++ serendipity_admin_entries.inc.php 13 May 2004 17:45:00 -0000 1.22 @@ -49,7 +49,7 @@ function serendipity_drawList_filter() { global $serendipity; - $sort = FILTER . ' ' . AUTHOR . ' '; + $sort = AUTHOR . ' '; $sort .= '<select name="serendipity[filter_author]"><option value="">--</option>'; $users = serendipity_fetchUsers(); if (is_array($users)) { @@ -67,7 +67,7 @@ } $sort .= '</select> ' - . ($serendipity['dbType'] == 'mysql' ? CONTENT . ': <input type="text" name="serendipity[filter_body]" value="' . (isset($serendipity['GET']['filter_body']) ? htmlspecialchars($serendipity['GET']['filter_body']) : '') . '" />' : '') + . ($serendipity['dbType'] == 'mysql' ? CONTENT . ': <input size="10" type="text" name="serendipity[filter_body]" value="' . (isset($serendipity['GET']['filter_body']) ? htmlspecialchars($serendipity['GET']['filter_body']) : '') . '" />' : '') . ' <input type="submit" name="go" value="' . GO . ' " />'; return $sort; } @@ -77,7 +77,7 @@ global $serendipity; $perPage = (!empty($serendipity['GET']['perPage']) ? $serendipity['GET']['perPage'] : 12); - $perRow = 3; + $perRow = 2; $full = false; // Prepare variables @@ -156,20 +156,16 @@ ?> <tr> <td colspan="<?php echo $halfRowLeft; ?>"> -<?php if ($serendipity['GET']['offset'] > 0) { ?> - <input type="submit" name="serendipity[prevpage]" value="<<<" /> -<?php } ?> + <input type="submit" name="serendipity[prevpage]" value="<<<" <?php if ($serendipity['GET']['offset'] <= 0) echo ' disabled' ?> /> </td> - <td> + <td class="serendipity_admin_filters" align="center"> <?php echo serendipity_drawList_sort(); ?><br /> <?php echo serendipity_drawList_filter(); ?> </td> <td colspan="<?php echo $halfRowRight; ?>" align="right"> -<?php if ($count == $perPage) { ?> - <input type="submit" name="serendipity[nextpage]" value=">>>" /> -<?php } ?> + <input type="submit" name="serendipity[nextpage]" value=">>>" <?php if ($count != $perPage) echo ' disabled' ?> /> </td> </tr> </table> @@ -196,13 +192,13 @@ <a href="?serendipity[action]=admin&serendipity[adminModule]=entries&serendipity[adminAction]=delete&serendipity[id]=<?php echo $entries[$entryIndex]['id']; ?>" title="#<?php echo $entries[$x]['id']; ?>"> <img style="float: right" class="serendipityImageButton" title="<?php echo DELETE; ?>" alt="<?php echo DELETE; ?>" src="<?php echo $serendipity['serendipityHTTPPath']; ?>pixel/delete.png" border="0" /> </a> - <?php echo serendipity_formatTime(DATE_FORMAT_SHORT, $entries[$entryIndex]['timestamp']); ?> + <?php echo serendipity_formatTime(DATE_FORMAT_SHORT, $entries[$entryIndex]['timestamp']) . ' ' .$lm; ?> <br /> <?php if ($entries[$entryIndex]['isdraft'] == 'true') echo DRAFT . ':'; ?> <a href="?serendipity[action]=admin&serendipity[adminModule]=entries&serendipity[adminAction]=edit&serendipity[id]=<?php echo $entries[$entryIndex]['id']; ?>" title="#<?php echo $entries[$x]['id']; ?>"> <?php echo htmlspecialchars(substr(empty($entries[$entryIndex]['title']) ? (empty($entries[$entryIndex]['body']) ? '---' : $entries[$entryIndex]['body']) : $entries[$entryIndex]['title'], 0, 40)); ?> </a><br /> - <?php echo POSTED_BY . ' ' . $entries[$entryIndex]['username'] . ' ' . IN . ' ' . $entries[$entryIndex]['category_name'] . $lm; ?><br /> + <?php echo POSTED_BY . ' ' . $entries[$entryIndex]['username'] . ( !empty($entries[$entryIndex]['category_name']) ? ' ' . IN . ' ' . $entries[$entryIndex]['category_name'] :''); ?><br /> </td> <?php } else { @@ -228,7 +224,7 @@ // We've got nothing ?> <tr> - <td> + <td class="serendipity_admin_filters" align="center"> <?php echo serendipity_drawList_sort(); ?><br /> <?php echo serendipity_drawList_filter(); ?> </td> |
