mirror of
https://github.com/acanas/swad-core.git
synced 2024-06-03 07:15:26 +02:00
Version 15.202.4
This commit is contained in:
parent
5fa2727826
commit
e7c8cac631
|
@ -134,13 +134,14 @@
|
||||||
/****************************** Public constants *****************************/
|
/****************************** Public constants *****************************/
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
|
||||||
#define Log_PLATFORM_VERSION "SWAD 15.202.3 (2016-04-23)"
|
#define Log_PLATFORM_VERSION "SWAD 15.202.4 (2016-04-23)"
|
||||||
#define CSS_FILE "swad15.202.css"
|
#define CSS_FILE "swad15.202.css"
|
||||||
#define JS_FILE "swad15.197.js"
|
#define JS_FILE "swad15.197.js"
|
||||||
|
|
||||||
// Number of lines (includes comments but not blank lines) has been got with the following command:
|
// 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
|
// nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*.h sql/swad*.sql | tail -1
|
||||||
/*
|
/*
|
||||||
|
Version 15.202.4: Apr 23, 2016 Code refactoring in record card. (200926 lines)
|
||||||
Version 15.202.3: Apr 23, 2016 Code refactoring in record card. (200911 lines)
|
Version 15.202.3: Apr 23, 2016 Code refactoring in record card. (200911 lines)
|
||||||
Version 15.202.2: Apr 23, 2016 Code refactoring in record card. (200899 lines)
|
Version 15.202.2: Apr 23, 2016 Code refactoring in record card. (200899 lines)
|
||||||
Version 15.202.1: Apr 23, 2016 Code refactoring related to showing user's e-mail. (200887 lines)
|
Version 15.202.1: Apr 23, 2016 Code refactoring related to showing user's e-mail. (200887 lines)
|
||||||
|
|
|
@ -106,6 +106,10 @@ static void Rec_ShowSurname1 (struct UsrData *UsrDat,
|
||||||
static void Rec_ShowSurname2 (struct UsrData *UsrDat,
|
static void Rec_ShowSurname2 (struct UsrData *UsrDat,
|
||||||
bool DataForm,
|
bool DataForm,
|
||||||
const char *ClassForm);
|
const char *ClassForm);
|
||||||
|
static void Rec_ShowFirstName (struct UsrData *UsrDat,
|
||||||
|
Rec_RecordViewType_t TypeOfView,
|
||||||
|
bool DataForm,
|
||||||
|
const char *ClassForm);
|
||||||
|
|
||||||
static void Rec_WriteLinkToDataProtectionClause (void);
|
static void Rec_WriteLinkToDataProtectionClause (void);
|
||||||
|
|
||||||
|
@ -1968,7 +1972,6 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
|
||||||
struct UsrData *UsrDat)
|
struct UsrData *UsrDat)
|
||||||
{
|
{
|
||||||
extern const char *The_ClassForm[The_NUM_THEMES];
|
extern const char *The_ClassForm[The_NUM_THEMES];
|
||||||
extern const char *Txt_First_name;
|
|
||||||
extern const char *Txt_Country;
|
extern const char *Txt_Country;
|
||||||
extern const char *Txt_Another_country;
|
extern const char *Txt_Another_country;
|
||||||
extern const char *Txt_Place_of_origin;
|
extern const char *Txt_Place_of_origin;
|
||||||
|
@ -2121,28 +2124,7 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
|
||||||
Rec_ShowSurname2 (UsrDat,DataForm,ClassForm);
|
Rec_ShowSurname2 (UsrDat,DataForm,ClassForm);
|
||||||
|
|
||||||
/* First name */
|
/* First name */
|
||||||
fprintf (Gbl.F.Out,"<tr>"
|
Rec_ShowFirstName (UsrDat,TypeOfView,DataForm,ClassForm);
|
||||||
"<td class=\"%s RIGHT_MIDDLE\""
|
|
||||||
" style=\"width:%upx;\">"
|
|
||||||
"%s",
|
|
||||||
ClassForm,Rec_C1_BOTTOM,Txt_First_name);
|
|
||||||
if (TypeOfView == Rec_FORM_MY_COMMON_RECORD)
|
|
||||||
fprintf (Gbl.F.Out,"*");
|
|
||||||
fprintf (Gbl.F.Out,":</td>"
|
|
||||||
"<td colspan=\"2\" class=\"REC_DAT_BOLD LEFT_MIDDLE\""
|
|
||||||
" style=\"width:%upx;\">",
|
|
||||||
Rec_C2_BOTTOM);
|
|
||||||
if (DataForm)
|
|
||||||
fprintf (Gbl.F.Out,"<input type=\"text\" name=\"FirstName\""
|
|
||||||
" maxlength=\"%u\" value=\"%s\""
|
|
||||||
" style=\"width:%upx;\" />",
|
|
||||||
Usr_MAX_LENGTH_USR_NAME_OR_SURNAME,
|
|
||||||
UsrDat->FirstName,
|
|
||||||
Rec_C2_BOTTOM - 20);
|
|
||||||
else if (UsrDat->FirstName[0])
|
|
||||||
fprintf (Gbl.F.Out,"<strong>%s</strong>",UsrDat->FirstName);
|
|
||||||
fprintf (Gbl.F.Out,"</td>"
|
|
||||||
"</tr>");
|
|
||||||
|
|
||||||
/* Country */
|
/* Country */
|
||||||
if (CountryForm)
|
if (CountryForm)
|
||||||
|
@ -3244,7 +3226,7 @@ static void Rec_ShowSurname1 (struct UsrData *UsrDat,
|
||||||
|
|
||||||
|
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
/*************************** Show user's surname 1 ***************************/
|
/*************************** Show user's surname 2 ***************************/
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
|
||||||
static void Rec_ShowSurname2 (struct UsrData *UsrDat,
|
static void Rec_ShowSurname2 (struct UsrData *UsrDat,
|
||||||
|
@ -3276,6 +3258,41 @@ static void Rec_ShowSurname2 (struct UsrData *UsrDat,
|
||||||
"</tr>");
|
"</tr>");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*****************************************************************************/
|
||||||
|
/************************** Show user's first name ***************************/
|
||||||
|
/*****************************************************************************/
|
||||||
|
|
||||||
|
static void Rec_ShowFirstName (struct UsrData *UsrDat,
|
||||||
|
Rec_RecordViewType_t TypeOfView,
|
||||||
|
bool DataForm,
|
||||||
|
const char *ClassForm)
|
||||||
|
{
|
||||||
|
extern const char *Txt_First_name;
|
||||||
|
|
||||||
|
fprintf (Gbl.F.Out,"<tr>"
|
||||||
|
"<td class=\"%s RIGHT_MIDDLE\""
|
||||||
|
" style=\"width:%upx;\">"
|
||||||
|
"%s",
|
||||||
|
ClassForm,Rec_C1_BOTTOM,Txt_First_name);
|
||||||
|
if (TypeOfView == Rec_FORM_MY_COMMON_RECORD)
|
||||||
|
fprintf (Gbl.F.Out,"*");
|
||||||
|
fprintf (Gbl.F.Out,":</td>"
|
||||||
|
"<td colspan=\"2\" class=\"REC_DAT_BOLD LEFT_MIDDLE\""
|
||||||
|
" style=\"width:%upx;\">",
|
||||||
|
Rec_C2_BOTTOM);
|
||||||
|
if (DataForm)
|
||||||
|
fprintf (Gbl.F.Out,"<input type=\"text\" name=\"FirstName\""
|
||||||
|
" maxlength=\"%u\" value=\"%s\""
|
||||||
|
" style=\"width:%upx;\" />",
|
||||||
|
Usr_MAX_LENGTH_USR_NAME_OR_SURNAME,
|
||||||
|
UsrDat->FirstName,
|
||||||
|
Rec_C2_BOTTOM - 20);
|
||||||
|
else if (UsrDat->FirstName[0])
|
||||||
|
fprintf (Gbl.F.Out,"<strong>%s</strong>",UsrDat->FirstName);
|
||||||
|
fprintf (Gbl.F.Out,"</td>"
|
||||||
|
"</tr>");
|
||||||
|
}
|
||||||
|
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
/*********************** Write a link to netiquette rules ********************/
|
/*********************** Write a link to netiquette rules ********************/
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
|
Loading…
Reference in New Issue
Block a user