From 428697528d541915bc13f94d7d4da084c1446411 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Tue, 9 Oct 2018 00:48:43 +0200 Subject: [PATCH] Version 18.2.7 --- swad_changelog.h | 3 ++- swad_photo.c | 25 ++----------------------- swad_privacy.c | 15 --------------- swad_privacy.h | 1 - swad_record.c | 5 ----- 5 files changed, 4 insertions(+), 45 deletions(-) diff --git a/swad_changelog.h b/swad_changelog.h index 2c73de934..ff18a3f7f 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -355,10 +355,11 @@ En OpenSWAD: ps2pdf source.ps destination.pdf */ -#define Log_PLATFORM_VERSION "SWAD 18.2.6 (2018-10-09)" +#define Log_PLATFORM_VERSION "SWAD 18.2.7 (2018-10-09)" #define CSS_FILE "swad18.2.2.css" #define JS_FILE "swad17.17.1.js" /* + Version 18.2.7: Oct 09, 2018 Changes in edition of preferences about privacy. (234872 lines) Version 18.2.6: Oct 09, 2018 Changes in edition of preferences about privacy. (234905 lines) Version 18.2.5: Oct 08, 2018 Changes in edition of user's shared record card. (234943 lines) Version 18.2.4: Oct 08, 2018 Changes in edition of user's photo. (234953 lines) diff --git a/swad_photo.c b/swad_photo.c index 432de0950..202a314b1 100644 --- a/swad_photo.c +++ b/swad_photo.c @@ -88,8 +88,6 @@ 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_ReqOtherUsrPhoto (void); @@ -209,25 +207,6 @@ 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 ****************/ /*****************************************************************************/ @@ -322,8 +301,8 @@ static void Pho_ReqPhoto (const struct UsrData *UsrDat) Act_Action_t NextAction; /***** Start box *****/ - Box_StartBox (NULL,Txt_Photo,ItsMe ? Pho_PutIconsMyPhoto : - Pho_PutIconsOtherUsrPhoto, + Box_StartBox (NULL,Txt_Photo,ItsMe ? Pho_PutIconToRequestRemoveMyPhoto : + Pho_PutIconToRequestRemoveOtherUsrPhoto, Hlp_PROFILE_Photo,Box_NOT_CLOSABLE); /***** Start form *****/ diff --git a/swad_privacy.c b/swad_privacy.c index 797c0085a..ac301e9cb 100644 --- a/swad_privacy.c +++ b/swad_privacy.c @@ -71,21 +71,6 @@ static void Pri_PutFormVisibility (const char *TxtLabel, Pri_Visibility_t CurrentVisibilityInDB, unsigned MaskAllowedVisibility); -/*****************************************************************************/ -/*************** Put a link to the action to edit my privacy *****************/ -/*****************************************************************************/ - -void Pri_PutLinkToChangeMyPrivacy (void) - { - extern const char *Txt_Privacy; - - /***** Link to edit my privacy *****/ - Lay_PutContextualLink (ActEdiPri,Pri_PRIVACY_ID,NULL, - "lock64x64.png", - Txt_Privacy,NULL, - NULL); - } - /*****************************************************************************/ /******************************* Edit my privacy *****************************/ /*****************************************************************************/ diff --git a/swad_privacy.h b/swad_privacy.h index 7d5f75d04..a514ca29a 100644 --- a/swad_privacy.h +++ b/swad_privacy.h @@ -42,7 +42,6 @@ /***************************** Public prototypes *****************************/ /*****************************************************************************/ -void Pri_PutLinkToChangeMyPrivacy (void); void Pri_EditMyPrivacy (void); Pri_Visibility_t Pri_GetVisibilityFromStr (const char *Str); diff --git a/swad_record.c b/swad_record.c index 5795624a6..c19750d0b 100644 --- a/swad_record.c +++ b/swad_record.c @@ -2688,11 +2688,6 @@ static void Rec_PutIconsCommands (void) /***** Button to change user's photo *****/ Pho_PutLinkToChangeOtherUsrPhoto (); - /* Button to change my privacy */ - if (ItsMe) - /* Button to change my privacy */ - Pri_PutLinkToChangeMyPrivacy (); - /***** End container *****/ fprintf (Gbl.F.Out,""); }