From dffd41a54fdb2400cc11c786c7f7b4ed6a7135b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Fri, 28 Apr 2017 00:13:28 +0200 Subject: [PATCH] Version 16.193.7 --- css/swad16.193.4.css | 1 - swad_account.c | 15 +++++++++------ swad_changelog.h | 3 ++- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/css/swad16.193.4.css b/css/swad16.193.4.css index 64544da7f..a0062f098 100644 --- a/css/swad16.193.4.css +++ b/css/swad16.193.4.css @@ -1502,7 +1502,6 @@ a:hover /* Default ==> underlined */ background-color:#FFF9EA; border-radius:2px; box-shadow: 0 2px 2px 0 rgba(124,121,109,0.14), 0 2px 1px -2px rgba(124,121,109,0.2), 0 1px 5px 0 rgba(124,121,109,0.12); - /* opacity:0.9; */ } .ALERT_TXT { diff --git a/swad_account.c b/swad_account.c index 114a9d855..5d744e4f9 100644 --- a/swad_account.c +++ b/swad_account.c @@ -902,18 +902,21 @@ void Acc_AskIfRemoveMyAccount (void) extern const char *Txt_Do_you_really_want_to_completely_eliminate_your_user_account; extern const char *Txt_Eliminate_my_user_account; - Lay_ShowAlert (Lay_WARNING,Txt_Do_you_really_want_to_completely_eliminate_your_user_account); + /***** Show question and button to remove my user account *****/ + /* Start alert */ + Lay_ShowAlertAndButton1 (Lay_QUESTION,Txt_Do_you_really_want_to_completely_eliminate_your_user_account); + /* Show my record */ Rec_ShowSharedRecordUnmodifiable (&Gbl.Usrs.Me.UsrDat); + /* Show form to request confirmation */ Act_FormStart (ActRemMyAcc); - - /* Ask for consent on dangerous actions */ Pwd_AskForConfirmationOnDangerousAction (); - Lay_PutRemoveButton (Txt_Eliminate_my_user_account); - Act_FormEnd (); + + /* End alert */ + Lay_ShowAlertAndButton2 (ActUnk,NULL,Lay_NO_BUTTON,NULL); } static void Acc_AskIfRemoveOtherUsrAccount (void) @@ -924,7 +927,7 @@ static void Acc_AskIfRemoveOtherUsrAccount (void) if (Usr_ChkIfUsrCodExists (Gbl.Usrs.Other.UsrDat.UsrCod)) { - /***** Show question and button to remove user as administrator *****/ + /***** Show question and button to remove user account *****/ /* Start alert */ Lay_ShowAlertAndButton1 (Lay_QUESTION,Txt_Do_you_really_want_to_completely_eliminate_the_following_user); diff --git a/swad_changelog.h b/swad_changelog.h index 2c1222857..e4edd1918 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -221,13 +221,14 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 16.193.6 (2017-04-27)" +#define Log_PLATFORM_VERSION "SWAD 16.193.7 (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.7: Apr 27, 2017 Changed dialog to remove user 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.