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

This commit is contained in:
Antonio Cañas Vargas 2016-04-23 15:15:06 +02:00
parent 7572f5c4cb
commit a44b447916
2 changed files with 30 additions and 16 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.15 (2016-04-23)"
#define Log_PLATFORM_VERSION "SWAD 15.202.16 (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.16:Apr 23, 2016 Code refactoring in record card. (201070 lines)
Version 15.202.15:Apr 23, 2016 Code refactoring in record card. (201059 lines)
Version 15.202.14:Apr 23, 2016 Code refactoring in record card. (201048 lines)
Version 15.202.13:Apr 23, 2016 Code refactoring in record card. (201037 lines)

43
swad_record.c
View File

@ -140,6 +140,8 @@ static void Rec_ShowCentre (struct UsrData *UsrDat,
bool ShowData,const char *ClassForm);
static void Rec_ShowDepartment (struct UsrData *UsrDat,
bool ShowData,const char *ClassForm);
static void Rec_ShowOffice (struct UsrData *UsrDat,
bool ShowData,const char *ClassForm);
static void Rec_WriteLinkToDataProtectionClause (void);
@ -2002,7 +2004,6 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
struct UsrData *UsrDat)
{
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *Txt_Office;
extern const char *Txt_Phone;
extern const char *Txt_Save_changes;
extern const char *Txt_Register;
@ -2178,20 +2179,8 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
/***** Department *****/
Rec_ShowDepartment (UsrDat,ShowData,ClassForm);
/* Office */
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_Office,
Rec_C2_BOTTOM);
if (ShowData)
fprintf (Gbl.F.Out,"%s",UsrDat->Tch.Office);
fprintf (Gbl.F.Out,"</td>"
"</tr>");
/***** Office *****/
Rec_ShowOffice (UsrDat,ShowData,ClassForm);
/* Phone */
fprintf (Gbl.F.Out,"<tr>"
@ -3446,6 +3435,30 @@ static void Rec_ShowDepartment (struct UsrData *UsrDat,
"</tr>");
}
/*****************************************************************************/
/*************************** Show user's office ******************************/
/*****************************************************************************/
static void Rec_ShowOffice (struct UsrData *UsrDat,
bool ShowData,const char *ClassForm)
{
extern const char *Txt_Office;
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_Office,
Rec_C2_BOTTOM);
if (ShowData)
fprintf (Gbl.F.Out,"%s",UsrDat->Tch.Office);
fprintf (Gbl.F.Out,"</td>"
"</tr>");
}
/*****************************************************************************/
/*********************** Write a link to netiquette rules ********************/
/*****************************************************************************/