Moving javascript files inside a "public" path see #6903

main/document/slideshow.php

@@ -472,7 +472,6 @@ if ($slide_id != 'all') {
 
 			 if (initial_height>height || initial_width>width) {
 				document.getElementById('image').style.visibility='hidden';
-				document.getElementById('td_image').style.background='url(../img/loadingAnimation.gif) center no-repeat';
 				document.getElementById('image').onload = resizeImage;
 			    window.onresize = resizeImage;
 			}

main/inc/lib/api.lib.php

@@ -12,7 +12,6 @@ use \ChamiloSession as Session;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
 
-
 /**
  * Constants declaration
  */
@@ -508,7 +507,7 @@ define('TOOL_ADMIN_VISIBLE',             'tooladminvisible');
  * api_get_path(SYS_CSS_PATH)                   /var/www/chamilo/main/css
  * api_get_path(INCLUDE_PATH)                   /var/www/chamilo/main/inc/
  * api_get_path(LIBRARY_PATH)                   /var/www/chamilo/main/inc/lib/
- * api_get_path(SYS_LIBRARY_JS_PATH)                /var/www/chamilo/main/inc/lib/javascript
+ * api_get_path(SYS_LIBRARY_JS_PATH)            /var/www/chamilo/web/ChamiloLMS/js
  * api_get_path(CONFIGURATION_PATH)             /var/www/chamilo/main/inc/conf/
  * api_get_path(SYS_LANG_PATH)                  /var/www/chamilo/main/lang/
  * api_get_path(SYS_PLUGIN_PATH)                /var/www/chamilo/plugin/
@@ -526,7 +525,7 @@ define('TOOL_ADMIN_VISIBLE',             'tooladminvisible');
  * api_get_path(WEB_IMG_PATH)                   http://www.mychamilo.org/chamilo/main/img/
  * api_get_path(WEB_CSS_PATH)                   http://www.mychamilo.org/chamilo/main/css/
  * api_get_path(WEB_LIBRARY_PATH)               http://www.mychamilo.org/chamilo/main/inc/lib/
- * api_get_path(WEB_LIBRARY_JS_PATH)            http://www.mychamilo.org/chamilo/main/inc/lib/javascript
+ * api_get_path(WEB_LIBRARY_JS_PATH)            http://www.mychamilo.org/chamilo/web/ChamiloLMS/javascript
  * api_get_path(WEB_TEMPLATE_PATH)              http://www.mychamilo.org/chamilo/main/template/
  *
  *
@@ -565,10 +564,10 @@ function api_get_path($path_type, $path = null) {
         WEB_ARCHIVE_PATH        => 'temp/',
         INCLUDE_PATH            => 'inc/',
         LIBRARY_PATH            => 'inc/lib/',
-        SYS_LIBRARY_JS_PATH     => 'inc/lib/javascript/',
+        SYS_LIBRARY_JS_PATH     => 'web/ChamiloLMS/js/',
         CONFIGURATION_PATH      => 'inc/conf/',
         WEB_LIBRARY_PATH        => 'inc/lib/',
-        WEB_LIBRARY_JS_PATH     => 'inc/lib/javascript/',
+        WEB_LIBRARY_JS_PATH     => 'web/ChamiloLMS/js/',
         WEB_AJAX_PATH           => 'inc/ajax/',
         SYS_TEST_PATH           => 'tests/',
         WEB_TEMPLATE_PATH       => 'template/',
@@ -665,7 +664,6 @@ function api_get_path($path_type, $path = null) {
         $paths[WEB_DEFAULT_COURSE_DOCUMENT_PATH] = $paths[WEB_DATA_PATH].'default_course_document/';
         $paths[REL_DEFAULT_COURSE_DOCUMENT_PATH] = $paths[REL_DATA_PATH].'default_course_document/';
 
-
         $paths[SYS_CODE_PATH]           = $root_sys.$code_folder;
 
         // Now we can switch into api_get_path() "terminology".
@@ -679,7 +677,8 @@ function api_get_path($path_type, $path = null) {
         $paths[WEB_CSS_PATH]            = $paths[WEB_CODE_PATH].$paths[WEB_CSS_PATH];
         $paths[WEB_IMG_PATH]            = $paths[WEB_CODE_PATH].$paths[WEB_IMG_PATH];
         $paths[WEB_LIBRARY_PATH]        = $paths[WEB_CODE_PATH].$paths[WEB_LIBRARY_PATH];
-        $paths[WEB_LIBRARY_JS_PATH]     = $paths[WEB_CODE_PATH].$paths[WEB_LIBRARY_JS_PATH];
+        //$paths[WEB_LIBRARY_JS_PATH]     = $paths[WEB_CODE_PATH].$paths[WEB_LIBRARY_JS_PATH];
+        $paths[WEB_LIBRARY_JS_PATH]     = $paths[WEB_PATH].$paths[WEB_LIBRARY_JS_PATH];
         $paths[WEB_AJAX_PATH]           = $paths[WEB_PUBLIC_PATH].'main/'.$paths[WEB_AJAX_PATH];
         $paths[WEB_PLUGIN_PATH]         = $paths[WEB_PATH].$paths[WEB_PLUGIN_PATH];
         $paths[WEB_ARCHIVE_PATH]        = $paths[WEB_PATH].$paths[WEB_ARCHIVE_PATH];

main/template/default/layout/footer.tpl

@@ -150,12 +150,27 @@ $("form").on("click", ' .advanced_parameters', function() {
     });
 });
 
-/** Makes row highlighting possible */
+
+// Support for AJAX loaded modal window.
+// Focuses on first input textbox after it loads the window.
+/*
+$('[data-toggle="modal"]').click(function(e) {
+    e.preventDefault();
+    var url = $(this).attr('href');
+    if (url.indexOf('#') == 0) {
+        $(url).modal('open');
+    } else {
+        $.get(url, function(data) {
+            $('<div class="modal hide fade">' + data + '</div>').modal();
+        }).success(function() { $('input:text:visible:first').focus(); });
+    }
+});*/
+
 $(document).ready( function() {
     /**
     * Advanced options
     * Usage
-     * <a id="link" href="url">Advanced</a>
+    * <a id="link" href="http://">Advanced</a>
     * <div id="link_options" style="display:none">
     *     hidden content :)
     * </div>
@@ -169,6 +184,11 @@ $(document).ready( function() {
         });
     });
 
+    /**
+     * <a class="advanced_options_open" href="http://" rel="div_id">Open</a>
+     * <a class="advanced_options_close" href="http://" rel="div_id">Close</a>
+     * <div id="div_id">Div content</div>
+     * */
     $(".advanced_options_open").on("click", function() {
         var id = $(this).attr('rel');
         $("#"+id).show();
@@ -179,6 +199,7 @@ $(document).ready( function() {
         $("#"+id).hide();
     });
 
+    // Tooltip.
     $(function() {
         $('a').tooltip({
             placement: 'right',
@@ -187,6 +208,7 @@ $(document).ready( function() {
         });
     });
 
+    /** Makes row highlighting possible */
 
     $('.advanced_parameters').addClass('btn-default');
     //$('.btn').addClass('btn-default');

main/template/default/skill/skill_tree.tpl

@@ -406,7 +406,6 @@ $(document).ready(function() {
     <div class="modal-body">
         <p style="text-align:center">
             {{ "Loading"|get_lang }}
-        <img src="{{ _p.web_img}}loadingAnimation.gif"/>
         </p>
     </div>
 </div>

main/template/jquery_mobile/skill/skill_tree.tpl

@@ -406,7 +406,6 @@ $(document).ready(function() {
     <div class="modal-body">
         <p style="text-align:center">
             {{ "Loading"|get_lang }}
-        <img src="{{ _p.web_img}}loadingAnimation.gif"/>
         </p>
     </div>
 </div>