Version 18.31.1

This commit is contained in:
Antonio Cañas Vargas 2019-01-11 03:45:13 +01:00
parent 96e02612d7
commit 9bd415ecb8
6 changed files with 23 additions and 44 deletions

View File

@ -657,25 +657,13 @@ static void ID_ShowFormChangeUsrID (const struct UsrData *UsrDat,
UsrDat->IDs.List[NumID].Confirmed ? Txt_ID_X_confirmed : UsrDat->IDs.List[NumID].Confirmed ? Txt_ID_X_confirmed :
Txt_ID_X_not_confirmed, Txt_ID_X_not_confirmed,
UsrDat->IDs.List[NumID].ID); UsrDat->IDs.List[NumID].ID);
fprintf (Gbl.F.Out,"<span class=\"%s\" title=\"%s\">%s</span>", fprintf (Gbl.F.Out,"<span class=\"%s\" title=\"%s\">%s%s</span>",
UsrDat->IDs.List[NumID].Confirmed ? "USR_ID_C" : UsrDat->IDs.List[NumID].Confirmed ? "USR_ID_C" :
"USR_ID_NC", "USR_ID_NC",
Gbl.Title, Gbl.Title,
UsrDat->IDs.List[NumID].ID); UsrDat->IDs.List[NumID].ID,
UsrDat->IDs.List[NumID].Confirmed ? "&check;" :
/* 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,"<img src=\"%s/ok_green16x16.gif\""
" alt=\"%s\" title=\"%s\""
" class=\"ICO20x20\" />",
Gbl.Prefs.URLIcons,
Gbl.Title,Gbl.Title);
}
if (NumID == UsrDat->IDs.Num - 1) if (NumID == UsrDat->IDs.Num - 1)
fprintf (Gbl.F.Out,"</td>" fprintf (Gbl.F.Out,"</td>"
"</tr>"); "</tr>");

View File

@ -369,11 +369,12 @@ En OpenSWAD:
ps2pdf source.ps destination.pdf 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 CSS_FILE "swad18.31.css"
#define JS_FILE "swad17.17.1.js" #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) Fixed bug in messages. (239545 lines)
Copy the following icons to icon public directory: Copy the following icons to icon public directory:
sudo cp icon/envelope-open-text.svg /var/www/html/swad/icon/ sudo cp icon/envelope-open-text.svg /var/www/html/swad/icon/

View File

@ -1258,19 +1258,14 @@ static bool Crs_ListCoursesOfAYearForSeeing (unsigned Year)
/* Put green tip if course has users */ /* Put green tip if course has users */
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<td class=\"CENTER_MIDDLE %s\">" "<td class=\"%s CENTER_MIDDLE %s\" title=\"%s\">"
"<img src=\"%s/%s16x16.gif\"" "%s"
" alt=\"%s\" title=\"%s\""
" class=\"ICO16x16\" />"
"</td>", "</td>",
BgColor, TxtClassNormal,BgColor,
Gbl.Prefs.URLIcons,
Crs->NumUsrs[Rol_UNK] ? "ok_green" :
"tr",
Crs->NumUsrs[Rol_UNK] ? Txt_COURSE_With_users : Crs->NumUsrs[Rol_UNK] ? Txt_COURSE_With_users :
Txt_COURSE_Without_users, Txt_COURSE_Without_users,
Crs->NumUsrs[Rol_UNK] ? Txt_COURSE_With_users : Crs->NumUsrs[Rol_UNK] ? "&check;" :
Txt_COURSE_Without_users); "&nbsp;");
/* Institutional code of the course */ /* Institutional code of the course */
fprintf (Gbl.F.Out,"<td class=\"%s CENTER_MIDDLE %s\">" fprintf (Gbl.F.Out,"<td class=\"%s CENTER_MIDDLE %s\">"

View File

@ -1290,21 +1290,16 @@ static void Deg_ListOneDegreeForSeeing (struct Degree *Deg,unsigned NumDeg)
BgColor = (Deg->DegCod == Gbl.CurrentDeg.Deg.DegCod) ? "LIGHT_BLUE" : BgColor = (Deg->DegCod == Gbl.CurrentDeg.Deg.DegCod) ? "LIGHT_BLUE" :
Gbl.ColorRows[Gbl.RowEvenOdd]; Gbl.ColorRows[Gbl.RowEvenOdd];
/***** Put green tip if degree has courses *****/ /***** Put tip if degree has courses *****/
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<td class=\"CENTER_MIDDLE %s\">" "<td class=\"%s CENTER_MIDDLE %s\" title=\"%s\">"
"<img src=\"%s/%s16x16.gif\"" "%s"
" alt=\"%s\" title=\"%s\""
" class=\"ICO16x16\" />"
"</td>", "</td>",
BgColor, TxtClassNormal,BgColor,
Gbl.Prefs.URLIcons,
NumCrss ? "ok_green" :
"tr",
NumCrss ? Txt_DEGREE_With_courses : NumCrss ? Txt_DEGREE_With_courses :
Txt_DEGREE_Without_courses, Txt_DEGREE_Without_courses,
NumCrss ? Txt_DEGREE_With_courses : NumCrss ? "&check;" :
Txt_DEGREE_Without_courses); "&nbsp;");
/***** Number of degree in this list *****/ /***** Number of degree in this list *****/
fprintf (Gbl.F.Out,"<td class=\"%s RIGHT_MIDDLE %s\">" fprintf (Gbl.F.Out,"<td class=\"%s RIGHT_MIDDLE %s\">"

View File

@ -1326,9 +1326,9 @@ static void Mai_ShowFormChangeUsrEmail (const struct UsrData *UsrDat,bool ItsMe,
snprintf (Gbl.Title,sizeof (Gbl.Title), snprintf (Gbl.Title,sizeof (Gbl.Title),
Txt_Email_X_confirmed, Txt_Email_X_confirmed,
row[0]); row[0]);
fprintf (Gbl.F.Out,"<img src=\"%s/ok_green16x16.gif\"" fprintf (Gbl.F.Out,"<img src=\"%s/check-circle.svg\""
" alt=\"%s\" title=\"%s\"" " alt=\"%s\" title=\"%s\""
" class=\"ICO20x20\" />", " class=\"ICO16x16\" />",
Gbl.Prefs.URLIcons, Gbl.Prefs.URLIcons,
Gbl.Title,Gbl.Title); Gbl.Title,Gbl.Title);
} }

View File

@ -1027,14 +1027,14 @@ static void TsI_WriteRowImportedQst (struct XMLElement *StemElem,
/***** Put icon to indicate that a question does not exist in database *****/ /***** Put icon to indicate that a question does not exist in database *****/
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<td class=\"BT%u CENTER_TOP\">" "<td class=\"BT%u CENTER_TOP\">"
"<img src=\"%s/%s16x16.gif\"" "<img src=\"%s/%s\""
" alt=\"%s\" title=\"%s\"" " alt=\"%s\" title=\"%s\""
" class=\"ICO20x20\" />" " class=\"ICO20x20\" />"
"</td>", "</td>",
Gbl.RowEvenOdd, Gbl.RowEvenOdd,
Gbl.Prefs.URLIcons, Gbl.Prefs.URLIcons,
QuestionExists ? "tr" : QuestionExists ? "tr16x16.gif" :
"ok_green", "check-circle.svg",
QuestionExists ? Txt_Existing_question : QuestionExists ? Txt_Existing_question :
Txt_New_question, Txt_New_question,
QuestionExists ? Txt_Existing_question : QuestionExists ? Txt_Existing_question :