[Phpgroupware-cvs] CVS: calendar/templates/default header.inc.php,1.18.2.6,1.18.2.6.2.1matrix_query.tpl,1.5.6.1,1.5.6.2

[Ralf Becker <address@hidden>]

Update of /cvsroot/phpgroupware/calendar/templates/default
In directory subversions:/tmp/cvs-serv19952/templates/default

Modified Files:
      Tag: Version-0_9_16-branch
        header.inc.php matrix_query.tpl 
Log Message:
timematrix:
- no longer shows rejected invitations 
- lot of cosmetical improvments
general cal:
- header.inc.php only in default anymore
- all user-selectboxes use and sort after the new account-display pref


Index: header.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/templates/default/header.inc.php,v
retrieving revision 1.18.2.6
retrieving revision 1.18.2.6.2.1
diff -C2 -r1.18.2.6 -r1.18.2.6.2.1
*** header.inc.php      25 Aug 2002 12:34:21 -0000      1.18.2.6
--- header.inc.php      4 May 2003 17:05:07 -0000       1.18.2.6.2.1
***************
*** 170,212 ****
                {
                        $form_options = '';
!                       reset($this->bo->grants);
!                       while(list($grantor,$temp_rights) = 
each($this->bo->grants))
!                       {
!                               
$GLOBALS['phpgw']->accounts->get_account_name($grantor,$lid,$fname,$lname);
!                               $drop_down[$lname.' '.$fname] = Array(
!                                       'grantor'       => $grantor,
!                                       'value'         => 
($GLOBALS['phpgw']->accounts->get_type($grantor)=='g'?'g_':'').$grantor,
!                                       'name'          => 
$GLOBALS['phpgw']->common->display_fullname($lid,$fname,$lname)
!                               );
!                       }
!                       $memberships = 
$GLOBALS['phpgw']->accounts->membership($GLOBALS['phpgw_info']['user']['account_id']);
!                       while($memberships != False && list($key,$group_info) = 
each($memberships))
!                       {
!                               
$GLOBALS['phpgw']->accounts->get_account_name($group_info['account_id'],$lid,$fname,$lname);
!                               $drop_down[$lname.' '.$fname] = Array(
!                                       'grantor'       => 
$group_info['account_id'],
!                                       'value'         => 
($GLOBALS['phpgw']->accounts->get_type($group_info['account_id'])=='g'?'g_':'').$group_info['account_id'],
!                                       'name'          => 
$GLOBALS['phpgw']->common->display_fullname($lid,$fname,$lname)
!                               );
! 
!                               $account_perms = 
$GLOBALS['phpgw']->acl->get_ids_for_location($group_info['account_id'],PHPGW_ACL_READ,'calendar');
!                               while($account_perms && list($key,$group_id) = 
each($account_perms))
!                               {
!                                       
$GLOBALS['phpgw']->accounts->get_account_name($group_id,$lid,$fname,$lname);
!                                       $drop_down[$lname.' '.$fname] = Array(
!                                               'grantor'       => $group_id,
!                                               'value'         => 
($GLOBALS['phpgw']->accounts->get_type($group_id)=='g'?'g_':'').$group_id,
!                                               'name'          => 
$GLOBALS['phpgw']->common->display_fullname($lid,$fname,$lname)
!                                       );
!                               }
!                       }
!               
!                       @reset($drop_down);
!                       @ksort($drop_down);
!                       while(list($key,$grant) = each($drop_down))
                        {
                                $form_options .= '    <option 
value="'.$grant['value'].'"'.($grant['grantor']==$this->bo->owner?' 
selected':'').'>'.$grant['name'].'</option>'."\n";
!             }
!                       reset($this->bo->grants);
                
                        $var = Array(
--- 170,178 ----
                {
                        $form_options = '';
!                       $drop_down = $this->bo->list_cals();
!                       foreach($drop_down as $key => $grant)
                        {
                                $form_options .= '    <option 
value="'.$grant['value'].'"'.($grant['grantor']==$this->bo->owner?' 
selected':'').'>'.$grant['name'].'</option>'."\n";
!                       }
                
                        $var = Array(

Index: matrix_query.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/templates/default/matrix_query.tpl,v
retrieving revision 1.5.6.1
retrieving revision 1.5.6.2
diff -C2 -r1.5.6.1 -r1.5.6.2
*** matrix_query.tpl    19 Apr 2003 21:11:49 -0000      1.5.6.1
--- matrix_query.tpl    4 May 2003 17:05:07 -0000       1.5.6.2
***************
*** 2,6 ****
  <!-- BEGIN matrix_query -->
  <center>
! <form target="viewmatrix" action="{action_url}" method="post" 
name="matrixform">
  <table border="0" width="90%">
   <tr bgcolor="{th_bg}">
--- 2,6 ----
  <!-- BEGIN matrix_query -->
  <center>
! <form action="{action_url}" method="post" name="matrixform">
  <table border="0" width="90%">
   <tr bgcolor="{th_bg}">