diff options
-rw-r--r-- | functions/template.php | 13 | ||||
-rw-r--r-- | templates/default/default.css | 4 | ||||
-rw-r--r-- | templates/green/default.css | 4 | ||||
-rw-r--r-- | templates/grey/default.css | 4 | ||||
-rw-r--r-- | templates/red/default.css | 4 | ||||
-rw-r--r-- | templates/tan/default.css | 4 |
6 files changed, 18 insertions, 15 deletions
diff --git a/functions/template.php b/functions/template.php index 982fd54..a808906 100644 --- a/functions/template.php +++ b/functions/template.php @@ -411,6 +411,7 @@ class Page { $key = date ($timeFormat, $key); if (ereg("([0-9]{1,2}):00", $key)) { + $even_row = '2'; # column of times colspan = 4 to cover navigation links at top $weekdisplay .= '<tr>'; $weekdisplay .= '<td colspan="4" rowspan="' . (60 / $phpiCal_config->gridLength) . '" align="center" valign="top" width="60" class="timeborder">'.$key.'</td>'; @@ -421,6 +422,8 @@ class Page { $weekdisplay .= '<td colspan="4" rowspan="' . ($size_tmp / $phpiCal_config->gridLength) . '" align="center" valign="top" width="60" class="timeborder">'.$key.' </td>'; $weekdisplay .= '<td bgcolor="#a1a5a9" width="1" height="' . $phpiCal_config->gridLength . '"></td>'; } else { + $even_row = ''; + if (ereg("([0-9]{1,2}):30", $key)) $even_row = '2'; # empty row for each gridLength, to the right of times and left of first weekday $weekdisplay .= '<tr>'; $weekdisplay .= '<td bgcolor="#a1a5a9" width="1" height="' . $phpiCal_config->gridLength . '"></td>'; @@ -465,7 +468,7 @@ class Page { if (empty($event_length[$thisday])) { # no events if ($dayborder == 0) { - $class = ' class="weekborder"'; + $class = ' class="weekborder'.$even_row.'"'; $dayborder++; } else { $class = ''; @@ -473,7 +476,7 @@ class Page { } $tclass = $class; if ($thisday == $getdate) { - if ($tclass) $tclass = ' class="weekborder weektoday"'; + if ($tclass) $tclass = ' class="weekborder'.$even_row.' weektoday"'; else $tclass = ' class="weektoday"'; } $drawWidth = 1; @@ -491,7 +494,7 @@ class Page { if ($ended_counter) { $tclass = $class; if ($thisday == $getdate) { - if ($tclass) $tclass = ' class="weekborder weektoday"'; + if ($tclass) $tclass = ' class="weekborder'.$even_row.' weektoday"'; else $tclass = ' class="weektoday"'; } $weekdisplay .= '<td colspan="' . $ended_counter . '"' . $tclass . '> </td>'; @@ -541,7 +544,7 @@ class Page { if ($ended_counter) { $tclass = $class; if ($thisday == $getdate) { - if ($tclass) $tclass = ' class="weekborder weektoday"'; + if ($tclass) $tclass = ' class="weekborder'.$even_row.' weektoday"'; else $tclass = ' class="weektoday"'; } $weekdisplay .= '<td colspan="' . $ended_counter . '"' . $tclass . '> </td>'; @@ -564,7 +567,7 @@ class Page { if ($emptyWidth > 0) { $tclass = $class; if ($thisday == $getdate) { - if ($tclass) $tclass = ' class="weekborder weektoday"'; + if ($tclass) $tclass = ' class="weekborder'.$even_row.' weektoday"'; else $tclass = ' class="weektoday"'; } $weekdisplay .= "<td colspan=\"" . $emptyWidth . "\"$tclass> </td>\n"; diff --git a/templates/default/default.css b/templates/default/default.css index e62d69f..c141473 100644 --- a/templates/default/default.css +++ b/templates/default/default.css @@ -84,8 +84,8 @@ table, td {font: 11px Verdana, Arial, sans-serif; color: #000;} .tfixed { table-layout: fixed; word-wrap: break-word; } .calborder { background-color: #fff; border: 1px #A1A5A9 solid; }
.dateback { background-color: #eee; }
-.weekborder { border-top: 1px dashed #A1A5A9; border-right: 1px solid #A1A5A9; }
-.weekborder2 { border-right: 1px solid #A1A5A9; }
+.weekborder { border-right: 1px solid #A1A5A9; border-top: 1px dashed #ccc; }
+.weekborder2 { border-right: 1px solid #A1A5A9; border-top: 1px solid #A1A5A9; }
.timeborder { border-right: 2px solid #A1A5A9; border-top: 1px dashed #A1A5A9; background-image: url(images/time_bg.gif); }
.timeborder2 { border-right: 2px solid #A1A5A9; border-top: 1px solid #A1A5A9; background-image: url(images/time_bg.gif); }
.navback { background-image: url(images/time_bg.gif); }
diff --git a/templates/green/default.css b/templates/green/default.css index 2ce4bc0..32e132a 100644 --- a/templates/green/default.css +++ b/templates/green/default.css @@ -102,8 +102,8 @@ table, td {font: 11px Verdana, Arial, sans-serif; color: #000;} .calborder { background-color: #ffffff; border: 1px #A1A5A9 solid; }
.dateback { background-color: #eee; }
-.weekborder { border-top: 1px dashed #A1A5A9; border-right: 1px solid #A1A5A9; }
-.weekborder2 { border-right: 1px solid #A1A5A9; }
+.weekborder { border-right: 1px solid #A1A5A9; border-top: 1px dashed #ccc; }
+.weekborder2 { border-right: 1px solid #A1A5A9; border-top: 1px solid #A1A5A9; }
.timeborder { border-right: 2px solid #A1A5A9; border-top: 1px dashed #A1A5A9; background-image: url(images/time_bg.gif); }
.timeborder2 { border-right: 2px solid #A1A5A9; border-top: 1px solid #A1A5A9; background-image: url(images/time_bg.gif); }
.navback { background-image: url(images/time_bg.gif); }
diff --git a/templates/grey/default.css b/templates/grey/default.css index 8042ff1..881131c 100644 --- a/templates/grey/default.css +++ b/templates/grey/default.css @@ -82,8 +82,8 @@ table, td {font: 11px Verdana, Arial, sans-serif; color: #000;} .tfixed { table-layout: fixed; word-wrap: break-word; } .calborder { background-color: #fff; border: 1px #A1A5A9 solid; }
.dateback { background-color: #eee; }
-.weekborder { border-top: 1px dashed #A1A5A9; border-right: 1px solid #A1A5A9; }
-.weekborder2 { border-right: 1px solid #A1A5A9; }
+.weekborder { border-right: 1px solid #A1A5A9; border-top: 1px dashed #ccc; }
+.weekborder2 { border-right: 1px solid #A1A5A9; border-top: 1px solid #A1A5A9; }
.timeborder { border-right: 2px solid #A1A5A9; border-top: 1px dashed #A1A5A9; background-image: url(images/time_bg.gif); }
.timeborder2 { border-right: 2px solid #A1A5A9; border-top: 1px solid #A1A5A9; background-image: url(images/time_bg.gif); }
.navback { background-image: url(images/time_bg.gif); }
diff --git a/templates/red/default.css b/templates/red/default.css index 717394e..9eae365 100644 --- a/templates/red/default.css +++ b/templates/red/default.css @@ -82,8 +82,8 @@ table, td {font: 11px Verdana, Arial, sans-serif; color: #000;} .tfixed { table-layout: fixed; word-wrap: break-word; } .calborder { background-color: #fff; border: 1px #A1A5A9 solid; }
.dateback { background-color: #eee; }
-.weekborder { border-top: 1px dashed #A1A5A9; border-right: 1px solid #A1A5A9; }
-.weekborder2 { border-right: 1px solid #A1A5A9; }
+.weekborder { border-right: 1px solid #A1A5A9; border-top: 1px dashed #ccc; }
+.weekborder2 { border-right: 1px solid #A1A5A9; border-top: 1px solid #A1A5A9; }
.timeborder { border-right: 2px solid #A1A5A9; border-top: 1px dashed #A1A5A9; background-image: url(images/time_bg.gif); }
.timeborder2 { border-right: 2px solid #A1A5A9; border-top: 1px solid #A1A5A9; background-image: url(images/time_bg.gif); }
.navback { background-image: url(images/time_bg.gif); }
diff --git a/templates/tan/default.css b/templates/tan/default.css index 73a21dd..e6f24cb 100644 --- a/templates/tan/default.css +++ b/templates/tan/default.css @@ -100,8 +100,8 @@ table, td {font: 11px Verdana, Arial, sans-serif; color: #000;} .tfixed { table-layout: fixed; word-wrap: break-word; } .calborder { background-color: #fff; border: 1px #A1A5A9 solid; }
.dateback { background-color: #eee; }
-.weekborder { border-top: 1px dashed #A1A5A9; border-right: 1px solid #A1A5A9; }
-.weekborder2 { border-right: 1px solid #A1A5A9; }
+.weekborder { border-right: 1px solid #A1A5A9; border-top: 1px dashed #ccc; }
+.weekborder2 { border-right: 1px solid #A1A5A9; border-top: 1px solid #A1A5A9; }
.timeborder { border-right: 2px solid #A1A5A9; border-top: 1px dashed #A1A5A9; background-image: url(images/time_bg.gif); }
.timeborder2 { border-right: 2px solid #A1A5A9; border-top: 1px solid #A1A5A9; background-image: url(images/time_bg.gif); }
.navback { background-image: url(images/time_bg.gif); }
|