mirror of https://github.com/acanas/swad-core.git
Version 16.48.12
This commit is contained in:
parent
8c903260d1
commit
84835270ad
|
@ -156,13 +156,14 @@
|
||||||
/****************************** Public constants *****************************/
|
/****************************** Public constants *****************************/
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
|
||||||
#define Log_PLATFORM_VERSION "SWAD 16.48.11 (2016-11-07)"
|
#define Log_PLATFORM_VERSION "SWAD 16.48.12 (2016-11-07)"
|
||||||
#define CSS_FILE "swad16.48.4.css"
|
#define CSS_FILE "swad16.48.4.css"
|
||||||
#define JS_FILE "swad16.46.1.js"
|
#define JS_FILE "swad16.46.1.js"
|
||||||
|
|
||||||
// Number of lines (includes comments but not blank lines) has been got with the following command:
|
// 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
|
// nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*.h sql/swad*.sql | tail -1
|
||||||
/*
|
/*
|
||||||
|
Version 16.48.12: Nov 07, 2016 Icon in my webs / social networks to show figure (statistics). (206537 lines)
|
||||||
Version 16.48.11: Nov 07, 2016 Changes in order of figures (statistics). (206523 lines)
|
Version 16.48.11: Nov 07, 2016 Changes in order of figures (statistics). (206523 lines)
|
||||||
Version 16.48.10: Nov 07, 2016 Changes in text related to notifications stats. (206522 lines)
|
Version 16.48.10: Nov 07, 2016 Changes in text related to notifications stats. (206522 lines)
|
||||||
Version 16.48.9: Nov 07, 2016 Icon in my notifications to show figure (statistics). (206521 lines)
|
Version 16.48.9: Nov 07, 2016 Icon in my notifications to show figure (statistics). (206521 lines)
|
||||||
|
|
|
@ -186,6 +186,9 @@ const char *Net_WebsAndSocialNetworksTitle[Net_NUM_WEBS_AND_SOCIAL_NETWORKS] =
|
||||||
|
|
||||||
static void Net_ShowAWebOrSocialNet (const char *URL,
|
static void Net_ShowAWebOrSocialNet (const char *URL,
|
||||||
const char *Icon,const char *Title);
|
const char *Icon,const char *Title);
|
||||||
|
|
||||||
|
static void Net_PutIconsWebsSocialNetworks (void);
|
||||||
|
|
||||||
static void Net_GetMyWebsAndSocialNetsFromForm (void);
|
static void Net_GetMyWebsAndSocialNetsFromForm (void);
|
||||||
|
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
@ -292,7 +295,9 @@ void Net_ShowFormMyWebsAndSocialNets (void)
|
||||||
char URL[Cns_MAX_BYTES_URL+1];
|
char URL[Cns_MAX_BYTES_URL+1];
|
||||||
|
|
||||||
/***** Start table *****/
|
/***** Start table *****/
|
||||||
Lay_StartRoundFrameTable (NULL,2,Txt_Webs_social_networks);
|
Lay_StartRoundFrame (NULL,Txt_Webs_social_networks,
|
||||||
|
Net_PutIconsWebsSocialNetworks);
|
||||||
|
fprintf (Gbl.F.Out,"<table class=\"CELLS_PAD_2\" style=\"margin:0 auto;\">");
|
||||||
|
|
||||||
for (NumURL = (Net_WebsAndSocialNetworks_t) 0;
|
for (NumURL = (Net_WebsAndSocialNetworks_t) 0;
|
||||||
NumURL < Net_NUM_WEBS_AND_SOCIAL_NETWORKS;
|
NumURL < Net_NUM_WEBS_AND_SOCIAL_NETWORKS;
|
||||||
|
@ -348,9 +353,21 @@ void Net_ShowFormMyWebsAndSocialNets (void)
|
||||||
}
|
}
|
||||||
|
|
||||||
/***** End table *****/
|
/***** End table *****/
|
||||||
|
fprintf (Gbl.F.Out,"</table>");
|
||||||
Lay_EndRoundFrameTable ();
|
Lay_EndRoundFrameTable ();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*****************************************************************************/
|
||||||
|
/************** Put contextual icons in my web / social networks *************/
|
||||||
|
/*****************************************************************************/
|
||||||
|
|
||||||
|
static void Net_PutIconsWebsSocialNetworks (void)
|
||||||
|
{
|
||||||
|
/***** Put icon to show a figure *****/
|
||||||
|
Gbl.Stat.FigureType = Sta_SOCIAL_NETWORKS;
|
||||||
|
Sta_PutIconToShowFigure ();
|
||||||
|
}
|
||||||
|
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
/**************** Update and show data from identified user ******************/
|
/**************** Update and show data from identified user ******************/
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
|
|
@ -3922,7 +3922,6 @@ void Sta_ShowFigures (void)
|
||||||
Sta_GetAndShowUsersRanking, // Sta_USERS_RANKING
|
Sta_GetAndShowUsersRanking, // Sta_USERS_RANKING
|
||||||
Sta_GetAndShowHierarchyStats, // Sta_HIERARCHY
|
Sta_GetAndShowHierarchyStats, // Sta_HIERARCHY
|
||||||
Sta_GetAndShowInstitutionsStats, // Sta_INSTITS
|
Sta_GetAndShowInstitutionsStats, // Sta_INSTITS
|
||||||
Net_ShowWebAndSocialNetworksStats, // Sta_SOCIAL_NETWORKS
|
|
||||||
Sta_GetAndShowFileBrowsersStats, // Sta_FOLDERS_AND_FILES
|
Sta_GetAndShowFileBrowsersStats, // Sta_FOLDERS_AND_FILES
|
||||||
Sta_GetAndShowOERsStats, // Sta_OER
|
Sta_GetAndShowOERsStats, // Sta_OER
|
||||||
Sta_GetAndShowAssignmentsStats, // Sta_ASSIGNMENTS
|
Sta_GetAndShowAssignmentsStats, // Sta_ASSIGNMENTS
|
||||||
|
@ -3934,6 +3933,7 @@ void Sta_ShowFigures (void)
|
||||||
Sta_GetAndShowNoticesStats, // Sta_NOTICES
|
Sta_GetAndShowNoticesStats, // Sta_NOTICES
|
||||||
Sta_GetAndShowMsgsStats, // Sta_MESSAGES
|
Sta_GetAndShowMsgsStats, // Sta_MESSAGES
|
||||||
Sta_GetAndShowSurveysStats, // Sta_SURVEYS
|
Sta_GetAndShowSurveysStats, // Sta_SURVEYS
|
||||||
|
Net_ShowWebAndSocialNetworksStats, // Sta_SOCIAL_NETWORKS
|
||||||
Sta_GetAndShowNumUsrsPerLanguage, // Sta_LANGUAGES
|
Sta_GetAndShowNumUsrsPerLanguage, // Sta_LANGUAGES
|
||||||
Sta_GetAndShowNumUsrsPerFirstDayOfWeek, // Sta_FIRST_DAY_OF_WEEK
|
Sta_GetAndShowNumUsrsPerFirstDayOfWeek, // Sta_FIRST_DAY_OF_WEEK
|
||||||
Sta_GetAndShowNumUsrsPerIconSet, // Sta_ICON_SETS
|
Sta_GetAndShowNumUsrsPerIconSet, // Sta_ICON_SETS
|
||||||
|
|
|
@ -104,7 +104,6 @@ typedef enum
|
||||||
Sta_USERS_RANKING, // Users' ranking
|
Sta_USERS_RANKING, // Users' ranking
|
||||||
Sta_HIERARCHY, // Number of countries, institutions, centres, degrees and courses
|
Sta_HIERARCHY, // Number of countries, institutions, centres, degrees and courses
|
||||||
Sta_INSTITS, // Number of users in each institution
|
Sta_INSTITS, // Number of users in each institution
|
||||||
Sta_SOCIAL_NETWORKS, // Number of users in social networks
|
|
||||||
Sta_FOLDERS_AND_FILES, // Number of folders and files
|
Sta_FOLDERS_AND_FILES, // Number of folders and files
|
||||||
Sta_OER, // Number of OERs (Open Educational Resources)
|
Sta_OER, // Number of OERs (Open Educational Resources)
|
||||||
Sta_ASSIGNMENTS, // Number of assignments
|
Sta_ASSIGNMENTS, // Number of assignments
|
||||||
|
@ -116,6 +115,7 @@ typedef enum
|
||||||
Sta_NOTICES, // Number of notices
|
Sta_NOTICES, // Number of notices
|
||||||
Sta_MESSAGES, // Number of users' (sent and received) messages
|
Sta_MESSAGES, // Number of users' (sent and received) messages
|
||||||
Sta_SURVEYS, // Number of surveys
|
Sta_SURVEYS, // Number of surveys
|
||||||
|
Sta_SOCIAL_NETWORKS, // Number of users in social networks
|
||||||
Sta_LANGUAGES, // Number of users per language
|
Sta_LANGUAGES, // Number of users per language
|
||||||
Sta_FIRST_DAY_OF_WEEK, // Number of users per first day of week
|
Sta_FIRST_DAY_OF_WEEK, // Number of users per first day of week
|
||||||
Sta_ICON_SETS, // Number of users per icon set
|
Sta_ICON_SETS, // Number of users per icon set
|
||||||
|
|
40
swad_text.c
40
swad_text.c
|
@ -38816,26 +38816,6 @@ const char *Txt_STAT_USE_STAT_TYPES[Sta_NUM_FIGURES] =
|
||||||
"Instituções"
|
"Instituções"
|
||||||
#endif
|
#endif
|
||||||
,
|
,
|
||||||
#if L==1 // Sta_SOCIAL_NETWORKS
|
|
||||||
"Webs / xarxes socials"
|
|
||||||
#elif L==2
|
|
||||||
"Webs / Social Networks"
|
|
||||||
#elif L==3
|
|
||||||
"Webs / social networks"
|
|
||||||
#elif L==4
|
|
||||||
"Webs / redes sociales"
|
|
||||||
#elif L==5
|
|
||||||
"Webs / réseaux sociaux"
|
|
||||||
#elif L==6
|
|
||||||
"Webs / redes sociales" // Okoteve traducción
|
|
||||||
#elif L==7
|
|
||||||
"Webs / reti sociali"
|
|
||||||
#elif L==8
|
|
||||||
"Webs / sieci społeczne"
|
|
||||||
#elif L==9
|
|
||||||
"Webs / redes sociais"
|
|
||||||
#endif
|
|
||||||
,
|
|
||||||
#if L==1 // Sta_FOLDERS_AND_FILES
|
#if L==1 // Sta_FOLDERS_AND_FILES
|
||||||
"Carpetes i fitxers"
|
"Carpetes i fitxers"
|
||||||
#elif L==2
|
#elif L==2
|
||||||
|
@ -39056,6 +39036,26 @@ const char *Txt_STAT_USE_STAT_TYPES[Sta_NUM_FIGURES] =
|
||||||
"Inquéritos"
|
"Inquéritos"
|
||||||
#endif
|
#endif
|
||||||
,
|
,
|
||||||
|
#if L==1 // Sta_SOCIAL_NETWORKS
|
||||||
|
"Webs / xarxes socials"
|
||||||
|
#elif L==2
|
||||||
|
"Webs / Social Networks"
|
||||||
|
#elif L==3
|
||||||
|
"Webs / social networks"
|
||||||
|
#elif L==4
|
||||||
|
"Webs / redes sociales"
|
||||||
|
#elif L==5
|
||||||
|
"Webs / réseaux sociaux"
|
||||||
|
#elif L==6
|
||||||
|
"Webs / redes sociales" // Okoteve traducción
|
||||||
|
#elif L==7
|
||||||
|
"Webs / reti sociali"
|
||||||
|
#elif L==8
|
||||||
|
"Webs / sieci społeczne"
|
||||||
|
#elif L==9
|
||||||
|
"Webs / redes sociais"
|
||||||
|
#endif
|
||||||
|
,
|
||||||
#if L==1 // Sta_LANGUAGES
|
#if L==1 // Sta_LANGUAGES
|
||||||
"Idioma"
|
"Idioma"
|
||||||
#elif L==2
|
#elif L==2
|
||||||
|
|
Loading…
Reference in New Issue