[Phpgroupware-cvs] CVS: wcm/inc class.uielement.inc.php,1.12,1.13 class.uisite.inc.php,1.8,1.9

[Miles Lott <address@hidden>]

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

Modified Files:
        class.uielement.inc.php class.uisite.inc.php 
Log Message:
Allow an alternate site to be called via website subdir (that still needs to be 
modified);
Added element_location to element list display (with sort)



Index: class.uielement.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/wcm/inc/class.uielement.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** class.uielement.inc.php     21 Feb 2002 12:26:24 -0000      1.12
--- class.uielement.inc.php     24 Feb 2002 04:12:55 -0000      1.13
***************
*** 209,212 ****
--- 209,214 ----
                        $GLOBALS['phpgw']->template->set_var('sort_title',
                                
$this->nextmatchs->show_sort_order($this->sort,'element_title',$this->order,'/index.php',lang('Title'),'&menuaction=wcm.uielement.index'));
+                       $GLOBALS['phpgw']->template->set_var('sort_location',
+                               
$this->nextmatchs->show_sort_order($this->sort,'element_hf',$this->order,'/index.php',lang('Location'),'&menuaction=wcm.uielement.index'));
                        $GLOBALS['phpgw']->template->set_var('sort_type',
                                
$this->nextmatchs->show_sort_order($this->sort,'element_type',$this->order,'/index.php',lang('Type'),'&menuaction=wcm.uielement.index'));
***************
*** 222,231 ****
                                
$GLOBALS['phpgw']->template->set_var('tr_color',$tr_color);
                                $element_id = $element['element_id'];
  
                                $GLOBALS['phpgw']->template->set_var(array(
!                                       'element_name'    => 
$GLOBALS['phpgw']->strip_html($element['element_name']),
!                                       'element_title'   => 
$GLOBALS['phpgw']->strip_html($element['element_title']),
!                                       'element_type'    => 
$this->bo->element_types[$element['element_type']],
!                                       'element_version' => 
$element['element_version']
                                ));
  
--- 224,238 ----
                                
$GLOBALS['phpgw']->template->set_var('tr_color',$tr_color);
                                $element_id = $element['element_id'];
+                               if(!$element['element_hf'])
+                               {
+                                       $element['element_hf'] = 'standard';
+                               }
  
                                $GLOBALS['phpgw']->template->set_var(array(
!                                       'element_name'     => 
$GLOBALS['phpgw']->strip_html($element['element_name']),
!                                       'element_title'    => 
$GLOBALS['phpgw']->strip_html($element['element_title']),
!                                       'element_type'     => 
$this->bo->element_types[$element['element_type']],
!                                       'element_location' => 
lang($element['element_hf']),
!                                       'element_version'  => 
$element['element_version']
                                ));
  

Index: class.uisite.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/wcm/inc/class.uisite.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** class.uisite.inc.php        21 Feb 2002 12:26:24 -0000      1.8
--- class.uisite.inc.php        24 Feb 2002 04:12:55 -0000      1.9
***************
*** 159,162 ****
--- 159,163 ----
                                
$this->nextmatchs->show_sort_order($this->sort,'site_security',$this->order,'/index.php',lang('Security'),'&menuaction=wcm.uisite.index'));
                        
$GLOBALS['phpgw']->template->set_var('lang_default',lang('Default'));
+                       
$GLOBALS['phpgw']->template->set_var('lang_view',lang('View'));
                        
$GLOBALS['phpgw']->template->set_var('lang_edit',lang('Edit'));
                        
$GLOBALS['phpgw']->template->set_var('lang_add',lang('Add'));
***************
*** 174,177 ****
--- 175,181 ----
                                        'site_security' => 
$site['site_security'] ? $site['site_security'] : lang('none')
                                ));
+ 
+                               
$GLOBALS['phpgw']->template->set_var('view',$GLOBALS['phpgw']->link('/wcm/website','sitename='
 . $site['site_name']));
+                               
$GLOBALS['phpgw']->template->set_var('lang_view_entry',lang('View'));
  
                                
$GLOBALS['phpgw']->template->set_var('edit',$GLOBALS['phpgw']->link('/index.php','menuaction=wcm.uisite.edit&site_id='
 . $site_id));