Changeset 2645 for trunk/phpgwapi
- Timestamp:
- 04/28/10 08:47:18 (14 years ago)
- Location:
- trunk/phpgwapi
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/phpgwapi/inc/class.common.inc.php
r2644 r2645 1327 1327 if ( @ isset( $GLOBALS[ 'phpgw_info' ][ 'flags' ][ 'currentapp' ] ) ) 1328 1328 { 1329 require_once('class.css.inc.php'); 1330 $cssObj = new css(); 1329 $path = ( ! empty( $GLOBALS[ 'phpgw_info' ][ 'server' ][ 'webserver_url' ] ) ) ? 1330 $GLOBALS[ 'phpgw_info' ][ 'server' ][ 'webserver_url' ] : '/'; 1331 1332 if ( strpos( $path, '/' ) != ( strlen( $path ) - 1 ) ) 1333 $path .= '/'; 1331 1334 1332 1335 $template = $GLOBALS[ 'phpgw_info' ][ 'server' ][ 'template_set' ]; 1333 1336 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");1337 $GLOBALS['phpgw']->css->validate_file( $path."phpgwapi/templates/".$template."/css/base.css"); 1338 $GLOBALS['phpgw']->css->validate_file( $path."phpgwapi/templates/".$template."/css/".$GLOBALS[ 'phpgw_info' ][ 'user' ][ 'preferences' ][ 'common' ][ 'theme' ].".css"); 1339 $GLOBALS['phpgw']->css->validate_file( $path.$GLOBALS[ 'phpgw_info' ][ 'flags' ][ 'currentapp' ]."/templates/".$template."/css/".$GLOBALS[ 'phpgw_info' ][ 'user' ][ 'preferences' ][ 'common' ][ 'theme' ].".css"); 1340 $GLOBALS['phpgw']->css->validate_file( $path.$GLOBALS[ 'phpgw_info' ][ 'flags' ][ 'currentapp' ]."/templates/".$template."/css/app.css"); 1338 1341 1339 $tpl -> set_var( 'css_file', $ cssObj->get_css() );1342 $tpl -> set_var( 'css_file', $GLOBALS['phpgw']->css->get_css() ); 1340 1343 } 1341 1344 -
trunk/phpgwapi/inc/class.css.inc.php
r2644 r2645 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 49 43 if ($GLOBALS['phpgw_info']['server']['csspacker'] == "True") 50 44 foreach($this->files as $cssFile) … … 52 46 if (!file_exists(PHPGW_SERVER_ROOT.SEP.$cssFile."pack.css")) 53 47 $this->create_pack($cssFile); 54 $out .= "\n\t\t<link href='".$ path.$cssFile."pack.css' type='text/css' rel='StyleSheet'>";48 $out .= "\n\t\t<link href='".$cssFile."pack.css' type='text/css' rel='StyleSheet'>"; 55 49 56 50 } 57 51 else 58 52 foreach($this->files as $cssFile) 59 $out .= "\n\t\t<link href='".$ path.$cssFile."' type='text/css' rel='StyleSheet'>";53 $out .= "\n\t\t<link href='".$cssFile."' type='text/css' rel='StyleSheet'>"; 60 54 return $out; 61 55 } … … 63 57 function validate_file($file, $stack = false ) 64 58 { 65 if (file_exists(PHPGW_SERVER_ROOT . '/'. $file))59 if (file_exists(PHPGW_SERVER_ROOT . SEP . $file)) 66 60 $this->files[] = $file; 67 61 } -
trunk/phpgwapi/inc/functions.inc.php
r2549 r2645 235 235 $GLOBALS['phpgw']->applications = CreateObject('phpgwapi.applications'); 236 236 $GLOBALS['phpgw']->js = CreateObject('phpgwapi.javascript'); 237 $GLOBALS['phpgw']->css = CreateObject('phpgwapi.css'); 238 237 239 print_debug('main class loaded', 'messageonly','api'); 238 240 if (! isset($GLOBALS['phpgw_info']['flags']['included_classes']['error']) || -
trunk/phpgwapi/js/dftree
- Property svn:ignore
-
old new 1 * .jspack.js1 *pack.*s
-
- Property svn:ignore
Note: See TracChangeset
for help on using the changeset viewer.