Marown/swad-core
Marown
/
swad-core
mirror of https://github.com/acanas/swad-core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Version 21.80: Jan 01, 2022 Working on design of dark theme.

This commit is contained in:
acanas 2022-01-02 00:39:26 +01:00
parent e387d4cf9a
commit dc650cbf4a
39 changed files with 442 additions and 464 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
swad_HTML.c
View File

@ -41,7 +41,18 @@
extern struct Globals Gbl;
/*****************************************************************************/
/***************************** Private vatiables *****************************/
/**************************** Private constants ******************************/
/*****************************************************************************/
static const char *ClassAlign[HTM_NUM_HEAD_ALIGN] =
{
[HTM_HEAD_LEFT ] = "LT",
[HTM_HEAD_CENTER] = "CT",
[HTM_HEAD_RIGHT ] = "RT",
};
/*****************************************************************************/
/************************* Private global variables **************************/
/*****************************************************************************/
static unsigned HTM_TABLE_NestingLevel = 0;
@ -315,6 +326,14 @@ void HTM_TR_End (void)
/***************************** Table heading cells ***************************/
/*****************************************************************************/
void HTM_TH_Title (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]);
}
void HTM_TH (unsigned RowSpan,unsigned ColSpan,const char *Txt,const char *ClassFmt,...)
{
va_list ap;
@ -375,6 +394,14 @@ void HTM_TH (unsigned RowSpan,unsigned ColSpan,const char *Txt,const char *Class
HTM_Txt ("</th>");
}
void HTM_TH_TitleBegin (HTM_HeadAlign HeadAlign)
{
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;

10
swad_HTML.h
View File

@ -46,6 +46,14 @@ typedef enum
HTM_SUBMIT_ON_CHANGE,
} HTM_SubmitOnChange_t;
#define HTM_NUM_HEAD_ALIGN 3
typedef enum
{
HTM_HEAD_LEFT = 0,
HTM_HEAD_CENTER = 1,
HTM_HEAD_RIGHT = 2,
} HTM_HeadAlign;
/*****************************************************************************/
/****************************** Public prototypes ****************************/
/*****************************************************************************/
@ -66,7 +74,9 @@ 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_End (void);
void HTM_TH_Empty (unsigned NumColumns);

10
swad_agenda.c
View File

@ -636,11 +636,11 @@ static void Agd_WriteHeaderListEvents (const struct Agd_Agenda *Agenda,
/***** Table head *****/
HTM_TR_Begin (NULL);
for (Order = Dat_STR_TIME;
Order <= Dat_END_TIME;
for (Order = (Dat_StartEndTime_t) 0;
Order <= (Dat_StartEndTime_t) (Dat_NUM_START_END_TIME - 1);
Order++)
{
HTM_TH_Begin (1,1,"TIT_TBL_%s LM",The_Colors[Gbl.Prefs.Theme]);
HTM_TH_TitleBegin (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 (1,1,Txt_Event ,"TIT_TBL_%s LM",The_Colors[Gbl.Prefs.Theme]);
HTM_TH (1,1,Txt_Location,"TIT_TBL_%s LM",The_Colors[Gbl.Prefs.Theme]);
HTM_TH_Title (Txt_Event ,HTM_HEAD_LEFT);
HTM_TH_Title (Txt_Location,HTM_HEAD_LEFT);
HTM_TR_End ();
}

11
swad_assignment.c
View File

@ -214,7 +214,6 @@ static void Asg_ShowAllAssignments (struct Asg_Assignments *Assignments)
static void Asg_PutHeadForSeeing (struct Asg_Assignments *Assignments,
bool PrintView)
{
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_START_END_TIME_HELP[Dat_NUM_START_END_TIME];
extern const char *Txt_START_END_TIME[Dat_NUM_START_END_TIME];
extern const char *Txt_Assignment;
@ -225,12 +224,12 @@ static void Asg_PutHeadForSeeing (struct Asg_Assignments *Assignments,
HTM_TR_Begin (NULL);
HTM_TH (1,1,NULL,"CONTEXT_COL"); // Column for contextual icons
for (Order = Dat_STR_TIME;
Order <= Dat_END_TIME;
for (Order = (Dat_StartEndTime_t) 0;
Order <= (Dat_StartEndTime_t) (Dat_NUM_START_END_TIME - 1);
Order++)
{
/* Begin head cell */
HTM_TH_Begin (1,1,"TIT_TBL_%s LM",The_Colors[Gbl.Prefs.Theme]);
HTM_TH_TitleBegin (HTM_HEAD_LEFT);
if (!PrintView)
{
@ -265,8 +264,8 @@ static void Asg_PutHeadForSeeing (struct Asg_Assignments *Assignments,
/* End head cell */
HTM_TH_End ();
}
HTM_TH (1,1,Txt_Assignment,"TIT_TBL_%s LM",The_Colors[Gbl.Prefs.Theme]);
HTM_TH (1,1,Txt_Folder ,"TIT_TBL_%s LM",The_Colors[Gbl.Prefs.Theme]);
HTM_TH_Title (Txt_Assignment,HTM_HEAD_LEFT);
HTM_TH_Title (Txt_Folder ,HTM_HEAD_LEFT);
HTM_TR_End ();
}

25
swad_attendance.c
View File

@ -211,7 +211,6 @@ void Att_SeeAttEvents (void)
static void Att_ShowAllAttEvents (struct Att_Events *Events)
{
extern const char *Hlp_USERS_Attendance;
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Events;
extern const char *Txt_START_END_TIME_HELP[Dat_NUM_START_END_TIME];
extern const char *Txt_START_END_TIME[Dat_NUM_START_END_TIME];
@ -258,11 +257,11 @@ static void Att_ShowAllAttEvents (struct Att_Events *Events)
HTM_TR_Begin (NULL);
HTM_TH (1,1,NULL,"CONTEXT_COL"); // Column for contextual icons
for (Order = Dat_STR_TIME;
Order <= Dat_END_TIME;
for (Order = (Dat_StartEndTime_t) 0;
Order <= (Dat_StartEndTime_t) (Dat_NUM_START_END_TIME - 1);
Order++)
{
HTM_TH_Begin (1,1,"TIT_TBL_%s LM",The_Colors[Gbl.Prefs.Theme]);
HTM_TH_TitleBegin (HTM_HEAD_LEFT);
Frm_BeginForm (ActSeeAtt);
WhichGroups = Grp_GetParamWhichGroups ();
@ -285,8 +284,8 @@ static void Att_ShowAllAttEvents (struct Att_Events *Events)
HTM_TH_End ();
}
HTM_TH (1,1,Txt_Event ,"LM");
HTM_TH (1,1,Txt_ROLES_PLURAL_Abc[Rol_STD][Usr_SEX_UNKNOWN],"RM");
HTM_TH_Title (Txt_Event ,HTM_HEAD_LEFT );
HTM_TH_Title (Txt_ROLES_PLURAL_Abc[Rol_STD][Usr_SEX_UNKNOWN],HTM_HEAD_RIGHT);
HTM_TR_End ();
@ -1561,8 +1560,8 @@ static void Att_ListAttOnlyMeAsStudent (struct Att_Event *Event)
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 (1,1,Txt_Student_comment ,"TIT_TBL_%s LM",The_Colors[Gbl.Prefs.Theme]);
HTM_TH (1,1,Txt_Teachers_comment ,"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_TR_End ();
@ -1641,8 +1640,8 @@ static void Att_ListAttStudents (struct Att_Events *Events,
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 (1,1,Txt_Student_comment ,"LM");
HTM_TH (1,1,Txt_Teachers_comment ,"LM");
HTM_TH_Title (Txt_Student_comment ,HTM_HEAD_LEFT);
HTM_TH_Title (Txt_Teachers_comment,HTM_HEAD_LEFT);
HTM_TR_End ();
@ -2702,7 +2701,7 @@ static void Att_ListEventsToSelect (const struct Att_Events *Events,
HTM_TR_Begin (NULL);
HTM_TH (1,4,Txt_Event ,"LM");
HTM_TH (1,1,Txt_ROLES_PLURAL_Abc[Rol_STD][Usr_SEX_UNKNOWN],"RM");
HTM_TH_Title (Txt_ROLES_PLURAL_Abc[Rol_STD][Usr_SEX_UNKNOWN],HTM_HEAD_RIGHT);
HTM_TR_End ();
@ -2931,7 +2930,7 @@ static void Att_WriteTableHeadSeveralAttEvents (const struct Att_Events *Events)
Att_GetDataOfAttEventByCodAndCheckCrs (&Events->Lst[NumAttEvent]);
/***** Put link to this attendance event *****/
HTM_TH_Begin (1,1,"TIT_TBL_%s CM",The_Colors[Gbl.Prefs.Theme]);
HTM_TH_TitleBegin (HTM_HEAD_CENTER);
snprintf (StrNumAttEvent,sizeof (StrNumAttEvent),"%u",NumAttEvent + 1);
Att_PutLinkAttEvent (&Events->Lst[NumAttEvent],
Events->Lst[NumAttEvent].Title,
@ -2939,7 +2938,7 @@ static void Att_WriteTableHeadSeveralAttEvents (const struct Att_Events *Events)
HTM_TH_End ();
}
HTM_TH (1,1,Txt_Attendance,"TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
HTM_TH_Title (Txt_Attendance ,HTM_HEAD_RIGHT);
HTM_TR_End ();
}

10
swad_banner.c
View File

@ -945,11 +945,11 @@ static void Ban_PutHeadBanners (void)
/****** Head cells *****/
HTM_TH (1,1,NULL ,"BM");
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_Image ,"LM");
HTM_TH (1,1,Txt_WWW ,"LM");
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 );
/***** End table row *****/
HTM_TR_End ();

12
swad_browser.c
View File

@ -9824,12 +9824,12 @@ void Brw_ListDocsFound (MYSQL_RES **mysql_res,unsigned NumDocs,
/***** Write heading *****/
HTM_TR_Begin (NULL);
HTM_TH (1,1,NULL ,"BM");
HTM_TH (1,1,Txt_Institution,"LM");
HTM_TH (1,1,Txt_Center ,"LM");
HTM_TH (1,1,Txt_Degree ,"LM");
HTM_TH (1,1,Txt_Course ,"LM");
HTM_TH (1,1,Txt_File_zone ,"LM");
HTM_TH (1,1,Txt_Document ,"LM");
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_TR_End ();
/***** List documents found *****/

11
swad_building.c
View File

@ -93,7 +93,6 @@ void Bld_SeeBuildings (void)
{
extern const char *Hlp_CENTER_Buildings;
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Buildings;
extern const char *Txt_BUILDINGS_HELP_ORDER[Bld_NUM_ORDERS];
extern const char *Txt_BUILDINGS_ORDER[Bld_NUM_ORDERS];
@ -127,7 +126,7 @@ void Bld_SeeBuildings (void)
Order <= (Bld_Order_t) (Bld_NUM_ORDERS - 1);
Order++)
{
HTM_TH_Begin (1,1,"TIT_TBL_%s LM",The_Colors[Gbl.Prefs.Theme]);
HTM_TH_TitleBegin (HTM_HEAD_LEFT);
Frm_BeginForm (ActSeeBld);
Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order);
HTM_BUTTON_OnSubmit_Begin (Txt_BUILDINGS_HELP_ORDER[Order],
@ -780,10 +779,10 @@ static void Bld_PutHeadBuildings (void)
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_Location ,"LM");
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_TR_End ();
}

37
swad_center.c
View File

@ -130,8 +130,8 @@ void Ctr_SeeCtrWithPendingDegs (void)
/***** Wrtie heading *****/
HTM_TR_Begin (NULL);
HTM_TH (1,1,Txt_Center ,"LM");
HTM_TH (1,1,Txt_Degrees_ABBREVIATION,"RM");
HTM_TH_Title (Txt_Center ,HTM_HEAD_LEFT );
HTM_TH_Title (Txt_Degrees_ABBREVIATION,HTM_HEAD_RIGHT);
HTM_TR_End ();
@ -1416,7 +1416,6 @@ static void Ctr_PutFormToCreateCenter (const struct Plc_Places *Places)
static void Ctr_PutHeadCentersForSeeing (bool OrderSelectable)
{
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_CENTERS_HELP_ORDER[2];
extern const char *Txt_CENTERS_ORDER[2];
extern const char *Txt_Place;
@ -1424,6 +1423,11 @@ static void Ctr_PutHeadCentersForSeeing (bool OrderSelectable)
extern const char *Txt_Courses_ABBREVIATION;
extern const char *Txt_ROLES_PLURAL_BRIEF_Abc[Rol_NUM_ROLES];
Ctr_Order_t Order;
static HTM_HeadAlign Align[Ctr_NUM_ORDERS] =
{
[Ctr_ORDER_BY_CENTER ] = HTM_HEAD_LEFT,
[Ctr_ORDER_BY_NUM_USRS] = HTM_HEAD_RIGHT
};
HTM_TR_Begin (NULL);
@ -1433,8 +1437,7 @@ static void Ctr_PutHeadCentersForSeeing (bool OrderSelectable)
Order <= (Ctr_Order_t) (Ctr_NUM_ORDERS - 1);
Order++)
{
HTM_TH_Begin (1,1,Order == Ctr_ORDER_BY_CENTER ? "TIT_TBL_%s LM" :
"TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
HTM_TH_TitleBegin (Align[Order]);
if (OrderSelectable)
{
Frm_BeginForm (ActSeeCtr);
@ -1455,10 +1458,10 @@ static void Ctr_PutHeadCentersForSeeing (bool OrderSelectable)
HTM_TH_End ();
}
HTM_TH (1,1,Txt_Place ,"TIT_TBL_%s LM",The_Colors[Gbl.Prefs.Theme]);
HTM_TH (1,1,Txt_Degrees_ABBREVIATION,"TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
HTM_TH (1,1,Txt_Courses_ABBREVIATION,"TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
HTM_TH_Begin (1,1,"TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
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_TxtF ("%s+",Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH]);
HTM_BR ();
HTM_Txt (Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD]);
@ -1487,20 +1490,20 @@ static void Ctr_PutHeadCentersForEdition (void)
HTM_TR_Begin (NULL);
HTM_TH_Empty (1);
HTM_TH (1,1,Txt_Code ,"RM");
HTM_TH_Title (Txt_Code ,HTM_HEAD_RIGHT);
HTM_TH_Empty (1);
HTM_TH (1,1,Txt_Place ,"LM");
HTM_TH (1,1,Txt_Short_name_of_the_center,"LM");
HTM_TH (1,1,Txt_Full_name_of_the_center ,"LM");
HTM_TH (1,1,Txt_WWW ,"LM");
HTM_TH (1,1,Txt_Users ,"RM");
HTM_TH (1,1,Txt_Degrees_ABBREVIATION ,"RM");
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_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_Title (Txt_Requester ,HTM_HEAD_LEFT );
HTM_TH_Empty (1);
HTM_TR_End ();

3
swad_changelog.h
View File

@ -602,10 +602,11 @@ 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.79 (2021-12-31)"
#define Log_PLATFORM_VERSION "SWAD 21.80 (2022-01-01)"
#define CSS_FILE "swad21.78.2.css"
#define JS_FILE "swad21.78.2.js"
/*
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)
Version 21.78.2: Dec 30, 2021 Working on design of dark theme. (322393 lines)

4
swad_chat.c
View File

@ -263,8 +263,8 @@ void Cht_ShowListOfChatRoomsWithUsrs (void)
/***** Write heading *****/
HTM_TR_Begin (NULL);
HTM_TH (1,1,Txt_CHAT_Room_code ,"CM");
HTM_TH (1,1,Txt_Number_of_users,"LM");
HTM_TH_Title (Txt_CHAT_Room_code ,HTM_HEAD_CENTER);
HTM_TH_Title (Txt_Number_of_users,HTM_HEAD_LEFT );
HTM_TR_End ();
/***** Loop over chat rooms *****/

28
swad_country.c
View File

@ -129,8 +129,8 @@ void Cty_SeeCtyWithPendingInss (void)
/***** Write heading *****/
HTM_TR_Begin (NULL);
HTM_TH (1,1,Txt_Country ,"LM");
HTM_TH (1,1,Txt_Institutions_ABBREVIATION,"RM");
HTM_TH_Title (Txt_Country ,HTM_HEAD_LEFT );
HTM_TH_Title (Txt_Institutions_ABBREVIATION,HTM_HEAD_RIGHT);
HTM_TR_End ();
/***** List the countries *****/
@ -343,7 +343,6 @@ void Cty_ListCountries2 (void)
static void Cty_PutHeadCountriesForSeeing (bool OrderSelectable)
{
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_COUNTRIES_HELP_ORDER[2];
extern const char *Txt_COUNTRIES_ORDER[2];
extern const char *Txt_Institutions_ABBREVIATION;
@ -352,16 +351,20 @@ static void Cty_PutHeadCountriesForSeeing (bool OrderSelectable)
extern const char *Txt_Courses_ABBREVIATION;
extern const char *Txt_ROLES_PLURAL_BRIEF_Abc[Rol_NUM_ROLES];
Cty_Order_t Order;
static HTM_HeadAlign Align[Cty_NUM_ORDERS] =
{
[Cty_ORDER_BY_COUNTRY ] = HTM_HEAD_LEFT,
[Cty_ORDER_BY_NUM_USRS] = HTM_HEAD_RIGHT
};
HTM_TR_Begin (NULL);
HTM_TH_Empty (1);
for (Order = Cty_ORDER_BY_COUNTRY;
Order <= Cty_ORDER_BY_NUM_USRS;
for (Order = (Cty_Order_t) 0;
Order <= (Cty_Order_t) (Cty_NUM_ORDERS - 1);
Order++)
{
HTM_TH_Begin (1,1,Order == Cty_ORDER_BY_COUNTRY ? "TIT_TBL_%s LM" :
"TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
HTM_TH_TitleBegin (Align[Order]);
if (OrderSelectable)
{
Frm_BeginForm (ActSeeCty);
@ -381,12 +384,11 @@ static void Cty_PutHeadCountriesForSeeing (bool OrderSelectable)
}
HTM_TH_End ();
}
HTM_TH (1,1,Txt_Institutions_ABBREVIATION,"TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
HTM_TH (1,1,Txt_Centers_ABBREVIATION ,"TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
HTM_TH (1,1,Txt_Degrees_ABBREVIATION ,"TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
HTM_TH (1,1,Txt_Courses_ABBREVIATION ,"TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
HTM_TH_Begin (1,1,"TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
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_TxtF ("%s+",Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH]);
HTM_BR ();
HTM_Txt (Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD]);

60
swad_course.c
View File

@ -1424,12 +1424,12 @@ static void Crs_PutHeadCoursesForSeeing (void)
HTM_TR_Begin (NULL);
HTM_TH (1,1,NULL ,"BM");
HTM_TH (1,1,Txt_Institutional_BR_code ,"CM");
HTM_TH (1,1,Txt_Year_OF_A_DEGREE ,"CM");
HTM_TH (1,1,Txt_Course ,"LM");
HTM_TH (1,1,Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH],"RM");
HTM_TH (1,1,Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD],"RM");
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_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 (1,1,Txt_Code ,"RM");
HTM_TH_Begin (1,1,"CM");
HTM_TH (1,1,NULL,"BM");
HTM_TH_Title (Txt_Code ,HTM_HEAD_RIGHT );
HTM_TH_TitleBegin (HTM_HEAD_CENTER);
HTM_TxtF ("%s&nbsp;(%s)",Txt_Institutional_code,Txt_optional);
HTM_TH_End ();
HTM_TH (1,1,Txt_Year_OF_A_DEGREE ,"CM");
HTM_TH (1,1,Txt_Short_name_of_the_course ,"LM");
HTM_TH (1,1,Txt_Full_name_of_the_course ,"LM");
HTM_TH (1,1,Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH],"RM");
HTM_TH (1,1,Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD],"RM");
HTM_TH (1,1,Txt_Requester ,"LM");
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_Empty (1);
HTM_TR_End ();
@ -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 (1,1,Txt_Degree ,"LM");
HTM_TH (1,1,Txt_Year_OF_A_DEGREE ,"CM");
HTM_TH (1,1,Txt_Course ,"LM");
HTM_TH (1,1,Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH],"RM");
HTM_TH (1,1,Txt_ROLES_PLURAL_BRIEF_Abc[Rol_NET],"RM");
HTM_TH (1,1,Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD],"RM");
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_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 (1,1,Txt_Degree ,"LM");
HTM_TH (1,1,Txt_Year_OF_A_DEGREE ,"CM");
HTM_TH (1,1,Txt_Course ,"LM");
HTM_TH (1,1,Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH],"RM");
HTM_TH (1,1,Txt_ROLES_PLURAL_BRIEF_Abc[Rol_NET],"RM");
HTM_TH (1,1,Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD],"RM");
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_TR_End ();

34
swad_degree.c
View File

@ -133,10 +133,8 @@ void Deg_SeeDegWithPendingCrss (void)
/***** Write heading *****/
HTM_TR_Begin (NULL);
HTM_TH (1,1,Txt_Degree ,"LM");
HTM_TH (1,1,Txt_Courses_ABBREVIATION,"RM");
HTM_TH_Title (Txt_Degree ,HTM_HEAD_LEFT );
HTM_TH_Title (Txt_Courses_ABBREVIATION,HTM_HEAD_RIGHT);
HTM_TR_End ();
/***** List the degrees *****/
@ -632,12 +630,12 @@ static void Deg_PutHeadDegreesForSeeing (void)
HTM_TR_Begin (NULL);
HTM_TH (1,1,NULL ,"BM");
HTM_TH (1,1,NULL,"BM");
HTM_TH_Empty (1);
HTM_TH (1,1,Txt_Degree ,"LM");
HTM_TH (1,1,Txt_Type ,"LM");
HTM_TH (1,1,Txt_Courses_ABBREVIATION,"RM");
HTM_TH_Begin (1,1,"RM");
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_TxtF ("%s+",Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH]);
HTM_BR ();
HTM_Txt (Txt_ROLES_PLURAL_BRIEF_Abc[Rol_STD]);
@ -664,20 +662,20 @@ static void Deg_PutHeadDegreesForEdition (void)
HTM_TR_Begin (NULL);
HTM_TH (1,1,NULL ,"BM");
HTM_TH (1,1,Txt_Code ,"RM");
HTM_TH (1,1,NULL,"BM");
HTM_TH_Title (Txt_Code ,HTM_HEAD_RIGHT);
HTM_TH_Empty (1);
HTM_TH (1,1,Txt_Short_name_of_the_degree,"LM");
HTM_TH (1,1,Txt_Full_name_of_the_degree ,"LM");
HTM_TH (1,1,Txt_Type ,"LM");
HTM_TH (1,1,Txt_WWW ,"LM");
HTM_TH (1,1,Txt_Courses_ABBREVIATION ,"RM");
HTM_TH_Begin (1,1,"RM");
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_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_Title (Txt_Requester ,HTM_HEAD_LEFT );
HTM_TH_Empty (1);
HTM_TR_End ();

21
swad_degree_type.c
View File

@ -514,22 +514,25 @@ static void DegTyp_PutHeadDegreeTypesForSeeing (Act_Action_t NextAction,
HieLvl_Level_t Scope,
DegTyp_Order_t SelectedOrder)
{
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_DEGREE_TYPES_HELP_ORDER[DegTyp_NUM_ORDERS];
extern const char *Txt_DEGREE_TYPES_ORDER[DegTyp_NUM_ORDERS];
DegTyp_Order_t Order;
static HTM_HeadAlign Align[DegTyp_NUM_ORDERS] =
{
[DegTyp_ORDER_BY_DEGREE_TYPE] = HTM_HEAD_LEFT,
[DegTyp_ORDER_BY_NUM_DEGREES] = HTM_HEAD_RIGHT
};
struct Fig_Figures Figures;
HTM_TR_Begin (NULL);
HTM_TH_Empty (1);
for (Order = DegTyp_ORDER_BY_DEGREE_TYPE;
Order <= DegTyp_ORDER_BY_NUM_DEGREES;
for (Order = (DegTyp_Order_t) 0;
Order <= (DegTyp_Order_t) (DegTyp_NUM_ORDERS - 1);
Order++)
{
HTM_TH_Begin (1,1,Order == DegTyp_ORDER_BY_DEGREE_TYPE ? "TIT_TBL_%s LM" :
"TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
HTM_TH_TitleBegin (Align[Order]);
/* Begin form to change order */
Frm_BeginForm (NextAction);
@ -572,10 +575,10 @@ static void DegTyp_PutHeadDegreeTypesForEdition (void)
HTM_TR_Begin (NULL);
HTM_TH (1,1,NULL ,"BM");
HTM_TH (1,1,Txt_Code ,"CM");
HTM_TH (1,1,Txt_Type_of_degree,"CM");
HTM_TH (1,1,Txt_Degrees ,"RM");
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_TR_End ();
}

37
swad_department.c
View File

@ -100,7 +100,6 @@ void Dpt_SeeDepts (void)
{
extern const char *Hlp_INSTITUTION_Departments;
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Departments_of_INSTITUTION_X;
extern const char *Txt_DEPARTMENTS_HELP_ORDER[2];
extern const char *Txt_DEPARTMENTS_ORDER[2];
@ -109,6 +108,11 @@ void Dpt_SeeDepts (void)
struct Dpt_Departments Departments;
char *Title;
Dpt_Order_t Order;
static HTM_HeadAlign Align[Dpt_NUM_ORDERS] =
{
[Dpt_ORDER_BY_DEPARTMENT] = HTM_HEAD_LEFT,
[Dpt_ORDER_BY_NUM_TCHS ] = HTM_HEAD_RIGHT
};
unsigned NumDpt;
unsigned NumTchsInsInOtherDpts;
unsigned NumTchsInsWithNoDpt;
@ -138,12 +142,11 @@ void Dpt_SeeDepts (void)
/***** Write heading *****/
HTM_TR_Begin (NULL);
for (Order = Dpt_ORDER_BY_DEPARTMENT;
Order <= Dpt_ORDER_BY_NUM_TCHS;
for (Order = (Dpt_Order_t) 0;
Order <= (Dpt_Order_t) (Dpt_NUM_ORDERS - 1);
Order++)
{
HTM_TH_Begin (1,1,Order == Dpt_ORDER_BY_NUM_TCHS ? "TIT_TBL_%s RM" :
"TIT_TBL_%s LM",The_Colors[Gbl.Prefs.Theme]);
HTM_TH_TitleBegin (Align[Order]);
Frm_BeginForm (ActSeeDpt);
Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order);
@ -821,12 +824,10 @@ static void Dpt_PutFormToCreateDepartment (void)
/***** Write heading *****/
HTM_TR_Begin (NULL);
HTM_TH (1,1,Txt_Institution,"LM");
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_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_TR_End ();
HTM_TR_Begin (NULL);
@ -897,15 +898,13 @@ static void Dpt_PutHeadDepartments (void)
extern const char *Txt_ROLES_PLURAL_BRIEF_Abc[Rol_NUM_ROLES];
HTM_TR_Begin (NULL);
HTM_TH_Empty (1);
HTM_TH (1,1,Txt_Code ,"RM");
HTM_TH (1,1,Txt_Institution ,"LM");
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 (1,1,Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH],"RM");
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_TR_End ();
}

10
swad_enrolment.c
View File

@ -2177,11 +2177,11 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected)
/* Table heading */
HTM_TR_Begin (NULL);
HTM_TH_Empty (1);
HTM_TH (1,1,Txt_Course ,"LT");
HTM_TH (1,1,Txt_ROLES_PLURAL_BRIEF_Abc[Rol_TCH],"RT");
HTM_TH (1,2,Txt_Requester ,"LT");
HTM_TH (1,1,Txt_Role ,"LT");
HTM_TH (1,1,Txt_Date ,"CT");
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_Empty (2);
HTM_TR_End ();

5
swad_exam.c
View File

@ -210,7 +210,6 @@ void Exa_SeeAllExams (void)
static void Exa_ListAllExams (struct Exa_Exams *Exams)
{
extern const char *Hlp_ASSESSMENT_Exams;
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Exams;
extern const char *Txt_EXAMS_ORDER_HELP[Exa_NUM_ORDERS];
extern const char *Txt_EXAMS_ORDER[Exa_NUM_ORDERS];
@ -255,7 +254,7 @@ static void Exa_ListAllExams (struct Exa_Exams *Exams)
Order <= (Exa_Order_t) (Exa_NUM_ORDERS - 1);
Order++)
{
HTM_TH_Begin (1,1,"TIT_TBL_%s LM",The_Colors[Gbl.Prefs.Theme]);
HTM_TH_TitleBegin (HTM_HEAD_LEFT);
/* Form to change order */
Frm_BeginForm (ActSeeAllExa);
@ -274,7 +273,7 @@ static void Exa_ListAllExams (struct Exa_Exams *Exams)
HTM_TH_End ();
}
HTM_TH (1,1,Txt_Sessions,"TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
HTM_TH_Title (Txt_Sessions,HTM_HEAD_RIGHT);
HTM_TR_End ();

16
swad_exam_log.c
View File

@ -266,14 +266,14 @@ void ExaLog_ShowExamLog (const struct ExaPrn_Print *Print)
/***** Write heading *****/
HTM_TR_Begin (NULL);
HTM_TH (1,1,Txt_Click ,"RB");
HTM_TH (1,1,Txt_Date_and_time,"LB");
HTM_TH (1,1,Txt_Action ,"LB");
HTM_TH (1,1,Txt_Question ,"RB");
HTM_TH (1,1,Txt_EXAM_Open ,"CB");
HTM_TH (1,1,Txt_IP ,"LB");
HTM_TH (1,1,Txt_Session ,"LB");
HTM_TH (1,1,Txt_Web_browser ,"LB");
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_TR_End ();
/***** Write clicks *****/

4
swad_exam_result.c
View File

@ -607,8 +607,8 @@ static void ExaRes_ListExamsToSelect (struct Exa_Exams *Exams)
/***** Heading row *****/
HTM_TR_Begin (NULL);
HTM_TH (1,2,NULL ,NULL);
HTM_TH (1,1,Txt_Exam,"LM");
HTM_TH_Empty (2);
HTM_TH_Title (Txt_Exam,HTM_HEAD_LEFT);
HTM_TR_End ();
/***** List the sessions *****/

10
swad_exam_session.c
View File

@ -368,11 +368,11 @@ static void ExaSes_ListOneOrMoreSessionsHeading (bool ICanEditSessions)
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[Exa_ORDER_BY_START_DATE] ,"LT");
HTM_TH (1,1,Txt_START_END_TIME[Exa_ORDER_BY_END_DATE ] ,"LT");
HTM_TH (1,1,Txt_Session ,"LT");
HTM_TH (1,1,Txt_Results ,"CT");
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);
/***** End row *****/
HTM_TR_End ();

13
swad_exam_set.c
View File

@ -915,10 +915,10 @@ static void ExaSet_PutTableHeadingForSets (void)
/***** Header cells *****/
HTM_TH_Empty (1);
HTM_TH (1,1,Txt_No_INDEX ,"RB");
HTM_TH (1,1,Txt_Set_of_questions ,"LB");
HTM_TH (1,1,Txt_Number_of_questions ,"RB");
HTM_TH (1,1,Txt_Number_of_questions_to_show,"RB");
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);
/***** End row *****/
HTM_TR_End ();
@ -973,9 +973,8 @@ static void ExaSet_ListOneOrMoreQuestionsForEdition (struct Exa_Exams *Exams,
HTM_TR_Begin (NULL);
HTM_TH_Empty (1);
HTM_TH (1,1,Txt_No_INDEX,"CT");
HTM_TH (1,1,Txt_Question,"CT");
HTM_TH_Title (Txt_No_INDEX,HTM_HEAD_CENTER);
HTM_TH_Title (Txt_Question,HTM_HEAD_CENTER);
HTM_TR_End ();

289
swad_figure.c
View File

@ -80,17 +80,6 @@
extern struct Globals Gbl;
/*****************************************************************************/
/**************************** Private constants ******************************/
/*****************************************************************************/
static const char *ClassAlign[Fig_NUM_HEAD_ALIGN] =
{
[Fig_HEAD_LEFT ] = "LT",
[Fig_HEAD_CENTER] = "CT",
[Fig_HEAD_RIGHT ] = "RT",
};
/*****************************************************************************/
/******************************* Private types *******************************/
/*****************************************************************************/
@ -420,10 +409,10 @@ static void Usr_GetAndShowUsersStats (void)
/***** Write heading *****/
HTM_TR_Begin (NULL);
Fig_TH (Txt_Users ,Fig_HEAD_RIGHT);
Fig_TH (Txt_Number_of_users ,Fig_HEAD_RIGHT);
Fig_TH (Txt_Average_number_of_courses_to_which_a_user_belongs,Fig_HEAD_RIGHT);
Fig_TH (Txt_Average_number_of_users_belonging_to_a_course ,Fig_HEAD_RIGHT);
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_TR_End ();
/***** Figures *****/
@ -561,13 +550,13 @@ static void Usr_GetAndShowUsersRanking (void)
/***** Write heading *****/
HTM_TR_Begin (NULL);
Fig_TH (Txt_Clicks ,Fig_HEAD_CENTER);
Fig_TH (Txt_Clicks_per_day,Fig_HEAD_CENTER);
Fig_TH (Txt_Timeline ,Fig_HEAD_CENTER);
Fig_TH (Txt_Followers ,Fig_HEAD_CENTER);
Fig_TH (Txt_Downloads ,Fig_HEAD_CENTER);
Fig_TH (Txt_Forums ,Fig_HEAD_CENTER);
Fig_TH (Txt_Messages ,Fig_HEAD_CENTER);
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_TR_End ();
/***** Rankings *****/
@ -654,35 +643,35 @@ static void Fig_WriteHeadHierarchy (void)
HTM_TH_Empty (1);
Fig_TH_Begin (Fig_HEAD_RIGHT);
HTM_TH_TitleBegin (HTM_HEAD_RIGHT);
Ico_PutIcon ("globe-americas.svg",Ico_BLACK,
Txt_Countries,"ICOx16");
HTM_BR ();
HTM_Txt (Txt_Countries);
HTM_TH_End ();
Fig_TH_Begin (Fig_HEAD_RIGHT);
HTM_TH_TitleBegin (HTM_HEAD_RIGHT);
Ico_PutIcon ("university.svg",Ico_BLACK,
Txt_Institutions,"ICOx16");
HTM_BR ();
HTM_Txt (Txt_Institutions);
HTM_TH_End ();
Fig_TH_Begin (Fig_HEAD_RIGHT);
HTM_TH_TitleBegin (HTM_HEAD_RIGHT);
Ico_PutIcon ("building.svg",Ico_BLACK,
Txt_Centers,"ICOx16");
HTM_BR ();
HTM_Txt (Txt_Centers);
HTM_TH_End ();
Fig_TH_Begin (Fig_HEAD_RIGHT);
HTM_TH_TitleBegin (HTM_HEAD_RIGHT);
Ico_PutIcon ("graduation-cap.svg",Ico_BLACK,
Txt_Degrees,"ICOx16");
HTM_BR ();
HTM_Txt (Txt_Degrees);
HTM_TH_End ();
Fig_TH_Begin (Fig_HEAD_RIGHT);
HTM_TH_TitleBegin (HTM_HEAD_RIGHT);
Ico_PutIcon ("chalkboard-teacher.svg",Ico_BLACK,
Txt_Courses,"ICOx16");
HTM_BR ();
@ -1250,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);
Fig_TH (Txt_Institution,Fig_HEAD_LEFT);
Fig_TH (TxtFigure ,Fig_HEAD_RIGHT);
HTM_TH_Title (Txt_Institution,HTM_HEAD_LEFT);
HTM_TH_Title (TxtFigure ,HTM_HEAD_RIGHT);
HTM_TR_End ();
for (NumIns = 1, NumOrder = 1, NumberLastRow = 0;
@ -1495,14 +1484,14 @@ static void Fig_WriteStatsExpTreesTableHead1 (void)
extern const char *Txt_Size;
HTM_TR_Begin (NULL);
Fig_TH (Txt_File_zones,Fig_HEAD_LEFT);
Fig_TH (Txt_Courses ,Fig_HEAD_RIGHT);
Fig_TH (Txt_Groups ,Fig_HEAD_RIGHT);
Fig_TH (Txt_Users ,Fig_HEAD_RIGHT);
Fig_TH (Txt_Max_levels,Fig_HEAD_RIGHT);
Fig_TH (Txt_Folders ,Fig_HEAD_RIGHT);
Fig_TH (Txt_Files ,Fig_HEAD_RIGHT);
Fig_TH (Txt_Size ,Fig_HEAD_RIGHT);
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_TR_End ();
}
@ -1516,21 +1505,21 @@ static void Fig_WriteStatsExpTreesTableHead2 (void)
HTM_TR_Begin (NULL);
Fig_TH (Txt_File_zones,Fig_HEAD_LEFT);
HTM_TH_Title (Txt_File_zones,HTM_HEAD_LEFT);
Fig_TH_Begin (Fig_HEAD_RIGHT);
HTM_TH_TitleBegin (HTM_HEAD_RIGHT);
HTM_TxtF ("%s/",Txt_Folders);
HTM_BR ();
HTM_Txt (Txt_course);
HTM_TH_End ();
Fig_TH_Begin (Fig_HEAD_RIGHT);
HTM_TH_TitleBegin (HTM_HEAD_RIGHT);
HTM_TxtF ("%s/",Txt_Files);
HTM_BR ();
HTM_Txt (Txt_course);
HTM_TH_End ();
Fig_TH_Begin (Fig_HEAD_RIGHT);
HTM_TH_TitleBegin (HTM_HEAD_RIGHT);
HTM_TxtF ("%s/",Txt_Size);
HTM_BR ();
HTM_Txt (Txt_course);
@ -1549,21 +1538,21 @@ static void Fig_WriteStatsExpTreesTableHead3 (void)
HTM_TR_Begin (NULL);
Fig_TH (Txt_File_zones,Fig_HEAD_LEFT);
HTM_TH_Title (Txt_File_zones,HTM_HEAD_LEFT);
Fig_TH_Begin (Fig_HEAD_RIGHT);
HTM_TH_TitleBegin (HTM_HEAD_RIGHT);
HTM_TxtF ("%s/",Txt_Folders);
HTM_BR ();
HTM_Txt (Txt_user[Usr_SEX_UNKNOWN]);
HTM_TH_End ();
Fig_TH_Begin (Fig_HEAD_RIGHT);
HTM_TH_TitleBegin (HTM_HEAD_RIGHT);
HTM_TxtF ("%s/",Txt_Files);
HTM_BR ();
HTM_Txt (Txt_user[Usr_SEX_UNKNOWN]);
HTM_TH_End ();
Fig_TH_Begin (Fig_HEAD_RIGHT);
HTM_TH_TitleBegin (HTM_HEAD_RIGHT);
HTM_TxtF ("%s/",Txt_Size);
HTM_BR ();
HTM_Txt (Txt_user[Usr_SEX_UNKNOWN]);
@ -1815,9 +1804,9 @@ static void Brw_GetAndShowOERsStats (void)
/***** Write table heading *****/
HTM_TR_Begin (NULL);
Fig_TH (Txt_License ,Fig_HEAD_LEFT);
Fig_TH (Txt_Number_of_private_files,Fig_HEAD_RIGHT);
Fig_TH (Txt_Number_of_public_files ,Fig_HEAD_RIGHT);
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_TR_End ();
for (License = (Brw_License_t) 0;
@ -1916,9 +1905,9 @@ static void Prg_GetAndShowCourseProgramStats (void) // TODO: Change function fro
/***** Write table heading *****/
HTM_TR_Begin (NULL);
Fig_TH (Txt_Number_of_BR_program_items ,Fig_HEAD_RIGHT);
Fig_TH (Txt_Number_of_BR_courses_with_BR_program_items,Fig_HEAD_RIGHT);
Fig_TH (Txt_Average_number_BR_of_items_BR_per_course ,Fig_HEAD_RIGHT);
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_TR_End ();
/***** Write number of assignments *****/
@ -1973,10 +1962,10 @@ static void Asg_GetAndShowAssignmentsStats (void)
/***** Write table heading *****/
HTM_TR_Begin (NULL);
Fig_TH (Txt_Number_of_BR_assignments ,Fig_HEAD_RIGHT);
Fig_TH (Txt_Number_of_BR_courses_with_BR_assignments,Fig_HEAD_RIGHT);
Fig_TH (Txt_Average_number_BR_of_ASSIG_BR_per_course,Fig_HEAD_RIGHT);
Fig_TH (Txt_Number_of_BR_notifications ,Fig_HEAD_RIGHT);
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_TR_End ();
/***** Write number of assignments *****/
@ -2033,9 +2022,9 @@ static void Prj_GetAndShowProjectsStats (void)
/***** Write table heading *****/
HTM_TR_Begin (NULL);
Fig_TH (Txt_Number_of_BR_projects ,Fig_HEAD_RIGHT);
Fig_TH (Txt_Number_of_BR_courses_with_BR_projects ,Fig_HEAD_RIGHT);
Fig_TH (Txt_Average_number_BR_of_projects_BR_per_course,Fig_HEAD_RIGHT);
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_TR_End ();
/***** Write number of projects *****/
@ -2090,15 +2079,15 @@ static void Tst_GetAndShowTestsStats (void)
/***** Write table heading *****/
HTM_TR_Begin (NULL);
Fig_TH (Txt_Type_of_BR_answers ,Fig_HEAD_LEFT);
Fig_TH (Txt_Number_of_BR_courses_BR_with_test_BR_questions ,Fig_HEAD_RIGHT);
Fig_TH (Txt_Number_of_BR_courses_with_BR_exportable_BR_test_BR_questions ,Fig_HEAD_RIGHT);
Fig_TH (Txt_Number_BR_of_test_BR_questions ,Fig_HEAD_RIGHT);
Fig_TH (Txt_Average_BR_number_BR_of_test_BR_questions_BR_per_course ,Fig_HEAD_RIGHT);
Fig_TH (Txt_Number_of_BR_times_that_BR_questions_BR_have_been_BR_responded ,Fig_HEAD_RIGHT);
Fig_TH (Txt_Average_BR_number_of_BR_times_that_BR_questions_BR_have_been_BR_responded_BR_per_course,Fig_HEAD_RIGHT);
Fig_TH (Txt_Average_BR_number_of_BR_times_that_BR_a_question_BR_has_been_BR_responded ,Fig_HEAD_RIGHT);
Fig_TH (Txt_Average_BR_score_BR_per_question ,Fig_HEAD_RIGHT);
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_TR_End ();
for (AnsType = (Qst_AnswerType_t) 0;
@ -2234,9 +2223,9 @@ static void Exa_GetAndShowExamsStats (void)
/***** Write table heading *****/
HTM_TR_Begin (NULL);
Fig_TH (Txt_Number_of_BR_exams ,Fig_HEAD_RIGHT);
Fig_TH (Txt_Number_of_BR_courses_with_BR_exams ,Fig_HEAD_RIGHT);
Fig_TH (Txt_Average_number_BR_of_exams_BR_per_course,Fig_HEAD_RIGHT);
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_TR_End ();
/***** Write number of exams *****/
@ -2288,9 +2277,9 @@ static void Gam_GetAndShowGamesStats (void)
/***** Write table heading *****/
HTM_TR_Begin (NULL);
Fig_TH (Txt_Number_of_BR_games ,Fig_HEAD_RIGHT);
Fig_TH (Txt_Number_of_BR_courses_with_BR_games ,Fig_HEAD_RIGHT);
Fig_TH (Txt_Average_number_BR_of_games_BR_per_course,Fig_HEAD_RIGHT);
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_TR_End ();
/***** Write number of games *****/
@ -2345,11 +2334,11 @@ static void Tml_GetAndShowTimelineActivityStats (void)
/***** Heading row *****/
HTM_TR_Begin (NULL);
Fig_TH (Txt_Type ,Fig_HEAD_LEFT);
Fig_TH (Txt_Number_of_posts ,Fig_HEAD_RIGHT);
Fig_TH (Txt_Number_of_users ,Fig_HEAD_RIGHT);
Fig_TH (Txt_PERCENT_of_users ,Fig_HEAD_RIGHT);
Fig_TH (Txt_Number_of_posts_BR_per_user,Fig_HEAD_RIGHT);
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_TR_End ();
/***** Get total number of users *****/
@ -2498,9 +2487,9 @@ static void Fol_GetAndShowFollowStats (void)
/***** Heading row *****/
HTM_TR_Begin (NULL);
Fig_TH (Txt_Users ,Fig_HEAD_LEFT);
Fig_TH (Txt_Number_of_users ,Fig_HEAD_RIGHT);
Fig_TH (Txt_PERCENT_of_users,Fig_HEAD_RIGHT);
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_TR_End ();
/***** Get total number of users *****/
@ -2596,14 +2585,14 @@ static void For_GetAndShowForumStats (void)
HTM_TH_Begin (1,1,"BT");
Ico_PutIcon ("comments.svg",Ico_BLACK,Txt_Scope,"ICOx16");
HTM_TH_End ();
Fig_TH (Txt_Forums ,Fig_HEAD_LEFT);
Fig_TH (Txt_Number_of_forums ,Fig_HEAD_RIGHT);
Fig_TH (Txt_Number_of_threads ,Fig_HEAD_RIGHT);
Fig_TH (Txt_Number_of_posts ,Fig_HEAD_RIGHT);
Fig_TH (Txt_Number_of_BR_notifications ,Fig_HEAD_RIGHT);
Fig_TH (Txt_Number_of_threads_BR_per_forum,Fig_HEAD_RIGHT);
Fig_TH (Txt_Number_of_posts_BR_per_thread ,Fig_HEAD_RIGHT);
Fig_TH (Txt_Number_of_posts_BR_per_forum ,Fig_HEAD_RIGHT);
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_TR_End ();
/***** Write a row for each type of forum *****/
@ -2902,11 +2891,11 @@ static void Ntf_GetAndShowNumUsrsPerNotifyEvent (void)
/***** Heading row *****/
HTM_TR_Begin (NULL);
Fig_TH (Txt_Event ,Fig_HEAD_LEFT);
Fig_TH (Txt_Number_of_users ,Fig_HEAD_RIGHT);
Fig_TH (Txt_PERCENT_of_users,Fig_HEAD_RIGHT);
Fig_TH (Txt_Number_of_events,Fig_HEAD_RIGHT);
Fig_TH (Txt_Number_of_emails,Fig_HEAD_RIGHT);
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_TR_End ();
/***** Get total number of users *****/
@ -3071,11 +3060,11 @@ static void Not_GetAndShowNoticesStats (void)
/***** Write table heading *****/
HTM_TR_Begin (NULL);
Fig_TH (Txt_NOTICE_Active_BR_notices ,Fig_HEAD_RIGHT);
Fig_TH (Txt_NOTICE_Obsolete_BR_notices,Fig_HEAD_RIGHT);
Fig_TH (Txt_NOTICE_Deleted_BR_notices ,Fig_HEAD_RIGHT);
Fig_TH (Txt_Total ,Fig_HEAD_RIGHT);
Fig_TH (Txt_Number_of_BR_notifications,Fig_HEAD_RIGHT);
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_TR_End ();
/***** Write number of notices *****/
@ -3143,11 +3132,11 @@ static void Msg_GetAndShowMsgsStats (void)
/***** Write table heading *****/
HTM_TR_Begin (NULL);
Fig_TH (Txt_Messages ,Fig_HEAD_LEFT);
Fig_TH (Txt_MSGS_Not_deleted ,Fig_HEAD_RIGHT);
Fig_TH (Txt_MSGS_Deleted ,Fig_HEAD_RIGHT);
Fig_TH (Txt_Total ,Fig_HEAD_RIGHT);
Fig_TH (Txt_Number_of_BR_notifications,Fig_HEAD_RIGHT);
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_TR_End ();
/***** Write number of messages *****/
@ -3227,10 +3216,10 @@ static void Agd_GetAndShowAgendasStats (void)
/***** Heading row *****/
HTM_TR_Begin (NULL);
Fig_TH (Txt_Number_of_events ,Fig_HEAD_RIGHT);
Fig_TH (Txt_Number_of_users ,Fig_HEAD_RIGHT);
Fig_TH (Txt_PERCENT_of_users ,Fig_HEAD_RIGHT);
Fig_TH (Txt_Number_of_events_per_user,Fig_HEAD_RIGHT);
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_TR_End ();
/***** Number of agenda events *****/
@ -3307,11 +3296,11 @@ static void Svy_GetAndShowSurveysStats (void)
/***** Write table heading *****/
HTM_TR_Begin (NULL);
Fig_TH (Txt_Number_of_BR_surveys ,Fig_HEAD_RIGHT);
Fig_TH (Txt_Number_of_BR_courses_with_BR_surveys ,Fig_HEAD_RIGHT);
Fig_TH (Txt_Average_number_BR_of_surveys_BR_per_course ,Fig_HEAD_RIGHT);
Fig_TH (Txt_Average_number_BR_of_questions_BR_per_survey,Fig_HEAD_RIGHT);
Fig_TH (Txt_Number_of_BR_notifications ,Fig_HEAD_RIGHT);
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_TR_End ();
/***** Write number of surveys *****/
@ -3397,9 +3386,9 @@ static void Fig_GetAndShowNumUsrsPerPrivacyForAnObject (const char *TxtObject,
/***** Heading row *****/
HTM_TR_Begin (NULL);
Fig_TH (TxtObject ,Fig_HEAD_LEFT);
Fig_TH (Txt_Number_of_users ,Fig_HEAD_RIGHT);
Fig_TH (Txt_PERCENT_of_users,Fig_HEAD_RIGHT);
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_TR_End ();
/***** For each privacy option... *****/
@ -3480,9 +3469,9 @@ static void Coo_GetAndShowNumUsrsPerCookies (void)
/***** Heading row *****/
HTM_TR_Begin (NULL);
Fig_TH (Txt_Cookies ,Fig_HEAD_LEFT);
Fig_TH (Txt_Number_of_users ,Fig_HEAD_RIGHT);
Fig_TH (Txt_PERCENT_of_users,Fig_HEAD_RIGHT);
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_TR_End ();
/***** For each option... *****/
@ -3556,9 +3545,9 @@ static void Lan_GetAndShowNumUsrsPerLanguage (void)
/***** Heading row *****/
HTM_TR_Begin (NULL);
Fig_TH (Txt_Language ,Fig_HEAD_LEFT);
Fig_TH (Txt_Number_of_users ,Fig_HEAD_RIGHT);
Fig_TH (Txt_PERCENT_of_users,Fig_HEAD_RIGHT);
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_TR_End ();
/***** For each language... *****/
@ -3634,9 +3623,9 @@ static void Cal_GetAndShowNumUsrsPerFirstDayOfWeek (void)
/***** Heading row *****/
HTM_TR_Begin (NULL);
Fig_TH (Txt_Calendar ,Fig_HEAD_LEFT);
Fig_TH (Txt_Number_of_users ,Fig_HEAD_RIGHT);
Fig_TH (Txt_PERCENT_of_users,Fig_HEAD_RIGHT);
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_TR_End ();
/***** For each day... *****/
@ -3718,9 +3707,9 @@ static void Dat_GetAndShowNumUsrsPerDateFormat (void)
/***** Heading row *****/
HTM_TR_Begin (NULL);
Fig_TH (Txt_Format ,Fig_HEAD_LEFT);
Fig_TH (Txt_Number_of_users ,Fig_HEAD_RIGHT);
Fig_TH (Txt_PERCENT_of_users,Fig_HEAD_RIGHT);
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_TR_End ();
/***** For each format... *****/
@ -3813,9 +3802,9 @@ static void Ico_GetAndShowNumUsrsPerIconSet (void)
/***** Heading row *****/
HTM_TR_Begin (NULL);
Fig_TH (Txt_Icons ,Fig_HEAD_LEFT);
Fig_TH (Txt_Number_of_users ,Fig_HEAD_RIGHT);
Fig_TH (Txt_PERCENT_of_users,Fig_HEAD_RIGHT);
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_TR_End ();
/***** For each icon set... *****/
@ -3893,9 +3882,9 @@ static void Mnu_GetAndShowNumUsrsPerMenu (void)
/***** Heading row *****/
HTM_TR_Begin (NULL);
Fig_TH (Txt_Menu ,Fig_HEAD_LEFT);
Fig_TH (Txt_Number_of_users ,Fig_HEAD_RIGHT);
Fig_TH (Txt_PERCENT_of_users,Fig_HEAD_RIGHT);
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_TR_End ();
/***** For each menu... *****/
@ -3970,9 +3959,9 @@ static void The_GetAndShowNumUsrsPerTheme (void)
/***** Heading row *****/
HTM_TR_Begin (NULL);
Fig_TH (Txt_Theme_SKIN ,Fig_HEAD_LEFT);
Fig_TH (Txt_Number_of_users ,Fig_HEAD_RIGHT);
Fig_TH (Txt_PERCENT_of_users,Fig_HEAD_RIGHT);
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_TR_End ();
/***** For each theme... *****/
@ -4050,9 +4039,9 @@ static void Lay_GetAndShowNumUsrsPerSideColumns (void)
/***** Heading row *****/
HTM_TR_Begin (NULL);
Fig_TH (Txt_Columns ,Fig_HEAD_CENTER);
Fig_TH (Txt_Number_of_users ,Fig_HEAD_RIGHT);
Fig_TH (Txt_PERCENT_of_users,Fig_HEAD_RIGHT);
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_TR_End ();
/***** For each layout of columns... *****/
@ -4103,23 +4092,3 @@ static void Lay_GetAndShowNumUsrsPerSideColumns (void)
/***** End table and box *****/
Box_BoxTableEnd ();
}
/*****************************************************************************/
/***************************** Table heading cells ***************************/
/*****************************************************************************/
void Fig_TH (const char *Txt,Fig_HeadAlign HeadAlign)
{
extern const char *The_Colors[The_NUM_THEMES];
HTM_TH (1,1,Txt,"TIT_TBL_%s %s",
The_Colors[Gbl.Prefs.Theme],ClassAlign[HeadAlign]);
}
void Fig_TH_Begin (Fig_HeadAlign HeadAlign)
{
extern const char *The_Colors[The_NUM_THEMES];
HTM_TH_Begin (1,1,"TIT_TBL_%s %s",
The_Colors[Gbl.Prefs.Theme],ClassAlign[HeadAlign]);
}

11
swad_figure.h
View File

@ -79,14 +79,6 @@ struct Fig_Figures
Fig_FigureType_t FigureType;
};
#define Fig_NUM_HEAD_ALIGN 3
typedef enum
{
Fig_HEAD_LEFT = 0,
Fig_HEAD_CENTER = 1,
Fig_HEAD_RIGHT = 2,
} Fig_HeadAlign;
/*****************************************************************************/
/***************************** Public prototypes *****************************/
/*****************************************************************************/
@ -96,7 +88,4 @@ void Fig_PutIconToShowFigure (Fig_FigureType_t FigureType);
void Fig_PutHiddenParamFigures (void *Figures);
void Fig_ShowFigures (void);
void Fig_TH (const char *Txt,Fig_HeadAlign HeadAlign);
void Fig_TH_Begin (Fig_HeadAlign HeadAlign);
#endif

26
swad_forum.c
View File

@ -2045,12 +2045,12 @@ 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 (1,1,Txt_MSG_Subject,"LM");
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);
for (Order = Dat_STR_TIME;
Order <= Dat_END_TIME;
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]);
@ -2077,10 +2077,10 @@ static void For_ShowForumThreadsHighlightingOneThread (struct For_Forums *Forums
HTM_TH_End ();
}
HTM_TH (1,1,Txt_Number_BR_msgs,"TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
HTM_TH (1,1,Txt_Unread_BR_msgs,"TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
HTM_TH (1,1,Txt_WriBRters ,"TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
HTM_TH (1,1,Txt_ReaBRders ,"TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
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_TR_End ();
@ -2258,8 +2258,8 @@ static void For_ListForumThrs (struct For_Forums *Forums,
HTM_TD_End ();
/***** Write the authors and date-times of first and last posts *****/
for (Order = Dat_STR_TIME;
Order <= Dat_END_TIME;
for (Order = (Dat_StartEndTime_t) 0;
Order <= (Dat_StartEndTime_t) (Dat_NUM_START_END_TIME - 1);
Order++)
{
if (Order == Dat_STR_TIME || Thr.NumPosts > 1) // Don't write twice the same author when thread has only one thread
@ -2369,8 +2369,8 @@ static void For_GetThreadData (struct For_Thread *Thr)
DB_FreeMySQLResult (&mysql_res);
/***** Get if first or last message are enabled *****/
for (Order = Dat_STR_TIME;
Order <= Dat_END_TIME;
for (Order = (Dat_StartEndTime_t) 0;
Order <= (Dat_StartEndTime_t) (Dat_NUM_START_END_TIME - 1);
Order++)
Thr->Enabled[Order] = !For_DB_GetIfPstIsDisabled (Thr->PstCod[Order]);

17
swad_game.c
View File

@ -225,7 +225,6 @@ void Gam_SeeAllGames (void)
static void Gam_ListAllGames (struct Gam_Games *Games)
{
extern const char *Hlp_ASSESSMENT_Games;
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Games;
extern const char *Txt_GAMES_ORDER_HELP[Gam_NUM_ORDERS];
extern const char *Txt_GAMES_ORDER[Gam_NUM_ORDERS];
@ -277,7 +276,7 @@ static void Gam_ListAllGames (struct Gam_Games *Games)
Order <= (Gam_Order_t) (Gam_NUM_ORDERS - 1);
Order++)
{
HTM_TH_Begin (1,1,"TIT_TBL_%s LM",The_Colors[Gbl.Prefs.Theme]);
HTM_TH_TitleBegin (HTM_HEAD_LEFT);
/* Form to change order */
Frm_BeginForm (ActSeeAllGam);
@ -298,7 +297,7 @@ static void Gam_ListAllGames (struct Gam_Games *Games)
HTM_TH_End ();
}
HTM_TH (1,1,Txt_Matches,"TIT_TBL_%s RM",The_Colors[Gbl.Prefs.Theme]);
HTM_TH_Title (Txt_Matches,HTM_HEAD_RIGHT);
HTM_TR_End ();
@ -1716,15 +1715,13 @@ static void Gam_ListOneOrMoreQuestionsForEdition (struct Gam_Games *Games,
/***** Write the heading *****/
HTM_TABLE_BeginWideMarginPadding (5);
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_Tags ,"CT");
HTM_TH (1,1,Txt_Question,"CT");
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_TR_End ();
/***** Write rows *****/

36
swad_group.c
View File

@ -1396,16 +1396,16 @@ static void Grp_WriteHeadingGroupTypes (void)
HTM_TR_Begin (NULL);
HTM_TH (1,1,NULL ,"BM");
HTM_TH_Begin (1,1,"CM");
HTM_TH (1,1,NULL,"BM");
HTM_TH_TitleBegin (HTM_HEAD_CENTER);
HTM_Txt (Txt_Type_of_group);
HTM_BR ();
HTM_TxtF ("(%s)",Txt_eg_Lectures_Practicals);
HTM_TH_End ();
HTM_TH (1,1,Txt_Mandatory_enrolment,"CM");
HTM_TH (1,1,Txt_Multiple_enrolment ,"CM");
HTM_TH (1,1,Txt_Opening_of_groups ,"CM");
HTM_TH (1,1,Txt_Number_of_BR_groups,"CM");
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_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 (1,1,Txt_Type_BR_of_group,"CM");
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_Txt (Txt_Group_name);
HTM_BR ();
HTM_TxtF ("(%s)",Txt_eg_A_B);
HTM_TH_End ();
HTM_TH (1,1,Txt_Room,"CM");
HTM_TH_Title (Txt_Room,HTM_HEAD_CENTER);
for (Role = Rol_TCH;
Role >= Rol_STD;
Role--)
HTM_TH (1,1,Txt_ROLES_PLURAL_BRIEF_Abc[Role],"CM");
HTM_TH (1,1,Txt_Max_BR_students ,"CM");
HTM_TH_Title (Txt_ROLES_PLURAL_BRIEF_Abc[Role],HTM_HEAD_CENTER);
HTM_TH_Title (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 (1,1,Txt_Group ,"LM");
HTM_TH (1,1,Txt_Room ,"LM");
HTM_TH_Title (Txt_Group ,HTM_HEAD_LEFT );
HTM_TH_Title (Txt_Room ,HTM_HEAD_LEFT );
for (Role = Rol_TCH;
Role >= Rol_STD;
Role--)
HTM_TH (1,1,Txt_ROLES_PLURAL_BRIEF_Abc[Role],"CM");
HTM_TH (1,1,Txt_Max_BR_students,"CM");
HTM_TH (1,1,Txt_Vacants ,"CM");
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_TR_End ();
}

35
swad_holiday.c
View File

@ -96,7 +96,6 @@ void Hld_SeeHolidays (void)
{
extern const char *Hlp_INSTITUTION_Holidays;
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Holidays;
extern const char *Txt_HOLIDAYS_HELP_ORDER[2];
extern const char *Txt_HOLIDAYS_ORDER[2];
@ -131,11 +130,11 @@ void Hld_SeeHolidays (void)
HTM_TABLE_BeginWideMarginPadding (2);
HTM_TR_Begin (NULL);
for (Order = Hld_ORDER_BY_PLACE;
Order <= Hld_ORDER_BY_START_DATE;
for (Order = (Hld_Order_t) 0;
Order <= (Hld_Order_t) (Hld_NUM_ORDERS - 1);
Order++)
{
HTM_TH_Begin (1,1,"TIT_TBL_%s LM",The_Colors[Gbl.Prefs.Theme]);
HTM_TH_TitleBegin (HTM_HEAD_LEFT);
Frm_BeginForm (ActSeeHld);
Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order);
HTM_BUTTON_OnSubmit_Begin (Txt_HOLIDAYS_HELP_ORDER[Order],
@ -149,10 +148,10 @@ void Hld_SeeHolidays (void)
Frm_EndForm ();
HTM_TH_End ();
}
HTM_TH_Begin (1,1,"TIT_TBL_%s LM",The_Colors[Gbl.Prefs.Theme]);
HTM_TH_TitleBegin (HTM_HEAD_LEFT);
HTM_TxtF ("&nbsp;%s&nbsp;",Txt_End_date);
HTM_TH_End ();
HTM_TH (1,1,Txt_Holiday,"TIT_TBL_%s LM",The_Colors[Gbl.Prefs.Theme]);
HTM_TH_Title (Txt_Holiday,HTM_HEAD_LEFT);
HTM_TR_End ();
@ -924,11 +923,11 @@ static void Hld_PutFormToCreateHoliday (const struct Plc_Places *Places)
/***** Write heading *****/
HTM_TR_Begin (NULL);
HTM_TH (1,1,Txt_Place ,"LM");
HTM_TH (1,1,Txt_Type ,"LM");
HTM_TH (1,1,Txt_START_END_TIME[Dat_STR_TIME],"LM");
HTM_TH (1,1,Txt_START_END_TIME[Dat_END_TIME],"LM");
HTM_TH (1,1,Txt_Holiday ,"LM");
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_TR_End ();
HTM_TR_Begin (NULL);
@ -1017,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 (1,1,Txt_Code ,"RM");
HTM_TH (1,1,Txt_Place ,"LM");
HTM_TH (1,1,Txt_Type ,"LM");
HTM_TH (1,1,Txt_START_END_TIME[Dat_STR_TIME],"LM");
HTM_TH (1,1,Txt_START_END_TIME[Dat_END_TIME],"LM");
HTM_TH (1,1,Txt_Holiday ,"LM");
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_TR_End ();
}

9
swad_institution.c
View File

@ -443,7 +443,6 @@ static void Ins_ListOneInstitutionForSeeing (struct Ins_Instit *Ins,unsigned Num
static void Ins_PutHeadInstitutionsForSeeing (bool OrderSelectable)
{
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_INSTITUTIONS_HELP_ORDER[2];
extern const char *Txt_INSTITUTIONS_ORDER[2];
extern const char *Txt_ROLES_PLURAL_BRIEF_Abc[Rol_NUM_ROLES];
@ -452,10 +451,10 @@ static void Ins_PutHeadInstitutionsForSeeing (bool OrderSelectable)
extern const char *Txt_Courses_ABBREVIATION;
extern const char *Txt_Departments_ABBREVIATION;
Ins_Order_t Order;
static const char *ClassTH[Ins_NUM_ORDERS] =
static HTM_HeadAlign Align[Ins_NUM_ORDERS] =
{
[Ins_ORDER_BY_INSTITUTION] = "TIT_TBL_%s LM",
[Ins_ORDER_BY_NUM_USRS ] = "TIT_TBL_%s RM"
[Ins_ORDER_BY_INSTITUTION] = HTM_HEAD_LEFT,
[Ins_ORDER_BY_NUM_USRS ] = HTM_HEAD_RIGHT
};
HTM_TR_Begin (NULL);
@ -465,7 +464,7 @@ static void Ins_PutHeadInstitutionsForSeeing (bool OrderSelectable)
Order <= (Ins_Order_t) (Ins_NUM_ORDERS - 1);
Order++)
{
HTM_TH_Begin (1,1,ClassTH[Order],The_Colors[Gbl.Prefs.Theme]);
HTM_TH_TitleBegin (Align[Order]);
if (OrderSelectable)
{
Frm_BeginForm (ActSeeIns);

7
swad_mail.c
View File

@ -104,7 +104,6 @@ void Mai_SeeMailDomains (void)
{
extern const char *Hlp_START_Domains;
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Email_domains_allowed_for_notifications;
extern const char *Txt_EMAIL_DOMAIN_HELP_ORDER[3];
extern const char *Txt_EMAIL_DOMAIN_ORDER[3];
@ -129,11 +128,11 @@ void Mai_SeeMailDomains (void)
/***** Write heading *****/
HTM_TR_Begin (NULL);
for (Order = Mai_ORDER_BY_DOMAIN;
Order <= Mai_ORDER_BY_USERS;
for (Order = (Mai_DomainsOrder_t) 0;
Order <= (Mai_DomainsOrder_t) (Mai_NUM_ORDERS - 1);
Order++)
{
HTM_TH_Begin (1,1,"TIT_TBL_%s LM",The_Colors[Gbl.Prefs.Theme]);
HTM_TH_TitleBegin (HTM_HEAD_LEFT);
Frm_BeginForm (ActSeeMai);
Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order);

6
swad_network.c
View File

@ -349,9 +349,9 @@ void Net_ShowWebAndSocialNetworksStats (void)
/***** Write heading *****/
HTM_TR_Begin (NULL);
Fig_TH (Txt_Web_social_network,Fig_HEAD_RIGHT);
Fig_TH (Txt_Number_of_users ,Fig_HEAD_RIGHT);
Fig_TH (Txt_PERCENT_of_users ,Fig_HEAD_RIGHT);
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_TR_End ();
/***** For each web / social network... *****/

6
swad_photo.c
View File

@ -2221,12 +2221,12 @@ static void Pho_ShowOrPrintListDegrees (struct Pho_DegPhotos *DegPhotos,
/***** Write heading *****/
HTM_TABLE_BeginCenterPadding (2);
HTM_TR_Begin (NULL);
HTM_TH (1,1,Txt_No_INDEX,"TIT_TBL_%s RT",The_Colors[Gbl.Prefs.Theme]);
HTM_TH (1,1,Txt_Degree ,"TIT_TBL_%s CT",The_Colors[Gbl.Prefs.Theme]);
HTM_TH_Title (Txt_No_INDEX,HTM_HEAD_RIGHT);
HTM_TH_Title (Txt_Degree ,HTM_HEAD_CENTER);
for (Sex = (Usr_Sex_t) 0;
Sex <= (Usr_Sex_t) (Usr_NUM_SEXS - 1);
Sex++)
HTM_TH (1,1,Txt_SEX_PLURAL_Abc[Sex],"TIT_TBL_%s CT",The_Colors[Gbl.Prefs.Theme]);
HTM_TH_Title (Txt_SEX_PLURAL_Abc[Sex],HTM_HEAD_CENTER);
HTM_TR_End ();
/***** Get degrees *****/

6
swad_photo_shape.c
View File

@ -190,9 +190,9 @@ void PhoSha_GetAndShowNumUsrsPerPhotoShape (void)
/***** Heading row *****/
HTM_TR_Begin (NULL);
Fig_TH (Txt_User_photos ,Fig_HEAD_CENTER);
Fig_TH (Txt_Number_of_users ,Fig_HEAD_RIGHT);
Fig_TH (Txt_PERCENT_of_users,Fig_HEAD_RIGHT);
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_TR_End ();
/***** For each user photo shape... *****/

3
swad_place.c
View File

@ -95,7 +95,6 @@ void Plc_SeePlaces (void)
{
extern const char *Hlp_INSTITUTION_Places;
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Places;
extern const char *Txt_PLACES_HELP_ORDER[2];
extern const char *Txt_PLACES_ORDER[2];
@ -129,7 +128,7 @@ void Plc_SeePlaces (void)
Order <= (Plc_Order_t) (Plc_NUM_ORDERS - 1);
Order++)
{
HTM_TH_Begin (1,1,"TIT_TBL_%s LM",The_Colors[Gbl.Prefs.Theme]);
HTM_TH_TitleBegin (HTM_HEAD_LEFT);
Frm_BeginForm (ActSeePlc);
Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order);

4
swad_project.c
View File

@ -976,7 +976,7 @@ static void Prj_ShowProjectsHead (struct Prj_Projects *Projects,
switch (ProjectView)
{
case Prj_LIST_PROJECTS:
HTM_TH (1,1,Txt_No_INDEX,"TIT_TBL_%s CM",The_Colors[Gbl.Prefs.Theme]);
HTM_TH_Title (Txt_No_INDEX,HTM_HEAD_CENTER);
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_Begin (1,1,"TIT_TBL_%s LM",The_Colors[Gbl.Prefs.Theme]);
HTM_TH_TitleBegin (HTM_HEAD_LEFT);
switch (ProjectView)
{

3
swad_question.c
View File

@ -901,7 +901,6 @@ void Qst_ListOneOrMoreQstsForEdition (struct Qst_Questions *Questions,
void Qst_WriteHeadingRowQuestionsForEdition (struct Qst_Questions *Questions)
{
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_No_INDEX;
extern const char *Txt_Code;
extern const char *Txt_Date;
@ -930,7 +929,7 @@ void Qst_WriteHeadingRowQuestionsForEdition (struct Qst_Questions *Questions)
Order <= (Qst_QuestionsOrder_t) (Qst_NUM_TYPES_ORDER_QST - 1);
Order++)
{
HTM_TH_Begin (1,1,"TIT_TBL_%s LT",The_Colors[Gbl.Prefs.Theme]);
HTM_TH_TitleBegin (HTM_HEAD_LEFT);
if (Questions->NumQsts > 1)
{

3
swad_room.c
View File

@ -146,7 +146,6 @@ void Roo_SeeRooms (void)
{
extern const char *Hlp_CENTER_Rooms;
extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Rooms;
extern const char *Txt_ROOMS_HELP_ORDER[Roo_NUM_ORDERS];
extern const char *Txt_ROOMS_ORDER[Roo_NUM_ORDERS];
@ -184,7 +183,7 @@ void Roo_SeeRooms (void)
Order <= (Roo_Order_t) (Roo_NUM_ORDERS - 1);
Order++)
{
HTM_TH_Begin (1,1,"TIT_TBL_%s LM",The_Colors[Gbl.Prefs.Theme]);
HTM_TH_TitleBegin (HTM_HEAD_LEFT);
Frm_BeginForm (ActSeeRoo);
Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order);
HTM_BUTTON_OnSubmit_Begin (Txt_ROOMS_HELP_ORDER[Order],

34
swad_statistic.c
View File

@ -939,7 +939,7 @@ static void Sta_ShowHits (Sta_GlobalOrCourseAccesses_t GlobalOrCourse)
NULL,NULL,
NULL,Box_NOT_CLOSABLE);
HTM_TABLE_BeginPadding (Sta_CellPadding[Stats.ClicksGroupedBy]);
HTM_TABLE_BeginWidePadding (Sta_CellPadding[Stats.ClicksGroupedBy]);
switch (Stats.ClicksGroupedBy)
{
case Sta_CLICKS_CRS_DETAILED_LIST:
@ -1061,8 +1061,6 @@ static void Sta_ShowDetailedAccessesList (const struct Sta_Stats *Stats,
MYSQL_RES *mysql_res)
{
extern Act_Action_t Act_FromActCodToAction[1 + Act_MAX_ACTION_COD];
extern const char *The_ClassDatStrong[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Show_previous_X_clicks;
extern const char *Txt_PAGES_Previous;
extern const char *Txt_Clicks;
@ -1145,31 +1143,27 @@ static void Sta_ShowDetailedAccessesList (const struct Sta_Stats *Stats,
Par_PutHiddenParamUnsigned (NULL,"RowsPage",Stats->RowsPerPage);
Usr_PutHiddenParSelectedUsrsCods (&Gbl.Usrs.Selected);
}
HTM_TD_Begin ("class=\"TIT_TBL_%s LM\"",The_Colors[Gbl.Prefs.Theme]);
HTM_TH_TitleBegin (HTM_HEAD_LEFT);
if (FirstRow > 1)
{
if (asprintf (&Title,Txt_Show_previous_X_clicks,Stats->RowsPerPage) < 0)
Err_NotEnoughMemoryExit ();
HTM_BUTTON_OnSubmit_Begin (Title,"BT_LINK",NULL);
free (Title);
HTM_STRONG_Begin ();
HTM_TxtF ("&lt;%s",Txt_PAGES_Previous);
HTM_STRONG_End ();
HTM_TxtF ("&lt;%s",Txt_PAGES_Previous);
HTM_BUTTON_End ();
}
HTM_TD_End ();
HTM_TH_End ();
if (FirstRow > 1)
Frm_EndForm ();
/* Write number of current page */
HTM_TD_Begin ("class=\"%s CM\"",The_ClassDatStrong[Gbl.Prefs.Theme]);
HTM_STRONG_Begin ();
HTM_TxtF ("%s %u-%u %s %u (%s %u %s %u)",
Txt_Clicks,
FirstRow,LastRow,Txt_of_PART_OF_A_TOTAL,NumHits,
Txt_page,NumPagesBefore + 1,Txt_of_PART_OF_A_TOTAL,NumPagsTotal);
HTM_STRONG_End ();
HTM_TD_End ();
HTM_TH_TitleBegin (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,
Txt_page,NumPagesBefore + 1,Txt_of_PART_OF_A_TOTAL,NumPagsTotal);
HTM_TH_End ();
/* Put link to jump to next page (more recent clicks) */
if (LastRow < NumHits)
@ -1183,19 +1177,17 @@ static void Sta_ShowDetailedAccessesList (const struct Sta_Stats *Stats,
Par_PutHiddenParamUnsigned (NULL,"RowsPage" ,(unsigned) Stats->RowsPerPage);
Usr_PutHiddenParSelectedUsrsCods (&Gbl.Usrs.Selected);
}
HTM_TD_Begin ("class=\"TIT_TBL_%s RM\"",The_Colors[Gbl.Prefs.Theme]);
HTM_TH_TitleBegin (HTM_HEAD_RIGHT);
if (LastRow < NumHits)
{
if (asprintf (&Title,Txt_Show_next_X_clicks,Stats->RowsPerPage) < 0)
Err_NotEnoughMemoryExit ();
HTM_BUTTON_OnSubmit_Begin (Title,"BT_LINK",NULL);
free (Title);
HTM_STRONG_Begin ();
HTM_TxtF ("%s&gt;",Txt_PAGES_Next);
HTM_STRONG_End ();
HTM_TxtF ("%s&gt;",Txt_PAGES_Next);
HTM_BUTTON_End ();
}
HTM_TD_End ();
HTM_TH_End ();
if (LastRow < NumHits)
Frm_EndForm ();

11
swad_survey.c
View File

@ -195,7 +195,6 @@ void Svy_SeeAllSurveys (void)
static void Svy_ListAllSurveys (struct Svy_Surveys *Surveys)
{
extern const char *Hlp_ASSESSMENT_Surveys;
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Surveys;
extern const char *Txt_START_END_TIME_HELP[Dat_NUM_START_END_TIME];
extern const char *Txt_START_END_TIME[Dat_NUM_START_END_TIME];
@ -246,11 +245,11 @@ static void Svy_ListAllSurveys (struct Svy_Surveys *Surveys)
HTM_TH (1,1,NULL,"CONTEXT_COL"); // Column for contextual icons
for (Order = Dat_STR_TIME;
Order <= Dat_END_TIME;
for (Order = (Dat_StartEndTime_t) 0;
Order <= (Dat_StartEndTime_t) (Dat_NUM_START_END_TIME - 1);
Order++)
{
HTM_TH_Begin (1,1,"TIT_TBL_%s LM",The_Colors[Gbl.Prefs.Theme]);
HTM_TH_TitleBegin (HTM_HEAD_LEFT);
/* Form to change order */
Frm_BeginForm (ActSeeAllSvy);
@ -271,8 +270,8 @@ static void Svy_ListAllSurveys (struct Svy_Surveys *Surveys)
HTM_TH_End ();
}
HTM_TH (1,1,Txt_Survey,"TIT_TBL_%s LM",The_Colors[Gbl.Prefs.Theme]);
HTM_TH (1,1,Txt_Status,"TIT_TBL_%s CM",The_Colors[Gbl.Prefs.Theme]);
HTM_TH_Title (Txt_Survey,HTM_HEAD_LEFT );
HTM_TH_Title (Txt_Status,HTM_HEAD_CENTER);
HTM_TR_End ();