diff --git a/swad_agenda.c b/swad_agenda.c index 7b005b185..3e9bf797a 100644 --- a/swad_agenda.c +++ b/swad_agenda.c @@ -58,9 +58,9 @@ extern struct Globals Gbl; #define Agd_NUM_AGENDA_TYPES 4 typedef enum { - Agd_USR_AGENDA_NOW, + Agd_USR_AGENDA_TODAY, Agd_USR_AGENDA, - Agd_MY_AGENDA_NOW, + Agd_MY_AGENDA_TODAY, Agd_MY_AGENDA, } Agd_AgendaType_t; @@ -147,7 +147,7 @@ void Agd_ShowUsrAgendaAfterLogIn (void) Hlp_PROFILE_Agenda); // TODO: Change /***** Show the current events in the user's agenda *****/ - Agd_ShowEventsNow (Agd_USR_AGENDA_NOW); + Agd_ShowEventsNow (Agd_USR_AGENDA_TODAY); /***** Show all the visible events in the user's agenda *****/ Agd_ShowEvents (Agd_USR_AGENDA); @@ -188,7 +188,7 @@ void Agd_ShowUsrAgenda (void) Hlp_PROFILE_Agenda); // TODO: Change /***** Show the current events in the user's agenda *****/ - Agd_ShowEventsNow (Agd_USR_AGENDA_NOW); + Agd_ShowEventsNow (Agd_USR_AGENDA_TODAY); /***** Show all the visible events in the user's agenda *****/ Agd_ShowEvents (Agd_USR_AGENDA); @@ -237,8 +237,7 @@ void Agd_ShowMyAgenda (void) Act_FormEnd (); /***** Show the current events in the user's agenda *****/ - if (Gbl.Agenda.WhichEvents == Agd_ONLY_PUBLIC_EVENTS) - Agd_ShowEventsNow (Agd_MY_AGENDA_NOW); + Agd_ShowEventsNow (Agd_MY_AGENDA_TODAY); /***** Show all my events *****/ Agd_ShowEvents (Agd_MY_AGENDA); @@ -323,7 +322,7 @@ static void Agd_ShowEvents (Agd_AgendaType_t AgendaType) static void Agd_ShowEventsNow (Agd_AgendaType_t AgendaType) { extern const char *Hlp_PROFILE_Agenda; - extern const char *Txt_Now; + extern const char *Txt_Today; extern const char *Txt_Public_agenda_USER; extern const char *Txt_My_agenda; extern const char *Txt_No_events; @@ -338,9 +337,9 @@ static void Agd_ShowEventsNow (Agd_AgendaType_t AgendaType) if (Gbl.Agenda.Num) { /***** Start frame *****/ - Lay_StartRoundFrameTable (NULL,Txt_Now, - NULL, - Hlp_PROFILE_Agenda,2); // TODO: Change + Lay_StartRoundFrameTableShadow (NULL,Txt_Today, + NULL, + Hlp_PROFILE_Agenda,2); // TODO: Change /***** Table head *****/ Agd_WriteHeaderListEvents (AgendaType); @@ -380,12 +379,12 @@ static void Agd_WriteHeaderListEvents (Agd_AgendaType_t AgendaType) fprintf (Gbl.F.Out,"