From 8635715235fc2a5df4624e8a9e551e74515d727a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Wed, 7 Oct 2015 23:03:30 +0200 Subject: [PATCH] Version 15.10.4 --- swad_changelog.h | 3 ++- swad_course.c | 16 +++++++++++----- swad_text.c | 21 +++++++++++++++++++++ 3 files changed, 34 insertions(+), 6 deletions(-) diff --git a/swad_changelog.h b/swad_changelog.h index f9d6d3a05..6415a076b 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -98,13 +98,14 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 15.10.3 (2015/10/07)" +#define Log_PLATFORM_VERSION "SWAD 15.10.4 (2015/10/07)" // 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 /* TODO: If photo zoom is out of the screen at left, put on right + Version 15.10.4: Oct 07, 2015 Change in layout of removal of old courses. (185665 lines) Version 15.10.3: Oct 07, 2015 New contextual link in visits to last clicks. (185641 lines) Version 15.10.2: Oct 07, 2015 Fixed bug in nicknames, reported by Javier Fdez. Baldomero. New MIME type, suggested by Javier Fdez. Baldomero. diff --git a/swad_course.c b/swad_course.c index 88b92b1d1..d567a915b 100644 --- a/swad_course.c +++ b/swad_course.c @@ -3412,15 +3412,20 @@ void Crs_UpdateCrsLast (void) void Crs_AskRemoveOldCrss (void) { extern const char *The_ClassForm[The_NUM_THEMES]; + extern const char *Txt_Eliminate_old_courses; extern const char *Txt_Eliminate_all_courses_whithout_users_PART_1_OF_2; extern const char *Txt_Eliminate_all_courses_whithout_users_PART_2_OF_2; extern const char *Txt_Eliminate; unsigned MonthsWithoutAccess = Crs_DEF_MONTHS_WITHOUT_ACCESS_TO_REMOVE_OLD_CRSS; unsigned i; - /***** Form to request number of months without clicks *****/ - fprintf (Gbl.F.Out,"
"); + /***** Start form *****/ Act_FormStart (ActRemOldCrs); + + /***** Start frame *****/ + Lay_StartRoundFrame (NULL,Txt_Eliminate_old_courses); + + /***** Form to request number of months without clicks *****/ fprintf (Gbl.F.Out,"%s ", The_ClassForm[Gbl.Prefs.Theme], Txt_Eliminate_all_courses_whithout_users_PART_1_OF_2); @@ -3441,10 +3446,11 @@ void Crs_AskRemoveOldCrss (void) Cfg_PLATFORM_SHORT_NAME); fprintf (Gbl.F.Out,""); - /***** Send button*****/ - Lay_PutRemoveButton (Txt_Eliminate); + /***** End frame *****/ + Lay_EndRoundFrameWithButton (Lay_REMOVE_BUTTON,Txt_Eliminate); + + /***** End form *****/ Act_FormEnd (); - fprintf (Gbl.F.Out,"
"); } /*****************************************************************************/ diff --git a/swad_text.c b/swad_text.c index b6cdee031..ac208e9de 100644 --- a/swad_text.c +++ b/swad_text.c @@ -9605,6 +9605,27 @@ const char *Txt_Eliminate_from_the_platform_the_users_indicated_in_step_1 = " os utilizadores que estão na lista"; #endif +const char *Txt_Eliminate_old_courses = +#if L==0 + "Eliminar assignatures antics"; +#elif L==1 + "Frühere Kursen entfernen"; +#elif L==2 + "Eliminate old courses"; +#elif L==3 + "Eliminar asignaturas antiguas"; +#elif L==4 + "Éliminer anciens matières"; +#elif L==5 + "Eliminar asignaturas antiguas"; // Okoteve traducción +#elif L==6 + "Rimuovere vecchi corsi"; +#elif L==7 + "Wyeleminuj starych kursów"; +#elif L==8 + "Eliminar antigas disciplinas"; +#endif + const char *Txt_Eliminating_X_courses_whithout_users_and_with_more_than_Y_months_without_access = // Warning: it is very important to include %lu and %u in the following sentences #if L==0 "Eliminando %lu asignatura(s) sin usuarios"