[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] phpgwapi/templates/verdilak head.inc.php navbar...
From: |
Sigurd Nes |
Subject: |
[Phpgroupware-cvs] phpgwapi/templates/verdilak head.inc.php navbar... |
Date: |
Tue, 05 Sep 2006 13:08:38 +0000 |
CVSROOT: /sources/phpgwapi
Module name: phpgwapi
Changes by: Sigurd Nes <sigurdne> 06/09/05 13:08:38
Modified files:
templates/verdilak: head.inc.php navbar.inc.php
Log message:
E_NOTICES
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/templates/verdilak/head.inc.php?cvsroot=phpgwapi&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/templates/verdilak/navbar.inc.php?cvsroot=phpgwapi&r1=1.32&r2=1.33
Patches:
Index: head.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/templates/verdilak/head.inc.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- head.inc.php 24 Apr 2006 09:49:25 -0000 1.19
+++ head.inc.php 5 Sep 2006 13:08:38 -0000 1.20
@@ -5,13 +5,9 @@
* @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
* @package phpgwapi
* @subpackage gui
- * @version $Id: head.inc.php,v 1.19 2006/04/24 09:49:25 sigurdne Exp $
+ * @version $Id: head.inc.php,v 1.20 2006/09/05 13:08:38 sigurdne Exp $
*/
- $bodyheader = ' bgcolor="' .
$GLOBALS['phpgw_info']['theme']['bg_color'] . '" alink="'
- . $GLOBALS['phpgw_info']['theme']['alink'] . '" link="'
. $GLOBALS['phpgw_info']['theme']['link'] . '" vlink="'
- . $GLOBALS['phpgw_info']['theme']['vlink'] . '"';
-
// css file handling
$css_file = PHPGW_SERVER_ROOT .
'/phpgwapi/templates/verdilak/css/'.$GLOBALS['phpgw_info']['user']['preferences']['common']['theme'].'.css';
if (file_exists($css_file))
@@ -31,7 +27,6 @@
$tpl->set_unknowns('remove');
$tpl->set_file(array('head' => 'head.tpl'));
$var = Array (
- 'body_tags' => $bodyheader,
'css' => $GLOBALS['phpgw']->common->get_css(),
'img_icon' => PHPGW_IMAGES_DIR . '/favicon.ico',
'img_shortcut' => PHPGW_IMAGES_DIR . '/favicon.ico',
Index: navbar.inc.php
===================================================================
RCS file: /sources/phpgwapi/phpgwapi/templates/verdilak/navbar.inc.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- navbar.inc.php 9 May 2005 08:20:27 -0000 1.32
+++ navbar.inc.php 5 Sep 2006 13:08:38 -0000 1.33
@@ -5,7 +5,7 @@
* @license http://www.gnu.org/licenses/gpl.html GNU General Public
License
* @package phpgwapi
* @subpackage gui
- * @version $Id: navbar.inc.php,v 1.32 2005/05/09 08:20:27 fipsfuchs Exp
$
+ * @version $Id: navbar.inc.php,v 1.33 2006/09/05 13:08:38 sigurdne Exp $
*/
@@ -120,7 +120,7 @@
$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']))
{
$var['current_users'] = '<a style="font-family:
Geneva,Arial,Helvetica,sans-serif; font-size: 12pt;" href="'
.
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicurrentsessions.list_sessions')
. '"> '
@@ -176,7 +176,7 @@
if (address@hidden'phpgw_info']['flags']['noappheader'] &&
@isset($GLOBALS['HTTP_GET_VARS']['menuaction']))
{
list($app,$class,$method) =
explode('.',$GLOBALS['HTTP_GET_VARS']['menuaction']);
- if (is_array($GLOBALS[$class]->public_functions) &&
$GLOBALS[$class]->public_functions['header'])
+ if (is_array($GLOBALS[$class]->public_functions) &&
isset($GLOBALS[$class]->public_functions['header']))
{
$GLOBALS[$class]->header();
}
@@ -203,7 +203,7 @@
'table_bg_color' =>
$GLOBALS['phpgw_info']['theme']['navbar_bg'],
'version' =>
$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']))
{
$var['current_users'] = '<a style="font-family:
Geneva,Arial,Helvetica,sans-serif; font-size: 12pt;" href="'
.
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicurrentsessions.list_sessions')
. '"> '
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] phpgwapi/templates/verdilak head.inc.php navbar...,
Sigurd Nes <=