From ab4fe582bf6288fcc9a1550be7026e264e6dc874 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Mon, 21 Apr 2003 11:00:53 +0000 Subject: [PATCH] imported changes from .16 (app-header & styleguide-conformace) --- calendar/inc/class.uialarm.inc.php | 35 +- calendar/inc/class.uicalendar.inc.php | 357 +++++++++++--------- calendar/inc/class.uiholiday.inc.php | 48 ++- calendar/inc/class.uiicalendar.inc.php | 4 +- calendar/setup/phpgw_de.lang | 31 +- calendar/setup/phpgw_en.lang | 33 ++ calendar/templates/default/alarm.tpl | 22 +- calendar/templates/default/edit.tpl | 24 +- calendar/templates/default/head.tpl | 2 +- calendar/templates/default/holiday.tpl | 24 +- calendar/templates/default/locales.tpl | 8 +- calendar/templates/default/matrix_query.tpl | 24 +- calendar/templates/default/overlap.tpl | 13 +- calendar/templates/default/search.tpl | 15 +- calendar/templates/default/view.tpl | 22 +- calendar/templates/default/year.tpl | 8 +- 16 files changed, 392 insertions(+), 278 deletions(-) diff --git a/calendar/inc/class.uialarm.inc.php b/calendar/inc/class.uialarm.inc.php index 2b8901c2c6..8dea84dcb4 100755 --- a/calendar/inc/class.uialarm.inc.php +++ b/calendar/inc/class.uialarm.inc.php @@ -67,17 +67,18 @@ ); } - unset($GLOBALS['phpgw_info']['flags']['noheader']); - unset($GLOBALS['phpgw_info']['flags']['nonavbar']); - $GLOBALS['phpgw']->common->phpgw_header(); + unset($GLOBALS['phpgw_info']['flags']['noheader']); + unset($GLOBALS['phpgw_info']['flags']['nonavbar']); + $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['calendar']['title'].' - '.lang('Alarm Management'); + $GLOBALS['phpgw']->common->phpgw_header(); $this->template = CreateObject('phpgwapi.Template',$this->template_dir); $this->template->set_unknowns('keep'); $this->template->set_file( Array( - 'alarm' => 'alarm.tpl' - ) + 'alarm' => 'alarm.tpl' + ) ); $this->template->set_block('alarm','alarm_management','alarm_management'); $this->template->set_block('alarm','alarm_headers','alarm_headers'); @@ -96,21 +97,26 @@ function manager() { $this->prep_page(); - echo ExecMethod('calendar.uicalendar.view_event',$this->event); + ExecMethod('calendar.uicalendar.view_event',$this->event); + echo "
\n"; + $GLOBALS['phpgw']->template->set_var(array( + 'hr_text' => lang('Alarms').':', + 'button_left' => '', + 'button_center' => '', + 'button_right' => '' + )); + $GLOBALS['phpgw']->template->fp('row','hr',True); + $GLOBALS['phpgw']->template->fp('phpgw_body','view_event'); - $this->template->set_var('hr_text','
'.lang('Alarms').'

'); - $this->template->parse('row','hr',True); + $var = Array( 'action_url' => $GLOBALS['phpgw']->link('/index.php',Array('menuaction'=>'calendar.uialarm.form_handler')), 'time_lang' => lang('Time'), 'text_lang' => lang('Text'), - 'enabled_pict' => $GLOBALS['phpgw']->common->image('calendar','enabled.gif'), + 'enabled_pict' => $GLOBALS['phpgw']->common->image('calendar','enabled.gif'), 'disabled_pict' => $GLOBALS['phpgw']->common->image('calendar','disabled.gif') ); - $this->output_template_array('row','alarm_headers',$var); - $this->template->set_var('hr_text','
'); - $this->template->parse('row','hr',True); if($this->event['alarm']) { @@ -127,10 +133,7 @@ $this->output_template_array('row','list',$var); } } - $this->template->set_var('hr_text','
'); - $this->template->parse('row','hr',True); - - echo $this->template->fp('out','alarm_management'); + $this->template->fp('phpgw_body','alarm_management'); } function add_alarm() diff --git a/calendar/inc/class.uicalendar.inc.php b/calendar/inc/class.uicalendar.inc.php index e880ee8f1f..cb1a1d55f0 100755 --- a/calendar/inc/class.uicalendar.inc.php +++ b/calendar/inc/class.uicalendar.inc.php @@ -131,6 +131,30 @@ print_debug('UI',$this->_debug_sqsof()); } + /*! + @function error_exit + @abstract shows $msg centered on the screen and exit + @syntax error_exit($msg) + @param $msg lang()'ed msg-text or one of the predefined messages (see below) + */ + function error_exit($msg) + { + switch($msg) + { + case 'invalid_id': + $msg = lang('Invalid entry id.'); + break; + case 'no_read_perm': + $msg = lang('You do not have permission to read this record!'); + break; + case 'not_exist': + $msg = lang('Sorry, this event does not exist'); + break; + } + $GLOBALS['phpgw']->template->set_var('phpgw_body','
'.$msg."
\n"); + exit; + } + /* Public functions */ function mini_calendar($params) @@ -310,14 +334,21 @@ /*! @function cal_header @abstract call common::phpgw_header and shows the application-header + @syntax cal_header($func_header,$big_header) + @param $func_header function name to display beside calendar-title + @param $always_show_header or only for selected templates */ - function cal_header() + function cal_header($func_header = '',$always_show_header = False) { unset($GLOBALS['phpgw_info']['flags']['noheader']); unset($GLOBALS['phpgw_info']['flags']['nonavbar']); unset($GLOBALS['phpgw_info']['flags']['noappheader']); unset($GLOBALS['phpgw_info']['flags']['noappfooter']); - $GLOBALS['phpgw']->common->phpgw_header(); + if (!empty($func_header) && ($always_show_header || $GLOBALS['phpgw_info']['user']['preferences']['common']['template'] == 'idots')) + { + $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['calendar']['title'] . + ' - ' . $func_header; + } function add_col(&$tpl,$str) { @@ -577,7 +608,7 @@ $tpl->parse('phpgw_body','head_table',True); } - function printer_friendly($body) + function printer_friendly($body,$func_header='') { if($this->bo->printer_friendly) { @@ -597,7 +628,7 @@ } else { - $this->cal_header(); + $this->cal_header($func_header && $GLOBALS['phpgw_info']['user']['template'] == 'idots' ? $func_header : ''); $new_body = $this->bo->debug_string.$body; } @@ -606,7 +637,7 @@ function month() { - echo $this->printer_friendly($this->get_month()); + $GLOBALS['phpgw']->template->set_var('phpgw_body',$this->printer_friendly($this->get_month(),lang('Monthview'))); } function get_month() @@ -665,7 +696,7 @@ 'print' => $print ); - $p = CreateObject('phpgwapi.Template',$this->template_dir); + $p = $GLOBALS['phpgw']->template; $p->set_unknowns('remove'); $p->set_file( Array( @@ -678,7 +709,7 @@ function week() { - echo $this->printer_friendly($this->get_week()); + $GLOBALS['phpgw']->template->set_var('phpgw_body',$this->printer_friendly($this->get_week(),lang('Weekview'))); } function get_week() @@ -812,7 +843,7 @@ $now['raw'] += $GLOBALS['phpgw']->datetime->tz_offset; $m = mktime(0,0,0,$this->bo->month,1,$this->bo->year); - $p = CreateObject('phpgwapi.Template',$this->template_dir); + $p = $GLOBALS['phpgw']->template; $p->set_file( Array( 'day_t' => 'day.tpl' @@ -845,7 +876,11 @@ function year() { - echo $this->printer_friendly($this->get_year()); + if($this->bo->printer_friendly) + { + $GLOBALS['phpgw_info']['flags']['nofooter'] = True; + } + $GLOBALS['phpgw']->template->set_var('phpgw_body',$this->printer_friendly($this->get_year(),lang('Yearview'))); } function get_year() @@ -876,19 +911,27 @@ 'printer_friendly'=> $printer ); - $p = CreateObject('phpgwapi.Template',$this->template_dir); + $p = $GLOBALS['phpgw']->template; $p->set_file( Array( 'year_t' => 'year.tpl' ) ); $p->set_block('year_t','year','year'); - $p->set_block('year_t','month','month'); - $p->set_block('year_t','month_sep','month_sep'); + $p->set_block('year_t','month','month_handle'); + $p->set_block('year_t','month_sep','month_sep_handle'); + $p->set_var(array( + 'month_handle' => '', + 'month_sep_handle' => '' + )); $p->set_var($var); for($i=1;$i<=12;$i++) { + if(($i % 3) == 1) + { + $p->parse('row','month_sep',True); + } $p->set_var('mini_month',$this->mini_calendar( Array( 'day' => 1, @@ -902,17 +945,13 @@ ); $p->parse('row','month',True); $p->set_var('mini_month',''); - if(($i % 3) == 0) - { - $p->parse('row','month_sep',True); - } } return $p->fp('out','year_t'); } function view($vcal_id=0,$cal_date=0) { - $this->cal_header(); + $this->cal_header(lang('View'),True); $cal_id = get_var('cal_id',Array('GET','POST','DEFAULT'),$vcal_id); $date = get_var('date',Array('GET','DEFAULT'),$cal_date); @@ -920,22 +959,19 @@ // First, make sure they have permission to this entry if ($cal_id < 1) { - $GLOBALS['phpgw']->template->set_var('phpgw_body','
'.lang('Invalid entry id.').'
'."\n"); - exit; - } - - if(!$this->bo->check_perms(PHPGW_ACL_READ,$cal_id)) - { - $GLOBALS['phpgw']->template->set_var('phpgw_body','
'.lang('You do not have permission to read this record!').'
'."\n"); - exit; + $this->error_exit('invalid_id'); } $event = $this->bo->read_entry($cal_id); if(!isset($event['id'])) { - $GLOBALS['phpgw']->template->set_var('phpgw_body','
'.lang("Sorry, this event does not exist").'.'.'
'."\n"); - exit; + $this->error_exit('not_exist'); + } + + if(!$this->bo->check_perms(PHPGW_ACL_READ,$event)) + { + $this->error_exit('no_read_perm'); } $this->bo->repeating_events = Array(); @@ -958,15 +994,11 @@ $event['end']['year'] = date('Y',$temp_end); } - $ret_value = $this->view_event($event,True); - $GLOBALS['phpgw']->template->set_var('phpgw_body',$ret_value); - - if($ret_value == '
'.lang('You do not have permission to read this record!').'
') + if(!$this->view_event($event,True)) { - exit; + $this->error_exit('no_read_perm'); } - //$p = CreateObject('phpgwapi.Template',$this->template_dir); $p = &$GLOBALS['phpgw']->template; $p->set_file( Array( @@ -974,6 +1006,7 @@ ) ); + $button_left = $button_center = $button_right = ''; if($this->bo->check_perms(PHPGW_ACL_EDIT,$event)) { if($event['recur_type'] != MCAL_RECUR_NONE) @@ -986,7 +1019,7 @@ . '' ); $p->set_var($var); - $p->parse('phpgw_body','form_button',True); + $button_left .= ''.$p->fp('button','form_button').''; $var = Array( 'action_url_button' => $this->page('edit','&cal_id='.$cal_id), @@ -995,7 +1028,7 @@ 'action_extra_field' => '' ); $p->set_var($var); - $p->parse('phpgw_body','form_button',True); + $button_left .= ''.$p->fp('button','form_button').''; } else { @@ -1006,7 +1039,7 @@ 'action_extra_field' => '' ); $p->set_var($var); - $p->parse('phpgw_body','form_button',True); + $button_left .= ''.$p->fp('button','form_button').''; } $var = Array( @@ -1016,7 +1049,7 @@ 'action_extra_field' => '' ); $p->set_var($var); - $p->parse('phpgw_body','form_button',True); + $button_center .= ''.$p->fp('button','form_button').''; } if ($this->bo->check_perms(PHPGW_ACL_DELETE,$event)) @@ -1031,7 +1064,7 @@ . '' ); $p->set_var($var); - $p->parse('phpgw_body','form_button',True); + $button_right .= ''.$p->fp('button','form_button').''; $var = Array( 'action_url_button' => $this->page('delete','&cal_id='.$cal_id), @@ -1040,7 +1073,7 @@ 'action_extra_field' => '' ); $p->set_var($var); - $p->parse('phpgw_body','form_button',True); + $button_right .= ''.$p->fp('button','form_button').''; if($event['recur_exception']) { @@ -1051,7 +1084,7 @@ 'action_extra_field' => '' ); $p->set_var($var); - $p->parse('phpgw_body','form_button',True); + $button_center .= ''.$p->fp('button','form_button').''; } } else @@ -1063,9 +1096,8 @@ 'action_extra_field' => '' ); $p->set_var($var); - $p->parse('phpgw_body','form_button',True); + $button_right .= ''.$p->fp('button','form_button').''; } -// } } $var = Array( @@ -1075,7 +1107,7 @@ 'action_extra_field' => '' ); $p->set_var($var); - $p->parse('phpgw_body','form_button',True); + $button_center .= ''.$p->fp('button','form_button').''; if ($this->bo->return_to) { @@ -1086,20 +1118,20 @@ 'action_extra_field' => '' ); $p->set_var($var); - $p->parse('phpgw_body','form_button',True); + $button_left .= ''.$p->fp('button','form_button').''; } - + $p->set_var(array( + 'button_left' => $button_left, + 'button_center' => $button_center, + 'button_right' => $button_right + )); + $p->fp('phpgw_body','view_event',True); + $GLOBALS['phpgw']->hooks->process('calendar_view'); } function edit($params='') { -// No event loaded, so what to check? -// if(!$this->bo->check_perms(PHPGW_ACL_EDIT)) -// { -// $this->no_edit(); -// } - if($this->debug) { echo ''."\n"; @@ -1135,9 +1167,7 @@ if(!$this->bo->check_perms(PHPGW_ACL_EDIT,$event)) { - Header('Location: '.$this->page('view','&cal_id='.$cal_id)); - $GLOBALS['phpgw_info']['flags']['nodisplay'] = True; - exit; + $GLOBALS['phpgw']->redirect($this->page('view','&cal_id='.$cal_id)); } if(@isset($GLOBALS['HTTP_POST_VARS']['edit_type']) && $GLOBALS['HTTP_POST_VARS']['edit_type'] == 'single') { @@ -1174,9 +1204,10 @@ { unset($GLOBALS['phpgw_info']['flags']['noheader']); unset($GLOBALS['phpgw_info']['flags']['nonavbar']); + $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['calendar']['title'].' - '.lang('Export'); $GLOBALS['phpgw']->common->phpgw_header(); - $p = CreateObject('phpgwapi.Template',$this->template_dir); + $p = $GLOBALS['phpgw']->template; $p->set_file( Array( 'form_button' => 'form_button_script.tpl' @@ -1240,50 +1271,40 @@ $this->index(); } - unset($GLOBALS['phpgw_info']['flags']['noheader']); - unset($GLOBALS['phpgw_info']['flags']['nonavbar']); + unset($GLOBALS['phpgw_info']['flags']['noheader']); + unset($GLOBALS['phpgw_info']['flags']['nonavbar']); + $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['calendar']['title'].' - '.lang('Reinstate'); $GLOBALS['phpgw']->common->phpgw_header(); - - echo '
'; - $cal_id = (isset($params['cal_id'])?intval($params['cal_id']):''); - $cal_id = ($cal_id==''?intval($GLOBALS['HTTP_GET_VARS']['cal_id']):$cal_id); + $cal_id = get_var('cal_id',array('GET'),$params['cal_id']); if ($cal_id < 1) { - echo lang('Invalid entry id.').'
'."\n"; - exit; + $this->error_exit('invalid_id'); } - if(!$this->bo->check_perms(PHPGW_ACL_READ)) + if(!$this->bo->check_perms(PHPGW_ACL_READ,$cal_id)) { - echo lang('You do not have permission to read this record!').''."\n"; - exit; + $this->error_exit('no_read_perm'); } $event = $this->bo->read_entry($cal_id); if(!isset($event['id'])) { - echo lang('Sorry, this event does not exist').'.'.''."\n"; - exit; + $this->error_exit('not_exist'); } elseif(!isset($event['recur_exception'])) { - echo lang('Sorry, this event does not have exceptions defined').'.'.''."\n"; - exit; + $this->error_exit(lang('Sorry, this event does not have exceptions defined')); } - $ret_value = $this->view_event($event,True); - echo $ret_value; - - if($ret_value == '
'.lang('You do not have permission to read this record!').'
') + if(!$this->view_event($event,True)) { - echo ''."\n"; - exit; + $this->error_exit('no_read_perm'); } - $p = CreateObject('phpgwapi.Template',$this->template_dir); + $p = &$GLOBALS['phpgw']->template; $p->set_file( Array( 'form_button' => 'form_button_script.tpl' @@ -1296,15 +1317,19 @@ { $str .= ' '."\n"; } + $this->output_template_array($p,'row','list',array( + 'field' => lang('Execptions'), + 'data' => '' + )); $var = Array( 'action_url_button' => $this->page('reinstate','&cal_id='.$cal_id), 'action_text_button' => lang('Reinstate'), 'action_confirm_button' => '', - 'action_extra_field' => "\n".' ' + 'action_extra_field' => '' ); $p->set_var($var); - echo $p->fp('out','form_button'); + $button_left = ''.$p->fp('out','form_button').''; $var = Array( 'action_url_button' => $this->bo->return_to ? $GLOBALS['phpgw']->link('/index.php','menuaction='.$this->bo->return_to) : $this->page(''), @@ -1313,7 +1338,10 @@ 'action_extra_field' => '' ); $p->set_var($var); - echo $p->fp('out','form_button').''; + $button_left .= ''.$p->fp('out','form_button').''; + + $p->set_var('button_left',$button_left); + $p->pfp('phpgw_body','view_event'); } function reinstate($params='') @@ -1493,7 +1521,7 @@ $now = $GLOBALS['phpgw']->datetime->makegmttime(0, 0, 0, $this->bo->month, $this->bo->day, $this->bo->year); $now['raw'] += $GLOBALS['phpgw']->datetime->tz_offset; - $p = CreateObject('phpgwapi.Template',$this->template_dir); + $p = $GLOBALS['phpgw']->template; $p->set_file( Array( 'day_t' => 'day.tpl' @@ -1520,7 +1548,7 @@ $p->set_var($var); $p->parse('day_events','day_event'); - echo $this->printer_friendly($p->fp('out','day')); + $GLOBALS['phpgw']->template->set_var('phpgw_body',$this->printer_friendly($p->fp('out','day'),lang('Dayview'))); } function edit_status() @@ -1529,6 +1557,7 @@ unset($GLOBALS['phpgw_info']['flags']['nonavbar']); $GLOBALS['phpgw_info']['flags']['noappheader'] = True; $GLOBALS['phpgw_info']['flags']['noappfooter'] = True; + $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['calendar']['title'].' - '.lang('Change Status'); $GLOBALS['phpgw']->common->phpgw_header(); $event = $this->bo->read_entry($GLOBALS['HTTP_GET_VARS']['cal_id']); @@ -1537,8 +1566,7 @@ if(!$event['participants'][$this->bo->owner]) { - echo '
The user '.$GLOBALS['phpgw']->common->grab_owner_name($this->bo->owner).' is not participating in this event!
'; - return; + $this->error_exit(lang('The user %1 is not participating in this event!',$GLOBALS['phpgw']->common->grab_owner_name($this->bo->owner))); } if(!$this->bo->check_perms(PHPGW_ACL_EDIT)) @@ -1555,10 +1583,11 @@ 'endtime' => 0, 'participants' => $event['participants'] ) - ); + ).'
'; $event = $this->bo->read_entry($GLOBALS['HTTP_GET_VARS']['cal_id']); - echo $this->view_event($event); + $this->view_event($event); + $GLOBALS['phpgw']->template->fp('phpgw_body','view_event',True); echo $this->get_response($event['id']); } @@ -1651,10 +1680,7 @@ // if (!$no_header) { - //unset($GLOBALS['phpgw_info']['flags']['noheader']); - //unset($GLOBALS['phpgw_info']['flags']['nonavbar']); - //$GLOBALS['phpgw']->common->phpgw_header(); - $this->cal_header(); + $this->cal_header(lang('Group Planner')); } // intervals_per_day can be configured in preferences now :-) @@ -2177,12 +2203,9 @@ $sb = CreateObject('phpgwapi.sbox'); - //unset($GLOBALS['phpgw_info']['flags']['noheader']); - //unset($GLOBALS['phpgw_info']['flags']['nonavbar']); - //$GLOBALS['phpgw']->common->phpgw_header(); - $this->cal_header(); + $this->cal_header(lang('Matrixview')); - $p = CreateObject('phpgwapi.Template',$this->template_dir); + $p = &$GLOBALS['phpgw']->template; $p->set_file( Array( 'mq' => 'matrix_query.tpl', @@ -2192,12 +2215,10 @@ $p->set_block('mq','matrix_query','matrix_query'); $p->set_block('mq','list','list'); - $vars = Array( - 'matrix_action' => lang('Daily Matrix View'), + $p->set_var(array( + 'title' => lang('Daily Matrix View'), 'action_url' => $this->page('viewmatrix') - ); - - $p->set_var($vars); + )); // Date $var[] = Array( @@ -2279,10 +2300,10 @@ } $vars = Array( - 'submit_button' => lang('Submit'), - 'action_url_button' => '', + 'submit_button' => lang('View'), + 'action_url_button' => $this->bo->return_to ? $GLOBALS['phpgw']->link('/index.php','menuaction='.$this->bo->return_to) : $this->page(''), 'action_text_button' => lang('Cancel'), - 'action_confirm_button' => 'onClick="history.back(-1)"', + 'action_confirm_button' => '', 'action_extra_field' => '' ); @@ -2330,16 +2351,14 @@ reset($participants); - unset($GLOBALS['phpgw_info']['flags']['noheader']); - unset($GLOBALS['phpgw_info']['flags']['nonavbar']); - $GLOBALS['phpgw']->common->phpgw_header(); + $this->cal_header(lang('Matrixview')); $matrixtype = get_var('matrixtype',Array('POST')); switch($matrixtype) { case 'free/busy': $freetime = $GLOBALS['phpgw']->datetime->gmtdate(mktime(0,0,0,$this->bo->month,$this->bo->day,$this->bo->year)); - echo $this->timematrix( + $html = '
'.$this->timematrix( Array( 'date' => $freetime, 'starttime' => $this->bo->splittime('000000',False), @@ -2349,7 +2368,7 @@ ); break; case 'weekly': - echo $this->display_weekly( + $html = '
'.$this->display_weekly( Array( 'date' => sprintf("%04d%02d%02d",$this->bo->year,$this->bo->month,$this->bo->day), 'showyear' => true, @@ -2358,20 +2377,21 @@ ); break; } - echo "\n".'
'."\n"; - echo '
'."\n"; - echo ' '."\n"; - echo ' '."\n"; - echo ' '."\n"; - echo ' '."\n"; - reset($parts); - while(list($key,$value) = each($parts)) + $html .= "\n".'
'."\n"; + $html .= ' '."\n"; + $html .= ' '."\n"; + $html .= ' '."\n"; + $html .= ' '."\n"; + + foreach($parts as $key => $value) { - echo ' '."\n"; + $html .= ' '."\n"; } - echo ' '."\n"; - echo ' '."\n"; - echo '
'."\n"; + $html .= ' '."\n"; + $html .= ' '."\n"; + $html .= '
'."\n"; + + $GLOBALS['phpgw']->template->set_var('phpgw_body',$html); } function search() @@ -2391,6 +2411,7 @@ unset($GLOBALS['phpgw_info']['flags']['noheader']); unset($GLOBALS['phpgw_info']['flags']['nonavbar']); + $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['calendar']['title'].' - '.lang('Search Results'); $GLOBALS['phpgw']->common->phpgw_header(); $error = ''; @@ -2405,11 +2426,11 @@ $event_ids = $this->bo->search_keywords($keywords); $ids = Array(); - while(list($key,$id) = each($event_ids)) + foreach($event_ids as $key => $id) { $event = $this->bo->read_entry($id); - if(!$event['public'] && !$this->bo->check_perms(PHPGW_ACL_READ,$event)) + if(!$this->bo->check_perms(PHPGW_ACL_READ,$event)) { continue; } @@ -2417,7 +2438,11 @@ $datetime = $this->bo->maketime($event['start']) - $GLOBALS['phpgw']->datetime->tz_offset; $ids[strval($event['id'])]++; - $info[strval($event['id'])] = $GLOBALS['phpgw']->common->show_date($datetime).$this->link_to_entry($event,$event['start']['month'],$event['start']['mday'],$event['start']['year']); + $info[strval($event['id'])] = array( + 'tr_color' => $GLOBALS['phpgw']->nextmatchs->alternate_row_color(), + 'date' => $GLOBALS['phpgw']->common->show_date($datetime), + 'link' => $this->link_to_entry($event,$event['start']['month'],$event['start']['mday'],$event['start']['year']) + ); } $matches = count($event_ids); @@ -2437,11 +2462,10 @@ } else { - echo ''.lang('Error').':'.lang('no matches found.'); - return; + $this->error_exit(lang('no matches found.')); } - $p = CreateObject('phpgwapi.Template',$this->template_dir); + $p = $GLOBALS['phpgw']->template; $p->set_file( Array( 'search_form' => 'search.tpl' @@ -2453,7 +2477,6 @@ $p->set_block('search_form','search_list_footer','search_list_footer'); $var = Array( - 'color' => $this->theme['bg_text'], 'search_text' => lang('Search Results'), 'quantity' => $quantity ); @@ -2465,9 +2488,9 @@ } // now sort by number of hits arsort($ids); - for(reset($ids);$key=key($ids);next($ids)) + foreach($ids as $key => $nul) { - $p->set_var('result_desc',$info[$key]); + $p->set_var($info[$key]); $p->parse('rows','search_list',True); } @@ -2501,6 +2524,10 @@ { $var['hidden_vars'] = ''; } + if (!isset($var['tr_color'])) + { + $var['tr_color'] = $GLOBALS['phpgw']->nextmatchs->alternate_row_color(); + } $p->set_var($var); $p->parse($row,$list,True); } @@ -2542,7 +2569,7 @@ $cols++; } - $tpl = CreateObject('phpgwapi.Template',$this->template_dir); + $tpl = $GLOBALS['phpgw']->template; $tpl->set_unknowns('remove'); include($this->template_dir.'/header.inc.php'); @@ -2731,6 +2758,7 @@ unset($GLOBALS['phpgw_info']['flags']['nonavbar']); $GLOBALS['phpgw_info']['flags']['noappheader'] = True; $GLOBALS['phpgw_info']['flags']['noappfooter'] = True; + $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['calendar']['title'].' - '.lang('Permission denied'); $GLOBALS['phpgw']->common->phpgw_header(); } echo '
You do not have permission to edit this appointment!
'; @@ -2933,9 +2961,10 @@ unset($GLOBALS['phpgw_info']['flags']['nonavbar']); $GLOBALS['phpgw_info']['flags']['noappheader'] = True; $GLOBALS['phpgw_info']['flags']['noappfooter'] = True; + $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['calendar']['title'].' - '.lang('Scheduling Conflict'); $GLOBALS['phpgw']->common->phpgw_header(); - $p = CreateObject('phpgwapi.Template',$this->template_dir); + $p = $GLOBALS['phpgw']->template; $p->set_file( Array( 'overlap' => 'overlap.tpl', @@ -3359,7 +3388,7 @@ { if((!$event['participants'][$this->bo->owner] && !$this->bo->check_perms(PHPGW_ACL_READ,$event))) { - return '
'.lang('You do not have permission to read this record!').'
'; + return False; } $pri = Array( @@ -3368,9 +3397,8 @@ 3 => lang('High') ); - $p = CreateObject('phpgwapi.Template',$this->template_dir); + $p = &$GLOBALS['phpgw']->template; - $p->set_unknowns('keep'); $p->set_file( Array( 'view' => 'view.tpl' @@ -3380,12 +3408,11 @@ $p->set_block('view','list','list'); $p->set_block('view','hr','hr'); - $var = Array( - 'bg_text' => $this->theme['bg_text'], - 'name' => $event['title'] + $var[] = Array( + 'tr_color' => 'th', + 'field' => lang('Title'), + 'data' => $event['title'] ); - $p->set_var($var); - unset($var); // Some browser add a \n when its entered in the database. Not a big deal // this will be printed even though its not needed. @@ -3455,8 +3482,8 @@ ); $var[] = Array( - 'field' => lang('Private'), - 'data' => $event['public']==True?'False':'True' + 'field' => lang('Access'), + 'data' => $event['public']==True?lang('Public'):lang('Privat') ); if(@isset($event['groups'][0])) @@ -3581,13 +3608,10 @@ if($alarms && @isset($event['alarm'])) { - $p->set_var('hr_text','
'); - $p->parse('row','hr',True); - $p->set_var('hr_text','
'.lang('Alarms').'

'); + $p->set_var('hr_text',lang('Alarms')); $p->parse('row','hr',True); - @reset($event['alarm']); - while(list($key,$alarm) = each($event['alarm'])) + foreach($event['alarm'] as $key => $alarm) { $icon = ''; $var = Array( @@ -3597,11 +3621,7 @@ $this->output_template_array($p,'row','list',$var); } } - - $p->set_var('hr_text','
'); - $p->parse('row','hr',True); - - return $p->fp('out','view_event'); + return True; } function nm_on_off() @@ -3633,7 +3653,7 @@ ) ); - $p = CreateObject('phpgwapi.Template',$this->template_dir); + $p = $GLOBALS['phpgw']->template; $p->set_unknowns('keep'); $templates = Array( @@ -3648,7 +3668,7 @@ $p->set_block('day_cal','day_time','day_time'); if (! $this->bo->prefs['calendar']['workdaystarts'] && - ! $this->bo->prefs['calendar']['workdayends']) + ! $this->bo->prefs['calendar']['workdayends']) { $GLOBALS['phpgw']->preferences->add('calendar','workdaystarts',8); @@ -3869,6 +3889,7 @@ 'close_link' => '' ); } + $var['tr_color'] = ''; // dummy to stop output_template_array to set it $this->output_template_array($p,'item','day_time',$var); $p->parse('row','day_row',True); $p->set_var('event',''); @@ -4024,7 +4045,7 @@ function get_response($cal_id) { - $p = CreateObject('phpgwapi.Template',$this->template_dir); + $p = &$GLOBALS['phpgw']->template; $p->set_file( Array( 'form_button' => 'form_button_script.tpl' @@ -4086,9 +4107,10 @@ unset($GLOBALS['phpgw_info']['flags']['nonavbar']); $GLOBALS['phpgw_info']['flags']['noappheader'] = True; $GLOBALS['phpgw_info']['flags']['noappfooter'] = True; + $GLOBALS['phpgw_info']['flags']['app_header'] = $event['id'] ? lang('Calendar - Edit') : lang('Calendar - Add'); $GLOBALS['phpgw']->common->phpgw_header(); - $p = CreateObject('phpgwapi.Template',$this->template_dir); + $p = &$GLOBALS['phpgw']->template; $p->set_file( Array( 'edit' => 'edit.tpl', @@ -4098,11 +4120,10 @@ $p->set_block('edit','edit_entry','edit_entry'); $p->set_block('edit','list','list'); $p->set_block('edit','hr','hr'); - + $vars = Array( 'font' => $this->theme['font'], 'bg_color' => $this->theme['bg_text'], - 'calendar_action' => ($event['id']?lang('Calendar - Edit'):lang('Calendar - Add')), 'action_url' => $GLOBALS['phpgw']->link('/index.php',Array('menuaction'=>'calendar.bocalendar.update')), 'common_hidden' => ''."\n" . ''."\n" @@ -4117,8 +4138,9 @@ // Brief Description $var[] = Array( + 'tr_color' => 'th', 'field' => lang('Title'), - 'data' => '' + 'data' => '' ); // Full Description @@ -4153,7 +4175,7 @@ // Location $var[] = Array( 'field' => lang('Location'), - 'data' => '' + 'data' => '' ); // Date @@ -4257,9 +4279,8 @@ unset($var); // Repeat Type - $p->set_var('hr_text','
'); - $p->parse('row','hr',True); - $p->set_var('hr_text','
'.lang('Repeating Event Information').'

'); + $p->set_var('tr_color','th'); + $p->set_var('hr_text','
'.lang('Repeating Event Information').'
'); $p->parse('row','hr',True); $rpt_type = Array( MCAL_RECUR_NONE, @@ -4329,8 +4350,9 @@ $this->output_template_array($p,'row','list',$var[$i]); } - $p->set_var('submit_button',lang('Submit')); + $p->set_var('submit_button',lang('Save')); + $delete_button = $cancel_button = ''; if ($event['id'] > 0) { $var = Array( @@ -4340,8 +4362,10 @@ 'action_extra_field' => '' ); $p->set_var($var); - $extra_buttons = $p->fp('out','form_button'); + $delete_button = $p->fp('out','form_button'); } + $p->set_var('delete_button',$delete_button); + if ($this->bo->return_to) { $var = Array( @@ -4351,10 +4375,9 @@ 'action_extra_field' => '' ); $p->set_var($var); - $extra_buttons .= ($event['id']>0?'
':'') . $p->fp('out','form_button'); + $cancel_button = $p->fp('out','form_button'); } - $p->set_var('extra_buttons',$extra_buttons); - + $p->set_var('cancel_button',$cancel_button); $p->pparse('out','edit_entry'); } diff --git a/calendar/inc/class.uiholiday.inc.php b/calendar/inc/class.uiholiday.inc.php index 1c87671d2c..0d18c1781e 100755 --- a/calendar/inc/class.uiholiday.inc.php +++ b/calendar/inc/class.uiholiday.inc.php @@ -41,8 +41,9 @@ $this->bo->check_admin(); $this->base_url = $this->bo->base_url; $this->template_dir = $GLOBALS['phpgw']->common->get_tpl_dir('calendar'); - $this->sb = CreateObject('phpgwapi.sbox'); + + $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['calendar']['title'].' - '.lang('Holiday Management'); } function admin() @@ -52,7 +53,7 @@ $GLOBALS['phpgw_info']['flags']['noappfooter'] = True; $GLOBALS['phpgw']->common->phpgw_header(); - $p = CreateObject('phpgwapi.Template',$this->template_dir); + $p = &$GLOBALS['phpgw']->template; $p->set_file(Array('locales'=>'locales.tpl')); $p->set_block('locales','list','list'); $p->set_block('locales','row','row'); @@ -148,7 +149,7 @@ $holidays = $this->bo->get_holiday_list(); $var = Array( - 'th_bg' => $phpgw_info['theme']['th_bg'], + 'th_bg' => $GLOBALS['phpgw_info']['theme']['th_bg'], 'left_next_matchs' => $GLOBALS['phpgw']->nextmatchs->left('/index.php',$this->bo->start,$this->bo->total,'&menuaction=calendar.uiholiday.edit_locale&locale='.$this->bo->locales[0].'&year='.$this->bo->year), 'right_next_matchs' => $GLOBALS['phpgw']->nextmatchs->right('/index.php',$this->bo->start,$this->bo->total,'&menuaction=calendar.uiholiday.edit_locale&locale='.$this->bo->locales[0].'&year='.$this->bo->year), 'center' => ''.lang('Holidays').' ('.$this->bo->locales[0].')'.$year_form.'', @@ -234,9 +235,10 @@ unset($GLOBALS['phpgw_info']['flags']['noheader']); unset($GLOBALS['phpgw_info']['flags']['nonavbar']); $GLOBALS['phpgw_info']['flags']['noappfooter'] = True; + $GLOBALS['phpgw_info']['flags']['app_header'] = $GLOBALS['phpgw_info']['apps']['calendar']['title'].' - '.($this->bo->id ? lang('Edit') : lang('Add')).' '.lang('Holiday'); $GLOBALS['phpgw']->common->phpgw_header(); - $t = CreateObject('phpgwapi.Template',$this->template_dir); + $t = &$GLOBALS['phpgw']->template; $t->set_file(Array('holiday'=>'holiday.tpl','form_button'=>'form_button_script.tpl')); $t->set_block('holiday','form','form'); $t->set_block('holiday','list','list'); @@ -266,7 +268,8 @@ $this->display_item($t,lang('title'),''); // Date - $this->display_item($t,lang('Date'),$GLOBALS['phpgw']->common->dateformatorder($this->sb->getYears('holiday[year]',$holiday['occurence']>1900?$holiday['occurence']:0),$this->sb->getMonthText('holiday[month_num]',$holiday['month']),$this->sb->getDays('holiday[mday]',$holiday['day']))); + $this->display_item($t,lang('Date'),$GLOBALS['phpgw']->common->dateformatorder($this->sb->getYears('holiday[year]',$holiday['occurence']>1900?$holiday['occurence']:0),$this->sb->getMonthText('holiday[month_num]',$holiday['month']),$this->sb->getDays('holiday[mday]',$holiday['day'])). + ' '.lang('Set a Year only for one-time / non-regular holidays.')); // Occurence $occur = Array( @@ -300,8 +303,10 @@ $out .= ''."\n"; } $dow_html = ''."\n"; - $this->display_item($t,lang('Occurence'),$occurence_html.' '.$dow_html); - $this->display_item($t,lang('Observance Rule'),''); + $this->display_item($t,lang('Occurence'),$occurence_html.' '.$dow_html. + ' '.lang('You can either set a Year or a Occurence, not both !!!')); + $this->display_item($t,lang('Observance Rule'),''. + ' '.lang('If checked holidays falling on a weekend, are taken on the monday after.')); $t->set_var('lang_add',lang('Save')); $t->set_var('lang_reset',lang('Reset')); @@ -310,7 +315,7 @@ { $link_params = Array( 'menuaction' => 'calendar.uiholiday.edit_locale', - 'year' => $this->bo->year, + 'year' => $this->bo->year, 'locale' => $this->bo->locales[0] ); } @@ -321,14 +326,34 @@ ); } - $var = Array( + $t->set_var(Array( 'action_url_button' => $GLOBALS['phpgw']->link($this->base_url,$link_params), 'action_text_button' => lang('Cancel'), 'action_confirm_button' => '', 'action_extra_field' => '' - ); - $t->set_var($var); + )); $t->parse('cancel_button','form_button'); + + if ($this->bo->id) + { + $link_params = Array( + 'menuaction' => 'calendar.uiholiday.delete_holiday', + 'year' => $this->bo->year, + 'locale' => $this->bo->locales[0], + 'id' => $this->bo->id + ); + $t->set_var(Array( + 'action_url_button' => $GLOBALS['phpgw']->link($this->base_url,$link_params), + 'action_text_button' => lang('Delete'), + 'action_confirm_button' => '', + 'action_extra_field' => '' + )); + $t->parse('delete_button','form_button'); + } + else + { + $t->set_var('delete_button',' '); + } $t->pparse('out','form'); } @@ -471,6 +496,7 @@ function display_item(&$p,$field,$data) { $var = Array( + 'tr_color' => $GLOBALS['phpgw']->nextmatchs->alternate_row_color(), 'field' => $field, 'data' => $data ); diff --git a/calendar/inc/class.uiicalendar.inc.php b/calendar/inc/class.uiicalendar.inc.php index 9508d207dd..e10f9a1e34 100755 --- a/calendar/inc/class.uiicalendar.inc.php +++ b/calendar/inc/class.uiicalendar.inc.php @@ -30,9 +30,9 @@ { $this->bo = CreateObject('calendar.boicalendar'); $this->template = $GLOBALS['phpgw']->template; + $GLOBALS['phpgw_info']['flags']['app_header'] = lang('Calendar - [iv]Cal Importer'); } - function print_test($val,$title,$x_pre='') { // echo 'VAL = '._debug_array($val,False)."
\n"; @@ -191,7 +191,7 @@ ); $var = Array( - 'vcal_header' => '

 ' . lang('Calendar - [iv]Cal Importer') . '

', + 'vcal_header' => '

', 'ical_lang' => lang('(i/v)Cal'), 'action_url' => $GLOBALS['phpgw']->link('/index.php','menuaction=calendar.boicalendar.import'), 'lang_access' => lang('Access'), diff --git a/calendar/setup/phpgw_de.lang b/calendar/setup/phpgw_de.lang index d0834fd02b..63ef39d146 100644 --- a/calendar/setup/phpgw_de.lang +++ b/calendar/setup/phpgw_de.lang @@ -1,4 +1,7 @@ %1 %2 in %3 calendar de %1 %2 im %3 +%1 matches found calendar de %1 Treffer gefunden +%1 records imported calendar de %1 Datensätze importiert +%1 records read (not yet imported, you may go back and uncheck test import) calendar de %1 Datensätze gelesen (noch nicht importiert, sie können zurück gehen und Test Import ausschalten) (for weekly) calendar de (für wöchentlich) (i/v)cal calendar de [iv]Cal 1 match found calendar de 1 Treffer gefunden @@ -27,12 +30,18 @@ calendar event calendar de Kalender Aktualisierung calendar holiday management admin de Feiertage verwalten calendar preferences calendar de Kalender Einstellungen calendar settings admin de Kalender Einstellungen +calendar-fieldname calendar de Kalender Feldname change all events for $params['old_owner'] to $params['new_owner']. calendar de Ändere alle Termine für $params['old_owner'] auf $params['new_owner']. +change status calendar de Zusage ändern choose the category calendar de Kategorie auswählen countries calendar de Länder +country calendar de Land +csv-fieldname calendar de CSV-Feldname +csv-filename calendar de CSV-Dateiname daily calendar de Täglich daily matrix view calendar de Matrix-Ansicht des Tages days repeated calendar de wiederholte Tage +dayview calendar de Tagesansicht default calendar filter calendar de Standard-Filter des Kalenders default calendar view calendar de Standard-Ansicht des Kalenders delete a single entry by passing the id. calendar de Lösche einen einzelnen Eintrag über seine Id. @@ -53,8 +62,10 @@ end date/time calendar de Enddatum/-zeit ends calendar de endet enter output filename: ( .vcs appended ) calendar de Namen der Ausgabedatei (.vcs angehangen) event details follow calendar de Details zum Termin folgen +execptions calendar de Ausnahmen export calendar de Exportieren export a list of entries in ical format. calendar de Eine Liste von Einträgen im iCal Format exportieren. +fieldseparator calendar de Feldtrenner fr calendar de Fr free/busy calendar de frei/belegt frequency calendar de Häufigkeit @@ -73,8 +84,10 @@ high priority calendar de Hohe Priorit holiday calendar de Feiertag holidays calendar de Feiertage i participate calendar de Ich nehme teil +if checked holidays falling on a weekend, are taken on the monday after. calendar de Wenn ausgewählt werden Feiertage die auf ein Wochenende fallen, am drauffolgenden Montag nachgeholt. ignore conflict calendar de Konflikt ignorieren import calendar de Importieren +import csv-file into calendar calendar de CSV-Datei in den Kalender importieren interval calendar de Interval invalid entry id. calendar de ungültige Id des Eintrags. last calendar de letzte @@ -82,6 +95,7 @@ load [iv]cal calendar de [iv]Cal Laden location calendar de Ort location to autoload from admin de Von wo sollen sie geladen werden low calendar de niedrig +matrixview calendar de Matrixansicht minutes calendar de Minuten mo calendar de Mo modified calendar de Geändert @@ -90,12 +104,14 @@ month calendar de Monat monthly calendar de Monatlich monthly (by date) calendar de Monatlich (nach Datum) monthly (by day) calendar de Monatlich (nach Wochentag) +monthview calendar de Monatsansicht new entry calendar de Neuer Eintrag no matches found. calendar de Keine Treffer gefunden. no response calendar de Keine Antwort normal calendar de normal number of intervals per day in planner view calendar de Anzahl Intervale pro Tag im Planer number of months calendar de Anzahl Monate +number of records to read (<=200) calendar de Anzeil Datensätze zu lesen (<= 200) observance rule calendar de Observance Rule occurence calendar de Wiederholung on %1 %2 %3 your meeting request for %4 calendar de Am %1 hat %2 Ihre Einladung für den %4 %3 @@ -103,7 +119,8 @@ overlap holiday calendar de participant calendar de Teilnehmer participants calendar de Teilnehmer participates calendar de nimmt teil -people holiday calendar de +people holiday calendar de Feiertag +permission denied calendar de Zugriff verweigert planner calendar de Planer planner by category calendar de Planer nach Kategorien planner by user calendar de Planer nach Benutzern @@ -111,6 +128,7 @@ please confirm,accept,reject or examine changes in the corresponding entry in yo preselected group for entering the planner calendar de vorausgewählte Gruppe beim Planeraufruf print calendars in black & white calendar de Kalender in Schwarz und Weiß drucken printer friendly calendar de Drucker-freundlich +privat calendar de Privat private and global public calendar de Privat und Global Öffentlich private and group public calendar de Privat und Gruppen Öffentlich private only calendar de nur private @@ -137,6 +155,8 @@ scheduling conflict calendar de Termin search results calendar de Suchergebnisse send updates via email common de Updates via EMail senden send/receive updates via email calendar de Senden/Empfangen von Aktualisierungen via EMail +send_extra calendar de +set a year only for one-time / non-regular holidays. calendar de Nur für einmalige / unregelmäßige Feiertage das Jahr angeben. show day view on main screen calendar de Tagesansicht auf Startseite anzeigen show default view on main screen calendar de Standardansicht auf der Startseite anzeigen show high priority events on main screen calendar de Termine mit hoher Priorität auf der Startseite anzeigen @@ -147,13 +167,16 @@ sorry, this event does not have exceptions defined calendar de Dieser Termin hat sort by calendar de Sortieren nach start date/time calendar de Startdatum/-zeit start- and enddates calendar de Start- und Enddatum/-zeit +startrecord calendar de Startdatensatz su calendar de So submit to repository calendar de Übertragen zu phpGroupWare.org sun calendar de So tentative calendar de Vorläufige Zusage +test import (show importable records only in browser) calendar de Test Import (zeigt importierte Datensätze nur im Webbrowser an) text calendar de Text th calendar de Do the following conflicts with the suggested time:

calendar de Im gewählten Zeitraum gibt es einen Konflikt: +the user %1 is not participating in this event! calendar de Der Benutzer %1 nimmt nicht an diesem Event teil! there was an error trying to connect to your news server.
please contact your admin to check the news servername, username or password. calendar de Fehler beim Kontaktieren Ihres News-Servers.
Bitte benachrichtigen Sie ihren Administrator um Servername, Username und Passwort für News zu überprüfen. this month calendar de Dieser Monat this week calendar de Diese Woche @@ -161,6 +184,7 @@ this year calendar de Dieses Jahr thu calendar de Do title calendar de TITEL today calendar de Heute +translation calendar de Übersetzung tu calendar de Di tue calendar de Di update a single entry by passing the fields. calendar de Einen einzelnen Termin über seine Felder updaten. @@ -172,12 +196,15 @@ wed calendar de Mi week calendar de Woche weekday starts on calendar de Arbeitswoche beginnt am weekly calendar de Wöchentlich +weekview calendar de Wochenansicht when creating new events default set to private calendar de neue Termine sind privat work day ends on calendar de Arbeitstag endet um work day starts on calendar de Arbeitstag beginnt um -%1 matches found calendar de %1 Treffer gefunden +workdayends calendar de Arbeitstag endet um year calendar de Jahr yearly calendar de Jährlich +yearview calendar de +you can either set a year or a occurence, not both !!! calendar de Sie können nur entweder das Jahr oder die Wiederholung angeben, nicht beides !!! you can only set a year or a occurence !!! calendar de Sie können nur ein Jahr oder eine Wiederholung angeben !!! you do not have permission to read this record! calendar de Sie haben keine Berechtigung diesen Eintrag zu lesen! you have 1 high priority event on your calendar today. common de Sie haben heute einen Eintrag mit hoher Priorität auf Ihrer Liste! diff --git a/calendar/setup/phpgw_en.lang b/calendar/setup/phpgw_en.lang index 2ed54441ff..7af9c69731 100644 --- a/calendar/setup/phpgw_en.lang +++ b/calendar/setup/phpgw_en.lang @@ -1,5 +1,7 @@ %1 %2 in %3 calendar en %1 %2 in %3 %1 matches found calendar en %1 matches found +%1 records imported calendar en %1 records imported +%1 records read (not yet imported, you may go back and uncheck test import) calendar en %1 records read (not yet imported, you may go back and uncheck Test Import) (for weekly) calendar en (for Weekly) (i/v)cal calendar en (i/v)Cal 1 match found calendar en 1 match found @@ -11,6 +13,7 @@ add alarm calendar en Add Alarm added calendar en Added alarm calendar en alarm alarm management calendar en Alarm Management +alarm-management calendar en Alarm-Management alarms calendar en Alarms all day calendar en All Day are you sure you want to delete this country ? calendar en Are you sure you want to delete this Country ? @@ -27,11 +30,18 @@ calendar event calendar en Calendar Event calendar holiday management admin en Calendar Holiday Management calendar preferences calendar en Calendar Preferences calendar settings admin en Calendar Settings +calendar-fieldname calendar en Calendar-Fieldname change all events for $params['old_owner'] to $params['new_owner']. calendar en Change all events for $params['old_owner'] to $params['new_owner']. +change status calendar en Change Status +configuration calendar en Configuration countries calendar en Countries +country calendar en Country +csv-fieldname calendar en CSV-Fieldname +csv-filename calendar en CSV-Filename daily calendar en Daily daily matrix view calendar en Daily Matrix View days repeated calendar en days repeated +dayview calendar en Dayview default calendar filter calendar en Default calendar filter default calendar view calendar en Default calendar view delete a single entry by passing the id. calendar en Delete a single entry by passing the id. @@ -53,8 +63,10 @@ end date/time calendar en End Date/Time ends calendar en ends enter output filename: ( .vcs appended ) calendar en Enter Output Filename: ( .vcs appended ) event details follow calendar en Event Details Follow +execptions calendar en Execptions export calendar en Export export a list of entries in ical format. calendar en Export a list of entries in iCal format. +fieldseparator calendar en Fieldseparator fr calendar en F free/busy calendar en Free/Busy frequency calendar en Frequency @@ -70,16 +82,21 @@ has been canceled calendar en has been canceled has been rescheduled to calendar en has been rescheduled to high priority calendar en high priority holiday calendar en Holiday +holiday management calendar en Holiday Management +holiday-management calendar en Holiday-Management holidays calendar en Holidays i participate calendar en I Participate +if checked holidays falling on a weekend, are taken on the monday after. calendar en If checked holidays falling on a weekend, are taken on the monday after. ignore conflict calendar en Ignore Conflict import calendar en Import +import csv-file into calendar calendar en Import CSV-File into Calendar interval calendar en Interval invalid entry id. calendar en Invalid entry id. last calendar en last load [iv]cal calendar en Load [iv]Cal location calendar en Location location to autoload from admin en Location to autoload from +matrixview calendar en Matrixview minutes calendar en minutes mo calendar en M modified calendar en Modified @@ -88,11 +105,13 @@ month calendar en Month monthly calendar en Monthly monthly (by date) calendar en Monthly (by date) monthly (by day) calendar en Monthly (by day) +monthview calendar en Monthview new entry calendar en New Entry no matches found. calendar en No matches found. no response calendar en No Response number of intervals per day in planner view calendar en Number of Intervals per Day in Planner View number of months calendar en Number of months +number of records to read (<=200) calendar en Number of records to read (<=200) observance rule calendar en Observance Rule occurence calendar en Occurence on %1 %2 %3 your meeting request for %4 calendar en On %1 %2 %3 your meeting request for %4 @@ -100,13 +119,17 @@ overlap holiday calendar en overlap holiday participant calendar en Participant participants calendar en Participants participates calendar en Participates +people holiday calendar en people holiday +permission denied calendar en Permission denied planner calendar en Planner planner by category calendar en Planner by category planner by user calendar en Planner by user +planner_user calendar en planner_user please confirm,accept,reject or examine changes in the corresponding entry in your calendar calendar en Please confirm, accept, reject or examine changes in the corresponding entry in your calendar preselected group for entering the planner calendar en Preselected group for entering the planner print calendars in black & white calendar en Print calendars in black & white printer friendly calendar en Printer Friendly +privat calendar en Privat private and global public calendar en Private and Global Public private and group public calendar en Private and Group Public private only calendar en Private Only @@ -132,6 +155,8 @@ scheduling conflict calendar en Scheduling Conflict search results calendar en Search Results send updates via email common en Send updates via EMail send/receive updates via email calendar en Send/Receive updates via EMail +send_extra calendar en send_extra +set a year only for one-time / non-regular holidays. calendar en Set a Year only for one-time / non-regular holidays. show day view on main screen calendar en show day view on main screen show default view on main screen calendar en Show default view on main screen show high priority events on main screen calendar en Show high priority events on main screen @@ -142,13 +167,16 @@ sorry, this event does not have exceptions defined calendar en Sorry, this event sort by calendar en Sort by start date/time calendar en Start Date/Time start- and enddates calendar en Start- and Enddates +startrecord calendar en Startrecord su calendar en Su submit to repository calendar en Submit to Repository sun calendar en Sun tentative calendar en Tentative +test import (show importable records only in browser) calendar en Test Import (show importable records only in browser) text calendar en Text th calendar en T the following conflicts with the suggested time: calendar en The following conflicts with the suggested time: +the user %1 is not participating in this event! calendar en The user %1 is not participating in this event! there was an error trying to connect to your news server.
please contact your admin to check the news servername, username or password. calendar en There was an error trying to connect to your news server.
Please contact your admin to check the news servername, username or password. this month calendar en This month this week calendar en This week @@ -156,6 +184,7 @@ this year calendar en This year thu calendar en Thu title calendar en TITLE today calendar en Today +translation calendar en Translation tu calendar en T tue calendar en Tue update a single entry by passing the fields. calendar en Update a single entry by passing the fields. @@ -167,10 +196,14 @@ wed calendar en Wed week calendar en Week weekday starts on calendar en Weekday starts on weekly calendar en Weekly +weekview calendar en Weekview when creating new events default set to private calendar en When creating new events default set to private work day ends on calendar en Work day ends on work day starts on calendar en Work day starts on +workdayends calendar en workdayends yearly calendar en Yearly +yearview calendar en Yearview +you can either set a year or a occurence, not both !!! calendar en You can either set a Year or a Occurence, not both !!! you can only set a year or a occurence !!! calendar en You can only set a year or a occurence !!! you do not have permission to read this record! calendar en You do not have permission to read this record! you have %1 high priority events on your calendar today. common en You have %1 high priority events on your calendar today. diff --git a/calendar/templates/default/alarm.tpl b/calendar/templates/default/alarm.tpl index 82fab1c8b9..a771a44f0a 100755 --- a/calendar/templates/default/alarm.tpl +++ b/calendar/templates/default/alarm.tpl @@ -2,25 +2,23 @@
- - +
{row}
-
- +   - {time_lang} - {text_lang} - enabled - disabled +  {time_lang} +  {text_lang} + enabled + disabled - + {edit_box} {field}: {data} @@ -29,9 +27,7 @@ - - - {hr_text} - + + {hr_text} diff --git a/calendar/templates/default/edit.tpl b/calendar/templates/default/edit.tpl index b3c23210ed..ad1e9d3b3f 100755 --- a/calendar/templates/default/edit.tpl +++ b/calendar/templates/default/edit.tpl @@ -1,36 +1,38 @@ -
-

{calendar_action}

{common_hidden} - +
{row} + + + +
{errormsg}
-
+ + + +
 {cancel_button}
+ 		{delete_button}
- - -
-{extra_buttons}
- - {field}: + +  {field}: {data} - + {hr_text} diff --git a/calendar/templates/default/head.tpl b/calendar/templates/default/head.tpl index d483005ad2..540d0d4324 100755 --- a/calendar/templates/default/head.tpl +++ b/calendar/templates/default/head.tpl @@ -1,6 +1,6 @@ -{row} +{row}
diff --git a/calendar/templates/default/holiday.tpl b/calendar/templates/default/holiday.tpl index c9d4b63c94..ae4d5197a0 100755 --- a/calendar/templates/default/holiday.tpl +++ b/calendar/templates/default/holiday.tpl @@ -1,35 +1,33 @@
-
- -
{title_holiday}
-{message} +{message}
{hidden_vars} {rows} + diff --git a/calendar/templates/default/locales.tpl b/calendar/templates/default/locales.tpl index 3913dfd2eb..705728eda6 100755 --- a/calendar/templates/default/locales.tpl +++ b/calendar/templates/default/locales.tpl @@ -21,7 +21,7 @@
- - - -
- + + + - +
+ - + + {cancel_button} + + {delete_button}
-{cancel_button} -
{field}: {data}
- +
{back_button} - @@ -39,7 +39,7 @@ - + {rule} diff --git a/calendar/templates/default/matrix_query.tpl b/calendar/templates/default/matrix_query.tpl index 3bc6c325e1..e09a9edca6 100755 --- a/calendar/templates/default/matrix_query.tpl +++ b/calendar/templates/default/matrix_query.tpl @@ -1,20 +1,26 @@
-

{matrix_action}

-
-
@@ -29,9 +29,9 @@
{lang_search}  +
- + {lang_search} 
{group_name} {group_name}{edit_link} {delete_link}
-{rows} +
+ + + + {rows} + + +
{title}
+ + + +
{cancel_button}
+
- - -{cancel_button} - - {field}: + +  {field}: {data} diff --git a/calendar/templates/default/overlap.tpl b/calendar/templates/default/overlap.tpl index 18c9076397..6c29afd1d4 100755 --- a/calendar/templates/default/overlap.tpl +++ b/calendar/templates/default/overlap.tpl @@ -1,14 +1,15 @@ -
-

- {overlap_title} -

+

+
{overlap_text}
    {overlap_list}
+ + + +
{resubmit_button}{reedit_button}
+
- {resubmit_button} - {reedit_button}
diff --git a/calendar/templates/default/search.tpl b/calendar/templates/default/search.tpl index 52dbfcf3e7..97c8dcef18 100755 --- a/calendar/templates/default/search.tpl +++ b/calendar/templates/default/search.tpl @@ -1,16 +1,19 @@ -

{search_text}

-{quantity}

+ + {rows} -

+

{quantity}
-

+ diff --git a/calendar/templates/default/view.tpl b/calendar/templates/default/view.tpl index 108ade486c..d2c26e6998 100755 --- a/calendar/templates/default/view.tpl +++ b/calendar/templates/default/view.tpl @@ -1,26 +1,26 @@
-

- - {name} - -

- +
{row} + + + + +
{button_left}
{button_center}
{button_right}
- - {field}: - {data} + +  {field}: + {data} - - {hr_text} + + {hr_text} diff --git a/calendar/templates/default/year.tpl b/calendar/templates/default/year.tpl index 4504447813..8dbf8eaa9b 100755 --- a/calendar/templates/default/year.tpl +++ b/calendar/templates/default/year.tpl @@ -3,25 +3,21 @@
- - - - {row}
+ {left_link} {year_text} + {right_link}

-

{printer_friendly} -