Moving img files into web/ see #6903

main/inc/lib/api.lib.php

@@ -560,8 +560,8 @@ function api_get_path($path_type, $path = null) {
         SYS_COURSE_PATH         => 'data/',
         SYS_CSS_PATH            => 'web/ChamiloLMS/css/',
         SYS_LANG_PATH           => 'lang/',
-        WEB_IMG_PATH            => 'img/',
-        SYS_IMG_PATH            => 'img/',
+        WEB_IMG_PATH            => 'web/ChamiloLMS/img/',
+        SYS_IMG_PATH            => 'web/ChamiloLMS/img/',
         WEB_CSS_PATH            => 'web/ChamiloLMS/css/',
         SYS_PLUGIN_PATH         => 'plugin/',
         WEB_PLUGIN_PATH         => 'plugin/',
@@ -678,7 +678,7 @@ function api_get_path($path_type, $path = null) {
         $paths[SYS_TEMPLATE_PATH]       = $paths[SYS_CODE_PATH].$paths[SYS_TEMPLATE_PATH];
         $paths[SYS_CSS_PATH]            = $paths[SYS_PATH].$paths[SYS_CSS_PATH];
         $paths[WEB_CSS_PATH]            = $paths[WEB_PATH].$paths[WEB_CSS_PATH];
-        $paths[WEB_IMG_PATH]            = $paths[WEB_CODE_PATH].$paths[WEB_IMG_PATH];
+        $paths[WEB_IMG_PATH]            = $paths[WEB_PATH].$paths[WEB_IMG_PATH];
         $paths[SYS_IMG_PATH]            = $paths[SYS_PATH].$paths[SYS_IMG_PATH];
 
         $paths[WEB_LIBRARY_PATH]        = $paths[WEB_CODE_PATH].$paths[WEB_LIBRARY_PATH];

main/inc/lib/display.lib.php

@@ -796,8 +796,8 @@ class Display
         $return_only_path = false
     ) {
 
-        $code_path   = api_get_path(SYS_CODE_PATH);
-        $w_code_path = api_get_path(WEB_CODE_PATH);
+        $code_path   = api_get_path(SYS_IMG_PATH);
+        $w_code_path = api_get_path(WEB_IMG_PATH);
 
         $image      = trim($image);
         $theme      = 'css/'.api_get_visual_theme().'/icons/';
@@ -811,14 +811,15 @@ class Display
         }
 
         // Checking the theme icons folder example: main/css/chamilo/icons/XXX
+
         if (is_file($code_path.$theme.$size_extra.$image)) {
             $icon = $w_code_path.$theme.$size_extra.$image;
-        } elseif (is_file($code_path.'img/icons/'.$size_extra.$image)) {
+        } elseif (is_file($code_path.'icons/'.$size_extra.$image)) {
             //Checking the main/img/icons/XXX/ folder
-            $icon = $w_code_path.'img/icons/'.$size_extra.$image;
+            $icon = $w_code_path.'icons/'.$size_extra.$image;
         } else {
             //Checking the img/ folder
-            $icon = $w_code_path.'img/'.$image;
+            $icon = $w_code_path.$image;
         }
 
         $icon = api_get_cdn_path($icon);

main/template/jquery_mobile/link/index.tpl

@@ -2,24 +2,24 @@
 {{javascript}}
 
 <script type="text/javascript">
-    
+
     {% if is_allowed_to_edit %}
         var sec_token = '{{sec_token}}';
     {% endif %}
-    
+
 $(function() {
 	$('.collapsible .head').click(function(e) {
         $(this).toggleClass('collapsed');
         $(this).next().toggle();
 		return true;
 	});
-    
+
     {% if is_allowed_to_edit %}
         $(".categories.sortable" ).sortable({
             axis: 'y',
             handle: '.handle',
             //placeholder: 'ui-state-highlight',
-            update: function(event, ui) { 
+            update: function(event, ui) {
                 var c_id = 0;
                 var ids = [];
                 var items;
@@ -27,8 +27,8 @@ $(function() {
                 items.each(function(index, li){
                     li = $(li);
                     var id;
-                    id = li.attr('data-id'); 
-                    c_id = li.attr('data-c_id'); 
+                    id = li.attr('data-id');
+                    c_id = li.attr('data-c_id');
                     ids.push(id);
                 });
 
@@ -40,7 +40,7 @@ $(function() {
         $(".links.sortable" ).sortable({
             axis: 'y',
             placeholder: 'ui-state-highlight',
-            update: function(event, ui) { 
+            update: function(event, ui) {
                 var c_id = 0;
                 var ids = [];
                 var items;
@@ -48,8 +48,8 @@ $(function() {
                 items.each(function(index, li){
                     li = $(li);
                     var id;
-                    id = li.attr('data-id'); 
-                    c_id = li.attr('data-c_id'); 
+                    id = li.attr('data-id');
+                    c_id = li.attr('data-c_id');
                     ids.push(id);
                 });
 
@@ -57,27 +57,27 @@ $(function() {
             }
         });
         $(".links.sortable" ).disableSelection();
-    
+
     {% endif %}
-    
+
 });
- 
+
  function expand_all(){
     $('.collapsible .head').removeClass('collapsed').next().show();
  }
- 
- function collapse_all(){     
+
+ function collapse_all(){
     $('.collapsible .head').addClass('collapsed').next().hide();
  }
- 
- function delete_category(name){   
+
+ function delete_category(name){
     if(!confirm("{{'ConfirmYourChoice'|get_lang}}")){
         return false;
-    } 
+    }
 
     var item = $('#'+name);
-    var id = item.attr('data-id'); 
-    var c_id = item.attr('data-c_id'); 
+    var id = item.attr('data-id');
+    var c_id = item.attr('data-c_id');
 
     var f = function(data){
         if(data.success){
@@ -87,12 +87,12 @@ $(function() {
     };
     LinkCategory.del(c_id, id, f);
  }
- 
+
  function delete_all(){
     if(!confirm("{{'ConfirmYourChoice'|get_lang}}")){
         return false;
-    } 
-    
+    }
+
     var f = function(data){
         if(data.success){
             var item = $('.data');
@@ -101,22 +101,22 @@ $(function() {
         message.update(data);
     };
     Link.delete_by_course({{c_id}}, {{session_id}}, f);
-    
+
  }
- 
- function delete_link(name, btn){   
+
+ function delete_link(name, btn){
     if(!confirm("{{'ConfirmYourChoice'|get_lang}}")){
         return false;
-    } 
+    }
 
     var item = $('#'+name);
-    var id = item.attr('data-id'); 
-    var c_id = item.attr('data-c_id'); 
+    var id = item.attr('data-id');
+    var c_id = item.attr('data-c_id');
 
     var f = function(data){
         if(data.success){
             item.remove();
-        }else{            
+        }else{
             $(btn).removeClass("loading");
         }
         message.update(data);
@@ -124,12 +124,12 @@ $(function() {
     $(btn).addClass("loading");
     Link.del(c_id, id, f);
  }
- 
+
 function switch_li_visibility(name, btn)
 {
     var li = $('#'+name);
-    var id = li.attr('data-id'); 
-    var c_id = li.attr('data-c_id'); 
+    var id = li.attr('data-id');
+    var c_id = li.attr('data-c_id');
 
     var is_visible = !li.hasClass('invisible')
 
@@ -161,9 +161,9 @@ function switch_li_visibility(name, btn)
 
 function validate_link(name, btn){
     var li = $('#'+name);
-    var id = li.attr('data-id'); 
-    var c_id = li.attr('data-c_id'); 
-    
+    var id = li.attr('data-id');
+    var c_id = li.attr('data-c_id');
+
     var f = function(data){
         if(data.success){
             li.addClass('valid');
@@ -229,10 +229,10 @@ function validate_link(name, btn){
 
             <li id="link_{{link.id}}" class="link {{link_class}}" data-id="{{link.id}}" data-c_id="{{link.c_id}}" data-type="link" >
                 <a class="icon" target="{{link.target}}" href="{{root}}&amp;action=go&amp;id={{link.id}}&amp;c_id={{link.c_id}}">
-                    <img alt="{{'Links'|get_lang}}" src="../../main/img/link.gif" />        
+                    <img alt="{{'Links'|get_lang}}" src="{{ _p.web_img_path }}link.gif" />
                 </a>
                 <a class="title" target="{{link.target}}" href="{{root}}&amp;action=go&amp;id={{link.id}}&amp;c_id={{link.c_id}}">
-                    {%if link.title %}{{link.title}}{% else %}{{link.url}}{%endif%}                
+                    {%if link.title %}{{link.title}}{% else %}{{link.url}}{%endif%}
                 </a>
                 {% if link.session_id %}
                     {{session_image}}
@@ -240,19 +240,19 @@ function validate_link(name, btn){
                 <div class="status" style="display:inline-block;">&nbsp;</div>
                 {% if is_allowed_to_edit %}
                     <div style="float:right;">
-                        <a href="javascript:void(0)" onclick="validate_link('link_{{link.id}}', this);return false;" 
-                        title="{{'CheckURL'|get_lang}}" 
+                        <a href="javascript:void(0)" onclick="validate_link('link_{{link.id}}', this);return false;"
+                        title="{{'CheckURL'|get_lang}}"
                         class="btn validate_link">
-                            
-                        </a>   
-                        <a href="{{root}}&amp;action=edit_link&amp;id={{link.id}}&amp;c_id={{link.c_id}}" 
-                        title="{{'Edit'|get_lang}}" 
+
+                        </a>
+                        <a href="{{root}}&amp;action=edit_link&amp;id={{link.id}}&amp;c_id={{link.c_id}}"
+                        title="{{'Edit'|get_lang}}"
                         class="">
                             <i class="size-22 icon-edit"></i>
-                        </a>   
-                        <a href="javascript:void(0)" onclick="switch_li_visibility('link_{{link.id}}', this);return false;" 
+                        </a>
+                        <a href="javascript:void(0)" onclick="switch_li_visibility('link_{{link.id}}', this);return false;"
                         class="btn visibility {%if link.visibility == 1%}hide{%else%}show{%endif%}">
-                            
+
                         </a>
                         <a href="javascript:void(0)" onclick="delete_link('link_{{link.id}}', this);return false;" title="{{'Delete'|get_lang}}" class="">
                             <i class="size-22 icon-delete"></i>
@@ -267,17 +267,17 @@ function validate_link(name, btn){
     <ul id="link_categories" class="categories sortable" style="list-style: none; margin-left:0;">
     {% for category in categories %}
         <li id="category_{{category.id}}" class="link_category collapsible" data-id="{{category.id}}" data-c_id="{{category.c_id}}" data-type="category" >
-            <div class="head handle collapsed">    
+            <div class="head handle collapsed">
                 {% if is_allowed_to_edit %}
                     <div style="float:right;">
-                        <a href="{{root}}&amp;action=edit_category&amp;id={{category.id}}&amp;c_id={{category.c_id}}" 
-                        onclick="event.stopPropagation();" 
+                        <a href="{{root}}&amp;action=edit_category&amp;id={{category.id}}&amp;c_id={{category.c_id}}"
+                        onclick="event.stopPropagation();"
                         title="{{'Edit'|get_lang}}"
                         class="">
                             <i class="size-22 icon-edit"></i>
-                        </a>            
-                        <a href="javascript:void(0)" 
-                        onclick="delete_category('category_{{category.id}}');event.stopPropagation();return false;" 
+                        </a>
+                        <a href="javascript:void(0)"
+                        onclick="delete_category('category_{{category.id}}');event.stopPropagation();return false;"
                             title="{{'Delete'|get_lang}}"
                             class="">
                             <i class="size-22 icon-delete"></i>
@@ -289,7 +289,7 @@ function validate_link(name, btn){
                 </h3>
                 {{category.description}}
             </div>
-            <div class="body" style="display:none;"> 
+            <div class="body" style="display:none;">
                 <ul style="list-style: none; margin-left:0;" class="links sortable">
                     {% for link in category.links %}
                     {% set link_class %}
@@ -301,10 +301,10 @@ function validate_link(name, btn){
 
                         <li id="link_{{link.id}}" class="link {{link_class}}" data-id="{{link.id}}" data-c_id="{{link.c_id}}" data-type="link" >
                             <a class="icon" target="{{link.target}}" href="{{root}}&amp;action=go&amp;id={{link.id}}&amp;c_id={{link.c_id}}">
-                                <img alt="{{'Links'|get_lang}}" src="../../main/img/link.gif" />        
+                                <img alt="{{'Links'|get_lang}}" src="{{ _p.web_img_path }}link.gif" />
                             </a>
                             <a class ="title" target="{{link.target}}" href="{{root}}&amp;action=go&amp;id={{link.id}}&amp;c_id={{link.c_id}}">
-                                {%if link.title %}{{link.title}}{% else %}{{link.url}}{%endif%}                
+                                {%if link.title %}{{link.title}}{% else %}{{link.url}}{%endif%}
                             </a>
                             {% if link.session_id %}
                                 {{session_image}}
@@ -312,20 +312,20 @@ function validate_link(name, btn){
                             <div class="status" style="display:inline-block;">&nbsp;</div>
                             {% if is_allowed_to_edit %}
                                 <div style="float:right;">
-                                    <a href="javascript:void(0)" onclick="validate_link('link_{{link.id}}', this);return false;" 
-                                    title="{{'CheckURL'|get_lang}}" 
-                                    class="btn validate_link"></a>   
-                                    <a href="{{root}}&amp;action=edit_link&amp;id={{link.id}}&amp;c_id={{link.c_id}}" 
-                                    onclick="" 
+                                    <a href="javascript:void(0)" onclick="validate_link('link_{{link.id}}', this);return false;"
+                                    title="{{'CheckURL'|get_lang}}"
+                                    class="btn validate_link"></a>
+                                    <a href="{{root}}&amp;action=edit_link&amp;id={{link.id}}&amp;c_id={{link.c_id}}"
+                                    onclick=""
                                     title="{{'Edit'|get_lang}}"
                                     class="">
                                         <i class="size-22 icon-edit"></i>
-                                    </a>   
-                                    <a href="javascript:void(0)" 
-                                    onclick="switch_li_visibility('link_{{link.id}}', this);return false;" 
+                                    </a>
+                                    <a href="javascript:void(0)"
+                                    onclick="switch_li_visibility('link_{{link.id}}', this);return false;"
                                     class="btn visibility {%if link.visibility == 1%}hide{%else%}show{%endif%}"></a>
-                                    <a href="javascript:void(0)" 
-                                    onclick="delete_link('link_{{link.id}}', this);return false;" 
+                                    <a href="javascript:void(0)"
+                                    onclick="delete_link('link_{{link.id}}', this);return false;"
                                     title="{{'Delete'|get_lang}}"
                                     class="">
                                         <i class="size-22 icon-delete"></i>
@@ -340,4 +340,4 @@ function validate_link(name, btn){
         </li>
     {% endfor%}
     </ul>
-</div>
+</div>

main/template/jquery_mobile/userportal/course_item.tpl

@@ -5,7 +5,7 @@
                 <div class="span1 course-box-thumbnail-box">
                     <div class="thumbnail">
                         {{ item.image }}
-                        <img src="http://localhost/chamilo11/main/img/icons/48/folder_yellow.png" alt="aaa" title="aaa">
+                        <img src="{{ _p.web_img_path }}icons/48/folder_yellow.png" alt="aaa" title="aaa">
                     </div>
                 </div>
                 <div class="span6 table_user_course_category course-box-text">
@@ -25,14 +25,14 @@
             <div class="row">
                 <div class="span1 course-box-thumbnail-box">
                     <a class="thumbnail" href="http://localhost/chamilo11/courses/AAAMATHS/?id_session=0">
-                        <img src="http://localhost/chamilo11/main/img/icons/48/blackboard.png" alt="aaa Maths" title="aaa Maths"></a>
+                        <img src="{{ _p.web_img_path }}icons/48/blackboard.png" alt="aaa Maths" title="aaa Maths"></a>
                     </div>
                         <div class="span6  course-box-text">
                         <h3>
                             <a href="http://localhost/chamilo11/courses/AAAMATHS/?id_session=0"> aaa Maths</a>&nbsp;
                         </h3>
                         <h5>
-                            <img src="http://localhost/chamilo11/main/img/icons/16/teacher.png" alt="Trainer" title="Trainer">
+                            <img src="{{ _p.web_img_path }}icons/16/teacher.png" alt="Trainer" title="Trainer">
                                 <a class="ajax" href="http://localhost/chamilo11/main/inc/ajax/user_manager.ajax.php?a=get_user_popup&amp;resizable=0&amp;height=300&amp;user_id=1"> John Doe</a>
                         </h5>
                         </div>
@@ -40,8 +40,8 @@
         </div>
         <div class="span1 pull-right course-box-actions">
             <a href="http://localhost/chamilo11/main/course_info/infocours.php?cidReq=AAAMATHS">
-                <img src="http://localhost/chamilo11/main/img/icons/22/edit.png" alt="Edit" title="Edit" align="absmiddle">
+                <img src="{{ _p.web_img_path }}icons/22/edit.png" alt="Edit" title="Edit" align="absmiddle">
             </a>
         </div>
     </div>
-</div>
+</div>