From 8d93f832b17c6a17707702db5e40ac017c7b08d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Thu, 19 Dec 2019 18:03:26 +0100 Subject: [PATCH] Version19.97.3 --- swad_centre.c | 22 ++++++++++++++++++++-- swad_changelog.h | 3 ++- swad_text.c | 21 +++++++++++++++++++++ 3 files changed, 43 insertions(+), 3 deletions(-) diff --git a/swad_centre.c b/swad_centre.c index b1439fe6d..4cbf7a440 100644 --- a/swad_centre.c +++ b/swad_centre.c @@ -1179,6 +1179,7 @@ static void Ctr_PutIconToEditCentres (void) static void Ctr_ListOneCentreForSeeing (struct Centre *Ctr,unsigned NumCtr) { + extern const char *Txt_Map; extern const char *Txt_CENTRE_STATUS[Ctr_NUM_STATUS_TXT]; struct Place Plc; const char *TxtClassNormal; @@ -1226,6 +1227,18 @@ static void Ctr_ListOneCentreForSeeing (struct Centre *Ctr,unsigned NumCtr) HTM_Txt (Plc.ShrtName); HTM_TD_End (); + /***** Place *****/ + HTM_TD_Begin ("class=\"%s CM %s\"",TxtClassNormal,BgColor); + if (Ctr->Coord.Latitude || + Ctr->Coord.Longitude) + { + Ctr_EditingCtr = Ctr; // Used to pass parameter with the code of the centre + Lay_PutContextualLinkOnlyIcon (ActSeeCtrInf,NULL,Ctr_PutParamGoToCtr, + "map-marker-alt.svg", + Txt_Map); + } + HTM_TD_End (); + /***** Number of degrees *****/ HTM_TD_Begin ("class=\"%s RM %s\"",TxtClassNormal,BgColor); HTM_Unsigned (Ctr->Degs.Num); @@ -3018,6 +3031,7 @@ 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]; @@ -3032,12 +3046,15 @@ static void Ctr_PutHeadCentresForSeeing (bool OrderSelectable) Order++) { HTM_TH_Begin (1,1,Order == Ctr_ORDER_BY_CENTRE ? "LM" : - "RM"); + "RM"); if (OrderSelectable) { Frm_StartForm (ActSeeCtr); Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order); - HTM_BUTTON_SUBMIT_Begin (Txt_CENTRES_HELP_ORDER[Order],"BT_LINK TIT_TBL",NULL); + HTM_BUTTON_SUBMIT_Begin (Txt_CENTRES_HELP_ORDER[Order], + Order == Ctr_ORDER_BY_CENTRE ? "BT_LINK LM TIT_TBL" : + "BT_LINK RM TIT_TBL", + NULL); if (Order == Gbl.Hierarchy.Ins.Ctrs.SelectedOrder) HTM_U_Begin (); } @@ -3053,6 +3070,7 @@ 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"); diff --git a/swad_changelog.h b/swad_changelog.h index 3f7ee5b9e..4859c2afd 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -492,7 +492,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.97.2 (2019-12-19)" +#define Log_PLATFORM_VERSION "SWAD 19.97.3 (2019-12-19)" #define CSS_FILE "swad19.97.css" #define JS_FILE "swad19.91.1.js" /* @@ -500,6 +500,7 @@ ps2pdf source.ps destination.pdf // TODO: Impedir la creación y edición de proyectos si no son editables. // TODO: No se puede entrar con DNI '1' suponiendo que no tenga password ¿por qué? + Version 19.97.3: Dec 19, 2019 In list of centres, show link to map. (249847 lines) Version 19.97.2: Dec 19, 2019 Don't show centre map when coordinates are 0. Fixed bug in database installation, reported by José Luis Amador Moreno. (249809 lines) Version 19.97.1: Dec 19, 2019 Fix bug in assignments. (249804 lines) diff --git a/swad_text.c b/swad_text.c index 4bbd579a8..0f2e052c7 100644 --- a/swad_text.c +++ b/swad_text.c @@ -18077,6 +18077,27 @@ const char *Txt_Mandatory_enrolment = // (to a type of group) "Inscrição obrigatória?"; #endif +const char *Txt_Map = +#if L==1 // ca + "Mapa"; +#elif L==2 // de + "Karte"; +#elif L==3 // en + "Map"; +#elif L==4 // es + "Mapa"; +#elif L==5 // fr + "Carte"; +#elif L==6 // gn + "Mapa"; // Okoteve traducción +#elif L==7 // it + "Carta"; +#elif L==8 // pl + "Mapa"; +#elif L==9 // pt + "Mapa"; +#endif + const char *Txt_Mark_all_NOTIFICATIONS_as_read = #if L==1 // ca "Marca totes com llegides";