Browse Source

Fix js/css/img paths

jmontoyaa 8 years ago
parent
commit
27c2ce6f68

+ 2 - 2
main/admin/user_list.php

@@ -47,7 +47,7 @@ function load_course_list (div_course,my_user_id) {
 	 $.ajax({
 		contentType: "application/x-www-form-urlencoded",
 		beforeSend: function(objeto) {
-            $("div#"+div_course).html("<img src=\'../inc/lib/javascript/indicator.gif\' />"); },
+            $("div#"+div_course).html("<img src=\''.Display::return_icon('indicator.gif', '', ICON_SIZE_SMALL, true, true).'\' />"); },
 		type: "POST",
 		url: "'.$url.'",
 		data: "user_id="+my_user_id,
@@ -63,7 +63,7 @@ function load_session_list(div_session, my_user_id) {
 	 $.ajax({
 		contentType: "application/x-www-form-urlencoded",
 		beforeSend: function(objeto) {
-            $("div#"+div_session).html("<img src=\'../inc/lib/javascript/indicator.gif\' />"); },
+            $("div#"+div_session).html("<img src=\''.Display::return_icon('indicator.gif', '', ICON_SIZE_SMALL, true, true).'\' />"); },
 		type: "POST",
 		url: "'.$urlSession.'",
 		data: "user_id="+my_user_id,

+ 2 - 2
main/admin/user_move_stats.php

@@ -554,7 +554,7 @@ $htmlHeadXtra[] = '<script type="text/javascript">
          $.ajax({
             contentType: "application/x-www-form-urlencoded",
             beforeSend: function(objeto) {
-            $("div#reponse_"+unique_id).html("<img src=\'../inc/lib/javascript/indicator.gif\' />"); },
+            $("div#reponse_"+unique_id).html("<img src=\''.Display::return_icon('indicator.gif', '', ICON_SIZE_SMALL, true, true).'\' />"); },
             type: "POST",
             url: "user_move_stats.php",
             data: "load_ajax=1"+"&unique_id="+unique_id+"&user_id="+user_id+"&session_id="+session_id,
@@ -569,7 +569,7 @@ $htmlHeadXtra[] = '<script type="text/javascript">
          $.ajax({
             contentType: "application/x-www-form-urlencoded",
             beforeSend: function(objeto) {
-            $("div#reponse_"+unique_id).html("<img src=\'../inc/lib/javascript/indicator.gif\' />"); },
+            $("div#reponse_"+unique_id).html("<img src=\''.Display::return_icon('indicator.gif', '', ICON_SIZE_SMALL, true, true).'\' />"); },
             type: "POST",
             url: "user_move_stats.php",
             data: "load_ajax=1&view_stat=1"+"&unique_id="+unique_id+"&user_id="+user_id+"&session_id="+session_id,

+ 9 - 29
main/chat/chat.php

@@ -1,43 +1,23 @@
 <?php
 /* For licensing terms, see /license.txt */
 
-define('CHAMILO_LOAD_WYSIWYG', false);
-
 require_once __DIR__.'/../inc/global.inc.php';
 
 api_protect_course_script(true);
 
 Event::event_access_tool(TOOL_CHAT);
 
-// View
-$externalCSS = [
-    'jquery-emojiarea/jquery.emojiarea.css',
-    'jquery-textcomplete/jquery.textcomplete.css',
-    'emojione/css/emojione.min.css',
-    'emojione/css/autocomplete.css',
-    'highlight/styles/github.css'
-];
-
-foreach ($externalCSS as $css) {
-    $htmlHeadXtra[] = api_get_css(api_get_path(WEB_LIBRARY_JS_PATH) . $css);
-}
-
-$htmlHeadXtra[] = api_get_css(api_get_path(WEB_CSS_PATH) . 'chat.css');
-$htmlHeadXtra[] = api_get_css(api_get_path(WEB_CSS_PATH) . 'markdown.css');
-
-$externalJS = [
-    'highlight/highlight.pack.js',
-    'jquery-textcomplete/jquery.textcomplete.js',
-    'emojione/js/emojione.min.js',
-    'jquery-emojiarea/jquery.emojiarea.js'
-];
-
-foreach ($externalJS as $js) {
-    $htmlHeadXtra[] = api_get_js($js);
-}
+$htmlHeadXtra[] = api_get_css_asset('emojione/assets/css/emojione.min.css');
+$htmlHeadXtra[] = api_get_css_asset('jquery-emojiarea/jquery.emojiarea.css');
+$htmlHeadXtra[] = api_get_css_asset('highlight.js.origin/src/styles/github.css');
+$htmlHeadXtra[] = api_get_css('css/chat.css');
+$htmlHeadXtra[] = api_get_css('css/markdown.css');
+$htmlHeadXtra[] = api_get_asset('highlight.js.origin/src/highlight.js');
+$htmlHeadXtra[] = api_get_asset('jquery-textcomplete/dist/jquery.textcomplete.js');
+$htmlHeadXtra[] = api_get_asset('emojionearea/dist/emojionearea.js');
+$htmlHeadXtra[] = api_get_asset('emojione/lib/js/emojione.min.js');
 
 $iconList = [];
-
 foreach (Emojione\Emojione::$shortcode_replace as $key => $icon) {
     if (!in_array($key, CourseChatUtils::getEmojisToInclude())) {
         continue;

+ 3 - 3
main/course_home/activity.php

@@ -51,9 +51,9 @@ if ($enabled === 'true') {
 if ($session_id === 0 && api_is_course_admin() && api_is_allowed_to_edit(null, true)) {
     $content .=  '<div class="alert alert-success" style="border:0px; margin-top: 0px;padding:0px;">
 		<div class="normal-message" id="id_normal_message" style="display:none">';
-    $content .=  '<img src="'.api_get_path(WEB_PATH).'main/inc/lib/javascript/indicator.gif"/>&nbsp;&nbsp;';
-    $content .=  get_lang('PleaseStandBy');
-    $content .=  '</div>
+    $content .= Display::return_icon('indicator.gif').'&nbsp;&nbsp;';
+    $content .= get_lang('PleaseStandBy');
+    $content .= '</div>
 		<div class="alert alert-success" id="id_confirmation_message" style="display:none"></div>
 	</div>';
 

+ 1 - 1
main/course_home/vertical_activity.php

@@ -57,7 +57,7 @@ if (api_is_platform_admin()) {
 if (api_is_allowed_to_edit(null, true) && !api_is_coach()) {
     $content .=  '<div class="courseadminview" style="border:0px; margin-top: 0px;padding:5px;">
     <div class="normal-message" id="id_normal_message" style="display:none">';
-        $content .=  '<img src="'.api_get_path(WEB_PATH).'main/inc/lib/javascript/indicator.gif"/>&nbsp;&nbsp;';
+        $content .=  Display::return_icon('indicator.gif').'&nbsp;&nbsp;';
         $content .=  get_lang('PleaseStandBy');
 
     $content .=  '</div>

+ 1 - 1
main/course_info/maintenance.php

@@ -42,7 +42,7 @@ echo Display::page_header($nameTools);
 <div class="sectiontitle"><?php Display::display_icon('tool_delete.gif', get_lang('recycle_course')); ?>&nbsp;&nbsp;<a href="../coursecopy/recycle_course.php?<?php echo api_get_cidreq(); ?>"><?php echo get_lang('recycle_course'); ?></a></div>
 <div class="sectioncomment"><?php echo get_lang('DescriptionRecycleCourse'); ?></div>
 
-<div class="sectiontitle"><?php Display::display_icon('delete.gif', get_lang('DelCourse')); ?>&nbsp;&nbsp;<a href="../course_info/delete_course.php?<?php echo api_get_cidreq(); ?>"><?php echo get_lang('DelCourse'); ?></a></div>
+<div class="sectiontitle"><?php Display::display_icon('delete.png', get_lang('DelCourse')); ?>&nbsp;&nbsp;<a href="../course_info/delete_course.php?<?php echo api_get_cidreq(); ?>"><?php echo get_lang('DelCourse'); ?></a></div>
 <div class="sectioncomment"><?php echo get_lang('DescriptionDeleteCourse');	?></div>
 
 <?php

+ 1 - 1
main/coursecopy/copy_course_session.php

@@ -227,7 +227,7 @@ $xajax->processRequests();
 
 /* HTML head extra */
 
-$htmlHeadXtra[] = $xajax->getJavascript( api_get_path(WEB_LIBRARY_PATH).'xajax/');
+$htmlHeadXtra[] = $xajax->getJavascript();
 $htmlHeadXtra[] = '<script>
 function checkSelected(id_select,id_radio,id_title,id_destination) {
    var num=0;

+ 1 - 3
main/coursecopy/copy_course_session_selected.php

@@ -234,9 +234,7 @@ $xajax->processRequests();
 
 /* HTML head extra */
 
-$htmlHeadXtra[] = $xajax->getJavascript(
-    api_get_path(WEB_LIBRARY_PATH) . 'xajax/'
-);
+$htmlHeadXtra[] = $xajax->getJavascript();
 $htmlHeadXtra[] = '<script>
 	function checkSelected(id_select,id_radio,id_title,id_destination) {
         var num=0;

+ 1 - 1
main/inc/lib/svg-edit/svg-editor.php

@@ -11,7 +11,7 @@ api_block_anonymous_users();
 if (!isset($_SESSION['draw_dir'])) {
     die();
 }
-$svgEditPath = api_get_path(WEB_LIBRARY_PATH).'javascript/svgedit/';
+$svgEditPath = api_get_path(WEB_LIBRARY_JS_PATH).'svgedit/';
 ?>
 <!DOCTYPE html>
 <html>