Changeset 2640 for trunk/phpgwapi

Timestamp:

04/27/10 16:41:59 (14 years ago)

Author:

amuller

Message:

Ticket #1044 - Implementa compactador inicialmente só sendo chamado na api

Location:

trunk/phpgwapi

Files:

• inc/class.common.inc.php (modified) (1 diff)
• inc/csstidy (added)
• inc/csstidy/class.csstidy.php (added)
• inc/csstidy/class.csstidy_optimise.php (added)
• inc/csstidy/class.csstidy_print.php (added)
• inc/csstidy/data.inc.php (added)
• templates/default/css (modified) (1 prop)

trunk/phpgwapi/inc/class.common.inc.php

@@ -1326 +1326 @@
                         // search for app specific css file
                         if ( @ isset( $GLOBALS[ 'phpgw_info' ][ 'flags' ][ 'currentapp' ] ) )
-                        {
-                                $css = "/%s/templates/%s/%s.css";
-
-                                global $path, $link, $template;
-
-                                $path = PHPGW_SERVER_ROOT . str_replace( '/', SEP, $css );
-
-                                $link = '<link href="%s" type="text/css" rel="StyleSheet" />';
-                                $link = "\n\t\t" . sprintf( $link,
-                                        "{$GLOBALS[ 'phpgw_info' ][ 'server' ][ 'webserver_url' ]}{$css}"
-                                );
-
+                        {               
+                                require_once('class.css.inc.php');
+                                $cssObj = new css();
+
+                                $path = $GLOBALS[ 'phpgw_info' ][ 'server' ][ 'webserver_url' ];
                                 $template = $GLOBALS[ 'phpgw_info' ][ 'server' ][ 'template_set' ];
 
-                                function _css( $module, $css )
-                                {
-                                        global $link, $path, $template;
-
-                                        if ( file_exists( sprintf( $path, $module, $template, str_replace( '/', SEP, $css ) ) ) )
-                                                return sprintf( $link, $module, $template, $css );
-
-                                        if ( file_exists( sprintf( $path, $module, 'default', str_replace( '/', SEP, $css ) ) ) )
-                                                return sprintf( $link, $module, 'default', $css );
-
-                                        return '';
-                                }
-
-                                $css = _css( 'phpgwapi', 'css/base' );
-                                $css .= _css( 'phpgwapi', "css/{$GLOBALS[ 'phpgw_info' ][ 'user' ][ 'preferences' ][ 'common' ][ 'theme' ]}" );
-                                $css .= _css( $GLOBALS[ 'phpgw_info' ][ 'flags' ][ 'currentapp' ], "css/{$GLOBALS[ 'phpgw_info' ][ 'user' ][ 'preferences' ][ 'common' ][ 'theme' ]}" );
-                                $css .= _css( $GLOBALS[ 'phpgw_info' ][ 'flags' ][ 'currentapp' ], 'app' );
-
-                                if ( $css )
-                                        $tpl -> set_var( 'css_file', $css );
+                                $cssObj->validate_file($path."phpgwapi/templates/".$template."/css/base.css");
+                                $cssObj->validate_file($path."phpgwapi/templates/".$template."/css/".$GLOBALS[ 'phpgw_info' ][ 'user' ][ 'preferences' ][ 'common' ][ 'theme' ].".css");
+                                $cssObj->validate_file($path.$GLOBALS[ 'phpgw_info' ][ 'flags' ][ 'currentapp' ]."/templates/".$template."/css/".$GLOBALS[ 'phpgw_info' ][ 'user' ][ 'preferences' ][ 'common' ][ 'theme' ].".css");
+                                $cssObj->validate_file($path.$GLOBALS[ 'phpgw_info' ][ 'flags' ][ 'currentapp' ]."/templates/".$template."/css/app.css");
+                                
+                                $tpl -> set_var( 'css_file',  $cssObj->get_css() );
                         }