Marown/swad-core
Marown
/
swad-core
mirror of https://github.com/acanas/swad-core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Version 14.47.4

This commit is contained in:
Antonio Cañas Vargas 2014-12-29 21:35:12 +01:00
parent 22decf3906
commit 89e55e411d
18 changed files with 113 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
swad_QR.c
View File

@ -125,15 +125,15 @@ static void QR_ImageQRCode (const char *QRString)
{
fprintf (Gbl.F.Out,"<div style=\"width:%upx; text-align:center;\">"
"<img src=\"https://chart.googleapis.com/chart?cht=qr&amp;chs=%ux%u&amp;chl=%s\""
" width=\"%u\" height=\"%u\" alt=\"%s\""
" style=\"border:1px dashed silver;\" /><br />"
" alt=\"%s\" style=\"width:%upx; height:%upx;"
" border:1px dashed silver;\" /><br />"
"<span class=\"DAT\">%s</span>"
"</div>",
QR_CODE_SIZE,
QR_CODE_SIZE,QR_CODE_SIZE,
QRString,
QR_CODE_SIZE,QR_CODE_SIZE,
QRString,
QR_CODE_SIZE,QR_CODE_SIZE,
QRString);
}
@ -147,11 +147,11 @@ void QR_LinkToCountry (unsigned Size)
/***** Show QR code with direct link to the current centre *****/
fprintf (Gbl.F.Out,"<img src=\"https://chart.googleapis.com/chart?cht=qr&amp;chs=%ux%u&amp;chl=%s/?CtyCod=%ld\""
" width=\"%u\" height=\"%u\" alt=\"%s\" />",
" alt=\"%s\" style=\"width:%upx; height:%upx;\" />",
Size,Size,
Cfg_HTTPS_URL_SWAD_CGI,Gbl.CurrentCty.Cty.CtyCod,
Size,Size,
Txt_Shortcut_to_this_country);
Txt_Shortcut_to_this_country,
Size,Size);
}
/*****************************************************************************/
@ -164,11 +164,11 @@ void QR_LinkToInstitution (unsigned Size)
/***** Show QR code with direct link to the current institution *****/
fprintf (Gbl.F.Out,"<img src=\"https://chart.googleapis.com/chart?cht=qr&amp;chs=%ux%u&amp;chl=%s/?InsCod=%ld\""
" width=\"%u\" height=\"%u\" alt=\"%s\" />",
" alt=\"%s\" style=\"width:%upx; height:%upx;\" />",
Size,Size,
Cfg_HTTPS_URL_SWAD_CGI,Gbl.CurrentIns.Ins.InsCod,
Size,Size,
Txt_Shortcut_to_this_institution);
Txt_Shortcut_to_this_institution,
Size,Size);
}
/*****************************************************************************/
@ -181,11 +181,11 @@ void QR_LinkToCentre (unsigned Size)
/***** Show QR code with direct link to the current centre *****/
fprintf (Gbl.F.Out,"<img src=\"https://chart.googleapis.com/chart?cht=qr&amp;chs=%ux%u&amp;chl=%s/?CtrCod=%ld\""
" width=\"%u\" height=\"%u\" alt=\"%s\" />",
" alt=\"%s\" style=\"width:%upx; height:%upx;\" />",
Size,Size,
Cfg_HTTPS_URL_SWAD_CGI,Gbl.CurrentCtr.Ctr.CtrCod,
Size,Size,
Txt_Shortcut_to_this_centre);
Txt_Shortcut_to_this_centre,
Size,Size);
}
/*****************************************************************************/
@ -198,11 +198,11 @@ void QR_LinkToDegree (unsigned Size)
/***** Show QR code with direct link to the current degree *****/
fprintf (Gbl.F.Out,"<img src=\"https://chart.googleapis.com/chart?cht=qr&amp;chs=%ux%u&amp;chl=%s/?DegCod=%ld\""
" width=\"%u\" height=\"%u\" alt=\"%s\" />",
" alt=\"%s\" style=\"width:%upx; height:%upx;\" />",
Size,Size,
Cfg_HTTPS_URL_SWAD_CGI,Gbl.CurrentDeg.Deg.DegCod,
Size,Size,
Txt_Shortcut_to_this_degree);
Txt_Shortcut_to_this_degree,
Size,Size);
}
/*****************************************************************************/
@ -215,11 +215,11 @@ void QR_LinkToCourse (unsigned Size)
/***** Show QR code with direct link to the current course *****/
fprintf (Gbl.F.Out,"<img src=\"https://chart.googleapis.com/chart?cht=qr&amp;chs=%ux%u&amp;chl=%s/?CrsCod=%ld\""
" width=\"%u\" height=\"%u\" alt=\"%s\" />",
" alt=\"%s\" style=\"width:%upx; height:%upx;\" />",
Size,Size,
Cfg_HTTPS_URL_SWAD_CGI,Gbl.CurrentCrs.Crs.CrsCod,
Size,Size,
Txt_Shortcut_to_this_course);
Txt_Shortcut_to_this_course,
Size,Size);
}
/*****************************************************************************/
@ -233,10 +233,9 @@ void QR_ExamAnnnouncement (void)
/***** Show QR code with direct link to the exam announcement *****/
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">"
"<img src=\"https://chart.googleapis.com/chart?cht=qr&amp;chs=%ux%u&amp;chl=%s/?CrsCod=%ld%%26ActCod=%ld\""
" width=\"%u\" height=\"%u\" alt=\"%s\" />"
" alt=\"%s\" style=\"width:200px; height:200px;\" />"
"</div>",
200,200,
Cfg_HTTPS_URL_SWAD_CGI,Gbl.CurrentCrs.Crs.CrsCod,Act_Actions[ActSeeExaAnn].ActCod,
200,200,
Txt_Link_to_announcement_of_exam);
}

2
swad_assignment.c
View File

@ -335,7 +335,7 @@ static void Asg_ShowOneAssignment (long AsgCod)
if (Gbl.CurrentCrs.Grps.NumGrps)
Asg_GetAndWriteNamesOfGrpsAssociatedToAsg (&Asg);
fprintf (Gbl.F.Out,"<p align=\"justify\" class=\"%s\">"
fprintf (Gbl.F.Out,"<p class=\"%s\" style=\"text-align:justify;\">"
"%s<br />&nbsp;</p>"
"</td>"
"</tr>",

2
swad_attendance.c
View File

@ -354,7 +354,7 @@ static void Att_ShowOneAttEvent (struct AttendanceEvent *Att,bool ShowOnlyThisAt
if (Gbl.CurrentCrs.Grps.NumGrps)
Att_GetAndWriteNamesOfGrpsAssociatedToAttEvent (Att);
fprintf (Gbl.F.Out,"<p align=\"justify\" class=\"%s\">%s</p>",
fprintf (Gbl.F.Out,"<p class=\"%s\" style=\"text-align:justify;\">%s</p>",
Att->Hidden ? "DAT_LIGHT" :
"DAT",
Txt);

7
swad_banner.c
View File

@ -100,7 +100,9 @@ void Ban_SeeBanners (void)
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"DAT\" style=\"text-align:left;\">"
"<a href=\"%s\" title=\"%s\" class=\"DAT\" target=\"_blank\">"
"<img src=\"%s/%s/%s\" width=\"120\" height=\"40\" alt=\"%s\" /></a>"
"<img src=\"%s/%s/%s\" alt=\"%s\""
" style=\"width:120px; height:40px;\"/>"
"</a>"
"</td>"
"</tr>",
Gbl.Banners.Lst[NumBan].WWW,
@ -920,7 +922,8 @@ void Ban_WriteMenuWithBanners (void)
Par_PutHiddenParamString ("URL",Gbl.Banners.Lst[NumBan].WWW);
fprintf (Gbl.F.Out,"<a href=\"javascript:document.getElementById('%s').submit();\""
" title=\"%s\">"
"<img src=\"%s/%s/%s\" width=\"120\" height=\"40\" alt=\"%s\" />"
"<img src=\"%s/%s/%s\" alt=\"%s\""
" style=\"width:120px; height:40px;\" />"
"</a>"
"</form>"
"</td>"

3
swad_changelog.h
View File

@ -35,11 +35,12 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 14.47.3 (2014/12/29)"
#define Log_PLATFORM_VERSION "SWAD 14.47.4 (2014/12/29)"
// 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 | tail -1
/*
Version 14.47.4 :Dic 29, 2014 Changes in HTML and CSS. (174535 lines)
Version 14.47.3 :Dic 29, 2014 Removed old code not used. (174499 lines)
Version 14.47.2 :Dic 29, 2014 Changes in listing of chat rooms, forums and user's courses. (174677 lines)
Version 14.47.1 :Dic 29, 2014 Changes in listing of chat rooms, forums and user's courses.

3
swad_file_browser.c
View File

@ -4313,7 +4313,8 @@ static void Brw_PutIconFile (unsigned Size,Brw_FileType_t FileType,const char *F
fprintf (Gbl.F.Out,"xxx%ux%u.gif\" alt=\"\"",
Size,Size);
}
fprintf (Gbl.F.Out," width=\"%u\" height=\"%u\" style=\"vertical-align:middle;\" />",
fprintf (Gbl.F.Out," style=\"width:%upx; height:%upx;"
" vertical-align:middle;\" />",
Size,Size);
}

4
swad_info.c
View File

@ -1577,7 +1577,7 @@ static void Inf_ShowTxtInfo (Inf_InfoType_t InfoType)
Lay_WriteHeaderClassPhoto (3,false,false,Gbl.CurrentIns.Ins.InsCod,Gbl.CurrentDeg.Deg.DegCod,Gbl.CurrentCrs.Crs.CrsCod);
fprintf (Gbl.F.Out,"<tr>"
"<td style=\"text-align:left;\">"
"<p align=\"justify\" class=\"DAT\">");
"<p class=\"DAT\" style=\"text-align:justify;\">");
/***** Convert to respectful HTML and insert links *****/
Str_ChangeFormat (Str_FROM_HTML,Str_TO_RIGOROUS_HTML,
@ -1643,7 +1643,7 @@ int Inf_WritePlainTextIntoHTMLBuffer (Inf_InfoType_t InfoType,char **HTMLBuffer)
/***** Write plain text into text buffer *****/
fprintf (FileHTMLTmp,"<tr>"
"<td style=\"text-align:left;\">"
"<p align=\"justify\" class=\"DAT\">");
"<p class=\"DAT\" style=\"text-align:justify;\">");
/* Convert to respectful HTML and insert links */
Str_ChangeFormat (Str_FROM_HTML,Str_TO_RIGOROUS_HTML,

13
swad_layout.c
View File

@ -1454,8 +1454,8 @@ static void Lay_ShowRightColumn (void)
"<td style=\"text-align:center;\">"
"<a href=\"https://play.google.com/store/apps/details?id=es.ugr.swad.swadroid\""
" target=\"_blank\" title=\"%s\">"
"<img src=\"%s/SWADroid120x200.png\""
" width=\"120\" height=\"200\" alt=\"SWADroid\" />"
"<img src=\"%s/SWADroid120x200.png\" alt=\"SWADroid\""
" style=\"width:120px; height:200px;\" />"
"</a>"
"</td>"
"</tr>",
@ -1759,13 +1759,14 @@ void Lay_WritePageFooter (void)
/***** Institution and centre hosting the platform *****/
fprintf (Gbl.F.Out,"<a href=\"%s\" class=\"FOOT\" target=\"_blank\">"
"<img src=\"%s/%s\" width=\"%u\" height=\"%u\" alt=\"%s\" />"
"<img src=\"%s/%s\" alt=\"%s\""
" style=\"width:%upx; height:%upx;\" />"
"<div>%s</div>"
"</a>",
Cfg_ABOUT_URL,
Gbl.Prefs.IconsURL,Cfg_ABOUT_LOGO,
Cfg_ABOUT_LOGO_WIDTH,Cfg_ABOUT_LOGO_HEIGHT,
Cfg_ABOUT_NAME,
Cfg_ABOUT_LOGO_WIDTH,Cfg_ABOUT_LOGO_HEIGHT,
Cfg_ABOUT_NAME);
fprintf (Gbl.F.Out,"<div>"
@ -2025,8 +2026,8 @@ void Lay_AdvertisementMobile (void)
"<a href=\"https://play.google.com/store/apps/details?id=es.ugr.swad.swadroid\""
" class=\"DAT\">"
"%s<br /><br />"
"<img src=\"%s/SWADroid200x300.png\""
" width=\"200\" height=\"300\" alt=\"SWADroid\" />"
"<img src=\"%s/SWADroid200x300.png\" alt=\"SWADroid\""
" style=\"width:200px; height:300px;\" />"
"</a>"
"</td>"
"</tr>",

12
swad_mail.c
View File

@ -813,14 +813,16 @@ void Mai_WriteMenuWithMailDomains (void)
fprintf (Gbl.F.Out,"<table style=\"width:120px;\">"
"<tr>"
"<td style=\"width:4px; text-align:left;\">"
"<img src=\"%s/ewbw1_4x4.gif\" width=\"4\" height=\"4\" alt=\"\" />"
"<img src=\"%s/ewbw1_4x4.gif\" alt=\"\""
" style=\"width:4px; height:4px;\" />"
"</td>"
"<td style=\"text-align:left;"
" background-image: url('%s/mbw1_1x4.gif');"
" background-repeat: repeat-x;\">"
"</td>"
"<td style=\"width:4px; text-align:left;\">"
"<img src=\"%s/ewbw2_4x4.gif\" width=\"4\" height=\"4\" alt=\"\" />"
"<img src=\"%s/ewbw2_4x4.gif\" alt=\"\""
" style=\"width:4px; height:4px;\" />"
"</td>"
"</tr>",
Gbl.Prefs.IconsURL,Gbl.Prefs.IconsURL,Gbl.Prefs.IconsURL);
@ -852,12 +854,14 @@ void Mai_WriteMenuWithMailDomains (void)
/***** End table *****/
fprintf (Gbl.F.Out,"<tr>"
"<td style=\"width:4px; text-align:left;\">"
"<img src=\"%s/ewbw3_4x4.gif\" width=\"4\" height=\"4\" alt=\"\" />"
"<img src=\"%s/ewbw3_4x4.gif\" alt=\"\""
" style=\"width:4px; height:4px;\" />"
"</td>"
"<td style=\"background-image: url('%s/mbw4_1x4.gif'); background-repeat: repeat-x;\">"
"</td>"
"<td style=\"width:4px; text-align:left;\">"
"<img src=\"%s/ewbw4_4x4.gif\" width=\"4\" height=\"4\" alt=\"\" />"
"<img src=\"%s/ewbw4_4x4.gif\" alt=\"\""
" style=\"width:4px; height:4px;\" />"
"</td>"
"</tr>"
"</table>"

4
swad_main.c
View File

@ -77,8 +77,8 @@ int main (int argc, char *argv[])
"<html lang=\"es\">"
"<head><title>%s</title></head>"
"<body><br /><br /><br /><br />"
"<h1 align=\"center\">%s est&aacute; parado por mantenimiento</h1>"
"<h2 align=\"center\">Intente acceder m&aacute;s tarde, por favor.</h2>"
"<h1 style=\"text-align:center;\">%s est&aacute; parado por mantenimiento</h1>"
"<h2 style=\"text-align:center;\">Intente acceder m&aacute;s tarde, por favor.</h2>"
"</body>"
"</html>",
Cfg_PLATFORM_FULL_NAME,

6
swad_notification.c
View File

@ -1806,8 +1806,10 @@ void Ntf_WriteNumberOfNewNtfs (void)
if (NumNewNtfs)
{
/***** Blinking icon *****/
fprintf (Gbl.F.Out,"<br /><img src=\"%s/mail13x10.gif\""
" width=\"13\" height=\"10\" align=\"bottom\" /> ",
fprintf (Gbl.F.Out,"<br />"
"<img src=\"%s/mail13x10.gif\""
" style=\"width:13px; height:10px;"
" vertical-align:bottom;\" /> ",
Gbl.Prefs.IconsURL);
/***** Number of new notifications *****/

23
swad_photo.c
View File

@ -683,7 +683,8 @@ static void Pho_UpdatePhoto2 (void)
NumPhoto++)
fprintf (Gbl.F.Out,"<td class=\"DAT\" style=\"width:33%%;"
" text-align:center; vertical-align:top;\">"
"<img src=\"%s/%s/%s/%s_paso%u.jpg\" width=\"%u\" height=\"%u\" />"
"<img src=\"%s/%s/%s/%s_paso%u.jpg\""
" style=\"width:%upx; height:%upx;\" />"
"<br />%s"
"</td>",
Cfg_HTTPS_URL_SWAD_PUBLIC,Cfg_FOLDER_PHOTO,Cfg_FOLDER_PHOTO_TMP,
@ -985,7 +986,7 @@ void Pho_ShowUsrPhoto (const struct UsrData *UsrDat,const char *PhotoURL,
else if (Width == 15 && Height == 20)
fprintf (Gbl.F.Out,"\" class=\"F15x20\"");
else if (Width == 18 && Height == 24)
fprintf (Gbl.F.Out,"\" class=\"F18x24\" width=\"18\" height=\"24\""); // Here width and height are written explicitely in order to allow copy-paste to Excel
fprintf (Gbl.F.Out,"\" class=\"F18x24\" style=\"width:18px; height:24px;\""); // Here width and height are written explicitely in order to allow copy-paste to Excel
else if (Width == 24 && Height == 32)
fprintf (Gbl.F.Out,"\" class=\"F24x32\"");
else if (Width == 36 && Height == 48)
@ -999,7 +1000,9 @@ void Pho_ShowUsrPhoto (const struct UsrData *UsrDat,const char *PhotoURL,
else if (Width == 150 && Height == 200)
fprintf (Gbl.F.Out,"\" class=\"F150x200\"");
else
fprintf (Gbl.F.Out,"\" width=\"%d\" height=\"%d\" align=\"middle\"",Width,Height);
fprintf (Gbl.F.Out,"\" style=\"width:%dpx; height:%dpx;"
" vertical-align:middle;\"",
Width,Height);
if (Zoom && PhotoURL &&
(Width != Pho_PHOTO_REAL_WIDTH ||
Height != Pho_PHOTO_REAL_HEIGHT))
@ -2123,10 +2126,14 @@ static void Pho_ShowDegreeAvgPhotoAndStat (struct Degree *Deg,Pho_AvgPhotoSeeOrP
Cfg_HTTPS_URL_SWAD_PUBLIC,Cfg_FOLDER_PHOTO,
Pho_StrAvgPhotoDirs[Gbl.Stat.DegPhotos.TypeOfAverage],
Deg->DegCod,Usr_StringsSexDB[Sex]);
fprintf (Gbl.F.Out,"%s\" width=\"%u\" height=\"%u\"",PhotoURL,PhotoWidth,PhotoHeight);
fprintf (Gbl.F.Out,"%s\" style=\"width:%upx; height:%upx;\"",
PhotoURL,PhotoWidth,PhotoHeight);
if (SeeOrPrint == Pho_DEGREES_SEE)
{
sprintf (PhotoCaption,"%s<br />%d&nbsp;%s&nbsp;(%s)<br />%d&nbsp;%s&nbsp;(%d%%)<br />%02u/%02u/%04u",
sprintf (PhotoCaption,"%s<br />"
"%d&nbsp;%s&nbsp;(%s)<br />"
"%d&nbsp;%s&nbsp;(%d%%)<br />"
"%02u/%02u/%04u",
Deg->ShortName,
NumStds,Txt_students_ABBREVIATION,Txt_SEX_PLURAL_abc[Sex],
NumStdsWithPhoto,Txt_photos,
@ -2138,11 +2145,13 @@ static void Pho_ShowDegreeAvgPhotoAndStat (struct Degree *Deg,Pho_AvgPhotoSeeOrP
}
}
else
fprintf (Gbl.F.Out,"%s/usr_bl.jpg\" width=\"%u\" height=\"%u\"",
fprintf (Gbl.F.Out,"%s/usr_bl.jpg\""
" style=\"width:%upx; height:%upx;\"",
Gbl.Prefs.IconsURL,PhotoWidth,PhotoHeight);
}
else
fprintf (Gbl.F.Out,"%s/usr_bl.jpg\" width=\"%u\" height=\"%u\"",
fprintf (Gbl.F.Out,"%s/usr_bl.jpg\""
" style=\"width:%upx; height:%upx;\"",
Gbl.Prefs.IconsURL,PhotoWidth,PhotoHeight);
fprintf (Gbl.F.Out," alt=\"%s\" />",Deg->FullName);
if (SeeOrPrint == Pho_DEGREES_PRINT)

9
swad_plugin.c
View File

@ -121,7 +121,8 @@ void Plg_ListPlugins (void)
"<td class=\"DAT\" style=\"width:32px;"
" text-align:left;\">"
"<a href=\"%s\" title=\"%s\" class=\"DAT\" target=\"_blank\">"
"<img src=\"%s/%s/%s24x24.gif\" width=\"24\" height=\"24\" alt=\"%s\" />"
"<img src=\"%s/%s/%s24x24.gif\" alt=\"%s\""
" style=\"width:24px; height:24px;\" />"
"</a>"
"</td>"
"<td class=\"DAT\" style=\"text-align:left;\">"
@ -386,9 +387,11 @@ static void Plg_ListPluginsForEdition (void)
/* Plugin logo */
fprintf (Gbl.F.Out,"<td style=\"width:28px; text-align:center;\">"
"<img src=\"%s/%s/%s24x24.gif\" width=\"24\" height=\"24\" alt=\"%s\" />"
"<img src=\"%s/%s/%s24x24.gif\" alt=\"%s\""
" style=\"width:24px; height:24px;\" />"
"</td>",
Gbl.Prefs.IconsURL,Cfg_ICON_FOLDER_PLUGINS,Gbl.Plugins.Lst[NumPlg].Logo,Gbl.Plugins.Lst[NumPlg].Name);
Gbl.Prefs.IconsURL,Cfg_ICON_FOLDER_PLUGINS,
Gbl.Plugins.Lst[NumPlg].Logo,Gbl.Plugins.Lst[NumPlg].Name);
/* Plugin name */
fprintf (Gbl.F.Out,"<td style=\"text-align:center;"

28
swad_statistic.c
View File

@ -227,8 +227,10 @@ void Sta_ExitIfTooFast (void)
"<title>%s</title>"
"</head>"
"<body>"
"<h1 align=\"center\">%s</h1>"
"<h2 align=\"center\"><a href=\"javascript:window.history.back();\">&larr; %s</a></h2>"
"<h1 style=\"text-align:center;\">%s</h1>"
"<h2 style=\"text-align:center;\">"
"<a href=\"javascript:window.history.back();\">&larr; %s</a>"
"</h2>"
"</body>"
"</html>",
Txt_STR_LANG_ID[Gbl.Prefs.Language],
@ -1292,7 +1294,7 @@ static bool Sta_SeeAccesses (void)
}
Lay_WriteTitle (Gbl.Message);
Sta_WriteSelectedRangeOfDates (NumDays);
fprintf (Gbl.F.Out,"<p class=\"DAT\" align=\"center\">");
fprintf (Gbl.F.Out,"<p class=\"DAT\" style=\"text-align:center;\">");
if (Gbl.Stat.Role == Sta_ME)
fprintf (Gbl.F.Out,"%s: %s",
Txt_User,
@ -1305,7 +1307,7 @@ static bool Sta_SeeAccesses (void)
break;
}
fprintf (Gbl.F.Out,"<p class=\"DAT\" align=\"center\">%s: %s</p>",
fprintf (Gbl.F.Out,"<p class=\"DAT\"style=\"text-align:center;\">%s: %s</p>",
Txt_Action,
Act_GetActionTextFromDB (Act_Actions[Gbl.Stat.NumAction].ActCod,ActTxt));
@ -1808,7 +1810,10 @@ static void Sta_ShowNumAccessesPerUsr (unsigned long NumRows,MYSQL_RES *mysql_re
" vertical-align:top; background-color:%s;\">",
Gbl.ColorRows[Gbl.RowEvenOdd]);
if (BarWidth)
fprintf (Gbl.F.Out,"<img src=\"%s/%c1x14.gif\" width=\"%u\" height=\"14\" style=\"vertical-align:top;\" alt=\"\" />&nbsp;",
fprintf (Gbl.F.Out,"<img src=\"%s/%c1x14.gif\" alt=\"\""
" style=\"width:%upx; height:14px;"
" vertical-align:top;\" />"
"&nbsp;",
Gbl.Prefs.IconsURL,
UsrDat.RoleInCurrentCrsDB == Rol_ROLE_STUDENT ? 'c' :
'v',
@ -2729,7 +2734,8 @@ static void Sta_WriteAccessHour (unsigned Hour,float NumPagesGenerated,float Max
AltoBarra = (unsigned) (((NumPagesGenerated * 400.0) / MaxPagesGenerated) + 0.5);
if (AltoBarra == 0)
AltoBarra = 1;
fprintf (Gbl.F.Out,"<img src=\"%s/c8x1.gif\" width=\"8\" height=\"%u\" alt=\"\" /><br />",
fprintf (Gbl.F.Out,"<img src=\"%s/c8x1.gif\" alt=\"\""
" style=\"width:8px; height:%upx;\" /><br />",
Gbl.Prefs.IconsURL,AltoBarra);
}
else
@ -3475,7 +3481,9 @@ static void Sta_DrawBarNumClicks (char Color,float NumPagesGenerated,float MaxPa
BarWidth = (unsigned) (((NumPagesGenerated * (float) MaxBarWidth) / MaxPagesGenerated) + 0.5);
if (BarWidth == 0)
BarWidth = 1;
fprintf (Gbl.F.Out,"<img src=\"%s/%c1x14.gif\" width=\"%u\" height=\"14\" style=\"vertical-align:top;\" alt=\"\" />"
fprintf (Gbl.F.Out,"<img src=\"%s/%c1x14.gif\" alt=\"\""
" style=\"width:%upx; height:14px;"
" vertical-align:top;\" />"
"&nbsp;",
Gbl.Prefs.IconsURL,Color,BarWidth);
@ -3524,7 +3532,7 @@ static void Sta_WriteSelectedRangeOfDates (unsigned NumDays)
char StrDatesRange[1024];
sprintf (StrDateIni,"%02u/%02u/%04u",Gbl.DateRange.DateIni.Day,Gbl.DateRange.DateIni.Month,Gbl.DateRange.DateIni.Year);
fprintf (Gbl.F.Out,"<p class=\"DAT\" align=\"center\">");
fprintf (Gbl.F.Out,"<p class=\"DAT\" style=\"text-align:center;\">");
if (NumDays == 1)
fprintf (Gbl.F.Out,"%s: %s (%s)",Txt_Date,StrDateIni,Txt_one_day);
else
@ -3859,7 +3867,7 @@ static void Sta_GetAndShowNumCtysInSWAD (void)
/***** Write number of countries *****/
fprintf (Gbl.F.Out,"<tr>"
"<td align=\"left\" class=\"TIT_TBL\" style=\"text-align:left;\">"
"<td class=\"TIT_TBL\" style=\"text-align:left;\">"
"%s:"
"</td>"
"<td class=\"DAT\" style=\"text-align:right;\">"
@ -5736,7 +5744,7 @@ static void Sta_WriteForumTotalStats (struct Sta_StatsForum *StatsForum)
/***** Write forum name and stats *****/
fprintf (Gbl.F.Out,"<tr>"
"<td width=\"16\" style=\"width:16px; %s\">"
"<td style=\"width:16px; %s\">"
"</td>"
"<td class=\"DAT_N\" style=\"text-align:left; vertical-align:top; %s\">"
"%s"

9
swad_survey.c
View File

@ -512,7 +512,7 @@ static void Svy_ShowOneSurvey (long SvyCod,struct SurveyQuestion *SvyQst,bool Sh
Str_ChangeFormat (Str_FROM_HTML,Str_TO_RIGOROUS_HTML,
Txt,Cns_MAX_BYTES_TEXT,false); // Convert from HTML to recpectful HTML
Str_InsertLinkInURLs (Txt,Cns_MAX_BYTES_TEXT,60); // Insert links
fprintf (Gbl.F.Out,"<p align=\"justify\" class=\"%s\">"
fprintf (Gbl.F.Out,"<p class=\"%s\" style=\"text-align:justify;\">"
"<br />%s<br />&nbsp;</p></td>"
"</tr>",
Svy.Status.Visible ? "DAT" :
@ -3158,7 +3158,7 @@ static void Svy_WriteQstStem (const char *Stem,const char *TextStyle)
/* Write the stem */
fprintf (Gbl.F.Out,"<td class=\"%s\" style=\"text-align:left;"
" vertical-align:top; background-color:%s;\">"
"<p align=\"justify\">"
"<p style=\"text-align:justify;\">"
"<tt>%s</tt>"
"</p>",
TextStyle,Gbl.ColorRows[Gbl.RowEvenOdd],HeadingRigorousHTML);
@ -3269,7 +3269,10 @@ static void Svy_DrawBarNumUsrs (unsigned NumUsrs,unsigned MaxUsrs)
(float) MaxUsrs) + 0.5);
if (BarWidth < 2)
BarWidth = 2;
fprintf (Gbl.F.Out,"<img src=\"%s/c1x16.gif\" width=\"%u\" height=\"16\" style=\"vertical-align:top;\" alt=\"\" />&nbsp;",
fprintf (Gbl.F.Out,"<img src=\"%s/c1x16.gif\" alt=\"\""
" style=\"width:%upx; height:16px;"
" vertical-align:top;\" />"
"&nbsp;",
Gbl.Prefs.IconsURL,BarWidth);
/***** Write the number of users *****/

19
swad_test.c
View File

@ -982,7 +982,7 @@ void Tst_WriteQstStem (const char *Stem,const char *ClassStem)
StemRigorousHTML,StemLength,false);
/***** Write the stem *****/
fprintf (Gbl.F.Out,"<p align=\"justify\" class=\"%s\">"
fprintf (Gbl.F.Out,"<p class=\"%s\" style=\"text-align:justify;\">"
"<tt>%s</tt>"
"</p>",
ClassStem,StemRigorousHTML);
@ -1013,7 +1013,7 @@ void Tst_WriteQstFeedback (const char *Feedback,const char *ClassFeedback)
FeedbackRigorousHTML,FeedbackLength,false);
/***** Write the feedback *****/
fprintf (Gbl.F.Out,"<p align=\"justify\" class=\"%s\">"
fprintf (Gbl.F.Out,"<p class=\"%s\" style=\"text-align:justify;\">"
"<tt>%s</tt>"
"</p>",
ClassFeedback,FeedbackRigorousHTML);
@ -2792,7 +2792,7 @@ static void Tst_WriteAnswersOfAQstEdit (long QstCod)
/* Write the text of the answer */
fprintf (Gbl.F.Out,"<td class=\"TEST_EDI\" style=\"text-align:left;"
" vertical-align:top;\">"
"<p align=\"justify\">"
"<p style=\"text-align:justify;\">"
"<tt>%s</tt>"
"</p>"
"</td>",
@ -2803,7 +2803,7 @@ static void Tst_WriteAnswersOfAQstEdit (long QstCod)
" style=\"text-align:left;"
" vertical-align:top;\">");
if (LengthFeedback)
fprintf (Gbl.F.Out,"<p align=\"justify\">"
fprintf (Gbl.F.Out,"<p style=\"text-align:justify;\">"
"<tt>%s</tt>"
"</p>",
Feedback);
@ -3083,7 +3083,7 @@ static void Tst_WriteChoiceAnsSeeExam (unsigned NumQst,long QstCod,bool Shuffle)
/***** Write the option text *****/
fprintf (Gbl.F.Out,"<td class=\"TEST_EXA\" style=\"text-align:left;"
" vertical-align:top;\">"
"<p align=\"justify\">"
"<p style=\"text-align:justify;\">"
"<tt>%s</tt>"
"</p>"
"</td>"
@ -3246,14 +3246,14 @@ static void Tst_WriteChoiceAnsAssessExam (unsigned NumQst,MYSQL_RES *mysql_res,
/* Answer text and feedback */
fprintf (Gbl.F.Out,"<td style=\"text-align:left; vertical-align:top;\">"
"<p align=\"justify\" class=\"TEST_EXA\">"
"<p class=\"TEST_EXA\" style=\"text-align:justify;\">"
"<tt>%s</tt>"
"</p>",
Gbl.Test.Answer.Options[Indexes[NumOpt]].Text);
if (Gbl.Test.Config.FeedbackType == Tst_FEEDBACK_FULL_FEEDBACK)
if (Gbl.Test.Answer.Options[Indexes[NumOpt]].Feedback)
if (Gbl.Test.Answer.Options[Indexes[NumOpt]].Feedback[0])
fprintf (Gbl.F.Out,"<p align=\"justify\" class=\"TEST_EXA_LIGHT\">"
fprintf (Gbl.F.Out,"<p class=\"TEST_EXA_LIGHT\" style=\"text-align:justify;\">"
"<tt>%s</tt>"
"</p>",
Gbl.Test.Answer.Options[Indexes[NumOpt]].Feedback);
@ -3452,14 +3452,15 @@ static void Tst_WriteTextAnsAssessExam (unsigned NumQst,MYSQL_RES *mysql_res,
/* Answer text and feedback */
fprintf (Gbl.F.Out,"<td style=\"text-align:left;"
" vertical-align:top;\">"
"<p align=\"justify\" class=\"ANS\">"
"<p class=\"ANS\" style=\"text-align:justify;\">"
"%s"
"</p>",
Gbl.Test.Answer.Options[NumOpt].Text);
if (Gbl.Test.Config.FeedbackType == Tst_FEEDBACK_FULL_FEEDBACK)
if (Gbl.Test.Answer.Options[NumOpt].Feedback)
if (Gbl.Test.Answer.Options[NumOpt].Feedback[0])
fprintf (Gbl.F.Out,"<p align=\"justify\" class=\"TEST_EXA_LIGHT\">"
fprintf (Gbl.F.Out,"<p class=\"TEST_EXA_LIGHT\""
" style=\"text-align:justify;\">"
"<tt>%s</tt>"
"</p>",
Gbl.Test.Answer.Options[NumOpt].Feedback);

3
swad_timetable.c
View File

@ -1130,7 +1130,8 @@ static void TT_TimeTableDrawCell (unsigned Day,unsigned Hour,unsigned Column,uns
case TT_CRS_SHOW:
case TT_TUT_SHOW:
if (HourType == TT_FREE_HOUR) // If cell is empty...
fprintf (Gbl.F.Out,"<img src=\"%s/tr1x16.gif\" width=\"1\" height=\"16\" />",
fprintf (Gbl.F.Out,"<img src=\"%s/tr1x16.gif\""
" style=\"width:1px; height:16px;\" />",
Gbl.Prefs.IconsURL);
else
{

4
swad_user.c
View File

@ -1376,8 +1376,8 @@ void Usr_WelcomeUsr (void)
if ((CongratulateMyBirthday = Usr_CheckIfMyBirthdayHasNotBeenCongratulated ()))
{
Usr_InsertMyBirthday ();
fprintf (Gbl.F.Out,"<img src=\"%s/%s/cake128x128.gif\""
" alt=\"\" width=\"128\" height=\"128\" />",
fprintf (Gbl.F.Out,"<img src=\"%s/%s/cake128x128.gif\" alt=\"\""
" style=\"width:128px; height:128px;\" />",
Gbl.Prefs.PathIconSet,Cfg_ICON_128x128);
sprintf (Gbl.Message,Txt_Welcome_X_and_happy_birthday[Gbl.Usrs.Me.UsrDat.Sex],
Gbl.Usrs.Me.UsrDat.FirstName);