[PHPiCalendar-Commits] phpicalendar config.inc.php,1.121,1.122 day.php,1.100,1.101 month.php,1.101,1.102 week.php,1.101,1.102

[<cl...@us...>]

Update of /cvsroot/phpicalendar/phpicalendar
In directory sc8-pr-cvs1:/tmp/cvs-serv11463

Modified Files:
	config.inc.php day.php month.php week.php 
Log Message:
Checked in a new popup system. Also added calname to calendar for popup reference.



Index: config.inc.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/config.inc.php,v
retrieving revision 1.121
retrieving revision 1.122
diff -C2 -d -r1.121 -r1.122
*** config.inc.php	17 Nov 2003 18:02:34 -0000	1.121
--- config.inc.php	19 Nov 2003 07:54:09 -0000	1.122
***************
*** 33,37 ****
  
  // Yes/No questions --- 'yes' means Yes, anything else means no. 'yes' must be lowercase.
! $save_parsed_cals 		= 'yes';				// Recommended 'yes'. Saves a copy of the cal in /tmp after it's been parsed. Improves performence.
  $use_sessions 			= 'no';				// This has not yet been implemented.
  $display_custom_goto 	= 'no';				// In the 'Jump To' box, display the custom 'go to day' box.
--- 33,37 ----
  
  // Yes/No questions --- 'yes' means Yes, anything else means no. 'yes' must be lowercase.
! $save_parsed_cals 		= 'no';				// Recommended 'yes'. Saves a copy of the cal in /tmp after it's been parsed. Improves performence.
  $use_sessions 			= 'no';				// This has not yet been implemented.
  $display_custom_goto 	= 'no';				// In the 'Jump To' box, display the custom 'go to day' box.

Index: day.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/day.php,v
retrieving revision 1.100
retrieving revision 1.101
diff -C2 -d -r1.100 -r1.101
*** day.php	16 Nov 2003 06:09:09 -0000	1.100
--- day.php	19 Nov 2003 07:54:09 -0000	1.101
***************
*** 91,98 ****
  						 echo "<tr>\n";
  						 $event_calno  = $allday['calnumber'];
  						 if ($event_calno < 1) $event_calno=1;
  						 if ($event_calno > 7) $event_calno=7;
  						 echo '<td valign="top" align="center" class="eventbg_'.$event_calno.'">';
! 						 openevent("$calendar_name",
  							   "",
  							   "",
--- 91,99 ----
  						 echo "<tr>\n";
  						 $event_calno  = $allday['calnumber'];
+ 						 $event_calna  = $allday['calname'];
  						 if ($event_calno < 1) $event_calno=1;
  						 if ($event_calno > 7) $event_calno=7;
  						 echo '<td valign="top" align="center" class="eventbg_'.$event_calno.'">';
! 						 openevent("$event_calna",
  							   "",
  							   "",
***************
*** 253,259 ****
  												  echo '<tr>'."\n";
  												  echo '<td class="eventbg_'.$event_calno.'">';
! 												  // Todo: keep track of where the event comes from, and indicate that to openevent instead of $ALL_CALENDARS_COMBINED
! 												  if ($cal == $ALL_CALENDARS_COMBINED) $calendar_name2=$cal; else $calendar_name2=$calendar_name;
! 										  		  openevent("$calendar_name2",
  												  "$event_start",
  												  "$event_end",
--- 254,259 ----
  												  echo '<tr>'."\n";
  												  echo '<td class="eventbg_'.$event_calno.'">';
! 												  $event_calna = $this_time_arr[($event_length[$i]['key'])]['calname'];
! 										  		  openevent("$event_calna",
  												  "$event_start",
  												  "$event_end",

Index: month.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/month.php,v
retrieving revision 1.101
retrieving revision 1.102
diff -C2 -d -r1.101 -r1.102
*** month.php	17 Nov 2003 19:48:05 -0000	1.101
--- month.php	19 Nov 2003 07:54:09 -0000	1.102
***************
*** 115,121 ****
  									foreach ($event_times as $val) {
  										$num_of_events2++;
  										if (!isset($val["event_start"])) {
  											echo '<div align="center" class="V10">';
! 											openevent("$calendar_name", "", "", $val, $month_event_lines,
  											15,
  											"<i>",
--- 115,123 ----
  									foreach ($event_times as $val) {
  										$num_of_events2++;
+ 										$event_calno = $val['calnumber'];
+ 										$event_calna = $val['calname'];
  										if (!isset($val["event_start"])) {
  											echo '<div align="center" class="V10">';
! 											openevent("$event_calna", "", "", $val, $month_event_lines,
  											15,
  											"<i>",
***************
*** 131,135 ****
  											$start2		 = date($timeFormat_small,@strtotime("$event_start"));
  											$event_end   = date($timeFormat, @strtotime ("$event_end"));
! 											@openevent("$calendar_name",
  											"$event_start",
  											"$event_end",
--- 133,137 ----
  											$start2		 = date($timeFormat_small,@strtotime("$event_start"));
  											$event_end   = date($timeFormat, @strtotime ("$event_end"));
! 											@openevent("$event_calna",
  											"$event_start",
  											"$event_end",
***************
*** 195,198 ****
--- 197,203 ----
  								// Pull out each time
  								foreach ($new_val as $new_key2 => $new_val2) {
+ 								$event_calno = $new_val2['calnumber'];
+ 								$event_calna = $new_val2['calname'];
+ 
  								if ($new_val2["event_text"]) {	
  									if (isset($new_val2["event_start"])) {
***************
*** 216,220 ****
  									}
  									echo "<td>\n";
! 									openevent("$calendar_name",
  									"$event_start",
  									"$event_end",
--- 221,225 ----
  									}
  									echo "<td>\n";
! 									openevent("$event_calna",
  									"$event_start",
  									"$event_end",

Index: week.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/week.php,v
retrieving revision 1.101
retrieving revision 1.102
diff -C2 -d -r1.101 -r1.102
*** week.php	16 Nov 2003 06:09:09 -0000	1.101
--- week.php	19 Nov 2003 07:54:09 -0000	1.102
***************
*** 164,171 ****
  														echo "<tr>\n";
  														$event_calno  = $allday['calnumber'];
  						 								if ($event_calno < 1) $event_calno=1;
  														if ($event_calno > 7) $event_calno=7;
  						 								echo '<td valign="top" align="center" class="eventbg_'.$event_calno.'">';
! 														openevent("$calendar_name",
  														"",
  													  	"",
--- 164,172 ----
  														echo "<tr>\n";
  														$event_calno  = $allday['calnumber'];
+ 														$event_calna  = $allday['calname'];
  						 								if ($event_calno < 1) $event_calno=1;
  														if ($event_calno > 7) $event_calno=7;
  						 								echo '<td valign="top" align="center" class="eventbg_'.$event_calno.'">';
! 														openevent("$event_calna",
  														"",
  													  	"",
***************
*** 307,313 ****
  																	 if (isset($this_time_arr[($event_length[$thisday][$i]["key"])]['display_end'])) $event_end = strtotime ($this_time_arr[($event_length[$thisday][$i]["key"])]['display_end']);
  																	$event_end 	= date ($timeFormat, $event_end);
! 																	// Todo: keep track of where the event comes from, and indicate that to openevent instead of $ALL_CALENDARS_COMBINED
! 																	if ($cal == $ALL_CALENDARS_COMBINED) $calendar_name2=$cal; else $calendar_name2=$calendar_name;
! 																	openevent("$calendar_name2",
  																		  "$event_start",
  																		  "$event_end",
--- 308,314 ----
  																	 if (isset($this_time_arr[($event_length[$thisday][$i]["key"])]['display_end'])) $event_end = strtotime ($this_time_arr[($event_length[$thisday][$i]["key"])]['display_end']);
  																	$event_end 	= date ($timeFormat, $event_end);
! 
! 																	$event_calna = $this_time_arr[($event_length[$thisday][$i]["key"])]['calname'];
! 																	openevent("$event_calna",
  																		  "$event_start",
  																		  "$event_end",