holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed minify issues: installation in docroot is now handeled, as well as problems with jscalendar and email

Browse Source
This commit is contained in:
Ralf Becker 2012-10-26 09:24:39 +00:00
parent 186bd29e0d
commit 18fe5c1d4b
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
phpgwapi/inc/class.egw_framework.inc.php
View File

@ -756,10 +756,10 @@ abstract class egw_framework
} }
if (!$debug_minify) if (!$debug_minify)
{ {
$css_file = $GLOBALS['egw_info']['server']['webserver_url'].'/phpgwapi/inc/min/?'; $css = $GLOBALS['egw_info']['server']['webserver_url'].'/phpgwapi/inc/min/?';
if ($base_path && $base_path != '/') $css_file .= 'b='.substr($base_path, 1).'&'; if ($base_path && $base_path != '/') $css .= 'b='.substr($base_path, 1).'&';
$css_file .= 'f='.$css_file . '&'.$max_modified; $css .= 'f='.$css_file . '&'.$max_modified;
$css_file = '<link href="'.$css_file.'" type="text/css" rel="StyleSheet" />'."\n"; $css_file = '<link href="'.$css.'" type="text/css" rel="StyleSheet" />'."\n";
} }
return array( return array(
'app_css' => $app_css, 'app_css' => $app_css,
@ -1286,7 +1286,8 @@ abstract class egw_framework
if ($base_path[0] != '/') $base_path = parse_url($base_path, PHP_URL_PATH); if ($base_path[0] != '/') $base_path = parse_url($base_path, PHP_URL_PATH);
$files = '/phpgwapi/inc/min/?'.($base_path && $base_path != '/' ? 'b='.substr($base_path, 1).'&' : ''). $files = '/phpgwapi/inc/min/?'.($base_path && $base_path != '/' ? 'b='.substr($base_path, 1).'&' : '').
'f='.$files . '&'.$max_modified; 'f='.$files . '&'.$max_modified;
$links .= '<script type="text/javascript" src="'. $GLOBALS['egw_info']['server']['webserver_url']. $files.'">'."</script>\n"; // need to include minified javascript before not minified stuff like jscalendar-setup, as it might depend on it
$links = '<script type="text/javascript" src="'. $GLOBALS['egw_info']['server']['webserver_url']. $files.'">'."</script>".$links;
} }
return $links."\n"; return $links."\n";
} }