[Phpgroupware-cvs] CVS: phpgwapi/inc class.app_registry.inc.php,1.10,1.11 class.applications.inc.php,1.46,1.47 class.common.inc.php,1.172,1.173 class.setup.inc.php,1.14,1.15 class.xslttemplates.inc.php,1.11,1.12 soap_functions.inc.php,1.9,1.10

[Bettina Gille <address@hidden>]

Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv18604/inc

Modified Files:
        class.app_registry.inc.php class.applications.inc.php 
        class.common.inc.php class.setup.inc.php 
        class.xslttemplates.inc.php soap_functions.inc.php 
Log Message:
removed app_title plus update default layout to use xslt

Index: class.app_registry.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.app_registry.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** class.app_registry.inc.php  28 Sep 2002 20:01:44 -0000      1.10
--- class.app_registry.inc.php  26 Oct 2002 22:39:19 -0000      1.11
***************
*** 354,358 ****
                                                        'id'      => 
$this->db->f('app_id'),
                                                        'name'    => 
$this->db->f('app_name'),
!                                                       'title'   => 
$this->db->f('app_title'),
                                                        'version' => 
$this->db->f('app_version'),
                                                        'tables'  => 
$this->db->f('app_tables')
--- 354,358 ----
                                                        'id'      => 
$this->db->f('app_id'),
                                                        'name'    => 
$this->db->f('app_name'),
!                                                       'title'   => 
lang($this->db->f('app_name')),
                                                        'version' => 
$this->db->f('app_version'),
                                                        'tables'  => 
$this->db->f('app_tables')
***************
*** 491,495 ****
                                        'id'      => 
CreateObject('phpgwapi.xmlrpcval',$app_id,'int'),
                                        'name'    => 
CreateObject('phpgwapi.xmlrpcval',$app_name,'string'),
!                                       'title'   => 
CreateObject('phpgwapi.xmlrpcval',$this->db->f('app_title'),'string'),
                                        'version' => 
CreateObject('phpgwapi.xmlrpcval',$this->db->f('app_version'),'string'),
                                        'tables'  => 
CreateObject('phpgwapi.xmlrpcval',$this->db->f('app_tables'),'string')
--- 491,495 ----
                                        'id'      => 
CreateObject('phpgwapi.xmlrpcval',$app_id,'int'),
                                        'name'    => 
CreateObject('phpgwapi.xmlrpcval',$app_name,'string'),
!                                       'title'   => 
CreateObject('phpgwapi.xmlrpcval',lang($this->db->f('app_name')),'string'),
                                        'version' => 
CreateObject('phpgwapi.xmlrpcval',$this->db->f('app_version'),'string'),
                                        'tables'  => 
CreateObject('phpgwapi.xmlrpcval',$this->db->f('app_tables'),'string')
***************
*** 510,514 ****
                                {
                                        $name   = $this->db->f('app_name');
!                                       $title  = $this->db->f('app_title');
                                        $status = $this->db->f('app_enabled');
                                        $version= $this->db->f('app_version');
--- 510,514 ----
                                {
                                        $name   = $this->db->f('app_name');
!                                       $title  = 
lang($this->db->f('app_name'));
                                        $status = $this->db->f('app_enabled');
                                        $version= $this->db->f('app_version');

Index: class.applications.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.applications.inc.php,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -r1.46 -r1.47
*** class.applications.inc.php  28 Jan 2002 01:52:36 -0000      1.46
--- class.applications.inc.php  26 Oct 2002 22:39:19 -0000      1.47
***************
*** 294,298 ****
                                {
                                        
$GLOBALS['phpgw_info']['apps'][$this->db->f('app_name')] = Array(
!                                               'title'         => 
$this->db->f('app_title'),
                                                'name'          => 
$this->db->f('app_name'),
                                                'enabled'       => True,
--- 294,298 ----
                                {
                                        
$GLOBALS['phpgw_info']['apps'][$this->db->f('app_name')] = Array(
!                                               'title'         => 
str_replace('- ','-',ucwords(str_replace('_','- ',$this->db->f('app_name')))),
                                                'name'          => 
$this->db->f('app_name'),
                                                'enabled'       => True,

Index: class.common.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.common.inc.php,v
retrieving revision 1.172
retrieving revision 1.173
diff -C2 -r1.172 -r1.173
*** class.common.inc.php        26 Oct 2002 20:28:37 -0000      1.172
--- class.common.inc.php        26 Oct 2002 22:39:19 -0000      1.173
***************
*** 1163,1166 ****
--- 1163,1172 ----
                                        $var['greybar']         = 
$this->image('phpgwapi','greybar.jpg');
                                        break;
+                               default:
+                                       $var['home_img']        = 
$GLOBALS['phpgw_info']['navbar']['home']['icon'];
+                                       $var['prefs_img']       = 
$GLOBALS['phpgw_info']['navbar']['preferences']['icon'];
+                                       $var['logout_img']      = 
$GLOBALS['phpgw_info']['navbar']['logout']['icon'];
+                                       $var['about_img']       = 
$GLOBALS['phpgw_info']['navbar']['about']['icon'];
+                                       break;
                        }
                        $var['home_link']               = 
$GLOBALS['phpgw_info']['navbar']['home']['url'];
***************
*** 1231,1235 ****
                        $var['top_spacer_middle_img']   = 
$GLOBALS['phpgw']->common->image('phpgwapi','top_spacer_middle');
  
!                       $GLOBALS['phpgw']->xslttpl->set_var('phpgw',$var,True);
                }
  
--- 1237,1241 ----
                        $var['top_spacer_middle_img']   = 
$GLOBALS['phpgw']->common->image('phpgwapi','top_spacer_middle');
  
!                       $GLOBALS['phpgw']->xslttpl->set_var('phpgw',$var);
                }
  

Index: class.setup.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.setup.inc.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** class.setup.inc.php 11 May 2002 19:30:10 -0000      1.14
--- class.setup.inc.php 26 Oct 2002 22:39:19 -0000      1.15
***************
*** 361,369 ****
                                }
                                $this->db->query("INSERT INTO $appstbl "
!                                       . "($app_idstr 
app_name,app_title,app_enabled,app_order,app_tables,app_version) "
                                        . "VALUES ("
                                        . $app_id
                                        . "'" . $setup_info[$appname]['name'] . 
"',"
-                                       . "'" . $setup_info[$appname]['title'] 
. "',"
                                        . $enable . ","
                                        . 
intval($setup_info[$appname]['app_order']) . ","
--- 361,368 ----
                                }
                                $this->db->query("INSERT INTO $appstbl "
!                                       . "($app_idstr 
app_name,app_enabled,app_order,app_tables,app_version) "
                                        . "VALUES ("
                                        . $app_id
                                        . "'" . $setup_info[$appname]['name'] . 
"',"
                                        . $enable . ","
                                        . 
intval($setup_info[$appname]['app_order']) . ","
***************
*** 469,473 ****
                                $sql = "UPDATE $appstbl "
                                        . "SET app_name='" . 
$setup_info[$appname]['name'] . "',"
-                                       . " app_title='" . 
$setup_info[$appname]['title'] . "',"
                                        . " app_enabled=" . 
intval($setup_info[$appname]['enable']) . ","
                                        . " app_order=" . 
intval($setup_info[$appname]['app_order']) . ","
--- 468,471 ----

Index: class.xslttemplates.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.xslttemplates.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** class.xslttemplates.inc.php 26 Oct 2002 20:28:37 -0000      1.11
--- class.xslttemplates.inc.php 26 Oct 2002 22:39:19 -0000      1.12
***************
*** 4,8 ****
        * Written by Dan Kuykendall <address@hidden>               *
        * and Bettina Gille address@hidden                          *
!       * and Ralf Becker <address@hidden>                   *
        * Copyright (C) 2002 Dan Kuykendall, Bettina Gille, Ralf Becker     *
        * ----------------------------------------------------------------- *
--- 4,8 ----
        * Written by Dan Kuykendall <address@hidden>               *
        * and Bettina Gille address@hidden                          *
!       * and Ralf Becker <address@hidden>                  *
        * Copyright (C) 2002 Dan Kuykendall, Bettina Gille, Ralf Becker     *
        * ----------------------------------------------------------------- *

Index: soap_functions.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/soap_functions.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** soap_functions.inc.php      10 Dec 2001 02:09:17 -0000      1.9
--- soap_functions.inc.php      26 Oct 2002 22:39:19 -0000      1.10
***************
*** 139,143 ****
                        {
                                $name   = $GLOBALS['phpgw']->db->f('app_name');
!                               $title  = $GLOBALS['phpgw']->db->f('app_title');
                                $status = 
$GLOBALS['phpgw']->db->f('app_enabled');
                                $version= 
$GLOBALS['phpgw']->db->f('app_version');
--- 139,143 ----
                        {
                                $name   = $GLOBALS['phpgw']->db->f('app_name');
!                               $title  = 
lang($GLOBALS['phpgw']->db->f('app_name'));
                                $status = 
$GLOBALS['phpgw']->db->f('app_enabled');
                                $version= 
$GLOBALS['phpgw']->db->f('app_version');