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

Version 18.17.2

Browse Source
This commit is contained in:
Antonio Cañas Vargas 2018-11-15 10:13:53 +01:00
parent 6030b3bb32
commit 07ed9df103
4 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
swad_centre.c
View File

@ -94,7 +94,6 @@ static void Ctr_ListOneCentreForSeeing (struct Centre *Ctr,unsigned NumCtr);
static void Ctr_GetParamCtrOrder (void); static void Ctr_GetParamCtrOrder (void);
static void Ctr_PutIconsEditingCentres (void); static void Ctr_PutIconsEditingCentres (void);
static void Ctr_PutIconToViewCentres (void);
static void Ctr_GetPhotoAttribution (long CtrCod,char **PhotoAttribution); static void Ctr_GetPhotoAttribution (long CtrCod,char **PhotoAttribution);
static void Ctr_FreePhotoAttribution (char **PhotoAttribution); static void Ctr_FreePhotoAttribution (char **PhotoAttribution);
@ -1024,9 +1023,15 @@ static void Ctr_PutIconsEditingCentres (void)
Plc_PutIconToViewPlaces (); Plc_PutIconToViewPlaces ();
} }
static void Ctr_PutIconToViewCentres (void) void Ctr_PutIconToViewCentres (void)
{ {
Ico_PutContextualIconToView (ActSeeCtr,NULL); // Ico_PutContextualIconToView (ActSeeCtr,NULL);
extern const char *Txt_Centres;
Lay_PutContextualLink (ActSeeCtr,NULL,NULL,
"ctr64x64.gif",
Txt_Centres,NULL,
NULL);
} }
/*****************************************************************************/ /*****************************************************************************/

3
swad_centre.h
View File

@ -97,6 +97,9 @@ void Ctr_PrintConfiguration (void);
void Ctr_ShowCtrsOfCurrentIns (void); void Ctr_ShowCtrsOfCurrentIns (void);
void Ctr_EditCentres (void); void Ctr_EditCentres (void);
void Ctr_PutIconToViewCentres (void);
void Ctr_GetListCentres (long InsCod); void Ctr_GetListCentres (long InsCod);
bool Ctr_GetDataOfCentreByCod (struct Centre *Ctr); bool Ctr_GetDataOfCentreByCod (struct Centre *Ctr);
long Ctr_GetInsCodOfCentreByCod (long CtrCod); long Ctr_GetInsCodOfCentreByCod (long CtrCod);

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.1 (2018-11-15)" #define Log_PLATFORM_VERSION "SWAD 18.17.2 (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.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)
Version 18.17: Nov 14, 2018 Code refactoring related to database queries. (236899 lines) Version 18.17: Nov 14, 2018 Code refactoring related to database queries. (236899 lines)
Version 18.16.3: Nov 14, 2018 Fixed bug when copying-pasting on assignments/works of another user, reported by Javier Fernández Baldomero. (236890 lines) Version 18.16.3: Nov 14, 2018 Fixed bug when copying-pasting on assignments/works of another user, reported by Javier Fernández Baldomero. (236890 lines)

20
swad_place.c
View File

@ -64,8 +64,11 @@ extern struct Globals Gbl;
/*****************************************************************************/ /*****************************************************************************/
static void Plc_GetParamPlcOrder (void); static void Plc_GetParamPlcOrder (void);
static void Plc_PutIconsListingPlaces (void);
static void Plc_PutIconToEditPlaces (void); static void Plc_PutIconToEditPlaces (void);
static void Plc_PutIconToViewPlacesWhenEditing (void); static void Plc_PutIconToViewPlacesWhenEditing (void);
static void Plc_ListPlacesForEdition (void); static void Plc_ListPlacesForEdition (void);
static void Plc_PutParamPlcCod (long PlcCod); static void Plc_PutParamPlcCod (long PlcCod);
@ -78,7 +81,7 @@ static void Plc_PutHeadPlaces (void);
static void Plc_CreatePlace (struct Place *Plc); static void Plc_CreatePlace (struct Place *Plc);
/*****************************************************************************/ /*****************************************************************************/
/********************** Put link (form) to view places ***********************/ /************************** Put icon to view places **************************/
/*****************************************************************************/ /*****************************************************************************/
void Plc_PutIconToViewPlaces (void) void Plc_PutIconToViewPlaces (void)
@ -121,7 +124,7 @@ void Plc_SeePlaces (void)
Plc_GetListPlaces (); Plc_GetListPlaces ();
/***** Table head *****/ /***** Table head *****/
Box_StartBox (NULL,Txt_Places,ICanEdit ? Plc_PutIconToEditPlaces : Box_StartBox (NULL,Txt_Places,ICanEdit ? Plc_PutIconsListingPlaces :
NULL, NULL,
Hlp_INSTITUTION_Places,Box_NOT_CLOSABLE); Hlp_INSTITUTION_Places,Box_NOT_CLOSABLE);
Tbl_StartTableWideMargin (2); Tbl_StartTableWideMargin (2);
@ -229,6 +232,19 @@ static void Plc_GetParamPlcOrder (void)
(unsigned long) Plc_ORDER_DEFAULT); (unsigned long) Plc_ORDER_DEFAULT);
} }
/*****************************************************************************/
/**************** Put contextual icons in edition of centres *****************/
/*****************************************************************************/
static void Plc_PutIconsListingPlaces (void)
{
/***** Put icon to edit places *****/
Plc_PutIconToEditPlaces ();
/***** Put icon to view centres *****/
Ctr_PutIconToViewCentres ();
}
/*****************************************************************************/ /*****************************************************************************/
/********************** Put a link (form) to edit places *********************/ /********************** Put a link (form) to edit places *********************/
/*****************************************************************************/ /*****************************************************************************/