diff --git a/phpgwapi/templates/idots/navbar.inc.php b/phpgwapi/templates/idots/navbar.inc.php
index fb3ec9164d..164d7f45a1 100644
--- a/phpgwapi/templates/idots/navbar.inc.php
+++ b/phpgwapi/templates/idots/navbar.inc.php
@@ -105,6 +105,10 @@
$var['messages'] = $api_messages . '
' . checkcode($cd);
}
+ $var['logo_file'] = $GLOBALS['phpgw']->common->image('phpgwapi',$GLOBALS['phpgw_info']['server']['login_logo_file']?$GLOBALS['phpgw_info']['server']['login_logo_file']:'logo');
+ $var['logo_url'] = $GLOBALS['phpgw_info']['server']['login_logo_url']?$GLOBALS['phpgw_info']['server']['login_logo_url']:'http://www.eGroupWare.org';
+ $var['logo_title'] = $GLOBALS['phpgw_info']['server']['login_logo_title']?$GLOBALS['phpgw_info']['server']['login_logo_title']:'www.eGroupWare.org';
+
$GLOBALS['idots_tpl']->set_var($var);
$GLOBALS['idots_tpl']->pfp('out','navbar_header');
@@ -159,7 +163,7 @@
function sidebox_menu_item($item_link='',$item_text='')
{
- if($item_text=='_NewLine_')
+ if($item_text == '_NewLine_' || $item_link == '_NewLine_')
{
$GLOBALS['idots_tpl']->pparse('out','extra_block_spacer');
}
diff --git a/phpgwapi/templates/idots/navbar.tpl b/phpgwapi/templates/idots/navbar.tpl
index e4e030a8e3..d228a7e8f7 100644
--- a/phpgwapi/templates/idots/navbar.tpl
+++ b/phpgwapi/templates/idots/navbar.tpl
@@ -4,7 +4,7 @@
-  |
+  |
diff --git a/phpgwapi/templates/idsociety/navbar.inc.php b/phpgwapi/templates/idsociety/navbar.inc.php
index 1576a3b29d..2c65cef447 100644
--- a/phpgwapi/templates/idsociety/navbar.inc.php
+++ b/phpgwapi/templates/idsociety/navbar.inc.php
@@ -140,7 +140,6 @@
$var['content_spacer_middle_img'] = $GLOBALS['phpgw']->common->image('phpgwapi','content_spacer_middle');
$var['em_img'] = $GLOBALS['phpgw']->common->image('phpgwapi','em');
- $var['logo_img'] = $GLOBALS['phpgw']->common->image('phpgwapi','logo2');
$var['top_spacer_middle_img'] = $GLOBALS['phpgw']->common->image('phpgwapi','top_spacer_middle');
$var['nav_bar_left_spacer_img'] = $GLOBALS['phpgw']->common->image('phpgwapi','nav_bar_left_spacer');
$var['nav_bar_left_top_bg_img'] = $GLOBALS['phpgw']->common->image('phpgwapi','nav_bar_left_top_bg');
@@ -151,14 +150,18 @@
if ($GLOBALS['phpgw_info']['server']['showpoweredbyon'] == 'top')
{
$var['powered_by'] = lang('Powered by phpGroupWare version %1',$GLOBALS['phpgw_info']['server']['versions']['phpgwapi']);
- $tpl->set_var($var);
}
else
{
$var['powered_by'] = '';
- $tpl->set_var($var);
}
+ $var['logo_file'] = $GLOBALS['phpgw']->common->image('phpgwapi',$GLOBALS['phpgw_info']['server']['login_logo_file']?$GLOBALS['phpgw_info']['server']['login_logo_file']:'logo2');
+ $var['logo_url'] = $GLOBALS['phpgw_info']['server']['login_logo_url']?$GLOBALS['phpgw_info']['server']['login_logo_url']:'http://www.eGroupWare.org';
+ $var['logo_title'] = $GLOBALS['phpgw_info']['server']['login_logo_title']?$GLOBALS['phpgw_info']['server']['login_logo_title']:'www.eGroupWare.org';
+
+ $tpl->set_var($var);
+
if (isset($GLOBALS['phpgw_info']['navbar']['admin']) && $GLOBALS['phpgw_info']['user']['preferences']['common']['show_currentusers'])
{
$var['current_users'] = '
- 
+
diff --git a/phpgwapi/templates/justweb/navbar.inc.php b/phpgwapi/templates/justweb/navbar.inc.php
index 98874d46ea..ce960ae211 100644
--- a/phpgwapi/templates/justweb/navbar.inc.php
+++ b/phpgwapi/templates/justweb/navbar.inc.php
@@ -103,6 +103,10 @@
$var['app_header'] = '';
}
+ $var['logo_file'] = $GLOBALS['phpgw']->common->image('phpgwapi',$GLOBALS['phpgw_info']['server']['login_logo_file']?$GLOBALS['phpgw_info']['server']['login_logo_file']:'logo');
+ $var['logo_url'] = $GLOBALS['phpgw_info']['server']['login_logo_url']?$GLOBALS['phpgw_info']['server']['login_logo_url']:'http://www.eGroupWare.org';
+ $var['logo_title'] = $GLOBALS['phpgw_info']['server']['login_logo_title']?$GLOBALS['phpgw_info']['server']['login_logo_title']:'www.eGroupWare.org';
+
$tpl->set_var($var);
// check if user is allowed to change his prefs
if ($GLOBALS['phpgw_info']['user']['apps']['preferences'])
diff --git a/phpgwapi/templates/justweb/navbar.tpl b/phpgwapi/templates/justweb/navbar.tpl
index d5b512f48d..7ad65f3ffc 100644
--- a/phpgwapi/templates/justweb/navbar.tpl
+++ b/phpgwapi/templates/justweb/navbar.tpl
@@ -2,15 +2,15 @@
-
-  |
- |
-  |
+
+ |
+ |
+ |
-  |
+ |
-  |
-  |
+ |
+ |
|
diff --git a/phpgwapi/templates/verdilak/navbar.inc.php b/phpgwapi/templates/verdilak/navbar.inc.php
index c92103d416..08a27b8a0e 100644
--- a/phpgwapi/templates/verdilak/navbar.inc.php
+++ b/phpgwapi/templates/verdilak/navbar.inc.php
@@ -61,6 +61,9 @@
{
$var['logo'] = 'logo.gif';
}
+ $var['logo_file'] = $GLOBALS['phpgw']->common->image('phpgwapi',$GLOBALS['phpgw_info']['server']['login_logo_file']?$GLOBALS['phpgw_info']['server']['login_logo_file']:$var['logo']);
+ $var['logo_url'] = $GLOBALS['phpgw_info']['server']['login_logo_url']?$GLOBALS['phpgw_info']['server']['login_logo_url']:'http://www.eGroupWare.org';
+ $var['logo_title'] = $GLOBALS['phpgw_info']['server']['login_logo_title']?$GLOBALS['phpgw_info']['server']['login_logo_title']:'www.eGroupWare.org';
$var['home_link'] = $GLOBALS['phpgw_info']['navbar']['home']['url'];
$var['preferences_link'] = $GLOBALS['phpgw_info']['navbar']['preferences']['url'];
@@ -139,6 +142,7 @@
{
$tpl->set_var('preferences_icon','');
}
+
$tpl->pfp('out','navbar');
// If the application has a header include, we now include it
if (!@$GLOBALS['phpgw_info']['flags']['noappheader'] && @isset($GLOBALS['HTTP_GET_VARS']['menuaction']))
diff --git a/phpgwapi/templates/verdilak/navbar.tpl b/phpgwapi/templates/verdilak/navbar.tpl
index 1c4d0aab76..b08460e5bd 100755
--- a/phpgwapi/templates/verdilak/navbar.tpl
+++ b/phpgwapi/templates/verdilak/navbar.tpl
@@ -3,7 +3,7 @@
| | | 