Marown/swad-core
Marown/swad-core
1
0
Fork 0
mirror of https://github.com/acanas/swad-core.git synced 2024-06-01 06:15:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Version 18.17.4

Browse Source
This commit is contained in:
Antonio Cañas Vargas 2018-11-15 10:41:11 +01:00
parent 2e0793108c
commit e3eae36a28
5 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
swad_centre.c
View File

@ -1032,7 +1032,6 @@ static void Ctr_PutIconsEditingCentres (void)
void Ctr_PutIconToViewCentres (void) void Ctr_PutIconToViewCentres (void)
{ {
// Ico_PutContextualIconToView (ActSeeCtr,NULL);
extern const char *Txt_Centres; extern const char *Txt_Centres;
Lay_PutContextualLink (ActSeeCtr,NULL,NULL, Lay_PutContextualLink (ActSeeCtr,NULL,NULL,

3
swad_changelog.h
View File

@ -348,10 +348,11 @@ En OpenSWAD:
ps2pdf source.ps destination.pdf 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 CSS_FILE "swad18.4.css"
#define JS_FILE "swad17.17.1.js" #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.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.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) Version 18.17.1: Nov 15, 2018 Icon to view places in box with info about institution. (236900 lines)

1
swad_institution.c
View File

@ -962,7 +962,6 @@ void Ins_EditInstitutions (void)
static void Ins_PutIconToViewInstitutions (void) static void Ins_PutIconToViewInstitutions (void)
{ {
//Ico_PutContextualIconToView (ActSeeIns,NULL);
extern const char *Txt_Institutions; extern const char *Txt_Institutions;
Lay_PutContextualLink (ActSeeIns,NULL,NULL, Lay_PutContextualLink (ActSeeIns,NULL,NULL,

42
swad_place.c
View File

@ -67,7 +67,7 @@ static void Plc_GetParamPlcOrder (void);
static bool Plc_CheckIfICanCreatePlaces (void); static bool Plc_CheckIfICanCreatePlaces (void);
static void Plc_PutIconsListingPlaces (void); static void Plc_PutIconsListingPlaces (void);
static void Plc_PutIconToEditPlaces (void); static void Plc_PutIconToEditPlaces (void);
static void Plc_PutIconToViewPlacesWhenEditing (void); static void Plc_PutIconsEditingPlaces (void);
static void Plc_ListPlacesForEdition (void); static void Plc_ListPlacesForEdition (void);
static void Plc_PutParamPlcCod (long PlcCod); static void Plc_PutParamPlcCod (long PlcCod);
@ -80,20 +80,6 @@ static void Plc_PutFormToCreatePlace (void);
static void Plc_PutHeadPlaces (void); static void Plc_PutHeadPlaces (void);
static void Plc_CreatePlace (struct Place *Plc); 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 *****************************/ /*************************** List all the places *****************************/
/*****************************************************************************/ /*****************************************************************************/
@ -273,7 +259,7 @@ void Plc_EditPlaces (void)
Plc_GetListPlaces (); Plc_GetListPlaces ();
/***** Start box *****/ /***** Start box *****/
Box_StartBox (NULL,Txt_Places,Plc_PutIconToViewPlacesWhenEditing, Box_StartBox (NULL,Txt_Places,Plc_PutIconsEditingPlaces,
Hlp_INSTITUTION_Places_edit,Box_NOT_CLOSABLE); Hlp_INSTITUTION_Places_edit,Box_NOT_CLOSABLE);
/***** Put a form to create a new place *****/ /***** Put a form to create a new place *****/
@ -290,13 +276,33 @@ void Plc_EditPlaces (void)
Plc_FreeListPlaces (); Plc_FreeListPlaces ();
} }
/*****************************************************************************/ /*****************************************************************************/
/**************** Put contextual icons in edition of places *****************/ /**************** 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);
} }
/*****************************************************************************/ /*****************************************************************************/

2
swad_place.h
View File

@ -58,9 +58,9 @@ typedef enum
/***************************** Public prototypes *****************************/ /***************************** Public prototypes *****************************/
/*****************************************************************************/ /*****************************************************************************/
void Plc_PutIconToViewPlaces (void);
void Plc_SeePlaces (void); void Plc_SeePlaces (void);
void Plc_EditPlaces (void); void Plc_EditPlaces (void);
void Plc_PutIconToViewPlaces (void);
void Plc_GetListPlaces (void); void Plc_GetListPlaces (void);
void Plc_FreeListPlaces (void); void Plc_FreeListPlaces (void);
void Plc_GetDataOfPlaceByCod (struct Place *Plc); void Plc_GetDataOfPlaceByCod (struct Place *Plc);