From 9e7c3f2ccd40945df45fcb8bcf390997c3420a10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Wed, 28 Sep 2016 13:12:11 +0200 Subject: [PATCH] Version 16.3.2 --- swad_changelog.h | 3 ++- swad_follow.c | 2 +- swad_record.c | 23 ++++++++++++++--------- swad_text.c | 4 ++-- 4 files changed, 19 insertions(+), 13 deletions(-) diff --git a/swad_changelog.h b/swad_changelog.h index accdab009..69f5da2d4 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -142,13 +142,14 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 16.3.1 (2016-09-28)" +#define Log_PLATFORM_VERSION "SWAD 16.3.2 (2016-09-28)" #define CSS_FILE "swad15.229.css" #define JS_FILE "swad15.238.1.js" // 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 16.3.2: Sep 28, 2016 Changes in behaviour of button to follow user. (205277 lines) Version 16.3.1: Sep 28, 2016 Two different messagesrelated to new account merged into one. Changes in form to create new account. (205271 lines) Version 16.3: Sep 26, 2016 Message translated. diff --git a/swad_follow.c b/swad_follow.c index 9286edea4..6bff79677 100644 --- a/swad_follow.c +++ b/swad_follow.c @@ -825,7 +825,7 @@ void Fol_UnfollowUsr (void) /* 1) I followed a user when I had permission 2) User restricted permission, so now I can not view his/her profile 3) Now I can not view his/her profile ==> show users I follow */ - Fol_ListFollowingUsr (&Gbl.Usrs.Me.UsrDat); // List user's I follow + Fol_ListFollowingUsr (&Gbl.Usrs.Me.UsrDat); // List users I follow } else Lay_ShowAlert (Lay_WARNING,Txt_User_not_found_or_you_do_not_have_permission_); diff --git a/swad_record.c b/swad_record.c index 2bd6886d5..f33dc60a9 100644 --- a/swad_record.c +++ b/swad_record.c @@ -2364,19 +2364,24 @@ static void Rec_PutIconsCommands (void) NULL); /***** Button to follow / unfollow *****/ - if (Gbl.Record.TypeOfView == Rec_RECORD_PUBLIC && - !ItsMe) + if (!ItsMe) { - if (Fol_CheckUsrIsFollowerOf (Gbl.Usrs.Me.UsrDat.UsrCod,Gbl.Record.UsrDat->UsrCod)) // I follow user + if (Fol_CheckUsrIsFollowerOf (Gbl.Usrs.Me.UsrDat.UsrCod, + Gbl.Record.UsrDat->UsrCod)) + // I follow user Lay_PutContextualLink (ActUnfUsr,Rec_PutParamUsrCodEncrypted, "following64x64.png", Txt_Following_unfollow,NULL, - NULL); - else // I do not follow user - Lay_PutContextualLink (ActFolUsr,Rec_PutParamUsrCodEncrypted, - "follow64x64.png", - Txt_Follow,NULL, - NULL); + NULL); // Put button to unfollow, even if I can not view user's profile + else + // I do not follow user + if (Pri_ShowIsAllowed (Gbl.Record.UsrDat->ProfileVisibility, + Gbl.Record.UsrDat->UsrCod)) + // I can view user's profile + Lay_PutContextualLink (ActFolUsr,Rec_PutParamUsrCodEncrypted, + "follow64x64.png", + Txt_Follow,NULL, + NULL); // Put button to follow } fprintf (Gbl.F.Out,""); diff --git a/swad_text.c b/swad_text.c index ed1966d7b..07d3ac921 100644 --- a/swad_text.c +++ b/swad_text.c @@ -3575,13 +3575,13 @@ const char *Txt_Before_creating_a_new_account_check_if_you_have_been_already_reg "Before creating a new account," " check if you have been already registered with your ID"; #elif L==4 - "Antes de crear una cuenta nueva," + "Antes de crear una nueva cuenta," " compruebe si ya le han inscrito con su ID"; #elif L==5 "Avant de créer un nouveau compte," " vérifiez si vous avez déjà enregistré avec votre ID"; #elif L==6 - "Antes de crear una cuenta nueva," + "Antes de crear una nueva cuenta," " compruebe si ya le han inscrito con su ID"; // Okoteve traducción #elif L==7 "Prima di creare un nuovo account,"