Marown/swad-core
Marown
/
swad-core
mirror of https://github.com/acanas/swad-core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Version 16.47.2

This commit is contained in:
Antonio Cañas Vargas 2016-11-06 21:19:25 +01:00
parent 3e20dee347
commit 1b9f08ed79
3 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swad_changelog.h
View File

@ -156,13 +156,14 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 16.47.1 (2016-11-06)"
#define Log_PLATFORM_VERSION "SWAD 16.47.2 (2016-11-06)"
#define CSS_FILE "swad16.32.1.css"
#define JS_FILE "swad16.46.1.js"
// Number of lines (includes comments but not blank lines) has been got with the following command:
// nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*.h sql/swad*.sql | tail -1
/*
Version 16.47.2: Nov 06, 2016 Icon in list of countries to show figure (statistics). (206141 lines)
Version 16.47.1: Nov 06, 2016 Icon in list of notices to show figure (statistics). (206129 lines)
Copy icon/pie64x64.gif to icon directory

20
swad_country.c
View File

@ -66,6 +66,7 @@ extern struct Globals Gbl;
static void Cty_Configuration (bool PrintView);
static void Cty_PutIconToPrint (void);
static void Cty_PutIconsCountries (void);
static void Cty_PutIconToEditCountries (void);
static unsigned Cty_GetNumUsrsWhoClaimToBelongToCty (long CtyCod);
@ -512,9 +513,7 @@ void Cty_ListCountries2 (void)
const char *BgColor;
/***** Table head *****/
Lay_StartRoundFrame (NULL,Txt_Countries,
Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM ? Cty_PutIconToEditCountries :
NULL);
Lay_StartRoundFrame (NULL,Txt_Countries,Cty_PutIconsCountries);
fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE CELLS_PAD_2\">"
"<tr>");
for (Order = Cty_ORDER_BY_COUNTRY;
@ -689,6 +688,21 @@ void Cty_ListCountries2 (void)
Cty_FreeListCountries ();
}
/*****************************************************************************/
/***************** Put contextual icons in list of countries *****************/
/*****************************************************************************/
static void Cty_PutIconsCountries (void)
{
/***** Put icon to edit countries *****/
if (Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM)
Cty_PutIconToEditCountries ();
/***** Put icon to show a figure *****/
Gbl.Stat.FigureType = Sta_HIERARCHY;
Sta_PutIconToShowFigure ();
}
/*****************************************************************************/
/********************* Put link (form) to edit countries *********************/
/*****************************************************************************/

2
swad_notice.c
View File

@ -485,7 +485,7 @@ void Not_ShowNotices (Not_Listing_t TypeNoticesListing,bool ICanEdit)
}
/*****************************************************************************/
/***************** Put conteextual icons in list of notices ******************/
/****************** Put contextual icons in list of notices ******************/
/*****************************************************************************/
static void Not_PutIconsNotices (void)