",
- Rec_C2_TOP);
+ "
"
+ "");
if (UsrDat->Nickname[0])
{
if (PutFormLinks)
@@ -2617,9 +2605,7 @@ static void Rec_ShowNickname (struct UsrData *UsrDat,bool PutFormLinks)
static void Rec_ShowCountryInHead (struct UsrData *UsrDat,bool ShowData)
{
- fprintf (Gbl.F.Out,"
",
- Rec_C2_TOP);
+ fprintf (Gbl.F.Out," ");
if (ShowData && UsrDat->CtyCod > 0)
/* Link to see country information */
Cty_WriteCountryName (UsrDat->CtyCod,"REC_DAT_BOLD");
@@ -2633,8 +2619,7 @@ static void Rec_ShowCountryInHead (struct UsrData *UsrDat,bool ShowData)
static void Rec_ShowWebsAndSocialNets (struct UsrData *UsrDat,
Rec_RecordViewType_t TypeOfView)
{
- fprintf (Gbl.F.Out," ",
- Rec_C3_TOP);
+ fprintf (Gbl.F.Out," ");
if (TypeOfView != Rec_RECORD_PRINT)
Net_ShowWebsAndSocialNets (UsrDat);
fprintf (Gbl.F.Out," ");
@@ -2649,14 +2634,11 @@ static void Rec_ShowEmail (struct UsrData *UsrDat,const char *ClassForm)
extern const char *Txt_Email;
fprintf (Gbl.F.Out,""
- ""
+ " "
"%s:"
" "
- "",
- ClassForm,Rec_C1_BOTTOM,Txt_Email,
- Rec_C2_BOTTOM);
+ " ",
+ ClassForm,Txt_Email);
if (UsrDat->Email[0])
{
if (Mai_ICanSeeEmail (UsrDat))
@@ -2683,14 +2665,11 @@ static void Rec_ShowUsrIDs (struct UsrData *UsrDat,const char *ClassForm)
extern const char *Txt_ID;
fprintf (Gbl.F.Out," "
- ""
+ " "
"%s:"
" "
- "",
- ClassForm,Rec_C1_BOTTOM,Txt_ID,
- Rec_C2_BOTTOM);
+ " ",
+ ClassForm,Txt_ID);
ID_WriteUsrIDs (UsrDat);
fprintf (Gbl.F.Out," "
" ");
@@ -2720,14 +2699,10 @@ static void Rec_ShowRole (struct UsrData *UsrDat,
if (RoleForm)
{
fprintf (Gbl.F.Out,""
- ""
+ " "
"%s: "
- "",
- ClassForm,Rec_C1_BOTTOM,
- Txt_Role,
- Rec_C2_BOTTOM);
+ " ",
+ ClassForm,Txt_Role);
switch (TypeOfView)
{
case Rec_FORM_SIGN_UP: // I want to apply for enrollment
@@ -2858,14 +2833,10 @@ static void Rec_ShowRole (struct UsrData *UsrDat,
else if (SexForm)
{
fprintf (Gbl.F.Out," "
- ""
+ " "
"%s*: "
- "",
- ClassForm,Rec_C1_BOTTOM,
- Txt_Sex,
- Rec_C2_BOTTOM);
+ " ",
+ ClassForm,Txt_Sex);
for (Sex = Usr_SEX_FEMALE;
Sex <= Usr_SEX_MALE;
Sex++)
@@ -2888,19 +2859,16 @@ static void Rec_ShowRole (struct UsrData *UsrDat,
}
else // RoleForm == false, SexForm == false
fprintf (Gbl.F.Out," "
- ""
+ " "
"%s:"
" "
- ""
+ " "
"%s"
" "
" ",
- ClassForm,Rec_C1_BOTTOM,
+ ClassForm,
TypeOfView == Rec_MY_COMMON_RECORD_CHECK ? Txt_Sex :
Txt_Role,
- Rec_C2_BOTTOM,
TypeOfView == Rec_MY_COMMON_RECORD_CHECK ? Txt_SEX_SINGULAR_Abc[UsrDat->Sex] :
Txt_ROLES_SINGUL_Abc[UsrDat->RoleInCurrentCrsDB][UsrDat->Sex]);
}
@@ -2917,23 +2885,19 @@ static void Rec_ShowSurname1 (struct UsrData *UsrDat,
extern const char *Txt_Surname_1;
fprintf (Gbl.F.Out,""
- ""
+ " "
"%s",
- ClassForm,Rec_C1_BOTTOM,Txt_Surname_1);
+ ClassForm,Txt_Surname_1);
if (TypeOfView == Rec_FORM_MY_COMMON_RECORD)
fprintf (Gbl.F.Out,"*");
fprintf (Gbl.F.Out,": "
- "",
- Rec_C2_BOTTOM);
+ " ");
if (DataForm)
fprintf (Gbl.F.Out," ",
+ " class=\"REC_C2_BOT_INPUT\" />",
Usr_MAX_LENGTH_USR_NAME_OR_SURNAME,
- UsrDat->Surname1,
- Rec_C2_BOTTOM - 20);
+ UsrDat->Surname1);
else if (UsrDat->Surname1[0])
fprintf (Gbl.F.Out,"%s ",UsrDat->Surname1);
fprintf (Gbl.F.Out," "
@@ -2952,22 +2916,17 @@ static void Rec_ShowSurname2 (struct UsrData *UsrDat,
extern const char *Txt_Surname_2;
fprintf (Gbl.F.Out," "
- ""
+ " "
"%s:"
" "
- "",
- ClassForm,Rec_C1_BOTTOM,
- Txt_Surname_2,
- Rec_C2_BOTTOM);
+ " ",
+ ClassForm,Txt_Surname_2);
if (DataForm)
fprintf (Gbl.F.Out," ",
+ " class=\"REC_C2_BOT_INPUT\" />",
Usr_MAX_LENGTH_USR_NAME_OR_SURNAME,
- UsrDat->Surname2,
- Rec_C2_BOTTOM - 20);
+ UsrDat->Surname2);
else if (UsrDat->Surname2[0])
fprintf (Gbl.F.Out,"%s ",UsrDat->Surname2);
fprintf (Gbl.F.Out," "
@@ -2986,23 +2945,20 @@ static void Rec_ShowFirstName (struct UsrData *UsrDat,
extern const char *Txt_First_name;
fprintf (Gbl.F.Out," "
- ""
+ " "
"%s",
- ClassForm,Rec_C1_BOTTOM,Txt_First_name);
+ ClassForm,Txt_First_name);
if (TypeOfView == Rec_FORM_MY_COMMON_RECORD)
fprintf (Gbl.F.Out,"*");
fprintf (Gbl.F.Out,": "
- "",
- Rec_C2_BOTTOM);
+ " ");
if (DataForm)
fprintf (Gbl.F.Out," ",
+ " class=\"REC_C2_BOT_INPUT\" />",
Usr_MAX_LENGTH_USR_NAME_OR_SURNAME,
- UsrDat->FirstName,
- Rec_C2_BOTTOM - 20);
+ UsrDat->FirstName);
else if (UsrDat->FirstName[0])
fprintf (Gbl.F.Out,"%s ",UsrDat->FirstName);
fprintf (Gbl.F.Out," "
@@ -3029,23 +2985,19 @@ static void Rec_ShowCountry (struct UsrData *UsrDat,
}
fprintf (Gbl.F.Out," "
- ""
+ " "
"%s",
- ClassForm,Rec_C1_BOTTOM,Txt_Country);
+ ClassForm,Txt_Country);
if (TypeOfView == Rec_FORM_MY_COMMON_RECORD)
fprintf (Gbl.F.Out,"*");
fprintf (Gbl.F.Out,": "
- "",
- Rec_C2_BOTTOM);
+ " ");
/***** Selector of country *****/
- fprintf (Gbl.F.Out,""
+ fprintf (Gbl.F.Out,""
"%s "
"CtyCod == 0)
fprintf (Gbl.F.Out," selected=\"selected\"");
@@ -3077,23 +3029,19 @@ static void Rec_ShowOriginPlace (struct UsrData *UsrDat,
extern const char *Txt_Place_of_origin;
fprintf (Gbl.F.Out,""
- ""
+ " "
"%s:"
" "
- "",
- ClassForm,Rec_C1_BOTTOM,Txt_Place_of_origin,
- Rec_C2_BOTTOM);
+ " ",
+ ClassForm,Txt_Place_of_origin);
if (ShowData)
{
if (DataForm)
fprintf (Gbl.F.Out," ",
+ " class=\"REC_C2_BOT_INPUT\" />",
Cns_MAX_LENGTH_STRING,
- UsrDat->OriginPlace,
- Rec_C2_BOTTOM - 20);
+ UsrDat->OriginPlace);
else if (UsrDat->OriginPlace[0])
fprintf (Gbl.F.Out,"%s",UsrDat->OriginPlace);
}
@@ -3112,14 +3060,11 @@ static void Rec_ShowDateOfBirth (struct UsrData *UsrDat,
extern const char *Txt_Date_of_birth;
fprintf (Gbl.F.Out," "
- ""
+ " "
"%s:"
" "
- "",
- ClassForm,Rec_C1_BOTTOM,Txt_Date_of_birth,
- Rec_C2_BOTTOM);
+ " ",
+ ClassForm,Txt_Date_of_birth);
if (ShowData)
{
if (DataForm)
@@ -3146,23 +3091,19 @@ static void Rec_ShowLocalAddress (struct UsrData *UsrDat,
extern const char *Txt_Local_address;
fprintf (Gbl.F.Out," "
- ""
+ " "
"%s:"
" "
- "",
- ClassForm,Rec_C1_BOTTOM,Txt_Local_address,
- Rec_C2_BOTTOM);
+ " ",
+ ClassForm,Txt_Local_address);
if (ShowData)
{
if (DataForm)
fprintf (Gbl.F.Out," ",
+ " class=\"REC_C2_BOT_INPUT\" />",
Cns_MAX_LENGTH_STRING,
- UsrDat->LocalAddress,
- Rec_C2_BOTTOM - 20);
+ UsrDat->LocalAddress);
else if (UsrDat->LocalAddress[0])
fprintf (Gbl.F.Out,"%s",UsrDat->LocalAddress);
}
@@ -3181,23 +3122,19 @@ static void Rec_ShowLocalPhone (struct UsrData *UsrDat,
extern const char *Txt_Phone;
fprintf (Gbl.F.Out," "
- ""
+ " "
"%s:"
" "
- "",
- ClassForm,Rec_C1_BOTTOM,Txt_Phone,
- Rec_C2_BOTTOM);
+ " ",
+ ClassForm,Txt_Phone);
if (ShowData)
{
if (DataForm)
fprintf (Gbl.F.Out," ",
+ " class=\"REC_C2_BOT_INPUT\" />",
Usr_MAX_LENGTH_PHONE,
- UsrDat->LocalPhone,
- Rec_C2_BOTTOM - 20);
+ UsrDat->LocalPhone);
else if (UsrDat->LocalPhone[0])
fprintf (Gbl.F.Out,"%s",UsrDat->LocalPhone);
}
@@ -3216,23 +3153,19 @@ static void Rec_ShowFamilyAddress (struct UsrData *UsrDat,
extern const char *Txt_Family_address;
fprintf (Gbl.F.Out," "
- ""
+ " "
"%s:"
" "
- "",
- ClassForm,Rec_C1_BOTTOM,Txt_Family_address,
- Rec_C2_BOTTOM);
+ " ",
+ ClassForm,Txt_Family_address);
if (ShowData)
{
if (DataForm)
fprintf (Gbl.F.Out," ",
+ " class=\"REC_C2_BOT_INPUT\" />",
Cns_MAX_LENGTH_STRING,
- UsrDat->FamilyAddress,
- Rec_C2_BOTTOM - 20);
+ UsrDat->FamilyAddress);
else if (UsrDat->FamilyAddress[0])
fprintf (Gbl.F.Out,"%s",UsrDat->FamilyAddress);
}
@@ -3251,23 +3184,19 @@ static void Rec_ShowFamilyPhone (struct UsrData *UsrDat,
extern const char *Txt_Phone;
fprintf (Gbl.F.Out," "
- ""
+ " "
"%s:"
" "
- "",
- ClassForm,Rec_C1_BOTTOM,Txt_Phone,
- Rec_C2_BOTTOM);
+ " ",
+ ClassForm,Txt_Phone);
if (ShowData)
{
if (DataForm)
fprintf (Gbl.F.Out," ",
+ " class=\"REC_C2_BOT_INPUT\" />",
Usr_MAX_LENGTH_PHONE,
- UsrDat->FamilyPhone,
- Rec_C2_BOTTOM - 20);
+ UsrDat->FamilyPhone);
else if (UsrDat->FamilyPhone[0])
fprintf (Gbl.F.Out,"%s",UsrDat->FamilyPhone);
}
@@ -3286,22 +3215,18 @@ static void Rec_ShowComments (struct UsrData *UsrDat,
extern const char *Txt_USER_comments;
fprintf (Gbl.F.Out," "
- ""
+ " "
"%s:"
" "
- "",
- ClassForm,Rec_C1_BOTTOM,Txt_USER_comments,
- Rec_C2_BOTTOM);
+ " ",
+ ClassForm,Txt_USER_comments);
if (ShowData)
{
if (DataForm)
fprintf (Gbl.F.Out,"",
- Rec_C2_BOTTOM - 20,
UsrDat->Comments);
else if (UsrDat->Comments[0])
{
@@ -3324,14 +3249,11 @@ static void Rec_ShowInstitution (struct Institution *Ins,
extern const char *Txt_Institution;
fprintf (Gbl.F.Out," "
- ""
+ " "
"%s:"
" "
- "",
- ClassForm,Rec_C1_BOTTOM,Txt_Institution,
- Rec_C2_BOTTOM);
+ " ",
+ ClassForm,Txt_Institution);
if (ShowData)
{
if (Ins->InsCod > 0)
@@ -3360,14 +3282,11 @@ static void Rec_ShowCentre (struct UsrData *UsrDat,
struct Centre Ctr;
fprintf (Gbl.F.Out," "
- ""
+ " "
"%s:"
" "
- "",
- ClassForm,Rec_C1_BOTTOM,Txt_Centre,
- Rec_C2_BOTTOM);
+ " ",
+ ClassForm,Txt_Centre);
if (ShowData)
{
if (UsrDat->Tch.CtrCod > 0)
@@ -3398,14 +3317,11 @@ static void Rec_ShowDepartment (struct UsrData *UsrDat,
struct Department Dpt;
fprintf (Gbl.F.Out," "
- ""
+ " "
"%s:"
" "
- "",
- ClassForm,Rec_C1_BOTTOM,Txt_Department,
- Rec_C2_BOTTOM);
+ " ",
+ ClassForm,Txt_Department);
if (ShowData)
{
if (UsrDat->Tch.DptCod > 0)
@@ -3435,14 +3351,11 @@ static void Rec_ShowOffice (struct UsrData *UsrDat,
extern const char *Txt_Office;
fprintf (Gbl.F.Out," "
- ""
+ " "
"%s:"
" "
- "",
- ClassForm,Rec_C1_BOTTOM,Txt_Office,
- Rec_C2_BOTTOM);
+ " ",
+ ClassForm,Txt_Office);
if (ShowData)
fprintf (Gbl.F.Out,"%s",UsrDat->Tch.Office);
fprintf (Gbl.F.Out," "
@@ -3459,14 +3372,11 @@ static void Rec_ShowOfficePhone (struct UsrData *UsrDat,
extern const char *Txt_Phone;
fprintf (Gbl.F.Out," "
- ""
+ " "
"%s:"
" "
- "",
- ClassForm,Rec_C1_BOTTOM,Txt_Phone,
- Rec_C2_BOTTOM);
+ " ",
+ ClassForm,Txt_Phone);
if (ShowData)
fprintf (Gbl.F.Out,"%s",UsrDat->Tch.OfficePhone);
fprintf (Gbl.F.Out," "
diff --git a/swad_record.h b/swad_record.h
index cc0ad483f..1fa75137c 100644
--- a/swad_record.h
+++ b/swad_record.h
@@ -36,11 +36,6 @@
/*****************************************************************************/
#define Rec_RECORD_WIDTH 560
-#define Rec_C1_TOP 68
-#define Rec_C2_TOP 300
-#define Rec_C3_TOP 192
-#define Rec_C1_BOTTOM (190-2)
-#define Rec_C2_BOTTOM (370-2)
#define Rec_MAX_LENGTH_NAME_FIELD 255
#define Rec_MIN_LINES_IN_EDITION_FIELD 1