Browse Source

Merge remote-tracking branch 'origin/1.10.x' into 1.11.x

jmontoya 9 years ago
parent
commit
37339e77ae

+ 1 - 1
main/admin/index.php

@@ -129,7 +129,7 @@ $blocks['users']['extra'] = null;
 if (api_is_platform_admin()) {
     /* Courses */
     $blocks['courses']['icon'] = Display::return_icon(
-        'course.gif',
+        'course.png',
         get_lang('Courses'),
         array(),
         ICON_SIZE_MEDIUM,

+ 1 - 1
main/admin/ldap_import_students.php

@@ -202,7 +202,7 @@ elseif(!empty($annee) && empty($course))
 {
 	Display::display_header($tool_name);
 	echo '<div style="align:center">';
-	echo Display::return_icon('course.gif', get_lang('SelectCourseToImportUsersTo')).' '.get_lang('SelectCourseToImportUsersTo').'<br />';
+	echo Display::return_icon('course.png', get_lang('SelectCourseToImportUsersTo')).' '.get_lang('SelectCourseToImportUsersTo').'<br />';
 	echo '<form method="post" action="'.api_get_self().'?annee='.Security::remove_XSS($annee).'"><br />';
 	echo '<select name="course">';
 	$courses = CourseManager::get_courses_list();

+ 3 - 1
main/admin/ldap_import_students_to_session.php

@@ -68,7 +68,9 @@ elseif(!empty($annee) && empty($id_session))
 {
 	Display::display_header($tool_name);
 	echo '<div style="align:center">';
-	echo Display::return_icon('course.gif', get_lang('SelectSessionToImportUsersTo')).' '.get_lang('SelectSessionToImportUsersTo').'<br />';
+	echo Display::return_icon(
+			'course.png',
+			get_lang('SelectSessionToImportUsersTo')).' '.get_lang('SelectSessionToImportUsersTo').'<br />';
 	echo '<form method="post" action="'.api_get_self().'?annee='.Security::remove_XSS($annee).'"><br />';
 	echo '<select name="id_session">';
 

+ 1 - 1
main/session/resume_session.php

@@ -299,7 +299,7 @@ if (!empty($userList)) {
         );
 
         $courseUserLink = Display::url(
-            Display::return_icon('course.gif', get_lang('BlockCoursesForThisUser')),
+            Display::return_icon('course.png', get_lang('BlockCoursesForThisUser')),
             api_get_path(WEB_CODE_PATH).'session/session_course_user.php?id_user='.$user['user_id'].'&id_session='.$sessionId
         );
 

+ 1 - 1
main/template/default/auth/courses_categories.php

@@ -299,7 +299,7 @@ function return_thumbnail($course, $icon_title)
         $course_medium_image = api_get_path(WEB_COURSE_PATH).$course['directory'].'/course-pic.png'; // redimensioned image 85x85
     } else {
         // without picture
-        $course_medium_image = Display::return_icon('session_default.png', null, null, null, null, true, false);
+        $course_medium_image = Display::returnIconPath('session_default.png');
     }
 
     // course image

+ 6 - 3
main/user/resume_session.php

@@ -355,9 +355,12 @@ if ($allowTutors == 'true') {
                         '.$user_link.'
                     </td>
                     <td>
-                        <a href="../mySpace/myStudents.php?student='.$user['user_id'].''.$orig_param.'">'.Display::return_icon('statistics.gif', get_lang('Reporting')).'</a>&nbsp;
-                        <a href="session_course_user.php?id_user='.$user['user_id'].'&id_session='.$id_session.'">'.Display::return_icon('course.gif', get_lang('BlockCoursesForThisUser')).'</a>&nbsp;
-                        <a href="'.api_get_self().'?id_session='.$id_session.'&action=delete&user='.$user['user_id'].'" onclick="javascript:if(!confirm(\''.get_lang('ConfirmYourChoice').'\')) return false;">'.Display::return_icon('delete.png', get_lang('Delete')).'</a>
+                        <a href="../mySpace/myStudents.php?student='.$user['user_id'].''.$orig_param.'">'.
+                        Display::return_icon('statistics.gif', get_lang('Reporting')).'</a>&nbsp;
+                        <a href="session_course_user.php?id_user='.$user['user_id'].'&id_session='.$id_session.'">'.
+                        Display::return_icon('course.png', get_lang('BlockCoursesForThisUser')).'</a>&nbsp;
+                        <a href="'.api_get_self().'?id_session='.$id_session.'&action=delete&user='.$user['user_id'].'" onclick="javascript:if(!confirm(\''.get_lang('ConfirmYourChoice').'\')) return false;">'.
+                        Display::return_icon('delete.png', get_lang('Delete')).'</a>
                         '.$link_to_add_user_in_url.'
                     </td>
                     </tr>';