From ccf0efc06fe1e9192cd49ae6ed4b48968e846e68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Wed, 21 Dec 2016 01:51:30 +0100 Subject: [PATCH] Version 16.105.12 --- swad_changelog.h | 3 +- swad_enrollment.c | 139 ++++++++++++++++++++++++++++++++++++---------- swad_password.c | 9 ++- 3 files changed, 118 insertions(+), 33 deletions(-) diff --git a/swad_changelog.h b/swad_changelog.h index 79d282fe6..8336c26a9 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -188,13 +188,14 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 16.105.11 (2016-12-21)" +#define Log_PLATFORM_VERSION "SWAD 16.105.12 (2016-12-21)" #define CSS_FILE "swad16.105.3.css" #define JS_FILE "swad16.101.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.105.12:Dec 21, 2016 Changes in behaviour of labels in forms. (211408 lines) Version 16.105.11:Dec 21, 2016 Changes in behaviour of labels in forms. (211323 lines) Version 16.105.10:Dec 21, 2016 Changes in behaviour of labels in forms. (211320 lines) Version 16.105.9: Dec 21, 2016 Changes in behaviour of labels in forms. (211316 lines) diff --git a/swad_enrollment.c b/swad_enrollment.c index 1d9211890..f31c3df5b 100644 --- a/swad_enrollment.c +++ b/swad_enrollment.c @@ -884,14 +884,20 @@ bool Enr_PutActionsRegRemOneUsr (bool ItsMe) Txt_Register_USER_in_the_course_X), Gbl.CurrentCrs.Crs.ShrtName); fprintf (Gbl.F.Out,"
  • " - "" + "%s
    • ",Gbl.Message); + fprintf (Gbl.F.Out," />" + "%s" + "" + "", + Gbl.Message); NumOptionsShown++; } @@ -908,14 +914,20 @@ bool Enr_PutActionsRegRemOneUsr (bool ItsMe) sprintf (Gbl.Message,Txt_Register_USER_as_an_administrator_of_the_degree_X, Gbl.CurrentDeg.Deg.ShrtName); fprintf (Gbl.F.Out,"
  • " - "" + "%s
    • ",Gbl.Message); + fprintf (Gbl.F.Out," />" + "%s" + "" + "", + Gbl.Message); NumOptionsShown++; } @@ -927,14 +939,20 @@ bool Enr_PutActionsRegRemOneUsr (bool ItsMe) sprintf (Gbl.Message,Txt_Register_USER_as_an_administrator_of_the_centre_X, Gbl.CurrentCtr.Ctr.ShrtName); fprintf (Gbl.F.Out,"
  • " - "" + "%s
    • ",Gbl.Message); + fprintf (Gbl.F.Out," />" + "%s" + "" + "", + Gbl.Message); NumOptionsShown++; } @@ -947,14 +965,20 @@ bool Enr_PutActionsRegRemOneUsr (bool ItsMe) sprintf (Gbl.Message,Txt_Register_USER_as_an_administrator_of_the_institution_X, Gbl.CurrentIns.Ins.ShrtName); fprintf (Gbl.F.Out,"
  • " - "" + "%s
    • ",Gbl.Message); + fprintf (Gbl.F.Out," />" + "%s" + "" + "", + Gbl.Message); NumOptionsShown++; } @@ -964,14 +988,20 @@ bool Enr_PutActionsRegRemOneUsr (bool ItsMe) if (!ItsMe && Gbl.Usrs.Me.LoggedRole >= Rol_TEACHER) { fprintf (Gbl.F.Out,"
  • " - "" + "%s
    • ",Txt_Report_possible_duplicate_user); + fprintf (Gbl.F.Out," />" + "%s" + "" + "", + Txt_Report_possible_duplicate_user); NumOptionsShown++; } @@ -984,14 +1014,20 @@ bool Enr_PutActionsRegRemOneUsr (bool ItsMe) Txt_Remove_USER_from_the_course_X, Gbl.CurrentCrs.Crs.ShrtName); fprintf (Gbl.F.Out,"
  • " - "" + "%s
    • ",Gbl.Message); + fprintf (Gbl.F.Out," />" + "%s" + "" + "", + Gbl.Message); NumOptionsShown++; } @@ -1010,14 +1046,20 @@ bool Enr_PutActionsRegRemOneUsr (bool ItsMe) Txt_Remove_USER_as_an_administrator_of_the_degree_X, Gbl.CurrentDeg.Deg.ShrtName); fprintf (Gbl.F.Out,"
  • " - "" + "%s
    • ",Gbl.Message); + fprintf (Gbl.F.Out," />" + "%s" + "" + "", + Gbl.Message); NumOptionsShown++; } @@ -1031,14 +1073,20 @@ bool Enr_PutActionsRegRemOneUsr (bool ItsMe) Txt_Remove_USER_as_an_administrator_of_the_centre_X, Gbl.CurrentCtr.Ctr.ShrtName); fprintf (Gbl.F.Out,"
  • " - "" + "%s
    • ",Gbl.Message); + fprintf (Gbl.F.Out," />" + "%s" + "" + "", + Gbl.Message); NumOptionsShown++; } @@ -1053,14 +1101,20 @@ bool Enr_PutActionsRegRemOneUsr (bool ItsMe) Txt_Remove_USER_as_an_administrator_of_the_institution_X, Gbl.CurrentIns.Ins.ShrtName); fprintf (Gbl.F.Out,"
  • " - "" + "%s
    • ",Gbl.Message); + fprintf (Gbl.F.Out," />" + "%s" + "" + "", + Gbl.Message); NumOptionsShown++; } @@ -1070,11 +1124,16 @@ bool Enr_PutActionsRegRemOneUsr (bool ItsMe) if (Acc_CheckIfICanEliminateAccount (Gbl.Usrs.Other.UsrDat.UsrCod)) { fprintf (Gbl.F.Out,"
  • " - "" + "%s
    • ", + fprintf (Gbl.F.Out," />" + "%s" + "" + "", ItsMe ? Txt_Eliminate_my_user_account : Txt_Eliminate_user_account); @@ -1108,17 +1167,33 @@ static void Enr_PutActionsRegRemSeveralUsrs (void) /***** Register / remove users listed or not listed *****/ if (Gbl.CurrentCrs.Crs.CrsCod > 0) // Course selected fprintf (Gbl.F.Out,"
  • " - "" - "%s
    • " + "" + "" "
  • " - "" - "%s
    • " + "" + "" "
  • " - "" - "%s
    • " + "" + "" "
  • " - "" - "%s
    • ", + "" + "", (unsigned) Enr_REGISTER_SPECIFIED_USRS_IN_CRS, Txt_Register_the_users_indicated_in_step_1, (unsigned) Enr_REMOVE_SPECIFIED_USRS_FROM_CRS, @@ -1131,8 +1206,12 @@ static void Enr_PutActionsRegRemSeveralUsrs (void) /***** Only for superusers *****/ if (Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM) fprintf (Gbl.F.Out,"
  • " - "" - "%s
    • ", + "" + "", (unsigned) Enr_ELIMINATE_USRS_FROM_PLATFORM, Txt_Eliminate_from_the_platform_the_users_indicated_in_step_1); diff --git a/swad_password.c b/swad_password.c index e754db789..f665e441a 100644 --- a/swad_password.c +++ b/swad_password.c @@ -920,11 +920,16 @@ void Pwd_AskForConfirmationOnDangerousAction (void) extern const char *Txt_For_security_enter_your_password; fprintf (Gbl.F.Out,"
    " + "" + "
    " + "" "
    ", The_ClassForm[Gbl.Prefs.Theme], Txt_I_understand_that_this_action_can_not_be_undone,