mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-01-27 08:19:09 +01:00
Fixing justweb interface and made a change to the navbar function so that it always has the icon_hover set. It wasnt for home, preferences, logout and about
This commit is contained in:
parent
1c341af5bc
commit
9468a22fbb
@ -896,6 +896,7 @@
|
|||||||
$GLOBALS['phpgw_info']['navbar']['home']['title'] = 'Home';
|
$GLOBALS['phpgw_info']['navbar']['home']['title'] = 'Home';
|
||||||
$GLOBALS['phpgw_info']['navbar']['home']['url'] = $GLOBALS['phpgw']->link('/index.php');
|
$GLOBALS['phpgw_info']['navbar']['home']['url'] = $GLOBALS['phpgw']->link('/index.php');
|
||||||
$GLOBALS['phpgw_info']['navbar']['home']['icon'] = $this->image('phpgwapi','home.gif');
|
$GLOBALS['phpgw_info']['navbar']['home']['icon'] = $this->image('phpgwapi','home.gif');
|
||||||
|
$GLOBALS['phpgw_info']['navbar']['home']['icon_hover'] = $this->image_on('phpgwapi','home','-over');
|
||||||
|
|
||||||
reset($GLOBALS['phpgw_info']['user']['apps']);
|
reset($GLOBALS['phpgw_info']['user']['apps']);
|
||||||
ksort($GLOBALS['phpgw_info']['user']['apps']);
|
ksort($GLOBALS['phpgw_info']['user']['apps']);
|
||||||
@ -950,6 +951,7 @@
|
|||||||
$GLOBALS['phpgw_info']['navbar']['preferences']['title'] = 'preferences';
|
$GLOBALS['phpgw_info']['navbar']['preferences']['title'] = 'preferences';
|
||||||
$GLOBALS['phpgw_info']['navbar']['preferences']['url'] = $GLOBALS['phpgw']->link('/preferences/index.php');
|
$GLOBALS['phpgw_info']['navbar']['preferences']['url'] = $GLOBALS['phpgw']->link('/preferences/index.php');
|
||||||
$GLOBALS['phpgw_info']['navbar']['preferences']['icon'] = $this->image('preferences','navbar.gif');
|
$GLOBALS['phpgw_info']['navbar']['preferences']['icon'] = $this->image('preferences','navbar.gif');
|
||||||
|
$GLOBALS['phpgw_info']['navbar']['preferences']['icon_hover'] = $this->image_on('preferences','navbar','-over');
|
||||||
|
|
||||||
if ($GLOBALS['phpgw_info']['flags']['currentapp'] == 'home' || $GLOBALS['phpgw_info']['flags']['currentapp'] == 'preferences' || $GLOBALS['phpgw_info']['flags']['currentapp'] == 'about')
|
if ($GLOBALS['phpgw_info']['flags']['currentapp'] == 'home' || $GLOBALS['phpgw_info']['flags']['currentapp'] == 'preferences' || $GLOBALS['phpgw_info']['flags']['currentapp'] == 'about')
|
||||||
{
|
{
|
||||||
@ -964,11 +966,13 @@
|
|||||||
$GLOBALS['phpgw_info']['navbar']['about']['title'] = lang('About x',$app);
|
$GLOBALS['phpgw_info']['navbar']['about']['title'] = lang('About x',$app);
|
||||||
|
|
||||||
$GLOBALS['phpgw_info']['navbar']['about']['url'] = $GLOBALS['phpgw']->link('/about.php','app='.$app);
|
$GLOBALS['phpgw_info']['navbar']['about']['url'] = $GLOBALS['phpgw']->link('/about.php','app='.$app);
|
||||||
$GLOBALS['phpgw_info']['navbar']['about']['icon'] = $this->image('phpgwapi','about.gif');
|
$GLOBALS['phpgw_info']['navbar']['about']['icon'] = $this->image('phpgwapi','about');
|
||||||
|
$GLOBALS['phpgw_info']['navbar']['about']['icon_hover'] = $this->image_on('phpgwapi','about','-over');
|
||||||
|
|
||||||
$GLOBALS['phpgw_info']['navbar']['logout']['title'] = 'Logout';
|
$GLOBALS['phpgw_info']['navbar']['logout']['title'] = 'Logout';
|
||||||
$GLOBALS['phpgw_info']['navbar']['logout']['url'] = $GLOBALS['phpgw']->link('/logout.php');
|
$GLOBALS['phpgw_info']['navbar']['logout']['url'] = $GLOBALS['phpgw']->link('/logout.php');
|
||||||
$GLOBALS['phpgw_info']['navbar']['logout']['icon'] = $this->image('phpgwapi','logout.gif');
|
$GLOBALS['phpgw_info']['navbar']['logout']['icon'] = $this->image('phpgwapi','logout');
|
||||||
|
$GLOBALS['phpgw_info']['navbar']['logout']['icon_hover'] = $this->image_on('phpgwapi','logout','-over');
|
||||||
}
|
}
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
|
@ -1,4 +1,3 @@
|
|||||||
<!-- BEGIN head -->
|
|
||||||
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
|
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
|
||||||
<HTML>
|
<HTML>
|
||||||
<HEAD>
|
<HEAD>
|
||||||
@ -21,8 +20,8 @@
|
|||||||
</STYLE>
|
</STYLE>
|
||||||
<TITLE>{website_title}</TITLE>
|
<TITLE>{website_title}</TITLE>
|
||||||
|
|
||||||
<script language="JavaScript" src="{webserver_url}/phpgwapi/templates/justweb/navcond.js"></script>
|
<script type="text/javascript" language="javascript" src="{webserver_url}/phpgwapi/templates/justweb/navcond.js"></script>
|
||||||
<script language="JavaScript">
|
<script type="text/javascript" language="javascript">
|
||||||
var myNavBar1 = new NavBar(0);
|
var myNavBar1 = new NavBar(0);
|
||||||
var dhtmlMenu;
|
var dhtmlMenu;
|
||||||
|
|
||||||
@ -78,5 +77,3 @@ function init() {
|
|||||||
|
|
||||||
</HEAD>
|
</HEAD>
|
||||||
<BODY leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="init();" {body_tags}>
|
<BODY leftmargin="0" topmargin="0" marginwidth="0" marginheight="0" onLoad="init();" {body_tags}>
|
||||||
<!-- END Head -->
|
|
||||||
|
|
||||||
|
@ -113,20 +113,27 @@
|
|||||||
$var['messages'] = $api_messages . "<br>" . checkcode($cd);
|
$var['messages'] = $api_messages . "<br>" . checkcode($cd);
|
||||||
}
|
}
|
||||||
*/
|
*/
|
||||||
|
if (! function_exists('display_section'))
|
||||||
|
{
|
||||||
|
//echo 'function was not found<br>';
|
||||||
|
|
||||||
/*
|
function display_section($appname,$title,$file)
|
||||||
function display_section($appname,$title,$file)
|
{
|
||||||
{
|
$GLOBALS['prefs'][$appname]['title'] = $title;
|
||||||
$GLOBALS['prefs'][$appname]['title'] = $title;
|
$GLOBALS['prefs'][$appname]['file'][] = $file;
|
||||||
$GLOBALS['prefs'][$appname]['file'][] = $file;
|
}
|
||||||
}
|
$temp_hooks = CreateObject('phpgwapi.hooks');
|
||||||
$temp_common = CreateObject('phpgwapi.common');
|
|
||||||
|
|
||||||
$temp_hooks->process('preferences',array('preferences'));
|
$temp_hooks->process('preferences',array('preferences'));
|
||||||
*/
|
//echo 'prefs<pre>';
|
||||||
// echo '>prefs<pre>';
|
//print_r($GLOBALS['prefs']);
|
||||||
// print_r($GLOBALS['prefs']);
|
//echo '</pre>';
|
||||||
// echo '</pre>';
|
|
||||||
|
//echo 'phpgw_info<pre>';
|
||||||
|
//print_r($GLOBALS['phpgw_info']);
|
||||||
|
//echo '</pre>';
|
||||||
|
}
|
||||||
|
// else {echo 'function was found<br>';}
|
||||||
|
|
||||||
$tpl->set_var($var);
|
$tpl->set_var($var);
|
||||||
$tpl->pfp('out','navbar');
|
$tpl->pfp('out','navbar');
|
||||||
|
@ -25,7 +25,7 @@
|
|||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td height="100%">
|
<td height="100%" valign="top">
|
||||||
<table width="100%" border="0" cellspacing="0" cellpadding="0" height="100%">
|
<table width="100%" border="0" cellspacing="0" cellpadding="0" height="100%">
|
||||||
<tr>
|
<tr>
|
||||||
<td height="7" width="59"><img src="{img_root}/side_bar_top.gif" width="59" height="7"></td>
|
<td height="7" width="59"><img src="{img_root}/side_bar_top.gif" width="59" height="7"></td>
|
||||||
|
Loading…
Reference in New Issue
Block a user