chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Removing @import using <link> tag see #4075

Browse Source
skala
Julio Montoya 13 years ago
parent deef43b3b9
commit 89aedf3148
4 changed files with 123 additions and 166 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4
      main/inc/lib/main_api.lib.php
  2. 235
      main/inc/lib/template.lib.php
  3. 46
      main/template/default/layout/head.tpl
  4. 4
      user_portal.php

4
main/inc/lib/main_api.lib.php
Unescape View File

@ -5644,8 +5644,8 @@ function api_get_js($file) {
/**
* Returns the <link> HTML tag
*/
function api_get_css($file) {
return '<link rel="stylesheet" href="'.$file.'" type="text/css" />'."\n";
function api_get_css($file, $media = 'screen') {
return '<link href="'.$file.'" rel="stylesheet" media="'.$media.'" type="text/css" />'."\n";
}
/**

235
main/inc/lib/template.lib.php
Unescape View File

@ -356,7 +356,10 @@ class Template {
/**
* Set theme, include CSS files */
function set_theme() {
function set_css_files() {
global $disable_js_and_css_files;
$css = array();
//$platform_theme = api_get_setting('stylesheets');
$this->theme = api_get_visual_theme();
@ -365,47 +368,127 @@ class Template {
}
//Base CSS
$style_html = '@import "' . api_get_cdn_path(api_get_path(WEB_CSS_PATH) . 'base.css') . '";' . "\n";
$css[] = api_get_cdn_path(api_get_path(WEB_CSS_PATH).'base.css');
//Default theme CSS
$style_html .= '@import "' . api_get_cdn_path(api_get_path(WEB_CSS_PATH) . $this->theme . '/default.css') . '";' . "\n";
$css[] = api_get_cdn_path(api_get_path(WEB_CSS_PATH).$this->theme.'/default.css');
$css[] = api_get_cdn_path(api_get_path(WEB_CSS_PATH).'bootstrap-responsive.css');
$css[] = api_get_cdn_path(api_get_path(WEB_CSS_PATH).'responsive.css');
//Extra CSS files
$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 (api_is_global_chat_enabled()) {
$css[] = api_get_path(WEB_LIBRARY_PATH) . 'javascript/chat/css/chat.css';
}
$css_file_to_string = null;
foreach ($css as $file) {
$css_file_to_string .= api_get_css($file);
}
// @todo move this somewhere else. Special fix when using tablets in order to see the text near icons
if (SHOW_TEXT_NEAR_ICONS == true) {
//hack in order to fix the actions buttons
$css_file_to_string .= '<style>
.td_actions a {
float:left;
width:100%;
}
.forum_message_left a {
float:left;
width:100%;
}
</style>';
}
$navigator_info = api_get_navigator();
if ($navigator_info['name'] == 'Internet Explorer' && $navigator_info['version'] == '6') {
$style_html .= 'img, div { behavior: url(' . api_get_path(WEB_LIBRARY_PATH) . 'javascript/iepngfix/iepngfix.htc) } ' . "\n";
$css_file_to_string .= 'img, div { behavior: url(' . api_get_path(WEB_LIBRARY_PATH) . 'javascript/iepngfix/iepngfix.htc) } ' . "\n";
}
$style_html .= '@import "' . api_get_cdn_path(api_get_path(WEB_CSS_PATH) . 'bootstrap-responsive.css') . '";' . "\n";
$style_html .= '@import "' . api_get_cdn_path(api_get_path(WEB_CSS_PATH) . 'responsive.css') . '";' . "\n";
$this->assign('css_style', $style_html);
$style_print = '@import "' . api_get_cdn_path(api_get_path(WEB_CSS_PATH) . $this->theme . '/print.css') . '";' . "\n";
$this->assign('css_style_print', $style_print);
if (!$disable_js_and_css_files) {
$this->assign('css_file_to_string', $css_file_to_string);
$style_print = api_get_css(api_get_cdn_path(api_get_path(WEB_CSS_PATH) . $this->theme . '/print.css'), 'print');
$this->assign('css_style_print', $style_print);
}
// Logo
$logo = return_logo($this->theme);
$this->assign('logo', $logo);
}
function set_js_files() {
global $disable_js_and_css_files, $htmlHeadXtra;
//JS files
$js_files = array(
'modernizr.js',
'jquery.min.js',
'chosen/chosen.jquery.min.js',
'thickbox.js',
'bootstrap/bootstrap.js',
);
if (api_is_global_chat_enabled()) {
//Do not include the global chat in LP
if ($this->show_learnpath == false && $this->show_footer == true && $this->hide_global_chat == false) {
$js_files[] = 'chat/js/chat.js';
}
}
if (api_get_setting('accessibility_font_resize') == 'true') {
$js_files[] = 'fontresize.js';
}
if (api_get_setting('include_asciimathml_script') == 'true') {
$js_files[] = 'asciimath/ASCIIMathML.js';
}
$js_file_to_string = null;
foreach ($js_files as $js_file) {
$js_file_to_string .= api_get_js($js_file);
}
//Loading email_editor js
if (!api_is_anonymous() && api_get_setting('allow_email_editor') == 'true') {
$js_file_to_string .= $this->fetch('default/mail_editor/email_link.js.tpl');
}
if (!$disable_js_and_css_files) {
$this->assign('js_file_to_string', $js_file_to_string);
//Adding jquery ui by default
$extra_headers = api_get_jquery_ui_js();
//$extra_headers = '';
if (isset($htmlHeadXtra) && $htmlHeadXtra) {
foreach ($htmlHeadXtra as & $this_html_head) {
$extra_headers .= $this_html_head . "\n";
}
}
$this->assign('extra_headers', $extra_headers);
}
}
/**
* Set header parameters
*/
private function set_header_parameters() {
private function set_header_parameters() {
global $httpHeadXtra, $_course, $interbreadcrumb, $language_file, $noPHP_SELF, $_configuration, $this_section;
$help = $this->help;
$nameTools = $this->title;
global $lp_theme_css, $mycoursetheme, $user_theme;
global $httpHeadXtra, $htmlHeadXtra, $_course, $text_dir,
$interbreadcrumb, $charset, $language_file, $noPHP_SELF;
$navigation = return_navigation_array();
$this->menu_navigation = $navigation['menu_navigation'];
global $_configuration;
$this->assign('system_charset', api_get_system_encoding());
if (isset($httpHeadXtra) && $httpHeadXtra) {
@ -433,6 +516,7 @@ class Template {
if ($nameTools != '') {
$title_list[] = $nameTools;
}
$title_string = '';
for ($i = 0; $i < count($title_list); $i++) {
$title_string .=$title_list[$i];
@ -444,81 +528,11 @@ class Template {
}
$this->assign('title_string', $title_string);
//Setting the theme and CSS files
$this->set_theme();
//Extra JS files
$js_files = array(
'modernizr.js',
'jquery.min.js',
'chosen/chosen.jquery.min.js',
'thickbox.js',
'bootstrap/bootstrap.js',
);
if (api_is_global_chat_enabled()) {
//Do not include the global chat in LP
if ($this->show_learnpath == false && $this->show_footer == true && $this->hide_global_chat == false) {
$js_files[] = 'chat/js/chat.js';
}
}
if (api_get_setting('accessibility_font_resize') == 'true') {
$js_files[] = 'fontresize.js';
}
if (api_get_setting('include_asciimathml_script') == 'true') {
$js_files[] = 'asciimath/ASCIIMathML.js';
}
$js_file_to_string = '';
foreach ($js_files as $js_file) {
$js_file_to_string .= api_get_js($js_file);
}
//Loading email_editor js
if (!api_is_anonymous() && api_get_setting('allow_email_editor') == 'true') {
$js_file_to_string .= $this->fetch('default/mail_editor/email_link.js.tpl');
}
//Extra CSS files
$css_files = array(
api_get_path(WEB_LIBRARY_PATH) . 'javascript/thickbox.css',
api_get_path(WEB_LIBRARY_PATH) . 'javascript/chosen/chosen.css'
);
if ($this->show_learnpath) {
$css_files[] = api_get_path(WEB_CSS_PATH) . $this->theme . '/learnpath.css';
$css_files[] = api_get_path(WEB_CSS_PATH) . $this->theme . '/scorm.css';
}
if (api_is_global_chat_enabled()) {
$css_files[] = api_get_path(WEB_LIBRARY_PATH) . 'javascript/chat/css/chat.css';
}
$this->set_css_files();
$this->set_js_files();
$css_file_to_string = '';
foreach ($css_files as $css_file) {
$css_file_to_string .= api_get_css($css_file);
}
// @todo move this somewhere else. Special fix when using tablets in order to see the text near icons
if (SHOW_TEXT_NEAR_ICONS == true) {
//hack in order to fix the actions buttons
$css_file_to_string .= '<style>
.td_actions a {
float:left;
width:100%;
}
.forum_message_left a {
float:left;
width:100%;
}
</style>';
}
// Implementation of prefetch.
// See http://cdn.chamilo.org/main/img/online.png for details
$prefetch = '';
@ -528,32 +542,10 @@ class Template {
$prefetch .= '<link rel="dns-prefetch" href="' . $host . '">';
}
}
global $this_section;
//@todo minify CSS and JS
$this->assign('prefetch', $prefetch);
$this->assign('text_direction', api_get_text_direction());
$this->assign('section_name', 'section-' . $this_section);
global $disable_js_and_css_files;
if (!$disable_js_and_css_files) {
$this->assign('css_file_to_string', $css_file_to_string);
$this->assign('js_file_to_string', $js_file_to_string);
//Adding jquery ui by default
$extra_headers = api_get_jquery_ui_js();
//$extra_headers = '';
if (isset($htmlHeadXtra) && $htmlHeadXtra) {
foreach ($htmlHeadXtra as & $this_html_head) {
$extra_headers .= $this_html_head . "\n";
}
}
$this->assign('extra_headers', $extra_headers);
}
$favico = '<link rel="shortcut icon" href="' . api_get_path(WEB_PATH) . 'favicon.ico" type="image/x-icon" />';
@ -591,8 +583,7 @@ class Template {
$this->assign('bug_notification_link', $bug_notification_link);
$notification = return_notification_menu();
$this->assign('notification_menu', $notification);
$this->assign('notification_menu', $notification);
//Preparing values for the menu
@ -711,7 +702,6 @@ class Template {
$this->assign('teachers', $teacher_data);
}
}
/* $stats = '';
$this->assign('execution_stats', $stats); */
}
@ -727,7 +717,6 @@ class Template {
}
/* Sets the plugin content in a template variable */
function set_plugin_region($plugin_region) {
if (!empty($plugin_region)) {
$region_content = $this->plugin->load_region($plugin_region, $this, $this->force_plugin_load);

46
main/template/default/layout/head.tpl
Unescape View File

@ -12,16 +12,10 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<!--[if ie]><meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"><![endif]-->
<title>{{ title_string }}</title>
<style type="text/css" media="screen">
/*<![CDATA[*/
{{ css_style }}
/*]]>*/
</style>
<style type="text/css" media="print">
/*<![CDATA[*/
{{ css_file_to_string }}
{{ css_style_print }}
/*]]>*/
</style>
{{ js_file_to_string }}
{{ extra_headers }}
<script>
//<![CDATA[
// This is a patch for the "__flash__removeCallback" bug, see FS#4378.
@ -47,13 +41,7 @@ var online_button = '{{ online_button }}';
var offline_button = '{{ offline_button }}';
var connect_lang = '{{ "ChatConnected"|get_lang }}';
var disconnect_lang = '{{ "ChatDisconnected"|get_lang }}';
</script>
{{ js_file_to_string}}
{{ css_file_to_string}}
{{ extra_headers}}
<script>
function get_url_params(q, attribute) {
var vars;
var hash;
@ -78,7 +66,6 @@ function check_brand() {
}
}
$(window).resize(function() {
check_brand();
});
@ -107,7 +94,6 @@ $(document).scroll(function() {
//$('.subnav .brand').hide();
}
//Exercise warning fixed at the top
var fixed = $("#exercise_clock_warning");
if (fixed.length) {
@ -182,20 +168,7 @@ $(document).scroll(function() {
}
}
}
});
/*
function isScrolledIntoView(elem) {
var docViewTop = $(window).scrollTop();
var docViewBottom = docViewTop + $(window).height();
var elemTop = $(elem).offset().top;
var elemBottom = elemTop + $(elem).height();
return ((elemBottom <= docViewBottom) && (elemTop >= docViewTop));
}*/
});
$(function() {
@ -217,17 +190,13 @@ $(function() {
if (!$('#button').hasClass('btn')) {
$("button").addClass('btn');
}
//Dropdown effect
$('.dropdown-toggle').dropdown();
//Responsive effect
$(".collapse").collapse();
//$('#collapse1').collapse("hide");
$(".accordion_jquery").accordion({
autoHeight: false,
active: false, // all items closed by default
@ -295,7 +264,6 @@ $(function() {
},200);
}
);
/*
$(".td_actions").hide();
@ -308,4 +276,4 @@ $(function() {
});*/
});
</script>
{{ header_extra_content }}
{{ header_extra_content }}

4
user_portal.php
Unescape View File

@ -97,9 +97,9 @@ if ($load_dirs) {
$folder_icon = api_get_path(WEB_IMG_PATH).'icons/22/folder.png';
$close_icon = api_get_path(WEB_IMG_PATH).'loading1.gif';
$htmlHeadXtra[] = '<script type="text/javascript">
$htmlHeadXtra[] = '<script>
$(document).ready( function() {
$(document).ready(function() {
$(".document_preview_container").hide();
$(".document_preview").click(function() {
var my_id = this.id;

Write Preview
Loading…
Cancel
Save