From ed48be9f53913c46599e13b94bd6c10c9e132cf4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Tue, 31 Jan 2017 00:48:33 +0100 Subject: [PATCH] Version 16.132.7 --- swad_changelog.h | 5 +++-- swad_enrollment.c | 10 ++++++++-- swad_text.c | 21 --------------------- 3 files changed, 11 insertions(+), 25 deletions(-) diff --git a/swad_changelog.h b/swad_changelog.h index 1d549947f..ef0f19334 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -191,14 +191,15 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 16.132.6 (2017-01-31)" +#define Log_PLATFORM_VERSION "SWAD 16.132.7 (2017-01-31)" #define CSS_FILE "swad16.132.4.css" #define JS_FILE "swad16.123.js" // Number of lines (includes comments but not blank lines) has been got with the following command: // nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*?.h sql/swad*.sql | tail -1 /* - Version 16.132.6: Jan 31, 2017 Help on adminitration of students. (211895 lines) + Version 16.132.7: Jan 31, 2017 Changes in layout of removal of all students in a course. (211880 lines) + Version 16.132.6: Jan 31, 2017 Help on administration of students. (211895 lines) Version 16.132.5: Jan 30, 2017 Fixed bug in checking consent on dangerous action. (211888 lines) Version 16.132.4: Jan 30, 2017 Changes in connected users. (211887 lines) Version 16.132.3: Jan 30, 2017 Code refactoring in connected users. (211881 lines) diff --git a/swad_enrollment.c b/swad_enrollment.c index 822616e87..64e9293a3 100644 --- a/swad_enrollment.c +++ b/swad_enrollment.c @@ -1720,11 +1720,14 @@ static void Enr_PutLinkToRemAllStdsThisCrs (void) void Enr_AskRemAllStdsThisCrs (void) { + extern const char *Txt_Remove_all_students; extern const char *Txt_Do_you_really_want_to_remove_the_X_students_from_the_course_Y_; - extern const char *Txt_Remove_students; extern const char *Txt_No_users_found[Rol_NUM_ROLES]; unsigned NumStds; + /***** Start frame *****/ + Lay_StartRoundFrame (NULL,Txt_Remove_all_students,NULL,NULL); + if ((NumStds = Usr_GetNumUsrsInCrs (Rol_STUDENT,Gbl.CurrentCrs.Crs.CrsCod))) { /***** Write message to confirm the removing *****/ @@ -1736,7 +1739,7 @@ void Enr_AskRemAllStdsThisCrs (void) Act_FormStart (ActRemAllStdCrs); Grp_PutParamAllGroups (); Pwd_AskForConfirmationOnDangerousAction (); - Lay_PutRemoveButton (Txt_Remove_students); + Lay_PutRemoveButton (Txt_Remove_all_students); Act_FormEnd (); } else @@ -1745,6 +1748,9 @@ void Enr_AskRemAllStdsThisCrs (void) Gbl.CurrentCrs.Crs.FullName); Lay_ShowAlert (Lay_INFO,Gbl.Message); } + + /***** End frame *****/ + Lay_EndRoundFrame (); } /*****************************************************************************/ diff --git a/swad_text.c b/swad_text.c index 0b8982ba1..527af48c1 100644 --- a/swad_text.c +++ b/swad_text.c @@ -31180,27 +31180,6 @@ const char *Txt_Remove_record_field = "Remover campo de cartão"; #endif -const char *Txt_Remove_students = -#if L==1 - "Eliminar estudiants"; -#elif L==2 - "Entfernen Studenten"; -#elif L==3 - "Remove students"; -#elif L==4 - "Eliminar estudiantes"; -#elif L==5 - "Enlever étudiants"; -#elif L==6 - "Eliminar estudiantes"; // Okoteve traducción -#elif L==7 - "Rimuovere studenti"; -#elif L==8 - "Usuń studentów"; -#elif L==9 - "Tirar estudantes"; -#endif - const char *Txt_Remove_survey = #if L==1 "Eliminar encuesta"; // Necessita traduccio