diff --git a/swad_changelog.h b/swad_changelog.h
index d3a8f1e16..e2b188ff5 100644
--- a/swad_changelog.h
+++ b/swad_changelog.h
@@ -108,7 +108,8 @@
// 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)
+TODO: Show my course record card when I am a student and I click on record icon on the left of my record card?
+ Version 14.104.1: Mar 29, 2015 Changes in layout of record cards. (184039 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:
diff --git a/swad_record.c b/swad_record.c
index 2f63533d3..cd7a8901f 100644
--- a/swad_record.c
+++ b/swad_record.c
@@ -1892,15 +1892,14 @@ void Rec_ShowFormMyCommRecord (void)
/***** Buttons for edition *****/
fprintf (Gbl.F.Out,"
");
Rec_PutLinkToMyCrsRecord (); // Put link (form) to my record in this course
- Pho_PutLinkToChangeUsrPhoto (&Gbl.Usrs.Me.UsrDat); // Put link (form) to change my photo
Rec_PutLinkToChangeMyInsCtrDpt (); // Put link (form) to change my institution, centre, department...
Rec_PutLinkToChangeMySocialNetworks (); // Put link (form) to change my social networks
+ Pho_PutLinkToChangeUsrPhoto (&Gbl.Usrs.Me.UsrDat); // Put link (form) to change my photo
Pri_PutLinkToChangeMyPrivacy (); // Put link (form) to change my privacy
/***** My record *****/
Rec_ShowSharedUsrRecord (Rec_FORM_MY_COMMON_RECORD,&Gbl.Usrs.Me.UsrDat);
Rec_WriteLinkToDataProtectionClause ();
- Act_FormEnd ();
fprintf (Gbl.F.Out,"
");
}
@@ -2003,6 +2002,7 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
{
extern const char *Usr_StringsSexDB[Usr_NUM_SEXS];
extern const char *The_ClassFormul[The_NUM_THEMES];
+ extern const char *Txt_Edit;
extern const char *Txt_View_record_card;
extern const char *Txt_Admin_user;
extern const char *Txt_ID;
@@ -2119,15 +2119,10 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
switch (TypeOfView)
{
case Rec_FORM_SIGN_UP:
- 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:
ClassHead = "HEAD_REC";
@@ -2252,12 +2247,26 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
{
fprintf (Gbl.F.Out,"");
- /***** Button to view user's record card when:
- - viewing public profile &&
- - a course is selected &&
- - the user belongs to it &&
- - I belong to it or I am system admin *****/
- if (TypeOfView == Rec_RECORD_PUBLIC &&
+ /***** Button to edit my record card *****/
+ if (ItsMe && TypeOfView != Rec_FORM_MY_COMMON_RECORD)
+ {
+ Act_FormStart (ActReqEdiRecCom);
+ Act_LinkFormSubmit (Txt_Edit,NULL);
+ fprintf (Gbl.F.Out,"
"
+ "
![\"%s\"](\"%s/edit16x16.gif\"")
"
+ "
"
+ "",
+ Gbl.Prefs.IconsURL,
+ Txt_Edit);
+ Act_FormEnd ();
+ }
+
+ /***** Button to view user's record card in course when:
+ - not already viewing user's record card in course &&
+ - a course is selected && the user belongs to it &&
+ - I can view user's record card in course *****/
+ if (TypeOfView != Rec_RECORD_LIST &&
HeBelongsToCurrentCrs &&
(IAmLoggedAsStudent ||
IAmLoggedAsTeacher ||
@@ -2481,8 +2490,12 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
ShowTeacherRows)
{
fprintf (Gbl.F.Out,"
"
- ""
- "");
+ "");
+
+ if (TypeOfView == Rec_FORM_MY_COMMON_RECORD)
+ Act_FormStart (ActChgMyData);
+
+ fprintf (Gbl.F.Out,"");
if (ShowIDRows)
{
@@ -3087,17 +3100,14 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
fprintf (Gbl.F.Out,""
"");
}
+ fprintf (Gbl.F.Out," ");
- fprintf (Gbl.F.Out," | "
- " | "
- "
");
- }
+ if (TypeOfView == Rec_FORM_MY_COMMON_RECORD)
+ {
+ Lay_PutConfirmButton (Txt_Save_changes);
+ Act_FormEnd ();
+ }
- if (TypeOfView == Rec_FORM_MY_COMMON_RECORD)
- {
- fprintf (Gbl.F.Out,"
"
- "");
- Lay_PutConfirmButton (Txt_Save_changes);
fprintf (Gbl.F.Out," | "
"
");
}