diff --git a/swad_banner.c b/swad_banner.c index 02cd1cf9..4b3f21eb 100644 --- a/swad_banner.c +++ b/swad_banner.c @@ -357,7 +357,8 @@ static void Ban_GetBannerDataFromRow (MYSQL_RES *mysql_res, static void Ban_PutIconsEditingBanners (__attribute__((unused)) void *Args) { /***** Put icon to view banners *****/ - Ban_PutIconToViewBanners (); + Ico_PutContextualIconToView (ActSeeBan,NULL, + NULL,NULL); /***** Put icon to view links *****/ Lnk_PutIconToViewLinks (); diff --git a/swad_building.c b/swad_building.c index 88459729..8b2ce2ad 100644 --- a/swad_building.c +++ b/swad_building.c @@ -277,18 +277,8 @@ static void Bld_EditBuildingsInternal (void) static void Bld_PutIconsEditingBuildings (__attribute__((unused)) void *Args) { /***** Put icon to view buildings *****/ - Bld_PutIconToViewBuildings (); - } - -/*****************************************************************************/ -/************************ Put icon to view buildings *************************/ -/*****************************************************************************/ - -void Bld_PutIconToViewBuildings (void) - { - Lay_PutContextualLinkOnlyIcon (ActSeeBld,NULL, - NULL,NULL, - "building.svg",Ico_BLACK); + Ico_PutContextualIconToView (ActSeeBld,NULL, + NULL,NULL); } /*****************************************************************************/ diff --git a/swad_building.h b/swad_building.h index 818cc67d..391fbff7 100644 --- a/swad_building.h +++ b/swad_building.h @@ -82,7 +82,6 @@ void Bld_ResetBuildings (struct Bld_Buildings *Buildings); void Bld_SeeBuildings (void); void Bld_EditBuildings (void); -void Bld_PutIconToViewBuildings (void); void Bld_GetListBuildings (struct Bld_Buildings *Buildings, Bld_WhichData_t WhichData); void Bld_FreeListBuildings (struct Bld_Buildings *Buildings); diff --git a/swad_center.c b/swad_center.c index f60b33ac..74b14e8d 100644 --- a/swad_center.c +++ b/swad_center.c @@ -472,7 +472,8 @@ static void Ctr_EditCentersInternal (void) static void Ctr_PutIconsEditingCenters (__attribute__((unused)) void *Args) { /***** Put icon to view centers *****/ - Ctr_PutIconToViewCenters (); + Ico_PutContextualIconToView (ActSeeCtr,NULL, + NULL,NULL); /***** Put icon to view places *****/ Plc_PutIconToViewPlaces (); diff --git a/swad_changelog.h b/swad_changelog.h index 2672ff96..1c7fc384 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -629,10 +629,11 @@ TODO: Emilce Barrera Mesa: Podr TODO: Emilce Barrera Mesa: Mis estudiantes presentan muchas dificultades a la hora de poner la foto porque la plataforma es muy exigente respecto al fondo de la imagen. */ -#define Log_PLATFORM_VERSION "SWAD 22.101.8 (2023-04-20)" +#define Log_PLATFORM_VERSION "SWAD 22.101.9 (2023-04-21)" #define CSS_FILE "swad22.95.css" #define JS_FILE "swad22.49.js" /* + Version 22.101.9: Apr 21, 2023 Changes in edition of countries, links, banners, institutions, centers, places, degrees, degree types, buildings, rooms and courses. (337313 lines) Version 22.101.8: Apr 20, 2023 Changes in edition of rubrics, degree types and departments. (337350 lines) Version 22.101.7: Apr 20, 2023 Changes in edition of exams and games. (337342 lines) Version 22.101.6: Apr 20, 2023 Changes in edition of program items. (337370 lines) diff --git a/swad_country.c b/swad_country.c index f2293b42..81e6917a 100644 --- a/swad_country.c +++ b/swad_country.c @@ -77,7 +77,6 @@ static void Cty_GetParCtyOrder (void); static void Cty_EditCountriesInternal (void); static void Cty_PutIconsEditingCountries (__attribute__((unused)) void *Args); -static void Cty_PutIconToViewCountries (void); static void Cty_ListCountriesForEdition (void); static void Cty_PutParOthCtyCod (void *CtyCod); @@ -718,23 +717,13 @@ static void Cty_EditCountriesInternal (void) static void Cty_PutIconsEditingCountries (__attribute__((unused)) void *Args) { /***** Put icon to view countries *****/ - Cty_PutIconToViewCountries (); + Ico_PutContextualIconToView (ActSeeCty,NULL, + NULL,NULL); /***** Put icon to show a figure *****/ Fig_PutIconToShowFigure (Fig_HIERARCHY); } -/*****************************************************************************/ -/************************ Put icon to view countries *************************/ -/*****************************************************************************/ - -static void Cty_PutIconToViewCountries (void) - { - Lay_PutContextualLinkOnlyIcon (ActSeeCty,NULL, - NULL,NULL, - "globe-americas.svg",Ico_BLACK); - } - /*****************************************************************************/ /********** Get basic list of countries ordered by name of country ***********/ /*****************************************************************************/ diff --git a/swad_course.c b/swad_course.c index 94d167a9..2213606a 100644 --- a/swad_course.c +++ b/swad_course.c @@ -100,7 +100,6 @@ static bool Crs_ListCoursesOfAYearForSeeing (unsigned Year); static void Crs_EditCoursesInternal (void); static void Crs_PutIconsEditingCourses (__attribute__((unused)) void *Args); -static void Crs_PutIconToViewCourses (void); static void Crs_ListCoursesForEdition (void); static void Crs_ListCoursesOfAYearForEdition (unsigned Year); static bool Crs_CheckIfICanEdit (struct Crs_Course *Crs); @@ -1070,24 +1069,14 @@ static void Crs_EditCoursesInternal (void) static void Crs_PutIconsEditingCourses (__attribute__((unused)) void *Args) { - /***** Put icon to view degrees *****/ - Crs_PutIconToViewCourses (); + /***** Put icon to view courses *****/ + Ico_PutContextualIconToView (ActSeeCrs,NULL, + NULL,NULL); /***** Put icon to show a figure *****/ Fig_PutIconToShowFigure (Fig_HIERARCHY); } -/*****************************************************************************/ -/************************* Put icon to view courses **************************/ -/*****************************************************************************/ - -static void Crs_PutIconToViewCourses (void) - { - Lay_PutContextualLinkOnlyIcon (ActSeeCrs,NULL, - NULL,NULL, - "chalkboard-teacher.svg",Ico_BLACK); - } - /*****************************************************************************/ /********************* List current courses for edition **********************/ /*****************************************************************************/ diff --git a/swad_degree.c b/swad_degree.c index 2c7909b5..8fa06dbe 100644 --- a/swad_degree.c +++ b/swad_degree.c @@ -931,7 +931,8 @@ static void Deg_EditDegreesInternal (void) static void Deg_PutIconsEditingDegrees (__attribute__((unused)) void *Args) { /***** Put icon to view degrees *****/ - Deg_PutIconToViewDegrees (); + Ico_PutContextualIconToView (ActSeeDeg,NULL, + NULL,NULL); /***** Put icon to view types of degree *****/ DegTyp_PutIconToViewDegreeTypes (); diff --git a/swad_degree_type.c b/swad_degree_type.c index b7f8c30c..b55d1d2a 100644 --- a/swad_degree_type.c +++ b/swad_degree_type.c @@ -297,7 +297,8 @@ static void DegTyp_EditDegreeTypesInternal (const struct DegTyp_DegTypes *DegTyp static void DegTyp_PutIconsEditingDegreeTypes (__attribute__((unused)) void *Args) { /***** Put icon to view degree types *****/ - DegTyp_PutIconToViewDegreeTypes (); + Ico_PutContextualIconToView (ActSeeDegTyp,NULL, + NULL,NULL); /***** Put icon to view degrees *****/ Deg_PutIconToViewDegrees (); diff --git a/swad_holiday.c b/swad_holiday.c index 94a92795..ba92f726 100644 --- a/swad_holiday.c +++ b/swad_holiday.c @@ -254,8 +254,9 @@ static void Hld_PutIconsSeeHolidays (__attribute__((unused)) void *Args) static void Hld_PutIconsEditHolidays (__attribute__((unused)) void *Args) { - /***** See holidays *****/ - Hld_PutIconToSeeHlds (); + /***** Put icon to view holidays *****/ + Ico_PutContextualIconToView (ActSeeHld,NULL, + NULL,NULL); /***** View calendar *****/ Cal_PutIconToSeeCalendar (); diff --git a/swad_institution.c b/swad_institution.c index 0eebef62..46edf705 100644 --- a/swad_institution.c +++ b/swad_institution.c @@ -83,7 +83,6 @@ static void Ins_GetParInsOrder (void); static void Ins_EditInstitutionsInternal (void); static void Ins_PutIconsEditingInstitutions (__attribute__((unused)) void *Args); -static void Ins_PutIconToViewInstitutions (void); static void Ins_GetInstitDataFromRow (MYSQL_RES *mysql_res, struct Ins_Instit *Ins, @@ -562,23 +561,13 @@ static void Ins_EditInstitutionsInternal (void) static void Ins_PutIconsEditingInstitutions (__attribute__((unused)) void *Args) { /***** Put icon to view institutions *****/ - Ins_PutIconToViewInstitutions (); + Ico_PutContextualIconToView (ActSeeIns,NULL, + NULL,NULL); /***** Put icon to show a figure *****/ Fig_PutIconToShowFigure (Fig_INSTITS); } -/*****************************************************************************/ -/*********************** Put icon to view institutions ***********************/ -/*****************************************************************************/ - -static void Ins_PutIconToViewInstitutions (void) - { - Lay_PutContextualLinkOnlyIcon (ActSeeIns,NULL, - NULL,NULL, - "university.svg",Ico_BLACK); - } - /*****************************************************************************/ /******* Get basic list of institutions ordered by name of institution *******/ /*****************************************************************************/ diff --git a/swad_link.c b/swad_link.c index 9b60b625..f359eeff 100644 --- a/swad_link.c +++ b/swad_link.c @@ -276,7 +276,8 @@ static void Lnk_EditLinksInternal (void) static void Lnk_PutIconsEditingLinks (__attribute__((unused)) void *Args) { /***** Put icon to view links *****/ - Lnk_PutIconToViewLinks (); + Ico_PutContextualIconToView (ActSeeLnk,NULL, + NULL,NULL); /***** Put icon to view banners *****/ Ban_PutIconToViewBanners (); diff --git a/swad_place.c b/swad_place.c index d6778f7e..237ec986 100644 --- a/swad_place.c +++ b/swad_place.c @@ -321,7 +321,8 @@ static void Plc_EditPlacesInternal (void) static void Plc_PutIconsEditingPlaces (__attribute__((unused)) void *Args) { /***** Put icon to view places *****/ - Plc_PutIconToViewPlaces (); + Ico_PutContextualIconToView (ActSeePlc,NULL, + NULL,NULL); /***** Put icon to view centers *****/ Ctr_PutIconToViewCenters (); diff --git a/swad_room.c b/swad_room.c index 63c88dde..b8e65c60 100644 --- a/swad_room.c +++ b/swad_room.c @@ -462,18 +462,8 @@ static void Roo_EditRoomsInternal (void) static void Roo_PutIconsEditingRooms (__attribute__((unused)) void *Args) { /***** Put icon to view rooms *****/ - Roo_PutIconToViewRooms (); - } - -/*****************************************************************************/ -/************************** Put icon to view rooms ***************************/ -/*****************************************************************************/ - -void Roo_PutIconToViewRooms (void) - { - Lay_PutContextualLinkOnlyIcon (ActSeeRoo,NULL, - NULL,NULL, - "chalkboard-teacher.svg",Ico_BLACK); + Ico_PutContextualIconToView (ActSeeRoo,NULL, + NULL,NULL); } /*****************************************************************************/ diff --git a/swad_room.h b/swad_room.h index c2c1b167..5784475e 100644 --- a/swad_room.h +++ b/swad_room.h @@ -124,7 +124,6 @@ void Roo_ResetRooms (struct Roo_Rooms *Rooms); void Roo_SeeRooms (void); void Roo_ChangeMAC (void); void Roo_EditRooms (void); -void Roo_PutIconToViewRooms (void); void Roo_GetListRooms (struct Roo_Rooms *Rooms,Roo_WhichData_t WhichData); void Roo_FreeListRooms (struct Roo_Rooms *Rooms);