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 14.104

This commit is contained in:
Antonio Cañas Vargas 2015-03-29 14:09:23 +02:00
parent ba28858f22
commit 57a84d29ef
2 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swad_changelog.h
View File

@ -103,11 +103,12 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 14.104 (2015/03/29)"
#define Log_PLATFORM_VERSION "SWAD 14.104.1 (2015/03/29)"
// 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 14.104.1: Mar 29, 2015 Changes in layout of record cards. (? lines)
Version 14.104: Mar 29, 2015 Changes in layout of record cards. (184021 lines)
Version 14.103: Mar 29, 2015 New table to ban users out of ranking. (184014 lines)
1 change necessary in database:

40
swad_record.c
View File

@ -1879,7 +1879,6 @@ void Rec_ShowFormMyCommRecord (void)
extern const char *Txt_Please_fill_in_your_record_card_including_your_country_nationality;
extern const char *Txt_Please_fill_in_your_record_card_including_your_sex;
extern const char *Txt_Please_fill_in_your_record_card_including_your_name;
extern const char *Txt_Save_changes;
/***** If user has no sex, name and surname... *****/
if (Gbl.Usrs.Me.UsrDat.CtyCod < 0)
@ -1899,9 +1898,7 @@ void Rec_ShowFormMyCommRecord (void)
Pri_PutLinkToChangeMyPrivacy (); // Put link (form) to change my privacy
/***** My record *****/
Act_FormStart (ActChgMyData);
Rec_ShowSharedUsrRecord (Rec_FORM_MY_COMMON_RECORD,&Gbl.Usrs.Me.UsrDat);
Lay_PutConfirmButton (Txt_Save_changes);
Rec_WriteLinkToDataProtectionClause ();
Act_FormEnd ();
fprintf (Gbl.F.Out,"</div>");
@ -2037,6 +2034,7 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
extern const char *Txt_Local_address;
extern const char *Txt_Family_address;
extern const char *Txt_USER_comments;
extern const char *Txt_Save_changes;
unsigned RecordWidth;
unsigned TopC1Width;
unsigned TopC2Width;
@ -2121,26 +2119,29 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
switch (TypeOfView)
{
case Rec_FORM_SIGN_UP:
case Rec_FORM_MY_COMMON_RECORD:
ClassHead = "HEAD_REC";
ClassForm = The_ClassFormul[Gbl.Prefs.Theme];
ClassData = "DAT_REC";
break;
case Rec_FORM_MY_COMMON_RECORD:
ClassHead = "HEAD_REC";
ClassForm = The_ClassFormul[Gbl.Prefs.Theme];
ClassData = "DAT_REC";
Act_FormStart (ActChgMyData);
break;
case Rec_FORM_NEW_RECORD_OTHER_NEW_USR:
case Rec_FORM_MODIFY_RECORD_OTHER_EXISTING_USR:
if (TypeOfView == Rec_FORM_NEW_RECORD_OTHER_NEW_USR)
{
Act_FormStart (ActCreOthUsrDat);
ID_PutParamOtherUsrIDPlain (); // New user
}
else
{
Act_FormStart (ActUpdOthUsrDat);
Usr_PutParamOtherUsrCodEncrypted (Gbl.Usrs.Other.UsrDat.EncryptedUsrCod); // Existing user
}
ClassHead = "HEAD_REC";
ClassForm = The_ClassFormul[Gbl.Prefs.Theme];
ClassData = "DAT_REC";
Act_FormStart (ActCreOthUsrDat);
ID_PutParamOtherUsrIDPlain (); // New user
break;
case Rec_FORM_MODIFY_RECORD_OTHER_EXISTING_USR:
ClassHead = "HEAD_REC";
ClassForm = The_ClassFormul[Gbl.Prefs.Theme];
ClassData = "DAT_REC";
Act_FormStart (ActUpdOthUsrDat);
Usr_PutParamOtherUsrCodEncrypted (Gbl.Usrs.Other.UsrDat.EncryptedUsrCod); // Existing user
break;
case Rec_MY_COMMON_RECORD_CHECK:
case Rec_OTHER_USR_COMMON_RECORD_CHECK:
@ -3092,6 +3093,15 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
"</tr>");
}
if (TypeOfView == Rec_FORM_MY_COMMON_RECORD)
{
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"3\" style=\"text-align:center;\">");
Lay_PutConfirmButton (Txt_Save_changes);
fprintf (Gbl.F.Out,"</td>"
"</tr>");
}
/***** End frame *****/
Lay_EndRoundFrameTable10 ();
}