[Phpgroupware-cvs] calendar/inc class.uicalendar.inc.php, 1.120 class.bocalendar.inc.php, 1.100

[skwashd]

Update of calendar/inc

Modified Files:
     Branch: MAIN
            class.uicalendar.inc.php lines: +3 -2
            class.bocalendar.inc.php lines: +1 -2

Log Message:
minor changes

====================================================
Index: calendar/inc/class.uicalendar.inc.php
diff -u calendar/inc/class.uicalendar.inc.php:1.119 
calendar/inc/class.uicalendar.inc.php:1.120
--- calendar/inc/class.uicalendar.inc.php:1.119 Thu Dec  8 06:24:18 2005
+++ calendar/inc/class.uicalendar.inc.php       Thu Dec  8 12:15:42 2005
@@ -311,6 +311,7 @@
                        $GLOBALS['phpgw']->redirect($this->page('',$params));
                }

+               //TODO Replace this with better CSS driven print mode
                function printer_friendly($body,$app_header='')
                {
                        if($this->bo->printer_friendly)
@@ -384,7 +385,7 @@
                        {
                                $printer = '';
                                $param = 
'&year='.$this->bo->year.'&month='.$this->bo->month.'&friendly=1';
-                               $print = '<a 
href="'.$this->page('month'.$param)."\" TARGET=\"cal_printer_friendly\" 
onMouseOver=\"window.status = '".lang('Generate printer-friendly 
version')."'\">[".lang('Printer Friendly').']</a>';
+                               $print = '<a 
href="'.$this->page('month'.$param)."\" target=\"cal_printer_friendly\" 
onMouseOver=\"window.status = '".lang('Generate printer-friendly 
version')."'\">[".lang('Printer Friendly').']</a>';
                        }
                        else
                        {

====================================================
Index: calendar/inc/class.bocalendar.inc.php
diff -u calendar/inc/class.bocalendar.inc.php:1.99 
calendar/inc/class.bocalendar.inc.php:1.100
--- calendar/inc/class.bocalendar.inc.php:1.99  Sun Dec  4 09:24:34 2005
+++ calendar/inc/class.bocalendar.inc.php       Thu Dec  8 12:15:42 2005
@@ -1225,7 +1225,6 @@
                                        {
                                                echo '<!-- Temp_Start == 
Temp_End -->'."\n";
                                        }
-                                       
@reset($possible_conflicts[$temp_start]);
                                        foreach ( 
$possible_conflicts[$temp_start] as $key => $event )
                                        {
                                                $found = False;