holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improved day text placement; intval->int changes; fixed quote issue

Browse Source
This commit is contained in:
shrykedude 2003-12-23 05:28:36 +00:00
parent 066153bcb0
commit 0b2abd610b
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
calendar/inc/class.uicalendar.inc.php
View File

@ -3357,8 +3357,8 @@
$p->set_unknowns('keep'); $p->set_unknowns('keep');
$tpl = 'day_cal.tpl'; $tpl = 'day_cal.tpl';
if(intval($GLOBALS['phpgw_info']['user']['preferences']['calendar']['mainscreen_showevents'])==2 && if((int)($GLOBALS['phpgw_info']['user']['preferences']['calendar']['mainscreen_showevents'])==2 &&
$GLOBALS[phpgw_info][flags][currentapp] == 'home') $GLOBALS['phpgw_info']['flags']['currentapp'] == 'home')
{ {
$tpl = 'day_list.tpl'; $tpl = 'day_list.tpl';
} }
@ -3376,8 +3376,8 @@
$date_to_eval = sprintf("%04d%02d%02d",$params['year'],$params['month'],$params['day']); $date_to_eval = sprintf("%04d%02d%02d",$params['year'],$params['month'],$params['day']);
$day_start = mktime(intval($this->bo->prefs['calendar']['workdaystarts']),0,0,$params['month'],$params['day'],$params['year']); $day_start = mktime((int)($this->bo->prefs['calendar']['workdaystarts']),0,0,$params['month'],$params['day'],$params['year']);
$day_end = mktime(intval($this->bo->prefs['calendar']['workdayends']),0,1,$params['month'],$params['day'],$params['year']); $day_end = mktime((int)($this->bo->prefs['calendar']['workdayends']),0,1,$params['month'],$params['day'],$params['year']);
$daily = $this->set_week_array($GLOBALS['phpgw']->datetime->get_weekday_start($params['year'],$params['month'],$params['day']),$this->theme['row_on'],True); $daily = $this->set_week_array($GLOBALS['phpgw']->datetime->get_weekday_start($params['year'],$params['month'],$params['day']),$this->theme['row_on'],True);
print_debug('Date to Eval',$date_to_eval); print_debug('Date to Eval',$date_to_eval);
$events_to_show = array(); $events_to_show = array();

2
calendar/inc/hook_home_small.inc.php
View File

@ -47,7 +47,7 @@
'month' => date('m',$day), 'month' => date('m',$day),
'day' => date('d',$day) 'day' => date('d',$day)
)); ));
$extra_data .= '<font class="event-off" style="font-weight: bold">'.date('l',$day) .'</font><br />' . $dayprint; $extra_data .= '<font class="event-off" style="font-weight: bold">&nbsp;&nbsp&nbsp;'.date('l',$day) .'</font><br />' . $dayprint;
} }
$extra_data .= '</td></tr></table>'."\n"; $extra_data .= '</td></tr></table>'."\n";

2
calendar/templates/default/day_list.tpl
View File

@ -11,7 +11,7 @@
</div> </div>
<!-- END day --> <!-- END day -->
<!-- BEGIN day_row --> <!-- BEGIN day_row -->
{event} <font style="font-size: 8pt;">{event}</font>
<!-- END day_row --> <!-- END day_row -->
<!-- BEGIN day_event_on --> <!-- BEGIN day_event_on -->
<font class="event-on">{event}</font> <font class="event-on">{event}</font>