merge

main/css/academica/default.css

@@ -189,6 +189,15 @@ a.breadcrumb0 {
 	background:url(images/home.gif) no-repeat;
 	padding-left: 22px;
 }
+/* The tool shortcuts */
+#toolshortcuts {
+	text-align: right;
+	clear: right;
+	margin-left: auto;
+	margin-right: auto;
+	width: 97.6%
+}
+
 /* footer styles */
 #footer {
 	height: 22em;
@@ -2886,4 +2895,4 @@ div.image-social-content center.friend {
 .hidden_message a {
 	color:#fff;
 	/* text-decoration: underline; */
-}
+}

main/css/baby_orange/default.css

@@ -176,6 +176,15 @@ a.breadcrumb0 {
 	background:url(images/home.gif) no-repeat;
 	padding-left: 22px;
 }
+/* The tool shortcuts */
+#toolshortcuts {
+	text-align: right;
+	clear: right;
+	margin-left: auto;
+	margin-right: auto;
+	width: 99%
+}
+
 /* footer styles */
 
 #footer {
@@ -2875,4 +2884,4 @@ div.image-social-content center.friend {
 .hidden_message a {
 	color:#fff;
 	/* text-decoration: underline; */
-}
+}

main/css/blue_lagoon/default.css

@@ -348,6 +348,9 @@ select, input[type=checkbox], input[type=radio], input[type=button], input[type=
 #toolshortcuts {
 	text-align: right;
 	clear: right;
+	margin-left: auto;
+	margin-right: auto;
+	width: 98%;
 }
 /*****************************************************
  *  FOOTER STYLES                                    *
@@ -3499,4 +3502,4 @@ div.image-social-content center.friend {
 .hidden_message a {
 	color:#fff;
 	/* text-decoration: underline; */
-}
+}

main/css/chamilo/default.css

@@ -509,9 +509,12 @@ margin-top:0;
 	color: #f3840d;
 }
 /* The tool shortcuts */
-#toolshortcuts {
-	text-align: right;
-	clear: right;
+#toolshortcuts {
+	clear:right;
+	margin-left:auto;
+	margin-right:auto;
+	text-align:right;
+	width:92%;
 }
 /*****************************************************
  *  FOOTER STYLES                                    *
@@ -3773,4 +3776,4 @@ div.image-social-content center.friend {
 .hidden_message a {
 	color:#fff;
 	/* text-decoration: underline; */
-}
+}

main/css/cool_blue/default.css

@@ -333,7 +333,10 @@ input[type="text"]:focus, input[type="password"]:focus, textarea:focus {
 /* The tool shortcuts */
 #toolshortcuts {
 	text-align: right;
-	clear: right;
+	clear: right;
+	margin-left: auto;
+	margin-right: auto;
+	width: 98%;
 }
 /*****************************************************
  *  FOOTER STYLES                                    *
@@ -3385,4 +3388,4 @@ div.image-social-content center.friend {
 .hidden_message a {
 	color:#fff;
 	/* text-decoration: underline; */
-}
+}

main/css/corporate/default.css

@@ -200,6 +200,15 @@ a.breadcrumb0 {
 	background:url(images/home.gif) no-repeat;
 	padding-left: 22px;
 }
+/* The tool shortcuts */
+#toolshortcuts {
+	text-align: right;
+	clear: right;
+	margin-left: auto;
+	margin-right: auto;
+	width: 97.6%
+}
+
 /* footer styles */
 #footer {
 	border-top: 1px solid #aeaeae;
@@ -2873,4 +2882,4 @@ div.image-social-content center.friend {
 .hidden_message a {
 	color:#fff;
 	/* text-decoration: underline; */
-}
+}

main/css/cosmic_campus/default.css

@@ -199,6 +199,15 @@ input[type=button], input[type=submit] {
 	text-decoration: none;
 	color: #f3840d;
 }
+/* The tool shortcuts */
+#toolshortcuts {
+	text-align: right;
+	clear: right;
+	margin-left: auto;
+	margin-right: auto;
+	padding: 10px;
+	width: 98.7%;
+}
 a.breadcrumb {
 	height: 21px;
 }
@@ -206,6 +215,7 @@ a.breadcrumb0 {
 	background:url(images/home.gif) no-repeat;
 	padding-left: 22px;
 }
+
 /* footer styles */
 #footer {
 	height: 7em;
@@ -499,6 +509,7 @@ form span.form_error {
 	padding:2px;
 	margin-bottom: 5px;
 	vertical-align:middle;
+	width: 99.8%	
 }
 .actions img {
 	/*display:inline-block;*/
@@ -774,7 +785,7 @@ a.personal_agenda:hover, a.personal_agenda:hover {
 .data_table {
 	margin: 3px;
 	border-collapse: collapse;
-	width: 100%;
+	width: 99.8%;
 	padding: 5px;
 }
 .data_table th {
@@ -2912,4 +2923,4 @@ div.image-social-content center.friend {
 .hidden_message a {
 	color:#fff;
 	/* text-decoration: underline; */
-}
+}

main/css/delicious_bordeaux/default.css

@@ -344,6 +344,9 @@ input[type="text"]:focus, input[type="password"]:focus, textarea:focus {
 #toolshortcuts {
 	text-align: right;
 	clear: right;
+	margin-left: auto;
+	margin-right: auto;
+	width: 98%
 }
 /*****************************************************
  *  FOOTER STYLES                                    *
@@ -3395,4 +3398,4 @@ div.image-social-content center.friend {
 .hidden_message a {
 	color:#fff;
 	/* text-decoration: underline; */
-}
+}

main/css/dokeos_blue/default.css

@@ -333,7 +333,10 @@ input[type="text"]:focus, input[type="password"]:focus, textarea:focus {
 /* The tool shortcuts */
 #toolshortcuts {
 	text-align: right;
-	clear: right;
+	clear: right;
+	margin-left: auto;
+	margin-right: auto;
+	width: 98%;
 }
 /*****************************************************
  *  FOOTER STYLES                                    *
@@ -3389,4 +3392,4 @@ div.image-social-content center.friend {
 .hidden_message a {
 	color:#fff;
 	/* text-decoration: underline; */
-}
+}

main/css/dokeos_classic/default.css

@@ -379,6 +379,9 @@ input[text] {
 #toolshortcuts {
 	text-align: right;
 	clear: right;
+	margin-left: auto;
+	margin-right: auto;
+	width: 98%
 }
 /*****************************************************
  *  FOOTER STYLES                                    *
@@ -3670,4 +3673,4 @@ div.image-social-content center.friend {
 .hidden_message a {
 	color:#fff;
 	/* text-decoration: underline; */
-}
+}

main/css/dokeos_classic_2D/default.css

@@ -350,6 +350,9 @@ input.link_alike:hover {
 #toolshortcuts {
 	text-align: right;
 	clear: right;
+	margin-left: auto;
+	margin-right: auto;
+	width: 98%;
 }
 /*
 ==============================================================================
@@ -3698,4 +3701,4 @@ div.image-social-content center.friend {
 .hidden_message a {
 	color:#fff;
 	/* text-decoration: underline; */
-}
+}

main/css/empire_green/default.css

@@ -344,7 +344,10 @@ input[type="text"]:focus, input[type="password"]:focus, textarea:focus {
 /* The tool shortcuts */
 #toolshortcuts {
 	text-align: right;
-	clear: right;
+	clear: right;
+	margin-left: auto;
+	margin-right: auto;
+	width: 98%
 }
 /*****************************************************
  *  FOOTER STYLES                                    *
@@ -3400,4 +3403,4 @@ div.image-social-content center.friend {
 .hidden_message a {
 	color:#fff;
 	/* text-decoration: underline; */
-}
+}

main/css/fruity_orange/default.css

@@ -344,7 +344,10 @@ input[type="text"]:focus, input[type="password"]:focus, textarea:focus {
 /* The tool shortcuts */
 #toolshortcuts {
 	text-align: right;
-	clear: right;
+	clear: right;
+	margin-left: auto;
+	margin-right: auto;
+	width: 98%
 }
 /*****************************************************
  *  FOOTER STYLES                                    *
@@ -3401,4 +3404,4 @@ div.image-social-content center.friend {
 .hidden_message a {
 	color:#fff;
 	/* text-decoration: underline; */
-}
+}

main/css/medical/default.css

@@ -398,6 +398,9 @@ input[text] {
 #toolshortcuts {
 	text-align: right;
 	clear: right;
+	margin-left: auto;
+	margin-right: auto;
+	width: 98%
 }
 /*****************************************************
  *  FOOTER STYLES                                    *
@@ -3854,4 +3857,4 @@ div.image-social-content center.friend {
 .hidden_message a {
 	color:#fff;
 	/* text-decoration: underline; */
-}
+}

main/css/public_admin/default.css

@@ -398,6 +398,9 @@ select, input[type=checkbox], input[type=radio], input[type=button], input[type=
 #toolshortcuts {
 	text-align: right;
 	clear: right;
+	margin-left: auto;
+	margin-right: auto;
+	width: 98%
 }
 /*****************************************************
  *  FOOTER STYLES                                    *
@@ -3579,4 +3582,4 @@ div.image-social-content center.friend {
 .hidden_message a {
 	color:#fff;
 	/* text-decoration: underline; */
-}
+}

main/css/royal_purple/default.css

@@ -344,7 +344,10 @@ input[type="text"]:focus, input[type="password"]:focus, textarea:focus {
 /* The tool shortcuts */
 #toolshortcuts {
 	text-align: right;
-	clear: right;
+	clear: right;
+	margin-left: auto;
+	margin-right: auto;
+	width: 98%;
 }
 /*****************************************************
  *  FOOTER STYLES                                    *
@@ -3393,4 +3396,4 @@ div.image-social-content center.friend {
 .hidden_message a {
 	color:#fff;
 	/* text-decoration: underline; */
-}
+}

main/css/silver_line/default.css

@@ -338,7 +338,7 @@ ul {
 	width:550px;
 	position: absolute;
 	bottom:-.75em;
-	right:.5em;
+	right: 1em;
 	padding: 0;
 	margin:0;
 	text-align: right;
@@ -3267,4 +3267,4 @@ div.image-social-content center.friend {
 .hidden_message a {
 	color:#fff;
 	/* text-decoration: underline; */
-}
+}

main/css/sober_brown/default.css

@@ -385,7 +385,10 @@ input[text] {
 /* The tool shortcuts */
 #toolshortcuts {
 	text-align: right;
-	clear: right;
+	clear: right;
+	margin-left: auto;
+	margin-right: auto;
+	width: 98%
 }
 /*****************************************************
  *  FOOTER STYLES                                    *
@@ -3576,4 +3579,4 @@ div.image-social-content center.friend {
 .hidden_message a {
 	color:#fff;
 	/* text-decoration: underline; */
-}
+}

main/css/steel_grey/default.css

@@ -344,7 +344,10 @@ input[type="text"]:focus, input[type="password"]:focus, textarea:focus {
 /* The tool shortcuts */
 #toolshortcuts {
 	text-align: right;
-	clear: right;
+	clear: right;
+	margin-left: auto;
+	margin-right: auto;
+	width: 98%
 }
 /*****************************************************
  *  FOOTER STYLES                                    *
@@ -3402,4 +3405,4 @@ div.image-social-content center.friend {
 .hidden_message a {
 	color:#fff;
 	/* text-decoration: underline; */
-}
+}

main/css/tasty_olive/default.css

@@ -344,7 +344,10 @@ input[type="text"]:focus, input[type="password"]:focus, textarea:focus {
 /* The tool shortcuts */
 #toolshortcuts {
 	text-align: right;
-	clear: right;
+	clear: right;
+	margin-left: auto;
+	margin-right: auto;
+	width: 98%;
 }
 /*****************************************************
  *  FOOTER STYLES                                    *
@@ -3404,4 +3407,4 @@ div.image-social-content center.friend {
 .hidden_message a {
 	color:#fff;
 	/* text-decoration: underline; */
-}
+}

main/inc/lib/social.lib.php

@@ -779,14 +779,14 @@ class SocialManager extends UserManager {
     	  		        	  	
 	  		if ($user_id != api_get_user_id()) {		
 	  			echo  '<li><a href="'.api_get_path(WEB_PATH).'main/messages/send_message_to_userfriend.inc.php?height=300&width=610&user_friend='.$user_id.'&view=profile&view_panel=1" class="thickbox" title="'.get_lang('SendMessage').'">';
-	  			echo  Display::return_icon('message_new.png').'&nbsp;&nbsp;'.get_lang('SendMessage').'</a></li>';	  		
+	  			echo  Display::return_icon('message_new.png',get_lang('SendMessage')).'&nbsp;&nbsp;'.get_lang('SendMessage').'</a></li>';	  		
 	  		}	  		
 	  		
 	  		//check if I already sent an invitation message
 	  		$invitation_sent_list = SocialManager::get_list_invitation_sent_by_user_id(api_get_user_id());
 	  			  		
 	  		if (is_array($invitation_sent_list) && is_array($invitation_sent_list[$user_id]) && count($invitation_sent_list[$user_id]) >0 ) {  	  		
-	  			echo '<li><a href="'.api_get_path(WEB_PATH).'main/social/invitations.php">'.get_lang('YouAlreadySentAnInvitation').'</a></li>';
+	  			echo '<li><a href="'.api_get_path(WEB_PATH).'main/social/invitations.php">'.Display::return_icon('mail_send.png',get_lang('YouAlreadySentAnInvitation')).'&nbsp;&nbsp;'.get_lang('YouAlreadySentAnInvitation').'</a></li>';
 	  		} else {
 	  			if (!$show_full_profile) {
 	  				echo  '<li><a href="'.api_get_path(WEB_PATH).'main/messages/send_message_to_userfriend.inc.php?view_panel=2&height=260&width=610&user_friend='.$user_id.'" class="thickbox" title="'.get_lang('SendInvitation').'">'.Display :: return_icon('add_multiple_users.gif', get_lang('SocialInvitationToFriends')).'&nbsp;'.get_lang('SendInvitation').'</a></li>';

main/lang/english/trad4all.inc.php

@@ -772,4 +772,5 @@ $Created = "Created";
 $LastUpdate = "Last update";
 $UserNonRegisteredAtTheCourse = "User non registered at the course";
 $EditMyProfile = "Edit my profile";
+$Announcements = "Announcements";
 ?>

main/lang/english/userInfo.inc.php

@@ -179,7 +179,7 @@ $UserAdded = "User added";
 $FilesSizeExceedsX = "Files size exceeds";
 $YouShouldWriteASubject = "You should write a subject";
 $Topics = "Topics";
-$StatusInThisGroup = "status in this group";
+$StatusInThisGroup = "Status in this group";
 $DescriptionGroup = "Description group";
 $FriendsOnline = "Friends online";
 $GroupDescription = "Group description";
@@ -189,4 +189,8 @@ $ClickHereToSeeMessageGroup = "Click here to see message group";
 $OrCopyPasteTheFollowingUrl = "Or copy paste the following url";
 $ThereIsANewMessageInTheGroupX = "There is a new message in the group %s";
 $UserIsAlreadySubscribedToThisGroup = "User is already subscribed to this group";
+$AddNormalUser = "Add as a normal user ";
+$AddModerator = "Add as a moderator";
+$DenyEntry = "Deny the entry";
+$YouNeedToHaveFriendsInYourSocialNetwork = "You need to have friends in your social network";
 ?>

main/lang/italian/admin.inc.php

@@ -1125,4 +1125,5 @@ $TabsSocial = "Etichetta social network";
 $MessageMaxUploadFilesizeTitle = "Messaggio: dimensione massima file da caricare";
 $MessageMaxUploadFilesizeComment = "Messaggio: dimensione massima file da caricare";
 $AddAdditionalProfileField = "Aggiungi un campo al profilo utente";
+$Username = "Nome utente";
 ?>

main/lang/italian/courses.inc.php

@@ -82,4 +82,5 @@ $Expand = "Espandi";
 $Collapse = "Riduci";
 $CourseDetails = "Informazioni sul corso";
 $GroupPendingInvitations = "Gruppi con inviti in attesa";
+$Compose = "Scrivi";
 ?>

main/lang/italian/exercice.inc.php

@@ -353,4 +353,9 @@ $ExerciseTotalDurationInMinutes = "Durata totale del test in minuti";
 $ToContinueUseMenu = "Per procedere usa il menù a lato";
 $RandomAnswers = "Mescola le risposte";
 $NotMarkActivity = "Non è possibile valutare l\'attività";
+$YouHaveToCreateAtLeastOneAnswer = "Devi indicare almeno una risposta valida";
+$YouHaveToCreateAtLeastOneAnswer = "Devi indicare almeno una risposta valida";
+$ExerciseAttempted = "Quesito affrontato";
+$MultipleSelectCombination = "Selezione multipla";
+$MultipleAnswerCombination = "Risposta multipla";
 ?>

main/lang/italian/learnpath.inc.php

@@ -245,4 +245,5 @@ $AddForumToCourse = "Includi Forum nel modulo";
 $SaveAudioAndOrganization = "Salva audio e ordinamento";
 $UploadOnlyMp3Files = "Si possono caricare solo file mp3, grazie";
 $ModifyHotPotatoes = "Modifica l\'elemento HotPotatoes";
+$SaveHotpotatoes = "Salva hotpotatoes";
 ?>

main/lang/italian/survey.inc.php

@@ -202,4 +202,5 @@ $BackToSurvey = "Torna al questionario";
 $UpdateInformation = "Aggiorna informazione";
 $PleaseFillSurvey = "Riempi il questionario, grazie.";
 $ReportingOverview = "Report di sintesi";
+$ThereAreNotQuestionsForthisSurvey = "Non ci sono domande nel questionario";
 ?>

main/lang/italian/trad4all.inc.php

@@ -764,4 +764,13 @@ $UserAdded = "Utente aggiunto";
 $UpdatedIn = "Aggiornato";
 $Metadata = "Metadati";
 $langAddMetadata  = "Vedi/Modifica i metadati";
+$SendMessage = "Invia messaggio";
+$SeeForum = "Visita il forum";
+$SeeMore = "Vedi tutto";
+$NoDataAvailable = "Data non disponibile";
+$Created = "Creato";
+$LastUpdate = "Ultimo aggiornamento";
+$UserNonRegisteredAtTheCourse = "Utente non iscritto al corso";
+$EditMyProfile = "Modifica il profilo personale";
+$Announcements = "Avvisi";
 ?>

main/lang/italian/userInfo.inc.php

@@ -178,4 +178,5 @@ $InvitationDenied = "Invito non accettato";
 $UserAdded = "Utente aggiunto";
 $FilesSizeExceedsX = "Superata la dimensione massima del file";
 $YouShouldWriteASubject = "Devi scrivere l\'oggetto del messaggio";
+$Topics = "Argomenti";
 ?>

main/lang/italian/wiki.inc.php

@@ -176,4 +176,5 @@ $Feedback3 = "Terzo messaggio";
 $FProgress = "Progresso";
 $PutATimeLimit = "Limiti di tempo";
 $StandardTask = "Compito predefinito";
+$ThePageHasBeenExportedToDocArea = "La pagina è stata esportata nella sezione Documenti";
 ?>

main/lang/italian/work.inc.php

@@ -77,4 +77,5 @@ $StudentAllowedToDeleteOwnPublication = "Consenti agli studenti di eliminare i d
 $TheDocumentHasBeenDeleted = "Documento eliminato";
 $YouAreNotAllowedToDeleteThisDocument = "Non hai il permesso di eliminare il documento";
 $ConfirmYourChoiceDeleteAllfiles = "TUTTI I FILE SARANNO ELIMINATI E NON POTRANNO ESSERE RECUPERATI CONFERMANDO LA SCELTA";
+$WorkName = "Titolo del compito";
 ?>

main/lang/spanish/trad4all.inc.php

@@ -772,4 +772,5 @@ $Created = "Creado";
 $LastUpdate = "Última actualización";
 $UserNonRegisteredAtTheCourse = "Usuario no registrado en el curso";
 $EditMyProfile = "Editar mi perfil";
+$Announcements = "Anuncios";
 ?>

main/lang/spanish/userInfo.inc.php

@@ -189,4 +189,8 @@ $ClickHereToSeeMessageGroup = "Clic aqu
 $OrCopyPasteTheFollowingUrl = "O copiar y pegar la siguente 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";
+$AddModerator = "Agregar como moderador";
+$DenyEntry = "Denegar la entrada";
+$YouNeedToHaveFriendsInYourSocialNetwork = "Usted necesita tener amigos en su red social";
 ?>

main/lang/spanish/work.inc.php

@@ -86,5 +86,5 @@ $ViewUsersWithoutTask = "Aun no presentan la tarea";
 $ViewUsersWithTask = "Ya presentaron la tarea";
 $ReminderMessage = "Enviar un recordatorio";
 $DateSent = "Fecha de envío";
-$ViewUsersWithoutTask = "Faltan presentar tarea";
+$ViewUsersWithoutTask = "Faltan presentar la tarea";
 ?>

main/lang/turkce/reservation.inc.php

@@ -1,4 +1,26 @@
 <?php /*
 for more information: see languages.txt in the lang folder. 
 */
+$ReservationPeriodToSmall = "Rezervasyon süresi çok k&#305;sa";
+$BookingSystem = "Rezervasyon Sistemi";
+$BookingPeriodList = "Rezervasy&#305;n süreleri listesi";
+$BookingListView = "Rezervasyon listesi";
+$BookingCalendarView = "Rezervasyon takvim görüntüsü";
+$BookingPeriods = "&#304;&#351; Program&#305;";
+$ResourceList = "Kaynak Listesi";
+$GoToCalendarView = "Takvim görünümü";
+$GoToListView = "Liste görüntüsü";
+$ManageResources = "Kaynak yönetimi";
+$EditResource = "Kaynak düzenle";
+$BookIt = "Bir kaynak rezerve et";
+$GoTo = "Git";
+$NoTimePicker = "Zaman seçici yok";
+$TimePicker = "Zaman seçici";
+$ManageBookingPeriods = "Rezervasyon sürelerini yönet";
+$BookingPeriodToSmall = "Rezervasyon süresi çok k&#305;sa";
+$BookingPeriodToBig = "Rezervasyon süresi çok büyük";
+$DeleteSelectedBookingPeriod = "Seçili rezervasyon sürelerini sil";
+$EditNewBookingPeriod = "Rezervasyon süresini düzenle";
+$BookingPeriodAdded = "Rezervasyon eklendi";
+$BookingPeriodDeleted = "Rezervasyon silindi";
 ?>

main/social/group_waiting_list.php

@@ -106,9 +106,9 @@ echo '<div id="social-content">';
 		foreach($users as $user) {	 
 			switch ($user['relation_type']) {			
 				case  GROUP_USER_PERMISSION_PENDING_INVITATION_SENT_BY_USER:
-				$user['link']  = '<a href="group_waiting_list.php?id='.$group_id.'&u='.$user['user_id'].'&action=accept">'.Display::return_icon('add_normal_user.png', get_lang('Accept')).'</a>';
-				$user['link'] .= '<a href="group_waiting_list.php?id='.$group_id.'&u='.$user['user_id'].'&action=set_moderator">'.Display::return_icon('add_moderator.png', get_lang('Moderator')).'</a>';
-				$user['link'] .= '<a href="group_waiting_list.php?id='.$group_id.'&u='.$user['user_id'].'&action=deny">'.Display::return_icon('delete.gif', get_lang('Deny')).'</a>';
+				$user['link']  = '<a href="group_waiting_list.php?id='.$group_id.'&u='.$user['user_id'].'&action=accept">'.Display::return_icon('add_normal_user.png', get_lang('AddNormalUser')).'</a>';
+				$user['link'] .= '<a href="group_waiting_list.php?id='.$group_id.'&u='.$user['user_id'].'&action=set_moderator">'.Display::return_icon('add_moderator.png', get_lang('AddModerator')).'</a>';
+				$user['link'] .= '<a href="group_waiting_list.php?id='.$group_id.'&u='.$user['user_id'].'&action=deny">'.Display::return_icon('delete.gif', get_lang('DenyEntry')).'</a>';
 				break;				
 			}
 			$new_member_list[] = $user;

main/social/invitations.php

@@ -228,8 +228,8 @@ echo '<div id="social-content">';
 				
 				$invitation['picture_uri'] = '<a href="groups.php?id='.$invitation['id'].'">'.$img.'</a>';		
 				$invitation['name'] = '<a href="groups.php?id='.$invitation['id'].'">'.cut($invitation['name'],120,true).'</a>';
-				$invitation['join'] = '<a href="invitations.php?accept='.$invitation['id'].'">'.get_lang('AcceptInvitation').'</a>';
-				$invitation['deny'] = '<a href="invitations.php?deny='.$invitation['id'].'">'.get_lang('DenyInvitation').'</a>';
+				$invitation['join'] = '<a href="invitations.php?accept='.$invitation['id'].'">'.Display::return_icon('accept_invitation.png', get_lang('AcceptInvitation')).'&nbsp;&nbsp;'.get_lang('AcceptInvitation').'</a>';
+				$invitation['deny'] = '<a href="invitations.php?deny='.$invitation['id'].'">'.Display::return_icon('denied_invitation.png', get_lang('DenyInvitation')).'&nbsp;&nbsp;'.get_lang('DenyInvitation').'</a>';
 				$invitation['description'] = cut($invitation['description'],220,true);
 				//$invitation['send_message'] = '<a href="'.api_get_path(WEB_PATH).'main/messages/send_message_to_userfriend.inc.php?height=300&width=610&user_friend='.$invitation['id'].'&view=profile&view_panel=1" class="thickbox" title="'.get_lang('SendMessage').'">';
 				//$invitation['send_message'] .= Display::return_icon('message_new.png').'&nbsp;&nbsp;'.get_lang('SendMessage').'</a>';