From 796bd1c0e5f38d50a9c4a4c39ea3340844b9bd13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Fri, 28 Apr 2017 01:02:44 +0200 Subject: [PATCH] Version 16.193.8 --- swad_changelog.h | 5 +++-- swad_message.c | 36 ++++++++++++++++++------------------ swad_text.c | 30 ------------------------------ 3 files changed, 21 insertions(+), 50 deletions(-) diff --git a/swad_changelog.h b/swad_changelog.h index e4edd1918..68e97a819 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -221,14 +221,15 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 16.193.7 (2017-04-27)" +#define Log_PLATFORM_VERSION "SWAD 16.193.8 (2017-04-28)" #define CSS_FILE "swad16.193.4.css" #define JS_FILE "swad16.181.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.193.7: Apr 27, 2017 Changed dialog to remove user account. (218328 lines) + Version 16.193.8: Apr 28, 2017 Changed dialog to remove messages. (218299 lines) + Version 16.193.7: Apr 27, 2017 Changed dialog to remove my account. (218328 lines) Version 16.193.6: Apr 27, 2017 Changed dialog to remove user account. (218322 lines) Version 16.193.5: Apr 27, 2017 Changed dialog to remove user from course. (218316 lines) Version 16.193.4: Apr 27, 2017 Changes in layout of alerts. diff --git a/swad_message.c b/swad_message.c index 1015b9b57..d7c3e5ccb 100644 --- a/swad_message.c +++ b/swad_message.c @@ -854,7 +854,8 @@ void Msg_ReqDelAllRecMsgs (void) Msg_GetParamFilterContent (); Msg_GetParamOnlyUnreadMsgs (); - /***** Request confirmation to remove messages *****/ + /***** Show question and button to remove messages received *****/ + /* Start alert */ if (Gbl.Msg.FilterContent[0]) { if (Gbl.Msg.ShowOnlyUnreadMsgs) @@ -881,16 +882,15 @@ void Msg_ReqDelAllRecMsgs (void) Txt_any_user, Gbl.Msg.FilterCrsShrtName); } - Lay_ShowAlert (Lay_WARNING,Gbl.Message); + Lay_ShowAlertAndButton1 (Lay_QUESTION,Gbl.Message); - /***** Form to remove received messages *****/ - Act_FormStart (ActDelAllRcvMsg); - Msg_PutHiddenParamsMsgsFilters (); - Lay_PutRemoveButton (Txt_Delete_messages_received); - Act_FormEnd (); + /* Show received messages again */ + Gbl.Msg.TypeOfMessages = Msg_MESSAGES_RECEIVED; + Msg_ShowSentOrReceivedMessages (); - /***** Show messages again *****/ - Msg_ShowRecMsgs (); + /* End alert */ + Lay_ShowAlertAndButton2 (ActDelAllRcvMsg,Msg_PutHiddenParamsMsgsFilters, + Lay_REMOVE_BUTTON,Txt_Delete_messages_received); } /*****************************************************************************/ @@ -909,7 +909,8 @@ void Msg_ReqDelAllSntMsgs (void) Msg_GetParamFilterFromTo (); Msg_GetParamFilterContent (); - /***** Request confirmation to remove messages *****/ + /***** Show question and button to remove messages received *****/ + /* Start alert */ if (Gbl.Msg.FilterContent[0]) sprintf (Gbl.Message,Txt_Do_you_really_want_to_delete_all_messages_sent_to_USER_X_from_COURSE_Y_related_to_CONTENT_Z, Gbl.Msg.FilterFromTo[0] ? Gbl.Msg.FilterFromTo : @@ -920,16 +921,15 @@ void Msg_ReqDelAllSntMsgs (void) Gbl.Msg.FilterFromTo[0] ? Gbl.Msg.FilterFromTo : Txt_any_user, Gbl.Msg.FilterCrsShrtName); - Lay_ShowAlert (Lay_WARNING,Gbl.Message); + Lay_ShowAlertAndButton1 (Lay_QUESTION,Gbl.Message); - /***** Form to remove sent messages *****/ - Act_FormStart (ActDelAllSntMsg); - Msg_PutHiddenParamsMsgsFilters (); - Lay_PutRemoveButton (Txt_Delete_messages_sent); - Act_FormEnd (); + /* Show sent messages again */ + Gbl.Msg.TypeOfMessages = Msg_MESSAGES_SENT; + Msg_ShowSentOrReceivedMessages (); - /***** Show messages again *****/ - Msg_ShowSntMsgs (); + /* End alert */ + Lay_ShowAlertAndButton2 (ActDelAllSntMsg,Msg_PutHiddenParamsMsgsFilters, + Lay_REMOVE_BUTTON,Txt_Delete_messages_sent); } /*****************************************************************************/ diff --git a/swad_text.c b/swad_text.c index 888b70290..c086e4ef1 100644 --- a/swad_text.c +++ b/swad_text.c @@ -8670,36 +8670,6 @@ const char *Txt_Do_you_really_want_to_completely_eliminate_your_user_account = "Do you really want to completely eliminate your user account?"; // Necessita de tradução #endif -const char *Txt_Do_you_really_want_to_create_a_new_user_account_with_the_following_data = -#if L==1 - "Realment voleu crear un nou compte d'usuari" - " amb les següents dades?"; -#elif L==2 - "Wollen Sie wirklich, um ein neues Benutzerkonto" - " mit den folgenden Daten zu erstellen?"; -#elif L==3 - "Do you really want to create a new user account" - " with the following data?"; -#elif L==4 - "¿Realmente desea crear una nueva cuenta de usuario/a" - " con los siguientes datos?"; -#elif L==5 - "Voulez-vous vraiment créer un nouveau compte d'utilisateur" - " avec les données suivantes?"; -#elif L==6 - "¿Realmente desea crear una nueva cuenta de usuario/a" - " con los siguientes datos?"; // Okoteve traducción -#elif L==7 - "Vuoi realmente creare un nuovo account utente" - " con i seguenti dati?"; -#elif L==8 - "Czy na pewno chcesz, aby utworzyć nowe konto użytkownika" - " z następującymi danymi?"; -#elif L==9 - "Você realmente deseja criar uma nova conta de usuário" - " com os seguintes dados?"; -#endif - const char *Txt_Do_you_really_want_to_delete_all_messages_received_from_USER_X_from_COURSE_Y = // Warning: it is very important to include two %s in the following sentences #if L==1 "¿Realmente desea eliminar todos los mensajes recibidos de %s desde %s?"; // Necessita traduccio