diff --git a/phpgwapi/inc/class.egw_framework.inc.php b/phpgwapi/inc/class.egw_framework.inc.php index f1099b44bb..9f82c76bdc 100644 --- a/phpgwapi/inc/class.egw_framework.inc.php +++ b/phpgwapi/inc/class.egw_framework.inc.php @@ -222,20 +222,23 @@ abstract class egw_framework { $lang_code = $GLOBALS['egw_info']['user']['preferences']['common']['lang']; } - //pngfix defaults to yes - if(!$GLOBALS['egw_info']['user']['preferences']['common']['disable_pngfix']) + // IE specific fixes + if (html::$user_agent == 'msie') { - $pngfix_src = $GLOBALS['egw_info']['server']['webserver_url'] . '/phpgwapi/templates/idots/js/pngfix.js'; - $pngfix =' - '; - } - // tell IE > 7 to use it's own mode, not old compatibility mode eg. IE=7 for IE8 - if (html::$user_agent == 'msie' && html::$ua_version > 7) - { - $pngfix .= "\n\t\t".''; + // tell IE to use it's own mode, not old compatibility modes (set eg. via group policy for all intranet sites) + // has to be before any other header tags, but meta and title!!! + $pngfix = ''."\n"; + + // pngfix for IE6 defaults to yes + if(!$GLOBALS['egw_info']['user']['preferences']['common']['disable_pngfix'] && html::$ua_version < 7) + { + $pngfix_src = $GLOBALS['egw_info']['server']['webserver_url'] . '/phpgwapi/templates/idots/js/pngfix.js'; + $pngfix .= ' + '; + } } if(!$GLOBALS['egw_info']['user']['preferences']['common']['disable_slider_effects']) diff --git a/phpgwapi/templates/default/head.tpl b/phpgwapi/templates/default/head.tpl new file mode 100644 index 0000000000..11ffd27e9f --- /dev/null +++ b/phpgwapi/templates/default/head.tpl @@ -0,0 +1,28 @@ + + +
+