[Phpgroupware-cvs] CVS: calendar/templates/justweb header.inc.php,1.16.2.5,1.16.2.6

[Mark A Peters <address@hidden>]

Update of /cvsroot/phpgroupware/calendar/templates/justweb
In directory subversions:/tmp/cvs-serv13212/templates/justweb

Modified Files:
      Tag: Version-0_9_14-branch
        header.inc.php 
Log Message:
Some more towards Ralf Beckers patches.

Index: header.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/templates/justweb/header.inc.php,v
retrieving revision 1.16.2.5
retrieving revision 1.16.2.6
diff -C2 -r1.16.2.5 -r1.16.2.6
*** header.inc.php      25 Aug 2002 04:07:48 -0000      1.16.2.5
--- header.inc.php      25 Aug 2002 12:34:21 -0000      1.16.2.6
***************
*** 78,81 ****
--- 78,85 ----
        {
                $remainder = 72;
+               
+               $date = (isset($GLOBALS['date'])?$GLOBALS['date']:'');
+               $date = 
(isset($GLOBALS['HTTP_GET_VARS']['date'])?$GLOBALS['HTTP_GET_VARS']['date']:$date);
+               $date = ($date=='' && 
isset($GLOBALS['HTTP_POST_VARS']['date'])?$GLOBALS['HTTP_POST_VARS']['date']:$date);
  
                $base_hidden_vars = '<input type="hidden" name="from" 
value="'.$GLOBALS['HTTP_GET_VARS']['menuaction'].'">'."\n";
***************
*** 92,95 ****
--- 96,107 ----
                        $base_hidden_vars .= '    <input type="hidden" 
name="matrixtype" value="'.$GLOBALS['HTTP_POST_VARS']['matrixtype'].'">'."\n";
                }
+               if($date)
+               {
+                       $base_hidden_vars .= '    <input type="hidden" 
name="date" value="'.$date.'">'."\n";
+               }
+               $base_hidden_vars .= '    <input type="hidden" name="month" 
value="'.$this->bo->month.'">'."\n";
+               $base_hidden_vars .= '    <input type="hidden" name="day" 
value="'.$this->bo->day.'">'."\n";
+               $base_hidden_vars .= '    <input type="hidden" name="year" 
value="'.$this->bo->year.'">'."\n";
+               
                if(isset($GLOBALS['HTTP_POST_VARS']['participants']) && 
$GLOBALS['HTTP_POST_VARS']['participants'])
                {
***************
*** 113,116 ****
--- 125,150 ----
                $tpl->parse('header_column','head_col',True);
  
+               if($GLOBALS['HTTP_GET_VARS']['menuaction'] == 
'calendar.uicalendar.planner')
+               {
+                       $remainder -= 28;
+                       print_debug('Sort By',$this->bo->sortby);
+ 
+                       $form_options = '<option 
value="user"'.($this->bo->sortby=='user'?' 
selected':'').'>'.lang('User').'</option>'."\n";
+                       $form_options .= '     <option 
value="category"'.((!isset($this->bo->sortby) || !$this->bo->sortby) || 
$this->bo->sortby=='category'?' 
selected':'').'>'.lang('Category').'</option>'."\n";
+               
+                       $var = Array(
+                               'form_width' => '28',
+                               'form_link'     => $this->page($referrer),
+                               'form_name'     => 'sortby',
+                               'title' => lang('Sort By'),
+                               'hidden_vars'   => $base_hidden_vars,
+                               'form_options'  => $form_options,
+                               'button_value'  => lang('Go!')
+                       );
+                       $tpl->set_var($var);
+                       
$tpl->set_var('str',$tpl->fp('out','form_button_dropdown'));
+                       $tpl->parse('header_column','head_col',True);
+               }
+ 
                if($this->bo->check_perms(PHPGW_ACL_PRIVATE))
                {
***************
*** 202,205 ****
--- 236,247 ----
        {
                $hidden_vars .= '    <input type="hidden" name="filter" 
value="'.$this->bo->filter.'">'."\n";
+       }
+       if(isset($this->bo->sortby) && $this->bo->sortby)
+       {
+               $hidden_vars .= '    <input type="hidden" name="sortby" 
value="'.$this->bo->sortby.'">'."\n";
+       }
+       if(isset($this->bo->num_months) && $this->bo->num_months)
+       {
+               $hidden_vars .= '    <input type="hidden" name="num_months" 
value="'.$this->bo->num_months.'">'."\n";
        }
        $hidden_vars .= '    <input 
name="keywords"'.($GLOBALS['HTTP_POST_VARS']['keywords']?' 
value="'.$GLOBALS['HTTP_POST_VARS']['keywords'].'"':'').'>';