Menu
▾
▴
[PHPiCalendar-Commits] phpicalendar config.inc.php,1.104,1.105 day.php,1.92,1.93 month.php,1.91,1.92 week.php,1.92,1.93
|
From: <cl...@us...> - 2003-09-14 21:01:38
|
Update of /cvsroot/phpicalendar/phpicalendar
In directory sc8-pr-cvs1:/tmp/cvs-serv25119
Modified Files:
config.inc.php day.php month.php week.php
Log Message:
Removed many many tables from month view, switched to DIVS. Fixed openevent, added link class.
Index: config.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/config.inc.php,v
retrieving revision 1.104
retrieving revision 1.105
diff -C2 -d -r1.104 -r1.105
*** config.inc.php 1 Jul 2003 00:40:59 -0000 1.104
--- config.inc.php 14 Sep 2003 21:01:34 -0000 1.105
***************
*** 11,15 ****
$default_cal = 'all_calenders_combined971'; // Exact filename of calendar without .ics. Or set to 'all_calenders_combined971' to open all calenders combined into one.
$language = 'English'; // Language support - 'English', 'Polish', 'German', 'French', 'Dutch', 'Danish', 'Italian', 'Japanese', 'Norwegian', 'Spanish', 'Swedish', 'Portuguese', 'Catalan', 'Traditional_Chinese', 'Esperanto'
! $week_start_day = 'Saturday'; // Day of the week your week starts on
$day_start = '0800'; // Start time for day grid
$gridLength = '15'; // Grid distance in minutes for day view, multiples of 15 preferred
--- 11,15 ----
$default_cal = 'all_calenders_combined971'; // Exact filename of calendar without .ics. Or set to 'all_calenders_combined971' to open all calenders combined into one.
$language = 'English'; // Language support - 'English', 'Polish', 'German', 'French', 'Dutch', 'Danish', 'Italian', 'Japanese', 'Norwegian', 'Spanish', 'Swedish', 'Portuguese', 'Catalan', 'Traditional_Chinese', 'Esperanto'
! $week_start_day = 'Sunday'; // Day of the week your week starts on
$day_start = '0800'; // Start time for day grid
$gridLength = '15'; // Grid distance in minutes for day view, multiples of 15 preferred
Index: day.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/day.php,v
retrieving revision 1.92
retrieving revision 1.93
diff -C2 -d -r1.92 -r1.93
*** day.php 30 Jun 2003 22:46:12 -0000 1.92
--- day.php 14 Sep 2003 21:01:34 -0000 1.93
***************
*** 119,123 ****
"",
'<font color="#ffffff"><i>',
! "</i></font>");
echo "</td>\n</tr>\n";
}
--- 119,124 ----
"",
'<font color="#ffffff"><i>',
! "</i></font>",
! "psf");
echo "</td>\n</tr>\n";
}
***************
*** 272,276 ****
0,
"<font class=\"eventfont\">",
! "</font>");
echo '</td></tr>'."\n";
echo '</table>'."\n";
--- 273,278 ----
0,
"<font class=\"eventfont\">",
! "</font>",
! "psf");
echo '</td></tr>'."\n";
echo '</table>'."\n";
Index: month.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/month.php,v
retrieving revision 1.91
retrieving revision 1.92
diff -C2 -d -r1.91 -r1.92
*** month.php 30 Jun 2003 22:46:12 -0000 1.91
--- month.php 14 Sep 2003 21:01:34 -0000 1.92
***************
*** 93,100 ****
<tr>
<td align="center" valign="top">
! <table width="100%" border="0" cellspacing="0" cellpadding="0">
! <tr>
! <td colspan="7" width="735"><img src="images/spacer.gif" width="735" height="1" alt=" "></td>
! </tr>
<tr>
<?php
--- 93,97 ----
<tr>
<td align="center" valign="top">
! <table width="100%" border="0" cellspacing="1" cellpadding="2" class="monthback">
<tr>
<?php
***************
*** 104,176 ****
$day_num = date("w", $start_day);
$day = $daysofweek_lang[$day_num];
! print "<td valign=\"top\" width=\"105\" height=\"12\" class=\"dateback\"><center><font class=\"V9BOLD\">$day</font></center></td>";
$start_day = strtotime("+1 day", $start_day);
}
?>
</tr>
- <tr>
- <td width="105"><img src="images/spacer.gif" width="105" height="1" alt=" "></td>
- <td width="105"><img src="images/spacer.gif" width="105" height="1" alt=" "></td>
- <td width="105"><img src="images/spacer.gif" width="105" height="1" alt=" "></td>
- <td width="105"><img src="images/spacer.gif" width="105" height="1" alt=" "></td>
- <td width="105"><img src="images/spacer.gif" width="105" height="1" alt=" "></td>
- <td width="105"><img src="images/spacer.gif" width="105" height="1" alt=" "></td>
- <td width="105"><img src="images/spacer.gif" width="105" height="1" alt=" "></td>
- </tr>
- </table>
- </td>
- </tr>
- <tr>
- <td align="center" valign="top">
- <table width="100%" border="0" cellspacing="1" cellpadding="0" class="monthback">
<tr>
<?php
! $sunday = strtotime("$start_month_day");
! $i = 0;
! $whole_month = TRUE;
! $num_of_events = 0;
do {
! $day = date ("j", $sunday);
! $daylink = date ("Ymd", $sunday);
! $check_month = date ("m", $sunday);
if ($check_month != $this_month) {
! $day= "<font class=\"G10G\">$day</font>";
! $bgclass="class=\"monthoff\"";
} else {
if ($today_today == $daylink) {
! $bgclass="class=\"monthon\"";
} else {
! $bgclass="class=\"monthreg\"";
}
}
! if ($i == 0) echo "<tr height=\"105\">\n";
! if (isset($master_array[("$daylink")]) && ($check_month == $this_month)) {
! echo "<td align=\"center\" valign=\"top\" $bgclass width=\"105\" height=\"105\">\n";
! echo "<table width=\"100%\" border=\"0\" cellspacing=\"0\" cellpadding=\"1\">\n";
! echo "<tr>\n";
! echo "<td align=\"right\" valign=\"top\" class=\"G10B\">\n";
! echo "<a class=\"psf\" href=\"day.php?cal=$cal&getdate=$daylink\">$day</a>\n";
! echo "</td>\n";
! echo "</tr>\n";
if ($master_array[("$daylink")]) {
foreach ($master_array[("$daylink")] as $event_times) {
foreach ($event_times as $val) {
$num_of_events++;
- echo "<tr><td>\n";
- echo "<table width=\"100%\" cellspacing=\"0\" cellpadding=\"0\">";
- echo "<tr>\n";
if (!isset($val["event_start"])) {
- echo '<td align="center">';
openevent("$calendar_name", "", "", $val, $month_event_lines,
12,
! "<font class=\"V10\"><i>",
! "</i></font>");
} else {
$event_start = @$val["event_start"];
$event_end = @$val["event_end"];
$event_start = date($timeFormat, @strtotime ("$event_start"));
! $start2 = date($timeFormat_small,@strtotime("$event_start"));
$event_end = date($timeFormat, @strtotime ("$event_end"));
- echo "<td align=\"left\" valign=\"top\">";
@openevent("$calendar_name",
"$event_start",
--- 101,150 ----
$day_num = date("w", $start_day);
$day = $daysofweek_lang[$day_num];
! echo '<td valign="top" width="105" height="12" class="dateback"><center class="V9BOLD">'.$day.'</center></td>';
$start_day = strtotime("+1 day", $start_day);
}
?>
</tr>
<tr>
<?php
! $sunday = strtotime("$start_month_day");
! $i = 0;
! $whole_month = TRUE;
! $num_of_events = 0;
do {
! $day = date ("j", $sunday);
! $daylink = date ("Ymd", $sunday);
! $check_month = date ("m", $sunday);
if ($check_month != $this_month) {
! $day = '<font class="G10G">'.$day.'</font>';
! $bgclass = 'class="monthoff"';
} else {
if ($today_today == $daylink) {
! $bgclass = 'class="monthon"';
} else {
! $bgclass = 'class="monthreg"';
}
}
! if ($i == 0) echo '<tr height="105">';
! echo '<td valign="top" align="left" '.$bgclass.' width="105" height="105">';
! if (isset($master_array[("$daylink")])) {
! echo '<div align="right"><font class="G10"><a class="psf" href="day.php?cal='.$cal.'&getdate='.$daylink.'">'.$day.'</a></font></div>';
! echo '<div align="left">';
if ($master_array[("$daylink")]) {
foreach ($master_array[("$daylink")] as $event_times) {
foreach ($event_times as $val) {
$num_of_events++;
if (!isset($val["event_start"])) {
openevent("$calendar_name", "", "", $val, $month_event_lines,
12,
! "<div align=\"center\" class=\"V10\"><i>",
! "</i></div>",
! "psf");
} else {
$event_start = @$val["event_start"];
$event_end = @$val["event_end"];
$event_start = date($timeFormat, @strtotime ("$event_start"));
! $start2 = date($timeFormat_small,@strtotime("$event_start"));
$event_end = date($timeFormat, @strtotime ("$event_end"));
@openevent("$calendar_name",
"$event_start",
***************
*** 179,208 ****
$month_event_lines,
12,
! "<font class=\"V9\"> $start2 ",
! "</font>");
}
- echo "</td></tr>\n";
- echo "</table>\n";
- echo "</td></tr>\n";
}
}
}
! echo "</table>\n";
! echo "</td>\n";
} else {
! echo "<td align=\"center\" valign=\"top\" $bgclass width=\"105\" height=\"105\">\n";
! echo "<table width=\"100%\" border=\"0\" cellspacing=\"0\" cellpadding=\"1\">\n";
! echo "<tr>\n";
! echo "<td align=\"right\" valign=\"top\" class=\"G10B\">\n";
! echo "<a class=\"psf\" href=\"day.php?cal=$cal&getdate=$daylink\">$day</a>\n";
! echo "</td>\n";
! echo "</tr>\n";
! echo "</table>\n";
! echo "</td>\n";
}
$sunday = strtotime("+1 day", $sunday);
$i++;
if ($i == 7) {
! echo "</tr>\n";
$i = 0;
$checkagain = date ("m", $sunday);
--- 153,173 ----
$month_event_lines,
12,
! "<div align=\"left\" class=\"V9\"> $start2 ",
! "</div>",
! "ps3");
}
}
}
}
! echo '</td>';
} else {
! echo '<td align="center" valign="top" '.$bgclass.' width="105" height="105">';
! echo '<a class="psf" href="day.php?cal='.$cal.'&getdate='.$daylink.'">'.$day.'</a>';
! echo '</td>';
}
$sunday = strtotime("+1 day", $sunday);
$i++;
if ($i == 7) {
! echo '</tr>';
$i = 0;
$checkagain = date ("m", $sunday);
***************
*** 216,220 ****
</table>
<?php include (BASE.'includes/calendar_nav.php'); ?>
! <?php if (($num_of_events != 0) && ($this_months_events == "yes")) { ?>
<br>
<table border="0" cellspacing="0" cellpadding="0" width="737" bgcolor="#FFFFFF" class="calborder">
--- 181,185 ----
</table>
<?php include (BASE.'includes/calendar_nav.php'); ?>
! <?php if ($this_months_events == "yes") { ?>
<br>
<table border="0" cellspacing="0" cellpadding="0" width="737" bgcolor="#FFFFFF" class="calborder">
***************
*** 274,278 ****
65,
"<font class=\"G10B\"> ",
! "</font>");
//echo " <a class=\"psf\" href=\"javascript:openEventInfo('$event_text2', '$calendar_name', '$event_start2', '$event_end', '$description', '$status')\"><font class=\"G10B\">$event_text</font></a>\n";
echo "</td>\n";
--- 239,244 ----
65,
"<font class=\"G10B\"> ",
! "</font>",
! "psf");
//echo " <a class=\"psf\" href=\"javascript:openEventInfo('$event_text2', '$calendar_name', '$event_start2', '$event_end', '$description', '$status')\"><font class=\"G10B\">$event_text</font></a>\n";
echo "</td>\n";
Index: week.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/week.php,v
retrieving revision 1.92
retrieving revision 1.93
diff -C2 -d -r1.92 -r1.93
*** week.php 30 Jun 2003 22:46:12 -0000 1.92
--- week.php 14 Sep 2003 21:01:34 -0000 1.93
***************
*** 190,194 ****
12,
'<font color="#ffffff">',
! "</font>");
echo "</td></tr>\n";
}
--- 190,195 ----
12,
'<font color="#ffffff">',
! "</font>",
! "psf");
echo "</td></tr>\n";
}
***************
*** 324,328 ****
25,
"<font class=\"V10W\">",
! "</font>");
echo "</td></tr>\n";
echo "</table>\n";
--- 325,330 ----
25,
"<font class=\"V10W\">",
! "</font>",
! "psf");
echo "</td></tr>\n";
echo "</table>\n";
|
