diff --git a/icon/cty16x16.gif b/icon/cty16x16.gif
new file mode 100644
index 000000000..c5950aca0
Binary files /dev/null and b/icon/cty16x16.gif differ
diff --git a/swad_changelog.h b/swad_changelog.h
index b302deef4..f9080b47b 100644
--- a/swad_changelog.h
+++ b/swad_changelog.h
@@ -103,11 +103,12 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
-#define Log_PLATFORM_VERSION "SWAD 14.107.7 (2015/04/03)"
+#define Log_PLATFORM_VERSION "SWAD 14.107.8 (2015/04/03)"
// 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 14.107.8: Apr 03, 2015 Changes in statistics (figures about hierarchy). (183774 lines)
Version 14.107.7: Apr 03, 2015 Changes in layout of sent / received messages. (183753 lines)
Version 14.107.6: Apr 03, 2015 Changes in layout of form to change password. (183748 lines)
Version 14.107.5: Apr 03, 2015 Changes in layout of form to change photo. (183718 lines)
diff --git a/swad_global.c b/swad_global.c
index 5e6f8d34e..ec75a7a40 100644
--- a/swad_global.c
+++ b/swad_global.c
@@ -405,7 +405,7 @@ void Gbl_InitializeGlobals (void)
Gbl.Stat.Role = Sta_IDENTIFIED_USRS;
Gbl.Stat.NumAction = ActAll;
Gbl.Stat.RowsPerPage = 50;
- Gbl.Stat.UseStatType = Sta_USRS_RANKING;
+ Gbl.Stat.UseStatType = Sta_USERS;
Gbl.Scope.Current = Sco_SCOPE_CRS;
diff --git a/swad_profile.c b/swad_profile.c
index c3d95a637..4a993cc3d 100644
--- a/swad_profile.c
+++ b/swad_profile.c
@@ -751,7 +751,7 @@ static void Prf_ShowRanking (unsigned long Rank,unsigned long NumUsrs)
/***** Rank in form to go to ranking *****/
Act_FormStart (ActSeeUseGbl);
Sco_PutParamScope (Sco_SCOPE_SYS);
- Par_PutHiddenParamUnsigned ("UseStatType",(unsigned) Sta_USRS_RANKING);
+ Par_PutHiddenParamUnsigned ("UseStatType",(unsigned) Sta_USERS_RANKING);
Act_LinkFormSubmit (Gbl.Title,The_ClassFormul[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"#%lu",Rank);
Act_FormEnd ();
diff --git a/swad_statistic.c b/swad_statistic.c
index b85ae1d49..94b433323 100644
--- a/swad_statistic.c
+++ b/swad_statistic.c
@@ -3660,7 +3660,7 @@ void Sta_ShowUseOfPlatform (void)
/***** Show the stat of use selected by user *****/
switch (Gbl.Stat.UseStatType)
{
- case Sta_USRS_RANKING:
+ case Sta_USERS_RANKING:
/***** Users ranking *****/
Sta_GetAndShowUsersRanking ();
break;
@@ -3668,7 +3668,7 @@ void Sta_ShowUseOfPlatform (void)
/***** Number of users *****/
Sta_GetAndShowUsersStats ();
break;
- case Sta_DEGREES_AND_COURSES:
+ case Sta_HIERARCHY:
/***** Number of degrees and courses *****/
Sta_GetAndShowDegCrsStats ();
break;
@@ -3701,7 +3701,7 @@ void Sta_ShowUseOfPlatform (void)
/***** Number of notices *****/
Sta_GetAndShowNoticesStats ();
break;
- case Sta_MSGS_BETWEEN_USERS:
+ case Sta_MESSAGES:
/***** Number of sent and received messages *****/
Sta_GetAndShowMsgsStats ();
break;
@@ -3798,7 +3798,7 @@ static void Sta_GetAndShowUsersRanking (void)
extern const char *Txt_Messages;
extern const char *Txt_Followers;
- Lay_StartRoundFrameTable10 (NULL,2,Txt_STAT_USE_STAT_TYPES[Sta_USRS_RANKING]);
+ Lay_StartRoundFrameTable10 (NULL,2,Txt_STAT_USE_STAT_TYPES[Sta_USERS_RANKING]);
/***** Header *****/
fprintf (Gbl.F.Out,""
@@ -3867,7 +3867,7 @@ static void Sta_GetAndShowDegCrsStats (void)
{
extern const char *Txt_STAT_USE_STAT_TYPES[Sta_NUM_TYPES_USE_STATS];
- Lay_StartRoundFrameTable10 (NULL,2,Txt_STAT_USE_STAT_TYPES[Sta_DEGREES_AND_COURSES]);
+ Lay_StartRoundFrameTable10 (NULL,2,Txt_STAT_USE_STAT_TYPES[Sta_HIERARCHY]);
Sta_WriteHeadDegsCrssInSWAD ();
Sta_GetAndShowNumCtysInSWAD ();
Sta_GetAndShowNumInssInSWAD ();
@@ -4016,7 +4016,9 @@ static void Sta_GetAndShowNumCtysInSWAD (void)
/***** Write number of countries *****/
fprintf (Gbl.F.Out,"
"
""
- "%s:"
+ "![\"%s\"](\"%s/cty16x16.gif\"") "
+ " %s:"
" | "
""
"%u"
@@ -4040,6 +4042,8 @@ static void Sta_GetAndShowNumCtysInSWAD (void)
"%u"
" | "
"
",
+ Gbl.Prefs.IconsURL,
+ Txt_Countries,
Txt_Countries,
NumCtysTotal,
NumCtysWithInss,
@@ -4135,7 +4139,9 @@ static void Sta_GetAndShowNumInssInSWAD (void)
/***** Write number of institutions *****/
fprintf (Gbl.F.Out,""
""
- "%s:"
+ "![\"%s\"](\"%s/ins16x16.gif\"") "
+ " %s:"
" | "
""
"%u"
@@ -4157,6 +4163,8 @@ static void Sta_GetAndShowNumInssInSWAD (void)
"%u"
" | "
"
",
+ Gbl.Prefs.IconsURL,
+ Txt_Institutions,
Txt_Institutions,
NumInssTotal,
NumInssWithCtrs,
@@ -4244,7 +4252,9 @@ static void Sta_GetAndShowNumCtrsInSWAD (void)
/***** Write number of centres *****/
fprintf (Gbl.F.Out,""
""
- "%s:"
+ "![\"%s\"](\"%s/ctr16x16.gif\"") "
+ " %s:"
" | "
""
"%u"
@@ -4264,6 +4274,8 @@ static void Sta_GetAndShowNumCtrsInSWAD (void)
"%u"
" | "
"
",
+ Gbl.Prefs.IconsURL,
+ Txt_Centres,
Txt_Centres,
NumCtrsTotal,
NumCtrsWithDegs,
@@ -4343,7 +4355,9 @@ static void Sta_GetAndShowNumDegsInSWAD (void)
/***** Write number of degrees *****/
fprintf (Gbl.F.Out,""
""
- "%s:"
+ "![\"%s\"](\"%s/deg16x16.gif\"") "
+ " %s:"
" | "
""
"%u"
@@ -4361,6 +4375,8 @@ static void Sta_GetAndShowNumDegsInSWAD (void)
"%u"
" | "
"
",
+ Gbl.Prefs.IconsURL,
+ Txt_Degrees,
Txt_Degrees,
NumDegsTotal,
NumDegsWithCrss,
@@ -4380,7 +4396,7 @@ static void Sta_GetAndShowNumCrssInSWAD (void)
unsigned NumCrssWithTchs = 0;
unsigned NumCrssWithStds = 0;
- /***** Get number of degrees *****/
+ /***** Get number of courses *****/
switch (Gbl.Scope.Current)
{
case Sco_SCOPE_SYS:
@@ -4429,10 +4445,12 @@ static void Sta_GetAndShowNumCrssInSWAD (void)
break;
}
- /***** Write number of degrees *****/
+ /***** Write number of courses *****/
fprintf (Gbl.F.Out,""
""
- "%s:"
+ "![\"%s\"](\"%s/crs16x16.gif\"") "
+ " %s:"
" | "
""
"%u"
@@ -4448,6 +4466,8 @@ static void Sta_GetAndShowNumCrssInSWAD (void)
"%u"
" | "
"
",
+ Gbl.Prefs.IconsURL,
+ Txt_Courses,
Txt_Courses,
NumCrssTotal,
NumCrssWithTchs,
@@ -6271,7 +6291,7 @@ static void Sta_GetAndShowMsgsStats (void)
NumMsgsReceivedAndNotified = Msg_GetNumMsgsReceived (Gbl.Scope.Current,Msg_STATUS_NOTIFIED);
/***** Table start *****/
- Lay_StartRoundFrameTable10 (NULL,2,Txt_STAT_USE_STAT_TYPES[Sta_MSGS_BETWEEN_USERS]);
+ Lay_StartRoundFrameTable10 (NULL,2,Txt_STAT_USE_STAT_TYPES[Sta_MESSAGES]);
/***** Write table heading *****/
fprintf (Gbl.F.Out,""
diff --git a/swad_statistic.h b/swad_statistic.h
index 291a5d95a..bdde3177e 100644
--- a/swad_statistic.h
+++ b/swad_statistic.h
@@ -90,8 +90,8 @@ typedef enum
typedef enum
{
Sta_USERS, // Number of users
- Sta_USRS_RANKING, // Users' ranking
- Sta_DEGREES_AND_COURSES, // Number of degrees and courses
+ Sta_USERS_RANKING, // Users' ranking
+ Sta_HIERARCHY, // Number of countries, institutions, centres, degrees and courses
Sta_SOCIAL_NETWORKS, // Number of users in social networks
Sta_FOLDERS_AND_FILES, // Number of folders and files
Sta_OER, // Number of OERs (Open Educational Resources)
@@ -99,7 +99,7 @@ typedef enum
Sta_TESTS, // Number of test questions
Sta_NOTIFY_EVENTS, // Number of users per notify event
Sta_NOTICES, // Number of notices
- Sta_MSGS_BETWEEN_USERS, // Number of users' (sent and received) messages
+ Sta_MESSAGES, // Number of users' (sent and received) messages
Sta_FORUMS, // Number of forums, threads and posts
Sta_SURVEYS, // Number of surveys
Sta_PRIVACY, // Number of users per privacity
diff --git a/swad_text.c b/swad_text.c
index 1d6c36102..004271849 100644
--- a/swad_text.c
+++ b/swad_text.c
@@ -36086,23 +36086,23 @@ const char *Txt_STAT_USE_STAT_TYPES[Sta_NUM_TYPES_USE_STATS] =
#endif
,
#if L==0
- "Titulaciones y asignaturas" // Necessita traducció
+ "Jerarquia"
#elif L==1
- "Studiengänge und Kursen"
+ "Hierarchie"
#elif L==2
- "Degrees and courses"
+ "Hierarchy"
#elif L==3
- "Titulaciones y asignaturas"
+ "Jerarquía"
#elif L==4
- "Études et matières"
+ "Hiérarchie"
#elif L==5
- "Titulaciones y asignaturas" // Okoteve traducción
+ "Jerarquía" // Okoteve traducción
#elif L==6
- "Lauree e corsi"
+ "Gerarchia"
#elif L==7
- "Degrees and courses" // Potrzebujesz tlumaczenie
+ "Hierarchia"
#elif L==8
- "Titulaçoes e disciplinas"
+ "Hierarquia"
#endif
,
#if L==0