- Fixes CSS for archive calendar so that you can make non-link days padded

  in a sensible fashion. Also removes table width 100% and puts that in css.
  Patch #48 by Al.

3 files changed, 7 insertions, 7 deletions

diff --git a/misc/drupal.css b/misc/drupal.css
index 93618bc4c..f63a91db9 100644
--- a/misc/drupal.css
+++ b/misc/drupal.css
@@ -22,7 +22,7 @@ th {
 .calendar .row-week td a:hover { background-color: #888; color: #fff; }
 .calendar a               { text-decoration: none; }
 .calendar a:hover         { text-decoration: none; }
-.calendar table           { border-collapse: collapse; }
+.calendar table           { border-collapse: collapse; width: 100%; }
 .calendar td              { text-align: center; border: 1px solid #000; padding: 1px; margin: 0; font-size: 0.8em; }
 
 .container-inline div     { display: inline; }
diff --git a/modules/archive.module b/modules/archive.module
index 05848c06b..0f7370daa 100644
--- a/modules/archive.module
+++ b/modules/archive.module
@@ -71,7 +71,7 @@ function archive_calendar($original = 0) {
   // Generate calendar header:
   $output .= "\n<!-- calendar -->\n";
   $output .= "<div class=\"calendar\">";
-  $output .= "<table width=\"100%\">\n";
+  $output .= "<table>\n";
   $output .= " <tr><td colspan=\"7\" class=\"header-month\">". l("&lt;", "archive/". date("Y/m/d", $prev)) ." ". date("F Y", $requested) ." ". ($nextmonth <= time() ? l("&gt;", "archive/". date("Y/m/d", $next)) : "&gt;") ."</td></tr>\n";
 
   // First day of week (0 => Sunday, 1 => Monday, ...)
@@ -103,7 +103,7 @@ function archive_calendar($original = 0) {
     }
     // Start every week on a new line:
     if ($sday == $weekstart) {
-      $output .=  " <tr class=\"row-week\">\n";
+      $output .= " <tr class=\"row-week\">\n";
     }
 
     // Print one cell:
@@ -112,7 +112,7 @@ function archive_calendar($original = 0) {
       $daytext = l($nday, "archive/$year/$month/$nday");
     }
     else {
-      $daytext = $nday;
+      $daytext = "<div>$nday</div>";
     }
     if ($date == $requested) {
       $output .= "  <td class=\"day-selected\">$daytext</td>\n";
diff --git a/modules/archive/archive.module b/modules/archive/archive.module
index 05848c06b..0f7370daa 100644
--- a/modules/archive/archive.module
+++ b/modules/archive/archive.module
@@ -71,7 +71,7 @@ function archive_calendar($original = 0) {
   // Generate calendar header:
   $output .= "\n<!-- calendar -->\n";
   $output .= "<div class=\"calendar\">";
-  $output .= "<table width=\"100%\">\n";
+  $output .= "<table>\n";
   $output .= " <tr><td colspan=\"7\" class=\"header-month\">". l("&lt;", "archive/". date("Y/m/d", $prev)) ." ". date("F Y", $requested) ." ". ($nextmonth <= time() ? l("&gt;", "archive/". date("Y/m/d", $next)) : "&gt;") ."</td></tr>\n";
 
   // First day of week (0 => Sunday, 1 => Monday, ...)
@@ -103,7 +103,7 @@ function archive_calendar($original = 0) {
     }
     // Start every week on a new line:
     if ($sday == $weekstart) {
-      $output .=  " <tr class=\"row-week\">\n";
+      $output .= " <tr class=\"row-week\">\n";
     }
 
     // Print one cell:
@@ -112,7 +112,7 @@ function archive_calendar($original = 0) {
       $daytext = l($nday, "archive/$year/$month/$nday");
     }
     else {
-      $daytext = $nday;
+      $daytext = "<div>$nday</div>";
     }
     if ($date == $requested) {
       $output .= "  <td class=\"day-selected\">$daytext</td>\n";