mirror of https://github.com/acanas/swad-core.git
Version19.46.5
This commit is contained in:
parent
7c6df6a1d4
commit
10e90abfc7
36
swad_HTML.c
36
swad_HTML.c
|
@ -703,3 +703,39 @@ void HTM_A_End (void)
|
||||||
|
|
||||||
HTM_A_NestingLevel--;
|
HTM_A_NestingLevel--;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*****************************************************************************/
|
||||||
|
/********************************** Images ***********************************/
|
||||||
|
/*****************************************************************************/
|
||||||
|
|
||||||
|
void HTM_IMG (const char *Path,const char *Icon,const char *Title,
|
||||||
|
const char *Class,const char *Style,const char *Id)
|
||||||
|
{
|
||||||
|
fprintf (Gbl.F.Out,"<img");
|
||||||
|
|
||||||
|
if (Id)
|
||||||
|
if (Id[0])
|
||||||
|
fprintf (Gbl.F.Out," id=\"%s\"",Id);
|
||||||
|
|
||||||
|
fprintf (Gbl.F.Out," src=\"%s/%s\"",Path,Icon);
|
||||||
|
|
||||||
|
if (Title)
|
||||||
|
{
|
||||||
|
if (Title[0])
|
||||||
|
fprintf (Gbl.F.Out," alt=\"%s\" title=\"%s\"",Title,Title);
|
||||||
|
else
|
||||||
|
fprintf (Gbl.F.Out," alt=\"\"");
|
||||||
|
}
|
||||||
|
else
|
||||||
|
fprintf (Gbl.F.Out," alt=\"\"");
|
||||||
|
|
||||||
|
if (Class)
|
||||||
|
if (Class[0])
|
||||||
|
fprintf (Gbl.F.Out," class=\"%s\"",Class);
|
||||||
|
|
||||||
|
if (Style)
|
||||||
|
if (Style[0])
|
||||||
|
fprintf (Gbl.F.Out," style=\"%s\"",Style);
|
||||||
|
|
||||||
|
fprintf (Gbl.F.Out," />");
|
||||||
|
}
|
||||||
|
|
|
@ -83,4 +83,7 @@ void HTM_LI_End (void);
|
||||||
void HTM_A_Begin (const char *fmt,...);
|
void HTM_A_Begin (const char *fmt,...);
|
||||||
void HTM_A_End (void);
|
void HTM_A_End (void);
|
||||||
|
|
||||||
|
void HTM_IMG (const char *Path,const char *Icon,const char *Title,
|
||||||
|
const char *Class,const char *Style,const char *Id);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
12
swad_MFU.c
12
swad_MFU.c
|
@ -245,10 +245,8 @@ void MFU_WriteBigMFUActions (struct MFU_ListMFUActions *ListMFUActions)
|
||||||
HTM_LI_Begin ("class=\"ICO_HIGHLIGHT\"");
|
HTM_LI_Begin ("class=\"ICO_HIGHLIGHT\"");
|
||||||
Frm_StartForm (Action);
|
Frm_StartForm (Action);
|
||||||
Frm_LinkFormSubmit (TabMenuStr,The_ClassFormInBoxNoWrap[Gbl.Prefs.Theme],NULL);
|
Frm_LinkFormSubmit (TabMenuStr,The_ClassFormInBoxNoWrap[Gbl.Prefs.Theme],NULL);
|
||||||
fprintf (Gbl.F.Out,"<img src=\"%s/%s\" alt=\"%s\" />",
|
HTM_IMG (Gbl.Prefs.URLIconSet,Act_GetIcon (Action),MenuStr,
|
||||||
Gbl.Prefs.URLIconSet,
|
NULL,NULL,NULL);
|
||||||
Act_GetIcon (Action),
|
|
||||||
MenuStr);
|
|
||||||
fprintf (Gbl.F.Out," %s",TabMenuStr);
|
fprintf (Gbl.F.Out," %s",TabMenuStr);
|
||||||
Frm_LinkFormEnd ();
|
Frm_LinkFormEnd ();
|
||||||
Frm_EndForm ();
|
Frm_EndForm ();
|
||||||
|
@ -308,10 +306,8 @@ void MFU_WriteSmallMFUActions (struct MFU_ListMFUActions *ListMFUActions)
|
||||||
HTM_LI_Begin ("class=\"ICO_HIGHLIGHT\"");
|
HTM_LI_Begin ("class=\"ICO_HIGHLIGHT\"");
|
||||||
Frm_StartForm (Action);
|
Frm_StartForm (Action);
|
||||||
Frm_LinkFormSubmit (TabMenuStr,NULL,NULL);
|
Frm_LinkFormSubmit (TabMenuStr,NULL,NULL);
|
||||||
fprintf (Gbl.F.Out,"<img src=\"%s/%s\" alt=\"%s\" />",
|
HTM_IMG (Gbl.Prefs.URLIconSet,Act_GetIcon (Action),MenuStr,
|
||||||
Gbl.Prefs.URLIconSet,
|
NULL,NULL,NULL);
|
||||||
Act_GetIcon (Action),
|
|
||||||
MenuStr);
|
|
||||||
fprintf (Gbl.F.Out," %s",MenuStr);
|
fprintf (Gbl.F.Out," %s",MenuStr);
|
||||||
Frm_LinkFormEnd ();
|
Frm_LinkFormEnd ();
|
||||||
Frm_EndForm ();
|
Frm_EndForm ();
|
||||||
|
|
|
@ -156,13 +156,8 @@ static void Ban_WriteListOfBanners (void)
|
||||||
HTM_A_Begin ("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\""
|
HTM_IMG (Cfg_URL_BANNER_PUBLIC,Gbl.Banners.Lst[NumBan].Img,Gbl.Banners.Lst[NumBan].FullName,
|
||||||
" alt=\"%s\" title=\"%s\""
|
"BANNER",NULL,NULL);
|
||||||
" class=\"BANNER\" />",
|
|
||||||
Cfg_URL_BANNER_PUBLIC,
|
|
||||||
Gbl.Banners.Lst[NumBan].Img,
|
|
||||||
Gbl.Banners.Lst[NumBan].ShrtName,
|
|
||||||
Gbl.Banners.Lst[NumBan].FullName);
|
|
||||||
HTM_A_End ();
|
HTM_A_End ();
|
||||||
HTM_LI_End ();
|
HTM_LI_End ();
|
||||||
}
|
}
|
||||||
|
@ -1052,13 +1047,8 @@ void Ban_WriteMenuWithBanners (void)
|
||||||
Ban_PutParamBanCod (Gbl.Banners.Lst[NumBan].BanCod);
|
Ban_PutParamBanCod (Gbl.Banners.Lst[NumBan].BanCod);
|
||||||
Par_PutHiddenParamString ("URL",Gbl.Banners.Lst[NumBan].WWW);
|
Par_PutHiddenParamString ("URL",Gbl.Banners.Lst[NumBan].WWW);
|
||||||
Frm_LinkFormSubmit (Gbl.Banners.Lst[NumBan].FullName,"BANNER",NULL);
|
Frm_LinkFormSubmit (Gbl.Banners.Lst[NumBan].FullName,"BANNER",NULL);
|
||||||
fprintf (Gbl.F.Out,"<img src=\"%s/%s\""
|
HTM_IMG (Cfg_URL_BANNER_PUBLIC,Gbl.Banners.Lst[NumBan].Img,Gbl.Banners.Lst[NumBan].FullName,
|
||||||
" alt=\"%s\" title=\"%s\""
|
"BANNER",NULL,NULL);
|
||||||
" class=\"BANNER\" />",
|
|
||||||
Cfg_URL_BANNER_PUBLIC,
|
|
||||||
Gbl.Banners.Lst[NumBan].Img,
|
|
||||||
Gbl.Banners.Lst[NumBan].ShrtName,
|
|
||||||
Gbl.Banners.Lst[NumBan].FullName);
|
|
||||||
Frm_LinkFormEnd ();
|
Frm_LinkFormEnd ();
|
||||||
Frm_EndForm ();
|
Frm_EndForm ();
|
||||||
HTM_DIV_End ();
|
HTM_DIV_End ();
|
||||||
|
|
|
@ -487,13 +487,15 @@ 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.4 (2019-10-28)"
|
#define Log_PLATFORM_VERSION "SWAD 19.46.5 (2019-10-29)"
|
||||||
#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.
|
||||||
|
// TODO: Continuar convirtiendo <img a HTM_IMG ()
|
||||||
|
|
||||||
|
Version 19.46.5: Oct 29, 2019 Code refactoring in HTML images. (246223 lines)
|
||||||
Version 19.46.4: Oct 28, 2019 Code refactoring in HTML images. (246247 lines)
|
Version 19.46.4: Oct 28, 2019 Code refactoring in HTML images. (246247 lines)
|
||||||
Version 19.46.3: Oct 28, 2019 Code refactoring in HTML images. (246390 lines)
|
Version 19.46.3: Oct 28, 2019 Code refactoring in HTML images. (246390 lines)
|
||||||
Version 19.46.2: Oct 28, 2019 Code refactoring in HTML images. (246519 lines)
|
Version 19.46.2: Oct 28, 2019 Code refactoring in HTML images. (246519 lines)
|
||||||
|
|
|
@ -2939,11 +2939,8 @@ void Crs_PutIconToSelectMyCoursesInBreadcrumb (void)
|
||||||
|
|
||||||
/***** Put icon with link *****/
|
/***** Put icon with link *****/
|
||||||
Frm_LinkFormSubmit (Txt_My_courses,NULL,NULL);
|
Frm_LinkFormSubmit (Txt_My_courses,NULL,NULL);
|
||||||
fprintf (Gbl.F.Out,"<img src=\"%s/sitemap.svg\""
|
HTM_IMG (Gbl.Prefs.URLTheme,"sitemap.svg",Txt_My_courses,
|
||||||
" alt=\"%s\" title=\"%s\""
|
"BC_ICON ICO_HIGHLIGHT",NULL,NULL);
|
||||||
" class=\"BC_ICON ICO_HIGHLIGHT\" />",
|
|
||||||
Gbl.Prefs.URLTheme,
|
|
||||||
Txt_My_courses,Txt_My_courses);
|
|
||||||
Frm_LinkFormEnd ();
|
Frm_LinkFormEnd ();
|
||||||
|
|
||||||
/***** End form *****/
|
/***** End form *****/
|
||||||
|
|
|
@ -3292,13 +3292,11 @@ static void Brw_FormToChangeCrsGrpZone (void)
|
||||||
(IsGroupZone &&
|
(IsGroupZone &&
|
||||||
GrpDat.GrpCod == Gbl.Crs.Grps.GrpCod) ? "BROWSER_TITLE" :
|
GrpDat.GrpCod == Gbl.Crs.Grps.GrpCod) ? "BROWSER_TITLE" :
|
||||||
"BROWSER_TITLE_LIGHT");
|
"BROWSER_TITLE_LIGHT");
|
||||||
fprintf (Gbl.F.Out,"<img src=\"%s/%s20x20.gif\""
|
HTM_IMG (Cfg_URL_ICON_PUBLIC,
|
||||||
" alt=\"\" title=\"\""
|
NumGrp < LstMyGrps.NumGrps - 1 ? "submid20x20.gif" :
|
||||||
" class=\"ICO25x25\""
|
"subend20x20.gif",
|
||||||
" style=\"margin-left:6px;\" />",
|
NULL,
|
||||||
Cfg_URL_ICON_PUBLIC,
|
"ICO25x25","margin-left:6px;",NULL);
|
||||||
NumGrp < LstMyGrps.NumGrps - 1 ? "submid" :
|
|
||||||
"subend");
|
|
||||||
fprintf (Gbl.F.Out,"<label>"
|
fprintf (Gbl.F.Out,"<label>"
|
||||||
"<input type=\"radio\" name=\"GrpCod\" value=\"%ld\"",
|
"<input type=\"radio\" name=\"GrpCod\" value=\"%ld\"",
|
||||||
GrpDat.GrpCod);
|
GrpDat.GrpCod);
|
||||||
|
|
|
@ -411,10 +411,8 @@ void Ico_PutIconOff (const char *Icon,const char *Title)
|
||||||
|
|
||||||
void Ico_PutIcon (const char *Icon,const char *Title,const char *Class)
|
void Ico_PutIcon (const char *Icon,const char *Title,const char *Class)
|
||||||
{
|
{
|
||||||
fprintf (Gbl.F.Out,"<img src=\"%s/%s\""
|
HTM_IMG (Cfg_URL_ICON_PUBLIC,Icon,Title,
|
||||||
" alt=\"%s\" title=\"%s\" class=\"%s\" />",
|
Class,NULL,NULL);
|
||||||
Cfg_URL_ICON_PUBLIC,Icon,
|
|
||||||
Title,Title,Class);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
|
|
@ -270,10 +270,8 @@ void Lay_WriteStartOfPage (void)
|
||||||
case Act_BRW_1ST_TAB:
|
case Act_BRW_1ST_TAB:
|
||||||
fprintf (Gbl.F.Out,"<body onload=\"init();\">\n");
|
fprintf (Gbl.F.Out,"<body onload=\"init();\">\n");
|
||||||
HTM_DIV_Begin ("id=\"zoomLyr\" class=\"ZOOM\"");
|
HTM_DIV_Begin ("id=\"zoomLyr\" class=\"ZOOM\"");
|
||||||
fprintf (Gbl.F.Out,"<img id=\"zoomImg\" src=\"%s/usr_bl.jpg\""
|
HTM_IMG (Cfg_URL_ICON_PUBLIC,"usr_bl.jpg",NULL,
|
||||||
" alt=\"\" title=\"\""
|
"IMG_USR",NULL,"zoomImg");
|
||||||
" class=\"IMG_USR\" />",
|
|
||||||
Cfg_URL_ICON_PUBLIC);
|
|
||||||
HTM_DIV_Begin ("id=\"zoomTxt\" class=\"CM\"");
|
HTM_DIV_Begin ("id=\"zoomTxt\" class=\"CM\"");
|
||||||
HTM_DIV_End ();
|
HTM_DIV_End ();
|
||||||
HTM_DIV_End ();
|
HTM_DIV_End ();
|
||||||
|
@ -1155,10 +1153,8 @@ static void Lay_ShowRightColumn (void)
|
||||||
HTM_A_Begin ("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\""
|
HTM_IMG (Cfg_URL_ICON_PUBLIC,"SWADroid120x200.png","SWADroid",
|
||||||
" alt=\"SWADroid\" title=\"SWADroid\""
|
NULL,"width:150px; height:250px;",NULL);
|
||||||
" style=\"width:150px; height:250px;\" />",
|
|
||||||
Cfg_URL_ICON_PUBLIC);
|
|
||||||
HTM_A_End ();
|
HTM_A_End ();
|
||||||
HTM_DIV_End ();
|
HTM_DIV_End ();
|
||||||
}
|
}
|
||||||
|
@ -1444,11 +1440,10 @@ static void Lay_WriteAboutZone (void)
|
||||||
|
|
||||||
/***** Questions and problems *****/
|
/***** Questions and problems *****/
|
||||||
HTM_DIV_Begin (NULL);
|
HTM_DIV_Begin (NULL);
|
||||||
fprintf (Gbl.F.Out,"%s: "
|
fprintf (Gbl.F.Out,"%s: ",Txt_Questions_and_problems);
|
||||||
"<a href=\"mailto:%s\" class=\"ABOUT\" target=\"_blank\">"
|
HTM_A_Begin ("href=\"mailto:%s\" class=\"ABOUT\" target=\"_blank\"",
|
||||||
"%s",
|
Cfg_PLATFORM_RESPONSIBLE_EMAIL);
|
||||||
Txt_Questions_and_problems,
|
fprintf (Gbl.F.Out,"%s",Cfg_PLATFORM_RESPONSIBLE_EMAIL);
|
||||||
Cfg_PLATFORM_RESPONSIBLE_EMAIL,Cfg_PLATFORM_RESPONSIBLE_EMAIL);
|
|
||||||
HTM_A_End ();
|
HTM_A_End ();
|
||||||
HTM_DIV_End ();
|
HTM_DIV_End ();
|
||||||
|
|
||||||
|
@ -1685,11 +1680,8 @@ void Lay_AdvertisementMobile (void)
|
||||||
HTM_A_Begin ("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 />",Txt_Stay_connected_with_SWADroid);
|
fprintf (Gbl.F.Out,"%s<br /><br />",Txt_Stay_connected_with_SWADroid);
|
||||||
fprintf (Gbl.F.Out,"<img src=\"%s/SWADroid200x300.png\""
|
HTM_IMG (Cfg_URL_ICON_PUBLIC,"SWADroid200x300.png",Txt_Stay_connected_with_SWADroid,
|
||||||
" alt=\"SWADroid\" title=\"%s\""
|
NULL,"width:250px; height:375px;",NULL);
|
||||||
" style=\"width:250px; height:375px;\" />",
|
|
||||||
Cfg_URL_ICON_PUBLIC,
|
|
||||||
Txt_Stay_connected_with_SWADroid);
|
|
||||||
HTM_A_End ();
|
HTM_A_End ();
|
||||||
HTM_TD_End ();
|
HTM_TD_End ();
|
||||||
HTM_TR_End ();
|
HTM_TR_End ();
|
||||||
|
|
|
@ -322,13 +322,8 @@ void Net_ShowFormMyWebsAndSocialNets (void)
|
||||||
HTM_TD_Begin ("class=\"REC_C1_BOT LM\"");
|
HTM_TD_Begin ("class=\"REC_C1_BOT LM\"");
|
||||||
fprintf (Gbl.F.Out,"<label for=\"URL%u\" class=\"%s\">",
|
fprintf (Gbl.F.Out,"<label for=\"URL%u\" class=\"%s\">",
|
||||||
(unsigned) NumURL,The_ClassFormInBox[Gbl.Prefs.Theme]);
|
(unsigned) NumURL,The_ClassFormInBox[Gbl.Prefs.Theme]);
|
||||||
fprintf (Gbl.F.Out,"<img src=\"%s/%s\""
|
HTM_IMG (Cfg_URL_ICON_PUBLIC,Net_WebsAndSocialNetworksIcons[NumURL],Net_WebsAndSocialNetworksTitle[NumURL],
|
||||||
" alt=\"%s\" title=\"%s\""
|
"CONTEXT_ICO_16x16","margin-right:6px;",NULL);
|
||||||
" class=\"CONTEXT_ICO_16x16\""
|
|
||||||
" style=\"margin-right:6px;\" />",
|
|
||||||
Cfg_URL_ICON_PUBLIC,Net_WebsAndSocialNetworksIcons[NumURL],
|
|
||||||
Net_WebsAndSocialNetworksTitle[NumURL],
|
|
||||||
Net_WebsAndSocialNetworksTitle[NumURL]);
|
|
||||||
fprintf (Gbl.F.Out,"%s:"
|
fprintf (Gbl.F.Out,"%s:"
|
||||||
"</label>",
|
"</label>",
|
||||||
Net_WebsAndSocialNetworksTitle[NumURL]);
|
Net_WebsAndSocialNetworksTitle[NumURL]);
|
||||||
|
|
|
@ -2059,12 +2059,8 @@ void Ntf_WriteNumberOfNewNtfs (void)
|
||||||
/***** Icon and number of new notifications *****/
|
/***** Icon and number of new notifications *****/
|
||||||
if (NumNewNtfs)
|
if (NumNewNtfs)
|
||||||
{
|
{
|
||||||
fprintf (Gbl.F.Out,"<img src=\"%s/bell.svg\""
|
HTM_IMG (Gbl.Prefs.URLTheme,"bell.svg",Txt_Notifications,
|
||||||
" alt=\"%s\" title=\"%s\""
|
"ICO16x16",NULL,NULL);
|
||||||
" class=\"ICO16x16\" />",
|
|
||||||
Gbl.Prefs.URLTheme,
|
|
||||||
Txt_Notifications,
|
|
||||||
Txt_Notifications);
|
|
||||||
fprintf (Gbl.F.Out," %u<span id=\"notif_new\"> %s</span>",
|
fprintf (Gbl.F.Out," %u<span id=\"notif_new\"> %s</span>",
|
||||||
NumNewNtfs,
|
NumNewNtfs,
|
||||||
NumNewNtfs == 1 ? Txt_NOTIF_new_SINGULAR :
|
NumNewNtfs == 1 ? Txt_NOTIF_new_SINGULAR :
|
||||||
|
|
|
@ -1790,6 +1790,7 @@ static void Sta_ShowNumHitsPerUsr (unsigned long NumRows,MYSQL_RES *mysql_res)
|
||||||
unsigned long NumRow;
|
unsigned long NumRow;
|
||||||
struct Sta_Hits Hits;
|
struct Sta_Hits Hits;
|
||||||
unsigned BarWidth;
|
unsigned BarWidth;
|
||||||
|
char Style[64];
|
||||||
struct UsrData UsrDat;
|
struct UsrData UsrDat;
|
||||||
char PhotoURL[PATH_MAX + 1];
|
char PhotoURL[PATH_MAX + 1];
|
||||||
bool ShowPhoto;
|
bool ShowPhoto;
|
||||||
|
@ -1868,18 +1869,16 @@ static void Sta_ShowNumHitsPerUsr (unsigned long NumRows,MYSQL_RES *mysql_res)
|
||||||
HTM_TD_Begin ("class=\"LOG LT COLOR%u\"",Gbl.RowEvenOdd);
|
HTM_TD_Begin ("class=\"LOG LT COLOR%u\"",Gbl.RowEvenOdd);
|
||||||
if (BarWidth)
|
if (BarWidth)
|
||||||
{
|
{
|
||||||
fprintf (Gbl.F.Out,"<img src=\"%s/%c1x1.png\"" // Background
|
snprintf (Style,sizeof (Style),
|
||||||
" alt=\"\" title=\"\""
|
"width:%upx; height:10px; padding-top:4px;",BarWidth);
|
||||||
" class=\"LT\""
|
HTM_IMG (Cfg_URL_ICON_PUBLIC,
|
||||||
" style=\"width:%upx; height:10px; padding-top:4px;\" />",
|
UsrDat.Roles.InCurrentCrs.Role == Rol_STD ? "o1x1.png" : // Student
|
||||||
Cfg_URL_ICON_PUBLIC,
|
"r1x1.png", // Non-editing teacher or teacher
|
||||||
UsrDat.Roles.InCurrentCrs.Role == Rol_STD ? 'o' : // Student
|
NULL,
|
||||||
'r', // Non-editing teacher or teacher
|
"LT",Style,NULL);
|
||||||
BarWidth);
|
|
||||||
fprintf (Gbl.F.Out," ");
|
fprintf (Gbl.F.Out," ");
|
||||||
}
|
}
|
||||||
Str_WriteFloatNumToFile (Gbl.F.Out,Hits.Num);
|
Str_WriteFloatNumToFile (Gbl.F.Out,Hits.Num);
|
||||||
fprintf (Gbl.F.Out," ");
|
|
||||||
HTM_TD_End ();
|
HTM_TD_End ();
|
||||||
|
|
||||||
HTM_TR_End ();
|
HTM_TR_End ();
|
||||||
|
|
|
@ -3505,6 +3505,7 @@ static void Svy_WriteAnswersOfAQst (struct Survey *Svy,
|
||||||
static void Svy_DrawBarNumUsrs (unsigned NumUsrs,unsigned MaxUsrs)
|
static void Svy_DrawBarNumUsrs (unsigned NumUsrs,unsigned MaxUsrs)
|
||||||
{
|
{
|
||||||
extern const char *Txt_of_PART_OF_A_TOTAL;
|
extern const char *Txt_of_PART_OF_A_TOTAL;
|
||||||
|
char Style[64];
|
||||||
unsigned BarWidth = 0;
|
unsigned BarWidth = 0;
|
||||||
|
|
||||||
/***** String with the number of users *****/
|
/***** String with the number of users *****/
|
||||||
|
@ -3527,16 +3528,13 @@ static void Svy_DrawBarNumUsrs (unsigned NumUsrs,unsigned MaxUsrs)
|
||||||
(float) MaxUsrs) + 0.5);
|
(float) MaxUsrs) + 0.5);
|
||||||
if (BarWidth < 2)
|
if (BarWidth < 2)
|
||||||
BarWidth = 2;
|
BarWidth = 2;
|
||||||
fprintf (Gbl.F.Out,"<img src=\"%s/o1x1.png\" alt=\"%s\" title=\"%s\""
|
snprintf (Style,sizeof (Style),
|
||||||
" class=\"LT\" style=\"width:%upx; height:20px;\" />",
|
"width:%upx; height:20px;",BarWidth);
|
||||||
Cfg_URL_ICON_PUBLIC,
|
HTM_IMG (Cfg_URL_ICON_PUBLIC,"o1x1.png",Gbl.Title,
|
||||||
Gbl.Title,
|
"LT",Style,NULL);
|
||||||
Gbl.Title,
|
|
||||||
BarWidth);
|
|
||||||
fprintf (Gbl.F.Out," ");
|
|
||||||
|
|
||||||
/***** Write the number of users *****/
|
/***** Write the number of users *****/
|
||||||
fprintf (Gbl.F.Out,"%s",Gbl.Title);
|
fprintf (Gbl.F.Out," %s",Gbl.Title);
|
||||||
|
|
||||||
HTM_TD_End ();
|
HTM_TD_End ();
|
||||||
}
|
}
|
||||||
|
|
|
@ -136,12 +136,8 @@ void Tab_DrawTabs (void)
|
||||||
Frm_LinkFormSubmit (Txt_TABS_TXT[NumTab],
|
Frm_LinkFormSubmit (Txt_TABS_TXT[NumTab],
|
||||||
NumTab == Gbl.Action.Tab ? The_ClassTxtTabOn[Gbl.Prefs.Theme] :
|
NumTab == Gbl.Action.Tab ? The_ClassTxtTabOn[Gbl.Prefs.Theme] :
|
||||||
The_ClassTxtTabOff[Gbl.Prefs.Theme],NULL);
|
The_ClassTxtTabOff[Gbl.Prefs.Theme],NULL);
|
||||||
fprintf (Gbl.F.Out,"<img src=\"%s/%s\" alt=\"%s\" title=\"%s\""
|
HTM_IMG (Gbl.Prefs.URLIconSet,Tab_GetIcon (NumTab),Txt_TABS_TXT[NumTab],
|
||||||
" class=\"TAB_ICO\" />",
|
"TAB_ICO",NULL,NULL);
|
||||||
Gbl.Prefs.URLIconSet,
|
|
||||||
Tab_GetIcon (NumTab),
|
|
||||||
Txt_TABS_TXT[NumTab],
|
|
||||||
Txt_TABS_TXT[NumTab]);
|
|
||||||
HTM_DIV_Begin ("class=\"TAB_TXT %s\"",
|
HTM_DIV_Begin ("class=\"TAB_TXT %s\"",
|
||||||
NumTab == Gbl.Action.Tab ? The_ClassTxtTabOn[Gbl.Prefs.Theme] :
|
NumTab == Gbl.Action.Tab ? The_ClassTxtTabOn[Gbl.Prefs.Theme] :
|
||||||
The_ClassTxtTabOff[Gbl.Prefs.Theme]);
|
The_ClassTxtTabOff[Gbl.Prefs.Theme]);
|
||||||
|
|
12
swad_test.c
12
swad_test.c
|
@ -1735,16 +1735,12 @@ static void Tst_ShowFormSelTags (unsigned long NumRows,MYSQL_RES *mysql_res,
|
||||||
{
|
{
|
||||||
TagHidden = (row[2][0] == 'Y');
|
TagHidden = (row[2][0] == 'Y');
|
||||||
HTM_TD_Begin ("class=\"LM\"");
|
HTM_TD_Begin ("class=\"LM\"");
|
||||||
fprintf (Gbl.F.Out,"<img src=\"%s/",Cfg_URL_ICON_PUBLIC);
|
|
||||||
if (TagHidden)
|
if (TagHidden)
|
||||||
fprintf (Gbl.F.Out,"eye-slash.svg\" alt=\"%s\" title=\"%s",
|
HTM_IMG (Cfg_URL_ICON_PUBLIC,"eye-slash.svg",Txt_Tag_not_allowed,
|
||||||
Txt_Tag_not_allowed,
|
"ICO_HIDDEN ICO16x16",NULL,NULL);
|
||||||
Txt_Tag_not_allowed);
|
|
||||||
else
|
else
|
||||||
fprintf (Gbl.F.Out,"eye.svg\" alt=\"%s\" title=\"%s",
|
HTM_IMG (Cfg_URL_ICON_PUBLIC,"eye.svg",Txt_Tag_allowed,
|
||||||
Txt_Tag_allowed,
|
"ICO_HIDDEN ICO16x16",NULL,NULL);
|
||||||
Txt_Tag_allowed);
|
|
||||||
fprintf (Gbl.F.Out,"\" class=\"ICO_HIDDEN ICO16x16\" />");
|
|
||||||
HTM_TD_End ();
|
HTM_TD_End ();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1425,14 +1425,12 @@ static void TL_PutLinkToViewOldPublications (void)
|
||||||
"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\""
|
HTM_IMG (Cfg_URL_ICON_PUBLIC,"recycle16x16.gif","Txt_See_more",
|
||||||
" src=\"%s/recycle16x16.gif\" alt=\"%s\" title=\"%s\""
|
"ICO20x20",NULL,"get_old_timeline");
|
||||||
" class=\"ICO20x20\" />",
|
HTM_IMG (Cfg_URL_ICON_PUBLIC,"working16x16.gif",Txt_See_more,
|
||||||
Cfg_URL_ICON_PUBLIC,Txt_See_more,Txt_See_more);
|
"ICO20x20","display:none;","getting_old_timeline"); // Animated icon hidden
|
||||||
fprintf (Gbl.F.Out,"<img id=\"getting_old_timeline\""
|
HTM_IMG (Cfg_URL_ICON_PUBLIC,"recycle16x16.gif","Txt_See_more",
|
||||||
" src=\"%s/working16x16.gif\" alt=\"%s\" title=\"%s\""
|
"ICO20x20","display:none;","get_old_timeline");
|
||||||
" class=\"ICO20x20\" style=\"display:none;\" />", // Animated icon hidden
|
|
||||||
Cfg_URL_ICON_PUBLIC,Txt_See_more,Txt_See_more);
|
|
||||||
fprintf (Gbl.F.Out," %s",Txt_See_more);
|
fprintf (Gbl.F.Out," %s",Txt_See_more);
|
||||||
HTM_A_End ();
|
HTM_A_End ();
|
||||||
HTM_DIV_End ();
|
HTM_DIV_End ();
|
||||||
|
|
|
@ -2677,9 +2677,8 @@ void Usr_WelcomeUsr (void)
|
||||||
Gbl.Usrs.Me.UsrDat.FirstName);
|
Gbl.Usrs.Me.UsrDat.FirstName);
|
||||||
|
|
||||||
/* Show cake icon */
|
/* Show cake icon */
|
||||||
fprintf (Gbl.F.Out,"<img src=\"%s/birthday-cake.svg\""
|
HTM_IMG (Gbl.Prefs.URLIconSet,"birthday-cake.svg",NULL,
|
||||||
" alt=\"\" class=\"ICO160x160\" />",
|
"ICO160x160",NULL,NULL);
|
||||||
Gbl.Prefs.URLIconSet);
|
|
||||||
|
|
||||||
/* End alert */
|
/* End alert */
|
||||||
Ale_ShowAlertAndButton2 (ActUnk,NULL,NULL,NULL,Btn_NO_BUTTON,NULL);
|
Ale_ShowAlertAndButton2 (ActUnk,NULL,NULL,NULL,Btn_NO_BUTTON,NULL);
|
||||||
|
|
|
@ -571,12 +571,8 @@ static void ZIP_ShowLinkToDownloadZIP (const char *FileName,const char *URL,
|
||||||
HTM_TD_Begin ("colspan=\"2\" class=\"FILENAME_TXT CM\"");
|
HTM_TD_Begin ("colspan=\"2\" class=\"FILENAME_TXT CM\"");
|
||||||
HTM_A_Begin ("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\""
|
HTM_IMG (CfG_URL_ICON_FILEXT_PUBLIC "32x32","zip32x32.gif",Txt_ZIP_file,
|
||||||
" alt=\"%s\" title=\"%s\""
|
"ICO40x40",NULL,NULL);
|
||||||
" class=\"ICO40x40\" />",
|
|
||||||
CfG_URL_ICON_FILEXT_PUBLIC,
|
|
||||||
Txt_ZIP_file,
|
|
||||||
Txt_ZIP_file);
|
|
||||||
fprintf (Gbl.F.Out," %s ",FileName);
|
fprintf (Gbl.F.Out," %s ",FileName);
|
||||||
Ico_PutIcon ("download.svg",Txt_Download,"ICO40x40");
|
Ico_PutIcon ("download.svg",Txt_Download,"ICO40x40");
|
||||||
HTM_A_End ();
|
HTM_A_End ();
|
||||||
|
|
Loading…
Reference in New Issue