From 46e3408ce42870be74b65e62a82c4bd57e29474d Mon Sep 17 00:00:00 2001 From: Pim Snel Date: Thu, 29 Jan 2004 13:34:01 +0000 Subject: [PATCH] show small icons in the extra appmenu --- phpgwapi/templates/idots/css/idots.css | 11 +- phpgwapi/templates/idots/navbar.inc.php | 466 +++++++++++++----------- 2 files changed, 254 insertions(+), 223 deletions(-) diff --git a/phpgwapi/templates/idots/css/idots.css b/phpgwapi/templates/idots/css/idots.css index db009ccb22..f87aabfc98 100755 --- a/phpgwapi/templates/idots/css/idots.css +++ b/phpgwapi/templates/idots/css/idots.css @@ -192,13 +192,20 @@ a.textSidebox right:10px; top:113px; visibility:hidden;*/ - background-image:url(../images/alpha-white.png); +/* background-image:url(../images/alpha-white.png);*/ + background-color:#eeeeee; border-width:1px; border-color:#7e7e7e; border-style:solid; } - +.extraIconsRow +{ + border-top-color:#dddddd; + border-top-width:1px; + border-top-style:solid; + padding:2px; +} #divMain { diff --git a/phpgwapi/templates/idots/navbar.inc.php b/phpgwapi/templates/idots/navbar.inc.php index c819b63a75..6c71c98521 100644 --- a/phpgwapi/templates/idots/navbar.inc.php +++ b/phpgwapi/templates/idots/navbar.inc.php @@ -43,7 +43,7 @@ $show_menu_event = 'onClick'; } - + $applications = ''; // == 'icons_and_text') @@ -64,7 +64,7 @@ if($i<$max_icons) { $app_icons .= ''; } - else // generate extra icon layer | always shows icons and text + // else // generate extra icon layer | always shows icons and text + else // generate extra icon layer shows icons and/or text { - $app_extra_icons .= ''; - if(isset($GLOBALS['phpgw_info']['flags']['navbar_target']) && $GLOBALS['phpgw_info']['flags']['navbar_target']) + $app_extra_icons .= ''; + + if($GLOBALS['phpgw_info']['user']['preferences']['common']['navbar_format']!='text') { - $app_extra_icons .= ' target="' . $GLOBALS['phpgw_info']['flags']['navbar_target'] . '"'; + $app_extra_icons .= ''; } - $app_extra_icons .= '>' . $icon . ''; - $app_extra_icons .= ''; + + $app_extra_icons .= ''; } - $app_extra_icons .= '>' . $title . ''; + unset($icon); + unset($title); + $i++; } - - unset($icon); - unset($title); - $i++; } + +// $var['app_icons'] = $app_icons; + if($GLOBALS['phpgw_info']['user']['preferences']['common']['navbar_format']!='text') + { + $var['app_icons'] = $app_icons; } - $var['app_icons'] = $app_icons; - - if($i > $max_icons) - { - $app_extra_icons_div = ' - + if($i > $max_icons) + { + $app_extra_icons_div = ' +