Browse Source

Moving icons from img/ to default icon folder icons/22

jmontoya 9 years ago
parent
commit
040f6ede2b
100 changed files with 3 additions and 40 deletions
  1. 3 40
      main/inc/lib/display.lib.php
  2. BIN
      src/Chamilo/CoreBundle/Resources/public/img/0.gif
  3. BIN
      src/Chamilo/CoreBundle/Resources/public/img/1.gif
  4. BIN
      src/Chamilo/CoreBundle/Resources/public/img/2rightarrow.gif
  5. BIN
      src/Chamilo/CoreBundle/Resources/public/img/ButtonGallOn.png
  6. BIN
      src/Chamilo/CoreBundle/Resources/public/img/ButtonListOff.png
  7. BIN
      src/Chamilo/CoreBundle/Resources/public/img/ButtonListOn.png
  8. BIN
      src/Chamilo/CoreBundle/Resources/public/img/accept_invitation.png
  9. BIN
      src/Chamilo/CoreBundle/Resources/public/img/action_first.png
  10. BIN
      src/Chamilo/CoreBundle/Resources/public/img/action_first_na.png
  11. BIN
      src/Chamilo/CoreBundle/Resources/public/img/action_last.png
  12. BIN
      src/Chamilo/CoreBundle/Resources/public/img/action_last_na.png
  13. BIN
      src/Chamilo/CoreBundle/Resources/public/img/action_prev.png
  14. BIN
      src/Chamilo/CoreBundle/Resources/public/img/action_prev_na.png
  15. BIN
      src/Chamilo/CoreBundle/Resources/public/img/add.gif
  16. BIN
      src/Chamilo/CoreBundle/Resources/public/img/add_multiple_users.gif
  17. BIN
      src/Chamilo/CoreBundle/Resources/public/img/add_na.gif
  18. BIN
      src/Chamilo/CoreBundle/Resources/public/img/add_normal_user.png
  19. BIN
      src/Chamilo/CoreBundle/Resources/public/img/add_teacher_big.gif
  20. BIN
      src/Chamilo/CoreBundle/Resources/public/img/add_user.gif
  21. BIN
      src/Chamilo/CoreBundle/Resources/public/img/add_user_big.gif
  22. BIN
      src/Chamilo/CoreBundle/Resources/public/img/add_user_field_howto.png
  23. BIN
      src/Chamilo/CoreBundle/Resources/public/img/addd.gif
  24. BIN
      src/Chamilo/CoreBundle/Resources/public/img/admin_star.png
  25. BIN
      src/Chamilo/CoreBundle/Resources/public/img/admins.gif
  26. BIN
      src/Chamilo/CoreBundle/Resources/public/img/agenda.gif
  27. BIN
      src/Chamilo/CoreBundle/Resources/public/img/alt_star.gif
  28. BIN
      src/Chamilo/CoreBundle/Resources/public/img/alt_star.png
  29. BIN
      src/Chamilo/CoreBundle/Resources/public/img/anim-frame2.gif
  30. BIN
      src/Chamilo/CoreBundle/Resources/public/img/anim-frame3.gif
  31. BIN
      src/Chamilo/CoreBundle/Resources/public/img/anim-loader.gif
  32. BIN
      src/Chamilo/CoreBundle/Resources/public/img/announce_add.gif
  33. BIN
      src/Chamilo/CoreBundle/Resources/public/img/announcement.png
  34. BIN
      src/Chamilo/CoreBundle/Resources/public/img/archive.png
  35. BIN
      src/Chamilo/CoreBundle/Resources/public/img/arrow-left.png
  36. BIN
      src/Chamilo/CoreBundle/Resources/public/img/arrow-right.png
  37. BIN
      src/Chamilo/CoreBundle/Resources/public/img/arrow_down_0.gif
  38. BIN
      src/Chamilo/CoreBundle/Resources/public/img/arrow_down_1.png
  39. BIN
      src/Chamilo/CoreBundle/Resources/public/img/arrow_down_2.gif
  40. BIN
      src/Chamilo/CoreBundle/Resources/public/img/arrow_down_2.png
  41. BIN
      src/Chamilo/CoreBundle/Resources/public/img/arrow_up_0.gif
  42. BIN
      src/Chamilo/CoreBundle/Resources/public/img/arrow_up_0.png
  43. BIN
      src/Chamilo/CoreBundle/Resources/public/img/arrow_up_1.gif
  44. BIN
      src/Chamilo/CoreBundle/Resources/public/img/arrow_up_2.png
  45. BIN
      src/Chamilo/CoreBundle/Resources/public/img/asterisk_prerequisites.gif
  46. BIN
      src/Chamilo/CoreBundle/Resources/public/img/attachment.gif
  47. BIN
      src/Chamilo/CoreBundle/Resources/public/img/attendance_na.gif
  48. BIN
      src/Chamilo/CoreBundle/Resources/public/img/audio.gif
  49. BIN
      src/Chamilo/CoreBundle/Resources/public/img/audio_question_na.png
  50. BIN
      src/Chamilo/CoreBundle/Resources/public/img/back.png
  51. BIN
      src/Chamilo/CoreBundle/Resources/public/img/background_message.png
  52. BIN
      src/Chamilo/CoreBundle/Resources/public/img/backup.gif
  53. BIN
      src/Chamilo/CoreBundle/Resources/public/img/backup_na.gif
  54. BIN
      src/Chamilo/CoreBundle/Resources/public/img/bar_1.gif
  55. BIN
      src/Chamilo/CoreBundle/Resources/public/img/bar_1m.gif
  56. BIN
      src/Chamilo/CoreBundle/Resources/public/img/blackboard_blue.png
  57. BIN
      src/Chamilo/CoreBundle/Resources/public/img/blanco.png
  58. BIN
      src/Chamilo/CoreBundle/Resources/public/img/blank.gif
  59. BIN
      src/Chamilo/CoreBundle/Resources/public/img/blog.gif
  60. BIN
      src/Chamilo/CoreBundle/Resources/public/img/blog_admin.gif
  61. BIN
      src/Chamilo/CoreBundle/Resources/public/img/blog_article.png
  62. BIN
      src/Chamilo/CoreBundle/Resources/public/img/blog_na.gif
  63. BIN
      src/Chamilo/CoreBundle/Resources/public/img/blog_new.gif
  64. BIN
      src/Chamilo/CoreBundle/Resources/public/img/blog_newarticle.gif
  65. BIN
      src/Chamilo/CoreBundle/Resources/public/img/blog_newtasks.gif
  66. BIN
      src/Chamilo/CoreBundle/Resources/public/img/blog_task.gif
  67. BIN
      src/Chamilo/CoreBundle/Resources/public/img/blog_user.gif
  68. BIN
      src/Chamilo/CoreBundle/Resources/public/img/bmp.gif
  69. BIN
      src/Chamilo/CoreBundle/Resources/public/img/boxmygroupscontent.jpg
  70. BIN
      src/Chamilo/CoreBundle/Resources/public/img/briefcase_small.png
  71. BIN
      src/Chamilo/CoreBundle/Resources/public/img/btn_next.png
  72. BIN
      src/Chamilo/CoreBundle/Resources/public/img/btn_previous.png
  73. BIN
      src/Chamilo/CoreBundle/Resources/public/img/btn_stats.png
  74. BIN
      src/Chamilo/CoreBundle/Resources/public/img/bug.large.png
  75. BIN
      src/Chamilo/CoreBundle/Resources/public/img/bullet_blue.gif
  76. BIN
      src/Chamilo/CoreBundle/Resources/public/img/bullet_green.gif
  77. BIN
      src/Chamilo/CoreBundle/Resources/public/img/bullet_grey.gif
  78. BIN
      src/Chamilo/CoreBundle/Resources/public/img/bullet_orange.gif
  79. BIN
      src/Chamilo/CoreBundle/Resources/public/img/buoy.gif
  80. BIN
      src/Chamilo/CoreBundle/Resources/public/img/c.gif
  81. BIN
      src/Chamilo/CoreBundle/Resources/public/img/calculated_answer.png
  82. BIN
      src/Chamilo/CoreBundle/Resources/public/img/calendar_add.gif
  83. BIN
      src/Chamilo/CoreBundle/Resources/public/img/calendar_add.png
  84. BIN
      src/Chamilo/CoreBundle/Resources/public/img/calendar_day.gif
  85. BIN
      src/Chamilo/CoreBundle/Resources/public/img/calendar_down.gif
  86. BIN
      src/Chamilo/CoreBundle/Resources/public/img/calendar_global.png
  87. BIN
      src/Chamilo/CoreBundle/Resources/public/img/calendar_month.gif
  88. BIN
      src/Chamilo/CoreBundle/Resources/public/img/calendar_personal.gif
  89. BIN
      src/Chamilo/CoreBundle/Resources/public/img/calendar_personal_add.gif
  90. BIN
      src/Chamilo/CoreBundle/Resources/public/img/calendar_select.gif
  91. BIN
      src/Chamilo/CoreBundle/Resources/public/img/calendar_up.gif
  92. BIN
      src/Chamilo/CoreBundle/Resources/public/img/calendar_week.gif
  93. BIN
      src/Chamilo/CoreBundle/Resources/public/img/canvas1024x768.png
  94. BIN
      src/Chamilo/CoreBundle/Resources/public/img/canvas1920x1080.png
  95. BIN
      src/Chamilo/CoreBundle/Resources/public/img/canvas800x600.png
  96. BIN
      src/Chamilo/CoreBundle/Resources/public/img/cd.gif
  97. BIN
      src/Chamilo/CoreBundle/Resources/public/img/cd_gray.gif
  98. BIN
      src/Chamilo/CoreBundle/Resources/public/img/certificate-logo.png
  99. BIN
      src/Chamilo/CoreBundle/Resources/public/img/chat.gif
  100. BIN
      src/Chamilo/CoreBundle/Resources/public/img/chat_little.gif

+ 3 - 40
main/inc/lib/display.lib.php

@@ -136,7 +136,7 @@ class Display
         return null;
         echo self::$global_template->show_footer_template();
     }
-    
+
     /**
      * Display the page footer
      */
@@ -892,25 +892,12 @@ class Display
         $return_only_path = false,
         $loadThemeIcon = true
     ) {
-        $code_path = api_get_path(SYS_IMG_PATH);
-        $w_code_path = api_get_path(WEB_CODE_PATH);
-        $alternateCssPath = api_get_path(SYS_CSS_PATH);
-        $alternateWebCssPath = api_get_path(WEB_CSS_PATH);
-
         $image = trim($image);
         $size_extra = '';
-
         if (isset($size)) {
-            $size = intval($size);
             $size_extra = $size . '/';
-        } else {
-            $size = ICON_SIZE_SMALL;
         }
-
-        // Checking the img/ folder
-        $icon = $w_code_path.'img/'.$image;
-
-        $theme = 'themes/chamilo/icons/';
+        /*$theme = 'themes/chamilo/icons/';
 
         if ($loadThemeIcon) {
             $theme = 'themes/' . api_get_visual_theme() . '/icons/';
@@ -921,35 +908,11 @@ class Display
             //Checking the main/img/icons/XXX/ folder
                 $icon = $w_code_path.'img/icons/'.$size_extra.$image;
             }
-        }
-
-        // Special code to enable SVG - refs #7359 - Needs more work
-        // The code below does something else to "test out" SVG: for each icon,
-        // it checks if there is an SVG version. If so, it uses it.
-        // When moving this to production, the return_icon() calls should
-        // ask for the SVG version directly
-        $testServer = api_get_setting('server_type');
-        /*if ($testServer == 'test' && $return_only_path == false) {
-            $svgImage = substr($image, 0, -3) . 'svg';
-            if (is_file($code_path . $theme . 'svg/' . $svgImage)) {
-                $icon = $w_code_path . $theme . 'svg/' . $svgImage;
-            } elseif (is_file($code_path . 'img/icons/svg/' . $svgImage)) {
-                $icon = $w_code_path . 'img/icons/svg/' . $svgImage;
-            }
-
-            if (empty($additional_attributes['height'])) {
-                $additional_attributes['height'] = $size;
-            }
-            if (empty($additional_attributes['width'])) {
-                $additional_attributes['width'] = $size;
-            }
         }*/
 
-        $icon = 'bundles/chamilocore/img/'.$icon;
+        $icon = 'bundles/chamilocore/img/icons/'.$size_extra.$image;
         $icon = Container::getAsset()->getUrl($icon);
 
-        //$icon = api_get_cdn_path($icon);
-
         if ($return_only_path) {
             return $icon;
         }

BIN
src/Chamilo/CoreBundle/Resources/public/img/0.gif


BIN
src/Chamilo/CoreBundle/Resources/public/img/1.gif


BIN
src/Chamilo/CoreBundle/Resources/public/img/2rightarrow.gif


BIN
src/Chamilo/CoreBundle/Resources/public/img/ButtonGallOn.png


BIN
src/Chamilo/CoreBundle/Resources/public/img/ButtonListOff.png


BIN
src/Chamilo/CoreBundle/Resources/public/img/ButtonListOn.png


BIN
src/Chamilo/CoreBundle/Resources/public/img/accept_invitation.png


BIN
src/Chamilo/CoreBundle/Resources/public/img/action_first.png


BIN
src/Chamilo/CoreBundle/Resources/public/img/action_first_na.png


BIN
src/Chamilo/CoreBundle/Resources/public/img/action_last.png


BIN
src/Chamilo/CoreBundle/Resources/public/img/action_last_na.png


BIN
src/Chamilo/CoreBundle/Resources/public/img/action_prev.png


BIN
src/Chamilo/CoreBundle/Resources/public/img/action_prev_na.png


BIN
src/Chamilo/CoreBundle/Resources/public/img/add.gif


BIN
src/Chamilo/CoreBundle/Resources/public/img/add_multiple_users.gif


BIN
src/Chamilo/CoreBundle/Resources/public/img/add_na.gif


BIN
src/Chamilo/CoreBundle/Resources/public/img/add_normal_user.png


BIN
src/Chamilo/CoreBundle/Resources/public/img/add_teacher_big.gif


BIN
src/Chamilo/CoreBundle/Resources/public/img/add_user.gif


BIN
src/Chamilo/CoreBundle/Resources/public/img/add_user_big.gif


BIN
src/Chamilo/CoreBundle/Resources/public/img/add_user_field_howto.png


BIN
src/Chamilo/CoreBundle/Resources/public/img/addd.gif


BIN
src/Chamilo/CoreBundle/Resources/public/img/admin_star.png


BIN
src/Chamilo/CoreBundle/Resources/public/img/admins.gif


BIN
src/Chamilo/CoreBundle/Resources/public/img/agenda.gif


BIN
src/Chamilo/CoreBundle/Resources/public/img/alt_star.gif


BIN
src/Chamilo/CoreBundle/Resources/public/img/alt_star.png


BIN
src/Chamilo/CoreBundle/Resources/public/img/anim-frame2.gif


BIN
src/Chamilo/CoreBundle/Resources/public/img/anim-frame3.gif


BIN
src/Chamilo/CoreBundle/Resources/public/img/anim-loader.gif


BIN
src/Chamilo/CoreBundle/Resources/public/img/announce_add.gif


BIN
src/Chamilo/CoreBundle/Resources/public/img/announcement.png


BIN
src/Chamilo/CoreBundle/Resources/public/img/archive.png


BIN
src/Chamilo/CoreBundle/Resources/public/img/arrow-left.png


BIN
src/Chamilo/CoreBundle/Resources/public/img/arrow-right.png


BIN
src/Chamilo/CoreBundle/Resources/public/img/arrow_down_0.gif


BIN
src/Chamilo/CoreBundle/Resources/public/img/arrow_down_1.png


BIN
src/Chamilo/CoreBundle/Resources/public/img/arrow_down_2.gif


BIN
src/Chamilo/CoreBundle/Resources/public/img/arrow_down_2.png


BIN
src/Chamilo/CoreBundle/Resources/public/img/arrow_up_0.gif


BIN
src/Chamilo/CoreBundle/Resources/public/img/arrow_up_0.png


BIN
src/Chamilo/CoreBundle/Resources/public/img/arrow_up_1.gif


BIN
src/Chamilo/CoreBundle/Resources/public/img/arrow_up_2.png


BIN
src/Chamilo/CoreBundle/Resources/public/img/asterisk_prerequisites.gif


BIN
src/Chamilo/CoreBundle/Resources/public/img/attachment.gif


BIN
src/Chamilo/CoreBundle/Resources/public/img/attendance_na.gif


BIN
src/Chamilo/CoreBundle/Resources/public/img/audio.gif


BIN
src/Chamilo/CoreBundle/Resources/public/img/audio_question_na.png


BIN
src/Chamilo/CoreBundle/Resources/public/img/back.png


BIN
src/Chamilo/CoreBundle/Resources/public/img/background_message.png


BIN
src/Chamilo/CoreBundle/Resources/public/img/backup.gif


BIN
src/Chamilo/CoreBundle/Resources/public/img/backup_na.gif


BIN
src/Chamilo/CoreBundle/Resources/public/img/bar_1.gif


BIN
src/Chamilo/CoreBundle/Resources/public/img/bar_1m.gif


BIN
src/Chamilo/CoreBundle/Resources/public/img/blackboard_blue.png


BIN
src/Chamilo/CoreBundle/Resources/public/img/blanco.png


BIN
src/Chamilo/CoreBundle/Resources/public/img/blank.gif


BIN
src/Chamilo/CoreBundle/Resources/public/img/blog.gif


BIN
src/Chamilo/CoreBundle/Resources/public/img/blog_admin.gif


BIN
src/Chamilo/CoreBundle/Resources/public/img/blog_article.png


BIN
src/Chamilo/CoreBundle/Resources/public/img/blog_na.gif


BIN
src/Chamilo/CoreBundle/Resources/public/img/blog_new.gif


BIN
src/Chamilo/CoreBundle/Resources/public/img/blog_newarticle.gif


BIN
src/Chamilo/CoreBundle/Resources/public/img/blog_newtasks.gif


BIN
src/Chamilo/CoreBundle/Resources/public/img/blog_task.gif


BIN
src/Chamilo/CoreBundle/Resources/public/img/blog_user.gif


BIN
src/Chamilo/CoreBundle/Resources/public/img/bmp.gif


BIN
src/Chamilo/CoreBundle/Resources/public/img/boxmygroupscontent.jpg


BIN
src/Chamilo/CoreBundle/Resources/public/img/briefcase_small.png


BIN
src/Chamilo/CoreBundle/Resources/public/img/btn_next.png


BIN
src/Chamilo/CoreBundle/Resources/public/img/btn_previous.png


BIN
src/Chamilo/CoreBundle/Resources/public/img/btn_stats.png


BIN
src/Chamilo/CoreBundle/Resources/public/img/bug.large.png


BIN
src/Chamilo/CoreBundle/Resources/public/img/bullet_blue.gif


BIN
src/Chamilo/CoreBundle/Resources/public/img/bullet_green.gif


BIN
src/Chamilo/CoreBundle/Resources/public/img/bullet_grey.gif


BIN
src/Chamilo/CoreBundle/Resources/public/img/bullet_orange.gif


BIN
src/Chamilo/CoreBundle/Resources/public/img/buoy.gif


BIN
src/Chamilo/CoreBundle/Resources/public/img/c.gif


BIN
src/Chamilo/CoreBundle/Resources/public/img/calculated_answer.png


BIN
src/Chamilo/CoreBundle/Resources/public/img/calendar_add.gif


BIN
src/Chamilo/CoreBundle/Resources/public/img/calendar_add.png


BIN
src/Chamilo/CoreBundle/Resources/public/img/calendar_day.gif


BIN
src/Chamilo/CoreBundle/Resources/public/img/calendar_down.gif


BIN
src/Chamilo/CoreBundle/Resources/public/img/calendar_global.png


BIN
src/Chamilo/CoreBundle/Resources/public/img/calendar_month.gif


BIN
src/Chamilo/CoreBundle/Resources/public/img/calendar_personal.gif


BIN
src/Chamilo/CoreBundle/Resources/public/img/calendar_personal_add.gif


BIN
src/Chamilo/CoreBundle/Resources/public/img/calendar_select.gif


BIN
src/Chamilo/CoreBundle/Resources/public/img/calendar_up.gif


BIN
src/Chamilo/CoreBundle/Resources/public/img/calendar_week.gif


BIN
src/Chamilo/CoreBundle/Resources/public/img/canvas1024x768.png


BIN
src/Chamilo/CoreBundle/Resources/public/img/canvas1920x1080.png


BIN
src/Chamilo/CoreBundle/Resources/public/img/canvas800x600.png


BIN
src/Chamilo/CoreBundle/Resources/public/img/cd.gif


BIN
src/Chamilo/CoreBundle/Resources/public/img/cd_gray.gif


BIN
src/Chamilo/CoreBundle/Resources/public/img/certificate-logo.png


BIN
src/Chamilo/CoreBundle/Resources/public/img/chat.gif


BIN
src/Chamilo/CoreBundle/Resources/public/img/chat_little.gif


Some files were not shown because too many files changed in this diff