Condensing template files.

This commit is contained in:
skeeter 2001-05-15 04:13:20 +00:00
parent 0ab640ddc1
commit dda38958ea
5 changed files with 43 additions and 40 deletions

View File

@ -32,13 +32,11 @@
$cal_info = CreateObject('calendar.calendar_item'); $cal_info = CreateObject('calendar.calendar_item');
function display_item($field,$data) function display_item(&$p,$field,$data)
{ {
global $p;
$p->set_var('field',$field); $p->set_var('field',$field);
$p->set_var('data',$data); $p->set_var('data',$data);
$p->parse('output','list',True); $p->parse('row','list',True);
} }
if ($phpgw_info['user']['preferences']['common']['timeformat'] == '12') if ($phpgw_info['user']['preferences']['common']['timeformat'] == '12')
@ -146,13 +144,13 @@
$p = CreateObject('phpgwapi.Template',$phpgw->calendar->template_dir); $p = CreateObject('phpgwapi.Template',$phpgw->calendar->template_dir);
$templates = Array( $templates = Array(
'edit_entry_begin'=> 'edit.tpl', 'edit' => 'edit.tpl',
'list' => 'list.tpl',
'hr' => 'hr.tpl',
'edit_entry_end' => 'edit.tpl',
'form_button' => 'form_button_script.tpl' 'form_button' => 'form_button_script.tpl'
); );
$p->set_file($templates); $p->set_file($templates);
$p->set_block('edit','edit_entry','edit_entry');
$p->set_block('edit','list','list');
$p->set_block('edit','hr','hr');
if($id > 0) if($id > 0)
{ {
@ -184,22 +182,21 @@
); );
$p->set_var($vars); $p->set_var($vars);
$p->parse('out','edit_entry_begin');
// Brief Description // Brief Description
display_item(lang('Title'),'<input name="title" size="25" maxlength="80" value="'.$event->title.'">'); display_item($p,lang('Title'),'<input name="title" size="25" maxlength="80" value="'.$event->title.'">');
// Full Description // Full Description
display_item(lang('Full Description'),'<textarea name="description" rows="5" cols="40" wrap="virtual" maxlength="2048">'.$event->description.'</textarea>'); display_item($p,lang('Full Description'),'<textarea name="description" rows="5" cols="40" wrap="virtual" maxlength="2048">'.$event->description.'</textarea>');
// Display Categories // Display Categories
display_item(lang('Category'),'<select name="category"><option value="">'.lang('Choose the category').'</option>'.$phpgw->categories->formated_list('select','all',$event->category,True).'</select>'); display_item($p,lang('Category'),'<select name="category"><option value="">'.lang('Choose the category').'</option>'.$phpgw->categories->formated_list('select','all',$event->category,True).'</select>');
// Date // Date
$day_html = $sb->getDays('start[mday]',intval($phpgw->common->show_date($start,'d'))); $day_html = $sb->getDays('start[mday]',intval($phpgw->common->show_date($start,'d')));
$month_html = $sb->getMonthText('start[month]',intval($phpgw->common->show_date($start,'n'))); $month_html = $sb->getMonthText('start[month]',intval($phpgw->common->show_date($start,'n')));
$year_html = $sb->getYears('start[year]',intval($phpgw->common->show_date($start,'Y')),intval($phpgw->common->show_date($start,'Y'))); $year_html = $sb->getYears('start[year]',intval($phpgw->common->show_date($start,'Y')),intval($phpgw->common->show_date($start,'Y')));
display_item(lang('Start Date'),$phpgw->common->dateformatorder($year_html,$month_html,$day_html)); display_item($p,lang('Start Date'),$phpgw->common->dateformatorder($year_html,$month_html,$day_html));
// Time // Time
$amsel = ' checked'; $pmsel = ''; $amsel = ' checked'; $pmsel = '';
@ -217,13 +214,13 @@
$str .= '<input type="radio" name="start[ampm]" value="pm"'.$pmsel.'>pm'; $str .= '<input type="radio" name="start[ampm]" value="pm"'.$pmsel.'>pm';
} }
display_item(lang('Start Time'),$str); display_item($p,lang('Start Time'),$str);
// End Date // End Date
$day_html = $sb->getDays('end[mday]',intval($phpgw->common->show_date($end,'d'))); $day_html = $sb->getDays('end[mday]',intval($phpgw->common->show_date($end,'d')));
$month_html = $sb->getMonthText('end[month]',intval($phpgw->common->show_date($end,'n'))); $month_html = $sb->getMonthText('end[month]',intval($phpgw->common->show_date($end,'n')));
$year_html = $sb->getYears('end[year]',intval($phpgw->common->show_date($end,'Y')),intval($phpgw->common->show_date($end,'Y'))); $year_html = $sb->getYears('end[year]',intval($phpgw->common->show_date($end,'Y')),intval($phpgw->common->show_date($end,'Y')));
display_item(lang('End Date'),$phpgw->common->dateformatorder($year_html,$month_html,$day_html)); display_item($p,lang('End Date'),$phpgw->common->dateformatorder($year_html,$month_html,$day_html));
// End Time // End Time
$amsel = ' checked'; $pmsel = ''; $amsel = ' checked'; $pmsel = '';
@ -242,10 +239,10 @@
$str .= '<input type="radio" name="end[ampm]" value="pm"'.$pmsel.'>pm'; $str .= '<input type="radio" name="end[ampm]" value="pm"'.$pmsel.'>pm';
} }
display_item(lang("End Time"),$str); display_item($p,lang("End Time"),$str);
// Priority // Priority
display_item(lang('Priority'),$sb->getPriority('priority',$event->priority)); display_item($p,lang('Priority'),$sb->getPriority('priority',$event->priority));
// Access // Access
$str = '<input type="checkbox" name="private" value="private"'; $str = '<input type="checkbox" name="private" value="private"';
@ -254,7 +251,7 @@
$str .= ' checked'; $str .= ' checked';
} }
$str .= '>'; $str .= '>';
display_item(lang('Private'),$str); display_item($p,lang('Private'),$str);
// Participants // Participants
$accounts = $phpgw->acl->get_ids_for_location('run',1,'calendar'); $accounts = $phpgw->acl->get_ids_for_location('run',1,'calendar');
@ -299,7 +296,7 @@
} }
} }
$str .= ' </select>'; $str .= ' </select>';
display_item(lang('Participants'),$str); display_item($p,lang('Participants'),$str);
// I Participate // I Participate
$participate = False; $participate = False;
@ -319,13 +316,13 @@
$str .= ' checked'; $str .= ' checked';
} }
$str .= '>'; $str .= '>';
display_item($phpgw->common->grab_owner_name($owner).' '.lang('Participates'),$str); display_item($p,$phpgw->common->grab_owner_name($owner).' '.lang('Participates'),$str);
// Repeat Type // Repeat Type
$p->set_var('hr_text','<hr>'); $p->set_var('hr_text','<hr>');
$p->parse('output','hr',True); $p->parse('row','hr',True);
$p->set_var('hr_text','<center><b>'.lang('Repeating Event Information').'</b></center><br>'); $p->set_var('hr_text','<center><b>'.lang('Repeating Event Information').'</b></center><br>');
$p->parse('output','hr',True); $p->parse('row','hr',True);
$str = '<select name="recur_type">'; $str = '<select name="recur_type">';
$rpt_type = Array( $rpt_type = Array(
RECUR_NONE, RECUR_NONE,
@ -353,9 +350,8 @@
$str .= '>'.lang($rpt_type_out[$rpt_type[$l]]).'</option>'; $str .= '>'.lang($rpt_type_out[$rpt_type[$l]]).'</option>';
} }
$str .= '</select>'; $str .= '</select>';
display_item(lang('Repeat Type'),$str); display_item($p,lang('Repeat Type'),$str);
$p->set_var('field',lang('Repeat End Date'));
$str = '<input type="checkbox" name="rpt_use_end" value="y"'; $str = '<input type="checkbox" name="rpt_use_end" value="y"';
if($event->recur_enddate->year != 0 && $event->recur_enddate->month != 0 && $event->recur_enddate->mday != 0) if($event->recur_enddate->year != 0 && $event->recur_enddate->month != 0 && $event->recur_enddate->mday != 0)
@ -377,7 +373,7 @@
$year_html = $sb->getYears('recur_enddate[year]',intval($phpgw->common->show_date($recur_end,'Y')),intval($phpgw->common->show_date($recur_end,'Y'))); $year_html = $sb->getYears('recur_enddate[year]',intval($phpgw->common->show_date($recur_end,'Y')),intval($phpgw->common->show_date($recur_end,'Y')));
$str .= $phpgw->common->dateformatorder($year_html,$month_html,$day_html); $str .= $phpgw->common->dateformatorder($year_html,$month_html,$day_html);
display_item(lang('Repeat End Date'),$str); display_item($p,lang('Repeat End Date'),$str);
$str = '<input type="checkbox" name="cal[rpt_sun]" value="'.M_SUNDAY.'"'.(($event->recur_data & M_SUNDAY) ?' checked':'').'> '.lang('Sunday').' '; $str = '<input type="checkbox" name="cal[rpt_sun]" value="'.M_SUNDAY.'"'.(($event->recur_data & M_SUNDAY) ?' checked':'').'> '.lang('Sunday').' ';
$str .= '<input type="checkbox" name="cal[rpt_mon]" value="'.M_MONDAY.'"'.(($event->recur_data & M_MONDAY) ?' checked':'').'> '.lang('Monday').' '; $str .= '<input type="checkbox" name="cal[rpt_mon]" value="'.M_MONDAY.'"'.(($event->recur_data & M_MONDAY) ?' checked':'').'> '.lang('Monday').' ';
@ -387,9 +383,9 @@
$str .= '<input type="checkbox" name="cal[rpt_fri]" value="'.M_FRIDAY.'"'.(($event->recur_data & M_FRIDAY) ?' checked':'').'> '.lang('Friday').' '; $str .= '<input type="checkbox" name="cal[rpt_fri]" value="'.M_FRIDAY.'"'.(($event->recur_data & M_FRIDAY) ?' checked':'').'> '.lang('Friday').' ';
$str .= '<input type="checkbox" name="cal[rpt_sat]" value="'.M_SATURDAY.'"'.(($event->recur_data & M_SATURDAY) ?' checked':'').'> '.lang('Saturday').' '; $str .= '<input type="checkbox" name="cal[rpt_sat]" value="'.M_SATURDAY.'"'.(($event->recur_data & M_SATURDAY) ?' checked':'').'> '.lang('Saturday').' ';
display_item(lang('Repeat Day').'<br>'.lang('(for weekly)'),$str); display_item($p,lang('Repeat Day').'<br>'.lang('(for weekly)'),$str);
display_item(lang('Frequency'),'<input name="recur_interval" size="4" maxlength="4" value="'.$event->recur_interval.'">'); display_item($p,lang('Frequency'),'<input name="recur_interval" size="4" maxlength="4" value="'.$event->recur_interval.'">');
$p->set_var('submit_button',lang('Submit')); $p->set_var('submit_button',lang('Submit'));
@ -406,12 +402,11 @@
); );
$p->set_var($var); $p->set_var($var);
$p->parse('delete_button','form_button'); $p->parse('delete_button','form_button');
$p->pparse('out','edit_entry_end');
} }
else else
{ {
$p->set_var('delete_button',''); $p->set_var('delete_button','');
$p->pparse('out','edit_entry_end');
} }
$p->pparse('out','edit_entry');
$phpgw->common->phpgw_footer(); $phpgw->common->phpgw_footer();
?> ?>

View File

@ -1,5 +1,5 @@
<!-- $Id$ --> <!-- $Id$ -->
<!-- BEGIN edit_entry_begin --> <!-- BEGIN edit_entry -->
<body bgcolor="#C0C0C0"> <body bgcolor="#C0C0C0">
<center> <center>
<h2><font color="#000000">{calendar_action}</font></h2> <h2><font color="#000000">{calendar_action}</font></h2>
@ -13,16 +13,24 @@
<hr> <hr>
</td> </td>
</tr> </tr>
<!-- END edit_entry_begin --> {row}
{output}
<!-- BEGIN edit_entry_end -->
</table> </table>
<input type="submit" value="{submit_button}"> <input type="submit" value="{submit_button}">
</form> </form>
{delete_button} {delete_button}
</center> </center>
<!-- END edit_entry_end --> <!-- END edit_entry -->
<!-- BEGIN list -->
<tr>
<td valign="top" width="35%"><b>{field}:</b></td>
<td valign="top" width="65%">{data}</td>
</tr>
<!-- END list -->
<!-- BEGIN hr -->
<tr>
<td colspan="2">
{hr_text}
</td>
</tr>
<!-- END hr -->

View File

@ -1,6 +1,6 @@
<!-- $Id$ --> <!-- $Id$ -->
<!-- BEGIN head --> <!-- BEGIN head -->
<table border="0" width="100%" cols={cols} cellpadding="0" cellspacing="0"> <table border="0" width="100%" cols="{cols}" cellpadding="0" cellspacing="0">
<tr> <tr>
{header_column} </tr> {header_column} </tr>
</table> </table>

View File

@ -99,7 +99,7 @@
'button_value' => lang('Go!') 'button_value' => lang('Go!')
); );
$tpl->set_var($var); $tpl->set_var($var);
$tpl->parse('header_column','form_button_dropdown',True); $tpl->fp('header_column','form_button_dropdown',True);
} }
if(count($grants) > 0) if(count($grants) > 0)

View File

@ -99,7 +99,7 @@
'button_value' => lang('Go!') 'button_value' => lang('Go!')
); );
$tpl->set_var($var); $tpl->set_var($var);
$tpl->parse('header_column','form_button_dropdown',True); $tpl->fp('header_column','form_button_dropdown',True);
} }
if(count($grants) > 0) if(count($grants) > 0)