phpicalendar-commits

[<ji...@us...>]

Update of /cvsroot/phpicalendar/phpicalendar/functions
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30988/phpicalendar/functions

Modified Files:
	event.js template.php 
Log Message:
fix bug 1641928 change todo popup to be like event popup

Index: event.js
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/event.js,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** event.js	5 Apr 2006 04:43:59 -0000	1.16
--- event.js	19 May 2007 16:18:13 -0000	1.17
***************
*** 24,38 ****
  	this.event_data = event_data;
  }
  
! function openTodoInfo(vtodo_array) {	
! 	var windowW = 460;
! 	var windowH = 275;
! 	var url = "includes/todo.php?vtodo_array="+vtodo_array;
! 	options = "scrollbars=yes,width="+windowW+",height="+windowH;
! 	info = window.open(url, "Popup", options);
! 	info.focus();
  }
  
  document.popup_data = new Array();
  //-->
  </script>
--- 24,51 ----
  	this.event_data = event_data;
  }
+ //-->
+ </script>
+ <script language="JavaScript" type="text/javascript">
+ <!--
  
! function openTodoInfo(num) {	
! 	// populate the hidden form
! 	var data = document.todo_popup_data[num];
! 	var form = document.forms.todoPopupForm;
! 
! 	form.elements.todo_data.value = data.todo_data;
! 
! 	// open a new window
! 	var w = window.open('', 'Popup', 'scrollbars=yes,width=460,height=275');
! 	form.target = 'Popup';
! 	form.submit();
! }
! function TodoData(todo_data,todo_text) {
! 	this.todo_data = todo_data;
! 	this.todo_text = todo_text;
  }
  
  document.popup_data = new Array();
+ document.todo_popup_data = new Array();
  //-->
  </script>

Index: template.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/template.php,v
retrieving revision 1.91
retrieving revision 1.92
diff -C2 -d -r1.91 -r1.92
*** template.php	18 May 2007 21:18:00 -0000	1.91
--- template.php	19 May 2007 16:18:13 -0000	1.92
***************
*** 780,784 ****
  		$normal 	= trim($match3[1]);
  		$nugget2	= '';
! 		
  		if (is_array($master_array['-2'])) {
  			foreach ($master_array['-2'] as $vtodo_times) {
--- 780,784 ----
  		$normal 	= trim($match3[1]);
  		$nugget2	= '';
! 		$todo_popup_data_index = 0;
  		if (is_array($master_array['-2'])) {
  			foreach ($master_array['-2'] as $vtodo_times) {
***************
*** 806,811 ****
  							'status'		=> $status,
  							'vtodo_text' 	=> $vtodo_text);
  
! 						$vtodo_array 	= base64_encode(serialize($vtodo_array));
  						$vtodo_text 	= word_wrap(strip_tags(str_replace('<br />',' ',$vtodo_text), '<b><i><u>'), 21, $tomorrows_events_lines);
  						$data 			= array ('{VTODO_TEXT}', '{VTODO_ARRAY}');
--- 806,820 ----
  							'status'		=> $status,
  							'vtodo_text' 	=> $vtodo_text);
+ 						$vtodo_array 	= base64_encode(urlencode(serialize($vtodo_array)));
+ 						$todo = "
+ 						<script language=\"Javascript\" type=\"text/javascript\"><!--
+ 						var todoData = new TodoData('$vtodo_array','$vtodo_text');
+ 						document.todo_popup_data[$todo_popup_data_index] = todoData;
+ 						// --></script>";
  
! 						$todo .= '<a class="psf" title="'.$title.'" href="#" onclick="openTodoInfo('.$todo_popup_data_index.'); return false;">';
! 						$todo_popup_data_index++;
! 						$vtodo_array = $todo;
! 						
  						$vtodo_text 	= word_wrap(strip_tags(str_replace('<br />',' ',$vtodo_text), '<b><i><u>'), 21, $tomorrows_events_lines);
  						$data 			= array ('{VTODO_TEXT}', '{VTODO_ARRAY}');