From 2ebd8094aef753cd7ae6d2bec3d9b999b12e0435 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Fri, 27 Dec 2019 21:10:39 +0100 Subject: [PATCH] Version19.100 --- swad_ID.c | 4 + swad_account.c | 4 + swad_agenda.c | 6 + swad_announcement.c | 3 + swad_assignment.c | 6 + swad_attendance.c | 7 + swad_centre.c | 33 +++- swad_changelog.h | 4 +- swad_country.c | 444 ++++++++++++++++++++++++++------------------ swad_course.c | 20 ++ swad_date.c | 10 +- swad_degree.c | 10 +- swad_enrolment.c | 4 + swad_exam.c | 26 +++ swad_file_browser.c | 8 + swad_forum.c | 4 + swad_game.c | 4 + swad_hierarchy.c | 25 +++ swad_indicator.c | 6 + swad_institution.c | 21 ++- swad_mail.c | 6 + swad_match.c | 2 + swad_message.c | 6 + swad_nickname.c | 6 + swad_password.c | 13 +- swad_photo.c | 9 + swad_project.c | 11 ++ swad_record.c | 16 +- swad_statistic.c | 10 +- swad_survey.c | 8 + swad_test.c | 6 + 31 files changed, 538 insertions(+), 204 deletions(-) diff --git a/swad_ID.c b/swad_ID.c index 1ae0603b1..05d01a4eb 100644 --- a/swad_ID.c +++ b/swad_ID.c @@ -602,8 +602,10 @@ static void ID_ShowFormChangeUsrID (const struct UsrData *UsrDat, { HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("REC_C1_BOT RT",NULL,Txt_ID); + /* Data */ HTM_TD_Begin ("class=\"REC_C2_BOT LT USR_ID\""); } else // NumID >= 1 @@ -677,10 +679,12 @@ static void ID_ShowFormChangeUsrID (const struct UsrData *UsrDat, /***** Form to enter new user's ID *****/ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("REC_C1_BOT RT","NewID", UsrDat->IDs.Num ? Txt_Another_ID : // A new user's ID Txt_ID); // The first user's ID + /* Data */ HTM_TD_Begin ("class=\"REC_C2_BOT LT DAT\""); if (ItsMe) Frm_StartFormAnchor (ActChgMyID,ID_ID_SECTION_ID); diff --git a/swad_account.c b/swad_account.c index afe4eef2b..f917ea2bf 100644 --- a/swad_account.c +++ b/swad_account.c @@ -371,8 +371,10 @@ static void Acc_ShowFormRequestNewAccountWithParams (const char NewNicknameWitho NewNicknameWithArroba[0] = '\0'; HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RT","NewNick",Txt_Nickname); + /* Data */ HTM_TD_Begin ("class=\"LT\""); HTM_INPUT_TEXT ("NewNick",1 + Nck_MAX_CHARS_NICKNAME_WITHOUT_ARROBA, NewNicknameWithArroba,false, @@ -385,8 +387,10 @@ static void Acc_ShowFormRequestNewAccountWithParams (const char NewNicknameWitho /***** Email *****/ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RT","NewEmail",Txt_Email); + /* Data */ HTM_TD_Begin ("class=\"LT\""); HTM_INPUT_EMAIL ("NewEmail",Cns_MAX_CHARS_EMAIL_ADDRESS,NewEmail, "id=\"NewEmail\" size=\"18\" placeholder=\"%s\" required=\"required\"", diff --git a/swad_agenda.c b/swad_agenda.c index 146d2f325..795276e0f 100644 --- a/swad_agenda.c +++ b/swad_agenda.c @@ -1507,8 +1507,10 @@ void Agd_RequestCreatOrEditEvent (void) /***** Event *****/ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RT","Event",Txt_Event); + /* Data */ HTM_TD_Begin ("class=\"LT\""); HTM_INPUT_TEXT ("Event",Agd_MAX_CHARS_EVENT,AgdEvent.Event,false, "id=\"Event\" required=\"required\"" @@ -1520,8 +1522,10 @@ void Agd_RequestCreatOrEditEvent (void) /***** Location *****/ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RT","Location",Txt_Location); + /* Data */ HTM_TD_Begin ("class=\"LT\""); HTM_INPUT_TEXT ("Location",Agd_MAX_CHARS_LOCATION,AgdEvent.Location,false, "id=\"Location\" required=\"required\"" @@ -1537,8 +1541,10 @@ void Agd_RequestCreatOrEditEvent (void) /***** Text *****/ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RT","Txt",Txt_Description); + /* Data */ HTM_TD_Begin ("class=\"LT\""); HTM_TEXTAREA_Begin ("id=\"Txt\" name=\"Txt\" rows=\"5\"" " class=\"TITLE_DESCRIPTION_WIDTH\""); diff --git a/swad_announcement.c b/swad_announcement.c index 5689bf122..0a3969334 100644 --- a/swad_announcement.c +++ b/swad_announcement.c @@ -450,10 +450,13 @@ static void Ann_PutSubjectMessage (const char *Field,const char *Label, { extern const char *The_ClassFormInBox[The_NUM_THEMES]; + /***** Subject or content *****/ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RT",Field,Label); + /* Data */ HTM_TD_Begin ("class=\"LT\""); HTM_TEXTAREA_Begin ("id=\"%s\" name=\"%s\" cols=\"75\" rows=\"%u\"", Field,Field,Rows); diff --git a/swad_assignment.c b/swad_assignment.c index b9fa6c67a..ca7249118 100644 --- a/swad_assignment.c +++ b/swad_assignment.c @@ -1165,8 +1165,10 @@ void Asg_RequestCreatOrEditAsg (void) /***** Assignment title *****/ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RM","Title",Txt_Title); + /* Data */ HTM_TD_Begin ("class=\"LM\""); HTM_INPUT_TEXT ("Title",Asg_MAX_CHARS_ASSIGNMENT_TITLE,Asg.Title,false, "id=\"Title\" required=\"required\"" @@ -1181,8 +1183,10 @@ void Asg_RequestCreatOrEditAsg (void) /***** Send work? *****/ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RM","Folder",Txt_Upload_files_QUESTION); + /* Data */ HTM_TD_Begin ("class=\"LM\""); HTM_LABEL_Begin ("class=\"DAT\""); HTM_TxtF ("%s:",Txt_Folder); @@ -1196,8 +1200,10 @@ void Asg_RequestCreatOrEditAsg (void) /***** Assignment text *****/ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RT","Txt",Txt_Description); + /* Data */ HTM_TD_Begin ("class=\"LT\""); HTM_TEXTAREA_Begin ("id=\"Txt\" name=\"Txt\" rows=\"10\"" " class=\"TITLE_DESCRIPTION_WIDTH\""); diff --git a/swad_attendance.c b/swad_attendance.c index d29a062a9..b318d0dfa 100644 --- a/swad_attendance.c +++ b/swad_attendance.c @@ -1072,8 +1072,10 @@ void Att_RequestCreatOrEditAttEvent (void) /***** Attendance event title *****/ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RT","Title",Txt_Title); + /* Data */ HTM_TD_Begin ("class=\"LT\""); HTM_INPUT_TEXT ("Title",Att_MAX_CHARS_ATTENDANCE_EVENT_TITLE,Att.Title,false, "id=\"Title\" required=\"required\"" @@ -1088,8 +1090,10 @@ void Att_RequestCreatOrEditAttEvent (void) /***** Visibility of comments *****/ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RT","ComTchVisible",Txt_Teachers_comment); + /* Data */ HTM_TD_Begin ("class=\"LT\""); HTM_SELECT_Begin (false,"id=\"ComTchVisible\" name=\"ComTchVisible\""); HTM_OPTION (HTM_Type_STRING,"N",!Att.CommentTchVisible,false, @@ -1098,13 +1102,16 @@ void Att_RequestCreatOrEditAttEvent (void) "%s",Txt_Visible_MALE_PLURAL); HTM_SELECT_End (); HTM_TD_End (); + HTM_TR_End (); /***** Attendance event description *****/ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RT","Txt",Txt_Description); + /* Data */ HTM_TD_Begin ("class=\"LT\""); HTM_TEXTAREA_Begin ("id=\"Txt\" name=\"Txt\" rows=\"5\"" " class=\"TITLE_DESCRIPTION_WIDTH\""); diff --git a/swad_centre.c b/swad_centre.c index d661c3443..e8e6b0b18 100644 --- a/swad_centre.c +++ b/swad_centre.c @@ -546,12 +546,14 @@ static void Ctr_ConfigLatitude (void) { extern const char *Txt_Latitude; + /***** Latitude *****/ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RM","Latitude",Txt_Latitude); + /* Data */ HTM_TD_Begin ("class=\"LM\""); - /* Form to change centre latitude */ Frm_StartForm (ActChgCtrLatCfg); HTM_INPUT_FLOAT ("Latitude", -90.0, // South Pole @@ -569,12 +571,14 @@ static void Ctr_ConfigLongitude (void) { extern const char *Txt_Longitude; + /***** Longitude *****/ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RM","Longitude",Txt_Longitude); + /* Data */ HTM_TD_Begin ("class=\"LM\""); - /* Form to change centre longitude */ Frm_StartForm (ActChgCtrLgtCfg); HTM_INPUT_FLOAT ("Longitude", -180.0, // West @@ -592,12 +596,14 @@ static void Ctr_ConfigAltitude (void) { extern const char *Txt_Altitude; + /***** Altitude *****/ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RM","Altitude",Txt_Altitude); + /* Data */ HTM_TD_Begin ("class=\"LM\""); - /* Form to change centre altitude */ Frm_StartForm (ActChgCtrAltCfg); HTM_INPUT_FLOAT ("Altitude", -413.0, // Dead Sea shore @@ -698,12 +704,15 @@ static void Ctr_ConfigInstitution (bool PutForm) extern const char *Txt_Institution; unsigned NumIns; + /***** Institution *****/ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RM",PutForm ? "OthInsCod" : NULL, Txt_Institution); + /* Data */ HTM_TD_Begin ("class=\"DAT_N LM\""); if (PutForm) { @@ -766,14 +775,19 @@ static void Ctr_ConfigPlace (bool PutForm) struct Place Plc; unsigned NumPlc; + /***** Get data of place *****/ Plc.PlcCod = Gbl.Hierarchy.Ctr.PlcCod; Plc_GetDataOfPlaceByCod (&Plc); + + /***** Place *****/ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RM",PutForm ? "PlcCod" : NULL, Txt_Place); + /* Data */ HTM_TD_Begin ("class=\"DAT LM\""); if (PutForm) { @@ -842,10 +856,13 @@ static void Ctr_ConfigNumUsrs (void) { extern const char *Txt_Users_of_the_centre; + /***** Number of users *****/ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RM",NULL,Txt_Users_of_the_centre); + /* Data */ HTM_TD_Begin ("class=\"DAT LM\""); HTM_Unsigned (Usr_GetNumUsrsWhoClaimToBelongToCtr (Gbl.Hierarchy.Ctr.CtrCod)); HTM_TD_End (); @@ -862,11 +879,13 @@ static void Ctr_ConfigNumDegs (void) extern const char *Txt_Degrees; extern const char *Txt_Degrees_of_CENTRE_X; + /***** Number of degrees *****/ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RM",NULL,Txt_Degrees); - /* Form to go to see degrees of this centre */ + /* Data */ HTM_TD_Begin ("class=\"LM\""); Frm_StartFormGoTo (ActSeeDeg); Ctr_PutParamCtrCod (Gbl.Hierarchy.Ctr.CtrCod); @@ -890,10 +909,13 @@ static void Ctr_ConfigNumCrss (void) { extern const char *Txt_Courses; + /***** Number of courses *****/ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RM",NULL,Txt_Courses); + /* Data */ HTM_TD_Begin ("class=\"DAT LM\""); HTM_Unsigned (Crs_GetNumCrssInCtr (Gbl.Hierarchy.Ctr.CtrCod)); HTM_TD_End (); @@ -910,12 +932,15 @@ static void Ctr_ShowNumUsrsInCrssOfCtr (Rol_Role_t Role) extern const char *Txt_Users_in_courses; extern const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS]; + /***** Number of users in courses *****/ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RM",NULL, Role == Rol_UNK ? Txt_Users_in_courses : Txt_ROLES_PLURAL_Abc[Role][Usr_SEX_UNKNOWN]); + /* Data */ HTM_TD_Begin ("class=\"DAT LM\""); HTM_Unsigned (Usr_GetNumUsrsInCrssOfCtr (Role,Gbl.Hierarchy.Ctr.CtrCod)); HTM_TD_End (); diff --git a/swad_changelog.h b/swad_changelog.h index 2cee4a061..c716ad48a 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -492,7 +492,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.99.2 (2019-12-27)" +#define Log_PLATFORM_VERSION "SWAD 19.100 (2019-12-27)" #define CSS_FILE "swad19.99.1.css" #define JS_FILE "swad19.91.1.js" /* @@ -502,7 +502,7 @@ ps2pdf source.ps destination.pdf Version 19.102: Dec 27, 2019 Map in country information. (? lines) Version 19.101: Dec 27, 2019 Map in institution information. (? lines) - Version 19.100: Dec 27, 2019 Code refactoring in country information. (? lines) + Version 19.100: Dec 27, 2019 Code refactoring in country information. (249170 lines) Version 19.99.2: Dec 27, 2019 Fixed bug in attendance. (248857 lines) Version 19.99.1: Dec 27, 2019 Code refactoring in form labels. (248855 lines) Version 19.99: Dec 27, 2019 Code refactoring in form labels. (248924 lines) diff --git a/swad_country.c b/swad_country.c index 6d376d2c2..dead8cf4d 100644 --- a/swad_country.c +++ b/swad_country.c @@ -72,6 +72,16 @@ long Cty_CurrentCtyCod = -1L; // Used as parameter in contextual links static void Cty_Configuration (bool PrintView); static void Cty_PutIconToPrint (void); +static void Cty_ConfigTitle (bool PutLink); +static void Cty_ConfigMap (bool PrintView,bool PutLink); +static void Cty_ConfigName (bool PutLink); +static void Cty_ConfigShortcut (void); +static void Cty_ConfigQR (void); +static void Cty_ConfigNumUsrs (void); +static void Cty_ConfigNumInss (void); +static void Cty_ConfigNumCtrs (void); +static void Cty_ConfigNumDegs (void); +static void Cty_ConfigNumCrss (void); static void Cty_ShowNumUsrsInCrssOfCty (Rol_Role_t Role); static void Cty_PutHeadCountriesForSeeing (bool OrderSelectable); @@ -236,24 +246,15 @@ void Cty_PrintConfiguration (void) static void Cty_Configuration (bool PrintView) { extern const char *Hlp_COUNTRY_Information; - extern const char *The_ClassFormInBox[The_NUM_THEMES]; - extern const char *Txt_Country; - extern const char *Txt_Shortcut; - extern const char *Lan_STR_LANG_ID[1 + Lan_NUM_LANGUAGES]; - extern const char *Txt_QR_code; - extern const char *Txt_Institutions; - extern const char *Txt_Institutions_of_COUNTRY_X; - extern const char *Txt_Centres; - extern const char *Txt_Degrees; - extern const char *Txt_Courses; - extern const char *Txt_Users_of_the_country; - char *MapAttribution = NULL; bool PutLink; /***** Trivial check *****/ if (Gbl.Hierarchy.Cty.CtyCod <= 0) // No country selected return; + /***** Initializations *****/ + PutLink = !PrintView && Gbl.Hierarchy.Cty.WWW[Gbl.Prefs.Language][0]; + /***** Begin box *****/ if (PrintView) Box_BoxBegin (NULL,NULL,NULL, @@ -263,192 +264,36 @@ static void Cty_Configuration (bool PrintView) Hlp_COUNTRY_Information,Box_NOT_CLOSABLE); /***** Title *****/ - PutLink = !PrintView && Gbl.Hierarchy.Cty.WWW[Gbl.Prefs.Language][0]; - HTM_DIV_Begin ("class=\"FRAME_TITLE FRAME_TITLE_BIG\""); - if (PutLink) - HTM_A_Begin ("href=\"%s\" target=\"_blank\"" - " class=\"FRAME_TITLE_BIG\" title=\"%s\"", - Gbl.Hierarchy.Cty.WWW[Gbl.Prefs.Language], - Gbl.Hierarchy.Cty.Name[Gbl.Prefs.Language]); - HTM_Txt (Gbl.Hierarchy.Cty.Name[Gbl.Prefs.Language]); - if (PutLink) - HTM_A_End (); - HTM_DIV_End (); + Cty_ConfigTitle (PutLink); - /***** Country map (and link to WWW if exists) *****/ + /***** Country map *****/ if (Cty_CheckIfCountryMapExists (&Gbl.Hierarchy.Cty)) - { - /* Get map attribution */ - Cty_GetMapAttribution (Gbl.Hierarchy.Cty.CtyCod,&MapAttribution); - - /* Map image */ - HTM_DIV_Begin ("class=\"DAT_SMALL CM\""); - if (PutLink) - HTM_A_Begin ("href=\"%s\" target=\"_blank\"", - Gbl.Hierarchy.Cty.WWW[Gbl.Prefs.Language]); - Cty_DrawCountryMap (&Gbl.Hierarchy.Cty,PrintView ? "COUNTRY_MAP_PRINT" : - "COUNTRY_MAP_SHOW"); - if (PutLink) - HTM_A_End (); - HTM_DIV_End (); - - /* Map attribution */ - if (!PrintView && Cty_CheckIfICanEditCountries ()) - { - HTM_DIV_Begin ("class=\"CM\""); - Frm_StartForm (ActChgCtyMapAtt); - HTM_TEXTAREA_Begin ("name=\"Attribution\" cols=\"50\" rows=\"2\"" - " onchange=\"document.getElementById('%s').submit();return false;\"", - Gbl.Form.Id); - if (MapAttribution) - HTM_Txt (MapAttribution); - HTM_TEXTAREA_End (); - Frm_EndForm (); - HTM_DIV_End (); - } - else if (MapAttribution) - { - HTM_DIV_Begin ("class=\"ATTRIBUTION\""); - HTM_Txt (MapAttribution); - HTM_DIV_End (); - } - - /* Free memory used for map attribution */ - Cty_FreeMapAttribution (&MapAttribution); - } + Cty_ConfigMap (PrintView,PutLink); /***** Begin table *****/ HTM_TABLE_BeginWidePadding (2); /***** Country name (an link to WWW if exists) *****/ - HTM_TR_Begin (NULL); + Cty_ConfigName (PutLink); - HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtF ("%s:",Txt_Country); - HTM_TD_End (); - - HTM_TD_Begin ("class=\"DAT_N LM\""); - if (!PrintView && Gbl.Hierarchy.Cty.WWW[Gbl.Prefs.Language][0]) - HTM_A_Begin ("href=\"%s\" target=\"_blank\" class=\"DAT_N\"", - Gbl.Hierarchy.Cty.WWW[Gbl.Prefs.Language]); - HTM_Txt (Gbl.Hierarchy.Cty.Name[Gbl.Prefs.Language]); - if (!PrintView && Gbl.Hierarchy.Cty.WWW[Gbl.Prefs.Language][0]) - HTM_A_End (); - HTM_TD_End (); - - HTM_TR_End (); - - /***** Link to the country inside platform *****/ - HTM_TR_Begin (NULL); - - HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtF ("%s:",Txt_Shortcut); - HTM_TD_End (); - - HTM_TD_Begin ("class=\"DAT LM\""); - HTM_A_Begin ("href=\"%s/%s?cty=%ld\" class=\"DAT\" target=\"_blank\"", - Cfg_URL_SWAD_CGI, - Lan_STR_LANG_ID[Gbl.Prefs.Language], - Gbl.Hierarchy.Cty.CtyCod); - HTM_TxtF ("%s/%s?cty=%ld", - Cfg_URL_SWAD_CGI, - Lan_STR_LANG_ID[Gbl.Prefs.Language], - Gbl.Hierarchy.Cty.CtyCod); - HTM_A_End (); - HTM_TD_End (); - - HTM_TR_End (); + /***** Shortcut to the country *****/ + Cty_ConfigShortcut (); if (PrintView) - { /***** QR code with link to the country *****/ - HTM_TR_Begin (NULL); - - HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtF ("%s:",Txt_QR_code); - HTM_TD_End (); - - HTM_TD_Begin ("class=\"DAT LM\""); - QR_LinkTo (250,"cty",Gbl.Hierarchy.Cty.CtyCod); - HTM_TD_End (); - - HTM_TR_End (); - } + Cty_ConfigQR (); else { - /***** Number of users who claim to belong to this country *****/ - HTM_TR_Begin (NULL); - - HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtF ("%s:",Txt_Users_of_the_country); - HTM_TD_End (); - - HTM_TD_Begin ("class=\"DAT LM\""); - HTM_Unsigned (Usr_GetNumUsrsWhoClaimToBelongToCty (Gbl.Hierarchy.Cty.CtyCod)); - HTM_TD_End (); - - HTM_TR_End (); - - /***** Number of institutions *****/ - HTM_TR_Begin (NULL); - - HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtF ("%s:",Txt_Institutions); - HTM_TD_End (); - - /* Form to go to see institutions of this country */ - HTM_TD_Begin ("class=\"LM\""); - Frm_StartFormGoTo (ActSeeIns); - Cty_PutParamCtyCod (Gbl.Hierarchy.Cty.CtyCod); - snprintf (Gbl.Title,sizeof (Gbl.Title), - Txt_Institutions_of_COUNTRY_X, - Gbl.Hierarchy.Cty.Name[Gbl.Prefs.Language]); - HTM_BUTTON_SUBMIT_Begin (Gbl.Title,"BT_LINK DAT",NULL); - HTM_Unsigned (Ins_GetNumInssInCty (Gbl.Hierarchy.Cty.CtyCod)); - HTM_BUTTON_End (); - Frm_EndForm (); - HTM_TD_End (); - - HTM_TR_End (); - - /***** Number of centres *****/ - HTM_TR_Begin (NULL); - - HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtF ("%s:",Txt_Centres); - HTM_TD_End (); - - HTM_TD_Begin ("class=\"DAT LM\""); - HTM_Unsigned (Ctr_GetNumCtrsInCty (Gbl.Hierarchy.Cty.CtyCod)); - HTM_TD_End (); - - HTM_TR_End (); - - /***** Number of degrees *****/ - HTM_TR_Begin (NULL); - - HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtF ("%s:",Txt_Degrees); - HTM_TD_End (); - - HTM_TD_Begin ("class=\"DAT LM\""); - HTM_Unsigned (Deg_GetNumDegsInCty (Gbl.Hierarchy.Cty.CtyCod)); - HTM_TD_End (); - - HTM_TR_End (); - - /***** Number of courses *****/ - HTM_TR_Begin (NULL); - - HTM_TD_Begin ("class=\"%s RM\"",The_ClassFormInBox[Gbl.Prefs.Theme]); - HTM_TxtF ("%s:",Txt_Courses); - HTM_TD_End (); - - HTM_TD_Begin ("class=\"DAT LM\""); - HTM_Unsigned (Crs_GetNumCrssInCty (Gbl.Hierarchy.Cty.CtyCod)); - HTM_TD_End (); - - HTM_TR_End (); + /***** Number of users who claim to belong to this centre, + number of institutions, + number of centres, + number of degrees, + number of courses *****/ + Cty_ConfigNumUsrs (); + Cty_ConfigNumInss (); + Cty_ConfigNumCtrs (); + Cty_ConfigNumDegs (); + Cty_ConfigNumCrss (); /***** Number of users in courses of this country *****/ Cty_ShowNumUsrsInCrssOfCty (Rol_TCH); @@ -473,6 +318,235 @@ static void Cty_PutIconToPrint (void) Ico_PutContextualIconToPrint (ActPrnCtyInf,NULL); } +/*****************************************************************************/ +/******************** Show title in country configuration ********************/ +/*****************************************************************************/ + +static void Cty_ConfigTitle (bool PutLink) + { + HTM_DIV_Begin ("class=\"FRAME_TITLE FRAME_TITLE_BIG\""); + if (PutLink) + HTM_A_Begin ("href=\"%s\" target=\"_blank\"" + " class=\"FRAME_TITLE_BIG\" title=\"%s\"", + Gbl.Hierarchy.Cty.WWW[Gbl.Prefs.Language], + Gbl.Hierarchy.Cty.Name[Gbl.Prefs.Language]); + HTM_Txt (Gbl.Hierarchy.Cty.Name[Gbl.Prefs.Language]); + if (PutLink) + HTM_A_End (); + HTM_DIV_End (); + } + +/*****************************************************************************/ +/********************* Show map in country configuration *********************/ +/*****************************************************************************/ + +static void Cty_ConfigMap (bool PrintView,bool PutLink) + { + char *MapAttribution = NULL; + + /***** Get map attribution *****/ + Cty_GetMapAttribution (Gbl.Hierarchy.Cty.CtyCod,&MapAttribution); + + /***** Map image *****/ + HTM_DIV_Begin ("class=\"DAT_SMALL CM\""); + if (PutLink) + HTM_A_Begin ("href=\"%s\" target=\"_blank\"", + Gbl.Hierarchy.Cty.WWW[Gbl.Prefs.Language]); + Cty_DrawCountryMap (&Gbl.Hierarchy.Cty,PrintView ? "COUNTRY_MAP_PRINT" : + "COUNTRY_MAP_SHOW"); + if (PutLink) + HTM_A_End (); + HTM_DIV_End (); + + /***** Map attribution *****/ + if (!PrintView && Cty_CheckIfICanEditCountries ()) + { + HTM_DIV_Begin ("class=\"CM\""); + Frm_StartForm (ActChgCtyMapAtt); + HTM_TEXTAREA_Begin ("name=\"Attribution\" cols=\"50\" rows=\"2\"" + " onchange=\"document.getElementById('%s').submit();return false;\"", + Gbl.Form.Id); + if (MapAttribution) + HTM_Txt (MapAttribution); + HTM_TEXTAREA_End (); + Frm_EndForm (); + HTM_DIV_End (); + } + else if (MapAttribution) + { + HTM_DIV_Begin ("class=\"ATTRIBUTION\""); + HTM_Txt (MapAttribution); + HTM_DIV_End (); + } + + /***** Free memory used for map attribution *****/ + Cty_FreeMapAttribution (&MapAttribution); + } + +/*****************************************************************************/ +/**************** Show country name in country configuration *****************/ +/*****************************************************************************/ + +static void Cty_ConfigName (bool PutLink) + { + extern const char *Txt_Country; + + /***** Country name *****/ + HTM_TR_Begin (NULL); + + /* Label */ + Frm_LabelColumn ("RM",NULL,Txt_Country); + + /* Data */ + HTM_TD_Begin ("class=\"DAT_N LM\""); + if (PutLink) + HTM_A_Begin ("href=\"%s\" target=\"_blank\" class=\"DAT_N\"", + Gbl.Hierarchy.Cty.WWW[Gbl.Prefs.Language]); + HTM_Txt (Gbl.Hierarchy.Cty.Name[Gbl.Prefs.Language]); + if (PutLink) + HTM_A_End (); + HTM_TD_End (); + + HTM_TR_End (); + } + +/*****************************************************************************/ +/************** Show country shortcut in country configuration ***************/ +/*****************************************************************************/ + +static void Cty_ConfigShortcut (void) + { + Hie_ConfigShortcut ("cty",Gbl.Hierarchy.Cty.CtyCod); + } + +/*****************************************************************************/ +/***************** Show country QR in country configuration ******************/ +/*****************************************************************************/ + +static void Cty_ConfigQR (void) + { + Hie_ConfigQR ("cty",Gbl.Hierarchy.Cty.CtyCod); + } + +/*****************************************************************************/ +/*** Show number of users who claim to belong to country in country config. **/ +/*****************************************************************************/ + +static void Cty_ConfigNumUsrs (void) + { + extern const char *Txt_Users_of_the_country; + + /***** Number of users *****/ + HTM_TR_Begin (NULL); + + /* Label */ + Frm_LabelColumn ("RM",NULL,Txt_Users_of_the_country); + + /* Data */ + HTM_TD_Begin ("class=\"DAT LM\""); + HTM_Unsigned (Usr_GetNumUsrsWhoClaimToBelongToCty (Gbl.Hierarchy.Cty.CtyCod)); + HTM_TD_End (); + + HTM_TR_End (); + } + +/*****************************************************************************/ +/*********** Show number of institutions in country configuration ************/ +/*****************************************************************************/ + +static void Cty_ConfigNumInss (void) + { + extern const char *Txt_Institutions; + extern const char *Txt_Institutions_of_COUNTRY_X; + + /***** Number of institutions ******/ + HTM_TR_Begin (NULL); + + /* Label */ + Frm_LabelColumn ("RM",NULL,Txt_Institutions); + + /* Data */ + HTM_TD_Begin ("class=\"LM\""); + Frm_StartFormGoTo (ActSeeIns); + Cty_PutParamCtyCod (Gbl.Hierarchy.Cty.CtyCod); + snprintf (Gbl.Title,sizeof (Gbl.Title), + Txt_Institutions_of_COUNTRY_X, + Gbl.Hierarchy.Cty.Name[Gbl.Prefs.Language]); + HTM_BUTTON_SUBMIT_Begin (Gbl.Title,"BT_LINK DAT",NULL); + HTM_Unsigned (Ins_GetNumInssInCty (Gbl.Hierarchy.Cty.CtyCod)); + HTM_BUTTON_End (); + Frm_EndForm (); + HTM_TD_End (); + + HTM_TR_End (); + } + +/*****************************************************************************/ +/************* Show number of centres in country configuration ***************/ +/*****************************************************************************/ + +static void Cty_ConfigNumCtrs (void) + { + extern const char *Txt_Centres; + + /***** Number of centres *****/ + HTM_TR_Begin (NULL); + + /* Label */ + Frm_LabelColumn ("RM",NULL,Txt_Centres); + + /* Data */ + HTM_TD_Begin ("class=\"DAT LM\""); + HTM_Unsigned (Ctr_GetNumCtrsInCty (Gbl.Hierarchy.Cty.CtyCod)); + HTM_TD_End (); + + HTM_TR_End (); + } + +/*****************************************************************************/ +/************* Show number of degrees in country configuration ***************/ +/*****************************************************************************/ + +static void Cty_ConfigNumDegs (void) + { + extern const char *Txt_Degrees; + + /***** Number of degrees *****/ + HTM_TR_Begin (NULL); + + /* Label */ + Frm_LabelColumn ("RM",NULL,Txt_Degrees); + + /* Data */ + HTM_TD_Begin ("class=\"DAT LM\""); + HTM_Unsigned (Deg_GetNumDegsInCty (Gbl.Hierarchy.Cty.CtyCod)); + HTM_TD_End (); + + HTM_TR_End (); + } + +/*****************************************************************************/ +/************* Show number of courses in country configuration ***************/ +/*****************************************************************************/ + +static void Cty_ConfigNumCrss (void) + { + extern const char *Txt_Courses; + + /***** Number of courses *****/ + HTM_TR_Begin (NULL); + + /* Label */ + Frm_LabelColumn ("RM",NULL,Txt_Courses); + + /* Data */ + HTM_TD_Begin ("class=\"DAT LM\""); + HTM_Unsigned (Crs_GetNumCrssInCty (Gbl.Hierarchy.Cty.CtyCod)); + HTM_TD_End (); + + HTM_TR_End (); + } + /*****************************************************************************/ /**************** Number of users in courses of this country *****************/ /*****************************************************************************/ diff --git a/swad_course.c b/swad_course.c index 224e6f297..b26b45352 100644 --- a/swad_course.c +++ b/swad_course.c @@ -298,12 +298,15 @@ static void Crs_ConfigDegree (bool PutForm) extern const char *Txt_Degree; unsigned NumDeg; + /***** Degree *****/ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RM",PutForm ? "OthDegCod" : NULL, Txt_Degree); + /* Data */ HTM_TD_Begin ("class=\"DAT LM\""); if (PutForm) { @@ -366,12 +369,15 @@ static void Crs_ConfigYear (bool PutForm) extern const char *Txt_Not_applicable; unsigned Year; + /***** Academic year *****/ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RM",PutForm ? "OthCrsYear" : NULL, Txt_Year_OF_A_DEGREE); + /* Data */ HTM_TD_Begin ("class=\"DAT LM\""); if (PutForm) { @@ -403,12 +409,15 @@ static void Crs_ConfigInstitutionalCode (bool PutForm) { extern const char *Txt_Institutional_code; + /***** Institutional course code *****/ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RM",PutForm ? "InsCrsCod" : NULL, Txt_Institutional_code); + /* Data */ HTM_TD_Begin ("class=\"DAT LM\""); if (PutForm) { @@ -434,10 +443,13 @@ static void Crs_ConfigInternalCode (void) { extern const char *Txt_Internal_code; + /***** Internal course code *****/ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RM",NULL,Txt_Internal_code); + /* Data */ HTM_TD_Begin ("class=\"DAT LM\""); HTM_Long (Gbl.Hierarchy.Crs.CrsCod); HTM_TD_End (); @@ -471,10 +483,13 @@ static void Crs_ShowNumUsrsInCrs (Rol_Role_t Role) { extern const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS]; + /***** Number of users in course *****/ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RM",NULL,Txt_ROLES_PLURAL_Abc[Role][Usr_SEX_UNKNOWN]); + /* Data */ HTM_TD_Begin ("class=\"DAT LM\""); HTM_Unsigned (Gbl.Hierarchy.Crs.NumUsrs[Role]); HTM_TD_End (); @@ -493,12 +508,17 @@ static void Crs_ConfigIndicators (void) struct Ind_IndicatorsCrs Indicators; int NumIndicatorsFromDB = Ind_GetNumIndicatorsCrsFromDB (Gbl.Hierarchy.Crs.CrsCod); + /***** Compute indicators ******/ Ind_ComputeAndStoreIndicatorsCrs (Gbl.Hierarchy.Crs.CrsCod, NumIndicatorsFromDB,&Indicators); + + /***** Number of indicators *****/ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RM",NULL,Txt_Indicators); + /* Data */ HTM_TD_Begin ("class=\"LM\""); Frm_StartForm (ActReqStaCrs); snprintf (Gbl.Title,sizeof (Gbl.Title), diff --git a/swad_date.c b/swad_date.c index 163c0ba2a..278e5d2b5 100644 --- a/swad_date.c +++ b/swad_date.c @@ -433,9 +433,10 @@ void Dat_PutFormStartEndClientLocalDateTimesWithYesterdayToday (bool SetHMS00000 /***** Start date-time *****/ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RM",NULL,Txt_START_END_TIME[Dat_START_TIME]); - /* Date-time */ + /* Data (date-time) */ HTM_TD_Begin ("class=\"LM\""); Dat_WriteFormClientLocalDateTimeFromTimeUTC ("Start", "Start", @@ -460,9 +461,10 @@ void Dat_PutFormStartEndClientLocalDateTimesWithYesterdayToday (bool SetHMS00000 /***** End date-time *****/ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RM",NULL,Txt_START_END_TIME[Dat_END_TIME]); - /* Date-time */ + /* Data (date-time) */ HTM_TD_Begin ("class=\"LM\""); Dat_WriteFormClientLocalDateTimeFromTimeUTC ("End", "End", @@ -497,11 +499,13 @@ void Dat_PutFormStartEndClientLocalDateTimes (time_t TimeUTC[2], StartEndTime <= Dat_END_TIME; StartEndTime++) { - /* Date-time */ + /***** Date-time *****/ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RM",NULL,Txt_START_END_TIME[StartEndTime]); + /* Data */ HTM_TD_Begin ("class=\"LM\""); Dat_WriteFormClientLocalDateTimeFromTimeUTC (Id[StartEndTime], Id[StartEndTime], diff --git a/swad_degree.c b/swad_degree.c index da3792d87..3b0200934 100644 --- a/swad_degree.c +++ b/swad_degree.c @@ -405,12 +405,15 @@ static void Deg_ConfigCentre (bool PutForm) extern const char *Txt_Centre; unsigned NumCtr; + /***** Centre *****/ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RM",PutForm ? "OthCtrCod" : NULL, Txt_Centre); + /* Data */ HTM_TD_Begin ("class=\"DAT_N LM\""); if (PutForm) { @@ -498,11 +501,13 @@ static void Deg_ConfigNumCrss (void) extern const char *Txt_Courses; extern const char *Txt_Courses_of_DEGREE_X; + /***** Number of courses *****/ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RM",NULL,Txt_Courses); - /* Form to go to see courses of this degree */ + /* Data */ HTM_TD_Begin ("class=\"LM\""); Frm_StartFormGoTo (ActSeeCrs); Deg_PutParamDegCod (Gbl.Hierarchy.Deg.DegCod); @@ -527,12 +532,15 @@ static void Deg_ShowNumUsrsInCrssOfDeg (Rol_Role_t Role) extern const char *Txt_Users_in_courses; extern const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS]; + /***** Number of users in courses *****/ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RM",NULL, Role == Rol_UNK ? Txt_Users_in_courses : Txt_ROLES_PLURAL_Abc[Role][Usr_SEX_UNKNOWN]); + /* Data */ HTM_TD_Begin ("class=\"DAT LM\""); HTM_Unsigned (Usr_GetNumUsrsInCrssOfDeg (Role,Gbl.Hierarchy.Deg.DegCod)); HTM_TD_End (); diff --git a/swad_enrolment.c b/swad_enrolment.c index d63ded9d6..90c4cfd49 100644 --- a/swad_enrolment.c +++ b/swad_enrolment.c @@ -916,8 +916,10 @@ static void Enr_PutAreaToEnterUsrsIDs (void) HTM_TABLE_BeginCenterPadding (2); HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RT","UsrsIDs",Txt_List_of_nicks_emails_or_IDs); + /* Data */ HTM_TD_Begin ("class=\"LT\""); HTM_TEXTAREA_Begin ("id=\"UsrsIDs\" name=\"UsrsIDs\" cols=\"60\" rows=\"10\""); HTM_TEXTAREA_End (); @@ -2257,8 +2259,10 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected) /* Scope (whole platform, current centre, current degree or current course) */ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RT","ScopeEnr",Txt_Scope); + /* Data */ HTM_TD_Begin ("class=\"LM\""); Sco_PutSelectorScope ("ScopeEnr",true); HTM_TD_End (); diff --git a/swad_exam.c b/swad_exam.c index 32805e55b..b200449d5 100644 --- a/swad_exam.c +++ b/swad_exam.c @@ -1071,11 +1071,13 @@ static void Exa_ShowExamAnnouncement (long ExaCod, /***** Name of the course *****/ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RT", TypeViewExamAnnouncement == Exa_FORM_VIEW ? "CrsName" : NULL, Txt_EXAM_ANNOUNCEMENT_Course); + /* Data */ HTM_TD_Begin ("class=\"EXAM LT\""); if (TypeViewExamAnnouncement == Exa_FORM_VIEW) HTM_INPUT_TEXT ("CrsName",Hie_MAX_CHARS_FULL_NAME,Gbl.ExamAnns.ExaDat.CrsFullName,false, @@ -1093,11 +1095,13 @@ static void Exa_ShowExamAnnouncement (long ExaCod, /***** Year/semester (N.A., 1º, 2º, 3º, 4º, 5º...) *****/ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RT", TypeViewExamAnnouncement == Exa_FORM_VIEW ? "Year" : NULL, Txt_EXAM_ANNOUNCEMENT_Year_or_semester); + /* Data */ HTM_TD_Begin ("class=\"EXAM LT\""); if (TypeViewExamAnnouncement == Exa_FORM_VIEW) { @@ -1120,11 +1124,13 @@ static void Exa_ShowExamAnnouncement (long ExaCod, /***** Exam session *****/ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RT", TypeViewExamAnnouncement == Exa_FORM_VIEW ? "ExamSession" : NULL, Txt_EXAM_ANNOUNCEMENT_Session); + /* Data */ HTM_TD_Begin ("class=\"EXAM LT\""); if (TypeViewExamAnnouncement == Exa_FORM_VIEW) HTM_INPUT_TEXT ("ExamSession",Exa_MAX_CHARS_SESSION,Gbl.ExamAnns.ExaDat.Session,false, @@ -1138,8 +1144,10 @@ static void Exa_ShowExamAnnouncement (long ExaCod, /***** Date of the exam *****/ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RT",NULL,Txt_EXAM_ANNOUNCEMENT_Exam_date); + /* Data */ if (TypeViewExamAnnouncement == Exa_FORM_VIEW) { HTM_TD_Begin ("class=\"LT\""); @@ -1163,8 +1171,10 @@ static void Exa_ShowExamAnnouncement (long ExaCod, /***** Start time *****/ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RT",NULL,Txt_EXAM_ANNOUNCEMENT_Start_time); + /* Data */ HTM_TD_Begin ("class=\"EXAM LT\""); if (TypeViewExamAnnouncement == Exa_FORM_VIEW) { @@ -1201,8 +1211,10 @@ static void Exa_ShowExamAnnouncement (long ExaCod, /***** Approximate duration of the exam *****/ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RT",NULL,Txt_EXAM_ANNOUNCEMENT_Approximate_duration); + /* Data */ HTM_TD_Begin ("class=\"EXAM LT\""); if (TypeViewExamAnnouncement == Exa_FORM_VIEW) { @@ -1254,11 +1266,13 @@ static void Exa_ShowExamAnnouncement (long ExaCod, /***** Place where the exam will be made *****/ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RT", TypeViewExamAnnouncement == Exa_FORM_VIEW ? "Place" : NULL, Txt_EXAM_ANNOUNCEMENT_Place_of_exam); + /* Data */ HTM_TD_Begin ("class=\"EXAM LT\""); if (TypeViewExamAnnouncement == Exa_FORM_VIEW) { @@ -1280,11 +1294,13 @@ static void Exa_ShowExamAnnouncement (long ExaCod, /***** Exam mode *****/ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RT", TypeViewExamAnnouncement == Exa_FORM_VIEW ? "ExamMode" : NULL, Txt_EXAM_ANNOUNCEMENT_Mode); + /* Data */ HTM_TD_Begin ("class=\"EXAM LT\""); if (TypeViewExamAnnouncement == Exa_FORM_VIEW) { @@ -1306,11 +1322,13 @@ static void Exa_ShowExamAnnouncement (long ExaCod, /***** Structure of the exam *****/ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RT", TypeViewExamAnnouncement == Exa_FORM_VIEW ? "Structure" : NULL, Txt_EXAM_ANNOUNCEMENT_Structure_of_the_exam); + /* Data */ HTM_TD_Begin ("class=\"EXAM LT\""); if (TypeViewExamAnnouncement == Exa_FORM_VIEW) { @@ -1332,11 +1350,13 @@ static void Exa_ShowExamAnnouncement (long ExaCod, /***** Documentation required *****/ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RT", TypeViewExamAnnouncement == Exa_FORM_VIEW ? "DocRequired" : NULL, Txt_EXAM_ANNOUNCEMENT_Documentation_required); + /* Data */ HTM_TD_Begin ("class=\"EXAM LT\""); if (TypeViewExamAnnouncement == Exa_FORM_VIEW) { @@ -1358,11 +1378,13 @@ static void Exa_ShowExamAnnouncement (long ExaCod, /***** Material required *****/ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RT", TypeViewExamAnnouncement == Exa_FORM_VIEW ? "MatRequired" : NULL, Txt_EXAM_ANNOUNCEMENT_Material_required); + /* Data */ HTM_TD_Begin ("class=\"EXAM LT\""); if (TypeViewExamAnnouncement == Exa_FORM_VIEW) { @@ -1384,11 +1406,13 @@ static void Exa_ShowExamAnnouncement (long ExaCod, /***** Material allowed *****/ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RT", TypeViewExamAnnouncement == Exa_FORM_VIEW ? "MatAllowed" : NULL, Txt_EXAM_ANNOUNCEMENT_Material_allowed); + /* Data */ HTM_TD_Begin ("class=\"EXAM LT\""); if (TypeViewExamAnnouncement == Exa_FORM_VIEW) { @@ -1410,11 +1434,13 @@ static void Exa_ShowExamAnnouncement (long ExaCod, /***** Other information to students *****/ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RT", TypeViewExamAnnouncement == Exa_FORM_VIEW ? "OtherInfo" : NULL, Txt_EXAM_ANNOUNCEMENT_Other_information); + /* Data */ HTM_TD_Begin ("class=\"EXAM LT\""); if (TypeViewExamAnnouncement == Exa_FORM_VIEW) { diff --git a/swad_file_browser.c b/swad_file_browser.c index 849ed862c..3a40ad4c5 100644 --- a/swad_file_browser.c +++ b/swad_file_browser.c @@ -8539,8 +8539,10 @@ static void Brw_PutFormToCreateALink (const char *FileNameToShow) HTM_TABLE_Begin (NULL); HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RT","NewLinkURL",Txt_URL); + /* Data */ HTM_TD_Begin ("class=\"LT\""); HTM_INPUT_URL ("NewLinkURL","",false, "size=\"30\" required=\"required\""); @@ -8551,11 +8553,13 @@ static void Brw_PutFormToCreateALink (const char *FileNameToShow) /***** Link name *****/ HTM_TR_Begin (NULL); + /* Label */ if (asprintf (&Label,"%s (%s): ",Txt_Save_as,Txt_optional) < 0) Lay_NotEnoughMemoryExit (); Frm_LabelColumn ("RT","NewLinkName",Label); free (Label); + /* Data */ HTM_TD_Begin ("class=\"LM\""); HTM_INPUT_TEXT ("NewLinkName",Brw_MAX_CHARS_FOLDER,"",false, "id=\"NewLinkName\" size=\"30\""); @@ -9602,8 +9606,10 @@ void Brw_ShowFileMetadata (void) /***** Private or public? *****/ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RT","PublicFile",Txt_Availability); + /* Data */ HTM_TD_Begin ("class=\"DAT LT\""); if (ICanChangePublic) // I can change file to public { @@ -9627,8 +9633,10 @@ void Brw_ShowFileMetadata (void) /***** License *****/ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RT","License",Txt_License); + /* Data */ HTM_TD_Begin ("class=\"DAT LT\""); if (ICanEdit) // I can edit file properties { diff --git a/swad_forum.c b/swad_forum.c index 888d96c86..5fbd5dd83 100644 --- a/swad_forum.c +++ b/swad_forum.c @@ -3829,8 +3829,10 @@ static void For_WriteFormForumPst (bool IsReply,const char *Subject) /* Subject */ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RT","Subject",Txt_MSG_Subject); + /* Data */ HTM_TD_Begin ("class=\"LT\""); HTM_INPUT_TEXT ("Subject",Cns_MAX_CHARS_SUBJECT, IsReply ? Subject : @@ -3843,8 +3845,10 @@ static void For_WriteFormForumPst (bool IsReply,const char *Subject) /* Content */ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RT","Content",Txt_MSG_Content); + /* Data */ HTM_TD_Begin ("class=\"LT\""); HTM_TEXTAREA_Begin ("id=\"Content\" name=\"Content\" class=\"MSG_CONTENT\" rows=\"10\""); HTM_TEXTAREA_End (); diff --git a/swad_game.c b/swad_game.c index bf2bc0655..b384a663f 100644 --- a/swad_game.c +++ b/swad_game.c @@ -1288,8 +1288,10 @@ static void Gam_PutFormsEditionGame (struct Game *Game,bool ItsANewGame) /***** Game title *****/ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RT","Title",Txt_Title); + /* Data */ HTM_TD_Begin ("class=\"LT\""); HTM_INPUT_TEXT ("Title",Gam_MAX_CHARS_TITLE,Game->Title,false, "id=\"Title\" required=\"required\"" @@ -1315,8 +1317,10 @@ static void Gam_PutFormsEditionGame (struct Game *Game,bool ItsANewGame) /***** Game text *****/ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RT","Txt",Txt_Description); + /* Data */ HTM_TD_Begin ("class=\"LT\""); HTM_TEXTAREA_Begin ("id=\"Txt\" name=\"Txt\" rows=\"5\"" " class=\"TITLE_DESCRIPTION_WIDTH\""); diff --git a/swad_hierarchy.c b/swad_hierarchy.c index dfbae37d5..0691a4c65 100644 --- a/swad_hierarchy.c +++ b/swad_hierarchy.c @@ -93,12 +93,15 @@ void Hie_ConfigTitle (bool PutLink, void Hie_ConfigFullName (bool PutForm,const char *Label,Act_Action_t NextAction, const char FullName[Hie_MAX_BYTES_FULL_NAME + 1]) { + /***** Full name *****/ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RM",PutForm ? "FullName" : NULL, Label); + /* Data */ HTM_TD_Begin ("class=\"DAT_N LM\""); if (PutForm) { @@ -124,12 +127,15 @@ void Hie_ConfigShrtName (bool PutForm,Act_Action_t NextAction, { extern const char *Txt_Short_name; + /***** Short name *****/ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RM",PutForm ? "ShortName" : NULL, Txt_Short_name); + /* Data */ HTM_TD_Begin ("class=\"DAT_N LM\""); if (PutForm) { @@ -155,12 +161,15 @@ void Hie_ConfigWWW (bool PutForm,Act_Action_t NextAction, { extern const char *Txt_Web; + /***** Web *****/ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RM",PutForm ? "WWW" : NULL, Txt_Web); + /* Data */ HTM_TD_Begin ("class=\"DAT LM\""); if (PutForm) { @@ -192,10 +201,13 @@ void Hie_ConfigShortcut (const char *ParamName,long HieCod) extern const char *Lan_STR_LANG_ID[1 + Lan_NUM_LANGUAGES]; extern const char *Txt_Shortcut; + /***** Short cut *****/ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RM",NULL,Txt_Shortcut); + /* Data */ HTM_TD_Begin ("class=\"DAT LM\""); HTM_A_Begin ("href=\"%s/%s?%s=%ld\" class=\"DAT\" target=\"_blank\"", Cfg_URL_SWAD_CGI, @@ -219,10 +231,13 @@ void Hie_ConfigQR (const char *ParamName,long HieCod) { extern const char *Txt_QR_code; + /***** QR *****/ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RT",NULL,Txt_QR_code); + /* Data */ HTM_TD_Begin ("class=\"DAT LT\""); QR_LinkTo (250,ParamName,HieCod); HTM_TD_End (); @@ -273,8 +288,10 @@ void Hie_WriteMenuHierarchy (void) with all the countries *****/ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RT","cty",Txt_Country); + /* Data */ HTM_TD_Begin ("class=\"LT\""); Cty_WriteSelectorOfCountry (); HTM_TD_End (); @@ -287,8 +304,10 @@ void Hie_WriteMenuHierarchy (void) with the institutions of selected country *****/ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RT","ins",Txt_Institution); + /* Data */ HTM_TD_Begin ("class=\"LT\""); Ins_WriteSelectorOfInstitution (); HTM_TD_End (); @@ -301,8 +320,10 @@ void Hie_WriteMenuHierarchy (void) with all the centres of selected institution *****/ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RT","ctr",Txt_Centre); + /* Data */ HTM_TD_Begin ("class=\"LT\""); Ctr_WriteSelectorOfCentre (); HTM_TD_End (); @@ -315,8 +336,10 @@ void Hie_WriteMenuHierarchy (void) with all the degrees of selected centre *****/ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RT","deg",Txt_Degree); + /* Data */ HTM_TD_Begin ("class=\"LT\""); Deg_WriteSelectorOfDegree (); HTM_TD_End (); @@ -329,8 +352,10 @@ void Hie_WriteMenuHierarchy (void) with all the courses of selected degree *****/ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RT","crs",Txt_Course); + /* Data */ HTM_TD_Begin ("class=\"LT\""); Crs_WriteSelectorOfCourse (); HTM_TD_End (); diff --git a/swad_indicator.c b/swad_indicator.c index 786e2ce79..4c4d3354d 100644 --- a/swad_indicator.c +++ b/swad_indicator.c @@ -122,8 +122,10 @@ void Ind_ReqIndicatorsCourses (void) /* Scope */ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RT","ScopeInd",Txt_Scope); + /* Data */ HTM_TD_Begin ("class=\"LT\""); Sco_PutSelectorScope ("ScopeInd",true); HTM_TD_End (); @@ -133,8 +135,10 @@ void Ind_ReqIndicatorsCourses (void) /* Compute stats for a type of degree */ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RT","OthDegTypCod",Txt_Types_of_degree); + /* Data */ HTM_TD_Begin ("class=\"DAT LT\""); DT_WriteSelectorDegreeTypes (); HTM_Txt (" ("); @@ -147,8 +151,10 @@ void Ind_ReqIndicatorsCourses (void) /* Compute stats for courses with teachers belonging to any department or to a particular departament? */ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RT",Dpt_PARAM_DPT_COD_NAME,Txt_Department); + /* Data */ HTM_TD_Begin ("class=\"LT\""); Dpt_WriteSelectorDepartment (Gbl.Hierarchy.Ins.InsCod, // Departments in current insitution Gbl.Stat.DptCod, // Selected department diff --git a/swad_institution.c b/swad_institution.c index bd1f8dbb9..d71bb2dc7 100644 --- a/swad_institution.c +++ b/swad_institution.c @@ -512,12 +512,15 @@ static void Ins_ConfigCountry (bool PutForm) extern const char *Txt_Country; unsigned NumCty; + /***** Country *****/ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RM",PutForm ? "OthCtyCod" : NULL, Txt_Country); + /* Data */ HTM_TD_Begin ("class=\"DAT LM\""); if (PutForm) { @@ -604,10 +607,13 @@ static void Ins_ConfigNumUsrs (void) { extern const char *Txt_Users_of_the_institution; + /***** Number of users *****/ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RM",NULL,Txt_Users_of_the_institution); + /* Data */ HTM_TD_Begin ("class=\"DAT LM\""); HTM_Unsigned (Usr_GetNumUsrsWhoClaimToBelongToIns (Gbl.Hierarchy.Ins.InsCod)); HTM_TD_End (); @@ -624,11 +630,13 @@ static void Ins_ConfigNumCtrs (void) extern const char *Txt_Centres; extern const char *Txt_Centres_of_INSTITUTION_X; + /***** Number of centres *****/ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RM",NULL,Txt_Centres); - /* Form to go to see centres of this institution */ + /* Data */ HTM_TD_Begin ("class=\"LM\""); Frm_StartFormGoTo (ActSeeCtr); Ins_PutParamInsCod (Gbl.Hierarchy.Ins.InsCod); @@ -655,8 +663,10 @@ static void Ins_ConfigNumDegs (void) /***** Number of degrees *****/ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RM",NULL,Txt_Degrees); + /* Data */ HTM_TD_Begin ("class=\"DAT LM\""); HTM_Unsigned (Deg_GetNumDegsInIns (Gbl.Hierarchy.Ins.InsCod)); HTM_TD_End (); @@ -672,10 +682,13 @@ static void Ins_ConfigNumCrss (void) { extern const char *Txt_Courses; + /***** Number of courses *****/ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RM",NULL,Txt_Courses); + /* Data */ HTM_TD_Begin ("class=\"DAT LM\""); HTM_Unsigned (Crs_GetNumCrssInIns (Gbl.Hierarchy.Ins.InsCod)); HTM_TD_End (); @@ -691,10 +704,13 @@ static void Ins_ConfigNumDpts (void) { extern const char *Txt_Departments; + /***** Number of departments *****/ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RM",NULL,Txt_Departments); + /* Data */ HTM_TD_Begin ("class=\"DAT LM\""); HTM_Unsigned (Dpt_GetNumDepartmentsInInstitution (Gbl.Hierarchy.Ins.InsCod)); HTM_TD_End (); @@ -711,12 +727,15 @@ static void Ins_ShowNumUsrsInCrssOfIns (Rol_Role_t Role) extern const char *Txt_Users_in_courses; extern const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS]; + /***** Number of users in courses *****/ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RM",NULL, Role == Rol_UNK ? Txt_Users_in_courses : Txt_ROLES_PLURAL_Abc[Role][Usr_SEX_UNKNOWN]); + /* Data */ HTM_TD_Begin ("class=\"DAT LM\""); HTM_Unsigned (Usr_GetNumUsrsInCrssOfIns (Role,Gbl.Hierarchy.Ins.InsCod)); HTM_TD_End (); diff --git a/swad_mail.c b/swad_mail.c index 6fb980e94..6b57a93ae 100644 --- a/swad_mail.c +++ b/swad_mail.c @@ -1260,16 +1260,20 @@ static void Mai_ShowFormChangeUsrEmail (const struct UsrData *UsrDat,bool ItsMe, HTM_TR_Begin (NULL); /* The first mail is the current one */ + /* Label */ Frm_LabelColumn ("REC_C1_BOT RT",NULL,Txt_Current_email); + /* Data */ HTM_TD_Begin ("class=\"REC_C2_BOT LT USR_ID\""); } else if (NumEmail == 2) { HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("REC_C1_BOT RT",NULL,Txt_Other_emails); + /* Data */ HTM_TD_Begin ("class=\"REC_C2_BOT LT DAT\""); } @@ -1353,10 +1357,12 @@ static void Mai_ShowFormChangeUsrEmail (const struct UsrData *UsrDat,bool ItsMe, /***** Form to enter new email *****/ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("REC_C1_BOT RT","NewEmail", NumEmails ? Txt_New_email : // A new email Txt_Email); // The first email + /* Data */ HTM_TD_Begin ("class=\"REC_C2_BOT LT DAT\""); if (ItsMe) Frm_StartFormAnchor (ActChgMyMai,Mai_EMAIL_SECTION_ID); diff --git a/swad_match.c b/swad_match.c index 989107f16..65d68a582 100644 --- a/swad_match.c +++ b/swad_match.c @@ -1243,8 +1243,10 @@ static void Mch_PutFormNewMatch (const struct Game *Game) /***** Match title *****/ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RT","Title",Txt_Title); + /* Data */ HTM_TD_Begin ("class=\"LT\""); HTM_INPUT_TEXT ("Title",Gam_MAX_CHARS_TITLE,Game->Title,false, "id=\"Title\" size=\"45\" required=\"required\""); diff --git a/swad_message.c b/swad_message.c index c1108737e..5c015ff8a 100644 --- a/swad_message.c +++ b/swad_message.c @@ -534,8 +534,10 @@ static void Msg_WriteFormSubjectAndContentMsgToUsrs (char Content[Cns_MAX_BYTES_ /***** Message subject *****/ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RT","MsgSubject",Txt_MSG_Subject); + /* Data */ HTM_TD_Begin ("class=\"LT\""); HTM_TEXTAREA_Begin ("id=\"MsgSubject\" name=\"Subject\"" " class=\"MSG_SUBJECT\" rows=\"2\""); @@ -581,8 +583,10 @@ static void Msg_WriteFormSubjectAndContentMsgToUsrs (char Content[Cns_MAX_BYTES_ /***** Message content *****/ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RT","MsgContent",Txt_MSG_Content); + /* Data */ HTM_TD_Begin ("class=\"LT\""); HTM_TEXTAREA_Begin ("id=\"MsgContent\" name=\"Content\"" " class=\"MSG_CONTENT\" rows=\"20\""); @@ -611,8 +615,10 @@ static void Msg_WriteFormSubjectAndContentMsgToUsrs (char Content[Cns_MAX_BYTES_ /***** Message content *****/ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RT","MsgContent",Txt_MSG_Content); + /* Data */ HTM_TD_Begin ("class=\"LT\""); HTM_TEXTAREA_Begin ("id=\"MsgContent\" name=\"Content\"" " class=\"MSG_CONTENT\" rows=\"20\""); diff --git a/swad_nickname.c b/swad_nickname.c index 8c49379a7..5144cfaaa 100644 --- a/swad_nickname.c +++ b/swad_nickname.c @@ -273,8 +273,10 @@ static void Nck_ShowFormChangeUsrNickname (const struct UsrData *UsrDat,bool Its /* The first nickname is the current one */ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("REC_C1_BOT RT",NULL,Txt_Current_nickname); + /* Data */ HTM_TD_Begin ("class=\"REC_C2_BOT LT USR_ID\""); } else // NumNick >= 2 @@ -283,8 +285,10 @@ static void Nck_ShowFormChangeUsrNickname (const struct UsrData *UsrDat,bool Its { HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("REC_C1_BOT RT",NULL,Txt_Other_nicknames); + /* Data */ HTM_TD_Begin ("class=\"REC_C2_BOT LT DAT\""); } @@ -367,10 +371,12 @@ static void Nck_ShowFormChangeUsrNickname (const struct UsrData *UsrDat,bool Its /***** Form to enter new nickname *****/ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("REC_C1_BOT RT","NewNick", NumNicks ? Txt_New_nickname : // A new nickname Txt_Nickname); // The first nickname + /* Data */ HTM_TD_Begin ("class=\"REC_C2_BOT LT DAT\""); if (ItsMe) Frm_StartFormAnchor (ActChgMyNck,Nck_NICKNAME_SECTION_ID); diff --git a/swad_password.c b/swad_password.c index f4d3f7e85..c831ae5c4 100644 --- a/swad_password.c +++ b/swad_password.c @@ -684,8 +684,10 @@ void Pwd_ShowFormChgMyPwd (void) { HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("REC_C1_BOT RM","UsrPwd",Txt_Current_password); + /* Data */ HTM_TD_Begin ("class=\"REC_C2_BOT LM\""); HTM_INPUT_PASSWORD ("UsrPwd",NULL,"off",true, "id=\"UsrPwd\""); @@ -727,12 +729,13 @@ void Pwd_PutFormToGetNewPasswordOnce (void) extern const char *Txt_Password; extern const char *Txt_HELP_password; + /***** Password *****/ HTM_TR_Begin (NULL); - /***** Label ****/ + /* Label */ Frm_LabelColumn ("RT","Paswd",Txt_Password); - /***** Input ****/ + /* Data */ HTM_TD_Begin ("class=\"LT\""); HTM_INPUT_PASSWORD ("Paswd",Txt_HELP_password,NULL,true, "id=\"Paswd\""); @@ -753,13 +756,12 @@ void Pwd_PutFormToGetNewPasswordTwice (void) extern const char *Txt_HELP_password; /***** 1st password *****/ - /* Begin form element */ HTM_TR_Begin (NULL); /* Label */ Frm_LabelColumn ("REC_C1_BOT RM","Paswd1",Txt_New_password); - /* Input */ + /* Data */ HTM_TD_Begin ("class=\"REC_C2_BOT LM\""); HTM_INPUT_PASSWORD ("Paswd1",Txt_HELP_password,NULL,true, "id=\"Paswd1\""); @@ -768,13 +770,12 @@ void Pwd_PutFormToGetNewPasswordTwice (void) HTM_TR_End (); /***** 2nd password *****/ - /* Begin form element */ HTM_TR_Begin (NULL); /* Label */ Frm_LabelColumn ("REC_C1_BOT RM","Paswd2",Txt_Retype_new_password); - /* Input */ + /* Data */ HTM_TD_Begin ("class=\"REC_C2_BOT LM\""); HTM_INPUT_PASSWORD ("Paswd2",Txt_HELP_password,NULL,true, "id=\"Paswd2\""); diff --git a/swad_photo.c b/swad_photo.c index 63778eaa4..185b172b4 100644 --- a/swad_photo.c +++ b/swad_photo.c @@ -1790,10 +1790,13 @@ static void Pho_PutSelectorForTypeOfAvg (void) Pho_AvgPhotoTypeOfAverage_t TypeOfAvg; unsigned TypeOfAvgUnsigned; + /***** Type of average *****/ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RT","AvgType",Txt_Average_type); + /* Data */ HTM_TD_Begin ("class=\"LT\""); Frm_StartForm (ActSeePhoDeg); Pho_PutHiddenParamPhotoSize (); @@ -1851,10 +1854,13 @@ static void Pho_PutSelectorForHowComputePhotoSize (void) Pho_HowComputePhotoSize_t PhoSi; unsigned PhoSiUnsigned; + /***** Photo size *****/ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RT","PhotoSize",Txt_Size_of_photos); + /* Data */ HTM_TD_Begin ("class=\"LT\""); Frm_StartForm (ActSeePhoDeg); Pho_PutHiddenParamTypeOfAvg (); @@ -1912,10 +1918,13 @@ static void Pho_PutSelectorForHowOrderDegrees (void) Pho_HowOrderDegrees_t Order; unsigned OrderUnsigned; + /***** Order *****/ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RT","Order",Txt_Sort_degrees_by); + /* Data */ HTM_TD_Begin ("class=\"LT\""); Frm_StartForm (ActSeePhoDeg); Pho_PutHiddenParamTypeOfAvg (); diff --git a/swad_project.c b/swad_project.c index 00e93124c..6668e5009 100644 --- a/swad_project.c +++ b/swad_project.c @@ -3471,8 +3471,10 @@ static void Prj_PutFormProject (struct Project *Prj,bool ItsANewProject) /* Project title */ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RT","Title",Txt_Title); + /* Data */ HTM_TD_Begin ("class=\"LT\""); HTM_INPUT_TEXT ("Title",Prj_MAX_CHARS_PROJECT_TITLE,Prj->Title,false, "id=\"Title\" required=\"required\"" @@ -3484,8 +3486,10 @@ static void Prj_PutFormProject (struct Project *Prj,bool ItsANewProject) /* Department */ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RT",Dpt_PARAM_DPT_COD_NAME,Txt_Department); + /* Data */ HTM_TD_Begin ("class=\"LT\""); Dpt_WriteSelectorDepartment (Gbl.Hierarchy.Ins.InsCod, // Departments in current institution Prj->DptCod, // Selected department @@ -3572,8 +3576,10 @@ static void Prj_PutFormProject (struct Project *Prj,bool ItsANewProject) /* URL for additional info */ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RT","WWW",Txt_URL); + /* Data */ HTM_TD_Begin ("class=\"DAT LT\""); HTM_INPUT_URL ("URL",Prj->URL,false, "class=\"TITLE_DESCRIPTION_WIDTH\""); @@ -3604,10 +3610,13 @@ static void Prj_EditOneProjectTxtArea (const char *Id, { extern const char *The_ClassFormInBox[The_NUM_THEMES]; + /***** Description *****/ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RT",Id,Label); + /* Data */ HTM_TD_Begin ("class=\"LT\""); HTM_TEXTAREA_Begin ("id=\"%s\" name=\"%s\" rows=\"%u\"%s" " class=\"TITLE_DESCRIPTION_WIDTH\"", @@ -3904,8 +3913,10 @@ void Prj_ShowFormConfig (void) HTM_TABLE_BeginCenterPadding (2); HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RT","Editable",Txt_Editable); + /* Data */ HTM_TD_Begin ("class=\"LT\""); HTM_INPUT_CHECKBOX ("Editable",false, "id=\"Editable\" value=\"Y\"%s", diff --git a/swad_record.c b/swad_record.c index 48f4d8c12..97559f231 100644 --- a/swad_record.c +++ b/swad_record.c @@ -2791,6 +2791,7 @@ static void Rec_ShowEmail (struct UsrData *UsrDat) { extern const char *Txt_Email; + /***** Email *****/ HTM_TR_Begin (NULL); /* Label */ @@ -2824,6 +2825,7 @@ static void Rec_ShowUsrIDs (struct UsrData *UsrDat,const char *Anchor) { extern const char *Txt_ID; + /***** User's IDs *****/ HTM_TR_Begin (NULL); /* Label */ @@ -3272,6 +3274,7 @@ static void Rec_ShowOriginPlace (struct UsrData *UsrDat,bool ShowData,bool PutFo { extern const char *Txt_Place_of_origin; + /***** Origin place *****/ HTM_TR_Begin (NULL); /* Label */ @@ -3303,6 +3306,7 @@ static void Rec_ShowDateOfBirth (struct UsrData *UsrDat,bool ShowData,bool PutFo { extern const char *Txt_Date_of_birth; + /***** Date of birth *****/ HTM_TR_Begin (NULL); /* Label */ @@ -3336,6 +3340,7 @@ static void Rec_ShowLocalAddress (struct UsrData *UsrDat,bool ShowData,bool PutF { extern const char *Txt_Local_address; + /***** Local address *****/ HTM_TR_Begin (NULL); /* Label */ @@ -3367,6 +3372,7 @@ static void Rec_ShowLocalPhone (struct UsrData *UsrDat,bool ShowData,bool PutFor { extern const char *Txt_Phone; + /***** Local phone *****/ HTM_TR_Begin (NULL); /* Label */ @@ -3401,6 +3407,7 @@ static void Rec_ShowFamilyAddress (struct UsrData *UsrDat,bool ShowData,bool Put { extern const char *Txt_Family_address; + /***** Family address *****/ HTM_TR_Begin (NULL); /* Label */ @@ -3432,6 +3439,7 @@ static void Rec_ShowFamilyPhone (struct UsrData *UsrDat,bool ShowData,bool PutFo { extern const char *Txt_Phone; + /***** Family phone *****/ HTM_TR_Begin (NULL); /* Label */ @@ -3466,6 +3474,7 @@ static void Rec_ShowComments (struct UsrData *UsrDat,bool ShowData,bool PutForm) { extern const char *Txt_USER_comments; + /***** Comments *****/ HTM_TR_Begin (NULL); /* Label */ @@ -3527,6 +3536,7 @@ static void Rec_ShowInstitution (struct Instit *Ins,bool ShowData) { extern const char *Txt_Institution; + /***** Institution *****/ HTM_TR_Begin (NULL); /* Label */ @@ -3558,6 +3568,7 @@ static void Rec_ShowCentre (struct UsrData *UsrDat,bool ShowData) extern const char *Txt_Centre; struct Centre Ctr; + /***** Centre *****/ HTM_TR_Begin (NULL); /* Label */ @@ -3593,6 +3604,7 @@ static void Rec_ShowDepartment (struct UsrData *UsrDat,bool ShowData) extern const char *Txt_Department; struct Department Dpt; + /***** Department *****/ HTM_TR_Begin (NULL); /* Label */ @@ -3627,6 +3639,7 @@ static void Rec_ShowOffice (struct UsrData *UsrDat,bool ShowData) { extern const char *Txt_Office; + /***** Office *****/ HTM_TR_Begin (NULL); /* Label */ @@ -3649,6 +3662,7 @@ static void Rec_ShowOfficePhone (struct UsrData *UsrDat,bool ShowData) { extern const char *Txt_Phone; + /***** Office phone *****/ HTM_TR_Begin (NULL); /* Label */ @@ -4099,7 +4113,7 @@ static void Rec_ShowFormMyInsCtrDpt (bool IAmATeacher) HTM_TR_End (); - /***** Phone *****/ + /***** Office phone *****/ HTM_TR_Begin (NULL); /* Label */ diff --git a/swad_statistic.c b/swad_statistic.c index beaf9f1af..a053e8afc 100644 --- a/swad_statistic.c +++ b/swad_statistic.c @@ -427,8 +427,10 @@ void Sta_AskShowGblHits (void) /***** Users' roles whose accesses we want to see *****/ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RT","Role",Txt_Users); + /* Data */ HTM_TD_Begin ("class=\"LT\""); HTM_SELECT_Begin (false, "id=\"Role\" name=\"Role\" class=\"STAT_SEL\""); @@ -452,8 +454,10 @@ void Sta_AskShowGblHits (void) /***** Clicks made from anywhere, current centre, current degree or current course *****/ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RT","ScopeSta",Txt_Scope); + /* Data */ HTM_TD_Begin ("class=\"LT\""); Gbl.Scope.Allowed = 1 << Hie_SYS | 1 << Hie_CTY | @@ -471,8 +475,10 @@ void Sta_AskShowGblHits (void) /***** Count type for the statistic *****/ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RT","CountType",Txt_Show); + /* Data */ HTM_TD_Begin ("class=\"LT\""); Sta_WriteSelectorCountType (); @@ -576,7 +582,7 @@ static void Sta_WriteSelectorCountType (void) } /*****************************************************************************/ -/****** Put selectors for type of access count and for degree or course ******/ +/******************** Put selector for type of action ************************/ /*****************************************************************************/ static void Sta_WriteSelectorAction (void) @@ -590,8 +596,10 @@ static void Sta_WriteSelectorAction (void) Tab_Tab_t Tab; char ActTxt[Act_MAX_BYTES_ACTION_TXT + 1]; + /***** Action *****/ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RT","StatAct",Txt_Action); HTM_TD_Begin ("class=\"LT\""); diff --git a/swad_survey.c b/swad_survey.c index 21a7a09c1..36b4830c1 100644 --- a/swad_survey.c +++ b/swad_survey.c @@ -1863,8 +1863,10 @@ void Svy_RequestCreatOrEditSvy (void) /***** Scope of the survey *****/ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RT","ScopeSvy",Txt_Scope); + /* Data */ HTM_TD_Begin ("class=\"LT\""); Svy_SetDefaultAndAllowedScope (&Svy); Sco_GetScope ("ScopeSvy"); @@ -1876,8 +1878,10 @@ void Svy_RequestCreatOrEditSvy (void) /***** Survey title *****/ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RT","Title",Txt_Title); + /* Data */ HTM_TD_Begin ("class=\"LT\""); HTM_INPUT_TEXT ("Title",Svy_MAX_CHARS_SURVEY_TITLE,Svy.Title,false, "id=\"Title\" required=\"required\"" @@ -1892,8 +1896,10 @@ void Svy_RequestCreatOrEditSvy (void) /***** Survey text *****/ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RT","Txt",Txt_Description); + /* Data */ HTM_TD_Begin ("class=\"LT\""); HTM_TEXTAREA_Begin ("id=\"Txt\" name=\"Txt\" rows=\"5\"" " class=\"TITLE_DESCRIPTION_WIDTH\""); @@ -2680,8 +2686,10 @@ static void Svy_ShowFormEditOneQst (long SvyCod,struct SurveyQuestion *SvyQst, /***** Stem *****/ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RT","Txt",Txt_Wording); + /* Data */ HTM_TD_Begin ("class=\"LT\""); HTM_TEXTAREA_Begin ("id=\"Txt\" name=\"Txt\" cols=\"60\" rows=\"4\""); HTM_Txt (Txt); diff --git a/swad_test.c b/swad_test.c index 3dad8e41e..df3edce59 100644 --- a/swad_test.c +++ b/swad_test.c @@ -336,8 +336,10 @@ void Tst_ShowFormAskTst (void) /***** Number of questions to generate ****/ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RT","NumQst",Txt_No_of_questions); + /* Data */ HTM_TD_Begin ("class=\"LT\""); HTM_INPUT_LONG ("NumQst", (long) Gbl.Test.Config.Min, @@ -1947,9 +1949,11 @@ static void Tst_ShowFormConfigTst (void) /***** Minimum time between consecutive tests, per question *****/ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RT","MinTimeNxtTstPerQst", Txt_Minimum_time_seconds_per_question_between_two_tests); + /* Data */ HTM_TD_Begin ("class=\"LB\""); snprintf (StrMinTimeNxtTstPerQst,sizeof (StrMinTimeNxtTstPerQst), "%lu", @@ -5194,8 +5198,10 @@ static void Tst_PutFormEditOneQst (char Stem[Cns_MAX_BYTES_TEXT + 1], /***** Stem and image *****/ HTM_TR_Begin (NULL); + /* Label */ Frm_LabelColumn ("RT","Stem",Txt_Wording); + /* Data */ HTM_TD_Begin ("class=\"LT\""); HTM_TEXTAREA_Begin ("id=\"Stem\" name=\"Stem\" class=\"STEM_TEXTAREA\"" " rows=\"5\" required=\"required\"");