diff --git a/Makefile b/Makefile index 77576178..2c95e5c2 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ # and used to support university teaching. # # # # This file is part of SWAD core. # -# Copyright (C) 1999-2014 Antonio Caņas Vargas # +# Copyright (C) 1999-2017 Antonio Caņas Vargas # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU Affero General Public License as # @@ -26,8 +26,8 @@ # # ############################################################################### -OBJS = swad_account.o swad_action.o swad_agenda.o swad_announcement.o \ - swad_assignment.o swad_attendance.o \ +OBJS = swad_account.o swad_action.o swad_agenda.o swad_alert.o \ + swad_announcement.o swad_assignment.o swad_attendance.o \ swad_banner.o \ swad_calendar.o swad_centre.o swad_chat.o swad_config.o \ swad_connected.o swad_country.o swad_course.o swad_cryptography.o \ diff --git a/swad_ID.c b/swad_ID.c index a63e6a5d..e4756429 100644 --- a/swad_ID.c +++ b/swad_ID.c @@ -538,10 +538,10 @@ void ID_ShowFormOthIDs (void) Lay_EndRoundFrame (); } else - Lay_ShowAlert (Lay_WARNING,Txt_User_not_found_or_you_do_not_have_permission_); + Ale_ShowAlert (Ale_WARNING,Txt_User_not_found_or_you_do_not_have_permission_); } else // User not found - Lay_ShowAlert (Lay_WARNING,Txt_User_not_found_or_you_do_not_have_permission_); + Ale_ShowAlert (Ale_WARNING,Txt_User_not_found_or_you_do_not_have_permission_); } /*****************************************************************************/ @@ -710,7 +710,7 @@ void ID_RemoveOtherUsrID (void) &Gbl.Usrs.Other.UsrDat,NULL); } else // User not found - Lay_ShowAlert (Lay_WARNING,Txt_User_not_found_or_you_do_not_have_permission_); + Ale_ShowAlert (Ale_WARNING,Txt_User_not_found_or_you_do_not_have_permission_); } /*****************************************************************************/ @@ -748,13 +748,13 @@ static void ID_RemoveUsrID (const struct UsrData *UsrDat,bool ItsMe) /***** Show message *****/ sprintf (Gbl.Alert.Txt,Txt_ID_X_removed,UsrID); - Lay_ShowAlert (Lay_SUCCESS,Gbl.Alert.Txt); + Ale_ShowAlert (Ale_SUCCESS,Gbl.Alert.Txt); } else - Lay_ShowAlert (Lay_WARNING,Txt_You_can_not_delete_this_ID); + Ale_ShowAlert (Ale_WARNING,Txt_You_can_not_delete_this_ID); } else - Lay_ShowAlert (Lay_WARNING,Txt_User_not_found_or_you_do_not_have_permission_); + Ale_ShowAlert (Ale_WARNING,Txt_User_not_found_or_you_do_not_have_permission_); } /*****************************************************************************/ @@ -826,7 +826,7 @@ void ID_NewOtherUsrID (void) &Gbl.Usrs.Other.UsrDat,NULL); } else // User not found - Lay_ShowAlert (Lay_WARNING,Txt_User_not_found_or_you_do_not_have_permission_); + Ale_ShowAlert (Ale_WARNING,Txt_User_not_found_or_you_do_not_have_permission_); } /*****************************************************************************/ @@ -907,12 +907,12 @@ static void ID_NewUsrID (const struct UsrData *UsrDat,bool ItsMe) } /***** Show message *****/ - Lay_ShowAlert (Error ? Lay_WARNING : - Lay_SUCCESS, + Ale_ShowAlert (Error ? Ale_WARNING : + Ale_SUCCESS, Gbl.Alert.Txt); } else - Lay_ShowAlert (Lay_WARNING,Txt_User_not_found_or_you_do_not_have_permission_); + Ale_ShowAlert (Ale_WARNING,Txt_User_not_found_or_you_do_not_have_permission_); } /*****************************************************************************/ @@ -951,7 +951,7 @@ void ID_ConfirmOtherUsrID (void) unsigned NumIDFound = 0; // Initialized to avoid warning /***** Initialize alert type and message *****/ - Gbl.Alert.Type = Lay_NONE; // Do not show alert + Gbl.Alert.Type = Ale_NONE; // Do not show alert /***** Get where we came from *****/ OriginalActCod = Par_GetParToLong ("OriginalActCod"); @@ -986,7 +986,7 @@ void ID_ConfirmOtherUsrID (void) if (Gbl.Usrs.Other.UsrDat.IDs.List[NumIDFound].Confirmed) { /***** ID found and already confirmed *****/ - Gbl.Alert.Type = Lay_INFO; + Gbl.Alert.Type = Ale_INFO; sprintf (Gbl.Alert.Txt,Txt_ID_X_had_already_been_confirmed, Gbl.Usrs.Other.UsrDat.IDs.List[NumIDFound].ID); } @@ -998,20 +998,20 @@ void ID_ConfirmOtherUsrID (void) Gbl.Usrs.Other.UsrDat.IDs.List[NumIDFound].Confirmed = true; /***** Write success message *****/ - Gbl.Alert.Type = Lay_SUCCESS; + Gbl.Alert.Type = Ale_SUCCESS; sprintf (Gbl.Alert.Txt,Txt_The_ID_X_has_been_confirmed, Gbl.Usrs.Other.UsrDat.IDs.List[NumIDFound].ID); } } else // User's ID not found { - Gbl.Alert.Type = Lay_WARNING; + Gbl.Alert.Type = Ale_WARNING; sprintf (Gbl.Alert.Txt,"%s",Txt_User_not_found_or_you_do_not_have_permission_); } } else // I can not confirm { - Gbl.Alert.Type = Lay_WARNING; + Gbl.Alert.Type = Ale_WARNING; sprintf (Gbl.Alert.Txt,"%s",Txt_User_not_found_or_you_do_not_have_permission_); } @@ -1032,7 +1032,7 @@ void ID_ConfirmOtherUsrID (void) break; default: /* Show optional alert */ - Lay_ShowPendingAlert (); + Ale_ShowPendingAlert (); /* Show only the updated record of this user */ Rec_ShowSharedUsrRecord (Rec_SHA_RECORD_LIST, diff --git a/swad_account.c b/swad_account.c index 8944cd71..8d39f11e 100644 --- a/swad_account.c +++ b/swad_account.c @@ -244,7 +244,7 @@ void Acc_CheckIfEmptyAccountExists (void) { sprintf (Gbl.Alert.Txt,Txt_There_is_no_empty_account_associated_with_your_ID_X_, ID); - Lay_ShowAlert (Lay_INFO,Gbl.Alert.Txt); + Ale_ShowAlert (Ale_INFO,Gbl.Alert.Txt); } /***** Free structure that stores the query result *****/ @@ -256,7 +256,7 @@ void Acc_CheckIfEmptyAccountExists (void) else // ID not valid { /**** Show again form to check if I have an account *****/ - Lay_ShowAlert (Lay_WARNING,Txt_Please_enter_your_ID); + Ale_ShowAlert (Ale_WARNING,Txt_Please_enter_your_ID); Acc_ShowFormCheckIfIHaveAccount (Txt_Before_creating_a_new_account_check_if_you_have_been_already_registered_with_your_ID); } @@ -465,7 +465,7 @@ void Acc_ShowFormChangeMyAccount (void) { fprintf (Gbl.F.Out,"" ""); - Lay_ShowAlert (Lay_WARNING,Txt_Before_going_to_any_other_option_you_must_fill_your_nickname); + Ale_ShowAlert (Ale_WARNING,Txt_Before_going_to_any_other_option_you_must_fill_your_nickname); fprintf (Gbl.F.Out,"" ""); } @@ -479,7 +479,7 @@ void Acc_ShowFormChangeMyAccount (void) { fprintf (Gbl.F.Out,"" ""); - Lay_ShowAlert (Lay_WARNING,IMustFillEmail ? Txt_Please_fill_in_your_email_address : + Ale_ShowAlert (Ale_WARNING,IMustFillEmail ? Txt_Please_fill_in_your_email_address : Txt_Please_check_and_confirm_your_email_address); fprintf (Gbl.F.Out,"" ""); @@ -494,7 +494,7 @@ void Acc_ShowFormChangeMyAccount (void) { fprintf (Gbl.F.Out,"" ""); - Lay_ShowAlert (Lay_WARNING,Txt_Please_fill_in_your_ID); + Ale_ShowAlert (Ale_WARNING,Txt_Please_fill_in_your_ID); fprintf (Gbl.F.Out,"" ""); } @@ -635,7 +635,7 @@ static bool Acc_GetParamsNewAccount (char NewNicknameWithoutArroba[Nck_MAX_BYTES Error = true; sprintf (Gbl.Alert.Txt,Txt_The_nickname_X_had_been_registered_by_another_user, NewNicknameWithoutArroba); - Lay_ShowAlert (Lay_WARNING,Gbl.Alert.Txt); + Ale_ShowAlert (Ale_WARNING,Gbl.Alert.Txt); } } else // New nickname is not valid @@ -645,7 +645,7 @@ static bool Acc_GetParamsNewAccount (char NewNicknameWithoutArroba[Nck_MAX_BYTES NewNicknameWithArroba, Nck_MIN_CHARS_NICKNAME_WITHOUT_ARROBA, Nck_MAX_CHARS_NICKNAME_WITHOUT_ARROBA); - Lay_ShowAlert (Lay_WARNING,Gbl.Alert.Txt); + Ale_ShowAlert (Ale_WARNING,Gbl.Alert.Txt); } /***** Step 2/3: Get new email from form *****/ @@ -663,7 +663,7 @@ static bool Acc_GetParamsNewAccount (char NewNicknameWithoutArroba[Nck_MAX_BYTES Error = true; sprintf (Gbl.Alert.Txt,Txt_The_email_address_X_had_been_registered_by_another_user, NewEmail); - Lay_ShowAlert (Lay_WARNING,Gbl.Alert.Txt); + Ale_ShowAlert (Ale_WARNING,Gbl.Alert.Txt); } } else // New email is not valid @@ -671,7 +671,7 @@ static bool Acc_GetParamsNewAccount (char NewNicknameWithoutArroba[Nck_MAX_BYTES Error = true; sprintf (Gbl.Alert.Txt,Txt_The_email_address_entered_X_is_not_valid, NewEmail); - Lay_ShowAlert (Lay_WARNING,Gbl.Alert.Txt); + Ale_ShowAlert (Ale_WARNING,Gbl.Alert.Txt); } /***** Step 3/3: Get new password from form *****/ @@ -680,7 +680,7 @@ static bool Acc_GetParamsNewAccount (char NewNicknameWithoutArroba[Nck_MAX_BYTES if (!Pwd_SlowCheckIfPasswordIsGood (NewPlainPassword,NewEncryptedPassword,-1L)) // New password is good? { Error = true; - Lay_ShowAlert (Lay_WARNING,Gbl.Alert.Txt); // Error message is set in Usr_SlowCheckIfPasswordIsGood + Ale_ShowAlert (Ale_WARNING,Gbl.Alert.Txt); // Error message is set in Usr_SlowCheckIfPasswordIsGood } return !Error; @@ -817,7 +817,7 @@ void Acc_AfterCreationNewAccount (void) sprintf (Gbl.Alert.Txt,Txt_Congratulations_You_have_created_your_account_X_Now_Y_will_request_you_, Gbl.Usrs.Me.UsrDat.Nickname, Cfg_PLATFORM_SHORT_NAME); - Lay_ShowAlert (Lay_SUCCESS,Gbl.Alert.Txt); + Ale_ShowAlert (Ale_SUCCESS,Gbl.Alert.Txt); /***** Show form with account data *****/ Acc_ShowFormChangeMyAccount (); @@ -844,7 +844,7 @@ void Acc_GetUsrCodAndRemUsrGbl (void) Error = true; if (Error) - Lay_ShowAlert (Lay_WARNING,Txt_User_not_found_or_you_do_not_have_permission_); + Ale_ShowAlert (Ale_WARNING,Txt_User_not_found_or_you_do_not_have_permission_); } /*****************************************************************************/ @@ -907,7 +907,7 @@ void Acc_AskIfRemoveMyAccount (void) /***** 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); + Ale_ShowAlertAndButton1 (Ale_QUESTION,Txt_Do_you_really_want_to_completely_eliminate_your_user_account); /* Show my record */ Rec_ShowSharedRecordUnmodifiable (&Gbl.Usrs.Me.UsrDat); @@ -919,7 +919,7 @@ void Acc_AskIfRemoveMyAccount (void) Act_FormEnd (); /* End alert */ - Lay_ShowAlertAndButton2 (ActUnk,NULL,NULL,Lay_NO_BUTTON,NULL); + Ale_ShowAlertAndButton2 (ActUnk,NULL,NULL,Lay_NO_BUTTON,NULL); } static void Acc_AskIfRemoveOtherUsrAccount (void) @@ -932,7 +932,7 @@ static void Acc_AskIfRemoveOtherUsrAccount (void) { /***** 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); + Ale_ShowAlertAndButton1 (Ale_QUESTION,Txt_Do_you_really_want_to_completely_eliminate_the_following_user); /* Show user's record */ Rec_ShowSharedRecordUnmodifiable (&Gbl.Usrs.Other.UsrDat); @@ -945,10 +945,10 @@ static void Acc_AskIfRemoveOtherUsrAccount (void) Act_FormEnd (); /* End alert */ - Lay_ShowAlertAndButton2 (ActUnk,NULL,NULL,Lay_NO_BUTTON,NULL); + Ale_ShowAlertAndButton2 (ActUnk,NULL,NULL,Lay_NO_BUTTON,NULL); } else - Lay_ShowAlert (Lay_WARNING,Txt_User_not_found_or_you_do_not_have_permission_); + Ale_ShowAlert (Ale_WARNING,Txt_User_not_found_or_you_do_not_have_permission_); } /*****************************************************************************/ @@ -1007,7 +1007,7 @@ void Acc_CompletelyEliminateAccount (struct UsrData *UsrDat, { sprintf (Gbl.Alert.Txt,Txt_THE_USER_X_has_been_removed_from_all_his_her_courses, UsrDat->FullName); - Lay_ShowAlert (Lay_SUCCESS,Gbl.Alert.Txt); + Ale_ShowAlert (Ale_SUCCESS,Gbl.Alert.Txt); } /***** Remove user as administrator of any degree *****/ @@ -1019,7 +1019,7 @@ void Acc_CompletelyEliminateAccount (struct UsrData *UsrDat, { sprintf (Gbl.Alert.Txt,Txt_THE_USER_X_has_been_removed_as_administrator, UsrDat->FullName); - Lay_ShowAlert (Lay_SUCCESS,Gbl.Alert.Txt); + Ale_ShowAlert (Ale_SUCCESS,Gbl.Alert.Txt); } /***** Remove user's clipboard in forums *****/ @@ -1034,7 +1034,7 @@ void Acc_CompletelyEliminateAccount (struct UsrData *UsrDat, { sprintf (Gbl.Alert.Txt,Txt_Briefcase_of_THE_USER_X_has_been_removed, UsrDat->FullName); - Lay_ShowAlert (Lay_SUCCESS,Gbl.Alert.Txt); + Ale_ShowAlert (Ale_SUCCESS,Gbl.Alert.Txt); } /***** Remove test results made by user in all courses *****/ @@ -1050,7 +1050,7 @@ void Acc_CompletelyEliminateAccount (struct UsrData *UsrDat, { sprintf (Gbl.Alert.Txt,Txt_Messages_of_THE_USER_X_have_been_deleted, UsrDat->FullName); - Lay_ShowAlert (Lay_SUCCESS,Gbl.Alert.Txt); + Ale_ShowAlert (Ale_SUCCESS,Gbl.Alert.Txt); } /***** Remove user from tables of banned users *****/ @@ -1097,7 +1097,7 @@ void Acc_CompletelyEliminateAccount (struct UsrData *UsrDat, { sprintf (Gbl.Alert.Txt,Txt_Photo_of_THE_USER_X_has_been_removed, UsrDat->FullName); - Lay_ShowAlert (Lay_SUCCESS,Gbl.Alert.Txt); + Ale_ShowAlert (Ale_SUCCESS,Gbl.Alert.Txt); } /***** Remove user *****/ @@ -1106,7 +1106,7 @@ void Acc_CompletelyEliminateAccount (struct UsrData *UsrDat, { sprintf (Gbl.Alert.Txt,Txt_Record_card_of_THE_USER_X_has_been_removed, UsrDat->FullName); - Lay_ShowAlert (Lay_SUCCESS,Gbl.Alert.Txt); + Ale_ShowAlert (Ale_SUCCESS,Gbl.Alert.Txt); } } diff --git a/swad_agenda.c b/swad_agenda.c index de067fb7..a213d778 100644 --- a/swad_agenda.c +++ b/swad_agenda.c @@ -380,7 +380,7 @@ void Agd_ShowUsrAgenda (void) } if (Error) - Lay_ShowAlert (Lay_WARNING,Txt_User_not_found_or_you_do_not_have_permission_); + Ale_ShowAlert (Ale_WARNING,Txt_User_not_found_or_you_do_not_have_permission_); } /*****************************************************************************/ @@ -422,12 +422,12 @@ void Agd_ShowOtherAgendaAfterLogIn (void) Lay_EndRoundFrame (); } else - Lay_ShowAlert (Lay_WARNING,Txt_User_not_found_or_you_do_not_have_permission_); + Ale_ShowAlert (Ale_WARNING,Txt_User_not_found_or_you_do_not_have_permission_); } else /* The current language is not my preferred language ==> change automatically to my language */ - Lay_ShowAlert (Lay_INFO,Txt_Switching_to_LANGUAGE[Gbl.Usrs.Me.UsrDat.Prefs.Language]); + Ale_ShowAlert (Ale_INFO,Txt_Switching_to_LANGUAGE[Gbl.Usrs.Me.UsrDat.Prefs.Language]); } } @@ -487,7 +487,7 @@ static void Agd_ShowEvents (Agd_AgendaType_t AgendaType) Lay_EndTable (); } else - Lay_ShowAlert (Lay_INFO,Txt_No_events); + Ale_ShowAlert (Ale_INFO,Txt_No_events); /***** Write again links to pages *****/ if (Pagination.MoreThanOnePage) @@ -1301,7 +1301,7 @@ void Agd_AskRemEvent (void) Gbl.Agenda.AgdCodToEdit = AgdEvent.AgdCod; sprintf (Gbl.Alert.Txt,Txt_Do_you_really_want_to_remove_the_event_X, AgdEvent.Event); - Lay_ShowAlertAndButton (Lay_QUESTION,Gbl.Alert.Txt, + Ale_ShowAlertAndButton (Ale_QUESTION,Gbl.Alert.Txt, ActRemEvtMyAgd,NULL,Agd_PutCurrentParamsMyAgenda, Lay_REMOVE_BUTTON,Txt_Remove_event); @@ -1335,7 +1335,7 @@ void Agd_RemoveEvent (void) /***** Write message to show the change made *****/ sprintf (Gbl.Alert.Txt,Txt_Event_X_removed,AgdEvent.Event); - Lay_ShowAlert (Lay_SUCCESS,Gbl.Alert.Txt); + Ale_ShowAlert (Ale_SUCCESS,Gbl.Alert.Txt); /***** Show events again *****/ Agd_ShowMyAgenda (); @@ -1367,7 +1367,7 @@ void Agd_HideEvent (void) /***** Write message to show the change made *****/ sprintf (Gbl.Alert.Txt,Txt_Event_X_is_now_hidden,AgdEvent.Event); - Lay_ShowAlert (Lay_SUCCESS,Gbl.Alert.Txt); + Ale_ShowAlert (Ale_SUCCESS,Gbl.Alert.Txt); /***** Show events again *****/ Agd_ShowMyAgenda (); @@ -1400,7 +1400,7 @@ void Agd_UnhideEvent (void) /***** Write message to show the change made *****/ sprintf (Gbl.Alert.Txt,Txt_Event_X_is_now_visible, AgdEvent.Event); - Lay_ShowAlert (Lay_SUCCESS,Gbl.Alert.Txt); + Ale_ShowAlert (Ale_SUCCESS,Gbl.Alert.Txt); /***** Show events again *****/ Agd_ShowMyAgenda (); @@ -1432,7 +1432,7 @@ void Agd_MakeEventPrivate (void) /***** Write message to show the change made *****/ sprintf (Gbl.Alert.Txt,Txt_Event_X_is_now_private,AgdEvent.Event); - Lay_ShowAlert (Lay_SUCCESS,Gbl.Alert.Txt); + Ale_ShowAlert (Ale_SUCCESS,Gbl.Alert.Txt); /***** Show events again *****/ Agd_ShowMyAgenda (); @@ -1465,7 +1465,7 @@ void Agd_MakeEventPublic (void) /***** Write message to show the change made *****/ sprintf (Gbl.Alert.Txt,Txt_Event_X_is_now_visible_to_users_of_your_courses, AgdEvent.Event); - Lay_ShowAlert (Lay_SUCCESS,Gbl.Alert.Txt); + Ale_ShowAlert (Ale_SUCCESS,Gbl.Alert.Txt); /***** Show events again *****/ Agd_ShowMyAgenda (); @@ -1644,14 +1644,14 @@ void Agd_RecFormEvent (void) if (!AgdEvent.Location[0]) // If there is no event { NewEventIsCorrect = false; - Lay_ShowAlert (Lay_WARNING,Txt_You_must_specify_the_title_of_the_event); + Ale_ShowAlert (Ale_WARNING,Txt_You_must_specify_the_title_of_the_event); } /***** Check if event is correct *****/ if (!AgdEvent.Event[0]) // If there is no event { NewEventIsCorrect = false; - Lay_ShowAlert (Lay_WARNING,Txt_You_must_specify_the_title_of_the_event); + Ale_ShowAlert (Ale_WARNING,Txt_You_must_specify_the_title_of_the_event); } /***** Create a new event or update an existing one *****/ @@ -1663,14 +1663,14 @@ void Agd_RecFormEvent (void) /***** Write success message *****/ sprintf (Gbl.Alert.Txt,Txt_Created_new_event_X,AgdEvent.Event); - Lay_ShowAlert (Lay_SUCCESS,Gbl.Alert.Txt); + Ale_ShowAlert (Ale_SUCCESS,Gbl.Alert.Txt); } else { Agd_UpdateEvent (&AgdEvent,Txt); /***** Write success message *****/ - Lay_ShowAlert (Lay_SUCCESS,Txt_The_event_has_been_modified); + Ale_ShowAlert (Ale_SUCCESS,Txt_The_event_has_been_modified); } /* Free memory for list of selected groups */ diff --git a/swad_announcement.c b/swad_announcement.c index 2070768c..d8357bb0 100644 --- a/swad_announcement.c +++ b/swad_announcement.c @@ -125,7 +125,7 @@ void Ann_ShowAllAnnouncements (void) Hlp_MESSAGES_Announcements); if (!NumAnnouncements) - Lay_ShowAlert (Lay_INFO,Txt_No_announcements); + Ale_ShowAlert (Ale_INFO,Txt_No_announcements); /***** Show the announcements *****/ for (NumAnn = 0; @@ -493,7 +493,7 @@ void Ann_ReceiveAnnouncement (void) Ann_CreateAnnouncement (Roles,Subject,Content); /***** Write message of success *****/ - Lay_ShowAlert (Lay_SUCCESS,Txt_Announcement_created); + Ale_ShowAlert (Ale_SUCCESS,Txt_Announcement_created); /***** Refresh list of announcements *****/ Ann_ShowAllAnnouncements (); @@ -578,7 +578,7 @@ void Ann_RemoveAnnouncement (void) DB_QueryDELETE (Query,"can not remove announcement"); /***** Write message of success *****/ - Lay_ShowAlert (Lay_SUCCESS,Txt_Announcement_removed); + Ale_ShowAlert (Ale_SUCCESS,Txt_Announcement_removed); /***** Refresh list of announcements *****/ Ann_ShowAllAnnouncements (); diff --git a/swad_assignment.c b/swad_assignment.c index 276b5dc5..580a115d 100644 --- a/swad_assignment.c +++ b/swad_assignment.c @@ -159,7 +159,7 @@ static void Asg_ShowAllAssignments (void) Lay_EndTable (); } else // No assignments created - Lay_ShowAlert (Lay_INFO,Txt_No_assignments); + Ale_ShowAlert (Ale_INFO,Txt_No_assignments); /***** Button to create a new assignment *****/ if (Asg_CheckIfICanCreateAssignments ()) @@ -972,7 +972,7 @@ void Asg_ReqRemAssignment (void) Gbl.Asgs.AsgCodToEdit = Asg.AsgCod; sprintf (Gbl.Alert.Txt,Txt_Do_you_really_want_to_remove_the_assignment_X, Asg.Title); - Lay_ShowAlertAndButton (Lay_QUESTION,Gbl.Alert.Txt, + Ale_ShowAlertAndButton (Ale_QUESTION,Gbl.Alert.Txt, ActRemAsg,NULL,Asg_PutParams, Lay_REMOVE_BUTTON,Txt_Remove_assignment); @@ -1016,7 +1016,7 @@ void Asg_RemoveAssignment (void) /***** Write message to show the change made *****/ sprintf (Gbl.Alert.Txt,Txt_Assignment_X_removed, Asg.Title); - Lay_ShowAlert (Lay_SUCCESS,Gbl.Alert.Txt); + Ale_ShowAlert (Ale_SUCCESS,Gbl.Alert.Txt); /***** Show assignments again *****/ Asg_SeeAssignments (); @@ -1048,7 +1048,7 @@ void Asg_HideAssignment (void) /***** Write message to show the change made *****/ sprintf (Gbl.Alert.Txt,Txt_Assignment_X_is_now_hidden, Asg.Title); - Lay_ShowAlert (Lay_SUCCESS,Gbl.Alert.Txt); + Ale_ShowAlert (Ale_SUCCESS,Gbl.Alert.Txt); /***** Show assignments again *****/ Asg_SeeAssignments (); @@ -1080,7 +1080,7 @@ void Asg_ShowAssignment (void) /***** Write message to show the change made *****/ sprintf (Gbl.Alert.Txt,Txt_Assignment_X_is_now_visible, Asg.Title); - Lay_ShowAlert (Lay_SUCCESS,Gbl.Alert.Txt); + Ale_ShowAlert (Ale_SUCCESS,Gbl.Alert.Txt); /***** Show assignments again *****/ Asg_SeeAssignments (); @@ -1361,7 +1361,7 @@ void Asg_RecFormAssignment (void) NewAssignmentIsCorrect = false; sprintf (Gbl.Alert.Txt,Txt_Already_existed_an_assignment_with_the_title_X, NewAsg.Title); - Lay_ShowAlert (Lay_WARNING,Gbl.Alert.Txt); + Ale_ShowAlert (Ale_WARNING,Gbl.Alert.Txt); } else // Title is correct { @@ -1374,13 +1374,13 @@ void Asg_RecFormAssignment (void) NewAssignmentIsCorrect = false; sprintf (Gbl.Alert.Txt,Txt_Already_existed_an_assignment_with_the_folder_X, NewAsg.Folder); - Lay_ShowAlert (Lay_WARNING,Gbl.Alert.Txt); + Ale_ShowAlert (Ale_WARNING,Gbl.Alert.Txt); } } else // Folder name not valid { NewAssignmentIsCorrect = false; - Lay_ShowAlert (Lay_WARNING,Gbl.Alert.Txt); + Ale_ShowAlert (Ale_WARNING,Gbl.Alert.Txt); } } else // NewAsg.SendWork == Asg_DO_NOT_SEND_WORK @@ -1390,7 +1390,7 @@ void Asg_RecFormAssignment (void) if (Brw_CheckIfExistsFolderAssigmentForAnyUsr (OldAsg.Folder)) { NewAssignmentIsCorrect = false; - Lay_ShowAlert (Lay_WARNING,Txt_You_can_not_disable_file_uploading_once_folders_have_been_created); + Ale_ShowAlert (Ale_WARNING,Txt_You_can_not_disable_file_uploading_once_folders_have_been_created); } } } @@ -1399,7 +1399,7 @@ void Asg_RecFormAssignment (void) else // If there is not an assignment title { NewAssignmentIsCorrect = false; - Lay_ShowAlert (Lay_WARNING,Txt_You_must_specify_the_title_of_the_assignment); + Ale_ShowAlert (Ale_WARNING,Txt_You_must_specify_the_title_of_the_assignment); } /***** Create a new assignment or update an existing one *****/ @@ -1414,7 +1414,7 @@ void Asg_RecFormAssignment (void) /***** Write success message *****/ sprintf (Gbl.Alert.Txt,Txt_Created_new_assignment_X,NewAsg.Title); - Lay_ShowAlert (Lay_SUCCESS,Gbl.Alert.Txt); + Ale_ShowAlert (Ale_SUCCESS,Gbl.Alert.Txt); } else { @@ -1426,7 +1426,7 @@ void Asg_RecFormAssignment (void) Asg_UpdateAssignment (&NewAsg,Txt); /***** Write success message *****/ - Lay_ShowAlert (Lay_SUCCESS,Txt_The_assignment_has_been_modified); + Ale_ShowAlert (Ale_SUCCESS,Txt_The_assignment_has_been_modified); } } diff --git a/swad_attendance.c b/swad_attendance.c index e1c446dd..77ef4377 100644 --- a/swad_attendance.c +++ b/swad_attendance.c @@ -273,7 +273,7 @@ static void Att_ShowAllAttEvents (void) Lay_EndTable (); } else // No events created - Lay_ShowAlert (Lay_INFO,Txt_No_events); + Ale_ShowAlert (Ale_INFO,Txt_No_events); /***** Button to create a new attendance event *****/ if (ICanEdit) @@ -879,7 +879,7 @@ void Att_AskRemAttEvent (void) /***** Ask for confirmation of removing *****/ sprintf (Gbl.Alert.Txt,Txt_Do_you_really_want_to_remove_the_event_X, Att.Title); - Lay_ShowAlert (Lay_WARNING,Gbl.Alert.Txt); + Ale_ShowAlert (Ale_WARNING,Gbl.Alert.Txt); Lay_PutRemoveButton (Txt_Remove_event); Act_FormEnd (); @@ -909,7 +909,7 @@ void Att_GetAndRemAttEvent (void) /***** Write message to show the change made *****/ sprintf (Gbl.Alert.Txt,Txt_Event_X_removed,Att.Title); - Lay_ShowAlert (Lay_SUCCESS,Gbl.Alert.Txt); + Ale_ShowAlert (Ale_SUCCESS,Gbl.Alert.Txt); /***** Show attendance events again *****/ Att_SeeAttEvents (); @@ -957,7 +957,7 @@ void Att_HideAttEvent (void) /***** Write message to show the change made *****/ sprintf (Gbl.Alert.Txt,Txt_Event_X_is_now_hidden, Att.Title); - Lay_ShowAlert (Lay_SUCCESS,Gbl.Alert.Txt); + Ale_ShowAlert (Ale_SUCCESS,Gbl.Alert.Txt); /***** Show attendance events again *****/ Att_SeeAttEvents (); @@ -989,7 +989,7 @@ void Att_ShowAttEvent (void) /***** Write message to show the change made *****/ sprintf (Gbl.Alert.Txt,Txt_Event_X_is_now_visible, Att.Title); - Lay_ShowAlert (Lay_SUCCESS,Gbl.Alert.Txt); + Ale_ShowAlert (Ale_SUCCESS,Gbl.Alert.Txt); /***** Show attendance events again *****/ Att_SeeAttEvents (); @@ -1270,13 +1270,13 @@ void Att_RecFormAttEvent (void) ReceivedAttEventIsCorrect = false; sprintf (Gbl.Alert.Txt,Txt_Already_existed_an_event_with_the_title_X, ReceivedAtt.Title); - Lay_ShowAlert (Lay_WARNING,Gbl.Alert.Txt); + Ale_ShowAlert (Ale_WARNING,Gbl.Alert.Txt); } } else // If there is not an attendance event title { ReceivedAttEventIsCorrect = false; - Lay_ShowAlert (Lay_WARNING,Txt_You_must_specify_the_title_of_the_event); + Ale_ShowAlert (Ale_WARNING,Txt_You_must_specify_the_title_of_the_event); } /***** Create a new attendance event or update an existing one *****/ @@ -1292,14 +1292,14 @@ void Att_RecFormAttEvent (void) /***** Write success message *****/ sprintf (Gbl.Alert.Txt,Txt_Created_new_event_X,ReceivedAtt.Title); - Lay_ShowAlert (Lay_SUCCESS,Gbl.Alert.Txt); + Ale_ShowAlert (Ale_SUCCESS,Gbl.Alert.Txt); } else { Att_UpdateAttEvent (&ReceivedAtt,Txt); /***** Write success message *****/ - Lay_ShowAlert (Lay_SUCCESS,Txt_The_event_has_been_modified); + Ale_ShowAlert (Ale_SUCCESS,Txt_The_event_has_been_modified); } /* Free memory for list of selected groups */ @@ -2207,7 +2207,7 @@ void Att_RegisterMeAsStdInAttEvent (void) Att_RemoveUsrFromAttEvent (Att.AttCod,Gbl.Usrs.Me.UsrDat.UsrCod); /***** Write final message *****/ - Lay_ShowAlert (Lay_SUCCESS,Txt_Your_comment_has_been_updated); + Ale_ShowAlert (Ale_SUCCESS,Txt_Your_comment_has_been_updated); } /***** Show the attendance event again *****/ @@ -2334,7 +2334,7 @@ void Att_RegisterStudentsInAttEvent (void) sprintf (Format,"%s: %%u
%s: %%u",Txt_Presents,Txt_Absents); sprintf (Gbl.Alert.Txt,Format, NumStdsPresent,NumStdsAbsent); - Lay_ShowAlert (Lay_INFO,Gbl.Alert.Txt); + Ale_ShowAlert (Ale_INFO,Gbl.Alert.Txt); } else // Gbl.Usrs.LstUsrs[Rol_STUDENT].NumUsrs == 0 /***** Show warning indicating no students found *****/ @@ -2798,7 +2798,7 @@ static void Usr_ListOrPrintStdsAttendanceCrs (Att_TypeOfView_t TypeOfView) } else // No students selected { - Lay_ShowAlert (Lay_WARNING,Txt_You_must_select_one_ore_more_students); + Ale_ShowAlert (Ale_WARNING,Txt_You_must_select_one_ore_more_students); Usr_ReqListStdsAttendanceCrs (); // ...show again the form } diff --git a/swad_banner.c b/swad_banner.c index 56ff51ec..ebe92520 100644 --- a/swad_banner.c +++ b/swad_banner.c @@ -113,7 +113,7 @@ void Ban_SeeBanners (void) if (Gbl.Banners.Num) // There are banners Ban_WriteListOfBanners (); else // No banners created - Lay_ShowAlert (Lay_INFO,Txt_No_banners); + Ale_ShowAlert (Ale_INFO,Txt_No_banners); /***** Button to create banner *****/ if (Gbl.Usrs.Me.LoggedRole == Rol_SYS_ADM) @@ -485,7 +485,7 @@ void Ban_RemoveBanner (void) /***** Write message to show the change made *****/ sprintf (Gbl.Alert.Txt,Txt_Banner_X_removed, Ban.ShrtName); - Lay_ShowAlert (Lay_SUCCESS,Gbl.Alert.Txt); + Ale_ShowAlert (Ale_SUCCESS,Gbl.Alert.Txt); /***** Show the form again *****/ Ban_EditBanners (); @@ -544,7 +544,7 @@ static void Ban_ShowOrHideBanner (bool Hide) sprintf (Gbl.Alert.Txt,Hide ? Txt_The_banner_X_is_now_hidden : Txt_The_banner_X_is_now_visible, Ban.ShrtName); - Lay_ShowAlert (Lay_SUCCESS,Gbl.Alert.Txt); + Ale_ShowAlert (Ale_SUCCESS,Gbl.Alert.Txt); /***** Show the form again *****/ Ban_EditBanners (); @@ -618,7 +618,7 @@ static void Ban_RenameBanner (Cns_ShrtOrFullName_t ShrtOrFullName) { sprintf (Gbl.Alert.Txt,Txt_You_can_not_leave_the_name_of_the_banner_X_empty, CurrentBanName); - Lay_ShowAlert (Lay_WARNING,Gbl.Alert.Txt); + Ale_ShowAlert (Ale_WARNING,Gbl.Alert.Txt); } else { @@ -630,7 +630,7 @@ static void Ban_RenameBanner (Cns_ShrtOrFullName_t ShrtOrFullName) { sprintf (Gbl.Alert.Txt,Txt_The_banner_X_already_exists, NewBanName); - Lay_ShowAlert (Lay_WARNING,Gbl.Alert.Txt); + Ale_ShowAlert (Ale_WARNING,Gbl.Alert.Txt); } else { @@ -640,14 +640,14 @@ static void Ban_RenameBanner (Cns_ShrtOrFullName_t ShrtOrFullName) /* Write message to show the change made */ sprintf (Gbl.Alert.Txt,Txt_The_banner_X_has_been_renamed_as_Y, CurrentBanName,NewBanName); - Lay_ShowAlert (Lay_SUCCESS,Gbl.Alert.Txt); + Ale_ShowAlert (Ale_SUCCESS,Gbl.Alert.Txt); } } else // The same name { sprintf (Gbl.Alert.Txt,Txt_The_name_of_the_banner_X_has_not_changed, CurrentBanName); - Lay_ShowAlert (Lay_INFO,Gbl.Alert.Txt); + Ale_ShowAlert (Ale_INFO,Gbl.Alert.Txt); } } @@ -719,10 +719,10 @@ void Ban_ChangeBannerImg (void) /***** Write message to show the change made *****/ sprintf (Gbl.Alert.Txt,Txt_The_new_image_is_X, NewImg); - Lay_ShowAlert (Lay_SUCCESS,Gbl.Alert.Txt); + Ale_ShowAlert (Ale_SUCCESS,Gbl.Alert.Txt); } else - Lay_ShowAlert (Lay_WARNING,Txt_You_can_not_leave_the_image_empty); + Ale_ShowAlert (Ale_WARNING,Txt_You_can_not_leave_the_image_empty); /***** Show the form again *****/ Str_Copy (Ban->Img,NewImg, @@ -764,10 +764,10 @@ void Ban_ChangeBannerWWW (void) /***** Write message to show the change made *****/ sprintf (Gbl.Alert.Txt,Txt_The_new_web_address_is_X, NewWWW); - Lay_ShowAlert (Lay_SUCCESS,Gbl.Alert.Txt); + Ale_ShowAlert (Ale_SUCCESS,Gbl.Alert.Txt); } else - Lay_ShowAlert (Lay_WARNING,Txt_You_can_not_leave_the_web_address_empty); + Ale_ShowAlert (Ale_WARNING,Txt_You_can_not_leave_the_web_address_empty); /***** Show the form again *****/ Str_Copy (Ban->WWW,NewWWW, @@ -910,23 +910,23 @@ void Ban_RecFormNewBanner (void) { sprintf (Gbl.Alert.Txt,Txt_The_banner_X_already_exists, Ban->ShrtName); - Lay_ShowAlert (Lay_WARNING,Gbl.Alert.Txt); + Ale_ShowAlert (Ale_WARNING,Gbl.Alert.Txt); } else if (Ban_CheckIfBannerNameExists ("FullName",Ban->FullName,-1L)) { sprintf (Gbl.Alert.Txt,Txt_The_banner_X_already_exists, Ban->FullName); - Lay_ShowAlert (Lay_WARNING,Gbl.Alert.Txt); + Ale_ShowAlert (Ale_WARNING,Gbl.Alert.Txt); } else if (!Ban->Img[0]) - Lay_ShowAlert (Lay_WARNING,Txt_You_must_specify_the_image_of_the_new_banner); + Ale_ShowAlert (Ale_WARNING,Txt_You_must_specify_the_image_of_the_new_banner); else if (!Ban->WWW[0]) - Lay_ShowAlert (Lay_WARNING,Txt_You_must_specify_the_URL_of_the_new_banner); + Ale_ShowAlert (Ale_WARNING,Txt_You_must_specify_the_URL_of_the_new_banner); else // Add new banner to database Ban_CreateBanner (Ban); } else // If there is not a banner name - Lay_ShowAlert (Lay_WARNING,Txt_You_must_specify_the_short_name_and_the_full_name_of_the_new_banner); + Ale_ShowAlert (Ale_WARNING,Txt_You_must_specify_the_short_name_and_the_full_name_of_the_new_banner); /***** Show the form again *****/ Ban_EditBanners (); @@ -952,7 +952,7 @@ static void Ban_CreateBanner (struct Banner *Ban) /***** Write success message *****/ sprintf (Gbl.Alert.Txt,Txt_Created_new_banner_X, Ban->ShrtName); - Lay_ShowAlert (Lay_SUCCESS,Gbl.Alert.Txt); + Ale_ShowAlert (Ale_SUCCESS,Gbl.Alert.Txt); } /*****************************************************************************/ diff --git a/swad_centre.c b/swad_centre.c index 9869dc07..decdc549 100644 --- a/swad_centre.c +++ b/swad_centre.c @@ -214,7 +214,7 @@ void Ctr_SeeCtrWithPendingDegs (void) Lay_EndRoundFrameTable (); } else - Lay_ShowAlert (Lay_INFO,Txt_There_are_no_centres_with_requests_for_degrees_to_be_confirmed); + Ale_ShowAlert (Ale_INFO,Txt_There_are_no_centres_with_requests_for_degrees_to_be_confirmed); /***** Free structure that stores the query result *****/ DB_FreeMySQLResult (&mysql_res); @@ -772,7 +772,7 @@ static void Ctr_ListCentres (void) Lay_EndTable (); } else // No centres created in the current institution - Lay_ShowAlert (Lay_INFO,Txt_No_centres); + Ale_ShowAlert (Ale_INFO,Txt_No_centres); /***** Button to create centre *****/ if (Ctr_CheckIfICanCreateCentres ()) @@ -1717,7 +1717,7 @@ void Ctr_RemoveCentre (void) if (Ctr.Degs.Num || Ctr.NumUsrsWhoClaimToBelongToCtr || Ctr.NumUsrs) // Centre has degrees or users ==> don't remove - Lay_ShowAlert (Lay_WARNING,Txt_To_remove_a_centre_you_must_first_remove_all_degrees_and_teachers_in_the_centre); + Ale_ShowAlert (Ale_WARNING,Txt_To_remove_a_centre_you_must_first_remove_all_degrees_and_teachers_in_the_centre); else // Centre has no teachers ==> remove it { /***** Remove all the threads and posts in forums of the centre *****/ @@ -1744,7 +1744,7 @@ void Ctr_RemoveCentre (void) /***** Write message to show the change made *****/ sprintf (Gbl.Alert.Txt,Txt_Centre_X_removed, Ctr.FullName); - Lay_ShowAlert (Lay_SUCCESS,Gbl.Alert.Txt); + Ale_ShowAlert (Ale_SUCCESS,Gbl.Alert.Txt); } /***** Show the form again *****/ @@ -1776,7 +1776,7 @@ void Ctr_ChangeCtrInsInConfig (void) Gbl.CurrentCtr.Ctr.CtrCod, NewIns.InsCod)) { - Gbl.Alert.Type = Lay_WARNING; + Gbl.Alert.Type = Ale_WARNING; sprintf (Gbl.Alert.Txt,Txt_The_centre_X_already_exists, Gbl.CurrentCtr.Ctr.ShrtName); } @@ -1785,7 +1785,7 @@ void Ctr_ChangeCtrInsInConfig (void) Gbl.CurrentCtr.Ctr.CtrCod, NewIns.InsCod)) { - Gbl.Alert.Type = Lay_WARNING; + Gbl.Alert.Type = Ale_WARNING; sprintf (Gbl.Alert.Txt,Txt_The_centre_X_already_exists, Gbl.CurrentCtr.Ctr.FullName); } @@ -1800,7 +1800,7 @@ void Ctr_ChangeCtrInsInConfig (void) Hie_InitHierarchy (); /***** Write message to show the change made *****/ - Gbl.Alert.Type = Lay_SUCCESS; + Gbl.Alert.Type = Ale_SUCCESS; sprintf (Gbl.Alert.Txt,Txt_The_centre_X_has_been_moved_to_the_institution_Y, Gbl.CurrentCtr.Ctr.FullName,NewIns.FullName); } @@ -1814,7 +1814,7 @@ void Ctr_ChangeCtrInsInConfig (void) void Ctr_ContEditAfterChgCtrInConfig (void) { /***** Write error/success message *****/ - Lay_ShowPendingAlert (); + Ale_ShowPendingAlert (); /***** Show the form again *****/ Ctr_ShowConfiguration (); @@ -1862,7 +1862,7 @@ void Ctr_ChangeCentrePlace (void) /***** Write message to show the change made and put button to go to centre changed *****/ - Gbl.Alert.Type = Lay_SUCCESS; + Gbl.Alert.Type = Ale_SUCCESS; sprintf (Gbl.Alert.Txt,"%s",Txt_The_place_of_the_centre_has_changed); Ctr_ShowAlertAndButtonToGoToCtr (); @@ -1942,7 +1942,7 @@ static void Ctr_RenameCentre (struct Centre *Ctr,Cns_ShrtOrFullName_t ShrtOrFull /***** Check if new name is empty *****/ if (!NewCtrName[0]) { - Gbl.Alert.Type = Lay_WARNING; + Gbl.Alert.Type = Ale_WARNING; sprintf (Gbl.Alert.Txt,Txt_You_can_not_leave_the_name_of_the_centre_X_empty, CurrentCtrName); } @@ -1954,7 +1954,7 @@ static void Ctr_RenameCentre (struct Centre *Ctr,Cns_ShrtOrFullName_t ShrtOrFull /***** If degree was in database... *****/ if (Ctr_CheckIfCtrNameExistsInIns (ParamName,NewCtrName,Ctr->CtrCod,Gbl.CurrentIns.Ins.InsCod)) { - Gbl.Alert.Type = Lay_WARNING; + Gbl.Alert.Type = Ale_WARNING; sprintf (Gbl.Alert.Txt,Txt_The_centre_X_already_exists,NewCtrName); } else @@ -1963,7 +1963,7 @@ static void Ctr_RenameCentre (struct Centre *Ctr,Cns_ShrtOrFullName_t ShrtOrFull Ctr_UpdateInsNameDB (Ctr->CtrCod,FieldName,NewCtrName); /* Write message to show the change made */ - Gbl.Alert.Type = Lay_SUCCESS; + Gbl.Alert.Type = Ale_SUCCESS; sprintf (Gbl.Alert.Txt,Txt_The_centre_X_has_been_renamed_as_Y, CurrentCtrName,NewCtrName); @@ -1974,7 +1974,7 @@ static void Ctr_RenameCentre (struct Centre *Ctr,Cns_ShrtOrFullName_t ShrtOrFull } else // The same name { - Gbl.Alert.Type = Lay_INFO; + Gbl.Alert.Type = Ale_INFO; sprintf (Gbl.Alert.Txt,Txt_The_name_of_the_centre_X_has_not_changed, CurrentCtrName); } @@ -2040,12 +2040,12 @@ void Ctr_ChangeCtrWWW (void) /***** Write message to show the change made and put button to go to centre changed *****/ - Gbl.Alert.Type = Lay_SUCCESS; + Gbl.Alert.Type = Ale_SUCCESS; sprintf (Gbl.Alert.Txt,Txt_The_new_web_address_is_X,NewWWW); Ctr_ShowAlertAndButtonToGoToCtr (); } else - Lay_ShowAlert (Lay_WARNING,Txt_You_can_not_leave_the_web_address_empty); + Ale_ShowAlert (Ale_WARNING,Txt_You_can_not_leave_the_web_address_empty); /***** Show the form again *****/ Ctr_EditCentres (); @@ -2071,10 +2071,10 @@ void Ctr_ChangeCtrWWWInConfig (void) /***** Write message to show the change made *****/ sprintf (Gbl.Alert.Txt,Txt_The_new_web_address_is_X,NewWWW); - Lay_ShowAlert (Lay_SUCCESS,Gbl.Alert.Txt); + Ale_ShowAlert (Ale_SUCCESS,Gbl.Alert.Txt); } else - Lay_ShowAlert (Lay_WARNING,Txt_You_can_not_leave_the_web_address_empty); + Ale_ShowAlert (Ale_WARNING,Txt_You_can_not_leave_the_web_address_empty); /***** Show the form again *****/ Ctr_ShowConfiguration (); @@ -2132,7 +2132,7 @@ void Ctr_ChangeCtrStatus (void) /***** Write message to show the change made and put button to go to centre changed *****/ - Gbl.Alert.Type = Lay_SUCCESS; + Gbl.Alert.Type = Ale_SUCCESS; sprintf (Gbl.Alert.Txt,Txt_The_status_of_the_centre_X_has_changed, Gbl.Ctrs.EditingCtr.ShrtName); Ctr_ShowAlertAndButtonToGoToCtr (); @@ -2171,13 +2171,13 @@ static void Ctr_ShowAlertAndButtonToGoToCtr (void) { /***** Alert with button to go to centre *****/ sprintf (Gbl.Title,Txt_Go_to_X,Gbl.Ctrs.EditingCtr.ShrtName); - Lay_ShowAlertAndButton (Gbl.Alert.Type,Gbl.Alert.Txt, + Ale_ShowAlertAndButton (Gbl.Alert.Type,Gbl.Alert.Txt, ActSeeDeg,NULL,Ctr_PutParamGoToCtr, Lay_CONFIRM_BUTTON,Gbl.Title); } else /***** Alert *****/ - Lay_ShowAlert (Gbl.Alert.Type,Gbl.Alert.Txt); + Ale_ShowAlert (Gbl.Alert.Type,Gbl.Alert.Txt); } static void Ctr_PutParamGoToCtr (void) @@ -2240,7 +2240,7 @@ void Ctr_RequestPhoto (void) Ctr_PHOTO_SAVED_MAX_WIDTH, Ctr_PHOTO_SAVED_MAX_HEIGHT, Txt_XxY_pixels_or_higher); - Lay_ShowAlert (Lay_INFO,Gbl.Alert.Txt); + Ale_ShowAlert (Ale_INFO,Gbl.Alert.Txt); /***** Upload photo *****/ fprintf (Gbl.F.Out,"