[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] calendar/inc class.bocalendar.inc.php class.soc...
|
From: |
Dave Hall |
|
Subject: |
[Phpgroupware-cvs] calendar/inc class.bocalendar.inc.php class.soc... |
|
Date: |
Tue, 05 Sep 2006 14:19:48 +0000 |
CVSROOT: /cvsroot/phpgroupware
Module name: calendar
Changes by: Dave Hall <skwashd> 06/09/05 14:19:48
Modified files:
inc : class.bocalendar.inc.php
class.socalendar_sql.inc.php
class.uicalendar.inc.php
Log message:
E_ALL, css and other fixes, WIP
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/calendar/inc/class.bocalendar.inc.php?cvsroot=phpgroupware&r1=1.106&r2=1.107
http://cvs.savannah.gnu.org/viewcvs/calendar/inc/class.socalendar_sql.inc.php?cvsroot=phpgroupware&r1=1.41&r2=1.42
http://cvs.savannah.gnu.org/viewcvs/calendar/inc/class.uicalendar.inc.php?cvsroot=phpgroupware&r1=1.125&r2=1.126
Patches:
Index: class.bocalendar.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.bocalendar.inc.php,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -b -r1.106 -r1.107
--- class.bocalendar.inc.php 21 Aug 2006 03:58:01 -0000 1.106
+++ class.bocalendar.inc.php 5 Sep 2006 14:19:48 -0000 1.107
@@ -12,7 +12,7 @@
* option) any later version. *
\**************************************************************************/
- /* $Id: class.bocalendar.inc.php,v 1.106 2006/08/21 03:58:01 skwashd
Exp $ */
+ /* $Id: class.bocalendar.inc.php,v 1.107 2006/09/05 14:19:48 skwashd
Exp $ */
class bocalendar
{
@@ -106,7 +106,7 @@
var $prefs;
var $owner;
- var $holiday_color;
+ var $holiday_class = 'cal_holiday';
var $printer_friendly = False;
var $cached_holidays;
@@ -133,6 +133,8 @@
var $sortby;
var $num_months;
+ var $save_owner;
+
function bocalendar($session = 0)
{
$this->cat = CreateObject('phpgwapi.categories');
@@ -166,7 +168,14 @@
$this->prefs['calendar'] =
$GLOBALS['phpgw_info']['user']['preferences']['calendar'];
$this->check_set_default_prefs();
- $owner = get_var('owner', array('GET','POST'),
$this->contacts->is_contact($GLOBALS['owner']) );
+ if ( isset($_REQUEST['owner']) )
+ {
+ $owner = (int) $_REQUEST['owner'];
+ }
+ else
+ {
+ $owner =
$this->contacts->is_contact($GLOBALS['phpgw_info']['user']['account_id']);
+ }
ereg('menuaction=([a-zA-Z.]+)',$_SERVER['HTTP_REFERER'],$regs);
$from = $regs[1];
@@ -218,7 +227,6 @@
{
$this->users_timeformat = 'H:i';
}
- $this->holiday_color =
(substr($GLOBALS['phpgw_info']['theme']['bg07'],0,1)=='#'?'':'#').$GLOBALS['phpgw_info']['theme']['bg07'];
$friendly =
(isset($_GET['friendly'])?$_GET['friendly']:'');
$friendly = ($friendly=='' &&
isset($_POST['friendly'])?$_POST['friendly']:$friendly);
@@ -261,7 +269,8 @@
MCAL_M_FRIDAY => 'Friday',
MCAL_M_SATURDAY => 'Saturday'
);
- if($this->bo->prefs['calendar']['weekdaystarts'] !=
'Sunday')
+ if (
!isset($this->bo->prefs['calendar']['weekdaystarts'])
+ ||
$this->bo->prefs['calendar']['weekdaystarts'] != 'Sunday')
{
$mcals = array_keys($this->rpt_day);
$days = array_values($this->rpt_day);
Index: class.socalendar_sql.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.socalendar_sql.inc.php,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- class.socalendar_sql.inc.php 7 Jan 2006 11:14:56 -0000 1.41
+++ class.socalendar_sql.inc.php 5 Sep 2006 14:19:48 -0000 1.42
@@ -12,7 +12,7 @@
* option) any later version. *
\**************************************************************************/
- /* $Id: class.socalendar_sql.inc.php,v 1.41 2006/01/07 11:14:56 skwashd Exp
$ */
+ /* $Id: class.socalendar_sql.inc.php,v 1.42 2006/09/05 14:19:48 skwashd Exp
$ */
if (@$GLOBALS['phpgw_info']['flags']['included_classes']['socalendar_'])
{
@@ -32,7 +32,8 @@
{
$this->socalendar__();
- if (!is_object($GLOBALS['phpgw']->asyncservice))
+ if ( !isset($GLOBALS['phpgw']->asyncservice)
+ || !is_object($GLOBALS['phpgw']->asyncservice))
{
$GLOBALS['phpgw']->asyncservice =
CreateObject('phpgwapi.asyncservice');
}
Index: class.uicalendar.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.uicalendar.inc.php,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -b -r1.125 -r1.126
--- class.uicalendar.inc.php 6 Aug 2006 10:03:24 -0000 1.125
+++ class.uicalendar.inc.php 5 Sep 2006 14:19:48 -0000 1.126
@@ -12,7 +12,7 @@
* option) any later version. *
\**************************************************************************/
- /* $Id: class.uicalendar.inc.php,v 1.125 2006/08/06 10:03:24 skwashd
Exp $ */
+ /* $Id: class.uicalendar.inc.php,v 1.126 2006/09/05 14:19:48 skwashd
Exp $ */
class uicalendar
{
@@ -23,13 +23,12 @@
var $cat;
var $holidays;
- var $holiday_color;
+ var $holiday_class;
var $debug = False;
// var $debug = True;
var $cat_id;
- var $theme;
var $link_tpl;
var $inserted_tooltip_js = false;
@@ -88,7 +87,6 @@
'search' => true,
'header' => true,
'footer' => true,
- 'css' => true,
'participants_popup' => true
);
@@ -97,8 +95,6 @@
$GLOBALS['phpgw']->nextmatchs =
CreateObject('phpgwapi.nextmatchs');
$GLOBALS['phpgw']->browser =
CreateObject('phpgwapi.browser');
- $this->theme = $GLOBALS['phpgw_info']['theme'];
-
$this->bo = CreateObject('calendar.bocalendar',1);
$this->cat = &$this->bo->cat;
@@ -107,7 +103,7 @@
$this->template = $GLOBALS['phpgw']->template;
$this->template_dir =
$GLOBALS['phpgw']->common->get_tpl_dir('calendar');
- $this->holiday_color =
(substr($this->theme['bg06'],0,1)=='#'?'':'#').$this->theme['bg06'];
+ $this->holiday_class = 'holiday';
$this->cat_id = $this->bo->cat_id;
@@ -177,9 +173,9 @@
)
);
- $params['link'] =
(!isset($params['link'])?'':$params['link']);
- $params['buttons'] =
(!isset($params['buttons'])?'none':$params['buttons']);
- $params['outside_month'] =
(!isset($params['outside_month'])?True:$params['outside_month']);
+ $params['link'] =
!isset($params['link']) ? '' : $params['link'];
+ $params['buttons'] =
!isset($params['buttons']) ? 'none' : $params['buttons'];
+ $params['outside_month'] =
!isset($params['outside_month']) ? false : $params['outside_month'];
$this->bo->read_holidays($params['year']);
@@ -209,14 +205,7 @@
}
- if($this->bo->printer_friendly == False)
- {
$month = '<a href="' .
$this->page('month','&month='.$GLOBALS['phpgw']->common->show_date($date['raw'],'m').'&year='.$GLOBALS['phpgw']->common->show_date($date['raw'],'Y')).
'" class="minicalendar">' .
lang($GLOBALS['phpgw']->common->show_date($date['raw'],'F')).'
'.$GLOBALS['phpgw']->common->show_date($date['raw'],'Y').'</a>';
- }
- else
- {
- $month =
lang($GLOBALS['phpgw']->common->show_date($date['raw'],'F')).'
'.$GLOBALS['phpgw']->common->show_date($date['raw'],'Y');
- }
$var = array(
'cal_img_root' =>
$GLOBALS['phpgw']->common->image('calendar','mini-calendar-bar'),
@@ -224,7 +213,7 @@
'bgcolor1' =>
$this->theme['bg_color'],
'month' => $month,
'bgcolor2' =>
$this->theme['cal_dayview'],
- 'holiday_color' => $this->holiday_color
+ 'holiday_class' => $this->holiday_class
);
$mini_cal_tpl->set_var($var);
@@ -233,18 +222,18 @@
{
case 'right':
$var = array(
- 'nextmonth'
=> '<a href="'.$this->page('month','&date='.$month_ahead).'"><img
src="'.$GLOBALS['phpgw']->common->image('phpgwapi','right').'" border="0"></a>'
+ 'nextmonth'
=> '<a href="'.$this->page('month','&date='.$month_ahead).'"><img
src="'.$GLOBALS['phpgw']->common->image('phpgwapi','right').'"></a>'
);
break;
case 'left':
$var = array(
- 'prevmonth'
=> '<a href="'.$this->page('month','&date='.$month_ago).'"><img
src="'.$GLOBALS['phpgw']->common->image('phpgwapi','left').'" border="0"></a>'
+ 'prevmonth'
=> '<a href="'.$this->page('month','&date='.$month_ago).'"><img
src="'.$GLOBALS['phpgw']->common->image('phpgwapi','left').'"></a>'
);
break;
case 'both':
$var = array(
- 'prevmonth'
=> '<a href="'.$this->page('month','&date='.$month_ago).'"><img
src="'.$GLOBALS['phpgw']->common->image('phpgwapi','left').'" border="0"></a>',
- 'nextmonth'
=> '<a href="'.$this->page('month','&date='.$month_ahead).'"><img
src="'.$GLOBALS['phpgw']->common->image('phpgwapi','right').'" border="0"></a>'
+ 'prevmonth'
=> '<a href="'.$this->page('month','&date='.$month_ago).'"><img
src="'.$GLOBALS['phpgw']->common->image('phpgwapi','left').'"></a>',
+ 'nextmonth'
=> '<a href="'.$this->page('month','&date='.$month_ahead).'"><img
src="'.$GLOBALS['phpgw']->common->image('phpgwapi','right').'"></a>'
);
break;
case 'none':
@@ -283,18 +272,10 @@
$str = '';
if(($date >= $monthstart && $date <=
$monthend) || $params['outside_month'] == True)
{
- if(!$this->bo->printer_friendly
&& $params['link'])
- {
$str = '<a
href="'.$this->page($params['link'],'&date='.$date).'"
class="'.$day_params['class'].'">'.$day.'</a>';
}
else
{
- $str = $day;
- }
-
- }
- else
- {
$day_params['day_image'] = '';
}
$var[] = array(
@@ -324,25 +305,7 @@
}
//TODO Replace this with better CSS driven print mode
- function printer_friendly($body,$app_header='')
- {
- if($this->bo->printer_friendly)
- {
- $new_body = '<html>'."\n"
- .'<head>'."\n"
- .'<STYLE type="text/css">'."\n"
- .'<!--'."\n"
- .' body { margin-top: 0px;
margin-right: 0px; margin-left: 0px; font-family:
"'.$GLOBALS['phpgw_info']['theme']['font'].'" }'."\n"
- .' .tablink { color: #000000; }'."\n"
- .' '.$this->css()."\n"
- .'-->'."\n"
- .'</STYLE>'."\n"
- .'</head>'."\n"
- .$this->bo->debug_string.$body
- .'</body>'."\n"
- .'</html>'."\n";
- }
- else
+ function printer_friendly($body, $app_header='')
{
unset($GLOBALS['phpgw_info']['flags']['noheader']);
unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
@@ -355,7 +318,6 @@
$this->header();
//$GLOBALS['phpgw']->common->phpgw_header();
$new_body = $this->bo->debug_string.$body;
- }
return $new_body;
}
@@ -368,8 +330,6 @@
{
$m = mktime(0,0,0,$this->bo->month,1,$this->bo->year);
- if (!$this->bo->printer_friendly ||
($this->bo->printer_friendly &&
@$this->bo->prefs['calendar']['display_minicals']))
- {
$minical_prev = $this->mini_calendar(
array(
'day' => 1,
@@ -387,31 +347,12 @@
'link' => 'day'
)
);
- }
- else
- {
- $minical_prev = '';
- $minical_next = '';
- }
- if (!$this->bo->printer_friendly)
- {
- $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>';
- }
- else
- {
- $printer = '<body
bgcolor="'.$phpgw_info['theme']['bg_color'].'">';
- $print = '';
- $GLOBALS['phpgw_info']['flags']['nofooter'] =
True;
- }
$this->bo->read_holidays();
$var = array(
- 'printer_friendly' => $printer,
- 'bg_text' =>
$this->theme['bg_text'],
'small_calendar_prev' => $minical_prev,
'month_identifier' =>
lang(strftime("%B",$m)).' '.$this->bo->year,
'username' => ( $this->bo->is_group
@@ -419,7 +360,6 @@
:
$this->bo->contacts->get_name_of_person_id($this->bo->owner) ),
'small_calendar_next' => $minical_next,
'large_month' =>
$this->display_month($this->bo->month,$this->bo->year,True,$this->bo->owner),
- 'print' => $print
);
$p =
CreateObject('phpgwapi.Template',$this->template_dir);
@@ -451,70 +391,42 @@
$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);
- if (!$this->bo->printer_friendly ||
($this->bo->printer_friendly &&
@$this->bo->prefs['calendar']['display_minicals']))
- {
- $minical_this = $this->mini_calendar(
- array(
+ $minical_this = $this->mini_calendar(array
+ (
'day' => $this->bo->day,
'month' => $this->bo->month,
'year' => $this->bo->year,
'link' => 'day',
'butons' => 'none',
'outside_month' => False
- )
- );
- $minical_prev = $this->mini_calendar(
- array(
+ ));
+
+ $minical_prev = $this->mini_calendar(array
+ (
'day' => $this->bo->day,
'month' => $this->bo->month - 1,
'year' => $this->bo->year,
'link' => 'day',
'butons' => 'left',
'outside_month' => False
- )
- );
- $minical_next = $this->mini_calendar(
- array(
+ ));
+
+ $minical_next = $this->mini_calendar(array
+ (
'day' => $this->bo->day,
'month' => $this->bo->month + 1,
'year' => $this->bo->year,
'link' => 'day',
'butons' => 'right',
'outside_month' => False
- )
- );
- }
- else
- {
- $minical_this = '';
- $minical_prev = '';
- $minical_next = '';
- }
-
- if (!$this->bo->printer_friendly)
- {
- $printer = '';
- $prev_week_link = '<a
href="'.$this->page($week_type_name,'&date='.$prev['full']).'"><<</a>';
- $next_week_link = '<a
href="'.$this->page($week_type_name,'&date='.$next['full']).'">>></a>';
- $print = '<a
href="'.$this->page($week_type_name,'&friendly=1&date='.sprintf("%04d%02d%02d",$this->bo->year,$this->bo->month,$this->bo->day))."\"
target=\"cal_printer_friendly\">[".lang('Printer Friendly').']</a>';
- }
- else
- {
- $printer = '<body
bgcolor="'.$this->theme['bg_color'].'">';
- $prev_week_link = '';
- $next_week_link = '';
- $print = '';
- $GLOBALS['phpgw_info']['flags']['nofooter'] =
True;
- }
+ ));
$var = array(
- 'printer_friendly' => $printer,
- 'bg_text' =>
$this->theme['bg_text'],
'small_calendar_prev' => $minical_prev,
- 'prev_week_link' => $prev_week_link,
+ 'prev_week_link' =>
$this->page($week_type_name,'&date='.$prev['full']),
'small_calendar_this' => $minical_this,
'week_identifier' =>
$this->bo->get_week_label(),
- 'next_week_link' => $next_week_link,
+ 'next_week_link' =>
$this->page($week_type_name,'&date='.$next['full']),
'username' => ( $this->bo->is_group
?
$GLOBALS['phpgw']->common->grab_owner_name($this->bo->owner)
:
$this->bo->contacts->get_name_of_person_id($this->bo->owner) ),
@@ -526,15 +438,10 @@
'owners' =>
$this->bo->owner
)
),
- 'print' => $print
);
$p =
CreateObject('phpgwapi.Template',$this->template_dir);
- $p->set_file(
- array(
- 'week_t' => $week_type_name.'.tpl'
- )
- );
+ $p->set_file('week_t', 'week.tpl');
$var = $this->insert_tooltip_js($var);
@@ -546,10 +453,6 @@
{
$this->week_type = 'new';
echo $this->printer_friendly($this->get_week(),
lang('Weekview'));
- if ( $this->bo->debug )
- {
- echo "\n<!-- Theme:\n" . print_r($this->theme,
true) . "\n-->\n";
- }
}
function get_week_new()
@@ -560,39 +463,19 @@
function year()
{
- if($this->bo->printer_friendly)
- {
- $GLOBALS['phpgw_info']['flags']['nofooter'] =
True;
- }
echo
$this->printer_friendly($this->get_year(),lang('Yearview'));
}
function get_year()
{
- if(!$this->bo->printer_friendly)
- {
- $print = '';
$left_link = '<a
href="'.$this->page('year','&year='.($this->bo->year - 1)).'"><<</a>';
$right_link = '<a
href="'.$this->page('year','&year='.($this->bo->year + 1)).'">>></a>';
$link = 'day';
- $printer = '<a
href="'.$this->page('year','&friendly=1&year='.$this->bo->year).'"
target="cal_printer_friendly" onMouseOver="window.status = '."'".lang('Generate
printer-friendly version')."'".'">['.lang('Printer Friendly').']</a>';
- }
- else
- {
- $print = '<body
bgcolor="'.$this->theme['bg_color'].'">';
- $left_link = '';
- $right_link = '';
- $link = '';
- $printer = '';
- }
$var = array(
- 'print' => $print,
'left_link' => $left_link,
- 'font' => $this->theme['font'],
'year_text' => $this->bo->year,
'right_link'=> $right_link,
- 'printer_friendly'=> $printer
);
$p =
CreateObject('phpgwapi.Template',$this->template_dir);
@@ -1156,35 +1039,15 @@
{
$this->bo->read_holidays();
- if (!$this->bo->printer_friendly ||
($this->bo->printer_friendly &&
@$this->bo->prefs['calendar']['display_minicals']))
- {
- $minical = $this->mini_calendar(
- array
+ $minical = $this->mini_calendar(array
(
'day' => $this->bo->day,
'month' => $this->bo->month,
'year' => $this->bo->year,
'link' => 'day'
- )
- );
- }
- else
- {
- $minical = '';
- }
+ ));
- if (!$this->bo->printer_friendly)
- {
- $printer = '';
$param =
'&date='.sprintf("%04d%02d%02d",$this->bo->year,$this->bo->month,$this->bo->day).'&friendly=1';
- $print = '<a
href="'.$this->page('day'.$param)."\" TARGET=\"cal_printer_friendly\"
onMouseOver=\"window.status = '".lang('Generate printer-friendly
version')."'\">[".lang('Printer Friendly').']</a>';
- }
- else
- {
- $GLOBALS['phpgw_info']['flags']['nofooter'] =
True;
- $printer = '<body
bgcolor="'.$this->theme['bg_color'].'">';
- $print = '';
- }
$now = $GLOBALS['phpgw']->datetime->makegmttime(0,
0, 0, $this->bo->month, $this->bo->day, $this->bo->year);
$now['raw'] += $GLOBALS['phpgw']->datetime->tz_offset;
@@ -1197,8 +1060,6 @@
$var = array
(
- 'printer_friendly' => $printer,
- 'bg_text' =>
$this->theme['bg_text'],
'daily_events' =>
$this->print_day(
array
(
@@ -1209,7 +1070,6 @@
'small_calendar' => $minical,
'date' =>
$this->bo->long_date($now),
'username' => (
$this->bo->is_group ?
$GLOBALS['phpgw']->common->grab_owner_name($this->bo->owner) :
$this->bo->contacts->get_name_of_person_id($this->bo->owner) ),
- 'print' => $print
);
if ( $this->bo->debug )
@@ -1420,10 +1280,10 @@
$d = mktime(0,0,0,$m,1,$y);
$month = lang(date('F', $d)).strftime(' %Y',
$d);
- $color = $this->theme[$m % 2 ||
$this->bo->num_months == 1 ? 'th_bg' : 'row_on'];
+ $cssclass = $m % 2 ? 'row_on' : 'row_off';
$cols = $days * $intervals_per_day;
- $hdr[0]['.'.$i] = 'bgcolor="'.$color.'"
colspan="'.$cols.'" align="center"';
+ $hdr[0]['.'.$i] = 'classr="'.$cssclass.'"
colspan="'.$cols.'"';
$prev_month =
sprintf('%04d%02d01',$y-($m==1),$m > 1?$m-1:12);
$next_month =
sprintf('%04d%02d01',$y+($m==12),$m < 12?$m+1:1);
$prev_link =
$GLOBALS['phpgw']->link('/index.php',"menuaction=calendar.uicalendar.planner&date=$prev_month");
@@ -1451,24 +1311,23 @@
// highlight today, saturday, sunday
and holidays
//
- $color = $this->theme['row_off'];
$dow =
$GLOBALS['phpgw']->datetime->day_of_week($y,$m,$d);
$date =
sprintf("%04d%02d%02d",$y,$m,$d);
if ($date == date('Ymd'))
{
- $color =
$GLOBALS['phpgw_info']['theme']['cal_today'];
+ $cssclass = 'cal_today';
}
elseif
($this->bo->cached_holidays[$date])
{
- $color =
$this->bo->holiday_color;
+ $cssclass =
$this->bo->holiday_class;
$hdr[2]['.'.$index] .= '
title="'.$this->bo->cached_holidays[$date][0]['name'].'"';
}
elseif ($dow == 0 || $dow == 6)
{
- $color =
$this->bo->theme['th_bg'];
+ $cssclass = 'th';
}
- $hdr[2]['.'.$index] .= "
bgcolor=\"$color\"";
+ $hdr[2]['.'.$index] .= "
class=\"$cssclass\"";
$hdr[2][$index] = '<a
href="'.$this->planner_html->link('/index.php',
array
@@ -1499,9 +1358,9 @@
}
$offset = (7-date("w", $d)+1)%7;
$offset = $offset == 0 ? 7 : $offset;
- $color = $this->theme[$w % 2 ? 'th_bg' : 'row_on'];
+ $cssclass = $w % 2 ? 'th' : 'row_on';
- $hdr[1]['.'.$w] = 'bgcolor="'.$color.'"
colspan="'.$intervals_per_day * $offset.'" align="left"';
+ $hdr[1]['.'.$w] = 'class="'.$cssclass.'"
colspan="'.$intervals_per_day * $offset.'" align="left"';
$hdr[1][$w] = '';
if ($offset >= 3)
{
@@ -1521,8 +1380,8 @@
}
$w += (isset($hdr[1][$w]))?1:0; // bug in
"date('W')" ?
- $color = $this->theme[$w % 2 ? 'th_bg' :
'row_on'];
- $hdr[1]['.'.$w] = 'bgcolor="'.$color.'"
colspan="'.$colspan.'" align="left"';
+ $cssclass = $w % 2 ? 'th' : 'row_on';
+ $hdr[1]['.'.$w] = 'cssclass="'.$cssclass.'"
colspan="'.$colspan.'" align="left"';
$hdr[1][$w] = '';
if ($days_left >= 3)
{
@@ -1631,9 +1490,9 @@
}
}
- if ($bgcolor=$cat['color'])
+ if ( isset($cat['color']) && ($bgcolor = $cat['color'])
) //yes this is an assignment hack
{
- $opt .= ' bgcolor="'.$bgcolor.'"';
+ $opt .= " style=\"background-color: $bgcolor;
\"";
}
if (!$is_private)
{
@@ -1810,11 +1669,12 @@
$last_cell =
$this->bo->prefs['calendar']['planner_intervals_per_day'] * $this->planner_days
- 1;
ksort($rows);
- while (list($k,$r) = each($rows))
+ $cnt = 0;;
+ foreach ( $rows as $k => $r )
{
if (is_array($r))
{
- $rows['.'.$k] =
'bgcolor="'.$GLOBALS['phpgw']->nextmatchs->alternate_row_color().'"';
+ $rows['.'.$k] = 'class="' . ($cnt % 2 ?
'row_on' : 'row_off') . '"';
$row = &$rows[$k];
$akt_cell = &$rows['.nr_'.$k];
if ($akt_cell < $last_cell)
@@ -1823,12 +1683,13 @@
$row['.3'] =
'colspan="'.(1+$last_cell-$akt_cell).'"';
}
}
+ ++$cnt;
}
}
function planner_print_rows()
{
- $bgcolor = 'bgcolor="'.$this->theme['th_bg'].'"';
+ $cssclass = "class=\"th\"";
$intervals_per_day =
$this->bo->prefs['calendar']['planner_intervals_per_day'];
if ($this->debug)
@@ -1839,11 +1700,11 @@
return $this->planner_html->table(
array(
'_hdr0' => $this->planner_header[0],
- '._hdr0' => $bgcolor,
+ '._hdr0' => $cssclass,
'_hdr1' => $this->planner_header[1],
- '._hdr1' => $bgcolor,
+ '._hdr1' => $cssclass,
'_hdr2' => $this->planner_header[2],
- '._hdr2' => $bgcolor
+ '._hdr2' => $cssclass
)+$this->planner_rows,
'width="100%"
cols="'.(1+$this->planner_days_in_end_month*$intervals_per_day).'"');
}
@@ -1918,7 +1779,7 @@
$p->set_var(array(
'title' => lang('Daily Matrix
View'),
- 'th_bg' =>
$this->theme['th_bg'],
+ 'th_class' => 'th',
'action_url' => $this->page('viewmatrix')
));
@@ -2118,7 +1979,7 @@
#echo '<br>prev: '.var_dump($prev_day);
#echo '<br>next: '.var_dump($next_day);
- echo ' <table cellpadding="5" border="0"
width="100%"><tr><td>'."\n";
+ echo ' <table cellpadding="5"
width="100%"><tr><td>'."\n";
// Prev
echo "\n<br />\n".'<form
action="'.$this->page('viewmatrix').'" method="post" name="matrixform">'."\n";
@@ -2153,7 +2014,7 @@
echo '</form>'."\n";
echo ' </td></tr></table>'."\n";
- echo ' <table cellpadding="5" border="0"><tr><td
valign="bottom">'."\n";
+ echo ' <table cellpadding="5"><tr><td
valign="bottom">'."\n";
echo "\n<br />\n".'<form
action="'.$this->page('viewmatrix').'" method="post" name="matrixform">'."\n";
echo ' <input type="hidden" name="year"
value="'.$this->bo->year.'">'."\n";
echo ' <input type="hidden" name="month"
value="'.$this->bo->month.'">'."\n";
@@ -2522,50 +2383,6 @@
unset($p);
}
- function css()
- {
- $GLOBALS['phpgw']->browser->browser();
- if($GLOBALS['phpgw']->browser->get_agent() == 'MOZILLA')
- {
- $time_width =
(intval($this->bo->prefs['common']['time_format']) == 12?12:8);
- }
- else
- {
- $time_width =
(intval($this->bo->prefs['common']['time_format']) == 12?10:7);
- }
-
- switch ($this->bo->prefs['calendar']['interval']) //in
minutes
- {
- case 5:
- case 10:
- case 15:
- $time_height = '20px';
- break;
- case 45:
- case 60:
- $time_height = '37px';
- break;
- default:
- $time_height = '27px';
- break;
- }
-
- return 'A.minicalendar { color: #000000; font: xx-small
'.$this->theme['font'].' }'."\n"
- . ' A.bminicalendar { color: #336699; font:
italic bold xx-small '.$this->theme['font'].' }'."\n"
- . ' 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-color: '.$this->holiday_color.'; color: #000000;
font: xx-small '.$this->theme['font'].' }'."\n"
- . ' A.bminicalhol { padding-left:3px;
padding-right:3px; background-color: '.$this->holiday_color.'; color: #336699;
font: italic bold xx-small '.$this->theme['font'].' }'."\n"
- . ' A.minicalgreyhol { padding-left:3px;
padding-right:3px; background-color: '.$this->holiday_color.'; color: #999999;
font: xx-small '.$this->theme['font'].' }'."\n"
- . ' A.bminicalgreyhol { padding-left:3px;
padding-right:3px; background-color: '.$this->holiday_color.'; color: #999999;
font: italic bold xx-small '.$this->theme['font'].' }'."\n"
- . ' .event-on { background-color:
'.$this->theme['row_on'].'; color: '.$this->theme['bg_text'].'; font: 100
80%/110% '.$this->theme['font'].'; vertical-align: middle }'."\n"
- . ' .event-off { background-color:
'.$this->theme['row_off'].'; color: '.$this->theme['bg_text'].'; font: 100
80%/110% '.$this->theme['font'].'; vertical-align: middle }'."\n"
- . ' .event-holiday { background-color:
'.$this->theme['bg04'].'; color: '.$this->theme['bg_text'].'; font: 100
80%/110% '.$this->theme['font'].'; vertical-align: middle }'."\n"
- . ' .time { background-color:
'.$this->theme['th_bg'].'; color: '.$this->theme['bg_text'].'; font: 80%/110%
'.$this->theme['font'].'; width: '.$time_width.'%; height: '.$time_height.';
border: 1px outset '.$this->theme['navbar_text'].'; vertical-align: top;}'."\n"
- . ' .tablecell { width: 80px; height: 80px
}'."\n"
- . ' .planner-cell { cursor:pointer;
cursor:hand; border: thin solid black; }';
- }
-
function no_edit()
{
if(!isset($GLOBALS['phpgw_info']['flags']['noheader']))
@@ -2586,7 +2403,7 @@
{
$str = '';
$is_private = !$event['public'] &&
!$this->bo->check_perms(PHPGW_ACL_READ,$event);
- $editable = !$this->bo->printer_friendly &&
$this->bo->check_perms(PHPGW_ACL_READ,$event);
+ $editable =
$this->bo->check_perms(PHPGW_ACL_READ,$event);
$starttime = $this->bo->maketime($event['start']) -
$GLOBALS['phpgw']->datetime->tz_offset;
$endtime = $this->bo->maketime($event['end']) -
$GLOBALS['phpgw']->datetime->tz_offset;
@@ -2993,33 +2810,17 @@
$p =
CreateObject('phpgwapi.Template',$this->template_dir);
$p->set_unknowns('remove');
- $p->set_file(
- array (
- 'month_header' => 'month_header.tpl'
- )
- );
+ $p->set_file('month_header', 'month_header.tpl');
+
$p->set_block('month_header','monthly_header','monthly_header');
$p->set_block('month_header','column_title','column_title');
- $var = array(
- 'bgcolor' => $this->theme['th_bg'],
- 'font_color' => $this->theme['th_text']
- );
- if($this->bo->printer_friendly &&
@$this->bo->prefs['calendar']['print_black_white'])
- {
- $var = array(
- 'bgcolor' => '',
- 'font_color' => ''
- );
- }
$p->set_var($var);
- $p->set_var('col_width','14');
if($display_name == True)
{
$p->set_var('col_title',lang('name'));
$p->parse('column_header','column_title',True);
- $p->set_var('col_width','12');
}
for($i=0;$i<7;$i++)
@@ -3030,15 +2831,13 @@
return $p->fp('out','monthly_header');
}
-## by tb
- function
display_week_new($startdate,$weekly,$cellcolor,$display_name =
False,$owner=0,$monthstart=0,$monthend=0)
+ function
display_week_new($startdate,$weekly,$cellclass,$display_name =
False,$owner=0,$monthstart=0,$monthend=0)
{
$this->week_type = 'new';
- return
$this->display_week($startdate,$weekly,$cellcolor,$display_name,$owner,$monthstart,$monthend);
+ return
$this->display_week($startdate,$weekly,$cellclass,$display_name,$owner,$monthstart,$monthend);
}
-## by tb
- function
display_week($startdate,$weekly,$cellcolor,$display_name =
False,$owner=0,$monthstart=0,$monthend=0)
+ function display_week($startdate, $weekly, $cellclass,
$display_name = false, $owner = 0, $monthstart = 0, $monthend = 0)
{
if($owner == 0)
{
@@ -3051,28 +2850,27 @@
$p =
CreateObject('phpgwapi.Template',$this->template_dir);
$p->set_unknowns('keep');
- $p->set_file(
- array(
- 'month_header' => 'month_header.tpl',
- 'month_day' => 'month_day.tpl'
- )
- );
-
$p->set_block('month_header','monthly_header','monthly_header');
-
$p->set_block('month_header','month_column','month_column');
+ $p->set_file('month_day', 'month_day.tpl');
+
+
$p->set_block('month_day','monthly_header','monthly_header');
+
$p->set_block('month_day','month_column','month_column');
$p->set_block('month_day','month_daily','month_daily');
$p->set_block('month_day','day_event','day_event');
$p->set_block('month_day','event','event');
- $p->set_var('extra','');
- $p->set_var('col_width','14');
+ $p->set_var(array
+ (
+ 'extra' => '',
+ 'cssclass' => $cellclass
+ ));
+
if($display_name)
{
$p->set_var('column_data',
$this->bo->contacts->get_name_of_person_id($owner));
$p->parse('column_header','month_column',True);
- $p->set_var('col_width','12');
}
$today =
date('Ymd',$GLOBALS['phpgw']->datetime->users_localtime);
- $daily = $this->set_week_array($startdate -
$GLOBALS['phpgw']->datetime->tz_offset,$cellcolor,$weekly);
+ $daily = $this->set_week_array($startdate -
$GLOBALS['phpgw']->datetime->tz_offset,$cellclass,$weekly);
foreach($daily as $date => $day_params)
{
$year = intval(substr($date,0,4));
@@ -3089,7 +2887,7 @@
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').'" title="'.lang('New Entry').'"
border="0" align="center">'
+ . '<img
src="'.$GLOBALS['phpgw']->common->image('calendar','new').'" width="10"
height="10" alt="'.lang('New Entry').'" title="'.lang('New Entry').'"
align="center">'
. '</a>';
$day_number = '<a
href="'.$this->page('day','&date='.$date).'">'.$day.'</a>';
}
@@ -3106,43 +2904,33 @@
);
if($day_params['week'])
{
-## by tb: string is too long for week_new
$tmp_str = ($this->week_type ==
'new') ? ' ' : ' ';
- $var['new_event_link'] .=
'<font size="-2">'. $tmp_str .
-
(!$this->bo->printer_friendly?'<a
href="'.$this->page('week_new','&date='.$date).'">'
.$day_params['week'].'</a>':$day_params['week']);
-## END - by tb
+ $var['new_event_link'] .=
'<font size="-2">'. $tmp_str . '<a
href="'.$this->page('week_new','&date='.$date).'">' .$day_params['week'].'</a>';
}
$p->set_var($var);
- if(@$day_params['holidays'])
+ if(isset($day_params['holidays']) &&
is_array($day_params['holidays']) )
{
foreach($day_params['holidays']
as $key => $value)
{
- $var = array(
- 'day_events' =>
'<font face="'.$this->theme['font'].'"
size="-1">'.$value.'</font>'.$GLOBALS['phpgw']->browser->br
+ $var = array
+ (
+ 'day_events'
=> "<span class=\"holiday\">{$value}</span>"
);
-
$this->output_template_array($p,'daily_events','event',$var);
+
$this->output_template_array($p,'daily_events','event', $var);
}
}
if($day_params['appts'] ||
$this->week_type == 'new')
{
- $var = array(
- 'week_day_font_size'
=> '2',
- 'events'
=> ''
- );
- $p->set_var($var);
+ $p->set_var(array('events' =>
''));
$events =
$this->bo->cached_events[$date];
-## by tb
if ($this->week_type != 'new')
{
foreach($events as $event)
{
-## by tb: we don't want a user to be able to see a event if he has no
permission to read it !!!
-## this shoud be in
class.bocalendar->get_cached_events() !!!
if
($this->bo->rejected_no_show($event) || !$this->bo->check_perms(PHPGW_ACL_READ))
-## by tb
{
continue;
// user does not want to see rejected events
}
@@ -3163,23 +2951,12 @@
$p->set_var('day_events','');
}
-## END - by tb
}
$p->parse('daily_events','day_event',True);
$p->parse('column_data','month_daily',True);
$p->set_var('daily_events','');
$p->set_var('events','');
-
-/* if($day_params['week'])
- {
- $var = array(
- 'week_day_font_size'
=> '-2',
- 'events'
=> (!$this->bo->printer_friendly?'<a
href="'.$this->page('week','&date='.$date).'">'
.$day_params['week'].'</a>':$day_params['week'])
- );
-
$this->output_template_array($p,'column_data','day_event',$var);
- $p->set_var('events','');
- } */
}
$p->parse('column_header','month_column',True);
$p->set_var('column_data','');
@@ -3232,15 +3009,15 @@
);
$this->output_template_array($p,'row','event',$var);
- $cellcolor = $this->theme['row_on'];
-
+ $cnt = 0;
for ($i=intval($start +
$GLOBALS['phpgw']->datetime->tz_offset);intval(date('Ymd',$i)) <= $monthend;$i
+= 604800)
{
- $cellcolor =
$GLOBALS['phpgw']->nextmatchs->alternate_row_color($cellcolor);
+ $cellclass = $cnt % 2 ? 'row_on' : 'row_off';
$var = array(
- 'day_events' =>
$this->display_week($i,False,$cellcolor,False,$owner,$monthstart,$monthend)
+ 'day_events' =>
$this->display_week($i,False,$cellclass,False,$owner,$monthstart,$monthend)
);
$this->output_template_array($p,'row','event',$var);
+ ++$cnt;
}
return $p->fp('out','m_w_table');
}
@@ -3273,8 +3050,6 @@
$cellcolor = $this->theme['row_off'];
- $true_printer_friendly = $this->bo->printer_friendly;
-
if(is_array($owners))
{
$display_name = True;
@@ -3317,7 +3092,6 @@
$p->parse('row','event',True);
}
$this->bo->so->owner = $original_owner;
- $this->bo->printer_friendly = $true_printer_friendly;
return $p->fp('out','m_w_table');
}
@@ -3565,7 +3339,7 @@
## by tb
$open_link = ($this->week_type !=
'new') ? ' - ' : '';
## by tb
- if(!$this->bo->printer_friendly &&
$this->bo->check_perms(PHPGW_ACL_ADD))
+ if (
$this->bo->check_perms(PHPGW_ACL_ADD) )
{
$open_link .= '<a
href="'.$this->page('add',"&date=$date_to_eval&hour=$hour&minute=$min").'">';
$close_link = '</a>';
@@ -3622,11 +3396,9 @@
$pix =
$GLOBALS['phpgw']->common->image('calendar','pix');
-## by tb
$str = '<center><font size="+1"
color="#000000"><b>'.lang($GLOBALS['phpgw']->common->show_date($date['raw'],'l'))
. ',
'.$this->bo->long_date($date).'</b></font><br />'
-## by tb
- . '<table width="85%" border="0"
cellspacing="0" cellpadding="0" cols="'.((24 * $interval) + 1).'">'
+ . '<table width="85%" cellspacing="0"
cellpadding="0" cols="'.((24 * $interval) + 1).'">'
. '<tr><td height="1" colspan="'.((24 *
$interval) + 1).'" bgcolor="black"><img src="'.$pix.'"></td></tr>'
. '<tr><td width="15%"><font
color="'.$this->theme['bg_text'].'" face="'.$this->theme['font'].'"
size="-2">'.lang('Participant').'</font></td>';
for($i=0;$i<24;$i++)
@@ -3635,9 +3407,9 @@
{
$k = ($j == 0 ? sprintf('%02d',$i).'<br
/>':'').sprintf('%02d',$j*$increment);
- $str .= '<td align="left"
bgcolor="'.$this->theme['bg_color'].'"><font
color="'.$phpgw_info['theme']['bg_text'].'" face="'.$this->theme['font'].'"
size="-2">'
+ $str .= '<td align="left"
bgcolor="'.$this->theme['bg_color'].'">'
. '<a
href="'.$this->page('add','&date='.$date['full'].'&hour='.$i.'&minute='.(interval
* $j))."\" onMouseOver=\"window.status='".$i.':'.(($increment *
$j)<=9?'0':'').($increment * $j)."'; return true;\">"
- . $k."</a> </font></td>\n";
+ . $k."</a></td>\n";
}
}
$str .= '</tr>'
@@ -3698,7 +3470,7 @@
$extra
=' title="'.$time_slice[$index]['description'].'"
onClick="location.href=\''.$link.'\';" style="cursor:pointer; cursor:hand;"';
break;
}
- $str .= '<td
bgcolor="'.$time_slice[$index]['color'].'" color="#999999"'.$extra.'><font
color="'.$this->theme['bg_text'].'" face="'.$this->theme['font'].'"
size="-2">'.$time_slice[$index]['marker'].'</font></td>';
+ $str .= '<td
bgcolor="'.$time_slice[$index]['color'].'"
color="#999999"'.$extra.'>'.$time_slice[$index]['marker'].'</td>';
}
$str .= "\n";
}
@@ -4407,11 +4179,6 @@
$p->parse('V_delete_btn','B_delete_btn');
}
- $body_tags =
'bgcolor="'.$GLOBALS['phpgw_info']['theme']['bg_color']
- . '"
alink="'.$GLOBALS['phpgw_info']['theme']['alink']
- . '"
link="'.$GLOBALS['phpgw_info']['theme']['link']
- .'"
vlink="'.$GLOBALS['phpgw_info']['theme']['vlink'].'"';
-
$form_action = $GLOBALS['phpgw']->link('/index.php',
array('menuaction' => 'calendar.uicalendar.modify'));
$charset = lang('charset');
@@ -4533,7 +4300,7 @@
$day_image = '';
if($holidays)
{
- $extra = '
bgcolor="'.$this->bo->holiday_color.'"';
+ $extra = '
class="'.$this->bo->holiday_class.'"';
$class = ($appts?'b':'').'minicalhol';
if ($date == $this->bo->today)
{
@@ -4542,29 +4309,17 @@
}
elseif ($date != $this->bo->today)
{
- $extra = ' bgcolor="'.$cellcolor.'"';
+ $extra = ' class="'.$cellclass.'"';
$class = ($appts?'b':'').'minicalendar';
}
else
{
- $extra = '
bgcolor="'.$GLOBALS['phpgw_info']['theme']['cal_today'].'"';
+ $extra = ' class="cal_today"';
$class = ($appts?'b':'').'minicalendar';
$day_image = '
background="'.$GLOBALS['phpgw']->common->image('calendar','mini_day_block').'"';
}
- if($this->bo->printer_friendly &&
@$this->bo->prefs['calendar']['print_black_white'])
- {
- $extra = '';
- }
-
- if(!$this->bo->printer_friendly &&
$this->bo->check_perms(PHPGW_ACL_ADD))
- {
- $new_event = True;
- }
- else
- {
- $new_event = False;
- }
+ $new_event =
$this->bo->check_perms(PHPGW_ACL_ADD);
$holiday_name = array();
if($holidays)
{
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] calendar/inc class.bocalendar.inc.php class.soc...,
Dave Hall <=