diff --git a/swad_changelog.h b/swad_changelog.h index 6415a076b..6996b1c29 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -98,13 +98,14 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 15.10.4 (2015/10/07)" +#define Log_PLATFORM_VERSION "SWAD 15.10.5 (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.5: Oct 07, 2015 Change in layout of removal of old users. (185669 lines) 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. diff --git a/swad_enrollment.c b/swad_enrollment.c index 53f2bb987..38c749286 100644 --- a/swad_enrollment.c +++ b/swad_enrollment.c @@ -658,10 +658,10 @@ static void Enr_ShowFormRegRemSeveralUsrs (Rol_Role_t Role) void Enr_PutLinkToRemOldUsrs (void) { - extern const char *Txt_Remove_old_users; + extern const char *Txt_Eliminate_old_users; /***** Put form to remove old users *****/ - Act_PutContextualLink (ActReqRemOldUsr,NULL,"delon",Txt_Remove_old_users); + Act_PutContextualLink (ActReqRemOldUsr,NULL,"delon",Txt_Eliminate_old_users); } /*****************************************************************************/ @@ -671,15 +671,20 @@ void Enr_PutLinkToRemOldUsrs (void) void Enr_AskRemoveOldUsrs (void) { extern const char *The_ClassForm[The_NUM_THEMES]; + extern const char *Txt_Eliminate_old_users; extern const char *Txt_Eliminate_all_users_who_are_not_enrolled_on_any_courses_PART_1_OF_2; extern const char *Txt_Eliminate_all_users_who_are_not_enrolled_on_any_courses_PART_2_OF_2; extern const char *Txt_Eliminate; unsigned MonthsWithoutAccess = Usr_DEF_MONTHS_WITHOUT_ACCESS_TO_REMOVE_OLD_USRS; unsigned Months; - /***** Form to request number of months without clicks *****/ - fprintf (Gbl.F.Out,"
"); + /***** Start form *****/ Act_FormStart (ActRemOldUsr); + + /***** Start frame *****/ + Lay_StartRoundFrame (NULL,Txt_Eliminate_old_users); + + /***** Form to request number of months without clicks *****/ fprintf (Gbl.F.Out,"%s ", The_ClassForm[Gbl.Prefs.Theme], Txt_Eliminate_all_users_who_are_not_enrolled_on_any_courses_PART_1_OF_2); @@ -700,10 +705,11 @@ void Enr_AskRemoveOldUsrs (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 ac208e9de..330489e6f 100644 --- a/swad_text.c +++ b/swad_text.c @@ -9626,6 +9626,27 @@ const char *Txt_Eliminate_old_courses = "Eliminar antigas disciplinas"; #endif +const char *Txt_Eliminate_old_users = +#if L==0 + "Eliminar usuaris antics"; +#elif L==1 + "Frühere Benutzer entfernen"; +#elif L==2 + "Eliminate old users"; +#elif L==3 + "Eliminar usuarios antiguos"; +#elif L==4 + "Éliminer anciens utilisateurs"; +#elif L==5 + "Eliminar usuarios antiguos"; // Okoteve traducción +#elif L==6 + "Rimuovere vecchi utenti"; +#elif L==7 + "Usuń starych uzytkowników"; +#elif L==8 + "Eliminar antigos utilizadores"; +#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" @@ -28915,27 +28936,6 @@ const char *Txt_Remove_me_from_the_course_X = // Warning: it is very important t "Tirar me da disciplina %s"; #endif -const char *Txt_Remove_old_users = -#if L==0 - "Eliminar usuaris antics"; -#elif L==1 - "Frühere Benutzer entfernen"; -#elif L==2 - "Eliminate old users"; -#elif L==3 - "Eliminar usuarios antiguos"; -#elif L==4 - "Éliminer anciens utilisateurs"; -#elif L==5 - "Eliminar usuarios antiguos"; // Okoteve traducción -#elif L==6 - "Rimuovere vecchi utenti"; -#elif L==7 - "Usuń starych uzytkowników"; -#elif L==8 - "Eliminar antigos utilizadores"; -#endif - const char *Txt_Remove_photo = #if L==0 "Eliminar foto";