diff --git a/main/admin/add_sessions_to_usergroup.php b/main/admin/add_sessions_to_usergroup.php index c6d2854bb7..708cca4a51 100644 --- a/main/admin/add_sessions_to_usergroup.php +++ b/main/admin/add_sessions_to_usergroup.php @@ -179,7 +179,7 @@ if ($add_type == 'multiple') { } echo '
'; -echo ''.Display::return_icon('back.png',get_lang('Back')).get_lang('Back').''; +echo ''.Display::return_icon('back.png',get_lang('Back'),'','32').''; echo '
'; echo '
'.$tool_name.' '.$data['name'].'

'; ?> diff --git a/main/admin/usergroups.php b/main/admin/usergroups.php index 2385833b68..d4a304f55f 100644 --- a/main/admin/usergroups.php +++ b/main/admin/usergroups.php @@ -69,9 +69,9 @@ $extra_params['height'] = 'auto'; //With this function we can add actions to the jgrid $action_links = 'function action_formatter (cellvalue, options, rowObject) { - return \'' - .' ' - .' ' + return \'' + .' ' + .' ' .' ' .' \'; }'; diff --git a/main/img/icons/22/course_to_class.png b/main/img/icons/22/course_to_class.png new file mode 100644 index 0000000000..eeda2ed8ee Binary files /dev/null and b/main/img/icons/22/course_to_class.png differ diff --git a/main/img/icons/22/sessions_to_class.png b/main/img/icons/22/sessions_to_class.png new file mode 100644 index 0000000000..5977b0aef3 Binary files /dev/null and b/main/img/icons/22/sessions_to_class.png differ diff --git a/main/img/icons/22/user_to_class.png b/main/img/icons/22/user_to_class.png new file mode 100644 index 0000000000..893d40cdc3 Binary files /dev/null and b/main/img/icons/22/user_to_class.png differ diff --git a/main/img/icons/32/class.png b/main/img/icons/32/class.png new file mode 100644 index 0000000000..1f83b91d07 Binary files /dev/null and b/main/img/icons/32/class.png differ diff --git a/main/img/icons/32/new_class.png b/main/img/icons/32/new_class.png new file mode 100644 index 0000000000..73703f29b6 Binary files /dev/null and b/main/img/icons/32/new_class.png differ diff --git a/main/img/icons/48/_sum.txt b/main/img/icons/48/_sum.txt index 8353672067..d5b998ba86 100644 --- a/main/img/icons/48/_sum.txt +++ b/main/img/icons/48/_sum.txt @@ -210,6 +210,11 @@ new_career modif gnome career gnome session_to_promotion modif nuvola courses_to_session modif nuvola +class modif mix gnome nuvola +new_class modif mix gnome nuvola +user_to_class modif mix gnome nuvola +session_to_class modif mix gnome nuvola +course_to_class modif mix gnome nuvola --julio star diff --git a/main/img/icons/48/class.png b/main/img/icons/48/class.png new file mode 100644 index 0000000000..cc87991a17 Binary files /dev/null and b/main/img/icons/48/class.png differ diff --git a/main/img/icons/48/course_to_class.png b/main/img/icons/48/course_to_class.png new file mode 100644 index 0000000000..461dee7114 Binary files /dev/null and b/main/img/icons/48/course_to_class.png differ diff --git a/main/img/icons/48/new_class.png b/main/img/icons/48/new_class.png new file mode 100644 index 0000000000..b410f911d6 Binary files /dev/null and b/main/img/icons/48/new_class.png differ diff --git a/main/img/icons/48/sessions_to_class.png b/main/img/icons/48/sessions_to_class.png new file mode 100644 index 0000000000..a145294803 Binary files /dev/null and b/main/img/icons/48/sessions_to_class.png differ diff --git a/main/img/icons/48/user_to_class.png b/main/img/icons/48/user_to_class.png new file mode 100644 index 0000000000..a7b612a552 Binary files /dev/null and b/main/img/icons/48/user_to_class.png differ diff --git a/main/inc/lib/usergroup.lib.php b/main/inc/lib/usergroup.lib.php index 514e95b229..777f7f9b53 100644 --- a/main/inc/lib/usergroup.lib.php +++ b/main/inc/lib/usergroup.lib.php @@ -29,7 +29,7 @@ class UserGroup extends Model { echo '
'; echo ''.Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('PlatformAdmin'),'','32').''; //echo ''.Display::return_icon('back.png',get_lang('Back')).get_lang('Back').''; - echo ''.Display::return_icon('filenew.gif',get_lang('Add')).get_lang('Add').''; + echo ''.Display::return_icon('new_class.png',get_lang('langAddClasses'),'','32').''; echo '
'; echo Display::grid_html('usergroups'); } diff --git a/main/lang/english/exercice.inc.php b/main/lang/english/exercice.inc.php index 00bda85868..82f6dd0932 100644 --- a/main/lang/english/exercice.inc.php +++ b/main/lang/english/exercice.inc.php @@ -377,4 +377,5 @@ $False = "False"; $DoubtScore = "Don't know"; $PropagateNegativeResults = "Propagate negative results between questions"; $InsertALinkToThisQuestionInTheExercise = "Use this question in the test as a link (not a copy)"; +$OnlyShowScore = "Show the score only"; ?> \ No newline at end of file diff --git a/main/lang/english/tracking.inc.php b/main/lang/english/tracking.inc.php index b05f450241..aedb26e709 100644 --- a/main/lang/english/tracking.inc.php +++ b/main/lang/english/tracking.inc.php @@ -290,4 +290,7 @@ $LPProgress = "Learning path progress"; $Ranking = "Ranking"; $BestResultInCourse = "Best result in course"; $ExerciseStartDate = "Publication date"; +$OnlyBestResultsPerStudent = "In case of multiple attempts, only shows the best result of each student"; +$BestAttempt = "Best attempt"; +$ExercisesInTimeProgressChart = "Progress of own exercises results over time, against learners average"; ?> \ No newline at end of file diff --git a/main/lang/english/userInfo.inc.php b/main/lang/english/userInfo.inc.php index 473e132603..c81252365d 100644 --- a/main/lang/english/userInfo.inc.php +++ b/main/lang/english/userInfo.inc.php @@ -198,4 +198,5 @@ $MyFiles = "My files"; $MySocialGroups = "My social groups"; $SocialGroups = "Social groups"; $CreateASocialGroup = "Create a social group"; +$EditMembersList = "Edit members list"; ?> \ No newline at end of file diff --git a/main/lang/french/exercice.inc.php b/main/lang/french/exercice.inc.php index 9b11ffbcd2..bada44a1d5 100644 --- a/main/lang/french/exercice.inc.php +++ b/main/lang/french/exercice.inc.php @@ -377,4 +377,5 @@ $False = "Faux"; $DoubtScore = "Ne sais pas"; $PropagateNegativeResults = "Propager les résultats négatifs entre les questions"; $InsertALinkToThisQuestionInTheExercise = "Insérer cette question dans l'exercice comme un lien (pas une copie)"; +$OnlyShowScore = "Montrer le score uniquement"; ?> \ No newline at end of file diff --git a/main/lang/french/tracking.inc.php b/main/lang/french/tracking.inc.php index cb61c2e866..7b7815be9e 100644 --- a/main/lang/french/tracking.inc.php +++ b/main/lang/french/tracking.inc.php @@ -291,4 +291,7 @@ $LPProgress = "Progrès parcours"; $Ranking = "Position"; $BestResultInCourse = "Meilleur résultat cours"; $ExerciseStartDate = "Date publication"; +$OnlyBestResultsPerStudent = "En cas de tentatives multiples, montre seulement le meilleur résultat de chaque étudiant"; +$BestAttempt = "Meilleure tentative"; +$ExercisesInTimeProgressChart = "Progrès des résultats aux exercices, face au résultat moyen des apprenants"; ?> \ No newline at end of file diff --git a/main/lang/french/trad4all.inc.php b/main/lang/french/trad4all.inc.php index 8f33c5d374..1d8204e452 100644 --- a/main/lang/french/trad4all.inc.php +++ b/main/lang/french/trad4all.inc.php @@ -1010,4 +1010,6 @@ $ItemUpdated = "Élément mis à jour"; $ItemCopied = "Élément copié"; $MyStatistics = "Mes statistiques"; $FromDateXToDateY = "Du %s au %s"; +$CourseThematicAdvance = "Journal de classe"; +$Clean = "Nettoyer"; ?> \ No newline at end of file diff --git a/main/lang/french/userInfo.inc.php b/main/lang/french/userInfo.inc.php index dfb1e90839..112f57f905 100644 --- a/main/lang/french/userInfo.inc.php +++ b/main/lang/french/userInfo.inc.php @@ -198,4 +198,5 @@ $MyFiles = "Mes fichiers"; $MySocialGroups = "Mes groupes sociaux"; $SocialGroups = "Groupes sociaux"; $CreateASocialGroup = "Créer un groupe social"; +$EditMembersList = "Éditer liste de membres"; ?> \ No newline at end of file diff --git a/main/lang/spanish/admin.inc.php b/main/lang/spanish/admin.inc.php index 4ee8ce4915..987a75f330 100644 --- a/main/lang/spanish/admin.inc.php +++ b/main/lang/spanish/admin.inc.php @@ -94,7 +94,7 @@ $langImportUserListXMLCSV = "Importar usuarios desde un fichero XML/CSV"; $langExportUserListXMLCSV = "Exportar usuarios a un fichero XML/CSV"; $langOnlyUsersFromCourse = "Sólo usuarios del curso"; $langAddClassesToACourse = "Añadir clases a un curso"; -$langAddUsersToACourse = "Añadir usuarios a un curso"; +$langAddUsersToACourse = "Inscribir usuarios en un curso"; $langAddUsersToAClass = "Importar usuarios a una clase desde un fichero"; $langAddUsersToAGroup = "Añadir usuarios a un grupo"; $langAtLeastOneClassAndOneCourse = "¡ Debe seleccionar al menos una clase y un curso !"; @@ -1351,22 +1351,22 @@ $Promotions = "Promociones"; $Updated = "Actualización correcta"; $Career = "Carrera"; $SubscribeSessionsToPromotions = "Inscribirse en las sesiones de la promoción"; -$SessionsInPlatform = "Sesiones no inscritas"; +$SessionsInPlatform = "Sesiones no asociadas"; $FirstLetterSessions = "Primera letra del nombre de la sesión"; $SessionsInPromotion = "Sesiones en esta promoción"; $SubscribeSessionsToPromotion = "Subscribirse a sesiones de la promoción"; $NoEndTime = "Sin fecha de fin"; -$SubscribeUsersToGroup = "Inscribir usuarios en este grupo"; -$SubscribeCoursesToGroup = "Inscribir este grupo a cursos"; -$SubscribeSessionsToGroup = "Inscribir este grupo a sesiones"; -$SessionsInGroup = "Sesiones del grupo"; +$SubscribeUsersToGroup = "Inscribir usuarios en la clase"; +$SubscribeCoursesToGroup = "Asociar un curso a la clase"; +$SubscribeSessionsToGroup = "Asociar sesiones a la clase"; +$SessionsInGroup = "Sesiones de la clase"; $CoursesInGroup = "Cursos del grupo"; $UsersInGroup = "Uusuarios del grupo"; $UsersInPlatform = "Usuarios de la plataforma"; $YouNeedToCreateACareerFirst = "Se requiere que exista una carrera antes de poder añadir promociones (promociones son sub-elementos de una carrera)."; $OutputBufferingInfo = "El output buffering (o caché de salida) está a \"On\" cuando activado y a \"Off\" cuando desactivado. Este parámetro también puede ser activado a través de un valor entero (4096, por ejemplo) que suele ser le tamaño de la memoria caché de salida."; $LoadedExtension = "Extensión cargada"; -$SubscribeGroupToSessions = "Inscribir grupo en sesiones"; +$SubscribeGroupToSessions = "Asociar la clase a varias sesiones"; $SubscribeGroupToCourses = "Inscribir grupo en cursos"; $CompareStats = "Comparar estadísticas"; $EnabledPixlrTitle = "Activar los servicios externos de Pixlr"; @@ -1379,7 +1379,7 @@ $RegistrationByUsersGroups = "Inscripción por clases"; $FillCourses = "Generar cursos"; $FillSessions = "Generar sesiones"; $Archived = "Archivada"; -$Unarchived = "Desarchivada"; +$Unarchived = "Sin archivar"; $StatsUsersDidNotLoginInLastPeriods = "No conectados por un tiempo"; $LastXMonths = "Últimos %i meses"; $NeverConnected = "Nunca conectados"; diff --git a/main/lang/spanish/exercice.inc.php b/main/lang/spanish/exercice.inc.php index 77e993640f..1b2b4624c0 100644 --- a/main/lang/spanish/exercice.inc.php +++ b/main/lang/spanish/exercice.inc.php @@ -377,4 +377,5 @@ $False = "Falso"; $DoubtScore = "No se"; $PropagateNegativeResults = "Propagar los resultados negativos entre preguntas"; $InsertALinkToThisQuestionInTheExercise = "Insertar esta pregunta en el ejercicio como un vínculo (no una copia)"; +$OnlyShowScore = "Mostrar solo el resultado"; ?> \ No newline at end of file diff --git a/main/lang/spanish/tracking.inc.php b/main/lang/spanish/tracking.inc.php index e3db13d51e..5a68667f9d 100644 --- a/main/lang/spanish/tracking.inc.php +++ b/main/lang/spanish/tracking.inc.php @@ -285,10 +285,13 @@ $LastConnexionDate = "Fecha de la última conexión"; $QuestionsAreTakenFromLPExercises = "Estas preguntas han sido tomadas en las lecciones"; $AllStudentsAttemptsAreConsidered = "Todos los intentos de los estudiantes son tomados en cuenta"; $PublishedExercises = "Ejercicios disponibles"; -$DoneExercises = "Ejercicios tomados"; +$DoneExercises = "Ejercicios realizados"; $AverageExerciseResult = "Resultados promedios ejercicio"; $LPProgress = "Progreso de lecciones"; $Ranking = "Clasificación"; $BestResultInCourse = "Mejor resultado del curso"; $ExerciseStartDate = "Fecha publicación"; +$OnlyBestResultsPerStudent = "En caso de intentos múltiples, solo muestra el mejor resultado por alumno"; +$BestAttempt = "Mejor intento"; +$ExercisesInTimeProgressChart = "Progreso de resultados de ejercicios propios en el tiempo frente al promedio de alumnos"; ?> \ No newline at end of file diff --git a/main/lang/spanish/trad4all.inc.php b/main/lang/spanish/trad4all.inc.php index 821d580b35..b2505ad64e 100644 --- a/main/lang/spanish/trad4all.inc.php +++ b/main/lang/spanish/trad4all.inc.php @@ -956,12 +956,12 @@ $EditionNotAvailableFromSession = "No es posible editar este recurso de curso de $HandingOverOfTaskX = "Entrega de tarea %s"; $ProtectedDocument = "Documento protegido"; $ConnectionsLastMonth = "Connexiones el mes pasado"; -$TotalStudents = "Alumnos totales"; +$TotalStudents = "Alumnos"; $FilteringWithScoreX = "Filtrando con resultado %s"; -$ExamTaken = "Tomado"; -$ExamNotTaken = "No tomado"; -$ExamPassX = "Aprobado con mínimo de %s"; -$ExamFail = "Reprobado"; +$ExamTaken = "Hecho"; +$ExamNotTaken = "Sin hacer"; +$ExamPassX = "Aprobados con un mínimo de %s"; +$ExamFail = "Suspensos"; $ExamTracking = "Seguimiento exámenes"; $NoAttempt = "Sin intentar"; $PassExam = "Aprobado"; diff --git a/main/lang/spanish/userInfo.inc.php b/main/lang/spanish/userInfo.inc.php index 2471fd83ff..838510bdd3 100644 --- a/main/lang/spanish/userInfo.inc.php +++ b/main/lang/spanish/userInfo.inc.php @@ -198,4 +198,5 @@ $MyFiles = "Mis archivos"; $MySocialGroups = "Mis grupos sociales"; $SocialGroups = "Grupos sociales"; $CreateASocialGroup = "Crear un grupo social"; +$EditMembersList = "Editar lista de miembros"; ?> \ No newline at end of file