more fix socialnetwork styles and update lang

main/auth/profile.php

@@ -260,11 +260,11 @@ if (api_get_setting('extended_profile') == 'true') {
 		//$form->addElement('html', '<a href="javascript: void(0);" onclick="javascript: show_extend();"> show_extend_profile</a>');
 		$form->addElement('static', null, '<em>'.get_lang('OptionalTextFields').'</em>');
 		//	MY COMPETENCES
-		$form->add_html_editor('competences', get_lang('MyCompetences'), false, false, array('ToolbarSet' => 'Profile', 'Width' => '100%', 'Height' => '130'));
+		$form->add_html_editor('competences', get_lang('MyCompetences'), false, false, array('ToolbarSet' => 'Profile', 'Width' => '550', 'Height' => '130'));
 		//	MY DIPLOMAS
-		$form->add_html_editor('diplomas', get_lang('MyDiplomas'), false, false, array('ToolbarSet' => 'Profile', 'Width' => '100%', 'Height' => '130'));
+		$form->add_html_editor('diplomas', get_lang('MyDiplomas'), false, false, array('ToolbarSet' => 'Profile', 'Width' => '550', 'Height' => '130'));
 		//	WHAT I AM ABLE TO TEACH
-		$form->add_html_editor('teach', get_lang('MyTeach'), false, false, array('ToolbarSet' => 'Profile', 'Width' => '100%', 'Height' => '130'));
+		$form->add_html_editor('teach', get_lang('MyTeach'), false, false, array('ToolbarSet' => 'Profile', 'Width' => '550', 'Height' => '130'));
 
 		//	MY PRODUCTIONS
 		$form->addElement('file', 'production', get_lang('MyProductions'));
@@ -272,7 +272,7 @@ if (api_get_setting('extended_profile') == 'true') {
 			$form->addElement('static', 'productions_list', null, $production_list);
 		}
 		//	MY PERSONAL OPEN AREA
-		$form->add_html_editor('openarea', get_lang('MyPersonalOpenArea'), false, false, array('ToolbarSet' => 'Profile', 'Width' => '100%', 'Height' => '130'));
+		$form->add_html_editor('openarea', get_lang('MyPersonalOpenArea'), false, false, array('ToolbarSet' => 'Profile', 'Width' => '550', 'Height' => '350'));
 		$form->applyFilter(array('competences', 'diplomas', 'teach', 'openarea'), 'stripslashes');
 		$form->applyFilter(array('competences', 'diplomas', 'teach'), 'trim'); // openarea is untrimmed for maximum openness
 	}
@@ -825,18 +825,24 @@ if (api_get_setting('allow_social_tool') == 'true') {
 		SocialManager::show_social_menu('home', null, $user_id, $show_full_profile);
 		echo '</div>';
 
-		echo '<div id="social-content-right">';
-			echo '<div id="social-content-online">';
-				if (api_get_setting('extended_profile') == 'true') {
-					$show = isset($_GET['show']) ? '&amp;show='.Security::remove_XSS($_GET['show']) : '';
-					if (isset($_GET['type']) && $_GET['type'] == 'reduced') {
-						echo '<a href="profile.php?type=extended '.$show.'"><span class="social-menu-text1">'.Display::return_icon('edit.gif', get_lang('EditExtendProfile')).'&nbsp;'.get_lang('EditExtendProfile').'</span></a>';
-					} else {
-						echo '<a href="profile.php?type=reduced'.$show.'"><span class="social-menu-text1">'.Display::return_icon('edit.gif', get_lang('EditNormalProfile')).'&nbsp;'.get_lang('EditNormalProfile').'</span></a>';
+		echo '<div id="social-content-right">';					
+			echo '<div>'.Display::return_icon('content-post-group1.jpg',get_lang('Profile')).'</div>';
+			echo '<div id="div_content_table" class="social-box-content2">';
+			echo '<table><tr><td>';
+				echo '<div id="social-content-online">';
+					if (api_get_setting('extended_profile') == 'true') {
+						$show = isset($_GET['show']) ? '&amp;show='.Security::remove_XSS($_GET['show']) : '';
+						if (isset($_GET['type']) && $_GET['type'] == 'reduced') {
+							echo '<a href="profile.php?type=extended '.$show.'"><span class="social-menu-text1">'.Display::return_icon('edit.gif', get_lang('EditExtendProfile')).'&nbsp;'.get_lang('EditExtendProfile').'</span></a>';
+						} else {
+							echo '<a href="profile.php?type=reduced'.$show.'"><span class="social-menu-text1">'.Display::return_icon('edit.gif', get_lang('EditNormalProfile')).'&nbsp;'.get_lang('EditNormalProfile').'</span></a>';
+						}
 					}
-				}
+				echo '</div>';
+				
+				$form->display();
+			echo '</td></tr></table>';	
 			echo '</div>';
-			$form->display();
 		echo '</div>';
 	echo '</div>';
 

main/inc/lib/group_portal_manager.lib.php

@@ -978,9 +978,9 @@ class GroupPortalManager
 					if (in_array($member['relation_type'] , array(GROUP_USER_PERMISSION_ADMIN, GROUP_USER_PERMISSION_READER,GROUP_USER_PERMISSION_MODERATOR))) {
 						//add icons
 						if ($member['relation_type'] == GROUP_USER_PERMISSION_ADMIN) {
-							$icon= Display::return_icon('admin_star.png', get_lang('Admin'));
+							$icon= Display::return_icon('social_group_admin.png', get_lang('Admin'));
 						}elseif ($member['relation_type'] == GROUP_USER_PERMISSION_MODERATOR) {
-							$icon= Display::return_icon('moderator_star.png', get_lang('Moderator'));
+							$icon= Display::return_icon('social_group_moderator.png', get_lang('Moderator'));
 						} else{
 							$icon= '';
 						}

main/inc/lib/internationalization.lib.php

@@ -673,8 +673,8 @@ function date_to_str_ago($date) {
 	date_default_timezone_set(_api_get_timezone());
 
 	if (!$initialized) {
-		$today = api_ucfirst(get_lang('Today'));
-		$yesterday = api_ucfirst(get_lang('Yesterday'));
+		$today = get_lang('Today');
+		$yesterday = get_lang('Yesterday');
 
 		$min_decade = get_lang('MinDecade');
 		$min_year = get_lang('MinYear');

main/lang/english/admin.inc.php

@@ -1105,8 +1105,8 @@ $GoToCourseAfterLoginComment = "When a user is registered in one course, go dire
 $GroupList = "Group List";
 $AllowStudentsDownloadFoldersTitle = "Allow students to download directories";
 $AllowStudentsDownloadFoldersComment = "Allow students to pack and download a complete directory from the document tool";
-$AllowStudentsToCreateGroupsInSocialTitle = "Allow students to create groups in social network";
-$AllowStudentsToCreateGroupsInSocialComment = "Allow students to create groups in social network";
+$AllowStudentsToCreateGroupsInSocialTitle = "Allow users to create groups in social network";
+$AllowStudentsToCreateGroupsInSocialComment = "Allow users to create groups in social network";
 $AllowSendMessageToAllPlatformUsersTitle = "Allow send message to all platform users";
 $AllowSendMessageToAllPlatformUsersComment = "Allow send message to all platform users";
 $TabsSocial = "Social network tab";

main/lang/english/exercice.inc.php

@@ -27,7 +27,7 @@ $langSound = "Audio or video file";
 $langDeleteSound = "Delete the audio or video file";
 $langNoAnswer = "There is no answer for the moment";
 $langGoBackToQuestionPool = "Go back to the question pool";
-$langGoBackToQuestionList = "Go back to the question list";
+$langGoBackToQuestionList = "Go back to the questions list";
 $langQuestionAnswers = "Answers to the question";
 $langUsedInSeveralExercises = "Warning ! This question and its answers are used in several tests. Would you like to Edit them";
 $langModifyInAllExercises = "in all tests";

main/lang/english/wiki.inc.php

@@ -12,7 +12,7 @@ $AllPages = "All pages";
 $AddNew = "Add new page";
 $ChangesStored = "Audio added";
 $NewWikiSaved = "The wiki page has been saved. You can see it clicking on:";
-$DefaultContent = " <br/> <br/> <p align=\"center\"> <img src=\"%swiki/wcollaborative.png\" alt=\"Mr. Chamilo\" title=\"Mr. Chamilo\" /></p> <p align=\"center\">To begin editing this page and remove this text</p>";
+$DefaultContent = " <br/> <br/> <p align=\"center\"> <img src=\"%swiki/wcollaborative.png\" alt=\"Working as a team\" title=\"Working as a team\" /></p> <p align=\"center\">To begin editing this page and remove this text</p>";
 $CourseWikiPages = "Wiki pages";
 $GroupWikiPages = "Group wiki pages";
 $NoWikiPageTitle = "Your changes have been saved. You still have to give a name to the page";
@@ -64,7 +64,7 @@ $RatingMedia = "The average rating for the page is";
 $NumComments = "Comments on this page";
 $NumCommentsScore = "Number of comments scored:";
 $AddPagesLocked = "The add option has been temporarily disabled by the trainer";
-$LinksPages = "References";
+$LinksPages = "What links here";
 $ShowLinksPages = "Show the pages that have links to this page";
 $MoreWikiOptions = "More Wiki options";
 $DefaultTitle = "Home";

main/lang/french/admin.inc.php

@@ -1270,4 +1270,6 @@ $ErrorReadingZip = "Erreur de lecture du fichier ZIP";
 $ErrorStylesheetFilesExtensionsInsideZip = "Les seules extensions acceptées pour les fichiers contenus dans le ZIP sont jpg, jpeg, png, gif et css.";
 $MyTextHere = "Introduisez votre texte ici...";
 $FieldTypeSocialProfile = "Lien réseau social";
+$AllowUsersCopyFilesTitle = "Permet aux utilisateurs de copier des fichiers à partir d'un cours de votre dossier personnel";
+$AllowUsersCopyFilesComment = "Permet aux utilisateurs de copier des fichiers à partir d'un cours de votre dossier personnel, visible à travers les réseaux sociaux ou par l'intermédiaire de l'éditeur HTML lorsqu'ils ne font pas partis d'un cours";
 ?>

main/lang/german/accessibility.inc.php

@@ -7,10 +7,10 @@ $test = "Test";
 $WCAGImage = "Bild";
 $WCAGLabel = "Bildbezeichnung";
 $WCAGLink = "Link";
-$WCAGLinkLabel = "Link Bezeichnung";
-$errorNoLabel = "Das Bild hat kein Label";
+$WCAGLinkLabel = "Linkbeschreibung";
+$errorNoLabel = "Das Bild hat keine Beschreibung";
 $AllLanguages = "alle Sprachen";
 $WCAGEditor = "WCAG Editor";
 $WCAGGoMenu = "Gehe zu Menü";
-$WCAGGoContent = "Geh zu Inhalt";
+$WCAGGoContent = "Gehe zu Inhalt";
 ?>

main/lang/german/agenda.inc.php

@@ -12,14 +12,14 @@ $Year = "Jahr";
 $Hour = "Stunde";
 $Minutes = "Minuten";
 $Detail = "Detail";
-$EditSuccess = "Eintrag wurde geändert";
-$AddSuccess = "Eintrag wurde hinzugefügt";
-$AgendaDeleteSuccess = "Eintrag wurde gelöscht";
-$NoAgendaItems = "Keine Einträge vorhanden";
+$EditSuccess = "Termin wurde geändert";
+$AddSuccess = "Termin wurde hinzugefügt";
+$AgendaDeleteSuccess = "Termin wurde gelöscht";
+$NoAgendaItems = "Keine Termine vorhanden";
 $lang_september = "September";
 $langClassName = "Klasse";
 $lang_agenda = "Agenda";
-$ModifyCalendarItem = "Agenda Eintrag ändern";
+$ModifyCalendarItem = "Termin ändern";
 $ItemTitle = "Eintrag Titel";
 $langDay = "Tag";
 $month_default = "Monat (default)";
@@ -75,4 +75,6 @@ $AgendaSortChronologicallyDown = "absteigend";
 $ItemForUserSelection = "ausgewählte Objekte";
 $IsNotiCalFormatFile = "Diese Datei ist nicht im iCal-Format gespeichert";
 $RepeatEvent = "Termin wiederholen";
+$RepeatDate = "Termin wiederholen";
+$EndDateMustBeMoreThanStartDate = "Endtermin muss nach dem Starttermin liegen";
 ?>

main/lang/italian/admin.inc.php

@@ -1273,4 +1273,7 @@ $AddUsersToGroup = "Aggiungi un membro al gruppo";
 $ErrorReadingZip = "Errore di lettura del file ZIP";
 $ErrorStylesheetFilesExtensionsInsideZip = "Le uniche estensioni accettate nel file ZIP sono jpg, jpeg. png, gif e css";
 $MyTextHere = "Scrivi qui dentro...";
+$FieldTypeSocialProfile = "Collegamento alla rete sociale";
+$AllowUsersCopyFilesTitle = "Consenti agli utenti di fare una copia di file del corso nella propria area personale";
+$AllowUsersCopyFilesComment = "Consenti agli utenti di fare una copia di file del corso nell'area personale, rendendoli visibili tramite la rete sociale o un browser/editor, nel caso siano esterni al corso";
 ?>

main/lang/italian/document.inc.php

@@ -216,4 +216,11 @@ $HelpSharedFolder = "La cartella contiene i documenti caricati da te e dai corsi
 $TemplateImage = "Immagine del modello";
 $MoveElement = "Sposta l'elemento";
 $CertificateName = "Nome";
+$CopyToMyFiles = "Copia nella mia area personale";
+$Export2PDF = "Esporta in formato PDF";
+$ResourceShared = "Risorsa condivisa";
+$CopyAlreadyDone = "Nell'area personale è presente un documento con lo stesso nome, vuoi sostituirlo?";
+$CopyFailed = "Copia non effettuata";
+$CopyMade = "Copia effettuata";
+$OverwritenFile = "Documento sostituito";
 ?>

main/lang/italian/exercice.inc.php

@@ -368,4 +368,5 @@ $ReUseACopyInCurrentTest = "Riutilizza una copia all'interno del test";
 $Copy = "Copia";
 $ScoreAverageFromAllAttempts = "Media dl punteggio per tutti i tentativi";
 $DefaultContent = "Genera un contenuto di default";
+$ExerciseEditionNotAvailableInSession = "Non è possibile modificare gli esercizi nel corso di una sessione";
 ?>

main/lang/italian/trad4all.inc.php

@@ -954,4 +954,7 @@ $MemoryUsage = "Impiego memoria:";
 $MemoryUsagePeak = "Picco impiego memoria:";
 $Seconds = "secondi";
 $QualifyInGradebook = "Valuta nel Registro";
+$SessionSpecificResource = "Risorsa specifica della sessione";
+$EditionNotAvailableFromSession = "Non è possibile modificare questa risorsa nel corso di una sessione: puoi farlo nel corso di origine";
+$HandingOverOfTaskX = "Compito realizzato al %s";
 ?>

main/lang/italian/userInfo.inc.php

@@ -194,4 +194,5 @@ $YouNeedToHaveFriendsInYourSocialNetwork = "Nel social network devi avere degli
 $SeeAllMyGroups = "Mostra i miei gruppi";
 $YouAlreadyInviteAllYourContacts = "Hai già mandato un invito a tutti i tuoi contatti";
 $YouShouldCreateAGroup = "Devi prima creare un gruppo";
+$MyFiles = "I miei documenti";
 ?>

main/lang/spanish/admin.inc.php

@@ -1105,8 +1105,8 @@ $GoToCourseAfterLoginComment = "Cuando un usuario está inscrito sólamente en u
 $GroupList = "Lista de grupos de la red social";
 $AllowStudentsDownloadFoldersTitle = "Permitir a los estudiantes descargar directorios";
 $AllowStudentsDownloadFoldersComment = "Permitir a los estudiantes empaquetar y descargar un directorio completo en la herramienta documentos";
-$AllowStudentsToCreateGroupsInSocialTitle = "Permitir a los alumnos de crear grupos en la red social";
-$AllowStudentsToCreateGroupsInSocialComment = "Permitir a los alumnos crear sus propios grupos en la red social";
+$AllowStudentsToCreateGroupsInSocialTitle = "Permitir a los usuarios crear grupos en la red social";
+$AllowStudentsToCreateGroupsInSocialComment = "Permitir a los usuarios crear sus propios grupos en la red social";
 $AllowSendMessageToAllPlatformUsersTitle = "Permitir enviar mensajes a todos los usuarios de la plataforma";
 $AllowSendMessageToAllPlatformUsersComment = "Permite poder enviar mensajes a todos los usuarios de la plataforma";
 $TabsSocial = "Pestaña Red social";

main/lang/spanish/userInfo.inc.php

@@ -45,7 +45,7 @@ $SelectOneContact = "Seleccione un contacto";
 $SelectOneGroup = "Seleccione un grupo";
 $AttachContactsPersonal = "Está seguro de que desea añadir este contacto al grupo seleccionado";
 $AttachContactsToGroupSuccesfuly = "Su contacto fue agrupado correctamente";
-$InvitationDenied = "Invitación denegada";
+$InvitationDenied = "Invitación rechazada";
 $AddedContactToList = "Usuario añadido a su lista de contactos";
 $ContactsGroupsComment = "Aquí se muestran sus contactos ordenados por grupos";
 $YouDontHaveContactsInThisGroup = "No tiene contactos en este grupo";
@@ -107,10 +107,10 @@ $AddPicture = "Agregar imagen";
 $GroupPermissions = "Permisos del grupo";
 $Closed = "Cerrado";
 $AddGroup = "Agregar grupo";
-$Privacy = "Privado";
+$Privacy = "Privacidad";
 $ThisIsAnOpenGroup = "Grupo abierto";
 $YouShouldCreateATopic = "Debería crear un tema";
-$IamAnAdmin = "Yo soy un administrador";
+$IamAnAdmin = "Administrador";
 $NewTopic = "Nuevo tema";
 $MessageList = "Lista de mensajes";
 $EditGroup = "Editar grupo";
@@ -133,14 +133,14 @@ $Reply = "Responder";
 $Newest = "Lo último";
 $Popular = "Populares";
 $Moderator = "Moderador";
-$DeleteModerator = "Eliminar moderador";
-$UserChangeToModerator = "Usuario cambiado a moderador";
-$IamAModerator = "Yo soy un moderador";
+$DeleteModerator = "Dar de baja como moderador";
+$UserChangeToModerator = "Usuario convertido en moderador";
+$IamAModerator = "Moderador";
 $ThisIsACloseGroup = "Grupo privado";
-$IamAReader = "Yo soy un lector";
-$UserChangeToReader = "Usuario cambiado a lector";
+$IamAReader = "Usuario estándard";
+$UserChangeToReader = "Usuario convertido en usuario estándard";
 $AddModerator = "Agregar como moderador";
-$UserDeleted = "Los usuarios seleccionados han sido eliminados";
+$UserDeleted = "Los usuarios seleccionados han sido dados de baja en el grupo";
 $JoinGroup = "Unirse al grupo";
 $YouShouldJoinTheGroup = "Debería unirse al grupo";
 $WaitingForAdminResponse = "Esperando a que el admin responda";
@@ -154,15 +154,15 @@ $SubscribeUsersToGroup = "Inscribir usuarios al grupo";
 $YouHaveBeenInvitedJoinNow = "Ud. ha sido invitado a unirser ahora";
 $DenyInvitation = "Rechazar invitación";
 $AcceptInvitation = "Aceptar invitación";
-$GroupsWaitingApproval = "Grupos esperando ser aprobado";
+$GroupsWaitingApproval = "Grupos esperando su aceptación";
 $GroupInvitationWasDeny = "Invitación de grupo fue rechazada";
 $UserIsSubscribedToThisGroup = "Ahora ya forma parte del grupo";
-$DeleteFromGroup = "Eliminar de grupo";
+$DeleteFromGroup = "Dar de baja en el grupo";
 $GroupMembers = "Miembros del grupo";
-$Subscribe = "Inscribirme";
-$YouAreInvitedToGroupContent = "Ud. esta invitado al contenido del grupo";
-$YouAreInvitedToGroup = "Estas invitado a unirte al grupo";
-$ToSubscribeClickInTheLinkBelow = "Para inscribirte has clic en el siguiente enlace";
+$Subscribe = "Quiero formar parte de este grupo";
+$YouAreInvitedToGroupContent = "Queda invitado/a a acceder al contenido del grupo";
+$YouAreInvitedToGroup = "Invitación para unirse al grupo";
+$ToSubscribeClickInTheLinkBelow = "Para unirse haga clic en el siguiente enlace";
 $ReturnToInbox = "Regresar a bandeja de entrada";
 $View = "Vista";
 $Me = "Mí";
@@ -171,15 +171,15 @@ $EditNormalProfile = "Edición básica del perfil";
 $GroupPendingInvitations = "Invitaciones pendientes de grupo";
 $LeaveGroup = "Abandonar el grupo";
 $UserIsNotSubscribedToThisGroup = "Ha dejado de formar parte de este grupo";
-$InvitationReceived = "Invitación aceptada";
-$InvitationSent = "Invitación enviada";
-$YouAlreadySentAnInvitation = "Usted ya ha enviado una invitación";
+$InvitationReceived = "Invitaciones recibidas";
+$InvitationSent = "Invitaciones enviadas";
+$YouAlreadySentAnInvitation = "Ya le he enviado una invitación";
 $AllowSendMessageToAllPlatformUsersTitle = "Permitir enviar mensajes a todos los usuarios de la plataforma";
 $UserAdded = "El usuario ha sido añadido";
 $FilesSizeExceedsX = "Tamaña del archivo excedido";
 $YouShouldWriteASubject = "Debe escribir el asunto";
 $Topics = "Temas";
-$StatusInThisGroup = "Estatus en este grupo";
+$StatusInThisGroup = "Mi función en el grupo";
 $FriendsOnline = "Amigos en línea";
 $GroupDescription = "Descripción del grupo";
 $MyProductions = "Mis producciones";
@@ -187,8 +187,8 @@ $YouHaveReceivedANewMessageInTheGroupX = "Ha recibido un nuevo mensaje en el gru
 $ClickHereToSeeMessageGroup = "Clic aquí para ver el mensaje de grupo";
 $OrCopyPasteTheFollowingUrl = "o copie y pegue la siguiente url:";
 $ThereIsANewMessageInTheGroupX = "Hay un nuevo mensaje en el grupo %s";
-$UserIsAlreadySubscribedToThisGroup = "El usuario ya esta suscrito a este grupo";
-$AddNormalUser = "Agregar como un usuario normal";
+$UserIsAlreadySubscribedToThisGroup = "El usuario ya pertenece a este grupo";
+$AddNormalUser = "Agregar como un usuario estándard";
 $DenyEntry = "Denegar la entrada";
 $YouNeedToHaveFriendsInYourSocialNetwork = "Necesita tener amigos en su red social";
 $SeeAllMyGroups = "Ver todos mis grupos";

main/lang/spanish/wiki.inc.php

@@ -12,7 +12,7 @@ $AllPages = "Todas las páginas";
 $AddNew = "Añadir una página";
 $ChangesStored = "Cambios almacenados";
 $NewWikiSaved = "La nueva página wiki ha sido guardada.";
-$DefaultContent = " <br/> <br/> <p align=\"center\"> <img src=\"%swiki/wcollaborative.png\" alt=\"Mr. Chamilo\" title=\"Mr. Chamilo\" /></p> <p align=\"center\">Para comenzar edite esta página y borre este texto</p>";
+$DefaultContent = " <br/> <br/> <p align=\"center\"> <img src=\"%swiki/wcollaborative.png\" alt=\"Trabajando en equipo\" title=\"Trabajando en equipo\" /></p> <p align=\"center\">Para comenzar edite esta página y borre este texto</p>";
 $CourseWikiPages = "Páginas Wiki del curso";
 $GroupWikiPages = "Páginas Wiki del grupo";
 $NoWikiPageTitle = "Los cambios no se han guardado. Debe dar un título a esta página";

main/messages/view_message.php

@@ -68,8 +68,8 @@ echo '<div id="social-content">';
 		$id_content_right = 'inbox';
 		echo '<div id="inbox-menu" class="actions">';
 		echo '<ul>';
-			echo '<li><a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php">'.Display::return_icon('inbox.png',get_lang('Inbox')).get_lang('Inbox').'</a>'.'</li>';
 			echo '<li><a href="'.api_get_path(WEB_PATH).'main/messages/new_message.php">'.Display::return_icon('message_new.png',get_lang('ComposeMessage')).get_lang('ComposeMessage').'</a>'.'</li>';
+			echo '<li><a href="'.api_get_path(WEB_PATH).'main/messages/inbox.php">'.Display::return_icon('inbox.png',get_lang('Inbox')).get_lang('Inbox').'</a>'.'</li>';			
 			echo '<li><a href="'.api_get_path(WEB_PATH).'main/messages/outbox.php">'.Display::return_icon('outbox.png',get_lang('Outbox')).get_lang('Outbox').'</a>'.'</li>';
 		echo '</ul>';
 		echo '</div>';

main/social/group_invitation.php

@@ -398,7 +398,7 @@ if ($add_type=='multiple') {
 
 <?php
 if(!empty($errorMsg)) {
-	Display::display_normal_message($errorMsg); //main API
+	Display::display_error_message($errorMsg); //main API
 }
 	echo '<div class="social-box-container2">';				
 	echo '<div>'.Display::return_icon('content-post-group1.jpg',get_lang('SubscribeUsersToGroup')).'</div>';

main/social/group_members.php

@@ -113,27 +113,27 @@ echo '<div id="social-content">';
 			echo '<div>'.Display::return_icon('content-post-group1.jpg',get_lang('MemberList')).'</div>';
 			echo '<div id="div_content_table" class="social-box-content2">';
 		if (! empty($show_message)){
-			Display :: display_normal_message($show_message);
+			Display :: display_confirmation_message($show_message);
 		}	
 		foreach($users as $user) {		
 				switch ($user['relation_type']) {
 					case  GROUP_USER_PERMISSION_ADMIN:
-						$user['link'] = Display::return_icon('admin_star.png', get_lang('Admin'));
+						$user['link'] = Display::return_icon('social_group_admin.png', get_lang('Admin'));
 					break;
 					case  GROUP_USER_PERMISSION_READER:
 						if (in_array($user_role, array(GROUP_USER_PERMISSION_ADMIN, GROUP_USER_PERMISSION_MODERATOR))) {
-						$user['link'] = '<a href="group_members.php?id='.$group_id.'&u='.$user['user_id'].'&action=delete">'.Display::return_icon('del_user_big.gif', get_lang('DeleteFromGroup')).'</a>'.
-										'<a href="group_members.php?id='.$group_id.'&u='.$user['user_id'].'&action=set_moderator">'.Display::return_icon('admins.gif', get_lang('AddModerator')).'</a>';
+						$user['link'] = '<a href="group_members.php?id='.$group_id.'&u='.$user['user_id'].'&action=delete">'.Display::return_icon('user_delete.png', get_lang('DeleteFromGroup')).'</a>'.
+										'<a href="group_members.php?id='.$group_id.'&u='.$user['user_id'].'&action=set_moderator">'.Display::return_icon('social_moderator_add.png', get_lang('AddModerator')).'</a>';
 						}
 					break;		
 					case  GROUP_USER_PERMISSION_PENDING_INVITATION:
 						$user['link'] = '<a href="group_members.php?id='.$group_id.'&u='.$user['user_id'].'&action=add">'.Display::return_icon('pending_invitation.png', get_lang('PendingInvitation')).'</a>';					
 					break;
 					case  GROUP_USER_PERMISSION_MODERATOR:
-						$user['link'] = Display::return_icon('moderator_star.png', get_lang('Moderator'));
+						$user['link'] = Display::return_icon('social_group_moderator.png', get_lang('Moderator'));
 						//only group admin can manage moderators 
 						if ($user_role == GROUP_USER_PERMISSION_ADMIN) {
-							$user['link'] .='<a href="group_members.php?id='.$group_id.'&u='.$user['user_id'].'&action=delete_moderator">'.Display::return_icon('del_user_big.gif', get_lang('DeleteModerator')).'</a>';
+							$user['link'] .='<a href="group_members.php?id='.$group_id.'&u='.$user['user_id'].'&action=delete_moderator">'.Display::return_icon('social_moderator_delete.png', get_lang('DeleteModerator')).'</a>';
 						}
 					break;				
 				}

main/social/groups.php

@@ -329,9 +329,9 @@ if ($group_id != 0 ) {
 
 				$name = api_strtoupper(cut($result['name'],25,true));
 				if ($result['relation_type'] == GROUP_USER_PERMISSION_ADMIN) {
-					$name .= Display::return_icon('admin_star.png', get_lang('Admin'), array('style'=>'vertical-align:middle'));
+					$name .= Display::return_icon('social_group_admin.png', get_lang('Admin'), array('style'=>'vertical-align:middle'));
 				} elseif ($result['relation_type'] == GROUP_USER_PERMISSION_MODERATOR) {
-					$name .= Display::return_icon('moderator_star.png', get_lang('Moderator'), array('style'=>'vertical-align:middle'));
+					$name .= Display::return_icon('social_group_moderator.png', get_lang('Moderator'), array('style'=>'vertical-align:middle'));
 				}
 				$count_users_group = count(GroupPortalManager::get_users_by_group($id, false, array(GROUP_USER_PERMISSION_ADMIN, GROUP_USER_PERMISSION_READER, GROUP_USER_PERMISSION_MODERATOR), 0 , 1000));
 				if ($count_users_group == 1 ) {

main/social/home.php

@@ -84,7 +84,7 @@ echo '<div id="social-content">';
 
 			// information current user
 			echo	'<div class="social-box-container1">
-                    	<div>'.Display::return_icon('boxmygroups.jpg',get_lang('Information')).'</div>
+                    	<div>'.Display::return_icon('boxmygroups.jpg',get_lang('Profile')).'</div>
                         <div class="social-box-content1">';
 
                    echo	'<div>'.$image.'</div>';

main/social/profile.php

@@ -261,13 +261,13 @@ echo '  </div>';
 echo '  <div id="social-content-right">';
 echo '    <div class="social-box-main1">';
 echo '      <div class="social-box-left">';
-echo '        <div>'.Display::return_icon('boxmygroups.jpg', get_lang('Information')).'</div>';
+echo '        <div>'.Display::return_icon('boxmygroups.jpg', get_lang('Profile')).'</div>';
 echo '          <div class="social-box-content1">';
 if (!empty($user_info['firstname']) || !empty($user_info['lastname'])) {
 	echo '            <div><h3>'.api_get_person_name($user_info['firstname'], $user_info['lastname']).'</h3></div>';
 } else {
 	//--- Basic Information
-	echo '            <div><h3>'.get_lang('Information').'</h3></div>';
+	echo '            <div><h3>'.get_lang('Profile').'</h3></div>';
 }
 
 if ($show_full_profile) {
@@ -460,9 +460,9 @@ if ($show_full_profile) {
 			$icon = '';
 			$name = api_strtoupper(cut($result['name'],20,true));
 			if ($result['relation_type'] == GROUP_USER_PERMISSION_ADMIN) {
-				$icon = Display::return_icon('admin_star.png', get_lang('Admin'), array('style'=>'vertical-align:middle;width:16px;height:16px;'));
+				$icon = Display::return_icon('social_group_admin.png', get_lang('Admin'), array('style'=>'vertical-align:middle;width:16px;height:16px;'));
 			} elseif ($result['relation_type'] == GROUP_USER_PERMISSION_MODERATOR) {
-				$icon = Display::return_icon('moderator_star.png', get_lang('Moderator'), array('style'=>'vertical-align:middle;width:16px;height:16px;'));
+				$icon = Display::return_icon('social_group_moderator.png', get_lang('Moderator'), array('style'=>'vertical-align:middle;width:16px;height:16px;'));
 			}
 			$count_users_group = count(GroupPortalManager::get_all_users_by_group($id));
 			if ($count_users_group == 1 ) {

main/social/profile_friends_and_groups.inc.php

@@ -63,9 +63,9 @@ if (isset($_GET['view']) && in_array($_GET['view'], $views)) {
 				$icon = '';					
 				$name = api_strtoupper(cut($result['name'],20,true));				
 				if ($result['relation_type'] == GROUP_USER_PERMISSION_ADMIN) {		 	
-					$icon = Display::return_icon('admin_star.png', get_lang('Admin'), array('style'=>'vertical-align:middle;width:16px;height:16px;'));
+					$icon = Display::return_icon('social_group_admin.png', get_lang('Admin'), array('style'=>'vertical-align:middle;width:16px;height:16px;'));
 				} elseif ($result['relation_type'] == GROUP_USER_PERMISSION_MODERATOR) {			
-					$icon = Display::return_icon('moderator_star.png', get_lang('Moderator'), array('style'=>'vertical-align:middle;width:16px;height:16px;'));
+					$icon = Display::return_icon('social_group_moderator.png', get_lang('Moderator'), array('style'=>'vertical-align:middle;width:16px;height:16px;'));
 				}
 				$count_users_group = count(GroupPortalManager::get_all_users_by_group($id));
 				if ($count_users_group == 1 ) {

main/social/search.php

@@ -93,9 +93,9 @@ echo '<div id="social-content">';
 						
 						$name = api_strtoupper(cut($result['name'],25,true));				
 						if ($result['relation_type'] == GROUP_USER_PERMISSION_ADMIN) {		 	
-							$name .= Display::return_icon('admin_star.png', get_lang('Admin'), array('style'=>'vertical-align:middle'));
+							$name .= Display::return_icon('social_group_admin.png', get_lang('Admin'), array('style'=>'vertical-align:middle'));
 						} elseif ($result['relation_type'] == GROUP_USER_PERMISSION_MODERATOR) {			
-							$name .= Display::return_icon('moderator_star.png', get_lang('Moderator'), array('style'=>'vertical-align:middle'));
+							$name .= Display::return_icon('social_group_moderator.png', get_lang('Moderator'), array('style'=>'vertical-align:middle'));
 						}
 						$count_users_group = count(GroupPortalManager::get_all_users_by_group($id));
 						if ($count_users_group == 1 ) {