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

This commit is contained in:
Antonio Cañas Vargas 2017-06-03 17:47:07 +02:00
parent e16a8966e3
commit 2240a73769
4 changed files with 40 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
swad_changelog.h
View File

@ -229,19 +229,21 @@
// TODO: Limit lenght of very big institution name in record card
// TODO: FIX BUG: Button remove in forums was missing.
// TODO: Change edition of banners, integrating box and putting icon to view.
/*****************************************************************************/
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 16.232.3 (2017-06-01)"
#define Log_PLATFORM_VERSION "SWAD 16.232.5 (2017-06-03)"
#define CSS_FILE "swad16.226.css"
#define JS_FILE "swad16.206.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 16.232.5: Jun 03, 2017 Changed layout of edition of links. (221108 lines)
Version 16.232.4: Jun 01, 2017 Changed alert when session expired. (221092 lines)
Version 16.232.3: Jun 01, 2017 Fixed bug in permission of deletion of forum threads. (221091 lines)
Version 16.232.2: May 31, 2017 Fixed bug in selection of user's centre and department. (221089 lines)
Version 16.232.1: May 31, 2017 Improvements in selection of user's institution, centre and department. (221085 lines)

28
swad_link.c
View File

@ -61,6 +61,7 @@ extern struct Globals Gbl;
static void Lnk_PutIconToEditLinks (void);
static void Lnk_WriteListOfLinks (void);
static void Lnk_PutIconToViewLinks (void);
static void Lnk_ListLinksForEdition (void);
static void Lnk_PutParamLnkCod (long LnkCod);
@ -200,9 +201,16 @@ static void Lnk_WriteListOfLinks (void)
void Lnk_EditLinks (void)
{
extern const char *Hlp_SYSTEM_Links_edit;
extern const char *Txt_Links;
/***** Get list of links *****/
Lnk_GetListLinks ();
/***** Start frame *****/
Lay_StartRoundFrame (NULL,Txt_Links,Lnk_PutIconToViewLinks,
Hlp_SYSTEM_Links_edit);
/***** Put a form to create a new link *****/
Lnk_PutFormToCreateLink ();
@ -210,6 +218,9 @@ void Lnk_EditLinks (void)
if (Gbl.Links.Num)
Lnk_ListLinksForEdition ();
/***** End frame *****/
Lay_EndRoundFrame ();
/***** Free list of links *****/
Lnk_FreeListLinks ();
}
@ -338,18 +349,26 @@ void Lnk_FreeListLinks (void)
}
}
/*****************************************************************************/
/***************** Put contextual icons in edition of links ******************/
/*****************************************************************************/
static void Lnk_PutIconToViewLinks (void)
{
Lay_PutContextualIconToView (ActSeeLnk,NULL);
}
/*****************************************************************************/
/*************************** List all the links ******************************/
/*****************************************************************************/
static void Lnk_ListLinksForEdition (void)
{
extern const char *Hlp_SYSTEM_Links_edit;
extern const char *Txt_Links;
unsigned NumLnk;
struct Link *Lnk;
Lay_StartRoundFrameTable (NULL,Txt_Links,NULL,Hlp_SYSTEM_Links_edit,2);
/***** Start table *****/
Lay_StartTableWide (2);
/***** Table head *****/
Lnk_PutHeadLinks ();
@ -417,7 +436,8 @@ static void Lnk_ListLinksForEdition (void)
"</tr>");
}
Lay_EndRoundFrameTable ();
/***** End table *****/
Lay_EndTable ();
}
/*****************************************************************************/

20
swad_text.c
View File

@ -45576,25 +45576,25 @@ const char *Txt_The_session_has_been_closed = // Closed by user
"A sess&atilde;o foi encerrada.";
#endif
const char *Txt_The_session_has_expired_due_to_inactivity = // Expired due to timeout
const char *Txt_The_session_has_expired =
#if L==1
"La sessi&oacute; ha expirat per inactivitat.";
"La sessi&oacute; ha expirat.";
#elif L==2
"Die Sitzung wurde wegen Inaktivit&uml;t abgelaufen.";
"Die Sitzung wurde.";
#elif L==3
"The session has expired due to inactivity.";
"The session has expired.";
#elif L==4
"La sesi&oacute;n ha expirado por inactividad.";
"La sesi&oacute;n ha expirado.";
#elif L==5
"La session a expir&eacute; pour cause d'inactivit&eacute;.";
"La session a expir&eacute;.";
#elif L==6
"La sesi&oacute;n ha expirado por inactividad."; // Okoteve traducción
"La sesi&oacute;n ha expirado."; // Okoteve traducción
#elif L==7
"La sessione &egrave; scaduta per inattivit&agrave;.";
"La sessione &egrave; scaduta.";
#elif L==8
"Sesja wygas&lstrok;a z powodu bezczynno&sacute;ci.";
"Sesja wygas&lstrok;a.";
#elif L==9
"A sess&atilde;o expirou devido &agrave; inatividade.";
"A sess&atilde;o expirou.";
#endif
const char *Txt_The_status_of_the_centre_X_has_changed = // Warning: it is very important to include %s in the following sentences

4
swad_user.c
View File

@ -2542,7 +2542,7 @@ bool Usr_GetParamOtherUsrCodEncryptedAndGetUsrData (void)
void Usr_ChkUsrAndGetUsrData (void)
{
extern const char *Txt_The_session_has_expired_due_to_inactivity;
extern const char *Txt_The_session_has_expired;
struct
{
bool PutForm;
@ -2562,7 +2562,7 @@ void Usr_ChkUsrAndGetUsrData (void)
{
Gbl.Action.Act = ActLogOut;
Tab_SetCurrentTab ();
Ale_ShowAlert (Ale_WARNING,Txt_The_session_has_expired_due_to_inactivity);
Ale_ShowAlert (Ale_WARNING,Txt_The_session_has_expired);
FormLogin.PutForm = true;
}
}