Version 16.198.5

This commit is contained in:
Antonio Cañas Vargas 2017-05-01 10:22:16 +02:00
parent 71ab6d3a82
commit 3b1480cd3a
16 changed files with 71 additions and 65 deletions

View File

@ -529,10 +529,10 @@ void ID_ShowFormOthIDs (void)
Rec_ShowSharedUsrRecord (Rec_SHA_RECORD_LIST,&Gbl.Usrs.Other.UsrDat); Rec_ShowSharedUsrRecord (Rec_SHA_RECORD_LIST,&Gbl.Usrs.Other.UsrDat);
/***** Form with the user's ID *****/ /***** Form with the user's ID *****/
fprintf (Gbl.F.Out,"<table class=\"FRAME_TBL_WIDE CELLS_PAD_2\">"); Lay_StartTableWide (2);
ID_ShowFormChangeUsrID (&Gbl.Usrs.Other.UsrDat, ID_ShowFormChangeUsrID (&Gbl.Usrs.Other.UsrDat,
(Gbl.Usrs.Other.UsrDat.UsrCod == Gbl.Usrs.Me.UsrDat.UsrCod)); // It's me? (Gbl.Usrs.Other.UsrDat.UsrCod == Gbl.Usrs.Me.UsrDat.UsrCod)); // It's me?
fprintf (Gbl.F.Out,"</table>"); Lay_EndTable ();
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Lay_EndRoundFrame ();

View File

@ -381,7 +381,7 @@ static void Ctr_Configuration (bool PrintView)
} }
/***** Start table *****/ /***** Start table *****/
fprintf (Gbl.F.Out,"<table class=\"FRAME_TBL_WIDE CELLS_PAD_2\">"); Lay_StartTableWide (2);
/***** Institution *****/ /***** Institution *****/
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
@ -659,7 +659,7 @@ static void Ctr_Configuration (bool PrintView)
} }
/***** End table *****/ /***** End table *****/
fprintf (Gbl.F.Out,"</table>"); Lay_EndTable ();
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Lay_EndRoundFrame ();
@ -1413,7 +1413,7 @@ static void Ctr_ListCentresForEdition (void)
Usr_UsrDataConstructor (&UsrDat); Usr_UsrDataConstructor (&UsrDat);
/***** Write heading *****/ /***** Write heading *****/
fprintf (Gbl.F.Out,"<table class=\"FRAME_TBL_WIDE CELLS_PAD_2\">"); Lay_StartTableWide (2);
Ctr_PutHeadCentresForEdition (); Ctr_PutHeadCentresForEdition ();
/***** Write all the centres *****/ /***** Write all the centres *****/
@ -1606,7 +1606,7 @@ static void Ctr_ListCentresForEdition (void)
} }
/***** End table *****/ /***** End table *****/
fprintf (Gbl.F.Out,"</table>"); Lay_EndTable ();
/***** Free memory used for user's data *****/ /***** Free memory used for user's data *****/
Usr_UsrDataDestructor (&UsrDat); Usr_UsrDataDestructor (&UsrDat);

View File

@ -223,13 +223,14 @@
/****************************** Public constants *****************************/ /****************************** Public constants *****************************/
/*****************************************************************************/ /*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 16.198.4 (2017-04-30)" #define Log_PLATFORM_VERSION "SWAD 16.198.5 (2017-05-01)"
#define CSS_FILE "swad16.195.8.css" #define CSS_FILE "swad16.195.8.css"
#define JS_FILE "swad16.181.js" #define JS_FILE "swad16.181.js"
// 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 16.198.5: May 01, 2017 Code refactoring related to tables. (218302 lines)
Version 16.198.4: Apr 30, 2017 Code refactoring related to contextual icons to remove. (218294 lines) Version 16.198.4: Apr 30, 2017 Code refactoring related to contextual icons to remove. (218294 lines)
Version 16.198.3: Apr 30, 2017 Code refactoring related to contextual icons to hide and unhide. (218320 lines) Version 16.198.3: Apr 30, 2017 Code refactoring related to contextual icons to hide and unhide. (218320 lines)
Version 16.198.2: Apr 30, 2017 Changes in layout of edition of places. (218341 lines) Version 16.198.2: Apr 30, 2017 Changes in layout of edition of places. (218341 lines)

View File

@ -300,7 +300,7 @@ static void Cty_Configuration (bool PrintView)
} }
/***** Start table *****/ /***** Start table *****/
fprintf (Gbl.F.Out,"<table class=\"FRAME_TBL_WIDE CELLS_PAD_2\">"); Lay_StartTableWide (2);
/***** Country name (an link to WWW if exists) *****/ /***** Country name (an link to WWW if exists) *****/
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
@ -470,7 +470,7 @@ static void Cty_Configuration (bool PrintView)
} }
/***** End table *****/ /***** End table *****/
fprintf (Gbl.F.Out,"</table>"); Lay_EndTable ();
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Lay_EndRoundFrame ();
@ -1533,7 +1533,7 @@ static void Cty_ListCountriesForEdition (void)
Txt_Language_t Lan; Txt_Language_t Lan;
/***** Write heading *****/ /***** Write heading *****/
fprintf (Gbl.F.Out,"<table class=\"FRAME_TBL_WIDE CELLS_PAD_2\">"); Lay_StartTableWide (2);
Cty_PutHeadCountriesForEdition (); Cty_PutHeadCountriesForEdition ();
/***** Write all the countries *****/ /***** Write all the countries *****/
@ -1632,7 +1632,7 @@ static void Cty_ListCountriesForEdition (void)
} }
/***** End table *****/ /***** End table *****/
fprintf (Gbl.F.Out,"</table>"); Lay_EndTable ();
} }
/*****************************************************************************/ /*****************************************************************************/

View File

@ -216,7 +216,7 @@ static void Crs_Configuration (bool PrintView)
Gbl.CurrentCrs.Crs.FullName); Gbl.CurrentCrs.Crs.FullName);
/***** Start table *****/ /***** Start table *****/
fprintf (Gbl.F.Out,"<table class=\"FRAME_TBL_WIDE CELLS_PAD_2\">"); Lay_StartTableWide (2);
/***** Degree *****/ /***** Degree *****/
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
@ -480,7 +480,7 @@ static void Crs_Configuration (bool PrintView)
} }
/***** End table *****/ /***** End table *****/
fprintf (Gbl.F.Out,"</table>"); Lay_EndTable ();
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Lay_EndRoundFrame ();
@ -1359,7 +1359,7 @@ static void Crs_ListCoursesForEdition (void)
unsigned Year; unsigned Year;
/***** Write heading *****/ /***** Write heading *****/
fprintf (Gbl.F.Out,"<table class=\"FRAME_TBL_WIDE CELLS_PAD_2\">"); Lay_StartTableWide (2);
Crs_PutHeadCoursesForEdition (); Crs_PutHeadCoursesForEdition ();
/***** List the courses *****/ /***** List the courses *****/
@ -1370,7 +1370,7 @@ static void Crs_ListCoursesForEdition (void)
Crs_ListCoursesOfAYearForEdition (0); Crs_ListCoursesOfAYearForEdition (0);
/***** End table *****/ /***** End table *****/
fprintf (Gbl.F.Out,"</table>"); Lay_EndTable ();
} }
/*****************************************************************************/ /*****************************************************************************/

View File

@ -315,7 +315,7 @@ static void Deg_Configuration (bool PrintView)
fprintf (Gbl.F.Out,"</div>"); fprintf (Gbl.F.Out,"</div>");
/***** Start table *****/ /***** Start table *****/
fprintf (Gbl.F.Out,"<table class=\"FRAME_TBL_WIDE CELLS_PAD_2\">"); Lay_StartTableWide (2);
/***** Centre *****/ /***** Centre *****/
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
@ -540,7 +540,7 @@ static void Deg_Configuration (bool PrintView)
} }
/***** End table *****/ /***** End table *****/
fprintf (Gbl.F.Out,"</table>"); Lay_EndTable ();
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Lay_EndRoundFrame ();
@ -674,7 +674,7 @@ static void Deg_ListDegreesForEdition (void)
Usr_UsrDataConstructor (&UsrDat); Usr_UsrDataConstructor (&UsrDat);
/***** Write heading *****/ /***** Write heading *****/
fprintf (Gbl.F.Out,"<table class=\"FRAME_TBL_WIDE CELLS_PAD_2\">"); Lay_StartTableWide (2);
Deg_PutHeadDegreesForEdition (); Deg_PutHeadDegreesForEdition ();
/***** List the degrees *****/ /***** List the degrees *****/
@ -852,7 +852,7 @@ static void Deg_ListDegreesForEdition (void)
} }
/***** End table *****/ /***** End table *****/
fprintf (Gbl.F.Out,"</table>"); Lay_EndTable ();
/***** Free memory used for user's data *****/ /***** Free memory used for user's data *****/
Usr_UsrDataDestructor (&UsrDat); Usr_UsrDataDestructor (&UsrDat);

View File

@ -357,7 +357,7 @@ static void DT_ListDegreeTypesForEdition (void)
unsigned NumDegTyp; unsigned NumDegTyp;
/***** Write heading *****/ /***** Write heading *****/
fprintf (Gbl.F.Out,"<table class=\"FRAME_TBL_WIDE CELLS_PAD_2\">"); Lay_StartTableWide (2);
DT_PutHeadDegreeTypesForEdition (); DT_PutHeadDegreeTypesForEdition ();
/***** List degree types with forms for edition *****/ /***** List degree types with forms for edition *****/
@ -407,7 +407,7 @@ static void DT_ListDegreeTypesForEdition (void)
} }
/***** End table *****/ /***** End table *****/
fprintf (Gbl.F.Out,"</table>"); Lay_EndTable ();
} }
/*****************************************************************************/ /*****************************************************************************/

View File

@ -1065,7 +1065,7 @@ static void For_ShowPostsOfAThread (Lay_AlertType_t AlertType,const char *Messag
&PaginationPsts); &PaginationPsts);
/***** Start table *****/ /***** Start table *****/
fprintf (Gbl.F.Out,"<table class=\"FRAME_TBL_WIDE CELLS_PAD_2\">"); Lay_StartTableWide (2);
/***** Show posts from this page, the author and the date of last reply *****/ /***** Show posts from this page, the author and the date of last reply *****/
mysql_data_seek (mysql_res,(my_ulonglong) (PaginationPsts.FirstItemVisible - 1)); mysql_data_seek (mysql_res,(my_ulonglong) (PaginationPsts.FirstItemVisible - 1));
@ -1117,7 +1117,7 @@ static void For_ShowPostsOfAThread (Lay_AlertType_t AlertType,const char *Messag
} }
/***** End table *****/ /***** End table *****/
fprintf (Gbl.F.Out,"</table>"); Lay_EndTable ();
/***** Write again links to pages *****/ /***** Write again links to pages *****/
if (PaginationPsts.MoreThanOnePage) if (PaginationPsts.MoreThanOnePage)

View File

@ -378,13 +378,13 @@ void Grp_ShowFormToSelectSeveralGroups (Act_Action_t NextAction)
Grp_GetListGrpTypesAndGrpsInThisCrs (Grp_ONLY_GROUP_TYPES_WITH_GROUPS); Grp_GetListGrpTypesAndGrpsInThisCrs (Grp_ONLY_GROUP_TYPES_WITH_GROUPS);
/***** List the groups for each group type *****/ /***** List the groups for each group type *****/
fprintf (Gbl.F.Out,"<table class=\"FRAME_TBL_WIDE CELLS_PAD_2\">"); Lay_StartTableWide (2);
for (NumGrpTyp = 0; for (NumGrpTyp = 0;
NumGrpTyp < Gbl.CurrentCrs.Grps.GrpTypes.Num; NumGrpTyp < Gbl.CurrentCrs.Grps.GrpTypes.Num;
NumGrpTyp++) NumGrpTyp++)
if (Gbl.CurrentCrs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp].NumGrps) if (Gbl.CurrentCrs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp].NumGrps)
Grp_ListGrpsForMultipleSelection (&Gbl.CurrentCrs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp]); Grp_ListGrpsForMultipleSelection (&Gbl.CurrentCrs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp]);
fprintf (Gbl.F.Out,"</table>"); Lay_EndTable ();
/***** Free list of groups types and groups in this course *****/ /***** Free list of groups types and groups in this course *****/
Grp_FreeListGrpTypesAndGrps (); Grp_FreeListGrpTypesAndGrps ();
@ -1196,7 +1196,7 @@ static void Grp_ListGroupTypesForEdition (void)
char Id[32]; char Id[32];
/***** Write heading *****/ /***** Write heading *****/
fprintf (Gbl.F.Out,"<table class=\"FRAME_TBL_WIDE CELLS_PAD_2\">"); Lay_StartTableWide (2);
Grp_WriteHeadingGroupTypes (); Grp_WriteHeadingGroupTypes ();
/***** List group types with forms for edition *****/ /***** List group types with forms for edition *****/
@ -1313,7 +1313,7 @@ static void Grp_ListGroupTypesForEdition (void)
} }
/***** End table *****/ /***** End table *****/
fprintf (Gbl.F.Out,"</table>"); Lay_EndTable ();
} }
/*****************************************************************************/ /*****************************************************************************/
@ -1401,7 +1401,7 @@ static void Grp_ListGroupsForEdition (void)
struct Group *Grp; struct Group *Grp;
/***** Write heading *****/ /***** Write heading *****/
fprintf (Gbl.F.Out,"<table class=\"FRAME_TBL_WIDE CELLS_PAD_2\">"); Lay_StartTableWide (2);
Grp_WriteHeadingGroups (); Grp_WriteHeadingGroups ();
/***** List the groups *****/ /***** List the groups *****/
@ -1521,7 +1521,7 @@ static void Grp_ListGroupsForEdition (void)
} }
/***** End table *****/ /***** End table *****/
fprintf (Gbl.F.Out,"</table>"); Lay_EndTable ();
} }
/*****************************************************************************/ /*****************************************************************************/
@ -1681,13 +1681,13 @@ void Grp_ShowLstGrpsToChgMyGrps (bool ShowWarningsToStudents)
Act_FormStart (ActChgGrp); Act_FormStart (ActChgGrp);
/***** List the groups the user belongs to for change *****/ /***** List the groups the user belongs to for change *****/
fprintf (Gbl.F.Out,"<table class=\"FRAME_TBL_WIDE CELLS_PAD_2\">"); Lay_StartTableWide (2);
for (NumGrpTyp = 0; for (NumGrpTyp = 0;
NumGrpTyp < Gbl.CurrentCrs.Grps.GrpTypes.Num; NumGrpTyp < Gbl.CurrentCrs.Grps.GrpTypes.Num;
NumGrpTyp++) NumGrpTyp++)
if (Gbl.CurrentCrs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp].NumGrps) // If there are groups of this type if (Gbl.CurrentCrs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp].NumGrps) // If there are groups of this type
NumGrpsIBelong += Grp_ListGrpsForChange (&Gbl.CurrentCrs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp]); NumGrpsIBelong += Grp_ListGrpsForChange (&Gbl.CurrentCrs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp]);
fprintf (Gbl.F.Out,"</table>"); Lay_EndTable ();
/***** End form *****/ /***** End form *****/
if (PutFormToChangeGrps) if (PutFormToChangeGrps)

View File

@ -108,9 +108,9 @@ void Ind_ReqIndicatorsCourses (void)
Hlp_STATS_Indicators); Hlp_STATS_Indicators);
/***** Form to update indicators *****/ /***** Form to update indicators *****/
/* Start form */ /* Start form and table */
Act_FormStart (ActReqStaCrs); Act_FormStart (ActReqStaCrs);
fprintf (Gbl.F.Out,"<table class=\"FRAME_TBL_WIDE CELLS_PAD_2\">"); Lay_StartTableWide (2);
/* Scope */ /* Scope */
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
@ -171,8 +171,7 @@ void Ind_ReqIndicatorsCourses (void)
fprintf (Gbl.F.Out,"</td>" fprintf (Gbl.F.Out,"</td>"
"</tr>"); "</tr>");
/* End form */ /* End form and form */
fprintf (Gbl.F.Out,"</table>");
Act_FormEnd (); Act_FormEnd ();
/***** Show the stats of courses *****/ /***** Show the stats of courses *****/

View File

@ -325,7 +325,7 @@ static void Ins_Configuration (bool PrintView)
fprintf (Gbl.F.Out,"</div>"); fprintf (Gbl.F.Out,"</div>");
/***** Start table *****/ /***** Start table *****/
fprintf (Gbl.F.Out,"<table class=\"FRAME_TBL_WIDE CELLS_PAD_2\">"); Lay_StartTableWide (2);
/***** Country *****/ /***** Country *****/
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
@ -614,7 +614,7 @@ static void Ins_Configuration (bool PrintView)
} }
/***** End table *****/ /***** End table *****/
fprintf (Gbl.F.Out,"</table>"); Lay_EndTable ();
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Lay_EndRoundFrame ();
@ -1408,7 +1408,7 @@ static void Ins_ListInstitutionsForEdition (void)
Usr_UsrDataConstructor (&UsrDat); Usr_UsrDataConstructor (&UsrDat);
/***** Write heading *****/ /***** Write heading *****/
fprintf (Gbl.F.Out,"<table class=\"FRAME_TBL_WIDE CELLS_PAD_2\">"); Lay_StartTableWide (2);
Ins_PutHeadInstitutionsForEdition (); Ins_PutHeadInstitutionsForEdition ();
/***** Write all the institutions *****/ /***** Write all the institutions *****/
@ -1573,7 +1573,7 @@ static void Ins_ListInstitutionsForEdition (void)
} }
/***** End table *****/ /***** End table *****/
fprintf (Gbl.F.Out,"</table>"); Lay_EndTable ();
/***** Free memory used for user's data *****/ /***** Free memory used for user's data *****/
Usr_UsrDataDestructor (&UsrDat); Usr_UsrDataDestructor (&UsrDat);

View File

@ -1445,27 +1445,19 @@ void Lay_PutRemoveButtonInline (const char *TxtButton)
void Lay_StartRoundFrameTable (const char *Width,const char *Title, void Lay_StartRoundFrameTable (const char *Width,const char *Title,
void (*FunctionToDrawContextualIcons) (void), void (*FunctionToDrawContextualIcons) (void),
const char *HelpLink, const char *HelpLink,
unsigned CellPadding) unsigned CellPadding) // CellPadding must be 0, 1, 2, 5 or 10
{ {
Lay_StartRoundFrame (Width,Title,FunctionToDrawContextualIcons,HelpLink); Lay_StartRoundFrame (Width,Title,FunctionToDrawContextualIcons,HelpLink);
Lay_StartTableWide (CellPadding);
fprintf (Gbl.F.Out,"<table class=\"FRAME_TBL_WIDE");
if (CellPadding)
fprintf (Gbl.F.Out," CELLS_PAD_%u",CellPadding); // CellPadding must be 0, 1, 2, 4 or 8
fprintf (Gbl.F.Out,"\">");
} }
void Lay_StartRoundFrameTableShadow (const char *Width,const char *Title, void Lay_StartRoundFrameTableShadow (const char *Width,const char *Title,
void (*FunctionToDrawContextualIcons) (void), void (*FunctionToDrawContextualIcons) (void),
const char *HelpLink, const char *HelpLink,
unsigned CellPadding) unsigned CellPadding) // CellPadding must be 0, 1, 2, 5 or 10
{ {
Lay_StartRoundFrameShadow (Width,Title,FunctionToDrawContextualIcons,HelpLink); Lay_StartRoundFrameShadow (Width,Title,FunctionToDrawContextualIcons,HelpLink);
Lay_StartTableWide (CellPadding);
fprintf (Gbl.F.Out,"<table class=\"FRAME_TBL_WIDE");
if (CellPadding)
fprintf (Gbl.F.Out," CELLS_PAD_%u",CellPadding); // CellPadding must be 0, 1, 2, 4 or 8
fprintf (Gbl.F.Out,"\">");
} }
void Lay_StartRoundFrame (const char *Width,const char *Title, void Lay_StartRoundFrame (const char *Width,const char *Title,
@ -1536,15 +1528,13 @@ static void Lay_StartRoundFrameInternal (const char *Width,const char *Title,
void Lay_EndRoundFrameTable (void) void Lay_EndRoundFrameTable (void)
{ {
fprintf (Gbl.F.Out,"</table>"); Lay_EndTable ();
Lay_EndRoundFrame (); Lay_EndRoundFrame ();
} }
void Lay_EndRoundFrameTableWithButton (Lay_Button_t Button,const char *TxtButton) void Lay_EndRoundFrameTableWithButton (Lay_Button_t Button,const char *TxtButton)
{ {
fprintf (Gbl.F.Out,"</table>"); Lay_EndTable ();
Lay_EndRoundFrameWithButton (Button,TxtButton); Lay_EndRoundFrameWithButton (Button,TxtButton);
} }
@ -1562,6 +1552,19 @@ void Lay_EndRoundFrame (void)
"</div>"); "</div>");
} }
void Lay_StartTableWide (unsigned CellPadding)
{
fprintf (Gbl.F.Out,"<table class=\"FRAME_TBL_WIDE");
if (CellPadding)
fprintf (Gbl.F.Out," CELLS_PAD_%u",CellPadding); // CellPadding must be 0, 1, 2, 5 or 10
fprintf (Gbl.F.Out,"\">");
}
void Lay_EndTable (void)
{
fprintf (Gbl.F.Out,"</table>");
}
/*****************************************************************************/ /*****************************************************************************/
/******* Write error message, close files, remove lock file, and exit ********/ /******* Write error message, close files, remove lock file, and exit ********/
/*****************************************************************************/ /*****************************************************************************/

View File

@ -122,6 +122,8 @@ void Lay_EndRoundFrameTable (void);
void Lay_EndRoundFrameTableWithButton (Lay_Button_t Button,const char *TxtButton); void Lay_EndRoundFrameTableWithButton (Lay_Button_t Button,const char *TxtButton);
void Lay_EndRoundFrameWithButton (Lay_Button_t Button,const char *TxtButton); void Lay_EndRoundFrameWithButton (Lay_Button_t Button,const char *TxtButton);
void Lay_EndRoundFrame (void); void Lay_EndRoundFrame (void);
void Lay_StartTableWide (unsigned CellPadding);
void Lay_EndTable (void);
void Lay_ShowErrorAndExit (const char *Message); void Lay_ShowErrorAndExit (const char *Message);
void Lay_ShowAlert (Lay_AlertType_t AlertType,const char *Message); void Lay_ShowAlert (Lay_AlertType_t AlertType,const char *Message);

View File

@ -461,7 +461,7 @@ static void Plc_ListPlacesForEdition (void)
struct Place *Plc; struct Place *Plc;
/***** Write heading *****/ /***** Write heading *****/
fprintf (Gbl.F.Out,"<table class=\"FRAME_TBL_WIDE CELLS_PAD_2\">"); Lay_StartTableWide (2);
Plc_PutHeadPlaces (); Plc_PutHeadPlaces ();
/***** Write all the places *****/ /***** Write all the places *****/
@ -523,7 +523,8 @@ static void Plc_ListPlacesForEdition (void)
Plc->NumCtrs); Plc->NumCtrs);
} }
Lay_EndRoundFrameTable (); /***** End table *****/
Lay_EndTable ();
} }
/*****************************************************************************/ /*****************************************************************************/

View File

@ -2231,10 +2231,10 @@ void Rec_ShowSharedUsrRecord (Rec_SharedRecordViewType_t TypeOfView,
/***** Show email and user's ID *****/ /***** Show email and user's ID *****/
if (ShowIDRows) if (ShowIDRows)
{ {
fprintf (Gbl.F.Out,"<table class=\"FRAME_TBL_WIDE CELLS_PAD_2\">"); Lay_StartTableWide (2);
Rec_ShowEmail (UsrDat,ClassForm); Rec_ShowEmail (UsrDat,ClassForm);
Rec_ShowUsrIDs (UsrDat,ClassForm); Rec_ShowUsrIDs (UsrDat,ClassForm);
fprintf (Gbl.F.Out,"</table>"); Lay_EndTable ();
} }
/***** Start form *****/ /***** Start form *****/
@ -2259,7 +2259,7 @@ void Rec_ShowSharedUsrRecord (Rec_SharedRecordViewType_t TypeOfView,
break; break;
} }
fprintf (Gbl.F.Out,"<table class=\"FRAME_TBL_WIDE CELLS_PAD_2\">"); Lay_StartTableWide (2);
if (ShowIDRows) if (ShowIDRows)
{ {
@ -2318,7 +2318,7 @@ void Rec_ShowSharedUsrRecord (Rec_SharedRecordViewType_t TypeOfView,
Rec_ShowOfficePhone (UsrDat,ShowData,ClassForm); Rec_ShowOfficePhone (UsrDat,ShowData,ClassForm);
} }
fprintf (Gbl.F.Out,"</table>"); Lay_EndTable ();
/***** Button and end form *****/ /***** Button and end form *****/
switch (TypeOfView) switch (TypeOfView)

View File

@ -438,7 +438,7 @@ static void Svy_ShowOneSurvey (long SvyCod,struct SurveyQuestion *SvyQst,
/***** Start table *****/ /***** Start table *****/
if (ShowOnlyThisSvyComplete) if (ShowOnlyThisSvyComplete)
fprintf (Gbl.F.Out,"<table class=\"FRAME_TBL_WIDE CELLS_PAD_2\">"); Lay_StartTableWide (2);
/***** Start date/time *****/ /***** Start date/time *****/
UniqueId++; UniqueId++;
@ -657,7 +657,7 @@ static void Svy_ShowOneSurvey (long SvyCod,struct SurveyQuestion *SvyQst,
if (ShowOnlyThisSvyComplete) if (ShowOnlyThisSvyComplete)
{ {
/***** End table *****/ /***** End table *****/
fprintf (Gbl.F.Out,"</table>"); Lay_EndTable ();
/***** End frame *****/ /***** End frame *****/
Lay_EndRoundFrame (); Lay_EndRoundFrame ();
@ -2649,7 +2649,7 @@ static void Svy_ShowFormEditOneQst (long SvyCod,struct SurveyQuestion *SvyQst,
Svy_PutParamQstCod (SvyQst->QstCod); Svy_PutParamQstCod (SvyQst->QstCod);
/***** Start table *****/ /***** Start table *****/
fprintf (Gbl.F.Out,"<table class=\"FRAME_TBL_WIDE CELLS_PAD_2\">"); Lay_StartTableWide (2);
/***** Stem *****/ /***** Stem *****/
fprintf (Gbl.F.Out,"<tr>" fprintf (Gbl.F.Out,"<tr>"
@ -2727,7 +2727,7 @@ static void Svy_ShowFormEditOneQst (long SvyCod,struct SurveyQuestion *SvyQst,
"</tr>"); "</tr>");
/***** End table *****/ /***** End table *****/
fprintf (Gbl.F.Out,"</table>"); Lay_EndTable ();
/***** Send button *****/ /***** Send button *****/
if (SvyQst->QstCod > 0) // If the question already has assigned a code if (SvyQst->QstCod > 0) // If the question already has assigned a code