Marown/swad-core
Marown/swad-core
1
0
Fork 0
mirror of https://github.com/acanas/swad-core.git synced 2024-06-15 21:24:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

Version 14.57.1

Browse Source
This commit is contained in:
Antonio Cañas Vargas 2015-01-17 20:06:25 +01:00
parent f62dab5dd5
commit 4bab6987b1
17 changed files with 888 additions and 1009 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1654
swad_action.c
View File

File diff suppressed because it is too large Load Diff

55
swad_centre.c
View File

@ -173,7 +173,7 @@ void Ctr_SeeCtrWithPendingDegs (void)
" vertical-align:middle; background-color:%s;\">" " vertical-align:middle; background-color:%s;\">"
"<a href=\"%s\" title=\"%s\" class=\"DAT\" target=\"_blank\">", "<a href=\"%s\" title=\"%s\" class=\"DAT\" target=\"_blank\">",
BgColor,Ctr.WWW,Ctr.FullName); BgColor,Ctr.WWW,Ctr.FullName);
Ctr_DrawCentreLogo (Ctr.CtrCod,Ctr.ShortName,16,"vertical-align:top;"); Log_DrawLogo (Sco_SCOPE_CENTRE,Ctr.CtrCod,Ctr.ShortName,16,"vertical-align:top;");
fprintf (Gbl.F.Out,"</a>" fprintf (Gbl.F.Out,"</a>"
"</td>"); "</td>");
@ -289,9 +289,8 @@ static void Ctr_Configuration (bool PrintView)
" class=\"TITLE_LOCATION\" title=\"%s\">", " class=\"TITLE_LOCATION\" title=\"%s\">",
Gbl.CurrentCtr.Ctr.WWW, Gbl.CurrentCtr.Ctr.WWW,
Gbl.CurrentCtr.Ctr.FullName); Gbl.CurrentCtr.Ctr.FullName);
Ctr_DrawCentreLogo (Gbl.CurrentCtr.Ctr.CtrCod, Log_DrawLogo (Sco_SCOPE_CENTRE,Gbl.CurrentCtr.Ctr.CtrCod,
Gbl.CurrentCtr.Ctr.ShortName, Gbl.CurrentCtr.Ctr.ShortName,64,NULL);
64,NULL);
fprintf (Gbl.F.Out,"<br />%s",Gbl.CurrentCtr.Ctr.FullName); fprintf (Gbl.F.Out,"<br />%s",Gbl.CurrentCtr.Ctr.FullName);
if (PutLink) if (PutLink)
fprintf (Gbl.F.Out,"</a>"); fprintf (Gbl.F.Out,"</a>");
@ -595,7 +594,7 @@ static void Ctr_ListOneCentreForSeeing (struct Centre *Ctr,unsigned NumCtr)
"<a href=\"%s\" title=\"%s\" class=\"DAT\" target=\"_blank\">", "<a href=\"%s\" title=\"%s\" class=\"DAT\" target=\"_blank\">",
TxtClass,BgColor, TxtClass,BgColor,
Ctr->WWW,Ctr->FullName); Ctr->WWW,Ctr->FullName);
Ctr_DrawCentreLogo (Ctr->CtrCod,Ctr->ShortName,16,"vertical-align:top;"); Log_DrawLogo (Sco_SCOPE_CENTRE,Ctr->CtrCod,Ctr->ShortName,16,"vertical-align:top;");
fprintf (Gbl.F.Out,"</a>" fprintf (Gbl.F.Out,"</a>"
"</td>"); "</td>");
@ -1138,7 +1137,7 @@ static void Ctr_ListCentresForEdition (void)
fprintf (Gbl.F.Out,"<td title=\"%s\"" fprintf (Gbl.F.Out,"<td title=\"%s\""
" style=\"width:20px; text-align:left;\">", " style=\"width:20px; text-align:left;\">",
Ctr->FullName); Ctr->FullName);
Ctr_DrawCentreLogo (Ctr->CtrCod,Ctr->ShortName,16,NULL); Log_DrawLogo (Sco_SCOPE_CENTRE,Ctr->CtrCod,Ctr->ShortName,16,NULL);
fprintf (Gbl.F.Out,"</td>"); fprintf (Gbl.F.Out,"</td>");
/* Institution */ /* Institution */
@ -1923,7 +1922,7 @@ static void Ctr_PutFormToCreateCentre (void)
/***** Centre logo *****/ /***** Centre logo *****/
fprintf (Gbl.F.Out,"<td style=\"width:20px; text-align:left;\">"); fprintf (Gbl.F.Out,"<td style=\"width:20px; text-align:left;\">");
Ctr_DrawCentreLogo (-1L,"",16,NULL); Log_DrawLogo (Sco_SCOPE_CENTRE,-1L,"",16,NULL);
fprintf (Gbl.F.Out,"</td>"); fprintf (Gbl.F.Out,"</td>");
/***** Institution *****/ /***** Institution *****/
@ -2357,48 +2356,6 @@ unsigned Ctr_GetNumCtrsWithUsrs (Rol_Role_t Role,const char *SubQuery)
return (unsigned) DB_QueryCOUNT (Query,"can not get number of centres with users"); return (unsigned) DB_QueryCOUNT (Query,"can not get number of centres with users");
} }
/*****************************************************************************/
/****************************** Draw centre logo *****************************/
/*****************************************************************************/
void Ctr_DrawCentreLogo (long CtrCod,const char *AltText,
unsigned Size,const char *Style)
{
char PathLogo[PATH_MAX+1];
bool LogoExists;
/***** Path to logo *****/
if (CtrCod > 0)
{
sprintf (PathLogo,"%s/%s/%02u/%u/logo/%u.png",
Cfg_PATH_SWAD_PUBLIC,Cfg_FOLDER_CTR,
(unsigned) (CtrCod % 100),
(unsigned) CtrCod,
(unsigned) CtrCod);
LogoExists = Fil_CheckIfPathExists (PathLogo);
}
else
LogoExists = false;
/***** Draw logo *****/
fprintf (Gbl.F.Out,"<img src=\"");
if (LogoExists)
fprintf (Gbl.F.Out,"%s/%s/%02u/%u/logo/%u.png",
Cfg_HTTPS_URL_SWAD_PUBLIC,Cfg_FOLDER_CTR,
(unsigned) (CtrCod % 100),
(unsigned) CtrCod,
(unsigned) CtrCod);
else
fprintf (Gbl.F.Out,"%s/ctr64x64.gif",
Gbl.Prefs.IconsURL);
fprintf (Gbl.F.Out,"\" alt=\"%s\" class=\"ICON%ux%u\"",
AltText,Size,Size);
if (Style)
if (Style[0])
fprintf (Gbl.F.Out," style=\"%s\"",Style);
fprintf (Gbl.F.Out," />");
}
/*****************************************************************************/ /*****************************************************************************/
/****************************** List centres found ***************************/ /****************************** List centres found ***************************/
/*****************************************************************************/ /*****************************************************************************/

3
swad_centre.h
View File

@ -120,9 +120,6 @@ unsigned Ctr_GetNumCtrsWithDegs (const char *SubQuery);
unsigned Ctr_GetNumCtrsWithCrss (const char *SubQuery); unsigned Ctr_GetNumCtrsWithCrss (const char *SubQuery);
unsigned Ctr_GetNumCtrsWithUsrs (Rol_Role_t Role,const char *SubQuery); unsigned Ctr_GetNumCtrsWithUsrs (Rol_Role_t Role,const char *SubQuery);
void Ctr_DrawCentreLogo (long CtrCod,const char *AltText,
unsigned Size,const char *Style);
unsigned Ctr_ListCtrsFound (const char *Query); unsigned Ctr_ListCtrsFound (const char *Query);
#endif #endif

3
swad_changelog.h
View File

@ -39,11 +39,12 @@
/****************************** Public constants *****************************/ /****************************** Public constants *****************************/
/*****************************************************************************/ /*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 14.57 (2015/01/17)" #define Log_PLATFORM_VERSION "SWAD 14.57.1 (2015/01/17)"
// Number of lines (includes comments but not blank lines) has been got with the following command: // Number of lines (includes comments but not blank lines) has been got with the following command:
// nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*.h | tail -1 // nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*.h | tail -1
/* /*
Version 14.57.1: Jan 17, 2015 Code refactoring related to logos of institutions, centres and degrees. (173674 lines)
Version 14.57: Jan 17, 2015 New option to upload logo of degree. (173720 lines) Version 14.57: Jan 17, 2015 New option to upload logo of degree. (173720 lines)
3 changes necessary in database: 3 changes necessary in database:
UPDATE actions SET Txt='Cambiar logo de titulaci&oacute;n' WHERE ActCod='553' AND Language='es'; UPDATE actions SET Txt='Cambiar logo de titulaci&oacute;n' WHERE ActCod='553' AND Language='es';

3
swad_chat.c
View File

@ -34,6 +34,7 @@
#include "swad_config.h" #include "swad_config.h"
#include "swad_database.h" #include "swad_database.h"
#include "swad_global.h" #include "swad_global.h"
#include "swad_logo.h"
#include "swad_parameter.h" #include "swad_parameter.h"
#include "swad_string.h" #include "swad_string.h"
#include "swad_text.h" #include "swad_text.h"
@ -184,7 +185,7 @@ void Cht_ShowListOfAvailableChatRooms (void)
sprintf (ThisRoomShortName,"%s",Deg.ShortName); sprintf (ThisRoomShortName,"%s",Deg.ShortName);
sprintf (ThisRoomFullName,"%s %s",Txt_Degree,Deg.ShortName); sprintf (ThisRoomFullName,"%s %s",Txt_Degree,Deg.ShortName);
Cht_WriteLinkToChat1 (ThisRoomCode,ThisRoomShortName,ThisRoomFullName,1,IsLastItemInLevel); Cht_WriteLinkToChat1 (ThisRoomCode,ThisRoomShortName,ThisRoomFullName,1,IsLastItemInLevel);
Deg_DrawDegreeLogo (Deg.DegCod,Deg.ShortName,16,NULL); Log_DrawLogo (Sco_SCOPE_DEGREE,Deg.DegCod,Deg.ShortName,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 */

11
swad_course.c
View File

@ -39,6 +39,7 @@
#include "swad_exam.h" #include "swad_exam.h"
#include "swad_global.h" #include "swad_global.h"
#include "swad_indicator.h" #include "swad_indicator.h"
#include "swad_logo.h"
#include "swad_notification.h" #include "swad_notification.h"
#include "swad_parameter.h" #include "swad_parameter.h"
#include "swad_QR.h" #include "swad_QR.h"
@ -211,7 +212,7 @@ static void Crs_Configuration (bool PrintView)
" class=\"TITLE_LOCATION\" title=\"%s\">", " class=\"TITLE_LOCATION\" title=\"%s\">",
Gbl.CurrentDeg.Deg.WWW, Gbl.CurrentDeg.Deg.WWW,
Gbl.CurrentDeg.Deg.FullName); Gbl.CurrentDeg.Deg.FullName);
Deg_DrawDegreeLogo (Gbl.CurrentDeg.Deg.DegCod,Gbl.CurrentDeg.Deg.ShortName,64,NULL); Log_DrawLogo (Sco_SCOPE_DEGREE,Gbl.CurrentDeg.Deg.DegCod,Gbl.CurrentDeg.Deg.ShortName,64,NULL);
if (PutLink) if (PutLink)
fprintf (Gbl.F.Out,"</a>"); fprintf (Gbl.F.Out,"</a>");
fprintf (Gbl.F.Out,"<br />%s" fprintf (Gbl.F.Out,"<br />%s"
@ -668,7 +669,7 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
Ins_PutParamInsCod (Ins.InsCod); Ins_PutParamInsCod (Ins.InsCod);
Act_LinkFormSubmit (Act_GetActionTextFromDB (Act_Actions[ActSeeInsInf].ActCod,ActTxt), Act_LinkFormSubmit (Act_GetActionTextFromDB (Act_Actions[ActSeeInsInf].ActCod,ActTxt),
The_ClassFormul[Gbl.Prefs.Theme]); The_ClassFormul[Gbl.Prefs.Theme]);
Ins_DrawInstitutionLogo (Ins.InsCod,Ins.ShortName,16,"vertical-align:middle;"); Log_DrawLogo (Sco_SCOPE_INSTITUTION,Ins.InsCod,Ins.ShortName,16,"vertical-align:middle;");
Highlight = (Gbl.CurrentCtr.Ctr.CtrCod <= 0 && Highlight = (Gbl.CurrentCtr.Ctr.CtrCod <= 0 &&
Gbl.CurrentIns.Ins.InsCod == Ins.InsCod); Gbl.CurrentIns.Ins.InsCod == Ins.InsCod);
if (Highlight) if (Highlight)
@ -705,7 +706,7 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
Ctr_PutParamCtrCod (Ctr.CtrCod); Ctr_PutParamCtrCod (Ctr.CtrCod);
Act_LinkFormSubmit (Act_GetActionTextFromDB (Act_Actions[ActSeeCtrInf].ActCod,ActTxt), Act_LinkFormSubmit (Act_GetActionTextFromDB (Act_Actions[ActSeeCtrInf].ActCod,ActTxt),
The_ClassFormul[Gbl.Prefs.Theme]); The_ClassFormul[Gbl.Prefs.Theme]);
Ctr_DrawCentreLogo (Ctr.CtrCod,Ctr.ShortName,16,"vertical-align:middle;"); Log_DrawLogo (Sco_SCOPE_CENTRE,Ctr.CtrCod,Ctr.ShortName,16,"vertical-align:middle;");
Highlight = (Gbl.CurrentDeg.Deg.DegCod <= 0 && Highlight = (Gbl.CurrentDeg.Deg.DegCod <= 0 &&
Gbl.CurrentCtr.Ctr.CtrCod == Ctr.CtrCod); Gbl.CurrentCtr.Ctr.CtrCod == Ctr.CtrCod);
if (Highlight) if (Highlight)
@ -742,7 +743,7 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
Deg_PutParamDegCod (Deg.DegCod); Deg_PutParamDegCod (Deg.DegCod);
Act_LinkFormSubmit (Act_GetActionTextFromDB (Act_Actions[ActSeeDegInf].ActCod,ActTxt), Act_LinkFormSubmit (Act_GetActionTextFromDB (Act_Actions[ActSeeDegInf].ActCod,ActTxt),
The_ClassFormul[Gbl.Prefs.Theme]); The_ClassFormul[Gbl.Prefs.Theme]);
Deg_DrawDegreeLogo (Deg.DegCod,Deg.ShortName,16,NULL); Log_DrawLogo (Sco_SCOPE_DEGREE,Deg.DegCod,Deg.ShortName,16,NULL);
Highlight = (Gbl.CurrentCrs.Crs.CrsCod <= 0 && Highlight = (Gbl.CurrentCrs.Crs.CrsCod <= 0 &&
Gbl.CurrentDeg.Deg.DegCod == Deg.DegCod); Gbl.CurrentDeg.Deg.DegCod == Deg.DegCod);
if (Highlight) if (Highlight)
@ -3314,7 +3315,7 @@ static void Crs_WriteRowCrsData (unsigned NumCrs,MYSQL_ROW row,bool WriteColumnA
Deg_PutParamDegCod (Deg.DegCod); Deg_PutParamDegCod (Deg.DegCod);
sprintf (Gbl.Title,Txt_Go_to_X,row[2]); sprintf (Gbl.Title,Txt_Go_to_X,row[2]);
Act_LinkFormSubmit (Gbl.Title,StyleNoBR); Act_LinkFormSubmit (Gbl.Title,StyleNoBR);
Deg_DrawDegreeLogo (Deg.DegCod,Deg.ShortName,64,NULL); Log_DrawLogo (Sco_SCOPE_DEGREE,Deg.DegCod,Deg.ShortName,64,NULL);
fprintf (Gbl.F.Out," %s (%s)" fprintf (Gbl.F.Out," %s (%s)"
"</a>" "</a>"
"</form>" "</form>"

66
swad_degree.c
View File

@ -223,7 +223,7 @@ void Deg_SeeDegWithPendingCrss (void)
"<a href=\"%s\" title=\"%s\" class=\"DAT\"" "<a href=\"%s\" title=\"%s\" class=\"DAT\""
" target=\"_blank\">", " target=\"_blank\">",
BgColor,Deg.WWW,Deg.FullName); BgColor,Deg.WWW,Deg.FullName);
Deg_DrawDegreeLogo (Deg.DegCod,Deg.ShortName,16,"vertical-align:top;"); Log_DrawLogo (Sco_SCOPE_DEGREE,Deg.DegCod,Deg.ShortName,16,"vertical-align:top;");
fprintf (Gbl.F.Out,"</a>" fprintf (Gbl.F.Out,"</a>"
"</td>"); "</td>");
@ -324,9 +324,8 @@ static void Deg_Configuration (bool PrintView)
" class=\"TITLE_LOCATION\" title=\"%s\">", " class=\"TITLE_LOCATION\" title=\"%s\">",
Gbl.CurrentDeg.Deg.WWW, Gbl.CurrentDeg.Deg.WWW,
Gbl.CurrentDeg.Deg.FullName); Gbl.CurrentDeg.Deg.FullName);
Deg_DrawDegreeLogo (Gbl.CurrentDeg.Deg.DegCod, Log_DrawLogo (Sco_SCOPE_DEGREE,Gbl.CurrentDeg.Deg.DegCod,
Gbl.CurrentDeg.Deg.ShortName, Gbl.CurrentDeg.Deg.ShortName,64,NULL);
64,NULL);
fprintf (Gbl.F.Out,"<br />%s", fprintf (Gbl.F.Out,"<br />%s",
Gbl.CurrentDeg.Deg.FullName); Gbl.CurrentDeg.Deg.FullName);
if (PutLink) if (PutLink)
@ -733,13 +732,16 @@ void Deg_WriteBigNameCtyInsCtrDegCrs (void)
Gbl.Prefs.Theme == The_THEME_WHITE) // TODO: Remove this line Gbl.Prefs.Theme == The_THEME_WHITE) // TODO: Remove this line
{ {
if (Gbl.CurrentDeg.Deg.DegCod > 0) if (Gbl.CurrentDeg.Deg.DegCod > 0)
Deg_DrawDegreeLogo (Gbl.CurrentDeg.Deg.DegCod,Gbl.CurrentDeg.Deg.ShortName,32, 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;");
else if (Gbl.CurrentCtr.Ctr.CtrCod > 0) else if (Gbl.CurrentCtr.Ctr.CtrCod > 0)
Ctr_DrawCentreLogo (Gbl.CurrentCtr.Ctr.CtrCod,Gbl.CurrentCtr.Ctr.ShortName,32, 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;");
else if (Gbl.CurrentIns.Ins.InsCod > 0) else if (Gbl.CurrentIns.Ins.InsCod > 0)
Ins_DrawInstitutionLogo (Gbl.CurrentIns.Ins.InsCod,Gbl.CurrentIns.Ins.ShortName,32, 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;");
else if (Gbl.CurrentCty.Cty.CtyCod > 0) else if (Gbl.CurrentCty.Cty.CtyCod > 0)
if (Cty_CheckIfCountryMapExists (&Gbl.CurrentCty.Cty)) if (Cty_CheckIfCountryMapExists (&Gbl.CurrentCty.Cty))
@ -1268,7 +1270,7 @@ static void Deg_ListOneDegreeForSeeing (struct Degree *Deg,unsigned NumDeg)
"<a href=\"%s\" title=\"%s\" class=\"DAT\" target=\"_blank\">", "<a href=\"%s\" title=\"%s\" class=\"DAT\" target=\"_blank\">",
TxtClass,BgColor, TxtClass,BgColor,
Deg->WWW,Deg->FullName); Deg->WWW,Deg->FullName);
Deg_DrawDegreeLogo (Deg->DegCod,Deg->ShortName,16,"vertical-align:top;"); Log_DrawLogo (Sco_SCOPE_DEGREE,Deg->DegCod,Deg->ShortName,16,"vertical-align:top;");
fprintf (Gbl.F.Out,"</a>" fprintf (Gbl.F.Out,"</a>"
"</td>"); "</td>");
@ -1411,7 +1413,7 @@ static void Deg_ListDegreesForEdition (void)
fprintf (Gbl.F.Out,"<td title=\"%s\"" fprintf (Gbl.F.Out,"<td title=\"%s\""
" style=\"width:20px; text-align:left;\">", " style=\"width:20px; text-align:left;\">",
Deg->FullName); Deg->FullName);
Deg_DrawDegreeLogo (Deg->DegCod,Deg->ShortName,16,NULL); Log_DrawLogo (Sco_SCOPE_DEGREE,Deg->DegCod,Deg->ShortName,16,NULL);
fprintf (Gbl.F.Out,"</td>"); fprintf (Gbl.F.Out,"</td>");
/* Centre */ /* Centre */
@ -1818,7 +1820,7 @@ static void Deg_PutFormToCreateDegree (void)
/***** Degree logo *****/ /***** Degree logo *****/
fprintf (Gbl.F.Out,"<td style=\"width:20px; text-align:left;\">"); fprintf (Gbl.F.Out,"<td style=\"width:20px; text-align:left;\">");
Deg_DrawDegreeLogo (-1L,"",16,NULL); Log_DrawLogo (Sco_SCOPE_DEGREE,-1L,"",16,NULL);
fprintf (Gbl.F.Out,"</td>"); fprintf (Gbl.F.Out,"</td>");
/***** Centre *****/ /***** Centre *****/
@ -3918,7 +3920,7 @@ void Deg_GetAndWriteDegreesAdminBy (long UsrCod,unsigned ColSpan)
Deg_PutParamDegCod (DegCod); Deg_PutParamDegCod (DegCod);
sprintf (Gbl.Title,Txt_Go_to_X,row[2]); sprintf (Gbl.Title,Txt_Go_to_X,row[2]);
Act_LinkFormSubmit (Gbl.Title,"DAT_SMALL_NOBR"); Act_LinkFormSubmit (Gbl.Title,"DAT_SMALL_NOBR");
Deg_DrawDegreeLogo (DegCod,row[1],16,"vertical-align:top;"); Log_DrawLogo (Sco_SCOPE_DEGREE,DegCod,row[1],16,"vertical-align:top;");
fprintf (Gbl.F.Out,"&nbsp;%s</a>" fprintf (Gbl.F.Out,"&nbsp;%s</a>"
"</form>", "</form>",
row[2]); row[2]);
@ -3940,48 +3942,6 @@ void Deg_GetAndWriteDegreesAdminBy (long UsrCod,unsigned ColSpan)
DB_FreeMySQLResult (&mysql_res); DB_FreeMySQLResult (&mysql_res);
} }
/*****************************************************************************/
/****************************** Draw degree logo *****************************/
/*****************************************************************************/
void Deg_DrawDegreeLogo (long DegCod,const char *AltText,
unsigned Size,const char *Style)
{
char PathLogo[PATH_MAX+1];
bool LogoExists;
/***** Path to logo *****/
if (DegCod > 0)
{
sprintf (PathLogo,"%s/%s/%02u/%u/logo/%u.png",
Cfg_PATH_SWAD_PUBLIC,Cfg_FOLDER_DEG,
(unsigned) (DegCod % 100),
(unsigned) DegCod,
(unsigned) DegCod);
LogoExists = Fil_CheckIfPathExists (PathLogo);
}
else
LogoExists = false;
/***** Draw logo *****/
fprintf (Gbl.F.Out,"<img src=\"");
if (LogoExists)
fprintf (Gbl.F.Out,"%s/%s/%02u/%u/logo/%u.png",
Cfg_HTTPS_URL_SWAD_PUBLIC,Cfg_FOLDER_DEG,
(unsigned) (DegCod % 100),
(unsigned) DegCod,
(unsigned) DegCod);
else
fprintf (Gbl.F.Out,"%s/deg64x64.gif",
Gbl.Prefs.IconsURL);
fprintf (Gbl.F.Out,"\" alt=\"%s\" class=\"ICON%ux%u\"",
AltText,Size,Size);
if (Style)
if (Style[0])
fprintf (Gbl.F.Out," style=\"%s\"",Style);
fprintf (Gbl.F.Out," />");
}
/*****************************************************************************/ /*****************************************************************************/
/****************************** List degrees found ***************************/ /****************************** List degrees found ***************************/
/*****************************************************************************/ /*****************************************************************************/

3
swad_degree.h
View File

@ -165,9 +165,6 @@ bool Deg_CheckIfYearIsValidInDeg (unsigned Year,struct Degree *Deg);
void Deg_GetAndWriteDegreesAdminBy (long UsrCod,unsigned ColSpan); void Deg_GetAndWriteDegreesAdminBy (long UsrCod,unsigned ColSpan);
void Deg_DrawDegreeLogo (long DegCod,const char *AltText,
unsigned Size,const char *Style);
unsigned Deg_ListDegsFound (const char *Query); unsigned Deg_ListDegsFound (const char *Query);
#endif #endif

3
swad_exam.c
View File

@ -39,6 +39,7 @@
#include "swad_database.h" #include "swad_database.h"
#include "swad_exam.h" #include "swad_exam.h"
#include "swad_global.h" #include "swad_global.h"
#include "swad_logo.h"
#include "swad_notification.h" #include "swad_notification.h"
#include "swad_parameter.h" #include "swad_parameter.h"
#include "swad_QR.h" #include "swad_QR.h"
@ -790,7 +791,7 @@ static void Exa_ShowExamAnnouncement (long ExaCod,Exa_tTypeViewExamAnnouncement_
else else
fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\" class=\"%s\">", fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\" class=\"%s\">",
Ins.WWW,StyleTitle); Ins.WWW,StyleTitle);
Ins_DrawInstitutionLogo (Ins.InsCod,Ins.FullName,64,NULL); Log_DrawLogo (Sco_SCOPE_INSTITUTION,Ins.InsCod,Ins.FullName,64,NULL);
fprintf (Gbl.F.Out,"<br />%s%s" \ fprintf (Gbl.F.Out,"<br />%s%s" \
"</td>" \ "</td>" \
"</tr>", "</tr>",

3
swad_file_browser.c
View File

@ -41,6 +41,7 @@
#include "swad_file_browser.h" #include "swad_file_browser.h"
#include "swad_global.h" #include "swad_global.h"
#include "swad_ID.h" #include "swad_ID.h"
#include "swad_logo.h"
#include "swad_mark.h" #include "swad_mark.h"
#include "swad_notification.h" #include "swad_notification.h"
#include "swad_parameter.h" #include "swad_parameter.h"
@ -9562,7 +9563,7 @@ static void Brw_WriteRowDocData (unsigned *NumDocsNotHidden,MYSQL_ROW row)
Deg_PutParamDegCod (DegCod); Deg_PutParamDegCod (DegCod);
sprintf (Gbl.Title,Txt_Go_to_X,row[5]); sprintf (Gbl.Title,Txt_Go_to_X,row[5]);
Act_LinkFormSubmit (Gbl.Title,"DAT"); Act_LinkFormSubmit (Gbl.Title,"DAT");
Deg_DrawDegreeLogo (DegCod,row[4],16,"vertical-align:top;"); Log_DrawLogo (Sco_SCOPE_DEGREE,DegCod,row[4],16,"vertical-align:top;");
fprintf (Gbl.F.Out,"&nbsp;%s (%s)</a>" fprintf (Gbl.F.Out,"&nbsp;%s (%s)</a>"
"</form>", "</form>",
row[4],row[5]); row[4],row[5]);

10
swad_forum.c
View File

@ -37,6 +37,7 @@
#include "swad_forum.h" #include "swad_forum.h"
#include "swad_global.h" #include "swad_global.h"
#include "swad_layout.h" #include "swad_layout.h"
#include "swad_logo.h"
#include "swad_notification.h" #include "swad_notification.h"
#include "swad_parameter.h" #include "swad_parameter.h"
@ -2146,15 +2147,18 @@ static void For_WriteLinkToForum (For_ForumType_t ForumType,Act_Action_t NextAct
{ {
case For_FORUM_INSTITUTION_USRS: case For_FORUM_INSTITUTION_USRS:
case For_FORUM_INSTITUTION_TCHS: case For_FORUM_INSTITUTION_TCHS:
Ins_DrawInstitutionLogo (Gbl.Forum.Ins.InsCod,ForumName,16,"vertical-align:middle;"); Log_DrawLogo (Sco_SCOPE_INSTITUTION,Gbl.Forum.Ins.InsCod,ForumName,
16,"vertical-align:middle;");
break; break;
case For_FORUM_CENTRE_USRS: case For_FORUM_CENTRE_USRS:
case For_FORUM_CENTRE_TCHS: case For_FORUM_CENTRE_TCHS:
Ctr_DrawCentreLogo (Gbl.Forum.Ctr.CtrCod,ForumName,16,"vertical-align:middle;"); Log_DrawLogo (Sco_SCOPE_CENTRE,Gbl.Forum.Ctr.CtrCod,ForumName,
16,"vertical-align:middle;");
break; break;
case For_FORUM_DEGREE_USRS: case For_FORUM_DEGREE_USRS:
case For_FORUM_DEGREE_TCHS: case For_FORUM_DEGREE_TCHS:
Deg_DrawDegreeLogo (Gbl.Forum.Deg.DegCod,ForumName,16,"vertical-align:middle;"); Log_DrawLogo (Sco_SCOPE_DEGREE,Gbl.Forum.Deg.DegCod,ForumName,
16,"vertical-align:middle;");
break; break;
default: default:
fprintf (Gbl.F.Out,"%s",Icon); fprintf (Gbl.F.Out,"%s",Icon);

55
swad_institution.c
View File

@ -163,7 +163,7 @@ void Ins_SeeInsWithPendingCtrs (void)
" vertical-align:middle; background-color:%s;\">" " vertical-align:middle; background-color:%s;\">"
"<a href=\"%s\" title=\"%s\" class=\"DAT\" target=\"_blank\">", "<a href=\"%s\" title=\"%s\" class=\"DAT\" target=\"_blank\">",
BgColor,Ins.WWW,Ins.FullName); BgColor,Ins.WWW,Ins.FullName);
Ins_DrawInstitutionLogo (Ins.InsCod,Ins.ShortName,16,"vertical-align:top;"); Log_DrawLogo (Sco_SCOPE_INSTITUTION,Ins.InsCod,Ins.ShortName,16,"vertical-align:top;");
fprintf (Gbl.F.Out,"</a>" fprintf (Gbl.F.Out,"</a>"
"</td>"); "</td>");
@ -266,9 +266,8 @@ static void Ins_Configuration (bool PrintView)
" class=\"TITLE_LOCATION\" title=\"%s\">", " class=\"TITLE_LOCATION\" title=\"%s\">",
Gbl.CurrentIns.Ins.WWW, Gbl.CurrentIns.Ins.WWW,
Gbl.CurrentIns.Ins.FullName); Gbl.CurrentIns.Ins.FullName);
Ins_DrawInstitutionLogo (Gbl.CurrentIns.Ins.InsCod, Log_DrawLogo (Sco_SCOPE_INSTITUTION,Gbl.CurrentIns.Ins.InsCod,
Gbl.CurrentIns.Ins.ShortName, Gbl.CurrentIns.Ins.ShortName,64,NULL);
64,NULL);
fprintf (Gbl.F.Out,"<br />%s",Gbl.CurrentIns.Ins.FullName); fprintf (Gbl.F.Out,"<br />%s",Gbl.CurrentIns.Ins.FullName);
if (PutLink) if (PutLink)
fprintf (Gbl.F.Out,"</a>"); fprintf (Gbl.F.Out,"</a>");
@ -530,7 +529,7 @@ static void Ins_ListOneInstitutionForSeeing (struct Institution *Ins,unsigned Nu
"<a href=\"%s\" target=\"_blank\" title=\"%s\">", "<a href=\"%s\" target=\"_blank\" title=\"%s\">",
BgColor, BgColor,
Ins->WWW,Ins->FullName); Ins->WWW,Ins->FullName);
Ins_DrawInstitutionLogo (Ins->InsCod,Ins->ShortName,16,NULL); Log_DrawLogo (Sco_SCOPE_INSTITUTION,Ins->InsCod,Ins->ShortName,16,NULL);
fprintf (Gbl.F.Out,"</a>" fprintf (Gbl.F.Out,"</a>"
"</td>"); "</td>");
@ -1114,7 +1113,7 @@ static void Ins_ListInstitutionsForEdition (void)
fprintf (Gbl.F.Out,"<td title=\"%s\"" fprintf (Gbl.F.Out,"<td title=\"%s\""
" style=\"width:20px; text-align:left;\">", " style=\"width:20px; text-align:left;\">",
Ins->FullName); Ins->FullName);
Ins_DrawInstitutionLogo (Ins->InsCod,Ins->ShortName,16,NULL); Log_DrawLogo (Sco_SCOPE_INSTITUTION,Ins->InsCod,Ins->ShortName,16,NULL);
fprintf (Gbl.F.Out,"</td>"); fprintf (Gbl.F.Out,"</td>");
/* Country */ /* Country */
@ -1733,7 +1732,7 @@ static void Ins_PutFormToCreateInstitution (void)
/***** Institution logo *****/ /***** Institution logo *****/
fprintf (Gbl.F.Out,"<td style=\"width:20px; text-align:left;\">"); fprintf (Gbl.F.Out,"<td style=\"width:20px; text-align:left;\">");
Ins_DrawInstitutionLogo (-1L,"",16,NULL); Log_DrawLogo (Sco_SCOPE_INSTITUTION,-1L,"",16,NULL);
fprintf (Gbl.F.Out,"</td>"); fprintf (Gbl.F.Out,"</td>");
/***** Country *****/ /***** Country *****/
@ -2064,48 +2063,6 @@ unsigned Ins_GetNumInssWithUsrs (Rol_Role_t Role,const char *SubQuery)
return (unsigned) DB_QueryCOUNT (Query,"can not get number of institutions with users"); return (unsigned) DB_QueryCOUNT (Query,"can not get number of institutions with users");
} }
/*****************************************************************************/
/**************************** Draw institution logo **************************/
/*****************************************************************************/
void Ins_DrawInstitutionLogo (long InsCod,const char *AltText,
unsigned Size,const char *Style)
{
char PathLogo[PATH_MAX+1];
bool LogoExists;
/***** Path to logo *****/
if (InsCod > 0)
{
sprintf (PathLogo,"%s/%s/%02u/%u/logo/%u.png",
Cfg_PATH_SWAD_PUBLIC,Cfg_FOLDER_INS,
(unsigned) (InsCod % 100),
(unsigned) InsCod,
(unsigned) InsCod);
LogoExists = Fil_CheckIfPathExists (PathLogo);
}
else
LogoExists = false;
/***** Draw logo *****/
fprintf (Gbl.F.Out,"<img src=\"");
if (LogoExists)
fprintf (Gbl.F.Out,"%s/%s/%02u/%u/logo/%u.png",
Cfg_HTTPS_URL_SWAD_PUBLIC,Cfg_FOLDER_INS,
(unsigned) (InsCod % 100),
(unsigned) InsCod,
(unsigned) InsCod);
else
fprintf (Gbl.F.Out,"%s/ins64x64.gif",
Gbl.Prefs.IconsURL);
fprintf (Gbl.F.Out,"\" alt=\"%s\" class=\"ICON%ux%u\"",
AltText,Size,Size);
if (Style)
if (Style[0])
fprintf (Gbl.F.Out," style=\"%s\"",Style);
fprintf (Gbl.F.Out," />");
}
/*****************************************************************************/ /*****************************************************************************/
/*************************** List institutions found *************************/ /*************************** List institutions found *************************/
/*****************************************************************************/ /*****************************************************************************/

2
swad_institution.h
View File

@ -122,8 +122,6 @@ unsigned Ins_GetNumInssWithDegs (const char *SubQuery);
unsigned Ins_GetNumInssWithCrss (const char *SubQuery); unsigned Ins_GetNumInssWithCrss (const char *SubQuery);
unsigned Ins_GetNumInssWithUsrs (Rol_Role_t Role,const char *SubQuery); unsigned Ins_GetNumInssWithUsrs (Rol_Role_t Role,const char *SubQuery);
void Ins_DrawInstitutionLogo (long InsCod,const char *AltText,unsigned Size,const char *Style);
unsigned Ins_ListInssFound (const char *Query); unsigned Ins_ListInssFound (const char *Query);
#endif #endif

5
swad_layout.c
View File

@ -36,6 +36,7 @@
#include "swad_connected.h" #include "swad_connected.h"
#include "swad_database.h" #include "swad_database.h"
#include "swad_global.h" #include "swad_global.h"
#include "swad_logo.h"
#include "swad_notice.h" #include "swad_notice.h"
#include "swad_notification.h" #include "swad_notification.h"
#include "swad_parameter.h" #include "swad_parameter.h"
@ -1278,7 +1279,7 @@ void Lay_WriteHeaderClassPhoto (unsigned NumColumns,bool PrintView,bool DrawingC
{ {
if (!PrintView) if (!PrintView)
fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\">",Ins.WWW); fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\">",Ins.WWW);
Ins_DrawInstitutionLogo (Ins.InsCod,Ins.ShortName,Size,NULL); Log_DrawLogo (Sco_SCOPE_INSTITUTION,Ins.InsCod,Ins.ShortName,Size,NULL);
if (!PrintView) if (!PrintView)
fprintf (Gbl.F.Out,"</a>"); fprintf (Gbl.F.Out,"</a>");
} }
@ -1327,7 +1328,7 @@ void Lay_WriteHeaderClassPhoto (unsigned NumColumns,bool PrintView,bool DrawingC
if (!PrintView) if (!PrintView)
fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\" class=\"TIT_CLASSPHOTO\">", fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\" class=\"TIT_CLASSPHOTO\">",
Deg.WWW); Deg.WWW);
Deg_DrawDegreeLogo (Deg.DegCod,Deg.ShortName,Size,NULL); Log_DrawLogo (Sco_SCOPE_DEGREE,Deg.DegCod,Deg.ShortName,Size,NULL);
if (!PrintView) if (!PrintView)
fprintf (Gbl.F.Out,"</a>"); fprintf (Gbl.F.Out,"</a>");
} }

3
swad_photo.c
View File

@ -40,6 +40,7 @@
#include "swad_file.h" #include "swad_file.h"
#include "swad_file_browser.h" #include "swad_file_browser.h"
#include "swad_global.h" #include "swad_global.h"
#include "swad_logo.h"
#include "swad_parameter.h" #include "swad_parameter.h"
#include "swad_photo.h" #include "swad_photo.h"
#include "swad_theme.h" #include "swad_theme.h"
@ -1983,7 +1984,7 @@ static void Pho_ShowOrPrintListDegrees (Pho_AvgPhotoSeeOrPrint_t SeeOrPrint)
if (SeeOrPrint == Pho_DEGREES_SEE) if (SeeOrPrint == Pho_DEGREES_SEE)
fprintf (Gbl.F.Out,"<a href=\"%s\" title=\"%s\" class=\"DAT\" target=\"_blank\">", fprintf (Gbl.F.Out,"<a href=\"%s\" title=\"%s\" class=\"DAT\" target=\"_blank\">",
Deg.WWW,Deg.FullName); Deg.WWW,Deg.FullName);
Deg_DrawDegreeLogo (Deg.DegCod,Deg.ShortName,16,"vertical-align:top;"); Log_DrawLogo (Sco_SCOPE_DEGREE,Deg.DegCod,Deg.ShortName,16,"vertical-align:top;");
fprintf (Gbl.F.Out,"&nbsp;%s&nbsp;", fprintf (Gbl.F.Out,"&nbsp;%s&nbsp;",
Deg.ShortName); Deg.ShortName);
if (SeeOrPrint == Pho_DEGREES_SEE) if (SeeOrPrint == Pho_DEGREES_SEE)

9
swad_record.c
View File

@ -36,6 +36,7 @@
#include "swad_enrollment.h" #include "swad_enrollment.h"
#include "swad_global.h" #include "swad_global.h"
#include "swad_ID.h" #include "swad_ID.h"
#include "swad_logo.h"
#include "swad_network.h" #include "swad_network.h"
#include "swad_parameter.h" #include "swad_parameter.h"
#include "swad_photo.h" #include "swad_photo.h"
@ -1529,9 +1530,8 @@ void Rec_ShowCrsRecord (Rec_RecordViewType_t TypeOfView,struct UsrData *UsrDat)
"<tr>" "<tr>"
"<td style=\"width:%upx; text-align:left;\">", "<td style=\"width:%upx; text-align:left;\">",
Rec_DEGREE_LOGO_SIZE); Rec_DEGREE_LOGO_SIZE);
Deg_DrawDegreeLogo (Gbl.CurrentDeg.Deg.DegCod, Log_DrawLogo (Sco_SCOPE_DEGREE,Gbl.CurrentDeg.Deg.DegCod,
Gbl.CurrentDeg.Deg.ShortName, Gbl.CurrentDeg.Deg.ShortName,Rec_DEGREE_LOGO_SIZE,NULL);
Rec_DEGREE_LOGO_SIZE,NULL);
fprintf (Gbl.F.Out,"</td>" fprintf (Gbl.F.Out,"</td>"
"<td class=\"%s\" style=\"text-align:center;\">" "<td class=\"%s\" style=\"text-align:center;\">"
"%s<br />%s<br />%s" "%s<br />%s<br />%s"
@ -2143,7 +2143,8 @@ void Rec_ShowCommonRecord (Rec_RecordViewType_t TypeOfView,
{ {
Ins.InsCod = UsrDat->InsCod; Ins.InsCod = UsrDat->InsCod;
Ins_GetDataOfInstitutionByCod (&Ins,Ins_GET_MINIMAL_DATA); Ins_GetDataOfInstitutionByCod (&Ins,Ins_GET_MINIMAL_DATA);
Ins_DrawInstitutionLogo (Ins.InsCod,Ins.ShortName,Rec_INSTITUTION_LOGO_SIZE,NULL); Log_DrawLogo (Sco_SCOPE_INSTITUTION,Ins.InsCod,Ins.ShortName,
Rec_INSTITUTION_LOGO_SIZE,NULL);
fprintf (Gbl.F.Out,"</td>" fprintf (Gbl.F.Out,"</td>"
"<td class=\"%s\" style=\"text-align:left;" "<td class=\"%s\" style=\"text-align:left;"
" vertical-align:middle;\">" " vertical-align:middle;\">"

3
swad_statistic.c
View File

@ -41,6 +41,7 @@
#include "swad_forum.h" #include "swad_forum.h"
#include "swad_global.h" #include "swad_global.h"
#include "swad_ID.h" #include "swad_ID.h"
#include "swad_logo.h"
#include "swad_network.h" #include "swad_network.h"
#include "swad_notice.h" #include "swad_notice.h"
#include "swad_notification.h" #include "swad_notification.h"
@ -3486,7 +3487,7 @@ static void Sta_WriteDegree (long DegCod)
fprintf (Gbl.F.Out,"%s\">" fprintf (Gbl.F.Out,"%s\">"
"<a href=\"%s\" class=\"LOG\" target=\"_blank\">", "<a href=\"%s\" class=\"LOG\" target=\"_blank\">",
Deg.WWW,Deg.FullName); Deg.WWW,Deg.FullName);
Deg_DrawDegreeLogo (Deg.DegCod,Deg.ShortName,16,"vertical-align:top;"); Log_DrawLogo (Sco_SCOPE_DEGREE,Deg.DegCod,Deg.ShortName,16,"vertical-align:top;");
fprintf (Gbl.F.Out,"&nbsp;%s&nbsp;</a>", fprintf (Gbl.F.Out,"&nbsp;%s&nbsp;</a>",
Deg.ShortName); Deg.ShortName);
} }