mirror of
https://github.com/acanas/swad-core.git
synced 2024-06-03 07:15:26 +02:00
Version 18.1.6
This commit is contained in:
parent
0f4ab91c12
commit
9a04df45c6
|
@ -3139,7 +3139,7 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] =
|
||||||
|
|
||||||
/* ActChgMyData */{ 298,-1,TabUnk,ActReqEdiRecCom ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,Rec_UpdateMyRecord ,Rec_ShowMySharedRecordUpd ,NULL},
|
/* ActChgMyData */{ 298,-1,TabUnk,ActReqEdiRecCom ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,Rec_UpdateMyRecord ,Rec_ShowMySharedRecordUpd ,NULL},
|
||||||
|
|
||||||
/* ActReqMyPho */{ 30,-1,TabUnk,ActReqEdiRecCom ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Pho_ReqMyPhotoWithContextLinks ,NULL},
|
/* ActReqMyPho */{ 30,-1,TabUnk,ActReqEdiRecCom ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Pho_ReqMyPhoto ,NULL},
|
||||||
/* ActDetMyPho */{ 693,-1,TabUnk,ActReqEdiRecCom ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_DATA,Act_BRW_1ST_TAB,NULL ,Pho_RecMyPhotoDetFaces ,NULL},
|
/* ActDetMyPho */{ 693,-1,TabUnk,ActReqEdiRecCom ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_DATA,Act_BRW_1ST_TAB,NULL ,Pho_RecMyPhotoDetFaces ,NULL},
|
||||||
/* ActUpdMyPho */{ 694,-1,TabUnk,ActReqEdiRecCom ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,Pho_UpdateMyPhoto1 ,Pho_UpdateMyPhoto2 ,NULL},
|
/* ActUpdMyPho */{ 694,-1,TabUnk,ActReqEdiRecCom ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,Pho_UpdateMyPhoto1 ,Pho_UpdateMyPhoto2 ,NULL},
|
||||||
/* ActReqRemMyPho */{1577,-1,TabUnk,ActReqEdiRecCom ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Pho_ReqRemoveMyPhoto ,NULL},
|
/* ActReqRemMyPho */{1577,-1,TabUnk,ActReqEdiRecCom ,0x3F8,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,0x3C6,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Pho_ReqRemoveMyPhoto ,NULL},
|
||||||
|
|
|
@ -355,11 +355,12 @@ En OpenSWAD:
|
||||||
ps2pdf source.ps destination.pdf
|
ps2pdf source.ps destination.pdf
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define Log_PLATFORM_VERSION "SWAD 18.1.5 (2018-10-07)"
|
#define Log_PLATFORM_VERSION "SWAD 18.1.6 (2018-10-07)"
|
||||||
#define CSS_FILE "swad17.25.4.css"
|
#define CSS_FILE "swad17.25.4.css"
|
||||||
#define JS_FILE "swad17.17.1.js"
|
#define JS_FILE "swad17.17.1.js"
|
||||||
/*
|
/*
|
||||||
Version 18.1.5: Oct 07, 2018 Icon to change user's provacy is moved to record card. (234958 lines)
|
Version 18.1.6: Oct 07, 2018 Icon to change user's institution is moved to record card. (234963 lines)
|
||||||
|
Version 18.1.5: Oct 07, 2018 Icon to change user's privacy is moved to record card. (234958 lines)
|
||||||
Version 18.1.4: Oct 07, 2018 Icon to change user's photo is moved to record card. (234955 lines)
|
Version 18.1.4: Oct 07, 2018 Icon to change user's photo is moved to record card. (234955 lines)
|
||||||
Version 18.1.3: Oct 07, 2018 Changes in statistic graphs. (234965 lines)
|
Version 18.1.3: Oct 07, 2018 Changes in statistic graphs. (234965 lines)
|
||||||
Version 18.1.2: Oct 07, 2018 Changes in statistic graphs. (234964 lines)
|
Version 18.1.2: Oct 07, 2018 Changes in statistic graphs. (234964 lines)
|
||||||
|
|
|
@ -278,7 +278,7 @@ void Net_PutLinkToChangeMySocialNetworks (void)
|
||||||
/***** Link to edit my social networks *****/
|
/***** Link to edit my social networks *****/
|
||||||
Lay_PutContextualLink (ActReqEdiMyNet,NULL,NULL,
|
Lay_PutContextualLink (ActReqEdiMyNet,NULL,NULL,
|
||||||
"earth64x64.gif",
|
"earth64x64.gif",
|
||||||
Txt_Edit_my_webs_networks,Txt_Edit_my_webs_networks,
|
Txt_Edit_my_webs_networks,NULL,
|
||||||
NULL);
|
NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
45
swad_photo.c
45
swad_photo.c
|
@ -87,8 +87,9 @@ const char *Pho_StrAvgPhotoPrograms[Pho_NUM_AVERAGE_PHOTO_TYPES] =
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
|
||||||
static void Pho_PutIconToRequestRemoveMyPhoto (void);
|
static void Pho_PutIconToRequestRemoveMyPhoto (void);
|
||||||
|
static void Pho_PutIconsMyPhoto (void);
|
||||||
|
static void Pho_PutIconsOtherUsrPhoto (void);
|
||||||
static void Pho_PutIconToRequestRemoveOtherUsrPhoto (void);
|
static void Pho_PutIconToRequestRemoveOtherUsrPhoto (void);
|
||||||
static void Pho_ReqMyPhoto (void);
|
|
||||||
static void Pho_ReqOtherUsrPhoto (void);
|
static void Pho_ReqOtherUsrPhoto (void);
|
||||||
|
|
||||||
static void Pho_ReqPhoto (const struct UsrData *UsrDat,const char *PhotoURL);
|
static void Pho_ReqPhoto (const struct UsrData *UsrDat,const char *PhotoURL);
|
||||||
|
@ -207,6 +208,25 @@ void Pho_PutLinkToChangeOtherUsrPhoto (void)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*****************************************************************************/
|
||||||
|
/************************* Put contextual icons ******************************/
|
||||||
|
/*****************************************************************************/
|
||||||
|
|
||||||
|
static void Pho_PutIconsMyPhoto (void)
|
||||||
|
{
|
||||||
|
/***** Put icon to remove my photo *****/
|
||||||
|
Pho_PutIconToRequestRemoveMyPhoto ();
|
||||||
|
|
||||||
|
/***** Put icon to change my privacy *****/
|
||||||
|
Pri_PutLinkToChangeMyPrivacy ();
|
||||||
|
}
|
||||||
|
|
||||||
|
static void Pho_PutIconsOtherUsrPhoto (void)
|
||||||
|
{
|
||||||
|
/***** Put icon to remove another user's photo *****/
|
||||||
|
Pho_PutIconToRequestRemoveOtherUsrPhoto ();
|
||||||
|
}
|
||||||
|
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
/************** Put a link to request the removal of my photo ****************/
|
/************** Put a link to request the removal of my photo ****************/
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
@ -263,21 +283,7 @@ static void Pho_PutIconToRequestRemoveOtherUsrPhoto (void)
|
||||||
/************************ Form for sending my photo **************************/
|
/************************ Form for sending my photo **************************/
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
|
||||||
void Pho_ReqMyPhotoWithContextLinks (void)
|
void Pho_ReqMyPhoto (void)
|
||||||
{
|
|
||||||
/***** Contextual links to remove photo and change privacy *****/
|
|
||||||
if (Gbl.Usrs.Me.MyPhotoExists) // I have photo
|
|
||||||
{
|
|
||||||
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
|
|
||||||
Pri_PutLinkToChangeMyPrivacy (); // Put link (form) to change my privacy
|
|
||||||
fprintf (Gbl.F.Out,"</div>");
|
|
||||||
}
|
|
||||||
|
|
||||||
/***** Show the form to send my photo *****/
|
|
||||||
Pho_ReqMyPhoto ();
|
|
||||||
}
|
|
||||||
|
|
||||||
static void Pho_ReqMyPhoto (void)
|
|
||||||
{
|
{
|
||||||
/***** Show the form for sending the photo *****/
|
/***** Show the form for sending the photo *****/
|
||||||
Pho_ReqPhoto (&Gbl.Usrs.Me.UsrDat,Gbl.Usrs.Me.PhotoURL);
|
Pho_ReqPhoto (&Gbl.Usrs.Me.UsrDat,Gbl.Usrs.Me.PhotoURL);
|
||||||
|
@ -314,9 +320,8 @@ static void Pho_ReqPhoto (const struct UsrData *UsrDat,const char *PhotoURL)
|
||||||
Act_Action_t NextAction;
|
Act_Action_t NextAction;
|
||||||
|
|
||||||
/***** Start box *****/
|
/***** Start box *****/
|
||||||
Box_StartBox (NULL,Txt_Photo,
|
Box_StartBox (NULL,Txt_Photo,ItsMe ? Pho_PutIconsMyPhoto :
|
||||||
ItsMe ? Pho_PutIconToRequestRemoveMyPhoto :
|
Pho_PutIconsOtherUsrPhoto,
|
||||||
Pho_PutIconToRequestRemoveOtherUsrPhoto,
|
|
||||||
Hlp_PROFILE_Photo,Box_NOT_CLOSABLE);
|
Hlp_PROFILE_Photo,Box_NOT_CLOSABLE);
|
||||||
|
|
||||||
/***** Start form *****/
|
/***** Start form *****/
|
||||||
|
@ -383,7 +388,7 @@ void Pho_SendPhotoUsr (void)
|
||||||
Gbl.Usrs.Other.UsrDat.Accepted = Usr_CheckIfUsrHasAcceptedInCurrentCrs (&Gbl.Usrs.Other.UsrDat);
|
Gbl.Usrs.Other.UsrDat.Accepted = Usr_CheckIfUsrHasAcceptedInCurrentCrs (&Gbl.Usrs.Other.UsrDat);
|
||||||
if (Gbl.Usrs.Other.UsrDat.UsrCod == Gbl.Usrs.Me.UsrDat.UsrCod) // It's me
|
if (Gbl.Usrs.Other.UsrDat.UsrCod == Gbl.Usrs.Me.UsrDat.UsrCod) // It's me
|
||||||
/***** Form to send my photo *****/
|
/***** Form to send my photo *****/
|
||||||
Pho_ReqMyPhotoWithContextLinks ();
|
Pho_ReqMyPhoto ();
|
||||||
else
|
else
|
||||||
/***** Form to send another user's photo *****/
|
/***** Form to send another user's photo *****/
|
||||||
Pho_ReqOtherUsrPhoto ();
|
Pho_ReqOtherUsrPhoto ();
|
||||||
|
|
|
@ -85,8 +85,7 @@ typedef enum
|
||||||
|
|
||||||
bool Pho_ICanChangeOtherUsrPhoto (const struct UsrData *UsrDat);
|
bool Pho_ICanChangeOtherUsrPhoto (const struct UsrData *UsrDat);
|
||||||
void Pho_PutLinkToChangeOtherUsrPhoto (void);
|
void Pho_PutLinkToChangeOtherUsrPhoto (void);
|
||||||
void Pho_ReqMyPhotoWithContextLinks (void);
|
void Pho_ReqMyPhoto (void);
|
||||||
void Pho_ReqUsrPhotoWithContextualLinks (struct UsrData *UsrDat);
|
|
||||||
void Pho_SendPhotoUsr (void);
|
void Pho_SendPhotoUsr (void);
|
||||||
void Pho_RecMyPhotoDetFaces (void);
|
void Pho_RecMyPhotoDetFaces (void);
|
||||||
void Pho_RecOtherUsrPhotoDetFaces (void);
|
void Pho_RecOtherUsrPhotoDetFaces (void);
|
||||||
|
|
|
@ -2112,12 +2112,6 @@ void Rec_ShowFormMySharedRecord (void)
|
||||||
!Gbl.Usrs.Me.UsrDat.Surname1[0])
|
!Gbl.Usrs.Me.UsrDat.Surname1[0])
|
||||||
Ale_ShowAlert (Ale_WARNING,Txt_Please_fill_in_your_record_card_including_your_name);
|
Ale_ShowAlert (Ale_WARNING,Txt_Please_fill_in_your_record_card_including_your_name);
|
||||||
|
|
||||||
/***** Contextual links *****/
|
|
||||||
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
|
|
||||||
Rec_PutLinkToChangeMyInsCtrDpt (); // Put link (form) to change my institution, centre, department...
|
|
||||||
Net_PutLinkToChangeMySocialNetworks (); // Put link (form) to change my social networks
|
|
||||||
fprintf (Gbl.F.Out,"</div>");
|
|
||||||
|
|
||||||
/***** My record *****/
|
/***** My record *****/
|
||||||
Rec_ShowSharedUsrRecord (Rec_SHA_MY_RECORD_FORM,&Gbl.Usrs.Me.UsrDat,NULL);
|
Rec_ShowSharedUsrRecord (Rec_SHA_MY_RECORD_FORM,&Gbl.Usrs.Me.UsrDat,NULL);
|
||||||
Rec_WriteLinkToDataProtectionClause ();
|
Rec_WriteLinkToDataProtectionClause ();
|
||||||
|
@ -2709,9 +2703,18 @@ static void Rec_PutIconsCommands (void)
|
||||||
/***** Button to change user's photo *****/
|
/***** Button to change user's photo *****/
|
||||||
Pho_PutLinkToChangeOtherUsrPhoto ();
|
Pho_PutLinkToChangeOtherUsrPhoto ();
|
||||||
|
|
||||||
/***** Put link (form) to change my privacy *****/
|
/* Buttons to change my institution, my social networks and my privacy */
|
||||||
if (ItsMe)
|
if (ItsMe)
|
||||||
|
{
|
||||||
|
/* Button to change my institution, centre, department... */
|
||||||
|
Rec_PutLinkToChangeMyInsCtrDpt ();
|
||||||
|
|
||||||
|
/* Button to change my social networks */
|
||||||
|
Net_PutLinkToChangeMySocialNetworks ();
|
||||||
|
|
||||||
|
/* Button to change my privacy */
|
||||||
Pri_PutLinkToChangeMyPrivacy ();
|
Pri_PutLinkToChangeMyPrivacy ();
|
||||||
|
}
|
||||||
|
|
||||||
/***** End container *****/
|
/***** End container *****/
|
||||||
fprintf (Gbl.F.Out,"</div>");
|
fprintf (Gbl.F.Out,"</div>");
|
||||||
|
@ -3941,7 +3944,7 @@ void Rec_PutLinkToChangeMyInsCtrDpt (void)
|
||||||
/***** Link to edit my institution, centre, department... *****/
|
/***** Link to edit my institution, centre, department... *****/
|
||||||
Lay_PutContextualLink (ActReqEdiMyIns,NULL,NULL,
|
Lay_PutContextualLink (ActReqEdiMyIns,NULL,NULL,
|
||||||
"ins64x64.gif",
|
"ins64x64.gif",
|
||||||
Txt_Edit_my_institution,Txt_Edit_my_institution,
|
Txt_Edit_my_institution,NULL,
|
||||||
NULL);
|
NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user