[Phpgroupware-cvs] phpgwapi/templates/desktop head.inc.php navbar....

[Dave Hall]

CVSROOT:        /cvsroot/phpgwapi
Module name:    phpgwapi
Changes by:     Dave Hall <skwashd>     07/10/10 08:53:53

Modified files:
        templates/desktop: head.inc.php navbar.inc.php 

Log message:
        fix some notices and remove some old stuff

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/templates/desktop/head.inc.php?cvsroot=phpgwapi&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/templates/desktop/navbar.inc.php?cvsroot=phpgwapi&r1=1.9&r2=1.10

Patches:
Index: head.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/templates/desktop/head.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- head.inc.php        15 Oct 2006 11:29:21 -0000      1.9
+++ head.inc.php        10 Oct 2007 08:53:53 -0000      1.10
@@ -9,7 +9,12 @@
   *  option) any later version.                                              *
   \**************************************************************************/
 
-  /* $Id: head.inc.php,v 1.9 2006/10/15 11:29:21 skwashd Exp $ */
+  /* $Id: head.inc.php,v 1.10 2007/10/10 08:53:53 skwashd Exp $ */
+
+       if ( !isset($GLOBALS['phpgw_info']['server']['site_title']) )
+       {
+               $GLOBALS['phpgw_info']['server']['site_title'] = lang('please 
set a site name in admin &gt; siteconfig');
+       }
 
        $tpl = CreateObject('phpgwapi.Template',PHPGW_TEMPLATE_DIR);
        $tpl->set_unknowns('remove');
@@ -33,17 +38,10 @@
        }
        $GLOBALS['phpgw']->js->set_onload('initPage();');
 
-       if ( ! (isset($GLOBALS['phpgw_info']['theme']) && 
is_array($GLOBALS['phpgw_info']['theme']) && 
count($GLOBALS['phpgw_info']['theme']) ) )
-       {
-               $GLOBALS['phpgw_info']['theme'] = array('font'  => '');
-       }
-
        $var = Array (
                'img_icon'      => PHPGW_IMAGES_DIR . '/favicon.ico',
                'img_shortcut'  => PHPGW_IMAGES_DIR . '/favicon.ico',
-               'font_family'   => $GLOBALS['phpgw_info']['theme']['font'],
                'website_title' => 
$GLOBALS['phpgw_info']['server']['site_title'] . $app,
-               'body_tags'     => 
$GLOBALS['phpgw']->common->get_body_attribs(),
                'theme_css'     => $theme_css,
                'css'           => $GLOBALS['phpgw']->common->get_css(),
                'java_script'   => $GLOBALS['phpgw']->common->get_java_script(),

Index: navbar.inc.php
===================================================================
RCS file: /cvsroot/phpgwapi/phpgwapi/templates/desktop/navbar.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- navbar.inc.php      24 Jan 2007 16:04:51 -0000      1.9
+++ navbar.inc.php      10 Oct 2007 08:53:53 -0000      1.10
@@ -9,7 +9,7 @@
   *  option) any later version.                                              *
   \**************************************************************************/
 
-  /* $Id: navbar.inc.php,v 1.9 2007/01/24 16:04:51 Caeies Exp $ */
+  /* $Id: navbar.inc.php,v 1.10 2007/10/10 08:53:53 skwashd Exp $ */
 
   function parse_navbar($force = False)
   {
@@ -150,7 +150,6 @@
                if (isset($GLOBALS['phpgw_info']['flags']['app_header']))
                {
                        $var['current_app_header'] = 
$GLOBALS['phpgw_info']['flags']['app_header'];
-                       $var['th_bg'] = 
$GLOBALS['phpgw_info']['theme']['th_bg'];
                }
                else
                {
@@ -185,7 +184,9 @@
                );
                $var = array();
                $var['powered_by'] = lang('Powered by phpGroupWare version 
%1',$GLOBALS['phpgw_info']['server']['versions']['phpgwapi']);
-               if (isset($GLOBALS['phpgw_info']['navbar']['admin']) && 
$GLOBALS['phpgw_info']['user']['preferences']['common']['show_currentusers'])
+               if (isset($GLOBALS['phpgw_info']['navbar']['admin']) 
+                       && 
isset($GLOBALS['phpgw_info']['user']['preferences']['common']['show_currentusers'])
+                       && 
$GLOBALS['phpgw_info']['user']['preferences']['common']['show_currentusers'])
                {
                        $var['current_users'] = '<a href="' . 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'admin.uicurrentsessions.list_sessions'))
                                . '">' . lang('Current users') . ': ' . 
$GLOBALS['phpgw']->session->total() . '</a>';