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 14.55.2

This commit is contained in:
Antonio Cañas Vargas 2015-01-16 01:28:42 +01:00
parent 312071c792
commit 8ec7f5334f
7 changed files with 72 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
css/swad_desktop.css
View File

@ -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;

6
css/swad_mobile.css
View File

@ -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;

3
swad_changelog.h
View File

@ -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:

56
swad_country.c
View File

@ -149,17 +149,11 @@ void Cty_SeeCtyWithPendingInss (void)
fprintf (Gbl.F.Out,"<tr>"
"<td style=\"text-align:center;"
" vertical-align:middle; background-color:%s;\">"
"<a href=\"%s\" target=\"_blank\">"
"<img src=\"%s/%s/%s/%s.png\" class=\"COUNTRY_MAP_SMALL\""
" alt=\"%s\" title=\"%s\" />"
"</a>"
"</td>",
BgColor,Cty.WWW[Gbl.Prefs.Language],
Gbl.Prefs.IconsURL,Cfg_ICON_FOLDER_COUNTRIES,
Cty.Alpha2,
Cty.Alpha2,
Cty.Alpha2,
Cty.Name[Gbl.Prefs.Language]);
"<a href=\"%s\" target=\"_blank\">",
BgColor,Cty.WWW[Gbl.Prefs.Language]);
Cty_DrawCountryMap (&Cty,"COUNTRY_MAP_SMALL");
fprintf (Gbl.F.Out,"</a>"
"</td>");
/* Country name */
fprintf (Gbl.F.Out,"<td class=\"DAT\" style=\"text-align:left;"
@ -279,15 +273,8 @@ static void Cty_Configuration (bool PrintView)
if (PutLink)
fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\">",
Gbl.CurrentCty.Cty.WWW[Gbl.Prefs.Language]);
fprintf (Gbl.F.Out,"<img src=\"%s/%s/%s/%s.png\" class=\"%s\""
" alt=\"%s\" title=\"%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,"</a>");
fprintf (Gbl.F.Out,"</td>"
@ -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,"<img src=\"%s/%s/%s/%s.png\" class=\"COUNTRY_MAP_SMALL\""
" alt=\"%s\" title=\"%s\" />"
"</a>"
"</form>",
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,"</a>"
"</form>");
}
fprintf (Gbl.F.Out,"</td>");
@ -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,"<img src=\"%s/%s/%s/%s.png\" alt=\"%s\" title=\"%s\""
" class=\"%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 *********************/
/*****************************************************************************/

1
swad_country.h
View File

@ -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);

2
swad_course.c
View File

@ -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)

32
swad_degree.c
View File

@ -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,"<div class=\"%s\">"
"%s"
fprintf (Gbl.F.Out,"<div class=\"%s\">",
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"
"</div>",
The_ClassCourse[Gbl.Prefs.Theme],FullName);
FullName);
}
}