diff --git a/swad_account.c b/swad_account.c index 852b699f1..114a9d855 100644 --- a/swad_account.c +++ b/swad_account.c @@ -924,19 +924,22 @@ static void Acc_AskIfRemoveOtherUsrAccount (void) if (Usr_ChkIfUsrCodExists (Gbl.Usrs.Other.UsrDat.UsrCod)) { - Lay_ShowAlert (Lay_WARNING,Txt_Do_you_really_want_to_completely_eliminate_the_following_user); + /***** Show question and button to remove user as administrator *****/ + /* Start alert */ + Lay_ShowAlertAndButton1 (Lay_QUESTION,Txt_Do_you_really_want_to_completely_eliminate_the_following_user); + /* Show user's record */ Rec_ShowSharedRecordUnmodifiable (&Gbl.Usrs.Other.UsrDat); + /* Show form to request confirmation */ Act_FormStart (ActRemUsrGbl); Usr_PutParamOtherUsrCodEncrypted (); - - /* Ask for consent on dangerous actions */ Pwd_AskForConfirmationOnDangerousAction (); - Lay_PutRemoveButton (Txt_Eliminate_user_account); - Act_FormEnd (); + + /* End alert */ + Lay_ShowAlertAndButton2 (ActUnk,NULL,Lay_NO_BUTTON,NULL); } else Lay_ShowAlert (Lay_WARNING,Txt_User_not_found_or_you_do_not_have_permission_); diff --git a/swad_changelog.h b/swad_changelog.h index 863dd3d96..2c1222857 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -221,13 +221,14 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 16.193.5 (2017-04-27)" +#define Log_PLATFORM_VERSION "SWAD 16.193.6 (2017-04-27)" #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.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. Changed dialog to remove user as administrator. (218311 lines) diff --git a/swad_text.c b/swad_text.c index af59c49a3..888b70290 100644 --- a/swad_text.c +++ b/swad_text.c @@ -8632,21 +8632,21 @@ const char *Txt_Do_you_really_want_to_completely_eliminate_the_following_user = #if L==1 "¿Realmente desea eliminar completamente la cuenta del siguiente usuario?"; // Necessita traduccio #elif L==2 - "Do you really want to completely eliminate the following user?"; // Need Übersetzung + "Do you really want to completely eliminate the following user?"; // Need Übersetzung #elif L==3 "Do you really want to completely eliminate the following user?"; #elif L==4 - "¿Realmente desea eliminar completamente la cuenta del siguiente usuario?"; + "¿Realmente desea eliminar por completo la cuenta del siguiente usuario?"; #elif L==5 - "Do you really want to completely eliminate the following user?"; // Besoin de traduction + "Do you really want to completely eliminate the following user?"; // Besoin de traduction #elif L==6 - "¿Realmente desea eliminar completamente la cuenta del siguiente usuario?"; // Okoteve traducción + "¿Realmente desea eliminar por completo la cuenta del siguiente usuario?"; // Okoteve traducción #elif L==7 "Vuoi realmente rimuovere totalmente il seguente utente?"; #elif L==8 "Czy na pewno chcesz, aby calkowicie wyeliminowac nastepujacych uzytkowników?"; #elif L==9 - "Do you really want to completely eliminate the following user?"; // Necessita de tradução + "Do you really want to completely eliminate the following user?"; // Necessita de tradução #endif const char *Txt_Do_you_really_want_to_completely_eliminate_your_user_account =