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 14.101

This commit is contained in:
Antonio Cañas Vargas 2015-03-24 17:47:26 +01:00
parent d424e75047
commit ae7481a92b
45 changed files with 566 additions and 453 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
css/swad_desktop.css
View File

@ -154,6 +154,104 @@ hr.YELLOW_SEPARA {height:0; border-top:0; border-bottom:#BD4815 dotted 1px;}
.DAY_EVENT {border:solid 1px; border-color:white; background-color:#FFF080;}
.TODAY_EVENT {border:solid 1px; border-color:#50B800; background-color:#FFF080;}
/********************************* Buttons ***********************************/
.BT_CREATE
{
background-color:#5BC33B;
border:1px solid #518741;
}
.BT_CONFIRM
{
background-color:#55ACEE;
border:1px solid #3B88C3;
}
.BT_REMOVE
{
background-color:#EF5555;
border:1px solid #C33B3B;
}
.BT_SUBMIT
{
color:white;
font-size:16px;
font-weight:bold;
line-height:normal;
margin:8px;
padding:8px 16px;
border-radius:4px;
box-shadow:0 1px 0 rgba(255, 255, 255, 0.15) inset;
}
.BT_SUBMIT_INLINE
{
color:white;
font-size:12px;
font-weight:bold;
line-height:normal;
margin:0 4px;
padding:4px 8px;
border-radius:4px;
box-shadow:0 1px 0 rgba(255, 255, 255, 0.15) inset;
}
.BT_SUBMIT:hover
{
background-image: linear-gradient(rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.2));
}
.BT_SUBMIT_INLINE:hover
{
background-image: linear-gradient(rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.2));
}
/*
.signin-wrapper .primary-btn {
font-size: 18px;
padding: 9px 13px;
}
.primary-btn, .following.first-hover .follow-btn:hover, .following .follow-btn, .following .follow-button.cancel-hover-style:hover, .following .follow-button, .notifying .device-follow-button, .button-group-item .content.selected {
background-color: #55acee;
background-image: linear-gradient(rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.05));
border: 1px solid #3b88c3;
box-shadow: 0 1px 0 rgba(255, 255, 255, 0.15) inset;
color: #fff;
}
.btn {
background-color: #f5f8fa;
background-image: linear-gradient(#fff, #f5f8fa);
}
.btn {
background-color: #ccd6dd;
background-repeat: no-repeat;
border: 1px solid #e1e8ed;
border-radius: 4px;
color: #66757f;
cursor: pointer;
display: inline-block;
font-size: 14px;
font-weight: bold;
line-height: normal;
padding: 8px 16px;
position: relative;
}
button {
border: 0 none;
}
button {
background: none repeat scroll 0 0 transparent;
border: 0 none;
padding: 0;
}
button, html input[type="button"], input[type="reset"], input[type="submit"] {
cursor: pointer;
}
button, select {
text-transform: none;
}
button {
overflow: visible;
}
*/
/********************************** Notice ***********************************/
.NOTICE_CONTAINER

32
swad_ID.c
View File

@ -402,7 +402,7 @@ void ID_ShowFormOthIDs (void)
/***** Form to change IDs *****/
/* Show user's record */
fprintf (Gbl.F.Out,"<table style=\"margin:0 auto;\">"
fprintf (Gbl.F.Out,"<table class=\"CELLS_PAD_2\" style=\"margin:0 auto;\">"
"<tr>"
"<td colspan=\"2\" style=\"text-align:center;\">");
Rec_ShowSharedUsrRecord (Rec_RECORD_LIST,&Gbl.Usrs.Other.UsrDat);
@ -445,12 +445,12 @@ void ID_ShowFormChangeUsrID (const struct UsrData *UsrDat,bool ItsMe)
{
if (NumID == 0)
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"width:40%%;"
" text-align:right; vertical-align:top;\">"
"<td class=\"%s\" style=\"text-align:right;"
" vertical-align:top;\">"
"%s:"
"</td>"
"<td style=\"width:60%%;"
" text-align:left; vertical-align:top;\">",
"<td colspan=\"2\" style=\"text-align:left;"
" vertical-align:top;\">",
The_ClassFormul[Gbl.Prefs.Theme],Txt_ID);
else // NumID >= 1
fprintf (Gbl.F.Out,"<br />");
@ -514,12 +514,12 @@ void ID_ShowFormChangeUsrID (const struct UsrData *UsrDat,bool ItsMe)
if (UsrDat->IDs.Num < ID_MAX_IDS_PER_USER)
{
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"width:40%%;"
" text-align:right; vertical-align:middle;\">"
"<td class=\"%s\" style=\"text-align:right;"
" vertical-align:middle;\">"
"%s:"
"</td>"
"<td style=\"width:60%%;"
" text-align:left; vertical-align:middle;\">",
"<td style=\"text-align:left;"
" vertical-align:middle;\">",
The_ClassFormul[Gbl.Prefs.Theme],
UsrDat->IDs.Num ? Txt_Another_ID : // A new user's ID
Txt_ID); // The first user's ID
@ -530,13 +530,15 @@ void ID_ShowFormChangeUsrID (const struct UsrData *UsrDat,bool ItsMe)
Act_FormStart (ActNewIDOth);
Usr_PutParamOtherUsrCodEncrypted (UsrDat->EncryptedUsrCod);
}
fprintf (Gbl.F.Out,"<input type=\"text\" name=\"NewID\" size=\"%u\" maxlength=\"%u\" value=\"%s\" />"
"<input type=\"submit\" value=\"%s\" />",
16,
fprintf (Gbl.F.Out,"<input type=\"text\" name=\"NewID\""
" size=\"16\" maxlength=\"%u\" value=\"%s\" />",
ID_MAX_LENGTH_USR_ID,
UsrDat->IDs.Num ? UsrDat->IDs.List[UsrDat->IDs.Num - 1].ID :
"", // Show the most recent ID
Txt_Add_this_ID);
""); // Show the most recent ID
fprintf (Gbl.F.Out,"</td>"
"<td style=\"text-align:left;"
" vertical-align:middle;\">");
Lay_PutCreateButtonInline (Txt_Add_this_ID);
Act_FormEnd ();
fprintf (Gbl.F.Out,"</td>"
"</tr>"
@ -544,7 +546,7 @@ void ID_ShowFormChangeUsrID (const struct UsrData *UsrDat,bool ItsMe)
}
/***** Write help text *****/
fprintf (Gbl.F.Out,"<td colspan=\"2\" class=\"DAT\""
fprintf (Gbl.F.Out,"<td colspan=\"3\" class=\"DAT\""
" style=\"text-align:center;\">");
if (ItsMe)
fprintf (Gbl.F.Out,"%s ",

21
swad_account.c
View File

@ -160,7 +160,9 @@ static void Acc_ShowFormRequestNewAccountWithParams (const char *NewNicknameWith
/***** Send button and form end *****/
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"2\" style=\"text-align:center;\">"
"<input type=\"submit\" value=\"%s\" />"
"<button type=\"submit\" class=\"BT_SUBMIT BT_CREATE\">"
"%s"
"</button>"
"</td>"
"</tr>",
Txt_Create_account);
@ -201,7 +203,7 @@ void Acc_ShowFormChangeMyAccount (void)
fprintf (Gbl.F.Out,"</div>");
/***** Start table *****/
Lay_StartRoundFrameTable10 ("80%",2,Txt_User_account);
Lay_StartRoundFrameTable10 (NULL,2,Txt_User_account);
/***** Nickname *****/
Nck_ShowFormChangeUsrNickname ();
@ -250,7 +252,8 @@ static void Acc_PrintAccountSeparator (void)
/***** Separator *****/
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"2\" style=\"text-align:center; vertical-align:middle;\">"
"<td colspan=\"3\""
" style=\"text-align:center; vertical-align:middle;\">"
"<hr class=\"%s\" />"
"</td>"
"</tr>",
@ -324,12 +327,12 @@ static bool Acc_GetParamsNewAccount (char *NewNicknameWithoutArroba,
/***** Step 1/3: Get new nickname from form *****/
Par_GetParToText ("NewNick",NewNicknameWithArroba,Nck_MAX_BYTES_NICKNAME_WITH_ARROBA);
strncpy (NewNicknameWithoutArroba,NewNicknameWithArroba,Nck_MAX_BYTES_NICKNAME_WITH_ARROBA);
NewNicknameWithoutArroba[Nck_MAX_BYTES_NICKNAME_WITH_ARROBA] = '\0';
if (Nck_CheckIfNickWithArrobaIsValid (NewNicknameWithArroba)) // If new nickname is valid
{
/***** Remove arrobas at the beginning *****/
strncpy (NewNicknameWithoutArroba,NewNicknameWithArroba,Nck_MAX_BYTES_NICKNAME_WITH_ARROBA);
NewNicknameWithoutArroba[Nck_MAX_BYTES_NICKNAME_WITH_ARROBA] = '\0';
Str_RemoveLeadingArrobas (NewNicknameWithoutArroba);
/***** Check if the new nickname matches any of the nicknames of other users *****/
@ -620,11 +623,9 @@ void Acc_AskIfCompletelyEliminateAccount (bool ItsMe)
/* Ask for consent on dangerous actions */
Pwd_AskForConfirmationOnDangerousAction ();
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">"
"<input type=\"submit\" value=\"%s\" />"
"</div>",
ItsMe ? Txt_Completely_eliminate_me :
Txt_Completely_eliminate_user);
Lay_PutRemoveButton (ItsMe ? Txt_Completely_eliminate_me :
Txt_Completely_eliminate_user);
Act_FormEnd ();
}
else

28
swad_announcement.c
View File

@ -320,15 +320,14 @@ void Ann_ShowFormAnnouncement (void)
extern const char *Txt_Users;
extern const char *Txt_Create_announcement;
/***** Form start *****/
Act_FormStart (ActRcvAnn);
/***** Start frame *****/
Lay_StartRoundFrameTable10 (NULL,2,Txt_New_announcement);
/***** Message subject and body *****/
fprintf (Gbl.F.Out,"<table style=\"margin:0 auto;\">"
"<tr>"
"<td></td>"
"<td class=\"%s\" style=\"text-align:left;\">%s</td>"
"</tr>"
"<tr>"
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"text-align:right; vertical-align:top;\">"
"%s: "
"</td>"
@ -347,8 +346,6 @@ void Ann_ShowFormAnnouncement (void)
"</td>"
"</tr>",
The_ClassFormul[Gbl.Prefs.Theme],
Txt_New_announcement,
The_ClassFormul[Gbl.Prefs.Theme],
Txt_MSG_Subject,
The_ClassFormul[Gbl.Prefs.Theme],
Txt_MSG_Message);
@ -365,10 +362,19 @@ void Ann_ShowFormAnnouncement (void)
Rol_WriteSelectorRoles (1 << Rol_ROLE_STUDENT |
1 << Rol_ROLE_TEACHER);
fprintf (Gbl.F.Out,"</td>"
"</tr>"
"</table>");
"</tr>");
Lay_PutSendButton (Txt_Create_announcement);
/***** Button to create announcement *****/
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"2\" style=\"text-align:center;\">");
Lay_PutCreateButton (Txt_Create_announcement);
fprintf (Gbl.F.Out,"</td>"
"</tr>");
/***** End frame *****/
Lay_EndRoundFrameTable10 ();
/***** Form end *****/
Act_FormEnd ();
}

11
swad_assignment.c
View File

@ -934,10 +934,7 @@ void Asg_AskRemAssignment (void)
sprintf (Gbl.Message,Txt_Do_you_really_want_to_remove_the_assignment_X,
Asg.Title);
Lay_ShowAlert (Lay_WARNING,Gbl.Message);
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">"
"<input type=\"submit\" value=\"%s\" />"
"</div>",
Txt_Remove_assignment);
Lay_PutRemoveButton (Txt_Remove_assignment);
Act_FormEnd ();
/***** Show assignments again *****/
@ -1240,8 +1237,10 @@ void Asg_RequestCreatOrEditAsg (void)
Lay_EndRoundFrameTable10 ();
/***** New assignment *****/
Lay_PutSendButton (ItsANewAssignment ? Txt_Create_assignment :
Txt_Modify_assignment);
if (ItsANewAssignment)
Lay_PutCreateButton (Txt_Create_assignment);
else
Lay_PutConfirmButton (Txt_Modify_assignment);
/***** Form end *****/
Act_FormEnd ();

19
swad_attendance.c
View File

@ -896,10 +896,7 @@ void Att_AskRemAttEvent (void)
sprintf (Gbl.Message,Txt_Do_you_really_want_to_remove_the_event_X,
Att.Title);
Lay_ShowAlert (Lay_WARNING,Gbl.Message);
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">"
"<input type=\"submit\" value=\"%s\" />"
"</div>",
Txt_Remove_event);
Lay_PutRemoveButton (Txt_Remove_event);
Act_FormEnd ();
/***** Show attendance events again *****/
@ -1207,8 +1204,10 @@ void Att_RequestCreatOrEditAttEvent (void)
Lay_EndRoundFrameTable10 ();
/***** New attendance event *****/
Lay_PutSendButton (ItsANewAttEvent ? Txt_Create_event :
Txt_Modify_event);
if (ItsANewAttEvent)
Lay_PutCreateButton (Txt_Create_event);
else
Lay_PutConfirmButton (Txt_Modify_event);
/***** Form end *****/
Act_FormEnd ();
@ -1943,7 +1942,7 @@ static void Att_ListAttOnlyMeAsStudent (struct AttendanceEvent *Att)
if (Att->Open)
{
/***** Send button *****/
Lay_PutSendButton (Txt_Save);
Lay_PutConfirmButton (Txt_Save);
Act_FormEnd ();
}
}
@ -2022,7 +2021,7 @@ static void Att_ListAttStudents (struct AttendanceEvent *Att)
Lay_EndRoundFrameTable10 ();
/***** Send button *****/
Lay_PutSendButton (Txt_Save);
Lay_PutConfirmButton (Txt_Save);
Act_FormEnd ();
fprintf (Gbl.F.Out,"</div>");
@ -2664,7 +2663,7 @@ void Usr_ReqListAttendanceStdsCrs (void)
Att_FreeListAttEvents ();
/* Send button */
Lay_PutSendButton (Txt_Show_list);
Lay_PutConfirmButton (Txt_Show_list);
Act_FormEnd ();
fprintf (Gbl.F.Out,"</div>");
@ -2949,7 +2948,7 @@ static void Att_PutButtonToShowDetails (char *StrAttCodsSelected)
Usr_PutHiddenParUsrCodAll (ActSeeLstAttStd,Gbl.Usrs.Select.All);
if (StrAttCodsSelected[0])
Par_PutHiddenParamString ("AttCods",StrAttCodsSelected);
Lay_PutSendButton (Txt_Show_more_details);
Lay_PutConfirmButton (Txt_Show_more_details);
Act_FormEnd ();
fprintf (Gbl.F.Out,"</div>");
}

9
swad_banner.c
View File

@ -779,11 +779,10 @@ static void Ban_PutFormToCreateBanner (void)
/***** Send button *****/
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"7\" style=\"text-align:center;\">"
"<input type=\"submit\" value=\"%s\" />"
"</td>"
"</tr>",
Txt_Create_banner);
"<td colspan=\"7\" style=\"text-align:center;\">");
Lay_PutCreateButton (Txt_Create_banner);
fprintf (Gbl.F.Out,"</td>"
"</tr>");
/***** End of frame *****/
Lay_EndRoundFrameTable10 ();

23
swad_centre.c
View File

@ -1870,15 +1870,15 @@ void Ctr_RequestPhoto (void)
"</td>"
"</tr>"
"<tr>"
"<td colspan=\"2\" style=\"text-align:center;\">"
"<input type=\"submit\" value=\"%s\" accept=\"image/jpeg\" />"
"</td>"
"</tr>"
"</table>",
"<td colspan=\"2\" style=\"text-align:center;\">",
The_ClassFormul[Gbl.Prefs.Theme],
Txt_File_with_the_photo,
Fil_NAME_OF_PARAM_FILENAME_ORG,
Txt_Upload_photo);
Fil_NAME_OF_PARAM_FILENAME_ORG);
Lay_PutCreateButton (Txt_Upload_photo);
fprintf (Gbl.F.Out,"</td>"
"</tr>"
"</table>");
Act_FormEnd ();
}
@ -2090,11 +2090,10 @@ static void Ctr_PutFormToCreateCentre (void)
/***** Send button *****/
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"12\" style=\"text-align:center;\">"
"<input type=\"submit\" value=\"%s\" />"
"</td>"
"</tr>",
Txt_Create_centre);
"<td colspan=\"12\" style=\"text-align:center;\">");
Lay_PutCreateButton (Txt_Create_centre);
fprintf (Gbl.F.Out,"</td>"
"</tr>");
/***** End of frame *****/
Lay_EndRoundFrameTable10 ();

5
swad_changelog.h
View File

@ -103,11 +103,14 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 14.100.3 (2015/03/24)"
#define Log_PLATFORM_VERSION "SWAD 14.101 (2015/03/24)"
// 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 14.101: Mar 24, 2015 Fixed bug in form to create a new account.
Fixed bug in statistics.
New design of buttons. (183753 lines)
Version 14.100.3: Mar 24, 2015 Fixed bug in link to institution in record. (183753 lines)
Version 14.100.2: Mar 24, 2015 Changes in profile.
Link to institution in record. (183752 lines)

9
swad_country.c
View File

@ -1748,11 +1748,10 @@ static void Cty_PutFormToCreateCountry (void)
/***** Send button *****/
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"8\" style=\"text-align:center;\">"
"<input type=\"submit\" value=\"%s\" />"
"</td>"
"</tr>",
Txt_Create_country);
"<td colspan=\"8\" style=\"text-align:center;\">");
Lay_PutCreateButton (Txt_Create_country);
fprintf (Gbl.F.Out,"</td>"
"</tr>");
/***** End of frame *****/
Lay_EndRoundFrameTable10 ();

13
swad_course.c
View File

@ -441,7 +441,7 @@ static void Crs_Configuration (bool PrintView)
/***** End form *****/
if (IsForm)
{
Lay_PutSendButton (Txt_Save);
Lay_PutConfirmButton (Txt_Save);
Act_FormEnd ();
}
}
@ -1774,11 +1774,10 @@ static void Crs_PutFormToCreateCourse (void)
/***** Send button *****/
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"12\" style=\"text-align:center;\">"
"<input type=\"submit\" value=\"%s\" />"
"</td>"
"</tr>",
Txt_Create_course);
"<td colspan=\"12\" style=\"text-align:center;\">");
Lay_PutCreateButton (Txt_Create_course);
fprintf (Gbl.F.Out,"</td>"
"</tr>");
/***** End of frame *****/
Lay_EndRoundFrameTable10 ();
@ -3432,7 +3431,7 @@ void Crs_AskRemoveOldCrss (void)
fprintf (Gbl.F.Out,"</span>");
/***** Send button*****/
Lay_PutSendButton (Txt_Eliminate);
Lay_PutRemoveButton (Txt_Eliminate);
Act_FormEnd ();
fprintf (Gbl.F.Out,"</div>");
}

18
swad_degree.c
View File

@ -1793,11 +1793,10 @@ static void Deg_PutFormToCreateDegType (void)
/***** Send button *****/
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"2\" style=\"text-align:center;\">"
"<input type=\"submit\" value=\"%s\" />"
"</td>"
"</tr>",
Txt_Create_type_of_degree);
"<td colspan=\"2\" style=\"text-align:center;\">");
Lay_PutCreateButton (Txt_Create_type_of_degree);
fprintf (Gbl.F.Out,"</td>"
"</tr>");
/***** End of frame *****/
Lay_EndRoundFrameTable10 ();
@ -1962,11 +1961,10 @@ static void Deg_PutFormToCreateDegree (void)
/***** Send button *****/
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"14\" style=\"text-align:center;\">"
"<input type=\"submit\" value=\"%s\" />"
"</td>"
"</tr>",
Txt_Create_degree);
"<td colspan=\"14\" style=\"text-align:center;\">");
Lay_PutCreateButton (Txt_Create_degree);
fprintf (Gbl.F.Out,"</td>"
"</tr>");
/***** End of frame *****/
Lay_EndRoundFrameTable10 ();

9
swad_department.c
View File

@ -947,11 +947,10 @@ static void Dpt_PutFormToCreateDepartment (void)
/***** Send button *****/
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"4\" style=\"text-align:center;\">"
"<input type=\"submit\" value=\"%s\" />"
"</td>"
"</tr>",
Txt_Create_department);
"<td colspan=\"4\" style=\"text-align:center;\">");
Lay_PutCreateButton (Txt_Create_department);
fprintf (Gbl.F.Out,"</td>"
"</tr>");
/***** End of frame *****/
Lay_EndRoundFrameTable10 ();

35
swad_enrollment.c
View File

@ -269,7 +269,7 @@ void Enr_WriteFormToReqAnotherUsrID (Act_Action_t NextAction)
Usr_MAX_BYTES_USR_LOGIN);
/***** Send button*****/
Lay_PutSendButton (Txt_Continue);
Lay_PutConfirmButton (Txt_Continue);
Act_FormEnd ();
}
@ -616,7 +616,7 @@ static void Enr_ShowFormRegRemSeveralUsrs (void)
The_ClassTitle[Gbl.Prefs.Theme],
Txt_Step_5_Confirm_the_enrollment_removing);
Pwd_AskForConfirmationOnDangerousAction ();
Lay_PutSendButton (Txt_Confirm);
Lay_PutConfirmButton (Txt_Confirm);
/***** End of form *****/
Act_FormEnd ();
@ -680,7 +680,7 @@ void Enr_AskRemoveOldUsrs (void)
fprintf (Gbl.F.Out,"</span>");
/***** Send button*****/
Lay_PutSendButton (Txt_Eliminate);
Lay_PutRemoveButton (Txt_Eliminate);
Act_FormEnd ();
fprintf (Gbl.F.Out,"</div>");
}
@ -1749,7 +1749,7 @@ void Enr_AskRemAllStdsThisCrs (void)
Act_FormStart (ActRemAllStdCrs);
Grp_PutParamAllGroups ();
Pwd_AskForConfirmationOnDangerousAction ();
Lay_PutSendButton (Txt_Remove_students);
Lay_PutRemoveButton (Txt_Remove_students);
Act_FormEnd ();
}
else
@ -2043,7 +2043,7 @@ void Enr_AskIfRejectSignUp (void)
Act_FormStart (ActRejSignUp);
Usr_PutParamOtherUsrCodEncrypted (Gbl.Usrs.Other.UsrDat.EncryptedUsrCod);
Lay_PutSendButton (Txt_Reject);
Lay_PutConfirmButton (Txt_Reject);
Act_FormEnd ();
}
else
@ -2184,7 +2184,7 @@ void Enr_ShowEnrollmentRequests (void)
"</tr>");
/* Form end */
fprintf (Gbl.F.Out,"</table>");
Lay_PutSendButton (Txt_Update);
Lay_PutConfirmButton (Txt_Update);
Act_FormEnd ();
/***** Build query *****/
@ -2505,7 +2505,7 @@ void Enr_ShowEnrollmentRequests (void)
Act_FormStart (ActReqMdfUsr);
Crs_PutParamCrsCod (Crs.CrsCod);
Usr_PutParamOtherUsrCodEncrypted (UsrDat.EncryptedUsrCod);
Lay_PutSendButton (Txt_Register);
Lay_PutCreateButton (Txt_Register);
Act_FormEnd ();
fprintf (Gbl.F.Out,"</td>");
@ -2515,7 +2515,7 @@ void Enr_ShowEnrollmentRequests (void)
Act_FormStart (ActReqRejSignUp);
Crs_PutParamCrsCod (Crs.CrsCod);
Usr_PutParamOtherUsrCodEncrypted (UsrDat.EncryptedUsrCod);
Lay_PutSendButton (Txt_Reject);
Lay_PutConfirmButton (Txt_Reject);
Act_FormEnd ();
fprintf (Gbl.F.Out,"</td>"
"</tr>");
@ -2877,7 +2877,7 @@ static void Enr_ShowFormToEditOtherUsr (void)
/***** Which action, register or removing? *****/
if (Enr_PutActionsRegRemOneUsr (ItsMe))
Lay_PutSendButton (Txt_Confirm);
Lay_PutConfirmButton (Txt_Confirm);
Act_FormEnd ();
fprintf (Gbl.F.Out,"</div>");
@ -3202,10 +3202,7 @@ static void Enr_ReqAddAdm (Sco_Scope_t Scope,long Cod,const char *InsCtrDegName)
Act_FormStart (Enr_ActNewAdm[Scope]);
Usr_PutParamOtherUsrCodEncrypted (Gbl.Usrs.Other.UsrDat.EncryptedUsrCod);
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">"
"<input type=\"submit\" value=\"%s\" />"
"</div>",
Txt_Register_user_IN_A_COURSE_OR_DEGREE);
Lay_PutConfirmButton (Txt_Register_user_IN_A_COURSE_OR_DEGREE);
Act_FormEnd ();
}
}
@ -3468,9 +3465,8 @@ static void Enr_AskIfRemoveUsrFromCrs (struct UsrData *UsrDat,bool ItsMe)
Act_FormStart (ActRemUsrCrs);
Usr_PutParamOtherUsrCodEncrypted (UsrDat->EncryptedUsrCod);
Pwd_AskForConfirmationOnDangerousAction ();
fprintf (Gbl.F.Out,"<input type=\"submit\" value=\"%s\" />",
ItsMe ? Txt_Remove_me_from_this_course :
Txt_Remove_user_from_this_course);
Lay_PutRemoveButton (ItsMe ? Txt_Remove_me_from_this_course :
Txt_Remove_user_from_this_course);
Act_FormEnd ();
fprintf (Gbl.F.Out,"</div>");
}
@ -3568,11 +3564,8 @@ static void Enr_AskIfRemAdm (bool ItsMe,Sco_Scope_t Scope,const char *InsCtrDegN
Act_FormStart (Enr_ActRemAdm[Scope]);
Usr_PutParamOtherUsrCodEncrypted (Gbl.Usrs.Other.UsrDat.EncryptedUsrCod);
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">"
"<input type=\"submit\" value=\"%s\" />"
"</div>",
ItsMe ? Txt_Remove_me_as_an_administrator :
Txt_Remove_user_as_an_administrator);
Lay_PutRemoveButton (ItsMe ? Txt_Remove_me_as_an_administrator :
Txt_Remove_user_as_an_administrator);
Act_FormEnd ();
}
else

9
swad_exam.c
View File

@ -739,9 +739,9 @@ static void Exa_ShowExamAnnouncement (long ExaCod,Exa_tTypeViewExamAnnouncement_
extern const char *Txt_minutes;
extern const char *Txt_Edit_announcement_of_exam;
extern const char *Txt_Edit;
extern const char *Txt_Send_announcement_of_exam;
extern const char *Txt_Remove_announcement_of_exam;
extern const char *Txt_Remove;
extern const char *Txt_Publish_announcement_OF_EXAM;
const char *StyleTitle = "CONV_TIT";
const char *StyleForm = "CONV_NEG";
const char *StyleNormal = "CONV";
@ -772,7 +772,7 @@ static void Exa_ShowExamAnnouncement (long ExaCod,Exa_tTypeViewExamAnnouncement_
StyleForm = The_ClassFormul[Gbl.Prefs.Theme];
/***** Start form *****/
Act_FormStart (ActRcvExaAnn);
if (ExaCod >= 0)
if (ExaCod > 0)
Par_PutHiddenParamLong ("ExaCod",ExaCod);
break;
}
@ -1263,7 +1263,10 @@ static void Exa_ShowExamAnnouncement (long ExaCod,Exa_tTypeViewExamAnnouncement_
QR_ExamAnnnouncement ();
break;
case Exa_FORM_VIEW:
Lay_PutSendButton (Txt_Send_announcement_of_exam);
if (ExaCod > 0)
Lay_PutConfirmButton (Txt_Publish_announcement_OF_EXAM);
else
Lay_PutCreateButton (Txt_Publish_announcement_OF_EXAM);
Act_FormEnd ();
break;
}

28
swad_file_browser.c
View File

@ -2870,7 +2870,7 @@ void Brw_AskEditWorksCrs (void)
Lay_EndRoundFrameTable10 ();
/* Button to send the form */
Lay_PutSendButton (Txt_View_works);
Lay_PutConfirmButton (Txt_View_works);
Act_FormEnd ();
fprintf (Gbl.F.Out,"</div>");
}
@ -5892,11 +5892,10 @@ void Brw_AskRemFileFromTree (void)
sprintf (Gbl.Message,Txt_Do_you_really_want_to_remove_FILE_OR_LINK_X,
FileNameToShow);
Lay_ShowAlert (Lay_WARNING,Gbl.Message);
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">"
"<input type=\"submit\" value=\"%s\" />"
"</div>",
Gbl.FileBrowser.FileType == Brw_IS_FILE ? Txt_Remove_file :
Txt_Remove_link);
Lay_PutRemoveButton (Gbl.FileBrowser.FileType == Brw_IS_FILE ? Txt_Remove_file :
Txt_Remove_link);
Act_FormEnd ();
}
else
@ -6046,10 +6045,7 @@ static void Brw_AskConfirmRemoveFolderNotEmpty (void)
sprintf (Gbl.Message,Txt_Do_you_really_want_to_remove_the_folder_X,
Gbl.FileBrowser.FilFolLnkName);
Lay_ShowAlert (Lay_WARNING,Gbl.Message);
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">"
"<input type=\"submit\" value=\"%s\" />"
"</div>",
Txt_Remove_folder);
Lay_PutRemoveButton (Txt_Remove_folder);
Act_FormEnd ();
}
@ -7665,7 +7661,7 @@ static void Brw_PutFormToCreateAFolder (const char *FileNameToShow)
The_ClassFormul[Gbl.Prefs.Theme],Txt_Folder);
/* Button to send */
Lay_PutSendButton (Txt_Create_folder);
Lay_PutCreateButton (Txt_Create_folder);
Act_FormEnd ();
/***** End frame *****/
@ -7754,7 +7750,7 @@ static void Brw_PutFormToUploadFilesUsingDropzone (const char *FileNameToShow)
Par_PutHiddenParamChar ("FullTree",'Y');
/* Button to send */
Lay_PutSendButton (Txt_FILE_UPLOAD_Done);
Lay_PutConfirmButton (Txt_FILE_UPLOAD_Done);
Act_FormEnd ();
/***** End frame *****/
@ -7804,7 +7800,7 @@ static void Brw_PutFormToUploadOneFileClassic (const char *FileNameToShow)
Fil_NAME_OF_PARAM_FILENAME_ORG);
/* Button to send */
Lay_PutSendButton (Txt_Upload_file);
Lay_PutCreateButton (Txt_Upload_file);
Act_FormEnd ();
/***** End frame *****/
@ -7851,7 +7847,7 @@ static void Brw_PutFormToPasteAFileOrFolder (const char *FileNameToShow)
Brw_ParamListFiles (Brw_IS_FOLDER,Gbl.FileBrowser.Priv.PathInTreeExceptFileOrFolder,Gbl.FileBrowser.FilFolLnkName);
/* Button to send */
Lay_PutSendButton (Txt_Paste);
Lay_PutCreateButton (Txt_Paste);
Act_FormEnd ();
/***** End frame *****/
@ -7912,7 +7908,7 @@ static void Brw_PutFormToCreateALink (const char *FileNameToShow)
The_ClassFormul[Gbl.Prefs.Theme],Txt_URL,PATH_MAX);
/* Button to send */
Lay_PutSendButton (Txt_Create_link);
Lay_PutCreateButton (Txt_Create_link);
Act_FormEnd ();
/***** End frame *****/
@ -9060,7 +9056,7 @@ void Brw_ShowFileMetadata (void)
if (ICanEdit) // I can edit file properties
{
Lay_PutSendButton (Txt_Save_file_properties);
Lay_PutConfirmButton (Txt_Save_file_properties);
Act_FormEnd ();
}

7
swad_forum.c
View File

@ -3750,7 +3750,7 @@ void For_WriteFormForumPst (bool IsReply,long ThrCod,const char *Subject)
The_ClassFormul[Gbl.Prefs.Theme],
Txt_MSG_Message);
Lay_PutSendButton (Txt_Send_message);
Lay_PutCreateButton (Txt_Send_message);
Act_FormEnd ();
}
@ -3965,10 +3965,7 @@ void For_ReqDelThr (void)
Act_FormStart (For_ActionsDelThrFor[Gbl.Forum.ForumType]);
For_PutAllHiddenParamsForum ();
For_PutHiddenParamThrCod (ThrCod);
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">"
"<input type=\"submit\" value=\"%s\" />"
"</div>",
Txt_Remove_thread);
Lay_PutRemoveButton (Txt_Remove_thread);
Act_FormEnd ();
}

26
swad_group.c
View File

@ -1560,8 +1560,8 @@ void Grp_ReqRegisterInGrps (void)
NumGrpsIBelong = Grp_ShowLstGrpsToChgMyGrps ((Gbl.Usrs.Me.LoggedRole == Rol_ROLE_STUDENT));
/***** End form *****/
Lay_PutSendButton (NumGrpsIBelong ? Txt_Change_my_groups :
Txt_Enroll_in_groups);
Lay_PutConfirmButton (NumGrpsIBelong ? Txt_Change_my_groups :
Txt_Enroll_in_groups);
Act_FormEnd ();
}
else // This course has not groups
@ -2146,11 +2146,10 @@ static void Grp_PutFormToCreateGroupType (void)
/***** Send button *****/
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"6\" style=\"text-align:center;\">"
"<input type=\"submit\" value=\"%s\" />"
"</td>"
"</tr>",
Txt_Create_type_of_group);
"<td colspan=\"6\" style=\"text-align:center;\">");
Lay_PutCreateButton (Txt_Create_type_of_group);
fprintf (Gbl.F.Out,"</td>"
"</tr>");
/***** End of frame *****/
Lay_EndRoundFrameTable10 ();
@ -2231,11 +2230,10 @@ static void Grp_PutFormToCreateGroup (void)
/***** Send button *****/
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"7\" style=\"text-align:center;\">"
"<input type=\"submit\" value=\"%s\" />"
"</td>"
"</tr>",
Txt_Create_group);
"<td colspan=\"7\" style=\"text-align:center;\">");
Lay_PutCreateButton (Txt_Create_group);
fprintf (Gbl.F.Out,"</td>"
"</tr>");
/***** End of frame *****/
Lay_EndRoundFrameTable10 ();
@ -3308,7 +3306,7 @@ static void Grp_AskConfirmRemGrpTypWithGrps (unsigned NumGrps)
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
Act_FormStart (ActRemGrpTyp);
Grp_PutParamGrpTypCod (Gbl.CurrentCrs.Grps.GrpTyp.GrpTypCod);
Lay_PutSendButton (Txt_Remove_type_of_group);
Lay_PutRemoveButton (Txt_Remove_type_of_group);
Act_FormEnd ();
fprintf (Gbl.F.Out,"</div>");
}
@ -3347,7 +3345,7 @@ static void Grp_AskConfirmRemGrp (void)
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
Act_FormStart (ActRemGrp);
Grp_PutParamGrpCod (GrpDat.GrpCod);
Lay_PutSendButton (Txt_Remove_group);
Lay_PutRemoveButton (Txt_Remove_group);
Act_FormEnd ();
fprintf (Gbl.F.Out,"</div>");
}

9
swad_holiday.c
View File

@ -1011,11 +1011,10 @@ static void Hld_PutFormToCreateHoliday (void)
/***** Send button *****/
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"5\" style=\"text-align:center;\">"
"<input type=\"submit\" value=\"%s\" />"
"</td>"
"</tr>",
Txt_Create_holiday);
"<td colspan=\"5\" style=\"text-align:center;\">");
Lay_PutCreateButton (Txt_Create_holiday);
fprintf (Gbl.F.Out,"</td>"
"</tr>");
/***** End of frame *****/
Lay_EndRoundFrameTable10 ();

6
swad_indicator.c
View File

@ -168,7 +168,7 @@ void Ind_ReqIndicatorsCourses (void)
/* Form end */
fprintf (Gbl.F.Out,"</td>"
"</table>");
Lay_PutSendButton (Txt_Update_indicators);
Lay_PutConfirmButton (Txt_Update_indicators);
Act_FormEnd ();
/***** Get courses from database *****/
@ -190,7 +190,7 @@ void Ind_ReqIndicatorsCourses (void)
Par_PutHiddenParamLong ("OthDegTypCod",Gbl.Stat.DegTypCod);
Par_PutHiddenParamLong ("DptCod",Gbl.Stat.DptCod);
Par_PutHiddenParamLong ("Indicators",Gbl.Stat.NumIndicators);
Lay_PutSendButton (Txt_Show_more_details);
Lay_PutConfirmButton (Txt_Show_more_details);
Act_FormEnd ();
/* End table */
@ -456,7 +456,7 @@ static void Ind_PutButtonToConfirmIWantToSeeBigList (unsigned NumCrss)
Par_PutHiddenParamChar ("ShowBigList",'Y');
/***** Send button *****/
Lay_PutSendButton (Txt_Show_anyway);
Lay_PutConfirmButton (Txt_Show_anyway);
Act_FormEnd ();
fprintf (Gbl.F.Out,"</div>");
}

14
swad_info.c
View File

@ -1004,7 +1004,7 @@ void Inf_FormToEnterIntegratedEditor (Inf_InfoSrc_t InfoSrc,Inf_InfoType_t InfoT
Act_FormStart (Inf_ActionsInfo[InfoSrc][InfoType]);
/***** Send button *****/
Lay_PutSendButton (Txt_Edit);
Lay_PutConfirmButton (Txt_Edit);
/***** End form *****/
Act_FormEnd ();
@ -1022,7 +1022,7 @@ void Inf_FormToEnterPlainTextEditor (Inf_InfoSrc_t InfoSrc,Inf_InfoType_t InfoTy
Act_FormStart (Inf_ActionsInfo[InfoSrc][InfoType]);
/***** Send button *****/
Lay_PutSendButton (Txt_Edit_text);
Lay_PutConfirmButton (Txt_Edit_text);
/***** End form *****/
Act_FormEnd ();
@ -1040,7 +1040,7 @@ void Inf_FormToEnterRichTextEditor (Inf_InfoSrc_t InfoSrc,Inf_InfoType_t InfoTyp
Act_FormStart (Inf_ActionsInfo[InfoSrc][InfoType]);
/***** Send button *****/
Lay_PutSendButton (Txt_Edit_text);
Lay_PutConfirmButton (Txt_Edit_text);
/***** End form *****/
Act_FormEnd ();
@ -1074,7 +1074,7 @@ void Inf_FormToSendPage (Inf_InfoSrc_t InfoSrc,Inf_InfoType_t InfoType)
Fil_NAME_OF_PARAM_FILENAME_ORG);
/***** Send button *****/
Lay_PutSendButton (Txt_Upload_file);
Lay_PutCreateButton (Txt_Upload_file);
/***** End form *****/
Act_FormEnd ();
@ -1119,7 +1119,7 @@ void Inf_FormToSendURL (Inf_InfoSrc_t InfoSrc,Inf_InfoType_t InfoType)
"</table>");
/***** Send button *****/
Lay_PutSendButton (Txt_Send_URL);
Lay_PutCreateButton (Txt_Send_URL);
/***** End form *****/
Act_FormEnd ();
@ -1729,7 +1729,7 @@ void Inf_EditPlainTxtInfo (void)
// fprintf (Gbl.F.Out,"<br />");
/***** Send and undo buttons *****/
Lay_PutSendButton (Txt_Send);
Lay_PutCreateButton (Txt_Send);
Act_FormEnd ();
}
@ -1789,7 +1789,7 @@ void Inf_EditRichTxtInfo (void)
// fprintf (Gbl.F.Out,"<br />");
/***** Send and undo buttons *****/
Lay_PutSendButton (Txt_Send);
Lay_PutCreateButton (Txt_Send);
Act_FormEnd ();
}

9
swad_institution.c
View File

@ -1851,11 +1851,10 @@ static void Ins_PutFormToCreateInstitution (void)
/***** Send button *****/
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"11\" style=\"text-align:center;\">"
"<input type=\"submit\" value=\"%s\" />"
"</td>"
"</tr>",
Txt_Create_institution);
"<td colspan=\"11\" style=\"text-align:center;\">");
Lay_PutCreateButton (Txt_Create_institution);
fprintf (Gbl.F.Out,"</td>"
"</tr>");
/***** End of frame *****/
Lay_EndRoundFrameTable10 ();

44
swad_layout.c
View File

@ -1002,12 +1002,50 @@ void Lay_PutCalculateIcon (const char *Alt,const char *Text,
/********************** Put a button to submit a form ************************/
/*****************************************************************************/
void Lay_PutSendButton (const char *TextSendButton)
void Lay_PutCreateButton (const char *Text)
{
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">"
"<input type=\"submit\" value=\"%s\" />"
"<button type=\"submit\" class=\"BT_SUBMIT BT_CREATE\">"
"%s"
"</button>"
"</div>",
TextSendButton);
Text);
}
void Lay_PutCreateButtonInline (const char *Text)
{
fprintf (Gbl.F.Out,"<button type=\"submit\" class=\"BT_SUBMIT_INLINE BT_CREATE\">"
"%s"
"</button>",
Text);
}
void Lay_PutConfirmButton (const char *Text)
{
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">"
"<button type=\"submit\" class=\"BT_SUBMIT BT_CONFIRM\">"
"%s"
"</button>"
"</div>",
Text);
}
void Lay_PutConfirmButtonInline (const char *Text)
{
fprintf (Gbl.F.Out,"<button type=\"submit\" class=\"BT_SUBMIT_INLINE BT_CONFIRM\">"
"%s"
"</button>",
Text);
}
void Lay_PutRemoveButton (const char *Text)
{
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">"
"<button type=\"submit\" class=\"BT_SUBMIT BT_REMOVE\">"
"%s"
"</button>"
"</div>",
Text);
}
/*****************************************************************************/

8
swad_layout.h
View File

@ -92,7 +92,13 @@ void Lay_PutSendIcon (const char *Icon,const char *Alt,const char *Text);
void Lay_PutCalculateIcon (const char *Alt,const char *Text,
const char *StaticIconId,
const char *AnimatedIconId);
void Lay_PutSendButton (const char *TextSendButton);
void Lay_PutCreateButton (const char *Text);
void Lay_PutCreateButtonInline (const char *Text);
void Lay_PutConfirmButton (const char *Text);
void Lay_PutConfirmButtonInline (const char *Text);
void Lay_PutRemoveButton (const char *Text);
void Lay_StartRoundFrameTable10 (const char *Width,unsigned CellPadding,const char *Title);
void Lay_StartRoundFrameTable10Shadow (const char *Width,unsigned CellPadding);
void Lay_EndRoundFrameTable10 (void);

9
swad_link.c
View File

@ -623,11 +623,10 @@ static void Lnk_PutFormToCreateLink (void)
/***** Send button *****/
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"5\" style=\"text-align:center;\">"
"<input type=\"submit\" value=\"%s\" />"
"</td>"
"</tr>",
Txt_Create_link);
"<td colspan=\"5\" style=\"text-align:center;\">");
Lay_PutCreateButton (Txt_Create_link);
fprintf (Gbl.F.Out,"</td>"
"</tr>");
/***** End of frame *****/
Lay_EndRoundFrameTable10 ();

13
swad_logo.c
View File

@ -298,15 +298,14 @@ void Log_RequestLogo (Sco_Scope_t Scope)
"</td>"
"</tr>"
"<tr>"
"<td colspan=\"2\" style=\"text-align:center;\">"
"<input type=\"submit\" value=\"%s\" accept=\"image/jpeg\" />"
"</td>"
"</tr>"
"</table>",
"<td colspan=\"2\" style=\"text-align:center;\">",
The_ClassFormul[Gbl.Prefs.Theme],
Txt_File_with_the_logo,
Fil_NAME_OF_PARAM_FILENAME_ORG,
Txt_Upload_logo);
Fil_NAME_OF_PARAM_FILENAME_ORG);
Lay_PutCreateButton (Txt_Upload_logo);
fprintf (Gbl.F.Out,"</td>"
"</tr>"
"</table>");
Act_FormEnd ();
}

78
swad_mail.c
View File

@ -686,11 +686,10 @@ static void Mai_PutFormToCreateMailDomain (void)
/***** Send button *****/
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"2\" style=\"text-align:center;\">"
"<input type=\"submit\" value=\"%s\" />"
"</td>"
"</tr>",
Txt_Create_mail_domain);
"<td colspan=\"2\" style=\"text-align:center;\">");
Lay_PutCreateButton (Txt_Create_mail_domain);
fprintf (Gbl.F.Out,"</td>"
"</tr>");
/***** End of frame *****/
Lay_EndRoundFrameTable10 ();
@ -1048,28 +1047,34 @@ void Mai_ShowFormChangeUsrEmail (void)
Confirmed = (Str_ConvertToUpperLetter (row[1][0]) == 'Y');
if (NumEmail == 1)
{
/* The first mail is the current one */
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"width:40%%;"
" text-align:right; vertical-align:middle;\">"
"<td ");
if (Confirmed)
fprintf (Gbl.F.Out," colspan=\"2\"");
fprintf (Gbl.F.Out," class=\"%s\" style=\"text-align:right;"
" vertical-align:middle;\">"
"%s:"
"</td>"
"<td style=\"width:60%%; text-align:left;"
"<td style=\"text-align:left;"
" vertical-align:middle;\">",
The_ClassFormul[Gbl.Prefs.Theme],Txt_Current_email);
}
else // NumEmail >= 2
{
fprintf (Gbl.F.Out,"<tr>");
if (NumEmail == 2)
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"width:40%%;"
" text-align:right; vertical-align:top;\">"
"%s:"
"</td>"
"<td style=\"width:60%%; text-align:left;"
" vertical-align:top;\">",
The_ClassFormul[Gbl.Prefs.Theme],Txt_Other_emails);
else // NumEmail >= 3
fprintf (Gbl.F.Out,"<br />");
fprintf (Gbl.F.Out,"<td rowspan=\"%u\" class=\"%s\""
" style=\"text-align:right;"
" vertical-align:top;\">"
"%s:",
NumEmails - 1,
The_ClassFormul[Gbl.Prefs.Theme],
Txt_Other_emails);
fprintf (Gbl.F.Out,"</td>"
"<td style=\"text-align:left;"
" vertical-align:top;\">");
/* Form to remove old e-mail */
Act_FormStart (ActRemOldMai);
@ -1110,39 +1115,40 @@ void Mai_ShowFormChangeUsrEmail (void)
/* Form to change the email */
if (NumEmail > 1 || !Confirmed)
{
fprintf (Gbl.F.Out,"</td>"
"<td style=\"text-align:left;"
" vertical-align:middle;\">");
Act_FormStart (ActChgMai);
fprintf (Gbl.F.Out,"&nbsp;<input type=\"hidden\" name=\"NewEmail\" value=\"%s\" />"
"<input type=\"submit\" value=\"%s\" />",
row[0], // E-mail
NumEmail == 1 ? Txt_Confirm_email :
Txt_Use_this_email);
fprintf (Gbl.F.Out,"<input type=\"hidden\" name=\"NewEmail\" value=\"%s\" />",
row[0]); // E-mail
Lay_PutConfirmButtonInline (NumEmail == 1 ? Txt_Confirm_email :
Txt_Use_this_email);
Act_FormEnd ();
fprintf (Gbl.F.Out,"</td>");
}
if (NumEmail == 1 ||
NumEmail == NumEmails)
fprintf (Gbl.F.Out,"</td>"
"</tr>");
fprintf (Gbl.F.Out,"</td>"
"</tr>");
}
/***** Form to enter new e-mail *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"width:40%%;"
" text-align:right; vertical-align:middle;\">"
"<td class=\"%s\" style=\"text-align:right;"
" vertical-align:middle;\">"
"%s:"
"</td>"
"<td style=\"width:60%%; text-align:left;"
" vertical-align:middle;\">",
"<td style=\"text-align:left; vertical-align:middle;\">",
The_ClassFormul[Gbl.Prefs.Theme],
NumEmails ? Txt_New_email : // A new e-mail
Txt_Email); // The first e-mail
Act_FormStart (ActChgMai);
fprintf (Gbl.F.Out,"<input type=\"text\" name=\"NewEmail\" size=\"16\" maxlength=\"%u\" value=\"%s\" />"
"<input type=\"submit\" value=\"%s\" />",
fprintf (Gbl.F.Out,"<input type=\"text\" name=\"NewEmail\" size=\"16\" maxlength=\"%u\" value=\"%s\" />",
Cns_MAX_BYTES_STRING,
Gbl.Usrs.Me.UsrDat.Email,
NumEmails ? Txt_Change_email : // I already have an e-mail address
Txt_Save); // I have no e-mail address yet
Gbl.Usrs.Me.UsrDat.Email);
fprintf (Gbl.F.Out,"</td>"
"<td style=\"text-align:left; vertical-align:middle;\">");
Lay_PutCreateButtonInline (NumEmails ? Txt_Change_email : // I already have an e-mail address
Txt_Save); // I have no e-mail address yet);
Act_FormEnd ();
fprintf (Gbl.F.Out,"</td>"
"</tr>");

14
swad_message.c
View File

@ -340,7 +340,7 @@ static void Msg_PutFormMsgUsrs (const char *Content)
fprintf (Gbl.F.Out,"</table>");
/***** Send and undo buttons *****/
Lay_PutSendButton (Txt_Send_message);
Lay_PutCreateButton (Txt_Send_message);
Act_FormEnd ();
}
@ -781,10 +781,7 @@ void Msg_ReqDelAllRecMsgs (void)
Act_FormStart (ActDelAllRcvMsg);
Msg_PutHiddenParamsMsgsFilters ();
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">"
"<input type=\"submit\" value=\"%s\" />"
"</div>",
Txt_Delete_messages_received);
Lay_PutRemoveButton (Txt_Delete_messages_received);
Act_FormEnd ();
}
@ -818,10 +815,7 @@ void Msg_ReqDelAllSntMsgs (void)
Lay_ShowAlert (Lay_WARNING,Gbl.Message);
Act_FormStart (ActDelAllSntMsg);
Msg_PutHiddenParamsMsgsFilters ();
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">"
"<input type=\"submit\" value=\"%s\" />"
"</div>",
Txt_Delete_messages_sent);
Lay_PutRemoveButton (Txt_Delete_messages_sent);
Act_FormEnd ();
}
@ -1555,7 +1549,7 @@ static void Msg_ShowSentOrReceivedMessages (Msg_TypeOfMessages_t TypeOfMessages)
Msg_GetParamOnlyUnreadMsgs ();
Msg_ShowFormToShowOnlyUnreadMessages ();
}
Lay_PutSendButton (Txt_View_messages);
Lay_PutConfirmButton (Txt_View_messages);
Act_FormEnd ();
if (TypeOfMessages == Msg_MESSAGES_RECEIVED)

64
swad_nickname.c
View File

@ -211,26 +211,27 @@ void Nck_ShowFormChangeUsrNickname (void)
if (NumNick == 1)
/* The first nickname is the current one */
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"width:40%%;"
" text-align:right; vertical-align:middle;\">"
"<td class=\"%s\" style=\"text-align:right;"
" vertical-align:middle;\">"
"%s:"
"</td>"
"<td style=\"width:60%%;"
" text-align:left; vertical-align:middle;\">",
"<td colspan=\"2\" style=\"text-align:left;"
" vertical-align:middle;\">",
The_ClassFormul[Gbl.Prefs.Theme],Txt_Current_nickname);
else // NumNick >= 2
{
fprintf (Gbl.F.Out,"<tr>");
if (NumNick == 2)
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"width:40%%;"
" text-align:right; vertical-align:top;\">"
"%s:"
"</td>"
"<td style=\"width:60%%;"
" text-align:left; vertical-align:top;\">",
The_ClassFormul[Gbl.Prefs.Theme],Txt_Other_nicknames);
else // NumNick >= 3
fprintf (Gbl.F.Out,"<br />");
fprintf (Gbl.F.Out,"<td rowspan=\"%u\" class=\"%s\""
" style=\"text-align:right;"
" vertical-align:top;\">"
"%s:",
NumNicks - 1,
The_ClassFormul[Gbl.Prefs.Theme],
Txt_Other_nicknames);
fprintf (Gbl.F.Out,"</td>"
"<td style=\"text-align:left;"
" vertical-align:top;\">");
/* Form to remove old nickname */
Act_FormStart (ActRemOldNic);
@ -260,39 +261,38 @@ void Nck_ShowFormChangeUsrNickname (void)
/* Form to change the nickname */
if (NumNick > 1)
{
fprintf (Gbl.F.Out,"</td>"
"<td style=\"text-align:left;"
" vertical-align:top;\">");
Act_FormStart (ActChgNic);
fprintf (Gbl.F.Out,"&nbsp;"
"<input type=\"hidden\" name=\"NewNick\" value=\"@%s\" />"
"<input type=\"submit\" value=\"%s\" />",
row[0], // Nickname
Txt_Use_this_nickname);
fprintf (Gbl.F.Out,"<input type=\"hidden\" name=\"NewNick\" value=\"@%s\" />",
row[0]); // Nickname
Lay_PutConfirmButtonInline (Txt_Use_this_nickname);
Act_FormEnd ();
}
if (NumNick == 1 ||
NumNick == NumNicks)
fprintf (Gbl.F.Out,"</td>"
"</tr>");
fprintf (Gbl.F.Out,"</td>"
"</tr>");
}
/***** Form to enter new nickname *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"width:40%%;"
" text-align:right; vertical-align:middle;\">"
"<td class=\"%s\" style=\"text-align:right;"
" vertical-align:middle;\">"
"%s:"
"</td>"
"<td style=\"width:60%%;"
" text-align:left; vertical-align:middle;\">",
"<td style=\"text-align:left; vertical-align:middle;\">",
The_ClassFormul[Gbl.Prefs.Theme],
NumNicks ? Txt_New_nickname : // A new nickname
Txt_Nickname); // The first nickname
Act_FormStart (ActChgNic);
fprintf (Gbl.F.Out,"<input type=\"text\" name=\"NewNick\" size=\"16\" maxlength=\"%u\" value=\"@%s\" />"
"<input type=\"submit\" value=\"%s\" />",
fprintf (Gbl.F.Out,"<input type=\"text\" name=\"NewNick\" size=\"16\" maxlength=\"%u\" value=\"@%s\" />",
1 + Nck_MAX_LENGTH_NICKNAME_WITHOUT_ARROBA,
Gbl.Usrs.Me.UsrDat.Nickname,
NumNicks ? Txt_Change_nickname : // I already have a nickname
Txt_Save); // I have no nickname yet
Gbl.Usrs.Me.UsrDat.Nickname);
fprintf (Gbl.F.Out,"</td>"
"<td style=\"text-align:left; vertical-align:middle;\">");
Lay_PutCreateButtonInline (NumNicks ? Txt_Change_nickname : // I already have a nickname
Txt_Save); // I have no nickname yet);
Act_FormEnd ();
fprintf (Gbl.F.Out,"</td>"
"</tr>");

33
swad_notice.c
View File

@ -93,15 +93,14 @@ void Not_ShowFormNotice (void)
Gbl.CurrentCrs.Crs.FullName);
Lay_ShowAlert (Lay_INFO,Gbl.Message);
/***** Form start *****/
Act_FormStart (ActRcvNot);
fprintf (Gbl.F.Out,"<table style=\"margin:0 auto;\">"
"<tr>"
"<td></td>"
"<td class=\"%s\" style=\"text-align:left;\">"
"%s"
"</td>"
"</tr>"
"<tr>"
/***** Start frame *****/
Lay_StartRoundFrameTable10 (NULL,2,Txt_New_notice);
/***** Message body *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"text-align:right;"
" vertical-align:top;\">"
"%s: "
@ -109,13 +108,21 @@ void Not_ShowFormNotice (void)
"<td style=\"text-align:left;\">"
"<textarea name=\"Content\" cols=\"30\" rows=\"10\"></textarea>"
"</td>"
"</tr>"
"</table>",
The_ClassFormul[Gbl.Prefs.Theme],
Txt_New_notice,
"</tr>",
The_ClassFormul[Gbl.Prefs.Theme],
Txt_MSG_Message);
Lay_PutSendButton (Txt_Create_notice);
/***** Button to create announcement *****/
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"2\" style=\"text-align:center;\">");
Lay_PutCreateButton (Txt_Create_notice);
fprintf (Gbl.F.Out,"</td>"
"</tr>");
/***** End frame *****/
Lay_EndRoundFrameTable10 ();
/***** Form end *****/
Act_FormEnd ();
}

2
swad_notification.c
View File

@ -1741,7 +1741,7 @@ void Ntf_PutFormChangeNotifSentByEMail (void)
/***** End form *****/
fprintf (Gbl.F.Out,"</table>");
Lay_PutSendButton (Txt_Save_changes);
Lay_PutConfirmButton (Txt_Save_changes);
Act_FormEnd ();
/***** End table *****/

13
swad_password.c
View File

@ -232,7 +232,7 @@ void Pwd_ShowFormSendNewPwd (void)
The_ClassFormul[Gbl.Prefs.Theme],Txt_nick_email_or_ID,Usr_MAX_LENGTH_USR_LOGIN,Gbl.Usrs.Me.UsrIdLogin);
/***** End form *****/
Lay_PutSendButton (Txt_Email_new_password);
Lay_PutConfirmButton (Txt_Email_new_password);
Act_FormEnd ();
}
@ -676,11 +676,10 @@ void Pwd_ShowFormChgPwd (void)
/***** Send button and end form *****/
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"2\" style=\"text-align:center;\">"
"<input type=\"submit\" value=\"%s\" />"
"</td>"
"</tr>",
Txt_Save);
"<td colspan=\"2\" style=\"text-align:center;\">");
Lay_PutConfirmButton (Txt_Save);
fprintf (Gbl.F.Out,"</td>"
"</tr>");
Lay_EndRoundFrameTable10 ();
Act_FormEnd ();
}
@ -760,7 +759,7 @@ void Pwd_ShowFormOthPwd (void)
fprintf (Gbl.F.Out,"</table>");
/* End form */
Lay_PutSendButton (Txt_Save);
Lay_PutConfirmButton (Txt_Save);
Act_FormEnd ();
}
else

13
swad_photo.c
View File

@ -267,16 +267,15 @@ void Pho_ReqPhoto (const struct UsrData *UsrDat,bool PhotoExists,const char *Pho
"</td>"
"</tr>"
"<tr>"
"<td colspan=\"2\" style=\"text-align:center;\">"
"<input type=\"submit\" value=\"%s\" accept=\"image/jpeg\" />"
"</td>"
"</tr>"
"</table>",
"<td colspan=\"2\" style=\"text-align:center;\">",
The_ClassFormul[Gbl.Prefs.Theme],
Txt_File_with_the_photo,
Fil_NAME_OF_PARAM_FILENAME_ORG,
UsrDat->UsrCod,
Txt_Upload_photo);
UsrDat->UsrCod);
Lay_PutCreateButton (Txt_Upload_photo);
fprintf (Gbl.F.Out,"</td>"
"</tr>"
"</table>");
Act_FormEnd ();
}

9
swad_place.c
View File

@ -720,11 +720,10 @@ static void Plc_PutFormToCreatePlace (void)
/***** Send button *****/
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"2\" style=\"text-align:center;\">"
"<input type=\"submit\" value=\"%s\" />"
"</td>"
"</tr>",
Txt_Create_place);
"<td colspan=\"2\" style=\"text-align:center;\">");
Lay_PutCreateButton (Txt_Create_place);
fprintf (Gbl.F.Out,"</td>"
"</tr>");
/***** End of frame *****/
Lay_EndRoundFrameTable10 ();

9
swad_plugin.c
View File

@ -914,11 +914,10 @@ static void Plg_PutFormToCreatePlugin (void)
/***** Send button *****/
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"6\" style=\"text-align:center;\">"
"<input type=\"submit\" value=\"%s\" />"
"</td>"
"</tr>",
Txt_Create_plugin);
"<td colspan=\"6\" style=\"text-align:center;\">");
Lay_PutCreateButton (Txt_Create_plugin);
fprintf (Gbl.F.Out,"</td>"
"</tr>");
/***** End of frame *****/
Lay_EndRoundFrameTable10 ();

2
swad_preference.c
View File

@ -273,7 +273,7 @@ void Pre_AskChangeLanguage (void)
/***** Send button *****/
Act_FormStart (ActChgLan);
Par_PutHiddenParamUnsigned ("Lan",(unsigned) Gbl.Prefs.Language);
Lay_PutSendButton (Txt_Switch_to_LANGUAGE[Gbl.Prefs.Language]);
Lay_PutConfirmButton (Txt_Switch_to_LANGUAGE[Gbl.Prefs.Language]);
Act_FormEnd ();
Gbl.Prefs.Language = CurrentLanguage; // Restore current language

2
swad_profile.c
View File

@ -157,7 +157,7 @@ static void Prf_RequestUserProfileWithDefaultNickname (const char *DefaultNickna
DefaultNickname);
/***** Send button*****/
Lay_PutSendButton (Txt_Continue);
Lay_PutConfirmButton (Txt_Continue);
Act_FormEnd ();
/***** End frame *****/

46
swad_record.c
View File

@ -90,7 +90,7 @@ static void Rec_PutLinkToChangeMySocialNetworks (void);
void Rec_ReqEditRecordFields (void)
{
extern const char *Txt_There_are_no_record_fields_in_the_course_X;
extern const char *Txt_Record_fields_in_X;
extern const char *Txt_Record_fields;
/***** Form to edit the fields of the records *****/
/***** Get list of fields of records in current course *****/
@ -99,11 +99,7 @@ void Rec_ReqEditRecordFields (void)
/***** List the current fields of records for edit them *****/
if (Gbl.CurrentCrs.Records.LstFields.Num) // Fields found...
{
sprintf (Gbl.Message,Txt_Record_fields_in_X,
Gbl.CurrentCrs.Crs.FullName);
Lay_WriteTitle (Gbl.Message);
Lay_StartRoundFrameTable10 (NULL,0,NULL);
Lay_StartRoundFrameTable10 (NULL,2,Txt_Record_fields);
Rec_ListFieldsRecordsForEdition ();
Lay_EndRoundFrameTable10 ();
}
@ -273,7 +269,6 @@ void Rec_ListFieldsRecordsForEdition (void)
void Rec_ShowFormCreateRecordField (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *Txt_New_record_field;
extern const char *Txt_RECORD_FIELD_VISIBILITY_MENU[Rec_NUM_TYPES_VISIBILITY];
extern const char *Txt_Create_record_field;
@ -283,16 +278,7 @@ void Rec_ShowFormCreateRecordField (void)
Act_FormStart (ActNewFie);
/***** Start of frame *****/
Lay_StartRoundFrameTable10 (NULL,0,NULL);
/***** Message *****/
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"4\" class=\"%s\""
" style=\"text-align:left;\">"
"%s:"
"</td>"
"</tr>",
The_ClassFormul[Gbl.Prefs.Theme],Txt_New_record_field);
Lay_StartRoundFrameTable10 (NULL,0,Txt_New_record_field);
/***** Write heading *****/
Rec_WriteHeadingRecordFields ();
@ -332,16 +318,21 @@ void Rec_ShowFormCreateRecordField (void)
Txt_RECORD_FIELD_VISIBILITY_MENU[Vis]);
}
/***** End of form *****/
fprintf (Gbl.F.Out,"</select>"
"</td>"
"</tr>");
/***** Send button *****/
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"4\" style=\"text-align:center;\">");
Lay_PutCreateButton (Txt_Create_record_field);
fprintf (Gbl.F.Out,"</td>"
"</tr>");
/***** End of frame *****/
Lay_EndRoundFrameTable10 ();
/***** Send button *****/
Lay_PutSendButton (Txt_Create_record_field);
/***** End of form *****/
Act_FormEnd ();
}
@ -590,10 +581,7 @@ void Rec_AskConfirmRemFieldWithRecords (unsigned NumRecords)
/***** Button to confirm removing *****/
Act_FormStart (ActRemFie);
Par_PutHiddenParamLong ("FieldCod",Gbl.CurrentCrs.Records.Field.FieldCod);
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">"
"<input type=\"submit\" value=\"%s\" />"
"</div>",
Txt_Remove_record_field);
Lay_PutRemoveButton (Txt_Remove_record_field);
Act_FormEnd ();
}
@ -1484,7 +1472,7 @@ void Rec_ShowCrsRecord (Rec_RecordViewType_t TypeOfView,struct UsrData *UsrDat)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *Txt_RECORD_FIELD_VISIBILITY_RECORD[Rec_NUM_TYPES_VISIBILITY];
extern const char *Txt_Send;
extern const char *Txt_Save;
unsigned RecordWidth = Rec_RECORD_WIDTH_WIDE;
char StrRecordWidth[10+1];
unsigned FrameWidth = 10;
@ -1649,7 +1637,7 @@ void Rec_ShowCrsRecord (Rec_RecordViewType_t TypeOfView,struct UsrData *UsrDat)
if (DataForm)
{
Lay_PutSendButton (Txt_Send);
Lay_PutConfirmButton (Txt_Save);
Act_FormEnd ();
}
}
@ -1877,7 +1865,7 @@ void Rec_ShowFormSignUpWithMyCommonRecord (void)
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
Act_FormStart (ActSignUp);
Rec_ShowSharedUsrRecord (Rec_FORM_SIGN_UP,&Gbl.Usrs.Me.UsrDat);
Lay_PutSendButton (Txt_Sign_up);
Lay_PutConfirmButton (Txt_Sign_up);
Act_FormEnd ();
fprintf (Gbl.F.Out,"</div>");
}
@ -1912,7 +1900,7 @@ void Rec_ShowFormMyCommRecord (void)
/***** My record *****/
Act_FormStart (ActChgMyData);
Rec_ShowSharedUsrRecord (Rec_FORM_MY_COMMON_RECORD,&Gbl.Usrs.Me.UsrDat);
Lay_PutSendButton (Txt_Save_changes);
Lay_PutConfirmButton (Txt_Save_changes);
Rec_WriteLinkToDataProtectionClause ();
Act_FormEnd ();
fprintf (Gbl.F.Out,"</div>");
@ -1969,7 +1957,7 @@ void Rec_ShowFormOtherNewCommonRecord (struct UsrData *UsrDat)
if (Gbl.CurrentCrs.Grps.NumGrps) // This course has groups?
Grp_ShowLstGrpsToChgOtherUsrsGrps (UsrDat->UsrCod);
Lay_PutSendButton (Txt_Register);
Lay_PutConfirmButton (Txt_Register);
Act_FormEnd ();
fprintf (Gbl.F.Out,"</div>");
}

5
swad_search.c
View File

@ -271,9 +271,8 @@ static void Sch_PutFormToSearchWithWhatToSearchAndScope (Act_Action_t Action,Sco
Sch_PutFormToSearch (Gbl.Prefs.IconsURL);
/***** Send button *****/
fprintf (Gbl.F.Out,"<br />"
"<input type=\"submit\" value=\"%s\" />",
Txt_Search);
fprintf (Gbl.F.Out,"<br />");
Lay_PutConfirmButton (Txt_Search);
/***** Form end *****/
fprintf (Gbl.F.Out,"</td>"

40
swad_statistic.c
View File

@ -94,7 +94,6 @@ struct Sta_StatsForum
static void Sta_PutFormToRequestAccessesCrs (void);
static void Sta_PutSeeAccessesButton (void);
static void Sta_WriteSelectorCountType (void);
static void Sta_WriteSelectorAction (void);
static bool Sta_SeeAccesses (void);
@ -388,10 +387,11 @@ static void Sta_PutFormToRequestAccessesCrs (void)
void Sta_AskSeeCrsAccesses (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *Txt_No_teachers_or_students_found;
extern const char *Txt_distributed_by;
extern const char *Txt_STAT_CLICK_STAT_TYPES[Sta_NUM_TYPES_CLICK_STATS];
extern const char *Txt_results_per_page;
extern const char *Txt_Show_visits;
extern const char *Txt_No_teachers_or_students_found;
static unsigned long RowsPerPage[] = {10,20,30,40,50,100,500,1000,5000,10000,50000,100000};
#define NUM_OPTIONS_ROWS_PER_PAGE (sizeof (RowsPerPage) / sizeof (RowsPerPage[0]))
Sta_ClicksStatType_t ClicksStatType;
@ -505,13 +505,13 @@ void Sta_AskSeeCrsAccesses (void)
}
fprintf (Gbl.F.Out,"</select>)"
"</td>"
"</tr>");
"</tr>"
"</table>");
/***** Submit button *****/
Sta_PutSeeAccessesButton ();
Lay_PutConfirmButton (Txt_Show_visits);
/***** Form end *****/
fprintf (Gbl.F.Out,"</table>");
Act_FormEnd ();
/* Free the memory used by the list of users */
@ -541,6 +541,7 @@ void Sta_AskSeeGblAccesses (void)
extern const char *Txt_Scope;
extern const char *Txt_distributed_by;
extern const char *Txt_STAT_CLICK_STAT_TYPES[Sta_NUM_TYPES_CLICK_STATS];
extern const char *Txt_Show_visits;
Sta_Role_t RoleStat;
Sta_ClicksStatType_t ClicksStatType;
@ -633,32 +634,16 @@ void Sta_AskSeeGblAccesses (void)
Txt_STAT_CLICK_STAT_TYPES[ClicksStatType]);
}
fprintf (Gbl.F.Out,"</td>"
"</tr>");
"</tr>"
"</table>");
/***** Submit button *****/
Sta_PutSeeAccessesButton ();
Lay_PutConfirmButton (Txt_Show_visits);
/***** Form end *****/
fprintf (Gbl.F.Out,"</table>");
Act_FormEnd ();
}
/*****************************************************************************/
/********************** Put submit button to see accesses ********************/
/*****************************************************************************/
static void Sta_PutSeeAccessesButton (void)
{
extern const char *Txt_Show_visits;
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"2\" style=\"text-align:center;\">"
"<input type=\"submit\" value=\"%s\" />"
"</td>"
"</tr>",
Txt_Show_visits);
}
/*****************************************************************************/
/****** Put selectors for type of access count and for degree or course ******/
/*****************************************************************************/
@ -822,7 +807,7 @@ static bool Sta_SeeAccesses (void)
struct UsrData UsrDat;
unsigned NumUsr = 0;
const char *Ptr;
char StrRole[16+1];
char StrRole[256];
char StrQueryCountType[256];
unsigned NumDays;
char ActTxt[Act_MAX_LENGTH_ACTION_TXT+1];
@ -1060,6 +1045,7 @@ static bool Sta_SeeAccesses (void)
Gbl.DateRange.DateEnd.Month,
Gbl.DateRange.DateEnd.Day);
strcat (Query,QueryAux);
switch (StatsGlobalOrCourse)
{
case STAT_GLOBAL:
@ -1099,6 +1085,7 @@ static bool Sta_SeeAccesses (void)
LogTable,Gbl.CurrentCrs.Crs.CrsCod);
strcat (Query,QueryAux);
}
/* Type of users */
switch (Gbl.Stat.Role)
{
@ -3643,8 +3630,7 @@ void Sta_ReqUseOfPlatform (void)
"</div>");
/***** Submit button *****/
fprintf (Gbl.F.Out,"<input type=\"submit\" value=\"%s\" />",
Txt_Show_statistic);
Lay_PutConfirmButton (Txt_Show_statistic);
/***** Form end *****/
Act_FormEnd ();

75
swad_survey.c
View File

@ -425,7 +425,7 @@ static void Svy_ShowOneSurvey (long SvyCod,struct SurveyQuestion *SvyQst,bool Sh
Svy_PutHiddenParamSvyOrderType ();
Grp_PutParamWhichGrps ();
Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage);
Lay_PutSendButton (Txt_Answer_survey);
Lay_PutConfirmButton (Txt_Answer_survey);
Act_FormEnd ();
}
/* Possible button to see the result of the survey */
@ -436,7 +436,7 @@ static void Svy_ShowOneSurvey (long SvyCod,struct SurveyQuestion *SvyQst,bool Sh
Svy_PutHiddenParamSvyOrderType ();
Grp_PutParamWhichGrps ();
Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage);
Lay_PutSendButton (Txt_View_survey_results);
Lay_PutConfirmButton (Txt_View_survey_results);
Act_FormEnd ();
}
}
@ -1270,10 +1270,7 @@ void Svy_AskRemSurvey (void)
sprintf (Gbl.Message,Txt_Do_you_really_want_to_remove_the_survey_X,
Svy.Title);
Lay_ShowAlert (Lay_WARNING,Gbl.Message);
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">"
"<input type=\"submit\" value=\"%s\" />"
"</div>",
Txt_Remove_survey);
Lay_PutRemoveButton (Txt_Remove_survey);
Act_FormEnd ();
/***** Show surveys again *****/
@ -1373,10 +1370,7 @@ void Svy_AskResetSurvey (void)
sprintf (Gbl.Message,Txt_Do_you_really_want_to_reset_the_survey_X,
Svy.Title);
Lay_ShowAlert (Lay_WARNING,Gbl.Message);
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">"
"<input type=\"submit\" value=\"%s\" />"
"</div>",
Txt_Reset_survey);
Lay_PutConfirmButton (Txt_Reset_survey);
Act_FormEnd ();
/***** Show surveys again *****/
@ -1600,7 +1594,7 @@ void Svy_RequestCreatOrEditSvy (void)
Grp_PutParamWhichGrps ();
Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage);
/***** Table start *****/
/***** Start frame *****/
Lay_StartRoundFrameTable10 (NULL,2,
ItsANewSurvey ? Txt_New_survey :
Txt_Edit_survey);
@ -1627,7 +1621,7 @@ void Svy_RequestCreatOrEditSvy (void)
"%s:"
"</td>"
"<td style=\"text-align:left; vertical-align:top;\">"
"<input type=\"text\" name=\"Title\" size=\"80\" maxlength=\"%u\" value=\"%s\" />"
"<input type=\"text\" name=\"Title\" size=\"40\" maxlength=\"%u\" value=\"%s\" />"
"</td>"
"</tr>",
Txt_Title,
@ -1699,12 +1693,18 @@ void Svy_RequestCreatOrEditSvy (void)
/***** Groups *****/
Svy_ShowLstGrpsToEditSurvey (Svy.SvyCod);
/***** Table end *****/
Lay_EndRoundFrameTable10 ();
/***** Button to create/modify survey *****/
Lay_PutSendButton (ItsANewSurvey ? Txt_Create_survey :
Txt_Modify_survey);
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"2\" style=\"text-align:center;\">");
if (ItsANewSurvey)
Lay_PutCreateButton (Txt_Create_survey);
else
Lay_PutConfirmButton (Txt_Modify_survey);
fprintf (Gbl.F.Out,"</td>"
"</tr>");
/***** End frame *****/
Lay_EndRoundFrameTable10 ();
/***** Form end *****/
Act_FormEnd ();
@ -1779,7 +1779,7 @@ static void Svy_ShowLstGrpsToEditSurvey (long SvyCod)
"</td>"
"<td style=\"text-align:left; vertical-align:top;\">",
Txt_Groups);
Lay_StartRoundFrameTable10 (NULL,0,NULL);
Lay_StartRoundFrameTable10 ("100%",0,NULL);
/***** First row: checkbox to select the whole course *****/
fprintf (Gbl.F.Out,"<tr>"
@ -2391,7 +2391,7 @@ static void Svy_ShowFormEditOneQst (long SvyCod,struct SurveyQuestion *SvyQst,ch
extern const char *Txt_Stem;
extern const char *Txt_Type;
extern const char *Txt_SURVEY_STR_ANSWER_TYPES[Svy_NUM_ANS_TYPES];
extern const char *Txt_Send;
extern const char *Txt_Save;
char Query[512];
MYSQL_RES *mysql_res;
MYSQL_ROW row;
@ -2452,19 +2452,15 @@ static void Svy_ShowFormEditOneQst (long SvyCod,struct SurveyQuestion *SvyQst,ch
if (SvyQst->QstCod > 0) // If the question already has assigned a code
Svy_PutParamQstCod (SvyQst->QstCod);
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
/***** Show message *****/
/***** Start frame *****/
if (SvyQst->QstCod > 0) // If the question already has assigned a code
{
sprintf (Gbl.Message,"%s %u",
sprintf (Gbl.Title,"%s %u",
Txt_Question,SvyQst->QstInd + 1); // Question index may be 0, 1, 2, 3,...
Lay_WriteTitle (Gbl.Message);
Lay_StartRoundFrameTable10 (NULL,2,Gbl.Title);
}
else
Lay_WriteTitle (Txt_New_question);
fprintf (Gbl.F.Out,"<table>");
Lay_StartRoundFrameTable10 (NULL,2,Txt_New_question);
/***** Stem *****/
fprintf (Gbl.F.Out,"<tr>"
@ -2534,13 +2530,24 @@ static void Svy_ShowFormEditOneQst (long SvyCod,struct SurveyQuestion *SvyQst,ch
"</td>"
"</tr>");
}
/***** Send and undo buttons *****/
fprintf (Gbl.F.Out,"</table>"
"</tr>"
"</table>"
"</div>");
Lay_PutSendButton (Txt_Send);
"</td>"
"</tr>");
/***** Send button *****/
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"2\" style=\"text-align:center;\">");
if (SvyQst->QstCod > 0) // If the question already has assigned a code
Lay_PutConfirmButton (Txt_Save);
else
Lay_PutCreateButton (Txt_Save);
fprintf (Gbl.F.Out,"</td>"
"</tr>");
/***** End frame *****/
Lay_EndRoundFrameTable10 ();
/***** End form *****/
Act_FormEnd ();
Svy_FreeTextChoiceAnswers (SvyQst,NumAnswers);
@ -3100,7 +3107,7 @@ static void Svy_ListSvyQuestions (struct Survey *Svy,struct SurveyQuestion *SvyQ
Lay_EndRoundFrameTable10 ();
/***** Button to create/modify survey *****/
Lay_PutSendButton (Txt_Send_survey);
Lay_PutConfirmButton (Txt_Send_survey);
/***** Form end *****/
Act_FormEnd ();

22
swad_test.c
View File

@ -287,12 +287,11 @@ void Tst_ShowFormAskTst (void)
if (Gbl.Test.Config.Min == Gbl.Test.Config.Max)
fprintf (Gbl.F.Out," disabled=\"disabled\"");
fprintf (Gbl.F.Out," />"
"</div>"
"</div>");
/***** Send button *****/
fprintf (Gbl.F.Out,"<input type=\"submit\" value=\"%s\" />"
"</div>",
Txt_Generate_exam);
Lay_PutConfirmButton (Txt_Generate_exam);
Act_FormEnd ();
}
}
@ -417,7 +416,7 @@ void Tst_ShowNewTestExam (void)
Txt_Allow_teachers_to_consult_this_exam);
/* End form */
Lay_PutSendButton (Txt_Done_assess_exam);
Lay_PutConfirmButton (Txt_Done_assess_exam);
Act_FormEnd ();
/***** Set test status *****/
@ -1141,12 +1140,11 @@ void Tst_ShowFormAskEditTsts (void)
fprintf (Gbl.F.Out,"<table class=\"CELLS_PAD_2\""
" style=\"margin:0 auto;\">");
Dat_WriteFormIniEndDates ();
fprintf (Gbl.F.Out,"</table>");
fprintf (Gbl.F.Out,"</table>"
"</div>");
/***** Send button *****/
fprintf (Gbl.F.Out,"<input type=\"submit\" value=\"%s\" />"
"</div>",
Txt_Show_questions);
Lay_PutConfirmButton (Txt_Show_questions);
Act_FormEnd ();
}
@ -1716,7 +1714,7 @@ static void Tst_ShowFormConfigTst (void)
/***** End form *****/
fprintf (Gbl.F.Out,"</tr>");
Lay_EndRoundFrameTable10 ();
Lay_PutSendButton (Txt_Save);
Lay_PutConfirmButton (Txt_Save);
Act_FormEnd ();
}
@ -4521,7 +4519,7 @@ static void Tst_PutFormEditOneQst (char *Stem,char *Feedback)
fprintf (Gbl.F.Out,"</table>"
"</tr>"
"</table>");
Lay_PutSendButton (Txt_Save);
Lay_PutConfirmButton (Txt_Save);
Act_FormEnd ();
Tst_FreeTextChoiceAnswers ();
@ -5994,7 +5992,7 @@ void Tst_SelUsrsToSeeUsrsTstExams (void)
/***** Button to send the form *****/
fprintf (Gbl.F.Out,"</table>"
"</div>");
Lay_PutSendButton (Txt_See_exams);
Lay_PutConfirmButton (Txt_See_exams);
Act_FormEnd ();
}
}
@ -6029,7 +6027,7 @@ void Tst_SelDatesToSeeMyTstExams (void)
fprintf (Gbl.F.Out,"</table>");
/***** Button to send the form *****/
Lay_PutSendButton (Txt_See_exams);
Lay_PutConfirmButton (Txt_See_exams);
Act_FormEnd ();
}

13
swad_test_import.c
View File

@ -148,15 +148,14 @@ void TsI_ShowFormImportQstsFromXML (void)
"</td>"
"</tr>"
"<tr>"
"<td colspan=\"2\" style=\"text-align:center;\">"
"<input type=\"submit\" value=\"%s\" accept=\"text/xml\" />"
"</td>"
"</tr>"
"</table>",
"<td colspan=\"2\" style=\"text-align:center;\">",
The_ClassFormul[Gbl.Prefs.Theme],
Txt_XML_file,
Fil_NAME_OF_PARAM_FILENAME_ORG,
Txt_Upload_file);
Fil_NAME_OF_PARAM_FILENAME_ORG);
Lay_PutCreateButton (Txt_Upload_file);
fprintf (Gbl.F.Out,"</td>"
"</tr>"
"</table>");
Act_FormEnd ();
fprintf (Gbl.F.Out,"</div>");
}

46
swad_text.c
View File

@ -2349,17 +2349,17 @@ const char *Txt_Another_ID =
const char *Txt_Add_this_ID =
#if L==0
"Afegir aquest ID (DNI/c&egrave;dula)";
"Afegir aquest ID";
#elif L==1
"F&uuml;gen Sie diese Ausweis-Nr.";
#elif L==2
"Add this ID";
#elif L==3
"A&ntilde;adir este ID (DNI/c&eacute;dula)";
"A&ntilde;adir este ID";
#elif L==4
"Ajouter ce num&eacute;ro d'identit&eacute;";
#elif L==5
"A&ntilde;adir este ID (DNI/c&eacute;dula)"; // Okoteve traducción
"A&ntilde;adir este ID"; // Okoteve traducción
#elif L==6
"Aggiungi questa carta d'identit&agrave;";
#elif L==7
@ -27940,25 +27940,25 @@ const char *Txt_RECORD_FIELD_VISIBILITY_RECORD[Rec_NUM_TYPES_VISIBILITY] =
#endif
};
const char *Txt_Record_fields_in_X = // Warning: it is very important to include %s in the following sentences
const char *Txt_Record_fields =
#if L==0
"Camps de fitxes en <strong>%s</strong>:";
"Camps de fitxes";
#elif L==1
"Record fields in <strong>%s</strong>:"; // Need Übersetzung
"Record fields"; // Need Übersetzung
#elif L==2
"Record fields in <strong>%s</strong>:";
"Record fields";
#elif L==3
"Campos de fichas en <strong>%s</strong>:";
"Campos de fichas";
#elif L==4
"Record fields in <strong>%s</strong>:"; // Besoin de traduction
"Record fields"; // Besoin de traduction
#elif L==5
"Campos de fichas en <strong>%s</strong>:"; // Okoteve traducción
"Campos de fichas"; // Okoteve traducción
#elif L==6
"Campo schede in <strong>%s</strong>:";
"Campo schede";
#elif L==7
"Rekord w dziedzinie <strong>%s</strong>:";
"Rekord w dziedzinie";
#elif L==8
"Record fields in <strong>%s</strong>:"; // Necessita de tradução
"Record fields"; // Necessita de tradução
#endif
const char *Txt_Recipients =
@ -33866,25 +33866,25 @@ const char *Txt_Send =
"Enviar";
#endif
const char *Txt_Send_announcement_of_exam =
const char *Txt_Publish_announcement_OF_EXAM =
#if L==0
"Enviar convocatoria de examen"; // Necessita traduccio
"Publicar convocat&ograve;ria";
#elif L==1
"Senden Aufruf f&uuml;r Pr&uuml;fung";
"Ver&ouml;ffentlichen Aufruf";
#elif L==2
"Send announcement of exam";
"Publish announcement";
#elif L==3
"Enviar convocatoria de examen";
"Publicar convocatoria";
#elif L==4
"Envoyer convocation &agrave; l'examen";
"Publier convocation";
#elif L==5
"Enviar convocatoria de examen"; // Okoteve traducción
"Publicar convocatoria"; // Okoteve traducción
#elif L==6
"Invia sessione d'esame";
"Pubblicare sessione";
#elif L==7
"Send announcement of exam"; // Potrzebujesz tlumaczenie
"Publikuje zaproszenie";
#elif L==8
"Enviar chamada para o exame";
"Publicar chamada";
#endif
const char *Txt_Send_message =

21
swad_user.c
View File

@ -1337,6 +1337,7 @@ void Usr_WriteFormLogin (void)
extern const char *Txt_New_on_PLATFORM_Sign_up;
extern const char *Txt_Create_account;
extern const char *Txt_Enter_from_X;
extern const char *Txt_User;
extern const char *Txt_nick_email_or_ID;
extern const char *Txt_Password;
extern const char *Txt_Log_in;
@ -1376,7 +1377,8 @@ void Usr_WriteFormLogin (void)
"</td>"
"<td style=\"text-align:left; vertical-align:middle;\">"
"<input type=\"text\" id=\"UsrId\" name=\"UsrId\""
" size=\"16\" maxlength=\"%u\" value=\"%s\" />"
" size=\"25\" maxlength=\"%u\""
" placeholder=\"%s\" value=\"%s\" />"
"</td>"
"</tr>"
"<tr>"
@ -1386,12 +1388,13 @@ void Usr_WriteFormLogin (void)
"</td>"
"<td style=\"text-align:left; vertical-align:middle;\">"
"<input type=\"password\" name=\"UsrPwd\""
" size=\"16\" maxlength=\"%u\" />"
" size=\"25\" maxlength=\"%u\" />"
"</td>"
"</tr>",
The_ClassFormul[Gbl.Prefs.Theme],
Txt_nick_email_or_ID,
Txt_User,
Usr_MAX_LENGTH_USR_LOGIN,
Txt_nick_email_or_ID,
Gbl.Usrs.Me.UsrIdLogin,
The_ClassFormul[Gbl.Prefs.Theme],
Txt_Password,
@ -1400,7 +1403,9 @@ void Usr_WriteFormLogin (void)
/***** Send button and form end *****/
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"2\" style=\"text-align:center;\">"
"<input type=\"submit\" value=\"%s\" />"
"<button type=\"submit\" class=\"BT_SUBMIT BT_CONFIRM\">"
"%s"
"</button>"
"</td>"
"</tr>",
Txt_Log_in);
@ -4318,7 +4323,7 @@ static void Usr_PutButtonToConfirmIWantToSeeBigList (unsigned NumUsrs)
Par_PutHiddenParamChar ("ShowBigList",'Y');
/***** Send button *****/
Lay_PutSendButton (Txt_Show_anyway);
Lay_PutConfirmButton (Txt_Show_anyway);
Act_FormEnd ();
fprintf (Gbl.F.Out,"</div>");
}
@ -6382,7 +6387,7 @@ void Usr_SeeGuests (void)
Lay_EndRoundFrameTable10 ();
/* Send button */
Lay_PutSendButton (Txt_Show_records);
Lay_PutConfirmButton (Txt_Show_records);
Act_FormEnd ();
fprintf (Gbl.F.Out,"</div>");
}
@ -6548,7 +6553,7 @@ void Usr_SeeStudents (void)
/* Send button */
if (ICanViewRecords)
{
Lay_PutSendButton (Txt_Show_records);
Lay_PutConfirmButton (Txt_Show_records);
Act_FormEnd ();
}
@ -6687,7 +6692,7 @@ void Usr_SeeTeachers (void)
if (ICanViewRecords)
{
/* Send button */
Lay_PutSendButton (Txt_Show_records);
Lay_PutConfirmButton (Txt_Show_records);
Act_FormEnd ();
}