diff --git a/main/document/showinframes.php b/main/document/showinframes.php index 2734f40c96..18a826a806 100755 --- a/main/document/showinframes.php +++ b/main/document/showinframes.php @@ -173,6 +173,7 @@ $frameheight = 135; if ($is_courseAdmin) { $frameheight = 165; } + $js_glossary_in_documents = ' $.frameReady(function(){ // $("
I am a div courses
").prependTo("body"); @@ -180,10 +181,10 @@ $js_glossary_in_documents = ' { load: [ { type:"script", id:"_fr1", src:"'.api_get_jquery_web_path().'"}, - { type:"script", id:"_fr7", src:"'.api_get_path(WEB_PATH).'web/assets/MathJax/MathJax.js?config=AM_HTMLorMML"}, - { type:"script", id:"_fr4", src:"'.api_get_path(WEB_PATH).'web/assets/jquery-ui/jquery-ui.min.js"}, - { type:"stylesheet", id:"_fr5", src:"'.api_get_path(WEB_PATH).'web/assets/jquery-ui/themes/smoothness/jquery-ui.min.css"}, - { type:"stylesheet", id:"_fr6", src:"'.api_get_path(WEB_PATH).'web/assets/jquery-ui/themes/smoothness/theme.css"}, + { type:"script", id:"_fr7", src:"'.api_get_path(WEB_PUBLIC_PATH).'assets/MathJax/MathJax.js?config=AM_HTMLorMML"}, + { type:"script", id:"_fr4", src:"'.api_get_path(WEB_PUBLIC_PATH).'assets/jquery-ui/jquery-ui.min.js"}, + { type:"stylesheet", id:"_fr5", src:"'.api_get_path(WEB_PUBLIC_PATH).'assets/jquery-ui/themes/smoothness/jquery-ui.min.css"}, + { type:"stylesheet", id:"_fr6", src:"'.api_get_path(WEB_PUBLIC_PATH).'assets/jquery-ui/themes/smoothness/theme.css"}, { type:"script", id:"_fr2", src:"'.api_get_path(WEB_LIBRARY_PATH).'javascript/jquery.highlight.js"}, { type:"script", id:"_fr3", src:"'.api_get_path(WEB_CODE_PATH).'glossary/glossary.js.php"} ] diff --git a/main/inc/lib/api.lib.php b/main/inc/lib/api.lib.php index 63aa0d2bf4..1a672f5d98 100644 --- a/main/inc/lib/api.lib.php +++ b/main/inc/lib/api.lib.php @@ -6471,7 +6471,7 @@ function api_get_js($file) { */ function api_get_asset($file) { - return ''."\n"; + return ''."\n"; } /** @@ -6480,7 +6480,7 @@ function api_get_asset($file) */ function api_get_css_asset($file, $media = 'screen') { - return ''."\n"; + return ''."\n"; } /** @@ -6505,7 +6505,7 @@ function api_get_jquery_js() */ function api_get_jquery_web_path() { - return api_get_path(WEB_PATH).'web/assets/jquery/dist/jquery.min.js'; + return api_get_path(WEB_PUBLIC_PATH).'assets/jquery/dist/jquery.min.js'; } /** @@ -6513,7 +6513,7 @@ function api_get_jquery_web_path() */ function api_get_jquery_ui_js_web_path() { - return api_get_path(WEB_PATH).'web/assets/jquery-ui/jquery-ui.min.js'; + return api_get_path(WEB_PUBLIC_PATH).'assets/jquery-ui/jquery-ui.min.js'; } /** @@ -6521,7 +6521,7 @@ function api_get_jquery_ui_js_web_path() */ function api_get_jquery_ui_css_web_path() { - return api_get_path(WEB_PATH).'web/assets/jquery-ui/themes/smoothness/jquery-ui.min.css'; + return api_get_path(WEB_PUBLIC_PATH).'assets/jquery-ui/themes/smoothness/jquery-ui.min.css'; } /** @@ -6586,8 +6586,8 @@ function api_get_jquery_libraries_js($libraries) { $js .= api_get_asset('jquery-file-upload/js/jquery.fileupload-video.js'); $js .= api_get_asset('jquery-file-upload/js/jquery.fileupload-validate.js'); - $js .= api_get_css(api_get_path(WEB_PATH).'web/assets/jquery-file-upload/css/jquery.fileupload.css'); - $js .= api_get_css(api_get_path(WEB_PATH).'web/assets/jquery-file-upload/css/jquery.fileupload-ui.css'); + $js .= api_get_css(api_get_path(WEB_PUBLIC_PATH).'assets/jquery-file-upload/css/jquery.fileupload.css'); + $js .= api_get_css(api_get_path(WEB_PUBLIC_PATH).'assets/jquery-file-upload/css/jquery.fileupload-ui.css'); } // jquery datepicker diff --git a/main/inc/lib/javascript/chat/video.php b/main/inc/lib/javascript/chat/video.php index bf52a9ce23..d925cad9c3 100644 --- a/main/inc/lib/javascript/chat/video.php +++ b/main/inc/lib/javascript/chat/video.php @@ -35,7 +35,7 @@ if ($isSender) { $idUserLocal = api_get_user_id(); $userLocal = api_get_user_info($idUserLocal, true); $htmlHeadXtra[] = '' . "\n"; $navigator = api_get_navigator(); diff --git a/main/inc/lib/template.lib.php b/main/inc/lib/template.lib.php index 7175323991..316f0e4e6f 100755 --- a/main/inc/lib/template.lib.php +++ b/main/inc/lib/template.lib.php @@ -607,7 +607,7 @@ class Template ]; foreach ($bowerCSSFiles as $file) { - $css[] = api_get_path(WEB_PATH).'web/assets/'.$file; + $css[] = api_get_path(WEB_PUBLIC_PATH).'assets/'.$file; } $css[] = api_get_path(WEB_LIBRARY_PATH).'javascript/chosen/chosen.css'; @@ -768,7 +768,7 @@ class Template } foreach ($bowerJsFiles as $file) { - $js_file_to_string .= ''."\n"; + $js_file_to_string .= ''."\n"; } foreach ($js_files as $file) { diff --git a/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/Basic.php b/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/Basic.php index 87d6c94f92..edca1bddef 100644 --- a/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/Basic.php +++ b/src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/Basic.php @@ -102,7 +102,7 @@ class Basic extends Toolbar if (api_get_setting('enabled_mathjax') == 'true') { $plugins[] = 'mathjax'; - $config['mathJaxLib'] = api_get_path(WEB_PATH).'web/assets/MathJax/MathJax.js?config=TeX-AMS_HTML'; + $config['mathJaxLib'] = api_get_path(WEB_PUBLIC_PATH).'assets/MathJax/MathJax.js?config=TeX-AMS_HTML'; } if (api_get_setting('enabled_asciisvg') == 'true') {