From 9bd415ecb8d6c7c46f2f273831bbd70d982bcf40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Fri, 11 Jan 2019 03:45:13 +0100 Subject: [PATCH] Version 18.31.1 --- swad_ID.c | 20 ++++---------------- swad_changelog.h | 5 +++-- swad_course.c | 15 +++++---------- swad_degree.c | 17 ++++++----------- swad_mail.c | 4 ++-- swad_test_import.c | 6 +++--- 6 files changed, 23 insertions(+), 44 deletions(-) diff --git a/swad_ID.c b/swad_ID.c index d6ab3a037..2cbdec7e6 100644 --- a/swad_ID.c +++ b/swad_ID.c @@ -657,25 +657,13 @@ static void ID_ShowFormChangeUsrID (const struct UsrData *UsrDat, UsrDat->IDs.List[NumID].Confirmed ? Txt_ID_X_confirmed : Txt_ID_X_not_confirmed, UsrDat->IDs.List[NumID].ID); - fprintf (Gbl.F.Out,"%s", + fprintf (Gbl.F.Out,"%s%s", UsrDat->IDs.List[NumID].Confirmed ? "USR_ID_C" : "USR_ID_NC", Gbl.Title, - UsrDat->IDs.List[NumID].ID); - - /* ID confirmed? */ - if (UsrDat->IDs.List[NumID].Confirmed) - { - snprintf (Gbl.Title,sizeof (Gbl.Title), - Txt_ID_X_confirmed, - UsrDat->IDs.List[NumID].ID); - fprintf (Gbl.F.Out,"\"%s\"", - Gbl.Prefs.URLIcons, - Gbl.Title,Gbl.Title); - } - + UsrDat->IDs.List[NumID].ID, + UsrDat->IDs.List[NumID].Confirmed ? "✓" : + ""); if (NumID == UsrDat->IDs.Num - 1) fprintf (Gbl.F.Out,"" ""); diff --git a/swad_changelog.h b/swad_changelog.h index d287ec3f2..7b922f4b3 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -369,11 +369,12 @@ En OpenSWAD: ps2pdf source.ps destination.pdf */ -#define Log_PLATFORM_VERSION "SWAD 18.31 (2019-01-11)" +#define Log_PLATFORM_VERSION "SWAD 18.31.1 (2019-01-11)" #define CSS_FILE "swad18.31.css" #define JS_FILE "swad17.17.1.js" /* - Version 18.31: Jan 11, 2019 Some new SVG icons. + Version 18.31.1: Jan 11, 2019 Changes in lists of degrees and courses. (239526 lines) + Version 18.31: Jan 11, 2019 Some new SVG icons. Fixed bug in messages. (239545 lines) Copy the following icons to icon public directory: sudo cp icon/envelope-open-text.svg /var/www/html/swad/icon/ diff --git a/swad_course.c b/swad_course.c index 5da401d5d..b72cde04f 100644 --- a/swad_course.c +++ b/swad_course.c @@ -1258,19 +1258,14 @@ static bool Crs_ListCoursesOfAYearForSeeing (unsigned Year) /* Put green tip if course has users */ fprintf (Gbl.F.Out,"" - "" - "\"%s\"" + "" + "%s" "", - BgColor, - Gbl.Prefs.URLIcons, - Crs->NumUsrs[Rol_UNK] ? "ok_green" : - "tr", + TxtClassNormal,BgColor, Crs->NumUsrs[Rol_UNK] ? Txt_COURSE_With_users : Txt_COURSE_Without_users, - Crs->NumUsrs[Rol_UNK] ? Txt_COURSE_With_users : - Txt_COURSE_Without_users); + Crs->NumUsrs[Rol_UNK] ? "✓" : + " "); /* Institutional code of the course */ fprintf (Gbl.F.Out,"" diff --git a/swad_degree.c b/swad_degree.c index 3f65dbf10..cc735da63 100644 --- a/swad_degree.c +++ b/swad_degree.c @@ -1290,21 +1290,16 @@ static void Deg_ListOneDegreeForSeeing (struct Degree *Deg,unsigned NumDeg) BgColor = (Deg->DegCod == Gbl.CurrentDeg.Deg.DegCod) ? "LIGHT_BLUE" : Gbl.ColorRows[Gbl.RowEvenOdd]; - /***** Put green tip if degree has courses *****/ + /***** Put tip if degree has courses *****/ fprintf (Gbl.F.Out,"" - "" - "\"%s\"" + "" + "%s" "", - BgColor, - Gbl.Prefs.URLIcons, - NumCrss ? "ok_green" : - "tr", + TxtClassNormal,BgColor, NumCrss ? Txt_DEGREE_With_courses : Txt_DEGREE_Without_courses, - NumCrss ? Txt_DEGREE_With_courses : - Txt_DEGREE_Without_courses); + NumCrss ? "✓" : + " "); /***** Number of degree in this list *****/ fprintf (Gbl.F.Out,"" diff --git a/swad_mail.c b/swad_mail.c index a7fd7421a..33c3ad777 100644 --- a/swad_mail.c +++ b/swad_mail.c @@ -1326,9 +1326,9 @@ static void Mai_ShowFormChangeUsrEmail (const struct UsrData *UsrDat,bool ItsMe, snprintf (Gbl.Title,sizeof (Gbl.Title), Txt_Email_X_confirmed, row[0]); - fprintf (Gbl.F.Out,"\"%s\"", + " class=\"ICO16x16\" />", Gbl.Prefs.URLIcons, Gbl.Title,Gbl.Title); } diff --git a/swad_test_import.c b/swad_test_import.c index 518667fd6..8998d380b 100644 --- a/swad_test_import.c +++ b/swad_test_import.c @@ -1027,14 +1027,14 @@ static void TsI_WriteRowImportedQst (struct XMLElement *StemElem, /***** Put icon to indicate that a question does not exist in database *****/ fprintf (Gbl.F.Out,"" "" - "\"%s\"" "", Gbl.RowEvenOdd, Gbl.Prefs.URLIcons, - QuestionExists ? "tr" : - "ok_green", + QuestionExists ? "tr16x16.gif" : + "check-circle.svg", QuestionExists ? Txt_Existing_question : Txt_New_question, QuestionExists ? Txt_Existing_question :