diff --git a/swad_centre.c b/swad_centre.c index 3f987d2db..4ce919624 100644 --- a/swad_centre.c +++ b/swad_centre.c @@ -1032,7 +1032,6 @@ static void Ctr_PutIconsEditingCentres (void) void Ctr_PutIconToViewCentres (void) { - // Ico_PutContextualIconToView (ActSeeCtr,NULL); extern const char *Txt_Centres; Lay_PutContextualLink (ActSeeCtr,NULL,NULL, diff --git a/swad_changelog.h b/swad_changelog.h index 7f0e90faa..2c7899e41 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -348,10 +348,11 @@ En OpenSWAD: ps2pdf source.ps destination.pdf */ -#define Log_PLATFORM_VERSION "SWAD 18.17.3 (2018-11-15)" +#define Log_PLATFORM_VERSION "SWAD 18.17.4 (2018-11-15)" #define CSS_FILE "swad18.4.css" #define JS_FILE "swad17.17.1.js" /* + Version 18.17.4: Nov 15, 2018 Changes in contextual icons related to places. (236936 lines) Version 18.17.3: Nov 15, 2018 Changes in contextual icons related to centres. (236934 lines) Version 18.17.2: Nov 15, 2018 Icon to view centres in box with info about places. (236917 lines) Version 18.17.1: Nov 15, 2018 Icon to view places in box with info about institution. (236900 lines) diff --git a/swad_institution.c b/swad_institution.c index 26e1d8a47..7d162243e 100644 --- a/swad_institution.c +++ b/swad_institution.c @@ -962,7 +962,6 @@ void Ins_EditInstitutions (void) static void Ins_PutIconToViewInstitutions (void) { - //Ico_PutContextualIconToView (ActSeeIns,NULL); extern const char *Txt_Institutions; Lay_PutContextualLink (ActSeeIns,NULL,NULL, diff --git a/swad_place.c b/swad_place.c index 55850b2ab..a27739e90 100644 --- a/swad_place.c +++ b/swad_place.c @@ -67,7 +67,7 @@ static void Plc_GetParamPlcOrder (void); static bool Plc_CheckIfICanCreatePlaces (void); static void Plc_PutIconsListingPlaces (void); static void Plc_PutIconToEditPlaces (void); -static void Plc_PutIconToViewPlacesWhenEditing (void); +static void Plc_PutIconsEditingPlaces (void); static void Plc_ListPlacesForEdition (void); static void Plc_PutParamPlcCod (long PlcCod); @@ -80,20 +80,6 @@ static void Plc_PutFormToCreatePlace (void); static void Plc_PutHeadPlaces (void); static void Plc_CreatePlace (struct Place *Plc); -/*****************************************************************************/ -/************************** Put icon to view places **************************/ -/*****************************************************************************/ - -void Plc_PutIconToViewPlaces (void) - { - extern const char *Txt_Places; - - Lay_PutContextualLink (ActSeePlc,NULL,NULL, - "mapmarker64x64.png", - Txt_Places,NULL, - NULL); - } - /*****************************************************************************/ /*************************** List all the places *****************************/ /*****************************************************************************/ @@ -273,7 +259,7 @@ void Plc_EditPlaces (void) Plc_GetListPlaces (); /***** Start box *****/ - Box_StartBox (NULL,Txt_Places,Plc_PutIconToViewPlacesWhenEditing, + Box_StartBox (NULL,Txt_Places,Plc_PutIconsEditingPlaces, Hlp_INSTITUTION_Places_edit,Box_NOT_CLOSABLE); /***** Put a form to create a new place *****/ @@ -290,13 +276,33 @@ void Plc_EditPlaces (void) Plc_FreeListPlaces (); } + /*****************************************************************************/ /**************** Put contextual icons in edition of places *****************/ /*****************************************************************************/ -static void Plc_PutIconToViewPlacesWhenEditing (void) +static void Plc_PutIconsEditingPlaces (void) { - Ico_PutContextualIconToView (ActSeePlc,NULL); + /***** Put icon to view places *****/ + Plc_PutIconToViewPlaces (); + + /***** Put icon to view centres *****/ + Ctr_PutIconToViewCentres (); + } + + +/*****************************************************************************/ +/************************** Put icon to view places **************************/ +/*****************************************************************************/ + +void Plc_PutIconToViewPlaces (void) + { + extern const char *Txt_Places; + + Lay_PutContextualLink (ActSeePlc,NULL,NULL, + "mapmarker64x64.png", + Txt_Places,NULL, + NULL); } /*****************************************************************************/ diff --git a/swad_place.h b/swad_place.h index c7a6a23a3..7c07c0abc 100644 --- a/swad_place.h +++ b/swad_place.h @@ -58,9 +58,9 @@ typedef enum /***************************** Public prototypes *****************************/ /*****************************************************************************/ -void Plc_PutIconToViewPlaces (void); void Plc_SeePlaces (void); void Plc_EditPlaces (void); +void Plc_PutIconToViewPlaces (void); void Plc_GetListPlaces (void); void Plc_FreeListPlaces (void); void Plc_GetDataOfPlaceByCod (struct Place *Plc);