");
@@ -627,16 +625,17 @@ static void Fol_ShowNumberOfFollowingOrFollowers (const struct UsrData *UsrDat,
/***** Text *****/
fprintf (Gbl.F.Out,"
",
- (Gbl.Action.Act == Action) ? The_ClassFormBold[Gbl.Prefs.Theme] :
- The_ClassForm[Gbl.Prefs.Theme]);
+ (Gbl.Action.Act == Action) ? The_ClassFormOutBoxBold[Gbl.Prefs.Theme] :
+ The_ClassFormOutBox [Gbl.Prefs.Theme]);
if (NumUsrs)
{
/* Form to list users */
Frm_StartFormAnchor (Action,Fol_FOLLOW_SECTION_ID);
Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
Frm_LinkFormSubmit (Title,
- (Gbl.Action.Act == Action) ? The_ClassFormBold[Gbl.Prefs.Theme] :
- The_ClassForm[Gbl.Prefs.Theme],NULL);
+ (Gbl.Action.Act == Action) ? The_ClassFormOutBoxBold[Gbl.Prefs.Theme] :
+ The_ClassFormOutBox [Gbl.Prefs.Theme],
+ NULL);
}
fprintf (Gbl.F.Out,"%s",Title);
if (NumUsrs)
diff --git a/swad_form.c b/swad_form.c
index 5c298bed..6976369e 100644
--- a/swad_form.c
+++ b/swad_form.c
@@ -216,32 +216,32 @@ void Frm_EndForm (void)
/*****************************************************************************/
// Requires an extern
-void Frm_LinkFormSubmit (const char *Title,const char *LinkStyle,
+void Frm_LinkFormSubmit (const char *Title,const char *LinkClass,
const char *OnSubmit)
{
- Frm_LinkFormSubmitId (Title,LinkStyle,Gbl.Form.Id,OnSubmit);
+ Frm_LinkFormSubmitId (Title,LinkClass,Gbl.Form.Id,OnSubmit);
}
-void Frm_LinkFormSubmitUnique (const char *Title,const char *LinkStyle)
+void Frm_LinkFormSubmitUnique (const char *Title,const char *LinkClass)
{
- Frm_LinkFormSubmitId (Title,LinkStyle,Gbl.Form.UniqueId,NULL);
+ Frm_LinkFormSubmitId (Title,LinkClass,Gbl.Form.UniqueId,NULL);
}
// Title can be NULL
-// LinkStyle can be NULL
+// LinkClass can be NULL
// Id can not be NULL
// OnSubmit can be NULL
-void Frm_LinkFormSubmitId (const char *Title,const char *LinkStyle,
+void Frm_LinkFormSubmitId (const char *Title,const char *LinkClass,
const char *Id,const char *OnSubmit)
{
fprintf (Gbl.F.Out,"
");
@@ -3929,7 +3929,7 @@ static void For_WriteFormForumPst (bool IsReply,const char *Subject)
{
extern const char *Hlp_SOCIAL_Forums_new_post;
extern const char *Hlp_SOCIAL_Forums_new_thread;
- extern const char *The_ClassForm[The_NUM_THEMES];
+ extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *Txt_New_post;
extern const char *Txt_New_thread;
extern const char *Txt_MSG_Subject;
@@ -3974,7 +3974,7 @@ static void For_WriteFormForumPst (bool IsReply,const char *Subject)
" required=\"required\" />"
""
"",
- The_ClassForm[Gbl.Prefs.Theme],Txt_MSG_Subject,
+ The_ClassFormInBox[Gbl.Prefs.Theme],Txt_MSG_Subject,
Cns_MAX_CHARS_SUBJECT,
IsReply ? Subject :
"");
@@ -3991,7 +3991,7 @@ static void For_WriteFormForumPst (bool IsReply,const char *Subject)
""
""
"",
- The_ClassForm[Gbl.Prefs.Theme],Txt_MSG_Content);
+ The_ClassFormInBox[Gbl.Prefs.Theme],Txt_MSG_Content);
Tbl_EndTable ();
diff --git a/swad_game.c b/swad_game.c
index cb2db74d..4d5687fa 100644
--- a/swad_game.c
+++ b/swad_game.c
@@ -1729,7 +1729,7 @@ void Gam_RequestCreatOrEditGame (void)
{
extern const char *Hlp_ASSESSMENT_Games_new_game;
extern const char *Hlp_ASSESSMENT_Games_edit_game;
- extern const char *The_ClassForm[The_NUM_THEMES];
+ extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *Txt_New_game;
extern const char *Txt_Scope;
extern const char *Txt_Edit_game;
@@ -1809,7 +1809,7 @@ void Gam_RequestCreatOrEditGame (void)
"%s: "
""
" ",
- The_ClassForm[Gbl.Prefs.Theme],
+ The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Scope);
Gam_SetDefaultAndAllowedScope (&Game);
Sco_GetScope ("ScopeGame");
@@ -1828,7 +1828,7 @@ void Gam_RequestCreatOrEditGame (void)
" required=\"required\" />"
" "
"",
- The_ClassForm[Gbl.Prefs.Theme],
+ The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Title,
Gam_MAX_CHARS_SURVEY_TITLE,Game.Title);
@@ -1843,7 +1843,7 @@ void Gam_RequestCreatOrEditGame (void)
"
"
" "
"
",
- The_ClassForm[Gbl.Prefs.Theme],Txt_Institution);
+ The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Institution);
Ins_WriteSelectorOfInstitution ();
fprintf (Gbl.F.Out," "
"");
@@ -136,7 +136,7 @@ void Hie_WriteMenuHierarchy (void)
"
%s: "
""
"
",
- The_ClassForm[Gbl.Prefs.Theme],Txt_Centre);
+ The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Centre);
Ctr_WriteSelectorOfCentre ();
fprintf (Gbl.F.Out," "
"");
@@ -150,7 +150,7 @@ void Hie_WriteMenuHierarchy (void)
"
%s: "
""
"
",
- The_ClassForm[Gbl.Prefs.Theme],Txt_Degree);
+ The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Degree);
Deg_WriteSelectorOfDegree ();
fprintf (Gbl.F.Out," "
"");
@@ -164,7 +164,7 @@ void Hie_WriteMenuHierarchy (void)
"
%s: "
""
"
",
- The_ClassForm[Gbl.Prefs.Theme],Txt_Course);
+ The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Course);
Crs_WriteSelectorOfCourse ();
fprintf (Gbl.F.Out," "
"");
diff --git a/swad_indicator.c b/swad_indicator.c
index 793f2e0c..3c416042 100644
--- a/swad_indicator.c
+++ b/swad_indicator.c
@@ -92,7 +92,7 @@ static unsigned long Ind_GetNumFilesInWorksZonesOfCrsFromDB (long CrsCod);
void Ind_ReqIndicatorsCourses (void)
{
extern const char *Hlp_ANALYTICS_Indicators;
- extern const char *The_ClassForm[The_NUM_THEMES];
+ extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *Txt_Scope;
extern const char *Txt_Types_of_degree;
extern const char *Txt_only_if_the_scope_is_X;
@@ -125,7 +125,7 @@ void Ind_ReqIndicatorsCourses (void)
"
%s: "
""
"
",
- The_ClassForm[Gbl.Prefs.Theme],Txt_Scope);
+ The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Scope);
Sco_PutSelectorScope ("ScopeInd",true);
fprintf (Gbl.F.Out," "
"");
@@ -136,7 +136,7 @@ void Ind_ReqIndicatorsCourses (void)
"
%s: "
""
"
",
- The_ClassForm[Gbl.Prefs.Theme],Txt_Types_of_degree);
+ The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Types_of_degree);
DT_WriteSelectorDegreeTypes ();
fprintf (Gbl.F.Out," (");
fprintf (Gbl.F.Out,Txt_only_if_the_scope_is_X,
@@ -151,7 +151,7 @@ void Ind_ReqIndicatorsCourses (void)
" "
"
",
Dpt_PARAM_DPT_COD_NAME,
- The_ClassForm[Gbl.Prefs.Theme],Txt_Department);
+ The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Department);
Dpt_WriteSelectorDepartment (Gbl.CurrentIns.Ins.InsCod, // Departments in current insitution
Gbl.Stat.DptCod, // Selected department
"INDICATORS_INPUT", // Selector class
@@ -178,7 +178,7 @@ void Ind_ReqIndicatorsCourses (void)
"%s:"
" "
"
",
- The_ClassForm[Gbl.Prefs.Theme],
+ The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_No_of_indicators);
Ind_ShowNumCoursesWithIndicators (NumCrssWithIndicatorYes,NumCrss,true);
fprintf (Gbl.F.Out," "
diff --git a/swad_info.c b/swad_info.c
index c9928b8f..0010608c 100644
--- a/swad_info.c
+++ b/swad_info.c
@@ -585,7 +585,7 @@ bool Inf_GetIfIMustReadAnyCrsInfoInThisCrs (void)
void Inf_WriteMsgYouMustReadInfo (void)
{
- extern const char *The_ClassForm[The_NUM_THEMES];
+ extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *Txt_Required_reading;
extern const char *Txt_You_should_read_the_following_information;
Inf_InfoType_t InfoType;
@@ -609,7 +609,7 @@ void Inf_WriteMsgYouMustReadInfo (void)
fprintf (Gbl.F.Out,"
");
Frm_StartForm (Inf_ActionsSeeInfo[InfoType]);
Frm_LinkFormSubmit (Act_GetTitleAction (Inf_ActionsSeeInfo[InfoType]),
- The_ClassForm[Gbl.Prefs.Theme],NULL);
+ The_ClassFormInBox[Gbl.Prefs.Theme],NULL);
fprintf (Gbl.F.Out,"%s"
"",
Act_GetTitleAction (Inf_ActionsSeeInfo[InfoType]));
@@ -1022,7 +1022,7 @@ void Inf_WriteURLIntoTxtBuffer (char TxtBuffer[Cns_MAX_BYTES_WWW + 1])
static void Inf_ShowPage (const char *URL)
{
- extern const char *The_ClassFormBold[The_NUM_THEMES];
+ extern const char *The_ClassFormOutBoxBold[The_NUM_THEMES];
extern const char *Txt_View_in_a_new_window;
extern const char *Txt_INFO_TITLE[Inf_NUM_INFO_TYPES];
bool ICanEdit = (Gbl.Usrs.Me.Role.Logged == Rol_TCH ||
@@ -1047,7 +1047,7 @@ static void Inf_ShowPage (const char *URL)
/***** Link to view in a new window *****/
fprintf (Gbl.F.Out,"",
- URL,The_ClassFormBold[Gbl.Prefs.Theme]);
+ URL,The_ClassFormOutBoxBold[Gbl.Prefs.Theme]);
Ico_PutIconTextLink ("expand-arrows-alt.svg",
Txt_View_in_a_new_window);
fprintf (Gbl.F.Out," ");
@@ -1080,7 +1080,7 @@ void Inf_SetInfoSrc (void)
void Inf_FormsToSelSendInfo (void)
{
- extern const char *The_ClassForm[The_NUM_THEMES];
+ extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *Txt_Source_of_information;
extern const char *Txt_INFO_SRC_FULL_TEXT[Inf_NUM_INFO_SOURCES];
extern const char *Txt_INFO_SRC_HELP[Inf_NUM_INFO_SOURCES];
@@ -1164,7 +1164,7 @@ void Inf_FormsToSelSendInfo (void)
fprintf (Gbl.F.Out," LIGHT_BLUE");
fprintf (Gbl.F.Out,"\">"
"%s ",
- (unsigned) InfoSrc,The_ClassForm[Gbl.Prefs.Theme],
+ (unsigned) InfoSrc,The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_INFO_SRC_FULL_TEXT[InfoSrc]);
if (Txt_INFO_SRC_HELP[InfoSrc])
fprintf (Gbl.F.Out," (%s) ",
@@ -1261,7 +1261,7 @@ void Inf_FormToEnterRichTextEditor (Inf_InfoSrc_t InfoSrc)
void Inf_FormToSendPage (Inf_InfoSrc_t InfoSrc)
{
- extern const char *The_ClassForm[The_NUM_THEMES];
+ extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *Txt_File;
extern const char *Txt_Upload_file;
@@ -1275,7 +1275,7 @@ void Inf_FormToSendPage (Inf_InfoSrc_t InfoSrc)
" "
""
" ",
- The_ClassForm[Gbl.Prefs.Theme],Txt_File,
+ The_ClassFormInBox[Gbl.Prefs.Theme],Txt_File,
Fil_NAME_OF_PARAM_FILENAME_ORG);
/***** Send button *****/
@@ -1291,7 +1291,7 @@ void Inf_FormToSendPage (Inf_InfoSrc_t InfoSrc)
void Inf_FormToSendURL (Inf_InfoSrc_t InfoSrc)
{
- extern const char *The_ClassForm[The_NUM_THEMES];
+ extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *Txt_URL;
extern const char *Txt_Send_URL;
char PathFile[PATH_MAX + 1];
@@ -1309,7 +1309,7 @@ void Inf_FormToSendURL (Inf_InfoSrc_t InfoSrc)
"%s: "
"
%s:"
""
"
",
- The_ClassForm[Gbl.Prefs.Theme],
+ The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Country);
if (!PrintView &&
@@ -391,7 +391,7 @@ static void Ins_Configuration (bool PrintView)
"%s: "
" "
"
",
- The_ClassForm[Gbl.Prefs.Theme],
+ The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Institution);
if (!PrintView &&
Gbl.Usrs.Me.Role.Logged == Rol_SYS_ADM)
@@ -420,7 +420,7 @@ static void Ins_Configuration (bool PrintView)
"%s: "
" "
"
",
- The_ClassForm[Gbl.Prefs.Theme],
+ The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Short_name);
if (!PrintView &&
Gbl.Usrs.Me.Role.Logged == Rol_SYS_ADM)
@@ -449,7 +449,7 @@ static void Ins_Configuration (bool PrintView)
"%s: "
" "
"
",
- The_ClassForm[Gbl.Prefs.Theme],
+ The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Web);
if (!PrintView &&
Gbl.Usrs.Me.Role.Logged >= Rol_INS_ADM)
@@ -489,7 +489,7 @@ static void Ins_Configuration (bool PrintView)
""
" "
"",
- The_ClassForm[Gbl.Prefs.Theme],
+ The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Shortcut,
Cfg_URL_SWAD_CGI,
Lan_STR_LANG_ID[Gbl.Prefs.Language],
@@ -506,7 +506,7 @@ static void Ins_Configuration (bool PrintView)
"%s:"
""
"
",
- The_ClassForm[Gbl.Prefs.Theme],
+ The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_QR_code);
QR_LinkTo (250,"ins",Gbl.CurrentIns.Ins.InsCod);
fprintf (Gbl.F.Out," "
@@ -523,7 +523,7 @@ static void Ins_Configuration (bool PrintView)
"%u"
""
"",
- The_ClassForm[Gbl.Prefs.Theme],
+ The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Users_of_the_institution,
Usr_GetNumUsrsWhoClaimToBelongToIns (Gbl.CurrentIns.Ins.InsCod));
@@ -533,7 +533,7 @@ static void Ins_Configuration (bool PrintView)
"%s:"
""
"
",
- The_ClassForm[Gbl.Prefs.Theme],
+ The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Centres);
/* Form to go to see centres of this institution */
@@ -559,7 +559,7 @@ static void Ins_Configuration (bool PrintView)
"%u"
" "
"",
- The_ClassForm[Gbl.Prefs.Theme],
+ The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Degrees,
Deg_GetNumDegsInIns (Gbl.CurrentIns.Ins.InsCod));
@@ -572,7 +572,7 @@ static void Ins_Configuration (bool PrintView)
"%u"
""
"",
- The_ClassForm[Gbl.Prefs.Theme],
+ The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Courses,
Crs_GetNumCrssInIns (Gbl.CurrentIns.Ins.InsCod));
@@ -585,7 +585,7 @@ static void Ins_Configuration (bool PrintView)
"%u"
""
"",
- The_ClassForm[Gbl.Prefs.Theme],
+ The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Departments,
Dpt_GetNumDepartmentsInInstitution (Gbl.CurrentIns.Ins.InsCod));
@@ -627,7 +627,7 @@ static void Ins_PutIconsToPrintAndUpload (void)
static void Ins_ShowNumUsrsInCrssOfIns (Rol_Role_t Role)
{
- extern const char *The_ClassForm[The_NUM_THEMES];
+ extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *Txt_Users_in_courses;
extern const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS];
@@ -639,7 +639,7 @@ static void Ins_ShowNumUsrsInCrssOfIns (Rol_Role_t Role)
"%u"
""
"",
- The_ClassForm[Gbl.Prefs.Theme],
+ The_ClassFormInBox[Gbl.Prefs.Theme],
(Role == Rol_UNK) ? Txt_Users_in_courses :
Txt_ROLES_PLURAL_Abc[Role][Usr_SEX_UNKNOWN],
Usr_GetNumUsrsInCrssOfIns (Role,Gbl.CurrentIns.Ins.InsCod));
diff --git a/swad_layout.c b/swad_layout.c
index 681dfa5a..de0f7c25 100644
--- a/swad_layout.c
+++ b/swad_layout.c
@@ -1107,7 +1107,7 @@ void Lay_PutContextualLinkIconText (Act_Action_t NextAction,const char *Anchor,
const char *Icon,
const char *Text)
{
- extern const char *The_ClassFormBold[The_NUM_THEMES];
+ extern const char *The_ClassFormOutBoxBold[The_NUM_THEMES];
/***** Separator *****/
fprintf (Gbl.F.Out," "); // This space is necessary to enable
@@ -1119,7 +1119,7 @@ void Lay_PutContextualLinkIconText (Act_Action_t NextAction,const char *Anchor,
FuncParams ();
/***** Put icon and text with link *****/
- Frm_LinkFormSubmit (Text,The_ClassFormBold[Gbl.Prefs.Theme],NULL);
+ Frm_LinkFormSubmit (Text,The_ClassFormOutBoxBold[Gbl.Prefs.Theme],NULL);
Ico_PutIconTextLink (Icon,Text);
fprintf (Gbl.F.Out,"");
@@ -1141,7 +1141,7 @@ void Lay_PutContextualLinkIconTextOnSubmit (Act_Action_t NextAction,const char *
const char *Text,
const char *OnSubmit)
{
- extern const char *The_ClassFormBold[The_NUM_THEMES];
+ extern const char *The_ClassFormOutBoxBold[The_NUM_THEMES];
/***** Separator *****/
fprintf (Gbl.F.Out," "); // This space is necessary to enable
@@ -1153,7 +1153,7 @@ void Lay_PutContextualLinkIconTextOnSubmit (Act_Action_t NextAction,const char *
FuncParams ();
/***** Put icon with link *****/
- Frm_LinkFormSubmit (Text,The_ClassFormBold[Gbl.Prefs.Theme],OnSubmit);
+ Frm_LinkFormSubmit (Text,The_ClassFormOutBoxBold[Gbl.Prefs.Theme],OnSubmit);
Ico_PutIconTextLink (Icon,Text);
fprintf (Gbl.F.Out,"");
@@ -1175,7 +1175,7 @@ void Lay_PutContextualCheckbox (Act_Action_t NextAction,
bool Checked,bool Disabled,
const char *Title,const char *Text)
{
- extern const char *The_ClassFormBold[The_NUM_THEMES];
+ extern const char *The_ClassFormOutBoxBold[The_NUM_THEMES];
/***** Separator *****/
if (Text)
@@ -1192,7 +1192,7 @@ void Lay_PutContextualCheckbox (Act_Action_t NextAction,
"
",
Checked ? "CHECKBOX_CHECKED" :
"CHECKBOX_UNCHECKED",
- The_ClassFormBold[Gbl.Prefs.Theme],
+ The_ClassFormOutBoxBold[Gbl.Prefs.Theme],
Title);
/****** Checkbox and text *****/
diff --git a/swad_logo.c b/swad_logo.c
index f13bd208..990db172 100644
--- a/swad_logo.c
+++ b/swad_logo.c
@@ -231,7 +231,7 @@ void Log_PutIconToChangeLogo (Sco_Scope_t Scope)
void Log_RequestLogo (Sco_Scope_t Scope)
{
- extern const char *The_ClassForm[The_NUM_THEMES];
+ extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *Txt_Remove_logo;
extern const char *Txt_Logo;
extern const char *Txt_You_can_send_a_file_with_an_image_in_PNG_format_transparent_background_and_size_X_Y;
@@ -301,7 +301,7 @@ void Log_RequestLogo (Sco_Scope_t Scope)
" "
" ",
- The_ClassForm[Gbl.Prefs.Theme],
+ The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_File_with_the_logo,
Fil_NAME_OF_PARAM_FILENAME_ORG,
Gbl.Form.Id);
diff --git a/swad_mail.c b/swad_mail.c
index e3daeeb6..61add83f 100644
--- a/swad_mail.c
+++ b/swad_mail.c
@@ -862,7 +862,7 @@ static void Mai_CreateMailDomain (struct Mail *Mai)
void Mai_ListEmails (void)
{
extern const char *Hlp_MESSAGES_Email;
- extern const char *The_ClassFormBold[The_NUM_THEMES];
+ extern const char *The_ClassFormOutBoxBold[The_NUM_THEMES];
extern const char *Txt_Students_who_have_accepted_and_who_have_email;
extern const char *Txt_X_students_who_have_email;
extern const char *Txt_X_students_who_have_accepted_and_who_have_email;
@@ -968,7 +968,7 @@ void Mai_ListEmails (void)
Gbl.Usrs.Me.UsrDat.Email,
StrAddresses,
Txt_Create_email_message,
- The_ClassFormBold[Gbl.Prefs.Theme]);
+ The_ClassFormOutBoxBold[Gbl.Prefs.Theme]);
Ico_PutIconTextLink ("pen.svg",
Txt_Create_email_message);
fprintf (Gbl.F.Out,""
@@ -1196,7 +1196,7 @@ void Mai_ShowFormChangeOtherUsrEmail (void)
static void Mai_ShowFormChangeUsrEmail (const struct UsrData *UsrDat,bool ItsMe,
bool IMustFillInEmail,bool IShouldConfirmEmail)
{
- extern const char *The_ClassForm[The_NUM_THEMES];
+ extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *Txt_Before_going_to_any_other_option_you_must_fill_in_your_email_address;
extern const char *Txt_Please_confirm_your_email_address;
extern const char *Txt_Current_email;
@@ -1256,7 +1256,7 @@ static void Mai_ShowFormChangeUsrEmail (const struct UsrData *UsrDat,bool ItsMe,
""
""
"
",
- The_ClassForm[Gbl.Prefs.Theme],
+ The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Current_email);
else // NumEmail >= 2
{
@@ -1267,7 +1267,7 @@ static void Mai_ShowFormChangeUsrEmail (const struct UsrData *UsrDat,bool ItsMe,
"%s:"
"",
NumEmails - 1,
- The_ClassForm[Gbl.Prefs.Theme],
+ The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Other_emails);
fprintf (Gbl.F.Out," "
"
");
@@ -1358,7 +1358,7 @@ static void Mai_ShowFormChangeUsrEmail (const struct UsrData *UsrDat,bool ItsMe,
"%s: "
" "
"
",
- The_ClassForm[Gbl.Prefs.Theme],
+ The_ClassFormInBox[Gbl.Prefs.Theme],
NumEmails ? Txt_New_email : // A new email
Txt_Email); // The first email
if (ItsMe)
diff --git a/swad_mark.c b/swad_mark.c
index 786d5317..74bbf55d 100644
--- a/swad_mark.c
+++ b/swad_mark.c
@@ -109,7 +109,7 @@ void Mrk_GetAndWriteNumRowsHeaderAndFooter (Brw_FileType_t FileType,
const char *PathInTree,
const char *FileName)
{
- extern const char *The_ClassFormNoWrap[The_NUM_THEMES];
+ extern const char *The_ClassFormInBoxNoWrap[The_NUM_THEMES];
extern const char *Txt_TABLE_Header;
extern const char *Txt_TABLE_Footer;
struct MarksProperties Marks;
@@ -126,7 +126,7 @@ void Mrk_GetAndWriteNumRowsHeaderAndFooter (Brw_FileType_t FileType,
/***** Write the number of rows of header *****/
fprintf (Gbl.F.Out," ",
- The_ClassFormNoWrap[Gbl.Prefs.Theme],
+ The_ClassFormInBoxNoWrap[Gbl.Prefs.Theme],
Gbl.RowEvenOdd);
if (Gbl.CurrentCrs.Grps.GrpCod > 0) // Group zone
{
@@ -153,7 +153,7 @@ void Mrk_GetAndWriteNumRowsHeaderAndFooter (Brw_FileType_t FileType,
/***** Write the number of rows of footer *****/
fprintf (Gbl.F.Out," ",
- The_ClassFormNoWrap[Gbl.Prefs.Theme],
+ The_ClassFormInBoxNoWrap[Gbl.Prefs.Theme],
Gbl.RowEvenOdd);
if (Gbl.CurrentCrs.Grps.GrpCod > 0) // Group zone
{
diff --git a/swad_message.c b/swad_message.c
index c27fe733..119f7a44 100644
--- a/swad_message.c
+++ b/swad_message.c
@@ -177,7 +177,7 @@ void Msg_FormMsgUsrs (void)
static void Msg_PutFormMsgUsrs (char Content[Cns_MAX_BYTES_LONG_TEXT + 1])
{
extern const char *Hlp_MESSAGES_Write;
- extern const char *The_ClassForm[The_NUM_THEMES];
+ extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *Txt_Reply_message;
extern const char *Txt_New_message;
extern const char *Txt_MSG_To;
@@ -294,7 +294,7 @@ static void Msg_PutFormMsgUsrs (char Content[Cns_MAX_BYTES_LONG_TEXT + 1])
"%s:"
" "
"
",
- The_ClassForm[Gbl.Prefs.Theme],Txt_MSG_To);
+ The_ClassFormInBox[Gbl.Prefs.Theme],Txt_MSG_To);
if (Gbl.Msg.ShowOnlyOneRecipient)
/***** Show only one user as recipient *****/
Msg_ShowOneUniqueRecipient ();
@@ -495,7 +495,7 @@ static void Msg_WriteFormUsrsIDsOrNicksOtherRecipients (void)
static void Msg_WriteFormSubjectAndContentMsgToUsrs (char Content[Cns_MAX_BYTES_LONG_TEXT + 1])
{
- extern const char *The_ClassForm[The_NUM_THEMES];
+ extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *Txt_MSG_Subject;
extern const char *Txt_MSG_Content;
extern const char *Txt_Original_message;
@@ -518,7 +518,7 @@ static void Msg_WriteFormSubjectAndContentMsgToUsrs (char Content[Cns_MAX_BYTES_
" "
" "
"",
- (unsigned) NumURL,The_ClassForm[Gbl.Prefs.Theme],
+ (unsigned) NumURL,The_ClassFormInBox[Gbl.Prefs.Theme],
Gbl.Prefs.URLIcons,Net_WebsAndSocialNetworksIcons[NumURL],
Net_WebsAndSocialNetworksTitle[NumURL],
Net_WebsAndSocialNetworksTitle[NumURL],
diff --git a/swad_nickname.c b/swad_nickname.c
index 46d7e79d..34b7e810 100644
--- a/swad_nickname.c
+++ b/swad_nickname.c
@@ -216,7 +216,7 @@ static void Nck_ShowFormChangeUsrNickname (const struct UsrData *UsrDat,bool Its
bool IMustFillNickname)
{
extern const char *Hlp_PROFILE_Account;
- extern const char *The_ClassForm[The_NUM_THEMES];
+ extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *Txt_Nickname;
extern const char *Txt_Before_going_to_any_other_option_you_must_fill_your_nickname;
extern const char *Txt_Current_nickname;
@@ -278,7 +278,7 @@ static void Nck_ShowFormChangeUsrNickname (const struct UsrData *UsrDat,bool Its
""
""
"
",
- The_ClassForm[Gbl.Prefs.Theme],
+ The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Current_nickname);
else // NumNick >= 2
{
@@ -291,7 +291,7 @@ static void Nck_ShowFormChangeUsrNickname (const struct UsrData *UsrDat,bool Its
""
" ",
NumNicks - 1,
- The_ClassForm[Gbl.Prefs.Theme],
+ The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Other_nicknames);
fprintf (Gbl.F.Out,"
");
@@ -373,7 +373,7 @@ static void Nck_ShowFormChangeUsrNickname (const struct UsrData *UsrDat,bool Its
""
" "
"
",
- The_ClassForm[Gbl.Prefs.Theme],
+ The_ClassFormInBox[Gbl.Prefs.Theme],
NumNicks ? Txt_New_nickname : // A new nickname
Txt_Nickname); // The first nickname
if (ItsMe)
diff --git a/swad_notification.c b/swad_notification.c
index 07cba6b6..2313079b 100644
--- a/swad_notification.c
+++ b/swad_notification.c
@@ -1916,7 +1916,7 @@ void Ntf_MarkAllNotifAsSeen (void)
void Ntf_PutFormChangeNotifSentByEMail (void)
{
extern const char *Hlp_PROFILE_Preferences_notifications;
- extern const char *The_ClassForm[The_NUM_THEMES];
+ extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *Txt_Save_changes;
extern const char *Txt_Notifications;
extern const char *Txt_Create_BR_notification;
@@ -1961,7 +1961,7 @@ void Ntf_PutFormChangeNotifSentByEMail (void)
" "
"
"
" "
"",
- The_ClassForm[Gbl.Prefs.Theme],Txt_nick_email_or_ID,
+ The_ClassFormInBox[Gbl.Prefs.Theme],Txt_nick_email_or_ID,
Cns_MAX_CHARS_EMAIL_ADDRESS,Gbl.Usrs.Me.UsrIdLogin);
/***** Send button and end box *****/
@@ -664,7 +664,7 @@ bool Pwd_FastCheckIfPasswordSeemsGood (const char *PlainPassword)
void Pwd_ShowFormChgMyPwd (void)
{
extern const char *Hlp_PROFILE_Password;
- extern const char *The_ClassForm[The_NUM_THEMES];
+ extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *Txt_Before_going_to_any_other_option_you_must_create_your_password;
extern const char *Txt_Your_password_is_not_secure_enough;
extern const char *Txt_Your_password_must_be_at_least_X_characters_and_can_not_contain_spaces_;
@@ -717,7 +717,7 @@ void Pwd_ShowFormChgMyPwd (void)
" autocomplete=\"off\" required=\"required\" />"
" "
"",
- The_ClassForm[Gbl.Prefs.Theme],
+ The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Current_password,
Pwd_MAX_CHARS_PLAIN_PASSWORD);
@@ -750,7 +750,7 @@ void Pwd_ShowFormChgMyPwd (void)
void Pwd_PutFormToGetNewPasswordOnce (void)
{
- extern const char *The_ClassForm[The_NUM_THEMES];
+ extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *Txt_Password;
extern const char *Txt_HELP_password;
@@ -762,7 +762,7 @@ void Pwd_PutFormToGetNewPasswordOnce (void)
"
"
" "
""
"",
- The_ClassForm[Gbl.Prefs.Theme],
+ The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_I_understand_that_this_action_can_not_be_undone,
- The_ClassForm[Gbl.Prefs.Theme],
+ The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_For_security_enter_your_password,
Pwd_MAX_CHARS_PLAIN_PASSWORD);
}
diff --git a/swad_photo.c b/swad_photo.c
index 5a7b9bc1..17b39cfc 100644
--- a/swad_photo.c
+++ b/swad_photo.c
@@ -294,7 +294,7 @@ static void Pho_ReqOtherUsrPhoto (void)
static void Pho_ReqPhoto (const struct UsrData *UsrDat)
{
extern const char *Hlp_PROFILE_Photo;
- extern const char *The_ClassForm[The_NUM_THEMES];
+ extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *Txt_Photo;
extern const char *Txt_You_can_send_a_file_with_an_image_in_JPEG_format_;
extern const char *Txt_File_with_the_photo;
@@ -338,7 +338,7 @@ static void Pho_ReqPhoto (const struct UsrData *UsrDat)
" "
"",
- The_ClassForm[Gbl.Prefs.Theme],
+ The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_File_with_the_photo,
Fil_NAME_OF_PARAM_FILENAME_ORG,
Gbl.Form.Id);
@@ -1245,7 +1245,7 @@ void Pho_ShowUsrPhoto (const struct UsrData *UsrDat,const char *PhotoURL,
Fol_GetNumFollow (UsrDat->UsrCod,&NumFollowing,&NumFollowers);
fprintf (Gbl.F.Out,""
"%u "
- " %s "
+ " %s "
"%u "
" %s "
"
",
@@ -1769,7 +1769,7 @@ void Pho_ShowOrPrintPhotoDegree (Pho_AvgPhotoSeeOrPrint_t SeeOrPrint)
static void Pho_PutSelectorForTypeOfAvg (void)
{
- extern const char *The_ClassForm[The_NUM_THEMES];
+ extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *Txt_Average_type;
extern const char *Txt_AVERAGE_PHOTO_TYPES[Pho_NUM_AVERAGE_PHOTO_TYPES];
Pho_AvgPhotoTypeOfAverage_t TypeOfAvg;
@@ -1779,7 +1779,7 @@ static void Pho_PutSelectorForTypeOfAvg (void)
"%s: "
" "
"
",
- The_ClassForm[Gbl.Prefs.Theme],Txt_Average_type);
+ The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Average_type);
Frm_StartForm (ActSeePhoDeg);
Pho_PutHiddenParamPhotoSize ();
Pho_PutHiddenParamOrderDegrees ();
@@ -1830,7 +1830,7 @@ static Pho_AvgPhotoTypeOfAverage_t Pho_GetPhotoAvgTypeFromForm (void)
static void Pho_PutSelectorForHowComputePhotoSize (void)
{
- extern const char *The_ClassForm[The_NUM_THEMES];
+ extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *Txt_Size_of_photos;
extern const char *Txt_STAT_DEGREE_PHOTO_SIZE[Pho_NUM_HOW_COMPUTE_PHOTO_SIZES];
Pho_HowComputePhotoSize_t PhoSi;
@@ -1840,7 +1840,7 @@ static void Pho_PutSelectorForHowComputePhotoSize (void)
"%s: "
" "
"
",
- The_ClassForm[Gbl.Prefs.Theme],Txt_Size_of_photos);
+ The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Size_of_photos);
Frm_StartForm (ActSeePhoDeg);
Pho_PutHiddenParamTypeOfAvg ();
Pho_PutHiddenParamOrderDegrees ();
@@ -1891,7 +1891,7 @@ static Pho_HowComputePhotoSize_t Pho_GetHowComputePhotoSizeFromForm (void)
static void Pho_PutSelectorForHowOrderDegrees (void)
{
- extern const char *The_ClassForm[The_NUM_THEMES];
+ extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *Txt_Sort_degrees_by;
extern const char *Txt_STAT_DEGREE_PHOTO_ORDER[Pho_NUM_HOW_ORDER_DEGREES];
Pho_HowOrderDegrees_t Order;
@@ -1901,7 +1901,7 @@ static void Pho_PutSelectorForHowOrderDegrees (void)
"%s: "
" "
"
",
- The_ClassForm[Gbl.Prefs.Theme],Txt_Sort_degrees_by);
+ The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Sort_degrees_by);
Frm_StartForm (ActSeePhoDeg);
Pho_PutHiddenParamTypeOfAvg ();
Pho_PutHiddenParamPhotoSize ();
@@ -1969,7 +1969,7 @@ static void Pho_PutLinkToPrintViewOfDegreeStatsParams (void)
static void Pho_PutLinkToCalculateDegreeStats (void)
{
- extern const char *The_ClassFormBold[The_NUM_THEMES];
+ extern const char *The_ClassFormInBoxBold[The_NUM_THEMES];
extern const char *Txt_Calculate_average_photo_of_THE_DEGREE_X;
extern const char *Txt_unknown_TIME;
extern const char *Txt_time;
@@ -1997,7 +1997,7 @@ static void Pho_PutLinkToCalculateDegreeStats (void)
Pho_PutHiddenParamOrderDegrees ();
Usr_PutParamsPrefsAboutUsrList ();
Frm_LinkFormSubmitAnimated (Txt_Calculate_average_photo_of_THE_DEGREE_X,
- The_ClassFormBold[Gbl.Prefs.Theme],
+ The_ClassFormInBoxBold[Gbl.Prefs.Theme],
NULL);
Ico_PutCalculateIconWithText (Txt_Calculate_average_photo_of_THE_DEGREE_X);
diff --git a/swad_privacy.c b/swad_privacy.c
index 476bab64..f44b01b2 100644
--- a/swad_privacy.c
+++ b/swad_privacy.c
@@ -148,7 +148,7 @@ static void Pri_PutFormVisibility (const char *TxtLabel,
Pri_Visibility_t CurrentVisibilityInDB,
unsigned MaskAllowedVisibility)
{
- extern const char *The_ClassForm[The_NUM_THEMES];
+ extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *Txt_PRIVACY_OPTIONS[Pri_NUM_OPTIONS_PRIVACY];
Pri_Visibility_t Visibility;
@@ -158,7 +158,7 @@ static void Pri_PutFormVisibility (const char *TxtLabel,
"%s:"
" "
"
",
- The_ClassForm[Gbl.Prefs.Theme],TxtLabel);
+ The_ClassFormInBox[Gbl.Prefs.Theme],TxtLabel);
/***** Form with list of options *****/
if (Action != ActUnk)
diff --git a/swad_profile.c b/swad_profile.c
index d1dddcc4..8aa20cdc 100644
--- a/swad_profile.c
+++ b/swad_profile.c
@@ -74,7 +74,7 @@ extern struct Globals Gbl;
/***************************** Private prototypes ****************************/
/*****************************************************************************/
-static void Prf_PutLinkToUpdateAction (Act_Action_t Action,const char *EncryptedUsrCod);
+static void Prf_PutLinkCalculateFigures (Act_Action_t Action,const char *EncryptedUsrCod);
static unsigned long Prf_GetRankingFigure (long UsrCod,const char *FieldName);
static unsigned long Prf_GetNumUsrsWithFigure (const char *FieldName);
@@ -161,7 +161,7 @@ void Prf_RequestUserProfile (void)
{
extern const char *Hlp_SOCIAL_Profiles_view_public_profile;
extern const char *Txt_Another_user_s_profile;
- extern const char *The_ClassForm[The_NUM_THEMES];
+ extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *Txt_Nickname;
extern const char *Txt_Continue;
@@ -189,7 +189,7 @@ void Prf_RequestUserProfile (void)
" "
"",
- The_ClassForm[Gbl.Prefs.Theme],
+ The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Nickname,
Nck_MAX_BYTES_NICKNAME_FROM_FORM,
Gbl.Usrs.Me.UsrDat.Nickname);
@@ -463,7 +463,7 @@ void Prf_ShowDetailsUserProfile (const struct UsrData *UsrDat)
}
else // First click time is unknown or user never logged
/***** Button to fetch and store first click time *****/
- Prf_PutLinkToUpdateAction (ActCal1stClkTim,UsrDat->EncryptedUsrCod);
+ Prf_PutLinkCalculateFigures (ActCal1stClkTim,UsrDat->EncryptedUsrCod);
fprintf (Gbl.F.Out,"");
/***** End left list *****/
@@ -503,7 +503,7 @@ void Prf_ShowDetailsUserProfile (const struct UsrData *UsrDat)
}
else // Number of clicks is unknown
/***** Button to fetch and store number of clicks *****/
- Prf_PutLinkToUpdateAction (ActCalNumClk,UsrDat->EncryptedUsrCod);
+ Prf_PutLinkCalculateFigures (ActCalNumClk,UsrDat->EncryptedUsrCod);
fprintf (Gbl.F.Out,"");
/***** Number of file views *****/
@@ -530,7 +530,7 @@ void Prf_ShowDetailsUserProfile (const struct UsrData *UsrDat)
}
else // Number of file views is unknown
/***** Button to fetch and store number of file views *****/
- Prf_PutLinkToUpdateAction (ActCalNumFilVie,UsrDat->EncryptedUsrCod);
+ Prf_PutLinkCalculateFigures (ActCalNumFilVie,UsrDat->EncryptedUsrCod);
fprintf (Gbl.F.Out,"");
/***** Number of posts in forums *****/
@@ -557,7 +557,7 @@ void Prf_ShowDetailsUserProfile (const struct UsrData *UsrDat)
}
else // Number of forum posts is unknown
/***** Button to fetch and store number of forum posts *****/
- Prf_PutLinkToUpdateAction (ActCalNumForPst,UsrDat->EncryptedUsrCod);
+ Prf_PutLinkCalculateFigures (ActCalNumForPst,UsrDat->EncryptedUsrCod);
fprintf (Gbl.F.Out,"");
@@ -585,7 +585,7 @@ void Prf_ShowDetailsUserProfile (const struct UsrData *UsrDat)
}
else // Number of messages sent is unknown
/***** Button to fetch and store number of messages sent *****/
- Prf_PutLinkToUpdateAction (ActCalNumMsgSnt,UsrDat->EncryptedUsrCod);
+ Prf_PutLinkCalculateFigures (ActCalNumMsgSnt,UsrDat->EncryptedUsrCod);
fprintf (Gbl.F.Out,"");
}
@@ -598,15 +598,16 @@ void Prf_ShowDetailsUserProfile (const struct UsrData *UsrDat)
/******** Put contextual link with animated icon to update an action *********/
/*****************************************************************************/
-static void Prf_PutLinkToUpdateAction (Act_Action_t Action,const char *EncryptedUsrCod)
+static void Prf_PutLinkCalculateFigures (Act_Action_t Action,const char *EncryptedUsrCod)
{
- extern const char *The_ClassForm[The_NUM_THEMES];
+ extern const char *The_ClassFormOutBoxBold[The_NUM_THEMES];
extern const char *Txt_Calculate;
Frm_StartForm (Action);
Usr_PutParamUsrCodEncrypted (EncryptedUsrCod);
- Frm_LinkFormSubmitAnimated (Txt_Calculate,The_ClassForm[Gbl.Prefs.Theme],
- NULL);
+ Frm_LinkFormSubmitAnimated (Txt_Calculate,
+ The_ClassFormOutBoxBold[Gbl.Prefs.Theme],
+ NULL);
Ico_PutCalculateIconWithText (Txt_Calculate);
Frm_EndForm ();
}
@@ -744,7 +745,7 @@ static unsigned long Prf_GetNumUsrsWithNumClicksPerDay (void)
static void Prf_ShowRanking (unsigned long Rank,unsigned long NumUsrs)
{
- extern const char *The_ClassForm[The_NUM_THEMES];
+ extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *Txt_of_PART_OF_A_TOTAL;
/***** Part of a total and end container *****/
@@ -756,7 +757,7 @@ static void Prf_ShowRanking (unsigned long Rank,unsigned long NumUsrs)
Frm_StartForm (ActSeeUseGbl);
Sco_PutParamScope ("ScopeSta",Sco_SCOPE_SYS);
Par_PutHiddenParamUnsigned ("FigureType",(unsigned) Fig_USERS_RANKING);
- Frm_LinkFormSubmit (Gbl.Title,The_ClassForm[Gbl.Prefs.Theme],NULL);
+ Frm_LinkFormSubmit (Gbl.Title,The_ClassFormInBox[Gbl.Prefs.Theme],NULL);
fprintf (Gbl.F.Out,"#%lu",Rank);
Frm_EndForm ();
}
diff --git a/swad_project.c b/swad_project.c
index 36b89bb9..3afc211e 100644
--- a/swad_project.c
+++ b/swad_project.c
@@ -1194,12 +1194,12 @@ static void Prj_ShowOneProject (unsigned NumIndex,struct Project *Prj,
static void Prj_PutIconToToggleProject (unsigned UniqueId,
const char *Icon,const char *Text)
{
- extern const char *The_ClassForm[The_NUM_THEMES];
+ extern const char *The_ClassFormInBox[The_NUM_THEMES];
/***** Link to toggle on/off some fields of project *****/
fprintf (Gbl.F.Out," ",
- Text,The_ClassForm[Gbl.Prefs.Theme],
+ Text,The_ClassFormInBox[Gbl.Prefs.Theme],
UniqueId);
Ico_PutIconTextLink (Icon,Text);
fprintf (Gbl.F.Out,"");
@@ -2898,7 +2898,7 @@ static void Prj_PutFormProject (struct Project *Prj,bool ItsANewProject)
{
extern const char *Hlp_ASSESSMENT_Projects_new_project;
extern const char *Hlp_ASSESSMENT_Projects_edit_project;
- extern const char *The_ClassForm[The_NUM_THEMES];
+ extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *Txt_New_project;
extern const char *Txt_Edit_project;
extern const char *Txt_Data;
@@ -2972,7 +2972,7 @@ static void Prj_PutFormProject (struct Project *Prj,bool ItsANewProject)
" required=\"required\" />"
" "
"",
- The_ClassForm[Gbl.Prefs.Theme],Txt_Title,
+ The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Title,
Prj_MAX_CHARS_PROJECT_TITLE,Prj->Title);
/* Department */
@@ -2982,7 +2982,7 @@ static void Prj_PutFormProject (struct Project *Prj,bool ItsANewProject)
""
"
",
Dpt_PARAM_DPT_COD_NAME,
- The_ClassForm[Gbl.Prefs.Theme],Txt_Department);
+ The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Department);
Dpt_WriteSelectorDepartment (Gbl.CurrentIns.Ins.InsCod, // Departments in current institution
Prj->DptCod, // Selected department
"PRJ_INPUT", // Selector class
@@ -2999,7 +2999,7 @@ static void Prj_PutFormProject (struct Project *Prj,bool ItsANewProject)
" "
"
"
"",
- The_ClassForm[Gbl.Prefs.Theme],
+ The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Preassigned_QUESTION);
fprintf (Gbl.F.Out," "
" "
"",
- The_ClassForm[Gbl.Prefs.Theme],
+ The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Number_of_students,
Prj->NumStds);
@@ -3037,7 +3037,7 @@ static void Prj_PutFormProject (struct Project *Prj,bool ItsANewProject)
""
"
"
"",
- The_ClassForm[Gbl.Prefs.Theme],
+ The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Proposal);
for (Proposal = (Prj_Proposal_t) 0;
Proposal <= (Prj_Proposal_t) (Prj_NUM_PROPOSAL_TYPES - 1);
@@ -3075,7 +3075,7 @@ static void Prj_PutFormProject (struct Project *Prj,bool ItsANewProject)
" size=\"45\" maxlength=\"%u\" value=\"%s\" />"
" "
"",
- The_ClassForm[Gbl.Prefs.Theme],
+ The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_URL,
Cns_MAX_CHARS_WWW,Prj->URL);
@@ -3100,7 +3100,7 @@ static void Prj_EditOneProjectTxtArea (const char *Id,
const char *Label,char *TxtField,
unsigned NumRows)
{
- extern const char *The_ClassForm[The_NUM_THEMES];
+ extern const char *The_ClassFormInBox[The_NUM_THEMES];
fprintf (Gbl.F.Out,"
"
""
@@ -3112,7 +3112,7 @@ static void Prj_EditOneProjectTxtArea (const char *Id,
""
" "
" ",
- Id,The_ClassForm[Gbl.Prefs.Theme],Label,
+ Id,The_ClassFormInBox[Gbl.Prefs.Theme],Label,
Id,Id,
NumRows,
TxtField);
diff --git a/swad_record.c b/swad_record.c
index 810d9eda..da2f2a09 100644
--- a/swad_record.c
+++ b/swad_record.c
@@ -1501,19 +1501,19 @@ static void Rec_ListRecordsTchs (Rec_SharedRecordViewType_t TypeOfView)
static void Rec_ShowLinkToPrintPreviewOfRecords (void)
{
- extern const char *The_ClassFormBold[The_NUM_THEMES];
- extern const char *The_ClassForm[The_NUM_THEMES];
+ extern const char *The_ClassFormOutBoxBold[The_NUM_THEMES];
+ extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *Txt_Print;
extern const char *Txt_record_cards_per_page;
unsigned i;
- Frm_LinkFormSubmit (Txt_Print,The_ClassFormBold[Gbl.Prefs.Theme],NULL);
+ Frm_LinkFormSubmit (Txt_Print,The_ClassFormOutBoxBold[Gbl.Prefs.Theme],NULL);
Ico_PutIconTextLink ("print.svg",
Txt_Print);
fprintf (Gbl.F.Out,""
"
"
"(",
- The_ClassForm[Gbl.Prefs.Theme]);
+ The_ClassFormInBox[Gbl.Prefs.Theme]);
for (i = Rec_MIN_RECORDS_PER_PAGE;
i <= Rec_MAX_RECORDS_PER_PAGE;
i++)
@@ -1678,7 +1678,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_ClassForm[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;
const char *Rec_RecordHelp[Rec_COURSE_NUM_VIEW_TYPES] =
@@ -1819,7 +1819,7 @@ static void Rec_ShowCrsRecord (Rec_CourseRecordViewType_t TypeOfView,
fprintf (Gbl.F.Out,""
""
"%s:",
- ICanEditThisField ? The_ClassForm[Gbl.Prefs.Theme] :
+ ICanEditThisField ? The_ClassFormInBox[Gbl.Prefs.Theme] :
"REC_DAT_SMALL",
Gbl.RowEvenOdd,
Gbl.CurrentCrs.Records.LstFields.Lst[NumField].Name);
@@ -2146,7 +2146,7 @@ void Rec_ShowSharedUsrRecord (Rec_SharedRecordViewType_t TypeOfView,
extern const char *Hlp_USERS_Guests;
extern const char *Hlp_USERS_Students_shared_record_card;
extern const char *Hlp_USERS_Teachers_shared_record_card;
- extern const char *The_ClassForm[The_NUM_THEMES];
+ extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *Txt_Sign_up;
extern const char *Txt_Save_changes;
extern const char *Txt_Register;
@@ -2241,7 +2241,7 @@ void Rec_ShowSharedUsrRecord (Rec_SharedRecordViewType_t TypeOfView,
case Rec_SHA_MY_RECORD_FORM:
case Rec_SHA_OTHER_NEW_USR_FORM:
case Rec_SHA_OTHER_EXISTING_USR_FORM:
- ClassForm = The_ClassForm[Gbl.Prefs.Theme];
+ ClassForm = The_ClassFormInBox[Gbl.Prefs.Theme];
break;
case Rec_SHA_OTHER_USR_CHECK:
case Rec_SHA_RECORD_LIST:
@@ -3963,7 +3963,7 @@ void Rec_ShowMySharedRecordAndMore (void)
static void Rec_ShowFormMyInsCtrDpt (bool IAmATeacher)
{
extern const char *Hlp_PROFILE_Institution;
- extern const char *The_ClassForm[The_NUM_THEMES];
+ extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *Txt_Institution_centre_and_department;
extern const char *Txt_Institution;
extern const char *Txt_Country;
@@ -3973,7 +3973,7 @@ static void Rec_ShowFormMyInsCtrDpt (bool IAmATeacher)
extern const char *Txt_Department;
extern const char *Txt_Office;
extern const char *Txt_Phone;
- const char *ClassForm = The_ClassForm[Gbl.Prefs.Theme];
+ const char *ClassForm = The_ClassFormInBox[Gbl.Prefs.Theme];
unsigned NumCty;
unsigned NumIns;
unsigned NumCtr;
diff --git a/swad_search.c b/swad_search.c
index 30750a32..eacf12d0 100644
--- a/swad_search.c
+++ b/swad_search.c
@@ -98,7 +98,7 @@ void Sch_ReqSysSearch (void)
static void Sch_PutFormToSearchWithWhatToSearchAndScope (Act_Action_t Action,Sco_Scope_t DefaultScope)
{
extern const char *Hlp_Search;
- extern const char *The_ClassForm[The_NUM_THEMES];
+ extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *Txt_Scope;
extern const char *Txt_SEARCH_X_in_Y;
extern const char *Txt_all;
@@ -144,7 +144,7 @@ static void Sch_PutFormToSearchWithWhatToSearchAndScope (Act_Action_t Action,Sco
current centre, current degree or current course) *****/
fprintf (Gbl.F.Out,""
"%s: ",
- The_ClassForm[Gbl.Prefs.Theme],Txt_Scope);
+ The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Scope);
Gbl.Scope.Allowed = 1 << Sco_SCOPE_SYS |
1 << Sco_SCOPE_CTY |
1 << Sco_SCOPE_INS |
@@ -163,7 +163,7 @@ static void Sch_PutFormToSearchWithWhatToSearchAndScope (Act_Action_t Action,Sco
/***** What to search? *****/
fprintf (Gbl.F.Out,""
" %s ",
- The_ClassForm[Gbl.Prefs.Theme],Txt_SEARCH_X_in_Y);
+ The_ClassFormInBox[Gbl.Prefs.Theme],Txt_SEARCH_X_in_Y);
fprintf (Gbl.F.Out,"");
for (WhatToSearch = (Sch_WhatToSearch_t) 0;
WhatToSearch < Sch_NUM_WHAT_TO_SEARCH;
diff --git a/swad_social.c b/swad_social.c
index a20b193a..0a239456 100644
--- a/swad_social.c
+++ b/swad_social.c
@@ -1294,7 +1294,7 @@ static void Soc_ShowOldPubsInTimeline (char *Query)
static void Soc_PutLinkToViewNewPublishings (void)
{
- extern const char *The_ClassFormBold[The_NUM_THEMES];
+ extern const char *The_ClassFormOutBoxBold[The_NUM_THEMES];
extern const char *Txt_See_new_activity;
/***** Link to view (show hidden) new publishings *****/
@@ -1307,7 +1307,7 @@ static void Soc_PutLinkToViewNewPublishings (void)
"%s (0 )"
""
"
",
- The_ClassFormBold[Gbl.Prefs.Theme],
+ The_ClassFormOutBoxBold[Gbl.Prefs.Theme],
Txt_See_new_activity);
}
@@ -1317,7 +1317,7 @@ static void Soc_PutLinkToViewNewPublishings (void)
static void Soc_PutLinkToViewOldPublishings (void)
{
- extern const char *The_ClassFormBold[The_NUM_THEMES];
+ extern const char *The_ClassFormOutBoxBold[The_NUM_THEMES];
extern const char *Txt_See_more;
/***** Animated link to view old publishings *****/
@@ -1337,7 +1337,7 @@ static void Soc_PutLinkToViewOldPublishings (void)
" %s"
""
"",
- The_ClassFormBold[Gbl.Prefs.Theme],
+ The_ClassFormOutBoxBold[Gbl.Prefs.Theme],
Gbl.Prefs.URLIcons,Txt_See_more,Txt_See_more,
Gbl.Prefs.URLIcons,Txt_See_more,Txt_See_more,
Txt_See_more);
@@ -1800,7 +1800,7 @@ static void Soc_GetAndWriteSocialPost (long PstCod)
static void Soc_PutFormGoToAction (const struct SocialNote *SocNot)
{
extern const Act_Action_t For_ActionsSeeFor[For_NUM_TYPES_FORUM];
- extern const char *The_ClassFormBold[The_NUM_THEMES];
+ extern const char *The_ClassFormOutBoxBold[The_NUM_THEMES];
extern const char *Txt_SOCIAL_NOTE[Soc_NUM_NOTE_TYPES];
extern const char *Txt_not_available;
char Class[64];
@@ -1957,7 +1957,7 @@ static void Soc_PutFormGoToAction (const struct SocialNote *SocNot)
/***** Link and end form *****/
snprintf (Class,sizeof (Class),
"%s ICO_HIGHLIGHT",
- The_ClassFormBold[Gbl.Prefs.Theme]);
+ The_ClassFormOutBoxBold[Gbl.Prefs.Theme]);
Frm_LinkFormSubmitUnique (Txt_SOCIAL_NOTE[SocNot->NoteType],Class);
fprintf (Gbl.F.Out," "
" "
"",
- The_ClassForm[Gbl.Prefs.Theme],Txt_Users,
- The_ClassForm[Gbl.Prefs.Theme]);
+ The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Users,
+ The_ClassFormInBox[Gbl.Prefs.Theme]);
Usr_ListUsersToSelect (Rol_TCH);
Usr_ListUsersToSelect (Rol_NET);
Usr_ListUsersToSelect (Rol_STD);
@@ -398,7 +398,7 @@ void Sta_AskShowCrsHits (void)
fprintf (Gbl.F.Out,""
"%s: "
"",
- The_ClassForm[Gbl.Prefs.Theme],Txt_Show);
+ The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Show);
if ((Gbl.Stat.ClicksGroupedBy < Sta_CLICKS_CRS_PER_USR ||
Gbl.Stat.ClicksGroupedBy > Sta_CLICKS_CRS_PER_ACTION) &&
@@ -417,7 +417,7 @@ void Sta_AskShowCrsHits (void)
fprintf (Gbl.F.Out," %s "
"",
- The_ClassForm[Gbl.Prefs.Theme],Txt_distributed_by);
+ The_ClassFormInBox[Gbl.Prefs.Theme],Txt_distributed_by);
for (ClicksGroupedBy = Sta_CLICKS_CRS_PER_USR;
ClicksGroupedBy <= Sta_CLICKS_CRS_PER_ACTION;
ClicksGroupedBy++)
@@ -502,7 +502,7 @@ void Sta_AskShowCrsHits (void)
void Sta_AskShowGblHits (void)
{
extern const char *Hlp_ANALYTICS_Visits_global_visits;
- extern const char *The_ClassForm[The_NUM_THEMES];
+ extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *Txt_Statistics_of_all_visits;
extern const char *Txt_Users;
extern const char *Txt_ROLE_STATS[Sta_NUM_ROLES_STAT];
@@ -542,7 +542,7 @@ void Sta_AskShowGblHits (void)
" "
""
"",
- The_ClassForm[Gbl.Prefs.Theme],Txt_Users);
+ The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Users);
for (RoleStat = (Sta_Role_t) 0;
RoleStat < Sta_NUM_ROLES_STAT;
RoleStat++)
@@ -565,7 +565,7 @@ void Sta_AskShowGblHits (void)
"%s: "
" "
"",
- The_ClassForm[Gbl.Prefs.Theme],Txt_Scope);
+ The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Scope);
Gbl.Scope.Allowed = 1 << Sco_SCOPE_SYS |
1 << Sco_SCOPE_CTY |
1 << Sco_SCOPE_INS |
@@ -584,12 +584,12 @@ void Sta_AskShowGblHits (void)
"%s: "
" "
"",
- The_ClassForm[Gbl.Prefs.Theme],Txt_Show);
+ The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Show);
Sta_WriteSelectorCountType ();
/***** Type of statistic *****/
fprintf (Gbl.F.Out," %s ",
- The_ClassForm[Gbl.Prefs.Theme],Txt_distributed_by);
+ The_ClassFormInBox[Gbl.Prefs.Theme],Txt_distributed_by);
if (Gbl.Stat.ClicksGroupedBy < Sta_CLICKS_GBL_PER_DAY ||
Gbl.Stat.ClicksGroupedBy > Sta_CLICKS_GBL_PER_COURSE)
@@ -689,7 +689,7 @@ static void Sta_WriteSelectorCountType (void)
static void Sta_WriteSelectorAction (void)
{
- extern const char *The_ClassForm[The_NUM_THEMES];
+ extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *Txt_Action;
extern const char *Txt_TABS_TXT[Tab_NUM_TABS];
Act_Action_t Action;
@@ -703,7 +703,7 @@ static void Sta_WriteSelectorAction (void)
""
"",
- The_ClassForm[Gbl.Prefs.Theme],Txt_Action);
+ The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Action);
for (Action = (Act_Action_t) 0;
Action < Act_NUM_ACTIONS;
Action++)
@@ -2067,7 +2067,7 @@ static void Sta_ShowNumHitsPerDay (unsigned long NumRows,MYSQL_RES *mysql_res)
static void Sta_ShowDistrAccessesPerDayAndHour (unsigned long NumRows,MYSQL_RES *mysql_res)
{
- extern const char *The_ClassForm[The_NUM_THEMES];
+ extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *Txt_Color_of_the_graphic;
extern const char *Txt_STAT_COLOR_TYPES[Sta_NUM_COLOR_TYPES];
extern const char *Txt_Date;
@@ -2115,7 +2115,7 @@ static void Sta_ShowDistrAccessesPerDayAndHour (unsigned long NumRows,MYSQL_RES
fprintf (Gbl.F.Out,"%s: "
"",
- The_ClassForm[Gbl.Prefs.Theme],
+ The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Color_of_the_graphic,
Gbl.Form.Id);
for (ColorType = (Sta_ColorType_t) 0;
diff --git a/swad_survey.c b/swad_survey.c
index eb700160..535d3566 100644
--- a/swad_survey.c
+++ b/swad_survey.c
@@ -1774,7 +1774,7 @@ void Svy_RequestCreatOrEditSvy (void)
{
extern const char *Hlp_ASSESSMENT_Surveys_new_survey;
extern const char *Hlp_ASSESSMENT_Surveys_edit_survey;
- extern const char *The_ClassForm[The_NUM_THEMES];
+ extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *Txt_New_survey;
extern const char *Txt_Scope;
extern const char *Txt_Edit_survey;
@@ -1858,7 +1858,7 @@ void Svy_RequestCreatOrEditSvy (void)
"%s: "
" "
"",
- The_ClassForm[Gbl.Prefs.Theme],
+ The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Scope);
Svy_SetDefaultAndAllowedScope (&Svy);
Sco_GetScope ("ScopeSvy");
@@ -1877,7 +1877,7 @@ void Svy_RequestCreatOrEditSvy (void)
" required=\"required\" />"
" "
" ",
- The_ClassForm[Gbl.Prefs.Theme],
+ The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Title,
Svy_MAX_CHARS_SURVEY_TITLE,Svy.Title);
@@ -1892,7 +1892,7 @@ void Svy_RequestCreatOrEditSvy (void)
""
"",
- The_ClassForm[Gbl.Prefs.Theme],
+ The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Description);
if (!ItsANewSurvey)
fprintf (Gbl.F.Out,"%s",Txt);
@@ -1905,7 +1905,7 @@ void Svy_RequestCreatOrEditSvy (void)
"%s:"
" "
"",
- The_ClassForm[Gbl.Prefs.Theme],
+ The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Users);
Rol_WriteSelectorRoles (1 << Rol_STD |
1 << Rol_NET |
@@ -2028,7 +2028,7 @@ static void Svy_SetDefaultAndAllowedScope (struct Survey *Svy)
static void Svy_ShowLstGrpsToEditSurvey (long SvyCod)
{
- extern const char *The_ClassForm[The_NUM_THEMES];
+ extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *Txt_Groups;
extern const char *Txt_The_whole_course;
unsigned NumGrpTyp;
@@ -2044,7 +2044,7 @@ static void Svy_ShowLstGrpsToEditSurvey (long SvyCod)
"%s:"
" "
"",
- The_ClassForm[Gbl.Prefs.Theme],
+ The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Groups);
Box_StartBoxTable ("95%",NULL,NULL,
NULL,Box_NOT_CLOSABLE,0);
@@ -2596,7 +2596,7 @@ static void Svy_ShowFormEditOneQst (long SvyCod,struct SurveyQuestion *SvyQst,
char Txt[Cns_MAX_BYTES_TEXT + 1])
{
extern const char *Hlp_ASSESSMENT_Surveys_questions;
- extern const char *The_ClassForm[The_NUM_THEMES];
+ extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *Txt_Question;
extern const char *Txt_New_question;
extern const char *Txt_Stem;
@@ -2696,7 +2696,7 @@ static void Svy_ShowFormEditOneQst (long SvyCod,struct SurveyQuestion *SvyQst,
""
" "
"",
- The_ClassForm[Gbl.Prefs.Theme],Txt_Stem,
+ The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Stem,
Txt);
/***** Type of answer *****/
@@ -2705,9 +2705,9 @@ static void Svy_ShowFormEditOneQst (long SvyCod,struct SurveyQuestion *SvyQst,
"%s:"
" "
"",
- The_ClassForm[Gbl.Prefs.Theme],
+ The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Type,
- The_ClassForm[Gbl.Prefs.Theme]);
+ The_ClassFormInBox[Gbl.Prefs.Theme]);
for (AnsType = (Svy_AnswerType_t) 0;
AnsType < Svy_NUM_ANS_TYPES;
AnsType++)
@@ -2741,7 +2741,7 @@ static void Svy_ShowFormEditOneQst (long SvyCod,struct SurveyQuestion *SvyQst,
" "
"%u) "
" ",
- NumAns,The_ClassForm[Gbl.Prefs.Theme],NumAns + 1);
+ NumAns,The_ClassFormInBox[Gbl.Prefs.Theme],NumAns + 1);
/* Answer text */
fprintf (Gbl.F.Out,""
diff --git a/swad_test.c b/swad_test.c
index 9af95f9c..f75b4bba 100644
--- a/swad_test.c
+++ b/swad_test.c
@@ -312,7 +312,7 @@ static void Tst_GetTestResultQuestionsFromDB (long TstCod);
void Tst_ShowFormAskTst (void)
{
extern const char *Hlp_ASSESSMENT_Tests;
- extern const char *The_ClassForm[The_NUM_THEMES];
+ extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *Txt_Take_a_test;
extern const char *Txt_No_of_questions;
extern const char *Txt_Generate_test;
@@ -369,7 +369,7 @@ void Tst_ShowFormAskTst (void)
" "
" "
@@ -1112,7 +1112,7 @@ static void Tst_PutFormToEditQstImage (struct Image *Image,int NumImgInForm,
const char *ClassImgTitURL,
bool OptionsDisabled)
{
- extern const char *The_ClassForm[The_NUM_THEMES];
+ extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *Txt_No_image;
extern const char *Txt_Current_image;
extern const char *Txt_Change_image;
@@ -1133,7 +1133,7 @@ static void Tst_PutFormToEditQstImage (struct Image *Image,int NumImgInForm,
/***** Choice 1: No image *****/
fprintf (Gbl.F.Out,""
" "
" "
" "
"%s:"
" ",
- The_ClassForm[Gbl.Prefs.Theme],Txt_Tags);
+ The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Tags);
/***** Select all tags *****/
fprintf (Gbl.F.Out,""
""
" "
@@ -1890,7 +1890,7 @@ static void Tst_PutIconDisable (long TagCod,const char *TagTxt)
static void Tst_ShowFormConfigTst (void)
{
extern const char *Hlp_ASSESSMENT_Tests;
- extern const char *The_ClassForm[The_NUM_THEMES];
+ extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *Txt_Configure_tests;
extern const char *Txt_Plugins;
extern const char *Txt_TST_PLUGGABLE[Tst_NUM_OPTIONS_PLUGGABLE];
@@ -1922,7 +1922,7 @@ static void Tst_ShowFormConfigTst (void)
"%s:"
" "
"",
- The_ClassForm[Gbl.Prefs.Theme],
+ The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Plugins);
for (Pluggable = Tst_PLUGGABLE_NO;
Pluggable <= Tst_PLUGGABLE_YES;
@@ -1947,7 +1947,7 @@ static void Tst_ShowFormConfigTst (void)
"%s:"
" "
"",
- The_ClassForm[Gbl.Prefs.Theme],
+ The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_No_of_questions);
Tbl_StartTable (2);
Tst_PutInputFieldNumQst ("NumQstMin",Txt_minimum,
@@ -1974,7 +1974,7 @@ static void Tst_ShowFormConfigTst (void)
" required=\"required\" />"
" "
"",
- The_ClassForm[Gbl.Prefs.Theme],
+ The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Minimum_time_seconds_per_question_between_two_tests,
Gbl.Test.Config.MinTimeNxtTstPerQst);
@@ -1984,7 +1984,7 @@ static void Tst_ShowFormConfigTst (void)
"%s:"
""
"",
- The_ClassForm[Gbl.Prefs.Theme],Txt_Feedback_to_students);
+ The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Feedback_to_students);
for (Feedback = (Tst_Feedback_t) 0;
Feedback < Tst_NUM_TYPES_FEEDBACK;
Feedback++)
@@ -2308,7 +2308,7 @@ static void Tst_CheckAndCorrectNumbersQst (void)
static void Tst_ShowFormAnswerTypes (unsigned NumCols)
{
- extern const char *The_ClassForm[The_NUM_THEMES];
+ extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *Txt_Types_of_answers;
extern const char *Txt_All_types_of_answers;
extern const char *Txt_TST_STR_ANSWER_TYPES[Tst_NUM_ANS_TYPES];
@@ -2321,7 +2321,7 @@ static void Tst_ShowFormAnswerTypes (unsigned NumCols)
" "
"%s:"
" ",
- The_ClassForm[Gbl.Prefs.Theme],Txt_Types_of_answers);
+ The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Types_of_answers);
/***** Select all types of answers *****/
fprintf (Gbl.F.Out,""
""
" "
@@ -4945,7 +4945,7 @@ static void Tst_PutFormEditOneQst (char Stem[Cns_MAX_BYTES_TEXT + 1],
char Feedback[Cns_MAX_BYTES_TEXT + 1])
{
extern const char *Hlp_ASSESSMENT_Tests;
- extern const char *The_ClassForm[The_NUM_THEMES];
+ extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *Txt_Question_code_X;
extern const char *Txt_New_question;
extern const char *Txt_Tags;
@@ -5014,7 +5014,7 @@ static void Tst_PutFormEditOneQst (char Stem[Cns_MAX_BYTES_TEXT + 1],
"%s:"
" "
"",
- The_ClassForm[Gbl.Prefs.Theme],Txt_Tags);
+ The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Tags);
Tbl_StartTable (2); // Table for tags
for (NumTag = 0;
@@ -5082,7 +5082,7 @@ static void Tst_PutFormEditOneQst (char Stem[Cns_MAX_BYTES_TEXT + 1],
" class=\"STEM\" rows=\"5\" required=\"required\">"
"%s"
" ",
- The_ClassForm[Gbl.Prefs.Theme],
+ The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Stem,
Stem);
Tst_PutFormToEditQstImage (&Gbl.Test.Image,-1,
@@ -5095,7 +5095,7 @@ static void Tst_PutFormEditOneQst (char Stem[Cns_MAX_BYTES_TEXT + 1],
fprintf (Gbl.F.Out,""
"%s (%s): "
"",
- The_ClassForm[Gbl.Prefs.Theme],
+ The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Feedback,Txt_optional);
if (Feedback)
if (Feedback[0])
@@ -5111,9 +5111,9 @@ static void Tst_PutFormEditOneQst (char Stem[Cns_MAX_BYTES_TEXT + 1],
"%s:"
" "
"",
- The_ClassForm[Gbl.Prefs.Theme],
+ The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Type,
- The_ClassForm[Gbl.Prefs.Theme]);
+ The_ClassFormInBox[Gbl.Prefs.Theme]);
for (AnsType = (Tst_AnswerType_t) 0;
AnsType < Tst_NUM_ANS_TYPES;
AnsType++)
@@ -5142,8 +5142,8 @@ static void Tst_PutFormEditOneQst (char Stem[Cns_MAX_BYTES_TEXT + 1],
"%s: "
" "
""
" "
"%c)",
- The_ClassForm[Gbl.Prefs.Theme],Gbl.RowEvenOdd,
+ The_ClassFormInBox[Gbl.Prefs.Theme],Gbl.RowEvenOdd,
'a' + (char) NumOpt);
/* Icon to expand (show the answer) */
@@ -5308,7 +5308,7 @@ static void Tst_PutFormEditOneQst (char Stem[Cns_MAX_BYTES_TEXT + 1],
/* Feedback */
fprintf (Gbl.F.Out,"%s (%s): "
"%s "
" "
" "
"",
- The_ClassForm[Gbl.Prefs.Theme],Txt_Users,
- The_ClassForm[Gbl.Prefs.Theme]);
+ The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Users,
+ The_ClassFormInBox[Gbl.Prefs.Theme]);
Tbl_StartTable (2);
Usr_ListUsersToSelect (Rol_TCH);
Usr_ListUsersToSelect (Rol_NET);
diff --git a/swad_test_import.c b/swad_test_import.c
index 046c2049..117f59b1 100644
--- a/swad_test_import.c
+++ b/swad_test_import.c
@@ -127,7 +127,7 @@ void TsI_PutFormToImportQuestions (void)
void TsI_ShowFormImportQstsFromXML (void)
{
extern const char *Hlp_ASSESSMENT_Tests;
- extern const char *The_ClassForm[The_NUM_THEMES];
+ extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *Txt_Import_questions;
extern const char *Txt_You_need_an_XML_file_containing_a_list_of_questions;
extern const char *Txt_XML_file;
@@ -146,7 +146,7 @@ void TsI_ShowFormImportQstsFromXML (void)
" "
"",
- The_ClassForm[Gbl.Prefs.Theme],
+ The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_XML_file,
Fil_NAME_OF_PARAM_FILENAME_ORG,
Gbl.Form.Id);
@@ -162,7 +162,7 @@ void TsI_ShowFormImportQstsFromXML (void)
void TsI_CreateXML (unsigned long NumRows,MYSQL_RES *mysql_res)
{
- extern const char *The_ClassFormBold[The_NUM_THEMES];
+ extern const char *The_ClassFormOutBoxBold[The_NUM_THEMES];
extern const char *Tst_StrAnswerTypesXML[Tst_NUM_ANS_TYPES];
extern const char *Txt_NEW_LINE;
extern const char *Txt_XML_file;
@@ -261,7 +261,7 @@ void TsI_CreateXML (unsigned long NumRows,MYSQL_RES *mysql_res)
fprintf (Gbl.F.Out,"",
Cfg_URL_SWAD_PUBLIC,Cfg_FOLDER_FILE_BROWSER_TMP,
Gbl.FileBrowser.TmpPubDir,
- The_ClassFormBold[Gbl.Prefs.Theme]);
+ The_ClassFormOutBoxBold[Gbl.Prefs.Theme]);
Ico_PutIconTextLink ("file.svg",
Txt_XML_file);
fprintf (Gbl.F.Out," ");
diff --git a/swad_theme.c b/swad_theme.c
index df193f69..b294d500 100644
--- a/swad_theme.c
+++ b/swad_theme.c
@@ -199,44 +199,54 @@ const char *The_ClassTitle[The_NUM_THEMES] =
"TITLE_PINK",
};
-const char *The_ClassForm[The_NUM_THEMES] =
+const char *The_ClassFormInBox[The_NUM_THEMES] =
{
- "FORM_WHITE",
- "FORM_GREY",
- "FORM_PURPLE",
- "FORM_BLUE",
- "FORM_YELLOW",
- "FORM_PINK",
+ "FORM_IN_WHITE",
+ "FORM_IN_GREY",
+ "FORM_IN_PURPLE",
+ "FORM_IN_BLUE",
+ "FORM_IN_YELLOW",
+ "FORM_IN_PINK",
};
-const char *The_ClassFormDark[The_NUM_THEMES] =
+const char *The_ClassFormInBoxBold[The_NUM_THEMES] =
{
- "FORM_DARK_WHITE",
- "FORM_DARK_GREY",
- "FORM_DARK_PURPLE",
- "FORM_DARK_BLUE",
- "FORM_DARK_YELLOW",
- "FORM_DARK_PINK",
+ "FORM_IN_WHITE BOLD",
+ "FORM_IN_GREY BOLD",
+ "FORM_IN_PURPLE BOLD",
+ "FORM_IN_BLUE BOLD",
+ "FORM_IN_YELLOW BOLD",
+ "FORM_IN_PINK BOLD",
};
-const char *The_ClassFormNoWrap[The_NUM_THEMES] =
+const char *The_ClassFormInBoxNoWrap[The_NUM_THEMES] =
{
- "FORM_NOWRAP_WHITE",
- "FORM_NOWRAP_GREY",
- "FORM_NOWRAP_PURPLE",
- "FORM_NOWRAP_BLUE",
- "FORM_NOWRAP_YELLOW",
- "FORM_NOWRAP_PINK",
+ "FORM_IN_WHITE NOWRAP",
+ "FORM_IN_GREY NOWRAP",
+ "FORM_IN_PURPLE NOWRAP",
+ "FORM_IN_BLUE NOWRAP",
+ "FORM_IN_YELLOW NOWRAP",
+ "FORM_IN_PINK NOWRAP",
};
-const char *The_ClassFormBold[The_NUM_THEMES] =
+const char *The_ClassFormOutBox[The_NUM_THEMES] =
{
- "FORM_BOLD_WHITE",
- "FORM_BOLD_GREY",
- "FORM_BOLD_PURPLE",
- "FORM_BOLD_BLUE",
- "FORM_BOLD_YELLOW",
- "FORM_BOLD_PINK",
+ "FORM_OUT_WHITE",
+ "FORM_OUT_GREY",
+ "FORM_OUT_PURPLE",
+ "FORM_OUT_BLUE",
+ "FORM_OUT_YELLOW",
+ "FORM_OUT_PINK",
+ };
+
+const char *The_ClassFormOutBoxBold[The_NUM_THEMES] =
+ {
+ "FORM_OUT_WHITE BOLD",
+ "FORM_OUT_GREY BOLD",
+ "FORM_OUT_PURPLE BOLD",
+ "FORM_OUT_BLUE BOLD",
+ "FORM_OUT_YELLOW BOLD",
+ "FORM_OUT_PINK BOLD",
};
/*****************************************************************************/
diff --git a/swad_user.c b/swad_user.c
index 7bd4dc03..8d9a22d2 100644
--- a/swad_user.c
+++ b/swad_user.c
@@ -3317,7 +3317,7 @@ static void Usr_SetMyPrefsAndRoles (void)
void Usr_ShowFormsLogoutAndRole (void)
{
extern const char *Hlp_PROFILE_Session_role;
- extern const char *The_ClassForm[The_NUM_THEMES];
+ extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *Txt_Session;
extern const char *Txt_Role;
extern const char *Txt_You_are_now_LOGGED_IN_as_X;
@@ -3344,7 +3344,7 @@ void Usr_ShowFormsLogoutAndRole (void)
else
{
fprintf (Gbl.F.Out,"%s: ",
- The_ClassForm[Gbl.Prefs.Theme],Txt_Role);
+ The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Role);
Rol_PutFormToChangeMyRole (NULL);
fprintf (Gbl.F.Out," ");
}
@@ -5901,7 +5901,7 @@ void Usr_ShowFormsToSelectUsrListType (Act_Action_t NextAction)
static void Usr_FormToSelectUsrListType (Act_Action_t NextAction,Usr_ShowUsrsType_t ListType)
{
- extern const char *The_ClassFormNoWrap[The_NUM_THEMES];
+ extern const char *The_ClassFormInBoxNoWrap[The_NUM_THEMES];
extern const char *Txt_USR_LIST_TYPES[Usr_NUM_USR_LIST_TYPES];
/***** Start form *****/
@@ -5913,7 +5913,7 @@ static void Usr_FormToSelectUsrListType (Act_Action_t NextAction,Usr_ShowUsrsTyp
/***** Link and image *****/
Frm_LinkFormSubmit (Txt_USR_LIST_TYPES[ListType],
- The_ClassFormNoWrap[Gbl.Prefs.Theme],
+ The_ClassFormInBoxNoWrap[Gbl.Prefs.Theme],
NextAction == ActReqMsgUsr ? "CopyMessageToHiddenFields()" :
NULL);
fprintf (Gbl.F.Out," "
" "
@@ -6983,7 +6983,7 @@ unsigned Usr_ListUsrsFound (Rol_Role_t Role,
void Usr_ListDataAdms (void)
{
extern const char *Hlp_USERS_Administrators;
- extern const char *The_ClassForm[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;
extern const char *Txt_No_INDEX;
@@ -7066,7 +7066,7 @@ void Usr_ListDataAdms (void)
Frm_StartForm (ActLstOth);
Usr_PutParamListWithPhotos ();
fprintf (Gbl.F.Out,"%s: ",
- The_ClassForm[Gbl.Prefs.Theme],Txt_Scope);
+ The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Scope);
Sco_PutSelectorScope ("ScopeUsr",true);
fprintf (Gbl.F.Out," ");
Frm_EndForm ();
@@ -7492,7 +7492,7 @@ static void Usr_PutLinkToSeeGuests (void)
void Usr_SeeGuests (void)
{
extern const char *Hlp_USERS_Guests;
- extern const char *The_ClassForm[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;
extern const char *Txt_Show_records;
@@ -7535,7 +7535,7 @@ void Usr_SeeGuests (void)
Frm_StartForm (ActLstGst);
Usr_PutParamsPrefsAboutUsrList ();
fprintf (Gbl.F.Out,"%s: ",
- The_ClassForm[Gbl.Prefs.Theme],Txt_Scope);
+ The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Scope);
Sco_PutSelectorScope ("ScopeUsr",true);
fprintf (Gbl.F.Out," ");
Frm_EndForm ();
@@ -7615,7 +7615,7 @@ void Usr_SeeGuests (void)
void Usr_SeeStudents (void)
{
extern const char *Hlp_USERS_Students;
- extern const char *The_ClassForm[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;
extern const char *Txt_Show_records;
@@ -7685,7 +7685,7 @@ void Usr_SeeStudents (void)
Frm_StartForm (ActLstStd);
Usr_PutParamsPrefsAboutUsrList ();
fprintf (Gbl.F.Out,"%s: ",
- The_ClassForm[Gbl.Prefs.Theme],Txt_Scope);
+ The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Scope);
Sco_PutSelectorScope ("ScopeUsr",true);
fprintf (Gbl.F.Out," ");
Frm_EndForm ();
@@ -7788,7 +7788,7 @@ void Usr_SeeStudents (void)
void Usr_SeeTeachers (void)
{
extern const char *Hlp_USERS_Teachers;
- extern const char *The_ClassForm[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;
extern const char *Txt_Show_records;
@@ -7864,7 +7864,7 @@ void Usr_SeeTeachers (void)
Frm_StartForm (ActLstTch);
Usr_PutParamsPrefsAboutUsrList ();
fprintf (Gbl.F.Out,"%s: ",
- The_ClassForm[Gbl.Prefs.Theme],Txt_Scope);
+ The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Scope);
Sco_PutSelectorScope ("ScopeUsr",true);
fprintf (Gbl.F.Out," ");
Frm_EndForm ();
@@ -8392,7 +8392,7 @@ static void Usr_DrawClassPhoto (Usr_ClassPhotoType_t ClassPhotoType,
void Usr_PutSelectorNumColsClassPhoto (void)
{
- extern const char *The_ClassForm[The_NUM_THEMES];
+ extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *Txt_columns;
unsigned Cols;
@@ -8400,7 +8400,7 @@ void Usr_PutSelectorNumColsClassPhoto (void)
fprintf (Gbl.F.Out,""
"",
- The_ClassForm[Gbl.Prefs.Theme],Gbl.Form.Id);
+ The_ClassFormInBox[Gbl.Prefs.Theme],Gbl.Form.Id);
/***** Put a row in selector for every number from 1 to Usr_CLASS_PHOTO_COLS_MAX *****/
for (Cols = 1;
diff --git a/swad_zip.c b/swad_zip.c
index 31cb01af..99eb2657 100644
--- a/swad_zip.c
+++ b/swad_zip.c
@@ -374,14 +374,14 @@ static void ZIP_CreateDirCompressionUsr (struct UsrData *UsrDat)
void ZIP_PutButtonToDownloadZIPOfAFolder (const char *PathInTree,const char *FileName)
{
- extern const char *The_ClassForm[The_NUM_THEMES];
+ extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *Txt_Create_ZIP_file;
Frm_StartForm (ZIP_ActZIPFolder[Gbl.FileBrowser.Type]);
Brw_PutParamsFileBrowser (ZIP_ActZIPFolder[Gbl.FileBrowser.Type],
PathInTree,FileName,
Brw_IS_FOLDER,-1L);
- Frm_LinkFormSubmit (Txt_Create_ZIP_file,The_ClassForm[Gbl.Prefs.Theme],NULL);
+ Frm_LinkFormSubmit (Txt_Create_ZIP_file,The_ClassFormInBox[Gbl.Prefs.Theme],NULL);
fprintf (Gbl.F.Out," "
@@ -625,7 +625,7 @@ static unsigned long long ZIP_CloneDir (const char *Path,const char *PathClone,c
static void ZIP_ShowLinkToDownloadZIP (const char *FileName,const char *URL,
off_t FileSize,unsigned long long UncompressedSize)
{
- extern const char *The_ClassForm[The_NUM_THEMES];
+ extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *Txt_ZIP_file;
extern const char *Txt_Download;
extern const char *Txt_Filename;
@@ -668,7 +668,7 @@ static void ZIP_ShowLinkToDownloadZIP (const char *FileName,const char *URL,
"%s "
" "
"",
- The_ClassForm[Gbl.Prefs.Theme],Txt_Filename,
+ The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Filename,
URL,FileName,FileName);
/***** Write the file size *****/
@@ -679,7 +679,7 @@ static void ZIP_ShowLinkToDownloadZIP (const char *FileName,const char *URL,
" "
""
"%s",
- The_ClassForm[Gbl.Prefs.Theme],
+ The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_File_size,
FileSizeStr);
if (UncompressedSize)