[Phpgroupware-cvs] CVS: wcm/inc class.boelement.inc.php,1.5,1.6 class.soelement.inc.php,1.10,1.11 class.uipage.inc.php,1.12,1.13

[Miles Lott <address@hidden>]

Update of /cvsroot/phpgroupware/wcm/inc
In directory subversions:/tmp/cvs-serv7186/inc

Modified Files:
        class.boelement.inc.php class.soelement.inc.php 
        class.uipage.inc.php 
Log Message:
Show element type with name in page editor



Index: class.boelement.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/wcm/inc/class.boelement.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** class.boelement.inc.php     15 Feb 2002 14:09:17 -0000      1.5
--- class.boelement.inc.php     17 Feb 2002 17:56:22 -0000      1.6
***************
*** 22,32 ****
                );
  
!               var $element_types = array(
!                       1 => 'html',
!                       2 => 'image',
!                       3 => 'file',
!                       4 => 'hook'
!               );
! 
                var $xml_functions  = array();
                var $soap_functions = array();
--- 22,26 ----
                );
  
!               var $element_types = array();
                var $xml_functions  = array();
                var $soap_functions = array();
***************
*** 47,50 ****
--- 41,45 ----
                {
                        $this->so = CreateObject('wcm.soelement');
+                       $this->element_types = $this->so->element_types;
  
                        if($session)
***************
*** 96,127 ****
                }
  
!               function list_elements($simple=False)
                {
!                       return 
$this->so->list_elements(array($this->start,$this->sort,$this->order,$this->query,$this->limit),$this->total,$simple);
                }
  
!               function list_headers($simple=False)
                {
!                       return 
$this->so->list_headers(array($this->start,$this->sort,$this->order,$this->query,$this->limit),$this->total,$simple);
                }
  
!               function list_footers($simple=False)
                {
!                       return 
$this->so->list_footers(array($this->start,$this->sort,$this->order,$this->query,$this->limit),$this->total,$simple);
                }
  
!               function list_normal($simple=False)
                {
!                       return 
$this->so->list_normal(array($this->start,$this->sort,$this->order,$this->query,$this->limit),$this->total,$simple);
                }
  
!               function list_top($simple=False)
                {
!                       return 
$this->so->list_top(array($this->start,$this->sort,$this->order,$this->query,$this->limit),$this->total,$simple);
                }
  
!               function list_bottom($simple=False)
                {
!                       return 
$this->so->list_bottom(array($this->start,$this->sort,$this->order,$this->query,$this->limit),$this->total,$simple);
                }
  
--- 91,122 ----
                }
  
!               function list_elements($simple=False,$showtype=False)
                {
!                       return 
$this->so->list_elements(array($this->start,$this->sort,$this->order,$this->query,$this->limit),$this->total,$simple,$showtype);
                }
  
!               function list_headers($simple=False,$showtype=False)
                {
!                       return 
$this->so->list_headers(array($this->start,$this->sort,$this->order,$this->query,$this->limit),$this->total,$simple,$showtype);
                }
  
!               function list_footers($simple=False,$showtype=False)
                {
!                       return 
$this->so->list_footers(array($this->start,$this->sort,$this->order,$this->query,$this->limit),$this->total,$simple,$showtype);
                }
  
!               function list_normal($simple=False,$showtype=False)
                {
!                       return 
$this->so->list_normal(array($this->start,$this->sort,$this->order,$this->query,$this->limit),$this->total,$simple,$showtype);
                }
  
!               function list_top($simple=False,$showtype=False)
                {
!                       return 
$this->so->list_top(array($this->start,$this->sort,$this->order,$this->query,$this->limit),$this->total,$simple,$showtype);
                }
  
!               function list_bottom($simple=False,$showtype=False)
                {
!                       return 
$this->so->list_bottom(array($this->start,$this->sort,$this->order,$this->query,$this->limit),$this->total,$simple,$showtype);
                }
  

Index: class.soelement.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/wcm/inc/class.soelement.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** class.soelement.inc.php     16 Feb 2002 15:09:40 -0000      1.10
--- class.soelement.inc.php     17 Feb 2002 17:56:22 -0000      1.11
***************
*** 20,28 ****
                var $table     = 'phpgw_wcm_elements';
  
                function soelement()
                {
                }
  
!               function list_elements($data='',&$total,$simple=False)
                {
                        if(is_array($data))
--- 20,35 ----
                var $table     = 'phpgw_wcm_elements';
  
+               var $element_types = array(
+                       1 => 'html',
+                       2 => 'image',
+                       3 => 'file',
+                       4 => 'hook'
+               );
+ 
                function soelement()
                {
                }
  
!               function 
list_elements($data='',&$total,$simple=False,$showtype=False)
                {
                        if(is_array($data))
***************
*** 31,38 ****
                                list($start,$sort,$order,$query,$limit) = $data;
                        }
!                       return 
$this->get_list($start,$sort,$order,$query,$limit,$total,$simple);
                }
  
!               function list_headers($data='',&$total,$simple=False)
                {
                        if(is_array($data))
--- 38,45 ----
                                list($start,$sort,$order,$query,$limit) = $data;
                        }
!                       return 
$this->get_list($start,$sort,$order,$query,$limit,$total,$simple,'',$showtype);
                }
  
!               function 
list_headers($data='',&$total,$simple=False,$showtype=False)
                {
                        if(is_array($data))
***************
*** 41,48 ****
                                list($start,$sort,$order,$query,$limit) = $data;
                        }
!                       return 
$this->get_list($start,$sort,$order,$query,$limit,$total,$simple,'header');
                }
  
!               function list_footers($data='',&$total,$simple=False)
                {
                        if(is_array($data))
--- 48,55 ----
                                list($start,$sort,$order,$query,$limit) = $data;
                        }
!                       return 
$this->get_list($start,$sort,$order,$query,$limit,$total,$simple,'header',$showtype);
                }
  
!               function 
list_footers($data='',&$total,$simple=False,$showtype=False)
                {
                        if(is_array($data))
***************
*** 51,58 ****
                                list($start,$sort,$order,$query,$limit) = $data;
                        }
!                       return 
$this->get_list($start,$sort,$order,$query,$limit,$total,$simple,'footer');
                }
  
!               function list_normal($data='',&$total,$simple=False)
                {
                        if(is_array($data))
--- 58,65 ----
                                list($start,$sort,$order,$query,$limit) = $data;
                        }
!                       return 
$this->get_list($start,$sort,$order,$query,$limit,$total,$simple,'footer',$showtype);
                }
  
!               function 
list_normal($data='',&$total,$simple=False,$showtype=False)
                {
                        if(is_array($data))
***************
*** 61,68 ****
                                list($start,$sort,$order,$query,$limit) = $data;
                        }
!                       return 
$this->get_list($start,$sort,$order,$query,$limit,$total,$simple,'normal');
                }
  
!               function list_top($data='',&$total,$simple=False)
                {
                        if(is_array($data))
--- 68,75 ----
                                list($start,$sort,$order,$query,$limit) = $data;
                        }
!                       return 
$this->get_list($start,$sort,$order,$query,$limit,$total,$simple,'normal',$showtype);
                }
  
!               function 
list_top($data='',&$total,$simple=False,$showtype=False)
                {
                        if(is_array($data))
***************
*** 71,78 ****
                                list($start,$sort,$order,$query,$limit) = $data;
                        }
!                       return 
$this->get_list($start,$sort,$order,$query,$limit,$total,$simple,'top');
                }
  
!               function list_bottom($data='',&$total,$simple=False)
                {
                        if(is_array($data))
--- 78,85 ----
                                list($start,$sort,$order,$query,$limit) = $data;
                        }
!                       return 
$this->get_list($start,$sort,$order,$query,$limit,$total,$simple,'top',$showtype);
                }
  
!               function 
list_bottom($data='',&$total,$simple=False,$showtype=False)
                {
                        if(is_array($data))
***************
*** 81,85 ****
                                list($start,$sort,$order,$query,$limit) = $data;
                        }
!                       return 
$this->get_list($start,$sort,$order,$query,$limit,$total,$simple,'bottom');
                }
  
--- 88,92 ----
                                list($start,$sort,$order,$query,$limit) = $data;
                        }
!                       return 
$this->get_list($start,$sort,$order,$query,$limit,$total,$simple,'bottom',$showtype);
                }
  
***************
*** 194,198 ****
                }
  
!               function 
get_list($start='',$sort='',$order='',$query='',$limit='',&$total,$simple=False,$type='')
                {
                        $this->elements = array();
--- 201,205 ----
                }
  
!               function 
get_list($start='',$sort='',$order='',$query='',$limit='',&$total,$simple=False,$type='',$showtype=False)
                {
                        $this->elements = array();
***************
*** 245,249 ****
                                if($simple)
                                {
!                                       
$this->elements[$GLOBALS['phpgw']->db->f('element_id')] = 
$GLOBALS['phpgw']->db->f('element_name');
                                }
                                else
--- 252,261 ----
                                if($simple)
                                {
!                                       $typstr = '';
!                                       if($showtype)
!                                       {
!                                               $typstr = ' {' . 
lang($this->element_types[$GLOBALS['phpgw']->db->f('element_type')]) . '}';
!                                       }
!                                       
$this->elements[$GLOBALS['phpgw']->db->f('element_id')] = 
$GLOBALS['phpgw']->db->f('element_name') . $typstr;
                                }
                                else

Index: class.uipage.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/wcm/inc/class.uipage.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** class.uipage.inc.php        17 Feb 2002 17:11:29 -0000      1.12
--- class.uipage.inc.php        17 Feb 2002 17:56:22 -0000      1.13
***************
*** 336,339 ****
--- 336,340 ----
                        
$GLOBALS['phpgw']->template->set_var('lang_delete',lang('Delete'));
                        
$GLOBALS['phpgw']->template->set_var('lang_elements',lang('Elements'));
+                       
$GLOBALS['phpgw']->template->set_var('lang_add',lang('Add'));
                        
$GLOBALS['phpgw']->template->set_var('lang_add_element',lang('Add Element'));
                        
$GLOBALS['phpgw']->template->set_var('lang_header',lang('Header'));
***************
*** 373,377 ****
                        
$GLOBALS['phpgw']->template->set_var('page_version',$page['page_version']);
  
!                       $list_top = $this->boelements->list_top(True);
                        for($i=0;$i<3;$i++)
                        {
--- 374,378 ----
                        
$GLOBALS['phpgw']->template->set_var('page_version',$page['page_version']);
  
!                       $list_top = $this->boelements->list_top(True,True);
                        for($i=0;$i<3;$i++)
                        {
***************
*** 381,385 ****
                        }
  
!                       $list_normal = $this->boelements->list_normal(True);
                        for($i=0;$i<8;$i++)
                        {
--- 382,386 ----
                        }
  
!                       $list_normal = 
$this->boelements->list_normal(True,True);
                        for($i=0;$i<8;$i++)
                        {
***************
*** 391,395 ****
                        }
  
!                       $list_bottom = $this->boelements->list_bottom(True);
                        for($i=0;$i<3;$i++)
                        {
--- 392,396 ----
                        }
  
!                       $list_bottom = 
$this->boelements->list_bottom(True,True);
                        for($i=0;$i<3;$i++)
                        {