Version 14.112

This commit is contained in:
Antonio Cañas Vargas 2015-04-11 23:46:21 +02:00
parent 0d0b59b0e6
commit e121ce316c
54 changed files with 447 additions and 624 deletions

View File

@ -168,15 +168,7 @@ static void Acc_ShowFormRequestNewAccountWithParams (const char *NewNicknameWith
Pwd_PutFormToGetNewPasswordTwice (); Pwd_PutFormToGetNewPasswordTwice ();
/***** Send button and form end *****/ /***** Send button and form end *****/
fprintf (Gbl.F.Out,"<tr>" Lay_EndRoundFrameTable10 (Lay_CREATE_BUTTON,Txt_Create_account);
"<td colspan=\"2\" style=\"text-align:center;\">"
"<button type=\"submit\" class=\"BT_SUBMIT BT_CREATE\">"
"%s"
"</button>"
"</td>"
"</tr>",
Txt_Create_account);
Lay_EndRoundFrameTable10 ();
Act_FormEnd (); Act_FormEnd ();
fprintf (Gbl.F.Out,"</div>"); fprintf (Gbl.F.Out,"</div>");
} }
@ -231,7 +223,7 @@ void Acc_ShowFormChangeMyAccount (void)
ID_ShowFormChangeUsrID (&Gbl.Usrs.Me.UsrDat,true); ID_ShowFormChangeUsrID (&Gbl.Usrs.Me.UsrDat,true);
/***** End of table *****/ /***** End of table *****/
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }

View File

@ -4738,7 +4738,7 @@ void Act_WriteBigMFUActions (struct Act_ListMFUActions *ListMFUActions)
} }
/***** Table end *****/ /***** Table end *****/
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
/*****************************************************************************/ /*****************************************************************************/

View File

@ -358,15 +358,8 @@ void Ann_ShowFormAnnouncement (void)
fprintf (Gbl.F.Out,"</td>" fprintf (Gbl.F.Out,"</td>"
"</tr>"); "</tr>");
/***** Button to create announcement *****/ /***** Button to create announcement and end frame *****/
fprintf (Gbl.F.Out,"<tr>" Lay_EndRoundFrameTable10 (Lay_CREATE_BUTTON,Txt_Create_announcement);
"<td colspan=\"2\" style=\"text-align:center;\">");
Lay_PutCreateButton (Txt_Create_announcement);
fprintf (Gbl.F.Out,"</td>"
"</tr>");
/***** End frame *****/
Lay_EndRoundFrameTable10 ();
/***** End form *****/ /***** End form *****/
Act_FormEnd (); Act_FormEnd ();

View File

@ -198,7 +198,7 @@ static void Asg_ShowAllAssignments (void)
Asg_ShowOneAssignment (Gbl.Asgs.LstAsgCods[NumAsg-1]); Asg_ShowOneAssignment (Gbl.Asgs.LstAsgCods[NumAsg-1]);
/***** Table end *****/ /***** Table end *****/
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
/***** Write again links to pages *****/ /***** Write again links to pages *****/
if (Pagination.MoreThanOnePage) if (Pagination.MoreThanOnePage)
@ -1210,21 +1210,11 @@ void Asg_RequestCreatOrEditAsg (void)
Asg_ShowLstGrpsToEditAssignment (Asg.AsgCod); Asg_ShowLstGrpsToEditAssignment (Asg.AsgCod);
/***** New assignment *****/ /***** New assignment *****/
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"2\">");
if (ItsANewAssignment) if (ItsANewAssignment)
Lay_PutCreateButton (Txt_Create_assignment); Lay_EndRoundFrameTable10 (Lay_CREATE_BUTTON,Txt_Create_assignment);
else else
Lay_PutConfirmButton (Txt_Save); Lay_EndRoundFrameTable10 (Lay_CONFIRM_BUTTON,Txt_Save);
fprintf (Gbl.F.Out,"</td>"
"</tr>");
/***** Table end *****/
Lay_EndRoundFrameTable10 ();
/***** End form *****/
Act_FormEnd (); Act_FormEnd ();
fprintf (Gbl.F.Out,"<br />");
/***** Show current assignments *****/ /***** Show current assignments *****/
Asg_ShowAllAssignments (); Asg_ShowAllAssignments ();
@ -1274,7 +1264,7 @@ static void Asg_ShowLstGrpsToEditAssignment (long AsgCod)
Grp_ListGrpsToEditAsgAttOrSvy (&Gbl.CurrentCrs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp],AsgCod,Grp_ASSIGNMENT); Grp_ListGrpsToEditAsgAttOrSvy (&Gbl.CurrentCrs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp],AsgCod,Grp_ASSIGNMENT);
/***** End table *****/ /***** End table *****/
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
fprintf (Gbl.F.Out,"</td>" fprintf (Gbl.F.Out,"</td>"
"</tr>"); "</tr>");
} }

View File

@ -46,7 +46,6 @@
/*****************************************************************************/ /*****************************************************************************/
extern struct Globals Gbl; extern struct Globals Gbl;
extern struct Act_Actions Act_Actions[Act_NUM_ACTIONS];
/*****************************************************************************/ /*****************************************************************************/
/****************************** Private constants ****************************/ /****************************** Private constants ****************************/
@ -229,7 +228,7 @@ static void Att_ShowAllAttEvents (void)
Att_ShowOneAttEvent (&Gbl.AttEvents.Lst[NumAttEvent-1],false); Att_ShowOneAttEvent (&Gbl.AttEvents.Lst[NumAttEvent-1],false);
/***** Table end *****/ /***** Table end *****/
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
/***** Write again links to pages *****/ /***** Write again links to pages *****/
if (Pagination.MoreThanOnePage) if (Pagination.MoreThanOnePage)
@ -1184,18 +1183,11 @@ void Att_RequestCreatOrEditAttEvent (void)
/***** Groups *****/ /***** Groups *****/
Att_ShowLstGrpsToEditAttEvent (Att.AttCod); Att_ShowLstGrpsToEditAttEvent (Att.AttCod);
/***** New attendance event *****/ /***** Button and end frame *****/
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"2\">");
if (ItsANewAttEvent) if (ItsANewAttEvent)
Lay_PutCreateButton (Txt_Create_event); Lay_EndRoundFrameTable10 (Lay_CREATE_BUTTON,Txt_Create_event);
else else
Lay_PutConfirmButton (Txt_Save); Lay_EndRoundFrameTable10 (Lay_CONFIRM_BUTTON,Txt_Save);
fprintf (Gbl.F.Out,"</td>"
"</tr>");
/***** Table end *****/
Lay_EndRoundFrameTable10 ();
/***** End form *****/ /***** End form *****/
Act_FormEnd (); Act_FormEnd ();
@ -1248,7 +1240,7 @@ static void Att_ShowLstGrpsToEditAttEvent (long AttCod)
Grp_ListGrpsToEditAsgAttOrSvy (&Gbl.CurrentCrs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp],AttCod,Grp_ATT_EVENT); Grp_ListGrpsToEditAsgAttOrSvy (&Gbl.CurrentCrs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp],AttCod,Grp_ATT_EVENT);
/***** End table *****/ /***** End table *****/
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
fprintf (Gbl.F.Out,"</td>" fprintf (Gbl.F.Out,"</td>"
"</tr>"); "</tr>");
} }
@ -1858,7 +1850,7 @@ void Att_SeeOneAttEvent (void)
Lay_StartRoundFrameTable10 (NULL,2,Txt_Event); Lay_StartRoundFrameTable10 (NULL,2,Txt_Event);
Att.AttCod = Gbl.AttEvents.AttCod; Att.AttCod = Gbl.AttEvents.AttCod;
Att_ShowOneAttEvent (&Att,true); Att_ShowOneAttEvent (&Att,true);
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
switch (Gbl.Usrs.Me.LoggedRole) switch (Gbl.Usrs.Me.LoggedRole)
{ {
@ -1925,7 +1917,7 @@ static void Att_ListAttOnlyMeAsStudent (struct AttendanceEvent *Att)
Att_WriteRowStdToCallTheRoll (1,&Gbl.Usrs.Me.UsrDat,Att); Att_WriteRowStdToCallTheRoll (1,&Gbl.Usrs.Me.UsrDat,Att);
/* Footer */ /* Footer */
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
if (Att->Open) if (Att->Open)
{ {
@ -2006,15 +1998,8 @@ static void Att_ListAttStudents (struct AttendanceEvent *Att)
} }
} }
/* Send button */ /* Send button and end frame */
fprintf (Gbl.F.Out,"<tr>" Lay_EndRoundFrameTable10 (Lay_CONFIRM_BUTTON,Txt_Save);
"<td colspan=\"8\">");
Lay_PutConfirmButton (Txt_Save);
fprintf (Gbl.F.Out,"</td>"
"<tr>");
/* End frame */
Lay_EndRoundFrameTable10 ();
/***** End form *****/ /***** End form *****/
Act_FormEnd (); Act_FormEnd ();
@ -2654,15 +2639,8 @@ void Usr_ReqListAttendanceStdsCrs (void)
/* Write list of students to select some of them */ /* Write list of students to select some of them */
Usr_ListUsersToSelect (Rol_STUDENT); Usr_ListUsersToSelect (Rol_STUDENT);
/* Send button */ /* Send button and end frame */
fprintf (Gbl.F.Out,"<tr>" Lay_EndRoundFrameTable10 (Lay_CONFIRM_BUTTON,Txt_Show_list);
"<td colspan=\"10\">");
Lay_PutConfirmButton (Txt_Show_list);
fprintf (Gbl.F.Out,"</td>"
"</tr>");
/* End frame */
Lay_EndRoundFrameTable10 ();
/* End form */ /* End form */
Act_FormEnd (); Act_FormEnd ();
@ -3051,7 +3029,7 @@ static void Att_ListEventsToSelect (void)
} }
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
/***** End form *****/ /***** End form *****/
if (Gbl.CurrentAct == ActSeeLstAttStd) if (Gbl.CurrentAct == ActSeeLstAttStd)
@ -3139,7 +3117,7 @@ static void Att_ListStdsAttendanceTable (unsigned NumStdsInList,long *LstSelecte
} }
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
/***** Free memory used for user's data *****/ /***** Free memory used for user's data *****/
Usr_UsrDataDestructor (&UsrDat); Usr_UsrDataDestructor (&UsrDat);
@ -3317,7 +3295,7 @@ static void Att_ListStdsWithAttEventsDetails (unsigned NumStdsInList,long *LstSe
} }
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
/***** Free memory used for user's data *****/ /***** Free memory used for user's data *****/
Usr_UsrDataDestructor (&UsrDat); Usr_UsrDataDestructor (&UsrDat);

View File

@ -112,7 +112,7 @@ void Ban_SeeBanners (void)
Gbl.Banners.Lst[NumBan].ShortName); Gbl.Banners.Lst[NumBan].ShortName);
/***** Table end *****/ /***** Table end *****/
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
/***** Free list of banners *****/ /***** Free list of banners *****/
Ban_FreeListBanners (); Ban_FreeListBanners ();
@ -399,7 +399,7 @@ static void Ban_ListBannersForEdition (void)
"</tr>"); "</tr>");
} }
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
/*****************************************************************************/ /*****************************************************************************/
@ -774,15 +774,8 @@ static void Ban_PutFormToCreateBanner (void)
"</tr>", "</tr>",
Cns_MAX_LENGTH_WWW,Ban->WWW); Cns_MAX_LENGTH_WWW,Ban->WWW);
/***** Send button *****/ /***** Send button and end frame *****/
fprintf (Gbl.F.Out,"<tr>" Lay_EndRoundFrameTable10 (Lay_CREATE_BUTTON,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 ();
/***** End of form *****/ /***** End of form *****/
Act_FormEnd (); Act_FormEnd ();

View File

@ -172,7 +172,7 @@ void Cal_DrawCalendar (void)
Exa_FreeListExamAnnouncements (); Exa_FreeListExamAnnouncements ();
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
/*****************************************************************************/ /*****************************************************************************/

View File

@ -203,7 +203,7 @@ void Ctr_SeeCtrWithPendingDegs (void)
Gbl.RowEvenOdd = 1 - Gbl.RowEvenOdd; Gbl.RowEvenOdd = 1 - Gbl.RowEvenOdd;
} }
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
else else
Lay_ShowAlert (Lay_INFO,Txt_There_are_no_centres_with_requests_for_degrees_to_be_confirmed); Lay_ShowAlert (Lay_INFO,Txt_There_are_no_centres_with_requests_for_degrees_to_be_confirmed);
@ -513,7 +513,7 @@ static void Ctr_Configuration (bool PrintView)
} }
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
} }
@ -582,7 +582,7 @@ static void Ctr_ListCentresForSeeing (void)
Ctr_ListOneCentreForSeeing (&(Gbl.Ctrs.Lst[NumCtr]),NumCtr + 1); Ctr_ListOneCentreForSeeing (&(Gbl.Ctrs.Lst[NumCtr]),NumCtr + 1);
/***** Table end *****/ /***** Table end *****/
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
/*****************************************************************************/ /*****************************************************************************/
@ -1370,7 +1370,7 @@ static void Ctr_ListCentresForEdition (void)
} }
/***** End table *****/ /***** End table *****/
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
/***** Free memory used for user's data *****/ /***** Free memory used for user's data *****/
Usr_UsrDataDestructor (&UsrDat); Usr_UsrDataDestructor (&UsrDat);
@ -2087,7 +2087,7 @@ static void Ctr_PutFormToCreateCentre (void)
"</tr>"); "</tr>");
/***** End of frame *****/ /***** End of frame *****/
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
/***** End of form *****/ /***** End of form *****/
Act_FormEnd (); Act_FormEnd ();
@ -2488,7 +2488,7 @@ unsigned Ctr_ListCtrsFound (const char *Query)
} }
/***** Table end *****/ /***** Table end *****/
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
/***** Free structure that stores the query result *****/ /***** Free structure that stores the query result *****/

View File

@ -103,11 +103,13 @@
/****************************** Public constants *****************************/ /****************************** Public constants *****************************/
/*****************************************************************************/ /*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 14.111 (2015/04/11)" #define Log_PLATFORM_VERSION "SWAD 14.112 (2015/04/11)"
// Number of lines (includes comments but not blank lines) has been got with the following command: // 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 // nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*.h sql/swad*.sql | tail -1
/* /*
Version 14.112: Apr 11, 2015 Optimization in frames with ending buttons. (184568 lines)
Version 14.111.1: Apr 11, 2015 Message translated. (184745 lines)
Version 14.111: Apr 11, 2015 Changes in layout of surveys. Version 14.111: Apr 11, 2015 Changes in layout of surveys.
Fixed bugs in surveys. Fixed bugs in surveys.
Changes in layout of edition of test questions. Changes in layout of edition of test questions.

View File

@ -225,7 +225,7 @@ void Cht_ShowListOfAvailableChatRooms (void)
"</div>" "</div>"
"</td>" "</td>"
"</tr>"); "</tr>");
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
/*****************************************************************************/ /*****************************************************************************/
@ -284,7 +284,7 @@ void Cht_ShowListOfChatRoomsWithUsrs (void)
} }
/***** End table *****/ /***** End table *****/
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
/***** Free structure that stores the query result *****/ /***** Free structure that stores the query result *****/

View File

@ -123,7 +123,7 @@ void Con_ShowConnectedUsrs (void)
"</tr>"); "</tr>");
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
/*****************************************************************************/ /*****************************************************************************/
@ -144,7 +144,7 @@ void Con_ShowLastClicks (void)
fprintf (Gbl.F.Out,"</td>" fprintf (Gbl.F.Out,"</td>"
"</tr>"); "</tr>");
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
/*****************************************************************************/ /*****************************************************************************/

View File

@ -183,7 +183,7 @@ void Cty_SeeCtyWithPendingInss (void)
Gbl.RowEvenOdd = 1 - Gbl.RowEvenOdd; Gbl.RowEvenOdd = 1 - Gbl.RowEvenOdd;
} }
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
else else
Lay_ShowAlert (Lay_INFO,Txt_There_are_no_countries_with_requests_for_institutions_to_be_confirmed); Lay_ShowAlert (Lay_INFO,Txt_There_are_no_countries_with_requests_for_institutions_to_be_confirmed);
@ -458,7 +458,7 @@ static void Cty_Configuration (bool PrintView)
} }
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
} }
@ -690,7 +690,7 @@ void Cty_ListCountries2 (void)
Ins_GetNumInssTotal () - NumInssWithCountry); Ins_GetNumInssTotal () - NumInssWithCountry);
/***** Table end *****/ /***** Table end *****/
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
/***** Div for Google Geochart *****/ /***** Div for Google Geochart *****/
if (Gbl.CurrentAct == ActSeeCty) if (Gbl.CurrentAct == ActSeeCty)
@ -1388,7 +1388,7 @@ static void Cty_ListCountriesForEdition (void)
} }
} }
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
/*****************************************************************************/ /*****************************************************************************/
@ -1741,15 +1741,8 @@ static void Cty_PutFormToCreateCountry (void)
Txt_STR_LANG_ID[Lan],Cty_MAX_LENGTH_COUNTRY_WWW,Cty->WWW[Lan]); Txt_STR_LANG_ID[Lan],Cty_MAX_LENGTH_COUNTRY_WWW,Cty->WWW[Lan]);
} }
/***** Send button *****/ /***** Send button and end of frame *****/
fprintf (Gbl.F.Out,"<tr>" Lay_EndRoundFrameTable10 (Lay_CREATE_BUTTON,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 ();
/***** End of form *****/ /***** End of form *****/
Act_FormEnd (); Act_FormEnd ();

View File

@ -435,19 +435,13 @@ static void Crs_Configuration (bool PrintView)
Gbl.Prefs.IconsURL, Gbl.Prefs.IconsURL,
(Indicators.CountIndicators == Ind_NUM_INDICATORS) ? "ok_green" : (Indicators.CountIndicators == Ind_NUM_INDICATORS) ? "ok_green" :
"warning"); "warning");
if (IsForm)
{
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"2\">");
Lay_PutConfirmButton (Txt_Save);
fprintf (Gbl.F.Out,"</td>"
"</tr>");
}
} }
/***** End of the frame *****/ /***** Send button and end frame *****/
Lay_EndRoundFrameTable10 (); if (IsForm)
Lay_EndRoundFrameTable10 (Lay_CONFIRM_BUTTON,Txt_Save);
else
Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
/***** End form *****/ /***** End form *****/
if (IsForm) if (IsForm)
@ -851,7 +845,7 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
"</div>" "</div>"
"</td>" "</td>"
"</tr>"); "</tr>");
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
/*****************************************************************************/ /*****************************************************************************/
@ -1328,7 +1322,7 @@ static void Crs_ListCoursesForSeeing (void)
} }
/***** Table end *****/ /***** Table end *****/
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
/*****************************************************************************/ /*****************************************************************************/
@ -1588,7 +1582,7 @@ static void Crs_ListCoursesForEdition (void)
} }
/***** End table *****/ /***** End table *****/
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
/***** Free memory used for user's data *****/ /***** Free memory used for user's data *****/
Usr_UsrDataDestructor (&UsrDat); Usr_UsrDataDestructor (&UsrDat);
@ -1780,17 +1774,10 @@ static void Crs_PutFormToCreateCourse (void)
"</td>" "</td>"
"</tr>"); "</tr>");
/***** Send button *****/ /***** Send button and end frame *****/
fprintf (Gbl.F.Out,"<tr>" Lay_EndRoundFrameTable10 (Lay_CREATE_BUTTON,Txt_Create_course);
"<td colspan=\"12\" style=\"text-align:center;\">");
Lay_PutCreateButton (Txt_Create_course);
fprintf (Gbl.F.Out,"</td>"
"</tr>");
/***** End of frame *****/ /***** End form *****/
Lay_EndRoundFrameTable10 ();
/***** End of form *****/
Act_FormEnd (); Act_FormEnd ();
} }
@ -3229,7 +3216,7 @@ unsigned Crs_ListCrssFound (const char *Query)
} }
/***** Table end *****/ /***** Table end *****/
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
/***** Free structure that stores the query result *****/ /***** Free structure that stores the query result *****/

View File

@ -1059,7 +1059,7 @@ mysql> DESCRIBE files;
"Cod INT NOT NULL DEFAULT -1," "Cod INT NOT NULL DEFAULT -1,"
"ZoneUsrCod INT NOT NULL DEFAULT -1," "ZoneUsrCod INT NOT NULL DEFAULT -1,"
"PublisherUsrCod INT NOT NULL," "PublisherUsrCod INT NOT NULL,"
"FileType TINYINT NOT NULL DEFAULT 0" "FileType TINYINT NOT NULL DEFAULT 0,"
"Path TEXT COLLATE latin1_bin NOT NULL," "Path TEXT COLLATE latin1_bin NOT NULL,"
"Hidden ENUM('N','Y') NOT NULL DEFAULT 'N'," "Hidden ENUM('N','Y') NOT NULL DEFAULT 'N',"
"Public ENUM('N','Y') NOT NULL DEFAULT 'N'," "Public ENUM('N','Y') NOT NULL DEFAULT 'N',"

View File

@ -254,7 +254,7 @@ void Deg_SeeDegWithPendingCrss (void)
Gbl.RowEvenOdd = 1 - Gbl.RowEvenOdd; Gbl.RowEvenOdd = 1 - Gbl.RowEvenOdd;
} }
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
else else
Lay_ShowAlert (Lay_INFO,Txt_There_are_no_degrees_with_requests_for_courses_to_be_confirmed); Lay_ShowAlert (Lay_INFO,Txt_There_are_no_degrees_with_requests_for_courses_to_be_confirmed);
@ -482,7 +482,7 @@ static void Deg_Configuration (bool PrintView)
} }
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
} }
@ -1135,7 +1135,7 @@ static void Deg_ListDegreeTypesForSeeing (void)
Gbl.RowEvenOdd = 1 - Gbl.RowEvenOdd; Gbl.RowEvenOdd = 1 - Gbl.RowEvenOdd;
} }
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
/*****************************************************************************/ /*****************************************************************************/
@ -1219,7 +1219,7 @@ static void Deg_ListDegreeTypesForEdition (void)
Gbl.Degs.DegTypes.Lst[NumDegTyp].NumDegs); Gbl.Degs.DegTypes.Lst[NumDegTyp].NumDegs);
} }
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
/*****************************************************************************/ /*****************************************************************************/
@ -1244,7 +1244,7 @@ static void Deg_ListDegreesForSeeing (void)
Deg_ListOneDegreeForSeeing (&(Gbl.CurrentCtr.LstDegs[NumDeg]),NumDeg + 1); Deg_ListOneDegreeForSeeing (&(Gbl.CurrentCtr.LstDegs[NumDeg]),NumDeg + 1);
/***** Table end *****/ /***** Table end *****/
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
/*****************************************************************************/ /*****************************************************************************/
@ -1683,7 +1683,7 @@ static void Deg_ListDegreesForEdition (void)
} }
/***** End table *****/ /***** End table *****/
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
/***** Free memory used for user's data *****/ /***** Free memory used for user's data *****/
Usr_UsrDataDestructor (&UsrDat); Usr_UsrDataDestructor (&UsrDat);
@ -1788,17 +1788,10 @@ static void Deg_PutFormToCreateDegType (void)
""); "");
/***** Send button *****/ /***** Send button and end frame *****/
fprintf (Gbl.F.Out,"<tr>" Lay_EndRoundFrameTable10 (Lay_CREATE_BUTTON,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 *****/ /***** End form *****/
Lay_EndRoundFrameTable10 ();
/***** End of form *****/
Act_FormEnd (); Act_FormEnd ();
} }
@ -1956,17 +1949,10 @@ static void Deg_PutFormToCreateDegree (void)
"</td>" "</td>"
"</tr>"); "</tr>");
/***** Send button *****/ /***** Send button and end frame *****/
fprintf (Gbl.F.Out,"<tr>" Lay_EndRoundFrameTable10 (Lay_CREATE_BUTTON,Txt_Create_degree);
"<td colspan=\"14\" style=\"text-align:center;\">");
Lay_PutCreateButton (Txt_Create_degree);
fprintf (Gbl.F.Out,"</td>"
"</tr>");
/***** End of frame *****/ /***** End form *****/
Lay_EndRoundFrameTable10 ();
/***** End of form *****/
Act_FormEnd (); Act_FormEnd ();
} }
@ -4083,7 +4069,7 @@ unsigned Deg_ListDegsFound (const char *Query)
} }
/***** Table end *****/ /***** Table end *****/
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
/***** Free structure that stores the query result *****/ /***** Free structure that stores the query result *****/

View File

@ -182,7 +182,7 @@ void Dpt_SeeDepts (void)
Rol_TEACHER) - NumTchsInsWithDpt); Rol_TEACHER) - NumTchsInsWithDpt);
/***** Table end *****/ /***** Table end *****/
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
/***** Free list of departments *****/ /***** Free list of departments *****/
Dpt_FreeListDepartments (); Dpt_FreeListDepartments ();
@ -595,7 +595,7 @@ static void Dpt_ListDepartmentsForEdition (void)
Dpt->NumTchs); Dpt->NumTchs);
} }
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
/*****************************************************************************/ /*****************************************************************************/
@ -941,15 +941,8 @@ static void Dpt_PutFormToCreateDepartment (void)
"</tr>", "</tr>",
Cns_MAX_LENGTH_WWW,Dpt->WWW); Cns_MAX_LENGTH_WWW,Dpt->WWW);
/***** Send button *****/ /***** Send button and end of frame *****/
fprintf (Gbl.F.Out,"<tr>" Lay_EndRoundFrameTable10 (Lay_CREATE_BUTTON,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 ();
/***** End of form *****/ /***** End of form *****/
Act_FormEnd (); Act_FormEnd ();

View File

@ -525,14 +525,14 @@ static void Enr_ShowFormRegRemSeveralUsrs (void)
fprintf (Gbl.F.Out,"</div>"); fprintf (Gbl.F.Out,"</div>");
/***** Form to send students to be enrolled / removed *****/
Act_FormStart (ActRcvFrmMdfUsrCrs);
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrameTable10 (NULL,2,Txt_Admin_several_users); Lay_StartRoundFrameTable10 (NULL,2,Txt_Admin_several_users);
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<td>"); "<td>");
/***** Form to send students to be enrolled / removed *****/
Act_FormStart (ActRcvFrmMdfUsrCrs);
/***** Step 1: List of students to be enrolled / removed *****/ /***** Step 1: List of students to be enrolled / removed *****/
fprintf (Gbl.F.Out,"<div class=\"%s\" style=\"text-align:left;\">" fprintf (Gbl.F.Out,"<div class=\"%s\" style=\"text-align:left;\">"
"%s" "%s"
@ -601,22 +601,21 @@ static void Enr_ShowFormRegRemSeveralUsrs (void)
} }
} }
/***** Step 5: Button to register / remove students *****/ /***** Step 5: Confirm register / remove students *****/
fprintf (Gbl.F.Out,"<div class=\"%s\" style=\"text-align:left;\">" fprintf (Gbl.F.Out,"<div class=\"%s\" style=\"text-align:left;\">"
"%s" "%s"
"</div>", "</div>",
The_ClassTitle[Gbl.Prefs.Theme], The_ClassTitle[Gbl.Prefs.Theme],
Txt_Step_5_Confirm_the_enrollment_removing); Txt_Step_5_Confirm_the_enrollment_removing);
Pwd_AskForConfirmationOnDangerousAction (); Pwd_AskForConfirmationOnDangerousAction ();
Lay_PutConfirmButton (Txt_Confirm);
/***** Send button and end frame *****/
fprintf (Gbl.F.Out,"</td>"
"</tr>");
Lay_EndRoundFrameTable10 (Lay_CONFIRM_BUTTON,Txt_Confirm);
/***** End of form *****/ /***** End of form *****/
Act_FormEnd (); Act_FormEnd ();
/***** End frame *****/
fprintf (Gbl.F.Out,"</td>"
"</tr>");
Lay_EndRoundFrameTable10 ();
} }
/*****************************************************************************/ /*****************************************************************************/
@ -2519,8 +2518,8 @@ void Enr_ShowEnrollmentRequests (void)
Enr_RemoveEnrollmentRequest (Crs.CrsCod,UsrDat.UsrCod); Enr_RemoveEnrollmentRequest (Crs.CrsCod,UsrDat.UsrCod);
} }
/* End of table */ /* End frame */
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
/* Free memory used for user's data */ /* Free memory used for user's data */
Usr_UsrDataDestructor (&UsrDat); Usr_UsrDataDestructor (&UsrDat);
@ -2672,7 +2671,7 @@ static void Enr_ReqAnotherUsrIDToRegisterRemove (void)
/***** End frame *****/ /***** End frame *****/
fprintf (Gbl.F.Out,"</td>" fprintf (Gbl.F.Out,"</td>"
"</tr>"); "</tr>");
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
/*****************************************************************************/ /*****************************************************************************/

View File

@ -1216,28 +1216,19 @@ static void Exa_ShowExamAnnouncement (long ExaCod,Exa_tTypeViewExamAnnouncement_
"</tr>" \ "</tr>" \
"</table>"); "</table>");
switch (TypeViewExamAnnouncement) if (TypeViewExamAnnouncement == Exa_PRINT_VIEW)
{ /* Bottom space used for signatures */
case Exa_NORMAL_VIEW: fprintf (Gbl.F.Out,"<div style=\"height:100px;\"></div>");
break;
case Exa_PRINT_VIEW:
/* Bottom space used for signatures */
fprintf (Gbl.F.Out,"<div style=\"height:100px;\"></div>");
break;
case Exa_FORM_VIEW:
/* Send button */
if (ExaCod > 0)
Lay_PutConfirmButton (Txt_Publish_announcement_OF_EXAM);
else
Lay_PutCreateButton (Txt_Publish_announcement_OF_EXAM);
Act_FormEnd ();
break;
}
/***** End frame *****/ /***** End frame *****/
fprintf (Gbl.F.Out,"</td>" \ fprintf (Gbl.F.Out,"</td>" \
"</tr>"); "</tr>");
Lay_EndRoundFrameTable10 (); if (TypeViewExamAnnouncement == Exa_FORM_VIEW)
Lay_EndRoundFrameTable10 ((ExaCod > 0) ? Lay_CONFIRM_BUTTON :
Lay_CREATE_BUTTON,
Txt_Publish_announcement_OF_EXAM);
else
Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
if (TypeViewExamAnnouncement == Exa_PRINT_VIEW) if (TypeViewExamAnnouncement == Exa_PRINT_VIEW)
QR_ExamAnnnouncement (); QR_ExamAnnnouncement ();

View File

@ -2870,16 +2870,7 @@ void Brw_AskEditWorksCrs (void)
Lay_StartRoundFrameTable10 (NULL,0,Txt_Users); Lay_StartRoundFrameTable10 (NULL,0,Txt_Users);
Usr_ListUsersToSelect (Rol_TEACHER); Usr_ListUsersToSelect (Rol_TEACHER);
Usr_ListUsersToSelect (Rol_STUDENT); Usr_ListUsersToSelect (Rol_STUDENT);
Lay_EndRoundFrameTable10 (Lay_CONFIRM_BUTTON,Txt_View_works);
/* Button to send the form */
fprintf (Gbl.F.Out,"<tr>"
"<td>");
Lay_PutConfirmButton (Txt_View_works);
fprintf (Gbl.F.Out,"</td>"
"</tr>");
/* Frame end */
Lay_EndRoundFrameTable10 ();
/* End form */ /* End form */
Act_FormEnd (); Act_FormEnd ();
@ -2993,7 +2984,7 @@ static void Brw_ShowFileBrowsersAsgWrkCrs (void)
} }
/***** End of the table *****/ /***** End of the table *****/
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
else // If no users are selected... else // If no users are selected...
{ {
@ -3326,11 +3317,7 @@ static void Brw_ShowFileBrowser (void)
Brw_ListDir (1,Gbl.FileBrowser.Priv.PathRootFolder,Brw_RootFolderInternalNames[Gbl.FileBrowser.Type]); Brw_ListDir (1,Gbl.FileBrowser.Priv.PathRootFolder,Brw_RootFolderInternalNames[Gbl.FileBrowser.Type]);
/***** End of table *****/ /***** End of table *****/
if (Gbl.FileBrowser.Type == Brw_ADMI_ASSIG_CRS || Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
Gbl.FileBrowser.Type == Brw_ADMI_WORKS_CRS)
Lay_EndRoundFrameTable10 ();
else
Lay_EndRoundFrameTable10 ();
} }
/*****************************************************************************/ /*****************************************************************************/
@ -7628,14 +7615,7 @@ static void Brw_PutFormToCreateAFolder (const char *FileNameToShow)
extern const char *Txt_You_can_create_a_new_folder_inside_the_folder_X; extern const char *Txt_You_can_create_a_new_folder_inside_the_folder_X;
extern const char *Txt_Folder; extern const char *Txt_Folder;
/***** Start frame *****/ /***** Start form *****/
Lay_StartRoundFrameTable10 (NULL,0,Txt_Create_folder);
fprintf (Gbl.F.Out,"<tr>"
"<td style=\"text-align:center;\">");
sprintf (Gbl.Message,Txt_You_can_create_a_new_folder_inside_the_folder_X,
FileNameToShow);
Lay_ShowAlert (Lay_INFO,Gbl.Message);
Act_FormStart (Brw_ActCreateFolder[Gbl.FileBrowser.Type]); Act_FormStart (Brw_ActCreateFolder[Gbl.FileBrowser.Type]);
switch (Gbl.FileBrowser.Type) switch (Gbl.FileBrowser.Type)
{ {
@ -7654,20 +7634,27 @@ static void Brw_PutFormToCreateAFolder (const char *FileNameToShow)
} }
Brw_ParamListFiles (Brw_IS_FOLDER,Gbl.FileBrowser.Priv.PathInTreeExceptFileOrFolder,Gbl.FileBrowser.FilFolLnkName); Brw_ParamListFiles (Brw_IS_FOLDER,Gbl.FileBrowser.Priv.PathInTreeExceptFileOrFolder,Gbl.FileBrowser.FilFolLnkName);
/* Folder */ /***** Start frame *****/
Lay_StartRoundFrameTable10 (NULL,0,Txt_Create_folder);
fprintf (Gbl.F.Out,"<tr>"
"<td style=\"text-align:center;\">");
sprintf (Gbl.Message,Txt_You_can_create_a_new_folder_inside_the_folder_X,
FileNameToShow);
Lay_ShowAlert (Lay_INFO,Gbl.Message);
/***** Folder *****/
fprintf (Gbl.F.Out,"<label class=\"%s\">%s:</label>" fprintf (Gbl.F.Out,"<label class=\"%s\">%s:</label>"
"<input type=\"text\" name=\"NewFolderName\"" "<input type=\"text\" name=\"NewFolderName\""
" size=\"32\" maxlength=\"40\" value=\"\" />", " size=\"32\" maxlength=\"40\" value=\"\" />"
"</td>"
"</tr>",
The_ClassFormul[Gbl.Prefs.Theme],Txt_Folder); The_ClassFormul[Gbl.Prefs.Theme],Txt_Folder);
/* Button to send */ /* Button to send and end frame *****/
Lay_PutCreateButton (Txt_Create_folder); Lay_EndRoundFrameTable10 (Lay_CREATE_BUTTON,Txt_Create_folder);
Act_FormEnd ();
/***** End frame *****/ /***** End form *****/
fprintf (Gbl.F.Out,"</td>" Act_FormEnd ();
"</tr>");
Lay_EndRoundFrameTable10 ();
} }
/*****************************************************************************/ /*****************************************************************************/
@ -7685,6 +7672,7 @@ static void Brw_PutFormToUploadFilesUsingDropzone (const char *FileNameToShow)
/***** Start frame *****/ /***** Start frame *****/
fprintf (Gbl.F.Out,"<div id=\"dropzone-upload\">"); fprintf (Gbl.F.Out,"<div id=\"dropzone-upload\">");
Lay_StartRoundFrameTable10 ("100%",0,Txt_Upload_files); Lay_StartRoundFrameTable10 ("100%",0,Txt_Upload_files);
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<td style=\"text-align:center;\">"); "<td style=\"text-align:center;\">");
@ -7756,7 +7744,8 @@ static void Brw_PutFormToUploadFilesUsingDropzone (const char *FileNameToShow)
/***** End frame *****/ /***** End frame *****/
fprintf (Gbl.F.Out,"</td>" fprintf (Gbl.F.Out,"</td>"
"</tr>"); "</tr>");
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
fprintf (Gbl.F.Out,"</div>"); fprintf (Gbl.F.Out,"</div>");
} }
@ -7771,6 +7760,7 @@ static void Brw_PutFormToUploadOneFileClassic (const char *FileNameToShow)
/***** Start frame *****/ /***** Start frame *****/
fprintf (Gbl.F.Out,"<div id=\"classic-upload\" style='display:none;'>"); fprintf (Gbl.F.Out,"<div id=\"classic-upload\" style='display:none;'>");
Lay_StartRoundFrameTable10 (NULL,0,Txt_Upload_file); Lay_StartRoundFrameTable10 (NULL,0,Txt_Upload_file);
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<td style=\"text-align:center;\">"); "<td style=\"text-align:center;\">");
@ -7807,7 +7797,8 @@ static void Brw_PutFormToUploadOneFileClassic (const char *FileNameToShow)
/***** End frame *****/ /***** End frame *****/
fprintf (Gbl.F.Out,"</td>" fprintf (Gbl.F.Out,"</td>"
"</tr>"); "</tr>");
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
fprintf (Gbl.F.Out,"</div>"); fprintf (Gbl.F.Out,"</div>");
} }
@ -7821,14 +7812,7 @@ static void Brw_PutFormToPasteAFileOrFolder (const char *FileNameToShow)
extern const char *Txt_Paste; extern const char *Txt_Paste;
extern const char *Txt_or_you_can_make_a_file_copy_to_the_folder_X; extern const char *Txt_or_you_can_make_a_file_copy_to_the_folder_X;
/***** Start frame *****/ /***** Start form *****/
Lay_StartRoundFrameTable10 (NULL,0,Txt_Paste);
fprintf (Gbl.F.Out,"<tr>"
"<td style=\"text-align:center;\">");
sprintf (Gbl.Message,Txt_or_you_can_make_a_file_copy_to_the_folder_X,
FileNameToShow);
Lay_ShowAlert (Lay_INFO,Gbl.Message);
Act_FormStart (Brw_ActPaste[Gbl.FileBrowser.Type]); Act_FormStart (Brw_ActPaste[Gbl.FileBrowser.Type]);
switch (Gbl.FileBrowser.Type) switch (Gbl.FileBrowser.Type)
{ {
@ -7847,14 +7831,21 @@ static void Brw_PutFormToPasteAFileOrFolder (const char *FileNameToShow)
} }
Brw_ParamListFiles (Brw_IS_FOLDER,Gbl.FileBrowser.Priv.PathInTreeExceptFileOrFolder,Gbl.FileBrowser.FilFolLnkName); Brw_ParamListFiles (Brw_IS_FOLDER,Gbl.FileBrowser.Priv.PathInTreeExceptFileOrFolder,Gbl.FileBrowser.FilFolLnkName);
/* Button to send */ /***** Start frame *****/
Lay_PutCreateButton (Txt_Paste); Lay_StartRoundFrameTable10 (NULL,0,Txt_Paste);
Act_FormEnd (); fprintf (Gbl.F.Out,"<tr>"
"<td style=\"text-align:center;\">");
/***** End frame *****/ sprintf (Gbl.Message,Txt_or_you_can_make_a_file_copy_to_the_folder_X,
FileNameToShow);
Lay_ShowAlert (Lay_INFO,Gbl.Message);
fprintf (Gbl.F.Out,"</td>" fprintf (Gbl.F.Out,"</td>"
"</tr>"); "</tr>");
Lay_EndRoundFrameTable10 ();
/***** Send button and end frame *****/
Lay_EndRoundFrameTable10 (Lay_CREATE_BUTTON,Txt_Paste);
/***** End form *****/
Act_FormEnd ();
} }
/*****************************************************************************/ /*****************************************************************************/
@ -7870,14 +7861,7 @@ static void Brw_PutFormToCreateALink (const char *FileNameToShow)
extern const char *Txt_Save_as; extern const char *Txt_Save_as;
extern const char *Txt_optional; extern const char *Txt_optional;
/***** Start frame *****/ /***** Start form *****/
Lay_StartRoundFrameTable10 (NULL,0,Txt_Create_link);
fprintf (Gbl.F.Out,"<tr>"
"<td style=\"text-align:center;\">");
sprintf (Gbl.Message,Txt_or_you_can_create_a_new_link_inside_the_folder_X,
FileNameToShow);
Lay_ShowAlert (Lay_INFO,Gbl.Message);
Act_FormStart (Brw_ActCreateLink[Gbl.FileBrowser.Type]); Act_FormStart (Brw_ActCreateLink[Gbl.FileBrowser.Type]);
switch (Gbl.FileBrowser.Type) switch (Gbl.FileBrowser.Type)
{ {
@ -7896,6 +7880,14 @@ static void Brw_PutFormToCreateALink (const char *FileNameToShow)
} }
Brw_ParamListFiles (Brw_IS_FOLDER,Gbl.FileBrowser.Priv.PathInTreeExceptFileOrFolder,Gbl.FileBrowser.FilFolLnkName); Brw_ParamListFiles (Brw_IS_FOLDER,Gbl.FileBrowser.Priv.PathInTreeExceptFileOrFolder,Gbl.FileBrowser.FilFolLnkName);
/***** Start frame *****/
Lay_StartRoundFrameTable10 (NULL,0,Txt_Create_link);
fprintf (Gbl.F.Out,"<tr>"
"<td style=\"text-align:center;\">");
sprintf (Gbl.Message,Txt_or_you_can_create_a_new_link_inside_the_folder_X,
FileNameToShow);
Lay_ShowAlert (Lay_INFO,Gbl.Message);
/* URL */ /* URL */
fprintf (Gbl.F.Out,"<table>" fprintf (Gbl.F.Out,"<table>"
"<tr>" "<tr>"
@ -7920,17 +7912,16 @@ static void Brw_PutFormToCreateALink (const char *FileNameToShow)
" size=\"40\" maxlength=\"100\" value=\"\" />" " size=\"40\" maxlength=\"100\" value=\"\" />"
"</td>" "</td>"
"</tr>" "</tr>"
"</table>", "</table>"
"</td>"
"</tr>",
The_ClassFormul[Gbl.Prefs.Theme],Txt_Save_as,Txt_optional); The_ClassFormul[Gbl.Prefs.Theme],Txt_Save_as,Txt_optional);
/* Button to send */ /***** Send button and end frame *****/
Lay_PutCreateButton (Txt_Create_link); Lay_EndRoundFrameTable10 (Lay_CREATE_BUTTON,Txt_Create_link);
Act_FormEnd ();
/***** End frame *****/ /***** End form *****/
fprintf (Gbl.F.Out,"</td>" Act_FormEnd ();
"</tr>");
Lay_EndRoundFrameTable10 ();
} }
/*****************************************************************************/ /*****************************************************************************/
@ -8831,11 +8822,6 @@ void Brw_ShowFileMetadata (void)
Brw_LimitLengthFileNameToShow (FileMetadata.FileType, Brw_LimitLengthFileNameToShow (FileMetadata.FileType,
Gbl.FileBrowser.FilFolLnkName,FileNameToShow); Gbl.FileBrowser.FilFolLnkName,FileNameToShow);
/***** Start frame *****/
Lay_StartRoundFrameTable10Shadow (NULL,0);
fprintf (Gbl.F.Out,"<tr>"
"<td style=\"text-align:center;\">");
/***** Start form to update the metadata of a file *****/ /***** Start form to update the metadata of a file *****/
if (ICanEdit) // I can edit file properties if (ICanEdit) // I can edit file properties
{ {
@ -8886,8 +8872,8 @@ void Brw_ShowFileMetadata (void)
Gbl.FileBrowser.FilFolLnkName); Gbl.FileBrowser.FilFolLnkName);
} }
/***** Start table *****/ /***** Start frame *****/
fprintf (Gbl.F.Out,"<table class=\"CELLS_PAD_2\">"); Lay_StartRoundFrameTable10Shadow (NULL,2);
/***** Link to download the file *****/ /***** Link to download the file *****/
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
@ -9077,19 +9063,14 @@ void Brw_ShowFileMetadata (void)
The_ClassFormul[Gbl.Prefs.Theme],Txt_Public_views, The_ClassFormul[Gbl.Prefs.Theme],Txt_Public_views,
FileMetadata.NumPublicViews); FileMetadata.NumPublicViews);
/***** End form and table *****/ /***** End frame *****/
fprintf (Gbl.F.Out,"</table>");
if (ICanEdit) // I can edit file properties if (ICanEdit) // I can edit file properties
{ {
Lay_PutConfirmButton (Txt_Save_file_properties); Lay_EndRoundFrameTable10 (Lay_CONFIRM_BUTTON,Txt_Save_file_properties);
Act_FormEnd (); Act_FormEnd ();
} }
else
/***** End frame *****/ Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
fprintf (Gbl.F.Out,"</td>"
"</tr>");
Lay_EndRoundFrameTable10 ();
/***** Mark possible notifications as seen *****/ /***** Mark possible notifications as seen *****/
switch (Gbl.FileBrowser.Type) switch (Gbl.FileBrowser.Type)
@ -10931,7 +10912,7 @@ unsigned Brw_ListDocsFound (const char *Query,const char *Title)
"</tr>"); "</tr>");
/* Table end */ /* Table end */
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
/***** Free structure that stores the query result *****/ /***** Free structure that stores the query result *****/

View File

@ -947,7 +947,7 @@ static void For_ShowThreadPosts (long ThrCod,char *LastSubject)
"</div>" "</div>"
"</td>" "</td>"
"</tr>"); "</tr>");
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
LastSubject[0] = '\0'; LastSubject[0] = '\0';
if (NumPsts) // If there are posts... if (NumPsts) // If there are posts...
@ -1034,7 +1034,7 @@ static void For_ShowThreadPosts (long ThrCod,char *LastSubject)
fprintf (Gbl.F.Out,"</table>" fprintf (Gbl.F.Out,"</table>"
"</td>" "</td>"
"</tr>"); "</tr>");
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
/***** Write again links to pages *****/ /***** Write again links to pages *****/
if (Pagination.MoreThanOnePage) if (Pagination.MoreThanOnePage)
@ -1745,7 +1745,7 @@ void For_ShowForumList (void)
"</div>" "</div>"
"</td>" "</td>"
"</tr>"); "</tr>");
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
/*****************************************************************************/ /*****************************************************************************/
@ -2491,7 +2491,7 @@ void For_ShowForumThrs (void)
"</div>" "</div>"
"</td>" "</td>"
"</tr>"); "</tr>");
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
/***** List the threads *****/ /***** List the threads *****/
if (NumThrs) if (NumThrs)
@ -2559,7 +2559,7 @@ void For_ShowForumThrs (void)
For_ListForumThrs (ThrCods,&PaginationThrs); For_ListForumThrs (ThrCods,&PaginationThrs);
/***** End table *****/ /***** End table *****/
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
/***** Write links to all the pages in the listing of threads *****/ /***** Write links to all the pages in the listing of threads *****/
if (PaginationThrs.MoreThanOnePage) if (PaginationThrs.MoreThanOnePage)
@ -3745,16 +3745,15 @@ static void For_WriteFormForumPst (bool IsReply,long ThrCod,const char *Subject)
The_ClassFormul[Gbl.Prefs.Theme], The_ClassFormul[Gbl.Prefs.Theme],
Txt_MSG_Message); Txt_MSG_Message);
/***** Help for text editor and send button *****/ /***** Help for text editor *****/
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"2\">"); "<td colspan=\"2\">");
Lay_HelpPlainEditor (); Lay_HelpPlainEditor ();
Lay_PutCreateButton (Txt_Send_message);
fprintf (Gbl.F.Out,"</td>" fprintf (Gbl.F.Out,"</td>"
"</tr>"); "</tr>");
/***** End frame *****/ /***** Send button and end frame *****/
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_CREATE_BUTTON,Txt_Send_message);
/***** End form *****/ /***** End form *****/
Act_FormEnd (); Act_FormEnd ();

View File

@ -286,7 +286,7 @@ static void Grp_ShowFormSeveralGrps (Act_Action_t NextAction)
"</tr>"); "</tr>");
/***** End table *****/ /***** End table *****/
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
/***** End form *****/ /***** End form *****/
Act_FormEnd (); Act_FormEnd ();
@ -1248,7 +1248,7 @@ static void Grp_ListGroupTypesForEdition (void)
Gbl.CurrentCrs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp].NumGrps); Gbl.CurrentCrs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp].NumGrps);
} }
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
/*****************************************************************************/ /*****************************************************************************/
@ -1430,7 +1430,7 @@ static void Grp_ListGroupsForEdition (void)
} }
} }
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
/*****************************************************************************/ /*****************************************************************************/
@ -1602,7 +1602,7 @@ unsigned Grp_ShowLstGrpsToChgMyGrps (bool ShowWarningsToStudents)
NumGrpsIBelong += Grp_ListGrpsForChange (&Gbl.CurrentCrs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp]); NumGrpsIBelong += Grp_ListGrpsForChange (&Gbl.CurrentCrs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp]);
/***** End table *****/ /***** End table *****/
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
/***** Free list of groups types and groups in this course *****/ /***** Free list of groups types and groups in this course *****/
Grp_FreeListGrpTypesAndGrps (); Grp_FreeListGrpTypesAndGrps ();
@ -1748,7 +1748,7 @@ void Grp_ShowLstGrpsToChgOtherUsrsGrps (long UsrCod)
Grp_ListGrpsToAddOrRemUsrs (&Gbl.CurrentCrs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp],UsrCod); Grp_ListGrpsToAddOrRemUsrs (&Gbl.CurrentCrs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp],UsrCod);
/***** End table *****/ /***** End table *****/
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
/***** Free list of groups types and groups in current course *****/ /***** Free list of groups types and groups in current course *****/
Grp_FreeListGrpTypesAndGrps (); Grp_FreeListGrpTypesAndGrps ();
@ -2143,17 +2143,10 @@ static void Grp_PutFormToCreateGroupType (void)
fprintf (Gbl.F.Out,"<td></td>" fprintf (Gbl.F.Out,"<td></td>"
"</tr>"); "</tr>");
/***** Send button *****/ /***** Send button and end frame *****/
fprintf (Gbl.F.Out,"<tr>" Lay_EndRoundFrameTable10 (Lay_CREATE_BUTTON,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 *****/ /***** End form *****/
Lay_EndRoundFrameTable10 ();
/***** End of form *****/
Act_FormEnd (); Act_FormEnd ();
} }
@ -2226,15 +2219,8 @@ static void Grp_PutFormToCreateGroup (void)
fprintf (Gbl.F.Out,"<td></td>" fprintf (Gbl.F.Out,"<td></td>"
"</tr>"); "</tr>");
/***** Send button *****/ /***** Send button and end frame *****/
fprintf (Gbl.F.Out,"<tr>" Lay_EndRoundFrameTable10 (Lay_CREATE_BUTTON,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 ();
/***** End of form *****/ /***** End of form *****/
Act_FormEnd (); Act_FormEnd ();

View File

@ -166,7 +166,7 @@ void Hld_SeeHolidays (void)
} }
/***** Table end *****/ /***** Table end *****/
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
/***** Free list of holidays *****/ /***** Free list of holidays *****/
Hld_FreeListHolidays (); Hld_FreeListHolidays ();
@ -587,7 +587,7 @@ static void Hld_ListHolidaysForEdition (void)
"</tr>"); "</tr>");
} }
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
/*****************************************************************************/ /*****************************************************************************/
@ -1005,15 +1005,8 @@ static void Hld_PutFormToCreateHoliday (void)
"</tr>", "</tr>",
Hld_MAX_LENGTH_HOLIDAY_NAME,Hld->Name); Hld_MAX_LENGTH_HOLIDAY_NAME,Hld->Name);
/***** Send button *****/ /***** Send button and end of frame *****/
fprintf (Gbl.F.Out,"<tr>" Lay_EndRoundFrameTable10 (Lay_CREATE_BUTTON,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 ();
/***** End of form *****/ /***** End of form *****/
Act_FormEnd (); Act_FormEnd ();

View File

@ -93,7 +93,7 @@ void Ico_PutIconsToSelectIconSet (void)
fprintf (Gbl.F.Out,"</td>"); fprintf (Gbl.F.Out,"</td>");
} }
fprintf (Gbl.F.Out,"</tr>"); fprintf (Gbl.F.Out,"</tr>");
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
/*****************************************************************************/ /*****************************************************************************/

View File

@ -592,7 +592,7 @@ static unsigned Imp_GetAndListImpGrpsAndStdsFromDB (bool ItsAFormToRegRemStds)
} }
/***** End of table with courses *****/ /***** End of table with courses *****/
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
/***** Free structure that stores the query result *****/ /***** Free structure that stores the query result *****/

View File

@ -211,7 +211,7 @@ void Ind_ReqIndicatorsCourses (void)
/***** End frame *****/ /***** End frame *****/
fprintf (Gbl.F.Out,"</td>" fprintf (Gbl.F.Out,"</td>"
"</tr>"); "</tr>");
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
/***** Free structure that stores the query result *****/ /***** Free structure that stores the query result *****/
DB_FreeMySQLResult (&mysql_res); DB_FreeMySQLResult (&mysql_res);

View File

@ -888,7 +888,7 @@ static void Inf_ShowPage (Inf_InfoType_t InfoType,const char *URL)
"</tr>"); "</tr>");
/***** End of frame *****/ /***** End of frame *****/
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
/*****************************************************************************/ /*****************************************************************************/
@ -949,7 +949,7 @@ void Inf_FormsToSelSendInfo (void)
} }
/* End of table */ /* End of table */
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
/***** Form to choice between alternatives *****/ /***** Form to choice between alternatives *****/
/* Start of form and table */ /* Start of form and table */
@ -987,7 +987,7 @@ void Inf_FormsToSelSendInfo (void)
} }
/* End of table and form */ /* End of table and form */
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
Act_FormEnd (); Act_FormEnd ();
} }
@ -1612,7 +1612,7 @@ static void Inf_ShowPlainTxtInfo (Inf_InfoType_t InfoType)
fprintf (Gbl.F.Out,"</p>" fprintf (Gbl.F.Out,"</p>"
"</td>" "</td>"
"</tr>"); "</tr>");
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
else else
Lay_ShowAlert (Lay_WARNING,Txt_No_information_available); Lay_ShowAlert (Lay_WARNING,Txt_No_information_available);
@ -1716,7 +1716,7 @@ static void Inf_ShowRichTxtInfo (Inf_InfoType_t InfoType)
fprintf (Gbl.F.Out,"</div>" fprintf (Gbl.F.Out,"</div>"
"</td>" "</td>"
"</tr>"); "</tr>");
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
else else
Lay_ShowAlert (Lay_WARNING,Txt_No_information_available); Lay_ShowAlert (Lay_WARNING,Txt_No_information_available);
@ -1846,12 +1846,11 @@ void Inf_EditPlainTxtInfo (void)
"%s" "%s"
"</textarea>", "</textarea>",
TxtHTML); TxtHTML);
Lay_PutConfirmButton (Txt_Save);
fprintf (Gbl.F.Out,"</td>" fprintf (Gbl.F.Out,"</td>"
"</tr>"); "</tr>");
/***** End form *****/ /***** End form *****/
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_CONFIRM_BUTTON,Txt_Save);
Act_FormEnd (); Act_FormEnd ();
} }
@ -1885,12 +1884,11 @@ void Inf_EditRichTxtInfo (void)
"%s" "%s"
"</textarea>", "</textarea>",
TxtHTML); TxtHTML);
Lay_PutConfirmButton (Txt_Save);
fprintf (Gbl.F.Out,"</td>" fprintf (Gbl.F.Out,"</td>"
"</tr>"); "</tr>");
/***** End form *****/ /***** End form *****/
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_CONFIRM_BUTTON,Txt_Save);
Act_FormEnd (); Act_FormEnd ();
} }

View File

@ -192,7 +192,7 @@ void Ins_SeeInsWithPendingCtrs (void)
Gbl.RowEvenOdd = 1 - Gbl.RowEvenOdd; Gbl.RowEvenOdd = 1 - Gbl.RowEvenOdd;
} }
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
else else
Lay_ShowAlert (Lay_INFO,Txt_There_are_no_institutions_with_requests_for_centres_to_be_confirmed); Lay_ShowAlert (Lay_INFO,Txt_There_are_no_institutions_with_requests_for_centres_to_be_confirmed);
@ -467,7 +467,7 @@ static void Ins_Configuration (bool PrintView)
} }
/***** End of the frame *****/ /***** End of the frame *****/
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
} }
@ -522,7 +522,7 @@ static void Ins_ListInstitutionsForSeeing (void)
Ins_ListOneInstitutionForSeeing (&(Gbl.Inss.Lst[NumIns]),NumIns + 1); Ins_ListOneInstitutionForSeeing (&(Gbl.Inss.Lst[NumIns]),NumIns + 1);
/***** Table end *****/ /***** Table end *****/
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
/*****************************************************************************/ /*****************************************************************************/
@ -1293,7 +1293,7 @@ static void Ins_ListInstitutionsForEdition (void)
/***** End table *****/ /***** End table *****/
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
/***** Free memory used for user's data *****/ /***** Free memory used for user's data *****/
Usr_UsrDataDestructor (&UsrDat); Usr_UsrDataDestructor (&UsrDat);
@ -1846,15 +1846,8 @@ static void Ins_PutFormToCreateInstitution (void)
"</td>" "</td>"
"</tr>"); "</tr>");
/***** Send button *****/ /***** Send button and end of frame *****/
fprintf (Gbl.F.Out,"<tr>" Lay_EndRoundFrameTable10 (Lay_CREATE_BUTTON,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 ();
/***** End of form *****/ /***** End of form *****/
Act_FormEnd (); Act_FormEnd ();
@ -2170,7 +2163,7 @@ unsigned Ins_ListInssFound (const char *Query)
} }
/***** Table end *****/ /***** Table end *****/
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
/***** Free structure that stores the query result *****/ /***** Free structure that stores the query result *****/

View File

@ -1136,14 +1136,33 @@ void Lay_StartRoundFrameTable10Shadow (const char *Width,unsigned CellPadding)
fprintf (Gbl.F.Out,"\">"); fprintf (Gbl.F.Out,"\">");
} }
void Lay_EndRoundFrameTable10 (void) void Lay_EndRoundFrameTable10 (Lay_Button_t Button,const char *TxtButton)
{ {
fprintf (Gbl.F.Out,"</table>"); fprintf (Gbl.F.Out,"</table>");
Lay_EndRoundFrame10 ();
Lay_EndRoundFrame10 (Button,TxtButton);
} }
void Lay_EndRoundFrame10 (void) void Lay_EndRoundFrame10 (Lay_Button_t Button,const char *TxtButton)
{ {
/***** Button *****/
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;
}
fprintf (Gbl.F.Out,"</div>" fprintf (Gbl.F.Out,"</div>"
"</div>"); "</div>");
} }
@ -1520,7 +1539,7 @@ void Lay_PutIconsToSelectLayout (void)
fprintf (Gbl.F.Out,"</td>"); fprintf (Gbl.F.Out,"</td>");
} }
fprintf (Gbl.F.Out,"</tr>"); fprintf (Gbl.F.Out,"</tr>");
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
/*****************************************************************************/ /*****************************************************************************/
@ -1595,7 +1614,7 @@ void Lay_AdvertisementMobile (void)
Gbl.Prefs.IconsURL); Gbl.Prefs.IconsURL);
/***** End table *****/ /***** End table *****/
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
fprintf (Gbl.F.Out,"</div>"); fprintf (Gbl.F.Out,"</div>");
} }

View File

@ -77,6 +77,14 @@ typedef enum
#define Lay_LAYOUT_DEFAULT Lay_LAYOUT_DESKTOP #define Lay_LAYOUT_DEFAULT Lay_LAYOUT_DESKTOP
typedef enum
{
Lay_NO_BUTTON,
Lay_CREATE_BUTTON,
Lay_CONFIRM_BUTTON,
Lay_REMOVE_BUTTON,
} Lay_Button_t;
/*****************************************************************************/ /*****************************************************************************/
/****************************** Public prototypes ****************************/ /****************************** Public prototypes ****************************/
/*****************************************************************************/ /*****************************************************************************/
@ -100,8 +108,8 @@ void Lay_PutRemoveButton (const char *Text);
void Lay_StartRoundFrameTable10 (const char *Width,unsigned CellPadding,const char *Title); void Lay_StartRoundFrameTable10 (const char *Width,unsigned CellPadding,const char *Title);
void Lay_StartRoundFrame10 (const char *Width,const char *Title); void Lay_StartRoundFrame10 (const char *Width,const char *Title);
void Lay_StartRoundFrameTable10Shadow (const char *Width,unsigned CellPadding); void Lay_StartRoundFrameTable10Shadow (const char *Width,unsigned CellPadding);
void Lay_EndRoundFrameTable10 (void); void Lay_EndRoundFrameTable10 (Lay_Button_t Button,const char *TxtButton);
void Lay_EndRoundFrame10 (void); void Lay_EndRoundFrame10 (Lay_Button_t Button,const char *TxtButton);
void Lay_ShowErrorAndExit (const char *Message); void Lay_ShowErrorAndExit (const char *Message);
void Lay_ShowAlert (Lay_AlertType_t MsgType,const char *Message); void Lay_ShowAlert (Lay_AlertType_t MsgType,const char *Message);

View File

@ -105,7 +105,7 @@ void Lnk_SeeLinks (void)
Gbl.Links.Lst[NumLnk].ShortName); Gbl.Links.Lst[NumLnk].ShortName);
/***** Table end *****/ /***** Table end *****/
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
/***** Free list of links *****/ /***** Free list of links *****/
@ -351,7 +351,7 @@ static void Lnk_ListLinksForEdition (void)
"</tr>"); "</tr>");
} }
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
/*****************************************************************************/ /*****************************************************************************/
@ -617,15 +617,8 @@ static void Lnk_PutFormToCreateLink (void)
"</tr>", "</tr>",
Cns_MAX_LENGTH_WWW,Lnk->WWW); Cns_MAX_LENGTH_WWW,Lnk->WWW);
/***** Send button *****/ /***** Send button and end frame *****/
fprintf (Gbl.F.Out,"<tr>" Lay_EndRoundFrameTable10 (Lay_CREATE_BUTTON,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 ();
/***** End of form *****/ /***** End of form *****/
Act_FormEnd (); Act_FormEnd ();

View File

@ -146,7 +146,7 @@ void Mai_SeeMailDomains (void)
Gbl.Mails.Lst[NumMai].NumUsrs); Gbl.Mails.Lst[NumMai].NumUsrs);
/***** Table end *****/ /***** Table end *****/
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
/***** Free list of mail domains *****/ /***** Free list of mail domains *****/
Mai_FreeListMailDomains (); Mai_FreeListMailDomains ();
@ -454,7 +454,7 @@ static void Mai_ListMailDomainsForEdition (void)
Mai->NumUsrs); Mai->NumUsrs);
} }
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
/*****************************************************************************/ /*****************************************************************************/
@ -680,15 +680,8 @@ static void Mai_PutFormToCreateMailDomain (void)
Mai_MAX_LENGTH_MAIL_INFO,Mai->Info); Mai_MAX_LENGTH_MAIL_INFO,Mai->Info);
/***** Send button *****/ /***** Send button and end frame *****/
fprintf (Gbl.F.Out,"<tr>" Lay_EndRoundFrameTable10 (Lay_CREATE_BUTTON,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 ();
/***** End of form *****/ /***** End of form *****/
Act_FormEnd (); Act_FormEnd ();

View File

@ -329,7 +329,7 @@ void Mnu_PutIconsToSelectMenu (void)
fprintf (Gbl.F.Out,"</td>"); fprintf (Gbl.F.Out,"</td>");
} }
fprintf (Gbl.F.Out,"</tr>"); fprintf (Gbl.F.Out,"</tr>");
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
/*****************************************************************************/ /*****************************************************************************/

View File

@ -214,7 +214,7 @@ void Msg_ListEMails (void)
"</tr>"); "</tr>");
/***** End of the frame used to list the e-mails *****/ /***** End of the frame used to list the e-mails *****/
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
/***** Icon to open the client e-mail program *****/ /***** Icon to open the client e-mail program *****/
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">" fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">"
@ -346,12 +346,11 @@ static void Msg_PutFormMsgUsrs (const char *Content)
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"2\">"); "<td colspan=\"2\">");
Lay_HelpPlainEditor (); Lay_HelpPlainEditor ();
Lay_PutCreateButton (Txt_Send_message);
fprintf (Gbl.F.Out,"</td>" fprintf (Gbl.F.Out,"</td>"
"</tr>"); "</tr>");
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_CREATE_BUTTON,Txt_Send_message);
/***** End form *****/ /***** End form *****/
Act_FormEnd (); Act_FormEnd ();
@ -1651,7 +1650,7 @@ static void Msg_ShowSentOrReceivedMessages (Msg_TypeOfMessages_t TypeOfMessages)
fprintf (Gbl.F.Out,"</table>" fprintf (Gbl.F.Out,"</table>"
"</td>" "</td>"
"</tr>"); "</tr>");
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
/***** Write again links to pages *****/ /***** Write again links to pages *****/
if (Pagination.MoreThanOnePage) if (Pagination.MoreThanOnePage)
@ -3570,7 +3569,7 @@ void Msg_ListBannedUsrs (void)
} }
/***** End of table *****/ /***** End of table *****/
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
/***** Free memory used for user's data *****/ /***** Free memory used for user's data *****/
Usr_UsrDataDestructor (&UsrDat); Usr_UsrDataDestructor (&UsrDat);

View File

@ -281,7 +281,7 @@ void Net_ShowFormMyWebsAndSocialNets (void)
} }
/***** End table *****/ /***** End table *****/
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
/*****************************************************************************/ /*****************************************************************************/
@ -495,7 +495,7 @@ void Net_ShowWebAndSocialNetworksStats (void)
} }
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
/***** Free structure that stores the query result *****/ /***** Free structure that stores the query result *****/
DB_FreeMySQLResult (&mysql_res); DB_FreeMySQLResult (&mysql_res);

View File

@ -112,15 +112,8 @@ void Not_ShowFormNotice (void)
The_ClassFormul[Gbl.Prefs.Theme], The_ClassFormul[Gbl.Prefs.Theme],
Txt_MSG_Message); Txt_MSG_Message);
/***** Button to create announcement *****/ /***** Button to create notice and end frame *****/
fprintf (Gbl.F.Out,"<tr>" Lay_EndRoundFrameTable10 (Lay_CREATE_BUTTON,Txt_Create_notice);
"<td colspan=\"2\" style=\"text-align:center;\">");
Lay_PutCreateButton (Txt_Create_notice);
fprintf (Gbl.F.Out,"</td>"
"</tr>");
/***** End frame *****/
Lay_EndRoundFrameTable10 ();
/***** End form *****/ /***** End form *****/
Act_FormEnd (); Act_FormEnd ();
@ -452,7 +445,7 @@ void Not_ShowNotices (Not_Listing_t TypeNoticesListing)
{ {
fprintf (Gbl.F.Out,"</td>" fprintf (Gbl.F.Out,"</td>"
"</tr>"); "</tr>");
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
/***** Free structure that stores the query result *****/ /***** Free structure that stores the query result *****/

View File

@ -564,7 +564,7 @@ void Ntf_ShowMyNotifications (void)
} }
/***** Table end *****/ /***** Table end *****/
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
/***** Free memory used for user's data *****/ /***** Free memory used for user's data *****/
Usr_UsrDataDestructor (&UsrDat); Usr_UsrDataDestructor (&UsrDat);
@ -1687,15 +1687,12 @@ void Ntf_PutFormChangeNotifSentByEMail (void)
extern const char *Txt_NOTIFY_EVENTS_PLURAL[Ntf_NUM_NOTIFY_EVENTS]; extern const char *Txt_NOTIFY_EVENTS_PLURAL[Ntf_NUM_NOTIFY_EVENTS];
Ntf_NotifyEvent_t NotifyEvent; Ntf_NotifyEvent_t NotifyEvent;
/***** Start table *****/
Lay_StartRoundFrameTable10 (NULL,0,Txt_Notifications);
fprintf (Gbl.F.Out,"<tr>"
"<td style=\"text-align:center;\">");
/***** Start form *****/ /***** Start form *****/
Act_FormStart (ActChgNtfPrf); Act_FormStart (ActChgNtfPrf);
fprintf (Gbl.F.Out,"<table class=\"CELLS_PAD_2\">"
"<tr>" /***** Start frame *****/
Lay_StartRoundFrameTable10 (NULL,2,Txt_Notifications);
fprintf (Gbl.F.Out,"<tr>"
"<th></th>" "<th></th>"
"<th class=\"TIT_TBL\" style=\"text-align:center;\">" "<th class=\"TIT_TBL\" style=\"text-align:center;\">"
"%s" "%s"
@ -1735,15 +1732,11 @@ void Ntf_PutFormChangeNotifSentByEMail (void)
"</tr>"); "</tr>");
} }
/***** End form *****/ /***** Button to save changes and end frame *****/
fprintf (Gbl.F.Out,"</table>"); Lay_EndRoundFrameTable10 (Lay_CONFIRM_BUTTON,Txt_Save_changes);
Lay_PutConfirmButton (Txt_Save_changes);
Act_FormEnd ();
/***** End table *****/ /***** End form *****/
fprintf (Gbl.F.Out,"</td>" Act_FormEnd ();
"</tr>");
Lay_EndRoundFrameTable10 ();
} }
/*****************************************************************************/ /*****************************************************************************/

View File

@ -234,24 +234,34 @@ void Pwd_ShowFormSendNewPwd (void)
{ {
extern const char *The_ClassFormul[The_NUM_THEMES]; extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *Txt_If_you_have_forgotten_your_password_; extern const char *Txt_If_you_have_forgotten_your_password_;
extern const char *Txt_Password;
extern const char *Txt_nick_email_or_ID; extern const char *Txt_nick_email_or_ID;
extern const char *Txt_Email_new_password; extern const char *Txt_Email_new_password;
/***** Help text *****/
Lay_ShowAlert (Lay_INFO,Txt_If_you_have_forgotten_your_password_);
/***** Start of form *****/ /***** Start of form *****/
Act_FormStart (ActSndNewPwd); Act_FormStart (ActSndNewPwd);
/***** Start frame *****/
Lay_StartRoundFrameTable10 (NULL,2,Txt_Password);
fprintf (Gbl.F.Out,"<tr>"
"<td style=\"align:center;\">");
/***** Help text *****/
Lay_ShowAlert (Lay_INFO,Txt_If_you_have_forgotten_your_password_);
/***** User's ID/nickname *****/ /***** User's ID/nickname *****/
fprintf (Gbl.F.Out,"<div class=\"%s\" style=\"text-align:center;\">" fprintf (Gbl.F.Out,"<label class=\"%s\">"
"%s:&nbsp;" "%s:"
"<input type=\"text\" name=\"UsrId\" size=\"8\" maxlength=\"%u\" value=\"%s\" />" "</label>"
"</div>", "<input type=\"text\" name=\"UsrId\" size=\"8\" maxlength=\"%u\" value=\"%s\" />",
The_ClassFormul[Gbl.Prefs.Theme],Txt_nick_email_or_ID,Usr_MAX_LENGTH_USR_LOGIN,Gbl.Usrs.Me.UsrIdLogin); The_ClassFormul[Gbl.Prefs.Theme],Txt_nick_email_or_ID,Usr_MAX_LENGTH_USR_LOGIN,Gbl.Usrs.Me.UsrIdLogin);
/***** Send button and end table *****/
fprintf (Gbl.F.Out,"</td>"
"</tr>");
Lay_EndRoundFrameTable10 (Lay_CONFIRM_BUTTON,Txt_Email_new_password);
/***** End form *****/ /***** End form *****/
Lay_PutConfirmButton (Txt_Email_new_password);
Act_FormEnd (); Act_FormEnd ();
} }
@ -673,7 +683,7 @@ void Pwd_ShowFormChgPwd (void)
/***** Start form *****/ /***** Start form *****/
Act_FormStart (ActChgPwd); Act_FormStart (ActChgPwd);
/***** Start table *****/ /***** Start frame *****/
Lay_StartRoundFrameTable10 (NULL,2,Txt_Password); Lay_StartRoundFrameTable10 (NULL,2,Txt_Password);
/* Current password */ /* Current password */
@ -704,13 +714,11 @@ void Pwd_ShowFormChgPwd (void)
Pwd_PutFormToGetNewPasswordTwice (); Pwd_PutFormToGetNewPasswordTwice ();
/***** Send button and end form *****/ /***** Send button and end form *****/
fprintf (Gbl.F.Out,"<tr>" Lay_EndRoundFrameTable10 (Lay_CONFIRM_BUTTON,
"<td colspan=\"2\" style=\"text-align:center;\">"); IHaveAPasswordInDB ? Txt_Change_password :
Lay_PutConfirmButton (IHaveAPasswordInDB ? Txt_Change_password : Txt_Set_password);
Txt_Set_password);
fprintf (Gbl.F.Out,"</td>" /***** End form *****/
"</tr>");
Lay_EndRoundFrameTable10 ();
Act_FormEnd (); Act_FormEnd ();
} }

View File

@ -291,19 +291,14 @@ void Pho_ReqPhoto (const struct UsrData *UsrDat,bool PhotoExists,const char *Pho
"<input type=\"file\" name=\"%s\"" "<input type=\"file\" name=\"%s\""
" size=\"40\" maxlength=\"100\" value=\"%ld.jpg\" />" " size=\"40\" maxlength=\"100\" value=\"%ld.jpg\" />"
"</td>" "</td>"
"</tr>" "</tr>",
"<tr>"
"<td colspan=\"2\" style=\"text-align:center;\">",
The_ClassFormul[Gbl.Prefs.Theme], The_ClassFormul[Gbl.Prefs.Theme],
Txt_File_with_the_photo, Txt_File_with_the_photo,
Fil_NAME_OF_PARAM_FILENAME_ORG, Fil_NAME_OF_PARAM_FILENAME_ORG,
UsrDat->UsrCod); UsrDat->UsrCod);
Lay_PutCreateButton (Txt_Upload_photo);
fprintf (Gbl.F.Out,"</td>"
"</tr>");
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_CREATE_BUTTON,Txt_Upload_photo);
/***** End form *****/ /***** End form *****/
Act_FormEnd (); Act_FormEnd ();
@ -1922,7 +1917,7 @@ static void Pho_ShowOrPrintClassPhotoDegrees (Pho_AvgPhotoSeeOrPrint_t SeeOrPrin
DB_FreeMySQLResult (&mysql_res); DB_FreeMySQLResult (&mysql_res);
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
/*****************************************************************************/ /*****************************************************************************/
@ -2040,7 +2035,7 @@ static void Pho_ShowOrPrintListDegrees (Pho_AvgPhotoSeeOrPrint_t SeeOrPrint)
/***** Photos end *****/ /***** Photos end *****/
if (SeeOrPrint == Pho_DEGREES_SEE) if (SeeOrPrint == Pho_DEGREES_SEE)
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
else else
fprintf (Gbl.F.Out,"</table>"); fprintf (Gbl.F.Out,"</table>");
} }

View File

@ -171,7 +171,7 @@ void Plc_SeePlaces (void)
Ctr_GetNumCtrsTotal () - NumCtrsWithPlc); Ctr_GetNumCtrsTotal () - NumCtrsWithPlc);
/***** Table end *****/ /***** Table end *****/
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
/***** Free list of places *****/ /***** Free list of places *****/
Plc_FreeListPlaces (); Plc_FreeListPlaces ();
@ -480,7 +480,7 @@ static void Plc_ListPlacesForEdition (void)
Plc->NumCtrs); Plc->NumCtrs);
} }
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
/*****************************************************************************/ /*****************************************************************************/
@ -714,17 +714,10 @@ static void Plc_PutFormToCreatePlace (void)
"</tr>", "</tr>",
Plc_MAX_LENGTH_PLACE_FULL_NAME,Plc->FullName); Plc_MAX_LENGTH_PLACE_FULL_NAME,Plc->FullName);
/***** Send button *****/ /***** Send button and end frame *****/
fprintf (Gbl.F.Out,"<tr>" Lay_EndRoundFrameTable10 (Lay_CREATE_BUTTON,Txt_Create_place);
"<td colspan=\"2\" style=\"text-align:center;\">");
Lay_PutCreateButton (Txt_Create_place);
fprintf (Gbl.F.Out,"</td>"
"</tr>");
/***** End of frame *****/ /***** End formn *****/
Lay_EndRoundFrameTable10 ();
/***** End of formn *****/
Act_FormEnd (); Act_FormEnd ();
} }

View File

@ -138,7 +138,7 @@ void Plg_ListPlugins (void)
} }
/***** End table *****/ /***** End table *****/
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
/***** Free list of plugins *****/ /***** Free list of plugins *****/
Plg_FreeListPlugins (); Plg_FreeListPlugins ();
@ -460,7 +460,7 @@ static void Plg_ListPluginsForEdition (void)
"</tr>"); "</tr>");
} }
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
/*****************************************************************************/ /*****************************************************************************/
@ -908,17 +908,10 @@ static void Plg_PutFormToCreatePlugin (void)
"</tr>", "</tr>",
Cns_MAX_LENGTH_IP,Plg->IP); Cns_MAX_LENGTH_IP,Plg->IP);
/***** Send button *****/ /***** Send button and end frame *****/
fprintf (Gbl.F.Out,"<tr>" Lay_EndRoundFrameTable10 (Lay_CREATE_BUTTON,Txt_Create_plugin);
"<td colspan=\"6\" style=\"text-align:center;\">");
Lay_PutCreateButton (Txt_Create_plugin);
fprintf (Gbl.F.Out,"</td>"
"</tr>");
/***** End of frame *****/ /***** End form *****/
Lay_EndRoundFrameTable10 ();
/***** End of form *****/
Act_FormEnd (); Act_FormEnd ();
} }

View File

@ -74,7 +74,7 @@ void Pre_EditPrefs (void)
Pre_PutSelectorToSelectLanguage (); Pre_PutSelectorToSelectLanguage ();
fprintf (Gbl.F.Out,"</td>" fprintf (Gbl.F.Out,"</td>"
"</tr>"); "</tr>");
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
/***** Layout, theme, icon set, menu & side columns *****/ /***** Layout, theme, icon set, menu & side columns *****/
fprintf (Gbl.F.Out,"<table style=\"margin:0 auto; border-spacing:10px;\">" fprintf (Gbl.F.Out,"<table style=\"margin:0 auto; border-spacing:10px;\">"
@ -364,7 +364,7 @@ static void Pre_PutIconsToSelectSideCols (void)
fprintf (Gbl.F.Out,"</td>"); fprintf (Gbl.F.Out,"</td>");
} }
fprintf (Gbl.F.Out,"</tr>"); fprintf (Gbl.F.Out,"</tr>");
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
/*****************************************************************************/ /*****************************************************************************/

View File

@ -139,31 +139,32 @@ static void Prf_RequestUserProfileWithDefaultNickname (const char *DefaultNickna
extern const char *Txt_Nickname; extern const char *Txt_Nickname;
extern const char *Txt_Continue; extern const char *Txt_Continue;
/***** Start form *****/
Act_FormStart (ActSeePubPrf);
/***** Start frame *****/ /***** Start frame *****/
Lay_StartRoundFrameTable10 (NULL,2,Txt_View_public_profile); Lay_StartRoundFrameTable10 (NULL,2,Txt_View_public_profile);
fprintf (Gbl.F.Out,"<tr>"
"<td>");
/***** Form to request user's @nickname *****/ /***** Form to request user's @nickname *****/
Act_FormStart (ActSeePubPrf); fprintf (Gbl.F.Out,"<tr>"
fprintf (Gbl.F.Out,"<div class=\"%s\" style=\"text-align:center;\">" "<td>"
"<div class=\"%s\" style=\"text-align:center;\">"
"%s: " "%s: "
"<input type=\"text\" name=\"usr\"" "<input type=\"text\" name=\"usr\""
" size=\"20\" maxlength=\"%u\" value=\"@%s\" />" " size=\"20\" maxlength=\"%u\" value=\"@%s\" />"
"</div>", "</div>"
"</td>"
"</tr>",
The_ClassFormul[Gbl.Prefs.Theme], The_ClassFormul[Gbl.Prefs.Theme],
Txt_Nickname, Txt_Nickname,
Nck_MAX_BYTES_NICKNAME_WITH_ARROBA, Nck_MAX_BYTES_NICKNAME_WITH_ARROBA,
DefaultNickname); DefaultNickname);
/***** Send button*****/ /***** Send button and end frame *****/
Lay_PutConfirmButton (Txt_Continue); Lay_EndRoundFrameTable10 (Lay_CONFIRM_BUTTON,Txt_Continue);
Act_FormEnd ();
/***** End frame *****/ /***** End form *****/
fprintf (Gbl.F.Out,"</td>" Act_FormEnd ();
"</tr>");
Lay_EndRoundFrameTable10 ();
} }
/*****************************************************************************/ /*****************************************************************************/

View File

@ -99,7 +99,7 @@ void Rec_ReqEditRecordFields (void)
{ {
Lay_StartRoundFrameTable10 (NULL,2,Txt_Record_fields); Lay_StartRoundFrameTable10 (NULL,2,Txt_Record_fields);
Rec_ListFieldsRecordsForEdition (); Rec_ListFieldsRecordsForEdition ();
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
else // No fields of records found for current course in the database else // No fields of records found for current course in the database
{ {
@ -320,17 +320,10 @@ void Rec_ShowFormCreateRecordField (void)
"</td>" "</td>"
"</tr>"); "</tr>");
/***** Send button *****/ /***** Send button and end frame *****/
fprintf (Gbl.F.Out,"<tr>" Lay_EndRoundFrameTable10 (Lay_CREATE_BUTTON,Txt_Create_record_field);
"<td colspan=\"4\" style=\"text-align:center;\">");
Lay_PutCreateButton (Txt_Create_record_field);
fprintf (Gbl.F.Out,"</td>"
"</tr>");
/***** End of frame *****/ /***** End form *****/
Lay_EndRoundFrameTable10 ();
/***** End of form *****/
Act_FormEnd (); Act_FormEnd ();
} }
@ -1178,7 +1171,7 @@ static void Rec_ShowRecordOneTchCrs (void)
TT_ShowTimeTable (TT_TUTOR_TIMETABLE,Gbl.Usrs.Other.UsrDat.UsrCod); TT_ShowTimeTable (TT_TUTOR_TIMETABLE,Gbl.Usrs.Other.UsrDat.UsrCod);
fprintf (Gbl.F.Out,"</td>" fprintf (Gbl.F.Out,"</td>"
"</tr>"); "</tr>");
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
fprintf (Gbl.F.Out,"</div>"); fprintf (Gbl.F.Out,"</div>");
} }
@ -1274,7 +1267,7 @@ void Rec_ListRecordsTchsCrs (void)
TT_ShowTimeTable (TT_TUTOR_TIMETABLE,UsrDat.UsrCod); TT_ShowTimeTable (TT_TUTOR_TIMETABLE,UsrDat.UsrCod);
fprintf (Gbl.F.Out,"</td>" fprintf (Gbl.F.Out,"</td>"
"</tr>"); "</tr>");
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
fprintf (Gbl.F.Out,"</div>"); fprintf (Gbl.F.Out,"</div>");
@ -1610,19 +1603,14 @@ void Rec_ShowCrsRecord (Rec_RecordViewType_t TypeOfView,struct UsrData *UsrDat)
DB_FreeMySQLResult (&mysql_res); DB_FreeMySQLResult (&mysql_res);
} }
/***** Button to save changes *****/ /***** Button to save changes and end frame *****/
if (DataForm) if (DataForm)
{ {
fprintf (Gbl.F.Out,"<tr>" Lay_EndRoundFrameTable10 (Lay_CONFIRM_BUTTON,Txt_Save);
"<td colspan=\"2\" style=\"text-align:center;\">");
Lay_PutConfirmButton (Txt_Save);
Act_FormEnd (); Act_FormEnd ();
fprintf (Gbl.F.Out,"</td>"
"</tr>");
} }
else
/***** End frame *****/ Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
Lay_EndRoundFrameTable10 ();
} }
/*****************************************************************************/ /*****************************************************************************/
@ -3075,7 +3063,7 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
} }
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
/*****************************************************************************/ /*****************************************************************************/
@ -3504,7 +3492,7 @@ void Rec_ShowFormMyInsCtrDpt (void)
} }
/***** End table *****/ /***** End table *****/
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
/*****************************************************************************/ /*****************************************************************************/

View File

@ -269,15 +269,13 @@ static void Sch_PutFormToSearchWithWhatToSearchAndScope (Act_Action_t Action,Sco
/***** String to find *****/ /***** String to find *****/
Sch_PutFormToSearch (Gbl.Prefs.IconsURL); Sch_PutFormToSearch (Gbl.Prefs.IconsURL);
/***** Send button *****/
fprintf (Gbl.F.Out,"<br />");
Lay_PutConfirmButton (Txt_Search);
/***** End form *****/
fprintf (Gbl.F.Out,"</td>" fprintf (Gbl.F.Out,"</td>"
"</tr>"); "</tr>");
Lay_EndRoundFrameTable10 ();
/***** Send button and end frame *****/
Lay_EndRoundFrameTable10 (Lay_CONFIRM_BUTTON,Txt_Search);
/***** End form *****/
Act_FormEnd (); Act_FormEnd ();
fprintf (Gbl.F.Out,"</div>"); fprintf (Gbl.F.Out,"</div>");
} }

View File

@ -444,7 +444,7 @@ void Sta_AskSeeCrsAccesses (void)
Usr_ListUsersToSelect (Rol_STUDENT); Usr_ListUsersToSelect (Rol_STUDENT);
/* End the table */ /* End the table */
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
fprintf (Gbl.F.Out,"</td>" fprintf (Gbl.F.Out,"</td>"
"</tr>"); "</tr>");
@ -1414,7 +1414,7 @@ static bool Sta_SeeAccesses (void)
} }
/* End of frame */ /* End of frame */
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
/***** Free structure that stores the query result *****/ /***** Free structure that stores the query result *****/
@ -3793,7 +3793,7 @@ static void Sta_GetAndShowUsersStats (void)
Usr_GetAndShowNumUsrsInPlatform (Rol_TEACHER); Usr_GetAndShowNumUsrsInPlatform (Rol_TEACHER);
Usr_GetAndShowNumUsrsInPlatform (Rol__GUEST_); // Users not beloging to any course Usr_GetAndShowNumUsrsInPlatform (Rol__GUEST_); // Users not beloging to any course
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
/*****************************************************************************/ /*****************************************************************************/
@ -3868,7 +3868,7 @@ static void Sta_GetAndShowUsersRanking (void)
fprintf (Gbl.F.Out,"</td>" fprintf (Gbl.F.Out,"</td>"
"</tr>"); "</tr>");
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
/*****************************************************************************/ /*****************************************************************************/
@ -3887,7 +3887,7 @@ static void Sta_GetAndShowHierarchyStats (void)
Sta_GetAndShowNumCtrsInSWAD (); Sta_GetAndShowNumCtrsInSWAD ();
Sta_GetAndShowNumDegsInSWAD (); Sta_GetAndShowNumDegsInSWAD ();
Sta_GetAndShowNumCrssInSWAD (); Sta_GetAndShowNumCrssInSWAD ();
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
/*****************************************************************************/ /*****************************************************************************/
@ -4558,7 +4558,7 @@ static void Sta_GetAndShowInssOrderedByNumCtrs (void)
} }
Sta_GetAndShowInss (Query,Txt_Centres); Sta_GetAndShowInss (Query,Txt_Centres);
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
/*****************************************************************************/ /*****************************************************************************/
@ -4613,7 +4613,7 @@ static void Sta_GetAndShowInssOrderedByNumDegs (void)
} }
Sta_GetAndShowInss (Query,Txt_Degrees); Sta_GetAndShowInss (Query,Txt_Degrees);
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
/*****************************************************************************/ /*****************************************************************************/
@ -4671,7 +4671,7 @@ static void Sta_GetAndShowInssOrderedByNumCrss (void)
} }
Sta_GetAndShowInss (Query,Txt_Courses); Sta_GetAndShowInss (Query,Txt_Courses);
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
/*****************************************************************************/ /*****************************************************************************/
@ -4732,7 +4732,7 @@ static void Sta_GetAndShowInssOrderedByNumUsrsInCrss (void)
} }
Sta_GetAndShowInss (Query,Txt_Users); Sta_GetAndShowInss (Query,Txt_Users);
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
/*****************************************************************************/ /*****************************************************************************/
@ -4786,7 +4786,7 @@ static void Sta_GetAndShowInssOrderedByNumUsrsWhoClaimToBelongToThem (void)
} }
Sta_GetAndShowInss (Query,Txt_Users); Sta_GetAndShowInss (Query,Txt_Users);
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
/*****************************************************************************/ /*****************************************************************************/
@ -5028,7 +5028,7 @@ static void Sta_GetAndShowFileBrowsersStats (void)
Sta_WriteRowStatsFileBrowsers (Brw_ADMI_BRIEF_USR,Txt_Virtual_pendrives); Sta_WriteRowStatsFileBrowsers (Brw_ADMI_BRIEF_USR,Txt_Virtual_pendrives);
/***** End table *****/ /***** End table *****/
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
/*****************************************************************************/ /*****************************************************************************/
@ -5890,7 +5890,7 @@ static void Sta_GetAndShowOERsStats (void)
} }
/***** End table *****/ /***** End table *****/
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
/*****************************************************************************/ /*****************************************************************************/
@ -6077,7 +6077,7 @@ static void Sta_GetAndShowAssignmentsStats (void)
NumNotif); NumNotif);
/***** End table *****/ /***** End table *****/
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
/*****************************************************************************/ /*****************************************************************************/
@ -6246,7 +6246,7 @@ static void Sta_GetAndShowTestsStats (void)
StyleTableCell,Stats.AvgScorePerQuestion); StyleTableCell,Stats.AvgScorePerQuestion);
/***** End table *****/ /***** End table *****/
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
/*****************************************************************************/ /*****************************************************************************/
@ -6575,7 +6575,7 @@ static void Sta_GetAndShowNumUsrsPerNotifyEvent (void)
StyleTableCell,NumEventsTotal, StyleTableCell,NumEventsTotal,
StyleTableCell,NumMailsTotal); StyleTableCell,NumMailsTotal);
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
/*****************************************************************************/ /*****************************************************************************/
@ -6663,7 +6663,7 @@ static void Sta_GetAndShowNoticesStats (void)
NumTotalNotifications); NumTotalNotifications);
/***** End table *****/ /***** End table *****/
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
/*****************************************************************************/ /*****************************************************************************/
@ -6765,7 +6765,7 @@ static void Sta_GetAndShowMsgsStats (void)
NumMsgsReceivedAndNotified); NumMsgsReceivedAndNotified);
/***** End table *****/ /***** End table *****/
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
/*****************************************************************************/ /*****************************************************************************/
@ -6907,7 +6907,7 @@ static void Sta_GetAndShowForumStats (void)
Sta_WriteForumTotalStats (&StatsForum); Sta_WriteForumTotalStats (&StatsForum);
/***** End table *****/ /***** End table *****/
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
/*****************************************************************************/ /*****************************************************************************/
@ -7211,7 +7211,7 @@ static void Sta_GetAndShowSurveysStats (void)
NumNotif); NumNotif);
/***** End table *****/ /***** End table *****/
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
/*****************************************************************************/ /*****************************************************************************/
@ -7232,7 +7232,7 @@ static void Sta_GetAndShowNumUsrsPerPrivacy (void)
/***** Privacy for public profile *****/ /***** Privacy for public profile *****/
Sta_GetAndShowNumUsrsPerPrivacyForAnObject (Txt_Public_profile,"ProfileVisibility"); Sta_GetAndShowNumUsrsPerPrivacyForAnObject (Txt_Public_profile,"ProfileVisibility");
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
@ -7505,7 +7505,7 @@ static void Sta_GetAndShowNumUsrsPerLanguage (void)
(float) NumUsrsTotal : (float) NumUsrsTotal :
0); 0);
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
/*****************************************************************************/ /*****************************************************************************/
@ -7637,7 +7637,7 @@ static void Sta_GetAndShowNumUsrsPerLayout (void)
(float) NumUsrsTotal : (float) NumUsrsTotal :
0); 0);
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
/*****************************************************************************/ /*****************************************************************************/
@ -7770,7 +7770,7 @@ static void Sta_GetAndShowNumUsrsPerTheme (void)
(float) NumUsrsTotal : (float) NumUsrsTotal :
0); 0);
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
/*****************************************************************************/ /*****************************************************************************/
@ -7906,7 +7906,7 @@ static void Sta_GetAndShowNumUsrsPerIconSet (void)
(float) NumUsrsTotal : (float) NumUsrsTotal :
0); 0);
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
/*****************************************************************************/ /*****************************************************************************/
@ -8038,7 +8038,7 @@ static void Sta_GetAndShowNumUsrsPerMenu (void)
(float) NumUsrsTotal : (float) NumUsrsTotal :
0); 0);
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
/*****************************************************************************/ /*****************************************************************************/
@ -8170,7 +8170,7 @@ static void Sta_GetAndShowNumUsrsPerSideColumns (void)
(float) NumUsrsTotal : (float) NumUsrsTotal :
0); 0);
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
/*****************************************************************************/ /*****************************************************************************/

View File

@ -248,7 +248,7 @@ static void Svy_ListAllSurveys (struct SurveyQuestion *SvyQst)
Svy_ShowOneSurvey (Gbl.Svys.LstSvyCods[NumSvy-1],SvyQst,false); Svy_ShowOneSurvey (Gbl.Svys.LstSvyCods[NumSvy-1],SvyQst,false);
/***** Table end *****/ /***** Table end *****/
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
/***** Write again links to pages *****/ /***** Write again links to pages *****/
if (Pagination.MoreThanOnePage) if (Pagination.MoreThanOnePage)
@ -312,7 +312,7 @@ void Svy_SeeOneSurvey (void)
/***** Show survey *****/ /***** Show survey *****/
Lay_StartRoundFrameTable10 (NULL,2,NULL); Lay_StartRoundFrameTable10 (NULL,2,NULL);
Svy_ShowOneSurvey (Svy.SvyCod,&SvyQst,true); Svy_ShowOneSurvey (Svy.SvyCod,&SvyQst,true);
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
/*****************************************************************************/ /*****************************************************************************/
@ -1671,18 +1671,11 @@ void Svy_RequestCreatOrEditSvy (void)
/***** Groups *****/ /***** Groups *****/
Svy_ShowLstGrpsToEditSurvey (Svy.SvyCod); Svy_ShowLstGrpsToEditSurvey (Svy.SvyCod);
/***** Button to create/modify survey *****/ /***** Button to create/modify survey and end frame *****/
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"2\" style=\"text-align:center;\">");
if (ItsANewSurvey) if (ItsANewSurvey)
Lay_PutCreateButton (Txt_Create_survey); Lay_EndRoundFrameTable10 (Lay_CREATE_BUTTON,Txt_Create_survey);
else else
Lay_PutConfirmButton (Txt_Save); Lay_EndRoundFrameTable10 (Lay_CONFIRM_BUTTON,Txt_Save);
fprintf (Gbl.F.Out,"</td>"
"</tr>");
/***** End frame *****/
Lay_EndRoundFrameTable10 ();
/***** End form *****/ /***** End form *****/
Act_FormEnd (); Act_FormEnd ();
@ -1778,7 +1771,7 @@ static void Svy_ShowLstGrpsToEditSurvey (long SvyCod)
Grp_ListGrpsToEditAsgAttOrSvy (&Gbl.CurrentCrs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp],SvyCod,Grp_SURVEY); Grp_ListGrpsToEditAsgAttOrSvy (&Gbl.CurrentCrs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp],SvyCod,Grp_SURVEY);
/***** End table *****/ /***** End table *****/
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
fprintf (Gbl.F.Out,"</td>" fprintf (Gbl.F.Out,"</td>"
"</tr>"); "</tr>");
} }
@ -2354,7 +2347,7 @@ void Svy_RequestEditQuestion (void)
/***** Show current survey *****/ /***** Show current survey *****/
Lay_StartRoundFrameTable10 (NULL,2,NULL); Lay_StartRoundFrameTable10 (NULL,2,NULL);
Svy_ShowOneSurvey (SvyCod,&SvyQst,true); Svy_ShowOneSurvey (SvyCod,&SvyQst,true);
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
/*****************************************************************************/ /*****************************************************************************/
@ -2513,18 +2506,11 @@ static void Svy_ShowFormEditOneQst (long SvyCod,struct SurveyQuestion *SvyQst,ch
"</td>" "</td>"
"</tr>"); "</tr>");
/***** Send button *****/ /***** Send button and end frame *****/
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"2\" style=\"text-align:center;\">");
if (SvyQst->QstCod > 0) // If the question already has assigned a code if (SvyQst->QstCod > 0) // If the question already has assigned a code
Lay_PutConfirmButton (Txt_Save); Lay_EndRoundFrameTable10 (Lay_CONFIRM_BUTTON,Txt_Save);
else else
Lay_PutCreateButton (Txt_Create_question); Lay_EndRoundFrameTable10 (Lay_CREATE_BUTTON,Txt_Create_question);
fprintf (Gbl.F.Out,"</td>"
"</tr>");
/***** End frame *****/
Lay_EndRoundFrameTable10 ();
/***** End form *****/ /***** End form *****/
Act_FormEnd (); Act_FormEnd ();
@ -2856,7 +2842,7 @@ void Svy_ReceiveQst (void)
/***** Show current survey *****/ /***** Show current survey *****/
Lay_StartRoundFrameTable10 (NULL,2,NULL); Lay_StartRoundFrameTable10 (NULL,2,NULL);
Svy_ShowOneSurvey (SvyCod,&SvyQst,true); Svy_ShowOneSurvey (SvyCod,&SvyQst,true);
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
/*****************************************************************************/ /*****************************************************************************/
@ -3103,7 +3089,7 @@ static void Svy_ListSvyQuestions (struct Survey *Svy,struct SurveyQuestion *SvyQ
} }
/***** Table end *****/ /***** Table end *****/
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
if (FormAnswerSurvey) if (FormAnswerSurvey)
/***** End form *****/ /***** End form *****/
@ -3318,7 +3304,7 @@ void Svy_RemoveQst (void)
/***** Show current survey *****/ /***** Show current survey *****/
Lay_StartRoundFrameTable10 (NULL,2,NULL); Lay_StartRoundFrameTable10 (NULL,2,NULL);
Svy_ShowOneSurvey (SvyCod,&SvyQst,true); Svy_ShowOneSurvey (SvyCod,&SvyQst,true);
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
/*****************************************************************************/ /*****************************************************************************/
@ -3352,7 +3338,7 @@ void Svy_ReceiveSurveyAnswers (void)
/***** Show current survey *****/ /***** Show current survey *****/
Lay_StartRoundFrameTable10 (NULL,2,NULL); Lay_StartRoundFrameTable10 (NULL,2,NULL);
Svy_ShowOneSurvey (Svy.SvyCod,&SvyQst,true); Svy_ShowOneSurvey (Svy.SvyCod,&SvyQst,true);
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
/*****************************************************************************/ /*****************************************************************************/

View File

@ -213,7 +213,7 @@ void Syl_EditSyllabus (void)
fprintf (Gbl.F.Out,"</table>" fprintf (Gbl.F.Out,"</table>"
"</td>" "</td>"
"</tr>"); "</tr>");
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
if (!Gbl.CurrentCrs.Syllabus.EditionIsActive) if (!Gbl.CurrentCrs.Syllabus.EditionIsActive)
fprintf (Gbl.F.Out,"<div class=\"DAT_SMALL\"" fprintf (Gbl.F.Out,"<div class=\"DAT_SMALL\""

View File

@ -747,7 +747,7 @@ static void Tst_WriteTestHead (unsigned NumTst)
static void Tst_WriteTestFoot (void) static void Tst_WriteTestFoot (void)
{ {
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
/*****************************************************************************/ /*****************************************************************************/
@ -1451,7 +1451,7 @@ static void Tst_ShowFormSelTags (unsigned long NumRows,MYSQL_RES *mysql_res,bool
} }
/***** End table *****/ /***** End table *****/
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
/*****************************************************************************/ /*****************************************************************************/
@ -1521,7 +1521,7 @@ static void Tst_ShowFormEditTags (void)
} }
/***** End table *****/ /***** End table *****/
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
fprintf (Gbl.F.Out,"</div>"); fprintf (Gbl.F.Out,"</div>");
} }
@ -1700,10 +1700,10 @@ static void Tst_ShowFormConfigTst (void)
fprintf (Gbl.F.Out,"</td>" fprintf (Gbl.F.Out,"</td>"
"</tr>"); "</tr>");
/***** Send button and end frame *****/
Lay_EndRoundFrameTable10 (Lay_CONFIRM_BUTTON,Txt_Save);
/***** End form *****/ /***** End form *****/
fprintf (Gbl.F.Out,"</tr>");
Lay_EndRoundFrameTable10 ();
Lay_PutConfirmButton (Txt_Save);
Act_FormEnd (); Act_FormEnd ();
} }
@ -2045,7 +2045,7 @@ static void Tst_ShowFormAnswerTypes (void)
} }
/***** End of table *****/ /***** End of table *****/
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
/*****************************************************************************/ /*****************************************************************************/
@ -2652,7 +2652,7 @@ static void Tst_ListOneOrMoreQuestionsToEdit (unsigned long NumRows,MYSQL_RES *m
} }
/***** Table end *****/ /***** Table end *****/
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
/*****************************************************************************/ /*****************************************************************************/
@ -4511,18 +4511,11 @@ static void Tst_PutFormEditOneQst (char *Stem,char *Feedback)
"</td>" "</td>"
"</tr>"); "</tr>");
/***** Send button *****/ /***** Send button and end frame *****/
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"2\">");
if (Gbl.Test.QstCod > 0) // The question already has assigned a code if (Gbl.Test.QstCod > 0) // The question already has assigned a code
Lay_PutConfirmButton (Txt_Save); Lay_EndRoundFrameTable10 (Lay_CONFIRM_BUTTON,Txt_Save);
else else
Lay_PutCreateButton (Txt_Create_question); Lay_EndRoundFrameTable10 (Lay_CREATE_BUTTON,Txt_Create_question);
fprintf (Gbl.F.Out,"</td>"
"</tr>");
/***** End table *****/
Lay_EndRoundFrameTable10 ();
/***** End form *****/ /***** End form *****/
Act_FormEnd (); Act_FormEnd ();
@ -5954,6 +5947,7 @@ static unsigned Tst_GetNumCoursesWithPluggableTstQuestions (Sco_Scope_t Scope,Ts
void Tst_SelUsrsToSeeUsrsTstExams (void) void Tst_SelUsrsToSeeUsrsTstExams (void)
{ {
extern const char *Txt_Users;
extern const char *Txt_See_exams; extern const char *Txt_See_exams;
/***** Get and update type of list, number of columns in class photo /***** Get and update type of list, number of columns in class photo
@ -5985,10 +5979,10 @@ void Tst_SelUsrsToSeeUsrsTstExams (void)
"<td colspan=\"2\" style=\"text-align:left;\">"); "<td colspan=\"2\" style=\"text-align:left;\">");
/***** Put list of users to select some of them *****/ /***** Put list of users to select some of them *****/
Lay_StartRoundFrameTable10 (NULL,0,NULL); Lay_StartRoundFrameTable10 (NULL,0,Txt_Users);
Usr_ListUsersToSelect (Rol_TEACHER); Usr_ListUsersToSelect (Rol_TEACHER);
Usr_ListUsersToSelect (Rol_STUDENT); Usr_ListUsersToSelect (Rol_STUDENT);
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
fprintf (Gbl.F.Out,"</td>" fprintf (Gbl.F.Out,"</td>"
"</tr>"); "</tr>");
@ -6111,7 +6105,7 @@ void Tst_ShowUsrsTestResults (void)
} }
/***** End of the table *****/ /***** End of the table *****/
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
else // If no users are selected... else // If no users are selected...
{ {
@ -6198,7 +6192,7 @@ void Tst_ShowMyTestResults (void)
Tst_ShowResultsOfTestExams (&Gbl.Usrs.Me.UsrDat); Tst_ShowResultsOfTestExams (&Gbl.Usrs.Me.UsrDat);
/***** End of the table *****/ /***** End of the table *****/
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
/*****************************************************************************/ /*****************************************************************************/

View File

@ -985,7 +985,7 @@ static void TsI_WriteHeadingListImportedQst (void)
static void TsI_WriteEndingListImportedQst (void) static void TsI_WriteEndingListImportedQst (void)
{ {
/***** Table end *****/ /***** Table end *****/
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
/*****************************************************************************/ /*****************************************************************************/

View File

@ -15499,6 +15499,27 @@ const char *Txt_List_of_nicks_emails_or_IDs =
"Lista de @alcunhas, e-mails ou n&ordm;s. identif."; "Lista de @alcunhas, e-mails ou n&ordm;s. identif.";
#endif #endif
const char *Txt_List_type =
#if L==0
"Tipus de llista";
#elif L==1
"Listentyp";
#elif L==2
"List type";
#elif L==3
"Tipo de lista";
#elif L==4
"Type de liste";
#elif L==5
"Tipo de lista"; // Okoteve traducción
#elif L==6
"Tipo di lista";
#elif L==7
"Typ listy";
#elif L==8
"Tipo de lista";
#endif
const char *Txt_Links = const char *Txt_Links =
#if L==0 #if L==0
"Enlla&ccedil;os"; "Enlla&ccedil;os";

View File

@ -257,7 +257,7 @@ void The_PutIconsToSelectTheme (void)
fprintf (Gbl.F.Out,"</td>"); fprintf (Gbl.F.Out,"</td>");
} }
fprintf (Gbl.F.Out,"</tr>"); fprintf (Gbl.F.Out,"</tr>");
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
/*****************************************************************************/ /*****************************************************************************/

View File

@ -297,7 +297,7 @@ void TT_ShowClassTimeTable (void)
"</tr>"); "</tr>");
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
/*****************************************************************************/ /*****************************************************************************/
@ -324,7 +324,7 @@ void TT_EditCrsTimeTable (void)
"</tr>"); "</tr>");
/***** End of table *****/ /***** End of table *****/
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
/*****************************************************************************/ /*****************************************************************************/
@ -348,7 +348,7 @@ void TT_ShowMyTutTimeTable (void)
TT_ShowTimeTable (TT_TUTOR_TIMETABLE,Gbl.Usrs.Me.UsrDat.UsrCod); TT_ShowTimeTable (TT_TUTOR_TIMETABLE,Gbl.Usrs.Me.UsrDat.UsrCod);
fprintf (Gbl.F.Out,"</td>" fprintf (Gbl.F.Out,"</td>"
"</tr>"); "</tr>");
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
/*****************************************************************************/ /*****************************************************************************/

View File

@ -754,6 +754,7 @@ unsigned Usr_GetNumUsrsInCrssOfAUsr (long UsrCod,Rol_Role_t UsrRole,
Rol_Role_t OthersRole) Rol_Role_t OthersRole)
{ {
char Query[256]; char Query[256];
unsigned NumUsrs;
// This query can be made in a unique, but slower, query // This query can be made in a unique, but slower, query
// The temporary table achieves speedup from ~2s to few ms // The temporary table achieves speedup from ~2s to few ms
@ -778,12 +779,14 @@ unsigned Usr_GetNumUsrsInCrssOfAUsr (long UsrCod,Rol_Role_t UsrRole,
" WHERE crs_usr.CrsCod=my_courses_tmp.CrsCod" " WHERE crs_usr.CrsCod=my_courses_tmp.CrsCod"
" AND crs_usr.Role='%u'", " AND crs_usr.Role='%u'",
(unsigned) OthersRole); (unsigned) OthersRole);
return (unsigned) DB_QueryCOUNT (Query,"can not get the number of users"); NumUsrs = (unsigned) DB_QueryCOUNT (Query,"can not get the number of users");
/***** Remove temporary table *****/ /***** Remove temporary table *****/
sprintf (Query,"DROP TABLE IF EXISTS my_courses_tmp"); sprintf (Query,"DROP TABLE IF EXISTS my_courses_tmp");
if (mysql_query (&Gbl.mysql,Query)) if (mysql_query (&Gbl.mysql,Query))
DB_ExitOnMySQLError ("can not remove temporary tables"); DB_ExitOnMySQLError ("can not remove temporary tables");
return NumUsrs;
} }
/*****************************************************************************/ /*****************************************************************************/
@ -1417,7 +1420,7 @@ void Usr_WriteFormLogin (void)
"</td>" "</td>"
"</tr>", "</tr>",
Txt_Log_in); Txt_Log_in);
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
Act_FormEnd (); Act_FormEnd ();
fprintf (Gbl.F.Out,"</div>"); fprintf (Gbl.F.Out,"</div>");
@ -4715,8 +4718,10 @@ void Usr_FreeListOtherRecipients (void)
void Usr_ShowFormsToSelectUsrListType (Act_Action_t NextAction) void Usr_ShowFormsToSelectUsrListType (Act_Action_t NextAction)
{ {
extern const char *Txt_List_type;
/***** Start table *****/ /***** Start table *****/
Lay_StartRoundFrameTable10 (NULL,8,"Tipo de lista"); // Need translation!!! Lay_StartRoundFrameTable10 (NULL,8,Txt_List_type);
/***** Select USR_CLASS_ROOM *****/ /***** Select USR_CLASS_ROOM *****/
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
@ -4754,7 +4759,7 @@ void Usr_ShowFormsToSelectUsrListType (Act_Action_t NextAction)
"</tr>"); "</tr>");
/***** End of table *****/ /***** End of table *****/
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
/*****************************************************************************/ /*****************************************************************************/
@ -5805,7 +5810,7 @@ unsigned Usr_ListUsrsFound (Rol_Role_t Role,const char *UsrQuery)
Usr_NUM_MAIN_FIELDS_DATA_USR-3); Usr_NUM_MAIN_FIELDS_DATA_USR-3);
Lay_StartRoundFrameTable10 (NULL,2,NULL); Lay_StartRoundFrameTable10 (NULL,2,NULL);
Crs_GetAndWriteCrssOfAUsr (UsrDat.UsrCod,Role); Crs_GetAndWriteCrssOfAUsr (UsrDat.UsrCod,Role);
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
fprintf (Gbl.F.Out,"</td>" fprintf (Gbl.F.Out,"</td>"
"</tr>"); "</tr>");
} }
@ -5816,7 +5821,7 @@ unsigned Usr_ListUsrsFound (Rol_Role_t Role,const char *UsrQuery)
Usr_UsrDataDestructor (&UsrDat); Usr_UsrDataDestructor (&UsrDat);
/***** Table end *****/ /***** Table end *****/
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
/***** Free memory for teachers list *****/ /***** Free memory for teachers list *****/
@ -5936,7 +5941,7 @@ void Usr_ListDataAdms (void)
Usr_UsrDataDestructor (&UsrDat); Usr_UsrDataDestructor (&UsrDat);
/***** End of table *****/ /***** End of table *****/
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
else // Gbl.Usrs.LstAdms.NumUsrs == 0 else // Gbl.Usrs.LstAdms.NumUsrs == 0
Lay_ShowAlert (Lay_INFO,Txt_No_users_found[Rol_DEG_ADM]); Lay_ShowAlert (Lay_INFO,Txt_No_users_found[Rol_DEG_ADM]);
@ -6285,6 +6290,7 @@ void Usr_SeeGuests (void)
extern const char *Txt_Scope; extern const char *Txt_Scope;
extern const char *Txt_Print; extern const char *Txt_Print;
extern const char *Txt_Show_all_data; extern const char *Txt_Show_all_data;
extern const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS];
extern const char *Txt_Show_records; extern const char *Txt_Show_records;
/***** Get and update type of list, /***** Get and update type of list,
@ -6347,14 +6353,12 @@ void Usr_SeeGuests (void)
fprintf (Gbl.F.Out,"</div>"); fprintf (Gbl.F.Out,"</div>");
/***** Draw a class photo with students of the course *****/ /***** Draw a class photo with students of the course *****/
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
/* Start form */ /* Start form */
Act_FormStart (ActSeeRecSevInv); Act_FormStart (ActSeeRecSevInv);
Grp_PutParamsCodGrps (); Grp_PutParamsCodGrps ();
/* Header */ /* Header */
Lay_StartRoundFrameTable10 (NULL,0,NULL); Lay_StartRoundFrameTable10 (NULL,0,Txt_ROLES_PLURAL_Abc[Rol__GUEST_][Usr_SEX_UNKNOWN]);
if (Gbl.Usrs.Me.ListType == Usr_CLASS_PHOTO) if (Gbl.Usrs.Me.ListType == Usr_CLASS_PHOTO)
Lay_WriteHeaderClassPhoto (Gbl.Usrs.ClassPhoto.Cols,false,true, Lay_WriteHeaderClassPhoto (Gbl.Usrs.ClassPhoto.Cols,false,true,
@ -6379,12 +6383,11 @@ void Usr_SeeGuests (void)
break; break;
} }
Lay_EndRoundFrameTable10 (); /* Send button and end frame */
Lay_EndRoundFrameTable10 (Lay_CONFIRM_BUTTON,Txt_Show_records);
/* Send button */ /* End form */
Lay_PutConfirmButton (Txt_Show_records);
Act_FormEnd (); Act_FormEnd ();
fprintf (Gbl.F.Out,"</div>");
} }
} }
else else
@ -6424,6 +6427,7 @@ void Usr_SeeStudents (void)
extern const char *Txt_Scope; extern const char *Txt_Scope;
extern const char *Txt_Print; extern const char *Txt_Print;
extern const char *Txt_Show_all_data; extern const char *Txt_Show_all_data;
extern const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS];
extern const char *Txt_Show_records; extern const char *Txt_Show_records;
bool ICanViewRecords; bool ICanViewRecords;
@ -6515,8 +6519,6 @@ void Usr_SeeStudents (void)
} }
/***** Draw a class photo with students of the course *****/ /***** Draw a class photo with students of the course *****/
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
/* Start form */ /* Start form */
if (ICanViewRecords) if (ICanViewRecords)
{ {
@ -6525,7 +6527,7 @@ void Usr_SeeStudents (void)
} }
/* Header */ /* Header */
Lay_StartRoundFrameTable10 (NULL,0,NULL); Lay_StartRoundFrameTable10 (NULL,0,Txt_ROLES_PLURAL_Abc[Rol_STUDENT][Usr_SEX_UNKNOWN]);
if (Gbl.Usrs.Me.ListType == Usr_CLASS_PHOTO) if (Gbl.Usrs.Me.ListType == Usr_CLASS_PHOTO)
Lay_WriteHeaderClassPhoto (Gbl.Usrs.ClassPhoto.Cols,false,true, Lay_WriteHeaderClassPhoto (Gbl.Usrs.ClassPhoto.Cols,false,true,
@ -6557,16 +6559,14 @@ void Usr_SeeStudents (void)
break; break;
} }
Lay_EndRoundFrameTable10 (); /* Send button and end frame */
/* Send button */
if (ICanViewRecords) if (ICanViewRecords)
{ {
Lay_PutConfirmButton (Txt_Show_records); Lay_EndRoundFrameTable10 (Lay_CONFIRM_BUTTON,Txt_Show_records);
Act_FormEnd (); Act_FormEnd ();
} }
else
fprintf (Gbl.F.Out,"</div>"); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
} }
else else
@ -6589,6 +6589,7 @@ void Usr_SeeTeachers (void)
extern const char *Txt_Scope; extern const char *Txt_Scope;
extern const char *Txt_Print; extern const char *Txt_Print;
extern const char *Txt_Show_all_data; extern const char *Txt_Show_all_data;
extern const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS];
extern const char *Txt_Show_records; extern const char *Txt_Show_records;
extern const char *Txt_No_users_found[Rol_NUM_ROLES]; extern const char *Txt_No_users_found[Rol_NUM_ROLES];
bool ICanViewRecords; bool ICanViewRecords;
@ -6660,7 +6661,7 @@ void Usr_SeeTeachers (void)
Act_FormStart (ActSeeRecSevTch); Act_FormStart (ActSeeRecSevTch);
/* Header */ /* Header */
Lay_StartRoundFrameTable10 (NULL,0,NULL); Lay_StartRoundFrameTable10 (NULL,0,Txt_ROLES_PLURAL_Abc[Rol_TEACHER][Usr_SEX_UNKNOWN]);
if (Gbl.Usrs.Me.ListType == Usr_CLASS_PHOTO) if (Gbl.Usrs.Me.ListType == Usr_CLASS_PHOTO)
Lay_WriteHeaderClassPhoto (Gbl.Usrs.ClassPhoto.Cols,false,true, Lay_WriteHeaderClassPhoto (Gbl.Usrs.ClassPhoto.Cols,false,true,
@ -6692,14 +6693,14 @@ void Usr_SeeTeachers (void)
break; break;
} }
Lay_EndRoundFrameTable10 (); /* Send button and end frame */
if (ICanViewRecords) if (ICanViewRecords)
{ {
/* Send button */ Lay_EndRoundFrameTable10 (Lay_CONFIRM_BUTTON,Txt_Show_records);
Lay_PutConfirmButton (Txt_Show_records);
Act_FormEnd (); Act_FormEnd ();
} }
else
Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
fprintf (Gbl.F.Out,"</div>"); fprintf (Gbl.F.Out,"</div>");
} }
@ -6757,7 +6758,7 @@ void Usr_SeeGstClassPhotoPrn (void)
-1L, -1L,
-1L,-1L); -1L,-1L);
Usr_DrawClassPhoto (Usr_CLASS_PHOTO_PRN,Rol__GUEST_); Usr_DrawClassPhoto (Usr_CLASS_PHOTO_PRN,Rol__GUEST_);
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
else else
Usr_ShowWarningNoUsersFound (Rol__GUEST_); Usr_ShowWarningNoUsersFound (Rol__GUEST_);
@ -6803,7 +6804,7 @@ void Usr_SeeStdClassPhotoPrn (void)
Gbl.Scope.Current == Sco_SCOPE_CRS ? Gbl.CurrentCrs.Crs.CrsCod : Gbl.Scope.Current == Sco_SCOPE_CRS ? Gbl.CurrentCrs.Crs.CrsCod :
-1L); -1L);
Usr_DrawClassPhoto (Usr_CLASS_PHOTO_PRN,Rol_STUDENT); Usr_DrawClassPhoto (Usr_CLASS_PHOTO_PRN,Rol_STUDENT);
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
else else
Usr_ShowWarningNoUsersFound (Rol_STUDENT); Usr_ShowWarningNoUsersFound (Rol_STUDENT);
@ -6857,7 +6858,7 @@ void Usr_SeeTchClassPhotoPrn (void)
Gbl.Scope.Current == Sco_SCOPE_CRS ? Gbl.CurrentCrs.Crs.CrsCod : Gbl.Scope.Current == Sco_SCOPE_CRS ? Gbl.CurrentCrs.Crs.CrsCod :
-1L); -1L);
Usr_DrawClassPhoto (Usr_CLASS_PHOTO_PRN,Rol_TEACHER); Usr_DrawClassPhoto (Usr_CLASS_PHOTO_PRN,Rol_TEACHER);
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }
else else
Lay_ShowAlert (Lay_INFO,Txt_No_users_found[Rol_TEACHER]); Lay_ShowAlert (Lay_INFO,Txt_No_users_found[Rol_TEACHER]);

View File

@ -606,5 +606,5 @@ static void ZIP_ShowLinkToDownloadZIP (const char *FileName,const char *URL,
fprintf (Gbl.F.Out,"</table>" fprintf (Gbl.F.Out,"</table>"
"</td>" "</td>"
"</tr>"); "</tr>");
Lay_EndRoundFrameTable10 (); Lay_EndRoundFrameTable10 (Lay_NO_BUTTON,NULL);
} }