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

This commit is contained in:
Antonio Cañas Vargas 2016-04-23 13:45:03 +02:00
parent 873b806d48
commit 5fa2727826
2 changed files with 40 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swad_changelog.h
View File

@ -134,13 +134,14 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 15.202.2 (2016-04-23)"
#define Log_PLATFORM_VERSION "SWAD 15.202.3 (2016-04-23)"
#define CSS_FILE "swad15.202.css"
#define JS_FILE "swad15.197.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.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.1: Apr 23, 2016 Code refactoring related to showing user's e-mail. (200887 lines)
Version 15.202: Apr 23, 2016 User's IDs are show in green or red.

61
swad_record.c
View File

@ -103,6 +103,9 @@ static void Rec_ShowSurname1 (struct UsrData *UsrDat,
Rec_RecordViewType_t TypeOfView,
bool DataForm,
const char *ClassForm);
static void Rec_ShowSurname2 (struct UsrData *UsrDat,
bool DataForm,
const char *ClassForm);
static void Rec_WriteLinkToDataProtectionClause (void);
@ -1965,7 +1968,6 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
struct UsrData *UsrDat)
{
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *Txt_Surname_2;
extern const char *Txt_First_name;
extern const char *Txt_Country;
extern const char *Txt_Another_country;
@ -2116,28 +2118,7 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
Rec_ShowSurname1 (UsrDat,TypeOfView,DataForm,ClassForm);
/* Surname 2 */
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s RIGHT_MIDDLE\""
" style=\"width:%upx;\">"
"%s:"
"</td>"
"<td class=\"REC_DAT_BOLD LEFT_MIDDLE\""
" style=\"width:%upx;\">",
ClassForm,Rec_C1_BOTTOM,
Txt_Surname_2,
Rec_C2_BOTTOM);
if (DataForm)
fprintf (Gbl.F.Out,"<input type=\"text\" name=\"Surname2\""
" maxlength=\"%u\" value=\"%s\""
" style=\"width:%upx;\" />",
Usr_MAX_LENGTH_USR_NAME_OR_SURNAME,
UsrDat->Surname2,
Rec_C2_BOTTOM - 20);
else if (UsrDat->Surname2[0])
fprintf (Gbl.F.Out,"<strong>%s</strong>",
UsrDat->Surname2);
fprintf (Gbl.F.Out,"</td>"
"</tr>");
Rec_ShowSurname2 (UsrDat,DataForm,ClassForm);
/* First name */
fprintf (Gbl.F.Out,"<tr>"
@ -3261,6 +3242,40 @@ static void Rec_ShowSurname1 (struct UsrData *UsrDat,
"</tr>");
}
/*****************************************************************************/
/*************************** Show user's surname 1 ***************************/
/*****************************************************************************/
static void Rec_ShowSurname2 (struct UsrData *UsrDat,
bool DataForm,
const char *ClassForm)
{
extern const char *Txt_Surname_2;
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s RIGHT_MIDDLE\""
" style=\"width:%upx;\">"
"%s:"
"</td>"
"<td class=\"REC_DAT_BOLD LEFT_MIDDLE\""
" style=\"width:%upx;\">",
ClassForm,Rec_C1_BOTTOM,
Txt_Surname_2,
Rec_C2_BOTTOM);
if (DataForm)
fprintf (Gbl.F.Out,"<input type=\"text\" name=\"Surname2\""
" maxlength=\"%u\" value=\"%s\""
" style=\"width:%upx;\" />",
Usr_MAX_LENGTH_USR_NAME_OR_SURNAME,
UsrDat->Surname2,
Rec_C2_BOTTOM - 20);
else if (UsrDat->Surname2[0])
fprintf (Gbl.F.Out,"<strong>%s</strong>",UsrDat->Surname2);
fprintf (Gbl.F.Out,"</td>"
"</tr>");
}
/*****************************************************************************/
/*********************** Write a link to netiquette rules ********************/
/*****************************************************************************/