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.160.4

This commit is contained in:
Antonio Cañas Vargas 2016-03-24 13:50:57 +01:00
parent 0949f0d185
commit 332886a725
3 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
swad_changelog.h
View File

@ -137,14 +137,15 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 15.160.3 (2016-03-24)"
#define Log_PLATFORM_VERSION "SWAD 15.160.4 (2016-03-24)"
#define CSS_FILE "swad15.160.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.160.3: Mar 24, 2016 Put contextual icon "update" integrate in frame in "Who to follow". (196538 lines)
Version 15.160.4: Mar 24, 2016 Put contextual icon "update" integrated in frame in "Connected users". (196543 lines)
Version 15.160.3: Mar 24, 2016 Put contextual icon "update" integrated in frame in "Who to follow". (196538 lines)
Version 15.160.2: Mar 22, 2016 Changes in layout of tagline. (196512 lines)
Version 15.160.1: Mar 21, 2016 Changes in layout of tagline. (196504 lines)
Version 15.160: Mar 21, 2016 Changes in forms to login and to create new account. (196423 lines)

31
swad_connected.c
View File

@ -52,6 +52,8 @@ extern struct Globals Gbl;
/*************************** Internal prototypes *****************************/
/*****************************************************************************/
static void Con_PutIconToUpdateConnected (void);
static void Con_ComputeConnectedUsrsWithARoleBelongingToCurrentCrs (Rol_Role_t Role);
static void Con_ShowConnectedUsrsBelongingToLocation (void);
@ -73,10 +75,8 @@ static void Con_WriteHoursMinutesSecondsFromSeconds (time_t Seconds);
void Con_ShowConnectedUsrs (void)
{
extern const char *The_ClassFormBold[The_NUM_THEMES];
extern const char *Txt_Connected_users;
extern const char *Txt_MONTHS_SMALL_SHORT[12];
extern const char *Txt_Update;
/***** Link to show last clicks in real time *****/
if (Gbl.Usrs.Me.Logged)
@ -98,16 +98,7 @@ void Con_ShowConnectedUsrs (void)
Gbl.Now.Date.Day,
Gbl.Now.Time.Hour,
Gbl.Now.Time.Minute);
Lay_StartRoundFrame (NULL,Gbl.Title,NULL);
/***** Put form to update connected users *****/
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Act_FormStart (ActLstCon);
Sco_PutParamScope (Gbl.Scope.Current);
Act_LinkFormSubmitAnimated (Txt_Update,The_ClassFormBold[Gbl.Prefs.Theme]);
Lay_PutCalculateIconWithText (Txt_Update,Txt_Update);
Act_FormEnd ();
fprintf (Gbl.F.Out,"</div>");
Lay_StartRoundFrame (NULL,Gbl.Title,Con_PutIconToUpdateConnected);
/***** Number of connected users in the whole platform *****/
Con_ShowGlobalConnectedUsrs ();
@ -119,6 +110,22 @@ void Con_ShowConnectedUsrs (void)
Lay_EndRoundFrame ();
}
/*****************************************************************************/
/******************** Put icon to update connected users *********************/
/*****************************************************************************/
static void Con_PutIconToUpdateConnected (void)
{
extern const char *The_ClassFormBold[The_NUM_THEMES];
extern const char *Txt_Update;
Act_FormStart (ActLstCon);
Sco_PutParamScope (Gbl.Scope.Current);
Act_LinkFormSubmitAnimated (Txt_Update,The_ClassFormBold[Gbl.Prefs.Theme]);
Lay_PutCalculateIcon (Txt_Update);
Act_FormEnd ();
}
/*****************************************************************************/
/*************** Put a link to show last clicks in real time *****************/
/*****************************************************************************/

6
swad_follow.c
View File

@ -66,7 +66,7 @@ extern struct Globals Gbl;
/***************************** Private prototypes ****************************/
/*****************************************************************************/
static void Fol_UpdateWhoToFollow (void);
static void Fol_PutIconToUpdateWhoToFollow (void);
static void Fol_ShowNumberOfFollowingOrFollowers (const struct UsrData *UsrDat,
unsigned NumUsrs,
@ -209,7 +209,7 @@ void Fol_SuggestWhoToFollow (void)
if (NumUsrs)
{
/***** Start frame *****/
Lay_StartRoundFrame ("560px",Txt_Who_to_follow,Fol_UpdateWhoToFollow);
Lay_StartRoundFrame ("560px",Txt_Who_to_follow,Fol_PutIconToUpdateWhoToFollow);
/***** Initialize structure with user's data *****/
Usr_UsrDataConstructor (&UsrDat);
@ -257,7 +257,7 @@ void Fol_SuggestWhoToFollow (void)
/********************* Put icon to update who to follow **********************/
/*****************************************************************************/
static void Fol_UpdateWhoToFollow (void)
static void Fol_PutIconToUpdateWhoToFollow (void)
{
extern const char *The_ClassFormBold[The_NUM_THEMES];
extern const char *Txt_Update;