Changeset 2648
- Timestamp:
- 04/28/10 11:47:11 (14 years ago)
- Location:
- trunk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/expressoMail1_2/index.php
r2645 r2648 173 173 $phpgwapi_url = $GLOBALS[ 'phpgw' ] -> link( '/phpgwapi' ); 174 174 175 $GLOBALS['phpgw']->css->validate_file( $expressoMail_url . '/templates/' . $GLOBALS['phpgw_info']['server']['template_set'] . '/main.css');176 $GLOBALS['phpgw']->css->validate_file( $phpgwapi_url . '/js/dftree/dftree.css');175 $GLOBALS['phpgw']->css->validate_file('expressoMail1_2/templates/' . $GLOBALS['phpgw_info']['server']['template_set'] . '/main.css'); 176 $GLOBALS['phpgw']->css->validate_file('phpgwapi/js/dftree/dftree.css'); 177 177 $script .= $GLOBALS['phpgw']->css->get_css(); 178 178 $script .= '<style type="text/css">@import url(' . $phpgwapi_url . '/js/jscalendar/calendar-win2k-1.css);</style>'; -
trunk/phpgwapi/inc/class.common.inc.php
r2646 r2648 1326 1326 // search for app specific css file 1327 1327 if ( @ isset( $GLOBALS[ 'phpgw_info' ][ 'flags' ][ 'currentapp' ] ) ) 1328 { 1328 { 1329 $template = $GLOBALS['phpgw_info']['server']['template_set']; 1329 1330 $GLOBALS['phpgw']->css->validate_file( "phpgwapi/templates/".$template."/css/base.css"); 1330 1331 $GLOBALS['phpgw']->css->validate_file( "phpgwapi/templates/".$template."/css/".$GLOBALS[ 'phpgw_info' ][ 'user' ][ 'preferences' ][ 'common' ][ 'theme' ].".css"); -
trunk/phpgwapi/inc/class.css.inc.php
r2646 r2648 57 57 function validate_file($file, $stack = false ) 58 58 { 59 $path = ( ! empty( $GLOBALS[ 'phpgw_info' ][ 'server' ][ 'webserver_url' ] ) ) ? 60 $GLOBALS[ 'phpgw_info' ][ 'server' ][ 'webserver_url' ] : '/'; 61 62 if ( strpos( $path, '/' ) != ( strlen( $path ) - 1 ) ) 63 $path .= '/'; 64 65 $template = $GLOBALS[ 'phpgw_info' ][ 'server' ][ 'template_set' ]; 66 67 if (file_exists(PHPGW_SERVER_ROOT . SEP . $path . $file)) 59 if (file_exists(PHPGW_SERVER_ROOT . SEP . $file)) 68 60 $this->files[] = $file; 69 61 }
Note: See TracChangeset
for help on using the changeset viewer.