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

Version 22.118.10:May 30, 2023 Draw logo in head even if it does not exist.

This commit is contained in:
acanas 2023-05-30 22:57:14 +02:00
parent 4b41b33495
commit de07045184
19 changed files with 71 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
swad_browser.c
View File

@ -9519,7 +9519,7 @@ static void Brw_WriteRowDocData (unsigned *NumDocsNotHidden,MYSQL_ROW row)
HTM_BUTTON_Submit_Begin (Str_BuildGoToTitle (InsShortName), HTM_BUTTON_Submit_Begin (Str_BuildGoToTitle (InsShortName),
"class=\"LT BT_LINK\""); "class=\"LT BT_LINK\"");
Str_FreeGoToTitle (); Str_FreeGoToTitle ();
Lgo_DrawLogo (HieLvl_INS,InsCod,InsShortName,20,"BT_LINK LT",true); Lgo_DrawLogo (HieLvl_INS,InsCod,InsShortName,20,"BT_LINK LT");
HTM_TxtF (" %s",InsShortName); HTM_TxtF (" %s",InsShortName);
HTM_BUTTON_End (); HTM_BUTTON_End ();
Frm_EndForm (); Frm_EndForm ();
@ -9536,7 +9536,7 @@ static void Brw_WriteRowDocData (unsigned *NumDocsNotHidden,MYSQL_ROW row)
HTM_BUTTON_Submit_Begin (Str_BuildGoToTitle (CtrShortName), HTM_BUTTON_Submit_Begin (Str_BuildGoToTitle (CtrShortName),
"class=\"LT BT_LINK\""); "class=\"LT BT_LINK\"");
Str_FreeGoToTitle (); Str_FreeGoToTitle ();
Lgo_DrawLogo (HieLvl_CTR,CtrCod,CtrShortName,20,"LT",true); Lgo_DrawLogo (HieLvl_CTR,CtrCod,CtrShortName,20,"LT");
HTM_TxtF (" %s",CtrShortName); HTM_TxtF (" %s",CtrShortName);
HTM_BUTTON_End (); HTM_BUTTON_End ();
Frm_EndForm (); Frm_EndForm ();
@ -9553,7 +9553,7 @@ static void Brw_WriteRowDocData (unsigned *NumDocsNotHidden,MYSQL_ROW row)
HTM_BUTTON_Submit_Begin (Str_BuildGoToTitle (DegShortName), HTM_BUTTON_Submit_Begin (Str_BuildGoToTitle (DegShortName),
"class=\"LT BT_LINK\""); "class=\"LT BT_LINK\"");
Str_FreeGoToTitle (); Str_FreeGoToTitle ();
Lgo_DrawLogo (HieLvl_DEG,DegCod,DegShortName,20,"LT",true); Lgo_DrawLogo (HieLvl_DEG,DegCod,DegShortName,20,"LT");
HTM_TxtF (" %s",DegShortName); HTM_TxtF (" %s",DegShortName);
HTM_BUTTON_End (); HTM_BUTTON_End ();
Frm_EndForm (); Frm_EndForm ();

2
swad_call_for_exam.c
View File

@ -954,7 +954,7 @@ static void Cfe_ShowCallForExam (struct Cfe_CallsForExams *CallsForExams,
if (TypeViewCallForExam == Cfe_NORMAL_VIEW) if (TypeViewCallForExam == Cfe_NORMAL_VIEW)
HTM_A_Begin ("href=\"%s\" target=\"_blank\" class=\"EXAM_TIT_%s\"", HTM_A_Begin ("href=\"%s\" target=\"_blank\" class=\"EXAM_TIT_%s\"",
Ins.WWW,The_GetSuffix ()); Ins.WWW,The_GetSuffix ());
Lgo_DrawLogo (HieLvl_INS,Ins.InsCod,Ins.FullName,64,NULL,true); Lgo_DrawLogo (HieLvl_INS,Ins.InsCod,Ins.FullName,64,NULL);
HTM_BR (); HTM_BR ();
HTM_Txt (Ins.FullName); HTM_Txt (Ins.FullName);
if (TypeViewCallForExam == Cfe_NORMAL_VIEW) if (TypeViewCallForExam == Cfe_NORMAL_VIEW)

6
swad_center.c
View File

@ -200,7 +200,7 @@ void Ctr_DrawCenterLogoAndNameWithLink (struct Ctr_Center *Ctr,Act_Action_t Acti
Str_FreeGoToTitle (); Str_FreeGoToTitle ();
/***** Center logo and name *****/ /***** Center logo and name *****/
Lgo_DrawLogo (HieLvl_CTR,Ctr->CtrCod,Ctr->ShrtName,16,ClassLogo,true); Lgo_DrawLogo (HieLvl_CTR,Ctr->CtrCod,Ctr->ShrtName,16,ClassLogo);
HTM_TxtF (" %s",Ctr->FullName); HTM_TxtF (" %s",Ctr->FullName);
/***** End link *****/ /***** End link *****/
@ -775,7 +775,7 @@ static void Ctr_ListCentersForEdition (const struct Plc_Places *Places)
/* Center logo */ /* Center logo */
HTM_TD_Begin ("title=\"%s\" class=\"HIE_LOGO\"",Ctr->FullName); HTM_TD_Begin ("title=\"%s\" class=\"HIE_LOGO\"",Ctr->FullName);
Lgo_DrawLogo (HieLvl_CTR,Ctr->CtrCod,Ctr->ShrtName,20,NULL,true); Lgo_DrawLogo (HieLvl_CTR,Ctr->CtrCod,Ctr->ShrtName,20,NULL);
HTM_TD_End (); HTM_TD_End ();
/* Place */ /* Place */
@ -1272,7 +1272,7 @@ static void Ctr_PutFormToCreateCenter (const struct Plc_Places *Places)
/***** Center logo *****/ /***** Center logo *****/
HTM_TD_Begin ("title=\"%s\" class=\"HIE_LOGO\"",Ctr_EditingCtr->FullName); HTM_TD_Begin ("title=\"%s\" class=\"HIE_LOGO\"",Ctr_EditingCtr->FullName);
Lgo_DrawLogo (HieLvl_CTR,-1L,"",20,NULL,true); Lgo_DrawLogo (HieLvl_CTR,-1L,"",20,NULL);
HTM_TD_End (); HTM_TD_End ();
/***** Place *****/ /***** Place *****/

2
swad_center_config.c
View File

@ -598,7 +598,7 @@ static void CtrCfg_Institution (bool PrintView,bool PutForm)
} }
Lgo_DrawLogo (HieLvl_INS,Gbl.Hierarchy.Ins.InsCod,Gbl.Hierarchy.Ins.ShrtName, Lgo_DrawLogo (HieLvl_INS,Gbl.Hierarchy.Ins.InsCod,Gbl.Hierarchy.Ins.ShrtName,
20,"LM",true); 20,"LM");
HTM_NBSP (); HTM_NBSP ();
HTM_Txt (Gbl.Hierarchy.Ins.FullName); HTM_Txt (Gbl.Hierarchy.Ins.FullName);

3
swad_changelog.h
View File

@ -629,10 +629,11 @@ TODO: Emilce Barrera Mesa: Podr
TODO: Emilce Barrera Mesa: Mis estudiantes presentan muchas dificultades a la hora de poner la foto porque la plataforma es muy exigente respecto al fondo de la imagen. TODO: Emilce Barrera Mesa: Mis estudiantes presentan muchas dificultades a la hora de poner la foto porque la plataforma es muy exigente respecto al fondo de la imagen.
*/ */
#define Log_PLATFORM_VERSION "SWAD 22.118.9 (2023-05-30)" #define Log_PLATFORM_VERSION "SWAD 22.118.10 (2023-05-30)"
#define CSS_FILE "swad22.118.5.css" #define CSS_FILE "swad22.118.5.css"
#define JS_FILE "swad22.49.js" #define JS_FILE "swad22.49.js"
/* /*
Version 22.118.10:May 30, 2023 Draw logo in head even if it does not exist. (337363 lines)
Version 22.118.9: May 30, 2023 Code refactoring in user account. (337363 lines) Version 22.118.9: May 30, 2023 Code refactoring in user account. (337363 lines)
Version 22.118.8: May 30, 2023 Fixed bugs in users. (337361 lines) Version 22.118.8: May 30, 2023 Fixed bugs in users. (337361 lines)
Version 22.118.7: May 30, 2023 Fixed bug in photo processing. Reported by Emilio Alemán Carmona. (337364 lines) Version 22.118.7: May 30, 2023 Fixed bug in photo processing. Reported by Emilio Alemán Carmona. (337364 lines)

2
swad_chat.c
View File

@ -187,7 +187,7 @@ void Cht_ShowListOfAvailableChatRooms (void)
snprintf (ThisRoomFullName,sizeof (ThisRoomFullName),"%s %s", snprintf (ThisRoomFullName,sizeof (ThisRoomFullName),"%s %s",
Txt_Degree,Deg.ShrtName); Txt_Degree,Deg.ShrtName);
Cht_WriteLinkToChat1 (ThisRoomCode,ThisRoomShrtName,ThisRoomFullName,1,IsLastItemInLevel); Cht_WriteLinkToChat1 (ThisRoomCode,ThisRoomShrtName,ThisRoomFullName,1,IsLastItemInLevel);
Lgo_DrawLogo (HieLvl_DEG,Deg.DegCod,Deg.ShrtName,16,NULL,true); Lgo_DrawLogo (HieLvl_DEG,Deg.DegCod,Deg.ShrtName,16,NULL);
Cht_WriteLinkToChat2 (ThisRoomCode,ThisRoomFullName); Cht_WriteLinkToChat2 (ThisRoomCode,ThisRoomFullName);
/* Get my courses in this degree from database */ /* Get my courses in this degree from database */

8
swad_course.c
View File

@ -258,7 +258,7 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
HTM_BUTTON_Submit_Begin (Act_GetActionText (ActSeeInsInf), HTM_BUTTON_Submit_Begin (Act_GetActionText (ActSeeInsInf),
"class=\"BT_LINK FORM_IN_%s\"", "class=\"BT_LINK FORM_IN_%s\"",
The_GetSuffix ()); The_GetSuffix ());
Lgo_DrawLogo (HieLvl_INS,Hie.Ins.InsCod,Hie.Ins.ShrtName,16,NULL,true); Lgo_DrawLogo (HieLvl_INS,Hie.Ins.InsCod,Hie.Ins.ShrtName,16,NULL);
HTM_TxtF (" %s",Hie.Ins.ShrtName); HTM_TxtF (" %s",Hie.Ins.ShrtName);
HTM_BUTTON_End (); HTM_BUTTON_End ();
Frm_EndForm (); Frm_EndForm ();
@ -292,7 +292,7 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
HTM_BUTTON_Submit_Begin (Act_GetActionText (ActSeeCtrInf), HTM_BUTTON_Submit_Begin (Act_GetActionText (ActSeeCtrInf),
"class=\"BT_LINK FORM_IN_%s\"", "class=\"BT_LINK FORM_IN_%s\"",
The_GetSuffix ()); The_GetSuffix ());
Lgo_DrawLogo (HieLvl_CTR,Hie.Ctr.CtrCod,Hie.Ctr.ShrtName,16,NULL,true); Lgo_DrawLogo (HieLvl_CTR,Hie.Ctr.CtrCod,Hie.Ctr.ShrtName,16,NULL);
HTM_TxtF (" %s",Hie.Ctr.ShrtName); HTM_TxtF (" %s",Hie.Ctr.ShrtName);
HTM_BUTTON_End (); HTM_BUTTON_End ();
Frm_EndForm (); Frm_EndForm ();
@ -326,7 +326,7 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
HTM_BUTTON_Submit_Begin (Act_GetActionText (ActSeeDegInf), HTM_BUTTON_Submit_Begin (Act_GetActionText (ActSeeDegInf),
"class=\"BT_LINK FORM_IN_%s\"", "class=\"BT_LINK FORM_IN_%s\"",
The_GetSuffix ()); The_GetSuffix ());
Lgo_DrawLogo (HieLvl_DEG,Hie.Deg.DegCod,Hie.Deg.ShrtName,16,NULL,true); Lgo_DrawLogo (HieLvl_DEG,Hie.Deg.DegCod,Hie.Deg.ShrtName,16,NULL);
HTM_TxtF (" %s",Hie.Deg.ShrtName); HTM_TxtF (" %s",Hie.Deg.ShrtName);
HTM_BUTTON_End (); HTM_BUTTON_End ();
Frm_EndForm (); Frm_EndForm ();
@ -2419,7 +2419,7 @@ static void Crs_WriteRowCrsData (unsigned NumCrs,MYSQL_ROW row,bool WriteColumnA
HTM_BUTTON_Submit_Begin (Str_BuildGoToTitle (row[2]), HTM_BUTTON_Submit_Begin (Str_BuildGoToTitle (row[2]),
"class=\"LT BT_LINK\""); "class=\"LT BT_LINK\"");
Str_FreeGoToTitle (); Str_FreeGoToTitle ();
Lgo_DrawLogo (HieLvl_DEG,Deg.DegCod,Deg.ShrtName,20,"CT",true); Lgo_DrawLogo (HieLvl_DEG,Deg.DegCod,Deg.ShrtName,20,"CT");
HTM_TxtF (" %s (%s)",row[2],row[6]); HTM_TxtF (" %s (%s)",row[2],row[6]);
HTM_BUTTON_End (); HTM_BUTTON_End ();
Frm_EndForm (); Frm_EndForm ();

2
swad_course_config.c
View File

@ -265,7 +265,7 @@ static void CrsCfg_Degree (bool PrintView,bool PutForm)
Str_FreeGoToTitle (); Str_FreeGoToTitle ();
} }
Lgo_DrawLogo (HieLvl_DEG,Gbl.Hierarchy.Deg.DegCod,Gbl.Hierarchy.Deg.ShrtName, Lgo_DrawLogo (HieLvl_DEG,Gbl.Hierarchy.Deg.DegCod,Gbl.Hierarchy.Deg.ShrtName,
20,"LM",true); 20,"LM");
HTM_NBSP (); HTM_NBSP ();
HTM_Txt (Gbl.Hierarchy.Deg.FullName); HTM_Txt (Gbl.Hierarchy.Deg.FullName);
if (!PrintView) if (!PrintView)

6
swad_degree.c
View File

@ -203,7 +203,7 @@ void Deg_DrawDegreeLogoAndNameWithLink (struct Deg_Degree *Deg,Act_Action_t Acti
Str_FreeGoToTitle (); Str_FreeGoToTitle ();
/***** Degree logo and name *****/ /***** Degree logo and name *****/
Lgo_DrawLogo (HieLvl_DEG,Deg->DegCod,Deg->ShrtName,16,ClassLogo,true); Lgo_DrawLogo (HieLvl_DEG,Deg->DegCod,Deg->ShrtName,16,ClassLogo);
HTM_TxtF (" %s",Deg->FullName); HTM_TxtF (" %s",Deg->FullName);
/***** End link *****/ /***** End link *****/
@ -367,7 +367,7 @@ static void Deg_ListDegreesForEdition (const struct DegTyp_DegTypes *DegTypes)
/* Degree logo */ /* Degree logo */
HTM_TD_Begin ("title=\"%s\" class=\"HIE_LOGO\"",DegInLst->FullName); HTM_TD_Begin ("title=\"%s\" class=\"HIE_LOGO\"",DegInLst->FullName);
Lgo_DrawLogo (HieLvl_DEG,DegInLst->DegCod,DegInLst->ShrtName,20,NULL,true); Lgo_DrawLogo (HieLvl_DEG,DegInLst->DegCod,DegInLst->ShrtName,20,NULL);
HTM_TD_End (); HTM_TD_End ();
/* Degree short name */ /* Degree short name */
@ -546,7 +546,7 @@ static void Deg_PutFormToCreateDegree (const struct DegTyp_DegTypes *DegTypes)
/***** Degree logo *****/ /***** Degree logo *****/
HTM_TD_Begin ("title=\"%s\" class=\"HIE_LOGO\"",Deg_EditingDeg->FullName); HTM_TD_Begin ("title=\"%s\" class=\"HIE_LOGO\"",Deg_EditingDeg->FullName);
Lgo_DrawLogo (HieLvl_DEG,-1L,"",20,NULL,true); Lgo_DrawLogo (HieLvl_DEG,-1L,"",20,NULL);
HTM_TD_End (); HTM_TD_End ();
/***** Degree short name *****/ /***** Degree short name *****/

2
swad_degree_config.c
View File

@ -260,7 +260,7 @@ static void DegCfg_Center (bool PrintView,bool PutForm)
Str_FreeGoToTitle (); Str_FreeGoToTitle ();
} }
Lgo_DrawLogo (HieLvl_CTR,Gbl.Hierarchy.Ctr.CtrCod,Gbl.Hierarchy.Ctr.ShrtName, Lgo_DrawLogo (HieLvl_CTR,Gbl.Hierarchy.Ctr.CtrCod,Gbl.Hierarchy.Ctr.ShrtName,
20,"LM",true); 20,"LM");
HTM_NBSP (); HTM_NBSP ();
HTM_Txt (Gbl.Hierarchy.Ctr.FullName); HTM_Txt (Gbl.Hierarchy.Ctr.FullName);
if (!PrintView) if (!PrintView)

6
swad_forum.c
View File

@ -1766,15 +1766,15 @@ static void For_WriteLinkToForum (const struct For_Forums *Forums,
break; break;
case For_FORUM_INSTIT_USRS: case For_FORUM_INSTIT_USRS:
case For_FORUM_INSTIT_TCHS: case For_FORUM_INSTIT_TCHS:
Lgo_DrawLogo (HieLvl_INS,Forum->HieCod,ForumName,16,NULL,true); Lgo_DrawLogo (HieLvl_INS,Forum->HieCod,ForumName,16,NULL);
break; break;
case For_FORUM_CENTER_USRS: case For_FORUM_CENTER_USRS:
case For_FORUM_CENTER_TCHS: case For_FORUM_CENTER_TCHS:
Lgo_DrawLogo (HieLvl_CTR,Forum->HieCod,ForumName,16,NULL,true); Lgo_DrawLogo (HieLvl_CTR,Forum->HieCod,ForumName,16,NULL);
break; break;
case For_FORUM_DEGREE_USRS: case For_FORUM_DEGREE_USRS:
case For_FORUM_DEGREE_TCHS: case For_FORUM_DEGREE_TCHS:
Lgo_DrawLogo (HieLvl_DEG,Forum->HieCod,ForumName,16,NULL,true); Lgo_DrawLogo (HieLvl_DEG,Forum->HieCod,ForumName,16,NULL);
break; break;
case For_FORUM_COURSE_USRS: case For_FORUM_COURSE_USRS:
case For_FORUM_COURSE_TCHS: case For_FORUM_COURSE_TCHS:

3
swad_hierarchy.c
View File

@ -508,8 +508,7 @@ static void Hie_DrawLogo (const char *ShrtText)
default: default:
Lgo_DrawLogo (LogoScope[Gbl.Hierarchy.Level], Lgo_DrawLogo (LogoScope[Gbl.Hierarchy.Level],
*LogoCode[Gbl.Hierarchy.Level], *LogoCode[Gbl.Hierarchy.Level],
ShrtText,40,"TOP_LOGO", ShrtText,40,"TOP_LOGO");
false); // Don't put icon if not exists
break; break;
} }
} }

2
swad_hierarchy_config.c
View File

@ -67,7 +67,7 @@ void HieCfg_Title (bool PutLink,
LogoWWW,LogoFullName,The_GetSuffix ()); LogoWWW,LogoFullName,The_GetSuffix ());
/* Logo and name */ /* Logo and name */
Lgo_DrawLogo (LogoScope,LogoCod,LogoShrtName,64,NULL,true); Lgo_DrawLogo (LogoScope,LogoCod,LogoShrtName,64,NULL);
HTM_BR (); HTM_BR ();
HTM_Txt (TextFullName); HTM_Txt (TextFullName);

11
swad_institution.c
View File

@ -216,8 +216,7 @@ void Ins_DrawInstitutionLogoWithLink (struct Ins_Instit *Ins,unsigned Size)
ParCod_PutPar (ParCod_Ins,Ins->InsCod); ParCod_PutPar (ParCod_Ins,Ins->InsCod);
HTM_BUTTON_Submit_Begin (Ins->FullName,"class=\"BT_LINK\""); HTM_BUTTON_Submit_Begin (Ins->FullName,"class=\"BT_LINK\"");
} }
Lgo_DrawLogo (HieLvl_INS,Ins->InsCod,Ins->FullName, Lgo_DrawLogo (HieLvl_INS,Ins->InsCod,Ins->FullName,Size,NULL);
Size,NULL,true);
if (PutLink) if (PutLink)
{ {
HTM_BUTTON_End (); HTM_BUTTON_End ();
@ -242,7 +241,7 @@ void Ins_DrawInstitLogoAndNameWithLink (struct Ins_Instit *Ins,Act_Action_t Acti
Str_FreeGoToTitle (); Str_FreeGoToTitle ();
/***** Institution logo and name *****/ /***** Institution logo and name *****/
Lgo_DrawLogo (HieLvl_INS,Ins->InsCod,Ins->ShrtName,16,ClassLogo,true); Lgo_DrawLogo (HieLvl_INS,Ins->InsCod,Ins->ShrtName,16,ClassLogo);
HTM_TxtF (" %s",Ins->FullName); HTM_TxtF (" %s",Ins->FullName);
/***** End link *****/ /***** End link *****/
@ -950,7 +949,7 @@ static void Ins_ListInstitutionsForEdition (void)
/* Institution logo */ /* Institution logo */
HTM_TD_Begin ("title=\"%s\" class=\"HIE_LOGO\"",Ins->FullName); HTM_TD_Begin ("title=\"%s\" class=\"HIE_LOGO\"",Ins->FullName);
Lgo_DrawLogo (HieLvl_INS,Ins->InsCod,Ins->ShrtName,20,NULL,true); Lgo_DrawLogo (HieLvl_INS,Ins->InsCod,Ins->ShrtName,20,NULL);
HTM_TD_End (); HTM_TD_End ();
/* Institution short name */ /* Institution short name */
@ -1395,7 +1394,7 @@ static void Ins_PutFormToCreateInstitution (void)
/***** Institution logo *****/ /***** Institution logo *****/
HTM_TD_Begin ("title=\"%s\" class=\"HIE_LOGO\"",Ins_EditingIns->FullName); HTM_TD_Begin ("title=\"%s\" class=\"HIE_LOGO\"",Ins_EditingIns->FullName);
Lgo_DrawLogo (HieLvl_INS,-1L,"",20,NULL,true); Lgo_DrawLogo (HieLvl_INS,-1L,"",20,NULL);
HTM_TD_End (); HTM_TD_End ();
/***** Institution short name *****/ /***** Institution short name *****/
@ -2269,7 +2268,7 @@ static void Ins_ShowInss (MYSQL_RES **mysql_res,unsigned NumInss,
if (Gbl.Usrs.Listing.WithPhotos) if (Gbl.Usrs.Listing.WithPhotos)
{ {
Lgo_DrawLogo (HieLvl_INS,Ins.InsCod,Ins.ShrtName, Lgo_DrawLogo (HieLvl_INS,Ins.InsCod,Ins.ShrtName,
40,NULL,true); 40,NULL);
HTM_NBSP (); HTM_NBSP ();
} }
HTM_Txt (Ins.FullName); HTM_Txt (Ins.FullName);

4
swad_layout.c
View File

@ -1491,7 +1491,7 @@ void Lay_WriteHeaderClassPhoto (bool PrintView,bool DrawingClassPhoto,
{ {
if (!PrintView) if (!PrintView)
HTM_A_Begin ("href=\"%s\" target=\"_blank\"",Hie.Ins.WWW); HTM_A_Begin ("href=\"%s\" target=\"_blank\"",Hie.Ins.WWW);
Lgo_DrawLogo (HieLvl_INS,Hie.Ins.InsCod,Hie.Ins.ShrtName,40,NULL,true); Lgo_DrawLogo (HieLvl_INS,Hie.Ins.InsCod,Hie.Ins.ShrtName,40,NULL);
if (!PrintView) if (!PrintView)
HTM_A_End (); HTM_A_End ();
} }
@ -1542,7 +1542,7 @@ void Lay_WriteHeaderClassPhoto (bool PrintView,bool DrawingClassPhoto,
HTM_A_Begin ("href=\"%s\" target=\"_blank\"" HTM_A_Begin ("href=\"%s\" target=\"_blank\""
" class=\"CLASSPHOTO_TITLE CLASSPHOTO_%s\"", " class=\"CLASSPHOTO_TITLE CLASSPHOTO_%s\"",
Hie.Deg.WWW,The_GetSuffix ()); Hie.Deg.WWW,The_GetSuffix ());
Lgo_DrawLogo (HieLvl_DEG,Hie.Deg.DegCod,Hie.Deg.ShrtName,40,NULL,true); Lgo_DrawLogo (HieLvl_DEG,Hie.Deg.DegCod,Hie.Deg.ShrtName,40,NULL);
if (!PrintView) if (!PrintView)
HTM_A_End (); HTM_A_End ();
} }

73
swad_logo.c
View File

@ -63,7 +63,7 @@ static void Lgo_PutIconToRemoveLogo (Act_Action_t ActionRem);
/*****************************************************************************/ /*****************************************************************************/
void Lgo_DrawLogo (HieLvl_Level_t Scope,long Cod,const char *AltText, void Lgo_DrawLogo (HieLvl_Level_t Scope,long Cod,const char *AltText,
unsigned Size,const char *Class,bool PutIconIfNotExists) unsigned Size,const char *Class)
{ {
static const char *HieIcon[HieLvl_NUM_LEVELS] = static const char *HieIcon[HieLvl_NUM_LEVELS] =
{ {
@ -139,46 +139,43 @@ void Lgo_DrawLogo (HieLvl_Level_t Scope,long Cod,const char *AltText,
Cod = InsCod; Cod = InsCod;
} }
if (LogoFound || PutIconIfNotExists) /***** Draw logo *****/
ClassNotEmpty = false;
if (Class)
if (Class[0])
ClassNotEmpty = true;
if (LogoFound)
{ {
/***** Draw logo *****/ if (asprintf (&URL,"%s/%s/%02u/%u/logo",
ClassNotEmpty = false; Cfg_URL_SWAD_PUBLIC,Folder,
if (Class) (unsigned) (Cod % 100),
if (Class[0]) (unsigned) Cod) < 0)
ClassNotEmpty = true; Err_NotEnoughMemoryExit ();
if (asprintf (&Icon,"%u.png",(unsigned) Cod) < 0)
Err_NotEnoughMemoryExit ();
if (LogoFound) HTM_IMG (URL,Icon,AltText,
{ "class=\"ICO%ux%u"
if (asprintf (&URL,"%s/%s/%02u/%u/logo", "%s%s\"",
Cfg_URL_SWAD_PUBLIC,Folder, Size,Size,
(unsigned) (Cod % 100), ClassNotEmpty ? " " :
(unsigned) Cod) < 0) "",
Err_NotEnoughMemoryExit (); ClassNotEmpty ? Class :
if (asprintf (&Icon,"%u.png",(unsigned) Cod) < 0) "");
Err_NotEnoughMemoryExit (); free (Icon);
free (URL);
HTM_IMG (URL,Icon,AltText,
"class=\"ICO%ux%u"
"%s%s\"",
Size,Size,
ClassNotEmpty ? " " :
"",
ClassNotEmpty ? Class :
"");
free (Icon);
free (URL);
}
else
HTM_IMG (Cfg_URL_ICON_PUBLIC,HieIcon[Scope],AltText,
"class=\"ICO%ux%u ICO_%s_%s"
"%s%s\"",
Size,Size,
Ico_GetPreffix (Ico_BLACK),The_GetSuffix (),
ClassNotEmpty ? " " :
"",
ClassNotEmpty ? Class :
"");
} }
else
HTM_IMG (Cfg_URL_ICON_PUBLIC,HieIcon[Scope],AltText,
"class=\"ICO%ux%u ICO_%s_%s"
"%s%s\"",
Size,Size,
Ico_GetPreffix (Ico_BLACK),The_GetSuffix (),
ClassNotEmpty ? " " :
"",
ClassNotEmpty ? Class :
"");
} }
} }
} }

2
swad_logo.h
View File

@ -28,7 +28,7 @@
/*****************************************************************************/ /*****************************************************************************/
void Lgo_DrawLogo (HieLvl_Level_t Scope,long Cod,const char *AltText, void Lgo_DrawLogo (HieLvl_Level_t Scope,long Cod,const char *AltText,
unsigned Size,const char *Class,bool PutIconIfNotExists); unsigned Size,const char *Class);
void Lgo_PutIconToChangeLogo (HieLvl_Level_t Scope); void Lgo_PutIconToChangeLogo (HieLvl_Level_t Scope);
void Lgo_RequestLogo (HieLvl_Level_t Scope); void Lgo_RequestLogo (HieLvl_Level_t Scope);
void Lgo_ReceiveLogo (HieLvl_Level_t Scope); void Lgo_ReceiveLogo (HieLvl_Level_t Scope);

2
swad_photo.c
View File

@ -2261,7 +2261,7 @@ static void Pho_ShowOrPrintListDegrees (struct Pho_DegPhotos *DegPhotos,
Deg_DrawDegreeLogoAndNameWithLink (&Deg,ActSeeDegInf,"CT"); Deg_DrawDegreeLogoAndNameWithLink (&Deg,ActSeeDegInf,"CT");
else // Pho_DEGREES_PRINT else // Pho_DEGREES_PRINT
{ {
Lgo_DrawLogo (HieLvl_DEG,Deg.DegCod,Deg.ShrtName,20,"CT",true); Lgo_DrawLogo (HieLvl_DEG,Deg.DegCod,Deg.ShrtName,20,"CT");
HTM_TxtF ("&nbsp;%s",Deg.FullName); HTM_TxtF ("&nbsp;%s",Deg.FullName);
} }
HTM_TD_End (); HTM_TD_End ();

4
swad_record.c
View File

@ -1656,7 +1656,7 @@ static void Rec_ShowCrsRecord (Rec_CourseRecordViewType_t TypeOfView,
HTM_TD_Begin ("class=\"LM\" style=\"width:%upx;\"",Rec_DEGREE_LOGO_SIZE); HTM_TD_Begin ("class=\"LM\" style=\"width:%upx;\"",Rec_DEGREE_LOGO_SIZE);
Lgo_DrawLogo (HieLvl_DEG,Gbl.Hierarchy.Deg.DegCod, Lgo_DrawLogo (HieLvl_DEG,Gbl.Hierarchy.Deg.DegCod,
Gbl.Hierarchy.Deg.ShrtName,Rec_DEGREE_LOGO_SIZE,NULL,true); Gbl.Hierarchy.Deg.ShrtName,Rec_DEGREE_LOGO_SIZE,NULL);
HTM_TD_End (); HTM_TD_End ();
HTM_TD_Begin ("class=\"REC_HEAD CM\""); HTM_TD_Begin ("class=\"REC_HEAD CM\"");
@ -2535,7 +2535,7 @@ static void Rec_ShowInstitutionInHead (struct Ins_Instit *Ins,bool PutFormLinks)
HTM_BUTTON_Submit_Begin (Ins->FullName,"class=\"BT_LINK\""); HTM_BUTTON_Submit_Begin (Ins->FullName,"class=\"BT_LINK\"");
} }
Lgo_DrawLogo (HieLvl_INS,Ins->InsCod,Ins->ShrtName, Lgo_DrawLogo (HieLvl_INS,Ins->InsCod,Ins->ShrtName,
Rec_INSTITUTION_LOGO_SIZE,NULL,true); Rec_INSTITUTION_LOGO_SIZE,NULL);
if (PutFormLinks) if (PutFormLinks)
{ {
HTM_BUTTON_End (); HTM_BUTTON_End ();