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 18.1.6

This commit is contained in:
Antonio Cañas Vargas 2018-10-07 22:53:59 +02:00
parent 0f4ab91c12
commit 9a04df45c6
6 changed files with 42 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
swad_action.c
View File

@ -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},
/* 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},
/* 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},

5
swad_changelog.h
View File

@ -355,11 +355,12 @@ En OpenSWAD:
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 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.3: Oct 07, 2018 Changes in statistic graphs. (234965 lines)
Version 18.1.2: Oct 07, 2018 Changes in statistic graphs. (234964 lines)

2
swad_network.c
View File

@ -278,7 +278,7 @@ void Net_PutLinkToChangeMySocialNetworks (void)
/***** Link to edit my social networks *****/
Lay_PutContextualLink (ActReqEdiMyNet,NULL,NULL,
"earth64x64.gif",
Txt_Edit_my_webs_networks,Txt_Edit_my_webs_networks,
Txt_Edit_my_webs_networks,NULL,
NULL);
}

45
swad_photo.c
View File

@ -87,8 +87,9 @@ const char *Pho_StrAvgPhotoPrograms[Pho_NUM_AVERAGE_PHOTO_TYPES] =
/*****************************************************************************/
static void Pho_PutIconToRequestRemoveMyPhoto (void);
static void Pho_PutIconsMyPhoto (void);
static void Pho_PutIconsOtherUsrPhoto (void);
static void Pho_PutIconToRequestRemoveOtherUsrPhoto (void);
static void Pho_ReqMyPhoto (void);
static void Pho_ReqOtherUsrPhoto (void);
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 ****************/
/*****************************************************************************/
@ -263,21 +283,7 @@ static void Pho_PutIconToRequestRemoveOtherUsrPhoto (void)
/************************ Form for sending my photo **************************/
/*****************************************************************************/
void Pho_ReqMyPhotoWithContextLinks (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)
void Pho_ReqMyPhoto (void)
{
/***** Show the form for sending the photo *****/
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;
/***** Start box *****/
Box_StartBox (NULL,Txt_Photo,
ItsMe ? Pho_PutIconToRequestRemoveMyPhoto :
Pho_PutIconToRequestRemoveOtherUsrPhoto,
Box_StartBox (NULL,Txt_Photo,ItsMe ? Pho_PutIconsMyPhoto :
Pho_PutIconsOtherUsrPhoto,
Hlp_PROFILE_Photo,Box_NOT_CLOSABLE);
/***** Start form *****/
@ -383,7 +388,7 @@ void Pho_SendPhotoUsr (void)
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
/***** Form to send my photo *****/
Pho_ReqMyPhotoWithContextLinks ();
Pho_ReqMyPhoto ();
else
/***** Form to send another user's photo *****/
Pho_ReqOtherUsrPhoto ();

3
swad_photo.h
View File

@ -85,8 +85,7 @@ typedef enum
bool Pho_ICanChangeOtherUsrPhoto (const struct UsrData *UsrDat);
void Pho_PutLinkToChangeOtherUsrPhoto (void);
void Pho_ReqMyPhotoWithContextLinks (void);
void Pho_ReqUsrPhotoWithContextualLinks (struct UsrData *UsrDat);
void Pho_ReqMyPhoto (void);
void Pho_SendPhotoUsr (void);
void Pho_RecMyPhotoDetFaces (void);
void Pho_RecOtherUsrPhotoDetFaces (void);

19
swad_record.c
View File

@ -2112,12 +2112,6 @@ void Rec_ShowFormMySharedRecord (void)
!Gbl.Usrs.Me.UsrDat.Surname1[0])
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 *****/
Rec_ShowSharedUsrRecord (Rec_SHA_MY_RECORD_FORM,&Gbl.Usrs.Me.UsrDat,NULL);
Rec_WriteLinkToDataProtectionClause ();
@ -2709,9 +2703,18 @@ static void Rec_PutIconsCommands (void)
/***** Button to change user's photo *****/
Pho_PutLinkToChangeOtherUsrPhoto ();
/***** Put link (form) to change my privacy *****/
/* Buttons to change my institution, my social networks and my privacy */
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 ();
}
/***** End container *****/
fprintf (Gbl.F.Out,"</div>");
@ -3941,7 +3944,7 @@ void Rec_PutLinkToChangeMyInsCtrDpt (void)
/***** Link to edit my institution, centre, department... *****/
Lay_PutContextualLink (ActReqEdiMyIns,NULL,NULL,
"ins64x64.gif",
Txt_Edit_my_institution,Txt_Edit_my_institution,
Txt_Edit_my_institution,NULL,
NULL);
}