From d628a49d50c54146499532173d3b216abcaeff35 Mon Sep 17 00:00:00 2001 From: Yannick Warnier Date: Tue, 25 Mar 2014 16:39:44 -0500 Subject: [PATCH] Finetuned CSS loading order in template.lib.php --- main/inc/lib/template.lib.php | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/main/inc/lib/template.lib.php b/main/inc/lib/template.lib.php index 2e1c2b2a4b..07132819cf 100644 --- a/main/inc/lib/template.lib.php +++ b/main/inc/lib/template.lib.php @@ -438,17 +438,6 @@ class Template $css[] = api_get_path(WEB_LIBRARY_PATH).'javascript/thickbox.css'; $css[] = api_get_path(WEB_LIBRARY_PATH).'javascript/chosen/chosen.css'; - if ($this->show_learnpath) { - $css[] = api_get_path(WEB_CSS_PATH).$this->theme.'/learnpath.css'; - $css[] = api_get_path(WEB_CSS_PATH).$this->theme.'/scorm.css'; - } - - - // if we have a scorm file in theme don't use default_scorm.css file - if (!is_file(api_get_path(SYS_CSS_PATH).$this->theme.'/scorm.css')) { - $css[] = api_get_cdn_path(api_get_path(WEB_CSS_PATH).'default_scorm.css'); - } - if (api_is_global_chat_enabled()) { $css[] = api_get_path(WEB_LIBRARY_PATH).'javascript/chat/css/chat.css'; } @@ -458,6 +447,17 @@ class Template //THEME CSS STYLE $css[] = api_get_cdn_path(api_get_path(WEB_CSS_PATH).$this->theme.'/default.css'); + if ($this->show_learnpath) { + $css[] = api_get_path(WEB_CSS_PATH).$this->theme.'/learnpath.css'; + + // if we have a SCORM file in theme, don't use default_scorm.css file + if (is_file(api_get_path(SYS_CSS_PATH).$this->theme.'/scorm.css')) { + $css[] = api_get_path(WEB_CSS_PATH).$this->theme.'/scorm.css'; + } else { + $css[] = api_get_cdn_path(api_get_path(WEB_CSS_PATH).'default_scorm.css'); + } + } + $css_file_to_string = null; foreach ($css as $file) { $css_file_to_string .= api_get_css($file);