From bd0d37e78add02c11027bd651ccf95523fabb5c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Sun, 18 Jan 2015 11:46:39 +0100 Subject: [PATCH] Version 14.57.2 --- icon/deg64x64.gif | Bin 520 -> 459 bytes icon/iconset/awesome/action64x64/pie64x64.gif | Bin 417 -> 482 bytes icon/iconset/awesome/action64x64/sta64x64.gif | Bin 331 -> 417 bytes .../awesome/action64x64/stats64x64.gif | Bin 331 -> 367 bytes swad_centre.c | 12 +++--- swad_changelog.h | 3 +- swad_chat.c | 2 +- swad_course.c | 14 ++++--- swad_degree.c | 24 ++++++----- swad_exam.c | 2 +- swad_file_browser.c | 3 +- swad_forum.c | 6 +-- swad_institution.c | 13 +++--- swad_layout.c | 5 ++- swad_logo.c | 39 ++++++++++-------- swad_logo.h | 2 +- swad_photo.c | 3 +- swad_record.c | 4 +- swad_statistic.c | 3 +- 19 files changed, 77 insertions(+), 58 deletions(-) diff --git a/icon/deg64x64.gif b/icon/deg64x64.gif index 9a09f085a073d68880641b0f01fb0f2e5632f5da..e88dada22f63bfd0a614e25598bb01b4e510015a 100644 GIT binary patch literal 459 zcmV;+0W|(cNk%w1VL$*t0J8u9KtMoCOG{T*S7&Euc6N6E|Nn-DhLDetlaiC0o13Jh zq^hc_va+(gyu8E1!vFvPA^8LW000F5EC2ui06+jh000F3u*gZPy*TU5yZ>M)j$~<` zXsWJk>%MR-&ve}~L;wJR(bylwU`H$h2n--5F*G`hgN3qi5InEXL1JdmVZT?wfz`-? z&)}YEK|s6R0m9ECeB18?DF$J^`~6xI3VnZte*z9ohKqLw1rA+|l2`%=7krbGfgE+2 zcnTp3o^D7aUH}edr=D>RCZaof5|FEf0tT)qO#vBIega!8L}MFFX9J)v4MY^U8l6RX z8V!ym2+XrPtr~2l893M^Z2$rj3{Ku4(BUKF1A^21Yqa7UF=DB;zC!@dsj=5ea!2H3G0SBH~7nB8iY3L8M@Td?`&7 zq2N#=!x0W-jGDoL0s{jE1kj;FzyJaU z76?sIkHD0HMarH1;AE|boFCnCfXPnol8bhq*~`nfuiw9b0}CEZxUk{Fh%H0_06Rli ByORI_ literal 520 zcmV+j0{8t#Nk%w1VL$*t0J8u9KtMoCOG{K#Q(0M8T3T9cY;1RTc7%k4k&%y>n3$%f zrmL%~v$M0hy1M`W|H;Y6A^8LW000gEEC2ui06+jh000F3(8)=wy*TU5yZ>M)jwBZV zfY6kzSD-LJwDfhvIB?W;bLO}JgI6*DkAMO(v_Lumi)DxKd=8|UTXnm`PJG)iYK1k5 z&xU2<%!VmygSI@y($42y5aV~h3qLP?f+$KGO@oLiQ5aNn0gZ_;GZhSdT@3<}F+&oS za{?9!nlPLSa|kx0C~p#WVTBc#ssN}JkWPOVW}}lAhe&x8o~nx)yD?W6w~=WcU@!@( zssUsmH?S14s=*qp9Ilbc9&{SRqs8MW+!M=**dH+%+KJR8@mY!MAom(^cj6`ZInd#2 z4!Q|9_Q9Y)>cX)q%_uE|H&H^2UfK8{sb}GqLKL_PKHhh6VYK9r5451q995P)PZMINSODOBFLq) zj$C~h7C=*!GO?CTi}owguuNhcR68p~JB&A{**yYK!p=c9HT(iH7pWhk9x@^6J7JBZ zsUfPAYv+UjCwoFUEI1GoMt}ozM<_l5D#U{Z4<29{oFlZC50quRZgF=ujRlGYxVFu^ Kx9`~z0029K_}icW diff --git a/icon/iconset/awesome/action64x64/pie64x64.gif b/icon/iconset/awesome/action64x64/pie64x64.gif index 139fde2631cb804dca433e38fcc9783c8de82f1a..847966c546ccc2c5e982861a2bf90a3fbde13fa8 100644 GIT binary patch literal 482 zcmV<80UiEFNk%w1VL$*t0J8u9KR-V}KtNMdQ(0MAWMpJ)Y;1CJa)X0|ii(PtmzSrf zr?j-Ryu7^s|NqL$%GcM|A^8LW000dDEC2ui06+jh000F3u*pfQy*TU5yZ>M)j$~<` zXsWI(2LwZbENvUyct9w1n*RYr&jkDlc*DzMaVQ90l;RISNKz7m+$#{38X3dK0YENx zy|@>xg+SlVZrnQM$j0IEn^4{(B5&V8g{@|70|ls*Xi!>x$(%dLKFtom*yAjH}@0rjR#e&B8uk`+7WsZ4#*O46z~Krh^88zumC}U Yh64;Fh`YG5<;$2eYu?OxLIeN+I}qp4&j0`b literal 417 zcmV;S0bc$`Nk%w1VL$*t0J8u9KtMo6MMX_bO;uG@VPRoqWo2w^Y;bUJdU|?-f`X%? zqo$^&tE;QBva+?cwg3PBA^8LW000jFEC2ui06+jh000F3@X1N5y*TU5yZ>M)j$~<` zXsWJk>%OHC0Ca8Nc&_g_(Oe3ia7g4OEXAaf$e5DoJX>vN=j(f9eQAJ%ZGjqtXCI1lg^M1Ij5&^nh8&WSlzN7L z9hsk-kCm9Bp*WSErKppvqnwbZajmnjwz7Acu9mT?8=%0Zp1z5~#=FCa8NtZMy~-HO zwY<5!q`%J9($~e!-qXpK*x%aD+{@X1=CE+(YeHI@Al95?(+Bf{_XSl3EY>e zp1*wr*}*~xuU|oZ0U36Rm++P}i3bBd92l`9zEn>XJ!XXXQQ;$uTSAijXOfyofD^x+ zqhldlESl&_;_Md7inyH>C_0fsbO{v-MUxWwL1BT?r#X&XIG_@0lmG=B0Nu*9tJkk! L!-^d{HUa=UaIMfB diff --git a/icon/iconset/awesome/action64x64/sta64x64.gif b/icon/iconset/awesome/action64x64/sta64x64.gif index 6ae2beb6667f28c41cea7db78305f5b076f5a1ed..139fde2631cb804dca433e38fcc9783c8de82f1a 100644 GIT binary patch literal 417 zcmV;S0bc$`Nk%w1VL$*t0J8u9KtMo6MMX_bO;uG@VPRoqWo2w^Y;bUJdU|?-f`X%? zqo$^&tE;QBva+?cwg3PBA^8LW000jFEC2ui06+jh000F3@X1N5y*TU5yZ>M)j$~<` zXsWJk>%OHC0Ca8Nc&_g_(Oe3ia7g4OEXAaf$e5DoJX>vN=j(f9eQAJ%ZGjqtXCI1lg^M1Ij5&^nh8&WSlzN7L z9hsk-kCm9Bp*WSErKppvqnwbZajmnjwz7Acu9mT?8=%0Zp1z5~#=FCa8NtZMy~-HO zwY<5!q`%J9($~e!-qXpK*x%aD+{@X1=CE+(YeHI@Al95?(+Bf{_XSl3EY>e zp1*wr*}*~xuU|oZ0U36Rm++P}i3bBd92l`9zEn>XJ!XXXQQ;$uTSAijXOfyofD^x+ zqhldlESl&_;_Md7inyH>C_0fsbO{v-MUxWwL1BT?r#X&XIG_@0lmG=B0Nu*9tJkk! L!-^d{HUa=UaIMfB literal 331 zcmZ?wbhEHbbYO5`*v!D-;Nalz?;jBn5g8d-U0wbE|9=L&K=CIFBLf2~gAPa)$P5OS z9~(}1uHI|$`t0ui2^xJVne#GMt;>16ufT@WAy;@)=6lDuciZOWv#jB4U#Rq;P`L8Jdw25tSY^qFe zi)wajt!?k^?8urJ(&gRLSTtED-@0&8|NI$xQ+>)*mh>&sT`_aP>d9*sZ`iy}XCvz} zmo2Myip?=!*|K)eEWh1{7M|E~G~#&o;Zu7>w{I8OZ#wVvx+`aH9l3pO+J*Be50^eW z_~i17$B$0F%DD63^QxEc?p=KI{`tMk~h{RI9{fKUOZ$I~9L5VWy0f_O!8O@K)YcU(Ip!T)G~;Ie!yp9f5jv ze0OwXf_njlj(>TCjc<>GfRmVqaD5__nTv>QpGTFEmztiMPn;pCppdGJtaz-hgSVqo zwvo7~xwVa}iB-Q>yR)*xu&>9)!O3L4(#+4q$kx=;q}9vO+27l-*xupby4=0yz}md+ z?Ca{v>E-n2;@x)j@cQ!Z@xuJPk+b(NS-OGy2nMu+&^6gRhp&WD5p`|iDPM)j$~<`XsWJk>%MS22|#TVvT5%@UhcM@Zv?Cf zhoK_ii2Nv-&CW9lno>R1D<`YfaJ!f<*diWN%4P{Vz0T2qxJg^aoyY1$XcG_ABl$dC zfI)(JXNFpXMumNcjfseVYLQfmON@bXlPqsLagvXpm@bt}b|j>ZqAjSIpsSOtqp-8C zEU^WqM6{~87MwS!gsr@qPP@XP$hgH=$BVqf0+~D)7>F(aq?C" "", BgColor,Ctr.WWW,Ctr.FullName); - Log_DrawLogo (Sco_SCOPE_CENTRE,Ctr.CtrCod,Ctr.ShortName,16,"vertical-align:top;"); + Log_DrawLogo (Sco_SCOPE_CENTRE,Ctr.CtrCod,Ctr.ShortName, + 16,"vertical-align:top;",true); fprintf (Gbl.F.Out,"" ""); @@ -290,7 +291,7 @@ static void Ctr_Configuration (bool PrintView) Gbl.CurrentCtr.Ctr.WWW, Gbl.CurrentCtr.Ctr.FullName); Log_DrawLogo (Sco_SCOPE_CENTRE,Gbl.CurrentCtr.Ctr.CtrCod, - Gbl.CurrentCtr.Ctr.ShortName,64,NULL); + Gbl.CurrentCtr.Ctr.ShortName,64,NULL,true); fprintf (Gbl.F.Out,"
%s",Gbl.CurrentCtr.Ctr.FullName); if (PutLink) fprintf (Gbl.F.Out,""); @@ -594,7 +595,8 @@ static void Ctr_ListOneCentreForSeeing (struct Centre *Ctr,unsigned NumCtr) "", TxtClass,BgColor, Ctr->WWW,Ctr->FullName); - Log_DrawLogo (Sco_SCOPE_CENTRE,Ctr->CtrCod,Ctr->ShortName,16,"vertical-align:top;"); + Log_DrawLogo (Sco_SCOPE_CENTRE,Ctr->CtrCod,Ctr->ShortName, + 16,"vertical-align:top;",true); fprintf (Gbl.F.Out,"" ""); @@ -1137,7 +1139,7 @@ static void Ctr_ListCentresForEdition (void) fprintf (Gbl.F.Out,"", Ctr->FullName); - Log_DrawLogo (Sco_SCOPE_CENTRE,Ctr->CtrCod,Ctr->ShortName,16,NULL); + Log_DrawLogo (Sco_SCOPE_CENTRE,Ctr->CtrCod,Ctr->ShortName,16,NULL,true); fprintf (Gbl.F.Out,""); /* Institution */ @@ -1922,7 +1924,7 @@ static void Ctr_PutFormToCreateCentre (void) /***** Centre logo *****/ fprintf (Gbl.F.Out,""); - Log_DrawLogo (Sco_SCOPE_CENTRE,-1L,"",16,NULL); + Log_DrawLogo (Sco_SCOPE_CENTRE,-1L,"",16,NULL,true); fprintf (Gbl.F.Out,""); /***** Institution *****/ diff --git a/swad_changelog.h b/swad_changelog.h index a1430ec85..6846b413c 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -39,11 +39,12 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 14.57.1 (2015/01/17)" +#define Log_PLATFORM_VERSION "SWAD 14.57.2 (2015/01/18)" // 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 /* + Version 14.57.2: Jan 18, 2015 Icon of institution, centre or degree is not drawn on title when logo does not exist. (173693 lines) 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) 3 changes necessary in database: diff --git a/swad_chat.c b/swad_chat.c index bd1376c68..3c718c32d 100644 --- a/swad_chat.c +++ b/swad_chat.c @@ -185,7 +185,7 @@ void Cht_ShowListOfAvailableChatRooms (void) sprintf (ThisRoomShortName,"%s",Deg.ShortName); sprintf (ThisRoomFullName,"%s %s",Txt_Degree,Deg.ShortName); Cht_WriteLinkToChat1 (ThisRoomCode,ThisRoomShortName,ThisRoomFullName,1,IsLastItemInLevel); - Log_DrawLogo (Sco_SCOPE_DEGREE,Deg.DegCod,Deg.ShortName,16,NULL); + Log_DrawLogo (Sco_SCOPE_DEGREE,Deg.DegCod,Deg.ShortName,16,NULL,true); Cht_WriteLinkToChat2 (ThisRoomCode,ThisRoomFullName); /* Get my courses in this degree from database */ diff --git a/swad_course.c b/swad_course.c index 4aebce0fe..32ec5a8b1 100644 --- a/swad_course.c +++ b/swad_course.c @@ -212,7 +212,8 @@ static void Crs_Configuration (bool PrintView) " class=\"TITLE_LOCATION\" title=\"%s\">", Gbl.CurrentDeg.Deg.WWW, Gbl.CurrentDeg.Deg.FullName); - Log_DrawLogo (Sco_SCOPE_DEGREE,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,true); if (PutLink) fprintf (Gbl.F.Out,""); fprintf (Gbl.F.Out,"
%s" @@ -669,7 +670,8 @@ static void Crs_WriteListMyCoursesToSelectOne (void) Ins_PutParamInsCod (Ins.InsCod); Act_LinkFormSubmit (Act_GetActionTextFromDB (Act_Actions[ActSeeInsInf].ActCod,ActTxt), The_ClassFormul[Gbl.Prefs.Theme]); - Log_DrawLogo (Sco_SCOPE_INSTITUTION,Ins.InsCod,Ins.ShortName,16,"vertical-align:middle;"); + Log_DrawLogo (Sco_SCOPE_INSTITUTION,Ins.InsCod,Ins.ShortName, + 16,NULL,true); Highlight = (Gbl.CurrentCtr.Ctr.CtrCod <= 0 && Gbl.CurrentIns.Ins.InsCod == Ins.InsCod); if (Highlight) @@ -706,7 +708,8 @@ static void Crs_WriteListMyCoursesToSelectOne (void) Ctr_PutParamCtrCod (Ctr.CtrCod); Act_LinkFormSubmit (Act_GetActionTextFromDB (Act_Actions[ActSeeCtrInf].ActCod,ActTxt), The_ClassFormul[Gbl.Prefs.Theme]); - Log_DrawLogo (Sco_SCOPE_CENTRE,Ctr.CtrCod,Ctr.ShortName,16,"vertical-align:middle;"); + Log_DrawLogo (Sco_SCOPE_CENTRE,Ctr.CtrCod,Ctr.ShortName, + 16,NULL,true); Highlight = (Gbl.CurrentDeg.Deg.DegCod <= 0 && Gbl.CurrentCtr.Ctr.CtrCod == Ctr.CtrCod); if (Highlight) @@ -743,7 +746,8 @@ static void Crs_WriteListMyCoursesToSelectOne (void) Deg_PutParamDegCod (Deg.DegCod); Act_LinkFormSubmit (Act_GetActionTextFromDB (Act_Actions[ActSeeDegInf].ActCod,ActTxt), The_ClassFormul[Gbl.Prefs.Theme]); - Log_DrawLogo (Sco_SCOPE_DEGREE,Deg.DegCod,Deg.ShortName,16,NULL); + Log_DrawLogo (Sco_SCOPE_DEGREE,Deg.DegCod,Deg.ShortName, + 16,NULL,true); Highlight = (Gbl.CurrentCrs.Crs.CrsCod <= 0 && Gbl.CurrentDeg.Deg.DegCod == Deg.DegCod); if (Highlight) @@ -3315,7 +3319,7 @@ static void Crs_WriteRowCrsData (unsigned NumCrs,MYSQL_ROW row,bool WriteColumnA Deg_PutParamDegCod (Deg.DegCod); sprintf (Gbl.Title,Txt_Go_to_X,row[2]); Act_LinkFormSubmit (Gbl.Title,StyleNoBR); - Log_DrawLogo (Sco_SCOPE_DEGREE,Deg.DegCod,Deg.ShortName,64,NULL); + Log_DrawLogo (Sco_SCOPE_DEGREE,Deg.DegCod,Deg.ShortName,64,NULL,true); fprintf (Gbl.F.Out," %s (%s)" "" "" diff --git a/swad_degree.c b/swad_degree.c index c8d38152b..9b2c402d2 100644 --- a/swad_degree.c +++ b/swad_degree.c @@ -223,7 +223,8 @@ void Deg_SeeDegWithPendingCrss (void) "", 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,"" ""); @@ -325,7 +326,7 @@ static void Deg_Configuration (bool PrintView) Gbl.CurrentDeg.Deg.WWW, Gbl.CurrentDeg.Deg.FullName); Log_DrawLogo (Sco_SCOPE_DEGREE,Gbl.CurrentDeg.Deg.DegCod, - Gbl.CurrentDeg.Deg.ShortName,64,NULL); + Gbl.CurrentDeg.Deg.ShortName,64,NULL,true); fprintf (Gbl.F.Out,"
%s", Gbl.CurrentDeg.Deg.FullName); if (PutLink) @@ -728,21 +729,20 @@ void Deg_WriteBigNameCtyInsCtrDegCrs (void) Str_LimitLengthHTMLStr (FullName,Deg_MAX_LENGTH_FULL_NAME_ON_PAGE_HEAD); fprintf (Gbl.F.Out,"
", 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,"\"%s\""); + } } /*****************************************************************************/ 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); }