Marown/swad-core
Marown
/
swad-core
mirror of https://github.com/acanas/swad-core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Version 16.240

This commit is contained in:
Antonio Cañas Vargas 2017-06-11 19:02:40 +02:00
parent dc196a2e6c
commit 0c15b1a5ae
50 changed files with 198 additions and 334 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -28,7 +28,7 @@
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_box.o \
swad_banner.o swad_box.o swad_button.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 \
swad_database.o swad_date.o swad_degree.o swad_degree_type.o \

2
swad_ID.c
View File

@ -705,7 +705,7 @@ void ID_ShowFormChangeUsrID (const struct UsrData *UsrDat,bool ItsMe)
ID_MAX_BYTES_USR_ID,
UsrDat->IDs.Num ? UsrDat->IDs.List[UsrDat->IDs.Num - 1].ID :
""); // Show the most recent ID
Lay_PutCreateButtonInline (Txt_Add_this_ID);
Btn_PutCreateButtonInline (Txt_Add_this_ID);
Act_FormEnd ();
fprintf (Gbl.F.Out,"</td>"
"</tr>"

16
swad_account.c
View File

@ -161,7 +161,7 @@ static void Acc_ShowFormCheckIfIHaveAccount (const char *Title)
"</label>",
The_ClassForm[Gbl.Prefs.Theme],Txt_ID,
ID_MAX_CHARS_USR_ID);
Lay_PutConfirmButton (Txt_Check);
Btn_PutConfirmButton (Txt_Check);
Act_FormEnd ();
/***** End frame *****/
@ -312,7 +312,7 @@ static void Acc_WriteRowEmptyAccount (unsigned NumUsr,const char *ID,struct UsrD
Gbl.RowEvenOdd);
Act_FormStart (ActLogInNew);
Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
Lay_PutCreateButtonInline (Txt_Its_me);
Btn_PutCreateButtonInline (Txt_Its_me);
Act_FormEnd ();
fprintf (Gbl.F.Out,"</td>"
"</tr>");
@ -396,7 +396,7 @@ static void Acc_ShowFormRequestNewAccountWithParams (const char *NewNicknameWith
Pwd_PutFormToGetNewPasswordOnce ();
/***** Send button and form end *****/
Box_EndBoxTableWithButton (Lay_CREATE_BUTTON,Txt_Create_account);
Box_EndBoxTableWithButton (Btn_CREATE_BUTTON,Txt_Create_account);
Act_FormEnd ();
}
@ -418,7 +418,7 @@ void Acc_ShowFormGoToRequestNewAccount (void)
/***** Button to go to request the creation of a new account *****/
Act_FormStart (ActFrmMyAcc);
Lay_PutCreateButton (Txt_Create_account);
Btn_PutCreateButton (Txt_Create_account);
Act_FormEnd ();
/***** End frame *****/
@ -933,11 +933,11 @@ void Acc_AskIfRemoveMyAccount (void)
/* Show form to request confirmation */
Act_FormStart (ActRemMyAcc);
Pwd_AskForConfirmationOnDangerousAction ();
Lay_PutRemoveButton (Txt_Eliminate_my_user_account);
Btn_PutRemoveButton (Txt_Eliminate_my_user_account);
Act_FormEnd ();
/* End alert */
Ale_ShowAlertAndButton2 (ActUnk,NULL,NULL,NULL,Lay_NO_BUTTON,NULL);
Ale_ShowAlertAndButton2 (ActUnk,NULL,NULL,NULL,Btn_NO_BUTTON,NULL);
}
static void Acc_AskIfRemoveOtherUsrAccount (void)
@ -959,11 +959,11 @@ static void Acc_AskIfRemoveOtherUsrAccount (void)
Act_FormStart (ActRemUsrGbl);
Usr_PutParamOtherUsrCodEncrypted ();
Pwd_AskForConfirmationOnDangerousAction ();
Lay_PutRemoveButton (Txt_Eliminate_user_account);
Btn_PutRemoveButton (Txt_Eliminate_user_account);
Act_FormEnd ();
/* End alert */
Ale_ShowAlertAndButton2 (ActUnk,NULL,NULL,NULL,Lay_NO_BUTTON,NULL);
Ale_ShowAlertAndButton2 (ActUnk,NULL,NULL,NULL,Btn_NO_BUTTON,NULL);
}
else
Ale_ShowAlert (Ale_WARNING,Txt_User_not_found_or_you_do_not_have_permission_);

8
swad_agenda.c
View File

@ -718,7 +718,7 @@ static void Agd_PutButtonToCreateNewEvent (void)
Gbl.Agenda.HiddenVisiblEvents,
Gbl.Agenda.CurrentPage,
-1L);
Lay_PutConfirmButton (Txt_New_event);
Btn_PutConfirmButton (Txt_New_event);
Act_FormEnd ();
}
@ -1309,7 +1309,7 @@ void Agd_AskRemEvent (void)
Ale_ShowAlertAndButton (Ale_QUESTION,Gbl.Alert.Txt,
ActRemEvtMyAgd,NULL,NULL,
Agd_PutCurrentParamsMyAgenda,
Lay_REMOVE_BUTTON,Txt_Remove_event);
Btn_REMOVE_BUTTON,Txt_Remove_event);
/***** Show events again *****/
Agd_ShowMyAgenda ();
@ -1599,9 +1599,9 @@ void Agd_RequestCreatOrEditEvent (void)
/***** New event *****/
if (ItsANewEvent)
Box_EndBoxTableWithButton (Lay_CREATE_BUTTON,Txt_Create_event);
Box_EndBoxTableWithButton (Btn_CREATE_BUTTON,Txt_Create_event);
else
Box_EndBoxTableWithButton (Lay_CONFIRM_BUTTON,Txt_Save);
Box_EndBoxTableWithButton (Btn_CONFIRM_BUTTON,Txt_Save);
Act_FormEnd ();
/***** Show current events, if any *****/

4
swad_announcement.c
View File

@ -198,7 +198,7 @@ static void Ann_PutButtonToAddNewAnnouncement (void)
extern const char *Txt_New_announcement;
Act_FormStart (ActWriAnn);
Lay_PutConfirmButton (Txt_New_announcement);
Btn_PutConfirmButton (Txt_New_announcement);
Act_FormEnd ();
}
@ -444,7 +444,7 @@ void Ann_ShowFormAnnouncement (void)
"</tr>");
/***** Button to create announcement and end frame *****/
Box_EndBoxTableWithButton (Lay_CREATE_BUTTON,Txt_Create_announcement);
Box_EndBoxTableWithButton (Btn_CREATE_BUTTON,Txt_Create_announcement);
/***** End form *****/
Act_FormEnd ();

8
swad_assignment.c
View File

@ -292,7 +292,7 @@ static void Asg_PutButtonToCreateNewAsg (void)
Gbl.Asgs.AsgCodToEdit = -1L;
Act_FormStart (ActFrmNewAsg);
Asg_PutParams ();
Lay_PutConfirmButton (Txt_New_assignment);
Btn_PutConfirmButton (Txt_New_assignment);
Act_FormEnd ();
}
@ -980,7 +980,7 @@ void Asg_ReqRemAssignment (void)
Asg.Title);
Ale_ShowAlertAndButton (Ale_QUESTION,Gbl.Alert.Txt,
ActRemAsg,NULL,NULL,Asg_PutParams,
Lay_REMOVE_BUTTON,Txt_Remove_assignment);
Btn_REMOVE_BUTTON,Txt_Remove_assignment);
/***** Show assignments again *****/
Asg_SeeAssignments ();
@ -1235,9 +1235,9 @@ void Asg_RequestCreatOrEditAsg (void)
/***** New assignment *****/
if (ItsANewAssignment)
Box_EndBoxTableWithButton (Lay_CREATE_BUTTON,Txt_Create_assignment);
Box_EndBoxTableWithButton (Btn_CREATE_BUTTON,Txt_Create_assignment);
else
Box_EndBoxTableWithButton (Lay_CONFIRM_BUTTON,Txt_Save);
Box_EndBoxTableWithButton (Btn_CONFIRM_BUTTON,Txt_Save);
Act_FormEnd ();
/***** Show current assignments, if any *****/

16
swad_attendance.c
View File

@ -339,7 +339,7 @@ static void Att_PutButtonToCreateNewAttEvent (void)
Act_FormStart (ActFrmNewAtt);
Att_PutParamsToCreateNewAttEvent ();
Lay_PutConfirmButton (Txt_New_event);
Btn_PutConfirmButton (Txt_New_event);
Act_FormEnd ();
}
@ -891,7 +891,7 @@ void Att_AskRemAttEvent (void)
sprintf (Gbl.Alert.Txt,Txt_Do_you_really_want_to_remove_the_event_X,
Att.Title);
Ale_ShowAlert (Ale_WARNING,Gbl.Alert.Txt);
Lay_PutRemoveButton (Txt_Remove_event);
Btn_PutRemoveButton (Txt_Remove_event);
Act_FormEnd ();
/***** Show attendance events again *****/
@ -1159,9 +1159,9 @@ void Att_RequestCreatOrEditAttEvent (void)
/***** Button and end frame *****/
if (ItsANewAttEvent)
Box_EndBoxTableWithButton (Lay_CREATE_BUTTON,Txt_Create_event);
Box_EndBoxTableWithButton (Btn_CREATE_BUTTON,Txt_Create_event);
else
Box_EndBoxTableWithButton (Lay_CONFIRM_BUTTON,Txt_Save);
Box_EndBoxTableWithButton (Btn_CONFIRM_BUTTON,Txt_Save);
/***** End form *****/
Act_FormEnd ();
@ -1909,7 +1909,7 @@ static void Att_ListAttOnlyMeAsStudent (struct AttendanceEvent *Att)
if (Att->Open)
{
/***** Send button *****/
Lay_PutConfirmButton (Txt_Save);
Btn_PutConfirmButton (Txt_Save);
Act_FormEnd ();
}
}
@ -2000,7 +2000,7 @@ static void Att_ListAttStudents (struct AttendanceEvent *Att)
Lay_EndTable ();
/* Send button */
Lay_PutConfirmButton (Txt_Save);
Btn_PutConfirmButton (Txt_Save);
/***** End form *****/
Act_FormEnd ();
@ -2707,7 +2707,7 @@ void Usr_ReqListStdsAttendanceCrs (void)
Lay_EndTable ();
/* Send button */
Lay_PutConfirmButton (Txt_Show_list);
Btn_PutConfirmButton (Txt_Show_list);
/* End form */
Act_FormEnd ();
@ -3075,7 +3075,7 @@ static void Att_PutButtonToShowDetails (void)
Usr_PutHiddenParUsrCodAll (Gbl.Action.Act,Gbl.Usrs.Select[Rol_UNK]);
if (Gbl.AttEvents.StrAttCodsSelected[0])
Par_PutHiddenParamString ("AttCods",Gbl.AttEvents.StrAttCodsSelected);
Lay_PutConfirmButton (Txt_Show_more_details);
Btn_PutConfirmButton (Txt_Show_more_details);
Act_FormEnd ();
}

4
swad_banner.c
View File

@ -130,7 +130,7 @@ void Ban_SeeBanners (void)
if (Gbl.Usrs.Me.Role.Logged == Rol_SYS_ADM)
{
Act_FormStart (ActEdiBan);
Lay_PutConfirmButton (Txt_New_banner);
Btn_PutConfirmButton (Txt_New_banner);
Act_FormEnd ();
}
@ -883,7 +883,7 @@ static void Ban_PutFormToCreateBanner (void)
Cns_MAX_CHARS_WWW,Ban->WWW);
/***** Send button and end frame *****/
Box_EndBoxTableWithButton (Lay_CREATE_BUTTON,Txt_Create_banner);
Box_EndBoxTableWithButton (Btn_CREATE_BUTTON,Txt_Create_banner);
/***** End of form *****/
Act_FormEnd ();

28
swad_box.c
View File

@ -25,35 +25,13 @@
/********************************* Headers ***********************************/
/*****************************************************************************/
// #include <linux/stddef.h> // For NULL
#include <stdbool.h> // For boolean type
#include <stdio.h> // For fprintf
// #include <stdlib.h> // For exit, system, malloc, calloc, free, etc
// #include <string.h> // For string functions
#include "swad_action.h"
#include "swad_box.h"
// #include "swad_calendar.h"
// #include "swad_changelog.h"
// #include "swad_config.h"
// #include "swad_connected.h"
// #include "swad_database.h"
// #include "swad_exam.h"
// #include "swad_follow.h"
#include "swad_global.h"
#include "swad_help.h"
// #include "swad_hierarchy.h"
// #include "swad_language.h"
// #include "swad_logo.h"
// #include "swad_MFU.h"
// #include "swad_notice.h"
// #include "swad_notification.h"
// #include "swad_parameter.h"
// #include "swad_preference.h"
// #include "swad_social.h"
// #include "swad_tab.h"
// #include "swad_theme.h"
// #include "swad_web_service.h"
/*****************************************************************************/
/************** External global variables from others modules ****************/
@ -218,15 +196,15 @@ void Box_EndBoxTable (void)
Box_EndBox ();
}
void Box_EndBoxTableWithButton (Lay_Button_t Button,const char *TxtButton)
void Box_EndBoxTableWithButton (Btn_Button_t Button,const char *TxtButton)
{
Lay_EndTable ();
Box_EndBoxWithButton (Button,TxtButton);
}
void Box_EndBoxWithButton (Lay_Button_t Button,const char *TxtButton)
void Box_EndBoxWithButton (Btn_Button_t Button,const char *TxtButton)
{
Lay_PutButton (Button,TxtButton);
Btn_PutButton (Button,TxtButton);
Box_EndBox ();
}

6
swad_box.h
View File

@ -29,7 +29,7 @@
#include <stdbool.h> // For boolean type
#include "swad_layout.h"
#include "swad_button.h"
/*****************************************************************************/
/****************************** Public constants *****************************/
@ -58,8 +58,8 @@ void Box_StartBoxTableShadow (const char *Width,const char *Title,
const char *HelpLink,
unsigned CellPadding);
void Box_EndBoxTable (void);
void Box_EndBoxTableWithButton (Lay_Button_t Button,const char *TxtButton);
void Box_EndBoxWithButton (Lay_Button_t Button,const char *TxtButton);
void Box_EndBoxTableWithButton (Btn_Button_t Button,const char *TxtButton);
void Box_EndBoxWithButton (Btn_Button_t Button,const char *TxtButton);
void Box_EndBox (void);
#endif

6
swad_centre.c
View File

@ -773,7 +773,7 @@ static void Ctr_ListCentres (void)
if (Ctr_CheckIfICanCreateCentres ())
{
Act_FormStart (ActEdiCtr);
Lay_PutConfirmButton (Gbl.Ctrs.Num ? Txt_Create_another_centre :
Btn_PutConfirmButton (Gbl.Ctrs.Num ? Txt_Create_another_centre :
Txt_Create_centre);
Act_FormEnd ();
}
@ -2166,7 +2166,7 @@ static void Ctr_ShowAlertAndButtonToGoToCtr (void)
sprintf (Gbl.Title,Txt_Go_to_X,Gbl.Ctrs.EditingCtr.ShrtName);
Ale_ShowAlertAndButton (Gbl.Alert.Type,Gbl.Alert.Txt,
ActSeeDeg,NULL,NULL,Ctr_PutParamGoToCtr,
Lay_CONFIRM_BUTTON,Gbl.Title);
Btn_CONFIRM_BUTTON,Gbl.Title);
}
else
/***** Alert *****/
@ -2509,7 +2509,7 @@ static void Ctr_PutFormToCreateCentre (void)
"</tr>");
/***** Send button and end of frame *****/
Box_EndBoxTableWithButton (Lay_CREATE_BUTTON,Txt_Create_centre);
Box_EndBoxTableWithButton (Btn_CREATE_BUTTON,Txt_Create_centre);
/***** End form *****/
Act_FormEnd ();

3
swad_changelog.h
View File

@ -243,13 +243,14 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 16.239 (2017-06-10)"
#define Log_PLATFORM_VERSION "SWAD 16.240 (2017-06-11)"
#define CSS_FILE "swad16.235.1.css"
#define JS_FILE "swad16.206.3.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.240: Jun 11, 2017 New module swad_button to draw buttons. (222023 lines)
Version 16.239: Jun 10, 2017 New module swad_box to draw boxes. (221970 lines)
Version 16.238: Jun 10, 2017 Icon to close frames. (221803 lines)
Version 16.237: Jun 09, 2017 Code refactoring related to users belonging to a course.

2
swad_country.c
View File

@ -2017,7 +2017,7 @@ static void Cty_PutFormToCreateCountry (void)
}
/***** Send button and end of frame *****/
Box_EndBoxTableWithButton (Lay_CREATE_BUTTON,Txt_Create_country);
Box_EndBoxTableWithButton (Btn_CREATE_BUTTON,Txt_Create_country);
/***** End of form *****/
Act_FormEnd ();

12
swad_course.c
View File

@ -1165,7 +1165,7 @@ static void Crs_ListCourses (void)
if (Crs_CheckIfICanCreateCourses ())
{
Act_FormStart (ActEdiCrs);
Lay_PutConfirmButton (Gbl.CurrentDeg.NumCrss ? Txt_Create_another_course :
Btn_PutConfirmButton (Gbl.CurrentDeg.NumCrss ? Txt_Create_another_course :
Txt_Create_course);
Act_FormEnd ();
}
@ -1718,7 +1718,7 @@ static void Crs_PutFormToCreateCourse (void)
"</tr>");
/***** Send button and end frame *****/
Box_EndBoxTableWithButton (Lay_CREATE_BUTTON,Txt_Create_course);
Box_EndBoxTableWithButton (Btn_CREATE_BUTTON,Txt_Create_course);
/***** End form *****/
Act_FormEnd ();
@ -2820,7 +2820,7 @@ void Crs_ContEditAfterChgCrs (void)
}
/***** End alert *****/
Ale_ShowAlertAndButton2 (ActUnk,NULL,NULL,NULL,Lay_NO_BUTTON,NULL);
Ale_ShowAlertAndButton2 (ActUnk,NULL,NULL,NULL,Btn_NO_BUTTON,NULL);
/***** Show the form again *****/
Crs_EditCourses ();
@ -2842,7 +2842,7 @@ static void Crs_PutButtonToGoToCrs (void)
Act_FormStart (ActSeeCrsInf);
Crs_PutParamCrsCod (Gbl.Degs.EditingCrs.CrsCod);
sprintf (Gbl.Title,Txt_Go_to_X,Gbl.Degs.EditingCrs.ShrtName);
Lay_PutConfirmButton (Gbl.Title);
Btn_PutConfirmButton (Gbl.Title);
Act_FormEnd ();
}
}
@ -2862,7 +2862,7 @@ static void Crs_PutButtonToRegisterInCrs (void)
if (Gbl.Degs.EditingCrs.CrsCod != Gbl.CurrentCrs.Crs.CrsCod)
Crs_PutParamCrsCod (Gbl.Degs.EditingCrs.CrsCod);
sprintf (Gbl.Title,Txt_Register_me_in_X,Gbl.Degs.EditingCrs.ShrtName);
Lay_PutCreateButton (Gbl.Title);
Btn_PutCreateButton (Gbl.Title);
Act_FormEnd ();
}
@ -3353,7 +3353,7 @@ void Crs_AskRemoveOldCrss (void)
fprintf (Gbl.F.Out,"</label>");
/***** End frame *****/
Box_EndBoxWithButton (Lay_REMOVE_BUTTON,Txt_Eliminate);
Box_EndBoxWithButton (Btn_REMOVE_BUTTON,Txt_Eliminate);
/***** End form *****/
Act_FormEnd ();

6
swad_degree.c
View File

@ -1024,7 +1024,7 @@ static void Deg_PutFormToCreateDegree (void)
fprintf (Gbl.F.Out,"</table>");
/***** Send button and end of frame *****/
Box_EndBoxTableWithButton (Lay_CREATE_BUTTON,Txt_Create_degree);
Box_EndBoxTableWithButton (Btn_CREATE_BUTTON,Txt_Create_degree);
/***** End form *****/
Act_FormEnd ();
@ -1202,7 +1202,7 @@ static void Deg_ListDegrees (void)
if (Deg_CheckIfICanCreateDegrees ())
{
Act_FormStart (ActEdiDeg);
Lay_PutConfirmButton (Gbl.CurrentCtr.Ctr.Degs.Num ? Txt_Create_another_degree :
Btn_PutConfirmButton (Gbl.CurrentCtr.Ctr.Degs.Num ? Txt_Create_another_degree :
Txt_Create_degree);
Act_FormEnd ();
}
@ -2285,7 +2285,7 @@ void Deg_ShowAlertAndButtonToGoToDeg (void)
sprintf (Gbl.Title,Txt_Go_to_X,Gbl.Degs.EditingDeg.ShrtName);
Ale_ShowAlertAndButton (Gbl.Alert.Type,Gbl.Alert.Txt,
ActSeeCrs,NULL,NULL,Deg_PutParamGoToDeg,
Lay_CONFIRM_BUTTON,Gbl.Title);
Btn_CONFIRM_BUTTON,Gbl.Title);
}
else
/***** Alert *****/

4
swad_degree_type.c
View File

@ -241,7 +241,7 @@ static void DT_ListDegreeTypes (Act_Action_t NextAction,DT_Order_t SelectedOrder
if (DT_CheckIfICanCreateDegreeTypes ())
{
Act_FormStart (ActEdiDegTyp);
Lay_PutConfirmButton (Gbl.Degs.DegTypes.Num ? Txt_Create_another_type_of_degree :
Btn_PutConfirmButton (Gbl.Degs.DegTypes.Num ? Txt_Create_another_type_of_degree :
Txt_Create_type_of_degree);
Act_FormEnd ();
}
@ -466,7 +466,7 @@ void DT_PutFormToCreateDegreeType (void)
"</tr>");
/***** Send button and end frame *****/
Box_EndBoxTableWithButton (Lay_CREATE_BUTTON,Txt_Create_type_of_degree);
Box_EndBoxTableWithButton (Btn_CREATE_BUTTON,Txt_Create_type_of_degree);
/***** End form *****/
Act_FormEnd ();

2
swad_department.c
View File

@ -964,7 +964,7 @@ static void Dpt_PutFormToCreateDepartment (void)
Cns_MAX_CHARS_WWW,Dpt->WWW);
/***** Send button and end of frame *****/
Box_EndBoxTableWithButton (Lay_CREATE_BUTTON,Txt_Create_department);
Box_EndBoxTableWithButton (Btn_CREATE_BUTTON,Txt_Create_department);
/***** End of form *****/
Act_FormEnd ();

6
swad_duplicate.c
View File

@ -398,7 +398,7 @@ static void Dup_PutButtonToViewSimilarUsrs (const struct UsrData *UsrDat)
Act_FormStart (ActLstSimUsr);
Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
Lay_PutConfirmButtonInline (Txt_Similar_users);
Btn_PutConfirmButtonInline (Txt_Similar_users);
Act_FormEnd ();
}
@ -413,7 +413,7 @@ static void Dup_PutButtonToEliminateUsrAccount (const struct UsrData *UsrDat)
Act_FormStart (ActUpdOth);
Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
Par_PutHiddenParamUnsigned ("RegRemAction",(unsigned) Enr_ELIMINATE_ONE_USR_FROM_PLATFORM);
Lay_PutRemoveButtonInline (Txt_Eliminate_user_account);
Btn_PutRemoveButtonInline (Txt_Eliminate_user_account);
Act_FormEnd ();
}
@ -427,7 +427,7 @@ static void Dup_PutButtonToRemoveFromListOfDupUsrs (const struct UsrData *UsrDat
Act_FormStart (ActRemDupUsr);
Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
Lay_PutConfirmButtonInline (Txt_Not_duplicated);
Btn_PutConfirmButtonInline (Txt_Not_duplicated);
Act_FormEnd ();
}

30
swad_enrolment.c
View File

@ -179,7 +179,7 @@ void Enr_PutButtonInlineToRegisterStds (long CrsCod)
{
Act_FormStart (ActReqEnrSevStd);
Crs_PutParamCrsCod (CrsCod);
Lay_PutCreateButtonInline (Txt_Register_students);
Btn_PutCreateButtonInline (Txt_Register_students);
Act_FormEnd ();
}
}
@ -358,7 +358,7 @@ void Enr_WriteFormToReqAnotherUsrID (Act_Action_t NextAction)
Cns_MAX_CHARS_EMAIL_ADDRESS);
/***** Send button*****/
Lay_PutConfirmButton (Txt_Continue);
Btn_PutConfirmButton (Txt_Continue);
Act_FormEnd ();
}
@ -402,7 +402,7 @@ void Enr_ReqAcceptRegisterInCrs (void)
default:
Lay_ShowErrorAndExit ("Wrong role.");
}
Lay_PutCreateButtonInline (Txt_Confirm_my_enrolment);
Btn_PutCreateButtonInline (Txt_Confirm_my_enrolment);
Act_FormEnd ();
/***** Send button to refuse register in the current course *****/
@ -420,7 +420,7 @@ void Enr_ReqAcceptRegisterInCrs (void)
default:
Lay_ShowErrorAndExit ("Wrong role.");
}
Lay_PutRemoveButtonInline (Txt_Remove_me_from_this_course);
Btn_PutRemoveButtonInline (Txt_Remove_me_from_this_course);
Act_FormEnd ();
/***** End frame *****/
@ -759,7 +759,7 @@ static void Enr_ShowFormRegRemSeveralUsrs (Rol_Role_t Role)
Pwd_AskForConfirmationOnDangerousAction ();
/***** Send button and end frame *****/
Box_EndBoxWithButton (Lay_CONFIRM_BUTTON,Txt_Confirm);
Box_EndBoxWithButton (Btn_CONFIRM_BUTTON,Txt_Confirm);
/***** End of form *****/
Act_FormEnd ();
@ -821,7 +821,7 @@ void Enr_AskRemoveOldUsrs (void)
fprintf (Gbl.F.Out,"</label>");
/***** End frame *****/
Box_EndBoxWithButton (Lay_REMOVE_BUTTON,Txt_Eliminate);
Box_EndBoxWithButton (Btn_REMOVE_BUTTON,Txt_Eliminate);
/***** End form *****/
Act_FormEnd ();
@ -1871,11 +1871,11 @@ void Enr_AskRemAllStdsThisCrs (void)
Act_FormStart (ActRemAllStdCrs);
Grp_PutParamAllGroups ();
Pwd_AskForConfirmationOnDangerousAction ();
Lay_PutRemoveButton (Txt_Remove_all_students);
Btn_PutRemoveButton (Txt_Remove_all_students);
Act_FormEnd ();
/* End alert */
Ale_ShowAlertAndButton2 (ActUnk,NULL,NULL,NULL,Lay_NO_BUTTON,NULL);
Ale_ShowAlertAndButton2 (ActUnk,NULL,NULL,NULL,Btn_NO_BUTTON,NULL);
}
else // Gbl.CurrentCrs.Crs.NumUsrs[Rol_STD] == 0
/***** Show warning indicating no students found *****/
@ -2164,7 +2164,7 @@ void Enr_AskIfRejectSignUp (void)
/* End alert */
Ale_ShowAlertAndButton2 (ActRejSignUp,NULL,NULL,
Usr_PutParamOtherUsrCodEncrypted,
Lay_REMOVE_BUTTON,Txt_Reject);
Btn_REMOVE_BUTTON,Txt_Reject);
}
else
Lay_ShowErrorAndExit ("Wrong role.");
@ -2919,7 +2919,7 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected)
Act_FormStart (NextAction);
Crs_PutParamCrsCod (Crs.CrsCod);
Usr_PutParamUsrCodEncrypted (UsrDat.EncryptedUsrCod);
Lay_PutCreateButtonInline (Txt_Register);
Btn_PutCreateButtonInline (Txt_Register);
Act_FormEnd ();
fprintf (Gbl.F.Out,"</td>");
@ -2928,7 +2928,7 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected)
Act_FormStart (ActReqRejSignUp);
Crs_PutParamCrsCod (Crs.CrsCod);
Usr_PutParamUsrCodEncrypted (UsrDat.EncryptedUsrCod);
Lay_PutRemoveButtonInline (Txt_Reject);
Btn_PutRemoveButtonInline (Txt_Reject);
Act_FormEnd ();
fprintf (Gbl.F.Out,"</td>"
"</tr>");
@ -3693,7 +3693,7 @@ static void Enr_ReqAddAdm (Sco_Scope_t Scope,long Cod,const char *InsCtrDegName)
/* End alert */
Ale_ShowAlertAndButton2 (Enr_ActNewAdm[Scope],NULL,NULL,
Usr_PutParamOtherUsrCodEncrypted,
Lay_CREATE_BUTTON,Txt_Register_user_IN_A_COURSE_OR_DEGREE);
Btn_CREATE_BUTTON,Txt_Register_user_IN_A_COURSE_OR_DEGREE);
}
}
else
@ -4120,12 +4120,12 @@ static void Enr_AskIfRemoveUsrFromCrs (struct UsrData *UsrDat)
Act_FormStart (NextAction);
Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
Pwd_AskForConfirmationOnDangerousAction ();
Lay_PutRemoveButton (ItsMe ? Txt_Remove_me_from_this_course :
Btn_PutRemoveButton (ItsMe ? Txt_Remove_me_from_this_course :
Txt_Remove_user_from_this_course);
Act_FormEnd ();
/* End alert */
Ale_ShowAlertAndButton2 (ActUnk,NULL,NULL,NULL,Lay_NO_BUTTON,NULL);
Ale_ShowAlertAndButton2 (ActUnk,NULL,NULL,NULL,Btn_NO_BUTTON,NULL);
}
else // User does not belong to current course
Ale_ShowAlert (Ale_WARNING,Txt_User_not_found_or_you_do_not_have_permission_);
@ -4239,7 +4239,7 @@ static void Enr_AskIfRemAdm (bool ItsMe,Sco_Scope_t Scope,const char *InsCtrDegN
/* End alert */
Ale_ShowAlertAndButton2 (Enr_ActRemAdm[Scope],NULL,NULL,
Usr_PutParamOtherUsrCodEncrypted,
Lay_REMOVE_BUTTON,
Btn_REMOVE_BUTTON,
ItsMe ? Txt_Remove_me_as_an_administrator :
Txt_Remove_USER_as_an_administrator);
}

8
swad_exam.c
View File

@ -374,7 +374,7 @@ void Exa_ReqRemoveExamAnnouncement (void)
/* End alert */
Ale_ShowAlertAndButton2 (ActRemExaAnn,NULL,NULL,Exa_PutParamExaCodToEdit,
Lay_REMOVE_BUTTON,Txt_Remove);
Btn_REMOVE_BUTTON,Txt_Remove);
}
/*****************************************************************************/
@ -725,7 +725,7 @@ static void Exa_PutButtonToCreateNewExamAnnouncement (void)
extern const char *Txt_New_announcement_OF_EXAM;
Act_FormStart (ActEdiExaAnn);
Lay_PutConfirmButton (Txt_New_announcement_OF_EXAM);
Btn_PutConfirmButton (Txt_New_announcement_OF_EXAM);
Act_FormEnd ();
}
@ -1526,8 +1526,8 @@ static void Exa_ShowExamAnnouncement (Exa_TypeViewExamAnnouncement_t TypeViewExa
/***** End frame *****/
if (TypeViewExamAnnouncement == Exa_FORM_VIEW)
Box_EndBoxWithButton ((Gbl.ExamAnns.ExaDat.ExaCod > 0) ? Lay_CONFIRM_BUTTON :
Lay_CREATE_BUTTON,
Box_EndBoxWithButton ((Gbl.ExamAnns.ExaDat.ExaCod > 0) ? Btn_CONFIRM_BUTTON :
Btn_CREATE_BUTTON,
Txt_Publish_announcement_OF_EXAM);
else
Box_EndBox ();

24
swad_file_browser.c
View File

@ -3153,7 +3153,7 @@ void Brw_AskEditWorksCrs (void)
Lay_EndTable ();
/* Send button */
Lay_PutConfirmButton (Txt_View_homework);
Btn_PutConfirmButton (Txt_View_homework);
/* End form */
Act_FormEnd ();
@ -3766,7 +3766,7 @@ static void Brw_PutButtonToShowEdit (void)
{
Act_FormStart (Brw_ActFromAdmToSee[Gbl.FileBrowser.Type]);
Brw_PutHiddenParamFullTreeIfSelected ();
Lay_PutConfirmButton (Txt_View);
Btn_PutConfirmButton (Txt_View);
Act_FormEnd ();
}
break;
@ -3775,7 +3775,7 @@ static void Brw_PutButtonToShowEdit (void)
{
Act_FormStart (Brw_ActFromSeeToAdm[Gbl.FileBrowser.Type]);
Brw_PutHiddenParamFullTreeIfSelected ();
Lay_PutConfirmButton (Txt_Edit);
Btn_PutConfirmButton (Txt_Edit);
Act_FormEnd ();
}
break;
@ -6253,7 +6253,7 @@ void Brw_AskRemFileFromTree (void)
Ale_ShowAlertAndButton (Ale_QUESTION,Gbl.Alert.Txt,
Brw_ActRemoveFile[Gbl.FileBrowser.Type],NULL,NULL,
Brw_PutParamsRemFile,
Lay_REMOVE_BUTTON,
Btn_REMOVE_BUTTON,
Gbl.FileBrowser.FileType == Brw_IS_FILE ? Txt_Remove_file :
Txt_Remove_link);
}
@ -6398,7 +6398,7 @@ static void Brw_AskConfirmRemoveFolderNotEmpty (void)
Ale_ShowAlertAndButton (Ale_QUESTION,Gbl.Alert.Txt,
Brw_ActRemoveFolderNotEmpty[Gbl.FileBrowser.Type],NULL,NULL,
Brw_PutParamsRemFolder,
Lay_REMOVE_BUTTON,Txt_Remove_folder);
Btn_REMOVE_BUTTON,Txt_Remove_folder);
}
/*****************************************************************************/
@ -8002,7 +8002,7 @@ static void Brw_PutFormToCreateAFolder (const char FileNameToShow[NAME_MAX + 1])
Brw_MAX_CHARS_FOLDER);
/* Button to send and end frame *****/
Box_EndBoxWithButton (Lay_CREATE_BUTTON,Txt_Create_folder);
Box_EndBoxWithButton (Btn_CREATE_BUTTON,Txt_Create_folder);
/***** End form *****/
Act_FormEnd ();
@ -8065,7 +8065,7 @@ static void Brw_PutFormToUploadFilesUsingDropzone (const char *FileNameToShow)
-1L);
/***** Button to send *****/
Lay_PutConfirmButton (Txt_Done);
Btn_PutConfirmButton (Txt_Done);
/***** End form *****/
Act_FormEnd ();
@ -8105,7 +8105,7 @@ static void Brw_PutFormToUploadOneFileClassic (const char *FileNameToShow)
Fil_NAME_OF_PARAM_FILENAME_ORG);
/* Button to send */
Lay_PutCreateButton (Txt_Upload_file);
Btn_PutCreateButton (Txt_Upload_file);
Act_FormEnd ();
/***** End frame *****/
@ -8140,7 +8140,7 @@ static void Brw_PutFormToPasteAFileOrFolder (const char *FileNameToShow)
Ale_ShowAlert (Ale_INFO,Gbl.Alert.Txt);
/***** Send button and end frame *****/
Box_EndBoxWithButton (Lay_CREATE_BUTTON,Txt_Paste);
Box_EndBoxWithButton (Btn_CREATE_BUTTON,Txt_Paste);
/***** End form *****/
Act_FormEnd ();
@ -8212,7 +8212,7 @@ static void Brw_PutFormToCreateALink (const char *FileNameToShow)
Brw_MAX_CHARS_FOLDER);
/***** Send button and end frame *****/
Box_EndBoxWithButton (Lay_CREATE_BUTTON,Txt_Create_link);
Box_EndBoxWithButton (Btn_CREATE_BUTTON,Txt_Create_link);
/***** End form *****/
Act_FormEnd ();
@ -9348,7 +9348,7 @@ void Brw_ShowFileMetadata (void)
/***** End frame *****/
if (ICanEdit) // I can edit file properties
{
Box_EndBoxTableWithButton (Lay_CONFIRM_BUTTON,Txt_Save_file_properties);
Box_EndBoxTableWithButton (Btn_CONFIRM_BUTTON,Txt_Save_file_properties);
Act_FormEnd ();
}
else
@ -11723,7 +11723,7 @@ void Brw_AskRemoveOldFiles (void)
fprintf (Gbl.F.Out,"</label>");
/***** End frame *****/
Box_EndBoxWithButton (Lay_REMOVE_BUTTON,Txt_Remove);
Box_EndBoxWithButton (Btn_REMOVE_BUTTON,Txt_Remove);
/***** End form *****/
Act_FormEnd ();

4
swad_forum.c
View File

@ -3924,7 +3924,7 @@ static void For_WriteFormForumPst (bool IsReply,const char *Subject)
Img_PutImageUploader (-1,"FOR_IMG_TIT_URL");
/***** Send button *****/
Lay_PutCreateButton (Txt_Send);
Btn_PutCreateButton (Txt_Send);
/***** End form *****/
Act_FormEnd ();
@ -4168,7 +4168,7 @@ void For_RequestRemoveThread (void)
For_ActionsDelThrFor[Gbl.Forum.ForumSelected.Type],
For_FORUM_THREADS_SECTION_ID,NULL,
For_PutAllHiddenParamsRemThread,
Lay_REMOVE_BUTTON,Txt_Remove_thread);
Btn_REMOVE_BUTTON,Txt_Remove_thread);
Lay_EndSection ();
/***** Show the threads again *****/

12
swad_group.c
View File

@ -1755,7 +1755,7 @@ void Grp_ShowLstGrpsToChgMyGrps (void)
if (PutFormToChangeGrps)
{
if (ICanChangeMyGrps)
Lay_PutConfirmButton (NumGrpsIBelong ? Txt_Change_my_groups :
Btn_PutConfirmButton (NumGrpsIBelong ? Txt_Change_my_groups :
Txt_Enrol_in_groups);
Act_FormEnd ();
}
@ -1770,7 +1770,7 @@ void Grp_ShowLstGrpsToChgMyGrps (void)
if (ICanEdit)
{
Act_FormStart (ActReqEdiGrp);
Lay_PutConfirmButton (Txt_Create_group);
Btn_PutConfirmButton (Txt_Create_group);
Act_FormEnd ();
}
}
@ -2440,7 +2440,7 @@ static void Grp_PutFormToCreateGroupType (void)
"</tr>");
/***** Send button and end frame *****/
Box_EndBoxTableWithButton (Lay_CREATE_BUTTON,Txt_Create_type_of_group);
Box_EndBoxTableWithButton (Btn_CREATE_BUTTON,Txt_Create_type_of_group);
/***** End form *****/
Act_FormEnd ();
@ -2536,7 +2536,7 @@ static void Grp_PutFormToCreateGroup (void)
"</tr>");
/***** Send button and end frame *****/
Box_EndBoxTableWithButton (Lay_CREATE_BUTTON,Txt_Create_group);
Box_EndBoxTableWithButton (Btn_CREATE_BUTTON,Txt_Create_group);
/***** End of form *****/
Act_FormEnd ();
@ -3698,7 +3698,7 @@ static void Grp_AskConfirmRemGrpTypWithGrps (unsigned NumGrps)
Ale_ShowAlertAndButton (Ale_QUESTION,Gbl.Alert.Txt,
ActRemGrpTyp,Grp_GROUP_TYPES_SECTION_ID,NULL,
Grp_PutParamRemGrpTyp,
Lay_REMOVE_BUTTON,Txt_Remove_type_of_group);
Btn_REMOVE_BUTTON,Txt_Remove_type_of_group);
/***** Show the form to edit group types and groups again *****/
Grp_ReqEditGroupsInternal1 (Ale_INFO,NULL);
@ -3751,7 +3751,7 @@ static void Grp_AskConfirmRemGrp (void)
Ale_ShowAlertAndButton (Ale_QUESTION,Gbl.Alert.Txt,
ActRemGrp,Grp_GROUPS_SECTION_ID,NULL,
Grp_PutParamRemGrp,
Lay_REMOVE_BUTTON,Txt_Remove_group);
Btn_REMOVE_BUTTON,Txt_Remove_group);
/***** Show the form to edit groups again *****/
Grp_ReqEditGroupsInternal2 (Ale_INFO,NULL);

30
swad_help.c
View File

@ -62,7 +62,7 @@ extern struct Globals Gbl;
static void Hlp_ShowRowHelpWhatWouldYouLikeToDo (const char *Description,
Act_Action_t Action,
Lay_Button_t Button,
Btn_Button_t Button,
const char *TxtButton);
/*****************************************************************************/
@ -151,7 +151,7 @@ void Hlp_ShowHelpWhatWouldYouLikeToDo (void)
Gbl.CurrentCrs.Crs.ShrtName);
Hlp_ShowRowHelpWhatWouldYouLikeToDo (Gbl.Title,
ActionsRemoveMe[Gbl.Usrs.Me.UsrDat.Roles.InCurrentCrs.Role],
Lay_REMOVE_BUTTON,Txt_Remove_me);
Btn_REMOVE_BUTTON,Txt_Remove_me);
}
}
else // I do not belong to this course
@ -161,7 +161,7 @@ void Hlp_ShowHelpWhatWouldYouLikeToDo (void)
Gbl.CurrentCrs.Crs.ShrtName);
Hlp_ShowRowHelpWhatWouldYouLikeToDo (Gbl.Title,
ActReqSignUp,
Lay_CREATE_BUTTON,Txt_Sign_up);
Btn_CREATE_BUTTON,Txt_Sign_up);
}
}
@ -176,14 +176,14 @@ void Hlp_ShowHelpWhatWouldYouLikeToDo (void)
Gbl.CurrentCrs.Crs.ShrtName);
Hlp_ShowRowHelpWhatWouldYouLikeToDo (Gbl.Title,
ActReqEnrSevStd,
Lay_CREATE_BUTTON,Txt_Register_students);
Btn_CREATE_BUTTON,Txt_Register_students);
}
if (Gbl.Action.Act != ActMyCrs) // I am not seeing the action to list my courses
/* Request list my courses */
Hlp_ShowRowHelpWhatWouldYouLikeToDo (Txt_Go_to_one_of_my_courses,
ActMyCrs,
Lay_CONFIRM_BUTTON,Txt_My_courses);
Btn_CONFIRM_BUTTON,Txt_My_courses);
}
if (Gbl.CurrentDeg.Deg.DegCod > 0) // Degree selected
@ -194,7 +194,7 @@ void Hlp_ShowHelpWhatWouldYouLikeToDo (void)
Gbl.CurrentDeg.Deg.ShrtName);
Hlp_ShowRowHelpWhatWouldYouLikeToDo (Gbl.Title,
ActSeeCrs,
Lay_CONFIRM_BUTTON,Txt_Courses);
Btn_CONFIRM_BUTTON,Txt_Courses);
}
else if (Gbl.CurrentCtr.Ctr.CtrCod > 0) // Centre selected
{
@ -204,7 +204,7 @@ void Hlp_ShowHelpWhatWouldYouLikeToDo (void)
Gbl.CurrentCtr.Ctr.ShrtName);
Hlp_ShowRowHelpWhatWouldYouLikeToDo (Gbl.Title,
ActSeeDeg,
Lay_CONFIRM_BUTTON,Txt_Degrees);
Btn_CONFIRM_BUTTON,Txt_Degrees);
}
else if (Gbl.CurrentIns.Ins.InsCod > 0) // Institution selected
{
@ -214,7 +214,7 @@ void Hlp_ShowHelpWhatWouldYouLikeToDo (void)
Gbl.CurrentIns.Ins.ShrtName);
Hlp_ShowRowHelpWhatWouldYouLikeToDo (Gbl.Title,
ActSeeCtr,
Lay_CONFIRM_BUTTON,Txt_Centres);
Btn_CONFIRM_BUTTON,Txt_Centres);
}
else if (Gbl.CurrentCty.Cty.CtyCod > 0) // Country selected
{
@ -224,33 +224,33 @@ void Hlp_ShowHelpWhatWouldYouLikeToDo (void)
Gbl.CurrentCty.Cty.Name[Gbl.Prefs.Language]);
Hlp_ShowRowHelpWhatWouldYouLikeToDo (Gbl.Title,
ActSeeIns,
Lay_CONFIRM_BUTTON,Txt_Institutions);
Btn_CONFIRM_BUTTON,Txt_Institutions);
}
else
/* Select a country */
Hlp_ShowRowHelpWhatWouldYouLikeToDo (Gbl.CurrentCty.Cty.CtyCod > 0 ? Txt_Select_another_country :
Txt_Select_one_country,
ActSeeCty,
Lay_CONFIRM_BUTTON,Txt_Countries);
Btn_CONFIRM_BUTTON,Txt_Countries);
if (!Gbl.Usrs.Me.MyPhotoExists) // I have no photo
Hlp_ShowRowHelpWhatWouldYouLikeToDo (Txt_Upload_my_picture,
ActReqMyPho,
Lay_CREATE_BUTTON,Txt_Upload_photo);
Btn_CREATE_BUTTON,Txt_Upload_photo);
}
else // I am not logged
{
/* Log in */
Hlp_ShowRowHelpWhatWouldYouLikeToDo (Txt_Log_in,
ActFrmLogIn,
Lay_CONFIRM_BUTTON,Txt_Log_in);
Btn_CONFIRM_BUTTON,Txt_Log_in);
/* Sign up */
sprintf (Gbl.Title,Txt_New_on_PLATFORM_Sign_up,
Cfg_PLATFORM_SHORT_NAME);
Hlp_ShowRowHelpWhatWouldYouLikeToDo (Gbl.Title,
ActFrmMyAcc,
Lay_CREATE_BUTTON,Txt_Create_account);
Btn_CREATE_BUTTON,Txt_Create_account);
}
/* End table */
@ -263,7 +263,7 @@ void Hlp_ShowHelpWhatWouldYouLikeToDo (void)
static void Hlp_ShowRowHelpWhatWouldYouLikeToDo (const char *Description,
Act_Action_t Action,
Lay_Button_t Button,
Btn_Button_t Button,
const char *TxtButton)
{
/***** Description *****/
@ -276,7 +276,7 @@ static void Hlp_ShowRowHelpWhatWouldYouLikeToDo (const char *Description,
/***** Button *****/
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE\">");
Act_FormStart (Action);
Lay_PutButtonInline (Button,TxtButton);
Btn_PutButtonInline (Button,TxtButton);
Act_FormEnd ();
fprintf (Gbl.F.Out,"</td>"
"</tr>");

4
swad_holiday.c
View File

@ -180,7 +180,7 @@ void Hld_SeeHolidays (void)
if (Gbl.Usrs.Me.Role.Logged >= Rol_INS_ADM) // Institution admin or system admin
{
Act_FormStart (ActEdiHld);
Lay_PutConfirmButton (Txt_New_holiday);
Btn_PutConfirmButton (Txt_New_holiday);
Act_FormEnd ();
}
@ -1052,7 +1052,7 @@ static void Hld_PutFormToCreateHoliday (void)
Hld_MAX_CHARS_HOLIDAY_NAME,Hld->Name);
/***** Send button and end of frame *****/
Box_EndBoxTableWithButton (Lay_CREATE_BUTTON,Txt_Create_holiday);
Box_EndBoxTableWithButton (Btn_CREATE_BUTTON,Txt_Create_holiday);
/***** End of form *****/
Act_FormEnd ();

4
swad_indicator.c
View File

@ -196,7 +196,7 @@ void Ind_ReqIndicatorsCourses (void)
Par_PutHiddenParamLong ("DptCod",Gbl.Stat.DptCod);
if (Gbl.Stat.StrIndicatorsSelected[0])
Par_PutHiddenParamString ("Indicators",Gbl.Stat.StrIndicatorsSelected);
Lay_PutConfirmButton (Txt_Show_more_details);
Btn_PutConfirmButton (Txt_Show_more_details);
Act_FormEnd ();
}
@ -527,7 +527,7 @@ static void Ind_PutButtonToConfirmIWantToSeeBigList (unsigned NumCrss)
Ale_ShowAlertAndButton (Ale_WARNING,Gbl.Alert.Txt,
Gbl.Action.Act,NULL,NULL,
Ind_PutParamsConfirmIWantToSeeBigList,
Lay_CONFIRM_BUTTON,Txt_Show_anyway);
Btn_CONFIRM_BUTTON,Txt_Show_anyway);
}
static void Ind_PutParamsConfirmIWantToSeeBigList (void)

16
swad_info.c
View File

@ -463,7 +463,7 @@ static void Inf_PutButtonToEditInfo (void)
extern const char *Txt_Edit;
Act_FormStart (Inf_ActionsEditInfo[Gbl.CurrentCrs.Info.Type]);
Lay_PutConfirmButton (Txt_Edit);
Btn_PutConfirmButton (Txt_Edit);
Act_FormEnd ();
}
@ -1221,7 +1221,7 @@ void Inf_FormToEnterIntegratedEditor (Inf_InfoSrc_t InfoSrc)
extern const char *Txt_Edit;
Act_FormStart (Inf_ActionsInfo[InfoSrc][Gbl.CurrentCrs.Info.Type]);
Lay_PutConfirmButton (Txt_Edit);
Btn_PutConfirmButton (Txt_Edit);
Act_FormEnd ();
}
@ -1234,7 +1234,7 @@ void Inf_FormToEnterPlainTextEditor (Inf_InfoSrc_t InfoSrc)
extern const char *Txt_Edit_plain_text;
Act_FormStart (Inf_ActionsInfo[InfoSrc][Gbl.CurrentCrs.Info.Type]);
Lay_PutConfirmButton (Txt_Edit_plain_text);
Btn_PutConfirmButton (Txt_Edit_plain_text);
Act_FormEnd ();
}
@ -1247,7 +1247,7 @@ void Inf_FormToEnterRichTextEditor (Inf_InfoSrc_t InfoSrc)
extern const char *Txt_Edit_rich_text;
Act_FormStart (Inf_ActionsInfo[InfoSrc][Gbl.CurrentCrs.Info.Type]);
Lay_PutConfirmButton (Txt_Edit_rich_text);
Btn_PutConfirmButton (Txt_Edit_rich_text);
Act_FormEnd ();
}
@ -1275,7 +1275,7 @@ void Inf_FormToSendPage (Inf_InfoSrc_t InfoSrc)
Fil_NAME_OF_PARAM_FILENAME_ORG);
/***** Send button *****/
Lay_PutCreateButton (Txt_Upload_file);
Btn_PutCreateButton (Txt_Upload_file);
/***** End form *****/
Act_FormEnd ();
@ -1321,7 +1321,7 @@ void Inf_FormToSendURL (Inf_InfoSrc_t InfoSrc)
"</div>");
/***** Send button *****/
Lay_PutCreateButton (Txt_Send_URL);
Btn_PutCreateButton (Txt_Send_URL);
/***** End form *****/
Act_FormEnd ();
@ -2085,7 +2085,7 @@ void Inf_EditPlainTxtInfo (void)
TxtHTML);
/***** End frame and form *****/
Box_EndBoxWithButton (Lay_CONFIRM_BUTTON,Txt_Save);
Box_EndBoxWithButton (Btn_CONFIRM_BUTTON,Txt_Save);
Act_FormEnd ();
}
@ -2137,7 +2137,7 @@ void Inf_EditRichTxtInfo (void)
TxtHTML);
/***** End frame and form *****/
Box_EndBoxWithButton (Lay_CONFIRM_BUTTON,Txt_Save);
Box_EndBoxWithButton (Btn_CONFIRM_BUTTON,Txt_Save);
Act_FormEnd ();
}

6
swad_institution.c
View File

@ -696,7 +696,7 @@ static void Ins_ListInstitutions (void)
if (Ins_CheckIfICanCreateInstitutions ())
{
Act_FormStart (ActEdiIns);
Lay_PutConfirmButton (Gbl.Inss.Num ? Txt_Create_another_institution :
Btn_PutConfirmButton (Gbl.Inss.Num ? Txt_Create_another_institution :
Txt_Create_institution);
Act_FormEnd ();
}
@ -2101,7 +2101,7 @@ static void Ins_ShowAlertAndButtonToGoToIns (void)
sprintf (Gbl.Title,Txt_Go_to_X,Gbl.Inss.EditingIns.ShrtName);
Ale_ShowAlertAndButton (Gbl.Alert.Type,Gbl.Alert.Txt,
ActSeeCtr,NULL,NULL,Ins_PutParamGoToIns,
Lay_CONFIRM_BUTTON,Gbl.Title);
Btn_CONFIRM_BUTTON,Gbl.Title);
}
else
/***** Alert *****/
@ -2231,7 +2231,7 @@ static void Ins_PutFormToCreateInstitution (void)
"</tr>");
/***** Send button and end of frame *****/
Box_EndBoxTableWithButton (Lay_CREATE_BUTTON,Txt_Create_institution);
Box_EndBoxTableWithButton (Btn_CREATE_BUTTON,Txt_Create_institution);
/***** End form *****/
Act_FormEnd ();

98
swad_layout.c
View File

@ -1335,104 +1335,6 @@ void Lay_PutIconRemove (void)
Txt_Remove);
}
/*****************************************************************************/
/********************** Put a button to submit a form ************************/
/*****************************************************************************/
void Lay_PutButton (Lay_Button_t Button,const char *TxtButton)
{
if (TxtButton)
if (TxtButton[0])
switch (Button)
{
case Lay_NO_BUTTON:
break;
case Lay_CREATE_BUTTON:
Lay_PutCreateButton (TxtButton);
break;
case Lay_CONFIRM_BUTTON:
Lay_PutConfirmButton (TxtButton);
break;
case Lay_REMOVE_BUTTON:
Lay_PutRemoveButton (TxtButton);
break;
}
}
void Lay_PutButtonInline (Lay_Button_t Button,const char *TxtButton)
{
if (TxtButton)
if (TxtButton[0])
switch (Button)
{
case Lay_NO_BUTTON:
break;
case Lay_CREATE_BUTTON:
Lay_PutCreateButtonInline (TxtButton);
break;
case Lay_CONFIRM_BUTTON:
Lay_PutConfirmButtonInline (TxtButton);
break;
case Lay_REMOVE_BUTTON:
Lay_PutRemoveButtonInline (TxtButton);
break;
}
}
void Lay_PutCreateButton (const char *TxtButton)
{
fprintf (Gbl.F.Out,"<div class=\"CENTER_MIDDLE\">"
"<button type=\"submit\" class=\"BT_SUBMIT BT_CREATE\">"
"%s"
"</button>"
"</div>",
TxtButton);
}
void Lay_PutCreateButtonInline (const char *TxtButton)
{
fprintf (Gbl.F.Out,"<button type=\"submit\" class=\"BT_SUBMIT_INLINE BT_CREATE\">"
"%s"
"</button>",
TxtButton);
}
void Lay_PutConfirmButton (const char *TxtButton)
{
fprintf (Gbl.F.Out,"<div class=\"CENTER_MIDDLE\">"
"<button type=\"submit\" class=\"BT_SUBMIT BT_CONFIRM\">"
"%s"
"</button>"
"</div>",
TxtButton);
}
void Lay_PutConfirmButtonInline (const char *TxtButton)
{
fprintf (Gbl.F.Out,"<button type=\"submit\" class=\"BT_SUBMIT_INLINE BT_CONFIRM\">"
"%s"
"</button>",
TxtButton);
}
void Lay_PutRemoveButton (const char *TxtButton)
{
fprintf (Gbl.F.Out,"<div class=\"CENTER_MIDDLE\">"
"<button type=\"submit\" class=\"BT_SUBMIT BT_REMOVE\">"
"%s"
"</button>"
"</div>",
TxtButton);
}
void Lay_PutRemoveButtonInline (const char *TxtButton)
{
fprintf (Gbl.F.Out,"<button type=\"submit\" class=\"BT_SUBMIT_INLINE BT_REMOVE\">"
"%s"
"</button>",
TxtButton);
}
/*****************************************************************************/
/******************************* Start/end table *****************************/
/*****************************************************************************/

17
swad_layout.h
View File

@ -44,14 +44,6 @@
/********************************* Public types ******************************/
/*****************************************************************************/
typedef enum
{
Lay_NO_BUTTON,
Lay_CREATE_BUTTON,
Lay_CONFIRM_BUTTON,
Lay_REMOVE_BUTTON,
} Lay_Button_t;
/*****************************************************************************/
/****************************** Public prototypes ****************************/
/*****************************************************************************/
@ -84,15 +76,6 @@ void Lay_PutIconRemovalNotAllowed (void);
void Lay_PutIconBRemovalNotAllowed (void);
void Lay_PutIconRemove (void);
void Lay_PutButton (Lay_Button_t Button,const char *TxtButton);
void Lay_PutButtonInline (Lay_Button_t Button,const char *TxtButton);
void Lay_PutCreateButton (const char *TxtButton);
void Lay_PutCreateButtonInline (const char *TxtButton);
void Lay_PutConfirmButton (const char *TxtButton);
void Lay_PutConfirmButtonInline (const char *TxtButton);
void Lay_PutRemoveButton (const char *TxtButton);
void Lay_PutRemoveButtonInline (const char *TxtButton);
void Lay_StartTable (unsigned CellPadding);
void Lay_StartTableCenter (unsigned CellPadding);
void Lay_StartTableWide (unsigned CellPadding);

4
swad_link.c
View File

@ -127,7 +127,7 @@ void Lnk_SeeLinks (void)
if (Gbl.Usrs.Me.Role.Logged == Rol_SYS_ADM)
{
Act_FormStart (ActEdiLnk);
Lay_PutConfirmButton (Txt_New_link);
Btn_PutConfirmButton (Txt_New_link);
Act_FormEnd ();
}
@ -750,7 +750,7 @@ static void Lnk_PutFormToCreateLink (void)
Cns_MAX_CHARS_WWW,Lnk->WWW);
/***** Send button and end frame *****/
Box_EndBoxTableWithButton (Lay_CREATE_BUTTON,Txt_Create_link);
Box_EndBoxTableWithButton (Btn_CREATE_BUTTON,Txt_Create_link);
/***** End of form *****/
Act_FormEnd ();

8
swad_mail.c
View File

@ -756,7 +756,7 @@ static void Mai_PutFormToCreateMailDomain (void)
/***** Send button and end frame *****/
Box_EndBoxTableWithButton (Lay_CREATE_BUTTON,Txt_Create_email_domain);
Box_EndBoxTableWithButton (Btn_CREATE_BUTTON,Txt_Create_email_domain);
/***** End of form *****/
Act_FormEnd ();
@ -1345,7 +1345,7 @@ void Mai_ShowFormChangeUsrEmail (const struct UsrData *UsrDat,bool ItsMe)
}
fprintf (Gbl.F.Out,"<input type=\"hidden\" name=\"NewEmail\" value=\"%s\" />",
row[0]); // Email
Lay_PutConfirmButtonInline ((ItsMe && NumEmail == 1) ? Txt_Confirm_email :
Btn_PutConfirmButtonInline ((ItsMe && NumEmail == 1) ? Txt_Confirm_email :
Txt_Use_this_email);
Act_FormEnd ();
fprintf (Gbl.F.Out,"</td>");
@ -1390,7 +1390,7 @@ void Mai_ShowFormChangeUsrEmail (const struct UsrData *UsrDat,bool ItsMe)
"</div>",
Cns_MAX_CHARS_EMAIL_ADDRESS,
Gbl.Usrs.Me.UsrDat.Email);
Lay_PutCreateButtonInline (NumEmails ? Txt_Change_email : // User already has an email address
Btn_PutCreateButtonInline (NumEmails ? Txt_Change_email : // User already has an email address
Txt_Save); // User has no email address yet
Act_FormEnd ();
fprintf (Gbl.F.Out,"</td>"
@ -1634,7 +1634,7 @@ void Mai_PutButtonToCheckEmailAddress (void)
true); // Closable
Ale_ShowAlertAndButton (Ale_WARNING,Txt_Please_check_and_confirm_your_email_address,
ActFrmMyAcc,NULL,NULL,NULL,
Lay_CONFIRM_BUTTON,Txt_Check);
Btn_CONFIRM_BUTTON,Txt_Check);
Box_EndBox ();
}

6
swad_message.c
View File

@ -325,7 +325,7 @@ static void Msg_PutFormMsgUsrs (char Content[Cns_MAX_BYTES_LONG_TEXT + 1])
Img_PutImageUploader (-1,"MSG_IMG_TIT_URL");
/***** Send button *****/
Lay_PutCreateButton (Txt_Send_message);
Btn_PutCreateButton (Txt_Send_message);
/***** End form *****/
Act_FormEnd ();
@ -899,7 +899,7 @@ void Msg_ReqDelAllRecMsgs (void)
/* End alert */
Ale_ShowAlertAndButton2 (ActDelAllRcvMsg,NULL,NULL,
Msg_PutHiddenParamsMsgsFilters,
Lay_REMOVE_BUTTON,Txt_Delete_messages_received);
Btn_REMOVE_BUTTON,Txt_Delete_messages_received);
}
/*****************************************************************************/
@ -939,7 +939,7 @@ void Msg_ReqDelAllSntMsgs (void)
/* End alert */
Ale_ShowAlertAndButton2 (ActDelAllSntMsg,NULL,NULL,
Msg_PutHiddenParamsMsgsFilters,
Lay_REMOVE_BUTTON,Txt_Delete_messages_sent);
Btn_REMOVE_BUTTON,Txt_Delete_messages_sent);
}
/*****************************************************************************/

4
swad_nickname.c
View File

@ -267,7 +267,7 @@ void Nck_ShowFormChangeUsrNickname (void)
fprintf (Gbl.F.Out,"<input type=\"hidden\" name=\"NewNick\""
" value=\"@%s\" />",
row[0]); // Nickname
Lay_PutConfirmButtonInline (Txt_Use_this_nickname);
Btn_PutConfirmButtonInline (Txt_Use_this_nickname);
Act_FormEnd ();
}
@ -291,7 +291,7 @@ void Nck_ShowFormChangeUsrNickname (void)
"</div>",
1 + Nck_MAX_CHARS_NICKNAME_WITHOUT_ARROBA,
Gbl.Usrs.Me.UsrDat.Nickname);
Lay_PutCreateButtonInline (NumNicks ? Txt_Change_nickname : // I already have a nickname
Btn_PutCreateButtonInline (NumNicks ? Txt_Change_nickname : // I already have a nickname
Txt_Save); // I have no nickname yet);
Act_FormEnd ();
fprintf (Gbl.F.Out,"</td>"

6
swad_notice.c
View File

@ -113,7 +113,7 @@ void Not_ShowFormNotice (void)
"</textarea>");
/***** Button to create notice and end frame *****/
Box_EndBoxWithButton (Lay_CREATE_BUTTON,Txt_Create_notice);
Box_EndBoxWithButton (Btn_CREATE_BUTTON,Txt_Create_notice);
/***** End form *****/
Act_FormEnd ();
@ -284,7 +284,7 @@ void Not_RequestRemNotice (void)
/* End alert */
Ale_ShowAlertAndButton2 (ActRemNot,NULL,NULL,Not_PutParams,
Lay_REMOVE_BUTTON,Txt_Remove);
Btn_REMOVE_BUTTON,Txt_Remove);
/***** Show all notices *****/
Not_ShowNotices (Not_LIST_FULL_NOTICES);
@ -531,7 +531,7 @@ static void Not_PutButtonToAddNewNotice (void)
extern const char *Txt_New_notice;
Act_FormStart (ActWriNot);
Lay_PutConfirmButton (Txt_New_notice);
Btn_PutConfirmButton (Txt_New_notice);
Act_FormEnd ();
}

2
swad_notification.c
View File

@ -1955,7 +1955,7 @@ void Ntf_PutFormChangeNotifSentByEMail (void)
Lay_EndTable ();
/***** Button to save changes *****/
Lay_PutConfirmButton (Txt_Save_changes);
Btn_PutConfirmButton (Txt_Save_changes);
/***** End form *****/
Act_FormEnd ();

6
swad_password.c
View File

@ -269,7 +269,7 @@ void Pwd_ShowFormSendNewPwd (void)
Cns_MAX_CHARS_EMAIL_ADDRESS,Gbl.Usrs.Me.UsrIdLogin);
/***** Send button and end frame *****/
Box_EndBoxWithButton (Lay_CONFIRM_BUTTON,Txt_Get_a_new_password);
Box_EndBoxWithButton (Btn_CONFIRM_BUTTON,Txt_Get_a_new_password);
/***** End form *****/
Act_FormEnd ();
@ -733,7 +733,7 @@ void Pwd_ShowFormChgPwd (void)
Pwd_PutFormToGetNewPasswordTwice ();
/***** Send button and end form *****/
Box_EndBoxTableWithButton (Lay_CONFIRM_BUTTON,
Box_EndBoxTableWithButton (Btn_CONFIRM_BUTTON,
IHaveAPasswordInDB ? Txt_Change_password :
Txt_Set_password);
@ -859,7 +859,7 @@ void Pwd_ShowFormOthPwd (void)
Lay_EndTable ();
/* End form */
Lay_PutConfirmButton (Txt_Change_password);
Btn_PutConfirmButton (Txt_Change_password);
Act_FormEnd ();
/***** End frame *****/

4
swad_photo.c
View File

@ -463,7 +463,7 @@ void Pho_ReqRemoveMyPhoto (void)
/* End alert */
Ale_ShowAlertAndButton2 (ActRemMyPho,NULL,NULL,NULL,
Lay_REMOVE_BUTTON,Txt_Remove_photo);
Btn_REMOVE_BUTTON,Txt_Remove_photo);
}
else
Ale_ShowAlert (Ale_INFO,Txt_The_photo_no_longer_exists);
@ -539,7 +539,7 @@ void Pho_ReqRemoveUsrPhoto (void)
}
Ale_ShowAlertAndButton2 (NextAction,NULL,NULL,
Usr_PutParamOtherUsrCodEncrypted,
Lay_REMOVE_BUTTON,Txt_Remove_photo);
Btn_REMOVE_BUTTON,Txt_Remove_photo);
}
else
Ale_ShowAlert (Ale_INFO,Txt_The_photo_no_longer_exists);

4
swad_place.c
View File

@ -202,7 +202,7 @@ void Plc_SeePlaces (void)
if (ICanEdit)
{
Act_FormStart (ActEdiPlc);
Lay_PutConfirmButton (Txt_New_place);
Btn_PutConfirmButton (Txt_New_place);
Act_FormEnd ();
}
@ -781,7 +781,7 @@ static void Plc_PutFormToCreatePlace (void)
"</tr>");
/***** Send button and end frame *****/
Box_EndBoxTableWithButton (Lay_CREATE_BUTTON,Txt_Create_place);
Box_EndBoxTableWithButton (Btn_CREATE_BUTTON,Txt_Create_place);
/***** End formn *****/
Act_FormEnd ();

2
swad_plugin.c
View File

@ -927,7 +927,7 @@ static void Plg_PutFormToCreatePlugin (void)
Cns_MAX_CHARS_IP,Plg->IP);
/***** Send button and end frame *****/
Box_EndBoxTableWithButton (Lay_CREATE_BUTTON,Txt_Create_plugin);
Box_EndBoxTableWithButton (Btn_CREATE_BUTTON,Txt_Create_plugin);
/***** End form *****/
Act_FormEnd ();

2
swad_profile.c
View File

@ -193,7 +193,7 @@ void Prf_RequestUserProfile (void)
Gbl.Usrs.Me.UsrDat.Nickname);
/***** Send button and end frame *****/
Box_EndBoxWithButton (Lay_CONFIRM_BUTTON,Txt_Continue);
Box_EndBoxWithButton (Btn_CONFIRM_BUTTON,Txt_Continue);
/***** End form *****/
Act_FormEnd ();

14
swad_record.c
View File

@ -408,7 +408,7 @@ void Rec_ShowFormCreateRecordField (void)
"</tr>");
/***** Send button and end frame *****/
Box_EndBoxTableWithButton (Lay_CREATE_BUTTON,Txt_Create_record_field);
Box_EndBoxTableWithButton (Btn_CREATE_BUTTON,Txt_Create_record_field);
/***** End form *****/
Act_FormEnd ();
@ -661,7 +661,7 @@ void Rec_AskConfirmRemFieldWithRecords (unsigned NumRecords)
}
Ale_ShowAlertAndButton (Ale_QUESTION,Gbl.Alert.Txt,
ActRemFie,NULL,NULL,Rec_PutParamFielCod,
Lay_REMOVE_BUTTON,Txt_Remove_record_field);
Btn_REMOVE_BUTTON,Txt_Remove_record_field);
/***** List record fields again *****/
Rec_ReqEditRecordFields ();
@ -1892,7 +1892,7 @@ static void Rec_ShowCrsRecord (Rec_CourseRecordViewType_t TypeOfView,
/***** Button to save changes and end frame *****/
if (ICanEdit)
{
Box_EndBoxTableWithButton (Lay_CONFIRM_BUTTON,Txt_Save);
Box_EndBoxTableWithButton (Btn_CONFIRM_BUTTON,Txt_Save);
Act_FormEnd ();
}
else
@ -2482,17 +2482,17 @@ void Rec_ShowSharedUsrRecord (Rec_SharedRecordViewType_t TypeOfView,
switch (TypeOfView)
{
case Rec_SHA_SIGN_UP_IN_CRS_FORM:
Lay_PutConfirmButton (Txt_Sign_up);
Btn_PutConfirmButton (Txt_Sign_up);
Act_FormEnd ();
break;
case Rec_SHA_MY_RECORD_FORM:
Lay_PutConfirmButton (Txt_Save_changes);
Btn_PutConfirmButton (Txt_Save_changes);
Act_FormEnd ();
break;
case Rec_SHA_OTHER_NEW_USR_FORM:
if (Gbl.CurrentCrs.Grps.NumGrps) // This course has groups?
Grp_ShowLstGrpsToChgOtherUsrsGrps (UsrDat->UsrCod);
Lay_PutConfirmButton (Txt_Register);
Btn_PutConfirmButton (Txt_Register);
Act_FormEnd ();
break;
case Rec_SHA_OTHER_EXISTING_USR_FORM:
@ -2511,7 +2511,7 @@ void Rec_ShowSharedUsrRecord (Rec_SharedRecordViewType_t TypeOfView,
/***** Which action, register or removing? *****/
if (Enr_PutActionsRegRemOneUsr (ItsMe))
Lay_PutConfirmButton (Txt_Confirm);
Btn_PutConfirmButton (Txt_Confirm);
Act_FormEnd ();
break;

2
swad_report.c
View File

@ -164,7 +164,7 @@ void Rep_ReqMyUsageReport (void)
Req_TitleReport (NULL); // NULL means do not write date
/***** Send button and end frame *****/
Box_EndBoxWithButton (Lay_CONFIRM_BUTTON,Txt_Generate_report);
Box_EndBoxWithButton (Btn_CONFIRM_BUTTON,Txt_Generate_report);
/***** End of form *****/
Act_FormEnd ();

2
swad_search.c
View File

@ -285,7 +285,7 @@ static void Sch_PutFormToSearchWithWhatToSearchAndScope (Act_Action_t Action,Sco
Sch_PutMagnifyingGlassButton ("search64x64.png");
/***** Send button and end frame *****/
Box_EndBoxWithButton (Lay_CONFIRM_BUTTON,Txt_Search);
Box_EndBoxWithButton (Btn_CONFIRM_BUTTON,Txt_Search);
/***** End form *****/
Act_FormEnd ();

8
swad_social.c
View File

@ -3672,11 +3672,11 @@ static void Soc_RequestRemovalSocialNote (void)
if (Gbl.Usrs.Other.UsrDat.UsrCod > 0)
Ale_ShowAlertAndButton2 (ActRemSocPubUsr,"timeline",NULL,
Soc_PutParamsRemoveSocialNote,
Lay_REMOVE_BUTTON,Txt_Remove);
Btn_REMOVE_BUTTON,Txt_Remove);
else
Ale_ShowAlertAndButton2 (ActRemSocPubGbl,NULL,NULL,
Soc_PutParamsRemoveSocialNote,
Lay_REMOVE_BUTTON,Txt_Remove);
Btn_REMOVE_BUTTON,Txt_Remove);
}
}
else
@ -4010,11 +4010,11 @@ static void Soc_RequestRemovalSocialComment (void)
if (Gbl.Usrs.Other.UsrDat.UsrCod > 0)
Ale_ShowAlertAndButton2 (ActRemSocComUsr,"timeline",NULL,
Soc_PutParamsRemoveSocialCommment,
Lay_REMOVE_BUTTON,Txt_Remove);
Btn_REMOVE_BUTTON,Txt_Remove);
else
Ale_ShowAlertAndButton2 (ActRemSocComGbl,NULL,NULL,
Soc_PutParamsRemoveSocialCommment,
Lay_REMOVE_BUTTON,Txt_Remove);
Btn_REMOVE_BUTTON,Txt_Remove);
}
}
else

6
swad_statistic.c
View File

@ -601,7 +601,7 @@ void Sta_AskShowCrsHits (void)
Dat_PutHiddenParBrowserTZDiff ();
/***** Send button *****/
Lay_PutConfirmButton (Txt_Show_hits);
Btn_PutConfirmButton (Txt_Show_hits);
/***** End form *****/
Act_FormEnd ();
@ -762,7 +762,7 @@ void Sta_AskShowGblHits (void)
Dat_PutHiddenParBrowserTZDiff ();
/***** End frame with button *****/
Box_EndBoxWithButton (Lay_CONFIRM_BUTTON,Txt_Show_hits);
Box_EndBoxWithButton (Btn_CONFIRM_BUTTON,Txt_Show_hits);
/***** End form *****/
Act_FormEnd ();
@ -3954,7 +3954,7 @@ void Sta_ReqShowFigures (void)
"</label>");
/***** Send button and end frame *****/
Box_EndBoxWithButton (Lay_CONFIRM_BUTTON,Txt_Show_statistic);
Box_EndBoxWithButton (Btn_CONFIRM_BUTTON,Txt_Show_statistic);
/***** End of form *****/
Act_FormEnd ();

24
swad_survey.c
View File

@ -351,7 +351,7 @@ static void Svy_PutButtonToCreateNewSvy (void)
Act_FormStart (ActFrmNewSvy);
Svy_PutParamsToCreateNewSvy ();
Lay_PutConfirmButton (Txt_New_survey);
Btn_PutConfirmButton (Txt_New_survey);
Act_FormEnd ();
}
@ -541,7 +541,7 @@ static void Svy_ShowOneSurvey (long SvyCod,struct SurveyQuestion *SvyQst,
Svy_PutHiddenParamSvyOrder ();
Grp_PutParamWhichGrps ();
Pag_PutHiddenParamPagNum (Pag_SURVEYS,Gbl.Svys.CurrentPage);
Lay_PutCreateButtonInline (Txt_Answer_survey);
Btn_PutCreateButtonInline (Txt_Answer_survey);
Act_FormEnd ();
fprintf (Gbl.F.Out,"</div>");
@ -556,7 +556,7 @@ static void Svy_ShowOneSurvey (long SvyCod,struct SurveyQuestion *SvyQst,
Svy_PutHiddenParamSvyOrder ();
Grp_PutParamWhichGrps ();
Pag_PutHiddenParamPagNum (Pag_SURVEYS,Gbl.Svys.CurrentPage);
Lay_PutConfirmButtonInline (Txt_View_survey_results);
Btn_PutConfirmButtonInline (Txt_View_survey_results);
Act_FormEnd ();
fprintf (Gbl.F.Out,"</div>");
@ -1502,7 +1502,7 @@ void Svy_AskRemSurvey (void)
Svy.Title);
Ale_ShowAlertAndButton (Ale_QUESTION,Gbl.Alert.Txt,
ActRemSvy,NULL,NULL,Svy_PutParams,
Lay_REMOVE_BUTTON,Txt_Remove_survey);
Btn_REMOVE_BUTTON,Txt_Remove_survey);
/***** Show surveys again *****/
Svy_ListAllSurveys (&SvyQst);
@ -1613,7 +1613,7 @@ static void Svy_PutButtonToResetSurvey (void)
Act_FormStart (ActRstSvy);
Svy_PutParams ();
Lay_PutRemoveButton (Txt_Reset_survey);
Btn_PutRemoveButton (Txt_Reset_survey);
Act_FormEnd ();
}
@ -1892,9 +1892,9 @@ void Svy_RequestCreatOrEditSvy (void)
/***** Button to create/modify survey and end frame *****/
if (ItsANewSurvey)
Box_EndBoxTableWithButton (Lay_CREATE_BUTTON,Txt_Create_survey);
Box_EndBoxTableWithButton (Btn_CREATE_BUTTON,Txt_Create_survey);
else
Box_EndBoxTableWithButton (Lay_CONFIRM_BUTTON,Txt_Save);
Box_EndBoxTableWithButton (Btn_CONFIRM_BUTTON,Txt_Save);
/***** End form *****/
Act_FormEnd ();
@ -2754,9 +2754,9 @@ static void Svy_ShowFormEditOneQst (long SvyCod,struct SurveyQuestion *SvyQst,
/***** Send button *****/
if (SvyQst->QstCod > 0) // If the question already has assigned a code
Lay_PutConfirmButton (Txt_Save);
Btn_PutConfirmButton (Txt_Save);
else
Lay_PutCreateButton (Txt_Create_question);
Btn_PutCreateButton (Txt_Create_question);
/***** End form *****/
Act_FormEnd ();
@ -3284,7 +3284,7 @@ static void Svy_ListSvyQuestions (struct Survey *Svy,struct SurveyQuestion *SvyQ
if (PutFormAnswerSurvey)
{
/***** Button to create/modify survey *****/
Lay_PutConfirmButton (Txt_Done);
Btn_PutConfirmButton (Txt_Done);
/***** End form *****/
Act_FormEnd ();
@ -3331,7 +3331,7 @@ static void Svy_PutButtonToCreateNewQuestion (void)
Act_FormStart (ActEdiOneSvyQst);
Svy_PutParams ();
Lay_PutConfirmButton (Txt_New_question);
Btn_PutConfirmButton (Txt_New_question);
Act_FormEnd ();
}
@ -3544,7 +3544,7 @@ void Svy_RequestRemoveQst (void)
(unsigned long) (SvyQst.QstInd + 1));
Ale_ShowAlertAndButton (Ale_QUESTION,Gbl.Alert.Txt,
ActRemSvyQst,NULL,NULL,Svy_PutParamsRemoveOneQst,
Lay_REMOVE_BUTTON,Txt_Remove_question);
Btn_REMOVE_BUTTON,Txt_Remove_question);
/***** Show current survey *****/
Svy_ShowOneSurvey (SvyCod,&SvyQst,true);

2
swad_syllabus.c
View File

@ -264,7 +264,7 @@ bool Syl_CheckAndEditSyllabus (void)
{
/***** Button to view *****/
Act_FormStart (Inf_ActionsSeeInfo[Gbl.CurrentCrs.Info.Type]);
Lay_PutConfirmButton (Txt_Done);
Btn_PutConfirmButton (Txt_Done);
Act_FormEnd ();
}

22
swad_test.c
View File

@ -360,7 +360,7 @@ void Tst_ShowFormAskTst (void)
Lay_EndTable ();
/***** Send button *****/
Lay_PutConfirmButton (Txt_Generate_test);
Btn_PutConfirmButton (Txt_Generate_test);
Act_FormEnd ();
}
}
@ -470,7 +470,7 @@ void Tst_ShowNewTest (void)
Txt_Allow_teachers_to_consult_this_test);
/***** End form *****/
Lay_PutConfirmButton (Txt_Done_assess_test);
Btn_PutConfirmButton (Txt_Done_assess_test);
Act_FormEnd ();
/***** End frame *****/
@ -1304,7 +1304,7 @@ void Tst_ShowFormAskEditTsts (void)
Lay_EndTable ();
/***** Send button *****/
Lay_PutConfirmButton (Txt_Show_questions);
Btn_PutConfirmButton (Txt_Show_questions);
Act_FormEnd ();
}
else // No test questions
@ -1377,7 +1377,7 @@ static void Tst_PutButtonToAddQuestion (void)
extern const char *Txt_New_question;
Act_FormStart (ActEdiOneTstQst);
Lay_PutConfirmButton (Txt_New_question);
Btn_PutConfirmButton (Txt_New_question);
Act_FormEnd ();
}
@ -1948,7 +1948,7 @@ static void Tst_ShowFormConfigTst (void)
Lay_EndTable ();
/***** Send button *****/
Lay_PutConfirmButton (Txt_Save);
Btn_PutConfirmButton (Txt_Save);
/***** End form *****/
Act_FormEnd ();
@ -4873,9 +4873,9 @@ static void Tst_PutFormEditOneQst (char Stem[Cns_MAX_BYTES_TEXT + 1],
/***** Send button *****/
if (Gbl.Test.QstCod > 0) // The question already has assigned a code
Lay_PutConfirmButton (Txt_Save);
Btn_PutConfirmButton (Txt_Save);
else
Lay_PutCreateButton (Txt_Create_question);
Btn_PutCreateButton (Txt_Create_question);
/***** End form *****/
Act_FormEnd ();
@ -5895,13 +5895,13 @@ void Tst_RequestRemoveQst (void)
Ale_ShowAlertAndButton (Ale_QUESTION,Gbl.Alert.Txt,
ActRemTstQst,NULL,NULL,
Tst_PutParamsRemoveOneQst,
Lay_REMOVE_BUTTON,Txt_Remove_question);
Btn_REMOVE_BUTTON,Txt_Remove_question);
else
{
Ale_ShowAlertAndButton (Ale_QUESTION,Gbl.Alert.Txt,
ActRemTstQst,NULL,NULL,
Tst_PutParamsRemoveQst,
Lay_REMOVE_BUTTON,Txt_Remove_question);
Btn_REMOVE_BUTTON,Txt_Remove_question);
Tst_FreeTagsList ();
}
@ -7035,7 +7035,7 @@ void Tst_SelUsrsToSeeUsrsTestResults (void)
Lay_EndTable ();
/***** Send button *****/
Lay_PutConfirmButton (Txt_View_test_results);
Btn_PutConfirmButton (Txt_View_test_results);
/***** End form *****/
Act_FormEnd ();
@ -7084,7 +7084,7 @@ void Tst_SelDatesToSeeMyTestResults (void)
Dat_PutFormStartEndClientLocalDateTimesWithYesterdayToday (false);
/***** Send button and end frame *****/
Box_EndBoxTableWithButton (Lay_CONFIRM_BUTTON,Txt_View_test_results);
Box_EndBoxTableWithButton (Btn_CONFIRM_BUTTON,Txt_View_test_results);
/***** End form *****/
Act_FormEnd ();

16
swad_user.c
View File

@ -263,7 +263,7 @@ void Usr_InformAboutNumClicksBeforePhoto (void)
Pho_MAX_CLICKS_WITHOUT_PHOTO - Gbl.Usrs.Me.NumAccWithoutPhoto);
Ale_ShowAlertAndButton (Ale_WARNING,Message,
ActReqMyPho,NULL,NULL,NULL,
Lay_CONFIRM_BUTTON,Txt_Upload_photo);
Btn_CONFIRM_BUTTON,Txt_Upload_photo);
}
}
}
@ -2300,7 +2300,7 @@ void Usr_WriteFormLogin (Act_Action_t NextAction,void (*FuncParams) ())
Txt_password);
/***** Send button and end table and frame *****/
Box_EndBoxTableWithButton (Lay_CONFIRM_BUTTON,Txt_Log_in);
Box_EndBoxTableWithButton (Btn_CONFIRM_BUTTON,Txt_Log_in);
/***** End form *****/
Act_FormEnd ();
@ -5241,7 +5241,7 @@ static void Usr_PutButtonToConfirmIWantToSeeBigList (unsigned NumUsrs,const char
Ale_ShowAlertAndButton (Ale_WARNING,Gbl.Alert.Txt,
Gbl.Action.Act,Usr_USER_LIST_SECTION_ID,OnSubmit,
Usr_PutParamsConfirmIWantToSeeBigList,
Lay_CONFIRM_BUTTON,Txt_Show_anyway);
Btn_CONFIRM_BUTTON,Txt_Show_anyway);
}
static void Usr_PutParamsConfirmIWantToSeeBigList (void)
@ -7366,7 +7366,7 @@ void Usr_SeeGuests (void)
Lay_EndTable ();
/* Send button */
Lay_PutConfirmButton (Txt_Show_records);
Btn_PutConfirmButton (Txt_Show_records);
/* End form */
Act_FormEnd ();
@ -7537,7 +7537,7 @@ void Usr_SeeStudents (void)
if (ICanViewRecords)
{
/* Send button */
Lay_PutConfirmButton (Txt_Show_records);
Btn_PutConfirmButton (Txt_Show_records);
/* End form */
Act_FormEnd ();
@ -7717,7 +7717,7 @@ void Usr_SeeTeachers (void)
if (ICanViewRecords)
{
/* Send button */
Lay_PutConfirmButton (Txt_Show_records);
Btn_PutConfirmButton (Txt_Show_records);
/* End form */
Act_FormEnd ();
@ -8259,7 +8259,7 @@ void Usr_ShowWarningNoUsersFound (Rol_Role_t Role)
/***** Show alert and button to enrol students *****/
Ale_ShowAlertAndButton (Ale_WARNING,Txt_No_users_found[Rol_STD],
ActReqEnrSevStd,NULL,NULL,NULL,
Lay_CREATE_BUTTON,Txt_Register_students);
Btn_CREATE_BUTTON,Txt_Register_students);
else if (Gbl.Usrs.ClassPhoto.AllGroups && // All groups selected
Role == Rol_TCH && // No teachers found
@ -8268,7 +8268,7 @@ void Usr_ShowWarningNoUsersFound (Rol_Role_t Role)
/***** Show alert and button to enrol students *****/
Ale_ShowAlertAndButton (Ale_WARNING,Txt_No_users_found[Rol_TCH],
ActReqMdfOneTch,NULL,NULL,NULL,
Lay_CREATE_BUTTON,Txt_Register_teacher);
Btn_CREATE_BUTTON,Txt_Register_teacher);
else
/***** Show alert *****/
Ale_ShowAlert (Ale_INFO,Txt_No_users_found[Role]);