mirror of
https://github.com/acanas/swad-core.git
synced 2024-06-13 04:04:35 +02:00
Version 16.147.10
This commit is contained in:
parent
5395a78662
commit
3b54182e82
|
@ -2480,6 +2480,15 @@ a:hover img.CENTRE_PHOTO_SHOW
|
|||
text-overflow:ellipsis;
|
||||
}
|
||||
|
||||
/***************************** Listing of users ******************************/
|
||||
.USR_DAT
|
||||
{
|
||||
box-sizing:border-box;
|
||||
max-width:120px;
|
||||
overflow:hidden;
|
||||
text-overflow:ellipsis;
|
||||
}
|
||||
|
||||
/**************************** Enrollment requests ****************************/
|
||||
.REQUESTER_NAME
|
||||
{
|
||||
|
|
|
@ -197,13 +197,14 @@
|
|||
/****************************** Public constants *****************************/
|
||||
/*****************************************************************************/
|
||||
|
||||
#define Log_PLATFORM_VERSION "SWAD 16.147.9 (2017-03-06)"
|
||||
#define Log_PLATFORM_VERSION "SWAD 16.147.10 (2017-03-06)"
|
||||
#define CSS_FILE "swad16.147.css"
|
||||
#define JS_FILE "swad16.144.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.147.10:Mar 06, 2017 Changes in layout of users' listing. (216394 lines)
|
||||
Version 16.147.9: Mar 06, 2017 Changes in layout of header. (216389 lines)
|
||||
Version 16.147.8: Mar 05, 2017 Changes in layout of timetable. (216374 lines)
|
||||
Version 16.147.7: Mar 05, 2017 Changes in layout of social timeline. (216372 lines)
|
||||
|
|
33
swad_user.c
33
swad_user.c
|
@ -140,7 +140,6 @@ static void Usr_WriteRowGstAllData (struct UsrData *UsrDat);
|
|||
static void Usr_WriteRowStdAllData (struct UsrData *UsrDat,char *GroupNames);
|
||||
static void Usr_WriteRowTchAllData (struct UsrData *UsrDat);
|
||||
static void Usr_WriteRowAdmData (unsigned NumUsr,struct UsrData *UsrDat);
|
||||
static void Usr_RestrictLengthUsrName (struct UsrData *UsrDat);
|
||||
static void Usr_WriteMainUsrDataExceptUsrID (struct UsrData *UsrDat,
|
||||
const char *BgColor);
|
||||
static void Usr_WriteEmail (struct UsrData *UsrDat,const char *BgColor);
|
||||
|
@ -3203,7 +3202,6 @@ void Usr_WriteRowUsrMainData (unsigned NumUsr,struct UsrData *UsrDat,
|
|||
/***** Write rest of main user's data *****/
|
||||
Ins.InsCod = UsrDat->InsCod;
|
||||
Ins_GetDataOfInstitutionByCod (&Ins,Ins_GET_BASIC_DATA);
|
||||
Usr_RestrictLengthUsrName (UsrDat);
|
||||
Usr_WriteMainUsrDataExceptUsrID (UsrDat,BgColor);
|
||||
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE %s\">",BgColor);
|
||||
Ins_DrawInstitutionLogoWithLink (&Ins,25);
|
||||
|
@ -3551,7 +3549,6 @@ static void Usr_WriteRowAdmData (unsigned NumUsr,struct UsrData *UsrDat)
|
|||
/***** Write rest of main administrator's data *****/
|
||||
Ins.InsCod = UsrDat->InsCod;
|
||||
Ins_GetDataOfInstitutionByCod (&Ins,Ins_GET_BASIC_DATA);
|
||||
Usr_RestrictLengthUsrName (UsrDat);
|
||||
Usr_WriteMainUsrDataExceptUsrID (UsrDat,Gbl.ColorRows[Gbl.RowEvenOdd]);
|
||||
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE %s\">",Gbl.ColorRows[Gbl.RowEvenOdd]);
|
||||
Ins_DrawInstitutionLogoWithLink (&Ins,25);
|
||||
|
@ -3564,17 +3561,6 @@ static void Usr_WriteRowAdmData (unsigned NumUsr,struct UsrData *UsrDat)
|
|||
Usr_NUM_MAIN_FIELDS_DATA_ADM-1);
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
/***************** Restrict the length of the user's name ********************/
|
||||
/*****************************************************************************/
|
||||
|
||||
static void Usr_RestrictLengthUsrName (struct UsrData *UsrDat)
|
||||
{
|
||||
Str_LimitLengthHTMLStr (UsrDat->FirstName,10);
|
||||
Str_LimitLengthHTMLStr (UsrDat->Surname1,10);
|
||||
Str_LimitLengthHTMLStr (UsrDat->Surname2,10);
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
/************************* Write main data of a user *************************/
|
||||
/*****************************************************************************/
|
||||
|
@ -3630,23 +3616,36 @@ static void Usr_WriteUsrData (const char *BgColor,
|
|||
const char *Data,const char *Link,
|
||||
bool NonBreak,bool Accepted)
|
||||
{
|
||||
/***** Start table cell *****/
|
||||
fprintf (Gbl.F.Out,"<td class=\"%s LEFT_MIDDLE %s\">",
|
||||
Accepted ? (NonBreak ? "DAT_SMALL_NOBR_N" :
|
||||
"DAT_SMALL_N") :
|
||||
(NonBreak ? "DAT_SMALL_NOBR" :
|
||||
"DAT_SMALL"),
|
||||
BgColor);
|
||||
if (Link != NULL)
|
||||
|
||||
/***** Container to limit length *****/
|
||||
fprintf (Gbl.F.Out,"<div class=\"USR_DAT\">");
|
||||
|
||||
/***** Start link *****/
|
||||
if (Link)
|
||||
fprintf (Gbl.F.Out,"<a href=\"%s\" class=\"%s\" target=\"_blank\">",
|
||||
Link,
|
||||
Accepted ? "DAT_SMALL_NOBR_N" :
|
||||
"DAT_SMALL_NOBR");
|
||||
|
||||
/***** Write data *****/
|
||||
fprintf (Gbl.F.Out,"%s",Data);
|
||||
if (NonBreak)
|
||||
fprintf (Gbl.F.Out," ");
|
||||
if (Link != NULL)
|
||||
|
||||
/***** End link *****/
|
||||
if (Link)
|
||||
fprintf (Gbl.F.Out,"</a>");
|
||||
fprintf (Gbl.F.Out,"</td>");
|
||||
|
||||
/***** End container and table cell *****/
|
||||
fprintf (Gbl.F.Out,"</div>"
|
||||
"</td>");
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
|
Loading…
Reference in New Issue
Block a user