Marown/swad-core
Marown/swad-core
1
0
Fork 0
mirror of https://github.com/acanas/swad-core.git synced 2024-06-01 14:25:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Version19.46.1

Browse Source
This commit is contained in:
Antonio Cañas Vargas 2019-10-28 20:38:29 +01:00
parent 088dabaa48
commit 26ccde3e21
32 changed files with 208 additions and 226 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
swad_RSS.c
View File

@ -62,6 +62,7 @@ void RSS_UpdateRSSFileForACrs (struct Course *Crs)
char PathRelPublRSSDir[PATH_MAX + 1]; char PathRelPublRSSDir[PATH_MAX + 1];
char PathRelPublRSSFile[PATH_MAX + 1]; char PathRelPublRSSFile[PATH_MAX + 1];
FILE *FileRSS; FILE *FileRSS;
char RSSLink[Cns_MAX_BYTES_WWW + 1];
struct tm *tm; struct tm *tm;
/***** Create RSS directory if not exists *****/ /***** Create RSS directory if not exists *****/
@ -85,7 +86,8 @@ void RSS_UpdateRSSFileForACrs (struct Course *Crs)
fprintf (FileRSS,"<channel>\n"); fprintf (FileRSS,"<channel>\n");
fprintf (FileRSS,"<atom:link href=\""); fprintf (FileRSS,"<atom:link href=\"");
RSS_WriteRSSLink (FileRSS,Crs->CrsCod); RSS_BuildRSSLink (RSSLink,Crs->CrsCod);
fprintf (FileRSS,"%s",RSSLink);
fprintf (FileRSS,"\" rel=\"self\" type=\"application/rss+xml\" />\n"); fprintf (FileRSS,"\" rel=\"self\" type=\"application/rss+xml\" />\n");
fprintf (FileRSS,"<title>%s: %s</title>\n", fprintf (FileRSS,"<title>%s: %s</title>\n",
@ -322,8 +324,9 @@ static void RSS_WriteExamAnnouncements (FILE *FileRSS,struct Course *Crs)
/********* Write URL to RSS archive with active notices in a course **********/ /********* Write URL to RSS archive with active notices in a course **********/
/*****************************************************************************/ /*****************************************************************************/
void RSS_WriteRSSLink (FILE *FileTgt,long CrsCod) void RSS_BuildRSSLink (char RSSLink[Cns_MAX_BYTES_WWW + 1],long CrsCod)
{ {
fprintf (FileTgt,"%s/%ld/%s/%s", snprintf (RSSLink,Cns_MAX_BYTES_WWW + 1,
Cfg_URL_CRS_PUBLIC,CrsCod,Cfg_RSS_FOLDER,Cfg_RSS_FILE); "%s/%ld/%s/%s",
Cfg_URL_CRS_PUBLIC,CrsCod,Cfg_RSS_FOLDER,Cfg_RSS_FILE);
} }

2
swad_RSS.h
View File

@ -40,6 +40,6 @@
/*****************************************************************************/ /*****************************************************************************/
void RSS_UpdateRSSFileForACrs (struct Course *Crs); void RSS_UpdateRSSFileForACrs (struct Course *Crs);
void RSS_WriteRSSLink (FILE *FileTgt,long CrsCod); void RSS_BuildRSSLink (char RSSLink[Cns_MAX_BYTES_WWW + 1],long CrsCod);
#endif #endif

6
swad_banner.c
View File

@ -153,9 +153,9 @@ static void Ban_WriteListOfBanners (void)
{ {
/* Write data of this banner */ /* Write data of this banner */
HTM_LI_Begin (NULL); HTM_LI_Begin (NULL);
fprintf (Gbl.F.Out,"<a href=\"%s\" title=\"%s\" class=\"DAT\" target=\"_blank\">", HTM_A_Begin ("href=\"%s\" title=\"%s\" class=\"DAT\" target=\"_blank\"",
Gbl.Banners.Lst[NumBan].WWW, Gbl.Banners.Lst[NumBan].WWW,
Gbl.Banners.Lst[NumBan].FullName); Gbl.Banners.Lst[NumBan].FullName);
fprintf (Gbl.F.Out,"<img src=\"%s/%s\"" fprintf (Gbl.F.Out,"<img src=\"%s/%s\""
" alt=\"%s\" title=\"%s\"" " alt=\"%s\" title=\"%s\""
" class=\"BANNER\" />", " class=\"BANNER\" />",

8
swad_box.c
View File

@ -171,8 +171,7 @@ static void Box_StartBoxInternal (const char *Width,const char *Title,
if (HelpLink) // Link to help if (HelpLink) // Link to help
{ {
fprintf (Gbl.F.Out,"<a href=\"%s%s\" target=\"_blank\">", HTM_A_Begin ("href=\"%s%s\" target=\"_blank\"",Hlp_WIKI,HelpLink);
Hlp_WIKI,HelpLink);
Ico_PutDivIcon ("CONTEXT_OPT HLP_HIGHLIGHT", Ico_PutDivIcon ("CONTEXT_OPT HLP_HIGHLIGHT",
"question.svg",Txt_Help); "question.svg",Txt_Help);
HTM_A_End (); HTM_A_End ();
@ -180,9 +179,8 @@ static void Box_StartBoxInternal (const char *Width,const char *Title,
if (Closable == Box_CLOSABLE) // Icon to close the box if (Closable == Box_CLOSABLE) // Icon to close the box
{ {
fprintf (Gbl.F.Out,"<a href=\"\"" HTM_A_Begin ("href=\"\" onclick=\"toggleDisplay('%s');return false;\"",
" onclick=\"toggleDisplay('%s');return false;\" />", Gbl.Box.Ids[Gbl.Box.Nested]);
Gbl.Box.Ids[Gbl.Box.Nested]);
Ico_PutDivIcon ("CONTEXT_OPT HLP_HIGHLIGHT", Ico_PutDivIcon ("CONTEXT_OPT HLP_HIGHLIGHT",
"close.svg",Txt_Close); "close.svg",Txt_Close);
HTM_A_End (); HTM_A_End ();

28
swad_centre.c
View File

@ -335,10 +335,10 @@ static void Ctr_Configuration (bool PrintView)
PutLink = !PrintView && Gbl.Hierarchy.Ctr.WWW[0]; PutLink = !PrintView && Gbl.Hierarchy.Ctr.WWW[0];
HTM_DIV_Begin ("class=\"FRAME_TITLE FRAME_TITLE_BIG\""); HTM_DIV_Begin ("class=\"FRAME_TITLE FRAME_TITLE_BIG\"");
if (PutLink) if (PutLink)
fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\"" HTM_A_Begin ("href=\"%s\" target=\"_blank\""
" class=\"FRAME_TITLE_BIG\" title=\"%s\">", " class=\"FRAME_TITLE_BIG\" title=\"%s\"",
Gbl.Hierarchy.Ctr.WWW, Gbl.Hierarchy.Ctr.WWW,
Gbl.Hierarchy.Ctr.FullName); Gbl.Hierarchy.Ctr.FullName);
Log_DrawLogo (Hie_CTR,Gbl.Hierarchy.Ctr.CtrCod, Log_DrawLogo (Hie_CTR,Gbl.Hierarchy.Ctr.CtrCod,
Gbl.Hierarchy.Ctr.ShrtName,64,NULL,true); Gbl.Hierarchy.Ctr.ShrtName,64,NULL,true);
fprintf (Gbl.F.Out,"<br />%s",Gbl.Hierarchy.Ctr.FullName); fprintf (Gbl.F.Out,"<br />%s",Gbl.Hierarchy.Ctr.FullName);
@ -355,8 +355,8 @@ static void Ctr_Configuration (bool PrintView)
/* Photo image */ /* Photo image */
HTM_DIV_Begin ("class=\"DAT_SMALL CM\""); HTM_DIV_Begin ("class=\"DAT_SMALL CM\"");
if (PutLink) if (PutLink)
fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\" class=\"DAT_N\">", HTM_A_Begin ("href=\"%s\" target=\"_blank\" class=\"DAT_N\"",
Gbl.Hierarchy.Ctr.WWW); Gbl.Hierarchy.Ctr.WWW);
fprintf (Gbl.F.Out,"<img src=\"%s/%02u/%u/%u.jpg\"" fprintf (Gbl.F.Out,"<img src=\"%s/%02u/%u/%u.jpg\""
" alt=\"%s\" title=\"%s\"" " alt=\"%s\" title=\"%s\""
" class=\"%s\" />", " class=\"%s\" />",
@ -588,8 +588,8 @@ static void Ctr_Configuration (bool PrintView)
else // I can not change centre WWW else // I can not change centre WWW
{ {
HTM_DIV_Begin ("class=\"EXTERNAL_WWW_LONG\""); HTM_DIV_Begin ("class=\"EXTERNAL_WWW_LONG\"");
fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\" class=\"DAT\">", HTM_A_Begin ("href=\"%s\" target=\"_blank\" class=\"DAT\"",
Gbl.Hierarchy.Ctr.WWW); Gbl.Hierarchy.Ctr.WWW);
fprintf (Gbl.F.Out,"%s",Gbl.Hierarchy.Ctr.WWW); fprintf (Gbl.F.Out,"%s",Gbl.Hierarchy.Ctr.WWW);
HTM_A_End (); HTM_A_End ();
HTM_DIV_End (); HTM_DIV_End ();
@ -606,10 +606,10 @@ static void Ctr_Configuration (bool PrintView)
HTM_TD_End (); HTM_TD_End ();
HTM_TD_Begin ("class=\"DAT LM\""); HTM_TD_Begin ("class=\"DAT LM\"");
fprintf (Gbl.F.Out,"<a href=\"%s/%s?ctr=%ld\" class=\"DAT\" target=\"_blank\">", HTM_A_Begin ("href=\"%s/%s?ctr=%ld\" class=\"DAT\" target=\"_blank\"",
Cfg_URL_SWAD_CGI, Cfg_URL_SWAD_CGI,
Lan_STR_LANG_ID[Gbl.Prefs.Language], Lan_STR_LANG_ID[Gbl.Prefs.Language],
Gbl.Hierarchy.Ctr.CtrCod); Gbl.Hierarchy.Ctr.CtrCod);
fprintf (Gbl.F.Out,"%s/%s?ctr=%ld", fprintf (Gbl.F.Out,"%s/%s?ctr=%ld",
Cfg_URL_SWAD_CGI, Cfg_URL_SWAD_CGI,
Lan_STR_LANG_ID[Gbl.Prefs.Language], Lan_STR_LANG_ID[Gbl.Prefs.Language],
@ -1606,8 +1606,8 @@ static void Ctr_ListCentresForEdition (void)
Str_Copy (WWW,Ctr->WWW, Str_Copy (WWW,Ctr->WWW,
Cns_MAX_BYTES_WWW); Cns_MAX_BYTES_WWW);
HTM_DIV_Begin ("class=\"EXTERNAL_WWW_SHORT\""); HTM_DIV_Begin ("class=\"EXTERNAL_WWW_SHORT\"");
fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\"" HTM_A_Begin ("href=\"%s\" target=\"_blank\""
" class=\"DAT\" title=\"%s\">",Ctr->WWW,Ctr->WWW); " class=\"DAT\" title=\"%s\"",Ctr->WWW,Ctr->WWW);
fprintf (Gbl.F.Out,"%s",WWW); fprintf (Gbl.F.Out,"%s",WWW);
HTM_A_End (); HTM_A_End ();
HTM_DIV_End (); HTM_DIV_End ();

3
swad_changelog.h
View File

@ -487,13 +487,14 @@ enscript -2 --landscape --color --file-align=2 --highlight --line-numbers -o - *
En OpenSWAD: En OpenSWAD:
ps2pdf source.ps destination.pdf ps2pdf source.ps destination.pdf
*/ */
#define Log_PLATFORM_VERSION "SWAD 19.46 (2019-10-28)" #define Log_PLATFORM_VERSION "SWAD 19.46.1 (2019-10-28)"
#define CSS_FILE "swad19.45.css" #define CSS_FILE "swad19.45.css"
#define JS_FILE "swad19.39.js" #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: 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. // TODO: Impedir la creación y edición de proyectos si no son editables.
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.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) Version 19.45.2: Oct 27, 2019 Code refactoring in HTML forms. (246498 lines)
Version 19.45.1: Oct 27, 2019 Code refactoring in HTML forms. (246481 lines) Version 19.45.1: Oct 27, 2019 Code refactoring in HTML forms. (246481 lines)

26
swad_country.c
View File

@ -265,10 +265,10 @@ static void Cty_Configuration (bool PrintView)
PutLink = !PrintView && Gbl.Hierarchy.Cty.WWW[Gbl.Prefs.Language][0]; PutLink = !PrintView && Gbl.Hierarchy.Cty.WWW[Gbl.Prefs.Language][0];
HTM_DIV_Begin ("class=\"FRAME_TITLE FRAME_TITLE_BIG\""); HTM_DIV_Begin ("class=\"FRAME_TITLE FRAME_TITLE_BIG\"");
if (PutLink) if (PutLink)
fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\"" HTM_A_Begin ("href=\"%s\" target=\"_blank\""
" class=\"FRAME_TITLE_BIG\" title=\"%s\">", " class=\"FRAME_TITLE_BIG\" title=\"%s\"",
Gbl.Hierarchy.Cty.WWW[Gbl.Prefs.Language], Gbl.Hierarchy.Cty.WWW[Gbl.Prefs.Language],
Gbl.Hierarchy.Cty.Name[Gbl.Prefs.Language]); Gbl.Hierarchy.Cty.Name[Gbl.Prefs.Language]);
fprintf (Gbl.F.Out,"%s",Gbl.Hierarchy.Cty.Name[Gbl.Prefs.Language]); fprintf (Gbl.F.Out,"%s",Gbl.Hierarchy.Cty.Name[Gbl.Prefs.Language]);
if (PutLink) if (PutLink)
HTM_A_End (); HTM_A_End ();
@ -283,10 +283,10 @@ static void Cty_Configuration (bool PrintView)
/* Map image */ /* Map image */
HTM_DIV_Begin ("class=\"DAT_SMALL CM\""); HTM_DIV_Begin ("class=\"DAT_SMALL CM\"");
if (PutLink) if (PutLink)
fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\">", HTM_A_Begin ("href=\"%s\" target=\"_blank\"",
Gbl.Hierarchy.Cty.WWW[Gbl.Prefs.Language]); Gbl.Hierarchy.Cty.WWW[Gbl.Prefs.Language]);
Cty_DrawCountryMap (&Gbl.Hierarchy.Cty,PrintView ? "COUNTRY_MAP_PRINT" : Cty_DrawCountryMap (&Gbl.Hierarchy.Cty,PrintView ? "COUNTRY_MAP_PRINT" :
"COUNTRY_MAP_SHOW"); "COUNTRY_MAP_SHOW");
if (PutLink) if (PutLink)
HTM_A_End (); HTM_A_End ();
HTM_DIV_End (); HTM_DIV_End ();
@ -329,8 +329,8 @@ static void Cty_Configuration (bool PrintView)
HTM_TD_Begin ("class=\"DAT_N LM\""); HTM_TD_Begin ("class=\"DAT_N LM\"");
if (!PrintView && Gbl.Hierarchy.Cty.WWW[Gbl.Prefs.Language][0]) if (!PrintView && Gbl.Hierarchy.Cty.WWW[Gbl.Prefs.Language][0])
fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\" class=\"DAT_N\">", HTM_A_Begin ("href=\"%s\" target=\"_blank\" class=\"DAT_N\"",
Gbl.Hierarchy.Cty.WWW[Gbl.Prefs.Language]); Gbl.Hierarchy.Cty.WWW[Gbl.Prefs.Language]);
fprintf (Gbl.F.Out,"%s",Gbl.Hierarchy.Cty.Name[Gbl.Prefs.Language]); fprintf (Gbl.F.Out,"%s",Gbl.Hierarchy.Cty.Name[Gbl.Prefs.Language]);
if (!PrintView && Gbl.Hierarchy.Cty.WWW[Gbl.Prefs.Language][0]) if (!PrintView && Gbl.Hierarchy.Cty.WWW[Gbl.Prefs.Language][0])
HTM_A_End (); HTM_A_End ();
@ -346,10 +346,10 @@ static void Cty_Configuration (bool PrintView)
HTM_TD_End (); HTM_TD_End ();
HTM_TD_Begin ("class=\"DAT LM\""); HTM_TD_Begin ("class=\"DAT LM\"");
fprintf (Gbl.F.Out,"<a href=\"%s/%s?cty=%ld\" class=\"DAT\" target=\"_blank\">", HTM_A_Begin ("href=\"%s/%s?cty=%ld\" class=\"DAT\" target=\"_blank\"",
Cfg_URL_SWAD_CGI, Cfg_URL_SWAD_CGI,
Lan_STR_LANG_ID[Gbl.Prefs.Language], Lan_STR_LANG_ID[Gbl.Prefs.Language],
Gbl.Hierarchy.Cty.CtyCod); Gbl.Hierarchy.Cty.CtyCod);
fprintf (Gbl.F.Out,"%s/%s?cty=%ld", fprintf (Gbl.F.Out,"%s/%s?cty=%ld",
Cfg_URL_SWAD_CGI, Cfg_URL_SWAD_CGI,
Lan_STR_LANG_ID[Gbl.Prefs.Language], Lan_STR_LANG_ID[Gbl.Prefs.Language],

19
swad_course.c
View File

@ -219,16 +219,15 @@ static void Crs_Configuration (bool PrintView)
PutLink = !PrintView && Gbl.Hierarchy.Deg.WWW[0]; PutLink = !PrintView && Gbl.Hierarchy.Deg.WWW[0];
HTM_DIV_Begin ("class=\"FRAME_TITLE FRAME_TITLE_BIG\""); HTM_DIV_Begin ("class=\"FRAME_TITLE FRAME_TITLE_BIG\"");
if (PutLink) if (PutLink)
fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\"" HTM_A_Begin ("href=\"%s\" target=\"_blank\""
" class=\"FRAME_TITLE_BIG\" title=\"%s\">", " class=\"FRAME_TITLE_BIG\" title=\"%s\"",
Gbl.Hierarchy.Deg.WWW, Gbl.Hierarchy.Deg.WWW,
Gbl.Hierarchy.Deg.FullName); Gbl.Hierarchy.Deg.FullName);
Log_DrawLogo (Hie_DEG,Gbl.Hierarchy.Deg.DegCod, Log_DrawLogo (Hie_DEG,Gbl.Hierarchy.Deg.DegCod,
Gbl.Hierarchy.Deg.ShrtName,64,NULL,true); Gbl.Hierarchy.Deg.ShrtName,64,NULL,true);
if (PutLink) if (PutLink)
HTM_A_End (); HTM_A_End ();
fprintf (Gbl.F.Out,"<br />%s", fprintf (Gbl.F.Out,"<br />%s",Gbl.Hierarchy.Crs.FullName);
Gbl.Hierarchy.Crs.FullName);
HTM_DIV_End (); HTM_DIV_End ();
/***** Begin table *****/ /***** Begin table *****/
@ -432,10 +431,10 @@ static void Crs_Configuration (bool PrintView)
HTM_TD_End (); HTM_TD_End ();
HTM_TD_Begin ("class=\"DAT LM\""); HTM_TD_Begin ("class=\"DAT LM\"");
fprintf (Gbl.F.Out,"<a href=\"%s/%s?crs=%ld\" class=\"DAT\" target=\"_blank\">", HTM_A_Begin ("href=\"%s/%s?crs=%ld\" class=\"DAT\" target=\"_blank\"",
Cfg_URL_SWAD_CGI, Cfg_URL_SWAD_CGI,
Lan_STR_LANG_ID[Gbl.Prefs.Language], Lan_STR_LANG_ID[Gbl.Prefs.Language],
Gbl.Hierarchy.Crs.CrsCod); Gbl.Hierarchy.Crs.CrsCod);
fprintf (Gbl.F.Out,"%s/%s?crs=%ld", fprintf (Gbl.F.Out,"%s/%s?crs=%ld",
Cfg_URL_SWAD_CGI, Cfg_URL_SWAD_CGI,
Lan_STR_LANG_ID[Gbl.Prefs.Language], Lan_STR_LANG_ID[Gbl.Prefs.Language],

24
swad_degree.c
View File

@ -323,10 +323,10 @@ static void Deg_Configuration (bool PrintView)
PutLink = !PrintView && Gbl.Hierarchy.Deg.WWW[0]; PutLink = !PrintView && Gbl.Hierarchy.Deg.WWW[0];
HTM_DIV_Begin ("class=\"FRAME_TITLE FRAME_TITLE_BIG\""); HTM_DIV_Begin ("class=\"FRAME_TITLE FRAME_TITLE_BIG\"");
if (PutLink) if (PutLink)
fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\"" HTM_A_Begin ("href=\"%s\" target=\"_blank\""
" class=\"FRAME_TITLE_BIG\" title=\"%s\">", " class=\"FRAME_TITLE_BIG\" title=\"%s\">",
Gbl.Hierarchy.Deg.WWW, Gbl.Hierarchy.Deg.WWW,
Gbl.Hierarchy.Deg.FullName); Gbl.Hierarchy.Deg.FullName);
Log_DrawLogo (Hie_DEG,Gbl.Hierarchy.Deg.DegCod, Log_DrawLogo (Hie_DEG,Gbl.Hierarchy.Deg.DegCod,
Gbl.Hierarchy.Deg.ShrtName,64,NULL,true); Gbl.Hierarchy.Deg.ShrtName,64,NULL,true);
fprintf (Gbl.F.Out,"<br />%s", fprintf (Gbl.F.Out,"<br />%s",
@ -473,8 +473,8 @@ static void Deg_Configuration (bool PrintView)
else // I can not change degree WWW else // I can not change degree WWW
{ {
HTM_DIV_Begin ("class=\"EXTERNAL_WWW_LONG\""); HTM_DIV_Begin ("class=\"EXTERNAL_WWW_LONG\"");
fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\" class=\"DAT\">", HTM_A_Begin ("href=\"%s\" target=\"_blank\" class=\"DAT\"",
Gbl.Hierarchy.Deg.WWW); Gbl.Hierarchy.Deg.WWW);
fprintf (Gbl.F.Out,"%s",Gbl.Hierarchy.Deg.WWW); fprintf (Gbl.F.Out,"%s",Gbl.Hierarchy.Deg.WWW);
HTM_A_End (); HTM_A_End ();
HTM_DIV_End (); HTM_DIV_End ();
@ -490,10 +490,10 @@ static void Deg_Configuration (bool PrintView)
HTM_TD_End (); HTM_TD_End ();
HTM_TD_Begin ("class=\"DAT LM\""); HTM_TD_Begin ("class=\"DAT LM\"");
fprintf (Gbl.F.Out,"<a href=\"%s/%s?deg=%ld\" class=\"DAT\" target=\"_blank\">", HTM_A_Begin ("href=\"%s/%s?deg=%ld\" class=\"DAT\" target=\"_blank\"",
Cfg_URL_SWAD_CGI, Cfg_URL_SWAD_CGI,
Lan_STR_LANG_ID[Gbl.Prefs.Language], Lan_STR_LANG_ID[Gbl.Prefs.Language],
Gbl.Hierarchy.Deg.DegCod); Gbl.Hierarchy.Deg.DegCod);
fprintf (Gbl.F.Out,"%s/%s?deg=%ld", fprintf (Gbl.F.Out,"%s/%s?deg=%ld",
Cfg_URL_SWAD_CGI, Cfg_URL_SWAD_CGI,
Lan_STR_LANG_ID[Gbl.Prefs.Language], Lan_STR_LANG_ID[Gbl.Prefs.Language],
@ -835,8 +835,8 @@ static void Deg_ListDegreesForEdition (void)
Str_Copy (WWW,Deg->WWW, Str_Copy (WWW,Deg->WWW,
Cns_MAX_BYTES_WWW); Cns_MAX_BYTES_WWW);
HTM_DIV_Begin ("class=\"EXTERNAL_WWW_SHORT\""); HTM_DIV_Begin ("class=\"EXTERNAL_WWW_SHORT\"");
fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\"" HTM_A_Begin ("href=\"%s\" target=\"_blank\" class=\"DAT\" title=\"%s\"",
" class=\"DAT\" title=\"%s\">",Deg->WWW,Deg->WWW); Deg->WWW,Deg->WWW);
fprintf (Gbl.F.Out,"%s",WWW); fprintf (Gbl.F.Out,"%s",WWW);
HTM_A_End (); HTM_A_End ();
HTM_DIV_End (); HTM_DIV_End ();

4
swad_department.c
View File

@ -151,8 +151,8 @@ void Dpt_SeeDepts (void)
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"LM\""); HTM_TD_Begin ("class=\"LM\"");
fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\" class=\"DAT\">", HTM_A_Begin ("href=\"%s\" target=\"_blank\" class=\"DAT\"",
Gbl.Dpts.Lst[NumDpt].WWW); Gbl.Dpts.Lst[NumDpt].WWW);
fprintf (Gbl.F.Out,"%s",Gbl.Dpts.Lst[NumDpt].FullName); fprintf (Gbl.F.Out,"%s",Gbl.Dpts.Lst[NumDpt].FullName);
HTM_A_End (); HTM_A_End ();
HTM_TD_End (); HTM_TD_End ();

8
swad_exam.c
View File

@ -1049,8 +1049,8 @@ static void Exa_ShowExamAnnouncement (long ExaCod,
if (TypeViewExamAnnouncement == Exa_PRINT_VIEW) if (TypeViewExamAnnouncement == Exa_PRINT_VIEW)
fprintf (Gbl.F.Out,"<span class=\"%s\">",StyleTitle); fprintf (Gbl.F.Out,"<span class=\"%s\">",StyleTitle);
else else
fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\" class=\"%s\">", HTM_A_Begin ("href=\"%s\" target=\"_blank\" class=\"%s\"",
Ins.WWW,StyleTitle); Ins.WWW,StyleTitle);
Log_DrawLogo (Hie_INS,Ins.InsCod,Ins.FullName,64,NULL,true); Log_DrawLogo (Hie_INS,Ins.InsCod,Ins.FullName,64,NULL,true);
fprintf (Gbl.F.Out,"<br />%s", fprintf (Gbl.F.Out,"<br />%s",
Ins.FullName); Ins.FullName);
@ -1065,8 +1065,8 @@ static void Exa_ShowExamAnnouncement (long ExaCod,
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
HTM_TD_Begin ("colspan=\"2\" class=\"%s CM\"",StyleTitle); HTM_TD_Begin ("colspan=\"2\" class=\"%s CM\"",StyleTitle);
if (TypeViewExamAnnouncement == Exa_NORMAL_VIEW) if (TypeViewExamAnnouncement == Exa_NORMAL_VIEW)
fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\" class=\"%s\">", HTM_A_Begin ("href=\"%s\" target=\"_blank\" class=\"%s\"",
Gbl.Hierarchy.Deg.WWW,StyleTitle); Gbl.Hierarchy.Deg.WWW,StyleTitle);
fprintf (Gbl.F.Out,"%s",Gbl.Hierarchy.Deg.FullName); fprintf (Gbl.F.Out,"%s",Gbl.Hierarchy.Deg.FullName);
if (TypeViewExamAnnouncement == Exa_NORMAL_VIEW) if (TypeViewExamAnnouncement == Exa_NORMAL_VIEW)
HTM_A_End (); HTM_A_End ();

9
swad_file_browser.c
View File

@ -10065,9 +10065,8 @@ static void Brw_WriteBigLinkToDownloadFile (const char *URL,
Txt_Download; Txt_Download;
/* Put anchor and filename */ /* Put anchor and filename */
fprintf (Gbl.F.Out,"<a href=\"%s\" class=\"FILENAME_TXT\"" HTM_A_Begin ("href=\"%s\" class=\"FILENAME_TXT\" title=\"%s\" target=\"_blank\"",
" title=\"%s\" target=\"_blank\">", URL,Title);
URL,Title);
Brw_PutIconFile (32,FileMetadata->FilFolLnk.Type,FileMetadata->FilFolLnk.Name); Brw_PutIconFile (32,FileMetadata->FilFolLnk.Type,FileMetadata->FilFolLnk.Name);
fprintf (Gbl.F.Out,"&nbsp;%s&nbsp;" fprintf (Gbl.F.Out,"&nbsp;%s&nbsp;"
"<img src=\"%s/download.svg\"" "<img src=\"%s/download.svg\""
@ -10117,8 +10116,8 @@ static void Brw_WriteSmallLinkToDownloadFile (const char *URL,
else else
{ {
/* Put anchor and filename */ /* Put anchor and filename */
fprintf (Gbl.F.Out,"<a href=\"%s\" class=\"DAT\" title=\"%s\" target=\"_blank\">", HTM_A_Begin ("href=\"%s\" class=\"DAT\" title=\"%s\" target=\"_blank\"",
URL,FileNameToShow); URL,FileNameToShow);
fprintf (Gbl.F.Out,"%s",FileNameToShow); fprintf (Gbl.F.Out,"%s",FileNameToShow);
HTM_A_End (); HTM_A_End ();
} }

8
swad_indicator.c
View File

@ -928,8 +928,8 @@ static void Ind_ShowTableOfCoursesWithIndicators (Ind_IndicatorsLayout_t Indicat
HTM_TD_End (); HTM_TD_End ();
HTM_TD_Begin ("class=\"DAT_SMALL LM COLOR%u\"",Gbl.RowEvenOdd); HTM_TD_Begin ("class=\"DAT_SMALL LM COLOR%u\"",Gbl.RowEvenOdd);
fprintf (Gbl.F.Out,"<a href=\"%s/?crs=%ld&amp;act=%ld\" target=\"_blank\">", HTM_A_Begin ("href=\"%s/?crs=%ld&amp;act=%ld\" target=\"_blank\"",
Cfg_URL_SWAD_CGI,CrsCod,ActCod); Cfg_URL_SWAD_CGI,CrsCod,ActCod);
fprintf (Gbl.F.Out,"%s/?crs=%ld&amp;act=%ld", fprintf (Gbl.F.Out,"%s/?crs=%ld&amp;act=%ld",
Cfg_URL_SWAD_CGI,CrsCod,ActCod); Cfg_URL_SWAD_CGI,CrsCod,ActCod);
HTM_A_End (); HTM_A_End ();
@ -1038,8 +1038,8 @@ static void Ind_ShowTableOfCoursesWithIndicators (Ind_IndicatorsLayout_t Indicat
HTM_TD_End (); HTM_TD_End ();
HTM_TD_Begin ("class=\"DAT_SMALL LM COLOR%u\"",Gbl.RowEvenOdd); HTM_TD_Begin ("class=\"DAT_SMALL LM COLOR%u\"",Gbl.RowEvenOdd);
fprintf (Gbl.F.Out,"<a href=\"%s/?crs=%ld&amp;act=%ld\" target=\"_blank\">", HTM_A_Begin ("href=\"%s/?crs=%ld&amp;act=%ld\" target=\"_blank\"",
Cfg_URL_SWAD_CGI,CrsCod,ActCod); Cfg_URL_SWAD_CGI,CrsCod,ActCod);
fprintf (Gbl.F.Out,"%s/?crs=%ld&amp;act=%ld", fprintf (Gbl.F.Out,"%s/?crs=%ld&amp;act=%ld",
Cfg_URL_SWAD_CGI,CrsCod,ActCod); Cfg_URL_SWAD_CGI,CrsCod,ActCod);
HTM_A_End (); HTM_A_End ();

4
swad_info.c
View File

@ -1048,8 +1048,8 @@ static void Inf_ShowPage (const char *URL)
Help[Gbl.Crs.Info.Type],Box_NOT_CLOSABLE); Help[Gbl.Crs.Info.Type],Box_NOT_CLOSABLE);
/***** Link to view in a new window *****/ /***** Link to view in a new window *****/
fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\" class=\"%s\">", HTM_A_Begin ("href=\"%s\" target=\"_blank\" class=\"%s\"",
URL,The_ClassFormOutBoxBold[Gbl.Prefs.Theme]); URL,The_ClassFormOutBoxBold[Gbl.Prefs.Theme]);
Ico_PutIconTextLink ("expand-arrows-alt.svg", Ico_PutIconTextLink ("expand-arrows-alt.svg",
Txt_View_in_a_new_window); Txt_View_in_a_new_window);
HTM_A_End (); HTM_A_End ();

28
swad_institution.c
View File

@ -337,10 +337,9 @@ static void Ins_Configuration (bool PrintView)
PutLink = !PrintView && Gbl.Hierarchy.Ins.WWW[0]; PutLink = !PrintView && Gbl.Hierarchy.Ins.WWW[0];
HTM_DIV_Begin ("class=\"FRAME_TITLE FRAME_TITLE_BIG\""); HTM_DIV_Begin ("class=\"FRAME_TITLE FRAME_TITLE_BIG\"");
if (PutLink) if (PutLink)
fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\"" HTM_A_Begin ("href=\"%s\" target=\"_blank\" class=\"FRAME_TITLE_BIG\" title=\"%s\"",
" class=\"FRAME_TITLE_BIG\" title=\"%s\">", Gbl.Hierarchy.Ins.WWW,
Gbl.Hierarchy.Ins.WWW, Gbl.Hierarchy.Ins.FullName);
Gbl.Hierarchy.Ins.FullName);
Log_DrawLogo (Hie_INS,Gbl.Hierarchy.Ins.InsCod, Log_DrawLogo (Hie_INS,Gbl.Hierarchy.Ins.InsCod,
Gbl.Hierarchy.Ins.ShrtName,64,NULL,true); Gbl.Hierarchy.Ins.ShrtName,64,NULL,true);
fprintf (Gbl.F.Out,"<br />%s",Gbl.Hierarchy.Ins.FullName); fprintf (Gbl.F.Out,"<br />%s",Gbl.Hierarchy.Ins.FullName);
@ -487,10 +486,9 @@ static void Ins_Configuration (bool PrintView)
else // I can not change institution WWW else // I can not change institution WWW
{ {
HTM_DIV_Begin ("class=\"EXTERNAL_WWW_LONG\""); HTM_DIV_Begin ("class=\"EXTERNAL_WWW_LONG\"");
fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\" class=\"DAT\">" HTM_A_Begin ("href=\"%s\" target=\"_blank\" class=\"DAT\">",
"%s", Gbl.Hierarchy.Ins.WWW);
Gbl.Hierarchy.Ins.WWW, fprintf (Gbl.F.Out,"%s",Gbl.Hierarchy.Ins.WWW);
Gbl.Hierarchy.Ins.WWW);
HTM_A_End (); HTM_A_End ();
HTM_DIV_End (); HTM_DIV_End ();
} }
@ -506,11 +504,11 @@ static void Ins_Configuration (bool PrintView)
HTM_TD_End (); HTM_TD_End ();
HTM_TD_Begin ("class=\"LM\""); HTM_TD_Begin ("class=\"LM\"");
fprintf (Gbl.F.Out,"<a href=\"%s/%s?ins=%ld\" class=\"DAT\" target=\"_blank\">" HTM_A_Begin ("href=\"%s/%s?ins=%ld\" class=\"DAT\" target=\"_blank\"",
"%s/%s?ins=%ld", Cfg_URL_SWAD_CGI,
Cfg_URL_SWAD_CGI, Lan_STR_LANG_ID[Gbl.Prefs.Language],
Lan_STR_LANG_ID[Gbl.Prefs.Language], Gbl.Hierarchy.Ins.InsCod);
Gbl.Hierarchy.Ins.InsCod, fprintf (Gbl.F.Out,"%s/%s?ins=%ld",
Cfg_URL_SWAD_CGI, Cfg_URL_SWAD_CGI,
Lan_STR_LANG_ID[Gbl.Prefs.Language], Lan_STR_LANG_ID[Gbl.Prefs.Language],
Gbl.Hierarchy.Ins.InsCod); Gbl.Hierarchy.Ins.InsCod);
@ -1557,8 +1555,8 @@ static void Ins_ListInstitutionsForEdition (void)
Str_Copy (WWW,Ins->WWW, Str_Copy (WWW,Ins->WWW,
Cns_MAX_BYTES_WWW); Cns_MAX_BYTES_WWW);
HTM_DIV_Begin ("class=\"EXTERNAL_WWW_SHORT\""); HTM_DIV_Begin ("class=\"EXTERNAL_WWW_SHORT\"");
fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\"" HTM_A_Begin ("href=\"%s\" target=\"_blank\" class=\"DAT\" title=\"%s\"",
" class=\"DAT\" title=\"%s\">",Ins->WWW,Ins->WWW); Ins->WWW,Ins->WWW);
fprintf (Gbl.F.Out,"%s",WWW); fprintf (Gbl.F.Out,"%s",WWW);
HTM_A_End (); HTM_A_End ();
HTM_DIV_End (); HTM_DIV_End ();

33
swad_layout.c
View File

@ -1152,9 +1152,9 @@ static void Lay_ShowRightColumn (void)
{ {
/***** SWADroid advertisement *****/ /***** SWADroid advertisement *****/
HTM_DIV_Begin ("class=\"LEFT_RIGHT_CELL\""); HTM_DIV_Begin ("class=\"LEFT_RIGHT_CELL\"");
fprintf (Gbl.F.Out,"<a href=\"https://play.google.com/store/apps/details?id=es.ugr.swad.swadroid\"" HTM_A_Begin ("href=\"https://play.google.com/store/apps/details?id=es.ugr.swad.swadroid\""
" target=\"_blank\" title=\"%s\">", " target=\"_blank\" title=\"%s\"",
Txt_If_you_have_an_Android_device_try_SWADroid); Txt_If_you_have_an_Android_device_try_SWADroid);
fprintf (Gbl.F.Out,"<img src=\"%s/SWADroid120x200.png\"" fprintf (Gbl.F.Out,"<img src=\"%s/SWADroid120x200.png\""
" alt=\"SWADroid\" title=\"SWADroid\"" " alt=\"SWADroid\" title=\"SWADroid\""
" style=\"width:150px; height:250px;\" />", " style=\"width:150px; height:250px;\" />",
@ -1430,8 +1430,7 @@ static void Lay_WriteAboutZone (void)
fprintf (Gbl.F.Out,"<address id=\"about_zone\" class=\"ABOUT\">"); fprintf (Gbl.F.Out,"<address id=\"about_zone\" class=\"ABOUT\">");
/***** Institution and centre hosting the platform *****/ /***** Institution and centre hosting the platform *****/
fprintf (Gbl.F.Out,"<a href=\"%s\" class=\"ABOUT\" target=\"_blank\">", HTM_A_Begin ("href=\"%s\" class=\"ABOUT\" target=\"_blank\"",Cfg_ABOUT_URL);
Cfg_ABOUT_URL);
fprintf (Gbl.F.Out,"<img src=\"%s/%s\"" fprintf (Gbl.F.Out,"<img src=\"%s/%s\""
" alt=\"%s\" title=\"%s\"" " alt=\"%s\" title=\"%s\""
" style=\"width:%upx; height:%upx;\" />", " style=\"width:%upx; height:%upx;\" />",
@ -1457,8 +1456,7 @@ static void Lay_WriteAboutZone (void)
HTM_DIV_Begin (NULL); HTM_DIV_Begin (NULL);
/* About */ /* About */
fprintf (Gbl.F.Out,"<a href=\"%s\" class=\"ABOUT\" target=\"_blank\">", HTM_A_Begin ("href=\"%s\" class=\"ABOUT\" target=\"_blank\"",Cfg_ABOUT_SWAD_URL);
Cfg_ABOUT_SWAD_URL);
fprintf (Gbl.F.Out,Txt_About_X,Log_PLATFORM_VERSION); fprintf (Gbl.F.Out,Txt_About_X,Log_PLATFORM_VERSION);
HTM_A_End (); HTM_A_End ();
fprintf (Gbl.F.Out,"&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"); fprintf (Gbl.F.Out,"&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;");
@ -1604,7 +1602,7 @@ void Lay_WriteHeaderClassPhoto (bool PrintView,bool DrawingClassPhoto,
if (InsCod > 0) if (InsCod > 0)
{ {
if (!PrintView) if (!PrintView)
fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\">",Ins.WWW); HTM_A_Begin ("href=\"%s\" target=\"_blank\"",Ins.WWW);
Log_DrawLogo (Hie_INS,Ins.InsCod,Ins.ShrtName,40,NULL,true); Log_DrawLogo (Hie_INS,Ins.InsCod,Ins.ShrtName,40,NULL,true);
if (!PrintView) if (!PrintView)
HTM_A_End (); HTM_A_End ();
@ -1616,9 +1614,8 @@ void Lay_WriteHeaderClassPhoto (bool PrintView,bool DrawingClassPhoto,
if (InsCod > 0) if (InsCod > 0)
{ {
if (!PrintView) if (!PrintView)
fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\"" HTM_A_Begin ("href=\"%s\" target=\"_blank\" class=\"CLASSPHOTO_TITLE\"",
" class=\"CLASSPHOTO_TITLE\">", Ins.WWW);
Ins.WWW);
fprintf (Gbl.F.Out,"%s",Ins.FullName); fprintf (Gbl.F.Out,"%s",Ins.FullName);
if (!PrintView) if (!PrintView)
HTM_A_End (); HTM_A_End ();
@ -1628,9 +1625,8 @@ void Lay_WriteHeaderClassPhoto (bool PrintView,bool DrawingClassPhoto,
if (Ins.InsCod > 0) if (Ins.InsCod > 0)
fprintf (Gbl.F.Out," - "); fprintf (Gbl.F.Out," - ");
if (!PrintView) if (!PrintView)
fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\"" HTM_A_Begin ("href=\"%s\" target=\"_blank\" class=\"CLASSPHOTO_TITLE\"",
" class=\"CLASSPHOTO_TITLE\">", Deg.WWW);
Deg.WWW);
fprintf (Gbl.F.Out,"%s",Deg.FullName); fprintf (Gbl.F.Out,"%s",Deg.FullName);
if (!PrintView) if (!PrintView)
HTM_A_End (); HTM_A_End ();
@ -1652,9 +1648,8 @@ void Lay_WriteHeaderClassPhoto (bool PrintView,bool DrawingClassPhoto,
if (DegCod > 0) if (DegCod > 0)
{ {
if (!PrintView) if (!PrintView)
fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\"" HTM_A_Begin ("href=\"%s\" target=\"_blank\" class=\"CLASSPHOTO_TITLE\"",
" class=\"CLASSPHOTO_TITLE\">", Deg.WWW);
Deg.WWW);
Log_DrawLogo (Hie_DEG,Deg.DegCod,Deg.ShrtName,40,NULL,true); Log_DrawLogo (Hie_DEG,Deg.DegCod,Deg.ShrtName,40,NULL,true);
if (!PrintView) if (!PrintView)
HTM_A_End (); HTM_A_End ();
@ -1687,8 +1682,8 @@ void Lay_AdvertisementMobile (void)
/***** Show advertisement *****/ /***** Show advertisement *****/
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"DAT CM\""); HTM_TD_Begin ("class=\"DAT CM\"");
fprintf (Gbl.F.Out,"<a href=\"https://play.google.com/store/apps/details?id=es.ugr.swad.swadroid\"" HTM_A_Begin ("href=\"https://play.google.com/store/apps/details?id=es.ugr.swad.swadroid\""
" class=\"DAT\">"); " class=\"DAT\"");
fprintf (Gbl.F.Out,"%s<br /><br />" fprintf (Gbl.F.Out,"%s<br /><br />"
"<img src=\"%s/SWADroid200x300.png\"" "<img src=\"%s/SWADroid200x300.png\""
" alt=\"SWADroid\" title=\"%s\"" " alt=\"SWADroid\" title=\"%s\""

7
swad_link.c
View File

@ -196,10 +196,9 @@ static void Lnk_WriteListOfLinks (void)
{ {
/* Write data of this link */ /* Write data of this link */
HTM_LI_Begin ("class=\"INS_LNK\""); HTM_LI_Begin ("class=\"INS_LNK\"");
fprintf (Gbl.F.Out,"<a href=\"%s\" title=\"%s\" class=\"INS_LNK\"" HTM_A_Begin ("href=\"%s\" title=\"%s\" class=\"INS_LNK\" target=\"_blank\"",
" target=\"_blank\">", Gbl.Links.Lst[NumLnk].WWW,
Gbl.Links.Lst[NumLnk].WWW, Gbl.Links.Lst[NumLnk].FullName);
Gbl.Links.Lst[NumLnk].FullName);
fprintf (Gbl.F.Out,"%s",Gbl.Links.Lst[NumLnk].ShrtName); fprintf (Gbl.F.Out,"%s",Gbl.Links.Lst[NumLnk].ShrtName);
HTM_A_End (); HTM_A_End ();
HTM_LI_End (); HTM_LI_End ();

20
swad_mail.c
View File

@ -963,8 +963,8 @@ static void Mai_ListEmails (void)
Lay_ShowErrorAndExit ("The space allocated to store email addresses is full."); Lay_ShowErrorAndExit ("The space allocated to store email addresses is full.");
Str_Concat (StrAddresses,UsrDat.Email, Str_Concat (StrAddresses,UsrDat.Email,
Mai_MAX_BYTES_STR_ADDR); Mai_MAX_BYTES_STR_ADDR);
fprintf (Gbl.F.Out,"<a href=\"mailto:%s?subject=%s\">", HTM_A_Begin ("href=\"mailto:%s?subject=%s\"",
UsrDat.Email,Gbl.Hierarchy.Crs.FullName); UsrDat.Email,Gbl.Hierarchy.Crs.FullName);
fprintf (Gbl.F.Out,"%s",UsrDat.Email); fprintf (Gbl.F.Out,"%s",UsrDat.Email);
HTM_A_End (); HTM_A_End ();
@ -994,14 +994,14 @@ static void Mai_ListEmails (void)
Mnu_ContextMenuBegin (); Mnu_ContextMenuBegin ();
/* Open the client email program */ /* Open the client email program */
fprintf (Gbl.F.Out,"<a href=\"mailto:%s?subject=%s&cc=%s&bcc=%s\"" HTM_A_Begin ("href=\"mailto:%s?subject=%s&cc=%s&bcc=%s\""
" title=\"%s\" class=\"%s\">", " title=\"%s\" class=\"%s\"",
Gbl.Usrs.Me.UsrDat.Email, Gbl.Usrs.Me.UsrDat.Email,
Gbl.Hierarchy.Crs.FullName, Gbl.Hierarchy.Crs.FullName,
Gbl.Usrs.Me.UsrDat.Email, Gbl.Usrs.Me.UsrDat.Email,
StrAddresses, StrAddresses,
Txt_Create_email_message, Txt_Create_email_message,
The_ClassFormOutBoxBold[Gbl.Prefs.Theme]); The_ClassFormOutBoxBold[Gbl.Prefs.Theme]);
Ico_PutIconTextLink ("marker.svg", Ico_PutIconTextLink ("marker.svg",
Txt_Create_email_message); Txt_Create_email_message);
HTM_A_End (); HTM_A_End ();

11
swad_match.c
View File

@ -2867,9 +2867,9 @@ static void Mch_PutBigButton (Act_Action_t NextAction,const char *Id,
/***** Put icon with link *****/ /***** Put icon with link *****/
HTM_DIV_Begin ("class=\"MCH_BUTTON_CONTAINER\""); HTM_DIV_Begin ("class=\"MCH_BUTTON_CONTAINER\"");
fprintf (Gbl.F.Out,"<a href=\"\" class=\"MCH_BUTTON_ON\" title=\"%s\" " HTM_A_Begin ("href=\"\" class=\"MCH_BUTTON_ON\" title=\"%s\" "
" onclick=\"document.getElementById('%s').submit();" " onclick=\"document.getElementById('%s').submit();return false;\"",
" return false;\">",Txt,Id); Txt,Id);
fprintf (Gbl.F.Out,"<i class=\"%s\"></i>",Icon); fprintf (Gbl.F.Out,"<i class=\"%s\"></i>",Icon);
HTM_A_End (); HTM_A_End ();
HTM_DIV_End (); HTM_DIV_End ();
@ -2894,9 +2894,8 @@ static void Mch_PutBigButtonClose (void)
/***** Put icon with link *****/ /***** Put icon with link *****/
HTM_DIV_Begin ("class=\"MCH_BUTTON_CONTAINER\""); HTM_DIV_Begin ("class=\"MCH_BUTTON_CONTAINER\"");
fprintf (Gbl.F.Out,"<a href=\"\" class=\"MCH_BUTTON_ON\" title=\"%s\" " HTM_A_Begin ("href=\"\" class=\"MCH_BUTTON_ON\" title=\"%s\" "
" onclick=\"window.close();" " onclick=\"window.close();return false;\"\"",Txt_Close);
" return false;\"\">",Txt_Close);
fprintf (Gbl.F.Out,"<i class=\"%s\"></i>",Mch_ICON_CLOSE); fprintf (Gbl.F.Out,"<i class=\"%s\"></i>",Mch_ICON_CLOSE);
HTM_A_End (); HTM_A_End ();
HTM_DIV_End (); HTM_DIV_End ();

9
swad_media.c
View File

@ -391,8 +391,7 @@ void Med_PutMediaUploader (int NumMediaInForm,const char *ClassInput)
/***** Icon 'clip' *****/ /***** Icon 'clip' *****/
HTM_DIV_Begin ("id=\"%s_med_ico\"",Id); // <id>_med_ico HTM_DIV_Begin ("id=\"%s_med_ico\"",Id); // <id>_med_ico
fprintf (Gbl.F.Out,"<a href=\"\"" HTM_A_Begin ("href=\"\" onclick=\"mediaActivateMediaUploader('%s');return false;\"",
" onclick=\"mediaActivateMediaUploader('%s');return false;\">",
Id); Id);
fprintf (Gbl.F.Out,"<img src=\"%s/paperclip.svg\"" fprintf (Gbl.F.Out,"<img src=\"%s/paperclip.svg\""
" alt=\"%s\" title=\"%s\"" " alt=\"%s\" title=\"%s\""
@ -490,8 +489,8 @@ static void Med_PutIconMediaUploader (const char UniqueId[Frm_MAX_BYTES_ID + 1],
/***** Icon to activate form in media uploader *****/ /***** Icon to activate form in media uploader *****/
HTM_DIV_Begin ("id=\"%s_%s\" class=\"PREF_OFF\"", // <id>_IconSuffix HTM_DIV_Begin ("id=\"%s_%s\" class=\"PREF_OFF\"", // <id>_IconSuffix
UniqueId,MediaUploader->IconSuffix); UniqueId,MediaUploader->IconSuffix);
fprintf (Gbl.F.Out,"<a href=\"\" onclick=\"%s('%s');return false;\">", HTM_A_Begin ("href=\"\" onclick=\"%s('%s');return false;\"",
MediaUploader->FunctionName,UniqueId); MediaUploader->FunctionName,UniqueId);
fprintf (Gbl.F.Out,"<img src=\"%s/%s\" alt=\"%s\" title=\"%s\"" fprintf (Gbl.F.Out,"<img src=\"%s/%s\" alt=\"%s\" title=\"%s\""
" class=\"ICO_HIGHLIGHT ICOx16\" />", " class=\"ICO_HIGHLIGHT ICOx16\" />",
Cfg_URL_ICON_PUBLIC,MediaUploader->Icon, Cfg_URL_ICON_PUBLIC,MediaUploader->Icon,
@ -1477,7 +1476,7 @@ void Med_ShowMedia (struct Media *Media,
if (Media->URL[0]) if (Media->URL[0])
PutLink = true; PutLink = true;
if (PutLink) if (PutLink)
fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\">",Media->URL); HTM_A_Begin ("href=\"%s\" target=\"_blank\"",Media->URL);
/* Create a temporary public directory used to show the media */ /* Create a temporary public directory used to show the media */
Brw_CreateDirDownloadTmp (); Brw_CreateDirDownloadTmp ();

3
swad_network.c
View File

@ -252,8 +252,7 @@ static void Net_ShowAWebOrSocialNet (const char *URL,
{ {
/***** Write link and icon *****/ /***** Write link and icon *****/
HTM_DIV_Begin ("class=\"ICO_HIGHLIGHT\" style=\"display:inline;\""); HTM_DIV_Begin ("class=\"ICO_HIGHLIGHT\" style=\"display:inline;\"");
fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\" title=\"%s\">", HTM_A_Begin ("href=\"%s\" target=\"_blank\" title=\"%s\"",URL,Title);
URL,Title);
fprintf (Gbl.F.Out,"<img src=\"%s/%s\"" fprintf (Gbl.F.Out,"<img src=\"%s/%s\""
" alt=\"%s\" title=\"%s\"" " alt=\"%s\" title=\"%s\""
" class=\"ICO16x16\" />", " class=\"ICO16x16\" />",

6
swad_notice.c
View File

@ -369,6 +369,7 @@ void Not_ShowNotices (Not_Listing_t TypeNoticesListing,long HighlightNotCod)
long UsrCod; long UsrCod;
unsigned UnsignedNum; unsigned UnsignedNum;
Not_Status_t Status; Not_Status_t Status;
char RSSLink[Cns_MAX_BYTES_WWW + 1];
/***** Trivial check *****/ /***** Trivial check *****/
if (Gbl.Hierarchy.Level != Hie_CRS) // No course selected if (Gbl.Hierarchy.Level != Hie_CRS) // No course selected
@ -470,9 +471,8 @@ void Not_ShowNotices (Not_Listing_t TypeNoticesListing,long HighlightNotCod)
/* Put a link to the RSS file */ /* Put a link to the RSS file */
HTM_DIV_Begin ("class=\"CM\""); HTM_DIV_Begin ("class=\"CM\"");
fprintf (Gbl.F.Out,"<a href=\""); RSS_BuildRSSLink (RSSLink,Gbl.Hierarchy.Crs.CrsCod);
RSS_WriteRSSLink (Gbl.F.Out,Gbl.Hierarchy.Crs.CrsCod); HTM_A_Begin ("href=\"%s\" target=\"_blank\"",RSSLink);
fprintf (Gbl.F.Out,"\" target=\"_blank\">");
fprintf (Gbl.F.Out,"<img src=\"%s/rss-square.svg\"" fprintf (Gbl.F.Out,"<img src=\"%s/rss-square.svg\""
" alt=\"RSS\" title=\"RSS\"" " alt=\"RSS\" title=\"RSS\""
" class=\"ICO16x16\" />", " class=\"ICO16x16\" />",

8
swad_plugin.c
View File

@ -137,8 +137,8 @@ void Plg_ListPlugins (void)
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"DAT LM\" style=\"width:45px;\""); HTM_TD_Begin ("class=\"DAT LM\" style=\"width:45px;\"");
fprintf (Gbl.F.Out,"<a href=\"%s\" title=\"%s\" class=\"DAT\" target=\"_blank\">", HTM_A_Begin ("href=\"%s\" title=\"%s\" class=\"DAT\" target=\"_blank\"",
URL,Plg->Name); URL,Plg->Name);
fprintf (Gbl.F.Out,"<img src=\"%s/%s24x24.gif\" alt=\"%s\" title=\"%s\"" fprintf (Gbl.F.Out,"<img src=\"%s/%s24x24.gif\" alt=\"%s\" title=\"%s\""
" class=\"ICO40x40\" />", " class=\"ICO40x40\" />",
Cfg_URL_ICON_PLUGINS_PUBLIC,Gbl.Plugins.Lst[NumPlg].Logo, Cfg_URL_ICON_PLUGINS_PUBLIC,Gbl.Plugins.Lst[NumPlg].Logo,
@ -147,8 +147,8 @@ void Plg_ListPlugins (void)
HTM_TD_End (); HTM_TD_End ();
HTM_TD_Begin ("class=\"DAT LM\""); HTM_TD_Begin ("class=\"DAT LM\"");
fprintf (Gbl.F.Out,"<a href=\"%s\" title=\"%s\" class=\"DAT\" target=\"_blank\">", HTM_A_Begin ("href=\"%s\" title=\"%s\" class=\"DAT\" target=\"_blank\"",
URL,Plg->Name); URL,Plg->Name);
fprintf (Gbl.F.Out,"%s",Plg->Name); fprintf (Gbl.F.Out,"%s",Plg->Name);
HTM_A_End (); HTM_A_End ();
HTM_TD_End (); HTM_TD_End ();

14
swad_project.c
View File

@ -1457,10 +1457,10 @@ static void Prj_PutIconToToggleProject (unsigned UniqueId,
extern const char *The_ClassFormInBox[The_NUM_THEMES]; extern const char *The_ClassFormInBox[The_NUM_THEMES];
/***** Link to toggle on/off some fields of project *****/ /***** Link to toggle on/off some fields of project *****/
fprintf (Gbl.F.Out,"<a href=\"\" title=\"%s\" class=\"%s\"" HTM_A_Begin ("href=\"\" title=\"%s\" class=\"%s\""
" onclick=\"toggleProject('%u');return false;\" />", " onclick=\"toggleProject('%u');return false;\"",
Text,The_ClassFormInBox[Gbl.Prefs.Theme], Text,The_ClassFormInBox[Gbl.Prefs.Theme],
UniqueId); UniqueId);
Ico_PutIconTextLink (Icon,Text); Ico_PutIconTextLink (Icon,Text);
HTM_A_End (); HTM_A_End ();
} }
@ -1601,8 +1601,8 @@ static void Prj_ShowOneProjectDepartment (const struct Project *Prj,
break; break;
} }
if (PutLink) if (PutLink)
fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\" class=\"%s\">", HTM_A_Begin ("href=\"%s\" target=\"_blank\" class=\"%s\"",
Dpt.WWW,ClassData); Dpt.WWW,ClassData);
fprintf (Gbl.F.Out,"%s",Dpt.FullName); fprintf (Gbl.F.Out,"%s",Dpt.FullName);
if (PutLink) if (PutLink)
HTM_A_End (); HTM_A_End ();
@ -1777,7 +1777,7 @@ static void Prj_ShowOneProjectURL (const struct Project *Prj,
break; break;
} }
if (PutLink) if (PutLink)
fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\">",Prj->URL); HTM_A_Begin ("href=\"%s\" target=\"_blank\"",Prj->URL);
fprintf (Gbl.F.Out,"%s",Prj->URL); fprintf (Gbl.F.Out,"%s",Prj->URL);
if (PutLink) if (PutLink)
HTM_A_End (); HTM_A_End ();

34
swad_record.c
View File

@ -2850,8 +2850,7 @@ static void Rec_ShowEmail (struct UsrData *UsrDat,const char *ClassForm)
HTM_DIV_Begin ("class=\"REC_EMAIL\""); // Limited width HTM_DIV_Begin ("class=\"REC_EMAIL\""); // Limited width
if (Mai_ICanSeeOtherUsrEmail (UsrDat)) if (Mai_ICanSeeOtherUsrEmail (UsrDat))
{ {
fprintf (Gbl.F.Out,"<a href=\"mailto:%s\" class=\"REC_DAT_BOLD\">", HTM_A_Begin ("href=\"mailto:%s\" class=\"REC_DAT_BOLD\"",UsrDat->Email);
UsrDat->Email);
fprintf (Gbl.F.Out,"%s",UsrDat->Email); fprintf (Gbl.F.Out,"%s",UsrDat->Email);
HTM_A_End (); HTM_A_End ();
} }
@ -3465,8 +3464,7 @@ static void Rec_ShowLocalPhone (struct UsrData *UsrDat,
UsrDat->LocalPhone); UsrDat->LocalPhone);
else if (UsrDat->LocalPhone[0]) else if (UsrDat->LocalPhone[0])
{ {
fprintf (Gbl.F.Out,"<a href=\"tel:%s\" class=\"REC_DAT_BOLD\">", HTM_A_Begin ("href=\"tel:%s\" class=\"REC_DAT_BOLD\"",UsrDat->LocalPhone);
UsrDat->LocalPhone);
fprintf (Gbl.F.Out,"%s",UsrDat->LocalPhone); fprintf (Gbl.F.Out,"%s",UsrDat->LocalPhone);
HTM_A_End (); HTM_A_End ();
} }
@ -3544,8 +3542,7 @@ static void Rec_ShowFamilyPhone (struct UsrData *UsrDat,
UsrDat->FamilyPhone); UsrDat->FamilyPhone);
else if (UsrDat->FamilyPhone[0]) else if (UsrDat->FamilyPhone[0])
{ {
fprintf (Gbl.F.Out,"<a href=\"tel:%s\" class=\"REC_DAT_BOLD\">", HTM_A_Begin ("href=\"tel:%s\" class=\"REC_DAT_BOLD\"",UsrDat->FamilyPhone);
UsrDat->FamilyPhone);
fprintf (Gbl.F.Out,"%s",UsrDat->FamilyPhone); fprintf (Gbl.F.Out,"%s",UsrDat->FamilyPhone);
HTM_A_End (); HTM_A_End ();
} }
@ -3637,9 +3634,8 @@ static void Rec_ShowInstitution (struct Instit *Ins,
if (Ins->InsCod > 0) if (Ins->InsCod > 0)
{ {
if (Ins->WWW[0]) if (Ins->WWW[0])
fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\"" HTM_A_Begin ("href=\"%s\" target=\"_blank\" class=\"REC_DAT_BOLD\"",
" class=\"REC_DAT_BOLD\">", Ins->WWW);
Ins->WWW);
fprintf (Gbl.F.Out,"%s",Ins->FullName); fprintf (Gbl.F.Out,"%s",Ins->FullName);
if (Ins->WWW[0]) if (Ins->WWW[0])
HTM_A_End (); HTM_A_End ();
@ -3673,9 +3669,8 @@ static void Rec_ShowCentre (struct UsrData *UsrDat,
Ctr.CtrCod = UsrDat->Tch.CtrCod; Ctr.CtrCod = UsrDat->Tch.CtrCod;
Ctr_GetDataOfCentreByCod (&Ctr); Ctr_GetDataOfCentreByCod (&Ctr);
if (Ctr.WWW[0]) if (Ctr.WWW[0])
fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\"" HTM_A_Begin ("href=\"%s\" target=\"_blank\" class=\"REC_DAT_BOLD\"",
" class=\"REC_DAT_BOLD\">", Ctr.WWW);
Ctr.WWW);
fprintf (Gbl.F.Out,"%s",Ctr.FullName); fprintf (Gbl.F.Out,"%s",Ctr.FullName);
if (Ctr.WWW[0]) if (Ctr.WWW[0])
HTM_A_End (); HTM_A_End ();
@ -3710,9 +3705,8 @@ static void Rec_ShowDepartment (struct UsrData *UsrDat,
Dpt.DptCod = UsrDat->Tch.DptCod; Dpt.DptCod = UsrDat->Tch.DptCod;
Dpt_GetDataOfDepartmentByCod (&Dpt); Dpt_GetDataOfDepartmentByCod (&Dpt);
if (Dpt.WWW[0]) if (Dpt.WWW[0])
fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\"" HTM_A_Begin ("href=\"%s\" target=\"_blank\" class=\"REC_DAT_BOLD\"",
" class=\"REC_DAT_BOLD\">", Dpt.WWW);
Dpt.WWW);
fprintf (Gbl.F.Out,"%s",Dpt.FullName); fprintf (Gbl.F.Out,"%s",Dpt.FullName);
if (Dpt.WWW[0]) if (Dpt.WWW[0])
HTM_A_End (); HTM_A_End ();
@ -3764,8 +3758,8 @@ static void Rec_ShowOfficePhone (struct UsrData *UsrDat,
HTM_TD_Begin ("class=\"REC_C2_BOT REC_DAT_BOLD LM\""); HTM_TD_Begin ("class=\"REC_C2_BOT REC_DAT_BOLD LM\"");
if (ShowData) if (ShowData)
{ {
fprintf (Gbl.F.Out,"<a href=\"tel:%s\" class=\"REC_DAT_BOLD\">", HTM_A_Begin ("href=\"tel:%s\" class=\"REC_DAT_BOLD\"",
UsrDat->Tch.OfficePhone); UsrDat->Tch.OfficePhone);
fprintf (Gbl.F.Out,"%s",UsrDat->Tch.OfficePhone); fprintf (Gbl.F.Out,"%s",UsrDat->Tch.OfficePhone);
HTM_A_End (); HTM_A_End ();
} }
@ -3783,9 +3777,9 @@ static void Rec_WriteLinkToDataProtectionClause (void)
extern const char *Txt_DATA_PROTECTION_CLAUSE; extern const char *Txt_DATA_PROTECTION_CLAUSE;
HTM_DIV_Begin ("class=\"CM\""); HTM_DIV_Begin ("class=\"CM\"");
fprintf (Gbl.F.Out,"<a class=\"TIT\" href=\"%s/\" target=\"_blank\">", HTM_A_Begin ("class=\"TIT\" href=\"%s/\" target=\"_blank\"",
Cfg_URL_DATA_PROTECTION_PUBLIC); Cfg_URL_DATA_PROTECTION_PUBLIC);
fprintf (Gbl.F.Out,"%s",Txt_DATA_PROTECTION_CLAUSE); fprintf (Gbl.F.Out,"%s",Txt_DATA_PROTECTION_CLAUSE);
HTM_A_End (); HTM_A_End ();
HTM_DIV_End (); HTM_DIV_End ();
} }

7
swad_report.c
View File

@ -275,10 +275,9 @@ static void Rep_PutLinkToMyUsageReport (struct Rep_Report *Report)
/***** Put anchor and report filename *****/ /***** Put anchor and report filename *****/
HTM_DIV_Begin ("class=\"FILENAME_TXT CM\""); HTM_DIV_Begin ("class=\"FILENAME_TXT CM\"");
fprintf (Gbl.F.Out,"<a href=\"%s\" class=\"FILENAME_TXT\"" HTM_A_Begin ("href=\"%s\" class=\"FILENAME_TXT\" title=\"%s\" target=\"_blank\"",
" title=\"%s\" target=\"_blank\">", Report->Permalink,
Report->Permalink, Txt_Report);
Txt_Report);
fprintf (Gbl.F.Out,"<img src=\"%s/file-alt.svg\" alt=\"%s\"" fprintf (Gbl.F.Out,"<img src=\"%s/file-alt.svg\" alt=\"%s\""
" class=\"ICO64x64\" /><br />" " class=\"ICO64x64\" /><br />"
"%s", "%s",

6
swad_statistic.c
View File

@ -3314,9 +3314,9 @@ static void Sta_ShowNumHitsPerBanner (unsigned long NumRows,
Lay_ShowErrorAndExit ("Wrong banner code."); Lay_ShowErrorAndExit ("Wrong banner code.");
Ban_GetDataOfBannerByCod (&Ban); Ban_GetDataOfBannerByCod (&Ban);
HTM_TD_Begin ("class=\"LOG LT\""); HTM_TD_Begin ("class=\"LOG LT\"");
fprintf (Gbl.F.Out,"<a href=\"%s\" title=\"%s\" class=\"DAT\" target=\"_blank\">", HTM_A_Begin ("href=\"%s\" title=\"%s\" class=\"DAT\" target=\"_blank\"",
Ban.WWW, Ban.WWW,
Ban.FullName); Ban.FullName);
fprintf (Gbl.F.Out,"<img src=\"%s/%s\"" fprintf (Gbl.F.Out,"<img src=\"%s/%s\""
" alt=\"%s\" title=\"%s\"" " alt=\"%s\" title=\"%s\""
" class=\"BANNER_SMALL\"" " class=\"BANNER_SMALL\""

29
swad_test.c
View File

@ -5340,11 +5340,12 @@ static void Tst_PutFormEditOneQst (char Stem[Cns_MAX_BYTES_TEXT + 1],
snprintf (Gbl.Title,sizeof (Gbl.Title), snprintf (Gbl.Title,sizeof (Gbl.Title),
"%s %c)", "%s %c)",
Txt_Expand,'a' + (char) NumOpt); Txt_Expand,'a' + (char) NumOpt);
fprintf (Gbl.F.Out,"<a href=\"\" id=\"exp_%u\"",NumOpt); HTM_A_Begin ("href=\"\" id=\"exp_%u\"%s"
if (DisplayRightColumn) // Answer does not have content " onclick=\"toggleAnswer('%u');return false;\"",
fprintf (Gbl.F.Out," style=\"display:none;\""); // Hide icon NumOpt,
fprintf (Gbl.F.Out," onclick=\"toggleAnswer('%u'); return false;\" />", DisplayRightColumn ? " style=\"display:none;\"" : // Answer does have content ==> Hide icon
NumOpt); "",
NumOpt);
fprintf (Gbl.F.Out,"<img src=\"%s/caret-right.svg\"" fprintf (Gbl.F.Out,"<img src=\"%s/caret-right.svg\""
" alt=\"%s\" title=\"%s\" class=\"ICO16x16\" />", " alt=\"%s\" title=\"%s\" class=\"ICO16x16\" />",
Cfg_URL_ICON_PUBLIC, Cfg_URL_ICON_PUBLIC,
@ -5355,10 +5356,12 @@ static void Tst_PutFormEditOneQst (char Stem[Cns_MAX_BYTES_TEXT + 1],
snprintf (Gbl.Title,sizeof (Gbl.Title), snprintf (Gbl.Title,sizeof (Gbl.Title),
"%s %c)", "%s %c)",
Txt_Contract,'a' + (char) NumOpt); Txt_Contract,'a' + (char) NumOpt);
fprintf (Gbl.F.Out,"<a href=\"\" id=\"con_%u\"",NumOpt); HTM_A_Begin ("href=\"\" id=\"con_%u\"%s"
if (!DisplayRightColumn) // Answer does not have content " onclick=\"toggleAnswer(%u);return false;\"",
fprintf (Gbl.F.Out," style=\"display:none;\""); // Hide icon NumOpt,
fprintf (Gbl.F.Out," onclick=\"toggleAnswer(%u); return false;\" />",NumOpt); DisplayRightColumn ? "" :
" style=\"display:none;\"", // Answer does not have content ==> Hide icon
NumOpt);
fprintf (Gbl.F.Out,"<img src=\"%s/caret-down.svg\"" fprintf (Gbl.F.Out,"<img src=\"%s/caret-down.svg\""
" alt=\"%s\" title=\"%s\" class=\"ICO16x16\" />", " alt=\"%s\" title=\"%s\" class=\"ICO16x16\" />",
Cfg_URL_ICON_PUBLIC, Cfg_URL_ICON_PUBLIC,
@ -5369,10 +5372,10 @@ static void Tst_PutFormEditOneQst (char Stem[Cns_MAX_BYTES_TEXT + 1],
/***** Right column: content of the answer *****/ /***** Right column: content of the answer *****/
HTM_TD_Begin ("class=\"TEST_EDI_ANS_RIGHT_COL COLOR%u\"",Gbl.RowEvenOdd); HTM_TD_Begin ("class=\"TEST_EDI_ANS_RIGHT_COL COLOR%u\"",Gbl.RowEvenOdd);
HTM_DIV_Begin ("id=\"ans_%u\"",NumOpt); HTM_DIV_Begin ("id=\"ans_%u\"%s",
if (!DisplayRightColumn) // Answer does not have content NumOpt,
fprintf (Gbl.F.Out," style=\"display:none;\""); // Hide column DisplayRightColumn ? "" :
fprintf (Gbl.F.Out,">"); " style=\"display:none;\""); // Answer does not have content ==> Hide column
/* Answer text */ /* Answer text */
fprintf (Gbl.F.Out,"<textarea name=\"AnsStr%u\"" fprintf (Gbl.F.Out,"<textarea name=\"AnsStr%u\""

11
swad_test_import.c
View File

@ -257,12 +257,11 @@ void TsI_CreateXML (unsigned long NumRows,MYSQL_RES *mysql_res)
mysql_data_seek (mysql_res,0); mysql_data_seek (mysql_res,0);
/***** Write the link to XML file *****/ /***** Write the link to XML file *****/
fprintf (Gbl.F.Out,"<a href=\"%s/%s/%s/test.xml\"" HTM_A_Begin ("href=\"%s/%s/%s/test.xml\" class=\"%s\" target=\"_blank\"",
" class=\"%s\" target=\"_blank\">", Cfg_URL_FILE_BROWSER_TMP_PUBLIC,
Cfg_URL_FILE_BROWSER_TMP_PUBLIC, Gbl.FileBrowser.TmpPubDir.L,
Gbl.FileBrowser.TmpPubDir.L, Gbl.FileBrowser.TmpPubDir.R,
Gbl.FileBrowser.TmpPubDir.R, The_ClassFormOutBoxBold[Gbl.Prefs.Theme]);
The_ClassFormOutBoxBold[Gbl.Prefs.Theme]);
Ico_PutIconTextLink ("file.svg", Ico_PutIconTextLink ("file.svg",
Txt_XML_file); Txt_XML_file);
HTM_A_End (); HTM_A_End ();

33
swad_timeline.c
View File

@ -1398,9 +1398,9 @@ static void TL_PutLinkToViewNewPublications (void)
HTM_DIV_Begin ("id=\"view_new_posts_container\"" HTM_DIV_Begin ("id=\"view_new_posts_container\""
" class=\"TL_WIDTH TL_SEP VERY_LIGHT_BLUE\"" " class=\"TL_WIDTH TL_SEP VERY_LIGHT_BLUE\""
" style=\"display:none;\""); " style=\"display:none;\"");
fprintf (Gbl.F.Out,"<a href=\"\" class=\"%s\"" HTM_A_Begin ("href=\"\" class=\"%s\""
" onclick=\"moveNewTimelineToTimeline(); return false;\" />", " onclick=\"moveNewTimelineToTimeline();return false;\"",
The_ClassFormInBoxBold[Gbl.Prefs.Theme]); The_ClassFormInBoxBold[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s (<span id=\"view_new_posts_count\">0</span>)", fprintf (Gbl.F.Out,"%s (<span id=\"view_new_posts_count\">0</span>)",
Txt_See_new_activity); Txt_See_new_activity);
HTM_A_End (); HTM_A_End ();
@ -1419,12 +1419,12 @@ static void TL_PutLinkToViewOldPublications (void)
/***** Animated link to view old publications *****/ /***** Animated link to view old publications *****/
HTM_DIV_Begin ("id=\"view_old_posts_container\"" HTM_DIV_Begin ("id=\"view_old_posts_container\""
" class=\"TL_WIDTH TL_SEP VERY_LIGHT_BLUE\""); " class=\"TL_WIDTH TL_SEP VERY_LIGHT_BLUE\"");
fprintf (Gbl.F.Out,"<a href=\"\" class=\"%s\" onclick=\"" HTM_A_Begin ("href=\"\" class=\"%s\" onclick=\""
"document.getElementById('get_old_timeline').style.display='none';" // Icon to be hidden on click "document.getElementById('get_old_timeline').style.display='none';" // Icon to be hidden on click
"document.getElementById('getting_old_timeline').style.display='';" // Icon to be shown on click "document.getElementById('getting_old_timeline').style.display='';" // Icon to be shown on click
"refreshOldTimeline();" "refreshOldTimeline();"
"return false;\">", "return false;\"",
The_ClassFormInBoxBold[Gbl.Prefs.Theme]); The_ClassFormInBoxBold[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"<img id=\"get_old_timeline\"" fprintf (Gbl.F.Out,"<img id=\"get_old_timeline\""
" src=\"%s/recycle16x16.gif\" alt=\"%s\" title=\"%s\"" " src=\"%s/recycle16x16.gif\" alt=\"%s\" title=\"%s\""
" class=\"ICO20x20\" />" " class=\"ICO20x20\" />"
@ -2502,9 +2502,8 @@ static void TL_PutIconToToggleCommentNote (const char UniqueId[Frm_MAX_BYTES_ID
/***** Link to toggle on/off the form to comment a note *****/ /***** Link to toggle on/off the form to comment a note *****/
HTM_DIV_Begin ("id=\"%s_ico\" class=\"TL_ICO_COM_OFF\"",UniqueId); HTM_DIV_Begin ("id=\"%s_ico\" class=\"TL_ICO_COM_OFF\"",UniqueId);
fprintf (Gbl.F.Out,"<a href=\"\"" HTM_A_Begin ("href=\"\" onclick=\"toggleNewComment ('%s');return false;\"",
" onclick=\"toggleNewComment ('%s');return false;\">", UniqueId);
UniqueId);
fprintf (Gbl.F.Out,"<img src=\"%s/edit.svg\" alt=\"%s\" title=\"%s\"" fprintf (Gbl.F.Out,"<img src=\"%s/edit.svg\" alt=\"%s\" title=\"%s\""
" class=\"CONTEXT_ICO_16x16\" />", " class=\"CONTEXT_ICO_16x16\" />",
Cfg_URL_ICON_PUBLIC, Cfg_URL_ICON_PUBLIC,
@ -2702,11 +2701,11 @@ static void TL_PutIconToToggleComments (const char *UniqueId,
extern const char *The_ClassFormInBox[The_NUM_THEMES]; extern const char *The_ClassFormInBox[The_NUM_THEMES];
/***** Link to toggle on/off some divs *****/ /***** Link to toggle on/off some divs *****/
fprintf (Gbl.F.Out,"<a href=\"\" title=\"%s\" class=\"%s\"" HTM_A_Begin ("href=\"\" title=\"%s\" class=\"%s\""
" onclick=\"toggleComments('%s');" " onclick=\"toggleComments('%s');"
"return false;\" />", "return false;\"",
Text,The_ClassFormInBox[Gbl.Prefs.Theme], Text,The_ClassFormInBox[Gbl.Prefs.Theme],
UniqueId); UniqueId);
Ico_PutIconTextLink (Icon,Text); Ico_PutIconTextLink (Icon,Text);
HTM_A_End (); HTM_A_End ();
} }

7
swad_user.c
View File

@ -4123,10 +4123,9 @@ static void Usr_WriteUsrData (const char *BgColor,
/***** Start link *****/ /***** Start link *****/
if (Link) if (Link)
fprintf (Gbl.F.Out,"<a href=\"%s\" class=\"%s\" target=\"_blank\">", HTM_A_Begin ("href=\"%s\" class=\"%s\" target=\"_blank\"",
Link, Link,Accepted ? "DAT_SMALL_NOBR_N" :
Accepted ? "DAT_SMALL_NOBR_N" : "DAT_SMALL_NOBR");
"DAT_SMALL_NOBR");
/***** Write data *****/ /***** Write data *****/
fprintf (Gbl.F.Out,"%s",Data); fprintf (Gbl.F.Out,"%s",Data);

8
swad_zip.c
View File

@ -569,8 +569,8 @@ static void ZIP_ShowLinkToDownloadZIP (const char *FileName,const char *URL,
/***** Link to download the file *****/ /***** Link to download the file *****/
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
HTM_TD_Begin ("colspan=\"2\" class=\"FILENAME_TXT CM\""); HTM_TD_Begin ("colspan=\"2\" class=\"FILENAME_TXT CM\"");
fprintf (Gbl.F.Out,"<a href=\"%s\" class=\"FILENAME_TXT\" title=\"%s\" target=\"_blank\">", HTM_A_Begin ("href=\"%s\" class=\"FILENAME_TXT\" title=\"%s\" target=\"_blank\"",
URL,FileName); URL,FileName);
fprintf (Gbl.F.Out,"<img src=\"%s32x32/zip32x32.gif\"" fprintf (Gbl.F.Out,"<img src=\"%s32x32/zip32x32.gif\""
" alt=\"%s\" title=\"%s\"" " alt=\"%s\" title=\"%s\""
" class=\"ICO40x40\" />" " class=\"ICO40x40\" />"
@ -597,8 +597,8 @@ static void ZIP_ShowLinkToDownloadZIP (const char *FileName,const char *URL,
HTM_TD_End (); HTM_TD_End ();
HTM_TD_Begin ("class=\"DAT LM\""); HTM_TD_Begin ("class=\"DAT LM\"");
fprintf (Gbl.F.Out,"<a href=\"%s\" class=\"DAT\" title=\"%s\" target=\"_blank\">", HTM_A_Begin ("href=\"%s\" class=\"DAT\" title=\"%s\" target=\"_blank\"",
URL,FileName); URL,FileName);
fprintf (Gbl.F.Out,"%s",FileName); fprintf (Gbl.F.Out,"%s",FileName);
HTM_A_End (); HTM_A_End ();
HTM_TD_End (); HTM_TD_End ();