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 15.144.3

This commit is contained in:
Antonio Cañas Vargas 2016-03-15 10:21:56 +01:00
parent 4ff302d486
commit 551e24ac29
4 changed files with 28 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
swad_changelog.h
View File

@ -118,18 +118,25 @@
// TODO: If a follower follows a user whose profile is no longer visible ==> put icon to unfollow in list of followed
// TODO: FIX BUG: In results of search of students, no mark of confirmation is shown even if the student really has confirmed his/her registration in the course
// TODO: Insert "http://" to WWW when WWW does not start with "*://"
// TODO: Change links from external degrees to internal degrees in STATS > Degrees
// TODO: To avoid wrong email addresses, when a user fills his/her email address, check if the domain is in the white list of allowed domains. If not, ask for confirmation.
// TODO: Important!!!! E-mail should not be visible for not logged users
// TODO: Fix bug in marks reported by Francisco Ocaña
// TODO: When a new user (a guest not registered in any course) creates a new course ==> register him/her automatically as a teacher in the course just created
/*****************************************************************************/
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 15.144.2 (2016-03-05)"
#define Log_PLATFORM_VERSION "SWAD 15.144.3 (2016-03-15)"
#define CSS_FILE "swad15.137.2.css"
#define JS_FILE "swad15.131.3.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 15.144.3: Mar 15, 2016 Changes in layout of connected users (right zone). (195742 lines)
Version 15.144.2: Mar 05, 2016 Fixed minor bugs in edition of centres. (195761 lines)
Version 15.144.1: Mar 03, 2016 Fixed bugs related to last chages made. (195756 lines)
Version 15.144: Mar 03, 2016 Direct login always available. (195755 lines)

36
swad_connected.c
View File

@ -339,6 +339,8 @@ void Con_GetAndShowLastClicks (void)
void Con_ShowGlobalConnectedUsrs (void)
{
extern const char *The_ClassConnected[The_NUM_THEMES];
extern const char *Txt_Connected_users;
extern const char *Txt_session;
extern const char *Txt_sessions;
extern const char *Txt_user[Usr_NUM_SEXS];
@ -353,47 +355,49 @@ void Con_ShowGlobalConnectedUsrs (void)
/***** Container start *****/
fprintf (Gbl.F.Out,"<div class=\"CONNECTED LEFT_RIGHT_CONTENT_WIDTH\">");
/***** Link to view more details about connected users *****/
Act_FormStart (ActLstCon);
Act_LinkFormSubmit (Txt_Connected_users,The_ClassConnected[Gbl.Prefs.Theme]);
/***** Write total number of sessions *****/
fprintf (Gbl.F.Out,"<div class=\"CENTER_TOP\">"
"%u %s"
"</div>",
fprintf (Gbl.F.Out,"%u %s",
Gbl.Session.NumSessions,
(Gbl.Session.NumSessions == 1) ? Txt_session :
Txt_sessions);
/***** Write total number of users *****/
fprintf (Gbl.F.Out,"<div class=\"CENTER_TOP\">"
"%u %s:"
"</div>",
fprintf (Gbl.F.Out,"<br />"
"%u %s:",
UsrsTotal,
(UsrsTotal == 1) ? Txt_user[Usr_SEX_UNKNOWN] :
Txt_users);
/***** Write total number of students *****/
fprintf (Gbl.F.Out,"<div class=\"CENTER_TOP\">"
"%u %s"
"</div>",
fprintf (Gbl.F.Out,"<br />"
"%u %s",
StdsTotal,
(StdsTotal == 1) ? Txt_ROLES_SINGUL_abc[Rol_STUDENT][Usr_SEX_UNKNOWN] :
Txt_ROLES_PLURAL_abc [Rol_STUDENT][Usr_SEX_UNKNOWN]);
Txt_ROLES_PLURAL_abc[Rol_STUDENT][Usr_SEX_UNKNOWN]);
/***** Write total number of teachers *****/
fprintf (Gbl.F.Out,"<div class=\"CENTER_TOP\">"
"%u %s"
"</div>",
fprintf (Gbl.F.Out,"<br />"
"%u %s",
TchsTotal,
(TchsTotal == 1) ? Txt_ROLES_SINGUL_abc[Rol_TEACHER][Usr_SEX_UNKNOWN] :
Txt_ROLES_PLURAL_abc[Rol_TEACHER][Usr_SEX_UNKNOWN]);
/***** Write total number of users who do not belong to any course *****/
if (WithoutCoursesTotal)
fprintf (Gbl.F.Out,"<div class=\"CENTER_TOP\">"
"%u %s"
"</div>",
fprintf (Gbl.F.Out,"<br />"
"%u %s",
WithoutCoursesTotal,
(WithoutCoursesTotal == 1) ? Txt_ROLES_SINGUL_abc[Rol__GUEST_][Usr_SEX_UNKNOWN] :
Txt_ROLES_PLURAL_abc[Rol__GUEST_][Usr_SEX_UNKNOWN]);
/***** End of link to view more details about connected users *****/
fprintf (Gbl.F.Out,"</a>");
Act_FormEnd ();
/***** Container end *****/
fprintf (Gbl.F.Out,"</div>");
}

7
swad_layout.c
View File

@ -938,9 +938,6 @@ static void Lay_ShowLeftColumn (void)
static void Lay_ShowRightColumn (void)
{
extern const char *The_ClassConnected[The_NUM_THEMES];
extern const char *Txt_Connected_users;
extern const char *Txt_Connected_PLURAL;
extern const char *Txt_If_you_have_an_Android_device_try_SWADroid;
Gbl.Usrs.Connected.WhereToShow = Con_SHOW_ON_RIGHT_COLUMN;
@ -950,10 +947,6 @@ static void Lay_ShowRightColumn (void)
/***** Connected users *****/
fprintf (Gbl.F.Out,"<div class=\"LEFT_RIGHT_CELL\">");
Act_FormStart (ActLstCon);
Act_LinkFormSubmit (Txt_Connected_users,The_ClassConnected[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s</a>",Txt_Connected_PLURAL);
Act_FormEnd ();
/***** Number of connected users in the whole platform *****/
fprintf (Gbl.F.Out,"<div id=\"globalconnected\">"); // Used for AJAX based refresh

21
swad_text.c
View File

@ -4910,27 +4910,6 @@ const char *Txt_Congratulations_You_have_created_your_account_X_Now_Y_will_reque
" (o mesmo se aplica &agrave;s institui&ccedil;&otilde;es, centros e graus).";
#endif
const char *Txt_Connected_PLURAL =
#if L==1
"Connectats";
#elif L==2
"Angemeldet";
#elif L==3
"Connected";
#elif L==4
"Conectados";
#elif L==5
"Connect&eacute;s";
#elif L==6
"Conectados"; // Okoteve traducción
#elif L==7
"Connessi";
#elif L==8
"Online";
#elif L==9
"Conectados";
#endif
const char *Txt_connected_PLURAL =
#if L==1
"connectats";