Changeset 4270 for branches/2.2.0.1/calendar/inc

Timestamp:

05/06/11 18:30:56 (13 years ago)

Author:

rafaelraymundo

Message:

Ticket #1850 - Problema na apresentação da agenda diaria no home

Location:

branches/2.2.0.1/calendar/inc

Files:

• class.uicalendar.inc.php (modified) (2 diffs)
• hook_home_day.inc.php (modified) (1 diff)

branches/2.2.0.1/calendar/inc/class.uicalendar.inc.php

@@ -5078 +5078 @@
                         $templateSet = $GLOBALS['phpgw_info']['server']['template_set'];
 
+                        if(isset($_GET['date']))
+                        {
+                            $dia = substr($_GET['date'],-2);
+                        }
+                        elseif(isset($_POST['day']))
+                        {
+                            $dia = $_POST['day'];
+                        }
+                        else
+                        {
+                            $dia = $params['day'];
+                        }
+                        
+                        $print =  '<a href="javascript:void(0)" id="printFriendly">['.lang('Printer Friendly').']</a>';
+                        $param = '&year='.$this->bo->year.'&month='.$this->bo->month.'&friendly=1'.'&day_ini='.$dia.'&num_dias=1'.'&d=1';
+
                         $p->set_file($templates);
                         $p->set_block('day_cal','day','day');
@@ -5085 +5101 @@
                         $p->set_var('date',$result_events_json['date_events_json']);
                         $p->set_var('templateSet',$templateSet);
+                        $p->set_var('iprint',$print);
+                        $p->set_var('param',$param);
                         $p->set_var('hora_final',$result_events_json['hora_final']);
                         $p->set_var('hora_inicial',$result_events_json['hora_inicial']);

branches/2.2.0.1/calendar/inc/hook_home_day.inc.php

@@ -32 +32 @@
                 ).'</td><td align="center"><table border="0" width="100%" cellspacing="0" cellpadding="0">'
                 . '<tr><td align="center">'.ExecMethod('calendar.bocalendar.long_date',time())
-                .'</td></tr><tr><td bgcolor="'.$GLOBALS['phpgw_info']['theme']['bg_text']
-                .'" valign="top">'.ExecMethod('calendar.uicalendar.print_day',
+                .'</td></tr><tr><td valign="top">'.ExecMethod('calendar.uicalendar.print_day_new',
                         Array(
                                 'year'  => $GLOBALS['g_year'],