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

Replace "api_get_path(WEB_PATH).'web/" with "WEB_PUBLIC_PATH"

Browse Source
pull/2487/head
jmontoyaa 8 years ago
parent cfaf50094e
commit a073656d9e
5 changed files with 16 additions and 15 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. 9
      main/document/showinframes.php
  2. 14
      main/inc/lib/api.lib.php
  3. 2
      main/inc/lib/javascript/chat/video.php
  4. 4
      main/inc/lib/template.lib.php
  5. 2
      src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/Basic.php

9
main/document/showinframes.php
Unescape View File

@ -173,6 +173,7 @@ $frameheight = 135;
if ($is_courseAdmin) {
$frameheight = 165;
}
$js_glossary_in_documents = '
$.frameReady(function(){
// $("<div>I am a div courses</div>").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"}
]

14
main/inc/lib/api.lib.php
Unescape View File

@ -6471,7 +6471,7 @@ function api_get_js($file) {
*/
function api_get_asset($file)
{
return '<script type="text/javascript" src="'.api_get_path(WEB_PATH).'web/assets/'.$file.'"></script>'."\n";
return '<script type="text/javascript" src="'.api_get_path(WEB_PUBLIC_PATH).'assets/'.$file.'"></script>'."\n";
}
/**
@ -6480,7 +6480,7 @@ function api_get_asset($file)
*/
function api_get_css_asset($file, $media = 'screen')
{
return '<link href="'.api_get_path(WEB_PATH).'web/assets/'.$file.'" rel="stylesheet" media="'.$media.'" type="text/css" />'."\n";
return '<link href="'.api_get_path(WEB_PUBLIC_PATH).'assets/'.$file.'" rel="stylesheet" media="'.$media.'" type="text/css" />'."\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

2
main/inc/lib/javascript/chat/video.php
Unescape View File

@ -35,7 +35,7 @@ if ($isSender) {
$idUserLocal = api_get_user_id();
$userLocal = api_get_user_info($idUserLocal, true);
$htmlHeadXtra[] = '<script type="text/javascript" src="'
. api_get_path(WEB_PATH) . 'web/assets/simpleWebRTC/latest-v2.js'
. api_get_path(WEB_PUBLIC_PATH).'assets/simpleWebRTC/latest-v2.js'
. '"></script>' . "\n";
$navigator = api_get_navigator();

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

@ -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 .= '<script type="text/javascript" src="'.api_get_path(WEB_PATH).'web/assets/'.$file.'"></script>'."\n";
$js_file_to_string .= '<script type="text/javascript" src="'.api_get_path(WEB_PUBLIC_PATH).'assets/'.$file.'"></script>'."\n";
}
foreach ($js_files as $file) {

2
src/Chamilo/CoreBundle/Component/Editor/CkEditor/Toolbar/Basic.php
Unescape View File

@ -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') {

Write Preview
Loading…
Cancel
Save