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

Version19.117

This commit is contained in:
Antonio Cañas Vargas 2020-01-14 13:41:29 +01:00
parent 6b824b23e1
commit 51d1f15358
5 changed files with 3 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
swad_centre.c
View File

@ -396,11 +396,6 @@ static void Ctr_ListOneCentreForSeeing (struct Centre *Ctr,unsigned NumCtr)
HTM_Txt (Plc.ShrtName);
HTM_TD_End ();
/***** Map *****/
HTM_TD_Begin ("class=\"%s CM %s\"",TxtClassNormal,BgColor);
Ctr_FormToGoToMap (Ctr);
HTM_TD_End ();
/***** Number of degrees *****/
HTM_TD_Begin ("class=\"%s RM %s\"",TxtClassNormal,BgColor);
HTM_Unsigned (Deg_GetNumDegsInCtr (Ctr->CtrCod));
@ -1703,7 +1698,6 @@ static void Ctr_PutHeadCentresForSeeing (bool OrderSelectable)
extern const char *Txt_CENTRES_HELP_ORDER[2];
extern const char *Txt_CENTRES_ORDER[2];
extern const char *Txt_Place;
extern const char *Txt_Map;
extern const char *Txt_Degrees_ABBREVIATION;
extern const char *Txt_Courses_ABBREVIATION;
extern const char *Txt_ROLES_PLURAL_BRIEF_Abc[Rol_NUM_ROLES];
@ -1742,7 +1736,6 @@ static void Ctr_PutHeadCentresForSeeing (bool OrderSelectable)
}
HTM_TH (1,1,"LM",Txt_Place);
HTM_TH (1,1,"CM",Txt_Map);
HTM_TH (1,1,"RM",Txt_Degrees_ABBREVIATION);
HTM_TH (1,1,"RM",Txt_Courses_ABBREVIATION);
HTM_TH_Begin (1,1,"RM");

3
swad_changelog.h
View File

@ -494,7 +494,7 @@ enscript -2 --landscape --color --file-align=2 --highlight --line-numbers -o - *
En OpenSWAD:
ps2pdf source.ps destination.pdf
*/
#define Log_PLATFORM_VERSION "SWAD 19.116.3 (2020-01-14)"
#define Log_PLATFORM_VERSION "SWAD 19.117 (2020-01-14)"
#define CSS_FILE "swad19.115.css"
#define JS_FILE "swad19.91.1.js"
/*
@ -503,6 +503,7 @@ ps2pdf source.ps destination.pdf
// TODO: No se puede entrar con DNI '1' suponiendo que no tenga password ¿por qué?
// TODO: Mapas más estrechos en móvil
Version 19.117: Jan 14, 2020 Column map moved in countries, institutions and centres. (? lines)
Version 19.116.3: Jan 14, 2020 Form to go to country map in statistics. (278547 lines)
Version 19.116.2: Jan 14, 2020 Form to go to institution map in statistics. (278529 lines)
Version 19.116.1: Jan 14, 2020 Form to go to centre map in statistics. (278518 lines)

14
swad_country.c
View File

@ -344,7 +344,6 @@ static void Cty_PutHeadCountriesForSeeing (bool OrderSelectable)
{
extern const char *Txt_COUNTRIES_HELP_ORDER[2];
extern const char *Txt_COUNTRIES_ORDER[2];
extern const char *Txt_Map;
extern const char *Txt_Institutions_ABBREVIATION;
extern const char *Txt_Centres_ABBREVIATION;
extern const char *Txt_Degrees_ABBREVIATION;
@ -380,7 +379,6 @@ static void Cty_PutHeadCountriesForSeeing (bool OrderSelectable)
HTM_TH_End ();
}
HTM_TH (1,1,"CM",Txt_Map);
HTM_TH (1,1,"RM",Txt_Institutions_ABBREVIATION);
HTM_TH (1,1,"RM",Txt_Centres_ABBREVIATION);
HTM_TH (1,1,"RM",Txt_Degrees_ABBREVIATION);
@ -400,7 +398,6 @@ static void Cty_PutHeadCountriesForSeeing (bool OrderSelectable)
static void Cty_ListOneCountryForSeeing (struct Country *Cty,unsigned NumCty)
{
extern const char *Txt_Map;
const char *BgColor;
BgColor = (Cty->CtyCod == Gbl.Hierarchy.Cty.CtyCod) ? "LIGHT_BLUE" :
@ -426,17 +423,6 @@ static void Cty_ListOneCountryForSeeing (struct Country *Cty,unsigned NumCty)
HTM_Unsigned (Usr_GetNumUsrsWhoClaimToBelongToCty (Cty));
HTM_TD_End ();
/***** Map *****/
HTM_TD_Begin ("class=\"DAT CM %s\"",BgColor);
if (Cty_GetIfMapIsAvailable (Cty->CtyCod))
{
Cty_EditingCty = Cty; // Used to pass parameter with the code of the country
Lay_PutContextualLinkOnlyIcon (ActSeeCtyInf,NULL,Cty_PutParamGoToCty,
"map-marker-alt.svg",
Txt_Map);
}
HTM_TD_End ();
/***** Other stats *****/
HTM_TD_Begin ("class=\"DAT RM %s\"",BgColor);
HTM_Unsigned (Ins_GetNumInssInCty (Cty->CtyCod));

7
swad_institution.c
View File

@ -411,11 +411,6 @@ static void Ins_ListOneInstitutionForSeeing (struct Instit *Ins,unsigned NumIns)
HTM_Unsigned (Usr_GetNumUsrsWhoClaimToBelongToIns (Ins));
HTM_TD_End ();
/***** Map *****/
HTM_TD_Begin ("class=\"%s CM %s\"",TxtClassNormal,BgColor);
Ins_FormToGoToMap (Ins);
HTM_TD_End ();
/***** Other stats *****/
/* Number of centres in this institution */
HTM_TD_Begin ("class=\"%s RM %s\"",TxtClassNormal,BgColor);
@ -466,7 +461,6 @@ static void Ins_PutHeadInstitutionsForSeeing (bool OrderSelectable)
extern const char *Txt_INSTITUTIONS_HELP_ORDER[2];
extern const char *Txt_INSTITUTIONS_ORDER[2];
extern const char *Txt_ROLES_PLURAL_BRIEF_Abc[Rol_NUM_ROLES];
extern const char *Txt_Map;
extern const char *Txt_Centres_ABBREVIATION;
extern const char *Txt_Degrees_ABBREVIATION;
extern const char *Txt_Courses_ABBREVIATION;
@ -509,7 +503,6 @@ static void Ins_PutHeadInstitutionsForSeeing (bool OrderSelectable)
HTM_TH_End ();
}
HTM_TH (1,1,"CM",Txt_Map);
HTM_TH (1,1,"RM",Txt_Centres_ABBREVIATION);
HTM_TH (1,1,"RM",Txt_Degrees_ABBREVIATION);
HTM_TH (1,1,"RM",Txt_Courses_ABBREVIATION);

2
swad_record.c
View File

@ -2665,7 +2665,7 @@ static void Rec_ShowInstitutionInHead (struct Instit *Ins,bool PutFormLinks)
{
Frm_StartFormGoTo (ActSeeInsInf);
Ins_PutParamInsCod (Ins->InsCod);
HTM_BUTTON_SUBMIT_Begin (Ins->FullName,"BT_LINK REC_HEAD",NULL);
HTM_BUTTON_SUBMIT_Begin (Ins->FullName,"BT_LINK REC_HEAD LM",NULL);
}
HTM_Txt (Ins->FullName);
if (PutFormLinks)