" // Limited width
+ if (asprintf (&Caption.Name,"
" // Limited width
"%s
"
"%s%s%s"
"
",
+ The_ClassDatStrong[Gbl.Prefs.Theme],
UsrDat->FrstName,
UsrDat->Surname1,
UsrDat->Surname2[0] ? " " :
@@ -1164,21 +1166,23 @@ void Pho_BuildHTMLUsrPhoto (const struct UsrData *UsrDat,const char *PhotoURL,
{
Fol_GetNumFollow (UsrDat->UsrCod,&NumFollowing,&NumFollowers);
if (asprintf (&Caption.Follow,"
"
- ""
+ ""
"%u"
""
""
" %s "
""
- ""
+ ""
"%u"
""
""
" %s"
""
"
",
+ The_ClassDatStrong[Gbl.Prefs.Theme],
NumFollowing,
Txt_Following,
+ The_ClassDatStrong[Gbl.Prefs.Theme],
NumFollowers,
Txt_Followers) < 0)
Err_NotEnoughMemoryExit ();
@@ -2243,7 +2247,7 @@ static void Pho_ShowOrPrintListDegrees (struct Pho_DegPhotos *DegPhotos,
if (SeeOrPrint == Pho_DEGREES_SEE)
{
Deg_DrawDegreeLogoAndNameWithLink (&Deg,ActSeeDegInf,
- Str_BuildStringStr ("BT_LINK %s",The_ClassDat[Gbl.Prefs.Theme]),
+ Str_BuildString ("BT_LINK %s",The_ClassDat[Gbl.Prefs.Theme]),
"CT");
Str_FreeStrings ();
}
@@ -2345,7 +2349,7 @@ static void Pho_ShowDegreeAvgPhotoAndStat (const struct Deg_Degree *Deg,
int NumStds,int NumStdsWithPhoto)
{
extern const char *Usr_StringsSexDB[Usr_NUM_SEXS];
- extern const char *The_ClassDatN[The_NUM_THEMES];
+ extern const char *The_ClassDatStrong[The_NUM_THEMES];
extern const char *Txt_students_ABBREVIATION;
extern const char *Txt_SEX_PLURAL_abc[Usr_NUM_SEXS];
extern const char *Txt_photos;
@@ -2410,7 +2414,7 @@ static void Pho_ShowDegreeAvgPhotoAndStat (const struct Deg_Degree *Deg,
Frm_SetUniqueId (IdCaption);
HTM_DIV_Begin ("id=\"%s\" class=\"NOT_SHOWN\"",IdCaption);
HTM_DIV_Begin ("class=\"ZOOM_TXT_LINE %s\"",
- The_ClassDatN[Gbl.Prefs.Theme]);
+ The_ClassDatStrong[Gbl.Prefs.Theme]);
HTM_Txt (PhotoCaption);
HTM_DIV_End ();
HTM_DIV_End ();
diff --git a/swad_plugin.c b/swad_plugin.c
index a7bc5b8c..bf6eaaeb 100644
--- a/swad_plugin.c
+++ b/swad_plugin.c
@@ -135,7 +135,7 @@ void Plg_ListPlugins (void)
HTM_A_Begin ("href=\"%s\" title=\"%s\" class=\"%s\" target=\"_blank\"",
URL,Plg->Name,The_ClassDat[Gbl.Prefs.Theme]);
HTM_IMG (Cfg_URL_ICON_PLUGINS_PUBLIC,
- Str_BuildStringStr ("%s24x24.gif",Gbl.Plugins.Lst[NumPlg].Logo),
+ Str_BuildString ("%s24x24.gif",Gbl.Plugins.Lst[NumPlg].Logo),
Plg->Name,
"class=\"ICO40x40\"");
Str_FreeStrings ();
@@ -363,7 +363,7 @@ static void Plg_ListPluginsForEdition (void)
// TODO: Change plugin icons to 32x32
HTM_TD_Begin ("class=\"CM\" style=\"width:45px;\"");
HTM_IMG (Cfg_URL_ICON_PLUGINS_PUBLIC,
- Str_BuildStringStr ("%s24x24.gif",Gbl.Plugins.Lst[NumPlg].Logo),
+ Str_BuildString ("%s24x24.gif",Gbl.Plugins.Lst[NumPlg].Logo),
Gbl.Plugins.Lst[NumPlg].Name,
"class=\"ICO40x40\"");
Str_FreeStrings ();
diff --git a/swad_privacy.c b/swad_privacy.c
index 18893a2f..9134392a 100644
--- a/swad_privacy.c
+++ b/swad_privacy.c
@@ -153,9 +153,10 @@ static void Pri_PutFormVisibility (const char *TxtLabel,
Pri_Visibility_t CurrentVisibilityInDB,
unsigned MaskAllowedVisibility)
{
+ extern const char *The_ClassBgHighlight[The_NUM_THEMES];
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *The_ClassDat[The_NUM_THEMES];
- extern const char *The_ClassDatN[The_NUM_THEMES];
+ extern const char *The_ClassDatStrong[The_NUM_THEMES];
extern const char *Txt_PRIVACY_OPTIONS[Pri_NUM_OPTIONS_PRIVACY];
Pri_Visibility_t Visibility;
@@ -178,9 +179,11 @@ static void Pri_PutFormVisibility (const char *TxtLabel,
if (MaskAllowedVisibility & (1 << Visibility))
{
if (Visibility == CurrentVisibilityInDB)
- HTM_LI_Begin ("class=\"%s LIGHT_BLUE\"",The_ClassDatN[Gbl.Prefs.Theme]);
+ HTM_LI_Begin ("class=\"%s %s\"",
+ The_ClassDatStrong[Gbl.Prefs.Theme],The_ClassBgHighlight[Gbl.Prefs.Theme]);
else
- HTM_LI_Begin ("class=\"%s\"",The_ClassDat[Gbl.Prefs.Theme]);
+ HTM_LI_Begin ("class=\"%s\"",
+ The_ClassDat[Gbl.Prefs.Theme]);
HTM_LABEL_Begin (NULL);
HTM_INPUT_RADIO (ParamName,Action != ActUnk,
"value=\"%u\"%s%s",
diff --git a/swad_profile.c b/swad_profile.c
index 71d3ac4d..1a7637ad 100644
--- a/swad_profile.c
+++ b/swad_profile.c
@@ -373,6 +373,7 @@ void Prf_ChangeExtendedProfileVis (void)
void Prf_ShowDetailsUserProfile (const struct UsrData *UsrDat)
{
+ extern const char *The_ClassDatStrong[The_NUM_THEMES];
bool UsrIsBannedFromRanking;
struct Prf_UsrFigures UsrFigures;
Rol_Role_t Role;
@@ -383,7 +384,8 @@ void Prf_ShowDetailsUserProfile (const struct UsrData *UsrDat)
/***** Left list *****/
/* Begin left list */
HTM_DIV_Begin ("class=\"PRF_FIG_LEFT_CONT\"");
- HTM_UL_Begin ("class=\"PRF_FIG_UL DAT_NOBR_N\"");
+ HTM_UL_Begin ("class=\"PRF_FIG_UL %s NOWRAP\"",
+ The_ClassDatStrong[Gbl.Prefs.Theme]);
/* Time since first click */
Prf_ShowTimeSinceFirstClick (UsrDat,&UsrFigures);
@@ -408,7 +410,8 @@ void Prf_ShowDetailsUserProfile (const struct UsrData *UsrDat)
if (!UsrIsBannedFromRanking)
{
/* Begin right list */
- HTM_UL_Begin ("class=\"PRF_FIG_UL DAT_NOBR_N\"");
+ HTM_UL_Begin ("class=\"PRF_FIG_UL %s NOWRAP\"",
+ The_ClassDatStrong[Gbl.Prefs.Theme]);
/* Number of clicks */
Prf_ShowNumClicks (UsrDat,&UsrFigures);
diff --git a/swad_program.c b/swad_program.c
index 6a1f9509..5e70bd3a 100644
--- a/swad_program.c
+++ b/swad_program.c
@@ -776,7 +776,7 @@ static void Prg_PutFormsToRemEditOneItem (unsigned NumItem,
Lay_PutContextualLinkOnlyIcon (ActUp_PrgItm,"prg_highlighted",
Prg_PutParams,&Item->Hierarchy.ItmCod,
"arrow-up.svg",
- Str_BuildStringStr (Txt_Move_up_X,
+ Str_BuildString (Txt_Move_up_X,
StrItemIndex));
Str_FreeStrings ();
}
@@ -789,7 +789,7 @@ static void Prg_PutFormsToRemEditOneItem (unsigned NumItem,
Lay_PutContextualLinkOnlyIcon (ActDwnPrgItm,"prg_highlighted",
Prg_PutParams,&Item->Hierarchy.ItmCod,
"arrow-down.svg",
- Str_BuildStringStr (Txt_Move_down_X,
+ Str_BuildString (Txt_Move_down_X,
StrItemIndex));
Str_FreeStrings ();
}
@@ -802,7 +802,7 @@ static void Prg_PutFormsToRemEditOneItem (unsigned NumItem,
Lay_PutContextualLinkOnlyIcon (ActLftPrgItm,"prg_highlighted",
Prg_PutParams,&Item->Hierarchy.ItmCod,
"arrow-left.svg",
- Str_BuildStringStr (Txt_Increase_level_of_X,
+ Str_BuildString (Txt_Increase_level_of_X,
StrItemIndex));
Str_FreeStrings ();
}
@@ -815,7 +815,7 @@ static void Prg_PutFormsToRemEditOneItem (unsigned NumItem,
Lay_PutContextualLinkOnlyIcon (ActRgtPrgItm,"prg_highlighted",
Prg_PutParams,&Item->Hierarchy.ItmCod,
"arrow-right.svg",
- Str_BuildStringStr (Txt_Decrease_level_of_X,
+ Str_BuildString (Txt_Decrease_level_of_X,
StrItemIndex));
Str_FreeStrings ();
}
diff --git a/swad_project.c b/swad_project.c
index de5e20b9..7da87df1 100644
--- a/swad_project.c
+++ b/swad_project.c
@@ -1003,7 +1003,7 @@ static void Prj_ShowProjectsHead (struct Prj_Projects *Projects,
static void Prj_ShowTableAllProjectsHead (void)
{
- extern const char *The_ClassDatN[The_NUM_THEMES];
+ extern const char *The_ClassDatStrong[The_NUM_THEMES];
extern const char *Txt_PROJECT_ORDER[Prj_NUM_ORDERS];
extern const char *Txt_Assigned_QUESTION;
extern const char *Txt_Number_of_students;
@@ -1015,7 +1015,7 @@ static void Prj_ShowTableAllProjectsHead (void)
extern const char *Txt_URL;
Prj_Order_t Order;
unsigned NumRoleToShow;
- const char *Class = Str_BuildStringStr ("LT %s",The_ClassDatN[Gbl.Prefs.Theme]);
+ const char *Class = Str_BuildString ("LT %s",The_ClassDatStrong[Gbl.Prefs.Theme]);
HTM_TR_Begin (NULL);
@@ -1219,6 +1219,7 @@ static void Prj_ShowOneProject (struct Prj_Projects *Projects,
Prj_ProjectView_t ProjectView)
{
extern const char *The_ClassDat[The_NUM_THEMES];
+ extern const char *The_ClassDatLight[The_NUM_THEMES];
extern const char *Txt_Project_files;
extern const char *Txt_Assigned_QUESTION;
extern const char *Txt_Yes;
@@ -1253,7 +1254,7 @@ static void Prj_ShowOneProject (struct Prj_Projects *Projects,
"ASG_TITLE";
ClassLink = (Prj->Hidden == Prj_HIDDEN) ? "BT_LINK LT ASG_TITLE_LIGHT" :
"BT_LINK LT ASG_TITLE";
- ClassData = (Prj->Hidden == Prj_HIDDEN) ? "DAT_LIGHT" :
+ ClassData = (Prj->Hidden == Prj_HIDDEN) ? The_ClassDatLight[Gbl.Prefs.Theme] :
The_ClassDat[Gbl.Prefs.Theme];
/***** Set anchor string *****/
@@ -1657,6 +1658,7 @@ static void Prj_PutIconToToggleProject (unsigned UniqueId,
static void Prj_ShowTableAllProjectsOneRow (struct Prj_Project *Prj)
{
extern const char *The_ClassDat[The_NUM_THEMES];
+ extern const char *The_ClassDatLight[The_NUM_THEMES];
extern const char *Txt_Yes;
extern const char *Txt_No;
extern const char *Txt_PROJECT_STATUS[Prj_NUM_PROPOSAL_TYPES];
@@ -1672,7 +1674,7 @@ static void Prj_ShowTableAllProjectsOneRow (struct Prj_Project *Prj)
/***** Set CSS classes *****/
ClassDate = (Prj->Hidden == Prj_HIDDEN) ? "DATE_BLUE_LIGHT" :
"DATE_BLUE";
- ClassData = (Prj->Hidden == Prj_HIDDEN) ? "DAT_LIGHT" :
+ ClassData = (Prj->Hidden == Prj_HIDDEN) ? The_ClassDatLight[Gbl.Prefs.Theme] :
The_ClassDat[Gbl.Prefs.Theme];
/***** Begin row *****/
@@ -1761,12 +1763,13 @@ static void Prj_ShowOneProjectDepartment (const struct Prj_Project *Prj,
Prj_ProjectView_t ProjectView)
{
extern const char *The_ClassDat[The_NUM_THEMES];
+ extern const char *The_ClassDatLight[The_NUM_THEMES];
struct Dpt_Department Dpt;
bool PutLink;
const char *ClassData;
/***** Set CSS classes *****/
- ClassData = (Prj->Hidden == Prj_HIDDEN) ? "DAT_LIGHT" :
+ ClassData = (Prj->Hidden == Prj_HIDDEN) ? The_ClassDatLight[Gbl.Prefs.Theme] :
The_ClassDat[Gbl.Prefs.Theme];
/***** Get data of department *****/
@@ -1800,11 +1803,12 @@ static void Prj_ShowOneProjectDepartment (const struct Prj_Project *Prj,
static void Prj_ShowTableAllProjectsDepartment (const struct Prj_Project *Prj)
{
extern const char *The_ClassDat[The_NUM_THEMES];
+ extern const char *The_ClassDatLight[The_NUM_THEMES];
struct Dpt_Department Dpt;
const char *ClassData;
/***** Set CSS classes *****/
- ClassData = (Prj->Hidden == Prj_HIDDEN) ? "DAT_LIGHT" :
+ ClassData = (Prj->Hidden == Prj_HIDDEN) ? The_ClassDatLight[Gbl.Prefs.Theme] :
The_ClassDat[Gbl.Prefs.Theme];
/***** Get data of department *****/
@@ -1828,13 +1832,14 @@ static void Prj_ShowOneProjectTxtField (struct Prj_Project *Prj,
bool Warning)
{
extern const char *The_ClassDat[The_NUM_THEMES];
+ extern const char *The_ClassDatLight[The_NUM_THEMES];
const char *ClassLabel;
const char *ClassData;
/***** Set CSS classes *****/
ClassLabel = (Prj->Hidden == Prj_HIDDEN) ? "ASG_LABEL_LIGHT" :
"ASG_LABEL";
- ClassData = (Prj->Hidden == Prj_HIDDEN) ? "DAT_LIGHT" :
+ ClassData = (Prj->Hidden == Prj_HIDDEN) ? The_ClassDatLight[Gbl.Prefs.Theme] :
The_ClassDat[Gbl.Prefs.Theme];
/***** Label *****/
@@ -1897,10 +1902,11 @@ static void Prj_ShowTableAllProjectsTxtField (struct Prj_Project *Prj,
char *TxtField)
{
extern const char *The_ClassDat[The_NUM_THEMES];
+ extern const char *The_ClassDatLight[The_NUM_THEMES];
const char *ClassData;
/***** Set CSS classes *****/
- ClassData = (Prj->Hidden == Prj_HIDDEN) ? "DAT_LIGHT" :
+ ClassData = (Prj->Hidden == Prj_HIDDEN) ? The_ClassDatLight[Gbl.Prefs.Theme] :
The_ClassDat[Gbl.Prefs.Theme];
/***** Change format *****/
@@ -1922,6 +1928,7 @@ static void Prj_ShowOneProjectURL (const struct Prj_Project *Prj,
const char *id,unsigned UniqueId)
{
extern const char *The_ClassDat[The_NUM_THEMES];
+ extern const char *The_ClassDatLight[The_NUM_THEMES];
extern const char *Txt_URL;
const char *ClassLabel;
const char *ClassData;
@@ -1932,7 +1939,7 @@ static void Prj_ShowOneProjectURL (const struct Prj_Project *Prj,
/***** Set CSS classes *****/
ClassLabel = (Prj->Hidden == Prj_HIDDEN) ? "ASG_LABEL_LIGHT" :
"ASG_LABEL";
- ClassData = (Prj->Hidden == Prj_HIDDEN) ? "DAT_LIGHT" :
+ ClassData = (Prj->Hidden == Prj_HIDDEN) ? The_ClassDatLight[Gbl.Prefs.Theme] :
The_ClassDat[Gbl.Prefs.Theme];
/***** Write row with label and text *****/
@@ -1982,10 +1989,11 @@ static void Prj_ShowOneProjectURL (const struct Prj_Project *Prj,
static void Prj_ShowTableAllProjectsURL (const struct Prj_Project *Prj)
{
extern const char *The_ClassDat[The_NUM_THEMES];
+ extern const char *The_ClassDatLight[The_NUM_THEMES];
const char *ClassData;
/***** Set CSS classes *****/
- ClassData = (Prj->Hidden == Prj_HIDDEN) ? "DAT_LIGHT" :
+ ClassData = (Prj->Hidden == Prj_HIDDEN) ? The_ClassDatLight[Gbl.Prefs.Theme] :
The_ClassDat[Gbl.Prefs.Theme];
/***** Show URL *****/
@@ -2022,6 +2030,7 @@ static void Prj_ShowOneProjectMembersWithARole (struct Prj_Projects *Projects,
Prj_RoleInProject_t RoleInPrj)
{
extern const char *The_ClassDat[The_NUM_THEMES];
+ extern const char *The_ClassDatLight[The_NUM_THEMES];
extern const char *Txt_PROJECT_ROLES_SINGUL_Abc[Prj_NUM_ROLES_IN_PROJECT];
extern const char *Txt_PROJECT_ROLES_PLURAL_Abc[Prj_NUM_ROLES_IN_PROJECT];
extern const char *Txt_Remove;
@@ -2059,7 +2068,7 @@ static void Prj_ShowOneProjectMembersWithARole (struct Prj_Projects *Projects,
/***** Set CSS classes *****/
ClassLabel = (Prj->Hidden == Prj_HIDDEN) ? "ASG_LABEL_LIGHT" :
"ASG_LABEL";
- ClassData = (Prj->Hidden == Prj_HIDDEN) ? "DAT_LIGHT" :
+ ClassData = (Prj->Hidden == Prj_HIDDEN) ? The_ClassDatLight[Gbl.Prefs.Theme] :
The_ClassDat[Gbl.Prefs.Theme];
/***** Get users in project from database *****/
@@ -2173,7 +2182,7 @@ static void Prj_ShowOneProjectMembersWithARole (struct Prj_Projects *Projects,
Projects->PrjCod = Prj->PrjCod; // Used to pass project code as a parameter
Ico_PutContextualIconToAdd (ActionReqAddUsr[RoleInPrj],NULL,
Prj_PutCurrentParams,Projects,
- Str_BuildStringStr (Txt_Add_USERS,
+ Str_BuildString (Txt_Add_USERS,
Txt_PROJECT_ROLES_PLURAL_abc[RoleInPrj]));
Str_FreeStrings ();
HTM_TD_End ();
@@ -2206,6 +2215,7 @@ static void Prj_ShowTableAllProjectsMembersWithARole (const struct Prj_Project *
Prj_RoleInProject_t RoleInPrj)
{
extern const char *The_ClassDat[The_NUM_THEMES];
+ extern const char *The_ClassDatLight[The_NUM_THEMES];
MYSQL_RES *mysql_res;
MYSQL_ROW row;
unsigned NumUsr;
@@ -2213,7 +2223,7 @@ static void Prj_ShowTableAllProjectsMembersWithARole (const struct Prj_Project *
const char *ClassData;
/***** Set CSS classes *****/
- ClassData = (Prj->Hidden == Prj_HIDDEN) ? "DAT_LIGHT" :
+ ClassData = (Prj->Hidden == Prj_HIDDEN) ? The_ClassDatLight[Gbl.Prefs.Theme] :
The_ClassDat[Gbl.Prefs.Theme];
/***** Get users in project from database *****/
@@ -2586,7 +2596,7 @@ static void Prj_ReqRemUsrFromPrj (struct Prj_Projects *Projects,
Frm_BeginForm (ActionRemUsr[RoleInPrj]);
Projects->PrjCod = Prj.PrjCod;
Prj_PutCurrentParams (Projects);
- Btn_PutRemoveButton (Str_BuildStringStr (Txt_Remove_USER_from_this_project,
+ Btn_PutRemoveButton (Str_BuildString (Txt_Remove_USER_from_this_project,
Txt_PROJECT_ROLES_SINGUL_abc[RoleInPrj][Gbl.Usrs.Other.UsrDat.Sex]));
Str_FreeStrings ();
Frm_EndForm ();
diff --git a/swad_question.c b/swad_question.c
index e61d93c6..cf5fc5f3 100644
--- a/swad_question.c
+++ b/swad_question.c
@@ -518,6 +518,7 @@ void Qst_ListQuestionForEdition (struct Qst_Question *Question,
unsigned QstInd,bool QuestionExists,
const char *Anchor)
{
+ extern const char *The_ClassDatLight[The_NUM_THEMES];
extern const char *Txt_Question_removed;
/***** Number of question and answer type (row[1]) *****/
@@ -560,7 +561,7 @@ void Qst_ListQuestionForEdition (struct Qst_Question *Question,
}
else
{
- HTM_SPAN_Begin ("class=\"DAT_LIGHT\"");
+ HTM_SPAN_Begin ("class=\"%s\"",The_ClassDatLight[Gbl.Prefs.Theme]);
HTM_Txt (Txt_Question_removed);
HTM_SPAN_End ();
}
@@ -1858,7 +1859,7 @@ void Qst_PutFormEditOneQst (struct Qst_Question *Question)
/***** Begin box *****/
if (Question->QstCod > 0) // The question already has assigned a code
{
- Box_BoxBegin (NULL,Str_BuildStringLong (Txt_Question_code_X,Question->QstCod),
+ Box_BoxBegin (NULL,Str_BuildString (Txt_Question_code_X,Question->QstCod),
Qst_PutIconToRemoveOneQst,&Question->QstCod,
Hlp_ASSESSMENT_Questions_writing_a_question,Box_NOT_CLOSABLE);
Str_FreeStrings ();
diff --git a/swad_record.c b/swad_record.c
index 1d2f4e4e..2ad389b9 100644
--- a/swad_record.c
+++ b/swad_record.c
@@ -1565,7 +1565,7 @@ static void Rec_ShowCrsRecord (Rec_CourseRecordViewType_t TypeOfView,
struct UsrData *UsrDat,const char *Anchor)
{
extern const char *Hlp_USERS_Students_course_record_card;
- extern const char *The_ClassDatN[The_NUM_THEMES];
+ extern const char *The_ClassDatStrong[The_NUM_THEMES];
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *Txt_RECORD_FIELD_VISIBILITY_RECORD[Rec_NUM_TYPES_VISIBILITY];
extern const char *Txt_Save_changes;
@@ -1735,7 +1735,7 @@ static void Rec_ShowCrsRecord (Rec_CourseRecordViewType_t TypeOfView,
/* Write form, text, or nothing depending on
the user's role and the visibility of the field */
HTM_TD_Begin ("class=\"REC_C2_BOT LT %s COLOR%u\"",
- The_ClassDatN[Gbl.Prefs.Theme],Gbl.RowEvenOdd);
+ The_ClassDatStrong[Gbl.Prefs.Theme],Gbl.RowEvenOdd);
if (ICanEditThisField) // Show with form
{
HTM_TEXTAREA_Begin ("name=\"Field%ld\" rows=\"%u\""
@@ -2683,14 +2683,14 @@ static void Rec_ShowNickname (struct UsrData *UsrDat,bool PutFormLinks)
static void Rec_ShowCountryInHead (struct UsrData *UsrDat,bool ShowData)
{
- extern const char *The_ClassDatN[The_NUM_THEMES];
+ extern const char *The_ClassDatStrong[The_NUM_THEMES];
- HTM_TD_Begin ("class=\"REC_C2_MID LT %s\"",The_ClassDatN[Gbl.Prefs.Theme]);
+ HTM_TD_Begin ("class=\"REC_C2_MID LT %s\"",The_ClassDatStrong[Gbl.Prefs.Theme]);
if (ShowData && UsrDat->CtyCod > 0)
{
/* Link to see country information */
Cty_WriteCountryName (UsrDat->CtyCod,
- Str_BuildStringStr ("BT_LINK %s",The_ClassDatN[Gbl.Prefs.Theme])); // Put link to country
+ Str_BuildString ("BT_LINK %s",The_ClassDatStrong[Gbl.Prefs.Theme])); // Put link to country
Str_FreeStrings ();
}
HTM_TD_End ();
@@ -2715,7 +2715,7 @@ static void Rec_ShowWebsAndSocialNets (struct UsrData *UsrDat,
static void Rec_ShowEmail (struct UsrData *UsrDat)
{
- extern const char *The_ClassDatN[The_NUM_THEMES];
+ extern const char *The_ClassDatStrong[The_NUM_THEMES];
extern const char *Txt_Email;
/***** Email *****/
@@ -2725,14 +2725,14 @@ static void Rec_ShowEmail (struct UsrData *UsrDat)
Frm_LabelColumn ("REC_C1_BOT RM",NULL,Txt_Email);
/* Data */
- HTM_TD_Begin ("class=\"REC_C2_BOT LM %s\"",The_ClassDatN[Gbl.Prefs.Theme]);
+ HTM_TD_Begin ("class=\"REC_C2_BOT LM %s\"",The_ClassDatStrong[Gbl.Prefs.Theme]);
if (UsrDat->Email[0])
{
HTM_DIV_Begin ("class=\"REC_EMAIL\""); // Limited width
if (Mai_ICanSeeOtherUsrEmail (UsrDat))
{
HTM_A_Begin ("href=\"mailto:%s\" class=\"%s\"",
- UsrDat->Email,The_ClassDatN[Gbl.Prefs.Theme]);
+ UsrDat->Email,The_ClassDatStrong[Gbl.Prefs.Theme]);
HTM_Txt (UsrDat->Email);
HTM_A_End ();
}
@@ -2751,7 +2751,7 @@ static void Rec_ShowEmail (struct UsrData *UsrDat)
static void Rec_ShowUsrIDs (struct UsrData *UsrDat,const char *Anchor)
{
- extern const char *The_ClassDatN[The_NUM_THEMES];
+ extern const char *The_ClassDatStrong[The_NUM_THEMES];
extern const char *Txt_ID;
/***** User's IDs *****/
@@ -2761,7 +2761,7 @@ static void Rec_ShowUsrIDs (struct UsrData *UsrDat,const char *Anchor)
Frm_LabelColumn ("REC_C1_BOT RT",NULL,Txt_ID);
/* Data */
- HTM_TD_Begin ("class=\"REC_C2_BOT LT %s\"",The_ClassDatN[Gbl.Prefs.Theme]);
+ HTM_TD_Begin ("class=\"REC_C2_BOT LT %s\"",The_ClassDatStrong[Gbl.Prefs.Theme]);
ID_WriteUsrIDs (UsrDat,Anchor);
HTM_TD_End ();
@@ -2776,7 +2776,7 @@ static void Rec_ShowRole (struct UsrData *UsrDat,
Rec_SharedRecordViewType_t TypeOfView)
{
extern const char *Usr_StringsSexIcons[Usr_NUM_SEXS];
- extern const char *The_ClassDatN[The_NUM_THEMES];
+ extern const char *The_ClassDatStrong[The_NUM_THEMES];
extern const char *Txt_Role;
extern const char *Txt_Sex;
extern const char *Txt_SEX_SINGULAR_Abc[Usr_NUM_SEXS];
@@ -2802,7 +2802,7 @@ static void Rec_ShowRole (struct UsrData *UsrDat,
Frm_LabelColumn ("REC_C1_BOT RM","Role",Txt_Role);
/* Data */
- HTM_TD_Begin ("class=\"REC_C2_BOT LM %s\"",The_ClassDatN[Gbl.Prefs.Theme]);
+ HTM_TD_Begin ("class=\"REC_C2_BOT LM %s\"",The_ClassDatStrong[Gbl.Prefs.Theme]);
switch (TypeOfView)
{
case Rec_SHA_SIGN_UP_IN_CRS_FORM: // I want to apply for enrolment
@@ -2997,7 +2997,7 @@ static void Rec_ShowRole (struct UsrData *UsrDat,
/***** Form to select a sex *****/
/* Label */
Frm_LabelColumn ("REC_C1_BOT RM","",
- Str_BuildStringStr ("%s*",Txt_Sex));
+ Str_BuildString ("%s*",Txt_Sex));
Str_FreeStrings ();
/* Data */
@@ -3006,7 +3006,7 @@ static void Rec_ShowRole (struct UsrData *UsrDat,
Sex <= Usr_SEX_MALE;
Sex++)
{
- HTM_LABEL_Begin ("class=\"%s\"",The_ClassDatN[Gbl.Prefs.Theme]);
+ HTM_LABEL_Begin ("class=\"%s\"",The_ClassDatStrong[Gbl.Prefs.Theme]);
HTM_INPUT_RADIO ("Sex",false,
"value=\"%u\"%s required=\"required\"",
(unsigned) Sex,
@@ -3023,7 +3023,7 @@ static void Rec_ShowRole (struct UsrData *UsrDat,
Frm_LabelColumn ("REC_C1_BOT RM",NULL,Txt_Role);
/* Data */
- HTM_TD_Begin ("class=\"REC_C2_BOT LM %s\"",The_ClassDatN[Gbl.Prefs.Theme]);
+ HTM_TD_Begin ("class=\"REC_C2_BOT LM %s\"",The_ClassDatStrong[Gbl.Prefs.Theme]);
HTM_Txt (Txt_ROLES_SINGUL_Abc[UsrDat->Roles.InCurrentCrs][UsrDat->Sex]);
HTM_TD_End ();
}
@@ -3037,7 +3037,7 @@ static void Rec_ShowRole (struct UsrData *UsrDat,
static void Rec_ShowSurname1 (struct UsrData *UsrDat,bool PutForm)
{
- extern const char *The_ClassDatN[The_NUM_THEMES];
+ extern const char *The_ClassDatStrong[The_NUM_THEMES];
extern const char *Txt_Surname_1;
HTM_TR_Begin (NULL);
@@ -3046,14 +3046,14 @@ static void Rec_ShowSurname1 (struct UsrData *UsrDat,bool PutForm)
if (PutForm)
{
Frm_LabelColumn ("REC_C1_BOT RM","Surname1",
- Str_BuildStringStr ("%s*",Txt_Surname_1));
+ Str_BuildString ("%s*",Txt_Surname_1));
Str_FreeStrings ();
}
else
Frm_LabelColumn ("REC_C1_BOT RM",NULL,Txt_Surname_1);
/* Data */
- HTM_TD_Begin ("class=\"REC_C2_BOT LM %s\"",The_ClassDatN[Gbl.Prefs.Theme]);
+ HTM_TD_Begin ("class=\"REC_C2_BOT LM %s\"",The_ClassDatStrong[Gbl.Prefs.Theme]);
if (PutForm)
HTM_INPUT_TEXT ("Surname1",Usr_MAX_CHARS_FIRSTNAME_OR_SURNAME,UsrDat->Surname1,
HTM_DONT_SUBMIT_ON_CHANGE,
@@ -3076,7 +3076,7 @@ static void Rec_ShowSurname1 (struct UsrData *UsrDat,bool PutForm)
static void Rec_ShowSurname2 (struct UsrData *UsrDat,bool PutForm)
{
- extern const char *The_ClassDatN[The_NUM_THEMES];
+ extern const char *The_ClassDatStrong[The_NUM_THEMES];
extern const char *Txt_Surname_2;
HTM_TR_Begin (NULL);
@@ -3087,7 +3087,7 @@ static void Rec_ShowSurname2 (struct UsrData *UsrDat,bool PutForm)
Txt_Surname_2);
/* Data */
- HTM_TD_Begin ("class=\"REC_C2_BOT LM %s\"",The_ClassDatN[Gbl.Prefs.Theme]);
+ HTM_TD_Begin ("class=\"REC_C2_BOT LM %s\"",The_ClassDatStrong[Gbl.Prefs.Theme]);
if (PutForm)
HTM_INPUT_TEXT ("Surname2",Usr_MAX_CHARS_FIRSTNAME_OR_SURNAME,
UsrDat->Surname2,
@@ -3110,7 +3110,7 @@ static void Rec_ShowSurname2 (struct UsrData *UsrDat,bool PutForm)
static void Rec_ShowFirstName (struct UsrData *UsrDat,bool PutForm)
{
- extern const char *The_ClassDatN[The_NUM_THEMES];
+ extern const char *The_ClassDatStrong[The_NUM_THEMES];
extern const char *Txt_First_name;
HTM_TR_Begin (NULL);
@@ -3119,7 +3119,7 @@ static void Rec_ShowFirstName (struct UsrData *UsrDat,bool PutForm)
if (PutForm)
{
Frm_LabelColumn ("REC_C1_BOT RM","FirstName",
- Str_BuildStringStr ("%s*",Txt_First_name));
+ Str_BuildString ("%s*",Txt_First_name));
Str_FreeStrings ();
}
else
@@ -3127,7 +3127,7 @@ static void Rec_ShowFirstName (struct UsrData *UsrDat,bool PutForm)
/* Data */
HTM_TD_Begin ("colspan=\"2\" class=\"REC_C2_BOT LM %s\"",
- The_ClassDatN[Gbl.Prefs.Theme]);
+ The_ClassDatStrong[Gbl.Prefs.Theme]);
if (PutForm)
HTM_INPUT_TEXT ("FirstName",Usr_MAX_CHARS_FIRSTNAME_OR_SURNAME,
UsrDat->FrstName,
@@ -3165,7 +3165,7 @@ static void Rec_ShowCountry (struct UsrData *UsrDat,bool PutForm)
if (PutForm)
{
Frm_LabelColumn ("REC_C1_BOT RM","OthCtyCod",
- Str_BuildStringStr ("%s*",Txt_Country));
+ Str_BuildString ("%s*",Txt_Country));
Str_FreeStrings ();
}
else
@@ -3200,7 +3200,7 @@ static void Rec_ShowCountry (struct UsrData *UsrDat,bool PutForm)
static void Rec_ShowDateOfBirth (struct UsrData *UsrDat,bool ShowData,bool PutForm)
{
- extern const char *The_ClassDatN[The_NUM_THEMES];
+ extern const char *The_ClassDatStrong[The_NUM_THEMES];
extern const char *Txt_Date_of_birth;
/***** Date of birth *****/
@@ -3212,7 +3212,7 @@ static void Rec_ShowDateOfBirth (struct UsrData *UsrDat,bool ShowData,bool PutFo
Txt_Date_of_birth);
/* Data */
- HTM_TD_Begin ("class=\"REC_C2_BOT LM %s\"",The_ClassDatN[Gbl.Prefs.Theme]);
+ HTM_TD_Begin ("class=\"REC_C2_BOT LM %s\"",The_ClassDatStrong[Gbl.Prefs.Theme]);
if (ShowData)
{
if (PutForm)
@@ -3237,7 +3237,7 @@ static void Rec_ShowDateOfBirth (struct UsrData *UsrDat,bool ShowData,bool PutFo
static void Rec_ShowPhone (struct UsrData *UsrDat,bool ShowData,bool PutForm,
unsigned NumPhone)
{
- extern const char *The_ClassDatN[The_NUM_THEMES];
+ extern const char *The_ClassDatStrong[The_NUM_THEMES];
extern const char *Txt_Phone;
char *Name;
char *Label;
@@ -3259,7 +3259,7 @@ static void Rec_ShowPhone (struct UsrData *UsrDat,bool ShowData,bool PutForm,
Label);
/* Data */
- HTM_TD_Begin ("class=\"REC_C2_BOT LM %s\"",The_ClassDatN[Gbl.Prefs.Theme]);
+ HTM_TD_Begin ("class=\"REC_C2_BOT LM %s\"",The_ClassDatStrong[Gbl.Prefs.Theme]);
if (ShowData)
{
if (PutForm)
@@ -3269,7 +3269,7 @@ static void Rec_ShowPhone (struct UsrData *UsrDat,bool ShowData,bool PutForm,
else if (UsrDat->Phone[NumPhone][0])
{
HTM_A_Begin ("href=\"tel:%s\" class=\"%s\"",
- UsrDat->Phone[NumPhone],The_ClassDatN[Gbl.Prefs.Theme]);
+ UsrDat->Phone[NumPhone],The_ClassDatStrong[Gbl.Prefs.Theme]);
HTM_Txt (UsrDat->Phone[NumPhone]);
HTM_A_End ();
}
@@ -3291,7 +3291,7 @@ static void Rec_ShowPhone (struct UsrData *UsrDat,bool ShowData,bool PutForm,
static void Rec_ShowComments (struct UsrData *UsrDat,bool ShowData,bool PutForm)
{
- extern const char *The_ClassDatN[The_NUM_THEMES];
+ extern const char *The_ClassDatStrong[The_NUM_THEMES];
extern const char *Txt_USER_comments;
/***** Comments *****/
@@ -3303,7 +3303,7 @@ static void Rec_ShowComments (struct UsrData *UsrDat,bool ShowData,bool PutForm)
Txt_USER_comments);
/* Data */
- HTM_TD_Begin ("class=\"REC_C2_BOT LT %s\"",The_ClassDatN[Gbl.Prefs.Theme]);
+ HTM_TD_Begin ("class=\"REC_C2_BOT LT %s\"",The_ClassDatStrong[Gbl.Prefs.Theme]);
if (ShowData)
{
if (PutForm)
@@ -3354,7 +3354,7 @@ static void Rec_ShowTeacherRows (struct UsrData *UsrDat,struct Ins_Instit *Ins,
static void Rec_ShowInstitution (struct Ins_Instit *Ins,bool ShowData)
{
- extern const char *The_ClassDatN[The_NUM_THEMES];
+ extern const char *The_ClassDatStrong[The_NUM_THEMES];
extern const char *Txt_Institution;
/***** Institution *****/
@@ -3364,13 +3364,13 @@ static void Rec_ShowInstitution (struct Ins_Instit *Ins,bool ShowData)
Frm_LabelColumn ("REC_C1_BOT RT",NULL,Txt_Institution);
/* Data */
- HTM_TD_Begin ("class=\"REC_C2_BOT LT %s\"",The_ClassDatN[Gbl.Prefs.Theme]);
+ HTM_TD_Begin ("class=\"REC_C2_BOT LT %s\"",The_ClassDatStrong[Gbl.Prefs.Theme]);
if (ShowData)
if (Ins->InsCod > 0)
{
if (Ins->WWW[0])
HTM_A_Begin ("href=\"%s\" target=\"_blank\" class=\"%s\"",
- Ins->WWW,The_ClassDatN[Gbl.Prefs.Theme]);
+ Ins->WWW,The_ClassDatStrong[Gbl.Prefs.Theme]);
HTM_Txt (Ins->FullName);
if (Ins->WWW[0])
HTM_A_End ();
@@ -3386,7 +3386,7 @@ static void Rec_ShowInstitution (struct Ins_Instit *Ins,bool ShowData)
static void Rec_ShowCenter (struct UsrData *UsrDat,bool ShowData)
{
- extern const char *The_ClassDatN[The_NUM_THEMES];
+ extern const char *The_ClassDatStrong[The_NUM_THEMES];
extern const char *Txt_Center;
struct Ctr_Center Ctr;
@@ -3397,7 +3397,7 @@ static void Rec_ShowCenter (struct UsrData *UsrDat,bool ShowData)
Frm_LabelColumn ("REC_C1_BOT RT",NULL,Txt_Center);
/* Data */
- HTM_TD_Begin ("class=\"REC_C2_BOT LT %s\"",The_ClassDatN[Gbl.Prefs.Theme]);
+ HTM_TD_Begin ("class=\"REC_C2_BOT LT %s\"",The_ClassDatStrong[Gbl.Prefs.Theme]);
if (ShowData)
{
if (UsrDat->Tch.CtrCod > 0)
@@ -3406,7 +3406,7 @@ static void Rec_ShowCenter (struct UsrData *UsrDat,bool ShowData)
Ctr_GetDataOfCenterByCod (&Ctr);
if (Ctr.WWW[0])
HTM_A_Begin ("href=\"%s\" target=\"_blank\" class=\"%s\"",
- Ctr.WWW,The_ClassDatN[Gbl.Prefs.Theme]);
+ Ctr.WWW,The_ClassDatStrong[Gbl.Prefs.Theme]);
HTM_Txt (Ctr.FullName);
if (Ctr.WWW[0])
HTM_A_End ();
@@ -3423,7 +3423,7 @@ static void Rec_ShowCenter (struct UsrData *UsrDat,bool ShowData)
static void Rec_ShowDepartment (struct UsrData *UsrDat,bool ShowData)
{
- extern const char *The_ClassDatN[The_NUM_THEMES];
+ extern const char *The_ClassDatStrong[The_NUM_THEMES];
extern const char *Txt_Department;
struct Dpt_Department Dpt;
@@ -3434,7 +3434,7 @@ static void Rec_ShowDepartment (struct UsrData *UsrDat,bool ShowData)
Frm_LabelColumn ("REC_C1_BOT RT",NULL,Txt_Department);
/* Data */
- HTM_TD_Begin ("class=\"REC_C2_BOT LT %s\"",The_ClassDatN[Gbl.Prefs.Theme]);
+ HTM_TD_Begin ("class=\"REC_C2_BOT LT %s\"",The_ClassDatStrong[Gbl.Prefs.Theme]);
if (ShowData)
{
if (UsrDat->Tch.DptCod > 0)
@@ -3443,7 +3443,7 @@ static void Rec_ShowDepartment (struct UsrData *UsrDat,bool ShowData)
Dpt_GetDataOfDepartmentByCod (&Dpt);
if (Dpt.WWW[0])
HTM_A_Begin ("href=\"%s\" target=\"_blank\" class=\"%s\"",
- Dpt.WWW,The_ClassDatN[Gbl.Prefs.Theme]);
+ Dpt.WWW,The_ClassDatStrong[Gbl.Prefs.Theme]);
HTM_Txt (Dpt.FullName);
if (Dpt.WWW[0])
HTM_A_End ();
@@ -3460,7 +3460,7 @@ static void Rec_ShowDepartment (struct UsrData *UsrDat,bool ShowData)
static void Rec_ShowOffice (struct UsrData *UsrDat,bool ShowData)
{
- extern const char *The_ClassDatN[The_NUM_THEMES];
+ extern const char *The_ClassDatStrong[The_NUM_THEMES];
extern const char *Txt_Office;
/***** Office *****/
@@ -3470,7 +3470,7 @@ static void Rec_ShowOffice (struct UsrData *UsrDat,bool ShowData)
Frm_LabelColumn ("REC_C1_BOT RT",NULL,Txt_Office);
/* Data */
- HTM_TD_Begin ("class=\"REC_C2_BOT LT %s\"",The_ClassDatN[Gbl.Prefs.Theme]);
+ HTM_TD_Begin ("class=\"REC_C2_BOT LT %s\"",The_ClassDatStrong[Gbl.Prefs.Theme]);
if (ShowData)
HTM_Txt (UsrDat->Tch.Office);
HTM_TD_End ();
@@ -3484,7 +3484,7 @@ static void Rec_ShowOffice (struct UsrData *UsrDat,bool ShowData)
static void Rec_ShowOfficePhone (struct UsrData *UsrDat,bool ShowData)
{
- extern const char *The_ClassDatN[The_NUM_THEMES];
+ extern const char *The_ClassDatStrong[The_NUM_THEMES];
extern const char *Txt_Phone;
/***** Office phone *****/
@@ -3494,11 +3494,11 @@ static void Rec_ShowOfficePhone (struct UsrData *UsrDat,bool ShowData)
Frm_LabelColumn ("REC_C1_BOT RM",NULL,Txt_Phone);
/* Data */
- HTM_TD_Begin ("class=\"REC_C2_BOT LM %s\"",The_ClassDatN[Gbl.Prefs.Theme]);
+ HTM_TD_Begin ("class=\"REC_C2_BOT LM %s\"",The_ClassDatStrong[Gbl.Prefs.Theme]);
if (ShowData)
{
HTM_A_Begin ("href=\"tel:%s\" class=\"%s\"",
- UsrDat->Tch.OfficePhone,The_ClassDatN[Gbl.Prefs.Theme]);
+ UsrDat->Tch.OfficePhone,The_ClassDatStrong[Gbl.Prefs.Theme]);
HTM_Txt (UsrDat->Tch.OfficePhone);
HTM_A_End ();
}
@@ -3774,7 +3774,7 @@ static void Rec_ShowFormMyInsCtrDpt (bool IAmATeacher)
/* Label */
Frm_LabelColumn ("REC_C1_BOT RM","InsCtyCod",
- Str_BuildStringStr ("%s*",Txt_Country));
+ Str_BuildString ("%s*",Txt_Country));
Str_FreeStrings ();
/* Data */
@@ -3806,7 +3806,7 @@ static void Rec_ShowFormMyInsCtrDpt (bool IAmATeacher)
/* Label */
Frm_LabelColumn ("REC_C1_BOT RM","OthInsCod",
- Str_BuildStringStr ("%s*",Txt_Institution));
+ Str_BuildString ("%s*",Txt_Institution));
Str_FreeStrings ();
/* Data */
@@ -3847,7 +3847,7 @@ static void Rec_ShowFormMyInsCtrDpt (bool IAmATeacher)
/* Label */
Frm_LabelColumn ("REC_C1_BOT RM","OthCtrCod",
- Str_BuildStringStr ("%s*",Txt_Center));
+ Str_BuildString ("%s*",Txt_Center));
Str_FreeStrings ();
/* Data */
@@ -3886,7 +3886,7 @@ static void Rec_ShowFormMyInsCtrDpt (bool IAmATeacher)
/* Label */
Frm_LabelColumn ("REC_C1_BOT RM",Dpt_PARAM_DPT_COD_NAME,
- Str_BuildStringStr ("%s*",Txt_Department));
+ Str_BuildString ("%s*",Txt_Department));
Str_FreeStrings ();
/* Data */
diff --git a/swad_report.c b/swad_report.c
index fa889fd7..d9e26f3b 100644
--- a/swad_report.c
+++ b/swad_report.c
@@ -124,7 +124,7 @@ void Rep_ReqMyUsageReport (void)
Frm_BeginForm (ActSeeMyUsgRep);
/***** Begin box *****/
- Box_BoxBegin (NULL,Str_BuildStringStr (Txt_Report_of_use_of_PLATFORM,
+ Box_BoxBegin (NULL,Str_BuildString (Txt_Report_of_use_of_PLATFORM,
Cfg_PLATFORM_SHORT_NAME),
NULL,NULL,
Hlp_ANALYTICS_Report,Box_NOT_CLOSABLE);
@@ -227,12 +227,13 @@ static void Rep_CreateMyUsageReport (struct Rep_Report *Report)
static void Rep_PutLinkToMyUsageReport (struct Rep_Report *Report)
{
extern const char *Hlp_ANALYTICS_Report;
+ extern const char *The_ClassDatLight[The_NUM_THEMES];
extern const char *Txt_Report_of_use_of_PLATFORM;
extern const char *Txt_Report;
extern const char *Txt_This_link_will_remain_active_as_long_as_your_user_s_account_exists;
/***** Begin box *****/
- Box_BoxBegin (NULL,Str_BuildStringStr (Txt_Report_of_use_of_PLATFORM,
+ Box_BoxBegin (NULL,Str_BuildString (Txt_Report_of_use_of_PLATFORM,
Cfg_PLATFORM_SHORT_NAME),
NULL,NULL,
Hlp_ANALYTICS_Report,Box_NOT_CLOSABLE);
@@ -252,7 +253,7 @@ static void Rep_PutLinkToMyUsageReport (struct Rep_Report *Report)
HTM_A_End ();
HTM_DIV_End ();
- HTM_DIV_Begin ("class=\"DAT_LIGHT\"");
+ HTM_DIV_Begin ("class=\"%s\"",The_ClassDatLight[Gbl.Prefs.Theme]);
HTM_Txt (Txt_This_link_will_remain_active_as_long_as_your_user_s_account_exists);
HTM_DIV_End ();
@@ -268,7 +269,7 @@ static void Rep_PutLinkToMyUsageReport (struct Rep_Report *Report)
static void Rep_TitleReport (struct Rep_CurrentTimeUTC *CurrentTimeUTC)
{
extern const char *The_ClassDat[The_NUM_THEMES];
- extern const char *The_ClassDatN[The_NUM_THEMES];
+ extern const char *The_ClassDatStrong[The_NUM_THEMES];
extern const char *Txt_User[Usr_NUM_SEXS];
extern const char *Txt_Date;
@@ -276,7 +277,7 @@ static void Rep_TitleReport (struct Rep_CurrentTimeUTC *CurrentTimeUTC)
/***** User *****/
HTM_TxtColonNBSP (Txt_User[Gbl.Usrs.Me.UsrDat.Sex]);
- HTM_SPAN_Begin ("class=\"DAT_N_BOLD\"");
+ HTM_SPAN_Begin ("class=\"%s BOLD\"",The_ClassDatStrong[Gbl.Prefs.Theme]);
HTM_Txt (Gbl.Usrs.Me.UsrDat.FullName);
HTM_SPAN_End ();
@@ -285,7 +286,7 @@ static void Rep_TitleReport (struct Rep_CurrentTimeUTC *CurrentTimeUTC)
{
HTM_BR ();
HTM_TxtColonNBSP (Txt_Date);
- HTM_SPAN_Begin ("class=\"%s\"",The_ClassDatN[Gbl.Prefs.Theme]);
+ HTM_SPAN_Begin ("class=\"%s\"",The_ClassDatStrong[Gbl.Prefs.Theme]);
HTM_TxtF ("%s %s UTC",CurrentTimeUTC->StrDate,
CurrentTimeUTC->StrTime);
HTM_SPAN_End ();
diff --git a/swad_statistic.c b/swad_statistic.c
index 8d4f62b3..6e23e97b 100644
--- a/swad_statistic.c
+++ b/swad_statistic.c
@@ -275,7 +275,7 @@ static void Sta_PutFormCrsHits (struct Sta_Stats *Stats)
Gbl.Usrs.LstUsrs[Rol_TCH].NumUsrs;
/***** Begin box *****/
- Box_BoxBegin (NULL,Str_BuildStringStr (Txt_Statistics_of_visits_to_the_course_X,
+ Box_BoxBegin (NULL,Str_BuildString (Txt_Statistics_of_visits_to_the_course_X,
Gbl.Hierarchy.Crs.ShrtName),
NULL,NULL,
Hlp_ANALYTICS_Visits_visits_to_course,Box_NOT_CLOSABLE);
@@ -1047,7 +1047,7 @@ 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_ClassDatN[The_NUM_THEMES];
+ extern const char *The_ClassDatStrong[The_NUM_THEMES];
extern const char *Txt_Show_previous_X_clicks;
extern const char *Txt_PAGES_Previous;
extern const char *Txt_Clicks;
@@ -1132,8 +1132,8 @@ static void Sta_ShowDetailedAccessesList (const struct Sta_Stats *Stats,
HTM_TD_Begin ("class=\"LM\"");
if (FirstRow > 1)
{
- HTM_BUTTON_SUBMIT_Begin (Str_BuildStringLong (Txt_Show_previous_X_clicks,
- (long) Stats->RowsPerPage),
+ HTM_BUTTON_SUBMIT_Begin (Str_BuildString (Txt_Show_previous_X_clicks,
+ Stats->RowsPerPage),
"BT_LINK TIT_TBL",NULL);
Str_FreeStrings ();
HTM_STRONG_Begin ();
@@ -1146,7 +1146,7 @@ static void Sta_ShowDetailedAccessesList (const struct Sta_Stats *Stats,
Frm_EndForm ();
/* Write number of current page */
- HTM_TD_Begin ("class=\"%s CM\"",The_ClassDatN[Gbl.Prefs.Theme]);
+ 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,
@@ -1170,8 +1170,8 @@ static void Sta_ShowDetailedAccessesList (const struct Sta_Stats *Stats,
HTM_TD_Begin ("class=\"RM\"");
if (LastRow < NumHits)
{
- HTM_BUTTON_SUBMIT_Begin (Str_BuildStringLong (Txt_Show_next_X_clicks,
- (long) Stats->RowsPerPage),
+ HTM_BUTTON_SUBMIT_Begin (Str_BuildString (Txt_Show_next_X_clicks,
+ Stats->RowsPerPage),
"BT_LINK TIT_TBL",NULL);
Str_FreeStrings ();
HTM_STRONG_Begin ();
diff --git a/swad_string.c b/swad_string.c
index 44e62286..2b3b630d 100644
--- a/swad_string.c
+++ b/swad_string.c
@@ -2667,7 +2667,7 @@ char *Str_BuildGoToMsg (const char *Where)
{
extern const char *Txt_Go_to_X;
- return Str_BuildStringStr (Txt_Go_to_X,Where);
+ return Str_BuildString (Txt_Go_to_X,Where);
}
/*****************************************************************************/
@@ -2686,58 +2686,33 @@ static struct
// Str_FreeStrings() must be called after calling these functions
-// fmt must be a string including "%s"
-char *Str_BuildStringStr (const char *fmt,const char *Str)
+char *Str_BuildString (const char *fmt,...)
{
- char *Ptr;
+ va_list ap;
+ int NumBytesPrinted;
+ char *Ptr = "";
- if (Str_Strings.Num >= Str_MAX_STRINGS)
- Err_NotEnoughMemoryExit ();
+ if (fmt)
+ {
+ if (fmt[0])
+ {
+ if (Str_Strings.Num >= Str_MAX_STRINGS)
+ Err_NotEnoughMemoryExit ();
- if (Str_Strings.Str[Str_Strings.Num] != NULL)
- Err_NotEnoughMemoryExit ();
+ if (Str_Strings.Str[Str_Strings.Num] != NULL)
+ Err_NotEnoughMemoryExit ();
- if (asprintf (&Str_Strings.Str[Str_Strings.Num],fmt,Str) < 0)
- Err_NotEnoughMemoryExit ();
- Ptr = Str_Strings.Str[Str_Strings.Num];
- Str_Strings.Num++;
+ va_start (ap,fmt);
+ NumBytesPrinted = vasprintf (&Str_Strings.Str[Str_Strings.Num],fmt,ap);
+ va_end (ap);
+ if (NumBytesPrinted < 0) // -1 if no memory or any other error
+ Err_NotEnoughMemoryExit ();
- return Ptr;
- }
+ Ptr = Str_Strings.Str[Str_Strings.Num];
-// fmt must be a string including "%ld"
-char *Str_BuildStringLong (const char *fmt,long Num)
- {
- char *Ptr;
-
- if (Str_Strings.Num >= Str_MAX_STRINGS)
- Err_NotEnoughMemoryExit ();
-
- if (Str_Strings.Str[Str_Strings.Num] != NULL)
- Err_NotEnoughMemoryExit ();
-
- if (asprintf (&Str_Strings.Str[Str_Strings.Num],fmt,Num) < 0)
- Err_NotEnoughMemoryExit ();
- Ptr = Str_Strings.Str[Str_Strings.Num];
- Str_Strings.Num++;
-
- return Ptr;
- }
-
-char *Str_BuildStringLongStr (long Num,const char *Str)
- {
- char *Ptr;
-
- if (Str_Strings.Num >= Str_MAX_STRINGS)
- Err_NotEnoughMemoryExit ();
-
- if (Str_Strings.Str[Str_Strings.Num] != NULL)
- Err_NotEnoughMemoryExit ();
-
- if (asprintf (&Str_Strings.Str[Str_Strings.Num],"%ld %s",Num,Str) < 0)
- Err_NotEnoughMemoryExit ();
- Ptr = Str_Strings.Str[Str_Strings.Num];
- Str_Strings.Num++;
+ Str_Strings.Num++;
+ }
+ }
return Ptr;
}
diff --git a/swad_string.h b/swad_string.h
index b3ed09b8..77678648 100644
--- a/swad_string.h
+++ b/swad_string.h
@@ -147,9 +147,7 @@ void Str_Copy (char *Dst,const char *Src,size_t DstSize);
void Str_Concat (char *Dst,const char *Src,size_t DstSize);
char *Str_BuildGoToMsg (const char *Where);
-char *Str_BuildStringStr (const char *fmt,const char *Str);
-char *Str_BuildStringLong (const char *fmt,long Num);
-char *Str_BuildStringLongStr (long Num,const char *Str);
+char *Str_BuildString (const char *fmt,...);
void Str_FreeStrings (void);
#endif
diff --git a/swad_survey.c b/swad_survey.c
index 71757df3..89a3ec85 100644
--- a/swad_survey.c
+++ b/swad_survey.c
@@ -425,6 +425,7 @@ static void Svy_ShowOneSurvey (struct Svy_Surveys *Surveys,
{
extern const char *Hlp_ASSESSMENT_Surveys;
extern const char *The_ClassDat[The_NUM_THEMES];
+ extern const char *The_ClassDatLight[The_NUM_THEMES];
extern const char *Txt_Survey;
extern const char *Txt_View_survey;
extern const char *Txt_Number_of_questions;
@@ -673,7 +674,7 @@ static void Svy_ShowOneSurvey (struct Svy_Surveys *Surveys,
Txt,Cns_MAX_BYTES_TEXT,false); // Convert from HTML to rigorous HTML
ALn_InsertLinks (Txt,Cns_MAX_BYTES_TEXT,60); // Insert links
HTM_DIV_Begin ("class=\"PAR %s\"",Svy.Status.Visible ? The_ClassDat[Gbl.Prefs.Theme] :
- "DAT_LIGHT");
+ The_ClassDatLight[Gbl.Prefs.Theme]);
HTM_Txt (Txt);
HTM_DIV_End ();
HTM_TD_End ();
diff --git a/swad_syllabus.c b/swad_syllabus.c
index b8c39f90..9ee698db 100644
--- a/swad_syllabus.c
+++ b/swad_syllabus.c
@@ -648,7 +648,7 @@ static void Syl_ShowRowSyllabus (struct Syl_Syllabus *Syllabus,unsigned NumItem,
NULL,
Syl_PutParamNumItem,&Syllabus->ParamNumItem,
"arrow-up.svg",
- Str_BuildStringStr (Syl_LstItemsSyllabus.Lst[NumItem].HasChildren ? Txt_Move_up_X_and_its_subsections :
+ Str_BuildString (Syl_LstItemsSyllabus.Lst[NumItem].HasChildren ? Txt_Move_up_X_and_its_subsections :
Txt_Move_up_X,
StrItemCod));
Str_FreeStrings ();
@@ -667,7 +667,7 @@ static void Syl_ShowRowSyllabus (struct Syl_Syllabus *Syllabus,unsigned NumItem,
NULL,
Syl_PutParamNumItem,&Syllabus->ParamNumItem,
"arrow-down.svg",
- Str_BuildStringStr (Syl_LstItemsSyllabus.Lst[NumItem].HasChildren ? Txt_Move_down_X_and_its_subsections :
+ Str_BuildString (Syl_LstItemsSyllabus.Lst[NumItem].HasChildren ? Txt_Move_down_X_and_its_subsections :
Txt_Move_down_X,
StrItemCod));
Str_FreeStrings ();
@@ -685,7 +685,7 @@ static void Syl_ShowRowSyllabus (struct Syl_Syllabus *Syllabus,unsigned NumItem,
NULL,
Syl_PutParamNumItem,&Syllabus->ParamNumItem,
"arrow-left.svg",
- Str_BuildStringStr (Txt_Increase_level_of_X,
+ Str_BuildString (Txt_Increase_level_of_X,
StrItemCod));
Str_FreeStrings ();
}
@@ -703,7 +703,7 @@ static void Syl_ShowRowSyllabus (struct Syl_Syllabus *Syllabus,unsigned NumItem,
NULL,
Syl_PutParamNumItem,&Syllabus->ParamNumItem,
"arrow-right.svg",
- Str_BuildStringStr (Txt_Decrease_level_of_X,
+ Str_BuildString (Txt_Decrease_level_of_X,
StrItemCod));
Str_FreeStrings ();
}
diff --git a/swad_system_config.c b/swad_system_config.c
index 0164beec..350ccf3d 100644
--- a/swad_system_config.c
+++ b/swad_system_config.c
@@ -258,7 +258,7 @@ static void SysCfg_Map (void)
static void SysCfg_Platform (void)
{
- extern const char *The_ClassDatN[The_NUM_THEMES];
+ extern const char *The_ClassDatStrong[The_NUM_THEMES];
extern const char *Txt_Platform;
/***** Institution *****/
@@ -268,7 +268,7 @@ static void SysCfg_Platform (void)
Frm_LabelColumn ("RT",NULL,Txt_Platform);
/* Data */
- HTM_TD_Begin ("class=\"LB %s\"",The_ClassDatN[Gbl.Prefs.Theme]);
+ HTM_TD_Begin ("class=\"LB %s\"",The_ClassDatStrong[Gbl.Prefs.Theme]);
HTM_Txt (Cfg_PLATFORM_SHORT_NAME);
HTM_TD_End ();
@@ -312,7 +312,7 @@ static void SysCfg_NumCtys (void)
HTM_TD_Begin ("class=\"LB\"");
Frm_BeginFormGoTo (ActSeeCty);
HTM_BUTTON_SUBMIT_Begin (Txt_Countries,
- Str_BuildStringStr ("BT_LINK %s",The_ClassDat[Gbl.Prefs.Theme]),
+ Str_BuildString ("BT_LINK %s",The_ClassDat[Gbl.Prefs.Theme]),
NULL);
Str_FreeStrings ();
HTM_Unsigned (Cty_GetCachedNumCtysInSys ());
diff --git a/swad_tag.c b/swad_tag.c
index bf2cdd9f..7b583086 100644
--- a/swad_tag.c
+++ b/swad_tag.c
@@ -470,7 +470,7 @@ static void Tag_PutIconEnable (long TagCod,const char *TagTxt)
Frm_BeginForm (ActEnaTag);
Par_PutHiddenParamLong (NULL,"TagCod",TagCod);
Ico_PutIconLink ("eye-slash-red.svg",
- Str_BuildStringStr (Txt_Tag_X_not_allowed_Click_to_allow_it,
+ Str_BuildString (Txt_Tag_X_not_allowed_Click_to_allow_it,
TagTxt));
Str_FreeStrings ();
Frm_EndForm ();
@@ -489,7 +489,7 @@ static void Tag_PutIconDisable (long TagCod,const char *TagTxt)
Frm_BeginForm (ActDisTag);
Par_PutHiddenParamLong (NULL,"TagCod",TagCod);
Ico_PutIconLink ("eye-green.svg",
- Str_BuildStringStr (Txt_Tag_X_allowed_Click_to_disable_it,
+ Str_BuildString (Txt_Tag_X_allowed_Click_to_disable_it,
TagTxt));
Str_FreeStrings ();
Frm_EndForm ();
diff --git a/swad_test.c b/swad_test.c
index fe7f44b3..68ce4dbb 100644
--- a/swad_test.c
+++ b/swad_test.c
@@ -303,6 +303,7 @@ void Tst_ReceiveTestDraft (void)
void Tst_AssessTest (void)
{
extern const char *Hlp_ASSESSMENT_Tests;
+ extern const char *The_ClassDatStrong[The_NUM_THEMES];
extern const char *Txt_Result;
extern const char *Txt_Test_No_X_that_you_make_in_this_course;
extern const char *Txt_Score;
@@ -371,7 +372,7 @@ void Tst_AssessTest (void)
/***** Write total score and grade *****/
if (TstVis_IsVisibleTotalScore (TstCfg_GetConfigVisibility ()))
{
- HTM_DIV_Begin ("class=\"DAT_N_BOLD CM\"");
+ HTM_DIV_Begin ("class=\"CM %s BOLD\"",The_ClassDatStrong[Gbl.Prefs.Theme]);
HTM_TxtColonNBSP (Txt_Score);
HTM_Double2Decimals (Print.Score);
HTM_BR ();
diff --git a/swad_test_print.c b/swad_test_print.c
index ffc7a0b5..b65ee56f 100644
--- a/swad_test_print.c
+++ b/swad_test_print.c
@@ -1830,6 +1830,7 @@ static void TstPrn_ShowHeaderPrints (Usr_MeOrOther_t MeOrOther)
static void TstPrn_ShowUsrPrints (struct UsrData *UsrDat)
{
extern const char *The_ClassDat[The_NUM_THEMES];
+ extern const char *The_ClassDatLight[The_NUM_THEMES];
extern const char *Txt_View_test;
MYSQL_RES *mysql_res;
unsigned NumPrints;
@@ -1872,7 +1873,7 @@ static void TstPrn_ShowUsrPrints (struct UsrData *UsrDat)
/* Get print data */
TstPrn_GetPrintDataByPrnCod (&Print);
ClassDat = Print.AllowTeachers ? The_ClassDat[Gbl.Prefs.Theme] :
- "DAT_LIGHT";
+ The_ClassDatLight[Gbl.Prefs.Theme];
/* Get if I can see print result and score */
TstRes_CheckIfICanSeePrintResult (&Print,UsrDat->UsrCod,&ICanView);
@@ -2057,7 +2058,7 @@ static void TstPrn_ShowPrintsSummaryRow (bool ItsMe,
struct TstPrn_NumQuestions *NumTotalQsts,
double TotalScore)
{
- extern const char *The_ClassDatN[The_NUM_THEMES];
+ extern const char *The_ClassDatStrong[The_NUM_THEMES];
extern const char *Txt_Visible_tests;
bool ICanViewTotalScore;
@@ -2088,35 +2089,35 @@ static void TstPrn_ShowPrintsSummaryRow (bool ItsMe,
/***** Row title *****/
HTM_TD_Begin ("colspan=\"2\" class=\"RM %s LINE_TOP LINE_BOTTOM COLOR%u\"",
- The_ClassDatN[Gbl.Prefs.Theme],Gbl.RowEvenOdd);
+ The_ClassDatStrong[Gbl.Prefs.Theme],Gbl.RowEvenOdd);
HTM_TxtColonNBSP (Txt_Visible_tests);
HTM_Unsigned (NumPrints);
HTM_TD_End ();
/***** Write total number of questions *****/
HTM_TD_Begin ("class=\"RM %s LINE_TOP LINE_BOTTOM LINE_LEFT COLOR%u\"",
- The_ClassDatN[Gbl.Prefs.Theme],Gbl.RowEvenOdd);
+ The_ClassDatStrong[Gbl.Prefs.Theme],Gbl.RowEvenOdd);
if (NumPrints)
HTM_Unsigned (NumTotalQsts->All);
HTM_TD_End ();
/***** Write total number of non-blank answers *****/
HTM_TD_Begin ("class=\"RM %s LINE_TOP LINE_BOTTOM LINE_LEFT COLOR%u\"",
- The_ClassDatN[Gbl.Prefs.Theme],Gbl.RowEvenOdd);
+ The_ClassDatStrong[Gbl.Prefs.Theme],Gbl.RowEvenOdd);
if (NumPrints)
HTM_Unsigned (NumTotalQsts->NotBlank);
HTM_TD_End ();
/***** Write total number of blank answers *****/
HTM_TD_Begin ("class=\"RM %s LINE_TOP LINE_BOTTOM COLOR%u\"",
- The_ClassDatN[Gbl.Prefs.Theme],Gbl.RowEvenOdd);
+ The_ClassDatStrong[Gbl.Prefs.Theme],Gbl.RowEvenOdd);
if (NumPrints)
HTM_Unsigned (NumTotalQsts->All - NumTotalQsts->NotBlank);
HTM_TD_End ();
/***** Write total score *****/
HTM_TD_Begin ("class=\"RM %s LINE_TOP LINE_BOTTOM LINE_LEFT COLOR%u\"",
- The_ClassDatN[Gbl.Prefs.Theme],Gbl.RowEvenOdd);
+ The_ClassDatStrong[Gbl.Prefs.Theme],Gbl.RowEvenOdd);
if (ICanViewTotalScore)
{
HTM_Double2Decimals (TotalScore);
@@ -2127,7 +2128,7 @@ static void TstPrn_ShowPrintsSummaryRow (bool ItsMe,
/***** Write average score per question *****/
HTM_TD_Begin ("class=\"RM %s LINE_TOP LINE_BOTTOM COLOR%u\"",
- The_ClassDatN[Gbl.Prefs.Theme],Gbl.RowEvenOdd);
+ The_ClassDatStrong[Gbl.Prefs.Theme],Gbl.RowEvenOdd);
if (ICanViewTotalScore)
HTM_Double2Decimals (NumTotalQsts->All ? TotalScore / (double) NumTotalQsts->All :
0.0);
@@ -2135,14 +2136,14 @@ static void TstPrn_ShowPrintsSummaryRow (bool ItsMe,
/***** Write grade over Tst_SCORE_MAX *****/
HTM_TD_Begin ("class=\"RM %s LINE_TOP LINE_BOTTOM LINE_LEFT COLOR%u\"",
- The_ClassDatN[Gbl.Prefs.Theme],Gbl.RowEvenOdd);
+ The_ClassDatStrong[Gbl.Prefs.Theme],Gbl.RowEvenOdd);
if (ICanViewTotalScore)
TstPrn_ComputeAndShowGrade (NumTotalQsts->All,TotalScore,Tst_SCORE_MAX);
HTM_TD_End ();
/***** Last cell *****/
HTM_TD_Begin ("class=\"%s LINE_TOP LINE_BOTTOM LINE_LEFT COLOR%u\"",
- The_ClassDatN[Gbl.Prefs.Theme],Gbl.RowEvenOdd);
+ The_ClassDatStrong[Gbl.Prefs.Theme],Gbl.RowEvenOdd);
HTM_TD_End ();
/***** End row *****/
@@ -2157,7 +2158,7 @@ void TstPrn_ShowOnePrint (void)
{
extern const char *Hlp_ASSESSMENT_Tests_results;
extern const char *The_ClassDat[The_NUM_THEMES];
- extern const char *The_ClassDatN[The_NUM_THEMES];
+ extern const char *The_ClassDatStrong[The_NUM_THEMES];
extern const char *Txt_Result;
extern const char *Txt_ROLES_SINGUL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS];
extern const char *Txt_START_END_TIME[Dat_NUM_START_END_TIME];
@@ -2221,7 +2222,7 @@ void TstPrn_ShowOnePrint (void)
/* User */
HTM_TR_Begin (NULL);
- HTM_TD_Begin ("class=\"RT %s\"",The_ClassDatN[Gbl.Prefs.Theme]);
+ HTM_TD_Begin ("class=\"RT %s\"",The_ClassDatStrong[Gbl.Prefs.Theme]);
HTM_TxtColon (Txt_ROLES_SINGUL_Abc[Gbl.Usrs.Other.UsrDat.Roles.InCurrentCrs][Gbl.Usrs.Other.UsrDat.Sex]);
HTM_TD_End ();
@@ -2250,7 +2251,7 @@ void TstPrn_ShowOnePrint (void)
HTM_TR_Begin (NULL);
- HTM_TD_Begin ("class=\"RT %s\"",The_ClassDatN[Gbl.Prefs.Theme]);
+ HTM_TD_Begin ("class=\"RT %s\"",The_ClassDatStrong[Gbl.Prefs.Theme]);
HTM_TxtColon (Txt_START_END_TIME[StartEndTime]);
HTM_TD_End ();
@@ -2269,7 +2270,7 @@ void TstPrn_ShowOnePrint (void)
/***** Number of questions *****/
HTM_TR_Begin (NULL);
- HTM_TD_Begin ("class=\"RT %s\"",The_ClassDatN[Gbl.Prefs.Theme]);
+ HTM_TD_Begin ("class=\"RT %s\"",The_ClassDatStrong[Gbl.Prefs.Theme]);
HTM_TxtColon (Txt_Questions);
HTM_TD_End ();
@@ -2282,7 +2283,7 @@ void TstPrn_ShowOnePrint (void)
/***** Number of answers *****/
HTM_TR_Begin (NULL);
- HTM_TD_Begin ("class=\"RT %s\"",The_ClassDatN[Gbl.Prefs.Theme]);
+ HTM_TD_Begin ("class=\"RT %s\"",The_ClassDatStrong[Gbl.Prefs.Theme]);
HTM_TxtColon (Txt_Answers);
HTM_TD_End ();
@@ -2295,7 +2296,7 @@ void TstPrn_ShowOnePrint (void)
/***** Score *****/
HTM_TR_Begin (NULL);
- HTM_TD_Begin ("class=\"RT %s\"",The_ClassDatN[Gbl.Prefs.Theme]);
+ HTM_TD_Begin ("class=\"RT %s\"",The_ClassDatStrong[Gbl.Prefs.Theme]);
HTM_TxtColon (Txt_Score);
HTM_TD_End ();
@@ -2317,7 +2318,7 @@ void TstPrn_ShowOnePrint (void)
/***** Grade *****/
HTM_TR_Begin (NULL);
- HTM_TD_Begin ("class=\"RT %s\"",The_ClassDatN[Gbl.Prefs.Theme]);
+ HTM_TD_Begin ("class=\"RT %s\"",The_ClassDatStrong[Gbl.Prefs.Theme]);
HTM_TxtColon (Txt_Grade);
HTM_TD_End ();
@@ -2337,7 +2338,7 @@ void TstPrn_ShowOnePrint (void)
/***** Tags present in this test *****/
HTM_TR_Begin (NULL);
- HTM_TD_Begin ("class=\"RT %s\"",The_ClassDatN[Gbl.Prefs.Theme]);
+ HTM_TD_Begin ("class=\"RT %s\"",The_ClassDatStrong[Gbl.Prefs.Theme]);
HTM_TxtColon (Txt_Tags);
HTM_TD_End ();
diff --git a/swad_text.c b/swad_text.c
index ca9f3114..015bbe2c 100644
--- a/swad_text.c
+++ b/swad_text.c
@@ -13949,46 +13949,46 @@ const char *Txt_FORUM_posts =
"posts";
#endif
-const char *Txt_FORUM_Post_X_allowed = // Warning: it is very important to include %ld in the following sentences
+const char *Txt_FORUM_Post_X_allowed = // Warning: it is very important to include %u in the following sentences
#if L==1 // ca
- "Comentario %ld permitido."; // Necessita traduccio
+ "Comentario %u permitido."; // Necessita traduccio
#elif L==2 // de
- "Post %ld allowed."; // Need Übersetzung
+ "Post %u allowed."; // Need Übersetzung
#elif L==3 // en
- "Post %ld allowed.";
+ "Post %u allowed.";
#elif L==4 // es
- "Comentario %ld permitido.";
+ "Comentario %u permitido.";
#elif L==5 // fr
- "Post %ld allowed."; // Besoin de traduction
+ "Post %u allowed."; // Besoin de traduction
#elif L==6 // gn
- "Comentario %ld permitido."; // Okoteve traducción
+ "Comentario %u permitido."; // Okoteve traducción
#elif L==7 // it
- "Post %ld autorizzato.";
+ "Post %u autorizzato.";
#elif L==8 // pl
- "Post %ld dozwolone.";
+ "Post %u dozwolone.";
#elif L==9 // pt
- "Post %ld permitido.";
+ "Post %u permitido.";
#endif
-const char *Txt_FORUM_Post_X_allowed_Click_to_ban_it = // Warning: it is very important to include %ld in the following sentences
+const char *Txt_FORUM_Post_X_allowed_Click_to_ban_it = // Warning: it is very important to include %u in the following sentences
#if L==1 // ca
- "Comentario %ld permitido. Pulse para censurarlo."; // Necessita traduccio
+ "Comentario %u permitido. Pulse para censurarlo."; // Necessita traduccio
#elif L==2 // de
- "Post %ld allowed. Click to ban it."; // Need Übersetzung
+ "Post %u allowed. Click to ban it."; // Need Übersetzung
#elif L==3 // en
- "Post %ld allowed. Click to ban it.";
+ "Post %u allowed. Click to ban it.";
#elif L==4 // es
- "Comentario %ld permitido. Pulse para censurarlo.";
+ "Comentario %u permitido. Pulse para censurarlo.";
#elif L==5 // fr
- "Post %ld allowed. Click to ban it."; // Besoin de traduction
+ "Post %u allowed. Click to ban it."; // Besoin de traduction
#elif L==6 // gn
- "Comentario %ld permitido. Pulse para censurarlo."; // Okoteve traducción
+ "Comentario %u permitido. Pulse para censurarlo."; // Okoteve traducción
#elif L==7 // it
- "Post %ld autorizzato. Clicca per censurarlo.";
+ "Post %u autorizzato. Clicca per censurarlo.";
#elif L==8 // pl
- "Post %ld dozwolone. Kliknij, aby to zakazac.";
+ "Post %u dozwolone. Kliknij, aby to zakazac.";
#elif L==9 // pt
- "Post %ld permitido. Clique para censurá-lo.";
+ "Post %u permitido. Clique para censurá-lo.";
#endif
const char *Txt_FORUM_Post_and_thread_removed =
@@ -14033,46 +14033,46 @@ const char *Txt_FORUM_Post_banned =
"Post não permitido.";
#endif
-const char *Txt_FORUM_Post_X_banned = // Warning: it is very important to include %ld in the following sentences
+const char *Txt_FORUM_Post_X_banned = // Warning: it is very important to include %u in the following sentences
#if L==1 // ca
- "Comentario %ld no permitido"; // Necessita traduccio
+ "Comentario %u no permitido"; // Necessita traduccio
#elif L==2 // de
- "Post %ld banned."; // Need Übersetzung
+ "Post %u banned."; // Need Übersetzung
#elif L==3 // en
- "Post %ld banned.";
+ "Post %u banned.";
#elif L==4 // es
- "Comentario %ld no permitido";
+ "Comentario %u no permitido";
#elif L==5 // fr
- "Post %ld banned."; // Besoin de traduction
+ "Post %u banned."; // Besoin de traduction
#elif L==6 // gn
- "Comentario %ld no permitido"; // Okoteve traducción
+ "Comentario %u no permitido"; // Okoteve traducción
#elif L==7 // it
- "Post %ld censurato.";
+ "Post %u censurato.";
#elif L==8 // pl
- "Post %ld zakazany.";
+ "Post %u zakazany.";
#elif L==9 // pt
- "Post %ld não permitido.";
+ "Post %u não permitido.";
#endif
-const char *Txt_FORUM_Post_X_banned_Click_to_unban_it = // Warning: it is very important to include %ld in the following sentences
+const char *Txt_FORUM_Post_X_banned_Click_to_unban_it = // Warning: it is very important to include %u in the following sentences
#if L==1 // ca
- "Comentario %ld no permitido. Pulse para permitirlo."; // Necessita traduccio
+ "Comentario %u no permitido. Pulse para permitirlo."; // Necessita traduccio
#elif L==2 // de
- "Post %ld banned. Click to unban it."; // Need Übersetzung
+ "Post %u banned. Click to unban it."; // Need Übersetzung
#elif L==3 // en
- "Post %ld banned. Click to unban it.";
+ "Post %u banned. Click to unban it.";
#elif L==4 // es
- "Comentario %ld no permitido. Pulse para permitirlo.";
+ "Comentario %u no permitido. Pulse para permitirlo.";
#elif L==5 // fr
- "Post %ld banned. Click to unban it."; // Besoin de traduction
+ "Post %u banned. Click to unban it."; // Besoin de traduction
#elif L==6 // gn
- "Comentario %ld no permitido. Pulse para permitirlo."; // Okoteve traducción
+ "Comentario %u no permitido. Pulse para permitirlo."; // Okoteve traducción
#elif L==7 // it
- "Post %ld censurato. Clicca per autorizzarlo.";
+ "Post %u censurato. Clicca per autorizzarlo.";
#elif L==8 // pl
- "Post %ld zakazany.Kliknij, aby to odbanowac.";
+ "Post %u zakazany.Kliknij, aby to odbanowac.";
#elif L==9 // pt
- "Post %ld não permitido. Clique para permiti-lo.";
+ "Post %u não permitido. Clique para permiti-lo.";
#endif
const char *Txt_FORUM_Post_sent =
@@ -41073,46 +41073,46 @@ const char *Txt_See_notifications =
"Ver notificações";
#endif
-const char *Txt_See_only_the_latest_X_COMMENTS = // Warning: it is very important to include %ld in the following sentences
+const char *Txt_See_only_the_latest_X_COMMENTS = // Warning: it is very important to include %u in the following sentences
#if L==1 // ca
- "Veure només els %ld últims";
+ "Veure només els %u últims";
#elif L==2 // de
- "Nur die neuesten %ld anzeigen";
+ "Nur die neuesten %u anzeigen";
#elif L==3 // en
- "See only the %ld latest";
+ "See only the %u latest";
#elif L==4 // es
- "Ver sólo los %ld últimos";
+ "Ver sólo los %u últimos";
#elif L==5 // fr
- "Voir seulement les %ld dernières";
+ "Voir seulement les %u dernières";
#elif L==6 // gn
- "Ver sólo los %ld últimos"; // Okoteve traducción
+ "Ver sólo los %u últimos"; // Okoteve traducción
#elif L==7 // it
- "Vedi solo le ultime %ld";
+ "Vedi solo le ultime %u";
#elif L==8 // pl
- "Zobacz tylko najnowsze %ld";
+ "Zobacz tylko najnowsze %u";
#elif L==9 // pt
- "Ver apenas os %ld últimos";
+ "Ver apenas os %u últimos";
#endif
-const char *Txt_See_the_previous_X_COMMENTS = // Warning: it is very important to include %ld in the following sentences
+const char *Txt_See_the_previous_X_COMMENTS = // Warning: it is very important to include %u in the following sentences
#if L==1 // ca
- "Veure els %ld anteriors";
+ "Veure els %u anteriors";
#elif L==2 // de
- "Siehe die vorherigen %ld";
+ "Siehe die vorherigen %u";
#elif L==3 // en
- "See the previous %ld";
+ "See the previous %u";
#elif L==4 // es
- "Ver los %ld anteriores";
+ "Ver los %u anteriores";
#elif L==5 // fr
- "Voir les %ld précédents";
+ "Voir les %u précédents";
#elif L==6 // gn
- "Ver los %ld anteriores"; // Okoteve traducción
+ "Ver los %u anteriores"; // Okoteve traducción
#elif L==7 // it
- "Vedi i precedente %ld";
+ "Vedi i precedente %u";
#elif L==8 // pl
- "Zobacz poprzednie %ld";
+ "Zobacz poprzednie %u";
#elif L==9 // pt
- "Ver os %ld anteriores";
+ "Ver os %u anteriores";
#endif
const char *Txt_Select_another_country =
@@ -42531,46 +42531,46 @@ const char *Txt_Show_more_recipients =
"Ver mais destinatários";
#endif
-const char *Txt_Show_next_X_clicks = // Warning: it is very important to include %ld in the following sentences
+const char *Txt_Show_next_X_clicks = // Warning: it is very important to include %u in the following sentences
#if L==1 // ca
- "Mostrar %ld clics posteriores"; // Necessita traduccio
+ "Mostrar %u clics posteriores"; // Necessita traduccio
#elif L==2 // de
- "Show next %ld clicks"; // Need Übersetzung
+ "Show next %u clicks"; // Need Übersetzung
#elif L==3 // en
- "Show next %ld clicks";
+ "Show next %u clicks";
#elif L==4 // es
- "Mostrar %ld clics posteriores";
+ "Mostrar %u clics posteriores";
#elif L==5 // fr
- "Show next %ld clicks"; // Besoin de traduction
+ "Show next %u clicks"; // Besoin de traduction
#elif L==6 // gn
- "Mostrar %ld clics posteriores"; // Okoteve traducción
+ "Mostrar %u clics posteriores"; // Okoteve traducción
#elif L==7 // it
- "Mostra %ld scatti seguenti";
+ "Mostra %u scatti seguenti";
#elif L==8 // pl
- "Show next %ld clicks"; // Potrzebujesz tlumaczenie
+ "Show next %u clicks"; // Potrzebujesz tlumaczenie
#elif L==9 // pt
- "Mostrar %ld cliques subsequentes";
+ "Mostrar %u cliques subsequentes";
#endif
-const char *Txt_Show_previous_X_clicks = // Warning: it is very important to include %ld in the following sentences
+const char *Txt_Show_previous_X_clicks = // Warning: it is very important to include %u in the following sentences
#if L==1 // ca
- "Mostrar %ld clics anteriores"; // Necessita traduccio
+ "Mostrar %u clics anteriores"; // Necessita traduccio
#elif L==2 // de
- "Show previous %ld clicks"; // Need Übersetzung
+ "Show previous %u clicks"; // Need Übersetzung
#elif L==3 // en
- "Show previous %ld clicks";
+ "Show previous %u clicks";
#elif L==4 // es
- "Mostrar %ld clics anteriores";
+ "Mostrar %u clics anteriores";
#elif L==5 // fr
- "Show previous %ld clicks"; // Besoin de traduction
+ "Show previous %u clicks"; // Besoin de traduction
#elif L==6 // gn
- "Mostrar %ld clics anteriores"; // Okoteve traducción
+ "Mostrar %u clics anteriores"; // Okoteve traducción
#elif L==7 // it
- "Mostra %ld scatti precedenti";
+ "Mostra %u scatti precedenti";
#elif L==8 // pl
- "Show previous %ld clicks"; // Potrzebujesz tlumaczenie
+ "Show previous %u clicks"; // Potrzebujesz tlumaczenie
#elif L==9 // pt
- "Mostrar %ld cliques anteriores";
+ "Mostrar %u cliques anteriores";
#endif
const char *Txt_Show_questions =
@@ -52642,25 +52642,25 @@ const char *Txt_TIMELINE_Favourite =
"Favorito";
#endif
-const char *Txt_TIMELINE_Favourited_by_X_USERS = // Warning: it is very important to include %ld in the following sentences
+const char *Txt_TIMELINE_Favourited_by_X_USERS = // Warning: it is very important to include %u in the following sentences
#if L==1 // ca
- "Marcat com favorit per %ld";
+ "Marcat com favorit per %u";
#elif L==2 // de
- "Von %ld vorgemerkt";
+ "Von %u vorgemerkt";
#elif L==3 // en
- "Favourited by %ld";
+ "Favourited by %u";
#elif L==4 // es
- "Marcado como favorito por %ld";
+ "Marcado como favorito por %u";
#elif L==5 // fr
- "Ajouté aux favoris par %ld";
+ "Ajouté aux favoris par %u";
#elif L==6 // gn
- "Marcado como favorito por %ld"; // Okoteve traducción
+ "Marcado como favorito por %u"; // Okoteve traducción
#elif L==7 // it
- "Preferiti da %ld";
+ "Preferiti da %u";
#elif L==8 // pl
- "Dodane do ulubionych przez %ld";
+ "Dodane do ulubionych przez %u";
#elif L==9 // pt
- "Marcado como favorito por %ld";
+ "Marcado como favorito por %u";
#endif
const char *Txt_TIMELINE_Not_favourited_by_anyone = // No favourited
@@ -53242,25 +53242,25 @@ const char *Txt_TIMELINE_Shared =
"Compartilhado";
#endif
-const char *Txt_TIMELINE_Shared_by_X_USERS = // Warning: it is very important to include %ld in the following sentences
+const char *Txt_TIMELINE_Shared_by_X_USERS = // Warning: it is very important to include %u in the following sentences
#if L==1 // ca
- "Compartit per %ld";
+ "Compartit per %u";
#elif L==2 // de
- "Von %ld geteilt";
+ "Von %u geteilt";
#elif L==3 // en
- "Shared by %ld";
+ "Shared by %u";
#elif L==4 // es
- "Compartido por %ld";
+ "Compartido por %u";
#elif L==5 // fr
- "Partagé par %ld";
+ "Partagé par %u";
#elif L==6 // gn
- "Compartido por %ld"; // Okoteve traducción
+ "Compartido por %u"; // Okoteve traducción
#elif L==7 // it
- "Condiviso da %ld";
+ "Condiviso da %u";
#elif L==8 // pl
- "Udostępnione przez %ld";
+ "Udostępnione przez %u";
#elif L==9 // pt
- "Compartilhado por %ld";
+ "Compartilhado por %u";
#endif
const char *Txt_TIMETABLE_CLASS_TYPES[Tmt_NUM_CLASS_TYPES] =
diff --git a/swad_theme.c b/swad_theme.c
index f363f5e2..a0dc1b9b 100644
--- a/swad_theme.c
+++ b/swad_theme.c
@@ -327,15 +327,37 @@ const char *The_ClassDat[The_NUM_THEMES] =
[The_THEME_DARK ] = "DAT_DARK",
};
-const char *The_ClassDatN[The_NUM_THEMES] =
+const char *The_ClassDatStrong[The_NUM_THEMES] =
{
- [The_THEME_WHITE ] = "DAT_N_WHITE",
- [The_THEME_GREY ] = "DAT_N_GREY",
- [The_THEME_PURPLE] = "DAT_N_PURPLE",
- [The_THEME_BLUE ] = "DAT_N_BLUE",
- [The_THEME_YELLOW] = "DAT_N_YELLOW",
- [The_THEME_PINK ] = "DAT_N_PINK",
- [The_THEME_DARK ] = "DAT_N_DARK",
+ [The_THEME_WHITE ] = "DAT_STRONG_WHITE",
+ [The_THEME_GREY ] = "DAT_STRONG_GREY",
+ [The_THEME_PURPLE] = "DAT_STRONG_PURPLE",
+ [The_THEME_BLUE ] = "DAT_STRONG_BLUE",
+ [The_THEME_YELLOW] = "DAT_STRONG_YELLOW",
+ [The_THEME_PINK ] = "DAT_STRONG_PINK",
+ [The_THEME_DARK ] = "DAT_STRONG_DARK",
+ };
+
+const char *The_ClassDatLight[The_NUM_THEMES] =
+ {
+ [The_THEME_WHITE ] = "DAT_LIGHT_WHITE",
+ [The_THEME_GREY ] = "DAT_LIGHT_GREY",
+ [The_THEME_PURPLE] = "DAT_LIGHT_PURPLE",
+ [The_THEME_BLUE ] = "DAT_LIGHT_BLUE",
+ [The_THEME_YELLOW] = "DAT_LIGHT_YELLOW",
+ [The_THEME_PINK ] = "DAT_LIGHT_PINK",
+ [The_THEME_DARK ] = "DAT_LIGHT_DARK",
+ };
+
+const char *The_ClassBgHighlight[The_NUM_THEMES] =
+ {
+ [The_THEME_WHITE ] = "BG_HIGHLIGHT_WHITE",
+ [The_THEME_GREY ] = "BG_HIGHLIGHT_GREY",
+ [The_THEME_PURPLE] = "BG_HIGHLIGHT_PURPLE",
+ [The_THEME_BLUE ] = "BG_HIGHLIGHT_BLUE",
+ [The_THEME_YELLOW] = "BG_HIGHLIGHT_YELLOW",
+ [The_THEME_PINK ] = "BG_HIGHLIGHT_PINK",
+ [The_THEME_DARK ] = "BG_HIGHLIGHT_DARK",
};
/*****************************************************************************/
diff --git a/swad_timeline.c b/swad_timeline.c
index 50e538d9..2c90cd7e 100644
--- a/swad_timeline.c
+++ b/swad_timeline.c
@@ -278,7 +278,7 @@ void Tml_ShowTimelineUsrHighlighting (struct Tml_Timeline *Timeline,long NotCod)
/***** Show timeline *****/
Tml_ShowTimeline (Timeline,NotCod,
- Str_BuildStringStr (Txt_Timeline_OF_A_USER,
+ Str_BuildString (Txt_Timeline_OF_A_USER,
Gbl.Usrs.Other.UsrDat.FrstName));
Str_FreeStrings ();
@@ -517,13 +517,15 @@ static void Tml_PutHiddenList (const char *Id)
void Tml_WriteDateTime (time_t TimeUTC)
{
+ extern const char *The_ClassDatLight[The_NUM_THEMES];
char IdDateTime[Frm_MAX_BYTES_ID + 1];
/***** Create unique Id *****/
Frm_SetUniqueId (IdDateTime);
/***** Container where the date-time is written *****/
- HTM_DIV_Begin ("id=\"%s\" class=\"Tml_RIGHT_TIME DAT_LIGHT\"",IdDateTime);
+ HTM_DIV_Begin ("id=\"%s\" class=\"Tml_RIGHT_TIME %s\"",
+ IdDateTime,The_ClassDatLight[Gbl.Prefs.Theme]);
HTM_DIV_End ();
/***** Script to write date and time in browser local time *****/
diff --git a/swad_timeline_comment.c b/swad_timeline_comment.c
index 497369ca..826ccd47 100644
--- a/swad_timeline_comment.c
+++ b/swad_timeline_comment.c
@@ -487,7 +487,7 @@ static void Tml_Com_LinkToShowComms (Tml_Com_ContractExpand_t ConExp,
/* Icon and text */
Tml_Com_PutIconToToggleComms (IdComms,Link[ConExp].Icon,
- Str_BuildStringLong (*Link[ConExp].Text,(long) NumComms));
+ Str_BuildString (*Link[ConExp].Text,NumComms));
Str_FreeStrings ();
/* End container */
@@ -612,6 +612,7 @@ static void Tml_Com_WriteAuthorTimeAndContent (struct Tml_Com_Comment *Com,
static void Tml_Com_WriteAuthorName (const struct UsrData *UsrDat) // Author
{
+ extern const char *The_ClassDat[The_NUM_THEMES];
extern const char *Txt_My_public_profile;
extern const char *Txt_Another_user_s_profile;
@@ -623,7 +624,9 @@ static void Tml_Com_WriteAuthorName (const struct UsrData *UsrDat) // Author
/* Author's name */
HTM_BUTTON_SUBMIT_Begin (Usr_ItsMe (UsrDat->UsrCod) ? Txt_My_public_profile :
Txt_Another_user_s_profile,
- "BT_LINK Tml_COM_AUTHOR Tml_COMM_AUTHOR_WIDTH DAT_BOLD",NULL);
+ Str_BuildString ("Tml_COM_AUTHOR Tml_COMM_AUTHOR_WIDTH BT_LINK %s BOLD",
+ The_ClassDat[Gbl.Prefs.Theme]),
+ NULL);
HTM_Txt (UsrDat->FullName);
HTM_BUTTON_End ();
diff --git a/swad_timeline_form.c b/swad_timeline_form.c
index 1fbf53de..104ffb63 100644
--- a/swad_timeline_form.c
+++ b/swad_timeline_form.c
@@ -340,8 +340,8 @@ void Tml_Frm_FormToShowHiddenComms (long NotCod,
/* Put icon and text with link to show the first hidden comments */
HTM_BUTTON_SUBMIT_Begin (NULL,The_ClassFormLinkInBox[Gbl.Prefs.Theme],NULL);
Ico_PutIconTextLink ("angle-up.svg",
- Str_BuildStringLong (Txt_See_the_previous_X_COMMENTS,
- (long) NumInitialComms));
+ Str_BuildString (Txt_See_the_previous_X_COMMENTS,
+ NumInitialComms));
Str_FreeStrings ();
HTM_BUTTON_End ();
diff --git a/swad_timeline_note.c b/swad_timeline_note.c
index 13e6f38d..af25ac2a 100644
--- a/swad_timeline_note.c
+++ b/swad_timeline_note.c
@@ -316,13 +316,16 @@ void Tml_Not_ShowAuthorPhoto (struct UsrData *UsrDat,bool FormUnique)
static void Tml_Not_WriteAuthorTimeAndContent (const struct Tml_Not_Note *Not,
const struct UsrData *UsrDat)
{
+ extern const char *The_ClassDatStrong[The_NUM_THEMES];
+
/***** Begin top container *****/
HTM_DIV_Begin ("class=\"Tml_RIGHT_CONT Tml_RIGHT_WIDTH\"");
/***** Write author's full name *****/
Tml_Not_WriteAuthorName (UsrDat,
- "BT_LINK Tml_RIGHT_AUTHOR"
- " Tml_RIGHT_AUTHOR_WIDTH DAT_N_BOLD");
+ Str_BuildString ("Tml_RIGHT_AUTHOR Tml_RIGHT_AUTHOR_WIDTH BT_LINK %s BOLD",
+ The_ClassDatStrong[Gbl.Prefs.Theme]));
+ Str_FreeStrings ();
/***** Write date and time *****/
Tml_WriteDateTime (Not->DateTimeUTC);
@@ -683,7 +686,7 @@ static void Tml_Not_PutFormGoToAction (const struct Tml_Not_Note *Not,
/***** Icon and link to go to action *****/
/* Begin button */
HTM_BUTTON_SUBMIT_Begin (Txt_TIMELINE_NOTE[Not->Type],
- Str_BuildStringStr ("BT_LINK %s ICO_HIGHLIGHT",
+ Str_BuildString ("BT_LINK %s ICO_HIGHLIGHT",
The_ClassFormInBoxBold[Gbl.Prefs.Theme]),
NULL);
Str_FreeStrings ();
diff --git a/swad_timeline_post.c b/swad_timeline_post.c
index c454b073..9a1131cc 100644
--- a/swad_timeline_post.c
+++ b/swad_timeline_post.c
@@ -165,6 +165,7 @@ void Tml_Pst_PutPhotoAndFormToWriteNewPost (struct Tml_Timeline *Timeline)
static void Tml_Pst_PutFormToWriteNewPost (struct Tml_Timeline *Timeline)
{
+ extern const char *The_ClassDatStrong[The_NUM_THEMES];
extern const char *Txt_New_TIMELINE_post;
/***** Begin container *****/
@@ -172,8 +173,9 @@ static void Tml_Pst_PutFormToWriteNewPost (struct Tml_Timeline *Timeline)
/***** Author name *****/
Tml_Not_WriteAuthorName (&Gbl.Usrs.Me.UsrDat,
- "BT_LINK Tml_RIGHT_AUTHOR"
- " Tml_RIGHT_AUTHOR_WIDTH DAT_N_BOLD");
+ Str_BuildString ("Tml_RIGHT_AUTHOR Tml_RIGHT_AUTHOR_WIDTH BT_LINK %s BOLD",
+ The_ClassDatStrong[Gbl.Prefs.Theme]));
+ Str_FreeStrings ();
/***** Form to write the post *****/
/* Begin container */
diff --git a/swad_timeline_user.c b/swad_timeline_user.c
index 2a0f8859..3632e9cd 100644
--- a/swad_timeline_user.c
+++ b/swad_timeline_user.c
@@ -351,7 +351,7 @@ static void Tml_Usr_PutDisabledIconFavSha (Tml_Usr_FavSha_t FavSha,
if (NumUsrs)
{
Ico_PutDivIcon ("Tml_ICO_DISABLED",Ico[FavSha].Icon,
- Str_BuildStringLong (*Ico[FavSha].Title.WithUsrs,(long) NumUsrs));
+ Str_BuildString (*Ico[FavSha].Title.WithUsrs,NumUsrs));
Str_FreeStrings ();
}
else
diff --git a/swad_user.c b/swad_user.c
index 7b8a5f5a..16f747ce 100644
--- a/swad_user.c
+++ b/swad_user.c
@@ -1356,7 +1356,7 @@ void Usr_WriteLoggedUsrHead (void)
{
Frm_BeginForm (ActFrmRolSes);
HTM_BUTTON_SUBMIT_Begin (Txt_Role,
- Str_BuildStringStr ("BT_LINK %s",
+ Str_BuildString ("BT_LINK %s",
The_ClassUsr[Gbl.Prefs.Theme]),
NULL);
Str_FreeStrings ();
@@ -2032,6 +2032,7 @@ void Usr_ShowFormsLogoutAndRole (void)
extern const char *Hlp_PROFILE_Session_role;
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *The_ClassDat[The_NUM_THEMES];
+ extern const char *The_ClassDatStrong[The_NUM_THEMES];
extern const char *Txt_Session;
extern const char *Txt_Role;
extern const char *Txt_You_are_now_LOGGED_IN_as_X;
@@ -2057,7 +2058,7 @@ void Usr_ShowFormsLogoutAndRole (void)
HTM_TxtColonNBSP (Txt_Role);
HTM_SPAN_End ();
- HTM_SPAN_Begin ("class=\"DAT_N_BOLD\"");
+ HTM_SPAN_Begin ("class=\"%s BOLD\"",The_ClassDatStrong[Gbl.Prefs.Theme]);
HTM_Txt (Txt_ROLES_SINGUL_Abc[Gbl.Usrs.Me.Role.Logged][Gbl.Usrs.Me.UsrDat.Sex]);
HTM_SPAN_End ();
}
@@ -3833,6 +3834,7 @@ void Usr_ListUsersToSelect (Rol_Role_t Role,struct SelectedUsrs *SelectedUsrs)
static void Usr_PutCheckboxToSelectAllUsers (Rol_Role_t Role,
struct SelectedUsrs *SelectedUsrs)
{
+ extern const char *The_ClassBgHighlight[The_NUM_THEMES];
extern const char *Txt_ROLES_SINGUL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS];
extern const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS];
char *ParamName;
@@ -3840,7 +3842,9 @@ static void Usr_PutCheckboxToSelectAllUsers (Rol_Role_t Role,
HTM_TR_Begin (NULL);
- HTM_TH_Begin (1,Usr_GetColumnsForSelectUsrs (),"LM LIGHT_BLUE");
+ HTM_TH_Begin (1,Usr_GetColumnsForSelectUsrs (),
+ Str_BuildString ("LM %s",The_ClassBgHighlight[Gbl.Prefs.Theme]));
+ Str_FreeStrings ();
HTM_LABEL_Begin (NULL);
if (Usr_NameSelUnsel[Role] && Usr_ParamUsrCod[Role])
@@ -3987,20 +3991,26 @@ void Usr_SetUsrDatMainFieldNames (void)
void Usr_WriteHeaderFieldsUsrDat (bool PutCheckBoxToSelectUsr)
{
+ extern const char *The_ClassBgHighlight[The_NUM_THEMES];
unsigned NumCol;
+ const char *ClassHeader;
HTM_TR_Begin (NULL);
+ ClassHeader = Str_BuildString ("LM %s",The_ClassBgHighlight[Gbl.Prefs.Theme]);
+
/***** First column used for selection *****/
if (PutCheckBoxToSelectUsr)
- HTM_TH (1,1,"LM LIGHT_BLUE",NULL);
+ HTM_TH (1,1,ClassHeader,NULL);
/***** Columns for user's data fields *****/
for (NumCol = 0;
NumCol < Usr_NUM_MAIN_FIELDS_DATA_USR;
NumCol++)
if (NumCol != 2 || Gbl.Usrs.Listing.WithPhotos) // Skip photo column if I don't want this column
- HTM_TH (1,1,"LM LIGHT_BLUE",Usr_UsrDatMainFieldNames[NumCol]);
+ HTM_TH (1,1,ClassHeader,Usr_UsrDatMainFieldNames[NumCol]);
+
+ Str_FreeStrings ();
HTM_TR_End ();
}
@@ -4140,9 +4150,11 @@ static void Usr_ListMainDataStds (bool PutCheckBoxToSelectUsr)
static void Usr_ListMainDataTchs (Rol_Role_t Role,
bool PutCheckBoxToSelectUsr)
{
+ extern const char *The_ClassBgHighlight[The_NUM_THEMES];
unsigned NumCol;
unsigned NumUsr;
struct UsrData UsrDat;
+ const char *ClassHeader;
if (Gbl.Usrs.LstUsrs[Role].NumUsrs)
{
@@ -4154,16 +4166,20 @@ static void Usr_ListMainDataTchs (Rol_Role_t Role,
/* Begin row */
HTM_TR_Begin (NULL);
+ ClassHeader = Str_BuildString ("LM %s",The_ClassBgHighlight[Gbl.Prefs.Theme]);
+
/* First column used for selection */
if (PutCheckBoxToSelectUsr)
- HTM_TH (1,1,"LM LIGHT_BLUE",NULL);
+ HTM_TH (1,1,ClassHeader,NULL);
/* Columns for the data */
for (NumCol = 0;
NumCol < Usr_NUM_MAIN_FIELDS_DATA_USR;
NumCol++)
if (NumCol != 2 || Gbl.Usrs.Listing.WithPhotos) // Skip photo column if I don't want this column
- HTM_TH (1,1,"LM LIGHT_BLUE",Usr_UsrDatMainFieldNames[NumCol]);
+ HTM_TH (1,1,ClassHeader,Usr_UsrDatMainFieldNames[NumCol]);
+
+ Str_FreeStrings ();
/* End row */
HTM_TR_End ();
@@ -4199,6 +4215,7 @@ static void Usr_ListMainDataTchs (Rol_Role_t Role,
void Usr_ListAllDataGsts (void)
{
+ extern const char *The_ClassBgHighlight[The_NUM_THEMES];
extern const char *Txt_Photo;
extern const char *Txt_ID;
extern const char *Txt_Surname_1;
@@ -4216,6 +4233,7 @@ void Usr_ListAllDataGsts (void)
unsigned NumUsr;
struct UsrData UsrDat;
const char *FieldNames[Usr_NUM_ALL_FIELDS_DATA_GST];
+ const char *ClassHeader;
/***** Initialize field names *****/
FieldNames[ 0] = Txt_Photo;
@@ -4255,13 +4273,16 @@ void Usr_ListAllDataGsts (void)
/* Begin row */
HTM_TR_Begin (NULL);
+ ClassHeader = Str_BuildString ("LM %s",The_ClassBgHighlight[Gbl.Prefs.Theme]);
/* Columns for the data */
for (NumCol = (Gbl.Usrs.Listing.WithPhotos ? 0 :
1);
NumCol < NumColumnsCommonCard;
NumCol++)
- HTM_TH (1,1,"LM LIGHT_BLUE",FieldNames[NumCol]);
+ HTM_TH (1,1,ClassHeader,FieldNames[NumCol]);
+
+ Str_FreeStrings ();
/* End row */
HTM_TR_End ();
@@ -4308,6 +4329,7 @@ void Usr_ListAllDataGsts (void)
void Usr_ListAllDataStds (void)
{
+ extern const char *The_ClassBgHighlight[The_NUM_THEMES];
extern const char *Txt_Photo;
extern const char *Txt_ID;
extern const char *Txt_Surname_1;
@@ -4329,6 +4351,7 @@ void Usr_ListAllDataStds (void)
struct UsrData UsrDat;
const char *FieldNames[Usr_NUM_ALL_FIELDS_DATA_STD];
size_t Length;
+ const char *ClassHeader;
/***** Initialize field names *****/
FieldNames[0] = Txt_Photo;
@@ -4408,12 +4431,14 @@ void Usr_ListAllDataStds (void)
/* Begin row */
HTM_TR_Begin (NULL);
+ ClassHeader = Str_BuildString ("LM %s",The_ClassBgHighlight[Gbl.Prefs.Theme]);
+
/* 1. Columns for the data */
for (NumCol = (Gbl.Usrs.Listing.WithPhotos ? 0 :
1);
NumCol < NumColsCommonRecord;
NumCol++)
- HTM_TH (1,1,"LM LIGHT_BLUE",FieldNames[NumCol]);
+ HTM_TH (1,1,ClassHeader,FieldNames[NumCol]);
/* 2. Columns for the groups */
if (Gbl.Scope.Current == HieLvl_CRS)
@@ -4424,7 +4449,7 @@ void Usr_ListAllDataStds (void)
NumGrpTyp++)
if (Gbl.Crs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp].NumGrps) // If current course tiene groups of este type
{
- HTM_TH_Begin (1,1,"LM LIGHT_BLUE");
+ HTM_TH_Begin (1,1,ClassHeader);
HTM_TxtF ("%s %s",
Txt_Group,
Gbl.Crs.Grps.GrpTypes.LstGrpTypes[NumGrpTyp].GrpTypName);
@@ -4437,7 +4462,7 @@ void Usr_ListAllDataStds (void)
for (NumField = 0;
NumField < Gbl.Crs.Records.LstFields.Num;
NumField++)
- HTM_TH (1,1,"LM LIGHT_BLUE",Gbl.Crs.Records.LstFields.Lst[NumField].Name);
+ HTM_TH (1,1,ClassHeader,Gbl.Crs.Records.LstFields.Lst[NumField].Name);
/* 4. Visibility type for the record fields that depend on the course, in other row */
HTM_TR_End ();
@@ -4449,20 +4474,23 @@ void Usr_ListAllDataStds (void)
NumCol++)
if (NumCol != 1 || Gbl.Usrs.Listing.WithPhotos) // Skip photo column if I don't want it in listing
{
- HTM_TD_Begin ("class=\"VERY_LIGHT_BLUE\"");
+ HTM_TD_Begin ("class=\"%s\"",ClassHeader);
HTM_TD_End ();
}
for (NumField = 0;
NumField < Gbl.Crs.Records.LstFields.Num;
NumField++)
{
- HTM_TH_Begin (1,1,"LM VERY_LIGHT_BLUE");
- HTM_TxtF ("(%s)",Txt_RECORD_FIELD_VISIBILITY_RECORD[Gbl.Crs.Records.LstFields.Lst[NumField].Visibility]);
+ HTM_TH_Begin (1,1,ClassHeader);
+ HTM_TxtF ("(%s)",
+ Txt_RECORD_FIELD_VISIBILITY_RECORD[Gbl.Crs.Records.LstFields.Lst[NumField].Visibility]);
HTM_TH_End ();
}
}
}
+ Str_FreeStrings ();
+
/* End row */
HTM_TR_End ();
@@ -4654,18 +4682,24 @@ static void Usr_ListRowsAllDataTchs (Rol_Role_t Role,
const char *FieldNames[Usr_NUM_ALL_FIELDS_DATA_TCH],
unsigned NumColumns)
{
+ extern const char *The_ClassBgHighlight[The_NUM_THEMES];
unsigned NumCol;
struct UsrData UsrDat;
unsigned NumUsr;
+ const char *ClassHeader;
/***** Heading row *****/
HTM_TR_Begin (NULL);
+ ClassHeader = Str_BuildString ("LM %s",The_ClassBgHighlight[Gbl.Prefs.Theme]);
+
for (NumCol = (Gbl.Usrs.Listing.WithPhotos ? 0 :
1);
NumCol < NumColumns;
NumCol++)
- HTM_TH (1,1,"LM LIGHT_BLUE",FieldNames[NumCol]);
+ HTM_TH (1,1,ClassHeader,FieldNames[NumCol]);
+
+ Str_FreeStrings ();
HTM_TR_End ();
@@ -4726,11 +4760,11 @@ unsigned Usr_ListUsrsFound (Rol_Role_t Role,
/***** Begin box and table *****/
/* Number of users found */
Sex = Usr_GetSexOfUsrsLst (Role);
- Box_BoxTableBegin (NULL,Str_BuildStringLongStr ((long) NumUsrs,
- (Role == Rol_UNK) ? ((NumUsrs == 1) ? Txt_user[Sex] :
- Txt_users[Sex]) :
- ((NumUsrs == 1) ? Txt_ROLES_SINGUL_abc[Role][Sex] :
- Txt_ROLES_PLURAL_abc[Role][Sex])),
+ Box_BoxTableBegin (NULL,Str_BuildString ("%u %s",NumUsrs,
+ (Role == Rol_UNK) ? ((NumUsrs == 1) ? Txt_user[Sex] :
+ Txt_users[Sex]) :
+ ((NumUsrs == 1) ? Txt_ROLES_SINGUL_abc[Role][Sex] :
+ Txt_ROLES_PLURAL_abc[Role][Sex])),
NULL,NULL,
NULL,Box_NOT_CLOSABLE,2);
Str_FreeStrings ();
@@ -4810,6 +4844,7 @@ unsigned Usr_ListUsrsFound (Rol_Role_t Role,
void Usr_ListDataAdms (void)
{
extern const char *Hlp_USERS_Administrators;
+ extern const char *The_ClassBgHighlight[The_NUM_THEMES];
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS];
extern const char *Txt_Scope;
@@ -4825,6 +4860,7 @@ void Usr_ListDataAdms (void)
unsigned NumUsr;
struct UsrData UsrDat;
const char *FieldNames[Usr_NUM_MAIN_FIELDS_DATA_ADM];
+ const char *ClassHeader;
/***** Put contextual links *****/
switch (Gbl.Usrs.Me.Role.Logged)
@@ -4908,11 +4944,15 @@ void Usr_ListDataAdms (void)
HTM_TABLE_Begin (NULL);
HTM_TR_Begin (NULL);
+ ClassHeader = Str_BuildString ("LM %s",The_ClassBgHighlight[Gbl.Prefs.Theme]);
+
for (NumCol = 0;
NumCol < Usr_NUM_MAIN_FIELDS_DATA_ADM;
NumCol++)
if (NumCol != 1 || Gbl.Usrs.Listing.WithPhotos) // Skip photo column if I don't want this column
- HTM_TH (1,1,"LM LIGHT_BLUE",FieldNames[NumCol]);
+ HTM_TH (1,1,ClassHeader,FieldNames[NumCol]);
+
+ Str_FreeStrings ();
HTM_TR_End ();