diff --git a/swad_changelog.h b/swad_changelog.h index a1acd47b8..7acd41787 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -221,14 +221,15 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 16.194.10 (2017-04-28)" +#define Log_PLATFORM_VERSION "SWAD 16.194.11 (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.194.10:Apr 28, 2017 Changed dialog to remove and exam announcement. (218379 lines) + Version 16.194.11:Apr 28, 2017 Changed dialog to remove a notice. (218379 lines) + Version 16.194.10:Apr 28, 2017 Changed dialog to remove an exam announcement. (218379 lines) Version 16.194.9: Apr 28, 2017 Changed dialog to remove a non empty folder. (218379 lines) Version 16.194.8: Apr 28, 2017 Changed dialog to remove a file/link. (218369 lines) Version 16.194.7: Apr 28, 2017 Changed dialog to remove a record field. (218359 lines) diff --git a/swad_global.h b/swad_global.h index 224aaebc1..8d8c4314d 100644 --- a/swad_global.h +++ b/swad_global.h @@ -481,7 +481,7 @@ struct Globals } Records; struct { - long NotCod; + long NotCod; // Notice to be edited, removed... long HighlightNotCod; // Notice code of a notice to be highlighted } Notices; } CurrentCrs; diff --git a/swad_notice.c b/swad_notice.c index c79863a6f..5467e2dc8 100644 --- a/swad_notice.c +++ b/swad_notice.c @@ -269,20 +269,20 @@ void Not_RequestRemNotice (void) { extern const char *Txt_Do_you_really_want_to_remove_the_following_notice; extern const char *Txt_Remove; - long NotCod; /***** Get the code of the notice to remove *****/ - NotCod = Not_GetParamNotCod (); + Gbl.CurrentCrs.Notices.NotCod = Not_GetParamNotCod (); - /***** Ask for confirmation to remove this notice *****/ - Lay_ShowAlert (Lay_WARNING,Txt_Do_you_really_want_to_remove_the_following_notice); - Not_GetDataAndShowNotice (NotCod); + /***** Show question and button to remove this notice *****/ + /* Start alert */ + Lay_ShowAlertAndButton1 (Lay_QUESTION,Txt_Do_you_really_want_to_remove_the_following_notice); - /***** Form to remove this notice *****/ - Act_FormStart (ActRemNot); - Not_PutHiddenParamNotCod (NotCod); - Lay_PutRemoveButton (Txt_Remove); - Act_FormEnd (); + /* Show notice */ + Not_GetDataAndShowNotice (Gbl.CurrentCrs.Notices.NotCod); + + /* End alert */ + Lay_ShowAlertAndButton2 (ActRemNot,NULL,Not_PutParams, + Lay_REMOVE_BUTTON,Txt_Remove); /***** Show all notices *****/ Not_ShowNotices (Not_LIST_FULL_NOTICES);