diff --git a/swad_calendar.c b/swad_calendar.c index 116b5e39b..ccb54da6a 100644 --- a/swad_calendar.c +++ b/swad_calendar.c @@ -320,7 +320,7 @@ static void Cal_PutIconsCalendar (__attribute__((unused)) void *Args) /************************** Put icon to see calendar *************************/ /*****************************************************************************/ -void Cal_PutIconToSeeCalendar (__attribute__((unused)) void *Args) +void Cal_PutIconToSeeCalendar (void) { Lay_PutContextualLinkOnlyIcon (ActSeeCal,NULL, NULL,NULL, diff --git a/swad_calendar.h b/swad_calendar.h index b65e2de2d..15c92e0c3 100644 --- a/swad_calendar.h +++ b/swad_calendar.h @@ -50,7 +50,7 @@ void Cal_DrawCurrentMonth (void); void Cal_ShowCalendar (void); void Cal_PrintCalendar (void); -void Cal_PutIconToSeeCalendar (__attribute__((unused)) void *Args); +void Cal_PutIconToSeeCalendar (void); //-------------------------------- Figures ------------------------------------ void Cal_GetAndShowNumUsrsPerFirstDayOfWeek (void); diff --git a/swad_changelog.h b/swad_changelog.h index e01228010..219569d64 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -633,6 +633,7 @@ TODO: Emilce Barrera Mesa: Mis estudiantes presentan muchas dificultades a la ho #define CSS_FILE "swad22.95.css" #define JS_FILE "swad22.49.js" /* + Version 22.101.2: Apr 20, 2023 Changes in edition of places and holidays. (337345 lines) Version 22.101.1: Apr 20, 2023 Changes in edition of holidays. (337338 lines) Version 22.101: Apr 20, 2023 Removed buttons to create new elements: a new place, new holiday, new link, new banner, new plugin, new building, new room, new program item, new assignment, new project, new call for exam, new question, new exam, new set of questions, new exam session, new game, new match, new rubric, new criterion, new group, new type of group, new attendance event, new record field, new announcement, new notice, new message, new forum thread, new forum post, new survey, new survey question, new agenda event, new email domain. (337332 lines) Version 22.100.4: Apr 19, 2023 Removed buttons to create a new institution, new center, new degree and new course. (338756 lines) diff --git a/swad_holiday.c b/swad_holiday.c index 3602238ec..94a927955 100644 --- a/swad_holiday.c +++ b/swad_holiday.c @@ -73,6 +73,7 @@ static struct Hld_Holiday *Hld_EditingHld = NULL; // Static variable to keep the static Hld_Order_t Hld_GetParHldOrder (void); static void Hld_PutIconsSeeHolidays (__attribute__((unused)) void *Args); +static void Hld_PutIconsEditHolidays (__attribute__((unused)) void *Args); static void Hld_EditHolidaysInternal (void); @@ -242,13 +243,22 @@ static Hld_Order_t Hld_GetParHldOrder (void) static void Hld_PutIconsSeeHolidays (__attribute__((unused)) void *Args) { - /***** Edit holidays calendar *****/ + /***** Edit holidays *****/ if (Hld_ICanEditHlds[Gbl.Usrs.Me.Role.Logged]) Ico_PutContextualIconToEdit (ActEdiHld,NULL, NULL,NULL); /***** View calendar *****/ - Cal_PutIconToSeeCalendar (NULL); + Cal_PutIconToSeeCalendar (); + } + +static void Hld_PutIconsEditHolidays (__attribute__((unused)) void *Args) + { + /***** See holidays *****/ + Hld_PutIconToSeeHlds (); + + /***** View calendar *****/ + Cal_PutIconToSeeCalendar (); } /*****************************************************************************/ @@ -488,8 +498,9 @@ static void Hld_ListHolidaysForEdition (const struct Hld_Holidays *Holidays, /***** Begin box *****/ Box_BoxBegin (NULL,Txt_Holidays, - Cal_PutIconToSeeCalendar,NULL, - Hlp_INSTITUTION_Holidays_edit,Box_NOT_CLOSABLE); + Hld_PutIconsEditHolidays,NULL, + // Cal_PutIconToSeeCalendar,NULL, + Hlp_INSTITUTION_Holidays_edit,Box_NOT_CLOSABLE); /***** Put a form to create a new holiday *****/ Hld_PutFormToCreateHoliday (Places); @@ -873,7 +884,6 @@ void Hld_ContEditAfterChgHld (void) static void Hld_PutFormToCreateHoliday (const struct Plc_Places *Places) { extern const char *Txt_All_places; - extern const char *Txt_Holiday; extern const char *Txt_Place; extern const char *Txt_Type; extern const char *Txt_START_END_TIME[Dat_NUM_START_END_TIME]; @@ -890,7 +900,7 @@ static void Hld_PutFormToCreateHoliday (const struct Plc_Places *Places) Frm_BeginForm (ActNewHld); /***** Begin box and table *****/ - Box_BoxTableBegin (NULL,Txt_Holiday, + Box_BoxTableBegin (NULL,NULL, NULL,NULL, NULL,Box_NOT_CLOSABLE,2); diff --git a/swad_link.c b/swad_link.c index dfaa5052e..be409d7fe 100644 --- a/swad_link.c +++ b/swad_link.c @@ -671,7 +671,6 @@ void Lnk_ContEditAfterChgLnk (void) static void Lnk_PutFormToCreateLink (void) { - extern const char *Hlp_SYSTEM_Links_edit; extern const char *Txt_Link; extern const char *Txt_Create_link; @@ -681,7 +680,7 @@ static void Lnk_PutFormToCreateLink (void) /***** Begin box and table *****/ Box_BoxTableBegin (NULL,Txt_Link, NULL,NULL, - Hlp_SYSTEM_Links_edit,Box_NOT_CLOSABLE,2); + NULL,Box_NOT_CLOSABLE,2); /***** Write heading *****/ Lnk_PutHeadLinks (); diff --git a/swad_place.c b/swad_place.c index ad5eb12b1..d6778f7e9 100644 --- a/swad_place.c +++ b/swad_place.c @@ -681,14 +681,13 @@ void Plc_ContEditAfterChgPlc (void) static void Plc_PutFormToCreatePlace (void) { - extern const char *Txt_Place; extern const char *Txt_Create_place; /***** Begin form *****/ Frm_BeginForm (ActNewPlc); /***** Begin box and table *****/ - Box_BoxTableBegin (NULL,Txt_Place, + Box_BoxTableBegin (NULL,NULL, NULL,NULL, NULL,Box_NOT_CLOSABLE,2);