",
The_ClassCourse[Gbl.Prefs.Theme]);
- if (Gbl.CurrentCrs.Crs.CrsCod <= 0 &&
- Gbl.Prefs.Theme == The_THEME_WHITE) // TODO: Remove this line
+ if (Gbl.CurrentCrs.Crs.CrsCod <= 0)
{
if (Gbl.CurrentDeg.Deg.DegCod > 0)
Log_DrawLogo (Sco_SCOPE_DEGREE,Gbl.CurrentDeg.Deg.DegCod,
Gbl.CurrentDeg.Deg.ShortName,32,
- "vertical-align:top; margin-right:8px;");
+ "vertical-align:top; margin-right:8px;",false);
else if (Gbl.CurrentCtr.Ctr.CtrCod > 0)
Log_DrawLogo (Sco_SCOPE_CENTRE,Gbl.CurrentCtr.Ctr.CtrCod,
Gbl.CurrentCtr.Ctr.ShortName,32,
- "vertical-align:top; margin-right:8px;");
+ "vertical-align:top; margin-right:8px;",false);
else if (Gbl.CurrentIns.Ins.InsCod > 0)
Log_DrawLogo (Sco_SCOPE_INSTITUTION,Gbl.CurrentIns.Ins.InsCod,
Gbl.CurrentIns.Ins.ShortName,32,
- "vertical-align:top; margin-right:8px;");
+ "vertical-align:top; margin-right:8px;",false);
else if (Gbl.CurrentCty.Cty.CtyCod > 0)
if (Cty_CheckIfCountryMapExists (&Gbl.CurrentCty.Cty))
Cty_DrawCountryMap (&Gbl.CurrentCty.Cty,"COUNTRY_MAP_TITLE");
@@ -1270,7 +1270,8 @@ static void Deg_ListOneDegreeForSeeing (struct Degree *Deg,unsigned NumDeg)
"
",
TxtClass,BgColor,
Deg->WWW,Deg->FullName);
- Log_DrawLogo (Sco_SCOPE_DEGREE,Deg->DegCod,Deg->ShortName,16,"vertical-align:top;");
+ Log_DrawLogo (Sco_SCOPE_DEGREE,Deg->DegCod,Deg->ShortName,
+ 16,"vertical-align:top;",true);
fprintf (Gbl.F.Out,""
"");
@@ -1413,7 +1414,7 @@ static void Deg_ListDegreesForEdition (void)
fprintf (Gbl.F.Out,"
",
Deg->FullName);
- Log_DrawLogo (Sco_SCOPE_DEGREE,Deg->DegCod,Deg->ShortName,16,NULL);
+ Log_DrawLogo (Sco_SCOPE_DEGREE,Deg->DegCod,Deg->ShortName,16,NULL,true);
fprintf (Gbl.F.Out," | ");
/* Centre */
@@ -1820,7 +1821,7 @@ static void Deg_PutFormToCreateDegree (void)
/***** Degree logo *****/
fprintf (Gbl.F.Out,"
");
- Log_DrawLogo (Sco_SCOPE_DEGREE,-1L,"",16,NULL);
+ Log_DrawLogo (Sco_SCOPE_DEGREE,-1L,"",16,NULL,true);
fprintf (Gbl.F.Out," | ");
/***** Centre *****/
@@ -3920,7 +3921,8 @@ void Deg_GetAndWriteDegreesAdminBy (long UsrCod,unsigned ColSpan)
Deg_PutParamDegCod (DegCod);
sprintf (Gbl.Title,Txt_Go_to_X,row[2]);
Act_LinkFormSubmit (Gbl.Title,"DAT_SMALL_NOBR");
- Log_DrawLogo (Sco_SCOPE_DEGREE,DegCod,row[1],16,"vertical-align:top;");
+ Log_DrawLogo (Sco_SCOPE_DEGREE,DegCod,row[1],
+ 16,"vertical-align:top;",true);
fprintf (Gbl.F.Out," %s"
"",
row[2]);
diff --git a/swad_exam.c b/swad_exam.c
index 5b5676cf9..ea860dd63 100644
--- a/swad_exam.c
+++ b/swad_exam.c
@@ -791,7 +791,7 @@ static void Exa_ShowExamAnnouncement (long ExaCod,Exa_tTypeViewExamAnnouncement_
else
fprintf (Gbl.F.Out,"
",
Ins.WWW,StyleTitle);
- Log_DrawLogo (Sco_SCOPE_INSTITUTION,Ins.InsCod,Ins.FullName,64,NULL);
+ Log_DrawLogo (Sco_SCOPE_INSTITUTION,Ins.InsCod,Ins.FullName,64,NULL,true);
fprintf (Gbl.F.Out,"
%s%s" \
"" \
"",
diff --git a/swad_file_browser.c b/swad_file_browser.c
index d3b0c3c37..9ee4e19a4 100644
--- a/swad_file_browser.c
+++ b/swad_file_browser.c
@@ -9563,7 +9563,8 @@ static void Brw_WriteRowDocData (unsigned *NumDocsNotHidden,MYSQL_ROW row)
Deg_PutParamDegCod (DegCod);
sprintf (Gbl.Title,Txt_Go_to_X,row[5]);
Act_LinkFormSubmit (Gbl.Title,"DAT");
- Log_DrawLogo (Sco_SCOPE_DEGREE,DegCod,row[4],16,"vertical-align:top;");
+ Log_DrawLogo (Sco_SCOPE_DEGREE,DegCod,row[4],
+ 16,"vertical-align:top;",true);
fprintf (Gbl.F.Out," %s (%s)"
"",
row[4],row[5]);
diff --git a/swad_forum.c b/swad_forum.c
index f4edc8590..a652fa4e5 100644
--- a/swad_forum.c
+++ b/swad_forum.c
@@ -2148,17 +2148,17 @@ static void For_WriteLinkToForum (For_ForumType_t ForumType,Act_Action_t NextAct
case For_FORUM_INSTITUTION_USRS:
case For_FORUM_INSTITUTION_TCHS:
Log_DrawLogo (Sco_SCOPE_INSTITUTION,Gbl.Forum.Ins.InsCod,ForumName,
- 16,"vertical-align:middle;");
+ 16,NULL,true);
break;
case For_FORUM_CENTRE_USRS:
case For_FORUM_CENTRE_TCHS:
Log_DrawLogo (Sco_SCOPE_CENTRE,Gbl.Forum.Ctr.CtrCod,ForumName,
- 16,"vertical-align:middle;");
+ 16,NULL,true);
break;
case For_FORUM_DEGREE_USRS:
case For_FORUM_DEGREE_TCHS:
Log_DrawLogo (Sco_SCOPE_DEGREE,Gbl.Forum.Deg.DegCod,ForumName,
- 16,"vertical-align:middle;");
+ 16,NULL,true);
break;
default:
fprintf (Gbl.F.Out,"%s",Icon);
diff --git a/swad_institution.c b/swad_institution.c
index fed9b8249..40a8dabae 100644
--- a/swad_institution.c
+++ b/swad_institution.c
@@ -163,7 +163,8 @@ void Ins_SeeInsWithPendingCtrs (void)
" vertical-align:middle; background-color:%s;\">"
"
",
BgColor,Ins.WWW,Ins.FullName);
- Log_DrawLogo (Sco_SCOPE_INSTITUTION,Ins.InsCod,Ins.ShortName,16,"vertical-align:top;");
+ Log_DrawLogo (Sco_SCOPE_INSTITUTION,Ins.InsCod,Ins.ShortName,
+ 16,"vertical-align:top;",true);
fprintf (Gbl.F.Out,""
"");
@@ -267,7 +268,7 @@ static void Ins_Configuration (bool PrintView)
Gbl.CurrentIns.Ins.WWW,
Gbl.CurrentIns.Ins.FullName);
Log_DrawLogo (Sco_SCOPE_INSTITUTION,Gbl.CurrentIns.Ins.InsCod,
- Gbl.CurrentIns.Ins.ShortName,64,NULL);
+ Gbl.CurrentIns.Ins.ShortName,64,NULL,true);
fprintf (Gbl.F.Out,"
%s",Gbl.CurrentIns.Ins.FullName);
if (PutLink)
fprintf (Gbl.F.Out,"");
@@ -529,7 +530,8 @@ static void Ins_ListOneInstitutionForSeeing (struct Institution *Ins,unsigned Nu
"
",
BgColor,
Ins->WWW,Ins->FullName);
- Log_DrawLogo (Sco_SCOPE_INSTITUTION,Ins->InsCod,Ins->ShortName,16,NULL);
+ Log_DrawLogo (Sco_SCOPE_INSTITUTION,Ins->InsCod,Ins->ShortName,
+ 16,NULL,true);
fprintf (Gbl.F.Out,""
"");
@@ -1113,7 +1115,8 @@ static void Ins_ListInstitutionsForEdition (void)
fprintf (Gbl.F.Out,"
",
Ins->FullName);
- Log_DrawLogo (Sco_SCOPE_INSTITUTION,Ins->InsCod,Ins->ShortName,16,NULL);
+ Log_DrawLogo (Sco_SCOPE_INSTITUTION,Ins->InsCod,Ins->ShortName,
+ 16,NULL,true);
fprintf (Gbl.F.Out," | ");
/* Country */
@@ -1732,7 +1735,7 @@ static void Ins_PutFormToCreateInstitution (void)
/***** Institution logo *****/
fprintf (Gbl.F.Out,"
");
- Log_DrawLogo (Sco_SCOPE_INSTITUTION,-1L,"",16,NULL);
+ Log_DrawLogo (Sco_SCOPE_INSTITUTION,-1L,"",16,NULL,true);
fprintf (Gbl.F.Out," | ");
/***** Country *****/
diff --git a/swad_layout.c b/swad_layout.c
index ab0afa1bb..c9ea3fa91 100644
--- a/swad_layout.c
+++ b/swad_layout.c
@@ -1279,7 +1279,8 @@ void Lay_WriteHeaderClassPhoto (unsigned NumColumns,bool PrintView,bool DrawingC
{
if (!PrintView)
fprintf (Gbl.F.Out,"
",Ins.WWW);
- Log_DrawLogo (Sco_SCOPE_INSTITUTION,Ins.InsCod,Ins.ShortName,Size,NULL);
+ Log_DrawLogo (Sco_SCOPE_INSTITUTION,Ins.InsCod,Ins.ShortName,
+ Size,NULL,true);
if (!PrintView)
fprintf (Gbl.F.Out,"");
}
@@ -1328,7 +1329,7 @@ void Lay_WriteHeaderClassPhoto (unsigned NumColumns,bool PrintView,bool DrawingC
if (!PrintView)
fprintf (Gbl.F.Out,"
",
Deg.WWW);
- Log_DrawLogo (Sco_SCOPE_DEGREE,Deg.DegCod,Deg.ShortName,Size,NULL);
+ Log_DrawLogo (Sco_SCOPE_DEGREE,Deg.DegCod,Deg.ShortName,Size,NULL,true);
if (!PrintView)
fprintf (Gbl.F.Out,"");
}
diff --git a/swad_logo.c b/swad_logo.c
index 315aa560f..7b4b9e7c8 100644
--- a/swad_logo.c
+++ b/swad_logo.c
@@ -63,7 +63,7 @@ extern struct Globals Gbl;
/*****************************************************************************/
void Log_DrawLogo (Sco_Scope_t Scope,long Cod,const char *AltText,
- unsigned Size,const char *Style)
+ unsigned Size,const char *Style,bool PutIconIfNotExists)
{
const char *Folder;
const char *Icon;
@@ -102,23 +102,26 @@ void Log_DrawLogo (Sco_Scope_t Scope,long Cod,const char *AltText,
else
LogoExists = false;
- /***** Draw logo *****/
- fprintf (Gbl.F.Out,"
![\"%s\"](\"");)
");
+ if (LogoExists || PutIconIfNotExists)
+ {
+ /***** Draw logo *****/
+ fprintf (Gbl.F.Out,"
");
+ }
}
/*****************************************************************************/
diff --git a/swad_logo.h b/swad_logo.h
index 154e6eb65..99ebb924b 100644
--- a/swad_logo.h
+++ b/swad_logo.h
@@ -40,7 +40,7 @@
/*****************************************************************************/
void Log_DrawLogo (Sco_Scope_t Scope,long Cod,const char *AltText,
- unsigned Size,const char *Style);
+ unsigned Size,const char *Style,bool PutIconIfNotExists);
void Log_PutFormToChangeLogo (Sco_Scope_t Scope);
void Log_RequestLogo (Sco_Scope_t Scope);
void Log_ReceiveLogo (Sco_Scope_t Scope);
diff --git a/swad_photo.c b/swad_photo.c
index 5cf22eb89..0b7ed243f 100644
--- a/swad_photo.c
+++ b/swad_photo.c
@@ -1984,7 +1984,8 @@ static void Pho_ShowOrPrintListDegrees (Pho_AvgPhotoSeeOrPrint_t SeeOrPrint)
if (SeeOrPrint == Pho_DEGREES_SEE)
fprintf (Gbl.F.Out,"
",
Deg.WWW,Deg.FullName);
- Log_DrawLogo (Sco_SCOPE_DEGREE,Deg.DegCod,Deg.ShortName,16,"vertical-align:top;");
+ Log_DrawLogo (Sco_SCOPE_DEGREE,Deg.DegCod,Deg.ShortName,
+ 16,"vertical-align:top;",true);
fprintf (Gbl.F.Out," %s ",
Deg.ShortName);
if (SeeOrPrint == Pho_DEGREES_SEE)
diff --git a/swad_record.c b/swad_record.c
index 281a7912c..4f61516c6 100644
--- a/swad_record.c
+++ b/swad_record.c
@@ -1531,7 +1531,7 @@ void Rec_ShowCrsRecord (Rec_RecordViewType_t TypeOfView,struct UsrData *UsrDat)
"",
Rec_DEGREE_LOGO_SIZE);
Log_DrawLogo (Sco_SCOPE_DEGREE,Gbl.CurrentDeg.Deg.DegCod,
- Gbl.CurrentDeg.Deg.ShortName,Rec_DEGREE_LOGO_SIZE,NULL);
+ Gbl.CurrentDeg.Deg.ShortName,Rec_DEGREE_LOGO_SIZE,NULL,true);
fprintf (Gbl.F.Out," | "
"
"
"%s
%s
%s"
@@ -2144,7 +2144,7 @@ void Rec_ShowCommonRecord (Rec_RecordViewType_t TypeOfView,
Ins.InsCod = UsrDat->InsCod;
Ins_GetDataOfInstitutionByCod (&Ins,Ins_GET_MINIMAL_DATA);
Log_DrawLogo (Sco_SCOPE_INSTITUTION,Ins.InsCod,Ins.ShortName,
- Rec_INSTITUTION_LOGO_SIZE,NULL);
+ Rec_INSTITUTION_LOGO_SIZE,NULL,true);
fprintf (Gbl.F.Out," | "
"
"
diff --git a/swad_statistic.c b/swad_statistic.c
index bbd5b8d78..e44feec38 100644
--- a/swad_statistic.c
+++ b/swad_statistic.c
@@ -3487,7 +3487,8 @@ static void Sta_WriteDegree (long DegCod)
fprintf (Gbl.F.Out,"%s\">"
"",
Deg.WWW,Deg.FullName);
- Log_DrawLogo (Sco_SCOPE_DEGREE,Deg.DegCod,Deg.ShortName,16,"vertical-align:top;");
+ Log_DrawLogo (Sco_SCOPE_DEGREE,Deg.DegCod,Deg.ShortName,
+ 16,"vertical-align:top;",true);
fprintf (Gbl.F.Out," %s ",
Deg.ShortName);
}
|