Changeset 3470

Timestamp:

11/05/10 09:11:54 (13 years ago)

Author:

rafaelraymundo

Message:

Ticket #1396 - Agenda - Calendário anual não exibe feriados.

File:

• branches/2.2/phpgwapi/inc/class.common.inc.php (modified) (2 diffs)

branches/2.2/phpgwapi/inc/class.common.inc.php

@@ -1247 +1247 @@
                 * @author Dave Hall (*based* on verdilak? css inclusion code)
                 */
-                function get_css()
+function get_css( )
                 {
                         $tpl = createObject('phpgwapi.Template', $this->get_tpl_dir('phpgwapi'));
@@ -1268 +1268 @@
                         $tpl->set_var('app_css', $app_css);
 
-                        // search for app specific css filie
-                        if ( @ isset( $GLOBALS[ 'phpgw_info' ][ 'flags' ][ 'currentapp' ] ) ) 
-                        { 
-                                $template = $GLOBALS['phpgw_info']['server']['template_set'];
-                                $GLOBALS['phpgw']->css->validate_file( "phpgwapi/templates/".$template."/css/base.css"); 
-                                $GLOBALS['phpgw']->css->validate_file( "phpgwapi/templates/".$template."/css/".get_theme().".css");
-                                $GLOBALS['phpgw']->css->validate_file( $GLOBALS[ 'phpgw_info' ][ 'flags' ][ 'currentapp' ]."/templates/".$template."/css/".get_theme().".css");
-                                $GLOBALS['phpgw']->css->validate_file( $GLOBALS[ 'phpgw_info' ][ 'flags' ][ 'currentapp' ]."/templates/".$template."/css/app.css"); 
-
-                                $tpl -> set_var( 'css_file',  $GLOBALS['phpgw']->css->get_css() ); 
-
-                        } 
-
-                        return $tpl -> subst('css'); 
-
-                }
+                        // 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 = sprintf( $link,
+                                        "{$GLOBALS[ 'phpgw_info' ][ 'server' ][ 'webserver_url' ]}{$css}"
+                                );
+
+                                $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/".get_theme());
+                                $css .= _css( $GLOBALS[ 'phpgw_info' ][ 'flags' ][ 'currentapp' ], "css/".get_theme());
+                                $css .= _css( $GLOBALS[ 'phpgw_info' ][ 'flags' ][ 'currentapp' ], 'app' );
+
+                                if ( $css )
+                                        $tpl -> set_var( 'css_file', $css );
+                        }
+
+                        return $tpl -> subst('css');
+                }
+
 
                 /**