From 588c0a5c924e8a006eb425c8a1410a2dd97c18fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Tue, 30 May 2017 09:42:01 +0200 Subject: [PATCH] Version 16.227.2 --- swad_changelog.h | 6 +++--- swad_user.c | 11 +++++------ 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/swad_changelog.h b/swad_changelog.h index 70e0ff0ae..8bf783337 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -229,19 +229,19 @@ // TODO: Al listar administradores, deberķa estar marcado por defecto "Incluir fotos" -// TODO: Behaviour of register non-editing teachers in groups should be similar to register students. - /*****************************************************************************/ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 16.227.1 (2017-05-30)" +#define Log_PLATFORM_VERSION "SWAD 16.227.2 (2017-05-30)" #define CSS_FILE "swad16.226.css" #define JS_FILE "swad16.206.3.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.227.3: May 30, 2017 Behaviour of registering non-editing teachers in groups similar to registering students. (? lines) + Version 16.227.2: May 30, 2017 Button to upload photo integrated in alert. (220694 lines) Version 16.227.1: May 30, 2017 Button to check email integrated in alert. (220693 lines) Version 16.227: May 30, 2017 Changes in selector or roles in record cards. (220694 lines) Version 16.226.1: May 29, 2017 Changes in contextual links related to users enrolment. (220637 lines) diff --git a/swad_user.c b/swad_user.c index 1a4ff2ce4..f2af9b248 100644 --- a/swad_user.c +++ b/swad_user.c @@ -246,6 +246,7 @@ void Usr_InformAboutNumClicksBeforePhoto (void) extern struct Act_Actions Act_Actions[Act_NUM_ACTIONS]; extern const char *Txt_You_must_send_your_photo_because_; extern const char *Txt_You_can_only_perform_X_further_actions_; + extern const char *Txt_Upload_photo; char Message[512]; // Don't use Gbl.Alert.Txt here, because it may be filled with another message and such message would be overwritten if (Gbl.Usrs.Me.NumAccWithoutPhoto) @@ -255,12 +256,10 @@ void Usr_InformAboutNumClicksBeforePhoto (void) else if (Act_Actions[Gbl.Action.Act].BrowserWindow == Act_THIS_WINDOW) { sprintf (Message,Txt_You_can_only_perform_X_further_actions_, - Pho_MAX_CLICKS_WITHOUT_PHOTO-Gbl.Usrs.Me.NumAccWithoutPhoto); - Ale_ShowAlert (Ale_WARNING,Message); - - fprintf (Gbl.F.Out,"
"); - Pho_PutLinkToChangeMyPhoto (); - fprintf (Gbl.F.Out,"
"); + Pho_MAX_CLICKS_WITHOUT_PHOTO - Gbl.Usrs.Me.NumAccWithoutPhoto); + Ale_ShowAlertAndButton (Ale_WARNING,Message, + ActReqMyPho,NULL,NULL,NULL, + Lay_CONFIRM_BUTTON,Txt_Upload_photo); } } }