mirror of
https://github.com/acanas/swad-core.git
synced 2024-09-22 00:00:40 +02:00
Version19.97.3
This commit is contained in:
parent
663d5ff8ac
commit
8d93f832b1
|
@ -1179,6 +1179,7 @@ static void Ctr_PutIconToEditCentres (void)
|
||||||
|
|
||||||
static void Ctr_ListOneCentreForSeeing (struct Centre *Ctr,unsigned NumCtr)
|
static void Ctr_ListOneCentreForSeeing (struct Centre *Ctr,unsigned NumCtr)
|
||||||
{
|
{
|
||||||
|
extern const char *Txt_Map;
|
||||||
extern const char *Txt_CENTRE_STATUS[Ctr_NUM_STATUS_TXT];
|
extern const char *Txt_CENTRE_STATUS[Ctr_NUM_STATUS_TXT];
|
||||||
struct Place Plc;
|
struct Place Plc;
|
||||||
const char *TxtClassNormal;
|
const char *TxtClassNormal;
|
||||||
|
@ -1226,6 +1227,18 @@ static void Ctr_ListOneCentreForSeeing (struct Centre *Ctr,unsigned NumCtr)
|
||||||
HTM_Txt (Plc.ShrtName);
|
HTM_Txt (Plc.ShrtName);
|
||||||
HTM_TD_End ();
|
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 *****/
|
/***** Number of degrees *****/
|
||||||
HTM_TD_Begin ("class=\"%s RM %s\"",TxtClassNormal,BgColor);
|
HTM_TD_Begin ("class=\"%s RM %s\"",TxtClassNormal,BgColor);
|
||||||
HTM_Unsigned (Ctr->Degs.Num);
|
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_HELP_ORDER[2];
|
||||||
extern const char *Txt_CENTRES_ORDER[2];
|
extern const char *Txt_CENTRES_ORDER[2];
|
||||||
extern const char *Txt_Place;
|
extern const char *Txt_Place;
|
||||||
|
extern const char *Txt_Map;
|
||||||
extern const char *Txt_Degrees_ABBREVIATION;
|
extern const char *Txt_Degrees_ABBREVIATION;
|
||||||
extern const char *Txt_Courses_ABBREVIATION;
|
extern const char *Txt_Courses_ABBREVIATION;
|
||||||
extern const char *Txt_ROLES_PLURAL_BRIEF_Abc[Rol_NUM_ROLES];
|
extern const char *Txt_ROLES_PLURAL_BRIEF_Abc[Rol_NUM_ROLES];
|
||||||
|
@ -3032,12 +3046,15 @@ static void Ctr_PutHeadCentresForSeeing (bool OrderSelectable)
|
||||||
Order++)
|
Order++)
|
||||||
{
|
{
|
||||||
HTM_TH_Begin (1,1,Order == Ctr_ORDER_BY_CENTRE ? "LM" :
|
HTM_TH_Begin (1,1,Order == Ctr_ORDER_BY_CENTRE ? "LM" :
|
||||||
"RM");
|
"RM");
|
||||||
if (OrderSelectable)
|
if (OrderSelectable)
|
||||||
{
|
{
|
||||||
Frm_StartForm (ActSeeCtr);
|
Frm_StartForm (ActSeeCtr);
|
||||||
Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order);
|
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)
|
if (Order == Gbl.Hierarchy.Ins.Ctrs.SelectedOrder)
|
||||||
HTM_U_Begin ();
|
HTM_U_Begin ();
|
||||||
}
|
}
|
||||||
|
@ -3053,6 +3070,7 @@ static void Ctr_PutHeadCentresForSeeing (bool OrderSelectable)
|
||||||
}
|
}
|
||||||
|
|
||||||
HTM_TH (1,1,"LM",Txt_Place);
|
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_Degrees_ABBREVIATION);
|
||||||
HTM_TH (1,1,"RM",Txt_Courses_ABBREVIATION);
|
HTM_TH (1,1,"RM",Txt_Courses_ABBREVIATION);
|
||||||
HTM_TH_Begin (1,1,"RM");
|
HTM_TH_Begin (1,1,"RM");
|
||||||
|
|
|
@ -492,7 +492,7 @@ enscript -2 --landscape --color --file-align=2 --highlight --line-numbers -o - *
|
||||||
En OpenSWAD:
|
En OpenSWAD:
|
||||||
ps2pdf source.ps destination.pdf
|
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 CSS_FILE "swad19.97.css"
|
||||||
#define JS_FILE "swad19.91.1.js"
|
#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: 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é?
|
// 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.
|
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)
|
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)
|
Version 19.97.1: Dec 19, 2019 Fix bug in assignments. (249804 lines)
|
||||||
|
|
21
swad_text.c
21
swad_text.c
|
@ -18077,6 +18077,27 @@ const char *Txt_Mandatory_enrolment = // (to a type of group)
|
||||||
"Inscrição obrigatória?";
|
"Inscrição obrigatória?";
|
||||||
#endif
|
#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 =
|
const char *Txt_Mark_all_NOTIFICATIONS_as_read =
|
||||||
#if L==1 // ca
|
#if L==1 // ca
|
||||||
"Marca totes com llegides";
|
"Marca totes com llegides";
|
||||||
|
|
Loading…
Reference in New Issue
Block a user