Changeset 2644 for trunk/phpgwapi
- Timestamp:
- 04/27/10 18:28:15 (14 years ago)
- Location:
- trunk/phpgwapi/inc
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/phpgwapi/inc/class.common.inc.php
r2640 r2644 1330 1330 $cssObj = new css(); 1331 1331 1332 $path = $GLOBALS[ 'phpgw_info' ][ 'server' ][ 'webserver_url' ];1333 1332 $template = $GLOBALS[ 'phpgw_info' ][ 'server' ][ 'template_set' ]; 1334 1333 1335 $cssObj->validate_file( $path."phpgwapi/templates/".$template."/css/base.css");1336 $cssObj->validate_file( $path."phpgwapi/templates/".$template."/css/".$GLOBALS[ 'phpgw_info' ][ 'user' ][ 'preferences' ][ 'common' ][ 'theme' ].".css");1337 $cssObj->validate_file( $path.$GLOBALS[ 'phpgw_info' ][ 'flags' ][ 'currentapp' ]."/templates/".$template."/css/".$GLOBALS[ 'phpgw_info' ][ 'user' ][ 'preferences' ][ 'common' ][ 'theme' ].".css");1338 $cssObj->validate_file( $path.$GLOBALS[ 'phpgw_info' ][ 'flags' ][ 'currentapp' ]."/templates/".$template."/css/app.css");1334 $cssObj->validate_file( "phpgwapi/templates/".$template."/css/base.css"); 1335 $cssObj->validate_file( "phpgwapi/templates/".$template."/css/".$GLOBALS[ 'phpgw_info' ][ 'user' ][ 'preferences' ][ 'common' ][ 'theme' ].".css"); 1336 $cssObj->validate_file( $GLOBALS[ 'phpgw_info' ][ 'flags' ][ 'currentapp' ]."/templates/".$template."/css/".$GLOBALS[ 'phpgw_info' ][ 'user' ][ 'preferences' ][ 'common' ][ 'theme' ].".css"); 1337 $cssObj->validate_file( $GLOBALS[ 'phpgw_info' ][ 'flags' ][ 'currentapp' ]."/templates/".$template."/css/app.css"); 1339 1338 1340 1339 $tpl -> set_var( 'css_file', $cssObj->get_css() ); -
trunk/phpgwapi/inc/class.css.inc.php
r2643 r2644 41 41 function get_css() 42 42 { 43 $path = ( ! empty( $GLOBALS[ 'phpgw_info' ][ 'server' ][ 'webserver_url' ] ) ) ? 44 $GLOBALS[ 'phpgw_info' ][ 'server' ][ 'webserver_url' ] : '/'; 45 46 if ( strpos( $path, '/' ) != ( strlen( $path ) - 1 ) ) 47 $path .= '/'; 48 43 49 if ($GLOBALS['phpgw_info']['server']['csspacker'] == "True") 44 50 foreach($this->files as $cssFile) … … 46 52 if (!file_exists(PHPGW_SERVER_ROOT.SEP.$cssFile."pack.css")) 47 53 $this->create_pack($cssFile); 48 $out .= "\n\t\t<link href='".$ cssFile."pack.css' type='text/css' rel='StyleSheet'>";54 $out .= "\n\t\t<link href='".$path.$cssFile."pack.css' type='text/css' rel='StyleSheet'>"; 49 55 50 56 } 51 57 else 52 58 foreach($this->files as $cssFile) 53 $out .= "\n\t\t<link href='".$ cssFile."' type='text/css' rel='StyleSheet'>";59 $out .= "\n\t\t<link href='".$path.$cssFile."' type='text/css' rel='StyleSheet'>"; 54 60 return $out; 55 61 } … … 57 63 function validate_file($file, $stack = false ) 58 64 { 59 if (file_exists(PHPGW_SERVER_ROOT . "/". $file))65 if (file_exists(PHPGW_SERVER_ROOT . '/' . $file)) 60 66 $this->files[] = $file; 61 67 }
Note: See TracChangeset
for help on using the changeset viewer.