[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: calendar/inc class.uicalendar.inc.php,1.66.2.35,
|
From: |
Ralf Becker <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: calendar/inc class.uicalendar.inc.php,1.66.2.35,1.66.2.36 |
|
Date: |
Thu, 31 Oct 2002 09:40:31 -0500 |
Update of /cvsroot/phpgroupware/calendar/inc
In directory subversions:/tmp/cvs-serv12824
Modified Files:
Tag: Version-0_9_14-branch
class.uicalendar.inc.php
Log Message:
some cosmetical changes and a cancel button for edit
Index: class.uicalendar.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.uicalendar.inc.php,v
retrieving revision 1.66.2.35
retrieving revision 1.66.2.36
diff -C2 -r1.66.2.35 -r1.66.2.36
*** class.uicalendar.inc.php 31 Oct 2002 09:47:12 -0000 1.66.2.35
--- class.uicalendar.inc.php 31 Oct 2002 14:40:28 -0000 1.66.2.36
***************
*** 1605,1609 ****
// FIXME: how many chars can
be displayed in the event\'s cell?
//
! $max_chars =
4*$colspan/$intervals_per_day-5;
$max_chars /=
($colspan<9 ? 2 : 1);
--- 1605,1609 ----
// FIXME: how many chars can
be displayed in the event\'s cell?
//
! $max_chars =
2*4*$colspan/$intervals_per_day-5;
$max_chars /=
($colspan<9 ? 2 : 1);
***************
*** 1732,1736 ****
$days_between =
$GLOBALS[\'phpgw\']->datetime->days_between($event[\'end\'][\'month\'],$event[\'end\'][\'mday\'],$event[\'end\'][\'year\'],$this->planner_end_month,$this->planner_days_in_end_month,$this->planner_end_year);
! $end_cell = $last_cell -
$intervals_per_day * ($days_between+1) + $interval[$event[\'end\'][\'hour\']] +
1;
}
else
--- 1732,1737 ----
$days_between =
$GLOBALS[\'phpgw\']->datetime->days_between($event[\'end\'][\'month\'],$event[\'end\'][\'mday\'],$event[\'end\'][\'year\'],$this->planner_end_month,$this->planner_days_in_end_month,$this->planner_end_year);
! $end_cell = $last_cell -
$intervals_per_day * ($days_between+1) + $interval[$event[\'end\'][\'hour\']];
! if ($end_cell == $start_cell)
$end_cell++; // min. width 1 interval
}
else
***************
*** 2469,2476 ****
. ' A.minicalendargrey { color: #999999; font:
xx-small '.$this->theme['font'].' }'."\n"
. ' A.bminicalendargrey { color: #336699;
font: italic bold xx-small '.$this->theme['font'].' }'."\n"
! . ' A.minicalhol { background:
'.$this->holiday_color.'; color: #000000; font: xx-small
'.$this->theme['font'].' }'."\n"
! . ' A.bminicalhol { background:
'.$this->holiday_color.'; color: #336699; font: italic bold xx-small
'.$this->theme['font'].' }'."\n"
! . ' A.minicalgreyhol { background:
'.$this->holiday_color.'; color: #999999; font: xx-small
'.$this->theme['font'].' }'."\n"
! . ' A.bminicalgreyhol { background:
'.$this->holiday_color.'; color: #999999; font: italic bold xx-small
'.$this->theme['font'].' }'."\n"
. ' .event-on { background:
'.$this->theme['row_on'].'; color: '.$this->theme['bg_text'].'; font: 100
80%/110% '.$this->theme['font'].'; vertical-align: middle }'."\n"
. ' .event-off { background:
'.$this->theme['row_off'].'; color: '.$this->theme['bg_text'].'; font: 100
80%/110% '.$this->theme['font'].'; vertical-align: middle }'."\n"
--- 2470,2477 ----
. ' A.minicalendargrey { color: #999999; font:
xx-small '.$this->theme['font'].' }'."\n"
. ' A.bminicalendargrey { color: #336699;
font: italic bold xx-small '.$this->theme['font'].' }'."\n"
! . ' A.minicalhol { padding-left:3px;
padding-right:3px; background: '.$this->holiday_color.'; color: #000000; font:
xx-small '.$this->theme['font'].' }'."\n"
! . ' A.bminicalhol { padding-left:3px;
padding-right:3px; background: '.$this->holiday_color.'; color: #336699; font:
italic bold xx-small '.$this->theme['font'].' }'."\n"
! . ' A.minicalgreyhol { padding-left:3px;
padding-right:3px; background: '.$this->holiday_color.'; color: #999999; font:
xx-small '.$this->theme['font'].' }'."\n"
! . ' A.bminicalgreyhol { padding-left:3px;
padding-right:3px; background: '.$this->holiday_color.'; color: #999999; font:
italic bold xx-small '.$this->theme['font'].' }'."\n"
. ' .event-on { background:
'.$this->theme['row_on'].'; color: '.$this->theme['bg_text'].'; font: 100
80%/110% '.$this->theme['font'].'; vertical-align: middle }'."\n"
. ' .event-off { background:
'.$this->theme['row_off'].'; color: '.$this->theme['bg_text'].'; font: 100
80%/110% '.$this->theme['font'].'; vertical-align: middle }'."\n"
***************
*** 2881,2885 ****
if ($day_params['new_event'])
{
! $new_event_link = '<a
href="'.$this->page('add','&date='.$date).'">'
. '<img
src="'.$GLOBALS['phpgw']->common->image('calendar','new').'" width="10"
height="10" alt="'.lang('New Entry').'" border="0" align="center">'
. '</a>';
--- 2882,2886 ----
if ($day_params['new_event'])
{
! $new_event_link = ' <a
href="'.$this->page('add','&date='.$date).'">'
. '<img
src="'.$GLOBALS['phpgw']->common->image('calendar','new').'" width="10"
height="10" alt="'.lang('New Entry').'" border="0" align="center">'
. '</a>';
***************
*** 2897,2900 ****
--- 2898,2906 ----
'day_number' => $day_number
);
+ if($day_params['week'])
+ {
+ $var['new_event_link'] .=
'<font size="-2"> '.
+
(!$this->bo->printer_friendly?'<a
href="'.$this->page('week','&date='.$date).'">'
.$day_params['week'].'</a>':$day_params['week']);
+ }
$p->set_var($var);
***************
*** 2933,2937 ****
$p->set_var('daily_events','');
$p->set_var('events','');
! if($day_params['week'])
{
$var = Array(
--- 2939,2943 ----
$p->set_var('daily_events','');
$p->set_var('events','');
! /* if($day_params['week'])
{
$var = Array(
***************
*** 2941,2945 ****
$this->output_template_array($p,'column_data','day_event',$var);
$p->set_var('events','');
! }
}
$p->parse('column_header','month_column',True);
--- 2947,2951 ----
$this->output_template_array($p,'column_data','day_event',$var);
$p->set_var('events','');
! } */
}
$p->parse('column_header','month_column',True);
***************
*** 4091,4100 ****
);
$p->set_var($var);
! $p->parse('delete_button','form_button');
}
! else
{
! $p->set_var('delete_button','');
}
$p->pparse('out','edit_entry');
}
--- 4097,4115 ----
);
$p->set_var($var);
! $extra_buttons = $p->fp('out','form_button');
}
! if ($this->bo->return_to)
{
! $var = Array(
! 'action_url_button' =>
$GLOBALS['phpgw']->link('/index.php','menuaction='.$this->bo->return_to),
! 'action_text_button' =>
lang('Cancel'),
! 'action_confirm_button' => '',
! 'action_extra_field' => ''
! );
! $p->set_var($var);
! $extra_buttons .= ($event['id']>0?'<br>':'') .
$p->fp('out','form_button');
}
+ $p->set_var('extra_buttons',$extra_buttons);
+
$p->pparse('out','edit_entry');
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: calendar/inc class.uicalendar.inc.php,1.66.2.35,1.66.2.36,
Ralf Becker <address@hidden> <=