Browse Source

merged style change

Yannick Warnier 15 years ago
parent
commit
67035faacd
40 changed files with 526 additions and 97 deletions
  1. 20 16
      main/admin/index.php
  2. 0 4
      main/css/chamilo/default.css
  3. 1 1
      main/inc/lib/group_portal_manager.lib.php
  4. 1 1
      main/inc/lib/main_api.lib.php
  5. 1 1
      main/inc/lib/social.lib.php
  6. 0 1
      main/lang/asturian/userInfo.inc.php
  7. 3 3
      main/lang/english/admin.inc.php
  8. 4 5
      main/lang/english/exercice.inc.php
  9. 4 2
      main/lang/english/trad4all.inc.php
  10. 7 8
      main/lang/english/userInfo.inc.php
  11. 1 1
      main/lang/english/wiki.inc.php
  12. 6 6
      main/lang/english/work.inc.php
  13. 9 0
      main/lang/french/admin.inc.php
  14. 2 0
      main/lang/french/courses.inc.php
  15. 1 0
      main/lang/french/create_course.inc.php
  16. 1 0
      main/lang/french/document.inc.php
  17. 5 0
      main/lang/french/exercice.inc.php
  18. 1 0
      main/lang/french/index.inc.php
  19. 2 0
      main/lang/french/learnpath.inc.php
  20. 1 0
      main/lang/french/messages.inc.php
  21. 1 0
      main/lang/french/scorm.inc.php
  22. 1 0
      main/lang/french/survey.inc.php
  23. 16 0
      main/lang/french/trad4all.inc.php
  24. 19 0
      main/lang/french/userInfo.inc.php
  25. 1 0
      main/lang/french/wiki.inc.php
  26. 10 0
      main/lang/french/work.inc.php
  27. 0 1
      main/lang/italian/exercice.inc.php
  28. 13 0
      main/lang/italian/userInfo.inc.php
  29. 9 0
      main/lang/italian/work.inc.php
  30. 61 0
      main/lang/serbian/admin.inc.php
  31. 7 0
      main/lang/serbian/blog.inc.php
  32. 1 0
      main/lang/serbian/scormdocument.inc.php
  33. 2 0
      main/lang/serbian/slideshow.inc.php
  34. 185 0
      main/lang/serbian/survey.inc.php
  35. 41 0
      main/lang/serbian/work.inc.php
  36. 2 3
      main/lang/spanish/exercice.inc.php
  37. 2 0
      main/lang/spanish/trad4all.inc.php
  38. 10 11
      main/lang/spanish/userInfo.inc.php
  39. 1 1
      main/social/friends.php
  40. 74 32
      user_portal.php

+ 20 - 16
main/admin/index.php

@@ -63,13 +63,14 @@ if (api_is_platform_admin()) {
 	?>
 		<div class="admin_section">
 	<h4><?php Display::display_icon('members.gif', get_lang('Users')); ?> <?php echo api_ucfirst(get_lang('Users')); ?></h4>
-	<ul>
-		<li style="list-style-type:none"><form method="get" action="user_list.php">
+
+		<div style="list-style-type:none"><form method="get" action="user_list.php">
 			<input type="text" name="keyword" value="<?php echo $keyword_url; ?>"/>
 			<button class="search" type="submit"> <?php echo get_lang('Search');?>
 			</button>
 			</form>
-		</li>
+		</div>
+	<ul>
 		<li><a href="user_list.php?search=advanced"><?php echo api_ucfirst(get_lang('AdvancedSearch')); ?></a></li>
 		<li><a href="user_list.php">	<?php echo get_lang('UserList') ?></a></li>
 		<li><a href="user_add.php">		<?php echo get_lang('AddUsers') ?></a></li>
@@ -112,11 +113,14 @@ if(api_is_platform_admin()) {
 ?>
 	<div class="admin_section">
 <h4><?php Display::display_icon('course.gif', get_lang('Courses')); ?> <?php echo api_ucfirst(get_lang('Courses')); ?></h4>
-		<ul><li style="list-style-type:none"><form method="get" action="course_list.php">
+		<div style="list-style-type:none"><form method="get" action="course_list.php">
 		<input type="text" name="keyword" value="<?php echo $keyword_url; ?>"/>
 		<button class="search" type="submit"> <?php echo get_lang('Search');?>
 			</button>
-		</form></li>
+		</form></div>
+		
+		
+		<ul>
 		<li>
 		<a href="course_list.php?search=advanced"><?php echo api_ucfirst(get_lang('AdvancedSearch')); ?></a>
 
@@ -186,13 +190,14 @@ if(api_get_setting('use_session_mode')=='true')
 
 <div class="admin_section">
  <h4><?php Display::display_icon('agenda.gif', get_lang('Sessions')); ?> <?php echo get_lang('Sessions') ?></h4>
- <ul>
- <li style="list-style-type:none"><form method="POST" action="session_list.php">
+ <div style="list-style-type:none"><form method="POST" action="session_list.php">
 	<input type="text" name="keyword_name" value="<?php echo $keyword_url; ?>"/>
 	<button class="search" type="submit"> <?php echo get_lang('Search');?>
 			</button>
 	</form>
-</li>
+</div>
+
+ <ul>
   <li><a href="session_list.php?search=advanced"><?php echo api_ucfirst(get_lang('AdvancedSearch')); ?></a></li>
   <li><a href="session_list.php"><?php echo get_lang('ListSession') ?></a></li>
   <li><a href="session_category_list.php"><?php echo get_lang('ListSessionCategory') ?></a></li>
@@ -220,13 +225,13 @@ else if(api_is_platform_admin())
 
 <div class="admin_section">
 <h4><?php Display::display_icon('group.gif', get_lang('AdminClasses')); ?> <?php echo api_ucfirst(get_lang('AdminClasses')); ?></h4>
-<ul>
-<li style="list-style-type:none"><form method="get" action="class_list.php">
+<div style="list-style-type:none"><form method="get" action="class_list.php">
 
 	<input type="text" name="keyword" value="<?php echo $keyword_url; ?>"/>
 	<input class="search" type="submit" value="<?php echo get_lang('Search'); ?>"/>
 	</form>
-</li>
+</div>
+<ul>
 <li><a href="class_list.php"><?php echo get_lang('ClassList'); ?></a></li>
 <li><a href="class_add.php"><?php echo get_lang('AddClasses'); ?></a></li>
 <li><a href="class_import.php"><?php echo get_lang('ImportClassListCSV'); ?></a></li>
@@ -278,15 +283,14 @@ if(api_is_platform_admin()){
   <li><a href="http://www.chamilo.org/" target="_blank"><?php echo get_lang('ChamiloHomepage'); ?></a></li>
   <li><a href="http://forum.chamilo.org/" target="_blank"><?php echo get_lang('ChamiloForum'); ?></a></li>
   <li><a href="http://www.chamilo.org/extensions/" target="_blank"><?php echo get_lang('ChamiloExtensions'); ?></a></li>
-  <li>
+
   <?php
   //try to display a maximum before we check the dokeos version and all that
   	//session_write_close(); //close session to avoid blocking concurrent access
 	flush(); //send data to client as much as allowed by the web server
 	//ob_flush();
-	echo get_lang('VersionCheck').': '.version_check();
+	echo '<li>'.get_lang('VersionCheck').': '.version_check().'</li>';
   ?>
-  </li>
  </ul>
 </div>
 <?php
@@ -430,10 +434,10 @@ function check_dokeos_version()
 	global $_configuration; // the dokeos version of your installation
 	$dokeos_version = $_configuration['dokeos_version'];
 
-	if ($fsock = @fsockopen('www.dokeos.com', 80, $errno, $errstr))
+	if ($fsock = @fsockopen('www.chamilo.org', 80, $errno, $errstr))
 	{
 		@fputs($fsock, "GET /version.php HTTP/1.1\r\n");
-		@fputs($fsock, "HOST: www.dokeos.com\r\n");
+		@fputs($fsock, "HOST: www.chamilo.org\r\n");
 		@fputs($fsock, "Connection: close\r\n\r\n");
 
 		$get_info = false;

+ 0 - 4
main/css/chamilo/default.css

@@ -1462,10 +1462,6 @@ div.admin_section h4 {
 
 }
 
-.admin_section li:first-child {
-	background-image:none; 
-}
-
 .user_course_category {
 	background-color: #E5EDF9;
 	border: 1px solid #666;

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

@@ -985,7 +985,7 @@ class GroupPortalManager
 					
 						echo '<div class="social-menu-group-member">';
 						echo '<a href="profile.php?u='.$member['user_id'].'">';
-						echo '<img height="44" border="2" align="middle" width="44" vspace="10" class="social-groups-image" src="'.$picture['file'].'"/>';
+						echo '<img height="44" border="2" align="middle" vspace="10" class="social-groups-image" src="'.$picture['file'].'"/>';
 						echo '<div>'.api_get_person_name(cut($member['firstname'],15),cut($member['lastname'],15)).'&nbsp;'.$icon.'</div></a>';
 						echo '</div>';
 						$i++;

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

@@ -1458,7 +1458,7 @@ function api_get_session_visibility($session_id) {
 		$sesion_id = intval(Database::escape_string($session_id));
 		$tbl_session = Database::get_main_table(TABLE_MAIN_SESSION);
 
-		$is_coach = api_is_course_coach();
+		$is_coach = api_is_coach();
 
 		$condition_date_end = "";
 		if ($is_coach) {

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

@@ -892,7 +892,7 @@ class SocialManager extends UserManager {
 				// reduce image
 				$name = api_get_person_name($user_info['firstName'], $user_info['lastName']);
 
-				$table_row[] = '<a href="'.$url.'"><img title = "'.$name.'" class="social-home-users-online" alt="'.$name.'" src="'.$friends_profile['file'].'" width="60px" height="60px"></a>';
+				$table_row[] = '<a href="'.$url.'"><img title = "'.$name.'" class="social-home-users-online" alt="'.$name.'" src="'.$friends_profile['file'].'" height="60px"></a>';
 				$table_row[] = '<a href="'.$url.'" style="font-size:10px;">'.api_get_person_name(cut($user_info['firstName'],15), cut($user_info['lastName'],15)).'</a>';
 
 				if (api_get_setting('show_email_addresses') == 'true') {

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

@@ -180,7 +180,6 @@ $FilesSizeExceedsX = "Tama
 $YouShouldWriteASubject = "Tienes qu\'escribir l\'asuntu";
 $Topics = "Temes";
 $StatusInThisGroup = "Estáu nesti grupu";
-$DescriptionGroup = "Descripción del grupu";
 $FriendsOnline = "Amigos online";
 $GroupDescription = "Descripción del grupu";
 $MyProductions = "Les mios producciones";

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

@@ -1121,9 +1121,9 @@ $AllowStudentsToCreateGroupsInSocialTitle = "Allow students to create groups in
 $AllowStudentsToCreateGroupsInSocialComment = "Allow students to create groups in social network";
 $AllowSendMessageToAllPlatformUsersTitle = "Allow send message to all platform users";
 $AllowSendMessageToAllPlatformUsersComment = "Allow send message to all platform users";
-$TabsSocial = "Tabs social";
-$MessageMaxUploadFilesizeTitle = "Message max upload file size";
-$MessageMaxUploadFilesizeComment = "Message max upload file size";
+$TabsSocial = "Social network tab";
+$MessageMaxUploadFilesizeTitle = "Max upload file size in messages";
+$MessageMaxUploadFilesizeComment = "Maximum size for file uploads in the messaging tool (in Bytes)";
 $AddAdditionalProfileField = "Add user profile field";
 $Username = "Username";
 ?>

+ 4 - 5
main/lang/english/exercice.inc.php

@@ -352,10 +352,9 @@ $EnableTimerControl = "Enable time control";
 $ExerciseTotalDurationInMinutes = "Total duration in minutes of the test";
 $ToContinueUseMenu = "To continue this course, please use the side-menu.";
 $RandomAnswers = "Shuffle answers";
-$NotMarkActivity = "Not possible mark this activity";
+$NotMarkActivity = "This activity cannot be qualified";
 $YouHaveToCreateAtLeastOneAnswer = "You have to create at least one answer";
-$YouHaveToCreateAtLeastOneAnswer = "You have to create at least one answer";
-$ExerciseAttempted = "Exercise attempted";
-$MultipleSelectCombination = "Multiple select combination";
-$MultipleAnswerCombination = "Multiple answer combination";
+$ExerciseAttempted = "A learner attempted an exercise";
+$MultipleSelectCombination = "Exact Selection";
+$MultipleAnswerCombination = "Exact answers combination";
 ?>

+ 4 - 2
main/lang/english/trad4all.inc.php

@@ -761,7 +761,7 @@ $YouMustToInstallTheExtensionLDAP = "You must install the extension LDAP";
 $AddAdditionalProfileField = "Add user profile field";
 $InvitationDenied = "Invitation denied";
 $UserAdded = "User added";
-$UpdatedIn = "Updated in";
+$UpdatedIn = "Updated on";
 $Metadata = "Metadata";
 $langAddMetadata  = "View/Edit Metadata";
 $SendMessage = "Send Message";
@@ -770,7 +770,9 @@ $SeeMore = "See more";
 $NoDataAvailable = "No data available";
 $Created = "Created";
 $LastUpdate = "Last update";
-$UserNonRegisteredAtTheCourse = "User non registered at the course";
+$UserNonRegisteredAtTheCourse = "User not registered in course";
 $EditMyProfile = "Edit my profile";
 $Announcements = "Announcements";
+$Username = "Username";
+$Password = "Password";
 ?>

+ 7 - 8
main/lang/english/userInfo.inc.php

@@ -180,17 +180,16 @@ $FilesSizeExceedsX = "Files size exceeds";
 $YouShouldWriteASubject = "You should write a subject";
 $Topics = "Topics";
 $StatusInThisGroup = "Status in this group";
-$DescriptionGroup = "Description group";
 $FriendsOnline = "Friends online";
 $GroupDescription = "Group description";
 $MyProductions = "My productions";
-$YouHaveReceivedANewMessageInTheGroupX = "You have received a new message in the group %s";
-$ClickHereToSeeMessageGroup = "Click here to see message group";
-$OrCopyPasteTheFollowingUrl = "Or copy paste the following url";
-$ThereIsANewMessageInTheGroupX = "There is a new message in the group %s";
+$YouHaveReceivedANewMessageInTheGroupX = "You have received a new message in group %s";
+$ClickHereToSeeMessageGroup = "Click here to see group message";
+$OrCopyPasteTheFollowingUrl = "Or copy/paste the following url";
+$ThereIsANewMessageInTheGroupX = "There is a new message in 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";
+$AddNormalUser = "Add as simple user ";
+$AddModerator = "Add as moderator";
+$DenyEntry = "Deny access";
 $YouNeedToHaveFriendsInYourSocialNetwork = "You need to have friends in your social network";
 ?>

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

@@ -176,5 +176,5 @@ $Feedback3 = "Third message";
 $FProgress = "Progress";
 $PutATimeLimit = "Set a time limit";
 $StandardTask = "Standard Task";
-$ThePageHasBeenExportedToDocArea = "The page has been exported to doc area";
+$ThePageHasBeenExportedToDocArea = "The page has been exported to the document tool";
 ?>

+ 6 - 6
main/lang/english/work.inc.php

@@ -78,13 +78,13 @@ $TheDocumentHasBeenDeleted = "The document has been deleted.";
 $YouAreNotAllowedToDeleteThisDocument = "You are not allowed to delete this document";
 $ConfirmYourChoiceDeleteAllfiles = "Please confirm your choice. This will delete all files without possibility of recovery";
 $WorkName = "Assignment name";
-$ReminderToSubmitPendingTask = "You are reminded that has a pending task";
-$MessageConfirmSendingOfTask = "This is a message confirming the sending of the task";
+$ReminderToSubmitPendingTask = "Please remember you still have to send an assignment";
+$MessageConfirmSendingOfTask = "This is a message confirming the good reception of the task";
 $DataSent = "Data sent";
 $DownloadLink = "Download link";
-$ViewUsersWithoutTask = "Still missing file";
-$ViewUsersWithTask = "Already delivered file";
+$ViewUsersWithoutTask = "Missing assignments";
+$ViewUsersWithTask = "Assignments received";
 $ReminderMessage = "Send a reminder";
-$DateSent = "Date Sent";
-$ViewUsersWithoutTask = "View Users Without Task";
+$DateSent = "Date sent";
+$ViewUsersWithoutTask = "View missing assignments";
 ?>

+ 9 - 0
main/lang/french/admin.inc.php

@@ -1117,4 +1117,13 @@ $GoToCourseAfterLoginComment = "Lorsqu\'un utilisateur est enregistr
 $GroupList = "Liste des groupes";
 $AllowStudentsDownloadFoldersTitle = "Autoriser les apprenants à télécharger des répertoires";
 $AllowStudentsDownloadFoldersComment = "Permettre aux apprenants de comprimer et télécharger un répertoire complet dans l\'outil documents";
+$AllowStudentsToCreateGroupsInSocialTitle = "Autoriser les étudiants à créer des groupes dans le réseau social";
+$AllowStudentsToCreateGroupsInSocialComment = "Autoriser les étudiants à créer des groupes dans le réseau social. Sans cette option, seuls les administrateurs peuvent créer des groupes, ce qui limite l\'interaction entre étudiants et la formation de groupes volontaires.";
+$AllowSendMessageToAllPlatformUsersTitle = "Autoriser l\'envoi de messages à tous les utilisateurs";
+$AllowSendMessageToAllPlatformUsersComment = "Autoriser l\'envoi de messages à tous les utilisateurs de la plateforme. Sans cette option, les utilisateurs ne peuvent envoyer de message qu\'aux utilisateurs actuellement connectés.";
+$TabsSocial = "Onglet réseau social";
+$MessageMaxUploadFilesizeTitle = "Taille maximum d\'envoi de fichier dans les messages";
+$MessageMaxUploadFilesizeComment = "Taille maximum pour l\'envoi de fichiers dans l\'outil de messagerie (en Bytes)";
+$AddAdditionalProfileField = "Ajouter un champ de profil utilisateur";
+$Username = "Nom d\'utilisateur";
 ?>

+ 2 - 0
main/lang/french/courses.inc.php

@@ -80,4 +80,6 @@ $SessionCategory = "Cat
 $Expand = "Déplier";
 $Collapse = "Replier";
 $CourseDetails = "Description du cours";
+$GroupPendingInvitations = "Invitations de groupe en attente";
+$Compose = "Composer";
 ?>

+ 1 - 0
main/lang/french/create_course.inc.php

@@ -104,4 +104,5 @@ $CreateCourse = "Cr
 $Create = "Créer";
 $MessageOfNewCourseToAdmin = "Ce petit message pour vous informer qu\'un nouveau cours a été créé sur la plateforme";
 $NewCourseCreatedIn = "Nouveau cours créé dans";
+$ExplicationTrainers = "Vous êtes considéré comme formateur pour l\'instant. Vous pourrez modifier ce paramètre plus tard dans la page de configuration des paramètres du cours.";
 ?>

+ 1 - 0
main/lang/french/document.inc.php

@@ -215,4 +215,5 @@ $CreateFolder = "Cr
 $HelpDefaultDirDocuments = "Ce répertoire contient les fichiers par défaut. Vous pouvez supprimer des fichiers ou en ajouter de nouveaux, mais si un fichier invisible est inséré dans un document web, les apprenants ne pourront pas voir ce fichier dans le document. Lorsque vous insérez un fichier dans un document, assurez-vous qu\'il soit visible. Les répertoires, eux, peuvent rester invisibles.";
 $HelpSharedFolder = "Ce répertoire contient les fichiers que d\'autres apprenants (ou vous-même) ont envoyé dans un cours au travers de l\'éditeur en ligne (à l\'exception de l\'outil de groupe). Par défaut, ils seront visibles par tous les enseignants, mais resteront invisibles pour les autres apprenants (sauf par accès direct au fichier). Si vous rendez un répertoire apprenant visible, les autres apprenants pourront voir l\'ensemble de son contenu.";
 $TemplateImage = "Icône du modèle";
+$MoveElement = "Déplacer élément";
 ?>

+ 5 - 0
main/lang/french/exercice.inc.php

@@ -352,4 +352,9 @@ $EnableTimerControl = "Activer le contr
 $ExerciseTotalDurationInMinutes = "Durée totale du test en minutes";
 $ToContinueUseMenu = "Pour continuer le cours, veuillez utiliser le menu latéral";
 $RandomAnswers = "Désordonner les réponses";
+$NotMarkActivity = "Activité non-qualificable";
+$YouHaveToCreateAtLeastOneAnswer = "Veuillez créer au moins une réponse";
+$ExerciseAttempted = "Un apprenant a passé un exercice";
+$MultipleSelectCombination = "Combinaison exacte";
+$MultipleAnswerCombination = "Combinaison exacte";
 ?>

+ 1 - 0
main/lang/french/index.inc.php

@@ -69,4 +69,5 @@ $YouDoNotHaveAnySessionInItsHistory = "Vous n\'avez pas de session dans votre hi
 $Messages = "Messages";
 $Inbox = "Boîte de réception";
 $Comppose = "Nouveau message";
+$PendingInvitations = "Invitations en attente";
 ?>

+ 2 - 0
main/lang/french/learnpath.inc.php

@@ -244,4 +244,6 @@ $AddAssignmentToCourse = "Ajouter cette t
 $AddForumToCourse = "Ajouter ce forum au cours";
 $SaveAudioAndOrganization = "Enregistrer sons et disposition";
 $UploadOnlyMp3Files = "Merci de ne charger que des fichiers audio de type MP3";
+$ModifyHotPotatoes = "Modifier hotpotatoes";
+$SaveHotpotatoes = "Enregistrer hotpotatoes";
 ?>

+ 1 - 0
main/lang/french/messages.inc.php

@@ -36,4 +36,5 @@ $WriteAMessage = "
 $AlreadyReadMessage = "Message déjà lu";
 $UnReadMessage = "Message non lu";
 $MessageSent = "Message envoyé";
+$YouShouldWriteAMessage = "Vous devriez écrire un message";
 ?>

+ 1 - 0
main/lang/french/scorm.inc.php

@@ -52,4 +52,5 @@ $UnknownPackageFormat = "Le format du cours n\'a pas 
 $Attempt = "Tentative";
 $MoveTheCurrentForum = "Déplacer le forum courant";
 $WarningWhenEditingScorm = "Attention !<br />Quand on édite une étape scorm, on peut altérer le reporting, voire endommager le cours.";
+$AdditionalProfileField = "Ajouter un champ de profil utilisateur";
 ?>

+ 1 - 0
main/lang/french/survey.inc.php

@@ -202,4 +202,5 @@ $BackToSurvey = "Retour 
 $UpdateInformation = "Mettre les informations à jour";
 $PleaseFillSurvey = "Veuillez compléter l\'enquête";
 $ReportingOverview = "Vue globale du suivi";
+$ThereAreNotQuestionsForthisSurvey = "Il n\'y a pas de questions dans cette enquête";
 ?>

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

@@ -759,4 +759,20 @@ $Coachs = "Formateurs";
 $New = "Nouveau";
 $YouMustToInstallTheExtensionLDAP = "Vous devez installer l\'extension LDAP";
 $AddAdditionalProfileField = "Ajouter un champ de profil utilisateur";
+$InvitationDenied = "Invitation rejetée";
+$UserAdded = "Utilisateur ajouté";
+$UpdatedIn = "Mise à jour le";
+$Metadata = "Métadonnées";
+$langAddMetadata  = "Voir/Éditer les métadonnées";
+$SendMessage = "Envoyer message";
+$SeeForum = "Voir forum";
+$SeeMore = "En savoir plus";
+$NoDataAvailable = "Pas de données disponibles";
+$Created = "Créé";
+$LastUpdate = "Dernière mise à jour";
+$UserNonRegisteredAtTheCourse = "Utilisateur non enregistré dans le cours";
+$EditMyProfile = "Éditer mon profil";
+$Announcements = "Annonces";
+$Username = "Nom d\'utilisateur";
+$Password = "Mot de passe";
 ?>

+ 19 - 0
main/lang/french/userInfo.inc.php

@@ -173,4 +173,23 @@ $UserIsNotSubscribedToThisGroup = "L\'utilisateur n\'est pas inscrit 
 $InvitationReceived = "Invitation reçue";
 $InvitationSent = "Invitation envoyée";
 $YouAlreadySentAnInvitation = "Vous avez déjà envoyé une invitation";
+$AllowSendMessageToAllPlatformUsersTitle = "Autoriser les utilisateurs à envoyer des messages à tous les utilisateurs";
+$InvitationDenied = "Invitation rejetée";
+$UserAdded = "Utilisateur ajouté";
+$FilesSizeExceedsX = "La taille du fichier dépasse";
+$YouShouldWriteASubject = "Vous devriez indiquer un sujet";
+$Topics = "Thèmes";
+$StatusInThisGroup = "Statut dans ce groupe";
+$FriendsOnline = "Amis en ligne";
+$GroupDescription = "Description du groupe";
+$MyProductions = "Mes publications";
+$YouHaveReceivedANewMessageInTheGroupX = "Vous avez reçu un message au sein du groupe %s";
+$ClickHereToSeeMessageGroup = "Cliquez ici pour voir le message de groupe";
+$OrCopyPasteTheFollowingUrl = "ou copiez/collez l\'URL suivant";
+$ThereIsANewMessageInTheGroupX = "Il y a un nouveau message dans le groupe %s";
+$UserIsAlreadySubscribedToThisGroup = "L\'utilisateur est déjà inscrit à ce groupe";
+$AddNormalUser = "Ajouter comme simple utilisateur";
+$AddModerator = "Ajouter comme modérateur";
+$DenyEntry = "Refuser l\'accès";
+$YouNeedToHaveFriendsInYourSocialNetwork = "Vous devez avoir des contacts dans votre réseau social";
 ?>

+ 1 - 0
main/lang/french/wiki.inc.php

@@ -176,4 +176,5 @@ $Feedback3 = "Troisi
 $FProgress = "Progrès";
 $PutATimeLimit = "Mettre une limite de temps";
 $StandardTask = "Tâche standard";
+$ThePageHasBeenExportedToDocArea = "La page a été exportée dans l\'outil de documents";
 ?>

+ 10 - 0
main/lang/french/work.inc.php

@@ -77,4 +77,14 @@ $StudentAllowedToDeleteOwnPublication = "Autoriser les apprenants 
 $TheDocumentHasBeenDeleted = "Le document a été supprimé.";
 $YouAreNotAllowedToDeleteThisDocument = "Vous n\'êtes pas autorisé à supprimer ce document";
 $ConfirmYourChoiceDeleteAllfiles = "Veuillez confirmer votre choix. Tous les fichiers seront supprimés sans possibilité de récupération postérieure";
+$WorkName = "Nom de la tâche";
+$ReminderToSubmitPendingTask = "Nous vous rappelons que vous devez soumettre une tâche";
+$MessageConfirmSendingOfTask = "Ceci est un message de confirmation de bonne récpetion de la tâche";
+$DataSent = "Données envoyées";
+$DownloadLink = "Lien de téléchargement";
+$ViewUsersWithoutTask = "Travaux manquants";
+$ViewUsersWithTask = "Travaux déjà remis";
+$ReminderMessage = "Envoyer un rappel";
+$DateSent = "Date de réception";
+$ViewUsersWithoutTask = "Travaux manquants";
 ?>

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

@@ -354,7 +354,6 @@ $ToContinueUseMenu = "Per procedere usa il men
 $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";

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

@@ -179,4 +179,17 @@ $UserAdded = "Utente aggiunto";
 $FilesSizeExceedsX = "Superata la dimensione massima del file";
 $YouShouldWriteASubject = "Devi scrivere l\'oggetto del messaggio";
 $Topics = "Argomenti";
+$StatusInThisGroup = "Status nel gruppo";
+$FriendsOnline = "Amici online";
+$GroupDescription = "Descrizione del gruppo";
+$MyProductions = "I miei prodotti";
+$YouHaveReceivedANewMessageInTheGroupX = "Hai ricevuto un messaggio nel gruppo %s";
+$ClickHereToSeeMessageGroup = "Clcca qui per vedere il messaggio nel gruppo";
+$OrCopyPasteTheFollowingUrl = "O copia e incolla l\'URL seguente";
+$ThereIsANewMessageInTheGroupX = "C\'è un nuovo messaggio nel gruppo %s";
+$UserIsAlreadySubscribedToThisGroup = "L\'utente è già iscritto al gruppo";
+$AddNormalUser = "Aggiungi come utente normale";
+$AddModerator = "Aggiungi come moderatore";
+$DenyEntry = "Nega l\'ingresso";
+$YouNeedToHaveFriendsInYourSocialNetwork = "Nel social network devi avere degli amici";
 ?>

+ 9 - 0
main/lang/italian/work.inc.php

@@ -78,4 +78,13 @@ $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";
+$ReminderToSubmitPendingTask = "Ricorda che hai un compito da completare";
+$MessageConfirmSendingOfTask = "Messaggio di conferma di assegnazione del compito";
+$DataSent = "Data d\'invio";
+$DownloadLink = "Collegamento di download";
+$ViewUsersWithoutTask = "File ancora mancante";
+$ViewUsersWithTask = "File già inviato";
+$ReminderMessage = "Manda un messaggio di richiamo";
+$DateSent = "Data d\'invio";
+$ViewUsersWithoutTask = "Mostra i corsisti senza compiti assegnati";
 ?>

+ 61 - 0
main/lang/serbian/admin.inc.php

@@ -437,6 +437,7 @@ $RoleType = "Tip";
 $RightValueModified = "Vrednost je izmenjena.";
 $MakeAvailable = "Omogu&#263;iti";
 $MakeUnavailable = "Onemogu&#263;iti";
+$Stylesheets = "Stilovi  (stylesheets) ";
 $DefaultDokeosStyle = "Podrazumevani Dokeos stil";
 $ShowIconsInNavigationsMenuComment = "Da li  navigacioni meni treba da prikazuje razli&#269;ite ikone alata? ";
 $Plugin = "Plugin";
@@ -445,9 +446,15 @@ $MainMenuLogged = "Glavni menu nakon prijave";
 $Banner = "Banner";
 $DokeosAdminWebLinks = "Dokeos Web";
 $ImageResizeTitle = "Promeni veli&#269;inu prenesene korisni&#269;ke slike";
+$MaxImageWidthTitle = "Najve&#263;a dužina korisni&#269;ke slike";
 $YourVersionNotUpToDate = "Vaša verzija nije ažurna";
 $YourVersionIs = "Vaša verzija je ";
+$PleaseVisitDokeos = "Molimo Vas posetite Dokeos webstranicu";
 $VersionUpToDate = "Vaša verzija je ažurna";
+$ConnectSocketError = "Greška povezivanja preko socketa (Socket Connection Error)";
+$SocketFunctionsDisabled = "Povezivanje preko socket-a je onemogu&#263;eno ";
+$ShowEmailAddresses = "Prikaži email adrese";
+$ShowEmailAddressesComment = "Prikaži email adrese korisnicima";
 $langphone = "Telefon ";
 $LatestVersionIs = "Poslednja verzija je";
 $langConfigureExtensions = "Podešavanje ekstenzija";
@@ -455,28 +462,51 @@ $langConfigureExtensions = "Dokeos PRO";
 $langActiveExtensions = "Aktivirajte ovu uslugu";
 $langVisioconf = "Visio-konferencija";
 $langPpt2lp = "DOKEOS RAPID Oogie-Woogie konvertor";
+$langBandWidthStatistics = "Statistika protoka podataka";
+$ServerStatistics = "Statistike servera ";
+$langServerStatisticsDescription = "AWStats omogu&#263;ava da pregledate statistike platforme: posetioci, pregled stranica, linkove ...";
+$SearchEngine = "Traženje po re&#269;ima";
 $langListSession = "Lista sesija";
 $AddSession = "Dodaj trening sesiju";
 $langImportSessionListXMLCSV = "Uvezi listu sesija";
+$ExportSessionListXMLCSV = "Izvezi sesije u XML/CSV obliku ";
 $SessionName = "Naziv sesije";
 $langNbCourses = "Trening";
 $DateStart = "Datum po&#269;etka";
 $DateEnd = "Datum završetka";
 $CoachName = "Naziv trenera";
 $NoTimeLimits = "Bez vremenskog ograni&#269;enja";
+$SessionList = "Spisak treninga";
+$SessionNameIsRequired = "Ime sesije je obavezno ";
 $NextStep = "Slede&#263;i korak";
 $keyword = "Klju&#269;na re&#269; ";
 $Confirm = "Potvrdi";
+$UnsubscribeUsersFromCourse = "Ispiši korisnike iz treninga ";
+$MissingClassName = "Ime razreda je obavezno ";
+$ClassNameExists = "Ime razreda ve&#263; postoji ";
+$ImportCSVFileLocation = "Lokacija CSV datoteke za uvoz ";
+$ClassesCreated = "Razred kreiran ";
+$ErrorsWhenImportingFile = "Greške prilikom uvoza fajla ";
+$ServiceActivated = "Servis aktiviran ";
+$ActivateExtension = "Aktiviraj uslugu (servis)";
+$InvalidExtension = "Nepostoje&#263;a ekstenzija ";
 $AfterApproval = "Nakon odobrenja";
 $StudentViewEnabledTitle = "Aktiviraj pogled - student";
 $TimeLimitWhosonlineTitle = "Vremensko ograni&#269;enje na  Ko je Online";
+$UseSessionModeTitle = "Upotrebi na&#269;in sesija";
+$HomepageView2column = "Pogled sa dve kolone ";
+$HomepageView3column = "Pogled sa tri kolone ";
+$AllowUserHeadings = "Dozvoli korisni&#269;ke profile unutar treninga ";
 $IconsOnly = "Samo ikone";
 $TextOnly = "Samo tekst";
 $IconsText = "Ikone i tekst";
+$EnableToolIntroductionTitle = "Omogu&#263;i uvodnu sekciju alata ";
 $Comment = "Komentar";
 $Version = "Verzija";
 $LoginPageMainArea = "Osnovno podru&#269;je prijavne strane ";
 $LoginPageMenu = "Meni prijavne strane";
+$CampusHomepageMainArea = "Osnovno podru&#269;je glavne stranice portala";
+$CampusHomepageMenu = "Meni osnovne stranice portala ";
 $MyCoursesMainArea = "Osnovna stranica kursa";
 $MyCoursesMenu = "Meni kurseva";
 $Header = "Zaglavlje - Glava";
@@ -485,19 +515,43 @@ $VersionCheck = "Provera verzije";
 $Active = "Aktivan";
 $Inactive = "Neaktivan";
 $SessionOverview = "Pregled sesije";
+$NbUsers = "Korisnici ";
 $Host = "Server";
 $UserOnHost = "Korisni&#269;ko ime";
 $FtpPassword = "FTP lozinka";
+$WCAGContent = "Tekst ";
 $DateStartSession = "Po&#269;etni datum";
+$DateEndSession = "Datum završetka ";
 $ReconfigureExtension = "Rekonfiguriši ekstenzije";
 $ChooseNewsLanguage = "Izaberite novi jezik";
+$Ajax_course_tracking_refresh = "Ukupno vreme provedenu u treningu ";
 $EditLink = "Edituj link";
+$UserLocked = "Korisnik zaklju&#269;an ";
+$UserUnlocked = "Korisnik otklju&#269;an ";
+$CannotDeleteUser = "Nemožete obrisati ovog korisnika ";
+$SomeUsersNotDeleted = "Neki korisnici nisu bili obrisani ";
 $RegistrationDate = "Datum registracije";
 $UserUpdated = "Korisnik ažuriran";
 $Choose = "Odaberi";
+$CourseSessionList = "Spisak treninga u sesiji";
+$UserNameUsedTwice = "Korisni&#269;ko ime je u upotrebi više puta ";
 $UserNameTooLong = "Korisni&#269;ko ime je predugo";
+$UnknownUser = "Nepoznati korisnik ";
+$UnknownStatus = "Nepoznat status ";
+$UsernameTooLongWasCut = "To korisni&#269;ko ime je bilo skra&#263;eno ";
+$NoInputFile = "Ni jedan fajl nije bio poslat ";
+$NoInputFile = "Nijedan fajl nije poslat ";
+$SlideSize = "Veli&#269;ina diapozitiva ";
+$UnknownTeacher = "Nepoznat trener ";
+$name = "Ime ";
+$Security = "Sigurnost ";
+$Blacklist = "Crna lista ";
+$Whitelist = "Bela lista ";
+$UploadExtensionsBlacklist = "Crna lista - podešavanja ";
+$UploadExtensionsWhitelist = "Bela lista - podešavanja ";
 $Remove = "Ukloni";
 $Rename = "Preimenuj";
+$NameOfTheSession = "Naziv sesije ";
 $TabsMyCourses = "Moji kursevi";
 $TabsCampusHomepage = "Jezi&#269;ak Glavna stranica";
 $TabsReporting = "Jezi&#269;ak Izveštaji";
@@ -505,11 +559,18 @@ $TabsPlatformAdministration = "Jezi&#269;ak Administracija platforme";
 $NoCoursesForThisSession = "Nema korisnika u toj sesiji";
 $NoUsersForThisSession = "Nema korisnika u toj sesiji";
 $TabsMyAgenda = "Jezi&#269;ak Agenda";
+$CourseCoachEmailSender = "e-mail adresa instruktora ";
+$NoReplyEmailSender = "Ne odgovaraj na tu poruku email adresa (No-replay email address)";
+$UserTheme = "Tema (predlog) ";
+$UserThemeSelection = "Korisni&#269;ki izbor teme ";
 $VisioPassword = "Šifra za server videokonferencije";
 $Port = "Port";
 $AddUserField = "Dodaj korisni&#269;ko polje";
 $TabsGradebookEnableColoring = "Omogu&#263;i farbanje rezultata";
 $AddUserFields = "Dodaj korisnicko polje";
 $TabsMyGradebook = "Jezi&#269;ak Procene";
+$EditUsers = "Ažuriraj korisnike ";
+$EditCourses = "Ažuriraj trening";
+$CourseListIn = "Kursevi ";
 $TabsSocial = "Jezi&#269;ak Social";
 ?>

+ 7 - 0
main/lang/serbian/blog.inc.php

@@ -10,4 +10,11 @@ $ThisBlog = "Ovaj blog";
 $NewPost = "Novi &#269;lanak";
 $AddTask = "Dodaj novu funkciju";
 $AddTasks = "Dodaj novu ulogu";
+$EditTask = "Ažuriraj ovaj zadatak ";
+$DeleteSystemTask = "Nije mogu&#263;e obrisati sistemski ugra&#273;enu temu. ";
+$SelectUser = "Izaberi korisnika ";
+$SelectTargetDate = "Datum ";
+$TargetDate = "Datum ";
+$Color = "Boja ";
+$ArticleManager = "Uredjiva&#269; zadataka ";
 ?>

+ 1 - 0
main/lang/serbian/scormdocument.inc.php

@@ -60,4 +60,5 @@ $langCreateDoc = "Kreiraj dokument";
 $langOrganiseDocuments = "Organizovanje dokumenata";
 $langUncompress = "Otpakuj";
 $ExportShort = "Izvezi kratko";
+$progress = "Napredak";
 ?>

+ 2 - 0
main/lang/serbian/slideshow.inc.php

@@ -18,4 +18,6 @@ $lang_next_slide = "Slede&#263;i slajd";
 $lang_image = "Slika";
 $lang_of = "sa";
 $lang_view_slideshow = "Pogledaj Slideshow ";
+$FirstSlide = "Prvi slajd";
+$LastSlide = "Poslednji slajd";
 ?>

+ 185 - 0
main/lang/serbian/survey.inc.php

@@ -16,4 +16,189 @@ $AdvancedReportDetails = "Opcija napredno izve
 $AdvancedReport = "Napredno izveštavanje";
 $CompleteReportDetails = "Opcija Kompletno izveštavanje prikazuje sve rezultate ispitanih korisnika i omogu&#263;ava prenos rezultata u csv format (za Excel) ";
 $CompleteReport = "Kompletno izveštavanje";
+$OnlyThoseAddresses = "Pošalji ankete jedino na ove adrese";
+$BackToQuestions = "Nazad na pitanja";
+$SelectWhichLanguage = "Izaberite jezik u kojem bi trebalo da se kreiraju ankete";
+$CreateInAnotherLanguage = "Kreiraj ovo istraživanje na drugom jeziku";
+$ExportInExcel = "Izvoz u Ekscel formatu";
+$ComparativeResults = "Komparativni rezultati";
+$SelectDataYouWantToCompare = "Izaberite podatke koje želite da uporedite";
+$ClickHereToOpenSurvey = "Kliknite ovde da ispunite anketu";
+$SurveyNotShared = "Ankete jos nisu bile sharovane";
+$ViewSurvey = "Pogledaj anketu";
+$SelectDisplayType = "Odaberi oblik prikaza : ";
+$Thanks = "Povratna informacija";
+$SurveyReporting = "Rezultati ankete ";
+$NoSurveyAvailable = "Trenutno nema anketa ";
+$YourSurveyHasBeenPublished = "je objavljena ";
+$CreateFromExistingSurvey = "Napravi od postoje&#263;e ankete ";
+$Publish = "Objavi anketu ";
+$SearchASurvey = "Potraži anketu ";
+$CourseName = "Naziv kursa";
+$SurveysOfAllCourses = "Anketa(e) svih treninga";
+$PleaseSelectAChoice = "Molim napravite odabir ";
+$ThereAreNoQuestionsInTheDatabase = "Ne postoje pitanja u bazi podataka ";
+$UpdateQuestionType = "Ažuriraj vrstu pitanja : ";
+$AddAnotherQuestion = "Dodaj novo pitanje ";
+$IsShareSurvey = "Podijeli anketu sa ostalima ";
+$Proceed = "Nastavi ";
+$PleaseFillNumber = "Molim ispunite numeri&#269;ku vrijednost za bodove. ";
+$PleaseFillAllPoints = "Molim ispunite bodove u intervalu 1-5 ";
+$PleasFillAllAnswer = "Molim ispunite sva polja za odgovor. ";
+$PleaseSelectFourTrue = "Molimo Vas da izaberete najmanje &#269;etiri prava odgovora.";
+$PleaseSelectFourDefault = "Molimo Vas da izaberete najmanje &#269;etiri neta&#269;na odgovora.";
+$PleaseFillDefaultText = "Molimo Vas da popunite podrazumevani tekst";
+$ModifySurveyInformation = "Promijeni informaciju o anketi ";
+$ViewQuestions = "Pogledaj pitanja ";
+$CreateSurvey = "Napravi anketu ";
+$FinishSurvey = "Završi anketu ";
+$QuestionsAdded = "Pitanja su dodana ";
+$DeleteSurvey = "Obriši anketu ";
+$SurveyCode = "Šifra ankete ";
+$SurveyList = "Lista anketa ";
+$SurveyAttached = "Anketa priložena";
+$QuestionByType = "Pitanje po vrsti ";
+$SelectQuestionByType = "Odaberi pitanje prema vrsti ";
+$PleaseEnterAQuestion = "Molimo Vas da unesete pitanje";
+$NoOfQuestions = "Broj pitanja ";
+$Question = "Pitanje";
+$ThisCodeAlradyExists = "Ova šifra ve&#263; postoji ";
+$SaveAndExit = "Sa&#269;uvaj i iza&#273;i";
+$ViewAnswers = "Pogledaj odgovore ";
+$CreateExistingSurvey = "Napravi od postoje&#263;e ankete";
+$SurveyName = "Naziv ankete ";
+$SurveySubTitle = "Podnaslov ankete ";
+$ShareSurvey = "Zajedni&#269;ka anketa ";
+$SurveyThanks = "Zahvala za sudjelovanje ";
+$EditSurvey = "Uredi anketu ";
+$OrReturnToSurveyOverview = "Ili povratak na pregled ankete ";
+$SurveyParametersMissingUseCopyPaste = "Nedostaje parametar u linku. Molimo Vas da koristite opciju kopiraj i zalijepi ";
+$WrongInvitationCode = "Pogrešna pozivna šifra";
+$SurveyFinished = "Završili ste anketu. ";
+$SurveyPreview = "Pregled ankete ";
+$InvallidSurvey = "Pogrešna anketa ";
+$AddQuestion = "Dodaj pitanje ";
+$EditQuestion = "Uredi pitanje ";
+$TypeDoesNotExist = "Ovaj tip ne postoji";
+$SurveyCreatedSuccesfully = "Anketa je uspješno napravljena ";
+$YouCanNowAddQuestionToYourSurvey = "Sada možete da dodate na svoja pitanja u anketu";
+$SurveyUpdatedSuccesfully = "Anketa je uspješno ažurirana ";
+$QuestionAdded = "Pitanje je dodano. ";
+$QuestionUpdated = "Pitanje je ažurirano. ";
+$RemoveAnswer = "Ukloni opciju";
+$AddAnswer = "Dodaj opciju";
+$DisplayAnswersHorVert = "Prikaži mogu&#263;nosti ";
+$AnswerOptions = "Mogu&#263;nosti odgovora ";
+$YesNo = "Da / Ne ";
+$MultipleResponse = "Višestruki odgovori ";
+$Open = "Otvori ";
+$Dropdown = "Dropdoun";
+$Pagebreak = "Kraj strane (odvojena pitanja)";
+$QuestionNumber = "Pitanje broj ";
+$NumberOfOptions = "Broj mogu&#263;nosti ";
+$SurveyInvitations = "Poziv za ispunjavanje ankete ";
+$InvitationCode = "Šifra ankete ";
+$InvitationDate = "Datum poziva";
+$Answered = "Odgovoreno ";
+$AdditonalUsersComment = "Možete pozvati dodatne korisnike da ispune anketu. Upišite ovdje njihove mail adrese me&#273;usobno odvojene sa , ili ;";
+$MailTitle = "Naslov e-pošte ";
+$InvitationsSend = "pozivnice poslate.";
+$SurveyDeleted = "Anketa je obrisana. ";
+$NoSurveysSelected = "Nije odabrana niti jedna anketa. ";
+$NumberOfQuestions = "Broj pitanja ";
+$Invited = "Pozvani ";
+$SubmitQuestionFilter = "Filter";
+$ResetQuestionFilter = "Poništi filter pitanja ";
+$ExportCurrentReport = "Izvoz trenutnog izveštaja";
+$OnlyQuestionsWithPredefinedAnswers = "Samo pitanja sa definiranim odgovorima se mogu upotrijebiti ";
+$SelectXAxis = "Izaberi pitanje na X osi ";
+$SelectYAxis = "Izaberi pitanje na Y osi ";
+$ComparativeReport = "Komparativni izveštaj";
+$AllQuestionsOnOnePage = "Sva pitanja su prikazana na jednoj stranici ";
+$SelectUser = "Izaberi korisnika ";
+$SelectUserWhoFilledSurvey = "Izaberi korisnika koji je ispunio anketu ";
+$userreport = "Korisni&#269;ki izvještaj ";
+$VisualRepresentation = "Graf";
+$AbsoluteTotal = "Apsolutno ukupno";
+$NextQuestion = "Sljede&#263;e pitanje ";
+$PreviousQuestion = "Prethodno pitanje";
+$PeopleWhoAnswered = "Osobe koje su izabrale ovaj odgovor ";
+$CourseUsers = "Polaznici kursa";
+$SurveyPublication = "Objavljivanje ankete ";
+$AdditonalUsers = "Dodatni korisnici ";
+$MailText = "E-mail poruka";
+$UseLinkSyntax = "Svaki izabrani korisnik &#263;e dobiti e-mail sa unešenim tekstom i jedinstveniim linkom koji mora odabrati da bi mogao ispuniti anketu. Ukoliko ništa ne napravite jedinstveni link &#263;e biti automatski dodan na kraj e-maila. Možete odrediti mjesto pojavljivanja linka na na&#269;in da u vašoj poruci napišete **link**. **link** &#263;e se automatski zamijeniti sa jedinstvenim linkom za svakog korisnika.";
+$DetailedReportByUser = "Detaljni izvještaj prema odabranom korisniku ";
+$DetailedReportByQuestion = "Detaljni izvještaj prema odabranom pitanju ";
+$ComparativeReportDetail = "U ovom izveštaJu možete uporediti dva pitanja.";
+$CompleteReportDetail = " U ovom izvještaju možete vidjeti pregled svih odgovora svih ispitanika na sva pitanja. Tako&#273;er imate opciju za odabir odre&#273;enog pitanja. Prenos rezulta u csv format (Excel) za statisti&#269;ku obradu je tako&#273;er opcionalan. ";
+$DetailedReportByUserDetail = "U ovom izvještaju možete vidjeti sve odgovore prema odabranom korisniku. ";
+$DetailedReportByQuestionDetail = "U ovom izvještaju možete vidjeti sve dane odgovore prema odabranom pitanju. Osnovna statisti&#269;ka analiza i grafi&#269;ki prikaz je omugu&#263;en ";
+$ReminderResendToAllUsers = "Podsjeti sve korisnike na anketu. Ukoliko ne odaberete ovu opciju samo novo dodani korisnici &#263;e dobiti obavijest putem e-maila. ";
+$Multiplechoice = "Višestruki izbor";
+$Multipleresponse = "Višestruki odgovori ";
+$Score = "Broj bodova ";
+$Shared = "Zajedni&#269;ki ";
+$Invite = "Pozovi ";
+$MaximumScore = "Maksimalni broj bodova ";
+$ViewInvited = "Pregled svih pozvanih ";
+$ViewAnswered = "Pogledaj koristnike koji su odgovorili";
+$ViewUnanswered = "Pogledaj koristnike koji nisu odgovorili";
+$DeleteSurveyQuestion = "Jeste li sigurni da želite obrisati pitanje? ";
+$YouAlreadyFilledThisSurvey = "Vi ste ve&#263; ispunili ovu anketu ";
+$ClickHereToAnswerTheSurvey = "Kliknite ovde da biste odgovorili na anketu";
+$OrCopyPasteTheFollowingUrl = "ili kopirajte i nalepite sledec&#769;i URL:";
+$UnknowUser = "Nepoznat korisnik ";
+$MoveDown = "Pomeri nadole";
+$MoveUp = "Pomeri gore";
+$HaveAnswered = "su odgovorili ";
+$WereInvited = "su pozvani ";
+$PagebreakNotFirst = "Prelom stranice ne može biti prvi";
+$PagebreakNotLast = "Prelom stranice ne može biti poslednji";
+$SurveyNotAvailableAnymore = "Nažalost, ova anketa nije dostupno više. Hvala Vam što ste pokušali.";
+$DuplicateSurvey = "Kopiraj anketu ";
+$EmptySurvey = "Isprazni anketu ";
+$SurveyEmptied = "Odgovori na anketu su obrisani ";
+$SurveyNotAvailableYet = "Ova anketa još uvek nije dostupna. Pokušajte ponovo kasnije. Hvala.";
+$PeopleAnswered = "osobe koje su odgovorile ";
+$AnonymousSurveyCannotKnowWhoAnswered = "Ova anketa je anonimna. Ne možete vidjeti tko je na nju odgovarao. ";
+$IllegalSurveyId = "Nepoznat ID ankete ";
+$SurveyQuestionMoved = "Pitanje je premešteno";
+$IdenticalSurveycodeWarning = "Ova šifra ankete ve&#263; postoji, što vjerojatno zna&#269;i da ova anketa ve&#263; postoji na drugim jezicima. Pozvani ispitanici &#263;e odabrati na kojem jeziku žele ispuniti anketu. ";
+$ThisSurveyCodeSoonExistsInThisLanguage = "Ova šifra ankete &#263;e uskoro postojati na odabranom jeziku ";
+$SurveyUserAnswersHaveBeenRemovedSuccessfully = "Odgovori korisnika na anketu su uspešno uklonjeni.";
+$DeleteSurveyByUser = "Obriši ove odgovore korisnika";
+$SelectType = "Izaberi tip";
+$Conditional = "Uslovno";
+$ParentSurvey = "Nadre&#273;ena anketa";
+$OneQuestionPerPage = "Jedno pitanje po stranici";
+$ActivateShuffle = "Omoguc&#769;i režim nasumi&#269;ne reprodukciJe";
+$ShowFormProfile = "Prikaži profil obrazac";
+$PersonalityQuestion = "Ure&#273;ivanje pitanja";
+$YouNeedToCreateGroups = "Potrebno je da napravite grupe";
+$ManageGroups = "Upravljanje grupama";
+$Create = "Kreiraj";
+$GroupCreatedSuccessfully = "Grupa je uspešno kreirana";
+$GroupNeedName = "Potrebno je ime gruoe";
+$Personality = "Personalizacija";
+$Condition = "Uslov";
+$Primary = "Primarno";
+$Secondary = "Sekundarno";
+$CourseSettings = "Podešavanje kursa";
+$PleaseChooseACondition = "Molimo izaberite uslov";
+$ChooseDifferentCategories = "Izabrati razli&#269;ite kategorije";
+$Version = "Verzija";
+$Normal = "Normalno";
+$AutoInviteLink = "Korisnici koji nisu pozvani mogu da koristite ovaj link do ankete:";
+$CompleteTheSurveysQuestions = "Kompletna anketna pitanja";
+$SurveysDeleted = "Ankete izbrisane";
+$RemindUnanswered = "Podseti samo korisnike koji nisu odgovorili";
+$ModifySurvey = "Izmeni anketu";
+$CreateQuestionSurvey = "Kreiraj pitanje";
+$ModifyQuestionSurvey = "Izmeni pitanje";
+$BackToSurvey = "Natrag na anketu";
+$UpdateInformation = "Ažuriraj informacije";
+$PleaseFillSurvey = "Molimo vas da popunite anketu";
+$ReportingOverview = "Pregled izveštavanja";
+$ThereAreNotQuestionsForthisSurvey = "Nema pitanja za ovu anketu";
 ?>

+ 41 - 0
main/lang/serbian/work.inc.php

@@ -29,21 +29,62 @@ $langCurrentDir = "teku&#263;i folder";
 $UploadADocument = "U&#269;itaj dokument";
 $EditToolOptions = "Izmeni opcije alata";
 $DocumentDeleted = "Dokument je obrisan";
+$SendMailBody = "Korisnik je objavio dokument u alatu Zadaci";
 $DirDelete = "Obriši direktorijum";
+$ValidateChanges = "Potvrdi izmjene ";
+$FolderUpdated = "Ažurirani direktorijum";
+$EndsAt = "Završava u potpunosti na ";
+$QualificationOfAssignment = "Bodovanje zadatka ";
+$MakeQualifiable = "Omogu&#263;i ocjenjivanje ";
+$QualificationNumberOver = "Rezultat ";
+$WeightInTheGradebook = "Težina u izvještaju spremnosti ";
+$DatesAvailables = "Raspoloživi datumi ";
+$ExpiresAt = "Zaklju&#269;no sa ";
 $AddToCalendar = "Dodaj u kalendar ";
 $DirectoryCreated = "Direktorijum je kreiran";
+$Assignment = "Zadaci ";
+$AdvancedParameters = "Napredne opcije ";
+$ExpiryDateToSendWorkIs = "Krajnji rok za izradu zadataka ";
+$EnableExpiryDate = "Omoguc&#769;i rok važenja";
+$EnableEndDate = "Omoguc&#769;i datum završetka";
+$IsNotPosibleSaveTheDocument = "Nemoguc&#769;e da sa&#269;uvate dokument";
+$EndDateCannotBeBeforeTheExpireDate = "Krajnji datum ne može biti pre datuma isteka";
+$SelectAFilter = "Izaberite filter";
+$FilterByNotExpired = "Filtriraj po nije istekao";
+$FilterAssignments = "Filtriraj zadatke";
+$WeightNecessary = "Minimalni potreban rezultat ";
+$QualificationOver = "Rezultat ";
+$ExpiryDateAlreadyPassed = "Datum isteka vec&#769; prošao";
+$EndDateAlreadyPassed = "Krajnji datum je vec&#769; prošao";
 $MoveXTo = "Premesti %s u ";
+$QualificationMustNotBeMoreThanQualificationOver = "Broj bodova ne može biti ve&#263;i od maksimalnog broja bodova ";
 $ModifyDirectory = "Potvrdi izmenu direktorijuma";
 $DeleteAllFiles = "Obriši sve dokumente";
 $BackToWorksList = "Povratak na popis zadataka ";
+$EditMedia = "Izmeni i oceni rad";
+$AllFilesInvisible = "Svi radovi su sada nevidljivi";
 $FileInvisible = "Datoteka je sakrivena ";
+$AllFilesVisible = "Svi radovi su sada vidljivi";
 $FileVisible = "Dokument je sad vidljiv";
+$ButtonCreateAssignment = "Kreiraj zadatak";
+$AssignmentName = "Ime zadatka";
 $CreateAssignment = "Kreirajte zadatak";
 $FolderEdited = "Direktorijum je promenjen";
 $UpdateWork = "Ažuriraj trenutni zadatak ";
 $MakeAllPapersInvisible = "Sakrij sve dokumente";
 $MakeAllPapersVisible = "Postavi sve dokumente da su vidljivi";
+$StudentAllowedToDeleteOwnPublication = "Dozvoli koristnicima da obrišu svoje publikacije";
 $TheDocumentHasBeenDeleted = "Dokument je obrisan";
 $YouAreNotAllowedToDeleteThisDocument = "Nemate autorizaciju da obrišete ovaj dokument";
 $ConfirmYourChoiceDeleteAllfiles = "Potvrdjivanjem vašeg izbora &#263;e obrisati sve fajlove i to ne&#263;e biti mogu&#263;e naknadno ispraviti";
+$WorkName = "Ime zadatka";
+$ReminderToSubmitPendingTask = "Molimo Vas da zapamtite da pošaljete zadatak";
+$MessageConfirmSendingOfTask = "Ovo je poruka koja potvr&#273;uje dobar prijem zadatka";
+$DataSent = "Podaci poslati ";
+$DownloadLink = "Download link ";
+$ViewUsersWithoutTask = "Nedostaje zadatak";
+$ViewUsersWithTask = "Fajl ve&#263; dostavljen ";
+$ReminderMessage = "Pošalji podsetnik";
+$DateSent = "Podaci poslati ";
+$ViewUsersWithoutTask = "Pogledaj korisnike bez zadatka ";
 ?>

+ 2 - 3
main/lang/spanish/exercice.inc.php

@@ -354,8 +354,7 @@ $ToContinueUseMenu = "Para continuar esta lecci
 $RandomAnswers = "Barajar respuestas";
 $NotMarkActivity = "No es posible calificar este elemento";
 $YouHaveToCreateAtLeastOneAnswer = "Tienes que crear al menos una respuesta";
-$YouHaveToCreateAtLeastOneAnswer = "Tienes que crear al menos una respuesta";
 $ExerciseAttempted = "Un estudiante ha contestado una pregunta";
-$MultipleSelectCombination = "Combinación de selección multiple";
-$MultipleAnswerCombination = "Combinación de respuesta multiple";
+$MultipleSelectCombination = "Combinación exacta";
+$MultipleAnswerCombination = "Combinación exacta";
 ?>

+ 2 - 0
main/lang/spanish/trad4all.inc.php

@@ -773,4 +773,6 @@ $LastUpdate = "
 $UserNonRegisteredAtTheCourse = "Usuario no registrado en el curso";
 $EditMyProfile = "Editar mi perfil";
 $Announcements = "Anuncios";
+$Username = "Usuario";
+$Password = "Contraseña";
 ?>

+ 10 - 11
main/lang/spanish/userInfo.inc.php

@@ -107,8 +107,8 @@ $GroupPermissions = "Permiso de grupo";
 $Closed = "Cerrado";
 $AddGroup = "Agregar grupo";
 $Privacy = "Privacidad";
-$ThisIsAnOpenGroup = "Este es un grupo abierto";
-$YouShouldCreateATopic = "Ud. deberia crear un tema";
+$ThisIsAnOpenGroup = "Grupo abierto";
+$YouShouldCreateATopic = "Debería crear un tema";
 $IamAnAdmin = "Yo soy un administrador";
 $NewTopic = "Nuevo tema";
 $MessageList = "Lista de mensajes";
@@ -135,13 +135,13 @@ $Moderator = "Moderador";
 $DeleteModerator = "Eliminar moderador";
 $UserChangeToModerator = "Usuario cambiado a moderador";
 $IamAModerator = "Yo soy un moderador";
-$ThisIsACloseGroup = "Este es un grupo cerrado";
+$ThisIsACloseGroup = "Grupo privado";
 $IamAReader = "Yo soy un lector";
 $UserChangeToReader = "Usuario cambiado a lector";
 $AddModerator = "Agregar moderador";
 $UserDeleted = "Usuario eliminado";
 $JoinGroup = "Unirse al grupo";
-$YouShouldJoinTheGroup = "Ud. deberia unirse al grupo";
+$YouShouldJoinTheGroup = "Debería unirse al grupo";
 $WaitingForAdminResponse = "Esperando a que el admin responda";
 $Member = "Miembro";
 $Re = "Re";
@@ -155,7 +155,7 @@ $DenyInvitation = "Rechazar invitaci
 $AcceptInvitation = "Aceptar invitación";
 $GroupsWaitingApproval = "Grupos esperando ser aprobado";
 $GroupInvitationWasDeny = "Invitación de grupo fue rechazada";
-$UserIsSubscribedToThisGroup = "Usuario se inscribió en el grupo";
+$UserIsSubscribedToThisGroup = "Ahora ya forma parte del grupo";
 $DeleteFromGroup = "Eliminar de grupo";
 $GroupMembers = "Miembros del grupo";
 $Subscribe = "Inscribir";
@@ -168,8 +168,8 @@ $Me = "M
 $ReturnToOutbox = "Regresar a bandeja de salida";
 $EditNormalProfile = "Edición básica del perfil";
 $GroupPendingInvitations = "Invitaciones de grupo pendiente";
-$LeaveGroup = "Dejar grupo";
-$UserIsNotSubscribedToThisGroup = "Usuario no esta inscrito a este 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";
@@ -179,12 +179,11 @@ $UserAdded = "Usuario agregado";
 $FilesSizeExceedsX = "Tamaña del archivo excedido";
 $YouShouldWriteASubject = "Debe escribir el asunto";
 $Topics = "Temas";
-$StatusInThisGroup = "Estado en este grupo";
-$DescriptionGroup = "Descripción del grupo";
+$StatusInThisGroup = "Estatus en este grupo";
 $FriendsOnline = "Amigos en línea";
 $GroupDescription = "Descripción del grupo";
 $MyProductions = "Mis producciones";
-$YouHaveReceivedANewMessageInTheGroupX = "Usted ha recibido un nuevo mensaje en el grupo %s";
+$YouHaveReceivedANewMessageInTheGroupX = "Ha recibido un nuevo mensaje en el grupo %s";
 $ClickHereToSeeMessageGroup = "Clic aquí para ver el mensaje de grupo";
 $OrCopyPasteTheFollowingUrl = "O copiar y pegar la siguente url";
 $ThereIsANewMessageInTheGroupX = "Hay un nuevo mensaje en el grupo %s";
@@ -192,5 +191,5 @@ $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";
+$YouNeedToHaveFriendsInYourSocialNetwork = "Necesita tener amigos en su red social";
 ?>

+ 1 - 1
main/social/friends.php

@@ -172,7 +172,7 @@ if (count($friends) == 0 ) {
 									$user_name = api_xml_http_response_encode($friend['firstName'].' '.$friend['lastName']);
 									$friends_profile = SocialManager::get_picture_user($friend['friend_user_id'], $friend['image'], 92);
 									$friend_html.='<div onMouseover="show_icon_delete(this)" onMouseout="hide_icon_delete(this)" class="image-social-content" id=div_'.$friends[$j]['friend_user_id'].'>';
-									$friend_html.='<span><a href="profile.php?u='.$friend['friend_user_id'].'"><center><img src="'.$friends_profile['file'].'" style="width:60px;height:60px;border:3pt solid #eee" id="imgfriend_'.$friend['friend_user_id'].'" title="'.$user_name.'" /></center></a></span>';
+									$friend_html.='<span><a href="profile.php?u='.$friend['friend_user_id'].'"><center><img src="'.$friends_profile['file'].'" style="height:60px;border:3pt solid #eee" id="imgfriend_'.$friend['friend_user_id'].'" title="'.$user_name.'" /></center></a></span>';
 									$friend_html.='<img onclick="delete_friend (this)" id=img_'.$friend['friend_user_id'].' src="../img/blank.gif" alt="" title=""  class="image-delete" /> <center class="friend">'.$user_name.'</center></div>';				
 								}
 								$j++;

+ 74 - 32
user_portal.php

@@ -974,8 +974,8 @@ if (!empty ($_GET['include']) && preg_match('/^[a-zA-Z0-9_-]*\.html$/',$_GET['in
 }
 
 if (isset($_GET['history']) && intval($_GET['history']) == 1) {
-	echo '<h3>'.get_lang('HistoryTrainingSession').'</h3>';
-	if (count($courses_tree)==1){
+	echo '<h3>'.get_lang('HistoryTrainingSession').'</h3>';	
+	if (empty($courses_tree[0]['sessions'])){
 		echo get_lang('YouDoNotHaveAnySessionInItsHistory');
 	}
 }
@@ -1007,50 +1007,92 @@ if ( is_array($courses_tree) ) {
 
 			//independent sessions
 			foreach ($category['sessions'] as $session) {
+
 				//don't show empty sessions
-				if (count($session['courses'])<1) { continue; }
-				echo '<ul class="session_box">';
-					echo '<li class="session_box_title" id="session_'.$session['details']['id'].'" >';
-					echo Display::return_icon('div_hide.gif', get_lang('Expand').'/'.get_lang('Hide'), array('align' => 'absmiddle', 'id' => 'session_img_'.$session['details']['id'])) . ' ';
-					$s = get_session_title_box($session['details']['id']);
-					echo get_lang('SessionName') . ': ' . $s['title']. ' - '.(!empty($s['coach'])?$s['coach'].' - ':'').$s['dates'];
-					echo '</li>';
+				if (count($session['courses'])<1) { continue; }	
+										
 				//courses inside the current session
+				$date_session_start = $session['details']['date_start'];
+				$days_access_before_beginning  = ($session['details']['nb_days_access_before_beginning'])*24*3600;
+				$session_now = time();
+				$html_courses_session = '';
+				$count_courses_session = 0;
 				foreach ($session['courses'] as $course) {
-					$c = get_logged_user_course_html($course, $session['details']['id'], 'session_course_item');
-					echo $c[1];
+					$is_coach_course = api_is_coach($session['details']['id'],$course['code']); 					
+					if ($is_coach_course) {
+						$allowed_time = (strtotime($date_session_start)-$days_access_before_beginning);						 
+					} else {
+						$allowed_time = strtotime($date_session_start);
+					}
+					if ($session_now > $allowed_time) {
+						$c = get_logged_user_course_html($course, $session['details']['id'], 'session_course_item');
+						$html_courses_session .= $c[1];
+						$count_courses_session++;		
+					}
 				}
-				echo '</ul>';
+							
+				if ($count_courses_session > 0) {
+					echo '<ul class="session_box">';
+						echo '<li class="session_box_title" id="session_'.$session['details']['id'].'" >';
+						echo Display::return_icon('div_hide.gif', get_lang('Expand').'/'.get_lang('Hide'), array('align' => 'absmiddle', 'id' => 'session_img_'.$session['details']['id'])) . ' ';
+						$s = get_session_title_box($session['details']['id']);
+						echo get_lang('SessionName') . ': ' . $s['title']. ' - '.(!empty($s['coach'])?$s['coach'].' - ':'').$s['dates'];
+						echo '</li>';
+					    echo $html_courses_session;
+					echo '</ul>';
+				}											
 			}
 
 		} else {
+							
 			// all sessions included in
 			if (!empty($category['details'])) {
-				echo '<div class="session_category" id="session_category_'.$category['details']['id'].'" style="background-color:#fbfbfb; border:1px solid #dddddd; padding:5px; margin-top: 10px;">';
-				echo '<div class="session_category_title_box" id="session_category_title_box_'.$category['details']['id'].'" style="font-size:larger; color: #555555;">'. Display::return_icon('div_hide.gif', get_lang('Expand').'/'.get_lang('Hide'), array('align' => 'absmiddle', 'id' => 'category_img_'.$category['details']['id'])) . ' ' . get_lang('SessionCategory') . ': ' . $category['details']['name'].'  -  '.get_lang('From').' '.$category['details']['date_start'].' '.get_lang('Until').' '.$category['details']['date_end'].'</div>';
-
+				$count_courses_session = 0;
+				$html_sessions = '';
 				foreach ($category['sessions'] as $session) {
 					//don't show empty sessions
-					if (count($session['courses'])<1) { continue; }
-					echo '<ul class="session_box" id="session_'.$session['details']['id'].'">';
-					echo '<li class="session_box_title" id="session_'.$session['details']['id'].'">';
-					echo Display::return_icon('div_hide.gif', get_lang('Expand').'/'.get_lang('Hide'), array('align' => 'absmiddle', 'id' => 'session_img_'.$session['details']['id'])) . ' ';
-					$s = get_session_title_box($session['details']['id']);
-					echo get_lang('SessionName') . ': ' . $s['title']. ' - '.(!empty($s['coach'])?$s['coach'].' - ':'').$s['dates'];
-					echo '</li>';
-
+					if (count($session['courses'])<1) { continue; }					
+					$date_session_start = $session['details']['date_start'];
+					$days_access_before_beginning  = ($session['details']['nb_days_access_before_beginning'])*24*3600;
+					$session_now = time();
+					$html_courses_session = '';
+					$count = 0;
 					foreach ($session['courses'] as $course) {
-						//echo '<li class="session_course_item" id="session_course_item_'.$course['code'].'" style="padding:5px">';
-						$c = get_logged_user_course_html($course, $session['details']['id'], 'session_course_item');
-						echo $c[1];
-						//echo $course['code'];
-						//echo '</li>';
-					}
-					echo '</ul>';
+						$is_coach_course = api_is_coach($session['details']['id'],$course['code']); 					
+						if ($is_coach_course) {
+							$allowed_time = (strtotime($date_session_start)-$days_access_before_beginning);						 
+						} else {
+							$allowed_time = strtotime($date_session_start);
+						}
+						if ($session_now > $allowed_time) {
+							$c = get_logged_user_course_html($course, $session['details']['id'], 'session_course_item');
+							$html_courses_session .= $c[1];
+							$count_courses_session++;
+							$count++;		
+						}	
+					}	
+
+					if ($count > 0) {
+						$s = get_session_title_box($session['details']['id']);
+						$html_sessions .= '<ul class="session_box" id="session_'.$session['details']['id'].'">';
+						$html_sessions .= '<li class="session_box_title" id="session_'.$session['details']['id'].'">';
+						$html_sessions .= Display::return_icon('div_hide.gif', get_lang('Expand').'/'.get_lang('Hide'), array('align' => 'absmiddle', 'id' => 'session_img_'.$session['details']['id'])) . ' ';					
+						$html_sessions .= get_lang('SessionName') . ': ' . $s['title']. ' - '.(!empty($s['coach'])?$s['coach'].' - ':'').$s['dates'];
+						$html_sessions .= '</li>';
+						$html_sessions .= $html_courses_session;
+						$html_sessions .= '</ul>';
+					}								
 				}
-				echo '</div>';
+					
+				if ($count_courses_session > 0) {
+					echo '<div class="session_category" id="session_category_'.$category['details']['id'].'" style="background-color:#fbfbfb; border:1px solid #dddddd; padding:5px; margin-top: 10px;">';
+					echo '<div class="session_category_title_box" id="session_category_title_box_'.$category['details']['id'].'" style="font-size:larger; color: #555555;">'. Display::return_icon('div_hide.gif', get_lang('Expand').'/'.get_lang('Hide'), array('align' => 'absmiddle', 'id' => 'category_img_'.$category['details']['id'])) . ' ' . get_lang('SessionCategory') . ': ' . $category['details']['name'].'  -  '.get_lang('From').' '.$category['details']['date_start'].' '.get_lang('Until').' '.$category['details']['date_end'].'</div>';														
+					echo $html_sessions;						
+					echo '</div>';
+				}				
 			}
-
+			
+			
 		}
 	}
 }