[php-blog-cvs] serendipity serendipity_functions.inc.php,1.289,1.290

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

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

Modified Files:
	serendipity_functions.inc.php 
Log Message:
Fixed the name of the month not being shown in the archive.
Did a few layout tweaks, more might come :)


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.289
retrieving revision 1.290
diff -u -d -r1.289 -r1.290
--- serendipity_functions.inc.php	14 Jun 2004 11:53:28 -0000	1.289
+++ serendipity_functions.inc.php	14 Jun 2004 18:16:28 -0000	1.290
@@ -3031,31 +3031,35 @@
     $barwidth = 40;
     $fac = $barwidth/$max;
 ?>
-<table cellspacing="0">
+<table cellspacing="0" width="500">
 <?php
     foreach($out as $year => $months) {
 ?>
     <tr>
-        <td colspan="4"><h2><?php echo $year; ?></h2></td>
+        <td colspan="6"><h2><?php echo $year; ?></h2></td>
     </tr>
 <?php
         for($y=1; $y<13; $y++) {
             if (isset($months[$y]) && $months[$y]) {
+                $time = mktime(0,0,0, $y+1, 0, $year);
 ?>
     <tr>
         <td>
-            <img src="<?php echo $serendipity['serendipityHTTPPath']; ?>pixel/bar1.png"  height="10" width="<?php echo ceil($months[$y][0]*$fac); ?>"             hspace="0" vspace="0" alt="" />
-            <img src="<?php echo $serendipity['serendipityHTTPPath']; ?>pixel/blank.png" height="10" width="<?php echo ($barwidth-ceil($months[$y][0]*$fac)); ?>" hspace="0" vspace="0" alt="" />
-                 &nbsp;&nbsp;<?php echo $months[$y][1] . $serendipity['months'][$y] . $months[$y][2] . ' (' . $months[$y][0] . ' ' . ENTRIES . ')'; ?>
+            <img src="<?php echo $serendipity['serendipityHTTPPath']; ?>pixel/bar1.png"  height="10" width="<?php echo ceil($months[$y][0]*$fac); ?>"             hspace="0" vspace="0" alt="" /><img src="<?php echo $serendipity['serendipityHTTPPath']; ?>pixel/blank.png" height="10" width="<?php echo ($barwidth-ceil($months[$y][0]*$fac)); ?>" hspace="0" vspace="0" alt="" />
+        </td>
+        <td>
+            <?php echo $months[$y][1] . serendipity_formatTime('%B', $time) . $months[$y][2]; ?>
+        </td>
+        <td>
+            <?php echo $months[$y][0] . ' ' . ENTRIES; ?>
         </td>
 
         <td>
-            <img src="<?php echo $serendipity['serendipityHTTPPath']; ?>pixel/blank.png" height="10" width="35" hspace="0" vspace="0" alt="" />
                 (<?php echo $months[$y][1] . VIEW_FULL . $months[$y][2]; ?>)
         </td>
 
         <td>
-            &nbsp;(<?php echo $months[$y][3] . VIEW_TOPICS . $months[$y][4]; ?>)
+            (<?php echo $months[$y][3] . VIEW_TOPICS . $months[$y][4]; ?>)
         </td>
     </tr>
 <?php