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

Version19.46.2

This commit is contained in:
Antonio Cañas Vargas 2019-10-28 21:24:07 +01:00
parent 26ccde3e21
commit 1aa2f512b0
19 changed files with 141 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swad_changelog.h
View File

@ -487,13 +487,14 @@ enscript -2 --landscape --color --file-align=2 --highlight --line-numbers -o - *
En OpenSWAD:
ps2pdf source.ps destination.pdf
*/
#define Log_PLATFORM_VERSION "SWAD 19.46.1 (2019-10-28)"
#define Log_PLATFORM_VERSION "SWAD 19.46.2 (2019-10-28)"
#define CSS_FILE "swad19.45.css"
#define JS_FILE "swad19.39.js"
/*
// TODO: Hacer un nuevo rol en los TFG: tutor externo (profesor de áreas no vinculadas con el centro, profesionales de empresas, etc.)
// TODO: Impedir la creación y edición de proyectos si no son editables.
Version 19.46.2: Oct 28, 2019 Code refactoring in HTML images. (246519 lines)
Version 19.46.1: Oct 28, 2019 Code refactoring in HTML anchors. (246523 lines)
Version 19.46: Oct 28, 2019 Code refactoring in HTML anchors. (246541 lines)
Version 19.45.2: Oct 27, 2019 Code refactoring in HTML forms. (246498 lines)

5
swad_chat.c
View File

@ -132,12 +132,11 @@ void Cht_ShowListOfAvailableChatRooms (void)
HTM_LI_Begin ("class=\"DAT\"");
fprintf (Gbl.F.Out,"<img src=\"%s/comments.svg\""
" alt=\"%s\" title=\"%s\""
" class=\"ICO16x16\" />"
" %s",
" class=\"ICO16x16\" />",
Cfg_URL_ICON_PUBLIC,
Txt_Chat_rooms,
Txt_Chat_rooms,
Txt_Chat_rooms);
fprintf (Gbl.F.Out," %s",Txt_Chat_rooms);
HTM_LI_End ();
/***** Link to chat available for all the users *****/

15
swad_course.c
View File

@ -597,11 +597,11 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
NULL);
fprintf (Gbl.F.Out,"<img src=\"%s/sitemap.svg\""
" alt=\"%s\" title=\"%s\""
" class=\"ICO16x16\" />&nbsp;%s",
" class=\"ICO16x16\" />);",
Cfg_URL_ICON_PUBLIC,
Txt_System,
Txt_System,
Txt_System);
fprintf (Gbl.F.Out,"&nbsp;%s",Txt_System);
Frm_LinkFormEnd ();
Frm_EndForm ();
HTM_LI_End ();
@ -635,13 +635,13 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
/* Country map */
fprintf (Gbl.F.Out,"<img src=\"%s/%s/%s.png\""
" alt=\"%s\" title=\"%s\""
" class=\"ICO16x16\" />&nbsp;%s",
" class=\"ICO16x16\" />);",
Cfg_URL_ICON_COUNTRIES_PUBLIC,
Cty.Alpha2,
Cty.Alpha2,
Cty.Alpha2,
Cty.Name[Gbl.Prefs.Language],
Cty.Name[Gbl.Prefs.Language]);
Cty.Name[Gbl.Prefs.Language]);
fprintf (Gbl.F.Out,"&nbsp;%s",Cty.Name[Gbl.Prefs.Language]);
Frm_LinkFormEnd ();
Frm_EndForm ();
HTM_LI_End ();
@ -777,12 +777,11 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
ClassNormal,NULL);
fprintf (Gbl.F.Out,"<img src=\"%s/list-ol.svg\""
" alt=\"%s\" title=\"%s\""
" class=\"ICO16x16\" />"
"&nbsp;%s",
" class=\"ICO16x16\" />",
Cfg_URL_ICON_PUBLIC,
Crs.ShrtName,
Crs.FullName,
Crs.FullName);
fprintf (Gbl.F.Out,"&nbsp;%s",Crs.FullName);
Frm_LinkFormEnd ();
Frm_EndForm ();

5
swad_degree.c
View File

@ -2521,12 +2521,11 @@ void Hie_GetAndWriteInsCtrDegAdminBy (long UsrCod,unsigned ColSpan)
case Hie_SYS: // System
fprintf (Gbl.F.Out,"<img src=\"%s/swad64x64.png\""
" alt=\"%s\" title=\"%s\""
" class=\"ICO16x16\" />"
"&nbsp;%s",
" class=\"ICO16x16\" />",
Cfg_URL_ICON_PUBLIC,
Txt_all_degrees,
Txt_all_degrees,
Txt_all_degrees);
fprintf (Gbl.F.Out,"&nbsp;%s",Txt_all_degrees);
break;
case Hie_INS: // Institution
Ins.InsCod = Str_ConvertStrCodToLongCod (row[1]);

45
swad_figure.c
View File

@ -598,46 +598,51 @@ static void Fig_WriteHeadHierarchy (void)
HTM_TH_Begin (1,1,"RM");
fprintf (Gbl.F.Out,"<img src=\"%s/globe.svg\""
" alt=\"%s\" title=\"%s\""
" class=\"CONTEXT_ICO_x16\" />"
"<br />"
"%s",
Cfg_URL_ICON_PUBLIC,Txt_Countries,Txt_Countries,Txt_Countries);
" class=\"CONTEXT_ICO_x16\" />",
Cfg_URL_ICON_PUBLIC,
Txt_Countries,
Txt_Countries);
fprintf (Gbl.F.Out,"<br />%s",Txt_Countries);
HTM_TH_End ();
HTM_TH_Begin (1,1,"RM");
fprintf (Gbl.F.Out,"<img src=\"%s/university.svg\""
" alt=\"%s\" title=\"%s\""
" class=\"CONTEXT_ICO_x16\" />"
"<br />"
"%s",
Cfg_URL_ICON_PUBLIC,Txt_Institutions,Txt_Institutions,Txt_Institutions);
" class=\"CONTEXT_ICO_x16\" />",
Cfg_URL_ICON_PUBLIC,
Txt_Institutions,
Txt_Institutions);
fprintf (Gbl.F.Out,"<br />%s",Txt_Institutions);
HTM_TH_End ();
HTM_TH_Begin (1,1,"RM");
fprintf (Gbl.F.Out,"<img src=\"%s/building.svg\""
" alt=\"%s\" title=\"%s\""
" class=\"CONTEXT_ICO_x16\" />"
"<br />"
"%s",
Cfg_URL_ICON_PUBLIC,Txt_Centres,Txt_Centres,Txt_Centres);
" class=\"CONTEXT_ICO_x16\" />",
Cfg_URL_ICON_PUBLIC,
Txt_Centres,
Txt_Centres);
fprintf (Gbl.F.Out,"<br />%s",Txt_Centres);
HTM_TH_End ();
HTM_TH_Begin (1,1,"RM");
fprintf (Gbl.F.Out,"<img src=\"%s/graduation-cap.svg\""
" alt=\"%s\" title=\"%s\""
" class=\"CONTEXT_ICO_x16\" />"
"<br />"
"%s",
Cfg_URL_ICON_PUBLIC,Txt_Degrees,Txt_Degrees,Txt_Degrees);
" class=\"CONTEXT_ICO_x16\" />",
Cfg_URL_ICON_PUBLIC,
Txt_Degrees,
Txt_Degrees);
fprintf (Gbl.F.Out,"<br />%s",Txt_Degrees);
HTM_TH_End ();
HTM_TH_Begin (1,1,"RM");
fprintf (Gbl.F.Out,"<img src=\"%s/list-ol.svg\""
" alt=\"%s\" title=\"%s\""
" class=\"CONTEXT_ICO_x16\" />"
"<br />"
"%s",
Cfg_URL_ICON_PUBLIC,Txt_Courses,Txt_Courses,Txt_Courses);
" class=\"CONTEXT_ICO_x16\" />",
Cfg_URL_ICON_PUBLIC,
Txt_Courses,
Txt_Courses);
fprintf (Gbl.F.Out,"<br />%s",Txt_Courses);
HTM_TH_End ();
HTM_TR_End ();

22
swad_file_browser.c
View File

@ -3295,12 +3295,12 @@ static void Brw_FormToChangeCrsGrpZone (void)
fprintf (Gbl.F.Out,"<img src=\"%s/%s20x20.gif\""
" alt=\"\" title=\"\""
" class=\"ICO25x25\""
" style=\"margin-left:6px;\" />"
"<label>"
"<input type=\"radio\" name=\"GrpCod\" value=\"%ld\"",
" style=\"margin-left:6px;\" />",
Cfg_URL_ICON_PUBLIC,
NumGrp < LstMyGrps.NumGrps - 1 ? "submid" :
"subend",
"subend");
fprintf (Gbl.F.Out,"<label>"
"<input type=\"radio\" name=\"GrpCod\" value=\"%ld\"",
GrpDat.GrpCod);
if (IsGroupZone && GrpDat.GrpCod == Gbl.Crs.Grps.GrpCod)
fprintf (Gbl.F.Out," checked=\"checked\"");
@ -10050,12 +10050,13 @@ static void Brw_WriteBigLinkToDownloadFile (const char *URL,
Brw_PutIconFile (32,FileMetadata->FilFolLnk.Type,FileMetadata->FilFolLnk.Name);
/* Name of the file of marks, link end and form end */
fprintf (Gbl.F.Out,"&nbsp;%s&nbsp;"
"<img src=\"%s/grades32x32.gif\""
fprintf (Gbl.F.Out,"&nbsp;%s&nbsp;",FileNameToShow);
fprintf (Gbl.F.Out,"<img src=\"%s/grades32x32.gif\""
" alt=\"%s\" title=\"%s\""
" class=\"ICO40x40\" />",
FileNameToShow,Cfg_URL_ICON_PUBLIC,
Txt_Check_marks_in_the_file,Txt_Check_marks_in_the_file);
Cfg_URL_ICON_PUBLIC,
Txt_Check_marks_in_the_file,
Txt_Check_marks_in_the_file);
Frm_LinkFormEnd ();
Frm_EndForm ();
}
@ -10068,11 +10069,10 @@ static void Brw_WriteBigLinkToDownloadFile (const char *URL,
HTM_A_Begin ("href=\"%s\" class=\"FILENAME_TXT\" title=\"%s\" target=\"_blank\"",
URL,Title);
Brw_PutIconFile (32,FileMetadata->FilFolLnk.Type,FileMetadata->FilFolLnk.Name);
fprintf (Gbl.F.Out,"&nbsp;%s&nbsp;"
"<img src=\"%s/download.svg\""
fprintf (Gbl.F.Out,"&nbsp;%s&nbsp;",FileNameToShow);
fprintf (Gbl.F.Out,"<img src=\"%s/download.svg\""
" alt=\"%s\" title=\"%s\""
" class=\"ICO40x40\" />",
FileNameToShow,
Cfg_URL_ICON_PUBLIC,
Title,Title);
HTM_A_End ();

9
swad_forum.c
View File

@ -1245,17 +1245,16 @@ static void For_ShowAForumPost (unsigned PstNum,long PstCod,
Enabled ? Txt_FORUM_Post_X_allowed :
Txt_FORUM_Post_X_banned,
PstNum);
fprintf (Gbl.F.Out,"<span title=\"%s\">"
"<img src=\"%s/%s\""
fprintf (Gbl.F.Out,"<span title=\"%s\">",Gbl.Title); // TODO: Remove?
fprintf (Gbl.F.Out,"<img src=\"%s/%s\""
" alt=\"%s\" title=\"%s\""
" class=\"ICO_HIDDEN ICO16x16\" />"
"</span>",
Gbl.Title,
" class=\"ICO_HIDDEN ICO16x16\" />",
Cfg_URL_ICON_PUBLIC,
Enabled ? "eye.svg" :
"eye-slash.svg",
Gbl.Title,
Gbl.Title);
fprintf (Gbl.F.Out,"</span>"); // TODO: Remove?
}
/***** Form to remove post *****/

33
swad_icon.c
View File

@ -382,10 +382,9 @@ void Ico_PutIconTextLink (const char *Icon,const char *Text)
/***** Print icon and optional text *****/
HTM_DIV_Begin ("class=\"CONTEXT_OPT ICO_HIGHLIGHT\"");
fprintf (Gbl.F.Out,"<img src=\"%s/%s\" alt=\"%s\" title=\"%s\""
" class=\"CONTEXT_ICO_x16\" />"
"&nbsp;%s",
Cfg_URL_ICON_PUBLIC,Icon,Text,Text,
Text);
" class=\"CONTEXT_ICO_x16\" />",
Cfg_URL_ICON_PUBLIC,Icon,Text,Text);
fprintf (Gbl.F.Out,"&nbsp;%s",Text);
HTM_DIV_End ();
}
@ -421,14 +420,17 @@ void Ico_PutIconOff (const char *Icon,const char *Title)
void Ico_PutCalculateIcon (const char *Title)
{
HTM_DIV_Begin ("class=\"CONTEXT_OPT ICO_HIGHLIGHT\"");
fprintf (Gbl.F.Out,"<img id=\"update_%d\" src=\"%s/recycle16x16.gif\"" // TODO: change name and resolution to refresh64x64.png
" alt=\"%s\" title=\"%s\""
" class=\"CONTEXT_ICO_16x16\" />"
"<img id=\"updating_%d\" src=\"%s/working16x16.gif\"" // TODO: change name and resolution to refreshing64x64.gif
" class=\"CONTEXT_ICO_16x16\" />",
Gbl.Form.Num,Cfg_URL_ICON_PUBLIC,Title,Title);
fprintf (Gbl.F.Out,"<img id=\"updating_%d\" src=\"%s/working16x16.gif\"" // TODO: change name and resolution to refreshing64x64.gif
" alt=\"%s\" title=\"%s\""
" class=\"CONTEXT_ICO_16x16\" style=\"display:none;\" />", // Animated icon hidden
Gbl.Form.Num,Cfg_URL_ICON_PUBLIC,Title,Title,
Gbl.Form.Num,Cfg_URL_ICON_PUBLIC,Title,Title);
HTM_DIV_End ();
}
@ -440,16 +442,19 @@ void Ico_PutCalculateIcon (const char *Title)
void Ico_PutCalculateIconWithText (const char *Text)
{
HTM_DIV_Begin ("class=\"ICO_HIGHLIGHT\" style=\"margin:0 6px 0 0; display:inline;\"");
fprintf (Gbl.F.Out,"<img id=\"update_%d\" src=\"%s/recycle16x16.gif\""
" alt=\"%s\" title=\"%s\""
" class=\"ICO20x20\" />"
"<img id=\"updating_%d\" src=\"%s/working16x16.gif\""
" class=\"ICO20x20\" />",
Gbl.Form.Num,Cfg_URL_ICON_PUBLIC,Text,Text);
fprintf (Gbl.F.Out,"<img id=\"updating_%d\" src=\"%s/working16x16.gif\""
" alt=\"%s\" title=\"%s\""
" class=\"ICO20x20\" style=\"display:none;\" />" // Animated icon hidden
"&nbsp;%s",
Gbl.Form.Num,Cfg_URL_ICON_PUBLIC,Text,Text,
Gbl.Form.Num,Cfg_URL_ICON_PUBLIC,Text,Text,
Text);
" class=\"ICO20x20\" style=\"display:none;\" />", // Animated icon hidden
Gbl.Form.Num,Cfg_URL_ICON_PUBLIC,Text,Text);
fprintf (Gbl.F.Out,"&nbsp;%s",Text);
HTM_DIV_End ();
}

5
swad_layout.c
View File

@ -1684,11 +1684,10 @@ void Lay_AdvertisementMobile (void)
HTM_TD_Begin ("class=\"DAT CM\"");
HTM_A_Begin ("href=\"https://play.google.com/store/apps/details?id=es.ugr.swad.swadroid\""
" class=\"DAT\"");
fprintf (Gbl.F.Out,"%s<br /><br />"
"<img src=\"%s/SWADroid200x300.png\""
fprintf (Gbl.F.Out,"%s<br /><br />",Txt_Stay_connected_with_SWADroid);
fprintf (Gbl.F.Out,"<img src=\"%s/SWADroid200x300.png\""
" alt=\"SWADroid\" title=\"%s\""
" style=\"width:250px; height:375px;\" />",
Txt_Stay_connected_with_SWADroid,
Cfg_URL_ICON_PUBLIC,
Txt_Stay_connected_with_SWADroid);
HTM_A_End ();

5
swad_match.c
View File

@ -2809,11 +2809,12 @@ static void Mch_DrawScoreRow (double Score,double MinScore,double MaxScore,
HTM_TD_Begin ("class=\"MCH_SCO_NUM%s\"",Mch_GetClassBorder (NumRow));
fprintf (Gbl.F.Out,"<img src=\"%s/score%u_1x1.png\"" // Background
" alt=\"\" title=\"%u %s\" class=\"MCH_SCO_BAR\""
" style=\"width:%u%%;\" />&nbsp;%u",
" style=\"width:%u%%;\" />",
Cfg_URL_ICON_PUBLIC,Color,
NumUsrs,NumUsrs == 1 ? Txt_ROLES_SINGUL_abc[Rol_STD][Usr_SEX_UNKNOWN] :
Txt_ROLES_PLURAL_abc[Rol_STD][Usr_SEX_UNKNOWN],
BarWidth,NumUsrs);
BarWidth);
fprintf (Gbl.F.Out,"&nbsp;%u",NumUsrs);
HTM_TD_End ();
HTM_TR_End ();

19
swad_network.c
View File

@ -324,17 +324,17 @@ void Net_ShowFormMyWebsAndSocialNets (void)
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"REC_C1_BOT LM\"");
fprintf (Gbl.F.Out,"<label for=\"URL%u\" class=\"%s\">"
"<img src=\"%s/%s\""
fprintf (Gbl.F.Out,"<label for=\"URL%u\" class=\"%s\">",
(unsigned) NumURL,The_ClassFormInBox[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"<img src=\"%s/%s\""
" alt=\"%s\" title=\"%s\""
" class=\"CONTEXT_ICO_16x16\""
" style=\"margin-right:6px;\" />"
"%s:"
"</label>",
(unsigned) NumURL,The_ClassFormInBox[Gbl.Prefs.Theme],
" style=\"margin-right:6px;\" />",
Cfg_URL_ICON_PUBLIC,Net_WebsAndSocialNetworksIcons[NumURL],
Net_WebsAndSocialNetworksTitle[NumURL],
Net_WebsAndSocialNetworksTitle[NumURL],
Net_WebsAndSocialNetworksTitle[NumURL]);
fprintf (Gbl.F.Out,"%s:"
"</label>",
Net_WebsAndSocialNetworksTitle[NumURL]);
HTM_TD_End ();
@ -589,12 +589,11 @@ void Net_ShowWebAndSocialNetworksStats (void)
fprintf (Gbl.F.Out,"<img src=\"%s/%s\""
" alt=\"%s\" title=\"%s\""
" class=\"CONTEXT_ICO_16x16\""
" style=\"margin-right:6px;\" />"
"%s",
" style=\"margin-right:6px;\" />",
Cfg_URL_ICON_PUBLIC,Net_WebsAndSocialNetworksIcons[Web],
Net_WebsAndSocialNetworksTitle[Web],
Net_WebsAndSocialNetworksTitle[Web],
Net_WebsAndSocialNetworksTitle[Web]);
fprintf (Gbl.F.Out,"%s",Net_WebsAndSocialNetworksTitle[Web]);
HTM_TD_End ();
HTM_TD_Begin ("class=\"DAT RM\"");

8
swad_notification.c
View File

@ -2058,16 +2058,18 @@ void Ntf_WriteNumberOfNewNtfs (void)
/***** Icon and number of new notifications *****/
if (NumNewNtfs)
{
fprintf (Gbl.F.Out,"<img src=\"%s/bell.svg\""
" alt=\"%s\" title=\"%s\""
" class=\"ICO16x16\" />"
"&nbsp;%u<span id=\"notif_new\">&nbsp;%s</span>",
" class=\"ICO16x16\" />",
Gbl.Prefs.URLTheme,
Txt_Notifications,
Txt_Notifications,
Txt_Notifications);
fprintf (Gbl.F.Out,"&nbsp;%u<span id=\"notif_new\">&nbsp;%s</span>",
NumNewNtfs,
NumNewNtfs == 1 ? Txt_NOTIF_new_SINGULAR :
Txt_NOTIF_new_PLURAL);
}
/***** End form *****/
Frm_LinkFormEnd ();

7
swad_photo.c
View File

@ -900,14 +900,13 @@ static void Pho_UpdatePhoto2 (void)
HTM_TD_Begin ("class=\"DAT CT\" style=\"width:33%%;\"");
fprintf (Gbl.F.Out,"<img src=\"%s/%s_paso%u.jpg\""
" alt=\"%s\" title=\"%s\""
" style=\"width:%upx; height:%upx;\" />"
"<br />%s",
" style=\"width:%upx; height:%upx;\" />",
Cfg_URL_PHOTO_TMP_PUBLIC,
Gbl.Usrs.FileNamePhoto,NumPhoto + 1,
Txt_PHOTO_PROCESSING_CAPTIONS[NumPhoto],
Txt_PHOTO_PROCESSING_CAPTIONS[NumPhoto],
Pho_PHOTO_REAL_WIDTH,Pho_PHOTO_REAL_HEIGHT,
Txt_PHOTO_PROCESSING_CAPTIONS[NumPhoto]);
Pho_PHOTO_REAL_WIDTH,Pho_PHOTO_REAL_HEIGHT);
fprintf (Gbl.F.Out,"<br />%s",Txt_PHOTO_PROCESSING_CAPTIONS[NumPhoto]);
HTM_TD_End ();
}
HTM_TR_End ();

7
swad_report.c
View File

@ -279,11 +279,10 @@ static void Rep_PutLinkToMyUsageReport (struct Rep_Report *Report)
Report->Permalink,
Txt_Report);
fprintf (Gbl.F.Out,"<img src=\"%s/file-alt.svg\" alt=\"%s\""
" class=\"ICO64x64\" /><br />"
"%s",
" class=\"ICO64x64\" />",
Cfg_URL_ICON_PUBLIC,
Txt_Report,
Report->FilenameReport);
Txt_Report);
fprintf (Gbl.F.Out,"<br />%s",Report->FilenameReport);
HTM_A_End ();
HTM_DIV_End ();

10
swad_statistic.c
View File

@ -1867,15 +1867,17 @@ static void Sta_ShowNumHitsPerUsr (unsigned long NumRows,MYSQL_RES *mysql_res)
HTM_TD_Begin ("class=\"LOG LT COLOR%u\"",Gbl.RowEvenOdd);
if (BarWidth)
{
fprintf (Gbl.F.Out,"<img src=\"%s/%c1x1.png\"" // Background
" alt=\"\" title=\"\""
" class=\"LT\""
" style=\"width:%upx; height:10px; padding-top:4px;\" />"
"&nbsp;",
" style=\"width:%upx; height:10px; padding-top:4px;\" />",
Cfg_URL_ICON_PUBLIC,
UsrDat.Roles.InCurrentCrs.Role == Rol_STD ? 'o' : // Student
'r', // Non-editing teacher or teacher
BarWidth);
fprintf (Gbl.F.Out,"&nbsp;");
}
Str_WriteFloatNumToFile (Gbl.F.Out,Hits.Num);
fprintf (Gbl.F.Out,"&nbsp;");
HTM_TD_End ();
@ -3855,9 +3857,9 @@ static void Sta_DrawBarNumHits (char Color,
fprintf (Gbl.F.Out,"<img src=\"%s/%c1x1.png\"" // Background
" alt=\"\" title=\"\""
" class=\"LM\""
" style=\"width:%upx; height:10px;\" />"
"&nbsp;",
" style=\"width:%upx; height:10px;\" />",
Cfg_URL_ICON_PUBLIC,Color,BarWidth);
fprintf (Gbl.F.Out,"&nbsp;");
/***** Write the number of hits *****/
Str_WriteFloatNumToFile (Gbl.F.Out,HitsNum);

15
swad_survey.c
View File

@ -3528,16 +3528,15 @@ static void Svy_DrawBarNumUsrs (unsigned NumUsrs,unsigned MaxUsrs)
if (BarWidth < 2)
BarWidth = 2;
fprintf (Gbl.F.Out,"<img src=\"%s/o1x1.png\" alt=\"%s\" title=\"%s\""
" class=\"LT\" style=\"width:%upx; height:20px;\" />"
"&nbsp;",
Cfg_URL_ICON_PUBLIC,
Gbl.Title,
Gbl.Title,
BarWidth);
" class=\"LT\" style=\"width:%upx; height:20px;\" />",
Cfg_URL_ICON_PUBLIC,
Gbl.Title,
Gbl.Title,
BarWidth);
fprintf (Gbl.F.Out,"&nbsp;");
/***** Write the number of users *****/
fprintf (Gbl.F.Out,"%s",
Gbl.Title);
fprintf (Gbl.F.Out,"%s",Gbl.Title);
HTM_TD_End ();
}

18
swad_timeline.c
View File

@ -1427,14 +1427,13 @@ static void TL_PutLinkToViewOldPublications (void)
The_ClassFormInBoxBold[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"<img id=\"get_old_timeline\""
" src=\"%s/recycle16x16.gif\" alt=\"%s\" title=\"%s\""
" class=\"ICO20x20\" />"
"<img id=\"getting_old_timeline\""
" class=\"ICO20x20\" />",
Cfg_URL_ICON_PUBLIC,Txt_See_more,Txt_See_more);
fprintf (Gbl.F.Out,"<img id=\"getting_old_timeline\""
" src=\"%s/working16x16.gif\" alt=\"%s\" title=\"%s\""
" class=\"ICO20x20\" style=\"display:none;\" />" // Animated icon hidden
"&nbsp;%s",
Cfg_URL_ICON_PUBLIC,Txt_See_more,Txt_See_more,
Cfg_URL_ICON_PUBLIC,Txt_See_more,Txt_See_more,
Txt_See_more);
" class=\"ICO20x20\" style=\"display:none;\" />", // Animated icon hidden
Cfg_URL_ICON_PUBLIC,Txt_See_more,Txt_See_more);
fprintf (Gbl.F.Out,"&nbsp;%s",Txt_See_more);
HTM_A_End ();
HTM_DIV_End ();
}
@ -2034,12 +2033,11 @@ static void TL_PutFormGoToAction (const struct TL_Note *SocNot)
Frm_LinkFormSubmitUnique (Txt_TIMELINE_NOTE[SocNot->NoteType],Class);
fprintf (Gbl.F.Out,"<img src=\"%s/%s\""
" alt=\"%s\" title=\"%s\""
" class=\"CONTEXT_ICO_x16\" />"
"&nbsp;%s",
" class=\"CONTEXT_ICO_x16\" />",
Cfg_URL_ICON_PUBLIC,TL_Icons[SocNot->NoteType],
Txt_TIMELINE_NOTE[SocNot->NoteType],
Txt_TIMELINE_NOTE[SocNot->NoteType],
Txt_TIMELINE_NOTE[SocNot->NoteType]);
fprintf (Gbl.F.Out,"&nbsp;%s",Txt_TIMELINE_NOTE[SocNot->NoteType]);
Frm_LinkFormEnd ();
Frm_EndForm ();

35
swad_user.c
View File

@ -2607,17 +2607,17 @@ void Usr_WriteFormLogin (Act_Action_t NextAction,void (*FuncParams) (void))
/***** User's ID/nickname *****/
HTM_DIV_Begin ("class=\"LM\"");
fprintf (Gbl.F.Out,"<label for=\"UsrId\">"
"<img src=\"%s/user.svg\" alt=\"%s\" title=\"%s\""
" class=\"CONTEXT_ICO_16x16\" />"
"</label>"
"<input type=\"text\" id=\"UsrId\" name=\"UsrId\""
fprintf (Gbl.F.Out,"<label for=\"UsrId\">");
fprintf (Gbl.F.Out,"<img src=\"%s/user.svg\" alt=\"%s\" title=\"%s\""
" class=\"CONTEXT_ICO_16x16\" />",
Cfg_URL_ICON_PUBLIC,
Txt_User[Usr_SEX_UNKNOWN],
Txt_User[Usr_SEX_UNKNOWN]);
fprintf (Gbl.F.Out,"</label>");
fprintf (Gbl.F.Out,"<input type=\"text\" id=\"UsrId\" name=\"UsrId\""
" size=\"18\" maxlength=\"%u\" placeholder=\"%s\""
" value=\"%s\""
" autofocus=\"autofocus\" required=\"required\" />",
Cfg_URL_ICON_PUBLIC,
Txt_User[Usr_SEX_UNKNOWN],
Txt_User[Usr_SEX_UNKNOWN],
Cns_MAX_CHARS_EMAIL_ADDRESS,
Txt_nick_email_or_ID,
Gbl.Usrs.Me.UsrIdLogin);
@ -2625,15 +2625,15 @@ void Usr_WriteFormLogin (Act_Action_t NextAction,void (*FuncParams) (void))
/***** User's password *****/
HTM_DIV_Begin ("class=\"LM\"");
fprintf (Gbl.F.Out,"<label for=\"UsrPwd\">"
"<img src=\"%s/key.svg\" alt=\"%s\" title=\"%s\""
" class=\"CONTEXT_ICO_16x16\" />"
"</label>"
"<input type=\"password\" id=\"UsrPwd\" name=\"UsrPwd\""
" size=\"18\" maxlength=\"%u\" placeholder=\"%s\" />",
fprintf (Gbl.F.Out,"<label for=\"UsrPwd\">");
fprintf (Gbl.F.Out,"<img src=\"%s/key.svg\" alt=\"%s\" title=\"%s\""
" class=\"CONTEXT_ICO_16x16\" />",
Cfg_URL_ICON_PUBLIC,
Txt_Password,
Txt_Password,
Txt_Password);
fprintf (Gbl.F.Out,"</label>");
fprintf (Gbl.F.Out,"<input type=\"password\" id=\"UsrPwd\" name=\"UsrPwd\""
" size=\"18\" maxlength=\"%u\" placeholder=\"%s\" />",
Pwd_MAX_CHARS_PLAIN_PASSWORD,
Txt_password);
HTM_DIV_End ();
@ -6142,13 +6142,12 @@ static void Usr_FormToSelectUsrListType (void (*FuncParams) (void),
NULL);
fprintf (Gbl.F.Out,"<img src=\"%s/%s\""
" alt=\"%s\" title=\"%s\""
" class=\"ICO20x20\" />"
" %s",
" class=\"ICO20x20\" />",
Cfg_URL_ICON_PUBLIC,
Usr_IconsClassPhotoOrList[ListType],
Txt_USR_LIST_TYPES[ListType],
Txt_USR_LIST_TYPES[ListType],
Txt_USR_LIST_TYPES[ListType]);
fprintf (Gbl.F.Out," %s",Txt_USR_LIST_TYPES[ListType]);
Frm_LinkFormEnd ();
/***** End form *****/

13
swad_zip.c
View File

@ -573,15 +573,14 @@ static void ZIP_ShowLinkToDownloadZIP (const char *FileName,const char *URL,
URL,FileName);
fprintf (Gbl.F.Out,"<img src=\"%s32x32/zip32x32.gif\""
" alt=\"%s\" title=\"%s\""
" class=\"ICO40x40\" />"
"&nbsp;%s&nbsp;"
"<img src=\"%s/download.svg\""
" alt=\"%s\" title=\"%s\""
" class=\"ICO40x40\" />",
" class=\"ICO40x40\" />",
CfG_URL_ICON_FILEXT_PUBLIC,
Txt_ZIP_file,
Txt_ZIP_file,
FileName,
Txt_ZIP_file);
fprintf (Gbl.F.Out,"&nbsp;%s&nbsp;",FileName);
fprintf (Gbl.F.Out,"<img src=\"%s/download.svg\""
" alt=\"%s\" title=\"%s\""
" class=\"ICO40x40\" />",
Cfg_URL_ICON_PUBLIC,
Txt_Download,
Txt_Download);