diff --git a/css/swad21.78.2.css b/css/swad21.81.css similarity index 98% rename from css/swad21.78.2.css rename to css/swad21.81.css index 6b4cc8ba..a1252045 100644 --- a/css/swad21.78.2.css +++ b/css/swad21.81.css @@ -4339,14 +4339,14 @@ a.PAG:hover, .PAG_CUR } /******************************** Last clicks ********************************/ -.LC_CLK {text-align:right; vertical-align:middle; min-width:60px;} -.LC_TIM {text-align:right; vertical-align:middle; min-width:60px; max-width:60px; white-space:nowrap; overflow:hidden; text-overflow:ellipsis;} -.LC_ROL {text-align:left; vertical-align:middle; min-width:100px; max-width:100px; white-space:nowrap; overflow:hidden; text-overflow:ellipsis;} -.LC_CTY {text-align:left; vertical-align:middle; min-width:100px; max-width:100px; white-space:nowrap; overflow:hidden; text-overflow:ellipsis;} -.LC_INS {text-align:left; vertical-align:middle; min-width:100px; max-width:100px; white-space:nowrap; overflow:hidden; text-overflow:ellipsis;} -.LC_CTR {text-align:left; vertical-align:middle; min-width:100px; max-width:100px; white-space:nowrap; overflow:hidden; text-overflow:ellipsis;} -.LC_DEG {text-align:left; vertical-align:middle; min-width:150px; max-width:150px; white-space:nowrap; overflow:hidden; text-overflow:ellipsis;} -.LC_ACT {text-align:left; vertical-align:middle; min-width:200px; max-width:200px; white-space:nowrap; overflow:hidden; text-overflow:ellipsis;} +.LC_CLK {text-align:right; vertical-align:top; min-width:60px;} +.LC_TIM {text-align:right; vertical-align:top; min-width:60px; max-width:60px; white-space:nowrap; overflow:hidden; text-overflow:ellipsis;} +.LC_ROL {text-align:left; vertical-align:top; min-width:100px; max-width:100px; white-space:nowrap; overflow:hidden; text-overflow:ellipsis;} +.LC_CTY {text-align:left; vertical-align:top; min-width:100px; max-width:100px; white-space:nowrap; overflow:hidden; text-overflow:ellipsis;} +.LC_INS {text-align:left; vertical-align:top; min-width:100px; max-width:100px; white-space:nowrap; overflow:hidden; text-overflow:ellipsis;} +.LC_CTR {text-align:left; vertical-align:top; min-width:100px; max-width:100px; white-space:nowrap; overflow:hidden; text-overflow:ellipsis;} +.LC_DEG {text-align:left; vertical-align:top; min-width:150px; max-width:150px; white-space:nowrap; overflow:hidden; text-overflow:ellipsis;} +.LC_ACT {text-align:left; vertical-align:top; min-width:200px; max-width:200px; white-space:nowrap; overflow:hidden; text-overflow:ellipsis;} /********************************** Privacy **********************************/ .PRI_LIST diff --git a/swad_HTML.c b/swad_HTML.c index 362d71f6..7bb4e77f 100644 --- a/swad_HTML.c +++ b/swad_HTML.c @@ -326,16 +326,21 @@ void HTM_TR_End (void) /***************************** Table heading cells ***************************/ /*****************************************************************************/ -void HTM_TH_Title (const char *Title,HTM_HeadAlign HeadAlign) +void HTM_TH (const char *Title,HTM_HeadAlign HeadAlign) { - extern const char *The_Colors[The_NUM_THEMES]; - - HTM_TH (1,1,Title,"TIT_TBL_%s %s", - The_Colors[Gbl.Prefs.Theme],ClassAlign[HeadAlign]); + HTM_TH_Span (Title,HeadAlign,1,1,NULL); } -void HTM_TH (unsigned RowSpan,unsigned ColSpan,const char *Txt,const char *ClassFmt,...) +void HTM_TH_Begin (HTM_HeadAlign HeadAlign) { + HTM_TH_Span_Begin (HeadAlign,1,1,NULL); + } + +void HTM_TH_Span (const char *Title,HTM_HeadAlign HeadAlign, + unsigned RowSpan,unsigned ColSpan, + const char *ClassFmt,...) + { + extern const char *The_Colors[The_NUM_THEMES]; va_list ap; int NumBytesPrinted; char *Attr = NULL; @@ -353,57 +358,59 @@ void HTM_TH (unsigned RowSpan,unsigned ColSpan,const char *Txt,const char *Class if (RowSpan > 1 && ColSpan > 1) { if (Attr) - HTM_TxtF ("", - RowSpan,ColSpan,Attr); + HTM_TxtF ("", + RowSpan,ColSpan, + The_Colors[Gbl.Prefs.Theme],ClassAlign[HeadAlign],Attr); else - HTM_TxtF ("", - RowSpan,ColSpan); + HTM_TxtF ("", + RowSpan,ColSpan, + The_Colors[Gbl.Prefs.Theme],ClassAlign[HeadAlign]); } else if (RowSpan > 1) { if (Attr) - HTM_TxtF ("", - RowSpan,Attr); + HTM_TxtF ("", + RowSpan, + The_Colors[Gbl.Prefs.Theme],ClassAlign[HeadAlign],Attr); else - HTM_TxtF ("", - RowSpan); + HTM_TxtF ("", + RowSpan, + The_Colors[Gbl.Prefs.Theme],ClassAlign[HeadAlign]); } else if (ColSpan > 1) { if (Attr) - HTM_TxtF ("", - ColSpan,Attr); + HTM_TxtF ("", + ColSpan, + The_Colors[Gbl.Prefs.Theme],ClassAlign[HeadAlign],Attr); else - HTM_TxtF ("", - ColSpan); + HTM_TxtF ("", + ColSpan, + The_Colors[Gbl.Prefs.Theme],ClassAlign[HeadAlign]); } else { if (Attr) - HTM_TxtF ("", - Attr); + HTM_TxtF ("", + The_Colors[Gbl.Prefs.Theme],ClassAlign[HeadAlign],Attr); else - HTM_Txt (""); + HTM_TxtF ("", + The_Colors[Gbl.Prefs.Theme],ClassAlign[HeadAlign]); } if (ClassFmt) if (ClassFmt[0]) free (Attr); - HTM_Txt (Txt); + HTM_Txt (Title); HTM_Txt (""); } -void HTM_TH_TitleBegin (HTM_HeadAlign HeadAlign) +void HTM_TH_Span_Begin (HTM_HeadAlign HeadAlign, + unsigned RowSpan,unsigned ColSpan, + const char *ClassFmt,...) { extern const char *The_Colors[The_NUM_THEMES]; - - HTM_TH_Begin (1,1,"TIT_TBL_%s %s", - The_Colors[Gbl.Prefs.Theme],ClassAlign[HeadAlign]); - } - -void HTM_TH_Begin (unsigned RowSpan,unsigned ColSpan,const char *ClassFmt,...) - { va_list ap; int NumBytesPrinted; char *Attr = NULL; @@ -421,37 +428,44 @@ void HTM_TH_Begin (unsigned RowSpan,unsigned ColSpan,const char *ClassFmt,...) if (RowSpan > 1 && ColSpan > 1) { if (Attr) - HTM_TxtF ("", - RowSpan,ColSpan,Attr); + HTM_TxtF ("", + RowSpan,ColSpan, + The_Colors[Gbl.Prefs.Theme],ClassAlign[HeadAlign],Attr); else - HTM_TxtF ("", - RowSpan,ColSpan); + HTM_TxtF ("", + RowSpan,ColSpan, + The_Colors[Gbl.Prefs.Theme],ClassAlign[HeadAlign]); } else if (RowSpan > 1) { if (Attr) - HTM_TxtF ("", - RowSpan,Attr); + HTM_TxtF ("", + RowSpan, + The_Colors[Gbl.Prefs.Theme],ClassAlign[HeadAlign],Attr); else - HTM_TxtF ("", - RowSpan); + HTM_TxtF ("", + RowSpan, + The_Colors[Gbl.Prefs.Theme],ClassAlign[HeadAlign]); } else if (ColSpan > 1) { if (Attr) - HTM_TxtF ("", - ColSpan,Attr); + HTM_TxtF ("", + ColSpan, + The_Colors[Gbl.Prefs.Theme],ClassAlign[HeadAlign],Attr); else - HTM_TxtF ("", - ColSpan); + HTM_TxtF ("", + ColSpan, + The_Colors[Gbl.Prefs.Theme],ClassAlign[HeadAlign]); } else { if (Attr) - HTM_TxtF ("", - Attr); + HTM_TxtF ("", + The_Colors[Gbl.Prefs.Theme],ClassAlign[HeadAlign],Attr); else - HTM_Txt (""); + HTM_TxtF ("", + The_Colors[Gbl.Prefs.Theme],ClassAlign[HeadAlign]); } if (ClassFmt) diff --git a/swad_HTML.h b/swad_HTML.h index 1cebff24..6cf9b2af 100644 --- a/swad_HTML.h +++ b/swad_HTML.h @@ -74,10 +74,14 @@ void HTM_TBODY_End (void); void HTM_TR_Begin (const char *fmt,...); void HTM_TR_End (void); -void HTM_TH_Title (const char *Txt,HTM_HeadAlign HeadAlign); -void HTM_TH (unsigned RowSpan,unsigned ColSpan,const char *Txt,const char *ClassFmt,...); -void HTM_TH_TitleBegin (HTM_HeadAlign HeadAlign); -void HTM_TH_Begin (unsigned RowSpan,unsigned ColSpan,const char *ClassFmt,...); +void HTM_TH (const char *Txt,HTM_HeadAlign HeadAlign); +void HTM_TH_Begin (HTM_HeadAlign HeadAlign); +void HTM_TH_Span (const char *Title,HTM_HeadAlign HeadAlign, + unsigned RowSpan,unsigned ColSpan, + const char *ClassFmt,...); +void HTM_TH_Span_Begin (HTM_HeadAlign HeadAlign, + unsigned RowSpan,unsigned ColSpan, + const char *ClassFmt,...); void HTM_TH_End (void); void HTM_TH_Empty (unsigned NumColumns); diff --git a/swad_agenda.c b/swad_agenda.c index 65361035..c39c6181 100644 --- a/swad_agenda.c +++ b/swad_agenda.c @@ -640,7 +640,7 @@ static void Agd_WriteHeaderListEvents (const struct Agd_Agenda *Agenda, Order <= (Dat_StartEndTime_t) (Dat_NUM_START_END_TIME - 1); Order++) { - HTM_TH_TitleBegin (HTM_HEAD_LEFT); + HTM_TH_Begin (HTM_HEAD_LEFT); switch (AgendaType) { case Agd_MY_AGENDA_TODAY: @@ -677,8 +677,8 @@ static void Agd_WriteHeaderListEvents (const struct Agd_Agenda *Agenda, HTM_TH_End (); } - HTM_TH_Title (Txt_Event ,HTM_HEAD_LEFT); - HTM_TH_Title (Txt_Location,HTM_HEAD_LEFT); + HTM_TH (Txt_Event ,HTM_HEAD_LEFT); + HTM_TH (Txt_Location,HTM_HEAD_LEFT); HTM_TR_End (); } diff --git a/swad_assignment.c b/swad_assignment.c index f6508e59..23468d08 100644 --- a/swad_assignment.c +++ b/swad_assignment.c @@ -223,13 +223,13 @@ static void Asg_PutHeadForSeeing (struct Asg_Assignments *Assignments, HTM_TR_Begin (NULL); - HTM_TH (1,1,NULL,"CONTEXT_COL"); // Column for contextual icons + HTM_TH_Span (NULL,HTM_HEAD_CENTER,1,1,"CONTEXT_COL"); // Column for contextual icons for (Order = (Dat_StartEndTime_t) 0; Order <= (Dat_StartEndTime_t) (Dat_NUM_START_END_TIME - 1); Order++) { /* Begin head cell */ - HTM_TH_TitleBegin (HTM_HEAD_LEFT); + HTM_TH_Begin (HTM_HEAD_LEFT); if (!PrintView) { @@ -264,8 +264,8 @@ static void Asg_PutHeadForSeeing (struct Asg_Assignments *Assignments, /* End head cell */ HTM_TH_End (); } - HTM_TH_Title (Txt_Assignment,HTM_HEAD_LEFT); - HTM_TH_Title (Txt_Folder ,HTM_HEAD_LEFT); + HTM_TH (Txt_Assignment,HTM_HEAD_LEFT); + HTM_TH (Txt_Folder ,HTM_HEAD_LEFT); HTM_TR_End (); } diff --git a/swad_attendance.c b/swad_attendance.c index 5dbaa12a..0ecbfc8b 100644 --- a/swad_attendance.c +++ b/swad_attendance.c @@ -256,12 +256,12 @@ static void Att_ShowAllAttEvents (struct Att_Events *Events) /***** Table head *****/ HTM_TR_Begin (NULL); - HTM_TH (1,1,NULL,"CONTEXT_COL"); // Column for contextual icons + HTM_TH_Span (NULL,HTM_HEAD_CENTER,1,1,"CONTEXT_COL"); // Column for contextual icons for (Order = (Dat_StartEndTime_t) 0; Order <= (Dat_StartEndTime_t) (Dat_NUM_START_END_TIME - 1); Order++) { - HTM_TH_TitleBegin (HTM_HEAD_LEFT); + HTM_TH_Begin (HTM_HEAD_LEFT); Frm_BeginForm (ActSeeAtt); WhichGroups = Grp_GetParamWhichGroups (); @@ -284,8 +284,8 @@ static void Att_ShowAllAttEvents (struct Att_Events *Events) HTM_TH_End (); } - HTM_TH_Title (Txt_Event ,HTM_HEAD_LEFT ); - HTM_TH_Title (Txt_ROLES_PLURAL_Abc[Rol_STD][Usr_SEX_UNKNOWN],HTM_HEAD_RIGHT); + HTM_TH (Txt_Event ,HTM_HEAD_LEFT ); + HTM_TH (Txt_ROLES_PLURAL_Abc[Rol_STD][Usr_SEX_UNKNOWN],HTM_HEAD_RIGHT); HTM_TR_End (); @@ -1526,7 +1526,6 @@ static void Att_ShowEvent (struct Att_Events *Events) static void Att_ListAttOnlyMeAsStudent (struct Att_Event *Event) { extern const char *Hlp_USERS_Attendance; - extern const char *The_Colors[The_NUM_THEMES]; extern const char *Txt_Attendance; extern const char *Txt_Student_comment; extern const char *Txt_Teachers_comment; @@ -1559,9 +1558,9 @@ static void Att_ListAttOnlyMeAsStudent (struct Att_Event *Event) HTM_TH_Empty (3); if (Gbl.Usrs.Listing.WithPhotos) HTM_TH_Empty (1); - HTM_TH (1,2,Txt_ROLES_SINGUL_Abc[Rol_STD][Usr_SEX_UNKNOWN],"TIT_TBL_%s LM",The_Colors[Gbl.Prefs.Theme]); - HTM_TH_Title (Txt_Student_comment ,HTM_HEAD_LEFT); - HTM_TH_Title (Txt_Teachers_comment,HTM_HEAD_LEFT); + HTM_TH_Span (Txt_ROLES_SINGUL_Abc[Rol_STD][Usr_SEX_UNKNOWN],HTM_HEAD_LEFT,1,2,NULL); + HTM_TH (Txt_Student_comment ,HTM_HEAD_LEFT); + HTM_TH (Txt_Teachers_comment ,HTM_HEAD_LEFT); HTM_TR_End (); @@ -1639,9 +1638,9 @@ static void Att_ListAttStudents (struct Att_Events *Events, HTM_TH_Empty (3); if (Gbl.Usrs.Listing.WithPhotos) HTM_TH_Empty (1); - HTM_TH (1,2,Txt_ROLES_SINGUL_Abc[Rol_STD][Usr_SEX_UNKNOWN],"LM"); - HTM_TH_Title (Txt_Student_comment ,HTM_HEAD_LEFT); - HTM_TH_Title (Txt_Teachers_comment,HTM_HEAD_LEFT); + HTM_TH_Span (Txt_ROLES_SINGUL_Abc[Rol_STD][Usr_SEX_UNKNOWN],HTM_HEAD_LEFT,1,2,NULL); + HTM_TH (Txt_Student_comment ,HTM_HEAD_LEFT); + HTM_TH (Txt_Teachers_comment ,HTM_HEAD_LEFT); HTM_TR_End (); @@ -2699,10 +2698,8 @@ static void Att_ListEventsToSelect (const struct Att_Events *Events, /***** Heading row *****/ HTM_TR_Begin (NULL); - - HTM_TH (1,4,Txt_Event ,"LM"); - HTM_TH_Title (Txt_ROLES_PLURAL_Abc[Rol_STD][Usr_SEX_UNKNOWN],HTM_HEAD_RIGHT); - + HTM_TH_Span (Txt_Event ,HTM_HEAD_LEFT ,1,4,NULL); + HTM_TH (Txt_ROLES_PLURAL_Abc[Rol_STD][Usr_SEX_UNKNOWN],HTM_HEAD_RIGHT); HTM_TR_End (); /***** List the events *****/ @@ -2908,7 +2905,6 @@ static void Att_ListUsrsAttendanceTable (const struct Att_Events *Events, static void Att_WriteTableHeadSeveralAttEvents (const struct Att_Events *Events) { - extern const char *The_Colors[The_NUM_THEMES]; extern const char *Txt_ROLES_SINGUL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS]; extern const char *Txt_Attendance; unsigned NumAttEvent; @@ -2916,10 +2912,9 @@ static void Att_WriteTableHeadSeveralAttEvents (const struct Att_Events *Events) HTM_TR_Begin (NULL); - HTM_TH (1,Gbl.Usrs.Listing.WithPhotos ? 4 : - 3, - Txt_ROLES_SINGUL_Abc[Rol_USR][Usr_SEX_UNKNOWN], - "TIT_TBL_%s LM",The_Colors[Gbl.Prefs.Theme]); + HTM_TH_Span (Txt_ROLES_SINGUL_Abc[Rol_USR][Usr_SEX_UNKNOWN],HTM_HEAD_LEFT, + 1,Gbl.Usrs.Listing.WithPhotos ? 4 : + 3,NULL); for (NumAttEvent = 0; NumAttEvent < Events->Num; @@ -2930,7 +2925,7 @@ static void Att_WriteTableHeadSeveralAttEvents (const struct Att_Events *Events) Att_GetDataOfAttEventByCodAndCheckCrs (&Events->Lst[NumAttEvent]); /***** Put link to this attendance event *****/ - HTM_TH_TitleBegin (HTM_HEAD_CENTER); + HTM_TH_Begin (HTM_HEAD_CENTER); snprintf (StrNumAttEvent,sizeof (StrNumAttEvent),"%u",NumAttEvent + 1); Att_PutLinkAttEvent (&Events->Lst[NumAttEvent], Events->Lst[NumAttEvent].Title, @@ -2938,7 +2933,7 @@ static void Att_WriteTableHeadSeveralAttEvents (const struct Att_Events *Events) HTM_TH_End (); } - HTM_TH_Title (Txt_Attendance ,HTM_HEAD_RIGHT); + HTM_TH (Txt_Attendance ,HTM_HEAD_RIGHT); HTM_TR_End (); } diff --git a/swad_banner.c b/swad_banner.c index a107826c..c4f4d356 100644 --- a/swad_banner.c +++ b/swad_banner.c @@ -943,13 +943,13 @@ static void Ban_PutHeadBanners (void) HTM_TR_Begin (NULL); /****** Head cells *****/ - HTM_TH (1,1,NULL ,"BM"); - HTM_TH (1,1,NULL ,"BM"); - HTM_TH_Title (Txt_Code ,HTM_HEAD_RIGHT); - HTM_TH_Title (Txt_Short_name,HTM_HEAD_LEFT ); - HTM_TH_Title (Txt_Full_name ,HTM_HEAD_LEFT ); - HTM_TH_Title (Txt_Image ,HTM_HEAD_LEFT ); - HTM_TH_Title (Txt_WWW ,HTM_HEAD_LEFT ); + HTM_TH_Span (NULL ,HTM_HEAD_CENTER,1,1,"BT"); + HTM_TH_Span (NULL ,HTM_HEAD_CENTER,1,1,"BT"); + HTM_TH (Txt_Code ,HTM_HEAD_RIGHT ); + HTM_TH (Txt_Short_name,HTM_HEAD_LEFT ); + HTM_TH (Txt_Full_name ,HTM_HEAD_LEFT ); + HTM_TH (Txt_Image ,HTM_HEAD_LEFT ); + HTM_TH (Txt_WWW ,HTM_HEAD_LEFT ); /***** End table row *****/ HTM_TR_End (); diff --git a/swad_browser.c b/swad_browser.c index d3678bb6..474e3dc5 100644 --- a/swad_browser.c +++ b/swad_browser.c @@ -9823,13 +9823,13 @@ void Brw_ListDocsFound (MYSQL_RES **mysql_res,unsigned NumDocs, /***** Write heading *****/ HTM_TR_Begin (NULL); - HTM_TH (1,1,NULL ,"BM"); - HTM_TH_Title (Txt_Institution,HTM_HEAD_LEFT); - HTM_TH_Title (Txt_Center ,HTM_HEAD_LEFT); - HTM_TH_Title (Txt_Degree ,HTM_HEAD_LEFT); - HTM_TH_Title (Txt_Course ,HTM_HEAD_LEFT); - HTM_TH_Title (Txt_File_zone ,HTM_HEAD_LEFT); - HTM_TH_Title (Txt_Document ,HTM_HEAD_LEFT); + HTM_TH_Span (NULL ,HTM_HEAD_CENTER,1,1,"BT"); + HTM_TH (Txt_Institution,HTM_HEAD_LEFT ); + HTM_TH (Txt_Center ,HTM_HEAD_LEFT ); + HTM_TH (Txt_Degree ,HTM_HEAD_LEFT ); + HTM_TH (Txt_Course ,HTM_HEAD_LEFT ); + HTM_TH (Txt_File_zone ,HTM_HEAD_LEFT ); + HTM_TH (Txt_Document ,HTM_HEAD_LEFT ); HTM_TR_End (); /***** List documents found *****/ @@ -9848,7 +9848,7 @@ void Brw_ListDocsFound (MYSQL_RES **mysql_res,unsigned NumDocs, HTM_TR_Begin (NULL); /* Number of documents not hidden found */ - HTM_TH_Begin (1,7,"CM"); + HTM_TH_Span_Begin (HTM_HEAD_CENTER,1,7,NULL); HTM_Txt ("("); NumDocsHidden = NumDocs - NumDocsNotHidden; HTM_TxtF ("%u %s", diff --git a/swad_building.c b/swad_building.c index 85546a3d..3305f54a 100644 --- a/swad_building.c +++ b/swad_building.c @@ -126,7 +126,7 @@ void Bld_SeeBuildings (void) Order <= (Bld_Order_t) (Bld_NUM_ORDERS - 1); Order++) { - HTM_TH_TitleBegin (HTM_HEAD_LEFT); + HTM_TH_Begin (HTM_HEAD_LEFT); Frm_BeginForm (ActSeeBld); Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order); HTM_BUTTON_OnSubmit_Begin (Txt_BUILDINGS_HELP_ORDER[Order], @@ -778,11 +778,11 @@ static void Bld_PutHeadBuildings (void) HTM_TR_Begin (NULL); - HTM_TH (1,1,NULL ,"BM"); - HTM_TH_Title (Txt_Code ,HTM_HEAD_RIGHT); - HTM_TH_Title (Txt_Short_name,HTM_HEAD_LEFT ); - HTM_TH_Title (Txt_Full_name ,HTM_HEAD_LEFT ); - HTM_TH_Title (Txt_Location ,HTM_HEAD_LEFT ); + HTM_TH_Span (NULL ,HTM_HEAD_CENTER,1,1,"BT"); + HTM_TH (Txt_Code ,HTM_HEAD_RIGHT); + HTM_TH (Txt_Short_name,HTM_HEAD_LEFT ); + HTM_TH (Txt_Full_name ,HTM_HEAD_LEFT ); + HTM_TH (Txt_Location ,HTM_HEAD_LEFT ); HTM_TR_End (); } diff --git a/swad_center.c b/swad_center.c index e323c7ec..82db0ac1 100644 --- a/swad_center.c +++ b/swad_center.c @@ -130,8 +130,8 @@ void Ctr_SeeCtrWithPendingDegs (void) /***** Wrtie heading *****/ HTM_TR_Begin (NULL); - HTM_TH_Title (Txt_Center ,HTM_HEAD_LEFT ); - HTM_TH_Title (Txt_Degrees_ABBREVIATION,HTM_HEAD_RIGHT); + HTM_TH (Txt_Center ,HTM_HEAD_LEFT ); + HTM_TH (Txt_Degrees_ABBREVIATION,HTM_HEAD_RIGHT); HTM_TR_End (); @@ -1437,7 +1437,7 @@ static void Ctr_PutHeadCentersForSeeing (bool OrderSelectable) Order <= (Ctr_Order_t) (Ctr_NUM_ORDERS - 1); Order++) { - HTM_TH_TitleBegin (Align[Order]); + HTM_TH_Begin (Align[Order]); if (OrderSelectable) { Frm_BeginForm (ActSeeCtr); @@ -1458,10 +1458,10 @@ static void Ctr_PutHeadCentersForSeeing (bool OrderSelectable) HTM_TH_End (); } - HTM_TH_Title (Txt_Place ,HTM_HEAD_LEFT ); - HTM_TH_Title (Txt_Degrees_ABBREVIATION,HTM_HEAD_RIGHT); - HTM_TH_Title (Txt_Courses_ABBREVIATION,HTM_HEAD_RIGHT); - HTM_TH_TitleBegin (HTM_HEAD_RIGHT); + HTM_TH (Txt_Place ,HTM_HEAD_LEFT ); + HTM_TH (Txt_Degrees_ABBREVIATION,HTM_HEAD_RIGHT); + HTM_TH (Txt_Courses_ABBREVIATION,HTM_HEAD_RIGHT); + HTM_TH_Begin (HTM_HEAD_RIGHT); HTM_TxtF ("%s+",Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH]); HTM_BR (); HTM_Txt (Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD]); @@ -1490,20 +1490,20 @@ static void Ctr_PutHeadCentersForEdition (void) HTM_TR_Begin (NULL); HTM_TH_Empty (1); - HTM_TH_Title (Txt_Code ,HTM_HEAD_RIGHT); + HTM_TH (Txt_Code ,HTM_HEAD_RIGHT); HTM_TH_Empty (1); - HTM_TH_Title (Txt_Place ,HTM_HEAD_LEFT ); - HTM_TH_Title (Txt_Short_name_of_the_center,HTM_HEAD_LEFT ); - HTM_TH_Title (Txt_Full_name_of_the_center ,HTM_HEAD_LEFT ); - HTM_TH_Title (Txt_WWW ,HTM_HEAD_LEFT ); - HTM_TH_Title (Txt_Users ,HTM_HEAD_RIGHT); - HTM_TH_Title (Txt_Degrees_ABBREVIATION ,HTM_HEAD_RIGHT); - HTM_TH_Begin (1,1,"RM"); + HTM_TH (Txt_Place ,HTM_HEAD_LEFT ); + HTM_TH (Txt_Short_name_of_the_center,HTM_HEAD_LEFT ); + HTM_TH (Txt_Full_name_of_the_center ,HTM_HEAD_LEFT ); + HTM_TH (Txt_WWW ,HTM_HEAD_LEFT ); + HTM_TH (Txt_Users ,HTM_HEAD_RIGHT); + HTM_TH (Txt_Degrees_ABBREVIATION ,HTM_HEAD_RIGHT); + HTM_TH_Begin (HTM_HEAD_RIGHT); HTM_TxtF ("%s+",Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH]); HTM_BR (); HTM_Txt (Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD]); HTM_TH_End (); - HTM_TH_Title (Txt_Requester ,HTM_HEAD_LEFT ); + HTM_TH (Txt_Requester ,HTM_HEAD_LEFT ); HTM_TH_Empty (1); HTM_TR_End (); diff --git a/swad_changelog.h b/swad_changelog.h index 8d30a975..e64947fa 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -602,10 +602,12 @@ TODO: FIX BUG, URGENT! En las fechas como par TODO: En las encuestas, que los estudiantes no puedan ver los resultados hasta que no finalice el plazo. */ -#define Log_PLATFORM_VERSION "SWAD 21.80 (2022-01-01)" -#define CSS_FILE "swad21.78.2.css" +#define Log_PLATFORM_VERSION "SWAD 21.81.1 (2022-01-02)" +#define CSS_FILE "swad21.81.css" #define JS_FILE "swad21.78.2.js" /* + Version 21.81.1: Jan 02, 2022 Fixed bug in projects. (322460 lines) + Version 21.81: Jan 02, 2022 Code refactoring on table heads. (322457 lines) Version 21.80: Jan 01, 2022 Working on design of dark theme. (322456 lines) Version 21.79: Dec 31, 2021 Working on design of dark theme. (322466 lines) Version 21.78.3: Dec 30, 2021 Working on design of dark theme. (322440 lines) diff --git a/swad_chat.c b/swad_chat.c index 463931fb..7222ea2a 100644 --- a/swad_chat.c +++ b/swad_chat.c @@ -263,8 +263,8 @@ void Cht_ShowListOfChatRoomsWithUsrs (void) /***** Write heading *****/ HTM_TR_Begin (NULL); - HTM_TH_Title (Txt_CHAT_Room_code ,HTM_HEAD_CENTER); - HTM_TH_Title (Txt_Number_of_users,HTM_HEAD_LEFT ); + HTM_TH (Txt_CHAT_Room_code ,HTM_HEAD_CENTER); + HTM_TH (Txt_Number_of_users,HTM_HEAD_LEFT ); HTM_TR_End (); /***** Loop over chat rooms *****/ diff --git a/swad_country.c b/swad_country.c index 36d922f3..86f729f2 100644 --- a/swad_country.c +++ b/swad_country.c @@ -129,8 +129,8 @@ void Cty_SeeCtyWithPendingInss (void) /***** Write heading *****/ HTM_TR_Begin (NULL); - HTM_TH_Title (Txt_Country ,HTM_HEAD_LEFT ); - HTM_TH_Title (Txt_Institutions_ABBREVIATION,HTM_HEAD_RIGHT); + HTM_TH (Txt_Country ,HTM_HEAD_LEFT ); + HTM_TH (Txt_Institutions_ABBREVIATION,HTM_HEAD_RIGHT); HTM_TR_End (); /***** List the countries *****/ @@ -364,7 +364,7 @@ static void Cty_PutHeadCountriesForSeeing (bool OrderSelectable) Order <= (Cty_Order_t) (Cty_NUM_ORDERS - 1); Order++) { - HTM_TH_TitleBegin (Align[Order]); + HTM_TH_Begin (Align[Order]); if (OrderSelectable) { Frm_BeginForm (ActSeeCty); @@ -384,11 +384,11 @@ static void Cty_PutHeadCountriesForSeeing (bool OrderSelectable) } HTM_TH_End (); } - HTM_TH_Title (Txt_Institutions_ABBREVIATION,HTM_HEAD_RIGHT); - HTM_TH_Title (Txt_Centers_ABBREVIATION ,HTM_HEAD_RIGHT); - HTM_TH_Title (Txt_Degrees_ABBREVIATION ,HTM_HEAD_RIGHT); - HTM_TH_Title (Txt_Courses_ABBREVIATION ,HTM_HEAD_RIGHT); - HTM_TH_TitleBegin (HTM_HEAD_RIGHT); + HTM_TH (Txt_Institutions_ABBREVIATION,HTM_HEAD_RIGHT); + HTM_TH (Txt_Centers_ABBREVIATION ,HTM_HEAD_RIGHT); + HTM_TH (Txt_Degrees_ABBREVIATION ,HTM_HEAD_RIGHT); + HTM_TH (Txt_Courses_ABBREVIATION ,HTM_HEAD_RIGHT); + HTM_TH_Begin (HTM_HEAD_RIGHT); HTM_TxtF ("%s+",Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH]); HTM_BR (); HTM_Txt (Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD]); @@ -1553,14 +1553,14 @@ static void Cty_PutHeadCountriesForEdition (void) HTM_TR_Begin (NULL); - HTM_TH (1,1,NULL ,"BM"); - HTM_TH (1,1,Txt_Numeric_BR_code_BR_ISO_3166_1 ,"RM"); - HTM_TH (1,1,Txt_Alphabetic_BR_code_BR_ISO_3166_1,"RM"); + HTM_TH_Span (NULL ,HTM_HEAD_CENTER,1,1,"BT"); + HTM_TH (Txt_Numeric_BR_code_BR_ISO_3166_1 ,HTM_HEAD_RIGHT ); + HTM_TH (Txt_Alphabetic_BR_code_BR_ISO_3166_1,HTM_HEAD_RIGHT ); HTM_TH_Empty (1); - HTM_TH (1,1,Txt_Name ,"LM"); - HTM_TH (1,1,Txt_WWW ,"LM"); - HTM_TH (1,1,Txt_Users ,"RM"); - HTM_TH (1,1,Txt_Institutions_ABBREVIATION ,"RM"); + HTM_TH (Txt_Name ,HTM_HEAD_LEFT ); + HTM_TH (Txt_WWW ,HTM_HEAD_LEFT ); + HTM_TH (Txt_Users ,HTM_HEAD_RIGHT ); + HTM_TH (Txt_Institutions_ABBREVIATION ,HTM_HEAD_RIGHT ); HTM_TR_End (); } diff --git a/swad_course.c b/swad_course.c index 4b9a74b8..4db1aecc 100644 --- a/swad_course.c +++ b/swad_course.c @@ -1424,12 +1424,12 @@ static void Crs_PutHeadCoursesForSeeing (void) HTM_TR_Begin (NULL); - HTM_TH (1,1,NULL,"BM"); - HTM_TH_Title (Txt_Institutional_BR_code ,HTM_HEAD_CENTER); - HTM_TH_Title (Txt_Year_OF_A_DEGREE ,HTM_HEAD_CENTER); - HTM_TH_Title (Txt_Course ,HTM_HEAD_LEFT ); - HTM_TH_Title (Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH],HTM_HEAD_RIGHT ); - HTM_TH_Title (Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD],HTM_HEAD_RIGHT ); + HTM_TH_Span (NULL ,HTM_HEAD_CENTER,1,1,"BT"); + HTM_TH (Txt_Institutional_BR_code ,HTM_HEAD_CENTER); + HTM_TH (Txt_Year_OF_A_DEGREE ,HTM_HEAD_CENTER); + HTM_TH (Txt_Course ,HTM_HEAD_LEFT ); + HTM_TH (Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH],HTM_HEAD_RIGHT ); + HTM_TH (Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD],HTM_HEAD_RIGHT ); HTM_TH_Empty (1); HTM_TR_End (); @@ -1452,17 +1452,17 @@ static void Crs_PutHeadCoursesForEdition (void) HTM_TR_Begin (NULL); - HTM_TH (1,1,NULL,"BM"); - HTM_TH_Title (Txt_Code ,HTM_HEAD_RIGHT ); - HTM_TH_TitleBegin (HTM_HEAD_CENTER); + HTM_TH_Span (NULL ,HTM_HEAD_CENTER,1,1,"BT"); + HTM_TH (Txt_Code ,HTM_HEAD_RIGHT ); + HTM_TH_Begin (HTM_HEAD_CENTER); HTM_TxtF ("%s (%s)",Txt_Institutional_code,Txt_optional); HTM_TH_End (); - HTM_TH_Title (Txt_Year_OF_A_DEGREE ,HTM_HEAD_CENTER); - HTM_TH_Title (Txt_Short_name_of_the_course ,HTM_HEAD_LEFT ); - HTM_TH_Title (Txt_Full_name_of_the_course ,HTM_HEAD_LEFT ); - HTM_TH_Title (Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH],HTM_HEAD_RIGHT ); - HTM_TH_Title (Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD],HTM_HEAD_RIGHT ); - HTM_TH_Title (Txt_Requester ,HTM_HEAD_LEFT ); + HTM_TH (Txt_Year_OF_A_DEGREE ,HTM_HEAD_CENTER); + HTM_TH (Txt_Short_name_of_the_course ,HTM_HEAD_LEFT ); + HTM_TH (Txt_Full_name_of_the_course ,HTM_HEAD_LEFT ); + HTM_TH (Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH],HTM_HEAD_RIGHT ); + HTM_TH (Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD],HTM_HEAD_RIGHT ); + HTM_TH (Txt_Requester ,HTM_HEAD_LEFT ); HTM_TH_Empty (1); HTM_TR_End (); @@ -2285,7 +2285,7 @@ void Crs_GetAndWriteCrssOfAUsr (const struct UsrData *UsrDat,Rol_Role_t Role) /* Heading row */ HTM_TR_Begin (NULL); - HTM_TH_Begin (1,7,"LM"); + HTM_TH_Span_Begin (HTM_HEAD_LEFT,1,7,NULL); if (asprintf (&Txt,Txt_USER_in_COURSE, Role == Rol_UNK ? Txt_User[Usr_SEX_UNKNOWN] : // Role == Rol_UNK ==> any role Txt_ROLES_SINGUL_Abc[Role][UsrDat->Sex]) < 0) @@ -2298,14 +2298,14 @@ void Crs_GetAndWriteCrssOfAUsr (const struct UsrData *UsrDat,Rol_Role_t Role) HTM_TR_Begin (NULL); - HTM_TH (1,1,NULL,"BM"); - HTM_TH (1,1,NULL,"BM"); - HTM_TH_Title (Txt_Degree ,HTM_HEAD_LEFT ); - HTM_TH_Title (Txt_Year_OF_A_DEGREE ,HTM_HEAD_CENTER); - HTM_TH_Title (Txt_Course ,HTM_HEAD_LEFT ); - HTM_TH_Title (Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH],HTM_HEAD_RIGHT ); - HTM_TH_Title (Txt_ROLES_PLURAL_BRIEF_Abc[Rol_NET],HTM_HEAD_RIGHT ); - HTM_TH_Title (Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD],HTM_HEAD_RIGHT ); + HTM_TH_Span (NULL ,HTM_HEAD_CENTER,1,1,"BT"); + HTM_TH_Span (NULL ,HTM_HEAD_CENTER,1,1,"BT"); + HTM_TH (Txt_Degree ,HTM_HEAD_LEFT ); + HTM_TH (Txt_Year_OF_A_DEGREE ,HTM_HEAD_CENTER); + HTM_TH (Txt_Course ,HTM_HEAD_LEFT ); + HTM_TH (Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH],HTM_HEAD_RIGHT ); + HTM_TH (Txt_ROLES_PLURAL_BRIEF_Abc[Rol_NET],HTM_HEAD_RIGHT ); + HTM_TH (Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD],HTM_HEAD_RIGHT ); HTM_TR_End (); @@ -2360,13 +2360,13 @@ void Crs_ListCrssFound (MYSQL_RES **mysql_res,unsigned NumCrss) /***** Heading row *****/ HTM_TR_Begin (NULL); - HTM_TH (1,1,NULL,"BM"); - HTM_TH_Title (Txt_Degree ,HTM_HEAD_LEFT ); - HTM_TH_Title (Txt_Year_OF_A_DEGREE ,HTM_HEAD_CENTER); - HTM_TH_Title (Txt_Course ,HTM_HEAD_LEFT ); - HTM_TH_Title (Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH],HTM_HEAD_RIGHT ); - HTM_TH_Title (Txt_ROLES_PLURAL_BRIEF_Abc[Rol_NET],HTM_HEAD_RIGHT ); - HTM_TH_Title (Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD],HTM_HEAD_RIGHT ); + HTM_TH_Span (NULL ,HTM_HEAD_CENTER,1,1,"BT"); + HTM_TH (Txt_Degree ,HTM_HEAD_LEFT ); + HTM_TH (Txt_Year_OF_A_DEGREE ,HTM_HEAD_CENTER); + HTM_TH (Txt_Course ,HTM_HEAD_LEFT ); + HTM_TH (Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH],HTM_HEAD_RIGHT ); + HTM_TH (Txt_ROLES_PLURAL_BRIEF_Abc[Rol_NET],HTM_HEAD_RIGHT ); + HTM_TH (Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD],HTM_HEAD_RIGHT ); HTM_TR_End (); diff --git a/swad_degree.c b/swad_degree.c index 59279a5e..0b247cfc 100644 --- a/swad_degree.c +++ b/swad_degree.c @@ -133,8 +133,8 @@ void Deg_SeeDegWithPendingCrss (void) /***** Write heading *****/ HTM_TR_Begin (NULL); - HTM_TH_Title (Txt_Degree ,HTM_HEAD_LEFT ); - HTM_TH_Title (Txt_Courses_ABBREVIATION,HTM_HEAD_RIGHT); + HTM_TH (Txt_Degree ,HTM_HEAD_LEFT ); + HTM_TH (Txt_Courses_ABBREVIATION,HTM_HEAD_RIGHT); HTM_TR_End (); /***** List the degrees *****/ @@ -630,12 +630,12 @@ static void Deg_PutHeadDegreesForSeeing (void) HTM_TR_Begin (NULL); - HTM_TH (1,1,NULL,"BM"); + HTM_TH_Span (NULL ,HTM_HEAD_CENTER,1,1,"BT"); HTM_TH_Empty (1); - HTM_TH_Title (Txt_Degree ,HTM_HEAD_LEFT ); - HTM_TH_Title (Txt_Type ,HTM_HEAD_LEFT ); - HTM_TH_Title (Txt_Courses_ABBREVIATION,HTM_HEAD_RIGHT); - HTM_TH_TitleBegin (HTM_HEAD_RIGHT); + HTM_TH (Txt_Degree ,HTM_HEAD_LEFT ); + HTM_TH (Txt_Type ,HTM_HEAD_LEFT ); + HTM_TH (Txt_Courses_ABBREVIATION,HTM_HEAD_RIGHT ); + HTM_TH_Begin (HTM_HEAD_RIGHT); HTM_TxtF ("%s+",Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH]); HTM_BR (); HTM_Txt (Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD]); @@ -662,20 +662,20 @@ static void Deg_PutHeadDegreesForEdition (void) HTM_TR_Begin (NULL); - HTM_TH (1,1,NULL,"BM"); - HTM_TH_Title (Txt_Code ,HTM_HEAD_RIGHT); + HTM_TH_Span (NULL ,HTM_HEAD_CENTER,1,1,"BT"); + HTM_TH (Txt_Code ,HTM_HEAD_RIGHT); HTM_TH_Empty (1); - HTM_TH_Title (Txt_Short_name_of_the_degree,HTM_HEAD_LEFT ); - HTM_TH_Title (Txt_Full_name_of_the_degree ,HTM_HEAD_LEFT ); - HTM_TH_Title (Txt_Type ,HTM_HEAD_LEFT ); - HTM_TH_Title (Txt_WWW ,HTM_HEAD_LEFT ); - HTM_TH_Title (Txt_Courses_ABBREVIATION ,HTM_HEAD_RIGHT); - HTM_TH_TitleBegin (HTM_HEAD_RIGHT); + HTM_TH (Txt_Short_name_of_the_degree,HTM_HEAD_LEFT ); + HTM_TH (Txt_Full_name_of_the_degree ,HTM_HEAD_LEFT ); + HTM_TH (Txt_Type ,HTM_HEAD_LEFT ); + HTM_TH (Txt_WWW ,HTM_HEAD_LEFT ); + HTM_TH (Txt_Courses_ABBREVIATION ,HTM_HEAD_RIGHT); + HTM_TH_Begin (HTM_HEAD_RIGHT); HTM_TxtF ("%s+",Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH]); HTM_BR (); HTM_Txt (Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD]); HTM_TH_End (); - HTM_TH_Title (Txt_Requester ,HTM_HEAD_LEFT ); + HTM_TH (Txt_Requester ,HTM_HEAD_LEFT ); HTM_TH_Empty (1); HTM_TR_End (); diff --git a/swad_degree_type.c b/swad_degree_type.c index a92a05f8..39820fd5 100644 --- a/swad_degree_type.c +++ b/swad_degree_type.c @@ -532,7 +532,7 @@ static void DegTyp_PutHeadDegreeTypesForSeeing (Act_Action_t NextAction, Order <= (DegTyp_Order_t) (DegTyp_NUM_ORDERS - 1); Order++) { - HTM_TH_TitleBegin (Align[Order]); + HTM_TH_Begin (Align[Order]); /* Begin form to change order */ Frm_BeginForm (NextAction); @@ -575,10 +575,10 @@ static void DegTyp_PutHeadDegreeTypesForEdition (void) HTM_TR_Begin (NULL); - HTM_TH (1,1,NULL,"BM"); - HTM_TH_Title (Txt_Code ,HTM_HEAD_CENTER); - HTM_TH_Title (Txt_Type_of_degree,HTM_HEAD_CENTER); - HTM_TH_Title (Txt_Degrees ,HTM_HEAD_RIGHT ); + HTM_TH_Span (NULL ,HTM_HEAD_CENTER,1,1,"BT"); + HTM_TH (Txt_Code ,HTM_HEAD_CENTER); + HTM_TH (Txt_Type_of_degree,HTM_HEAD_CENTER); + HTM_TH (Txt_Degrees ,HTM_HEAD_RIGHT ); HTM_TR_End (); } diff --git a/swad_department.c b/swad_department.c index 5c784df7..4cf88f02 100644 --- a/swad_department.c +++ b/swad_department.c @@ -146,7 +146,7 @@ void Dpt_SeeDepts (void) Order <= (Dpt_Order_t) (Dpt_NUM_ORDERS - 1); Order++) { - HTM_TH_TitleBegin (Align[Order]); + HTM_TH_Begin (Align[Order]); Frm_BeginForm (ActSeeDpt); Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order); @@ -824,10 +824,10 @@ static void Dpt_PutFormToCreateDepartment (void) /***** Write heading *****/ HTM_TR_Begin (NULL); - HTM_TH_Title (Txt_Institution,HTM_HEAD_LEFT ); - HTM_TH_Title (Txt_Short_name ,HTM_HEAD_LEFT ); - HTM_TH_Title (Txt_Full_name ,HTM_HEAD_LEFT ); - HTM_TH_Title (Txt_WWW ,HTM_HEAD_LEFT ); + HTM_TH (Txt_Institution,HTM_HEAD_LEFT ); + HTM_TH (Txt_Short_name ,HTM_HEAD_LEFT ); + HTM_TH (Txt_Full_name ,HTM_HEAD_LEFT ); + HTM_TH (Txt_WWW ,HTM_HEAD_LEFT ); HTM_TR_End (); HTM_TR_Begin (NULL); @@ -899,12 +899,12 @@ static void Dpt_PutHeadDepartments (void) HTM_TR_Begin (NULL); HTM_TH_Empty (1); - HTM_TH_Title (Txt_Code ,HTM_HEAD_RIGHT); - HTM_TH_Title (Txt_Institution ,HTM_HEAD_LEFT ); - HTM_TH_Title (Txt_Short_name ,HTM_HEAD_LEFT ); - HTM_TH_Title (Txt_Full_name ,HTM_HEAD_LEFT ); - HTM_TH_Title (Txt_WWW ,HTM_HEAD_LEFT ); - HTM_TH_Title (Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH],HTM_HEAD_RIGHT); + HTM_TH (Txt_Code ,HTM_HEAD_RIGHT); + HTM_TH (Txt_Institution ,HTM_HEAD_LEFT ); + HTM_TH (Txt_Short_name ,HTM_HEAD_LEFT ); + HTM_TH (Txt_Full_name ,HTM_HEAD_LEFT ); + HTM_TH (Txt_WWW ,HTM_HEAD_LEFT ); + HTM_TH (Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH],HTM_HEAD_RIGHT); HTM_TR_End (); } diff --git a/swad_enrolment.c b/swad_enrolment.c index 6078e780..c15460e0 100644 --- a/swad_enrolment.c +++ b/swad_enrolment.c @@ -2177,11 +2177,11 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected) /* Table heading */ HTM_TR_Begin (NULL); HTM_TH_Empty (1); - HTM_TH_Title (Txt_Course ,HTM_HEAD_LEFT ); - HTM_TH_Title (Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH],HTM_HEAD_RIGHT ); - HTM_TH (1,2,Txt_Requester ,"LT"); - HTM_TH_Title (Txt_Role ,HTM_HEAD_LEFT ); - HTM_TH_Title (Txt_Date ,HTM_HEAD_CENTER); + HTM_TH (Txt_Course ,HTM_HEAD_LEFT ); + HTM_TH (Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH],HTM_HEAD_RIGHT ); + HTM_TH_Span (Txt_Requester ,HTM_HEAD_LEFT ,1,2,NULL); + HTM_TH (Txt_Role ,HTM_HEAD_LEFT ); + HTM_TH (Txt_Date ,HTM_HEAD_CENTER); HTM_TH_Empty (2); HTM_TR_End (); diff --git a/swad_exam.c b/swad_exam.c index a04e1b84..68becb0e 100644 --- a/swad_exam.c +++ b/swad_exam.c @@ -248,13 +248,13 @@ static void Exa_ListAllExams (struct Exa_Exams *Exams) HTM_TABLE_BeginWideMarginPadding (5); HTM_TR_Begin (NULL); if (Exa_CheckIfICanEditExams ()) - HTM_TH (1,1,NULL,"CONTEXT_COL"); // Column for contextual icons + HTM_TH_Span (NULL,HTM_HEAD_CENTER,1,1,"CONTEXT_COL"); // Column for contextual icons for (Order = (Exa_Order_t) 0; Order <= (Exa_Order_t) (Exa_NUM_ORDERS - 1); Order++) { - HTM_TH_TitleBegin (HTM_HEAD_LEFT); + HTM_TH_Begin (HTM_HEAD_LEFT); /* Form to change order */ Frm_BeginForm (ActSeeAllExa); @@ -273,7 +273,7 @@ static void Exa_ListAllExams (struct Exa_Exams *Exams) HTM_TH_End (); } - HTM_TH_Title (Txt_Sessions,HTM_HEAD_RIGHT); + HTM_TH (Txt_Sessions,HTM_HEAD_RIGHT); HTM_TR_End (); diff --git a/swad_exam_log.c b/swad_exam_log.c index f7539d93..4dd4456e 100644 --- a/swad_exam_log.c +++ b/swad_exam_log.c @@ -266,14 +266,14 @@ void ExaLog_ShowExamLog (const struct ExaPrn_Print *Print) /***** Write heading *****/ HTM_TR_Begin (NULL); - HTM_TH_Title (Txt_Click ,HTM_HEAD_RIGHT ); - HTM_TH_Title (Txt_Date_and_time,HTM_HEAD_LEFT ); - HTM_TH_Title (Txt_Action ,HTM_HEAD_LEFT ); - HTM_TH_Title (Txt_Question ,HTM_HEAD_RIGHT ); - HTM_TH_Title (Txt_EXAM_Open ,HTM_HEAD_CENTER); - HTM_TH_Title (Txt_IP ,HTM_HEAD_LEFT ); - HTM_TH_Title (Txt_Session ,HTM_HEAD_LEFT ); - HTM_TH_Title (Txt_Web_browser ,HTM_HEAD_LEFT ); + HTM_TH (Txt_Click ,HTM_HEAD_RIGHT ); + HTM_TH (Txt_Date_and_time,HTM_HEAD_LEFT ); + HTM_TH (Txt_Action ,HTM_HEAD_LEFT ); + HTM_TH (Txt_Question ,HTM_HEAD_RIGHT ); + HTM_TH (Txt_EXAM_Open ,HTM_HEAD_CENTER); + HTM_TH (Txt_IP ,HTM_HEAD_LEFT ); + HTM_TH (Txt_Session ,HTM_HEAD_LEFT ); + HTM_TH (Txt_Web_browser ,HTM_HEAD_LEFT ); HTM_TR_End (); /***** Write clicks *****/ diff --git a/swad_exam_result.c b/swad_exam_result.c index e3c4df09..8372e639 100644 --- a/swad_exam_result.c +++ b/swad_exam_result.c @@ -608,7 +608,7 @@ static void ExaRes_ListExamsToSelect (struct Exa_Exams *Exams) /***** Heading row *****/ HTM_TR_Begin (NULL); HTM_TH_Empty (2); - HTM_TH_Title (Txt_Exam,HTM_HEAD_LEFT); + HTM_TH (Txt_Exam,HTM_HEAD_LEFT); HTM_TR_End (); /***** List the sessions *****/ @@ -693,42 +693,42 @@ static void ExaRes_ShowHeaderResults (Usr_MeOrOther_t MeOrOther) /***** First row *****/ HTM_TR_Begin (NULL); - HTM_TH (3,2,Txt_User[MeOrOther == Usr_ME ? Gbl.Usrs.Me.UsrDat.Sex : - Usr_SEX_UNKNOWN], - "CT LINE_BOTTOM"); - HTM_TH (3,1,Txt_START_END_TIME[Dat_STR_TIME],"LT LINE_BOTTOM"); - HTM_TH (3,1,Txt_START_END_TIME[Dat_END_TIME],"LT LINE_BOTTOM"); - HTM_TH (3,1,Txt_Session ,"LT LINE_BOTTOM"); - HTM_TH (1,3,Txt_Questions ,"CT LINE_LEFT"); - HTM_TH (1,5,Txt_Valid_answers ,"CT LINE_LEFT"); - HTM_TH (1,2,Txt_Score ,"CT LINE_LEFT"); - HTM_TH (3,1,Txt_Grade ,"RT LINE_BOTTOM LINE_LEFT"); - HTM_TH (3,1,NULL ,"LINE_BOTTOM LINE_LEFT"); + HTM_TH_Span (Txt_User[MeOrOther == Usr_ME ? + Gbl.Usrs.Me.UsrDat.Sex : + Usr_SEX_UNKNOWN ],HTM_HEAD_CENTER,3,2,"LINE_BOTTOM"); + HTM_TH_Span (Txt_START_END_TIME[Dat_STR_TIME] ,HTM_HEAD_LEFT ,3,1,"LINE_BOTTOM"); + HTM_TH_Span (Txt_START_END_TIME[Dat_END_TIME] ,HTM_HEAD_LEFT ,3,1,"LINE_BOTTOM"); + HTM_TH_Span (Txt_Session ,HTM_HEAD_LEFT ,3,1,"LINE_BOTTOM"); + HTM_TH_Span (Txt_Questions ,HTM_HEAD_CENTER,1,3,"LINE_LEFT"); + HTM_TH_Span (Txt_Valid_answers ,HTM_HEAD_CENTER,1,5,"LINE_LEFT"); + HTM_TH_Span (Txt_Score ,HTM_HEAD_CENTER,1,2,"LINE_LEFT"); + HTM_TH_Span (Txt_Grade ,HTM_HEAD_RIGHT ,3,1,"LINE_BOTTOM LINE_LEFT"); + HTM_TH_Span (NULL ,HTM_HEAD_CENTER,3,1,"LINE_BOTTOM LINE_LEFT"); HTM_TR_End (); /***** Second row *****/ HTM_TR_Begin (NULL); - HTM_TH (2,1,Txt_total ,"RT LINE_BOTTOM LINE_LEFT"); - HTM_TH (2,1,Txt_QUESTIONS_valid ,"RT LINE_BOTTOM"); - HTM_TH (2,1,Txt_QUESTIONS_invalid,"RT LINE_BOTTOM"); - HTM_TH (1,1,Txt_ANSWERS_correct ,"RT LINE_LEFT"); - HTM_TH (1,3,Txt_ANSWERS_wrong ,"CT"); - HTM_TH (1,1,Txt_ANSWERS_blank ,"RT"); - HTM_TH (1,1,Txt_total ,"RT LINE_LEFT"); - HTM_TH (1,1,Txt_average ,"RT"); + HTM_TH_Span (Txt_total ,HTM_HEAD_RIGHT ,2,1,"LINE_BOTTOM LINE_LEFT"); + HTM_TH_Span (Txt_QUESTIONS_valid ,HTM_HEAD_RIGHT ,2,1,"LINE_BOTTOM"); + HTM_TH_Span (Txt_QUESTIONS_invalid ,HTM_HEAD_RIGHT ,2,1,"LINE_BOTTOM"); + HTM_TH_Span (Txt_ANSWERS_correct ,HTM_HEAD_RIGHT ,1,1,"LINE_LEFT"); + HTM_TH_Span (Txt_ANSWERS_wrong ,HTM_HEAD_CENTER,1,3,NULL); + HTM_TH_Span (Txt_ANSWERS_blank ,HTM_HEAD_RIGHT ,1,1,NULL); + HTM_TH_Span (Txt_total ,HTM_HEAD_RIGHT ,1,1,"LINE_LEFT"); + HTM_TH_Span (Txt_average ,HTM_HEAD_RIGHT ,1,1,NULL); HTM_TR_End (); /***** Third row *****/ HTM_TR_Begin (NULL); - HTM_TH (1,1,"{pi=1}" ,"RT LINE_BOTTOM LINE_LEFT"); - HTM_TH (1,1,"{-1≤pi<0}","RT LINE_BOTTOM"); - HTM_TH (1,1,"{pi=0}" ,"RT LINE_BOTTOM"); - HTM_TH (1,1,"{0<pi<1}" ,"RT LINE_BOTTOM"); - HTM_TH (1,1,"{pi=0}" ,"RT LINE_BOTTOM"); - HTM_TH (1,1,"Σpi" ,"RT LINE_BOTTOM LINE_LEFT"); - HTM_TH (1,1,"-1≤" - "p" - "≤1" ,"RT LINE_BOTTOM"); + HTM_TH_Span ("{pi=1}" ,HTM_HEAD_RIGHT ,1,1,"LINE_BOTTOM LINE_LEFT"); + HTM_TH_Span ("{-1≤pi<0}",HTM_HEAD_RIGHT ,1,1,"LINE_BOTTOM"); + HTM_TH_Span ("{pi=0}" ,HTM_HEAD_RIGHT ,1,1,"LINE_BOTTOM"); + HTM_TH_Span ("{0<pi<1}" ,HTM_HEAD_RIGHT ,1,1,"LINE_BOTTOM"); + HTM_TH_Span ("{pi=0}" ,HTM_HEAD_RIGHT ,1,1,"LINE_BOTTOM"); + HTM_TH_Span ("Σpi" ,HTM_HEAD_RIGHT ,1,1,"LINE_BOTTOM LINE_LEFT"); + HTM_TH_Span ("-1≤" + "p" + "≤1" ,HTM_HEAD_RIGHT ,1,1,"LINE_BOTTOM"); HTM_TR_End (); } diff --git a/swad_exam_session.c b/swad_exam_session.c index 3b247ae8..bfb9404b 100644 --- a/swad_exam_session.c +++ b/swad_exam_session.c @@ -368,11 +368,11 @@ static void ExaSes_ListOneOrMoreSessionsHeading (bool ICanEditSessions) HTM_TH_Empty (1); /***** The rest of columns *****/ - HTM_TH_Title (Txt_ROLES_SINGUL_Abc[Rol_TCH][Usr_SEX_UNKNOWN],HTM_HEAD_LEFT ); - HTM_TH_Title (Txt_START_END_TIME[Exa_ORDER_BY_START_DATE] ,HTM_HEAD_LEFT ); - HTM_TH_Title (Txt_START_END_TIME[Exa_ORDER_BY_END_DATE ] ,HTM_HEAD_LEFT ); - HTM_TH_Title (Txt_Session ,HTM_HEAD_LEFT ); - HTM_TH_Title (Txt_Results ,HTM_HEAD_CENTER); + HTM_TH (Txt_ROLES_SINGUL_Abc[Rol_TCH][Usr_SEX_UNKNOWN],HTM_HEAD_LEFT ); + HTM_TH (Txt_START_END_TIME[Exa_ORDER_BY_START_DATE] ,HTM_HEAD_LEFT ); + HTM_TH (Txt_START_END_TIME[Exa_ORDER_BY_END_DATE ] ,HTM_HEAD_LEFT ); + HTM_TH (Txt_Session ,HTM_HEAD_LEFT ); + HTM_TH (Txt_Results ,HTM_HEAD_CENTER); /***** End row *****/ HTM_TR_End (); diff --git a/swad_exam_set.c b/swad_exam_set.c index 4f5148d0..9189c3db 100644 --- a/swad_exam_set.c +++ b/swad_exam_set.c @@ -915,10 +915,10 @@ static void ExaSet_PutTableHeadingForSets (void) /***** Header cells *****/ HTM_TH_Empty (1); - HTM_TH_Title (Txt_No_INDEX ,HTM_HEAD_RIGHT); - HTM_TH_Title (Txt_Set_of_questions ,HTM_HEAD_LEFT ); - HTM_TH_Title (Txt_Number_of_questions ,HTM_HEAD_RIGHT); - HTM_TH_Title (Txt_Number_of_questions_to_show,HTM_HEAD_RIGHT); + HTM_TH (Txt_No_INDEX ,HTM_HEAD_RIGHT); + HTM_TH (Txt_Set_of_questions ,HTM_HEAD_LEFT ); + HTM_TH (Txt_Number_of_questions ,HTM_HEAD_RIGHT); + HTM_TH (Txt_Number_of_questions_to_show,HTM_HEAD_RIGHT); /***** End row *****/ HTM_TR_End (); @@ -973,8 +973,8 @@ static void ExaSet_ListOneOrMoreQuestionsForEdition (struct Exa_Exams *Exams, HTM_TR_Begin (NULL); HTM_TH_Empty (1); - HTM_TH_Title (Txt_No_INDEX,HTM_HEAD_CENTER); - HTM_TH_Title (Txt_Question,HTM_HEAD_CENTER); + HTM_TH (Txt_No_INDEX,HTM_HEAD_CENTER); + HTM_TH (Txt_Question,HTM_HEAD_CENTER); HTM_TR_End (); diff --git a/swad_figure.c b/swad_figure.c index b7afda34..e75a58df 100644 --- a/swad_figure.c +++ b/swad_figure.c @@ -409,10 +409,10 @@ static void Usr_GetAndShowUsersStats (void) /***** Write heading *****/ HTM_TR_Begin (NULL); - HTM_TH_Title (Txt_Users ,HTM_HEAD_RIGHT); - HTM_TH_Title (Txt_Number_of_users ,HTM_HEAD_RIGHT); - HTM_TH_Title (Txt_Average_number_of_courses_to_which_a_user_belongs,HTM_HEAD_RIGHT); - HTM_TH_Title (Txt_Average_number_of_users_belonging_to_a_course ,HTM_HEAD_RIGHT); + HTM_TH (Txt_Users ,HTM_HEAD_RIGHT); + HTM_TH (Txt_Number_of_users ,HTM_HEAD_RIGHT); + HTM_TH (Txt_Average_number_of_courses_to_which_a_user_belongs,HTM_HEAD_RIGHT); + HTM_TH (Txt_Average_number_of_users_belonging_to_a_course ,HTM_HEAD_RIGHT); HTM_TR_End (); /***** Figures *****/ @@ -423,7 +423,7 @@ static void Usr_GetAndShowUsersStats (void) /***** Separator *****/ HTM_TR_Begin (NULL); - HTM_TH (1,4,NULL,"SEPAR_ROW"); + HTM_TH_Span (NULL,HTM_HEAD_CENTER,1,4,"SEPAR_ROW"); HTM_TR_End (); Fig_GetAndShowNumUsrsNotBelongingToAnyCrs (); // Users not beloging to any course @@ -550,13 +550,13 @@ static void Usr_GetAndShowUsersRanking (void) /***** Write heading *****/ HTM_TR_Begin (NULL); - HTM_TH_Title (Txt_Clicks ,HTM_HEAD_CENTER); - HTM_TH_Title (Txt_Clicks_per_day,HTM_HEAD_CENTER); - HTM_TH_Title (Txt_Timeline ,HTM_HEAD_CENTER); - HTM_TH_Title (Txt_Followers ,HTM_HEAD_CENTER); - HTM_TH_Title (Txt_Downloads ,HTM_HEAD_CENTER); - HTM_TH_Title (Txt_Forums ,HTM_HEAD_CENTER); - HTM_TH_Title (Txt_Messages ,HTM_HEAD_CENTER); + HTM_TH (Txt_Clicks ,HTM_HEAD_CENTER); + HTM_TH (Txt_Clicks_per_day,HTM_HEAD_CENTER); + HTM_TH (Txt_Timeline ,HTM_HEAD_CENTER); + HTM_TH (Txt_Followers ,HTM_HEAD_CENTER); + HTM_TH (Txt_Downloads ,HTM_HEAD_CENTER); + HTM_TH (Txt_Forums ,HTM_HEAD_CENTER); + HTM_TH (Txt_Messages ,HTM_HEAD_CENTER); HTM_TR_End (); /***** Rankings *****/ @@ -643,35 +643,35 @@ static void Fig_WriteHeadHierarchy (void) HTM_TH_Empty (1); - HTM_TH_TitleBegin (HTM_HEAD_RIGHT); + HTM_TH_Begin (HTM_HEAD_RIGHT); Ico_PutIcon ("globe-americas.svg",Ico_BLACK, Txt_Countries,"ICOx16"); HTM_BR (); HTM_Txt (Txt_Countries); HTM_TH_End (); - HTM_TH_TitleBegin (HTM_HEAD_RIGHT); + HTM_TH_Begin (HTM_HEAD_RIGHT); Ico_PutIcon ("university.svg",Ico_BLACK, Txt_Institutions,"ICOx16"); HTM_BR (); HTM_Txt (Txt_Institutions); HTM_TH_End (); - HTM_TH_TitleBegin (HTM_HEAD_RIGHT); + HTM_TH_Begin (HTM_HEAD_RIGHT); Ico_PutIcon ("building.svg",Ico_BLACK, Txt_Centers,"ICOx16"); HTM_BR (); HTM_Txt (Txt_Centers); HTM_TH_End (); - HTM_TH_TitleBegin (HTM_HEAD_RIGHT); + HTM_TH_Begin (HTM_HEAD_RIGHT); Ico_PutIcon ("graduation-cap.svg",Ico_BLACK, Txt_Degrees,"ICOx16"); HTM_BR (); HTM_Txt (Txt_Degrees); HTM_TH_End (); - HTM_TH_TitleBegin (HTM_HEAD_RIGHT); + HTM_TH_Begin (HTM_HEAD_RIGHT); Ico_PutIcon ("chalkboard-teacher.svg",Ico_BLACK, Txt_Courses,"ICOx16"); HTM_BR (); @@ -1239,8 +1239,8 @@ static void Fig_ShowInss (MYSQL_RES **mysql_res,unsigned NumInss, /***** Draw institutions as a list *****/ HTM_TR_Begin (NULL); HTM_TH_Empty (1); - HTM_TH_Title (Txt_Institution,HTM_HEAD_LEFT); - HTM_TH_Title (TxtFigure ,HTM_HEAD_RIGHT); + HTM_TH (Txt_Institution,HTM_HEAD_LEFT); + HTM_TH (TxtFigure ,HTM_HEAD_RIGHT); HTM_TR_End (); for (NumIns = 1, NumOrder = 1, NumberLastRow = 0; @@ -1484,14 +1484,14 @@ static void Fig_WriteStatsExpTreesTableHead1 (void) extern const char *Txt_Size; HTM_TR_Begin (NULL); - HTM_TH_Title (Txt_File_zones,HTM_HEAD_LEFT); - HTM_TH_Title (Txt_Courses ,HTM_HEAD_RIGHT); - HTM_TH_Title (Txt_Groups ,HTM_HEAD_RIGHT); - HTM_TH_Title (Txt_Users ,HTM_HEAD_RIGHT); - HTM_TH_Title (Txt_Max_levels,HTM_HEAD_RIGHT); - HTM_TH_Title (Txt_Folders ,HTM_HEAD_RIGHT); - HTM_TH_Title (Txt_Files ,HTM_HEAD_RIGHT); - HTM_TH_Title (Txt_Size ,HTM_HEAD_RIGHT); + HTM_TH (Txt_File_zones,HTM_HEAD_LEFT); + HTM_TH (Txt_Courses ,HTM_HEAD_RIGHT); + HTM_TH (Txt_Groups ,HTM_HEAD_RIGHT); + HTM_TH (Txt_Users ,HTM_HEAD_RIGHT); + HTM_TH (Txt_Max_levels,HTM_HEAD_RIGHT); + HTM_TH (Txt_Folders ,HTM_HEAD_RIGHT); + HTM_TH (Txt_Files ,HTM_HEAD_RIGHT); + HTM_TH (Txt_Size ,HTM_HEAD_RIGHT); HTM_TR_End (); } @@ -1505,21 +1505,21 @@ static void Fig_WriteStatsExpTreesTableHead2 (void) HTM_TR_Begin (NULL); - HTM_TH_Title (Txt_File_zones,HTM_HEAD_LEFT); + HTM_TH (Txt_File_zones,HTM_HEAD_LEFT); - HTM_TH_TitleBegin (HTM_HEAD_RIGHT); + HTM_TH_Begin (HTM_HEAD_RIGHT); HTM_TxtF ("%s/",Txt_Folders); HTM_BR (); HTM_Txt (Txt_course); HTM_TH_End (); - HTM_TH_TitleBegin (HTM_HEAD_RIGHT); + HTM_TH_Begin (HTM_HEAD_RIGHT); HTM_TxtF ("%s/",Txt_Files); HTM_BR (); HTM_Txt (Txt_course); HTM_TH_End (); - HTM_TH_TitleBegin (HTM_HEAD_RIGHT); + HTM_TH_Begin (HTM_HEAD_RIGHT); HTM_TxtF ("%s/",Txt_Size); HTM_BR (); HTM_Txt (Txt_course); @@ -1538,21 +1538,21 @@ static void Fig_WriteStatsExpTreesTableHead3 (void) HTM_TR_Begin (NULL); - HTM_TH_Title (Txt_File_zones,HTM_HEAD_LEFT); + HTM_TH (Txt_File_zones,HTM_HEAD_LEFT); - HTM_TH_TitleBegin (HTM_HEAD_RIGHT); + HTM_TH_Begin (HTM_HEAD_RIGHT); HTM_TxtF ("%s/",Txt_Folders); HTM_BR (); HTM_Txt (Txt_user[Usr_SEX_UNKNOWN]); HTM_TH_End (); - HTM_TH_TitleBegin (HTM_HEAD_RIGHT); + HTM_TH_Begin (HTM_HEAD_RIGHT); HTM_TxtF ("%s/",Txt_Files); HTM_BR (); HTM_Txt (Txt_user[Usr_SEX_UNKNOWN]); HTM_TH_End (); - HTM_TH_TitleBegin (HTM_HEAD_RIGHT); + HTM_TH_Begin (HTM_HEAD_RIGHT); HTM_TxtF ("%s/",Txt_Size); HTM_BR (); HTM_Txt (Txt_user[Usr_SEX_UNKNOWN]); @@ -1804,9 +1804,9 @@ static void Brw_GetAndShowOERsStats (void) /***** Write table heading *****/ HTM_TR_Begin (NULL); - HTM_TH_Title (Txt_License ,HTM_HEAD_LEFT); - HTM_TH_Title (Txt_Number_of_private_files,HTM_HEAD_RIGHT); - HTM_TH_Title (Txt_Number_of_public_files ,HTM_HEAD_RIGHT); + HTM_TH (Txt_License ,HTM_HEAD_LEFT); + HTM_TH (Txt_Number_of_private_files,HTM_HEAD_RIGHT); + HTM_TH (Txt_Number_of_public_files ,HTM_HEAD_RIGHT); HTM_TR_End (); for (License = (Brw_License_t) 0; @@ -1905,9 +1905,9 @@ static void Prg_GetAndShowCourseProgramStats (void) // TODO: Change function fro /***** Write table heading *****/ HTM_TR_Begin (NULL); - HTM_TH_Title (Txt_Number_of_BR_program_items ,HTM_HEAD_RIGHT); - HTM_TH_Title (Txt_Number_of_BR_courses_with_BR_program_items,HTM_HEAD_RIGHT); - HTM_TH_Title (Txt_Average_number_BR_of_items_BR_per_course ,HTM_HEAD_RIGHT); + HTM_TH (Txt_Number_of_BR_program_items ,HTM_HEAD_RIGHT); + HTM_TH (Txt_Number_of_BR_courses_with_BR_program_items,HTM_HEAD_RIGHT); + HTM_TH (Txt_Average_number_BR_of_items_BR_per_course ,HTM_HEAD_RIGHT); HTM_TR_End (); /***** Write number of assignments *****/ @@ -1962,10 +1962,10 @@ static void Asg_GetAndShowAssignmentsStats (void) /***** Write table heading *****/ HTM_TR_Begin (NULL); - HTM_TH_Title (Txt_Number_of_BR_assignments ,HTM_HEAD_RIGHT); - HTM_TH_Title (Txt_Number_of_BR_courses_with_BR_assignments,HTM_HEAD_RIGHT); - HTM_TH_Title (Txt_Average_number_BR_of_ASSIG_BR_per_course,HTM_HEAD_RIGHT); - HTM_TH_Title (Txt_Number_of_BR_notifications ,HTM_HEAD_RIGHT); + HTM_TH (Txt_Number_of_BR_assignments ,HTM_HEAD_RIGHT); + HTM_TH (Txt_Number_of_BR_courses_with_BR_assignments,HTM_HEAD_RIGHT); + HTM_TH (Txt_Average_number_BR_of_ASSIG_BR_per_course,HTM_HEAD_RIGHT); + HTM_TH (Txt_Number_of_BR_notifications ,HTM_HEAD_RIGHT); HTM_TR_End (); /***** Write number of assignments *****/ @@ -2022,9 +2022,9 @@ static void Prj_GetAndShowProjectsStats (void) /***** Write table heading *****/ HTM_TR_Begin (NULL); - HTM_TH_Title (Txt_Number_of_BR_projects ,HTM_HEAD_RIGHT); - HTM_TH_Title (Txt_Number_of_BR_courses_with_BR_projects ,HTM_HEAD_RIGHT); - HTM_TH_Title (Txt_Average_number_BR_of_projects_BR_per_course,HTM_HEAD_RIGHT); + HTM_TH (Txt_Number_of_BR_projects ,HTM_HEAD_RIGHT); + HTM_TH (Txt_Number_of_BR_courses_with_BR_projects ,HTM_HEAD_RIGHT); + HTM_TH (Txt_Average_number_BR_of_projects_BR_per_course,HTM_HEAD_RIGHT); HTM_TR_End (); /***** Write number of projects *****/ @@ -2079,15 +2079,15 @@ static void Tst_GetAndShowTestsStats (void) /***** Write table heading *****/ HTM_TR_Begin (NULL); - HTM_TH_Title (Txt_Type_of_BR_answers ,HTM_HEAD_LEFT); - HTM_TH_Title (Txt_Number_of_BR_courses_BR_with_test_BR_questions ,HTM_HEAD_RIGHT); - HTM_TH_Title (Txt_Number_of_BR_courses_with_BR_exportable_BR_test_BR_questions ,HTM_HEAD_RIGHT); - HTM_TH_Title (Txt_Number_BR_of_test_BR_questions ,HTM_HEAD_RIGHT); - HTM_TH_Title (Txt_Average_BR_number_BR_of_test_BR_questions_BR_per_course ,HTM_HEAD_RIGHT); - HTM_TH_Title (Txt_Number_of_BR_times_that_BR_questions_BR_have_been_BR_responded ,HTM_HEAD_RIGHT); - HTM_TH_Title (Txt_Average_BR_number_of_BR_times_that_BR_questions_BR_have_been_BR_responded_BR_per_course,HTM_HEAD_RIGHT); - HTM_TH_Title (Txt_Average_BR_number_of_BR_times_that_BR_a_question_BR_has_been_BR_responded ,HTM_HEAD_RIGHT); - HTM_TH_Title (Txt_Average_BR_score_BR_per_question ,HTM_HEAD_RIGHT); + HTM_TH (Txt_Type_of_BR_answers ,HTM_HEAD_LEFT); + HTM_TH (Txt_Number_of_BR_courses_BR_with_test_BR_questions ,HTM_HEAD_RIGHT); + HTM_TH (Txt_Number_of_BR_courses_with_BR_exportable_BR_test_BR_questions ,HTM_HEAD_RIGHT); + HTM_TH (Txt_Number_BR_of_test_BR_questions ,HTM_HEAD_RIGHT); + HTM_TH (Txt_Average_BR_number_BR_of_test_BR_questions_BR_per_course ,HTM_HEAD_RIGHT); + HTM_TH (Txt_Number_of_BR_times_that_BR_questions_BR_have_been_BR_responded ,HTM_HEAD_RIGHT); + HTM_TH (Txt_Average_BR_number_of_BR_times_that_BR_questions_BR_have_been_BR_responded_BR_per_course,HTM_HEAD_RIGHT); + HTM_TH (Txt_Average_BR_number_of_BR_times_that_BR_a_question_BR_has_been_BR_responded ,HTM_HEAD_RIGHT); + HTM_TH (Txt_Average_BR_score_BR_per_question ,HTM_HEAD_RIGHT); HTM_TR_End (); for (AnsType = (Qst_AnswerType_t) 0; @@ -2223,9 +2223,9 @@ static void Exa_GetAndShowExamsStats (void) /***** Write table heading *****/ HTM_TR_Begin (NULL); - HTM_TH_Title (Txt_Number_of_BR_exams ,HTM_HEAD_RIGHT); - HTM_TH_Title (Txt_Number_of_BR_courses_with_BR_exams ,HTM_HEAD_RIGHT); - HTM_TH_Title (Txt_Average_number_BR_of_exams_BR_per_course,HTM_HEAD_RIGHT); + HTM_TH (Txt_Number_of_BR_exams ,HTM_HEAD_RIGHT); + HTM_TH (Txt_Number_of_BR_courses_with_BR_exams ,HTM_HEAD_RIGHT); + HTM_TH (Txt_Average_number_BR_of_exams_BR_per_course,HTM_HEAD_RIGHT); HTM_TR_End (); /***** Write number of exams *****/ @@ -2277,9 +2277,9 @@ static void Gam_GetAndShowGamesStats (void) /***** Write table heading *****/ HTM_TR_Begin (NULL); - HTM_TH_Title (Txt_Number_of_BR_games ,HTM_HEAD_RIGHT); - HTM_TH_Title (Txt_Number_of_BR_courses_with_BR_games ,HTM_HEAD_RIGHT); - HTM_TH_Title (Txt_Average_number_BR_of_games_BR_per_course,HTM_HEAD_RIGHT); + HTM_TH (Txt_Number_of_BR_games ,HTM_HEAD_RIGHT); + HTM_TH (Txt_Number_of_BR_courses_with_BR_games ,HTM_HEAD_RIGHT); + HTM_TH (Txt_Average_number_BR_of_games_BR_per_course,HTM_HEAD_RIGHT); HTM_TR_End (); /***** Write number of games *****/ @@ -2334,11 +2334,11 @@ static void Tml_GetAndShowTimelineActivityStats (void) /***** Heading row *****/ HTM_TR_Begin (NULL); - HTM_TH_Title (Txt_Type ,HTM_HEAD_LEFT); - HTM_TH_Title (Txt_Number_of_posts ,HTM_HEAD_RIGHT); - HTM_TH_Title (Txt_Number_of_users ,HTM_HEAD_RIGHT); - HTM_TH_Title (Txt_PERCENT_of_users ,HTM_HEAD_RIGHT); - HTM_TH_Title (Txt_Number_of_posts_BR_per_user,HTM_HEAD_RIGHT); + HTM_TH (Txt_Type ,HTM_HEAD_LEFT); + HTM_TH (Txt_Number_of_posts ,HTM_HEAD_RIGHT); + HTM_TH (Txt_Number_of_users ,HTM_HEAD_RIGHT); + HTM_TH (Txt_PERCENT_of_users ,HTM_HEAD_RIGHT); + HTM_TH (Txt_Number_of_posts_BR_per_user,HTM_HEAD_RIGHT); HTM_TR_End (); /***** Get total number of users *****/ @@ -2487,9 +2487,9 @@ static void Fol_GetAndShowFollowStats (void) /***** Heading row *****/ HTM_TR_Begin (NULL); - HTM_TH_Title (Txt_Users ,HTM_HEAD_LEFT); - HTM_TH_Title (Txt_Number_of_users ,HTM_HEAD_RIGHT); - HTM_TH_Title (Txt_PERCENT_of_users,HTM_HEAD_RIGHT); + HTM_TH (Txt_Users ,HTM_HEAD_LEFT); + HTM_TH (Txt_Number_of_users ,HTM_HEAD_RIGHT); + HTM_TH (Txt_PERCENT_of_users,HTM_HEAD_RIGHT); HTM_TR_End (); /***** Get total number of users *****/ @@ -2582,17 +2582,17 @@ static void For_GetAndShowForumStats (void) /***** Write table heading *****/ HTM_TR_Begin (NULL); - HTM_TH_Begin (1,1,"BT"); + HTM_TH_Span_Begin (HTM_HEAD_CENTER,1,1,"BT"); Ico_PutIcon ("comments.svg",Ico_BLACK,Txt_Scope,"ICOx16"); HTM_TH_End (); - HTM_TH_Title (Txt_Forums ,HTM_HEAD_LEFT); - HTM_TH_Title (Txt_Number_of_forums ,HTM_HEAD_RIGHT); - HTM_TH_Title (Txt_Number_of_threads ,HTM_HEAD_RIGHT); - HTM_TH_Title (Txt_Number_of_posts ,HTM_HEAD_RIGHT); - HTM_TH_Title (Txt_Number_of_BR_notifications ,HTM_HEAD_RIGHT); - HTM_TH_Title (Txt_Number_of_threads_BR_per_forum,HTM_HEAD_RIGHT); - HTM_TH_Title (Txt_Number_of_posts_BR_per_thread ,HTM_HEAD_RIGHT); - HTM_TH_Title (Txt_Number_of_posts_BR_per_forum ,HTM_HEAD_RIGHT); + HTM_TH (Txt_Forums ,HTM_HEAD_LEFT); + HTM_TH (Txt_Number_of_forums ,HTM_HEAD_RIGHT); + HTM_TH (Txt_Number_of_threads ,HTM_HEAD_RIGHT); + HTM_TH (Txt_Number_of_posts ,HTM_HEAD_RIGHT); + HTM_TH (Txt_Number_of_BR_notifications ,HTM_HEAD_RIGHT); + HTM_TH (Txt_Number_of_threads_BR_per_forum,HTM_HEAD_RIGHT); + HTM_TH (Txt_Number_of_posts_BR_per_thread ,HTM_HEAD_RIGHT); + HTM_TH (Txt_Number_of_posts_BR_per_forum ,HTM_HEAD_RIGHT); HTM_TR_End (); /***** Write a row for each type of forum *****/ @@ -2891,11 +2891,11 @@ static void Ntf_GetAndShowNumUsrsPerNotifyEvent (void) /***** Heading row *****/ HTM_TR_Begin (NULL); - HTM_TH_Title (Txt_Event ,HTM_HEAD_LEFT); - HTM_TH_Title (Txt_Number_of_users ,HTM_HEAD_RIGHT); - HTM_TH_Title (Txt_PERCENT_of_users,HTM_HEAD_RIGHT); - HTM_TH_Title (Txt_Number_of_events,HTM_HEAD_RIGHT); - HTM_TH_Title (Txt_Number_of_emails,HTM_HEAD_RIGHT); + HTM_TH (Txt_Event ,HTM_HEAD_LEFT); + HTM_TH (Txt_Number_of_users ,HTM_HEAD_RIGHT); + HTM_TH (Txt_PERCENT_of_users,HTM_HEAD_RIGHT); + HTM_TH (Txt_Number_of_events,HTM_HEAD_RIGHT); + HTM_TH (Txt_Number_of_emails,HTM_HEAD_RIGHT); HTM_TR_End (); /***** Get total number of users *****/ @@ -3060,11 +3060,11 @@ static void Not_GetAndShowNoticesStats (void) /***** Write table heading *****/ HTM_TR_Begin (NULL); - HTM_TH_Title (Txt_NOTICE_Active_BR_notices ,HTM_HEAD_RIGHT); - HTM_TH_Title (Txt_NOTICE_Obsolete_BR_notices,HTM_HEAD_RIGHT); - HTM_TH_Title (Txt_NOTICE_Deleted_BR_notices ,HTM_HEAD_RIGHT); - HTM_TH_Title (Txt_Total ,HTM_HEAD_RIGHT); - HTM_TH_Title (Txt_Number_of_BR_notifications,HTM_HEAD_RIGHT); + HTM_TH (Txt_NOTICE_Active_BR_notices ,HTM_HEAD_RIGHT); + HTM_TH (Txt_NOTICE_Obsolete_BR_notices,HTM_HEAD_RIGHT); + HTM_TH (Txt_NOTICE_Deleted_BR_notices ,HTM_HEAD_RIGHT); + HTM_TH (Txt_Total ,HTM_HEAD_RIGHT); + HTM_TH (Txt_Number_of_BR_notifications,HTM_HEAD_RIGHT); HTM_TR_End (); /***** Write number of notices *****/ @@ -3132,11 +3132,11 @@ static void Msg_GetAndShowMsgsStats (void) /***** Write table heading *****/ HTM_TR_Begin (NULL); - HTM_TH_Title (Txt_Messages ,HTM_HEAD_LEFT); - HTM_TH_Title (Txt_MSGS_Not_deleted ,HTM_HEAD_RIGHT); - HTM_TH_Title (Txt_MSGS_Deleted ,HTM_HEAD_RIGHT); - HTM_TH_Title (Txt_Total ,HTM_HEAD_RIGHT); - HTM_TH_Title (Txt_Number_of_BR_notifications,HTM_HEAD_RIGHT); + HTM_TH (Txt_Messages ,HTM_HEAD_LEFT); + HTM_TH (Txt_MSGS_Not_deleted ,HTM_HEAD_RIGHT); + HTM_TH (Txt_MSGS_Deleted ,HTM_HEAD_RIGHT); + HTM_TH (Txt_Total ,HTM_HEAD_RIGHT); + HTM_TH (Txt_Number_of_BR_notifications,HTM_HEAD_RIGHT); HTM_TR_End (); /***** Write number of messages *****/ @@ -3216,10 +3216,10 @@ static void Agd_GetAndShowAgendasStats (void) /***** Heading row *****/ HTM_TR_Begin (NULL); - HTM_TH_Title (Txt_Number_of_events ,HTM_HEAD_RIGHT); - HTM_TH_Title (Txt_Number_of_users ,HTM_HEAD_RIGHT); - HTM_TH_Title (Txt_PERCENT_of_users ,HTM_HEAD_RIGHT); - HTM_TH_Title (Txt_Number_of_events_per_user,HTM_HEAD_RIGHT); + HTM_TH (Txt_Number_of_events ,HTM_HEAD_RIGHT); + HTM_TH (Txt_Number_of_users ,HTM_HEAD_RIGHT); + HTM_TH (Txt_PERCENT_of_users ,HTM_HEAD_RIGHT); + HTM_TH (Txt_Number_of_events_per_user,HTM_HEAD_RIGHT); HTM_TR_End (); /***** Number of agenda events *****/ @@ -3296,11 +3296,11 @@ static void Svy_GetAndShowSurveysStats (void) /***** Write table heading *****/ HTM_TR_Begin (NULL); - HTM_TH_Title (Txt_Number_of_BR_surveys ,HTM_HEAD_RIGHT); - HTM_TH_Title (Txt_Number_of_BR_courses_with_BR_surveys ,HTM_HEAD_RIGHT); - HTM_TH_Title (Txt_Average_number_BR_of_surveys_BR_per_course ,HTM_HEAD_RIGHT); - HTM_TH_Title (Txt_Average_number_BR_of_questions_BR_per_survey,HTM_HEAD_RIGHT); - HTM_TH_Title (Txt_Number_of_BR_notifications ,HTM_HEAD_RIGHT); + HTM_TH (Txt_Number_of_BR_surveys ,HTM_HEAD_RIGHT); + HTM_TH (Txt_Number_of_BR_courses_with_BR_surveys ,HTM_HEAD_RIGHT); + HTM_TH (Txt_Average_number_BR_of_surveys_BR_per_course ,HTM_HEAD_RIGHT); + HTM_TH (Txt_Average_number_BR_of_questions_BR_per_survey,HTM_HEAD_RIGHT); + HTM_TH (Txt_Number_of_BR_notifications ,HTM_HEAD_RIGHT); HTM_TR_End (); /***** Write number of surveys *****/ @@ -3386,9 +3386,9 @@ static void Fig_GetAndShowNumUsrsPerPrivacyForAnObject (const char *TxtObject, /***** Heading row *****/ HTM_TR_Begin (NULL); - HTM_TH_Title (TxtObject ,HTM_HEAD_LEFT); - HTM_TH_Title (Txt_Number_of_users ,HTM_HEAD_RIGHT); - HTM_TH_Title (Txt_PERCENT_of_users,HTM_HEAD_RIGHT); + HTM_TH (TxtObject ,HTM_HEAD_LEFT); + HTM_TH (Txt_Number_of_users ,HTM_HEAD_RIGHT); + HTM_TH (Txt_PERCENT_of_users,HTM_HEAD_RIGHT); HTM_TR_End (); /***** For each privacy option... *****/ @@ -3469,9 +3469,9 @@ static void Coo_GetAndShowNumUsrsPerCookies (void) /***** Heading row *****/ HTM_TR_Begin (NULL); - HTM_TH_Title (Txt_Cookies ,HTM_HEAD_LEFT); - HTM_TH_Title (Txt_Number_of_users ,HTM_HEAD_RIGHT); - HTM_TH_Title (Txt_PERCENT_of_users,HTM_HEAD_RIGHT); + HTM_TH (Txt_Cookies ,HTM_HEAD_LEFT); + HTM_TH (Txt_Number_of_users ,HTM_HEAD_RIGHT); + HTM_TH (Txt_PERCENT_of_users,HTM_HEAD_RIGHT); HTM_TR_End (); /***** For each option... *****/ @@ -3545,9 +3545,9 @@ static void Lan_GetAndShowNumUsrsPerLanguage (void) /***** Heading row *****/ HTM_TR_Begin (NULL); - HTM_TH_Title (Txt_Language ,HTM_HEAD_LEFT); - HTM_TH_Title (Txt_Number_of_users ,HTM_HEAD_RIGHT); - HTM_TH_Title (Txt_PERCENT_of_users,HTM_HEAD_RIGHT); + HTM_TH (Txt_Language ,HTM_HEAD_LEFT); + HTM_TH (Txt_Number_of_users ,HTM_HEAD_RIGHT); + HTM_TH (Txt_PERCENT_of_users,HTM_HEAD_RIGHT); HTM_TR_End (); /***** For each language... *****/ @@ -3623,9 +3623,9 @@ static void Cal_GetAndShowNumUsrsPerFirstDayOfWeek (void) /***** Heading row *****/ HTM_TR_Begin (NULL); - HTM_TH_Title (Txt_Calendar ,HTM_HEAD_LEFT); - HTM_TH_Title (Txt_Number_of_users ,HTM_HEAD_RIGHT); - HTM_TH_Title (Txt_PERCENT_of_users,HTM_HEAD_RIGHT); + HTM_TH (Txt_Calendar ,HTM_HEAD_LEFT); + HTM_TH (Txt_Number_of_users ,HTM_HEAD_RIGHT); + HTM_TH (Txt_PERCENT_of_users,HTM_HEAD_RIGHT); HTM_TR_End (); /***** For each day... *****/ @@ -3707,9 +3707,9 @@ static void Dat_GetAndShowNumUsrsPerDateFormat (void) /***** Heading row *****/ HTM_TR_Begin (NULL); - HTM_TH_Title (Txt_Format ,HTM_HEAD_LEFT); - HTM_TH_Title (Txt_Number_of_users ,HTM_HEAD_RIGHT); - HTM_TH_Title (Txt_PERCENT_of_users,HTM_HEAD_RIGHT); + HTM_TH (Txt_Format ,HTM_HEAD_LEFT); + HTM_TH (Txt_Number_of_users ,HTM_HEAD_RIGHT); + HTM_TH (Txt_PERCENT_of_users,HTM_HEAD_RIGHT); HTM_TR_End (); /***** For each format... *****/ @@ -3802,9 +3802,9 @@ static void Ico_GetAndShowNumUsrsPerIconSet (void) /***** Heading row *****/ HTM_TR_Begin (NULL); - HTM_TH_Title (Txt_Icons ,HTM_HEAD_LEFT); - HTM_TH_Title (Txt_Number_of_users ,HTM_HEAD_RIGHT); - HTM_TH_Title (Txt_PERCENT_of_users,HTM_HEAD_RIGHT); + HTM_TH (Txt_Icons ,HTM_HEAD_LEFT); + HTM_TH (Txt_Number_of_users ,HTM_HEAD_RIGHT); + HTM_TH (Txt_PERCENT_of_users,HTM_HEAD_RIGHT); HTM_TR_End (); /***** For each icon set... *****/ @@ -3882,9 +3882,9 @@ static void Mnu_GetAndShowNumUsrsPerMenu (void) /***** Heading row *****/ HTM_TR_Begin (NULL); - HTM_TH_Title (Txt_Menu ,HTM_HEAD_LEFT); - HTM_TH_Title (Txt_Number_of_users ,HTM_HEAD_RIGHT); - HTM_TH_Title (Txt_PERCENT_of_users,HTM_HEAD_RIGHT); + HTM_TH (Txt_Menu ,HTM_HEAD_LEFT); + HTM_TH (Txt_Number_of_users ,HTM_HEAD_RIGHT); + HTM_TH (Txt_PERCENT_of_users,HTM_HEAD_RIGHT); HTM_TR_End (); /***** For each menu... *****/ @@ -3959,9 +3959,9 @@ static void The_GetAndShowNumUsrsPerTheme (void) /***** Heading row *****/ HTM_TR_Begin (NULL); - HTM_TH_Title (Txt_Theme_SKIN ,HTM_HEAD_LEFT); - HTM_TH_Title (Txt_Number_of_users ,HTM_HEAD_RIGHT); - HTM_TH_Title (Txt_PERCENT_of_users,HTM_HEAD_RIGHT); + HTM_TH (Txt_Theme_SKIN ,HTM_HEAD_LEFT); + HTM_TH (Txt_Number_of_users ,HTM_HEAD_RIGHT); + HTM_TH (Txt_PERCENT_of_users,HTM_HEAD_RIGHT); HTM_TR_End (); /***** For each theme... *****/ @@ -4039,9 +4039,9 @@ static void Lay_GetAndShowNumUsrsPerSideColumns (void) /***** Heading row *****/ HTM_TR_Begin (NULL); - HTM_TH_Title (Txt_Columns ,HTM_HEAD_CENTER); - HTM_TH_Title (Txt_Number_of_users ,HTM_HEAD_RIGHT); - HTM_TH_Title (Txt_PERCENT_of_users,HTM_HEAD_RIGHT); + HTM_TH (Txt_Columns ,HTM_HEAD_CENTER); + HTM_TH (Txt_Number_of_users ,HTM_HEAD_RIGHT); + HTM_TH (Txt_PERCENT_of_users,HTM_HEAD_RIGHT); HTM_TR_End (); /***** For each layout of columns... *****/ diff --git a/swad_forum.c b/swad_forum.c index 25ea29ba..2b638f68 100644 --- a/swad_forum.c +++ b/swad_forum.c @@ -1976,7 +1976,6 @@ static void For_ShowForumThreadsHighlightingOneThread (struct For_Forums *Forums Ale_AlertType_t AlertType,const char *Message) { extern const char *Hlp_COMMUNICATION_Forums_threads; - extern const char *The_Colors[The_NUM_THEMES]; extern const char *Txt_Forum; extern const char *Txt_MSG_Subject; extern const char *Txt_FORUM_THREAD_HELP_ORDER[Dat_NUM_START_END_TIME]; @@ -2045,15 +2044,15 @@ static void For_ShowForumThreadsHighlightingOneThread (struct For_Forums *Forums HTM_TABLE_BeginWideMarginPadding (2); HTM_TR_Begin (NULL); - HTM_TH (1,1,NULL,"BT"); - HTM_TH (1,1,NULL,"CONTEXT_COL"); // Column for contextual icons - HTM_TH_Title (Txt_MSG_Subject,HTM_HEAD_LEFT); + HTM_TH_Span (NULL ,HTM_HEAD_CENTER,1,1,"BT"); + HTM_TH_Span (NULL ,HTM_HEAD_CENTER,1,1,"CONTEXT_COL"); // Column for contextual icons + HTM_TH (Txt_MSG_Subject,HTM_HEAD_LEFT ); for (Order = (Dat_StartEndTime_t) 0; Order <= (Dat_StartEndTime_t) (Dat_NUM_START_END_TIME - 1); Order++) { - HTM_TH_Begin (1,2,"TIT_TBL_%s CM",The_Colors[Gbl.Prefs.Theme]); + HTM_TH_Span_Begin (HTM_HEAD_CENTER,1,2,NULL); Frm_BeginFormAnchor (For_ActionsSeeFor[Forums->Forum.Type], For_FORUM_THREADS_SECTION_ID); @@ -2077,10 +2076,10 @@ static void For_ShowForumThreadsHighlightingOneThread (struct For_Forums *Forums HTM_TH_End (); } - HTM_TH_Title (Txt_Number_BR_msgs,HTM_HEAD_RIGHT); - HTM_TH_Title (Txt_Unread_BR_msgs,HTM_HEAD_RIGHT); - HTM_TH_Title (Txt_WriBRters ,HTM_HEAD_RIGHT); - HTM_TH_Title (Txt_ReaBRders ,HTM_HEAD_RIGHT); + HTM_TH (Txt_Number_BR_msgs,HTM_HEAD_RIGHT); + HTM_TH (Txt_Unread_BR_msgs,HTM_HEAD_RIGHT); + HTM_TH (Txt_WriBRters ,HTM_HEAD_RIGHT); + HTM_TH (Txt_ReaBRders ,HTM_HEAD_RIGHT); HTM_TR_End (); diff --git a/swad_game.c b/swad_game.c index a851e130..926b9cc9 100644 --- a/swad_game.c +++ b/swad_game.c @@ -270,13 +270,13 @@ static void Gam_ListAllGames (struct Gam_Games *Games) if (Gam_CheckIfICanEditGames () || Gam_CheckIfICanListGameQuestions ()) - HTM_TH (1,1,NULL,"CONTEXT_COL"); // Column for contextual icons + HTM_TH_Span (NULL,HTM_HEAD_CENTER,1,1,"CONTEXT_COL"); // Column for contextual icons for (Order = (Gam_Order_t) 0; Order <= (Gam_Order_t) (Gam_NUM_ORDERS - 1); Order++) { - HTM_TH_TitleBegin (HTM_HEAD_LEFT); + HTM_TH_Begin (HTM_HEAD_LEFT); /* Form to change order */ Frm_BeginForm (ActSeeAllGam); @@ -297,7 +297,7 @@ static void Gam_ListAllGames (struct Gam_Games *Games) HTM_TH_End (); } - HTM_TH_Title (Txt_Matches,HTM_HEAD_RIGHT); + HTM_TH (Txt_Matches,HTM_HEAD_RIGHT); HTM_TR_End (); @@ -1718,10 +1718,10 @@ static void Gam_ListOneOrMoreQuestionsForEdition (struct Gam_Games *Games, HTM_TR_Begin (NULL); HTM_TH_Empty (1); - HTM_TH_Title (Txt_No_INDEX,HTM_HEAD_CENTER); - HTM_TH_Title (Txt_Code ,HTM_HEAD_CENTER); - HTM_TH_Title (Txt_Tags ,HTM_HEAD_CENTER); - HTM_TH_Title (Txt_Question,HTM_HEAD_CENTER); + HTM_TH (Txt_No_INDEX,HTM_HEAD_CENTER); + HTM_TH (Txt_Code ,HTM_HEAD_CENTER); + HTM_TH (Txt_Tags ,HTM_HEAD_CENTER); + HTM_TH (Txt_Question,HTM_HEAD_CENTER); HTM_TR_End (); /***** Write rows *****/ diff --git a/swad_group.c b/swad_group.c index cbfc3082..5023c091 100644 --- a/swad_group.c +++ b/swad_group.c @@ -1396,16 +1396,16 @@ static void Grp_WriteHeadingGroupTypes (void) HTM_TR_Begin (NULL); - HTM_TH (1,1,NULL,"BM"); - HTM_TH_TitleBegin (HTM_HEAD_CENTER); + HTM_TH_Span (NULL ,HTM_HEAD_CENTER,1,1,"BT"); + HTM_TH_Begin (HTM_HEAD_CENTER); HTM_Txt (Txt_Type_of_group); HTM_BR (); HTM_TxtF ("(%s)",Txt_eg_Lectures_Practicals); HTM_TH_End (); - HTM_TH_Title (Txt_Mandatory_enrolment,HTM_HEAD_CENTER); - HTM_TH_Title (Txt_Multiple_enrolment ,HTM_HEAD_CENTER); - HTM_TH_Title (Txt_Opening_of_groups ,HTM_HEAD_CENTER); - HTM_TH_Title (Txt_Number_of_BR_groups,HTM_HEAD_CENTER); + HTM_TH (Txt_Mandatory_enrolment,HTM_HEAD_CENTER); + HTM_TH (Txt_Multiple_enrolment ,HTM_HEAD_CENTER); + HTM_TH (Txt_Opening_of_groups ,HTM_HEAD_CENTER); + HTM_TH (Txt_Number_of_BR_groups,HTM_HEAD_CENTER); HTM_TR_End (); } @@ -1615,21 +1615,21 @@ static void Grp_WriteHeadingGroups (void) HTM_TR_Begin (NULL); - HTM_TH (1,1,NULL,"BM"); - HTM_TH (1,1,NULL,"BM"); - HTM_TH (1,1,NULL,"BM"); - HTM_TH_Title (Txt_Type_BR_of_group,HTM_HEAD_CENTER); - HTM_TH_Begin (1,1,"CM"); + HTM_TH_Span (NULL ,HTM_HEAD_CENTER,1,1,"BT"); + HTM_TH_Span (NULL ,HTM_HEAD_CENTER,1,1,"BT"); + HTM_TH_Span (NULL ,HTM_HEAD_CENTER,1,1,"BT"); + HTM_TH (Txt_Type_BR_of_group,HTM_HEAD_CENTER); + HTM_TH_Begin (HTM_HEAD_CENTER); HTM_Txt (Txt_Group_name); HTM_BR (); HTM_TxtF ("(%s)",Txt_eg_A_B); HTM_TH_End (); - HTM_TH_Title (Txt_Room,HTM_HEAD_CENTER); + HTM_TH (Txt_Room,HTM_HEAD_CENTER); for (Role = Rol_TCH; Role >= Rol_STD; Role--) - HTM_TH_Title (Txt_ROLES_PLURAL_BRIEF_Abc[Role],HTM_HEAD_CENTER); - HTM_TH_Title (Txt_Max_BR_students ,HTM_HEAD_CENTER); + HTM_TH (Txt_ROLES_PLURAL_BRIEF_Abc[Role],HTM_HEAD_CENTER); + HTM_TH (Txt_Max_BR_students ,HTM_HEAD_CENTER); HTM_TR_End (); } @@ -2326,14 +2326,14 @@ static void Grp_WriteGrpHead (struct GroupType *GrpTyp) HTM_TR_Begin (NULL); HTM_TH_Empty (2); - HTM_TH_Title (Txt_Group ,HTM_HEAD_LEFT ); - HTM_TH_Title (Txt_Room ,HTM_HEAD_LEFT ); + HTM_TH (Txt_Group ,HTM_HEAD_LEFT ); + HTM_TH (Txt_Room ,HTM_HEAD_LEFT ); for (Role = Rol_TCH; Role >= Rol_STD; Role--) - HTM_TH_Title (Txt_ROLES_PLURAL_BRIEF_Abc[Role],HTM_HEAD_CENTER); - HTM_TH_Title (Txt_Max_BR_students,HTM_HEAD_CENTER); - HTM_TH_Title (Txt_Vacants ,HTM_HEAD_CENTER); + HTM_TH (Txt_ROLES_PLURAL_BRIEF_Abc[Role],HTM_HEAD_CENTER); + HTM_TH (Txt_Max_BR_students,HTM_HEAD_CENTER); + HTM_TH (Txt_Vacants ,HTM_HEAD_CENTER); HTM_TR_End (); } diff --git a/swad_holiday.c b/swad_holiday.c index 51e66d0a..7f297e24 100644 --- a/swad_holiday.c +++ b/swad_holiday.c @@ -134,7 +134,7 @@ void Hld_SeeHolidays (void) Order <= (Hld_Order_t) (Hld_NUM_ORDERS - 1); Order++) { - HTM_TH_TitleBegin (HTM_HEAD_LEFT); + HTM_TH_Begin (HTM_HEAD_LEFT); Frm_BeginForm (ActSeeHld); Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order); HTM_BUTTON_OnSubmit_Begin (Txt_HOLIDAYS_HELP_ORDER[Order], @@ -148,10 +148,10 @@ void Hld_SeeHolidays (void) Frm_EndForm (); HTM_TH_End (); } - HTM_TH_TitleBegin (HTM_HEAD_LEFT); + HTM_TH_Begin (HTM_HEAD_LEFT); HTM_TxtF (" %s ",Txt_End_date); HTM_TH_End (); - HTM_TH_Title (Txt_Holiday,HTM_HEAD_LEFT); + HTM_TH (Txt_Holiday,HTM_HEAD_LEFT); HTM_TR_End (); @@ -923,11 +923,11 @@ static void Hld_PutFormToCreateHoliday (const struct Plc_Places *Places) /***** Write heading *****/ HTM_TR_Begin (NULL); - HTM_TH_Title (Txt_Place ,HTM_HEAD_LEFT); - HTM_TH_Title (Txt_Type ,HTM_HEAD_LEFT); - HTM_TH_Title (Txt_START_END_TIME[Dat_STR_TIME],HTM_HEAD_LEFT); - HTM_TH_Title (Txt_START_END_TIME[Dat_END_TIME],HTM_HEAD_LEFT); - HTM_TH_Title (Txt_Holiday ,HTM_HEAD_LEFT); + HTM_TH (Txt_Place ,HTM_HEAD_LEFT); + HTM_TH (Txt_Type ,HTM_HEAD_LEFT); + HTM_TH (Txt_START_END_TIME[Dat_STR_TIME],HTM_HEAD_LEFT); + HTM_TH (Txt_START_END_TIME[Dat_END_TIME],HTM_HEAD_LEFT); + HTM_TH (Txt_Holiday ,HTM_HEAD_LEFT); HTM_TR_End (); HTM_TR_Begin (NULL); @@ -1016,13 +1016,13 @@ static void Hld_PutHeadHolidays (void) extern const char *Txt_Holiday; HTM_TR_Begin (NULL); - HTM_TH (1,1,NULL,"BM"); - HTM_TH_Title (Txt_Code ,HTM_HEAD_RIGHT); - HTM_TH_Title (Txt_Place ,HTM_HEAD_LEFT ); - HTM_TH_Title (Txt_Type ,HTM_HEAD_LEFT ); - HTM_TH_Title (Txt_START_END_TIME[Dat_STR_TIME],HTM_HEAD_LEFT ); - HTM_TH_Title (Txt_START_END_TIME[Dat_END_TIME],HTM_HEAD_LEFT ); - HTM_TH_Title (Txt_Holiday ,HTM_HEAD_LEFT ); + HTM_TH_Span (NULL ,HTM_HEAD_CENTER,1,1,"BT"); + HTM_TH (Txt_Code ,HTM_HEAD_RIGHT); + HTM_TH (Txt_Place ,HTM_HEAD_LEFT ); + HTM_TH (Txt_Type ,HTM_HEAD_LEFT ); + HTM_TH (Txt_START_END_TIME[Dat_STR_TIME],HTM_HEAD_LEFT ); + HTM_TH (Txt_START_END_TIME[Dat_END_TIME],HTM_HEAD_LEFT ); + HTM_TH (Txt_Holiday ,HTM_HEAD_LEFT ); HTM_TR_End (); } diff --git a/swad_indicator.c b/swad_indicator.c index f15d00f2..2e938a57 100644 --- a/swad_indicator.c +++ b/swad_indicator.c @@ -460,8 +460,8 @@ static void Ind_ShowNumCoursesWithIndicators (const struct Ind_Indicators *Indic HTM_TR_Begin (NULL); if (PutForm) HTM_TH_Empty (1); - HTM_TH (1,1,Txt_Indicators,"RM"); - HTM_TH (1,2,Txt_Courses ,"RM"); + HTM_TH (Txt_Indicators,HTM_HEAD_RIGHT); + HTM_TH_Span (Txt_Courses ,HTM_HEAD_RIGHT,1,2,NULL); HTM_TR_End (); for (Ind = 0; @@ -537,7 +537,6 @@ static void Ind_ShowTableOfCoursesWithIndicators (const struct Ind_Indicators *I Ind_IndicatorsLayout_t IndicatorsLayout, unsigned NumCrss,MYSQL_RES *mysql_res) { - extern const char *The_Colors[The_NUM_THEMES]; extern const char *Txt_Degree; extern const char *Txt_Course; extern const char *Txt_Institutional_BR_code; @@ -571,119 +570,112 @@ static void Ind_ShowTableOfCoursesWithIndicators (const struct Ind_Indicators *I unsigned NumIndicators; struct Ind_IndicatorsCrs IndicatorsCrs; long ActCod; - char *ClassHead; /***** Begin table *****/ HTM_TABLE_Begin ("INDICATORS"); /***** Write table heading *****/ - if (asprintf (&ClassHead,"TIT_TBL_%s %s", - The_Colors[Gbl.Prefs.Theme],Gbl.ColorRows[0]) < 0) - Err_NotEnoughMemoryExit (); - switch (IndicatorsLayout) { case Ind_INDICATORS_BRIEF: HTM_TR_Begin (NULL); - HTM_TH (3, 1,Txt_Degree ,"%s LM",ClassHead); - HTM_TH (3, 1,Txt_Course ,"%s LM",ClassHead); - HTM_TH (3, 1,Txt_Institutional_BR_code ,"%s LM",ClassHead); - HTM_TH (3, 1,Txt_Web_page_of_the_course,"%s LM",ClassHead); - HTM_TH (1,11,Txt_Indicators ,"%s CM",ClassHead); + HTM_TH_Span (Txt_Degree ,HTM_HEAD_LEFT ,3, 1,NULL); + HTM_TH_Span (Txt_Course ,HTM_HEAD_LEFT ,3, 1,NULL); + HTM_TH_Span (Txt_Institutional_BR_code ,HTM_HEAD_LEFT ,3, 1,NULL); + HTM_TH_Span (Txt_Web_page_of_the_course,HTM_HEAD_LEFT ,3, 1,NULL); + HTM_TH_Span (Txt_Indicators ,HTM_HEAD_CENTER,1,11,NULL); HTM_TR_End (); HTM_TR_Begin (NULL); - HTM_TH (2,1,Txt_No_INDEX,"%s CT",ClassHead); - HTM_TH_Begin (1,2,"%s CT",ClassHead); + HTM_TH_Span (Txt_No_INDEX ,HTM_HEAD_CENTER,2, 1,NULL); + HTM_TH_Span_Begin (HTM_HEAD_CENTER,1,2,NULL); HTM_TxtF ("(A) %s",Txt_Syllabus_of_the_course); HTM_TH_End (); - HTM_TH_Begin (1,2,"%s CT",ClassHead); + HTM_TH_Span_Begin (HTM_HEAD_CENTER,1,2,NULL); HTM_TxtF ("(B) %s",Txt_Guided_academic_assignments); HTM_TH_End (); - HTM_TH_Begin (1,2,"%s CT",ClassHead); + HTM_TH_Span_Begin (HTM_HEAD_CENTER,1,2,NULL); HTM_TxtF ("(C) %s",Txt_Online_tutoring); HTM_TH_End (); - HTM_TH_Begin (1,2,"%s CT",ClassHead); + HTM_TH_Span_Begin (HTM_HEAD_CENTER,1,2,NULL); HTM_TxtF ("(D) %s",Txt_Materials); HTM_TH_End (); - HTM_TH_Begin (1,2,"%s CT",ClassHead); + HTM_TH_Span_Begin (HTM_HEAD_CENTER,1,2,NULL); HTM_TxtF ("(E) %s",Txt_Assessment_criteria); HTM_TH_End (); HTM_TR_End (); HTM_TR_Begin (NULL); - HTM_TH (1,1,Txt_YES,"%s CM",ClassHead); - HTM_TH (1,1,Txt_NO ,"%s CM",ClassHead); - HTM_TH (1,1,Txt_YES,"%s CM",ClassHead); - HTM_TH (1,1,Txt_NO ,"%s CM",ClassHead); - HTM_TH (1,1,Txt_YES,"%s CM",ClassHead); - HTM_TH (1,1,Txt_NO ,"%s CM",ClassHead); - HTM_TH (1,1,Txt_YES,"%s CM",ClassHead); - HTM_TH (1,1,Txt_NO ,"%s CM",ClassHead); - HTM_TH (1,1,Txt_YES,"%s CM",ClassHead); - HTM_TH (1,1,Txt_NO ,"%s CM",ClassHead); + HTM_TH (Txt_YES ,HTM_HEAD_CENTER); + HTM_TH (Txt_NO ,HTM_HEAD_CENTER); + HTM_TH (Txt_YES ,HTM_HEAD_CENTER); + HTM_TH (Txt_NO ,HTM_HEAD_CENTER); + HTM_TH (Txt_YES ,HTM_HEAD_CENTER); + HTM_TH (Txt_NO ,HTM_HEAD_CENTER); + HTM_TH (Txt_YES ,HTM_HEAD_CENTER); + HTM_TH (Txt_NO ,HTM_HEAD_CENTER); + HTM_TH (Txt_YES ,HTM_HEAD_CENTER); + HTM_TH (Txt_NO ,HTM_HEAD_CENTER); HTM_TR_End (); break; case Ind_INDICATORS_FULL: HTM_TR_Begin (NULL); - HTM_TH (3, 1,Txt_Degree ,"%s LM",ClassHead); - HTM_TH (3, 1,Txt_Course ,"%s LM",ClassHead); - HTM_TH (3, 1,Txt_Institutional_BR_code ,"%s LM",ClassHead); - HTM_TH (3, 1,Txt_Web_page_of_the_course ,"%s LM",ClassHead); - HTM_TH (3, 1,Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH],"%s LM",ClassHead); - HTM_TH (3, 1,Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD],"%s LM",ClassHead); - HTM_TH (1,24,Txt_Indicators ,"%s CM",ClassHead); + HTM_TH_Span (Txt_Degree ,HTM_HEAD_LEFT ,3, 1,NULL); + HTM_TH_Span (Txt_Course ,HTM_HEAD_LEFT ,3, 1,NULL); + HTM_TH_Span (Txt_Institutional_BR_code ,HTM_HEAD_LEFT ,3, 1,NULL); + HTM_TH_Span (Txt_Web_page_of_the_course ,HTM_HEAD_LEFT ,3, 1,NULL); + HTM_TH_Span (Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH],HTM_HEAD_LEFT ,3, 1,NULL); + HTM_TH_Span (Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD],HTM_HEAD_LEFT ,3, 1,NULL); + HTM_TH_Span (Txt_Indicators ,HTM_HEAD_CENTER,1,24,NULL); HTM_TR_End (); HTM_TR_Begin (NULL); - HTM_TH (2,1,Txt_No_INDEX,"CT %s",ClassHead); - HTM_TH_Begin (1,5,"CT %s",ClassHead); + HTM_TH_Span (Txt_No_INDEX ,HTM_HEAD_CENTER,2,1,NULL); + HTM_TH_Span_Begin (HTM_HEAD_CENTER,1,5,NULL); HTM_TxtF ("(A) %s",Txt_Syllabus_of_the_course); HTM_TH_End (); - HTM_TH_Begin (1,5,"CT %s",ClassHead); + HTM_TH_Span_Begin (HTM_HEAD_CENTER,1,5,NULL); HTM_TxtF ("(B) %s",Txt_Guided_academic_assignments); HTM_TH_End (); - HTM_TH_Begin (1,5,"CT %s",ClassHead); + HTM_TH_Span_Begin (HTM_HEAD_CENTER,1,5,NULL); HTM_TxtF ("(C) %s",Txt_Online_tutoring); HTM_TH_End (); - HTM_TH_Begin (1,4,"CT %s",ClassHead); + HTM_TH_Span_Begin (HTM_HEAD_CENTER,1,4,NULL); HTM_TxtF ("(D) %s",Txt_Materials); HTM_TH_End (); - HTM_TH_Begin (1,4,"CT %s",ClassHead); + HTM_TH_Span_Begin (HTM_HEAD_CENTER,1,4,NULL); HTM_TxtF ("(E) %s",Txt_Assessment_criteria); HTM_TH_End (); HTM_TR_End (); HTM_TR_Begin (NULL); - HTM_TH (1,1,Txt_YES ,"%s CM",ClassHead); - HTM_TH (1,1,Txt_NO ,"%s CM",ClassHead); - HTM_TH (1,1,Txt_INFO_TITLE[Inf_LECTURES] ,"%s LM",ClassHead); - HTM_TH (1,1,Txt_INFO_TITLE[Inf_PRACTICALS] ,"%s LM",ClassHead); - HTM_TH (1,1,Txt_INFO_TITLE[Inf_TEACHING_GUIDE],"%s LM",ClassHead); - HTM_TH (1,1,Txt_YES ,"%s CM",ClassHead); - HTM_TH (1,1,Txt_NO ,"%s CM",ClassHead); - HTM_TH (1,1,Txt_Assignments ,"%s RM",ClassHead); - HTM_TH (1,1,Txt_Files_assignments ,"%s RM",ClassHead); - HTM_TH (1,1,Txt_Files_works ,"%s RM",ClassHead); - HTM_TH (1,1,Txt_YES ,"%s CM",ClassHead); - HTM_TH (1,1,Txt_NO ,"%s CM",ClassHead); - HTM_TH (1,1,Txt_Forum_threads ,"%s RM",ClassHead); - HTM_TH (1,1,Txt_Forum_posts ,"%s RM",ClassHead); - HTM_TH (1,1,Txt_Messages_sent_by_teachers ,"%s RM",ClassHead); - HTM_TH (1,1,Txt_YES ,"%s CM",ClassHead); - HTM_TH (1,1,Txt_NO ,"%s CM",ClassHead); - HTM_TH (1,1,Txt_Number_of_files_in_DOCUM_zones,"%s RM",ClassHead); - HTM_TH (1,1,Txt_Number_of_files_in_SHARE_zones,"%s RM",ClassHead); - HTM_TH (1,1,Txt_YES ,"%s CM",ClassHead); - HTM_TH (1,1,Txt_NO ,"%s CM",ClassHead); - HTM_TH (1,1,Txt_INFO_TITLE[Inf_ASSESSMENT] ,"%s LM",ClassHead); - HTM_TH (1,1,Txt_INFO_TITLE[Inf_TEACHING_GUIDE],"%s LM",ClassHead); + HTM_TH (Txt_YES ,HTM_HEAD_CENTER); + HTM_TH (Txt_NO ,HTM_HEAD_CENTER); + HTM_TH (Txt_INFO_TITLE[Inf_LECTURES] ,HTM_HEAD_LEFT ); + HTM_TH (Txt_INFO_TITLE[Inf_PRACTICALS] ,HTM_HEAD_LEFT ); + HTM_TH (Txt_INFO_TITLE[Inf_TEACHING_GUIDE] ,HTM_HEAD_LEFT ); + HTM_TH (Txt_YES ,HTM_HEAD_CENTER); + HTM_TH (Txt_NO ,HTM_HEAD_CENTER); + HTM_TH (Txt_Assignments ,HTM_HEAD_RIGHT ); + HTM_TH (Txt_Files_assignments ,HTM_HEAD_RIGHT ); + HTM_TH (Txt_Files_works ,HTM_HEAD_RIGHT ); + HTM_TH (Txt_YES ,HTM_HEAD_CENTER); + HTM_TH (Txt_NO ,HTM_HEAD_CENTER); + HTM_TH (Txt_Forum_threads ,HTM_HEAD_RIGHT ); + HTM_TH (Txt_Forum_posts ,HTM_HEAD_RIGHT ); + HTM_TH (Txt_Messages_sent_by_teachers ,HTM_HEAD_RIGHT ); + HTM_TH (Txt_YES ,HTM_HEAD_CENTER); + HTM_TH (Txt_NO ,HTM_HEAD_CENTER); + HTM_TH (Txt_Number_of_files_in_DOCUM_zones ,HTM_HEAD_RIGHT ); + HTM_TH (Txt_Number_of_files_in_SHARE_zones ,HTM_HEAD_RIGHT ); + HTM_TH (Txt_YES ,HTM_HEAD_CENTER); + HTM_TH (Txt_NO ,HTM_HEAD_CENTER); + HTM_TH (Txt_INFO_TITLE[Inf_ASSESSMENT] ,HTM_HEAD_LEFT ); + HTM_TH (Txt_INFO_TITLE[Inf_TEACHING_GUIDE] ,HTM_HEAD_LEFT ); HTM_TR_End (); break; } - free (ClassHead); - /***** List courses *****/ mysql_data_seek (mysql_res,0); for (NumCrs = 0, Gbl.RowEvenOdd = 1; diff --git a/swad_institution.c b/swad_institution.c index 586d91ac..ed8d72b7 100644 --- a/swad_institution.c +++ b/swad_institution.c @@ -144,8 +144,8 @@ void Ins_SeeInsWithPendingCtrs (void) /***** Write heading *****/ HTM_TR_Begin (NULL); - HTM_TH (1,1,Txt_Institution ,"LM"); - HTM_TH (1,1,Txt_Centers_ABBREVIATION,"RM"); + HTM_TH (Txt_Institution ,HTM_HEAD_LEFT ); + HTM_TH (Txt_Centers_ABBREVIATION,HTM_HEAD_RIGHT); HTM_TR_End (); /***** List the institutions *****/ @@ -464,7 +464,7 @@ static void Ins_PutHeadInstitutionsForSeeing (bool OrderSelectable) Order <= (Ins_Order_t) (Ins_NUM_ORDERS - 1); Order++) { - HTM_TH_TitleBegin (Align[Order]); + HTM_TH_Begin (Align[Order]); if (OrderSelectable) { Frm_BeginForm (ActSeeIns); @@ -484,11 +484,11 @@ static void Ins_PutHeadInstitutionsForSeeing (bool OrderSelectable) } HTM_TH_End (); } - HTM_TH (1,1,Txt_Centers_ABBREVIATION ,"RM"); - HTM_TH (1,1,Txt_Degrees_ABBREVIATION ,"RM"); - HTM_TH (1,1,Txt_Courses_ABBREVIATION ,"RM"); - HTM_TH (1,1,Txt_Departments_ABBREVIATION,"RM"); - HTM_TH_Begin (1,1,"RM"); + HTM_TH (Txt_Centers_ABBREVIATION ,HTM_HEAD_RIGHT); + HTM_TH (Txt_Degrees_ABBREVIATION ,HTM_HEAD_RIGHT); + HTM_TH (Txt_Courses_ABBREVIATION ,HTM_HEAD_RIGHT); + HTM_TH (Txt_Departments_ABBREVIATION,HTM_HEAD_RIGHT); + HTM_TH_Begin (HTM_HEAD_RIGHT); HTM_TxtF ("%s+",Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH]); HTM_BR (); HTM_Txt (Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD]); @@ -1549,19 +1549,19 @@ static void Ins_PutHeadInstitutionsForEdition (void) HTM_TR_Begin (NULL); HTM_TH_Empty (1); - HTM_TH (1,1,Txt_Code ,"RM"); + HTM_TH (Txt_Code ,HTM_HEAD_RIGHT); HTM_TH_Empty (1); - HTM_TH (1,1,Txt_Short_name_of_the_institution,"LM"); - HTM_TH (1,1,Txt_Full_name_of_the_institution ,"LM"); - HTM_TH (1,1,Txt_WWW ,"LM"); - HTM_TH (1,1,Txt_Users ,"RM"); - HTM_TH (1,1,Txt_Centers_ABBREVIATION ,"RM"); - HTM_TH_Begin (1,1,"RM"); + HTM_TH (Txt_Short_name_of_the_institution,HTM_HEAD_LEFT ); + HTM_TH (Txt_Full_name_of_the_institution ,HTM_HEAD_LEFT ); + HTM_TH (Txt_WWW ,HTM_HEAD_LEFT ); + HTM_TH (Txt_Users ,HTM_HEAD_RIGHT); + HTM_TH (Txt_Centers_ABBREVIATION ,HTM_HEAD_RIGHT); + HTM_TH_Begin (HTM_HEAD_RIGHT); HTM_TxtF ("%s+",Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH]); HTM_BR (); HTM_Txt (Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD]); HTM_TH_End (); - HTM_TH (1,1,Txt_Requester ,"LM"); + HTM_TH (Txt_Requester ,HTM_HEAD_LEFT ); HTM_TH_Empty (1); HTM_TR_End (); diff --git a/swad_link.c b/swad_link.c index 6f5faa06..b9f4c0fe 100644 --- a/swad_link.c +++ b/swad_link.c @@ -737,11 +737,11 @@ static void Lnk_PutHeadLinks (void) extern const char *Txt_WWW; HTM_TR_Begin (NULL); - HTM_TH (1,1,NULL ,"BM"); - HTM_TH (1,1,Txt_Code ,"RM"); - HTM_TH (1,1,Txt_Short_name,"LM"); - HTM_TH (1,1,Txt_Full_name ,"LM"); - HTM_TH (1,1,Txt_WWW ,"LM"); + HTM_TH_Span (NULL ,HTM_HEAD_CENTER,1,1,"BT"); + HTM_TH (Txt_Code ,HTM_HEAD_RIGHT ); + HTM_TH (Txt_Short_name,HTM_HEAD_LEFT ); + HTM_TH (Txt_Full_name ,HTM_HEAD_LEFT ); + HTM_TH (Txt_WWW ,HTM_HEAD_LEFT ); HTM_TR_End (); } diff --git a/swad_log.c b/swad_log.c index f2b196b5..e0b58353 100644 --- a/swad_log.c +++ b/swad_log.c @@ -159,7 +159,6 @@ void Log_ShowLastClicks (void) void Log_GetAndShowLastClicks (void) { - extern const char *The_Colors[The_NUM_THEMES]; extern const char *Txt_Click; extern const char *Txt_ELAPSED_TIME; extern const char *Txt_Role; @@ -187,14 +186,14 @@ void Log_GetAndShowLastClicks (void) /* Heading row */ HTM_TR_Begin (NULL); - HTM_TH (1,1,Txt_Click ,"LC_CLK TIT_TBL_%s",The_Colors[Gbl.Prefs.Theme]); // Click - HTM_TH (1,1,Txt_ELAPSED_TIME,"LC_TIM TIT_TBL_%s",The_Colors[Gbl.Prefs.Theme]); // Elapsed time - HTM_TH (1,1,Txt_Role ,"LC_ROL TIT_TBL_%s",The_Colors[Gbl.Prefs.Theme]); // Role - HTM_TH (1,1,Txt_Country ,"LC_CTY TIT_TBL_%s",The_Colors[Gbl.Prefs.Theme]); // Country - HTM_TH (1,1,Txt_Institution ,"LC_INS TIT_TBL_%s",The_Colors[Gbl.Prefs.Theme]); // Institution - HTM_TH (1,1,Txt_Center ,"LC_CTR TIT_TBL_%s",The_Colors[Gbl.Prefs.Theme]); // Center - HTM_TH (1,1,Txt_Degree ,"LC_DEG TIT_TBL_%s",The_Colors[Gbl.Prefs.Theme]); // Degree - HTM_TH (1,1,Txt_Action ,"LC_ACT TIT_TBL_%s",The_Colors[Gbl.Prefs.Theme]); // Action + HTM_TH_Span (Txt_Click ,HTM_HEAD_RIGHT,1,1,"LC_CLK"); // Click + HTM_TH_Span (Txt_ELAPSED_TIME,HTM_HEAD_RIGHT,1,1,"LC_TIM"); // Elapsed time + HTM_TH_Span (Txt_Role ,HTM_HEAD_LEFT ,1,1,"LC_ROL"); // Role + HTM_TH_Span (Txt_Country ,HTM_HEAD_LEFT ,1,1,"LC_CTY"); // Country + HTM_TH_Span (Txt_Institution ,HTM_HEAD_LEFT ,1,1,"LC_INS"); // Institution + HTM_TH_Span (Txt_Center ,HTM_HEAD_LEFT ,1,1,"LC_CTR"); // Center + HTM_TH_Span (Txt_Degree ,HTM_HEAD_LEFT ,1,1,"LC_DEG"); // Degree + HTM_TH_Span (Txt_Action ,HTM_HEAD_LEFT ,1,1,"LC_ACT"); // Action HTM_TR_End (); for (NumClick = 0; diff --git a/swad_log_database.c b/swad_log_database.c index 8e0663e5..4a73ddb3 100644 --- a/swad_log_database.c +++ b/swad_log_database.c @@ -290,7 +290,7 @@ unsigned Log_DB_GetMyCrssAndHitsPerCrs (MYSQL_RES **mysql_res,Rol_Role_t Role) " WHERE UsrCod=%ld" " AND Role=%u) AS my_courses" // It's imperative to use a derived table to not block crs_usr! " LEFT JOIN log" - " ON (my_courses.CrsCod=log.CrsCod)" + " ON my_courses.CrsCod=log.CrsCod" " WHERE log.UsrCod=%ld" " AND log.Role=%u" " GROUP BY my_courses.CrsCod" diff --git a/swad_mail.c b/swad_mail.c index 743c622a..6348220b 100644 --- a/swad_mail.c +++ b/swad_mail.c @@ -132,7 +132,7 @@ void Mai_SeeMailDomains (void) Order <= (Mai_DomainsOrder_t) (Mai_NUM_ORDERS - 1); Order++) { - HTM_TH_TitleBegin (HTM_HEAD_LEFT); + HTM_TH_Begin (HTM_HEAD_LEFT); Frm_BeginForm (ActSeeMai); Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order); @@ -657,8 +657,8 @@ static void Mai_PutFormToCreateMailDomain (void) /***** Write heading *****/ HTM_TR_Begin (NULL); - HTM_TH (1,1,Txt_EMAIL_DOMAIN_ORDER[Mai_ORDER_BY_DOMAIN],"LM"); - HTM_TH (1,1,Txt_EMAIL_DOMAIN_ORDER[Mai_ORDER_BY_INFO] ,"LM"); + HTM_TH (Txt_EMAIL_DOMAIN_ORDER[Mai_ORDER_BY_DOMAIN],HTM_HEAD_LEFT); + HTM_TH (Txt_EMAIL_DOMAIN_ORDER[Mai_ORDER_BY_INFO] ,HTM_HEAD_LEFT); HTM_TR_End (); /***** Second row *****/ @@ -699,11 +699,11 @@ static void Mai_PutHeadMailDomains (void) extern const char *Txt_EMAIL_DOMAIN_ORDER[3]; HTM_TR_Begin (NULL); - HTM_TH (1,1,NULL ,"BM"); - HTM_TH (1,1,Txt_Code ,"RM"); - HTM_TH (1,1,Txt_EMAIL_DOMAIN_ORDER[Mai_ORDER_BY_DOMAIN],"LM"); - HTM_TH (1,1,Txt_EMAIL_DOMAIN_ORDER[Mai_ORDER_BY_INFO ],"LM"); - HTM_TH (1,1,Txt_EMAIL_DOMAIN_ORDER[Mai_ORDER_BY_USERS ],"RM"); + HTM_TH_Span (NULL ,HTM_HEAD_CENTER,1,1,"BT"); + HTM_TH (Txt_Code ,HTM_HEAD_RIGHT ); + HTM_TH (Txt_EMAIL_DOMAIN_ORDER[Mai_ORDER_BY_DOMAIN],HTM_HEAD_LEFT ); + HTM_TH (Txt_EMAIL_DOMAIN_ORDER[Mai_ORDER_BY_INFO ],HTM_HEAD_LEFT ); + HTM_TH (Txt_EMAIL_DOMAIN_ORDER[Mai_ORDER_BY_USERS ],HTM_HEAD_RIGHT ); HTM_TR_End (); } diff --git a/swad_match.c b/swad_match.c index 03558480..d689cdda 100644 --- a/swad_match.c +++ b/swad_match.c @@ -492,13 +492,13 @@ static void Mch_ListOneOrMoreMatchesHeading (bool ICanEditMatches) HTM_TH_Empty (1); /***** The rest of columns *****/ - HTM_TH (1,1,Txt_ROLES_SINGUL_Abc[Rol_TCH][Usr_SEX_UNKNOWN],"LT"); - HTM_TH (1,1,Txt_START_END_TIME[Gam_ORDER_BY_START_DATE] ,"LT"); - HTM_TH (1,1,Txt_START_END_TIME[Gam_ORDER_BY_END_DATE ] ,"LT"); - HTM_TH (1,1,Txt_Match ,"LT"); - HTM_TH (1,1,Txt_Players ,"RT"); - HTM_TH (1,1,Txt_Status ,"CT"); - HTM_TH (1,1,Txt_Results ,"CT"); + HTM_TH (Txt_ROLES_SINGUL_Abc[Rol_TCH][Usr_SEX_UNKNOWN],HTM_HEAD_LEFT ); + HTM_TH (Txt_START_END_TIME[Gam_ORDER_BY_START_DATE] ,HTM_HEAD_LEFT ); + HTM_TH (Txt_START_END_TIME[Gam_ORDER_BY_END_DATE ] ,HTM_HEAD_LEFT ); + HTM_TH (Txt_Match ,HTM_HEAD_LEFT ); + HTM_TH (Txt_Players ,HTM_HEAD_RIGHT ); + HTM_TH (Txt_Status ,HTM_HEAD_CENTER); + HTM_TH (Txt_Results ,HTM_HEAD_CENTER); /***** End row *****/ HTM_TR_End (); diff --git a/swad_match_result.c b/swad_match_result.c index 436dc9de..693c467d 100644 --- a/swad_match_result.c +++ b/swad_match_result.c @@ -564,8 +564,8 @@ static void MchRes_ListGamesToSelect (struct Gam_Games *Games) /***** Heading row *****/ HTM_TR_Begin (NULL); - HTM_TH (1,2,NULL ,NULL); - HTM_TH (1,1,Txt_Game,"LM"); + HTM_TH_Empty (2); + HTM_TH (Txt_Game,HTM_HEAD_LEFT); HTM_TR_End (); /***** List the events *****/ @@ -646,35 +646,34 @@ static void MchRes_ShowHeaderMchResults (Usr_MeOrOther_t MeOrOther) /***** First row *****/ HTM_TR_Begin (NULL); - HTM_TH (3,2,Txt_User[MeOrOther == Usr_ME ? Gbl.Usrs.Me.UsrDat.Sex : - Usr_SEX_UNKNOWN] - ,"CT LINE_BOTTOM"); - HTM_TH (3,1,Txt_START_END_TIME[Dat_STR_TIME],"LT LINE_BOTTOM"); - HTM_TH (3,1,Txt_START_END_TIME[Dat_END_TIME],"LT LINE_BOTTOM"); - HTM_TH (3,1,Txt_Match ,"LT LINE_BOTTOM"); - HTM_TH (3,1,Txt_Questions ,"RT LINE_BOTTOM LINE_LEFT"); - HTM_TH (1,2,Txt_Answers ,"CT LINE_LEFT"); - HTM_TH (1,2,Txt_Score ,"CT LINE_LEFT"); - HTM_TH (3,1,Txt_Grade ,"RT LINE_BOTTOM LINE_LEFT"); - HTM_TH (3,1,NULL ,"LINE_BOTTOM LINE_LEFT"); + HTM_TH_Span (Txt_User[MeOrOther == Usr_ME ? Gbl.Usrs.Me.UsrDat.Sex : + Usr_SEX_UNKNOWN],HTM_HEAD_CENTER,3,2,"LINE_BOTTOM"); + HTM_TH_Span (Txt_START_END_TIME[Dat_STR_TIME] ,HTM_HEAD_LEFT ,3,1,"LINE_BOTTOM"); + HTM_TH_Span (Txt_START_END_TIME[Dat_END_TIME] ,HTM_HEAD_LEFT ,3,1,"LINE_BOTTOM"); + HTM_TH_Span (Txt_Match ,HTM_HEAD_LEFT ,3,1,"LINE_BOTTOM"); + HTM_TH_Span (Txt_Questions ,HTM_HEAD_RIGHT ,3,1,"LINE_BOTTOM LINE_LEFT"); + HTM_TH_Span (Txt_Answers ,HTM_HEAD_CENTER,1,2,"LINE_LEFT"); + HTM_TH_Span (Txt_Score ,HTM_HEAD_CENTER,1,2,"LINE_LEFT"); + HTM_TH_Span (Txt_Grade ,HTM_HEAD_RIGHT ,3,1,"LINE_BOTTOM LINE_LEFT"); + HTM_TH_Span (NULL ,HTM_HEAD_LEFT ,3,1,"LINE_BOTTOM LINE_LEFT"); HTM_TR_End (); /***** Second row *****/ HTM_TR_Begin (NULL); - HTM_TH (1,1,Txt_ANSWERS_non_blank,"RT LINE_LEFT"); - HTM_TH (1,1,Txt_ANSWERS_blank ,"RT"); - HTM_TH (1,1,Txt_total ,"RT LINE_LEFT"); - HTM_TH (1,1,Txt_average ,"RT"); + HTM_TH_Span (Txt_ANSWERS_non_blank ,HTM_HEAD_RIGHT ,1,1,"LINE_LEFT"); + HTM_TH (Txt_ANSWERS_blank ,HTM_HEAD_RIGHT); + HTM_TH_Span (Txt_total ,HTM_HEAD_RIGHT ,1,1,"LINE_LEFT"); + HTM_TH (Txt_average ,HTM_HEAD_RIGHT); HTM_TR_End (); /***** Third row *****/ HTM_TR_Begin (NULL); - HTM_TH (1,1,"{-1≤pi≤1}" ,"RT LINE_BOTTOM LINE_LEFT"); - HTM_TH (1,1,"{pi=0}" ,"RT LINE_BOTTOM"); - HTM_TH (1,1,"Σpi" ,"RT LINE_BOTTOM LINE_LEFT"); - HTM_TH (1,1,"-1≤" + HTM_TH_Span ("{-1≤pi≤1}" ,HTM_HEAD_RIGHT ,1,1,"LINE_BOTTOM LINE_LEFT"); + HTM_TH_Span ("{pi=0}" ,HTM_HEAD_RIGHT ,1,1,"LINE_BOTTOM"); + HTM_TH_Span ("Σpi" ,HTM_HEAD_RIGHT ,1,1,"LINE_BOTTOM LINE_LEFT"); + HTM_TH_Span ("-1≤" "p" - "≤1" ,"RT LINE_BOTTOM"); + "≤1" ,HTM_HEAD_RIGHT ,1,1,"LINE_BOTTOM"); HTM_TR_End (); } diff --git a/swad_message.c b/swad_message.c index 7fa6fa91..8c00dbf0 100644 --- a/swad_message.c +++ b/swad_message.c @@ -540,7 +540,7 @@ static void Msg_WriteFormUsrsIDsOrNicksOtherRecipients (void) /***** Title *****/ HTM_TR_Begin (NULL); - HTM_TH_Begin (1,ColSpan,"LM BG_HIGHLIGHT"); + HTM_TH_Span_Begin (HTM_HEAD_LEFT,1,ColSpan,"BG_HIGHLIGHT"); HTM_LABEL_Begin ("for=\"OtherRecipients\""); HTM_TxtColon (StdsAndTchsWritten ? Txt_Other_recipients : Txt_Recipients); diff --git a/swad_network.c b/swad_network.c index d4b2a113..bd61450e 100644 --- a/swad_network.c +++ b/swad_network.c @@ -349,9 +349,9 @@ void Net_ShowWebAndSocialNetworksStats (void) /***** Write heading *****/ HTM_TR_Begin (NULL); - HTM_TH_Title (Txt_Web_social_network,HTM_HEAD_RIGHT); - HTM_TH_Title (Txt_Number_of_users ,HTM_HEAD_RIGHT); - HTM_TH_Title (Txt_PERCENT_of_users ,HTM_HEAD_RIGHT); + HTM_TH (Txt_Web_social_network,HTM_HEAD_RIGHT); + HTM_TH (Txt_Number_of_users ,HTM_HEAD_RIGHT); + HTM_TH (Txt_PERCENT_of_users ,HTM_HEAD_RIGHT); HTM_TR_End (); /***** For each web / social network... *****/ diff --git a/swad_notification.c b/swad_notification.c index 2bb550ad..ae947b8a 100644 --- a/swad_notification.c +++ b/swad_notification.c @@ -388,11 +388,11 @@ void Ntf_ShowMyNotifications (void) /***** Heading *****/ HTM_TR_Begin (NULL); - HTM_TH (1,2,Txt_Event ,"LM"); - HTM_TH (1,1,Txt_MSG_From,"LM"); - HTM_TH (1,1,Txt_Location,"LM"); - HTM_TH (1,1,Txt_Date ,"CM"); - HTM_TH (1,1,Txt_Email ,"LM"); + HTM_TH_Span (Txt_Event ,HTM_HEAD_LEFT ,1,2,NULL); + HTM_TH (Txt_MSG_From,HTM_HEAD_LEFT ); + HTM_TH (Txt_Location,HTM_HEAD_LEFT ); + HTM_TH (Txt_Date ,HTM_HEAD_CENTER); + HTM_TH (Txt_Email ,HTM_HEAD_LEFT ); HTM_TR_End (); /***** List notifications one by one *****/ @@ -1524,8 +1524,8 @@ void Ntf_PutFormChangeNotifSentByEMail (void) HTM_TR_Begin (NULL); HTM_TH_Empty (1); - HTM_TH (1,1,Txt_Create_BR_notification,"CM"); - HTM_TH (1,1,Txt_Notify_me_BR_by_email ,"CM"); + HTM_TH (Txt_Create_BR_notification,HTM_HEAD_CENTER); + HTM_TH (Txt_Notify_me_BR_by_email ,HTM_HEAD_CENTER); HTM_TR_End (); /***** Checkbox to activate internal notifications and email notifications diff --git a/swad_photo.c b/swad_photo.c index 4e2ba60a..0d3f5f2a 100644 --- a/swad_photo.c +++ b/swad_photo.c @@ -2221,12 +2221,12 @@ static void Pho_ShowOrPrintListDegrees (struct Pho_DegPhotos *DegPhotos, /***** Write heading *****/ HTM_TABLE_BeginCenterPadding (2); HTM_TR_Begin (NULL); - HTM_TH_Title (Txt_No_INDEX,HTM_HEAD_RIGHT); - HTM_TH_Title (Txt_Degree ,HTM_HEAD_CENTER); + HTM_TH (Txt_No_INDEX,HTM_HEAD_RIGHT); + HTM_TH (Txt_Degree ,HTM_HEAD_CENTER); for (Sex = (Usr_Sex_t) 0; Sex <= (Usr_Sex_t) (Usr_NUM_SEXS - 1); Sex++) - HTM_TH_Title (Txt_SEX_PLURAL_Abc[Sex],HTM_HEAD_CENTER); + HTM_TH (Txt_SEX_PLURAL_Abc[Sex],HTM_HEAD_CENTER); HTM_TR_End (); /***** Get degrees *****/ diff --git a/swad_photo_shape.c b/swad_photo_shape.c index 213913ba..1150ee8b 100644 --- a/swad_photo_shape.c +++ b/swad_photo_shape.c @@ -190,9 +190,9 @@ void PhoSha_GetAndShowNumUsrsPerPhotoShape (void) /***** Heading row *****/ HTM_TR_Begin (NULL); - HTM_TH_Title (Txt_User_photos ,HTM_HEAD_CENTER); - HTM_TH_Title (Txt_Number_of_users ,HTM_HEAD_RIGHT); - HTM_TH_Title (Txt_PERCENT_of_users,HTM_HEAD_RIGHT); + HTM_TH (Txt_User_photos ,HTM_HEAD_CENTER); + HTM_TH (Txt_Number_of_users ,HTM_HEAD_RIGHT); + HTM_TH (Txt_PERCENT_of_users,HTM_HEAD_RIGHT); HTM_TR_End (); /***** For each user photo shape... *****/ diff --git a/swad_place.c b/swad_place.c index 46429a37..071abdab 100644 --- a/swad_place.c +++ b/swad_place.c @@ -128,7 +128,7 @@ void Plc_SeePlaces (void) Order <= (Plc_Order_t) (Plc_NUM_ORDERS - 1); Order++) { - HTM_TH_TitleBegin (HTM_HEAD_LEFT); + HTM_TH_Begin (HTM_HEAD_LEFT); Frm_BeginForm (ActSeePlc); Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order); @@ -776,11 +776,11 @@ static void Plc_PutHeadPlaces (void) extern const char *Txt_Centers; HTM_TR_Begin (NULL); - HTM_TH (1,1,NULL ,"BM"); - HTM_TH (1,1,Txt_Code ,"RM"); - HTM_TH (1,1,Txt_Short_name,"LM"); - HTM_TH (1,1,Txt_Full_name ,"LM"); - HTM_TH (1,1,Txt_Centers ,"RM"); + HTM_TH_Span (NULL ,HTM_HEAD_CENTER,1,1,"BT"); + HTM_TH (Txt_Code ,HTM_HEAD_RIGHT ); + HTM_TH (Txt_Short_name,HTM_HEAD_LEFT ); + HTM_TH (Txt_Full_name ,HTM_HEAD_LEFT ); + HTM_TH (Txt_Centers ,HTM_HEAD_RIGHT ); HTM_TR_End (); } diff --git a/swad_plugin.c b/swad_plugin.c index cc4725e2..d89fdbfd 100644 --- a/swad_plugin.c +++ b/swad_plugin.c @@ -112,7 +112,7 @@ void Plg_ListPlugins (void) /***** Write table heading *****/ HTM_TR_Begin (NULL); HTM_TH_Empty (1); - HTM_TH (1,1,Txt_Plugin,"LM"); + HTM_TH (Txt_Plugin,HTM_HEAD_LEFT); HTM_TR_End (); /***** Write all plugins *****/ @@ -788,12 +788,12 @@ static void Plg_PutFormToCreatePlugin (void) /***** Write heading *****/ HTM_TR_Begin (NULL); - HTM_TH (1,1,Txt_Name ,"LM"); - HTM_TH (1,1,Txt_Description ,"LM"); - HTM_TH (1,1,Txt_Logo ,"LM"); - HTM_TH (1,1,Txt_Application_key,"LM"); - HTM_TH (1,1,Txt_URL ,"LM"); - HTM_TH (1,1,Txt_IP ,"LM"); + HTM_TH (Txt_Name ,HTM_HEAD_LEFT); + HTM_TH (Txt_Description ,HTM_HEAD_LEFT); + HTM_TH (Txt_Logo ,HTM_HEAD_LEFT); + HTM_TH (Txt_Application_key,HTM_HEAD_LEFT); + HTM_TH (Txt_URL ,HTM_HEAD_LEFT); + HTM_TH (Txt_IP ,HTM_HEAD_LEFT); HTM_TR_End (); /***** Row begin *****/ @@ -867,14 +867,14 @@ static void Plg_PutHeadPlugins (void) HTM_TR_Begin (NULL); HTM_TH_Empty (1); - HTM_TH (1,1,Txt_Code ,"RM"); + HTM_TH (Txt_Code ,HTM_HEAD_RIGHT); HTM_TH_Empty (1); - HTM_TH (1,1,Txt_Name ,"LM"); - HTM_TH (1,1,Txt_Description ,"LM"); - HTM_TH (1,1,Txt_Logo ,"LM"); - HTM_TH (1,1,Txt_Application_key,"LM"); - HTM_TH (1,1,Txt_URL ,"LM"); - HTM_TH (1,1,Txt_IP ,"LM"); + HTM_TH (Txt_Name ,HTM_HEAD_LEFT ); + HTM_TH (Txt_Description ,HTM_HEAD_LEFT ); + HTM_TH (Txt_Logo ,HTM_HEAD_LEFT ); + HTM_TH (Txt_Application_key,HTM_HEAD_LEFT ); + HTM_TH (Txt_URL ,HTM_HEAD_LEFT ); + HTM_TH (Txt_IP ,HTM_HEAD_LEFT ); HTM_TR_End (); } diff --git a/swad_project.c b/swad_project.c index 667269cc..79bed259 100644 --- a/swad_project.c +++ b/swad_project.c @@ -976,7 +976,7 @@ static void Prj_ShowProjectsHead (struct Prj_Projects *Projects, switch (ProjectView) { case Prj_LIST_PROJECTS: - HTM_TH_Title (Txt_No_INDEX,HTM_HEAD_CENTER); + HTM_TH (Txt_No_INDEX,HTM_HEAD_CENTER); break; default: break; @@ -987,7 +987,7 @@ static void Prj_ShowProjectsHead (struct Prj_Projects *Projects, { case Prj_LIST_PROJECTS: case Prj_FILE_BROWSER_PROJECT: - HTM_TH (1,1,NULL,"CONTEXT_COL"); + HTM_TH_Span (NULL,HTM_HEAD_CENTER,1,1,"CONTEXT_COL"); break; default: break; @@ -998,7 +998,7 @@ static void Prj_ShowProjectsHead (struct Prj_Projects *Projects, Order <= (Prj_Order_t) (Prj_NUM_ORDERS - 1); Order++) { - HTM_TH_TitleBegin (HTM_HEAD_LEFT); + HTM_TH_Begin (HTM_HEAD_LEFT); switch (ProjectView) { @@ -1032,7 +1032,6 @@ static void Prj_ShowProjectsHead (struct Prj_Projects *Projects, static void Prj_ShowTableAllProjectsHead (void) { - extern const char *The_ClassDatStrong[The_NUM_THEMES]; extern const char *Txt_PROJECT_ORDER[Prj_NUM_ORDERS]; extern const char *Txt_Assigned_QUESTION; extern const char *Txt_Number_of_students; @@ -1044,30 +1043,24 @@ static void Prj_ShowTableAllProjectsHead (void) extern const char *Txt_URL; Prj_Order_t Order; unsigned NumRoleToShow; - char *Class; - - if (asprintf (&Class,"LT %s",The_ClassDatStrong[Gbl.Prefs.Theme]) < 0) - Err_NotEnoughMemoryExit (); HTM_TR_Begin (NULL); for (Order = (Prj_Order_t) 0; Order <= (Prj_Order_t) (Prj_NUM_ORDERS - 1); Order++) - HTM_TH (1,1,Txt_PROJECT_ORDER[Order],Class); - HTM_TH (1,1,Txt_Assigned_QUESTION ,Class); - HTM_TH (1,1,Txt_Number_of_students,Class); + HTM_TH (Txt_PROJECT_ORDER[Order],HTM_HEAD_LEFT); + HTM_TH (Txt_Assigned_QUESTION ,HTM_HEAD_LEFT); + HTM_TH (Txt_Number_of_students,HTM_HEAD_LEFT); for (NumRoleToShow = 0; NumRoleToShow < Brw_NUM_ROLES_TO_SHOW; NumRoleToShow++) - HTM_TH (1,1,Txt_PROJECT_ROLES_PLURAL_Abc[Prj_RolesToShow[NumRoleToShow]],Class); - HTM_TH (1,1,Txt_Proposal ,Class); - HTM_TH (1,1,Txt_Description ,Class); - HTM_TH (1,1,Txt_Required_knowledge,Class); - HTM_TH (1,1,Txt_Required_materials,Class); - HTM_TH (1,1,Txt_URL ,Class); + HTM_TH (Txt_PROJECT_ROLES_PLURAL_Abc[Prj_RolesToShow[NumRoleToShow]],HTM_HEAD_LEFT); + HTM_TH (Txt_Proposal ,HTM_HEAD_LEFT); + HTM_TH (Txt_Description ,HTM_HEAD_LEFT); + HTM_TH (Txt_Required_knowledge,HTM_HEAD_LEFT); + HTM_TH (Txt_Required_materials,HTM_HEAD_LEFT); + HTM_TH (Txt_URL ,HTM_HEAD_LEFT); HTM_TR_End (); - - free (Class); } /*****************************************************************************/ diff --git a/swad_project_database.c b/swad_project_database.c index a0a65585..fd7978c4 100644 --- a/swad_project_database.c +++ b/swad_project_database.c @@ -326,9 +326,10 @@ unsigned Prj_DB_GetListProjects (MYSQL_RES **mysql_res, NumPrjsFromDB = (unsigned) DB_QuerySELECT (mysql_res,"can not get projects", "SELECT prj_projects.PrjCod" - " FROM prj_projects LEFT JOIN dpt_departments," - "prj_users" + " FROM prj_projects LEFT JOIN dpt_departments" " ON prj_projects.DptCod=dpt_departments.DptCod" + " LEFT JOIN prj_users" + " ON prj_projects.PrjCod=prj_users.PrjCod" " WHERE prj_projects.CrsCod=%ld" "%s" "%s" @@ -379,9 +380,10 @@ unsigned Prj_DB_GetListProjects (MYSQL_RES **mysql_res, NumPrjsFromDB = (unsigned) DB_QuerySELECT (mysql_res,"can not get projects", "SELECT prj_projects.PrjCod" - " FROM prj_projects LEFT JOIN dpt_departments," - "prj_users" + " FROM prj_projects LEFT JOIN dpt_departments" " ON prj_projects.DptCod=dpt_departments.DptCod" + " LEFT JOIN prj_users" + " ON prj_projects.PrjCod=prj_users.PrjCod" " WHERE prj_projects.CrsCod=%ld" "%s" "%s" diff --git a/swad_question.c b/swad_question.c index 1fdfb976..9f6b728a 100644 --- a/swad_question.c +++ b/swad_question.c @@ -915,11 +915,11 @@ void Qst_WriteHeadingRowQuestionsForEdition (struct Qst_Questions *Questions) /***** First columns *****/ HTM_TH_Empty (1); - HTM_TH (1,1,Txt_No_INDEX,"CT"); - HTM_TH (1,1,Txt_Code ,"CT"); - HTM_TH (1,1,Txt_Date ,"CT"); - HTM_TH (1,1,Txt_Tags ,"CT"); - HTM_TH (1,1,Txt_Shuffle ,"CT"); + HTM_TH (Txt_No_INDEX,HTM_HEAD_CENTER); + HTM_TH (Txt_Code ,HTM_HEAD_CENTER); + HTM_TH (Txt_Date ,HTM_HEAD_CENTER); + HTM_TH (Txt_Tags ,HTM_HEAD_CENTER); + HTM_TH (Txt_Shuffle ,HTM_HEAD_CENTER); /***** Columns which data can be ordered *****/ /* Stem and answers of question */ @@ -929,7 +929,7 @@ void Qst_WriteHeadingRowQuestionsForEdition (struct Qst_Questions *Questions) Order <= (Qst_QuestionsOrder_t) (Qst_NUM_TYPES_ORDER_QST - 1); Order++) { - HTM_TH_TitleBegin (HTM_HEAD_LEFT); + HTM_TH_Begin (HTM_HEAD_LEFT); if (Questions->NumQsts > 1) { @@ -1116,13 +1116,13 @@ void Qst_ListOneOrMoreQstsForSelectionForExamSet (struct Exa_Exams *Exams, /***** Write the heading *****/ HTM_TR_Begin (NULL); HTM_TH_Empty (1); - HTM_TH (1,1,Txt_No_INDEX,"CT"); - HTM_TH (1,1,Txt_Code ,"CT"); - HTM_TH (1,1,Txt_Date ,"CT"); - HTM_TH (1,1,Txt_Tags ,"LT"); - HTM_TH (1,1,Txt_Type ,"CT"); - HTM_TH (1,1,Txt_Shuffle ,"CT"); - HTM_TH (1,1,Txt_Question,"CT"); + HTM_TH (Txt_No_INDEX,HTM_HEAD_CENTER); + HTM_TH (Txt_Code ,HTM_HEAD_CENTER); + HTM_TH (Txt_Date ,HTM_HEAD_CENTER); + HTM_TH (Txt_Tags ,HTM_HEAD_LEFT ); + HTM_TH (Txt_Type ,HTM_HEAD_CENTER); + HTM_TH (Txt_Shuffle ,HTM_HEAD_CENTER); + HTM_TH (Txt_Question,HTM_HEAD_CENTER); HTM_TR_End (); /***** Write rows *****/ @@ -1200,13 +1200,13 @@ void Qst_ListOneOrMoreQstsForSelectionForGame (struct Gam_Games *Games, /***** Write the heading *****/ HTM_TR_Begin (NULL); HTM_TH_Empty (1); - HTM_TH (1,1,Txt_No_INDEX,"CT"); - HTM_TH (1,1,Txt_Code ,"CT"); - HTM_TH (1,1,Txt_Date ,"CT"); - HTM_TH (1,1,Txt_Tags ,"LT"); - HTM_TH (1,1,Txt_Type ,"CT"); - HTM_TH (1,1,Txt_Shuffle ,"CT"); - HTM_TH (1,1,Txt_Question,"CT"); + HTM_TH (Txt_No_INDEX,HTM_HEAD_CENTER); + HTM_TH (Txt_Code ,HTM_HEAD_CENTER); + HTM_TH (Txt_Date ,HTM_HEAD_CENTER); + HTM_TH (Txt_Tags ,HTM_HEAD_LEFT ); + HTM_TH (Txt_Type ,HTM_HEAD_CENTER); + HTM_TH (Txt_Shuffle ,HTM_HEAD_CENTER); + HTM_TH (Txt_Question,HTM_HEAD_CENTER); HTM_TR_End (); /***** Write rows *****/ diff --git a/swad_question_import.c b/swad_question_import.c index 3bcb4c0d..fa9717a4 100644 --- a/swad_question_import.c +++ b/swad_question_import.c @@ -837,11 +837,11 @@ static void QstImp_WriteHeadingListImportedQst (void) /***** Write the heading *****/ HTM_TR_Begin (NULL); HTM_TH_Empty (1); - HTM_TH (1,1,Txt_No_INDEX,"CT"); - HTM_TH (1,1,Txt_Tags ,"CT"); - HTM_TH (1,1,Txt_Type ,"CT"); - HTM_TH (1,1,Txt_Shuffle ,"CT"); - HTM_TH (1,1,Txt_Question,"LT"); + HTM_TH (Txt_No_INDEX,HTM_HEAD_CENTER); + HTM_TH (Txt_Tags ,HTM_HEAD_CENTER); + HTM_TH (Txt_Type ,HTM_HEAD_CENTER); + HTM_TH (Txt_Shuffle ,HTM_HEAD_CENTER); + HTM_TH (Txt_Question,HTM_HEAD_LEFT ); HTM_TR_End (); } diff --git a/swad_record.c b/swad_record.c index 3febdd25..b069608c 100644 --- a/swad_record.c +++ b/swad_record.c @@ -406,9 +406,9 @@ static void Rec_WriteHeadingRecordFields (void) HTM_TR_Begin (NULL); HTM_TH_Empty (1); - HTM_TH (1,1,Txt_Field_BR_name ,"CM"); - HTM_TH (1,1,Txt_Number_of_BR_lines ,"CM"); - HTM_TH (1,1,Txt_Visible_by_BR_the_student,"CM"); + HTM_TH (Txt_Field_BR_name ,HTM_HEAD_CENTER); + HTM_TH (Txt_Number_of_BR_lines ,HTM_HEAD_CENTER); + HTM_TH (Txt_Visible_by_BR_the_student,HTM_HEAD_CENTER); HTM_TR_End (); } diff --git a/swad_room.c b/swad_room.c index d7dc8bf2..108f0610 100644 --- a/swad_room.c +++ b/swad_room.c @@ -183,7 +183,7 @@ void Roo_SeeRooms (void) Order <= (Roo_Order_t) (Roo_NUM_ORDERS - 1); Order++) { - HTM_TH_TitleBegin (HTM_HEAD_LEFT); + HTM_TH_Begin (HTM_HEAD_LEFT); Frm_BeginForm (ActSeeRoo); Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order); HTM_BUTTON_OnSubmit_Begin (Txt_ROOMS_HELP_ORDER[Order], @@ -204,9 +204,7 @@ void Roo_SeeRooms (void) case Rol_CTR_ADM: case Rol_INS_ADM: case Rol_SYS_ADM: - HTM_TH_Begin (1,1,"LM"); - HTM_Txt (Txt_MAC_address); - HTM_TH_End (); + HTM_TH (Txt_MAC_address,HTM_HEAD_LEFT); break; default: break; @@ -1358,15 +1356,15 @@ static void Roo_PutHeadRooms (void) extern const char *Txt_MAC_address; HTM_TR_Begin (NULL); - HTM_TH (1,1,NULL ,"BM"); - HTM_TH (1,1,Txt_Code ,"RM"); - HTM_TH (1,1,Txt_Building ,"LM"); - HTM_TH (1,1,Txt_Floor ,"LM"); - HTM_TH (1,1,Txt_Type ,"LM"); - HTM_TH (1,1,Txt_Short_name ,"LM"); - HTM_TH (1,1,Txt_Full_name ,"LM"); - HTM_TH (1,1,Txt_Capacity_OF_A_ROOM,"LM"); - HTM_TH (1,1,Txt_MAC_address ,"LM"); + HTM_TH_Span (NULL ,HTM_HEAD_CENTER,1,1,"BT"); + HTM_TH (Txt_Code ,HTM_HEAD_CENTER); + HTM_TH (Txt_Building ,HTM_HEAD_LEFT ); + HTM_TH (Txt_Floor ,HTM_HEAD_LEFT ); + HTM_TH (Txt_Type ,HTM_HEAD_LEFT ); + HTM_TH (Txt_Short_name ,HTM_HEAD_LEFT ); + HTM_TH (Txt_Full_name ,HTM_HEAD_LEFT ); + HTM_TH (Txt_Capacity_OF_A_ROOM,HTM_HEAD_LEFT ); + HTM_TH (Txt_MAC_address ,HTM_HEAD_LEFT ); HTM_TR_End (); } diff --git a/swad_statistic.c b/swad_statistic.c index f081e4bb..365de7a6 100644 --- a/swad_statistic.c +++ b/swad_statistic.c @@ -1143,7 +1143,7 @@ static void Sta_ShowDetailedAccessesList (const struct Sta_Stats *Stats, Par_PutHiddenParamUnsigned (NULL,"RowsPage",Stats->RowsPerPage); Usr_PutHiddenParSelectedUsrsCods (&Gbl.Usrs.Selected); } - HTM_TH_TitleBegin (HTM_HEAD_LEFT); + HTM_TH_Begin (HTM_HEAD_LEFT); if (FirstRow > 1) { if (asprintf (&Title,Txt_Show_previous_X_clicks,Stats->RowsPerPage) < 0) @@ -1158,7 +1158,7 @@ static void Sta_ShowDetailedAccessesList (const struct Sta_Stats *Stats, Frm_EndForm (); /* Write number of current page */ - HTM_TH_TitleBegin (HTM_HEAD_CENTER); + HTM_TH_Begin (HTM_HEAD_CENTER); HTM_TxtF ("%s %u-%u %s %u (%s %u %s %u)", Txt_Clicks, FirstRow,LastRow,Txt_of_PART_OF_A_TOTAL,NumHits, @@ -1177,7 +1177,7 @@ static void Sta_ShowDetailedAccessesList (const struct Sta_Stats *Stats, Par_PutHiddenParamUnsigned (NULL,"RowsPage" ,(unsigned) Stats->RowsPerPage); Usr_PutHiddenParSelectedUsrsCods (&Gbl.Usrs.Selected); } - HTM_TH_TitleBegin (HTM_HEAD_RIGHT); + HTM_TH_Begin (HTM_HEAD_RIGHT); if (LastRow < NumHits) { if (asprintf (&Title,Txt_Show_next_X_clicks,Stats->RowsPerPage) < 0) @@ -1198,13 +1198,13 @@ static void Sta_ShowDetailedAccessesList (const struct Sta_Stats *Stats, /***** Write heading *****/ HTM_TR_Begin (NULL); - HTM_TH (1,1,Txt_No_INDEX ,"RT"); - HTM_TH (1,1,Txt_User_ID ,"CT"); - HTM_TH (1,1,Txt_Name ,"LT"); - HTM_TH (1,1,Txt_Role ,"CT"); - HTM_TH (1,1,Txt_Date ,"CT"); - HTM_TH (1,1,Txt_Action ,"LT"); - HTM_TH (1,1,Txt_LOG_More_info,"LT"); + HTM_TH (Txt_No_INDEX ,HTM_HEAD_RIGHT ); + HTM_TH (Txt_User_ID ,HTM_HEAD_CENTER); + HTM_TH (Txt_Name ,HTM_HEAD_LEFT ); + HTM_TH (Txt_Role ,HTM_HEAD_CENTER); + HTM_TH (Txt_Date ,HTM_HEAD_CENTER); + HTM_TH (Txt_Action ,HTM_HEAD_LEFT ); + HTM_TH (Txt_LOG_More_info,HTM_HEAD_LEFT ); HTM_TR_End (); /***** Write rows back *****/ @@ -1334,12 +1334,12 @@ static void Sta_ShowNumHitsPerUsr (Sta_CountType_t CountType, /***** Write heading *****/ HTM_TR_Begin (NULL); - HTM_TH (1,1,Txt_No_INDEX ,"RT"); - HTM_TH (1,1,Txt_Photo ,"CT"); - HTM_TH (1,1,Txt_ID ,"LT"); - HTM_TH (1,1,Txt_Name ,"LT"); - HTM_TH (1,1,Txt_Role ,"CT"); - HTM_TH (1,2,Txt_STAT_TYPE_COUNT_CAPS[CountType],"LT"); + HTM_TH (Txt_No_INDEX ,HTM_HEAD_RIGHT ); + HTM_TH (Txt_Photo ,HTM_HEAD_CENTER); + HTM_TH (Txt_ID ,HTM_HEAD_LEFT ); + HTM_TH (Txt_Name ,HTM_HEAD_LEFT ); + HTM_TH (Txt_Role ,HTM_HEAD_CENTER); + HTM_TH_Span (Txt_STAT_TYPE_COUNT_CAPS[CountType],HTM_HEAD_LEFT ,1,2,NULL); HTM_TR_End (); /***** Write rows *****/ @@ -1447,9 +1447,9 @@ static void Sta_ShowNumHitsPerDay (Sta_CountType_t CountType, /***** Write heading *****/ HTM_TR_Begin (NULL); - HTM_TH (1,1,Txt_Date ,"CT"); - HTM_TH (1,1,Txt_Day ,"LT"); - HTM_TH (1,1,Txt_STAT_TYPE_COUNT_CAPS[CountType],"LT"); + HTM_TH (Txt_Date ,HTM_HEAD_CENTER); + HTM_TH (Txt_Day ,HTM_HEAD_LEFT ); + HTM_TH (Txt_STAT_TYPE_COUNT_CAPS[CountType],HTM_HEAD_LEFT ); HTM_TR_End (); /***** Compute maximum number of pages generated per day *****/ @@ -1637,9 +1637,9 @@ static void Sta_ShowDistrAccessesPerDayAndHour (const struct Sta_Stats *Stats, /***** Write heading *****/ HTM_TR_Begin (NULL); - HTM_TH (3, 1,Txt_Date ,"CT"); - HTM_TH (3, 1,Txt_Day ,"LT"); - HTM_TH (1,24,Txt_STAT_TYPE_COUNT_CAPS[Stats->CountType],"LT"); + HTM_TH_Span (Txt_Date ,HTM_HEAD_CENTER,3, 1,NULL); + HTM_TH_Span (Txt_Day ,HTM_HEAD_LEFT ,3, 1,NULL); + HTM_TH_Span (Txt_STAT_TYPE_COUNT_CAPS[Stats->CountType],HTM_HEAD_LEFT ,1,24,NULL); HTM_TR_End (); HTM_TR_Begin (NULL); @@ -2025,8 +2025,8 @@ static void Sta_ShowNumHitsPerWeek (Sta_CountType_t CountType, /***** Write heading *****/ HTM_TR_Begin (NULL); - HTM_TH (1,1,Txt_Week ,"LT"); - HTM_TH (1,1,Txt_STAT_TYPE_COUNT_CAPS[CountType],"LT"); + HTM_TH (Txt_Week ,HTM_HEAD_LEFT); + HTM_TH (Txt_STAT_TYPE_COUNT_CAPS[CountType],HTM_HEAD_LEFT); HTM_TR_End (); /***** Compute maximum number of pages generated per week *****/ @@ -2124,8 +2124,8 @@ static void Sta_ShowNumHitsPerMonth (Sta_CountType_t CountType, /***** Write heading *****/ HTM_TR_Begin (NULL); - HTM_TH (1,1,Txt_Month ,"LT"); - HTM_TH (1,1,Txt_STAT_TYPE_COUNT_CAPS[CountType],"LT"); + HTM_TH (Txt_Month ,HTM_HEAD_LEFT); + HTM_TH (Txt_STAT_TYPE_COUNT_CAPS[CountType],HTM_HEAD_LEFT); HTM_TR_End (); /***** Compute maximum number of pages generated per month *****/ @@ -2223,8 +2223,8 @@ static void Sta_ShowNumHitsPerYear (Sta_CountType_t CountType, /***** Write heading *****/ HTM_TR_Begin (NULL); - HTM_TH (1,1,Txt_Year ,"LT"); - HTM_TH (1,1,Txt_STAT_TYPE_COUNT_CAPS[CountType],"LT"); + HTM_TH (Txt_Year ,HTM_HEAD_LEFT); + HTM_TH (Txt_STAT_TYPE_COUNT_CAPS[CountType],HTM_HEAD_LEFT); HTM_TR_End (); /***** Compute maximum number of pages generated per year *****/ @@ -2642,8 +2642,8 @@ static void Sta_ShowNumHitsPerAction (Sta_CountType_t CountType, /***** Write heading *****/ HTM_TR_Begin (NULL); - HTM_TH (1,1,Txt_Action ,"RT"); - HTM_TH (1,1,Txt_STAT_TYPE_COUNT_CAPS[CountType],"LT"); + HTM_TH (Txt_Action ,HTM_HEAD_RIGHT); + HTM_TH (Txt_STAT_TYPE_COUNT_CAPS[CountType],HTM_HEAD_LEFT ); HTM_TR_End (); /***** Compute maximum number of pages generated per day *****/ @@ -2695,8 +2695,8 @@ static void Sta_ShowNumHitsPerPlugin (Sta_CountType_t CountType, /***** Write heading *****/ HTM_TR_Begin (NULL); - HTM_TH (1,1,Txt_Plugin ,"RT"); - HTM_TH (1,1,Txt_STAT_TYPE_COUNT_CAPS[CountType],"LT"); + HTM_TH (Txt_Plugin ,HTM_HEAD_RIGHT); + HTM_TH (Txt_STAT_TYPE_COUNT_CAPS[CountType],HTM_HEAD_LEFT ); HTM_TR_End (); /***** Compute maximum number of pages generated per plugin *****/ @@ -2749,8 +2749,8 @@ static void Sta_ShowNumHitsPerWSFunction (Sta_CountType_t CountType, /***** Write heading *****/ HTM_TR_Begin (NULL); - HTM_TH (1,1,Txt_Function ,"LT"); - HTM_TH (1,1,Txt_STAT_TYPE_COUNT_CAPS[CountType],"LT"); + HTM_TH (Txt_Function ,HTM_HEAD_LEFT); + HTM_TH (Txt_STAT_TYPE_COUNT_CAPS[CountType],HTM_HEAD_LEFT); HTM_TR_End (); /***** Compute maximum number of pages generated per function *****/ @@ -2803,8 +2803,8 @@ static void Sta_ShowNumHitsPerBanner (Sta_CountType_t CountType, /***** Write heading *****/ HTM_TR_Begin (NULL); - HTM_TH (1,1,Txt_Banner ,"CT"); - HTM_TH (1,1,Txt_STAT_TYPE_COUNT_CAPS[CountType],"LT"); + HTM_TH (Txt_Banner ,HTM_HEAD_CENTER); + HTM_TH (Txt_STAT_TYPE_COUNT_CAPS[CountType],HTM_HEAD_LEFT ); HTM_TR_End (); /***** Compute maximum number of clicks per banner *****/ @@ -2873,9 +2873,9 @@ static void Sta_ShowNumHitsPerCountry (Sta_CountType_t CountType, /***** Write heading *****/ HTM_TR_Begin (NULL); - HTM_TH (1,1,Txt_No_INDEX ,"CT"); - HTM_TH (1,1,Txt_Country ,"CT"); - HTM_TH (1,1,Txt_STAT_TYPE_COUNT_CAPS[CountType],"LT"); + HTM_TH (Txt_No_INDEX ,HTM_HEAD_CENTER); + HTM_TH (Txt_Country ,HTM_HEAD_CENTER); + HTM_TH (Txt_STAT_TYPE_COUNT_CAPS[CountType],HTM_HEAD_LEFT ); HTM_TR_End (); /***** Compute maximum number of hits per country *****/ @@ -2961,9 +2961,9 @@ static void Sta_ShowNumHitsPerInstitution (Sta_CountType_t CountType, /***** Write heading *****/ HTM_TR_Begin (NULL); - HTM_TH (1,1,Txt_No_INDEX ,"CT"); - HTM_TH (1,1,Txt_Institution ,"CT"); - HTM_TH (1,1,Txt_STAT_TYPE_COUNT_CAPS[CountType],"LT"); + HTM_TH (Txt_No_INDEX ,HTM_HEAD_CENTER); + HTM_TH (Txt_Institution ,HTM_HEAD_CENTER); + HTM_TH (Txt_STAT_TYPE_COUNT_CAPS[CountType],HTM_HEAD_LEFT ); HTM_TR_End (); /***** Compute maximum number of hits per institution *****/ @@ -3051,9 +3051,9 @@ static void Sta_ShowNumHitsPerCenter (Sta_CountType_t CountType, /***** Write heading *****/ HTM_TR_Begin (NULL); - HTM_TH (1,1,Txt_No_INDEX ,"CT"); - HTM_TH (1,1,Txt_Center ,"CT"); - HTM_TH (1,1,Txt_STAT_TYPE_COUNT_CAPS[CountType],"LT"); + HTM_TH (Txt_No_INDEX ,HTM_HEAD_CENTER); + HTM_TH (Txt_Center ,HTM_HEAD_CENTER); + HTM_TH (Txt_STAT_TYPE_COUNT_CAPS[CountType],HTM_HEAD_LEFT ); HTM_TR_End (); /***** Compute maximum number of hits per center *****/ @@ -3141,9 +3141,9 @@ static void Sta_ShowNumHitsPerDegree (Sta_CountType_t CountType, /***** Write heading *****/ HTM_TR_Begin (NULL); - HTM_TH (1,1,Txt_No_INDEX ,"CT"); - HTM_TH (1,1,Txt_Degree ,"CT"); - HTM_TH (1,1,Txt_STAT_TYPE_COUNT_CAPS[CountType],"LT"); + HTM_TH (Txt_No_INDEX ,HTM_HEAD_CENTER); + HTM_TH (Txt_Degree ,HTM_HEAD_CENTER); + HTM_TH (Txt_STAT_TYPE_COUNT_CAPS[CountType],HTM_HEAD_LEFT ); HTM_TR_End (); /***** Compute maximum number of hits per degree *****/ @@ -3235,11 +3235,11 @@ static void Sta_ShowNumHitsPerCourse (Sta_CountType_t CountType, /***** Write heading *****/ HTM_TR_Begin (NULL); - HTM_TH (1,1,Txt_No_INDEX ,"CT"); - HTM_TH (1,1,Txt_Degree ,"CT"); - HTM_TH (1,1,Txt_Year_OF_A_DEGREE ,"CT"); - HTM_TH (1,1,Txt_Course ,"CT"); - HTM_TH (1,1,Txt_STAT_TYPE_COUNT_CAPS[CountType],"LT"); + HTM_TH (Txt_No_INDEX ,HTM_HEAD_CENTER); + HTM_TH (Txt_Degree ,HTM_HEAD_CENTER); + HTM_TH (Txt_Year_OF_A_DEGREE ,HTM_HEAD_CENTER); + HTM_TH (Txt_Course ,HTM_HEAD_CENTER); + HTM_TH (Txt_STAT_TYPE_COUNT_CAPS[CountType],HTM_HEAD_LEFT ); HTM_TR_End (); /***** Compute maximum number of pages generated per course *****/ diff --git a/swad_survey.c b/swad_survey.c index 79eec694..22a1294a 100644 --- a/swad_survey.c +++ b/swad_survey.c @@ -243,13 +243,13 @@ static void Svy_ListAllSurveys (struct Svy_Surveys *Surveys) HTM_TABLE_BeginWideMarginPadding (5); HTM_TR_Begin (NULL); - HTM_TH (1,1,NULL,"CONTEXT_COL"); // Column for contextual icons + HTM_TH_Span (NULL,HTM_HEAD_CENTER,1,1,"CONTEXT_COL"); // Column for contextual icons for (Order = (Dat_StartEndTime_t) 0; Order <= (Dat_StartEndTime_t) (Dat_NUM_START_END_TIME - 1); Order++) { - HTM_TH_TitleBegin (HTM_HEAD_LEFT); + HTM_TH_Begin (HTM_HEAD_LEFT); /* Form to change order */ Frm_BeginForm (ActSeeAllSvy); @@ -270,8 +270,8 @@ static void Svy_ListAllSurveys (struct Svy_Surveys *Surveys) HTM_TH_End (); } - HTM_TH_Title (Txt_Survey,HTM_HEAD_LEFT ); - HTM_TH_Title (Txt_Status,HTM_HEAD_CENTER); + HTM_TH (Txt_Survey,HTM_HEAD_LEFT ); + HTM_TH (Txt_Status,HTM_HEAD_CENTER); HTM_TR_End (); @@ -2792,9 +2792,9 @@ static void Svy_ListSvyQuestions (struct Svy_Surveys *Surveys, HTM_TR_Begin (NULL); if (Svy->Status.ICanEdit) HTM_TH_Empty (1); - HTM_TH (1,1,Txt_No_INDEX,"CT"); - HTM_TH (1,1,Txt_Type ,"CT"); - HTM_TH (1,1,Txt_Question,"LT"); + HTM_TH (Txt_No_INDEX,HTM_HEAD_CENTER); + HTM_TH (Txt_Type ,HTM_HEAD_CENTER); + HTM_TH (Txt_Question,HTM_HEAD_LEFT ); HTM_TR_End (); /***** Write questions one by one *****/ diff --git a/swad_test_print.c b/swad_test_print.c index 34905c9b..48db49e5 100644 --- a/swad_test_print.c +++ b/swad_test_print.c @@ -1789,34 +1789,34 @@ static void TstPrn_ShowHeaderPrints (Usr_MeOrOther_t MeOrOther) /***** First row *****/ HTM_TR_Begin (NULL); - HTM_TH (3,2,Txt_User[MeOrOther == Usr_ME ? Gbl.Usrs.Me.UsrDat.Sex : - Usr_SEX_UNKNOWN] - ,"CT LINE_BOTTOM"); - HTM_TH (3,1,Txt_START_END_TIME[Dat_STR_TIME],"LT LINE_BOTTOM"); - HTM_TH (3,1,Txt_START_END_TIME[Dat_END_TIME],"LT LINE_BOTTOM"); - HTM_TH (3,1,Txt_Questions ,"RT LINE_BOTTOM LINE_LEFT"); - HTM_TH (1,2,Txt_Answers ,"CT LINE_LEFT"); - HTM_TH (1,2,Txt_Score ,"CT LINE_LEFT"); - HTM_TH (3,1,Txt_Grade ,"RT LINE_BOTTOM LINE_LEFT"); - HTM_TH (3,1,NULL ,"LINE_BOTTOM LINE_LEFT"); + HTM_TH_Span (Txt_User[MeOrOther == Usr_ME ? + Gbl.Usrs.Me.UsrDat.Sex : + Usr_SEX_UNKNOWN ],HTM_HEAD_CENTER,3,2,"LINE_BOTTOM"); + HTM_TH_Span (Txt_START_END_TIME[Dat_STR_TIME] ,HTM_HEAD_LEFT ,3,1,"LINE_BOTTOM"); + HTM_TH_Span (Txt_START_END_TIME[Dat_END_TIME] ,HTM_HEAD_LEFT ,3,1,"LINE_BOTTOM"); + HTM_TH_Span (Txt_Questions ,HTM_HEAD_RIGHT ,3,1,"LINE_BOTTOM LINE_LEFT"); + HTM_TH_Span (Txt_Answers ,HTM_HEAD_CENTER,1,2,"LINE_LEFT"); + HTM_TH_Span (Txt_Score ,HTM_HEAD_CENTER,1,2,"LINE_LEFT"); + HTM_TH_Span (Txt_Grade ,HTM_HEAD_RIGHT ,3,1,"LINE_BOTTOM LINE_LEFT"); + HTM_TH_Span (NULL ,HTM_HEAD_CENTER,3,1,"LINE_BOTTOM LINE_LEFT"); HTM_TR_End (); /***** Second row *****/ HTM_TR_Begin (NULL); - HTM_TH (1,1,Txt_ANSWERS_non_blank,"RT LINE_LEFT"); - HTM_TH (1,1,Txt_ANSWERS_blank ,"RT"); - HTM_TH (1,1,Txt_total ,"RT LINE_LEFT"); - HTM_TH (1,1,Txt_average ,"RT"); + HTM_TH_Span (Txt_ANSWERS_non_blank ,HTM_HEAD_RIGHT ,1,1,"LINE_LEFT"); + HTM_TH (Txt_ANSWERS_blank ,HTM_HEAD_RIGHT ); + HTM_TH_Span (Txt_total ,HTM_HEAD_RIGHT ,1,1,"LINE_LEFT"); + HTM_TH (Txt_average ,HTM_HEAD_RIGHT ); HTM_TR_End (); /***** Third row *****/ HTM_TR_Begin (NULL); - HTM_TH (1,1,"{-1≤pi≤1}","RT LINE_BOTTOM LINE_LEFT"); - HTM_TH (1,1,"{pi=0}" ,"RT LINE_BOTTOM"); - HTM_TH (1,1,"Σpi" ,"RT LINE_BOTTOM LINE_LEFT"); - HTM_TH (1,1,"-1≤" - "p" - "≤1" ,"RT LINE_BOTTOM"); + HTM_TH_Span ("{-1≤pi≤1}",HTM_HEAD_RIGHT ,1,1,"LINE_BOTTOM LINE_LEFT"); + HTM_TH_Span ("{pi=0}" ,HTM_HEAD_RIGHT ,1,1,"LINE_BOTTOM"); + HTM_TH_Span ("Σpi" ,HTM_HEAD_RIGHT ,1,1,"LINE_BOTTOM LINE_LEFT"); + HTM_TH_Span ("-1≤" + "p" + "≤1" ,HTM_HEAD_RIGHT ,1,1,"LINE_BOTTOM"); HTM_TR_End (); } diff --git a/swad_user.c b/swad_user.c index d7ddabd2..85cc1b1e 100644 --- a/swad_user.c +++ b/swad_user.c @@ -3860,7 +3860,7 @@ static void Usr_PutCheckboxToSelectAllUsers (Rol_Role_t Role, HTM_TR_Begin (NULL); - HTM_TH_Begin (1,Usr_GetColumnsForSelectUsrs (),"LM BG_HIGHLIGHT"); + HTM_TH_Span_Begin (HTM_HEAD_LEFT,1,Usr_GetColumnsForSelectUsrs (),"BG_HIGHLIGHT"); HTM_LABEL_Begin (NULL); if (Usr_NameSelUnsel[Role] && Usr_ParamUsrCod[Role]) @@ -4013,14 +4013,14 @@ void Usr_WriteHeaderFieldsUsrDat (bool PutCheckBoxToSelectUsr) /***** First column used for selection *****/ if (PutCheckBoxToSelectUsr) - HTM_TH (1,1,NULL,"LM BG_HIGHLIGHT"); + HTM_TH_Span (NULL,HTM_HEAD_LEFT,1,1,"BG_HIGHLIGHT"); /***** Columns for user's data fields *****/ for (NumCol = 0; NumCol < Usr_NUM_MAIN_FIELDS_DATA_USR; NumCol++) if (NumCol != 2 || Gbl.Usrs.Listing.WithPhotos) // Skip photo column if I don't want this column - HTM_TH (1,1,Usr_UsrDatMainFieldNames[NumCol],"LM BG_HIGHLIGHT"); + HTM_TH_Span (Usr_UsrDatMainFieldNames[NumCol],HTM_HEAD_LEFT,1,1,"BG_HIGHLIGHT"); HTM_TR_End (); } @@ -4176,14 +4176,14 @@ static void Usr_ListMainDataTchs (Rol_Role_t Role, /* First column used for selection */ if (PutCheckBoxToSelectUsr) - HTM_TH (1,1,NULL,"LM BG_HIGHLIGHT"); + HTM_TH_Span (NULL,HTM_HEAD_LEFT,1,1,"BG_HIGHLIGHT"); /* Columns for the data */ for (NumCol = 0; NumCol < Usr_NUM_MAIN_FIELDS_DATA_USR; NumCol++) if (NumCol != 2 || Gbl.Usrs.Listing.WithPhotos) // Skip photo column if I don't want this column - HTM_TH (1,1,Usr_UsrDatMainFieldNames[NumCol],"LM BG_HIGHLIGHT"); + HTM_TH_Span (Usr_UsrDatMainFieldNames[NumCol],HTM_HEAD_LEFT,1,1,"BG_HIGHLIGHT"); /* End row */ HTM_TR_End (); @@ -4281,7 +4281,7 @@ void Usr_ListAllDataGsts (void) 1); NumCol < NumColumnsCommonCard; NumCol++) - HTM_TH (1,1,FieldNames[NumCol],"LM BG_HIGHLIGHT"); + HTM_TH_Span (FieldNames[NumCol],HTM_HEAD_LEFT,1,1,"BG_HIGHLIGHT"); /* End row */ HTM_TR_End (); @@ -4433,7 +4433,7 @@ void Usr_ListAllDataStds (void) 1); NumCol < NumColsCommonRecord; NumCol++) - HTM_TH (1,1,FieldNames[NumCol],"LM BG_HIGHLIGHT"); + HTM_TH_Span (FieldNames[NumCol],HTM_HEAD_LEFT,1,1,"BG_HIGHLIGHT"); /* 2. Columns for the groups */ if (Gbl.Scope.Current == HieLvl_CRS) @@ -4444,7 +4444,7 @@ void Usr_ListAllDataStds (void) NumGrpTyp++) if (Gbl.Crs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp].NumGrps) // If current course tiene groups of este type { - HTM_TH_Begin (1,1,"LM BG_HIGHLIGHT"); + HTM_TH_Span_Begin (HTM_HEAD_LEFT,1,1,"BG_HIGHLIGHT"); HTM_TxtF ("%s %s", Txt_Group, Gbl.Crs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp].GrpTypName); @@ -4457,8 +4457,7 @@ void Usr_ListAllDataStds (void) for (NumField = 0; NumField < Gbl.Crs.Records.LstFields.Num; NumField++) - HTM_TH (1,1,Gbl.Crs.Records.LstFields.Lst[NumField].Name, - "LM BG_HIGHLIGHT"); + HTM_TH_Span (Gbl.Crs.Records.LstFields.Lst[NumField].Name,HTM_HEAD_LEFT,1,1,"BG_HIGHLIGHT"); /* 4. Visibility type for the record fields that depend on the course, in other row */ HTM_TR_End (); @@ -4477,7 +4476,7 @@ void Usr_ListAllDataStds (void) NumField < Gbl.Crs.Records.LstFields.Num; NumField++) { - HTM_TH_Begin (1,1,"LM BG_HIGHLIGHT"); + HTM_TH_Span_Begin (HTM_HEAD_LEFT,1,1,"BG_HIGHLIGHT"); HTM_TxtF ("(%s)", Txt_RECORD_FIELD_VISIBILITY_RECORD[Gbl.Crs.Records.LstFields.Lst[NumField].Visibility]); HTM_TH_End (); @@ -4687,7 +4686,7 @@ static void Usr_ListRowsAllDataTchs (Rol_Role_t Role, 1); NumCol < NumColumns; NumCol++) - HTM_TH (1,1,FieldNames[NumCol],"LM BG_HIGHLIGHT"); + HTM_TH_Span (FieldNames[NumCol],HTM_HEAD_LEFT,1,1,"BG_HIGHLIGHT"); HTM_TR_End (); @@ -4936,7 +4935,7 @@ void Usr_ListDataAdms (void) NumCol < Usr_NUM_MAIN_FIELDS_DATA_ADM; NumCol++) if (NumCol != 1 || Gbl.Usrs.Listing.WithPhotos) // Skip photo column if I don't want this column - HTM_TH (1,1,FieldNames[NumCol],"LM BG_HIGHLIGHT"); + HTM_TH_Span (FieldNames[NumCol],HTM_HEAD_LEFT,1,1,"BG_HIGHLIGHT"); HTM_TR_End ();