[Phpgroupware-cvs] CVS: calendar/templates/default day_cal.tpl,1.13,1.14 header.inc.php,1.22,1.23 month_header.tpl,1.4,1.5

[Ralf Becker <address@hidden>]

Update of /cvsroot/phpgroupware/calendar/templates/default
In directory subversions:/tmp/cvs-serv32234/templates/default

Modified Files:
        day_cal.tpl header.inc.php month_header.tpl 
Log Message:
got cal working with the .14 fixes and (provisionaly) with the new themes via 
css (still a lot to do)


Index: day_cal.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/templates/default/day_cal.tpl,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** day_cal.tpl 4 Jan 2002 04:26:51 -0000       1.13
--- day_cal.tpl 23 Nov 2002 20:48:42 -0000      1.14
***************
*** 10,23 ****
  <!-- END day_row -->
  <!-- BEGIN day_event_on -->
!      <td class="event-on"{extras}>{event}</td>
  <!-- END day_event_on -->
  <!-- BEGIN day_event_off -->
!      <td class="event-off"{extras}>{event}</td>
  <!-- END day_event_off -->
  <!-- BEGIN day_event_holiday -->
!      <td class="event-holiday"{extras}>{event}</td>
  <!-- END day_event_holiday -->
  <!-- BEGIN day_time -->
!      <td class="time"><nobr>{open_link}{time}{close_link}</nobr></td>
  <!-- END day_time -->
  
--- 10,23 ----
  <!-- END day_row -->
  <!-- BEGIN day_event_on -->
!      <td class="row_on"{extras}>{event}</td>
  <!-- END day_event_on -->
  <!-- BEGIN day_event_off -->
!      <td class="row_off"{extras}>{event}</td>
  <!-- END day_event_off -->
  <!-- BEGIN day_event_holiday -->
!      <td class="cal_holiday"{extras}>{event}</td>
  <!-- END day_event_holiday -->
  <!-- BEGIN day_time -->
!      <td class="th"><nobr>{open_link}{time}{close_link}</nobr></td>
  <!-- END day_time -->
  

Index: header.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/templates/default/header.inc.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** header.inc.php      25 Aug 2002 12:33:57 -0000      1.22
--- header.inc.php      23 Nov 2002 20:48:42 -0000      1.23
***************
*** 31,34 ****
--- 31,35 ----
                'form_button_script'    => 'form_button_script.tpl'
        );
+       $tpl = &$GLOBALS['phpgw']->template;
        $tpl->set_file($templates);
        $tpl->set_block('head_tpl','head','head');
***************
*** 70,74 ****
        add_col($tpl,'  <td width="'.(100 - $col_width).'%" 
align="left"'.(floor(phpversion()) < 4?' colspan="2"':'').'>&nbsp;</td>');
  
!       $tpl->parse('row','head_table',True);
  
        $tpl->set_var('header_column','');
--- 71,75 ----
        add_col($tpl,'  <td width="'.(100 - $col_width).'%" 
align="left"'.(floor(phpversion()) < 4?' colspan="2"':'').'>&nbsp;</td>');
  
!       $tpl->parse('phpgw_body','head_table',True);
  
        $tpl->set_var('header_column','');
***************
*** 84,88 ****
                $date         = get_var('date',Array('GET','POST'));
                $year         = $this->bo->year;
!               $month        = $this->bo-month;
                $day          = $this->bo->day;
                $var_list = Array(
--- 85,89 ----
                $date         = get_var('date',Array('GET','POST'));
                $year         = $this->bo->year;
!               $month        = $this->bo->month;
                $day          = $this->bo->day;
                $var_list = Array(
***************
*** 99,105 ****
                for($i=0;$i<count($var_list);$i++)
                {
!                       if($($var_list[$i]))
                        {
!                               $base_hidden_vars .= '    <input type="hidden" 
name="'.$var_list[$i].'" value="'.$($var_list[$i]).'">'."\n";
                        }
                }
--- 100,106 ----
                for($i=0;$i<count($var_list);$i++)
                {
!                       if($$var_list[$i])
                        {
!                               $base_hidden_vars .= '    <input type="hidden" 
name="'.$var_list[$i].'" value="'.$$var_list[$i].'">'."\n";
                        }
                }
***************
*** 119,123 ****
                        'title' => lang('Category'),
                        'hidden_vars'   => $base_hidden_vars.$hidden_vars,
!                       'form_options'  => '<option 
value="0">All</option>'.$this->cat->formated_list('select','all',$this->bo->cat_id,'True'),
                        'button_value'  => lang('Go!')
                );
--- 120,124 ----
                        'title' => lang('Category'),
                        'hidden_vars'   => $base_hidden_vars.$hidden_vars,
!                       'form_options'  => '<option 
value="0">All</option>'.$this->cat->formatted_list('select','all',$this->bo->cat_id,'True'),
                        'button_value'  => lang('Go!')
                );
***************
*** 267,270 ****
        $tpl->set_var('str','<td align="right" 
valign="bottom">'.$button.'</td>');
        $tpl->parse('header_column','head_col',True);
!       $tpl->parse('row','head_table',True);
  ?>
--- 268,271 ----
        $tpl->set_var('str','<td align="right" 
valign="bottom">'.$button.'</td>');
        $tpl->parse('header_column','head_col',True);
!       $tpl->parse('phpgw_body','head_table',True);
  ?>

Index: month_header.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/templates/default/month_header.tpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** month_header.tpl    27 Sep 2002 22:52:04 -0000      1.4
--- month_header.tpl    23 Nov 2002 20:48:42 -0000      1.5
***************
*** 5,9 ****
  <!-- END monthly_header -->
  <!-- BEGIN column_title -->
!   <th width="11%" class="bgcolor"><font 
color="{font_color}">{col_title}</font></th>
  <!-- END column_title -->
  <!-- BEGIN month_column -->
--- 5,9 ----
  <!-- END monthly_header -->
  <!-- BEGIN column_title -->
!   <th width="11%" class="{class}"><font 
color="{font_color}">{col_title}</font></th>
  <!-- END column_title -->
  <!-- BEGIN month_column -->