diff --git a/etemplate/inc/class.sitemgr_module.inc.php b/etemplate/inc/class.sitemgr_module.inc.php index 87d3576307..b371a5b909 100644 --- a/etemplate/inc/class.sitemgr_module.inc.php +++ b/etemplate/inc/class.sitemgr_module.inc.php @@ -41,12 +41,15 @@ class sitemgr_module extends Module // the Module class get automatic included b list($app) = explode('.',$this->etemplate_method); $GLOBALS['egw']->translation->add_app($app); - $css = ''; - if (file_exists(EGW_SERVER_ROOT.'/'.$app.'/templates/default/app.css')) + $css = ""; + $css .= "@import url(".$GLOBALS['egw_info']['server']['webserver_url']. + '/'.$app."/templates/default/app.css);\n"; } + $css .= "-->\n\n"; $ret = false; if($_POST['etemplate_exec_id']) { diff --git a/etemplate/inc/class.tab_widget.inc.php b/etemplate/inc/class.tab_widget.inc.php index c0dfd8b130..7fd7867a2b 100644 --- a/etemplate/inc/class.tab_widget.inc.php +++ b/etemplate/inc/class.tab_widget.inc.php @@ -119,11 +119,11 @@ $tcell =& $tab_widget->empty_cell(); if ($value == $name) { - $tcell['span'] = ',etemplate_tab_active th'; + $tcell['span'] = ',etemplate_tab_active'; } else { - $tcell['span'] = ',etemplate_tab row_on'; + $tcell['span'] = ',etemplate_tab'; } if ($dom_enabled) { diff --git a/etemplate/inc/class.uietemplate.inc.php b/etemplate/inc/class.uietemplate.inc.php index 223b484327..f29f9f7906 100644 --- a/etemplate/inc/class.uietemplate.inc.php +++ b/etemplate/inc/class.uietemplate.inc.php @@ -211,7 +211,7 @@ if (!@$GLOBALS['egw_info']['etemplate']['hooked'] && (int) $output_mode != 1 && (int) $output_mode != -1) // not just returning the html { $GLOBALS['egw_info']['flags']['java_script'] .= $this->include_java_script(2); -/* + if ($GLOBALS['egw_info']['flags']['currentapp'] != 'etemplate') { $css_file = '/etemplate/templates/'.$GLOBALS['egw_info']['server']['template_set'].'/app.css'; @@ -219,10 +219,10 @@ { $css_file = '/etemplate/templates/default/app.css'; } - $GLOBALS['egw_info']['flags']['css'] .= '@import('.$GLOBALS['egw_info']['server']['webserver_url']. - $css_file.'?'.filemtime(EGW_SERVER_ROOT.$css_file).");\n"; + $GLOBALS['egw_info']['flags']['css'] .= "\n\t\t\n\t\t".''."\n\t\t