diff --git a/admin/index.php b/admin/index.php index 45b9d71b2f..213977e506 100755 --- a/admin/index.php +++ b/admin/index.php @@ -66,7 +66,7 @@ if(is_array($file)) { section_start($appname, - $GLOBALS['phpgw']->common->image($appname,Array('navbar',$appname,'nonav'),'',True) + $GLOBALS['phpgw']->common->image($appname,'navbar','',True) ); while(list($text,$url) = each($file)) diff --git a/preferences/inc/hook_preferences.inc.php b/preferences/inc/hook_preferences.inc.php index c368111f70..862b2a658d 100644 --- a/preferences/inc/hook_preferences.inc.php +++ b/preferences/inc/hook_preferences.inc.php @@ -18,6 +18,6 @@ } $file['change your settings'] = $GLOBALS['phpgw']->link('/preferences/preferences.php','appname=preferences&type=user'); - display_section('Preferences','Preferences',$file); + display_section('preferences',$file); ?> diff --git a/preferences/index.php b/preferences/index.php index 037e5dcff7..c9ff94e920 100755 --- a/preferences/index.php +++ b/preferences/index.php @@ -2,8 +2,8 @@ /**************************************************************************\ * phpGroupWare - preferences * * http://www.phpgroupware.org * - * Written by Joseph Engo * - * -------------------------------------------- * + * Written by phpGroupWare coreteam * + * ------------------------------------------------------------------ * * This program is free software; you can redistribute it and/or modify it * * under the terms of the GNU General Public License as published by the * * Free Software Foundation; either version 2 of the License, or (at your * @@ -78,13 +78,14 @@ } // This func called by the includes to dump a row header - function section_start($name='',$icon='',$appname='') + function section_start($appname='',$icon='') { $GLOBALS['pref_tpl']->set_var('icon_backcolor',$GLOBALS['phpgw_info']['theme']['row_off']); // $GLOBALS['pref_tpl']->set_var('link_backcolor',$GLOBALS['phpgw_info']['theme']['row_off']); - $GLOBALS['pref_tpl']->set_var('a_name',$appname); - $GLOBALS['pref_tpl']->set_var('app_name',lang($name)); + $GLOBALS['pref_tpl']->set_var('app_name',$appname); + $GLOBALS['pref_tpl']->set_var('app_title',lang($appname)); $GLOBALS['pref_tpl']->set_var('app_icon',$icon); + if ($icon) { $GLOBALS['pref_tpl']->parse('rows','app_row',True); @@ -116,9 +117,9 @@ $GLOBALS['pref_tpl']->parse('rows','spacer_row',True); } - function display_section($appname,$title,$file) + function display_section($appname,$file) { - section_start($title,$GLOBALS['phpgw']->common->image($appname,'navbar'),$appname); + section_start($appname,$GLOBALS['phpgw']->common->image($appname,'navbar','',True)); while(list($text,$url) = each($file)) { diff --git a/preferences/templates/default/index.tpl b/preferences/templates/default/index.tpl index da2634368b..fa84729df7 100644 --- a/preferences/templates/default/index.tpl +++ b/preferences/templates/default/index.tpl @@ -12,14 +12,14 @@ - [ {app_name} ] -   {app_name} + [ {app_title} ] +   {app_title} -   {app_name} +   {app_title}