Fixed missing attendance terms for demo

main/admin/access_url_edit.php

@@ -79,11 +79,20 @@ $form->addElement('text','url',get_lang('URL'),array('size'=>'30'));
 $form->addRule('url', get_lang('ThisFieldIsRequired'), 'required');
 $form->addRule('url', '', 'maxlength',254);
 $form->addElement('textarea','description',get_lang('Description'));
+<<<<<<< /www/chamilodev.beeznest.com/www/main/admin/access_url_edit.php
+
+if ($_GET['url_id'] != 1) {
+$form->addElement('checkbox','active',get_lang('Active'));
+}
+
+//$form->addRule('checkbox', get_lang('ThisFieldIsRequired'), 'required');
+=======
 
 //the first url with id = 1 will be always active
 if ($_GET['url_id'] != 1) {
 	$form->addElement('checkbox','active',get_lang('Active'));
 }
+>>>>>>> /tmp/access_url_edit.php~other.zY-an1
 
 $defaults['url']='http://';
 $form->setDefaults($defaults);
@@ -121,4 +130,4 @@ if (isset ($_GET['action'])) {
 // Submit button
 $form->addElement('submit', 'submit', $submit_name);
 $form->display();
-?>
+?>

main/lang/english/trad4all.inc.php

@@ -803,4 +803,15 @@ $AssignUsers = "Assign users";
 $AssignCourses = "Assign courses";
 $AssignSessions = "Assign sessions";
 $Timezone = "Timezone";
+$Attendance = "Attendance";
+$CreateANewAttendance = "Create a new attendance list";
+$QualifyAttendanceGradebook = "Qualify the attendance list in the gradebook";
+$AttendanceCalendar = "Attendance calendar";
+$GoToAttendanceCalendar = "Ir al calendario de asistencias";
+$AttendanceSheet = "Attendance sheet";
+$AddDateAndTime = "Add a date and time";
+$CleanCalendar = "Clean the calendar of all lists";
+$AttendanceCalendarDescription = "The attendance calendar allows you to register attendance lists (one per real session the students need to attend). Add new attendance lists here.";
+$CalendarList = "Calendar list of attendances";
+$ThereAreNoRegisteredDatetimeYet = "There is no date/time registered yet";
 ?>

main/lang/spanish/trad4all.inc.php

@@ -803,4 +803,15 @@ $AssignUsers = "Asignar usuarios";
 $AssignCourses = "Asignar cursos";
 $AssignSessions = "Asignar sesiones de formación";
 $Timezone = "Zona horaria";
+$Attendance = "Asistencia";
+$CreateANewAttendance = "Crear una nueva lista de asistencias";
+$QualifyAttendanceGradebook = "Calificar la lista de asistencias";
+$AttendanceCalendar = "Calendario de asistencias";
+$GoToAttendanceCalendar = "Ir al calendario de asistencias para agregar fechas";
+$AttendanceSheet = "Hoja de asistencia";
+$AddDateAndTime = "Agregar fecha y hora";
+$CleanCalendar = "Limpiar calendario";
+$AttendanceCalendarDescription = "Descripción de calendario de asistencia";
+$CalendarList = "Lista de calendario";
+$ThereAreNoRegisteredDatetimeYet = "No hay fecha/hora registrada todavía";
 ?>

plugin/dashboard/block_teacher_graph/block_teacher_graph.class.php

@@ -202,4 +202,4 @@ class BlockTeacherGraph extends Block {
     
 }
 
-?>
+?>