Changeset 4098 for branches/2.2.0.1/calendar/inc/class.uicalendar.inc.php

Timestamp:

04/20/11 14:23:50 (13 years ago)

Author:

brunocosta

Message:

Ticket #1745 - Ajustes na interface das novas visões semanal e mensal da agenda.

File:

• branches/2.2.0.1/calendar/inc/class.uicalendar.inc.php (modified) (7 diffs)

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

@@ -506 +506 @@
 
                         }
-
-                        echo $this->printer_friendly($this->print_month_new($params),lang('Weekview'));
+                        if($_GET['friendly']==1)
+                            echo $this->printer_friendly($this->get_month(),lang('Monthview'));
+                        else
+                            echo $this->printer_friendly($this->print_month_new($params),lang('Weekview'));
                         $GLOBALS['phpgw']->common->phpgw_footer();
                 }
@@ -5143 +5145 @@
                         $m = mktime(0,0,0,$this->bo->month,1,$this->bo->year);
 
+                        $next = $GLOBALS['phpgw']->datetime->makegmttime(0,0,0,$this->bo->month,$this->bo->day + 7,$this->bo->year);
+                        $prev = $GLOBALS['phpgw']->datetime->makegmttime(0,0,0,$this->bo->month,$this->bo->day - 7,$this->bo->year);
+                        $prev_week_link = '<a href="'.$this->page('week','&date='.$prev['full']).'">&lt;&lt;</a>';
+                        $next_week_link = '<a href="'.$this->page('week','&date='.$next['full']).'">&gt;&gt;</a>';
+
+
                         $templates = Array(
                                 'new_week'   => $tpl,
@@ -5154 +5162 @@
                         $p->set_var('hora_final',$result_events_json['hora_final']);
                         $p->set_var('hora_inicial',$result_events_json['hora_inicial']);
-                          $p->set_var('minical',$minical_prev.'<br>'.$minical_next.'<br>'.$minical_next1);
-                        $p->set_var('title',lang(strftime("%B",$m)).' '.$this->bo->year);
-                        $p->set_var('user',$GLOBALS['phpgw']->common->grab_owner_name($this->bo->owner));
+                        $p->set_var('minical',$minical_prev.'<br>'.$minical_next.'<br>'.$minical_next1);
+                        $p->set_var('title',$this->bo->get_week_label());
+                        $p->set_var('user',$prev_week_link.' '.$GLOBALS['phpgw']->common->grab_owner_name($this->bo->owner).' '.$next_week_link);
                         $p->set_var('events_json',json_encode($result_events_json['events_to_show_json'])?json_encode($result_events_json['events_to_show_json']):'null');
                         return $p->fp('out','day');
@@ -5209 +5217 @@
                                         )
                                 );
+
+                        $next = $this->bo->month + 1;
+                        $prev = $this->bo->month - 1;
+                        $nextyear = $this->bo->year;
+                        $prevyear = $this->bo->year;
+                        if ($this->bo->month == 12)
+                        {
+                                $next = 1;
+                                $nextyear = $nextyear + 1;
+                        }
+                        elseif ($this->bo->month == 1)
+                        {
+                                $prev = 12;
+                                $prevyear = $prevyear - 1;
+                        }
+
                         $m = mktime(0,0,0,$this->bo->month,1,$this->bo->year);
                         $p->set_file($templates);
@@ -5214 +5238 @@
                         $params['period'] = 3;
                         $result_events_json = $this->print_events_to_show_json($params);
+                        $prev_month_link = '<a href="'.$this->page('month','&year='.$prevyear.'&month='.$prev.'&sday='.$sday).'">&lt;&lt;</a>';
+                        $next_month_link = '<a href="'.$this->page('month','&year='.$nextyear.'&month='.$next.'&sday='.$sday).'">&gt;&gt;</a>';
                         $p->set_var('date',$result_events_json['date_events_json']);
                         $p->set_var('hora_final',$result_events_json['hora_final']);
@@ -5219 +5245 @@
                         $p->set_var('minical',$minical_prev.'<br>'.$minical_next.'<br>'.$minical_next1);
                         $p->set_var('title',lang(strftime("%B",$m)).' '.$this->bo->year);
-                        $p->set_var('user',$GLOBALS['phpgw']->common->grab_owner_name($this->bo->owner));
+                        $p->set_var('user',$prev_month_link." ".$GLOBALS['phpgw']->common->grab_owner_name($this->bo->owner).' '.$next_month_link);
                         $p->set_var('events_json',json_encode($result_events_json['events_to_show_json'])?json_encode($result_events_json['events_to_show_json']):'null');
                         return $p->fp('out','day');
@@ -5337 +5363 @@
                                 else
                                 {
-                                    $text = $event['title']." - ".$event['description'];
+                                        $text = ' - '.$event['end']['hour'].':'.$event['end']['min'].' - '.$event['title']." - ".$event['description'];
                                 }