navbar uses now logo, url and title specified in site configuration

This commit is contained in:
Ralf Becker 2003-09-15 07:39:47 +00:00
parent 1961e29fe8
commit 0400a3fd73
8 changed files with 30 additions and 15 deletions

View File

@ -105,6 +105,10 @@
$var['messages'] = $api_messages . '<br>' . 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');
}

View File

@ -4,7 +4,7 @@
<TD vAlign=top>
<TABLE cellSpacing=0 cellPadding=0 width="100%" bgColor=#ffffff border=0>
<TR>
<TD width=185 rowSpan=2 align="center" vAlign=top class=toppannel><a href="http://www.phpgroupware.org" target="_blank"><IMG src="{img_root}/logo.png" border="0" title="www.phpGroupWare.org"></a></TD>
<TD width=185 rowSpan=2 align="center" vAlign=top class=toppannel><a href="{logo_url}" target="_blank"><IMG src="{logo_file}" border="0" title="{logo_title}"></a></TD>
<TD colspan="2" valign="top" background="{img_root}/panel.png" style="background-repeat: repeat-x;">
<TABLE width="100%" border=0 cellPadding=0 cellSpacing=0 background="{img_root}/panel.png" bgColor="#ffffff">
<TR valign="center">

View File

@ -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'] = '<a href="' . $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicurrentsessions.list_sessions')

View File

@ -1,4 +1,4 @@
marginwidth="0" marginheight="0" topmargin="0" bottommargin="0" rightmargin="0" leftmargin="0" border="0"
marginwidth="0" marginheight="0" topmargin="0" bottommargin="0" rightmargin="0" leftmargin="0" border="0"
onLoad="MM_preloadImages('{app_images}',
'{logout_img_hover}',
'{preferences_img_hover}',
@ -14,7 +14,7 @@
<!-- top row back images are 58px high, but the row may be smaller than that -->
<!-- row 2 images are 15 px high, so this table with these 2 rows is 58 plus 15 equals 73px high -->
<td width="154" height="58" align="left" valign="top" background="{em_img}">
<img src="{logo_img}">
<a href="{logo_url}" target="_blank"><img src="{logo_file}" title="{logo_title}" border="0"></a>
</td>
<td width="100%" align="right" background="{em_img}">
<table width="100%" height="28" cellpadding="0" cellspacing="0" border="0" valign="top">

View File

@ -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'])

View File

@ -2,15 +2,15 @@
<tr>
<td>
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
<td width="218" height="33"><img src="{img_root}/logo.gif" alt="phpGroupWare"></td>
<td width="100%" valign="bottom" background="{img_root}/menu_filler.gif">&nbsp;</td>
<td valign="bottom" width="56" background="{img_root}/blue_filler.gif"><a href="{home_link}"><img src="{img_root}/tab_home.gif" width="56" height="23" border="0"></a></td>
<tr background="{img_root}/menu_filler.gif">
<td width="218" height="33"><a href="{logo_url}" target="_blank"><img src="{logo_file}" title="{logo_title}" border="0"></a></td>
<td width="100%" valign="bottom">&nbsp;</td>
<td valign="bottom" width="56"><a href="{home_link}"><img src="{img_root}/tab_home.gif" width="56" height="23" border="0"></a></td>
<!-- BEGIN preferences -->
<td valign="bottom" width="85" background="{img_root}/blue_filler.gif"><a href="{preferences_link}"><img src="{img_root}/tab_prefs.gif" width="85" height="23" border="0"></a></td>
<td valign="bottom" width="85"><a href="{preferences_link}"><img src="{img_root}/tab_prefs.gif" width="85" height="23" border="0"></a></td>
<!-- END preferences -->
<td valign="bottom" width="56" background="{img_root}/blue_filler.gif"><a href="{logout_link}"><img src="{img_root}/tab_logout.gif" width="56" height="23" border="0"></a></td>
<td valign="bottom" width="39" background="{img_root}/blue_filler.gif"><a href="{help_link}"><img src="{img_root}/tab_help.gif" width="39" height="23" border="0"></a></td>
<td valign="bottom" width="56"><a href="{logout_link}"><img src="{img_root}/tab_logout.gif" width="56" height="23" border="0"></a></td>
<td valign="bottom" width="39"><a href="{help_link}"><img src="{img_root}/tab_help.gif" width="39" height="23" border="0"></a></td>
</tr>
</table>
</td>

View File

@ -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']))

View File

@ -3,7 +3,7 @@
<table border="0" cellspacing="0" cellpadding="0" width="100%" bgcolor="{table_bg_color}">
<tr background="{img_root}/bg_filler.gif">
<td background="{img_root}/bg_filler.gif" align="left" valign="bottom"><a href="http://www.phpgroupware.org" target="_new"><img src="{img_root}/{logo}" border="0" alt="phpGroupWare"></a></td>
<td background="{img_root}/bg_filler.gif" align="left" valign="bottom"><a href="{logo_url}" target="_new"><img src="{logo_file}" border="0" title="{logo_title}"></a></td>
<td background="{img_root}/bg_filler.gif" align="center" valign="bottom" width="100%"><!--<font color="{navbar_text}" size="-1">{user_info}</font>--></td>
<td background="{img_root}/bg_filler.gif" align="right" valign="bottom" rowspan="2" nowrap><a href="{home_link}"><img src="{welcome_img}" border="0" alt="Welcome"></a>{preferences_icon}<a href="{logout_link}"><img src="{logout_img}" border="0" alt="Logout"></a><a href="{help_link}"><img src="{img_root}/help.gif" border="0" alt="Help"></a></td></tr>
<tr background="{img_root}/bg_filler.gif">