diff --git a/swad_centre.c b/swad_centre.c index 93b477322..fb4d44600 100644 --- a/swad_centre.c +++ b/swad_centre.c @@ -183,14 +183,12 @@ void Ctr_SeeCtrWithPendingDegs (void) Tbl_TR_Begin (NULL); Tbl_TH_Begin ("class=\"LEFT_MIDDLE\""); - fprintf (Gbl.F.Out,"%s" - "", - Txt_Centre); + fprintf (Gbl.F.Out,"%s",Txt_Centre); + Tbl_TH_End (); Tbl_TH_Begin ("class=\"RIGHT_MIDDLE\""); - fprintf (Gbl.F.Out,"%s" - "", - Txt_Degrees_ABBREVIATION); + fprintf (Gbl.F.Out,"%s",Txt_Degrees_ABBREVIATION); + Tbl_TH_End (); Tbl_TR_End (); @@ -2701,9 +2699,8 @@ static void Ctr_PutHeadCentresForEdition (void) Tbl_TH_Empty (1); Tbl_TH_Begin ("class=\"RIGHT_MIDDLE\""); - fprintf (Gbl.F.Out,"%s" - "", - Txt_Code); + fprintf (Gbl.F.Out,"%s",Txt_Code); + Tbl_TH_End (); Tbl_TH_Empty (1); diff --git a/swad_changelog.h b/swad_changelog.h index 73f9f50e6..886f6b0b1 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -487,7 +487,7 @@ enscript -2 --landscape --color --file-align=2 --highlight --line-numbers -o - * En OpenSWAD: ps2pdf source.ps destination.pdf */ -#define Log_PLATFORM_VERSION "SWAD 19.32.1 (2019-10-11)" +#define Log_PLATFORM_VERSION "SWAD 19.32.2 (2019-10-11)" #define CSS_FILE "swad19.29.css" #define JS_FILE "swad19.30.js" /* @@ -496,6 +496,7 @@ ps2pdf source.ps destination.pdf // TODO: En un TFG no preasignado con estudiante tiene que salir un triángulo amarillo // TODO: Hacer un nuevo rol en los TFG: tutor externo (profesor de áreas no vinculadas con el centro, profesionales de empresas, etc.) + Version 19.32.2: Oct 11, 2019 Code refactoring in HTML. (246668 lines) Version 19.32.1: Oct 11, 2019 Code refactoring in HTML. (246668 lines) Version 19.32: Oct 10, 2019 Code refactoring in HTML. (246631 lines) Version 19.31.40: Oct 10, 2019 Code refactoring in HTML tables. (246669 lines) diff --git a/swad_chat.c b/swad_chat.c index 0fdbfbf76..df0025886 100644 --- a/swad_chat.c +++ b/swad_chat.c @@ -284,14 +284,15 @@ void Cht_ShowListOfChatRoomsWithUsrs (void) /***** Write heading *****/ Tbl_TR_Begin (NULL); - fprintf (Gbl.F.Out,"" - "%s" - "" - "" - "%s" - "", - Txt_CHAT_Room_code, - Txt_No_of_users); + + Tbl_TH_Begin ("class=\"CENTER_MIDDLE LIGHT_BLUE\""); + fprintf (Gbl.F.Out,"%s",Txt_CHAT_Room_code); + Tbl_TH_End (); + + Tbl_TH_Begin ("class=\"LEFT_MIDDLE LIGHT_BLUE\""); + fprintf (Gbl.F.Out,"%s",Txt_No_of_users); + Tbl_TH_End (); + Tbl_TR_End (); /***** Loop over chat rooms *****/ diff --git a/swad_classroom.c b/swad_classroom.c index bd9639042..0b7af2c30 100644 --- a/swad_classroom.c +++ b/swad_classroom.c @@ -120,7 +120,7 @@ void Cla_SeeClassrooms (void) Order <= (Cla_Order_t) (Cla_NUM_ORDERS - 1); Order++) { - fprintf (Gbl.F.Out,""); + Tbl_TH_Begin ("class=\"LEFT_MIDDLE\""); Frm_StartForm (ActSeeCla); Par_PutHiddenParamUnsigned ("Order",(unsigned) Order); Frm_LinkFormSubmit (Txt_CLASSROOMS_HELP_ORDER[Order],"TIT_TBL",NULL); @@ -962,27 +962,30 @@ static void Cla_PutHeadClassrooms (void) extern const char *Txt_Location; Tbl_TR_Begin (NULL); - fprintf (Gbl.F.Out,"" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "", - Txt_Code, - Txt_Short_name, - Txt_Full_name, - Txt_Capacity_OF_A_CLASSROOM, - Txt_Location); + + Tbl_TH_Begin ("class=\"BM\""); + Tbl_TH_End (); + + Tbl_TH_Begin ("class=\"RIGHT_MIDDLE\""); + fprintf (Gbl.F.Out,"%s",Txt_Code); + Tbl_TH_End (); + + Tbl_TH_Begin ("class=\"LEFT_MIDDLE\""); + fprintf (Gbl.F.Out,"%s",Txt_Short_name); + Tbl_TH_End (); + + Tbl_TH_Begin ("class=\"LEFT_MIDDLE\""); + fprintf (Gbl.F.Out,"%s",Txt_Full_name); + Tbl_TH_End (); + + Tbl_TH_Begin ("class=\"LEFT_MIDDLE\""); + fprintf (Gbl.F.Out,"%s",Txt_Capacity_OF_A_CLASSROOM); + Tbl_TH_End (); + + Tbl_TH_Begin ("class=\"LEFT_MIDDLE\""); + fprintf (Gbl.F.Out,"%s",Txt_Location); + Tbl_TH_End (); + Tbl_TR_End (); } diff --git a/swad_country.c b/swad_country.c index ff41ae53b..3f29156e3 100644 --- a/swad_country.c +++ b/swad_country.c @@ -156,14 +156,15 @@ void Cty_SeeCtyWithPendingInss (void) /***** Write heading *****/ Tbl_TR_Begin (NULL); - fprintf (Gbl.F.Out,"" - "%s" - "" - "" - "%s" - "", - Txt_Country, - Txt_Institutions_ABBREVIATION); + + Tbl_TH_Begin ("class=\"LEFT_MIDDLE\""); + fprintf (Gbl.F.Out,"%s",Txt_Country); + Tbl_TH_End (); + + Tbl_TH_Begin ("class=\"RIGHT_MIDDLE\""); + fprintf (Gbl.F.Out,"%s",Txt_Institutions_ABBREVIATION); + Tbl_TH_End (); + Tbl_TR_End (); /***** List the countries *****/ @@ -666,9 +667,9 @@ static void Cty_PutHeadCountriesForSeeing (bool OrderSelectable) Order <= Cty_ORDER_BY_NUM_USRS; Order++) { - fprintf (Gbl.F.Out,"", - Order == Cty_ORDER_BY_COUNTRY ? "LEFT_MIDDLE" : - "RIGHT_MIDDLE"); + Tbl_TH_Begin ("class=\"%s\"", + Order == Cty_ORDER_BY_COUNTRY ? "LEFT_MIDDLE" : + "RIGHT_MIDDLE"); if (OrderSelectable) { Frm_StartForm (ActSeeCty); @@ -687,27 +688,28 @@ static void Cty_PutHeadCountriesForSeeing (bool OrderSelectable) } Tbl_TH_End (); } - fprintf (Gbl.F.Out,"" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s+
%s" - "", - Txt_Institutions_ABBREVIATION, - Txt_Centres_ABBREVIATION, - Txt_Degrees_ABBREVIATION, - Txt_Courses_ABBREVIATION, - Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH], + + Tbl_TH_Begin ("class=\"RIGHT_MIDDLE\""); + fprintf (Gbl.F.Out,"%s",Txt_Institutions_ABBREVIATION); + Tbl_TH_End (); + + Tbl_TH_Begin ("class=\"RIGHT_MIDDLE\""); + fprintf (Gbl.F.Out,"%s",Txt_Centres_ABBREVIATION); + Tbl_TH_End (); + + Tbl_TH_Begin ("class=\"RIGHT_MIDDLE\""); + fprintf (Gbl.F.Out,"%s",Txt_Degrees_ABBREVIATION); + Tbl_TH_End (); + + Tbl_TH_Begin ("class=\"RIGHT_MIDDLE\""); + fprintf (Gbl.F.Out,"%s",Txt_Courses_ABBREVIATION); + Tbl_TH_End (); + + Tbl_TH_Begin ("class=\"RIGHT_MIDDLE\""); + fprintf (Gbl.F.Out,"%s+
%s", + Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH], Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD]); + Tbl_TH_End (); Tbl_TR_End (); } @@ -2149,32 +2151,34 @@ static void Cty_PutHeadCountriesForEdition (void) Tbl_TR_Begin (NULL); - fprintf (Gbl.F.Out,"" - "" - "%s" - "" - "" - "%s" - "", - Txt_Numeric_BR_code_BR_ISO_3166_1, - Txt_Alphabetic_BR_code_BR_ISO_3166_1); + Tbl_TH_Begin ("class=\"BM\""); + Tbl_TH_End (); + + Tbl_TH_Begin ("class=\"RIGHT_MIDDLE\""); + fprintf (Gbl.F.Out,"%s",Txt_Numeric_BR_code_BR_ISO_3166_1); + Tbl_TH_End (); + + Tbl_TH_Begin ("class=\"RIGHT_MIDDLE\""); + fprintf (Gbl.F.Out,"%s",Txt_Alphabetic_BR_code_BR_ISO_3166_1); + Tbl_TH_End (); + Tbl_TH_Empty (1); - fprintf (Gbl.F.Out,"" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "", - Txt_Name, - Txt_WWW, - Txt_Users, - Txt_Institutions_ABBREVIATION); + + Tbl_TH_Begin ("class=\"LEFT_MIDDLE\""); + fprintf (Gbl.F.Out,"%s",Txt_Name); + Tbl_TH_End (); + + Tbl_TH_Begin ("class=\"LEFT_MIDDLE\""); + fprintf (Gbl.F.Out,"%s",Txt_WWW); + Tbl_TH_End (); + + Tbl_TH_Begin ("class=\"RIGHT_MIDDLE\""); + fprintf (Gbl.F.Out,"%s",Txt_Users); + Tbl_TH_End (); + + Tbl_TH_Begin ("class=\"RIGHT_MIDDLE\""); + fprintf (Gbl.F.Out,"%s",Txt_Institutions_ABBREVIATION); + Tbl_TH_End (); Tbl_TR_End (); } diff --git a/swad_course.c b/swad_course.c index bdd4e6714..8a56406dd 100644 --- a/swad_course.c +++ b/swad_course.c @@ -1804,29 +1804,33 @@ static void Crs_PutHeadCoursesForSeeing (void) extern const char *Txt_ROLES_PLURAL_BRIEF_Abc[Rol_NUM_ROLES]; Tbl_TR_Begin (NULL); - fprintf (Gbl.F.Out,"" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "", - Txt_Institutional_BR_code, - Txt_Year_OF_A_DEGREE, - Txt_Course, - Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH], - Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD]); + + Tbl_TH_Begin ("class=\"BM\""); + Tbl_TH_End (); + + Tbl_TH_Begin ("class=\"CENTER_MIDDLE\""); + fprintf (Gbl.F.Out,"%s",Txt_Institutional_BR_code); + Tbl_TH_End (); + + Tbl_TH_Begin ("class=\"CENTER_MIDDLE\""); + fprintf (Gbl.F.Out,"%s",Txt_Year_OF_A_DEGREE); + Tbl_TH_End (); + + Tbl_TH_Begin ("class=\"LEFT_MIDDLE\""); + fprintf (Gbl.F.Out,"%s",Txt_Course); + Tbl_TH_End (); + + Tbl_TH_Begin ("class=\"RIGHT_MIDDLE\""); + fprintf (Gbl.F.Out,"%s",Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH]); + Tbl_TH_End (); + + Tbl_TH_Begin ("class=\"RIGHT_MIDDLE\""); + fprintf (Gbl.F.Out,"%s",Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD]); + Tbl_TH_End (); + + Tbl_TH_Begin ("class=\"LEFT_MIDDLE\""); + Tbl_TH_End (); + Tbl_TR_End (); } @@ -1846,41 +1850,45 @@ static void Crs_PutHeadCoursesForEdition (void) extern const char *Txt_Requester; Tbl_TR_Begin (NULL); - fprintf (Gbl.F.Out,"" - "" - "%s" - "" - "" - "%s (%s)" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "", - Txt_Code, - Txt_Institutional_code,Txt_optional, - Txt_Year_OF_A_DEGREE, - Txt_Short_name_of_the_course, - Txt_Full_name_of_the_course, - Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH], - Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD], - Txt_Requester); + + Tbl_TH_Begin ("class=\"BM\""); + Tbl_TH_End (); + + Tbl_TH_Begin ("class=\"RIGHT_MIDDLE\""); + fprintf (Gbl.F.Out,"%s",Txt_Code); + Tbl_TH_End (); + + Tbl_TH_Begin ("class=\"CENTER_MIDDLE\""); + fprintf (Gbl.F.Out,"%s (%s)",Txt_Institutional_code,Txt_optional); + Tbl_TH_End (); + + Tbl_TH_Begin ("class=\"CENTER_MIDDLE\""); + fprintf (Gbl.F.Out,"%s",Txt_Year_OF_A_DEGREE); + Tbl_TH_End (); + + Tbl_TH_Begin ("class=\"LEFT_MIDDLE\""); + fprintf (Gbl.F.Out,"%s",Txt_Short_name_of_the_course); + Tbl_TH_End (); + + Tbl_TH_Begin ("class=\"LEFT_MIDDLE\""); + fprintf (Gbl.F.Out,"%s",Txt_Full_name_of_the_course); + Tbl_TH_End (); + + Tbl_TH_Begin ("class=\"RIGHT_MIDDLE\""); + fprintf (Gbl.F.Out,"%s",Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH]); + Tbl_TH_End (); + + Tbl_TH_Begin ("class=\"RIGHT_MIDDLE\""); + fprintf (Gbl.F.Out,"%s",Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD]); + Tbl_TH_End (); + + Tbl_TH_Begin ("class=\"LEFT_MIDDLE\""); + fprintf (Gbl.F.Out,"%s",Txt_Requester); + Tbl_TH_End (); + + Tbl_TH_Begin ("class=\"LEFT_MIDDLE\""); + Tbl_TH_End (); + Tbl_TR_End (); } @@ -3109,34 +3117,43 @@ void Crs_GetAndWriteCrssOfAUsr (const struct UsrData *UsrDat,Rol_Role_t Role) Txt_USER_in_COURSE, Role == Rol_UNK ? Txt_User[Usr_SEX_UNKNOWN] : // Role == Rol_UNK ==> any role Txt_ROLES_SINGUL_Abc[Role][UsrDat->Sex]); + Tbl_TR_Begin (NULL); - fprintf (Gbl.F.Out,"%s:", - Gbl.Title); + + Tbl_TH_Begin ("colspan=\"7\" class=\"LEFT_MIDDLE\""); + fprintf (Gbl.F.Out,"%s:",Gbl.Title); + Tbl_TH_End (); + Tbl_TR_End (); Tbl_TR_Begin (NULL); - fprintf (Gbl.F.Out,"" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "", - Txt_Degree, - Txt_Year_OF_A_DEGREE, - Txt_Course, - Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH], - Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD]); + + Tbl_TH_Begin ("class=\"BM\""); + Tbl_TH_End (); + + Tbl_TH_Begin ("class=\"BM\""); + Tbl_TH_End (); + + Tbl_TH_Begin ("class=\"LEFT_MIDDLE\""); + fprintf (Gbl.F.Out,"%s",Txt_Degree); + Tbl_TH_End (); + + Tbl_TH_Begin ("class=\"CENTER_MIDDLE\""); + fprintf (Gbl.F.Out,"%s",Txt_Year_OF_A_DEGREE); + Tbl_TH_End (); + + Tbl_TH_Begin ("class=\"LEFT_MIDDLE\""); + fprintf (Gbl.F.Out,"%s",Txt_Course); + Tbl_TH_End (); + + Tbl_TH_Begin ("class=\"RIGHT_MIDDLE\""); + fprintf (Gbl.F.Out,"%s",Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH]); + Tbl_TH_End (); + + Tbl_TH_Begin ("class=\"RIGHT_MIDDLE\""); + fprintf (Gbl.F.Out,"%s",Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD]); + Tbl_TH_End (); + Tbl_TR_End (); /* Write courses */ @@ -3188,27 +3205,30 @@ void Crs_ListCrssFound (MYSQL_RES **mysql_res,unsigned NumCrss) /***** Heading row *****/ Tbl_TR_Begin (NULL); - fprintf (Gbl.F.Out,"" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "" - "" - "%s" - "", - Txt_Degree, - Txt_Year_OF_A_DEGREE, - Txt_Course, - Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH], - Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD]); + + Tbl_TH_Begin ("class=\"BM\""); + Tbl_TH_End (); + + Tbl_TH_Begin ("class=\"LEFT_MIDDLE\""); + fprintf (Gbl.F.Out,"%s",Txt_Degree); + Tbl_TH_End (); + + Tbl_TH_Begin ("class=\"CENTER_MIDDLE\""); + fprintf (Gbl.F.Out,"%s",Txt_Year_OF_A_DEGREE); + Tbl_TH_End (); + + Tbl_TH_Begin ("class=\"LEFT_MIDDLE\""); + fprintf (Gbl.F.Out,"%s",Txt_Course); + Tbl_TH_End (); + + Tbl_TH_Begin ("class=\"RIGHT_MIDDLE\""); + fprintf (Gbl.F.Out,"%s",Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH]); + Tbl_TH_End (); + + Tbl_TH_Begin ("class=\"RIGHT_MIDDLE\""); + fprintf (Gbl.F.Out,"%s", Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD]); + Tbl_TH_End (); + Tbl_TR_End (); /***** Write courses *****/ diff --git a/swad_group.c b/swad_group.c index 8f84ae482..9e2249f93 100644 --- a/swad_group.c +++ b/swad_group.c @@ -5051,8 +5051,8 @@ void Grp_ShowFormToSelWhichGrps (Act_Action_t Action,void (*FuncParams) (void)) if (FuncParams) // Extra parameters depending on the action FuncParams (); Ico_PutSettingIconLink (WhichGrps == Grp_MY_GROUPS ? "mysitemap.png" : - "sitemap.svg", - Txt_GROUP_WHICH_GROUPS[WhichGrps]); + "sitemap.svg", + Txt_GROUP_WHICH_GROUPS[WhichGrps]); Frm_EndForm (); fprintf (Gbl.F.Out,""); } diff --git a/swad_survey.c b/swad_survey.c index 5b9f908e7..f8ac90cbc 100644 --- a/swad_survey.c +++ b/swad_survey.c @@ -595,7 +595,7 @@ static void Svy_ShowOneSurvey (long SvyCod,struct SurveyQuestion *SvyQst, /***** Write second row of data of this survey *****/ Tbl_TR_Begin (NULL); - /* Author of the survey */ + /* 1st column: Author of the survey */ if (ShowOnlyThisSvyComplete) Tbl_TD_Begin ("colspan=\"2\" class=\"LEFT_TOP\""); else @@ -603,11 +603,11 @@ static void Svy_ShowOneSurvey (long SvyCod,struct SurveyQuestion *SvyQst, Svy_WriteAuthor (&Svy); Tbl_TD_End (); + /* 2nd column: Scope, Users, Groups and Text */ if (ShowOnlyThisSvyComplete) Tbl_TD_Begin ("class=\"LEFT_TOP\""); else Tbl_TD_Begin ("class=\"LEFT_TOP COLOR%u\"",Gbl.RowEvenOdd); - Tbl_TD_End (); /* Scope of the survey */ fprintf (Gbl.F.Out,"
%s: ", @@ -620,28 +620,22 @@ static void Svy_ShowOneSurvey (long SvyCod,struct SurveyQuestion *SvyQst, Lay_ShowErrorAndExit ("Wrong survey scope."); break; case Hie_SYS: // System - fprintf (Gbl.F.Out,"%s", - Cfg_PLATFORM_SHORT_NAME); + fprintf (Gbl.F.Out,"%s",Cfg_PLATFORM_SHORT_NAME); break; case Hie_CTY: // Country - fprintf (Gbl.F.Out,"%s %s", - Txt_Country,Gbl.Hierarchy.Cty.Name[Gbl.Prefs.Language]); + fprintf (Gbl.F.Out,"%s %s",Txt_Country,Gbl.Hierarchy.Cty.Name[Gbl.Prefs.Language]); break; case Hie_INS: // Institution - fprintf (Gbl.F.Out,"%s %s", - Txt_Institution,Gbl.Hierarchy.Ins.ShrtName); + fprintf (Gbl.F.Out,"%s %s",Txt_Institution,Gbl.Hierarchy.Ins.ShrtName); break; case Hie_CTR: // Centre - fprintf (Gbl.F.Out,"%s %s", - Txt_Centre,Gbl.Hierarchy.Ctr.ShrtName); + fprintf (Gbl.F.Out,"%s %s",Txt_Centre,Gbl.Hierarchy.Ctr.ShrtName); break; case Hie_DEG: // Degree - fprintf (Gbl.F.Out,"%s %s", - Txt_Degree,Gbl.Hierarchy.Deg.ShrtName); + fprintf (Gbl.F.Out,"%s %s",Txt_Degree,Gbl.Hierarchy.Deg.ShrtName); break; case Hie_CRS: // Course - fprintf (Gbl.F.Out,"%s %s", - Txt_Course,Gbl.Hierarchy.Crs.ShrtName); + fprintf (Gbl.F.Out,"%s %s",Txt_Course,Gbl.Hierarchy.Crs.ShrtName); break; } fprintf (Gbl.F.Out,"
");