Explorar el Código

Feature #2785 tables: my courses and inscription, calendar, admin languages, agenda, notebook, social network, survey, works, admin templates .And update languages

Juan Carlos Raña hace 14 años
padre
commit
cd0c784c45
Se han modificado 56 ficheros con 157 adiciones y 141 borrados
  1. 2 2
      main/admin/calendar.lib.php
  2. 9 9
      main/admin/languages.php
  3. 2 2
      main/admin/settings.lib.php
  4. 22 21
      main/calendar/agenda.inc.php
  5. BIN
      main/img/icons/22/course_home.png
  6. BIN
      main/img/icons/22/event.png
  7. BIN
      main/img/icons/22/languages.png
  8. BIN
      main/img/icons/22/languages_na.png
  9. BIN
      main/img/icons/22/mime_code.png
  10. BIN
      main/img/icons/22/mime_text.png
  11. BIN
      main/img/icons/22/new_announce.png
  12. BIN
      main/img/icons/22/new_language.png
  13. BIN
      main/img/icons/22/new_platform_event.png
  14. BIN
      main/img/icons/22/page.png
  15. BIN
      main/img/icons/22/platform_event.png
  16. BIN
      main/img/icons/22/rate_work.png
  17. BIN
      main/img/icons/22/user_event.png
  18. BIN
      main/img/icons/22/work.png
  19. BIN
      main/img/icons/32/new_platform_event.png
  20. BIN
      main/img/icons/32/new_user_event.png
  21. BIN
      main/img/icons/32/platform_event.png
  22. BIN
      main/img/icons/32/user_event.png
  23. 9 2
      main/img/icons/48/_sum.txt
  24. BIN
      main/img/icons/48/languages_na.png
  25. BIN
      main/img/icons/48/mime_code.png
  26. BIN
      main/img/icons/48/mime_text.png
  27. BIN
      main/img/icons/48/new_language.png
  28. BIN
      main/img/icons/48/new_platform_event.png
  29. BIN
      main/img/icons/48/new_user_event_competo.png
  30. BIN
      main/img/icons/48/platform_event.png
  31. BIN
      main/img/icons/48/rate_work.png
  32. BIN
      main/img/icons/48/user_event.png
  33. 2 2
      main/inc/lib/fileDisplay.lib.php
  34. 2 2
      main/inc/lib/notebook.lib.php
  35. 1 1
      main/inc/lib/social.lib.php
  36. 1 1
      main/lang/english/admin.inc.php
  37. 0 3
      main/lang/english/registration.inc.php
  38. 5 1
      main/lang/english/trad4all.inc.php
  39. 0 3
      main/lang/french/registration.inc.php
  40. 3 0
      main/lang/french/trad4all.inc.php
  41. 0 3
      main/lang/italian/registration.inc.php
  42. 3 0
      main/lang/italian/tracking.inc.php
  43. 1 0
      main/lang/italian/userInfo.inc.php
  44. 7 7
      main/lang/slovenian/agenda.inc.php
  45. 1 1
      main/lang/slovenian/gradebook.inc.php
  46. 0 3
      main/lang/slovenian/registration.inc.php
  47. 3 0
      main/lang/slovenian/tracking.inc.php
  48. 1 0
      main/lang/slovenian/userInfo.inc.php
  49. 2 2
      main/lang/spanish/admin.inc.php
  50. 0 3
      main/lang/spanish/registration.inc.php
  51. 15 11
      main/lang/spanish/trad4all.inc.php
  52. 2 2
      main/lang/spanish/userInfo.inc.php
  53. 26 26
      main/survey/survey.lib.php
  54. 8 8
      main/survey/survey.php
  55. 12 12
      main/template/default/auth/courses_list.php
  56. 18 14
      main/work/work.lib.php

+ 2 - 2
main/admin/calendar.lib.php

@@ -477,7 +477,7 @@ function store_new_agenda_item() {
 * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
 */
 function display_courseadmin_links() {
-	echo "<a href='".api_get_self()."?".api_get_cidreq()."&action=add&amp;origin=".Security::remove_XSS($_GET['origin'])."'>".Display::return_icon('platform_event.png', get_lang('AgendaAdd'),'','32')."</a>";
+	echo "<a href='".api_get_self()."?".api_get_cidreq()."&action=add&amp;origin=".Security::remove_XSS($_GET['origin'])."'>".Display::return_icon('new_platform_event.png', get_lang('AgendaAdd'),'','32')."</a>";
 
 }
 
@@ -776,7 +776,7 @@ function display_agenda_items()
     	// the icons. If the message is sent to one or more specific users/groups
     	// we add the groups icon
     	// 2do: if it is sent to groups we display the group icon, if it is sent to a user we show the user icon
-    	Display::display_icon('agenda.png', get_lang('Agenda'),'','22');
+    	Display::display_icon('platform_event.png', get_lang('GlobalEvent'),'','22');
     	/*if ($myrow['to_group_id']!=='0') {
     		echo Display::return_icon('group.gif', get_lang('AllUsersOfThePlatform'));
     	}*/

+ 9 - 9
main/admin/languages.php

@@ -58,8 +58,8 @@ $htmlHeadXtra[] ='<script type="text/javascript">
 	//});
 
  	$("td .make_visible_and_invisible").click(function () {
-		make_visible="visible.gif";
-		make_invisible="invisible.gif";
+		make_visible="visible.png";
+		make_invisible="invisible.png";
 		id_link_tool=$(this).attr("id");
 		id_img_link_tool="img"+id_link_tool;
 		path_name_of_imglinktool=$("#"+id_img_link_tool).attr("src");
@@ -70,7 +70,7 @@ $htmlHeadXtra[] ='<script type="text/javascript">
 		my_image_tool=link_tool_info[link_tool_info.length-1];
 
 
-		if (my_image_tool=="visible.gif") {
+		if (my_image_tool=="visible.png") {
 			path_name_of_imglinktool=path_name_of_imglinktool.replace(make_visible,make_invisible);
 			my_visibility=0;
 		} else {
@@ -91,7 +91,7 @@ $htmlHeadXtra[] ='<script type="text/javascript">
 
 				$("#"+id_img_link_tool).attr("src",path_name_of_imglinktool);
 
-				if (my_image_tool=="visible.gif") {
+				if (my_image_tool=="visible.png") {
 					$("#"+id_img_link_tool).attr("alt","'.get_lang('MakeAvailable', '').'");
 					$("#"+id_img_link_tool).attr("title","'.get_lang('MakeAvailable', '').'");
 				} else {
@@ -245,9 +245,9 @@ while ($row = Database::fetch_array($result_select)) {
 	$row_td[] = $row['dokeos_folder'];
 
 	if ($row['english_name'] == $row_lang['selected_value']){
-		$setplatformlanguage = Display::return_icon('links.gif', get_lang('CurrentLanguagesPortal'));
+		$setplatformlanguage = Display::return_icon('languages.png', get_lang('CurrentLanguagesPortal'),'',22);
 	} else {
-		$setplatformlanguage = "<a href=\"javascript:if (confirm('".addslashes(get_lang('AreYouSureYouWantToSetThisLanguageAsThePortalDefault'))."')) { location.href='".api_get_self()."?action=setplatformlanguage&id=".$row['id']."'; }\">".Display::return_icon('link_na.gif',get_lang('SetLanguageAsDefault'))."</a>";
+		$setplatformlanguage = "<a href=\"javascript:if (confirm('".addslashes(get_lang('AreYouSureYouWantToSetThisLanguageAsThePortalDefault'))."')) { location.href='".api_get_self()."?action=setplatformlanguage&id=".$row['id']."'; }\">".Display::return_icon('languages_na.png',get_lang('SetLanguageAsDefault'),'',22)."</a>";
 	}
 	if (api_get_setting('allow_use_sub_language')=='true') {
 
@@ -255,7 +255,7 @@ while ($row = Database::fetch_array($result_select)) {
 
 		if ($verified_if_is_sub_language===false) {
 			$verified_if_is_father=SubLanguageManager::check_if_language_is_father($row['id']);
-			$allow_use_sub_language = "&nbsp;<a href='sub_language_add.php?action=definenewsublanguage&id=".$row['id']."'>".Display::return_icon('mas.gif', get_lang('CreateSubLanguage'),array('width'=>'22','height'=>'22'))."</a>";
+			$allow_use_sub_language = "&nbsp;<a href='sub_language_add.php?action=definenewsublanguage&id=".$row['id']."'>".Display::return_icon('new_language.png', get_lang('CreateSubLanguage'),array(),22)."</a>";
 			if ($verified_if_is_father===true) {
 				//$allow_add_term_sub_language = "&nbsp;<a href='sub_language.php?action=registersublanguage&id=".$row['id']."'>".Display::return_icon('2rightarrow.gif', get_lang('AddWordForTheSubLanguage'),array('width'=>'22','height'=>'22'))."</a>";
 				$allow_add_term_sub_language='';
@@ -274,10 +274,10 @@ while ($row = Database::fetch_array($result_select)) {
 		$allow_add_term_sub_language='';
 	}
 	if ($row['available'] == 1) {
-		$row_td[] = "<a class=\"make_visible_and_invisible\" id=\"linktool_".$row['id']."\" href='".api_get_self()."?action=makeunavailable&id=".$row['id']."'>".Display::return_icon('visible.gif', get_lang('MakeUnavailable'),array('id'=>'imglinktool_'.$row['id']))."</a> <a href='".api_get_self()."?action=edit&id=".$row['id']."#value'>".Display::return_icon('edit.gif', get_lang('Edit'))."</a>&nbsp;".$setplatformlanguage.$allow_use_sub_language.$allow_add_term_sub_language.$allow_delete_sub_language;
+		$row_td[] = "<a class=\"make_visible_and_invisible\" id=\"linktool_".$row['id']."\" href='".api_get_self()."?action=makeunavailable&id=".$row['id']."'>".Display::return_icon('visible.png', get_lang('MakeUnavailable'),array('id'=>'imglinktool_'.$row['id']),22)."</a> <a href='".api_get_self()."?action=edit&id=".$row['id']."#value'>".Display::return_icon('edit.png', get_lang('Edit'),'',22)."</a>&nbsp;".$setplatformlanguage.$allow_use_sub_language.$allow_add_term_sub_language.$allow_delete_sub_language;
 		//$row_td[] = "<a class=\"make_visible_and_invisible\" id=\"linktool_".$row['id']."\" href='javascript:void(0)'>".Display::return_icon('visible.gif', get_lang('MakeUnavailable'),array('id'=>'imglinktool_'.$row['id']))."</a> <a href='".api_get_self()."?action=edit&id=".$row['id']."#value'>".Display::return_icon('edit.gif', get_lang('Edit'))."</a>&nbsp;".$setplatformlanguage.$allow_use_sub_language.$allow_add_term_sub_language;
 	} else {
-		$row_td[] = "<a class=\"make_visible_and_invisible\" id=\"linktool_".$row['id']."\" href='".api_get_self()."?action=makeavailable&id=".$row['id']."'>".Display::return_icon('invisible.gif', get_lang('MakeAvailable'),array('id'=>'imglinktool_'.$row['id']))."</a> <a href='".api_get_self()."?action=edit&id=".$row['id']."#value'>".Display::return_icon('edit.gif', get_lang('Edit'))."</a>&nbsp;".$setplatformlanguage.$allow_use_sub_language.$allow_add_term_sub_language.$allow_delete_sub_language;
+		$row_td[] = "<a class=\"make_visible_and_invisible\" id=\"linktool_".$row['id']."\" href='".api_get_self()."?action=makeavailable&id=".$row['id']."'>".Display::return_icon('invisible.png', get_lang('MakeAvailable'),array('id'=>'imglinktool_'.$row['id']),22)."</a> <a href='".api_get_self()."?action=edit&id=".$row['id']."#value'>".Display::return_icon('edit.png', get_lang('Edit'),'',22)."</a>&nbsp;".$setplatformlanguage.$allow_use_sub_language.$allow_add_term_sub_language.$allow_delete_sub_language;
 		//$row_td[] = "<a class=\"make_visible_and_invisible\" id=\"linktool_".$row['id']."\" href='javascript:void(0)'>".Display::return_icon('invisible.gif', get_lang('MakeAvailable'),array('id'=>'imglinktool_'.$row['id']))."</a> <a href='".api_get_self()."?action=edit&id=".$row['id']."#value'>".Display::return_icon('edit.gif', get_lang('Edit'))."</a>&nbsp;".$setplatformlanguage.$allow_use_sub_language.$allow_add_term_sub_language;
 	}
 

+ 2 - 2
main/admin/settings.lib.php

@@ -679,8 +679,8 @@ function get_template_data($from, $number_of_items, $column, $direction) {
  * @since Dokeos 1.8.6
  */
 function actions_filter($id) {
-    $return = '<a href="settings.php?category=Templates&amp;action=edit&amp;id='.Security::remove_XSS($id).'">'.Display::return_icon('edit.gif', get_lang('Edit')).'</a>';
-    $return .= '<a href="settings.php?category=Templates&amp;action=delete&amp;id='.Security::remove_XSS($id).'" onClick="javascript:if(!confirm('."'".get_lang('ConfirmYourChoice')."'".')) return false;">'.Display::return_icon('delete.gif', get_lang('Delete')).'</a>';
+    $return = '<a href="settings.php?category=Templates&amp;action=edit&amp;id='.Security::remove_XSS($id).'">'.Display::return_icon('edit.png', get_lang('Edit'),'',22).'</a>';
+    $return .= '<a href="settings.php?category=Templates&amp;action=delete&amp;id='.Security::remove_XSS($id).'" onClick="javascript:if(!confirm('."'".get_lang('ConfirmYourChoice')."'".')) return false;">'.Display::return_icon('delete.png', get_lang('Delete'),'',22).'</a>';
     return $return;
 }
 

+ 22 - 21
main/calendar/agenda.inc.php

@@ -2108,20 +2108,21 @@ function display_agenda_items($select_month, $select_year) {
     	// we add the groups icon
     	// 2do: if it is sent to groups we display the group icon, if it is sent to a user we show the user icon
     	if ($myrow['calendar_type'] == 'course') {
-    		Display::display_icon('agenda.gif', get_lang('Agenda'));
+    		Display::display_icon('event.png', get_lang('Course'),'',22);
     		if ($myrow['to_group_id']!=='0') {
-    			echo Display::return_icon('group.gif', get_lang('ItemForUserSelection'));
+    			echo Display::return_icon('group.png', get_lang('ItemForUserSelection'),'',22);
     		}
     		echo '<span style="padding-left:5px; font-size:130%; ">';
     		echo $myrow['title'];
     		echo '</span>';
     	} elseif ($myrow['calendar_type'] == 'personal') {
-    		Display::display_icon('calendar_personal.gif', get_lang('Personal'));
+    		Display::display_icon('user_event.png', get_lang('Personal'),'',22);
     		echo '<span style="padding-left:5px; font-size:130%; ">';
     		echo $myrow['title'];
     		echo '</span>';
     	} else {
-    		Display::display_icon('calendar_global.png', get_lang('Personal'));
+    		Display::display_icon('platform_event.png', get_lang('Platform'),'',22);//TODO:check whether this still works
+
     		echo '<span style="padding-left:5px; font-size:130%; ">';
     		echo $myrow['title'];
     		echo '</span>';
@@ -2178,24 +2179,24 @@ function display_agenda_items($select_month, $select_year) {
 
 	    		// edit
     			echo '<a href="'.$mylink.api_get_cidreq()."&amp;sort=asc&amp;toolgroup=".Security::remove_XSS($_GET['toolgroup']).'&amp;action=edit&amp;id_attach='.$attachment_list['id'].'" title="'.get_lang("ModifyCalendarItem").'">';
-	    		echo Display::return_icon('edit.gif', get_lang('ModifyCalendarItem'))."</a>";
+	    		echo Display::return_icon('edit.png', get_lang('ModifyCalendarItem'),'',22)."</a>";
 
     			echo "<a href=\"".$mylink.api_get_cidreq()."&amp;sort=asc&amp;toolgroup=".Security::remove_XSS($_GET['toolgroup'])."&amp;action=delete\" onclick=\"javascript:if(!confirm('".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES,$charset))."')) return false;\"  title=\"".get_lang("Delete")."\"> ";
-	    		echo Display::return_icon('delete.gif', get_lang('Delete'))."</a>";
+	    		echo Display::return_icon('delete.png', get_lang('Delete'),'',22)."&nbsp;</a>";
 
     			echo '<a href="'.$mylink.api_get_cidreq()."&amp;sort=asc&amp;toolgroup=".Security::remove_XSS($_GET['toolgroup']).'&amp;action=announce" title="'.get_lang("AddAnnouncement").'">';
-    			echo Display::return_icon('announce_add.gif', get_lang('AddAnnouncement'), array ('style' => 'width:16px; height:16px;'))."</a> ";
+    			echo Display::return_icon('new_announce.png', get_lang('AddAnnouncement'), array (),22)."</a> ";
 
 	    		if ($myrow['visibility']==1) {
-	    			$image_visibility="visible.gif";
+	    			$image_visibility="visible";
 					$text_visibility=get_lang("Hide");
 					$next_action = 0;
 	    		} else {
-	    			$image_visibility="invisible.gif";
+	    			$image_visibility="invisible";
 					$text_visibility=get_lang("Show");
 					$next_action = 1;
 	    		}
-    			echo 	'<a href="'.$mylink.api_get_cidreq().'&amp;sort=asc&amp;toolgroup='.Security::remove_XSS($_GET['toolgroup']).'&amp;action=showhide&amp;next_action='.$next_action.'" title="'.$text_visibility.'">'.Display::return_icon($image_visibility, $text_visibility),'</a> ';
+    			echo 	'<a href="'.$mylink.api_get_cidreq().'&amp;sort=asc&amp;toolgroup='.Security::remove_XSS($_GET['toolgroup']).'&amp;action=showhide&amp;next_action='.$next_action.'" title="'.$text_visibility.'">'.Display::return_icon($image_visibility.'.png', $text_visibility,'',22).'</a> ';
 			}
 
 	    	if (!$is_repeated && (api_is_allowed_to_edit(false,true) OR (api_get_course_setting('allow_user_edit_agenda') && !api_is_anonymous()))) {
@@ -2212,7 +2213,7 @@ function display_agenda_items($select_month, $select_year) {
 			//echo '<a class="ical_export" href="'.$mylink.'&amp;class=confidential" title="'.get_lang('ExportiCalConfidential').'">'.Display::return_icon($export_icon_high, get_lang('ExportiCalConfidential')).'</a> ';
 	    	//echo '<a class="ical_export" href="'.$mylink.'&amp;class=private" title="'.get_lang('ExportiCalPrivate').'">'.Display::return_icon($export_icon_low, get_lang('ExportiCalPrivate')).'</a> ';
 	    	//echo '<a class="ical_export" href="'.$mylink.'&amp;class=public" title="'.get_lang('ExportiCalPublic').'">'.Display::return_icon($export_icon, get_lang('ExportiCalPublic')).'</a> ';
-		    echo '<a href="#" onclick="javascript:win_print=window.open(\'print.php?id='.$myrow['id'].'\',\'popup\',\'left=100,top=100,width=700,height=500,scrollbars=1,resizable=0\'); win_print.focus(); return false;">'.Display::return_icon('print.gif', get_lang('Print')).'</a>&nbsp;';
+		    echo '<a href="#" onclick="javascript:win_print=window.open(\'print.php?id='.$myrow['id'].'\',\'popup\',\'left=100,top=100,width=700,height=500,scrollbars=1,resizable=0\'); win_print.focus(); return false;">'.Display::return_icon('printer.png', get_lang('Print'),'',22).'</a>&nbsp;';
 	    	echo '</td>';
 		} else {
 			echo '<td align="center">';
@@ -2238,7 +2239,7 @@ function display_agenda_items($select_month, $select_year) {
 				echo ' "> '.$user_filename.' </a>';
 				echo '<span class="forum_attach_comment" >'.$attachment_list['comment'].'</span>';
 				if (api_is_allowed_to_edit()) {
-					echo '&nbsp;&nbsp;<a href="'.api_get_self().'?'.api_get_cidreq().'&amp;origin='.Security::remove_XSS($_GET['origin']).'&amp;action=delete_attach&amp;id_attach='.$attachment_list['id'].'" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES,$charset)).'\')) return false;">'.Display::return_icon('delete.gif',get_lang('Delete')).'</a><br />';
+					echo '&nbsp;&nbsp;<a href="'.api_get_self().'?'.api_get_cidreq().'&amp;origin='.Security::remove_XSS($_GET['origin']).'&amp;action=delete_attach&amp;id_attach='.$attachment_list['id'].'" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES,$charset)).'\')) return false;">'.Display::return_icon('delete.png',get_lang('Delete'),'',22).'</a><br />';
 				}
 			}
 	    echo '</td></tr>';
@@ -2397,10 +2398,10 @@ function display_one_agenda_item($agenda_id)
 	// the icons. If the message is sent to one or more specific users/groups
 	// we add the groups icon
 	// 2do: if it is sent to groups we display the group icon, if it is sent to a user we show the user icon
-	echo Display::return_icon('agenda.gif');
+	echo Display::return_icon('agenda.png','&nbsp;','',22);
 	if ($myrow['to_group_id']!=='0')
 	{
-		echo Display::return_icon('group.gif');
+		echo Display::return_icon('group.png','&nbsp;','',22);
 	}
 	echo $myrow['title'];
 	echo "</th>";
@@ -2446,21 +2447,21 @@ function display_one_agenda_item($agenda_id)
 				$mylink .= '&amp;agenda_id='.Security::remove_XSS($_GET['agenda_id']).'&amp;id='.Security::remove_XSS($_GET['agenda_id']);
 			}
 			echo 	"<a href=\"".$mylink."&amp;action=edit\">",
-					Display::return_icon('edit.gif', get_lang('ModifyCalendarItem')), "</a>",
+					Display::return_icon('edit.png', get_lang('ModifyCalendarItem'),'',22), "</a>",
 					"<a href=\"".$mylink."&amp;action=delete\" onclick=\"javascript:if(!confirm('".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES,$charset))."')) return false;\">",
-					Display::return_icon('delete.gif', get_lang('Delete')),"</a>";
+					Display::return_icon('delete.png', get_lang('Delete'),'',22),"</a>";
 			if ($myrow['visibility']==1) {
 				$image_visibility="visible";
 			} else {
 				$image_visibility="invisible";
 			}
-			echo 	'<a href="'.$mylink.'&amp;action=showhide">',Display::return_icon($image_visibility.'.gif', get_lang('Visible')),'</a>';
+			echo 	'<a href="'.$mylink.'&amp;action=showhide">'.Display::return_icon($image_visibility.'.png', get_lang('Visible'),'',22).'</a>';
 		}
 	   	$mylink = 'ical_export.php?'.api_get_cidreq().'&amp;type=course&amp;id='.$myrow['id'];
 	    //echo '<a class="ical_export" href="'.$mylink.'&amp;class=confidential" title="'.get_lang('ExportiCalConfidential').'">'.Display::return_icon($export_icon_high, get_lang('ExportiCalConfidential')).'</a> ';
 	    //echo '<a class="ical_export" href="'.$mylink.'&amp;class=private" title="'.get_lang('ExportiCalPrivate').'">'.Display::return_icon($export_icon_low, get_lang('ExportiCalPrivate')).'</a> ';
 	    //echo '<a class="ical_export" href="'.$mylink.'&amp;class=public" title="'.get_lang('ExportiCalPublic').'">'.Display::return_icon($export_icon, get_lang('ExportiCalPublic')).'</a> ';
-	    echo '<a href="javascript: void(0);" onclick="javascript:win_print=window.open(\'print.php?id='.$myrow['id'].'\',\'popup\',\'left=100,top=100,width=700,height=500,scrollbars=1,resizable=0\'); win_print.focus(); return false;">'.Display::return_icon('print.gif', get_lang('Print')).'</a>&nbsp;';
+	    echo '<a href="javascript: void(0);" onclick="javascript:win_print=window.open(\'print.php?id='.$myrow['id'].'\',\'popup\',\'left=100,top=100,width=700,height=500,scrollbars=1,resizable=0\'); win_print.focus(); return false;">'.Display::return_icon('printer.png', get_lang('Print'),'',22).'</a>&nbsp;';
 		echo "</td></tr>";
 	    if($repeat) {
 	    	echo '<tr>';
@@ -2631,7 +2632,7 @@ function show_add_form($id = '') {
 	} else {
 		echo '	<div class="row">
 					<div class="label">
-						<a href="javascript: void(0);" onclick="if(document.getElementById(\'recipient_list\').style.display==\'none\') document.getElementById(\'recipient_list\').style.display=\'block\'; else document.getElementById(\'recipient_list\').style.display=\'none\';">'.Display::return_icon('group.gif', get_lang('SentTo'), array ('align' => 'absmiddle')).' '.get_lang('SentTo').'</a>
+						<a href="javascript: void(0);" onclick="if(document.getElementById(\'recipient_list\').style.display==\'none\') document.getElementById(\'recipient_list\').style.display=\'block\'; else document.getElementById(\'recipient_list\').style.display=\'none\';">'.Display::return_icon('group.png', get_lang('SentTo'), array ('align' => 'absmiddle'),22).' '.get_lang('SentTo').'</a>
 					</div>
 					<div class="formw">';
 		if ((isset($_GET['id'])  && $to=='everyone') || !isset($_GET['id'])) {
@@ -3452,7 +3453,7 @@ function get_day_agendaitems($courses_dbs, $month, $year, $day) {
 				$title=$array_course_info['title'];
 				$agenda_link = cut($title,14,true);
 			} else {
-				$agenda_link = Display::return_icon('course_home.gif');
+				$agenda_link = Display::return_icon('course_home.png','&nbsp;','',22);
 			}
 
 			//$URL = $_configuration['root_web'].$mycours["dir"]."/";
@@ -3563,7 +3564,7 @@ function get_week_agendaitems($courses_dbs, $month, $year, $week = '') {
 				$title=$array_course_info['title'];
 				$agenda_link = cut($title, 14, true);
 			} else {
-				$agenda_link = Display::return_icon('course_home.gif');
+				$agenda_link = Display::return_icon('course_home.png','&nbsp;','',22);
 			}
 
 			$URL = $_configuration['root_web']."main/calendar/agenda.php?cidReq=".urlencode($array_course_info["code"])."&amp;day=$agendaday&amp;month=$month&amp;year=$year#$agendaday"; // RH  //Patrick Cool: to highlight the relevant agenda item

BIN
main/img/icons/22/course_home.png


BIN
main/img/icons/22/event.png


BIN
main/img/icons/22/languages.png


BIN
main/img/icons/22/languages_na.png


BIN
main/img/icons/22/mime_code.png


BIN
main/img/icons/22/mime_text.png


BIN
main/img/icons/22/new_announce.png


BIN
main/img/icons/22/new_language.png


BIN
main/img/icons/22/new_platform_event.png


BIN
main/img/icons/22/page.png


BIN
main/img/icons/22/platform_event.png


BIN
main/img/icons/22/rate_work.png


BIN
main/img/icons/22/user_event.png


BIN
main/img/icons/22/work.png


BIN
main/img/icons/32/new_platform_event.png


BIN
main/img/icons/32/new_user_event.png


BIN
main/img/icons/32/platform_event.png


BIN
main/img/icons/32/user_event.png


+ 9 - 2
main/img/icons/48/_sum.txt

@@ -234,7 +234,7 @@ timezone			nuvola
 tuning				nuvola
 html_editor			gnome			
 --
-platform_event			modif nuvola
+new_platform_event		modif mix crystal chamilo
 agenda				nuvola
 --------------------------------------------------------
 up				crystal (only 22 px)
@@ -266,7 +266,14 @@ briefcase			modif tango
 new_dropbox_message		tango
 unsubscribe_course		modif nuvola
 unsubscribe_course_na		modif nuvola
-			
+mime_text			crystal
+mime_code			crystal
+rate_work			modif mix crystal nuvola
+user_event			modif mix crystal nuvola
+platform_event			modif mix crystal nuvola chamilo
+languages_na			modif crystal
+new_language			modif crystal
+		
 --julio
 star				
 star_green

BIN
main/img/icons/48/languages_na.png


BIN
main/img/icons/48/mime_code.png


BIN
main/img/icons/48/mime_text.png


BIN
main/img/icons/48/new_language.png


BIN
main/img/icons/48/new_platform_event.png


BIN
main/img/icons/48/new_user_event_competo.png


BIN
main/img/icons/48/platform_event.png


BIN
main/img/icons/48/rate_work.png


BIN
main/img/icons/48/user_event.png


+ 2 - 2
main/inc/lib/fileDisplay.lib.php

@@ -77,11 +77,11 @@ function choose_image($file_name)
         $image['video'     ] = 'film.gif';
         $image['excel'     ] = 'excel.gif';
         $image['compressed'] = 'file_zip.gif';
-        $image['code'      ] = 'file_txt.gif';
+        $image['code'      ] = 'icons/22/mime_code.png';
         $image['acrobat'   ] = 'file_pdf.gif';
         $image['powerpoint'] = 'powerpoint.gif';
         $image['flash'     ] = 'file_flash.gif';
-        $image['text'      ] = 'file_txt.gif';
+        $image['text'      ] = 'icons/22/mime_text.png';
         $image['oo_writer' ] = 'file_oo_writer.gif';
         $image['oo_calc'   ] = 'file_oo_calc.gif';
         $image['oo_impress'] = 'file_oo_impress.gif';

+ 2 - 2
main/inc/lib/notebook.lib.php

@@ -216,8 +216,8 @@ class NotebookManager
 			echo '</div>';
 			echo '<div class="sectioncomment">'.$row['description'].'</div>';
 			echo '<div>';
-			echo '<a href="'.api_get_self().'?action=editnote&amp;notebook_id='.$row['notebook_id'].'">'.Display::return_icon('edit.gif', get_lang('Edit')).'</a>';
-			echo '<a href="'.api_get_self().'?action=deletenote&amp;notebook_id='.$row['notebook_id'].'" onclick="return confirmation(\''.$row['title'].'\');">'.Display::return_icon('delete.gif', get_lang('Delete')).'</a>';
+			echo '<a href="'.api_get_self().'?action=editnote&amp;notebook_id='.$row['notebook_id'].'">'.Display::return_icon('edit.png', get_lang('Edit'),'',22).'</a>';
+			echo '<a href="'.api_get_self().'?action=deletenote&amp;notebook_id='.$row['notebook_id'].'" onclick="return confirmation(\''.$row['title'].'\');">'.Display::return_icon('delete.png', get_lang('Delete'),'',22).'</a>';
 			echo '</div>';
 		}
 		//return $return;

+ 1 - 1
main/inc/lib/social.lib.php

@@ -652,7 +652,7 @@ class SocialManager extends UserManager {
 	        echo '<li><a href="'.api_get_path(WEB_PATH).'main/social/search.php">'.Display::return_icon('zoom.png',get_lang('Search'),array('hspace'=>'6')).'<span class="'.($show=='search'?'social-menu-text-active':'social-menu-text4').'" >'.get_lang('Search').'</span></a></li>';
             		
 			//My files
-			 echo '<li><a href="'.api_get_path(WEB_PATH).'main/social/myfiles.php">'.Display::return_icon('briefcase_small.png',get_lang('MyFiles'),array('hspace'=>'6')).'<span class="'.($show=='myfiles'?'social-menu-text-active':'social-menu-text4').'" >'.get_lang('MyFiles').'</span></a></li>';	
+			 echo '<li><a href="'.api_get_path(WEB_PATH).'main/social/myfiles.php">'.Display::return_icon('briefcase.png',get_lang('MyFiles'),array('hspace'=>'6'),16).'<span class="'.($show=='myfiles'?'social-menu-text-active':'social-menu-text4').'" >'.get_lang('MyFiles').'</span></a></li>';	
 	        echo'</ul>
 				  </div>';	     
 		}

+ 1 - 1
main/lang/english/admin.inc.php

@@ -1099,7 +1099,7 @@ $BlockCopyPasteForStudentsTitle = "Block students copy and paste";
 $BlockCopyPasteForStudentsComment = "Block students the ability to copy and paste into the WYSIWYG editor";
 $MoreButtonsForMaximizedModeTitle = "Buttons bar extended";
 $MoreButtonsForMaximizedModeComment = "Enable button bars extended when the WYSIWYG editor is maximized";
-$Editor = "Editor";
+$Editor = "HTML Editor";
 $GoToCourseAfterLoginTitle = "Go directly to the course after login";
 $GoToCourseAfterLoginComment = "When a user is registered in one course, go directly to the course after login";
 $GroupList = "Group List";

+ 0 - 3
main/lang/english/registration.inc.php

@@ -184,9 +184,6 @@ $AreYouSureToEditTheUserStatus = "Are you sure to edit the user status?";
 $TheTutorOnlyCanKeepTrackOfStudentsRegisteredInTheCourse = "The tutor can only keep track of all progress of users registered to the course.";
 $TheTeacherCanQualifyEvaluateAndKeepTrackOfAllStudentsEnrolledInTheCourse = "The teacher can qualify, evaluate and keep track of all students enrolled in the course.";
 $LoginOrEmailAddress = "User name or e-mail address";
-$MailNotifyInvitation = "Notify by mail on new invitation received";
-$MailNotifyMessage = "Notify by mail on new personal message received";
-$MailNotifyGroupMessage = "Notify by mail on new message received in group";
 $AtOnce = "Upon reception";
 $Daily = "Once a day";
 ?>

+ 5 - 1
main/lang/english/trad4all.inc.php

@@ -321,7 +321,7 @@ $langDoYouAccept = "Do you accept it ?";
 $Everybody = "All";
 $SentTo = "Visible to";
 $Export = "Export";
-$Tools = "Tools";
+$Tools = "Modules";
 $Everyone = "Everyone";
 $SelectGroupsUsers = "Select groups/users";
 $Student = "Learner";
@@ -1006,6 +1006,7 @@ $ContactInformationHasNotBeenSent = "Your contact information could not be sent.
 $FileDeleted = "File deleted";
 $MyClasses = "My classes";
 $PublicationDate = "Publication date";
+$CorrectAndRate = "Correct and rate";
 $ItemAdded = "Item added";
 $ItemDeleted = "Item deleted";
 $ItemUpdated = "Item updated";
@@ -1014,4 +1015,7 @@ $MyStatistics = "My statistics";
 $FromDateXToDateY = "From %s to %s";
 $CourseThematicAdvance = "Course progress";
 $Clean = "Clean";
+$MailNotifyInvitation = "Notify by mail on new invitation received";
+$MailNotifyMessage = "Notify by mail on new personal message received";
+$MailNotifyGroupMessage = "Notify by mail on new message received in group";
 ?>

+ 0 - 3
main/lang/french/registration.inc.php

@@ -184,9 +184,6 @@ $AreYouSureToEditTheUserStatus = "Voulez-vous vraiment modifier le statut de l'u
 $TheTutorOnlyCanKeepTrackOfStudentsRegisteredInTheCourse = "Le tuteur peut seulement suivre le progrès des autres utilisateurs inscrits à ce cours.";
 $TheTeacherCanQualifyEvaluateAndKeepTrackOfAllStudentsEnrolledInTheCourse = "Le formateur peut qualifier, évaluer et suivre tous les étudiants inscrits dans le cours.";
 $LoginOrEmailAddress = "Nom d'utilisateur ou adresse e-mail";
-$MailNotifyInvitation = "Avertir par mail de la réception d'une invitation";
-$MailNotifyMessage = "Avertir par mail de la réception d'un message";
-$MailNotifyGroupMessage = "Avertir par mail de la réception d'un message de groupe";
 $AtOnce = "À la réception";
 $Daily = "Une fois par jour";
 ?>

+ 3 - 0
main/lang/french/trad4all.inc.php

@@ -1012,4 +1012,7 @@ $MyStatistics = "Mes statistiques";
 $FromDateXToDateY = "Du %s au %s";
 $CourseThematicAdvance = "Journal de classe";
 $Clean = "Nettoyer";
+$MailNotifyInvitation = "Avertir par mail de la réception d'une invitation";
+$MailNotifyMessage = "Avertir par mail de la réception d'un message";
+$MailNotifyGroupMessage = "Avertir par mail de la réception d'un message de groupe";
 ?>

+ 0 - 3
main/lang/italian/registration.inc.php

@@ -184,9 +184,6 @@ $AreYouSureToEditTheUserStatus = "Sei sicuro di modificare lo stato dell'utente?
 $TheTutorOnlyCanKeepTrackOfStudentsRegisteredInTheCourse = "Il tutor può solo controllare i progressi dei corsisti";
 $TheTeacherCanQualifyEvaluateAndKeepTrackOfAllStudentsEnrolledInTheCourse = "Il docente può controllare, valutare i corsisti e assegnarne i diritti";
 $LoginOrEmailAddress = "Nome dell'utente e indirizzo e-mail";
-$MailNotifyInvitation = "Notifica via e-mail la ricezione di nuovi inviti";
-$MailNotifyMessage = "Notifica via e-mail la ricezione di nuovi messaggi personali";
-$MailNotifyGroupMessage = "Notifica via e-mail l'invio di nuovi messaggi al gruppo";
 $AtOnce = "Immediatamente";
 $Daily = "Quotidianamente";
 ?>

+ 3 - 0
main/lang/italian/tracking.inc.php

@@ -291,4 +291,7 @@ $LPProgress = "Avanzamento nei moduli didattici";
 $Ranking = "Graduatoria";
 $BestResultInCourse = "Miglior risultato nel modulo";
 $ExerciseStartDate = "Data di pubblicazione";
+$OnlyBestResultsPerStudent = "In caso di tentativi multipli mostra solo il risultato migliore di ogni corsista";
+$BestAttempt = "Miglior risultato";
+$ExercisesInTimeProgressChart = "Avanzamento progressivo dei propri risultati nei test rispetto alla media dei corsisti";
 ?>

+ 1 - 0
main/lang/italian/userInfo.inc.php

@@ -198,4 +198,5 @@ $MyFiles = "I miei documenti";
 $MySocialGroups = "I miei gruppi";
 $SocialGroups = "Gruppi";
 $CreateASocialGroup = "Crea un gruppo";
+$EditMembersList = "Modifica l'elenco dei partecipanti";
 ?>

+ 7 - 7
main/lang/slovenian/agenda.inc.php

@@ -56,13 +56,13 @@ $NewAnnouncement = "Novo obvestilo";
 $AddAnnouncement = "Dodano kot obvestilo";
 $UpcomingEvent = "Prihajajoč dogodek";
 $RepeatedEvent = "Ponovljiv dogodek";
-$RepeatType = "Vrsta ponovljivosti";
-$RepeatDaily = "Dnevni";
-$RepeatWeekly = "Tedenski";
-$RepeatMonthlyByDate = "Mesečni, po datumu";
-$RepeatMonthlyByDay = "Mesečni, po dnevih";
-$RepeatMonthlyByDayR = "Mesečni, po dnevih, omejen";
-$RepeatYearly = "Letni";
+$RepeatType = "Vrsta ponovitve";
+$RepeatDaily = "Dnevna";
+$RepeatWeekly = "Tedenska";
+$RepeatMonthlyByDate = "Mesečna, po datumu";
+$RepeatMonthlyByDay = "Mesečna, po dnevih";
+$RepeatMonthlyByDayR = "Mesečna, po dnevih, omejena";
+$RepeatYearly = "Letna";
 $RepeatEnd = "Datum konca ponovitev";
 $RepeatedEventViewOriginalEvent = "Poglej začetni dogodek";
 $ICalFileImport = "Uvozi iCal/ics datoteko";

+ 1 - 1
main/lang/slovenian/gradebook.inc.php

@@ -160,7 +160,7 @@ $NoCertificateAvailable = "Nobenega certifikata ni na voljo";
 $SaveCertificate = "Shrani certifikat";
 $CertificateNotRemoved = "Certifikat ne more biti odstranjen";
 $CertificateRemoved = "Certifikat je bil odstranjen";
-$NoDefaultCertificate = "Ni privzetega";
+$NoDefaultCertificate = "Ni privzet";
 $DefaultCertificate = "Privzeti certifikat";
 $PreviewCertificate = "Predogled certifikata";
 $IsDefaultCertificate = "Certifikat je nastavljen kot privzeti";

+ 0 - 3
main/lang/slovenian/registration.inc.php

@@ -184,9 +184,6 @@ $AreYouSureToEditTheUserStatus = "Ste prepričani, da želite urediti uporabniš
 $TheTutorOnlyCanKeepTrackOfStudentsRegisteredInTheCourse = "Tutor lahko zgolj sledi napredkom vseh registiranih tečajnikov tega tečaja";
 $TheTeacherCanQualifyEvaluateAndKeepTrackOfAllStudentsEnrolledInTheCourse = "Učitelj lahko primerja, ocenjuje in sledi napredku vsakega posameznega tečajnika tega tečaja";
 $LoginOrEmailAddress = "Uporabniško ime ali e-poštni naslov";
-$MailNotifyInvitation = "Obvesti po e-pošti ob prejetem novem povabilu";
-$MailNotifyMessage = "Obvesti po e-pošti ob novem osebnem sporočilu";
-$MailNotifyGroupMessage = "Obvesti preko e-pošte ob novem sporočilu v skupini";
 $AtOnce = "Ob sprejemu";
 $Daily = "Enkrat na dan";
 ?>

+ 3 - 0
main/lang/slovenian/tracking.inc.php

@@ -289,4 +289,7 @@ $AverageExerciseResult = "Povprečen rezultat vaj/testov";
 $LPProgress = "Napredek učne poti";
 $BestResultInCourse = "Najboljši rezultat v tečaju";
 $ExerciseStartDate = "Datum objave";
+$OnlyBestResultsPerStudent = "V primeru večih poskusov, prikaži zgolj najboljši rezultat posameznega tečajnika";
+$BestAttempt = "Najboljši poizkus";
+$ExercisesInTimeProgressChart = "Napredek v rezultatih vaj/testov preko časa proti povprečju vseh tečajnikov";
 ?>

+ 1 - 0
main/lang/slovenian/userInfo.inc.php

@@ -198,4 +198,5 @@ $MyFiles = "Moje datoteke";
 $MySocialGroups = "Moje socialne skupine";
 $SocialGroups = "Socialne skupine";
 $CreateASocialGroup = "Ustvari socialno skupino";
+$EditMembersList = "Uredi seznam članov";
 ?>

+ 2 - 2
main/lang/spanish/admin.inc.php

@@ -1099,7 +1099,7 @@ $BlockCopyPasteForStudentsTitle = "Bloquear a los estudiantes copiar y pegar";
 $BlockCopyPasteForStudentsComment = "Bloquear a los estudiantes la posibilidad de copiar y pegar en el editor WYSIWYG";
 $MoreButtonsForMaximizedModeTitle = "Barras de botones extendidas";
 $MoreButtonsForMaximizedModeComment = "Habilitar las barras de botones extendidas cuando el editor WYSIWYG está maximizado";
-$Editor = "Editor";
+$Editor = "Editor HTML";
 $GoToCourseAfterLoginTitle = "Ir directamente al curso tras identificarse";
 $GoToCourseAfterLoginComment = "Cuando un usuario está inscrito sólamente en un curso, ir directamente al curso despúes de identificarse";
 $GroupList = "Lista de grupos de la red social";
@@ -1306,7 +1306,7 @@ $BigBlueButtonEnableTitle = "Herramienta de videoconferencia BigBlueButton";
 $BigBlueButtonEnableComment = "Seleccione si desea habilitar la herramienta de videoconferencia BigBlueButton. Una vez activada, se mostrará como una herramienta en la página principal todos los curso. Los profesores podrán lanzar una videoconferencia en cualquier momento, pero los alumnos sólo podrán unirse a una ya lanzada.
 Si no dispone de un servidor BigBlueButton, pruebe a 
 <a href=\"http://bigbluebutton.org/\" target=\"_blank\">configurar uno</a> o pida ayuda a los <a href=\"http://www.chamilo.org/en/providers\" target=\"_blank\">proveedores oficiales de Chamilo</a>.
-BigBlueButton es libre (como la libertad *y* la cerveza), pero su instalación requiere un conjunto de habilidades técnicas que no todo el mundo posee. Puede instalarlo por su cuenta o buscar ayuda profesional para hacerlo, con el consiguiente costo. En la lógica pura del software libre, nosotros le ofrecemos las herramientas para hacer más fácil su trabajo y le recomendamos profesionales (los proveedores oficiales de Chamilo) que serán capaces de ayudarle.";
+BigBlueButton es libre, pero su instalación requiere ciertas habilidades técnicas que no todo el mundo posee. Puede instalarlo por su cuenta o buscar ayuda profesional con el consiguiente costo. En la lógica del software libre, nosotros le ofrecemos las herramientas para hacer más fácil su trabajo y le recomendamos profesionales (los proveedores oficiales de Chamilo) que serán capaces de ayudarle.";
 $BigBlueButtonHostTitle = "Servidor BigBlueButton";
 $BigBlueButtonHostComment = "Este es el nombre del servidor donde su servidor BigBlueButton está ejecutándose. Puede ser localhost, una dirección IP (ej., 192.168.14.54) o un nombre de dominio (por ej., my.video.com).";
 $BigBlueButtonSecuritySaltTitle = "Clave de seguridad del servidor BigBlueButton";

+ 0 - 3
main/lang/spanish/registration.inc.php

@@ -184,9 +184,6 @@ $AreYouSureToEditTheUserStatus = "¿Está seguro de querer editar el estatus de
 $TheTutorOnlyCanKeepTrackOfStudentsRegisteredInTheCourse = "El tutor solo puede realizar el seguimiento de los alumnos registrados al curso.";
 $TheTeacherCanQualifyEvaluateAndKeepTrackOfAllStudentsEnrolledInTheCourse = "El profesor puede calificar evaluar y realizar el seguimiento de todos los alumnos registrados en el curso.";
 $LoginOrEmailAddress = "Nombre de usuario o dirección e-mail";
-$MailNotifyInvitation = "Notificación por correo de nuevas invitaciones recibidas";
-$MailNotifyMessage = "Notificación por correo de nuevo mensaje personal";
-$MailNotifyGroupMessage = "Notificación por correo de nuevos mensajes recibidos en grupos";
 $AtOnce = "Inmediatamente";
 $Daily = "A diario";
 ?>

+ 15 - 11
main/lang/spanish/trad4all.inc.php

@@ -321,7 +321,7 @@ $langDoYouAccept = "¿Acepta?";
 $Everybody = "todos los usuarios del curso";
 $SentTo = "Dirigido a";
 $Export = "Exportar";
-$Tools = "Herramientas";
+$Tools = "Módulos";
 $Everyone = "Cada uno";
 $SelectGroupsUsers = "Seleccionar grupos/usuarios";
 $Student = "Estudiante";
@@ -366,7 +366,7 @@ $Anonymous = "Anónimo";
 $h = "h";
 $CreateNewGlobalRole = "Crear nuevo rol global";
 $CreateNewLocalRole = "Crear nuevo rol local";
-$Actions = "Acción";
+$Actions = "Opciones";
 $Inbox = "Bandeja de entrada";
 $ComposeMessage = "Redactar";
 $Other = "Otro";
@@ -817,7 +817,7 @@ $AssignSessions = "Asignar sesiones de formación";
 $Timezone = "Zona horaria";
 $DashboardPluginsHaveBeenUpdatedSucesslly = "Los plugins del panel de control han sido actualizados correctamente";
 $LoginEnter = "Entrar";
-$AttendanceSheetDescription = "Las listas de asistencia permiten registrar las faltas de asistencia de los estudiantes. En caso de ausencia de un estudiante, el profesor deberá registrarlo manualmente en la casilla correspondiente.
+$AttendanceSheetDescription = "Las listas de asistencia permiten registrar las faltas de asistencia de los estudiantes. En caso de ausencia de un estudiante, el profesor deberá registrarlo manualmente en la casilla correspondiente.
 Es posible crear más de una lista de asistencia por cada curso; así por ejemplo, podrá registrar separadamente la asistencia a las clases teóricas y prácticas.";
 $ThereAreNoRegisteredLearnersInsidetheCourse = "No hay alumnos inscritos en este curso";
 $GoToAttendanceCalendarList = "Ir al calendario de asistencia";
@@ -928,14 +928,14 @@ $SendInformation = "Enviar la información";
 $YouMustAcceptLicence = "Debe aceptar la licencia para poder usar este software";
 $SelectOne = "Seleccione uno";
 $ContactInformationHasBeenSent = "Información de contacto enviada";
-$ContactInformationDescription = "Estimado usuario,
-
-está a punto de instalar una de las mejores plataformas e-learning de código abierto que existen en el mercado. Al igual de muchos otros proyectos de código abierto, Chamilo está respaldado por una amplia comunidad de profesores, estudiantes, desarrolladores y creadores de contenido.
-
-Si sabemos algo más de quien va a gestionar este sistema e-learning, podremos dar a conocer a otros que nuestro software lo utiliza y a usted podremos informarle sobre eventos que pueden ser de su interés.
-
-Cumplimentar este formulario, implica la aceptación de que la asociación Chamilo o sus miembros puedan enviarle información por correo electrónico sobre eventos importantes o actualizaciones en el software Chamilo. Esto ayudará a crecer a la comunidad como una entidad organizada, donde el flujo de información, se haga con respeto permanente a su tiempo y su privacidad.
-
+$ContactInformationDescription = "Estimado usuario,
+
+está a punto de instalar una de las mejores plataformas e-learning de código abierto que existen en el mercado. Al igual de muchos otros proyectos de código abierto, Chamilo está respaldado por una amplia comunidad de profesores, estudiantes, desarrolladores y creadores de contenido.
+
+Si sabemos algo más de quien va a gestionar este sistema e-learning, podremos dar a conocer a otros que nuestro software lo utiliza y a usted podremos informarle sobre eventos que pueden ser de su interés.
+
+Cumplimentar este formulario, implica la aceptación de que la asociación Chamilo o sus miembros puedan enviarle información por correo electrónico sobre eventos importantes o actualizaciones en el software Chamilo. Esto ayudará a crecer a la comunidad como una entidad organizada, donde el flujo de información, se haga con respeto permanente a su tiempo y su privacidad.
+
 De cualquier forma, tenga en cuenta que no tiene la obligación de rellenar este formulario. Si desea permanecer en el anonimato, perderemos la oportunidad de ofrecerle todos los privilegios de ser un administrador de portal registrado, pero respetaremos su decisión. Basta con dejar vacío este formulario y hacer clic en \"Siguiente\" para seguir instalando Chamilo.";
 $CompanyActivity = "Sector";
 $DateUnLock = "Desbloquear fecha";
@@ -1008,6 +1008,7 @@ $ContactInformationHasNotBeenSent = "Su información de contacto no pudió ser e
 $FileDeleted = "Archivo eliminado";
 $MyClasses = "Mis clases";
 $PublicationDate = "Fecha de publicación";
+$CorrectAndRate = "Corregir y puntuar";
 $ItemAdded = "Elemento añadido";
 $ItemDeleted = "Elemento borrado";
 $ItemUpdated = "Elemento actualizado";
@@ -1016,4 +1017,7 @@ $MyStatistics = "Mis estadísticas";
 $FromDateXToDateY = "Del %s al %s";
 $CourseThematicAdvance = "Avance del curso";
 $Clean = "Limpiar";
+$MailNotifyInvitation = "Notificación por correo de nuevas invitaciones recibidas";
+$MailNotifyMessage = "Notificación por correo de nuevo mensaje personal";
+$MailNotifyGroupMessage = "Notificación por correo de nuevos mensajes recibidos en grupos";
 ?>

+ 2 - 2
main/lang/spanish/userInfo.inc.php

@@ -195,8 +195,8 @@ $SeeAllMyGroups = "Ver todos mis grupos";
 $YouAlreadyInviteAllYourContacts = "Ya invitó a todos sus contactos";
 $YouShouldCreateAGroup = "Debería crear un grupo";
 $MyFiles = "Mis archivos";
-$MySocialGroups = "Mis grupos sociales";
-$SocialGroups = "Grupos sociales";
+$MySocialGroups = "Mis grupos";
+$SocialGroups = "Grupos";
 $CreateASocialGroup = "Crear un grupo social";
 $EditMembersList = "Editar lista de miembros";
 ?>

+ 26 - 26
main/survey/survey.lib.php

@@ -1491,13 +1491,13 @@ class ch_yesno extends survey_question {
 		//$this->html .= '		<td><input type="text" name="answers[0]" id="answers[0]" value="'.$form_content['answers'][0].'" /></td>';
 
 		$this->html .= '		<td width="550">'.api_return_html_area('answers[0]', stripslashes($form_content['answers'][0]), '', '', null, array('ToolbarSet' => 'Survey', 'Width' => '100%', 'Height' => '120')).'</td>';
-		$this->html .= '		<td><input type="image" src="../img/down.gif"  value="move_down[0]" name="move_down[0]"/></td>';
+		$this->html .= '		<td><input type="image" src="../img/icons/22/down.png"  value="move_down[0]" name="move_down[0]"/></td>';
 		$this->html .= '	</tr>';
 		$this->html .= '	<tr>';
 		$this->html .= '		<td align="right"><label for="answers[1]">2</label></td>';
 		//$this->html .= '		<td><input type="text" name="answers[1]" id="answers[1]" value="'.$form_content['answers'][1].'" /></td>';
 		$this->html .= '		<td width="550">'.api_return_html_area('answers[1]', stripslashes($form_content['answers'][1]), '', '', null, array('ToolbarSet' => 'Survey', 'Width' => '100%', 'Height' => '120')).'</td>';
-		$this->html .= '		<td><input type="image" src="../img/up.gif" value="move_up[1]" name="move_up[1]" /></td>';
+		$this->html .= '		<td><input type="image" src="../img/icons/22/up.png" value="move_up[1]" name="move_up[1]" /></td>';
 		$this->html .= '	</tr>';
 		$this->html .= '			</table>';
 		$this->html .= '		</div>';
@@ -1588,13 +1588,13 @@ class ch_multiplechoice extends survey_question {
 				$this->html .= '		<td width="550">'.api_return_html_area('answers['.$key.']', api_html_entity_decode(stripslashes($form_content['answers'][$key]), ENT_QUOTES), '', '', null, array('ToolbarSet' => 'Survey', 'Width' => '100%', 'Height' => '120')).'</td>';
 				$this->html .= '		<td>';
 				if ($key<$total_number_of_answers-1) {
-					$this->html .= '			<input type="image" src="../img/down.gif"  value="move_down['.$key.']" name="move_down['.$key.']"/>';
+					$this->html .= '			<input type="image" src="../img/icons/22/down.png"  value="move_down['.$key.']" name="move_down['.$key.']"/>';
 				}
 				if ($key>0) {
-					$this->html .= '			<input type="image" src="../img/up.gif"  value="move_up['.$key.']" name="move_up['.$key.']"/>';
+					$this->html .= '			<input type="image" src="../img/icons/22/up.png"  value="move_up['.$key.']" name="move_up['.$key.']"/>';
 				}
 				if ($total_number_of_answers> 2) {
-					$this->html .= '			<input type="image" src="../img/delete.gif"  value="delete_answer['.$key.']" name="delete_answer['.$key.']"/>';
+					$this->html .= '			<input type="image" src="../img/icons/22/delete.png"  value="delete_answer['.$key.']" name="delete_answer['.$key.']"/>';
 				}
 				$this->html .= ' 		</td>';
 				$this->html .= '	</tr>';
@@ -1688,13 +1688,13 @@ class ch_personality extends survey_question {
 				}
 
 				if ($key < $total_number_of_answers - 1) {
-					$this->html .= '		<input type="image" src="../img/down.gif"  value="move_down['.$key.']" name="move_down['.$key.']"/>';
+					$this->html .= '		<input type="image" src="../img/icons/22/down.png"  value="move_down['.$key.']" name="move_down['.$key.']"/>';
 				}
 				if ($key > 0) {
-					$this->html .= '		<input type="image" src="../img/up.gif"  value="move_up['.$key.']" name="move_up['.$key.']"/>';
+					$this->html .= '		<input type="image" src="../img/icons/22/up.png"  value="move_up['.$key.']" name="move_up['.$key.']"/>';
 				}
 				if ($total_number_of_answers > 2) {
-					$this->html .= '			<input type="image" src="../img/delete.gif"  value="delete_answer['.$key.']" name="delete_answer['.$key.']"/>';
+					$this->html .= '			<input type="image" src="../img/icons/22/delete.png"  value="delete_answer['.$key.']" name="delete_answer['.$key.']"/>';
 				}
 				$this->html .= ' 		</td>';
 				$this->html .= '	</tr>';
@@ -1765,15 +1765,15 @@ class ch_multipleresponse extends survey_question {
 				$this->html .= '		<td width="550">'.api_return_html_area('answers['.$key.']', api_html_entity_decode(stripslashes($form_content['answers'][$key]), ENT_QUOTES), '', '', null, array('ToolbarSet' => 'Survey', 'Width' => '100%', 'Height' => '120')).'</td>';
 				$this->html .= '		<td>';
 				if ($key<$total_number_of_answers - 1) {
-					$this->html .= '			<input type="image" src="../img/down.gif"  value="move_down['.$key.']" name="move_down['.$key.']"/>';
+					$this->html .= '			<input type="image" src="../img/icons/22/down.png"  value="move_down['.$key.']" name="move_down['.$key.']"/>';
 				}
 
 				if ($key > 0) {
-					$this->html .= '			<input type="image" src="../img/up.gif"  value="move_up['.$key.']" name="move_up['.$key.']"/>';
+					$this->html .= '			<input type="image" src="../img/icons/22/up.png"  value="move_up['.$key.']" name="move_up['.$key.']"/>';
 				}
 
 				if ($total_number_of_answers > 2) {
-					$this->html .= '			<input type="image" src="../img/delete.gif"  value="delete_answer['.$key.']" name="delete_answer['.$key.']"/>';
+					$this->html .= '			<input type="image" src="../img/icons/22/delete.png"  value="delete_answer['.$key.']" name="delete_answer['.$key.']"/>';
 				}
 				$this->html .= ' 		</td>';
 				$this->html .= '	</tr>';
@@ -1845,13 +1845,13 @@ class ch_dropdown extends survey_question {
 			$this->html .= '		<td><input type="text" name="answers['.$key.']" id="answers['.$key.']" value="'.stripslashes($form_content['answers'][$key]).'" /></td>';
 			$this->html .= '		<td>';
 			if ($key < $total_number_of_answers - 1) {
-				$this->html .= '			<input type="image" src="../img/down.gif"  value="move_down['.$key.']" name="move_down['.$key.']"/>';
+				$this->html .= '			<input type="image" src="../img/icons/22/down.png"  value="move_down['.$key.']" name="move_down['.$key.']"/>';
 			}
 			if ($key > 0) {
-				$this->html .= '			<input type="image" src="../img/up.gif"  value="move_up['.$key.']" name="move_up['.$key.']"/>';
+				$this->html .= '			<input type="image" src="../img/icons/22/up.png"  value="move_up['.$key.']" name="move_up['.$key.']"/>';
 			}
 			if ($total_number_of_answers> 2) {
-				$this->html .= '			<input type="image" src="../img/delete.gif"  value="delete_answer['.$key.']" name="delete_answer['.$key.']"/>';
+				$this->html .= '			<input type="image" src="../img/icons/22/delete.png"  value="delete_answer['.$key.']" name="delete_answer['.$key.']"/>';
 			}
 			$this->html .= ' 		</td>';
 			$this->html .= '	</tr>';
@@ -2043,13 +2043,13 @@ class ch_score extends survey_question {
 			$this->html .= '		<td width="550">'.api_return_html_area('answers['.$key.']', stripslashes($form_content['answers'][$key]), '', '', null, array('ToolbarSet' => 'Survey', 'Width' => '100%', 'Height' => '120')).'</td>';
 			$this->html .= '		<td>';
 			if ($key<$total_number_of_answers - 1) {
-				$this->html .= '			<input type="image" src="../img/down.gif"  value="move_down['.$key.']" name="move_down['.$key.']"/>';
+				$this->html .= '			<input type="image" src="../img/icons/22/down.png"  value="move_down['.$key.']" name="move_down['.$key.']"/>';
 			}
 			if ($key > 0) {
-				$this->html .= '			<input type="image" src="../img/up.gif"  value="move_up['.$key.']" name="move_up['.$key.']"/>';
+				$this->html .= '			<input type="image" src="../img/icons/22/up.png"  value="move_up['.$key.']" name="move_up['.$key.']"/>';
 			}
 			if ($total_number_of_answers > 2) {
-				$this->html .= '			<input type="image" src="../img/delete.gif"  value="delete_answer['.$key.']" name="delete_answer['.$key.']"/>';
+				$this->html .= '			<input type="image" src="../img/icons/22/delete.png"  value="delete_answer['.$key.']" name="delete_answer['.$key.']"/>';
 			}
 			$this->html .= ' 		</td>';
 			$this->html .= '	</tr>';
@@ -4027,15 +4027,15 @@ class SurveyUtil {
 
 		// Coach can see that only if the survey is in his session
 		if (api_is_allowed_to_edit() || api_is_element_in_the_session(TOOL_SURVEY, $survey_id)) {
-			$return .= '<a href="create_new_survey.php?'.api_get_cidreq().'&amp;action=edit&amp;survey_id='.$survey_id.'">'.Display::return_icon('edit.gif', get_lang('Edit')).'</a>';
-			$return .= '<a href="survey_list.php?'.api_get_cidreq().'&amp;action=delete&amp;survey_id='.$survey_id.'" onclick="javascript: if(!confirm(\''.addslashes(api_htmlentities(get_lang("DeleteSurvey").'?', ENT_QUOTES)).'\')) return false;">'.Display::return_icon('delete.gif', get_lang('Delete')).'</a>&nbsp;';
-			$return .= '<a href="survey_list.php?'.api_get_cidreq().'&amp;action=empty&amp;survey_id='.$survey_id.'" onclick="javascript: if(!confirm(\''.addslashes(api_htmlentities(get_lang("EmptySurvey").'?')).'\')) return false;">'.Display::return_icon('clean.png', get_lang('EmptySurvey'),'','16').'</a>&nbsp;';
+			$return .= '<a href="create_new_survey.php?'.api_get_cidreq().'&amp;action=edit&amp;survey_id='.$survey_id.'">'.Display::return_icon('edit.png', get_lang('Edit'),'',22).'</a>';
+			$return .= '<a href="survey_list.php?'.api_get_cidreq().'&amp;action=delete&amp;survey_id='.$survey_id.'" onclick="javascript: if(!confirm(\''.addslashes(api_htmlentities(get_lang("DeleteSurvey").'?', ENT_QUOTES)).'\')) return false;">'.Display::return_icon('delete.png', get_lang('Delete'),'',22).'</a>&nbsp;';
+			$return .= '<a href="survey_list.php?'.api_get_cidreq().'&amp;action=empty&amp;survey_id='.$survey_id.'" onclick="javascript: if(!confirm(\''.addslashes(api_htmlentities(get_lang("EmptySurvey").'?')).'\')) return false;">'.Display::return_icon('clean.png', get_lang('EmptySurvey'),'','22').'</a>&nbsp;';
 		}
 		//$return .= '<a href="create_survey_in_another_language.php?id_survey='.$survey_id.'">'.Display::return_icon('copy.gif', get_lang('Copy')).'</a>';
 		//$return .= '<a href="survey.php?survey_id='.$survey_id.'">'.Display::return_icon('add.gif', get_lang('Add')).'</a>';
-		$return .= '<a href="preview.php?'.api_get_cidreq().'&amp;survey_id='.$survey_id.'">'.Display::return_icon('preview_view.png', get_lang('Preview'),'','16').'</a>&nbsp;';
-		$return .= '<a href="survey_invite.php?'.api_get_cidreq().'&amp;survey_id='.$survey_id.'">'.Display::return_icon('mail_send.png', get_lang('Publish'),'','16').'</a>&nbsp;';
-		$return .= '<a href="reporting.php?'.api_get_cidreq().'&amp;survey_id='.$survey_id.'">'.Display::return_icon('stats.png', get_lang('Reporting'),'','16').'</a>';
+		$return .= '<a href="preview.php?'.api_get_cidreq().'&amp;survey_id='.$survey_id.'">'.Display::return_icon('preview_view.png', get_lang('Preview'),'','22').'</a>&nbsp;';
+		$return .= '<a href="survey_invite.php?'.api_get_cidreq().'&amp;survey_id='.$survey_id.'">'.Display::return_icon('mail_send.png', get_lang('Publish'),'','22').'</a>&nbsp;';
+		$return .= '<a href="reporting.php?'.api_get_cidreq().'&amp;survey_id='.$survey_id.'">'.Display::return_icon('stats.png', get_lang('Reporting'),'','22').'</a>';
 		return $return;
 	}
 
@@ -4046,9 +4046,9 @@ class SurveyUtil {
 		//$return .= '<a href="survey_list.php?'.api_get_cidreq().'&amp;action=delete&amp;survey_id='.$survey_id.'" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang("DeleteSurvey").'?', ENT_QUOTES)).'\')) return false;">'.Display::return_icon('delete.gif', get_lang('Delete')).'</a>';
 		//$return .= '<a href="create_survey_in_another_language.php?id_survey='.$survey_id.'">'.Display::return_icon('copy.gif', get_lang('Copy')).'</a>';
 		//$return .= '<a href="survey.php?survey_id='.$survey_id.'">'.Display::return_icon('add.gif', get_lang('Add')).'</a>';
-		$return .= '<a href="preview.php?'.api_get_cidreq().'&amp;survey_id='.$survey_id.'">'.Display::return_icon('preview.gif', get_lang('Preview')).'</a>&nbsp;';
-		$return .= '<a href="survey_invite.php?'.api_get_cidreq().'&amp;survey_id='.$survey_id.'">'.Display::return_icon('survey_publish.gif', get_lang('Publish')).'</a>&nbsp;';
-		$return .= '<a href="survey_list.php?'.api_get_cidreq().'&amp;action=empty&amp;survey_id='.$survey_id.'" onclick="javascript: if(!confirm(\''.addslashes(api_htmlentities(get_lang("EmptySurvey").'?', ENT_QUOTES)).'\')) return false;">'.Display::return_icon('clean_group.gif', get_lang('EmptySurvey')).'</a>&nbsp;';
+		$return .= '<a href="preview.php?'.api_get_cidreq().'&amp;survey_id='.$survey_id.'">'.Display::return_icon('preview_view.png', get_lang('Preview'),'',22).'</a>&nbsp;';
+		$return .= '<a href="survey_invite.php?'.api_get_cidreq().'&amp;survey_id='.$survey_id.'">'.Display::return_icon('mail_send.png', get_lang('Publish'),'',22).'</a>&nbsp;';
+		$return .= '<a href="survey_list.php?'.api_get_cidreq().'&amp;action=empty&amp;survey_id='.$survey_id.'" onclick="javascript: if(!confirm(\''.addslashes(api_htmlentities(get_lang("EmptySurvey").'?', ENT_QUOTES)).'\')) return false;">'.Display::return_icon('clean.png', get_lang('EmptySurvey'),'',22).'</a>&nbsp;';
 		//$return .= '<a href="reporting.php?'.api_get_cidreq().'&amp;survey_id='.$survey_id.'">'.Display::return_icon('statistics.gif', get_lang('Reporting')).'</a>';
 		return $return;
 	}

+ 8 - 8
main/survey/survey.php

@@ -214,17 +214,17 @@ while ($row = Database::fetch_array($result, 'ASSOC')) {
 	echo '	<td>'.$tool_name.'</td>';
 	echo '	<td>'.$row['number_of_options'].'</td>';
 	echo '	<td>';
-	echo '		<a href="question.php?'.api_get_cidreq().'&amp;action=edit&amp;type='.$row['type'].'&amp;survey_id='.$survey_id.'&amp;question_id='.$row['question_id'].'">'.Display::return_icon('edit.gif', get_lang('Edit')).'</a>';
-	echo '		<a href="survey.php?'.api_get_cidreq().'&amp;action=delete&amp;survey_id='.$survey_id.'&amp;question_id='.$row['question_id'].'" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang("DeleteSurveyQuestion").'?',ENT_QUOTES,$charset)).'\')) return false;">'.Display::return_icon('delete.gif', get_lang('Delete')).'</a>';
+	echo '		<a href="question.php?'.api_get_cidreq().'&amp;action=edit&amp;type='.$row['type'].'&amp;survey_id='.$survey_id.'&amp;question_id='.$row['question_id'].'">'.Display::return_icon('edit.png', get_lang('Edit'),'',22).'</a>';
+	echo '		<a href="survey.php?'.api_get_cidreq().'&amp;action=delete&amp;survey_id='.$survey_id.'&amp;question_id='.$row['question_id'].'" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(get_lang("DeleteSurveyQuestion").'?',ENT_QUOTES,$charset)).'\')) return false;">'.Display::return_icon('delete.png', get_lang('Delete'),'',22).'</a>';
 	if ($question_counter > 1) {
-		echo '		<a href="survey.php?'.api_get_cidreq().'&amp;action=moveup&amp;survey_id='.$survey_id.'&amp;question_id='.$row['question_id'].'">'.Display::return_icon('up.gif', get_lang('MoveUp')).'</a>';
+		echo '		<a href="survey.php?'.api_get_cidreq().'&amp;action=moveup&amp;survey_id='.$survey_id.'&amp;question_id='.$row['question_id'].'">'.Display::return_icon('up.png', get_lang('MoveUp'),'',22).'</a>';
 	} else {
-		Display::display_icon('up_na.gif');
+		Display::display_icon('up_na.png','&nbsp;','',22);
 	}
 	if ($question_counter < $question_counter_max) {
-		echo '		<a href="survey.php?'.api_get_cidreq().'&amp;action=movedown&amp;survey_id='.$survey_id.'&amp;question_id='.$row['question_id'].'">'.Display::return_icon('down.gif', get_lang('MoveDown')).'</a>';
+		echo '		<a href="survey.php?'.api_get_cidreq().'&amp;action=movedown&amp;survey_id='.$survey_id.'&amp;question_id='.$row['question_id'].'">'.Display::return_icon('down.png', get_lang('MoveDown'),'',22).'</a>';
 	} else {
-		Display::display_icon('down_na.gif');
+		Display::display_icon('down_na.png','&nbsp;','',22);
 	}
 	echo '	</td>';
 	$question_counter++;
@@ -279,9 +279,9 @@ if ($is_survey_type_1) {
 	while($row = Database::fetch_array($rs,ASSOC)){
 		$grouplist .= '<tr><td>'.$row['name'].'</td><td>'.$row['description'].'</td><td>'.
 		'<a href="survey.php?survey_id='.$survey_id.'&gid='.$row['id'].'&action=editgroup">'.
-		Display::return_icon('edit.gif', get_lang('Edit')).'</a> '.
+		Display::return_icon('edit.png', get_lang('Edit'),'',22).'</a> '.
 		'<a href="survey.php?survey_id='.$survey_id.'&gid='.$row['id'].'&action=deletegroup" onclick="javascript:if(!confirm(\''.addslashes(api_htmlentities(sprintf(get_lang('DeleteSurveyGroup'),$row['name']).'?',ENT_QUOTES)).'\')) return false;">'.
-		Display::return_icon('delete.gif', get_lang('Delete')).'</a>'.
+		Display::return_icon('delete.png', get_lang('Delete'),'',22).'</a>'.
 		'</td></tr>';
 	}
 	echo $grouplist.'</table>';

+ 12 - 12
main/template/default/auth/courses_list.php

@@ -66,7 +66,7 @@ $courses_without_category = $courses_in_category[0];
                     <table><tr><td>
                     <?php if ($key > 0) { ?>
                             <a href="courses.php?action=<?php echo $action; ?>&amp;move=up&amp;course=<?php echo $course['code']; ?>&amp;category=<?php echo $course['user_course_cat']; ?>&amp;sec_token=<?php echo $stok; ?>">
-                            <?php echo Display::display_icon('up.gif', get_lang('Up')) ?>
+                            <?php echo Display::display_icon('up.png', get_lang('Up'),'',22) ?>
                             </a>
                     <?php } ?>
                     </td>
@@ -90,7 +90,7 @@ $courses_without_category = $courses_in_category[0];
                             </td>
                     <?php } else { ?>
                             <td rowspan="2" valign="middle"><a href="courses.php?action=<?php echo $action; ?>&amp;edit=<?php echo $course['code']; ?>&amp;sec_token=<?php echo $stok; ?>">
-                            <?php echo Display::display_icon('edit.gif', get_lang('Edit')); ?>
+                            <?php echo Display::display_icon('edit.png', get_lang('Edit'),'',22); ?>
                             </a></td>
                     <?php } ?>
 
@@ -102,7 +102,7 @@ $courses_without_category = $courses_in_category[0];
                                 <form action="<?php echo api_get_self(); ?>" method="post" onsubmit="javascript: if (!confirm('<?php echo addslashes(api_htmlentities(get_lang("ConfirmUnsubscribeFromCourse"), ENT_QUOTES, api_get_system_encoding())) ?>')) return false;">
                                 <input type="hidden" name="sec_token" value="<?php echo $stok; ?>">
                                 <input type="hidden" name="unsubscribe" value="<?php echo $course['code']; ?>" />
-                                <input type="image" name="unsub" style="border-color:#fff" src="<?php echo api_get_path(WEB_IMG_PATH).'delete.gif'; ?>" title="<?php echo get_lang('_unsubscribe') ?>"  alt="<?php echo get_lang('_unsubscribe'); ?>" /></form>
+                                <input type="image" name="unsub" style="border-color:#fff" src="<?php echo api_get_path(WEB_IMG_PATH).'/icons/22/unsubscribe_course.png'; ?>" title="<?php echo get_lang('_unsubscribe') ?>"  alt="<?php echo get_lang('_unsubscribe'); ?>" /></form>
                       <?php } else {
                                 echo get_lang('UnsubscribeNotAllowed');
 
@@ -116,7 +116,7 @@ $courses_without_category = $courses_in_category[0];
                     </tr><tr><td>
                     <?php if ($key < $number_of_courses - 1) { ?>
                             <a href="courses.php?action=<?php echo $action; ?>&amp;move=down&amp;course=<?php echo $course['code']; ?>&amp;category=<?php echo $course['user_course_cat']; ?>&amp;sec_token=<?php echo $stok; ?>">
-                            <?php echo Display::display_icon('down.gif', get_lang('Down')); ?>
+                            <?php echo Display::display_icon('down.png', get_lang('Down'),'',22); ?>
                             </a>
                     <?php } ?>
                     </td></tr></table>
@@ -156,18 +156,18 @@ $courses_without_category = $courses_in_category[0];
                             <td>
                             <?php if ($row['id'] != $user_course_categories[0]['id']) { ?>
                                     <a href="courses.php?action=<?php echo $action ?>&amp;move=up&amp;category=<?php echo $row['id']; ?>&amp;sec_token=<?php echo $stok; ?>">
-                                    <?php echo Display::return_icon('up.gif', get_lang('Up')); ?>
+                                    <?php echo Display::return_icon('up.png', get_lang('Up'),'',22); ?>
                                     </a>
                             <?php } ?>
                             </td>
                             <td rowspan="2">
                             <a href="courses.php?action=sortmycourses&amp;categoryid=<?php echo $row['id']; ?>&amp;sec_token=<?php echo $stok; ?>#category<?php echo $row['id']; ?>">
-                            <?php echo Display::display_icon('edit.gif', get_lang('Edit')); ?>
+                            <?php echo Display::display_icon('edit.png', get_lang('Edit'),'',22); ?>
                             </a>
                             </td>
                             <td rowspan=\"2\">
                             <a href="courses.php?action=deletecoursecategory&amp;id=<?php echo $row['id']; ?>&amp;sec_token=<?php echo $stok; ?>">
-                            <?php echo Display::display_icon('delete.gif', get_lang('Delete'), array('onclick' => "javascript: if (!confirm('".addslashes(api_htmlentities(get_lang("CourseCategoryAbout2bedeleted"), ENT_QUOTES, api_get_system_encoding()))."')) return false;")) ?>
+                            <?php echo Display::display_icon('delete.png', get_lang('Delete'), array('onclick' => "javascript: if (!confirm('".addslashes(api_htmlentities(get_lang("CourseCategoryAbout2bedeleted"), ENT_QUOTES, api_get_system_encoding()))."')) return false;"),22) ?>
                             </a>
                             </td>
                             </tr>
@@ -175,7 +175,7 @@ $courses_without_category = $courses_in_category[0];
                             <td>
                             <?php if ($row['id'] != $user_course_categories[$max_category_key - 1]['id']) { ?>
                                     <a href="courses.php?action=<?php echo $action; ?>&amp;move=down&amp;category=<?php echo $row['id']; ?>&amp;sec_token=<?php echo $stok; ?>">
-                                    <?php echo Display::return_icon('down.gif', get_lang('Down')); ?>
+                                    <?php echo Display::return_icon('down.png', get_lang('Down'),'',22); ?>
                                     </a>
                             <?php } ?>
                             </td>
@@ -217,7 +217,7 @@ $courses_without_category = $courses_in_category[0];
                                 <table><tr><td>
                                 <?php if ($key > 0) { ?>
                                         <a href="courses.php?action=<?php echo $action; ?>&amp;move=up&amp;course=<?php echo $course['code']; ?>&amp;category=<?php echo $course['user_course_cat']; ?>&amp;sec_token=<?php echo $stok; ?>">
-                                        <?php echo Display::display_icon('up.gif', get_lang('Up')); ?>
+                                        <?php echo Display::display_icon('up.png', get_lang('Up'),'',22); ?>
                                         </a>
                                 <?php } ?>
                                 </td>
@@ -241,7 +241,7 @@ $courses_without_category = $courses_in_category[0];
 
                                 <?php } else { ?>
                                         <td rowspan="2" valign="middle"><a href="courses.php?action=<?php echo $action; ?>&amp;edit=<?php echo $course['code']; ?>&amp;sec_token=<?php echo $stok; ?>">
-                                        <?php echo Display::display_icon('edit.gif', get_lang('Edit')); ?>
+                                        <?php echo Display::display_icon('edit.png', get_lang('Edit'),'',22); ?>
                                         </a></td>
                                 <?php } ?>
                                 <td rowspan="2" valign="top" class="invisible">
@@ -252,7 +252,7 @@ $courses_without_category = $courses_in_category[0];
                                                         <form action="<?php echo api_get_self(); ?>" method="post" onsubmit="javascript: if (!confirm('<?php echo addslashes(api_htmlentities(get_lang("ConfirmUnsubscribeFromCourse"), ENT_QUOTES, api_get_system_encoding()))?>')) return false">
                                                         <input type="hidden" name="sec_token" value="<?php echo $stok; ?>">
                                                         <input type="hidden" name="unsubscribe" value="<?php echo $course['code']; ?>" />
-                                                        <input type="image" name="unsub" style="border-color:#fff" src="<?php echo api_get_path(WEB_IMG_PATH); ?>delete.gif" title="<?php echo get_lang('_unsubscribe') ?>"  alt="<?php echo get_lang('_unsubscribe') ?>" /></form>
+                                                        <input type="image" name="unsub" style="border-color:#fff" src="<?php echo api_get_path(WEB_IMG_PATH); ?>icons/22/unsubscribe_course.png" title="<?php echo get_lang('_unsubscribe') ?>"  alt="<?php echo get_lang('_unsubscribe') ?>" /></form>
                                   <?php } else {
                                                 echo get_lang('UnsubscribeNotAllowed');
                                         }
@@ -264,7 +264,7 @@ $courses_without_category = $courses_in_category[0];
                                 </tr><tr><td>
                                 <?php if ($key < $number_of_courses - 1) { ?>
                                         <a href="courses.php?action=<?php echo $action; ?>&amp;move=down&amp;course=<?php echo $course['code']; ?>&amp;category=<?php echo $course['user_course_cat']; ?>&amp;sec_token=<?php echo $stok; ?>">
-                                        <?php echo Display::display_icon('down.gif', get_lang('Down')); ?>
+                                        <?php echo Display::display_icon('down.png', get_lang('Down'),'',22); ?>
                                         </a>
                                 <?php } ?>
                                 </td></tr></table>

+ 18 - 14
main/work/work.lib.php

@@ -43,6 +43,10 @@ function display_action_links($cur_dir_path, $always_show_tool_options, $always_
 		}
 	}
 	if (!$always_show_tool_options && api_is_allowed_to_edit(null, true) && $origin != 'learnpath') {
+		
+		if (empty($curdirpath)) {
+			$display_output .= '<a href="work.php?">'.Display::return_icon('back.png', get_lang('BackToWorksList'),'','32').'</a>';
+		}
 		// Create dir
 		if ($cur_dir_path == '/') {
 			$display_output .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&amp;toolgroup='.Security::remove_XSS($_GET['toolgroup']).'&amp;createdir=1&origin='.$origin.'&gradebook='.$gradebook.'">'.Display::return_icon('new_work.png', get_lang('CreateAssignment'),'','32').'</a>';
@@ -387,7 +391,7 @@ function display_student_publications_list($work_dir, $sub_course_dir, $currentC
 	$table_header[] = array(get_lang('Date'), true);
 
 	if ($origin != 'learnpath') {
-		$table_header[] = array(get_lang('Modify'), false);
+		$table_header[] = array(get_lang('Actions'), false);
 		$table_header[] = array('RealDate', true);
 	}
 
@@ -710,8 +714,8 @@ function display_student_publications_list($work_dir, $sub_course_dir, $currentC
 				$dirtext = '';
 			}
 
-			$icon = '<img src="../img/works.gif" border="0" hspace="5" align="middle" alt="'.get_lang('Assignment').'" title="'.get_lang('Assignment').'" />';
-
+			$icon = Display::return_icon('work.png', get_lang('Assignment'),array(), 22);
+			
 			if (!empty($display_edit_form) && isset($clean_edit_dir) && $clean_edit_dir == $mydir) {
 				$row[] = $icon;
 				$row[] = '<span class="invisible" style="display:none">'.$dir.'</span>'.$form_folder->toHtml(); // form to edit the directory's name
@@ -730,7 +734,8 @@ function display_student_publications_list($work_dir, $sub_course_dir, $currentC
 				$show_as_icon = get_work_id($mydir); //true or false
 				if ($show_as_icon) {
 					if (is_allowed_to_edit()) {
-						$zip='<a href="'.api_get_self().'?cidReq='.api_get_course_id().'&gradebook='.$gradebook.'&action=downloadfolder&path=/'.$mydir.'"><img src="../img/zip_save.gif" style="float:right;" alt="'.get_lang('Save').'" title="'.get_lang('Save').'" width="17" height="17"/></a>';
+						$zip='<a href="'.api_get_self().'?cidReq='.api_get_course_id().'&gradebook='.$gradebook.'&action=downloadfolder&path=/'.$mydir.'">
+						'.Display::return_icon('save_pack.png', get_lang('Save'),array('style' => 'float:right;'), 22).'</a>';
 					}
 					$row[] = $zip.'<a href="'.api_get_self().'?'.api_get_cidreq().'&origin='.$origin.'&gradebook='.Security::remove_XSS($_GET['gradebook']).'&curdirpath='.$mydir.'"'.$class.'>'.$dir.'</a>'.$add_to_name.'<br />'.$cant_files.' '.$text_file.$dirtext;
 				} else {
@@ -751,8 +756,7 @@ function display_student_publications_list($work_dir, $sub_course_dir, $currentC
 
 			if ($origin != 'learnpath') {
 				if ($is_allowed_to_edit) {
-					$action .= '<a href="'.api_get_self().'?cidReq='.api_get_course_id().
-						'&curdirpath='.$my_sub_dir.'&origin='.$origin.'&gradebook='.$gradebook.'&edit_dir='.$mydir.'">'.Display::return_icon('edit.png', get_lang('Modify'),array(), 22).'</a>';
+					$action .= '<a href="'.api_get_self().'?cidReq='.api_get_course_id().'&curdirpath='.$my_sub_dir.'&origin='.$origin.'&gradebook='.$gradebook.'&edit_dir='.$mydir.'">'.Display::return_icon('edit.png', get_lang('Modify'),array(), 22).'</a>';						
 					$action .= ' <a href="'.api_get_self().'?'.api_get_cidreq().'&origin='.$origin.'&gradebook='.$gradebook.'&delete_dir='.$mydir.'&delete2='.$id2.'" onclick="javascript:if(!confirm('."'".addslashes(api_htmlentities(get_lang('ConfirmYourChoice'), ENT_QUOTES))."'".')) return false;" title="'.get_lang('DirDelete').'"  >'.Display::return_icon('delete.png',get_lang('DirDelete'),'',22).'</a>';
 					$row[] = $action;
 				} else {
@@ -808,7 +812,7 @@ function display_student_publications_list($work_dir, $sub_course_dir, $currentC
 				$url = implode('/', array_map('rawurlencode', explode('/', $work->url)));
 
 				$row[] = '<a href="download.php?file='.$url.'">'.build_document_icon_tag('file', substr(basename($work->url), 13)).'</a>';
-				$row[] = '<a href="download.php?file='.$url.'"'.$class.'><img src="../img/filesave.gif" style="float:right;" alt="'.get_lang('Save').'" title="'.get_lang('Save').'" />'.$work->title.'</a><br />'.$work->description;
+				$row[] = '<a href="download.php?file='.$url.'"'.$class.'>'.Display::return_icon('save.png', get_lang('Save'),array('style' => 'float:right;'), 22).' '.$work->title.'</a><br />'.$work->description;
 				$row[] = display_user_link_work($row2['insert_user_id'], $work->author); // $work->author;
 				$row[] = $qualification_string;
 			
@@ -816,20 +820,20 @@ function display_student_publications_list($work_dir, $sub_course_dir, $currentC
 				$row[] = date_to_str_ago($work_sent_date_local).$add_string.'<br /><span class="dropbox_date">'.api_format_date($work_sent_date_local).'</span>';
 
 				if ($is_allowed_to_edit) {
-					$action = '';
-					$action .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&curdirpath='.urlencode($my_sub_dir).'&amp;origin='.$origin.'&gradebook='.$gradebook.'&amp;edit='.$work->id.'&gradebook='.Security::remove_XSS($_GET['gradebook']).'&amp;parent_id='.$work->parent_id.'" title="'.get_lang('Modify').'"  ><img src="../img/edit.gif" alt="'.get_lang('Modify').'" title="'.get_lang('Modify').'"></a>';
+					$action = '';	
+					$action .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&curdirpath='.urlencode($my_sub_dir).'&amp;origin='.$origin.'&gradebook='.$gradebook.'&amp;edit='.$work->id.'&gradebook='.Security::remove_XSS($_GET['gradebook']).'&amp;parent_id='.$work->parent_id.'" title="'.get_lang('Modify').'"  >'.Display::return_icon('rate_work.png', get_lang('CorrectAndRate'),array(), 22).'</a>';					
 					$action .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&curdirpath='.urlencode($my_sub_dir).'&amp;origin='.$origin.'&gradebook='.$gradebook.'&amp;delete='.$work->id.'" onclick="javascript:if(!confirm('."'".addslashes(api_htmlentities(get_lang('ConfirmYourChoice'),ENT_QUOTES))."'".')) return false;" title="'.get_lang('WorkDelete').'" >'.Display::return_icon('delete.png', get_lang('WorkDelete'),'',22).'</a>';
-					$action .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&curdirpath='.urlencode($my_sub_dir).'&amp;origin='.$origin.'&gradebook='.$gradebook.'&amp;move='.$work->id.'" title="'.get_lang('Move').'"><img src="../img/deplacer_fichier.gif" border="0" title="'.get_lang('Move').'" alt="'.get_lang('Move').'" /></a>';
+					$action .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&curdirpath='.urlencode($my_sub_dir).'&amp;origin='.$origin.'&gradebook='.$gradebook.'&amp;move='.$work->id.'" title="'.get_lang('Move').'">'.Display::return_icon('move.png', get_lang('Move'),array(), 22).'</a>';
 					if ($work->accepted == '1') {
-						$action .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&curdirpath='.urlencode($my_sub_dir).'&amp;origin='.$origin.'&gradebook='.$gradebook.'&amp;make_invisible='.$work->id.'&amp;'.$sort_params.'" title="'.get_lang('Invisible').'" ><img src="../img/visible.gif" alt="'.get_lang('Invisible').'" title="'.get_lang('Invisible').'"></a>';
+						$action .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&curdirpath='.urlencode($my_sub_dir).'&amp;origin='.$origin.'&gradebook='.$gradebook.'&amp;make_invisible='.$work->id.'&amp;'.$sort_params.'" title="'.get_lang('Invisible').'" >'.Display::return_icon('visible.png', get_lang('Invisible'),array(), 22).'</a>';
 					} else {
-						$action .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&curdirpath='.urlencode($my_sub_dir).'&amp;origin='.$origin.'&gradebook='.$gradebook.'&amp;make_visible='.$work->id.'&amp;'.$sort_params.'" title="'.get_lang('Visible').'" ><img src="../img/invisible.gif" alt="'.get_lang('Visible').'"  title="'.get_lang('Visible').'"></a>';
+						$action .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&curdirpath='.urlencode($my_sub_dir).'&amp;origin='.$origin.'&gradebook='.$gradebook.'&amp;make_visible='.$work->id.'&amp;'.$sort_params.'" title="'.get_lang('Visible').'" >'.Display::return_icon('invisible.png', get_lang('Visible'),array(), 22).'</a>';
 					}
 					$row[] = $action;
 				// the user that is not course admin can only edit/delete own document
 				} elseif ($row2['insert_user_id'] == $_user['user_id']) {
-					$action = '';
-					$action .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&curdirpath='.urlencode($my_sub_dir).'&gradebook='.Security::remove_XSS($_GET['gradebook']).'&amp;origin='.$origin.'&gradebook='.$gradebook.'&amp;edit='.$work->id.'" title="'.get_lang('Modify').'"  ><img src="../img/edit.gif"  alt="'.get_lang('Modify').'" title="'.get_lang('Modify').'"></a>';
+					$action = '';					
+					$action .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&curdirpath='.urlencode($my_sub_dir).'&gradebook='.Security::remove_XSS($_GET['gradebook']).'&amp;origin='.$origin.'&gradebook='.$gradebook.'&amp;edit='.$work->id.'" title="'.get_lang('Modify').'"  >'.Display::return_icon('edit.png', get_lang('Modify'),array(), 22).'</a>';					
 					if (api_get_course_setting('student_delete_own_publication') == 1) {
 						$action .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&curdirpath='.urlencode($my_sub_dir).'&amp;origin='.$origin.'&gradebook='.$gradebook.'&amp;delete='.$work->id.'" onclick="javascript:if(!confirm('."'".addslashes(api_htmlentities(get_lang('ConfirmYourChoice'),ENT_QUOTES))."'".')) return false;" title="'.get_lang('WorkDelete').'"  >'.Display::return_icon('delete.png',get_lang('WorkDelete'),'',22).'</a>';
 					}