From 8ec7f5334f365785e910026787ead40cd153c382 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Fri, 16 Jan 2015 01:28:42 +0100 Subject: [PATCH] Version 14.55.2 --- css/swad_desktop.css | 6 +++++ css/swad_mobile.css | 6 +++++ swad_changelog.h | 3 ++- swad_country.c | 56 +++++++++++++++++++++----------------------- swad_country.h | 1 + swad_course.c | 2 +- swad_degree.c | 32 ++++++++++++++++++++++--- 7 files changed, 72 insertions(+), 34 deletions(-) diff --git a/css/swad_desktop.css b/css/swad_desktop.css index c20ad627..26e22c45 100644 --- a/css/swad_desktop.css +++ b/css/swad_desktop.css @@ -336,6 +336,12 @@ hr.YELLOW_SEPARA {height:0; border-top:0; border-bottom:#BD4815 dotted 1px;} } /******************************* Map of country ******************************/ +.COUNTRY_MAP_TITLE + { + width:32px; height:32px; + margin-right:8px; + vertical-align:top; + } .COUNTRY_MAP_SMALL { width:50px; height:50px; diff --git a/css/swad_mobile.css b/css/swad_mobile.css index 2074ee9c..090ddbad 100644 --- a/css/swad_mobile.css +++ b/css/swad_mobile.css @@ -299,6 +299,12 @@ p {margin:0;} } /******************************* Map of country ******************************/ +.COUNTRY_MAP_TITLE + { + width:32px; height:32px; + margin-right:8px; + vertical-align:top; + } .COUNTRY_MAP_SMALL { width:50px; height:50px; diff --git a/swad_changelog.h b/swad_changelog.h index cf2e774a..201c04f9 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -39,11 +39,12 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 14.55.1 (2015/01/14)" +#define Log_PLATFORM_VERSION "SWAD 14.55.2 (2015/01/15)" // 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.55.2: Jan 15, 2015 Logo of centre, degree, institution or country in title. (173546 lines) Version 14.55.1: Jan 14, 2015 Fixed bug in user's photo. (173510 lines) Version 14.55 : Jan 14, 2015 New option to upload logo of a centre. (173509 lines) 3 changes necessary in database: diff --git a/swad_country.c b/swad_country.c index 5a17f6cf..dc083389 100644 --- a/swad_country.c +++ b/swad_country.c @@ -149,17 +149,11 @@ void Cty_SeeCtyWithPendingInss (void) fprintf (Gbl.F.Out,"" "" - "" - "\"%s\"" - "" - "", - BgColor,Cty.WWW[Gbl.Prefs.Language], - Gbl.Prefs.IconsURL,Cfg_ICON_FOLDER_COUNTRIES, - Cty.Alpha2, - Cty.Alpha2, - Cty.Alpha2, - Cty.Name[Gbl.Prefs.Language]); + "", + BgColor,Cty.WWW[Gbl.Prefs.Language]); + Cty_DrawCountryMap (&Cty,"COUNTRY_MAP_SMALL"); + fprintf (Gbl.F.Out,"" + ""); /* Country name */ fprintf (Gbl.F.Out,"", Gbl.CurrentCty.Cty.WWW[Gbl.Prefs.Language]); - fprintf (Gbl.F.Out,"\"%s\"", - Gbl.Prefs.IconsURL,Cfg_ICON_FOLDER_COUNTRIES, - Gbl.CurrentCty.Cty.Alpha2, - Gbl.CurrentCty.Cty.Alpha2, - PrintView ? "COUNTRY_MAP_PRINT" : - "COUNTRY_MAP_SHOW", - Gbl.CurrentCty.Cty.Alpha2, - Gbl.CurrentCty.Cty.Name[Gbl.Prefs.Language]); + Cty_DrawCountryMap (&Gbl.CurrentCty.Cty,PrintView ? "COUNTRY_MAP_PRINT" : + "COUNTRY_MAP_SHOW"); if (PutLink) fprintf (Gbl.F.Out,""); fprintf (Gbl.F.Out,"" @@ -587,15 +574,9 @@ void Cty_ListCountries2 (void) sprintf (Gbl.Title,Txt_Go_to_X, Gbl.Ctys.Lst[NumCty].Name[Gbl.Prefs.Language]); Act_LinkFormSubmit (Gbl.Title,NULL); - fprintf (Gbl.F.Out,"\"%s\"" - "" - "", - Gbl.Prefs.IconsURL,Cfg_ICON_FOLDER_COUNTRIES, - Gbl.Ctys.Lst[NumCty].Alpha2, - Gbl.Ctys.Lst[NumCty].Alpha2, - Gbl.Ctys.Lst[NumCty].Alpha2, - Gbl.Ctys.Lst[NumCty].Name[Gbl.Prefs.Language]); + Cty_DrawCountryMap (&Gbl.Ctys.Lst[NumCty],"COUNTRY_MAP_SMALL"); + fprintf (Gbl.F.Out,"" + ""); } fprintf (Gbl.F.Out,""); @@ -725,6 +706,23 @@ void Cty_ListCountries2 (void) Cty_FreeListCountries (); } +/*****************************************************************************/ +/**************************** Draw institution logo **************************/ +/*****************************************************************************/ + +void Cty_DrawCountryMap (struct Country *Cty,const char *Class) + { + /***** Draw country map *****/ + fprintf (Gbl.F.Out,"\"%s\"", + Gbl.Prefs.IconsURL,Cfg_ICON_FOLDER_COUNTRIES, + Cty->Alpha2, + Cty->Alpha2, + Cty->Alpha2, + Cty->Name[Gbl.Prefs.Language], + Class); + } + /*****************************************************************************/ /********************** Write script for Google Geochart *********************/ /*****************************************************************************/ diff --git a/swad_country.h b/swad_country.h index 31738caa..4f407aee 100644 --- a/swad_country.h +++ b/swad_country.h @@ -78,6 +78,7 @@ void Cty_PrintConfiguration (void); void Cty_ListCountries (void); void Cty_ListCountries1 (void); void Cty_ListCountries2 (void); +void Cty_DrawCountryMap (struct Country *Cty,const char *Class); void Cty_WriteScriptGoogleGeochart (void); void Cty_PutHiddenParamCtyOrderType (void); void Cty_EditCountries (void); diff --git a/swad_course.c b/swad_course.c index 0698c480..d00efbd6 100644 --- a/swad_course.c +++ b/swad_course.c @@ -738,7 +738,7 @@ static void Crs_WriteListMyCoursesToSelectOne (void) Deg_PutParamDegCod (Deg.DegCod); Act_LinkFormSubmit (Act_GetActionTextFromDB (Act_Actions[ActSeeDegInf].ActCod,ActTxt), The_ClassFormul[Gbl.Prefs.Theme]); - Deg_DrawDegreeLogo (Deg.Logo,Deg.ShortName,16,"vertical-align:middle;"); + Deg_DrawDegreeLogo (Deg.Logo,Deg.ShortName,16,NULL); Highlight = (Gbl.CurrentCrs.Crs.CrsCod <= 0 && Gbl.CurrentDeg.Deg.DegCod == Deg.DegCod); if (Highlight) diff --git a/swad_degree.c b/swad_degree.c index 823a1092..74451b15 100644 --- a/swad_degree.c +++ b/swad_degree.c @@ -726,6 +726,7 @@ void Deg_WriteBigNameCtyInsCtrDegCrs (void) { extern const char *The_ClassCourse[The_NUM_THEMES]; char FullName[Deg_MAX_LENGTH_FULL_NAME+1]; // Full name of course / degree + char PathMap[PATH_MAX+1]; if (Gbl.CurrentCty.Cty.CtyCod > 0 || Gbl.CurrentIns.Ins.InsCod > 0 || @@ -742,10 +743,35 @@ void Deg_WriteBigNameCtyInsCtrDegCrs (void) Deg_MAX_LENGTH_FULL_NAME); FullName[Deg_MAX_LENGTH_FULL_NAME] = '\0'; Str_LimitLengthHTMLStr (FullName,Deg_MAX_LENGTH_FULL_NAME_ON_PAGE_HEAD); - fprintf (Gbl.F.Out,"
" - "%s" + 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.CurrentDeg.Deg.DegCod > 0) + Deg_DrawDegreeLogo (Gbl.CurrentDeg.Deg.Logo,Gbl.CurrentDeg.Deg.ShortName,32, + "vertical-align:top; margin-right:8px;"); + else if (Gbl.CurrentCtr.Ctr.CtrCod > 0) + Ctr_DrawCentreLogo (Gbl.CurrentCtr.Ctr.CtrCod,Gbl.CurrentCtr.Ctr.ShortName,32, + "vertical-align:top; margin-right:8px;"); + else if (Gbl.CurrentIns.Ins.InsCod > 0) + Ins_DrawInstitutionLogo (Gbl.CurrentIns.Ins.Logo,Gbl.CurrentIns.Ins.ShortName,32, + "vertical-align:top; margin-right:8px;"); + else if (Gbl.CurrentCty.Cty.CtyCod > 0) + { + sprintf (PathMap,"%s/%s/%s/%s/%s.png", + Cfg_PATH_SWAD_PUBLIC, + Cfg_FOLDER_PUBLIC_ICON, + Cfg_ICON_FOLDER_COUNTRIES, + Gbl.CurrentCty.Cty.Alpha2, + Gbl.CurrentCty.Cty.Alpha2); + if (Fil_CheckIfPathExists (PathMap)) + Cty_DrawCountryMap (&Gbl.CurrentCty.Cty,"COUNTRY_MAP_TITLE"); + } + } + fprintf (Gbl.F.Out,"%s" "
", - The_ClassCourse[Gbl.Prefs.Theme],FullName); + FullName); } }