[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: calendar/templates/idsociety header.inc.php,1.22
From: |
Mark A Peters <address@hidden> |
Subject: |
[Phpgroupware-cvs] CVS: calendar/templates/idsociety header.inc.php,1.22,1.23 |
Date: |
Sat, 17 Aug 2002 11:36:12 -0400 |
Update of /cvsroot/phpgroupware/calendar/templates/idsociety
In directory subversions:/tmp/cvs-serv31555/idsociety
Modified Files:
header.inc.php
Log Message:
A couple more fixes and even a speed enhancement.
Index: header.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/templates/idsociety/header.inc.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** header.inc.php 17 Aug 2002 04:25:25 -0000 1.22
--- header.inc.php 17 Aug 2002 15:36:10 -0000 1.23
***************
*** 46,50 ****
}
! $today = date('Ymd',$GLOBALS['phpgw']['datetime']->users_localtime);
$col_width = 12;
--- 46,50 ----
}
! $today = date('Ymd',$GLOBALS['phpgw']->datetime->users_localtime);
$col_width = 12;
***************
*** 52,70 ****
add_col($tpl,' <td width="2%"> </td>');
! add_col($tpl,' <td
width="2%">'.add_image_ahref($this->page('day','&date='.$today),'today.gif',lang('Today')).'</td>');
! add_col($tpl,' <td width="2%"
align="left">'.add_image_ahref($this->page('week','&date='.$today),'week.gif',lang('This
week')).'</td>');
! add_col($tpl,' <td width="2%"
align="left">'.add_image_ahref($this->page('month','&date='.$today),'month.gif',lang('This
month')).'</td>');
! add_col($tpl,' <td width="2%"
align="left">'.add_image_ahref($this->page('year','&date='.$today),'year.gif',lang('This
Year')).'</td>');
if(floor(phpversion()) >= 4)
{
! add_col($tpl,' <td width="2%"
align="left">'.add_image_ahref($this->page('planner','&date='.$today),'planner.gif',lang('Planner')).'</td>');
$col_width += 2;
}
! add_col($tpl,' <td width="2%"
align="left">'.add_image_ahref($this->page('matrixselect'),'view.gif',lang('Daily
Matrix View')).'</td>');
add_col($tpl,' <td width="'.(100 - $col_width).'%"
align="left"'.(floor(phpversion()) < 4?' colspan="2"':'').'> </td>');
--- 52,70 ----
add_col($tpl,' <td width="2%"> </td>');
! add_col($tpl,' <td
width="2%">'.add_image_ahref($this->page('day','&date='.$today),'today',lang('Today')).'</td>');
! add_col($tpl,' <td width="2%"
align="left">'.add_image_ahref($this->page('week','&date='.$today),'week',lang('This
week')).'</td>');
! add_col($tpl,' <td width="2%"
align="left">'.add_image_ahref($this->page('month','&date='.$today),'month',lang('This
month')).'</td>');
! add_col($tpl,' <td width="2%"
align="left">'.add_image_ahref($this->page('year','&date='.$today),'year',lang('This
Year')).'</td>');
if(floor(phpversion()) >= 4)
{
! add_col($tpl,' <td width="2%"
align="left">'.add_image_ahref($this->page('planner','&date='.$today),'planner',lang('Planner')).'</td>');
$col_width += 2;
}
! add_col($tpl,' <td width="2%"
align="left">'.add_image_ahref($this->page('matrixselect'),'view',lang('Daily
Matrix View')).'</td>');
add_col($tpl,' <td width="'.(100 - $col_width).'%"
align="left"'.(floor(phpversion()) < 4?' colspan="2"':'').'> </td>');
***************
*** 82,99 ****
$matrixtype = get_var('matrixtype',Array('POST','DEFAULT'),'');
$participants = get_var('participants',Array('POST'));
! $hidden_vars = '<input type="hidden" name="from"
value="'.MENUACTION.'">'."\n";
! if($cal_id != 0)
! {
! $hidden_vars .= ' <input type="hidden" name="cal_id"
value="'.$cal_id.'">'."\n";
! }
! if($keywords)
{
! $hidden_vars .= ' <input type="hidden"
name="keywords" value="'.$keywords.'">'."\n";
! }
! if($matrixtype)
! {
! $hidden_vars .= ' <input type="hidden"
name="matrixtype" value="'.$matrixtype.'">'."\n";
}
if($participants)
{
--- 82,112 ----
$matrixtype = get_var('matrixtype',Array('POST','DEFAULT'),'');
$participants = get_var('participants',Array('POST'));
+ $var_list = Array(
+ 'cal_id',
+ 'keywords',
+ 'matrixtype'
+ );
! $base_hidden_vars = '<input type="hidden" name="from"
value="'.MENUACTION.'">'."\n";
! for($i=0;$i<count($var_list);$i++)
{
! if($($var_list[$i]))
! {
! $base_hidden_vars .= ' <input type="hidden"
name="cal_id" value="'.$($var_list[$i]).'">'."\n";
! }
}
+ // if($cal_id != 0)
+ // {
+ // $base_hidden_vars .= ' <input type="hidden"
name="cal_id" value="'.$cal_id.'">'."\n";
+ // }
+ // if($keywords)
+ // {
+ // $base_hidden_vars .= ' <input type="hidden"
name="keywords" value="'.$keywords.'">'."\n";
+ // }
+ // if($matrixtype)
+ // {
+ // $base_hidden_vars .= ' <input type="hidden"
name="matrixtype" value="'.$matrixtype.'">'."\n";
+ // }
+ $hidden_vars = '';
if($participants)
{
***************
*** 103,107 ****
}
}
- if($this->debug) { echo 'Cat ID =
('.$this->bo->cat_id.")<br>\n"; }
$var = Array(
--- 116,119 ----
***************
*** 110,114 ****
'form_name' => 'cat_id',
'title' => lang('Category'),
! 'hidden_vars' => $hidden_vars,
'form_options' => '<option
value="0">All</option>'.$this->cat->formated_list('select','all',$this->bo->cat_id,'True'),
'button_value' => lang('Go!')
--- 122,126 ----
'form_name' => 'cat_id',
'title' => lang('Category'),
! 'hidden_vars' => $base_hidden_vars.$hidden_vars,
'form_options' => '<option
value="0">All</option>'.$this->cat->formated_list('select','all',$this->bo->cat_id,'True'),
'button_value' => lang('Go!')
***************
*** 121,137 ****
{
$remainder -= 28;
! $hidden_vars = '<input type="hidden" name="from"
value="'.MENUACTION.'">'."\n";
! if($cal_id)
! {
! $hidden_vars .= ' <input type="hidden"
name="cal_id" value="'.$cal_id.'">'."\n";
! }
! if($keywords)
! {
! $hidden_vars .= ' <input type="hidden"
name="keywords" value="'.$keywords.'">'."\n";
! }
! if($matrixtype)
! {
! $hidden_vars .= ' <input type="hidden"
name="matrixtype" value="'.$matrixtype.'">'."\n";
! }
if($participants)
{
--- 133,137 ----
{
$remainder -= 28;
! $hidden_vars = '';
if($participants)
{
***************
*** 141,148 ****
}
}
- if($this->debug) { echo 'Filter =
('.$this->bo->filter.")<br>\n"; }
$form_options = '<option value=" all
"'.($this->bo->filter==' all '?' selected':'').'>'.lang('All').'</option>'."\n";
$form_options .= ' <option value=" private
"'.((!isset($this->bo->filter) || !$this->bo->filter) || $this->bo->filter=='
private '?' selected':'').'>'.lang('Private Only').'</option>'."\n";
!
$var = Array(
'form_width' => '28',
--- 141,147 ----
}
}
$form_options = '<option value=" all
"'.($this->bo->filter==' all '?' selected':'').'>'.lang('All').'</option>'."\n";
$form_options .= ' <option value=" private
"'.((!isset($this->bo->filter) || !$this->bo->filter) || $this->bo->filter=='
private '?' selected':'').'>'.lang('Private Only').'</option>'."\n";
!
$var = Array(
'form_width' => '28',
***************
*** 150,154 ****
'form_name' => 'filter',
'title' => lang('Filter'),
! 'hidden_vars' => $hidden_vars,
'form_options' => $form_options,
'button_value' => lang('Go!')
--- 149,153 ----
'form_name' => 'filter',
'title' => lang('Filter'),
! 'hidden_vars' =>
$base_hidden_vars.$hidden_vars,
'form_options' => $form_options,
'button_value' => lang('Go!')
***************
*** 161,178 ****
if((!isset($GLOBALS['phpgw_info']['server']['deny_user_grants_access']) ||
!$GLOBALS['phpgw_info']['server']['deny_user_grants_access']) &&
count($this->bo->grants) > 0)
{
- $hidden_vars = ' <input type="hidden" name="from"
value="'.MENUACTION.'">'."\n";
- if($keywords)
- {
- $hidden_vars .= ' <input type="hidden"
name="keywords" value="'.$keywords.'">'."\n";
- }
- if($cal_id)
- {
- $hidden_vars .= ' <input type="hidden"
name="cal_id" value="'.$cal_id.'">'."\n";
- }
- if($matrixtype)
- {
- $hidden_vars .= ' <input type="hidden"
name="matrixtype" value="'.$matrixtype.'">'."\n";
- }
- $hidden_vars .= ' <!-- BO Owner =
'.$this->bo->owner.' -->'."\n";
$form_options = '';
reset($this->bo->grants);
--- 160,163 ----
***************
*** 207,211 ****
}
}
!
@reset($drop_down);
@ksort($drop_down);
--- 192,196 ----
}
}
!
@reset($drop_down);
@ksort($drop_down);
***************
*** 213,219 ****
{
$form_options .= ' <option
value="'.$grant['value'].'"'.($grant['grantor']==$this->bo->owner?'
selected':'').'>'.$grant['name'].'</option>'."\n";
! }
reset($this->bo->grants);
!
$var = Array(
'form_width' => $remainder,
--- 198,204 ----
{
$form_options .= ' <option
value="'.$grant['value'].'"'.($grant['grantor']==$this->bo->owner?'
selected':'').'>'.$grant['name'].'</option>'."\n";
! }
reset($this->bo->grants);
!
$var = Array(
'form_width' => $remainder,
***************
*** 221,225 ****
'form_name' => 'owner',
'title' => lang('User'),
! 'hidden_vars' => $hidden_vars,
'form_options' => $form_options,
'button_value' => lang('Go!')
--- 206,210 ----
'form_name' => 'owner',
'title' => lang('User'),
! 'hidden_vars' => $base_hidden_vars,
'form_options' => $form_options,
'button_value' => lang('Go!')
***************
*** 232,236 ****
$hidden_vars = ' <input type="hidden" name="from"
value="'.MENUACTION.'">'."\n";
! $date = get_vars('date',Array('GET'));
if($date)
{
--- 217,221 ----
$hidden_vars = ' <input type="hidden" name="from"
value="'.MENUACTION.'">'."\n";
! $date = get_var('date',Array('GET'));
if($date)
{
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: calendar/templates/idsociety header.inc.php,1.22,1.23,
Mark A Peters <address@hidden> <=