Browse Source

Merge branch 'aragonc-1.10.x' into 1.10.x

Yannick Warnier 9 years ago
parent
commit
087d559500

+ 17 - 0
app/Resources/public/css/base.css

@@ -6107,9 +6107,26 @@ div#chat-remote-video video {
   margin-left: auto;
   margin-right: auto;
 }
+
 #session-list .information-item{
   padding: 10px;
 }
+#session-list .information-item .requirements .fa-book{
+  margin-right: 10px;
+  color: #00829C;
+}
+#session-list .information-item .requirements{
+  color: #666666;
+  font-size: 12px;
+}
+#session-list .information-item .options .info-catalog{
+  background-color: #35A8C9;
+  color: #ffffff;
+  padding: 5px;
+  text-align: center;
+  border-radius: 5px;
+  font-size: 12px;
+}
 #session-list .author-session,
 #session-list .date-session{
   font-size: 12px;

+ 2 - 2
main/auth/courses_controller.php

@@ -526,9 +526,9 @@ class CoursesController
      */
     public function getAlreadyRegisteredInSessionLabel()
     {
-        $icon = Display::return_icon('students.gif', get_lang('Student'));
+        $icon = '<i class="fa fa-smile-o"></i>';
 
-        return Display::label($icon . ' ' . get_lang("AlreadyRegisteredToSession"), "info");
+        return Display::div($icon . ' ' . get_lang("AlreadyRegisteredToSession"),array('class'=>'info-catalog'));
     }
 
     /**

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

@@ -2979,6 +2979,7 @@ $Description = "Description";
 $Links = "Links";
 $Works = "Assignments";
 $Forums = "Forums";
+$GradebookListOfStudentsReports = "Students list report";
 $CreateDir = "Create folder";
 $Name = "Name";
 $Comment = "Comment";
@@ -7389,8 +7390,12 @@ $UntilDateX = "Until %s";
 $GraphDependencyTree = "Dependency tree";
 $CustomizeIcons = "Customize icons";
 $ExportAllToPDF = "Export all to PDF";
+$GradeGeneratedOnX = "Grade generated on %s";
 $ExerciseAvailableSinceX = "Exercise available since %s";
+$ExerciseIsActivatedFromXToY = "The test is enabled from %s to %s";
 $SelectSomeOptions = "Select some options";
 $AddCustomCourseIntro = "You may add an introduction to this course here by clicking the edition icon";
 $SocialGroup = "Social group";
+$RequiredSessions = "Required sessions";
+$DependentSessions = "Dependent sessions";
 ?>

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

@@ -2979,6 +2979,7 @@ $Description = "Descripción";
 $Links = "Enlaces";
 $Works = "Tareas";
 $Forums = "Foros";
+$GradebookListOfStudentsReports = "Reporte de lista de alumnos";
 $CreateDir = "Crear una carpeta";
 $Name = "Nombre";
 $Comment = "Comentarios";
@@ -7417,6 +7418,13 @@ $FromDateX = "Del %s";
 $UntilDateX = "Al %s";
 $GraphDependencyTree = "Árbol de dependencias";
 $CustomizeIcons = "Personalizar iconos";
+$ExportAllToPDF = "Exportar todo a PDF";
+$GradeGeneratedOnX = "Nota generada el %s";
+$ExerciseAvailableSinceX = "Ejercicio disponible desde el %s";
+$ExerciseIsActivatedFromXToY = "El ejercicio está habilitado del %s al %s";
+$SelectSomeOptions = "Seleccione alguna opción";
 $AddCustomCourseIntro = "Puede añadir una introducción a su curso en esta sección, dando clic en el icono de edición";
 $SocialGroup = "Grupo de red social";
+$RequiredSessions = "Sesiones requeridas";
+$DependentSessions = "Sesiones dependientes";
 ?>

+ 2 - 4
main/template/default/auth/session_catalog.tpl

@@ -105,8 +105,7 @@
                                 </ul>
                                 <div class="requirements">
                                     {% if session.requirements %}
-                                    <h4>{{ 'Requirements'|get_lang }}</h4>
-                                    <p>
+                                    <p><i class="fa fa-book"></i> {{ 'RequiredSessions'|get_lang }} :
                                         {% for requirement in session.requirements %}
                                         {{ requirement.name  }}
                                         {% endfor %}
@@ -114,8 +113,7 @@
                                     {% endif %}
 
                                     {% if session.dependencies %}
-                                    <h4>{{ 'Dependencies'|get_lang }}</h4>
-                                    <p>
+                                    <p> <i class="fa fa-book"></i> {{ 'DependentSessions'|get_lang }} :
                                         {% for dependency in session.dependencies %}
                                         {{ dependency.name  }}
                                         {% endfor %}