From 0d4fa88c2f062e94d685ec549a50cfecef51f624 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Mon, 14 Oct 2019 15:02:00 +0200 Subject: [PATCH] Version19.34.2 --- css/{swad19.33.css => swad19.34.2.css} | 2 +- swad_changelog.h | 7 +++++-- swad_connected.c | 1 - swad_course.c | 2 +- swad_holiday.c | 4 ++-- swad_mail.c | 1 - swad_message.c | 10 +++------- swad_timetable.c | 2 +- 8 files changed, 13 insertions(+), 16 deletions(-) rename css/{swad19.33.css => swad19.34.2.css} (99%) diff --git a/css/swad19.33.css b/css/swad19.34.2.css similarity index 99% rename from css/swad19.33.css rename to css/swad19.34.2.css index a2c877b8a..2c207ca32 100644 --- a/css/swad19.33.css +++ b/css/swad19.34.2.css @@ -2871,7 +2871,7 @@ a:hover img.CENTRE_PHOTO_SHOW .BT_J {background-color:#f5e800; border-color:#b8ad00;} /* light yellow */ /******************************* Time table **********************************/ -#timetable +.TT { width:100%; margin:0 auto; diff --git a/swad_changelog.h b/swad_changelog.h index 3e821982d..49cc10591 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -487,13 +487,16 @@ enscript -2 --landscape --color --file-align=2 --highlight --line-numbers -o - * En OpenSWAD: ps2pdf source.ps destination.pdf */ -#define Log_PLATFORM_VERSION "SWAD 19.34.1 (2019-10-14)" -#define CSS_FILE "swad19.33.css" +#define Log_PLATFORM_VERSION "SWAD 19.34.2 (2019-10-14)" +#define CSS_FILE "swad19.34.2.css" #define JS_FILE "swad19.30.js" /* // TODO: Perico: poner un candado de bloqueo de creación/edición de proyectos (por ejemplo en asignaturas obsoletas) // TODO: Hacer un nuevo rol en los TFG: tutor externo (profesor de áreas no vinculadas con el centro, profesionales de empresas, etc.) + Version 19.34.2: Oct 14, 2019 Fixed bug in IDs. + Fixed bug in timetable. + Fixed bug in messages. (245350 lines) Version 19.34.1: Oct 14, 2019 Show warnings in projects. (245353 lines) Version 19.34: Oct 14, 2019 Code refactoring in projects. Show warning if preassigned project without students. (245320 lines) diff --git a/swad_connected.c b/swad_connected.c index 0e40862cc..659bb19e1 100644 --- a/swad_connected.c +++ b/swad_connected.c @@ -109,7 +109,6 @@ void Con_ShowConnectedUsrs (void) "", (long) Gbl.StartExecutionTimeUTC, (unsigned) Gbl.Prefs.DateFormat); - Tbl_TR_End (); /***** Number of connected users in the whole platform *****/ Con_ShowGlobalConnectedUsrs (); diff --git a/swad_course.c b/swad_course.c index 647a6f1d0..c9cf81652 100644 --- a/swad_course.c +++ b/swad_course.c @@ -1308,7 +1308,7 @@ static bool Crs_ListCoursesOfAYearForSeeing (unsigned Year) Tbl_TD_End (); /* Course year */ - Tbl_TD_Begin ("class=\"%s CENTER_MIDDLE %s\">", + Tbl_TD_Begin ("class=\"%s CENTER_MIDDLE %s\"", TxtClassNormal,BgColor); fprintf (Gbl.F.Out,"%s",Txt_YEAR_OF_DEGREE[Crs->Year]); Tbl_TD_End (); diff --git a/swad_holiday.c b/swad_holiday.c index 721aa30d6..66a3dd824 100644 --- a/swad_holiday.c +++ b/swad_holiday.c @@ -196,8 +196,8 @@ void Hld_SeeHolidays (void) Frm_EndForm (); } - /***** End table and box *****/ - Box_EndBoxTable (); + /***** End box *****/ + Box_EndBox (); /***** Free list of holidays *****/ Hld_FreeListHolidays (); diff --git a/swad_mail.c b/swad_mail.c index 5f85d3fc8..bf0877289 100644 --- a/swad_mail.c +++ b/swad_mail.c @@ -1366,7 +1366,6 @@ static void Mai_ShowFormChangeUsrEmail (const struct UsrData *UsrDat,bool ItsMe, Btn_PutConfirmButtonInline ((ItsMe && NumEmail == 1) ? Txt_Confirm_email : Txt_Use_this_email); Frm_EndForm (); - Tbl_TD_End (); } Tbl_TD_End (); diff --git a/swad_message.c b/swad_message.c index cc742ca63..4e5ad9024 100644 --- a/swad_message.c +++ b/swad_message.c @@ -493,7 +493,7 @@ static void Msg_WriteFormUsrsIDsOrNicksOtherRecipients (void) /***** Textarea with users' @nicknames, emails or IDs *****/ Tbl_TR_Begin (NULL); - Tbl_TH_Begin (1,ColSpan,"LEFT_MIDDLE"); + Tbl_TD_Begin ("colspan=\"%u\" class=\"LEFT_MIDDLE\"",ColSpan); fprintf (Gbl.F.Out,"", - Gbl.Msg.Subject); + fprintf (Gbl.F.Out,"%s",Gbl.Msg.Subject); Tbl_TD_End (); Tbl_TR_End (); @@ -612,8 +610,7 @@ static void Msg_WriteFormSubjectAndContentMsgToUsrs (char Content[Cns_MAX_BYTES_ else // It's not a reply { /* End message subject */ - fprintf (Gbl.F.Out,"%s", - Gbl.Msg.Subject); + fprintf (Gbl.F.Out,"%s",Gbl.Msg.Subject); Tbl_TD_End (); Tbl_TR_End (); @@ -3092,7 +3089,6 @@ static void Msg_ShowASentOrReceivedMessage (long MsgNum,long MsgCod) void Msg_GetNotifMessage (char SummaryStr[Ntf_MAX_BYTES_SUMMARY + 1], char **ContentStr,long MsgCod,bool GetContent) { - extern const char *Txt_MSG_Subject; MYSQL_RES *mysql_res; MYSQL_ROW row; size_t Length; diff --git a/swad_timetable.c b/swad_timetable.c index 4e4b4e443..ccaed5138 100644 --- a/swad_timetable.c +++ b/swad_timetable.c @@ -1126,7 +1126,7 @@ static void TT_DrawTimeTable (void) unsigned ContinuousFreeMinicolumns; /***** Start table *****/ - Tbl_TABLE_Begin ("id=\"timetable\""); + Tbl_TABLE_Begin ("TT"); /***** Top row used for column adjustement *****/ TT_TimeTableDrawAdjustRow ();