From 10e90abfc7bd42f0dfcf231d845329af7b549d8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Wed, 30 Oct 2019 00:42:01 +0100 Subject: [PATCH] Version19.46.5 --- swad_HTML.c | 36 ++++++++++++++++++++++++++++++++++++ swad_HTML.h | 3 +++ swad_MFU.c | 12 ++++-------- swad_banner.c | 18 ++++-------------- swad_changelog.h | 4 +++- swad_course.c | 7 ++----- swad_file_browser.c | 12 +++++------- swad_icon.c | 6 ++---- swad_layout.c | 28 ++++++++++------------------ swad_network.c | 9 ++------- swad_notification.c | 8 ++------ swad_statistic.c | 17 ++++++++--------- swad_survey.c | 14 ++++++-------- swad_tab.c | 8 ++------ swad_test.c | 12 ++++-------- swad_timeline.c | 14 ++++++-------- swad_user.c | 5 ++--- swad_zip.c | 8 ++------ 18 files changed, 103 insertions(+), 118 deletions(-) diff --git a/swad_HTML.c b/swad_HTML.c index de3ba6c3..edb7deca 100644 --- a/swad_HTML.c +++ b/swad_HTML.c @@ -703,3 +703,39 @@ void HTM_A_End (void) 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,""); + } diff --git a/swad_HTML.h b/swad_HTML.h index 01f4ef7b..42de6677 100644 --- a/swad_HTML.h +++ b/swad_HTML.h @@ -83,4 +83,7 @@ void HTM_LI_End (void); void HTM_A_Begin (const char *fmt,...); 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 diff --git a/swad_MFU.c b/swad_MFU.c index b927ae03..f09ab17f 100644 --- a/swad_MFU.c +++ b/swad_MFU.c @@ -245,10 +245,8 @@ void MFU_WriteBigMFUActions (struct MFU_ListMFUActions *ListMFUActions) HTM_LI_Begin ("class=\"ICO_HIGHLIGHT\""); Frm_StartForm (Action); Frm_LinkFormSubmit (TabMenuStr,The_ClassFormInBoxNoWrap[Gbl.Prefs.Theme],NULL); - fprintf (Gbl.F.Out,"\"%s\"", - Gbl.Prefs.URLIconSet, - Act_GetIcon (Action), - MenuStr); + HTM_IMG (Gbl.Prefs.URLIconSet,Act_GetIcon (Action),MenuStr, + NULL,NULL,NULL); fprintf (Gbl.F.Out," %s",TabMenuStr); Frm_LinkFormEnd (); Frm_EndForm (); @@ -308,10 +306,8 @@ void MFU_WriteSmallMFUActions (struct MFU_ListMFUActions *ListMFUActions) HTM_LI_Begin ("class=\"ICO_HIGHLIGHT\""); Frm_StartForm (Action); Frm_LinkFormSubmit (TabMenuStr,NULL,NULL); - fprintf (Gbl.F.Out,"\"%s\"", - Gbl.Prefs.URLIconSet, - Act_GetIcon (Action), - MenuStr); + HTM_IMG (Gbl.Prefs.URLIconSet,Act_GetIcon (Action),MenuStr, + NULL,NULL,NULL); fprintf (Gbl.F.Out," %s",MenuStr); Frm_LinkFormEnd (); Frm_EndForm (); diff --git a/swad_banner.c b/swad_banner.c index 8b1cd3ec..508a5ce6 100644 --- a/swad_banner.c +++ b/swad_banner.c @@ -156,13 +156,8 @@ static void Ban_WriteListOfBanners (void) HTM_A_Begin ("href=\"%s\" title=\"%s\" class=\"DAT\" target=\"_blank\"", Gbl.Banners.Lst[NumBan].WWW, Gbl.Banners.Lst[NumBan].FullName); - fprintf (Gbl.F.Out,"\"%s\"", - Cfg_URL_BANNER_PUBLIC, - Gbl.Banners.Lst[NumBan].Img, - Gbl.Banners.Lst[NumBan].ShrtName, - Gbl.Banners.Lst[NumBan].FullName); + HTM_IMG (Cfg_URL_BANNER_PUBLIC,Gbl.Banners.Lst[NumBan].Img,Gbl.Banners.Lst[NumBan].FullName, + "BANNER",NULL,NULL); HTM_A_End (); HTM_LI_End (); } @@ -1052,13 +1047,8 @@ void Ban_WriteMenuWithBanners (void) Ban_PutParamBanCod (Gbl.Banners.Lst[NumBan].BanCod); Par_PutHiddenParamString ("URL",Gbl.Banners.Lst[NumBan].WWW); Frm_LinkFormSubmit (Gbl.Banners.Lst[NumBan].FullName,"BANNER",NULL); - fprintf (Gbl.F.Out,"\"%s\"", - Cfg_URL_BANNER_PUBLIC, - Gbl.Banners.Lst[NumBan].Img, - Gbl.Banners.Lst[NumBan].ShrtName, - Gbl.Banners.Lst[NumBan].FullName); + HTM_IMG (Cfg_URL_BANNER_PUBLIC,Gbl.Banners.Lst[NumBan].Img,Gbl.Banners.Lst[NumBan].FullName, + "BANNER",NULL,NULL); Frm_LinkFormEnd (); Frm_EndForm (); HTM_DIV_End (); diff --git a/swad_changelog.h b/swad_changelog.h index f9c0949d..7fe1fafc 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -487,13 +487,15 @@ 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.4 (2019-10-28)" +#define Log_PLATFORM_VERSION "SWAD 19.46.5 (2019-10-29)" #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. +// TODO: Continuar convirtiendo \"%s\"", - Gbl.Prefs.URLTheme, - Txt_My_courses,Txt_My_courses); + HTM_IMG (Gbl.Prefs.URLTheme,"sitemap.svg",Txt_My_courses, + "BC_ICON ICO_HIGHLIGHT",NULL,NULL); Frm_LinkFormEnd (); /***** End form *****/ diff --git a/swad_file_browser.c b/swad_file_browser.c index ef570904..bd3e2cc6 100644 --- a/swad_file_browser.c +++ b/swad_file_browser.c @@ -3292,13 +3292,11 @@ static void Brw_FormToChangeCrsGrpZone (void) (IsGroupZone && GrpDat.GrpCod == Gbl.Crs.Grps.GrpCod) ? "BROWSER_TITLE" : "BROWSER_TITLE_LIGHT"); - fprintf (Gbl.F.Out,"\"\"", - Cfg_URL_ICON_PUBLIC, - NumGrp < LstMyGrps.NumGrps - 1 ? "submid" : - "subend"); + HTM_IMG (Cfg_URL_ICON_PUBLIC, + NumGrp < LstMyGrps.NumGrps - 1 ? "submid20x20.gif" : + "subend20x20.gif", + NULL, + "ICO25x25","margin-left:6px;",NULL); fprintf (Gbl.F.Out,"