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

Version 18.55

This commit is contained in:
Antonio Cañas Vargas 2019-02-22 21:47:50 +01:00
parent 642324598a
commit 25dc463ca9
53 changed files with 474 additions and 475 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
css/swad18.54.css → css/swad18.55.css
View File

@ -2024,33 +2024,24 @@ a:hover img.CENTRE_PHOTO_SHOW
}
/********************************* Form fonts ********************************/
.FORM_WHITE {color:#4D88A1; font-size:13pt;}
.FORM_GREY {color:#4D88A1; font-size:13pt;}
.FORM_PURPLE {color:#4D88A1; font-size:13pt;}
.FORM_BLUE {color:#4D88A1; font-size:13pt;}
.FORM_YELLOW {color:#7C4D2A; font-size:13pt;}
.FORM_PINK {color:#4D88A1; font-size:13pt;}
/* Inside white box */
.FORM_IN_WHITE {color:#4d88a1; font-size:13pt;}
.FORM_IN_GREY {color:#4d88a1; font-size:13pt;}
.FORM_IN_PURPLE {color:#4d88a1; font-size:13pt;}
.FORM_IN_BLUE {color:#4d88a1; font-size:13pt;}
.FORM_IN_YELLOW {color:#7c4d2a; font-size:13pt;}
.FORM_IN_PINK {color:#4d88a1; font-size:13pt;}
.FORM_DARK_WHITE {color:#365E6E; font-size:13pt;}
.FORM_DARK_GREY {color:#365E6E; font-size:13pt;}
.FORM_DARK_PURPLE {color:#365E6E; font-size:13pt;}
.FORM_DARK_BLUE {color:#365E6E; font-size:13pt;}
.FORM_DARK_YELLOW {color:#4A2E19; font-size:13pt;}
.FORM_DARK_PINK {color:#365E6E; font-size:13pt;}
/* Outside white box */
.FORM_OUT_WHITE {color:#4d88a1; font-size:13pt;}
.FORM_OUT_GREY {color:#4d88a1; font-size:13pt;}
.FORM_OUT_PURPLE {color:#573c4d; font-size:13pt;}
.FORM_OUT_BLUE {color:#4d88a1; font-size:13pt;}
.FORM_OUT_YELLOW {color:#7c4d2a; font-size:13pt;}
.FORM_OUT_PINK {color:#63474e; font-size:13pt;}
.FORM_NOWRAP_WHITE {color:#4D88A1; font-size:13pt; white-space:nowrap;}
.FORM_NOWRAP_GREY {color:#4D88A1; font-size:13pt; white-space:nowrap;}
.FORM_NOWRAP_PURPLE {color:#4D88A1; font-size:13pt; white-space:nowrap;}
.FORM_NOWRAP_BLUE {color:#4D88A1; font-size:13pt; white-space:nowrap;}
.FORM_NOWRAP_YELLOW {color:#7C4D2A; font-size:13pt; white-space:nowrap;}
.FORM_NOWRAP_PINK {color:#4D88A1; font-size:13pt; white-space:nowrap;}
.FORM_BOLD_WHITE {color:#4D88a1; font-size:13pt; font-weight:bold;}
.FORM_BOLD_GREY {color:#4D88a1; font-size:13pt; font-weight:bold;}
.FORM_BOLD_PURPLE {color:#573c4d; font-size:13pt; font-weight:bold;}
.FORM_BOLD_BLUE {color:#4D88a1; font-size:13pt; font-weight:bold;}
.FORM_BOLD_YELLOW {color:#7c4d2a; font-size:13pt; font-weight:bold;}
.FORM_BOLD_PINK {color:#63474e; font-size:13pt; font-weight:bold;}
.BOLD {font-weight:bold;}
.NOWRAP {white-space:nowrap;}
/****************************** Placing of objects ***************************/
.LEFT_TOP {text-align:left; vertical-align:top;}

10
swad_ID.c
View File

@ -455,7 +455,7 @@ bool ID_ICanSeeOtherUsrIDs (const struct UsrData *UsrDat)
static void ID_PutLinkToConfirmID (struct UsrData *UsrDat,unsigned NumID,
const char *Anchor)
{
extern const char *The_ClassFormBold[The_NUM_THEMES];
extern const char *The_ClassFormOutBoxBold[The_NUM_THEMES];
extern const char *Txt_Confirm_ID;
Act_Action_t NextAction;
@ -496,7 +496,7 @@ static void ID_PutLinkToConfirmID (struct UsrData *UsrDat,unsigned NumID,
UsrDat->IDs.List[NumID].ID);
/***** Put link *****/
Frm_LinkFormSubmit (Txt_Confirm_ID,The_ClassFormBold[Gbl.Prefs.Theme],NULL);
Frm_LinkFormSubmit (Txt_Confirm_ID,The_ClassFormOutBoxBold[Gbl.Prefs.Theme],NULL);
Ico_PutIconTextLink ("check.svg",
Txt_Confirm_ID);
fprintf (Gbl.F.Out,"</a>");
@ -577,7 +577,7 @@ static void ID_ShowFormChangeUsrID (const struct UsrData *UsrDat,
bool ItsMe,bool IShouldFillInID)
{
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_Please_fill_in_your_ID;
extern const char *Txt_ID_X_confirmed;
extern const char *Txt_ID_X_not_confirmed;
@ -612,7 +612,7 @@ static void ID_ShowFormChangeUsrID (const struct UsrData *UsrDat,
"</label>"
"</td>"
"<td class=\"REC_C2_BOT LEFT_TOP USR_ID\">",
The_ClassForm[Gbl.Prefs.Theme],Txt_ID);
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_ID);
else // NumID >= 1
fprintf (Gbl.F.Out,"<br />");
@ -684,7 +684,7 @@ static void ID_ShowFormChangeUsrID (const struct UsrData *UsrDat,
"<label for=\"NewID\" class=\"%s\">%s:</label>"
"</td>"
"<td class=\"REC_C2_BOT LEFT_TOP DAT\">",
The_ClassForm[Gbl.Prefs.Theme],
The_ClassFormInBox[Gbl.Prefs.Theme],
UsrDat->IDs.Num ? Txt_Another_ID : // A new user's ID
Txt_ID); // The first user's ID
if (ItsMe)

4
swad_MFU.c
View File

@ -206,7 +206,7 @@ void MFU_ShowMyMFUActions (void)
void MFU_WriteBigMFUActions (struct MFU_ListMFUActions *ListMFUActions)
{
extern const char *Hlp_ANALYTICS_Frequent;
extern const char *The_ClassFormNoWrap[The_NUM_THEMES];
extern const char *The_ClassFormInBoxNoWrap[The_NUM_THEMES];
extern const char *Txt_My_frequent_actions;
extern const char *Txt_TABS_TXT[Tab_NUM_TABS];
unsigned NumAct;
@ -243,7 +243,7 @@ void MFU_WriteBigMFUActions (struct MFU_ListMFUActions *ListMFUActions)
/* Icon and text */
fprintf (Gbl.F.Out,"<li class=\"ICO_HIGHLIGHT\">");
Frm_StartForm (Action);
Frm_LinkFormSubmit (TabMenuStr,The_ClassFormNoWrap[Gbl.Prefs.Theme],NULL);
Frm_LinkFormSubmit (TabMenuStr,The_ClassFormInBoxNoWrap[Gbl.Prefs.Theme],NULL);
fprintf (Gbl.F.Out,"<img src=\"%s/%s\" alt=\"%s\" />",
Gbl.Prefs.URLIconSet,
Act_GetIcon (Action),

10
swad_account.c
View File

@ -135,7 +135,7 @@ void Acc_ShowFormMyAccount (void)
static void Acc_ShowFormCheckIfIHaveAccount (const char *Title)
{
extern const char *Hlp_PROFILE_SignUp;
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *Txt_If_you_think_you_may_have_been_registered_;
extern const char *Txt_ID;
extern const char *Txt_Check;
@ -155,7 +155,7 @@ static void Acc_ShowFormCheckIfIHaveAccount (const char *Title)
" size=\"18\" maxlength=\"%u\" value=\"\""
" required=\"required\" />"
"</label>",
The_ClassForm[Gbl.Prefs.Theme],Txt_ID,
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_ID,
ID_MAX_CHARS_USR_ID);
Btn_PutConfirmButton (Txt_Check);
Frm_EndForm ();
@ -326,7 +326,7 @@ static void Acc_ShowFormRequestNewAccountWithParams (const char *NewNicknameWith
const char *NewEmail)
{
extern const char *Hlp_PROFILE_SignUp;
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *Txt_Create_account;
extern const char *Txt_Nickname;
extern const char *Txt_HELP_nickname;
@ -359,7 +359,7 @@ static void Acc_ShowFormRequestNewAccountWithParams (const char *NewNicknameWith
" required=\"required\" />"
"</td>"
"</tr>",
The_ClassForm[Gbl.Prefs.Theme],
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Nickname,
1 + Nck_MAX_CHARS_NICKNAME_WITHOUT_ARROBA,
Txt_HELP_nickname,
@ -377,7 +377,7 @@ static void Acc_ShowFormRequestNewAccountWithParams (const char *NewNicknameWith
" required=\"required\" />"
"</td>"
"</tr>",
The_ClassForm[Gbl.Prefs.Theme],
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Email,
Cns_MAX_CHARS_EMAIL_ADDRESS,
Txt_HELP_email,

8
swad_agenda.c
View File

@ -1444,7 +1444,7 @@ void Agd_RequestCreatOrEditEvent (void)
{
extern const char *Hlp_PROFILE_Agenda_new_event;
extern const char *Hlp_PROFILE_Agenda_edit_event;
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *Txt_New_event;
extern const char *Txt_Edit_event;
extern const char *Txt_Location;
@ -1515,7 +1515,7 @@ void Agd_RequestCreatOrEditEvent (void)
" required=\"required\" />"
"</td>"
"</tr>",
The_ClassForm[Gbl.Prefs.Theme],
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Event,
Agd_MAX_CHARS_EVENT,AgdEvent.Event);
@ -1530,7 +1530,7 @@ void Agd_RequestCreatOrEditEvent (void)
" required=\"required\" />"
"</td>"
"</tr>",
The_ClassForm[Gbl.Prefs.Theme],
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Location,
Agd_MAX_CHARS_LOCATION,AgdEvent.Location);
@ -1546,7 +1546,7 @@ void Agd_RequestCreatOrEditEvent (void)
"<td class=\"LEFT_TOP\">"
"<textarea id=\"Txt\" name=\"Txt\""
" cols=\"60\" rows=\"10\">",
The_ClassForm[Gbl.Prefs.Theme],
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Description);
if (!ItsANewEvent)
fprintf (Gbl.F.Out,"%s",Txt);

8
swad_announcement.c
View File

@ -399,7 +399,7 @@ static long Ann_GetParamAnnCod (void)
void Ann_ShowFormAnnouncement (void)
{
extern const char *Hlp_MESSAGES_Announcements;
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *Txt_New_announcement;
extern const char *Txt_MSG_Subject;
extern const char *Txt_MSG_Content;
@ -423,7 +423,7 @@ void Ann_ShowFormAnnouncement (void)
"%s: "
"</td>"
"<td class=\"DAT LEFT_TOP\">",
The_ClassForm[Gbl.Prefs.Theme],
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Users);
Rol_WriteSelectorRoles (1 << Rol_UNK |
1 << Rol_GST |
@ -453,7 +453,7 @@ void Ann_ShowFormAnnouncement (void)
static void Ann_PutSubjectMessage (const char *Field,const char *Label,
unsigned Rows)
{
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *The_ClassFormInBox[The_NUM_THEMES];
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"RIGHT_TOP\">"
@ -465,7 +465,7 @@ static void Ann_PutSubjectMessage (const char *Field,const char *Label,
"</textarea>"
"</td>"
"</tr>",
Field,The_ClassForm[Gbl.Prefs.Theme],Label,
Field,The_ClassFormInBox[Gbl.Prefs.Theme],Label,
Field,Field,Rows);
}

12
swad_assignment.c
View File

@ -1073,7 +1073,7 @@ void Asg_RequestCreatOrEditAsg (void)
{
extern const char *Hlp_ASSESSMENT_Assignments_new_assignment;
extern const char *Hlp_ASSESSMENT_Assignments_edit_assignment;
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *Txt_New_assignment;
extern const char *Txt_Edit_assignment;
extern const char *Txt_Title;
@ -1152,7 +1152,7 @@ void Asg_RequestCreatOrEditAsg (void)
" required=\"required\" />"
"</td>"
"</tr>",
The_ClassForm[Gbl.Prefs.Theme],Txt_Title,
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Title,
Asg_MAX_CHARS_ASSIGNMENT_TITLE,Asg.Title);
/***** Assignment start and end dates *****/
@ -1170,7 +1170,7 @@ void Asg_RequestCreatOrEditAsg (void)
"</label>"
"</td>"
"</tr>",
The_ClassForm[Gbl.Prefs.Theme],
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Upload_files_QUESTION,
Txt_Folder,
Brw_MAX_CHARS_FOLDER,Asg.Folder);
@ -1183,7 +1183,7 @@ void Asg_RequestCreatOrEditAsg (void)
"<td class=\"LEFT_TOP\">"
"<textarea id=\"Txt\" name=\"Txt\""
" cols=\"60\" rows=\"10\">",
The_ClassForm[Gbl.Prefs.Theme],Txt_Description);
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Description);
if (!ItsANewAssignment)
fprintf (Gbl.F.Out,"%s",Txt);
fprintf (Gbl.F.Out,"</textarea>"
@ -1213,7 +1213,7 @@ void Asg_RequestCreatOrEditAsg (void)
static void Asg_ShowLstGrpsToEditAssignment (long AsgCod)
{
extern const char *Hlp_USERS_Groups;
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;
@ -1229,7 +1229,7 @@ static void Asg_ShowLstGrpsToEditAssignment (long AsgCod)
"%s:"
"</td>"
"<td class=\"LEFT_TOP\">",
The_ClassForm[Gbl.Prefs.Theme],
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Groups);
Box_StartBoxTable ("100%",NULL,NULL,
Hlp_USERS_Groups,Box_NOT_CLOSABLE,0);

18
swad_attendance.c
View File

@ -1033,7 +1033,7 @@ void Att_RequestCreatOrEditAttEvent (void)
{
extern const char *Hlp_USERS_Attendance_new_event;
extern const char *Hlp_USERS_Attendance_edit_event;
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *Txt_New_event;
extern const char *Txt_Edit_event;
extern const char *Txt_Teachers_comment;
@ -1113,7 +1113,7 @@ void Att_RequestCreatOrEditAttEvent (void)
" required=\"required\" />"
"</td>"
"</tr>",
The_ClassForm[Gbl.Prefs.Theme],Txt_Title,
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Title,
Att_MAX_CHARS_ATTENDANCE_EVENT_TITLE,Att.Title);
/***** Assignment start and end dates *****/
@ -1126,7 +1126,7 @@ void Att_RequestCreatOrEditAttEvent (void)
"</td>"
"<td class=\"LEFT_TOP\">"
"<select id=\"ComTchVisible\" name=\"ComTchVisible\">",
The_ClassForm[Gbl.Prefs.Theme],Txt_Teachers_comment);
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Teachers_comment);
fprintf (Gbl.F.Out,"<option value=\"N\"");
if (!Att.CommentTchVisible)
@ -1152,7 +1152,7 @@ void Att_RequestCreatOrEditAttEvent (void)
"<td class=\"LEFT_TOP\">"
"<textarea id=\"Txt\" name=\"Txt\""
" cols=\"60\" rows=\"5\">",
The_ClassForm[Gbl.Prefs.Theme],Txt_Description);
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Description);
if (!ItsANewAttEvent)
fprintf (Gbl.F.Out,"%s",Description);
fprintf (Gbl.F.Out,"</textarea>"
@ -1182,7 +1182,7 @@ void Att_RequestCreatOrEditAttEvent (void)
static void Att_ShowLstGrpsToEditAttEvent (long AttCod)
{
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;
@ -1198,7 +1198,7 @@ static void Att_ShowLstGrpsToEditAttEvent (long AttCod)
"%s:"
"</td>"
"<td class=\"LEFT_TOP\">",
The_ClassForm[Gbl.Prefs.Theme],Txt_Groups);
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Groups);
Box_StartBoxTable ("100%",NULL,NULL,
NULL,Box_NOT_CLOSABLE,0);
@ -3149,7 +3149,7 @@ static void Att_PutButtonToShowDetails (void)
static void Att_ListEventsToSelect (Att_TypeOfView_t TypeOfView)
{
extern const char *The_ClassFormBold[The_NUM_THEMES];
extern const char *The_ClassFormInBoxBold[The_NUM_THEMES];
extern const char *Txt_Events;
extern const char *Txt_Event;
extern const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS];
@ -3250,8 +3250,8 @@ static void Att_ListEventsToSelect (Att_TypeOfView_t TypeOfView)
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"5\" class=\"CENTER_MIDDLE\">");
Frm_LinkFormSubmitAnimated (Txt_Update_attendance,
The_ClassFormBold[Gbl.Prefs.Theme],
NULL);
The_ClassFormInBoxBold[Gbl.Prefs.Theme],
NULL);
Ico_PutCalculateIconWithText (Txt_Update_attendance);
fprintf (Gbl.F.Out,"</td>"
"</tr>");

30
swad_centre.c
View File

@ -286,7 +286,7 @@ void Ctr_PrintConfiguration (void)
static void Ctr_Configuration (bool PrintView)
{
extern const char *Hlp_CENTRE_Information;
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *Txt_Institution;
extern const char *Txt_Centre;
extern const char *Txt_Short_name;
@ -404,7 +404,7 @@ static void Ctr_Configuration (bool PrintView)
"<label for=\"OthInsCod\" class=\"%s\">%s:</label>"
"</td>"
"<td class=\"DAT_N LEFT_MIDDLE\">",
The_ClassForm[Gbl.Prefs.Theme],
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Institution);
if (!PrintView &&
@ -446,7 +446,7 @@ static void Ctr_Configuration (bool PrintView)
"<label for=\"FullName\" class=\"%s\">%s:</label>"
"</td>"
"<td class=\"DAT_N LEFT_MIDDLE\">",
The_ClassForm[Gbl.Prefs.Theme],
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Centre);
if (!PrintView &&
Gbl.Usrs.Me.Role.Logged >= Rol_INS_ADM)
@ -475,7 +475,7 @@ static void Ctr_Configuration (bool PrintView)
"<label for=\"ShortName\" class=\"%s\">%s:</label>"
"</td>"
"<td class=\"DAT_N LEFT_MIDDLE\">",
The_ClassForm[Gbl.Prefs.Theme],
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Short_name);
if (!PrintView &&
Gbl.Usrs.Me.Role.Logged >= Rol_INS_ADM)
@ -506,7 +506,7 @@ static void Ctr_Configuration (bool PrintView)
"%s:"
"</td>"
"<td class=\"DAT LEFT_MIDDLE\">",
The_ClassForm[Gbl.Prefs.Theme],
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Place);
if (!PrintView &&
Gbl.Usrs.Me.Role.Logged >= Rol_CTR_ADM)
@ -551,7 +551,7 @@ static void Ctr_Configuration (bool PrintView)
"<label for=\"WWW\" class=\"%s\">%s:</label>"
"</td>"
"<td class=\"LEFT_MIDDLE\">",
The_ClassForm[Gbl.Prefs.Theme],
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Web);
if (!PrintView &&
Gbl.Usrs.Me.Role.Logged >= Rol_CTR_ADM)
@ -591,7 +591,7 @@ static void Ctr_Configuration (bool PrintView)
"</a>"
"</td>"
"</tr>",
The_ClassForm[Gbl.Prefs.Theme],
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Shortcut,
Cfg_URL_SWAD_CGI,
Lan_STR_LANG_ID[Gbl.Prefs.Language],
@ -608,7 +608,7 @@ static void Ctr_Configuration (bool PrintView)
"%s:"
"</td>"
"<td class=\"DAT LEFT_MIDDLE\">",
The_ClassForm[Gbl.Prefs.Theme],
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_QR_code);
QR_LinkTo (250,"ctr",Gbl.CurrentCtr.Ctr.CtrCod);
fprintf (Gbl.F.Out,"</td>"
@ -625,7 +625,7 @@ static void Ctr_Configuration (bool PrintView)
"%u"
"</td>"
"</tr>",
The_ClassForm[Gbl.Prefs.Theme],
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Users_of_the_centre,
Usr_GetNumUsrsWhoClaimToBelongToCtr (Gbl.CurrentCtr.Ctr.CtrCod));
@ -635,7 +635,7 @@ static void Ctr_Configuration (bool PrintView)
"%s:"
"</td>"
"<td class=\"LEFT_MIDDLE\">",
The_ClassForm[Gbl.Prefs.Theme],
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Degrees);
/* Form to go to see degrees of this centre */
@ -661,7 +661,7 @@ static void Ctr_Configuration (bool PrintView)
"%u"
"</td>"
"</tr>",
The_ClassForm[Gbl.Prefs.Theme],
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Courses,
Crs_GetNumCrssInCtr (Gbl.CurrentCtr.Ctr.CtrCod));
@ -735,7 +735,7 @@ static void Ctr_PutIconToChangePhoto (void)
static void Ctr_ShowNumUsrsInCrssOfCtr (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];
@ -747,7 +747,7 @@ static void Ctr_ShowNumUsrsInCrssOfCtr (Rol_Role_t Role)
"%u"
"</td>"
"</tr>",
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_GetNumUsrsInCrssOfCtr (Role,Gbl.CurrentCtr.Ctr.CtrCod));
@ -2298,7 +2298,7 @@ void Ctr_RemoveLogo (void)
void Ctr_RequestPhoto (void)
{
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_Recommended_aspect_ratio;
extern const char *Txt_Recommended_resolution;
@ -2328,7 +2328,7 @@ void Ctr_RequestPhoto (void)
"<input type=\"file\" name=\"%s\" accept=\"image/*\""
" onchange=\"document.getElementById('%s').submit();\" />"
"</label>",
The_ClassForm[Gbl.Prefs.Theme],
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_File_with_the_photo,
Fil_NAME_OF_PARAM_FILENAME_ORG,
Gbl.Form.Id);

5
swad_changelog.h
View File

@ -429,10 +429,11 @@ En OpenSWAD:
ps2pdf source.ps destination.pdf
*/
#define Log_PLATFORM_VERSION "SWAD 18.54.1 (2019-02-21)"
#define CSS_FILE "swad18.54.css"
#define Log_PLATFORM_VERSION "SWAD 18.55 (2019-02-21)"
#define CSS_FILE "swad18.55.css"
#define JS_FILE "swad18.51.js"
/*
Version 18.55: Feb 22, 2019 Changes in CSS styles related to forms. (237585 lines)
Version 18.54.1: Feb 22, 2019 Following and followers shown in photo zoom. (237586 lines)
Version 18.54: Feb 21, 2019 Selection of users scope in timeline is made with icons. (237534 lines)
Version 18.53: Feb 21, 2019 Last selection of users scope in timeline is saved in database. (237538 lines)

4
swad_chat.c
View File

@ -326,13 +326,13 @@ void Cht_ShowListOfChatRoomsWithUsrs (void)
static void Cht_WriteLinkToChat1 (const char *RoomCode,const char *RoomShrtName,const char *RoomFullName,
unsigned Level,bool IsLastItemInLevel[1 + Cht_CHAT_MAX_LEVELS])
{
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *The_ClassFormInBox[The_NUM_THEMES];
fprintf (Gbl.F.Out,"<li style=\"height:25px;\">");
Lay_IndentDependingOnLevel (Level,IsLastItemInLevel);
Frm_StartForm (ActCht);
Cht_WriteParamsRoomCodeAndNames (RoomCode,RoomShrtName,RoomFullName);
Frm_LinkFormSubmit (RoomFullName,The_ClassForm[Gbl.Prefs.Theme],NULL);
Frm_LinkFormSubmit (RoomFullName,The_ClassFormInBox[Gbl.Prefs.Theme],NULL);
}
static void Cht_WriteLinkToChat2 (const char *RoomCode,const char *RoomFullName)

4
swad_connected.c
View File

@ -127,13 +127,11 @@ void Con_ShowConnectedUsrs (void)
static void Con_PutIconToUpdateConnected (void)
{
extern const char *The_ClassFormBold[The_NUM_THEMES];
extern const char *Txt_Update;
Frm_StartForm (ActLstCon);
Sco_PutParamScope ("ScopeCon",Gbl.Scope.Current);
Frm_LinkFormSubmitAnimated (Txt_Update,The_ClassFormBold[Gbl.Prefs.Theme],
NULL);
Frm_LinkFormSubmitAnimated (Txt_Update,NULL,NULL);
Ico_PutCalculateIcon (Txt_Update);
Frm_EndForm ();
}

22
swad_country.c
View File

@ -231,7 +231,7 @@ void Cty_PrintConfiguration (void)
static void Cty_Configuration (bool PrintView)
{
extern const char *Hlp_COUNTRY_Information;
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *Txt_Country;
extern const char *Txt_Shortcut;
extern const char *Lan_STR_LANG_ID[1 + Lan_NUM_LANGUAGES];
@ -318,7 +318,7 @@ static void Cty_Configuration (bool PrintView)
"%s:"
"</td>"
"<td class=\"DAT_N LEFT_MIDDLE\">",
The_ClassForm[Gbl.Prefs.Theme],
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Country);
if (!PrintView && Gbl.CurrentCty.Cty.WWW[Gbl.Prefs.Language][0])
fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\" class=\"DAT_N\">",
@ -339,7 +339,7 @@ static void Cty_Configuration (bool PrintView)
"%s/%s?cty=%ld</a>"
"</td>"
"</tr>",
The_ClassForm[Gbl.Prefs.Theme],
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Shortcut,
Cfg_URL_SWAD_CGI,
Lan_STR_LANG_ID[Gbl.Prefs.Language],
@ -356,7 +356,7 @@ static void Cty_Configuration (bool PrintView)
"%s:"
"</td>"
"<td class=\"DAT LEFT_MIDDLE\">",
The_ClassForm[Gbl.Prefs.Theme],
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_QR_code);
QR_LinkTo (250,"cty",Gbl.CurrentCty.Cty.CtyCod);
fprintf (Gbl.F.Out,"</td>"
@ -373,7 +373,7 @@ static void Cty_Configuration (bool PrintView)
"%u"
"</td>"
"</tr>",
The_ClassForm[Gbl.Prefs.Theme],
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Users_of_the_country,
Usr_GetNumUsrsWhoClaimToBelongToCty (Gbl.CurrentCty.Cty.CtyCod));
@ -383,7 +383,7 @@ static void Cty_Configuration (bool PrintView)
"%s:"
"</td>"
"<td class=\"LEFT_MIDDLE\">",
The_ClassForm[Gbl.Prefs.Theme],
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Institutions);
/* Form to go to see institutions of this country */
@ -409,7 +409,7 @@ static void Cty_Configuration (bool PrintView)
"%u"
"</td>"
"</tr>",
The_ClassForm[Gbl.Prefs.Theme],
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Centres,
Ctr_GetNumCtrsInCty (Gbl.CurrentCty.Cty.CtyCod));
@ -422,7 +422,7 @@ static void Cty_Configuration (bool PrintView)
"%u"
"</td>"
"</tr>",
The_ClassForm[Gbl.Prefs.Theme],
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Degrees,
Deg_GetNumDegsInCty (Gbl.CurrentCty.Cty.CtyCod));
@ -435,7 +435,7 @@ static void Cty_Configuration (bool PrintView)
"%u"
"</td>"
"</tr>",
The_ClassForm[Gbl.Prefs.Theme],
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Courses,
Crs_GetNumCrssInCty (Gbl.CurrentCty.Cty.CtyCod));
@ -469,7 +469,7 @@ static void Cty_PutIconToPrint (void)
static void Cty_ShowNumUsrsInCrssOfCty (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];
@ -481,7 +481,7 @@ static void Cty_ShowNumUsrsInCrssOfCty (Rol_Role_t Role)
"%u"
"</td>"
"</tr>",
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_GetNumUsrsInCrssOfCty (Role,Gbl.CurrentCty.Cty.CtyCod));

36
swad_course.c
View File

@ -166,7 +166,7 @@ void Crs_PrintConfiguration (void)
static void Crs_Configuration (bool PrintView)
{
extern const char *Hlp_COURSE_Information;
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *Txt_Degree;
extern const char *Txt_Course;
extern const char *Txt_Short_name;
@ -232,7 +232,7 @@ static void Crs_Configuration (bool PrintView)
"<label for=\"OthDegCod\" class=\"%s\">%s:</label>"
"</td>"
"<td class=\"DAT LEFT_MIDDLE\">",
The_ClassForm[Gbl.Prefs.Theme],
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Degree);
if (!PrintView &&
@ -274,7 +274,7 @@ static void Crs_Configuration (bool PrintView)
"<label for=\"FullName\" class=\"%s\">%s:</label>"
"</td>"
"<td class=\"DAT_N LEFT_MIDDLE\">",
The_ClassForm[Gbl.Prefs.Theme],
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Course);
if (!PrintView &&
Gbl.Usrs.Me.Role.Logged >= Rol_DEG_ADM)
@ -303,7 +303,7 @@ static void Crs_Configuration (bool PrintView)
"<label for=\"ShortName\" class=\"%s\">%s:</label>"
"</td>"
"<td class=\"DAT_N LEFT_MIDDLE\">",
The_ClassForm[Gbl.Prefs.Theme],
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Short_name);
if (!PrintView &&
Gbl.Usrs.Me.Role.Logged >= Rol_DEG_ADM)
@ -332,7 +332,7 @@ static void Crs_Configuration (bool PrintView)
"<label for=\"OthCrsYear\" class=\"%s\">%s:</label>"
"</td>"
"<td class=\"DAT LEFT_MIDDLE\">",
The_ClassForm[Gbl.Prefs.Theme],
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Year_OF_A_DEGREE);
if (IsForm)
{
@ -366,7 +366,7 @@ static void Crs_Configuration (bool PrintView)
"<label for=\"InsCrsCod\" class=\"%s\">%s:</label>"
"</td>"
"<td class=\"DAT LEFT_MIDDLE\">",
The_ClassForm[Gbl.Prefs.Theme],
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Institutional_code);
if (IsForm)
{
@ -395,7 +395,7 @@ static void Crs_Configuration (bool PrintView)
"%ld"
"</td>"
"</tr>",
The_ClassForm[Gbl.Prefs.Theme],
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Internal_code,
Gbl.CurrentCrs.Crs.CrsCod);
}
@ -410,7 +410,7 @@ static void Crs_Configuration (bool PrintView)
"%s/%s?crs=%ld</a>"
"</td>"
"</tr>",
The_ClassForm[Gbl.Prefs.Theme],
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Shortcut,
Cfg_URL_SWAD_CGI,
Lan_STR_LANG_ID[Gbl.Prefs.Language],
@ -427,7 +427,7 @@ static void Crs_Configuration (bool PrintView)
"%s:"
"</td>"
"<td class=\"DAT LEFT_MIDDLE\">",
The_ClassForm[Gbl.Prefs.Theme],
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_QR_code);
QR_LinkTo (250,"crs",Gbl.CurrentCrs.Crs.CrsCod);
fprintf (Gbl.F.Out,"</td>"
@ -449,7 +449,7 @@ static void Crs_Configuration (bool PrintView)
"%s:"
"</td>"
"<td class=\"LEFT_MIDDLE\">",
The_ClassForm[Gbl.Prefs.Theme],
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Indicators);
Frm_StartForm (ActReqStaCrs);
snprintf (Gbl.Title,sizeof (Gbl.Title),
@ -492,7 +492,7 @@ static void Crs_PutIconToPrint (void)
static void Crs_ShowNumUsrsInCrs (Rol_Role_t Role)
{
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];
fprintf (Gbl.F.Out,"<tr>"
@ -503,7 +503,7 @@ static void Crs_ShowNumUsrsInCrs (Rol_Role_t Role)
"%u"
"</td>"
"</tr>",
The_ClassForm[Gbl.Prefs.Theme],
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_ROLES_PLURAL_Abc[Role][Usr_SEX_UNKNOWN],
Gbl.CurrentCrs.Crs.NumUsrs[Role]);
}
@ -517,8 +517,8 @@ static void Crs_ShowNumUsrsInCrs (Rol_Role_t Role)
static void Crs_WriteListMyCoursesToSelectOne (void)
{
extern const char *Hlp_PROFILE_Courses;
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *The_ClassFormDark[The_NUM_THEMES];
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *The_ClassFormInBoxBold[The_NUM_THEMES];
extern const char *Txt_My_courses;
extern const char *Txt_System;
extern const char *Txt_Go_to_X;
@ -549,10 +549,10 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
const char *ClassNormal;
char ClassHighlight[64];
ClassNormal = The_ClassForm[Gbl.Prefs.Theme];
ClassNormal = The_ClassFormInBox[Gbl.Prefs.Theme];
snprintf (ClassHighlight,sizeof (ClassHighlight),
"%s LIGHT_BLUE",
The_ClassFormDark[Gbl.Prefs.Theme]);
The_ClassFormInBoxBold[Gbl.Prefs.Theme]);
/***** Start box *****/
Box_StartBox (NULL,Txt_My_courses,Crs_PutIconToSearchCourses,
@ -3379,7 +3379,7 @@ void Crs_PutLinkToRemoveOldCrss (void)
void Crs_AskRemoveOldCrss (void)
{
extern const char *Hlp_SYSTEM_Hierarchy_eliminate_old_courses;
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *Txt_Eliminate_old_courses;
extern const char *Txt_Eliminate_all_courses_whithout_users_PART_1_OF_2;
extern const char *Txt_Eliminate_all_courses_whithout_users_PART_2_OF_2;
@ -3397,7 +3397,7 @@ void Crs_AskRemoveOldCrss (void)
/***** Form to request number of months without clicks *****/
fprintf (Gbl.F.Out,"<label class=\"%s\">%s&nbsp;"
"<select name=\"Months\">",
The_ClassForm[Gbl.Prefs.Theme],
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Eliminate_all_courses_whithout_users_PART_1_OF_2);
for (i = Crs_MIN_MONTHS_WITHOUT_ACCESS_TO_REMOVE_OLD_CRSS;
i <= Crs_MAX_MONTHS_WITHOUT_ACCESS_TO_REMOVE_OLD_CRSS;

10
swad_date.c
View File

@ -421,7 +421,7 @@ void Dat_ConvDateToDateStr (struct Date *Date,char StrDate[Cns_MAX_BYTES_DATE +
void Dat_PutFormStartEndClientLocalDateTimesWithYesterdayToday (bool SetHMS000000To235959)
{
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *Txt_START_END_TIME[Dat_NUM_START_END_TIME];
extern const char *Txt_Yesterday;
extern const char *Txt_Today;
@ -432,7 +432,7 @@ void Dat_PutFormStartEndClientLocalDateTimesWithYesterdayToday (bool SetHMS00000
"<label class=\"%s\">%s:</label>"
"</td>"
"<td class=\"LEFT_MIDDLE\">",
The_ClassForm[Gbl.Prefs.Theme],
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_START_END_TIME[Dat_START_TIME]);
/* Date-time */
@ -464,7 +464,7 @@ void Dat_PutFormStartEndClientLocalDateTimesWithYesterdayToday (bool SetHMS00000
"<label class=\"%s\">%s:</label>"
"</td>"
"<td class=\"LEFT_MIDDLE\">",
The_ClassForm[Gbl.Prefs.Theme],
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_START_END_TIME[Dat_END_TIME]);
/* Date-time */
Dat_WriteFormClientLocalDateTimeFromTimeUTC ("End",
@ -487,7 +487,7 @@ void Dat_PutFormStartEndClientLocalDateTimesWithYesterdayToday (bool SetHMS00000
void Dat_PutFormStartEndClientLocalDateTimes (time_t TimeUTC[2],
Dat_FormSeconds FormSeconds)
{
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *Txt_START_END_TIME[Dat_NUM_START_END_TIME];
Dat_StartEndTime_t StartEndTime;
const char *Id[Dat_NUM_START_END_TIME] =
@ -506,7 +506,7 @@ void Dat_PutFormStartEndClientLocalDateTimes (time_t TimeUTC[2],
"<label class=\"%s\">%s:</label>"
"</td>"
"<td class=\"LEFT_MIDDLE\">",
The_ClassForm[Gbl.Prefs.Theme],
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_START_END_TIME[StartEndTime]);
Dat_WriteFormClientLocalDateTimeFromTimeUTC (Id[StartEndTime],
Id[StartEndTime],

20
swad_degree.c
View File

@ -290,7 +290,7 @@ void Deg_PrintConfiguration (void)
static void Deg_Configuration (bool PrintView)
{
extern const char *Hlp_DEGREE_Information;
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *Txt_Centre;
extern const char *Txt_Degree;
extern const char *Txt_Short_name;
@ -337,7 +337,7 @@ static void Deg_Configuration (bool PrintView)
"<label for=\"OthCtrCod\" class=\"%s\">%s:</label>"
"</td>"
"<td class=\"DAT_N LEFT_MIDDLE\">",
The_ClassForm[Gbl.Prefs.Theme],
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Centre);
if (!PrintView &&
@ -379,7 +379,7 @@ static void Deg_Configuration (bool PrintView)
"<label for=\"FullName\" class=\"%s\">%s:</label>"
"</td>"
"<td class=\"DAT_N LEFT_MIDDLE\">",
The_ClassForm[Gbl.Prefs.Theme],
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Degree);
if (!PrintView &&
Gbl.Usrs.Me.Role.Logged >= Rol_CTR_ADM)
@ -409,7 +409,7 @@ static void Deg_Configuration (bool PrintView)
"<label for=\"ShortName\" class=\"%s\">%s:</label>"
"</td>"
"<td class=\"DAT_N LEFT_MIDDLE\">",
The_ClassForm[Gbl.Prefs.Theme],
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Short_name);
if (!PrintView &&
Gbl.Usrs.Me.Role.Logged >= Rol_CTR_ADM)
@ -439,7 +439,7 @@ static void Deg_Configuration (bool PrintView)
"<label for=\"WWW\" class=\"%s\">%s:</label>"
"</td>"
"<td class=\"DAT LEFT_MIDDLE\">",
The_ClassForm[Gbl.Prefs.Theme],
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Web);
if (!PrintView &&
Gbl.Usrs.Me.Role.Logged >= Rol_DEG_ADM)
@ -479,7 +479,7 @@ static void Deg_Configuration (bool PrintView)
"</a>"
"</td>"
"</tr>",
The_ClassForm[Gbl.Prefs.Theme],
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Shortcut,
Cfg_URL_SWAD_CGI,
Lan_STR_LANG_ID[Gbl.Prefs.Language],
@ -496,7 +496,7 @@ static void Deg_Configuration (bool PrintView)
"%s:"
"</td>"
"<td class=\"DAT LEFT_MIDDLE\">",
The_ClassForm[Gbl.Prefs.Theme],
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_QR_code);
QR_LinkTo (250,"deg",Gbl.CurrentDeg.Deg.DegCod);
fprintf (Gbl.F.Out,"</td>"
@ -510,7 +510,7 @@ static void Deg_Configuration (bool PrintView)
"%s:"
"</td>"
"<td class=\"LEFT_MIDDLE\">",
The_ClassForm[Gbl.Prefs.Theme],
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Courses);
/* Form to go to see courses of this degree */
@ -564,7 +564,7 @@ static void Deg_PutIconsToPrintAndUpload (void)
static void Deg_ShowNumUsrsInCrssOfDeg (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];
@ -576,7 +576,7 @@ static void Deg_ShowNumUsrsInCrssOfDeg (Rol_Role_t Role)
"%u"
"</td>"
"</tr>",
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_GetNumUsrsInCrssOfDeg (Role,Gbl.CurrentDeg.Deg.DegCod));

26
swad_enrolment.c
View File

@ -351,7 +351,7 @@ static void Enr_NotifyAfterEnrolment (struct UsrData *UsrDat,Rol_Role_t NewRole)
void Enr_WriteFormToReqAnotherUsrID (Act_Action_t NextAction,void (*FuncParams) ())
{
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *Txt_nick_email_or_ID;
extern const char *Txt_Continue;
@ -366,7 +366,7 @@ void Enr_WriteFormToReqAnotherUsrID (Act_Action_t NextAction,void (*FuncParams)
"<input type=\"text\" id=\"OtherUsrIDNickOrEMail\""
" name=\"OtherUsrIDNickOrEMail\""
" size=\"18\" maxlength=\"%u\" required=\"required\" />",
The_ClassForm[Gbl.Prefs.Theme],
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_nick_email_or_ID,
Cns_MAX_CHARS_EMAIL_ADDRESS);
@ -782,7 +782,7 @@ void Enr_PutLinkToRemOldUsrs (void)
void Enr_AskRemoveOldUsrs (void)
{
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *Txt_Eliminate_old_users;
extern const char *Txt_Eliminate_all_users_who_are_not_enroled_on_any_courses_PART_1_OF_2;
extern const char *Txt_Eliminate_all_users_who_are_not_enroled_on_any_courses_PART_2_OF_2;
@ -798,7 +798,7 @@ void Enr_AskRemoveOldUsrs (void)
/***** Form to request number of months without clicks *****/
fprintf (Gbl.F.Out,"<label class=\"%s\">%s&nbsp;",
The_ClassForm[Gbl.Prefs.Theme],
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Eliminate_all_users_who_are_not_enroled_on_any_courses_PART_1_OF_2);
fprintf (Gbl.F.Out,"<select name=\"Months\">");
for (Months = Usr_MIN_MONTHS_WITHOUT_ACCESS_TO_REMOVE_OLD_USRS;
@ -906,7 +906,7 @@ void Enr_RemoveOldUsrs (void)
static void Enr_PutAreaToEnterUsrsIDs (void)
{
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *Txt_List_of_nicks_emails_or_IDs;
/***** Text area for users' IDs *****/
@ -921,7 +921,7 @@ static void Enr_PutAreaToEnterUsrsIDs (void)
"</textarea>"
"</td>"
"</tr>",
The_ClassForm[Gbl.Prefs.Theme],
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_List_of_nicks_emails_or_IDs);
Tbl_EndTable ();
}
@ -933,7 +933,7 @@ static void Enr_PutAreaToEnterUsrsIDs (void)
bool Enr_PutActionsRegRemOneUsr (bool ItsMe)
{
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *Txt_Modify_me_in_the_course_X;
extern const char *Txt_Modify_user_in_the_course_X;
extern const char *Txt_Register_me_in_X;
@ -987,7 +987,7 @@ bool Enr_PutActionsRegRemOneUsr (bool ItsMe)
/***** Start list of options *****/
fprintf (Gbl.F.Out,"<ul class=\"LIST_LEFT %s\" style=\"margin:12px;\">",
The_ClassForm[Gbl.Prefs.Theme]);
The_ClassFormInBox[Gbl.Prefs.Theme]);
/***** Register user in course / Modify user's data *****/
if (Gbl.CurrentCrs.Crs.CrsCod > 0 &&
@ -1275,7 +1275,7 @@ bool Enr_PutActionsRegRemOneUsr (bool ItsMe)
static void Enr_PutActionsRegRemSeveralUsrs (void)
{
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *Txt_Register_the_users_indicated_in_step_1;
extern const char *Txt_Remove_the_users_indicated_in_step_1;
extern const char *Txt_Remove_the_users_not_indicated_in_step_1;
@ -1284,7 +1284,7 @@ static void Enr_PutActionsRegRemSeveralUsrs (void)
/***** Start list of options *****/
fprintf (Gbl.F.Out,"<ul class=\"LIST_LEFT %s\" style=\"margin:12px;\">",
The_ClassForm[Gbl.Prefs.Theme]);
The_ClassFormInBox[Gbl.Prefs.Theme]);
/***** Register / remove users listed or not listed *****/
if (Gbl.CurrentCrs.Crs.CrsCod > 0) // Course selected
@ -2240,7 +2240,7 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected)
{
extern const char *Hlp_USERS_Requests;
extern const char *Sco_ScopeDB[Sco_NUM_SCOPES];
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *Txt_Enrolment_requests;
extern const char *Txt_Scope;
extern const char *Txt_Users;
@ -2297,7 +2297,7 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected)
"<label for=\"ScopeEnr\" class=\"%s\">%s:</label>"
"</td>"
"<td class=\"LEFT_MIDDLE\">",
The_ClassForm[Gbl.Prefs.Theme],Txt_Scope);
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Scope);
Sco_PutSelectorScope ("ScopeEnr",true);
fprintf (Gbl.F.Out,"</td>"
"</tr>");
@ -2308,7 +2308,7 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected)
"<label class=\"%s\">%s:</label>"
"</td>"
"<td class=\"DAT LEFT_MIDDLE\">",
The_ClassForm[Gbl.Prefs.Theme],Txt_Users);
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Users);
Rol_WriteSelectorRoles (1 << Rol_STD |
1 << Rol_NET |
1 << Rol_TCH,

4
swad_exam.c
View File

@ -981,7 +981,7 @@ static void Exa_ShowExamAnnouncement (Exa_TypeViewExamAnnouncement_t TypeViewExa
extern const char *Hlp_ASSESSMENT_Announcements_new_announcement;
extern const char *Hlp_ASSESSMENT_Announcements_edit_announcement;
extern const char *Txt_YEAR_OF_DEGREE[1 + Deg_MAX_YEARS_PER_DEGREE];
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *Txt_EXAM_ANNOUNCEMENT;
extern const char *Txt_EXAM_ANNOUNCEMENT_Course;
extern const char *Txt_EXAM_ANNOUNCEMENT_Year_or_semester;
@ -1043,7 +1043,7 @@ static void Exa_ShowExamAnnouncement (Exa_TypeViewExamAnnouncement_t TypeViewExa
StyleNormal = "CONV_IMPR";
break;
case Exa_FORM_VIEW:
StyleForm = The_ClassForm[Gbl.Prefs.Theme];
StyleForm = The_ClassFormInBox[Gbl.Prefs.Theme];
break;
}

14
swad_figure.c
View File

@ -186,7 +186,7 @@ unsigned Fig_GetNumUsrsWhoChoseAnOption (const char *SubQuery);
void Fig_ReqShowFigures (void)
{
extern const char *Hlp_ANALYTICS_Figures;
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *Txt_Figures;
extern const char *Txt_Scope;
extern const char *Txt_Statistic;
@ -203,7 +203,7 @@ void Fig_ReqShowFigures (void)
/***** Compute stats for anywhere, degree or course? *****/
fprintf (Gbl.F.Out,"<label class=\"%s\">%s:&nbsp;",
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 |
@ -218,7 +218,7 @@ void Fig_ReqShowFigures (void)
/***** Type of statistic *****/
fprintf (Gbl.F.Out,"<label class=\"%s\">%s:&nbsp;"
"<select name=\"FigureType\">",
The_ClassForm[Gbl.Prefs.Theme],Txt_Statistic);
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Statistic);
for (FigureType = (Fig_FigureType_t) 0;
FigureType < Fig_NUM_FIGURES;
FigureType++)
@ -1405,7 +1405,7 @@ static void Fig_GetAndShowInssOrderedByNumUsrsWhoClaimToBelongToThem (void)
static void Fig_ShowInss (MYSQL_RES **mysql_res,unsigned NumInss,
const char *TxtFigure)
{
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *Txt_Institution;
unsigned NumIns;
unsigned NumOrder;
@ -1436,7 +1436,7 @@ static void Fig_ShowInss (MYSQL_RES **mysql_res,unsigned NumInss,
/***** Write link to institution *****/
fprintf (Gbl.F.Out,"<td class=\"%s CENTER_MIDDLE\">",
The_ClassForm[Gbl.Prefs.Theme]);
The_ClassFormInBox[Gbl.Prefs.Theme]);
Ins_DrawInstitutionLogoWithLink (&Ins,40);
fprintf (Gbl.F.Out,"<br />%u</td>",
NumberThisRow);
@ -1486,12 +1486,12 @@ static void Fig_ShowInss (MYSQL_RES **mysql_res,unsigned NumInss,
/***** Write link to institution *****/
fprintf (Gbl.F.Out,"<td class=\"%s LEFT_MIDDLE\">",
The_ClassForm[Gbl.Prefs.Theme]);
The_ClassFormInBox[Gbl.Prefs.Theme]);
/* Icon and name of this institution */
Frm_StartForm (ActSeeInsInf);
Ins_PutParamInsCod (Ins.InsCod);
Frm_LinkFormSubmit (Ins.ShrtName,The_ClassForm[Gbl.Prefs.Theme],NULL);
Frm_LinkFormSubmit (Ins.ShrtName,The_ClassFormInBox[Gbl.Prefs.Theme],NULL);
if (Gbl.Usrs.Listing.WithPhotos)
{
Log_DrawLogo (Sco_SCOPE_INS,Ins.InsCod,Ins.ShrtName,

34
swad_file_browser.c
View File

@ -8536,7 +8536,7 @@ void Brw_ShowFormFileBrowser (void)
static void Brw_PutFormToCreateAFolder (const char FileNameToShow[NAME_MAX + 1])
{
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *Txt_Create_folder;
extern const char *Txt_You_can_create_a_new_folder_inside_the_folder_X;
extern const char *Txt_Folder;
@ -8561,7 +8561,7 @@ static void Brw_PutFormToCreateAFolder (const char FileNameToShow[NAME_MAX + 1])
" size=\"30\" maxlength=\"%u\" value=\"\""
" required=\"required\" />"
"</label>",
The_ClassForm[Gbl.Prefs.Theme],Txt_Folder,
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Folder,
Brw_MAX_CHARS_FOLDER);
/***** Send button and end box *****/
@ -8708,7 +8708,7 @@ static void Brw_PutFormToPasteAFileOrFolder (const char *FileNameToShow)
static void Brw_PutFormToCreateALink (const char *FileNameToShow)
{
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *Txt_Create_link;
extern const char *Txt_or_you_can_create_a_new_link_inside_the_folder_X;
extern const char *Txt_URL;
@ -8745,7 +8745,7 @@ static void Brw_PutFormToCreateALink (const char *FileNameToShow)
" required=\"required\" />"
"</td>"
"</tr>",
The_ClassForm[Gbl.Prefs.Theme],Txt_URL,
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_URL,
PATH_MAX);
/***** Link name *****/
@ -8762,7 +8762,7 @@ static void Brw_PutFormToCreateALink (const char *FileNameToShow)
"</td>"
"</tr>"
"</table>",
The_ClassForm[Gbl.Prefs.Theme],Txt_Save_as,Txt_optional,
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Save_as,Txt_optional,
Brw_MAX_CHARS_FOLDER);
/***** Send button and end box *****/
@ -9611,7 +9611,7 @@ bool Brw_CheckIfFileOrFolderIsHidden (struct FileMetadata *FileMetadata)
void Brw_ShowFileMetadata (void)
{
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *Txt_The_file_of_folder_no_longer_exists_or_is_now_hidden;
extern const char *Txt_Filename;
extern const char *Txt_File_size;
@ -9771,7 +9771,7 @@ void Brw_ShowFileMetadata (void)
"%s:"
"</td>"
"<td class=\"DAT LEFT_MIDDLE\">",
The_ClassForm[Gbl.Prefs.Theme],Txt_Filename);
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Filename);
Brw_WriteSmallLinkToDownloadFile (URL,FileMetadata.FileType,FileNameToShow);
fprintf (Gbl.F.Out,"</td>"
"</tr>");
@ -9782,7 +9782,7 @@ void Brw_ShowFileMetadata (void)
"%s:"
"</td>"
"<td class=\"DAT LEFT_MIDDLE\">",
The_ClassForm[Gbl.Prefs.Theme],Txt_Uploaded_by);
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Uploaded_by);
if (FileHasPublisher)
{
/* Show photo */
@ -9815,7 +9815,7 @@ void Brw_ShowFileMetadata (void)
"%s"
"</td>"
"</tr>",
The_ClassForm[Gbl.Prefs.Theme],
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_File_size,
FileSizeStr);
@ -9831,7 +9831,7 @@ void Brw_ShowFileMetadata (void)
"</script>"
"</td>"
"</tr>",
The_ClassForm[Gbl.Prefs.Theme],
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Date_of_creation,
(long) FileMetadata.Time,
(unsigned) Gbl.Prefs.DateFormat,Txt_Today);
@ -9844,7 +9844,7 @@ void Brw_ShowFileMetadata (void)
"</label>"
"</td>"
"<td class=\"DAT LEFT_MIDDLE\">",
The_ClassForm[Gbl.Prefs.Theme],Txt_Availability);
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Availability);
if (ICanChangePublic) // I can change file to public
{
fprintf (Gbl.F.Out,"<select id=\"PublicFile\" name=\"PublicFile\">");
@ -9874,7 +9874,7 @@ void Brw_ShowFileMetadata (void)
"<label for=\"License\" class=\"%s\">%s:</label>"
"</td>"
"<td class=\"DAT LEFT_MIDDLE\">",
The_ClassForm[Gbl.Prefs.Theme],Txt_License);
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_License);
if (ICanEdit) // I can edit file properties
{
fprintf (Gbl.F.Out,"<select id=\"License\" name=\"License\">");
@ -9905,7 +9905,7 @@ void Brw_ShowFileMetadata (void)
"%u"
"</td>"
"</tr>",
The_ClassForm[Gbl.Prefs.Theme],Txt_My_views,
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_My_views,
FileMetadata.NumMyViews);
/***** Write number of identificated views *****/
@ -9917,7 +9917,7 @@ void Brw_ShowFileMetadata (void)
"%u (%u %s)"
"</td>"
"</tr>",
The_ClassForm[Gbl.Prefs.Theme],Txt_Identified_views,
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Identified_views,
FileMetadata.NumViewsFromLoggedUsrs,
FileMetadata.NumLoggedUsrs,
(FileMetadata.NumLoggedUsrs == 1) ? Txt_user[Usr_SEX_UNKNOWN] :
@ -9932,7 +9932,7 @@ void Brw_ShowFileMetadata (void)
"%u"
"</td>"
"</tr>",
The_ClassForm[Gbl.Prefs.Theme],Txt_Public_views,
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Public_views,
FileMetadata.NumPublicViews);
/***** End box *****/
@ -12419,7 +12419,7 @@ static void Brw_PutLinkToAskRemOldFiles (void)
void Brw_AskRemoveOldFiles (void)
{
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *Txt_Remove_old_files;
extern const char *Txt_Remove_files_older_than_PART_1_OF_2;
extern const char *Txt_Remove_files_older_than_PART_2_OF_2;
@ -12439,7 +12439,7 @@ void Brw_AskRemoveOldFiles (void)
/***** Form to request number of months (to remove files older) *****/
fprintf (Gbl.F.Out,"<label class=\"%s\">%s&nbsp;",
The_ClassForm[Gbl.Prefs.Theme],
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Remove_files_older_than_PART_1_OF_2);
fprintf (Gbl.F.Out,"<select name=\"Months\">");
for (Months = Brw_MIN_MONTHS_TO_REMOVE_OLD_FILES;

17
swad_follow.c
View File

@ -423,12 +423,10 @@ static void Fol_PutIconsWhoToFollow (void)
static void Fol_PutIconToUpdateWhoToFollow (void)
{
extern const char *The_ClassFormBold[The_NUM_THEMES];
extern const char *Txt_Update;
Frm_StartForm (ActSeeSocPrf);
Frm_LinkFormSubmitAnimated (Txt_Update,The_ClassFormBold[Gbl.Prefs.Theme],
NULL);
Frm_LinkFormSubmitAnimated (Txt_Update,NULL,NULL);
Ico_PutCalculateIcon (Txt_Update);
Frm_EndForm ();
}
@ -596,8 +594,8 @@ static void Fol_ShowNumberOfFollowingOrFollowers (const struct UsrData *UsrDat,
Act_Action_t Action,
const char *Title)
{
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *The_ClassFormBold[The_NUM_THEMES];
extern const char *The_ClassFormOutBox[The_NUM_THEMES];
extern const char *The_ClassFormOutBoxBold[The_NUM_THEMES];
/***** Start container *****/
fprintf (Gbl.F.Out,"<div class=\"FOLLOW_BOX\">");
@ -627,16 +625,17 @@ static void Fol_ShowNumberOfFollowingOrFollowers (const struct UsrData *UsrDat,
/***** Text *****/
fprintf (Gbl.F.Out,"<div class=\"%s\">",
(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)

26
swad_form.c
View File

@ -216,32 +216,32 @@ void Frm_EndForm (void)
/*****************************************************************************/
// Requires an extern </a>
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,"<a href=\"\"");
if (Title)
if (Title[0])
fprintf (Gbl.F.Out," title=\"%s\"",Title);
if (LinkStyle)
if (LinkStyle[0])
fprintf (Gbl.F.Out," class=\"%s\"",LinkStyle);
if (LinkClass)
if (LinkClass[0])
fprintf (Gbl.F.Out," class=\"%s\"",LinkClass);
fprintf (Gbl.F.Out," onclick=\"");
if (OnSubmit) // JavaScript function to be called
// before submitting the form
@ -252,16 +252,16 @@ void Frm_LinkFormSubmitId (const char *Title,const char *LinkStyle,
Id);
}
void Frm_LinkFormSubmitAnimated (const char *Title,const char *LinkStyle,
void Frm_LinkFormSubmitAnimated (const char *Title,const char *LinkClass,
const char *OnSubmit)
{
fprintf (Gbl.F.Out,"<a href=\"\"");
if (Title)
if (Title[0])
fprintf (Gbl.F.Out," title=\"%s\"",Title);
if (LinkStyle)
if (LinkStyle[0])
fprintf (Gbl.F.Out," class=\"%s\"",LinkStyle);
if (LinkClass)
if (LinkClass[0])
fprintf (Gbl.F.Out," class=\"%s\"",LinkClass);
fprintf (Gbl.F.Out," onclick=\"");
if (OnSubmit) // JavaScript function to be called
// before submitting the form

8
swad_form.h
View File

@ -61,12 +61,12 @@ void Frm_StartFormId (Act_Action_t NextAction,const char *Id);
void Frm_SetParamsForm (char ParamsStr[Frm_MAX_BYTES_PARAMS_STR],Act_Action_t NextAction,
bool PutParameterLocationIfNoSesion);
void Frm_EndForm (void);
void Frm_LinkFormSubmit (const char *Title,const char *LinkStyle,
void Frm_LinkFormSubmit (const char *Title,const char *LinkClass,
const char *OnSubmit);
void Frm_LinkFormSubmitUnique (const char *Title,const char *LinkStyle);
void Frm_LinkFormSubmitId (const char *Title,const char *LinkStyle,
void Frm_LinkFormSubmitUnique (const char *Title,const char *LinkClass);
void Frm_LinkFormSubmitId (const char *Title,const char *LinkClass,
const char *Id,const char *OnSubmit);
void Frm_LinkFormSubmitAnimated (const char *Title,const char *LinkStyle,
void Frm_LinkFormSubmitAnimated (const char *Title,const char *LinkClass,
const char *OnSubmit);
void Frm_SetUniqueId (char UniqueId[Frm_MAX_BYTES_ID + 1]);

22
swad_forum.c
View File

@ -2031,8 +2031,8 @@ static void For_WriteLinkToForum (struct Forum *Forum,
unsigned Level,
bool IsLastItemInLevel[1 + For_FORUM_MAX_LEVELS])
{
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *The_ClassFormBold[The_NUM_THEMES];
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *The_ClassFormInBoxBold[The_NUM_THEMES];
extern const char *Txt_Copy_not_allowed;
unsigned NumThrs;
unsigned NumThrsWithNewPosts;
@ -2044,8 +2044,8 @@ static void For_WriteLinkToForum (struct Forum *Forum,
/***** Get number of threads and number of posts *****/
NumThrs = For_GetNumThrsInForum (Forum);
NumThrsWithNewPosts = For_GetNumThrsWithNewPstsInForum (Forum,NumThrs);
Style = (NumThrsWithNewPosts ? The_ClassFormBold[Gbl.Prefs.Theme] :
The_ClassForm[Gbl.Prefs.Theme]);
Style = (NumThrsWithNewPosts ? The_ClassFormInBoxBold[Gbl.Prefs.Theme] :
The_ClassFormInBox[Gbl.Prefs.Theme]);
/***** Start row *****/
fprintf (Gbl.F.Out,"<li");
@ -3361,8 +3361,8 @@ static void For_ListForumThrs (long ThrCods[Pag_ITEMS_PER_PAGE],
long ThrCodHighlighted,
struct Pagination *PaginationThrs)
{
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *The_ClassFormBold[The_NUM_THEMES];
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *The_ClassFormInBoxBold[The_NUM_THEMES];
extern const char *Txt_You_have_written_1_post_in_this_thread;
extern const char *Txt_You_have_written_X_posts_in_this_thread;
extern const char *Txt_Thread_with_posts_from_you;
@ -3489,8 +3489,8 @@ static void For_ListForumThrs (long ThrCods[Pag_ITEMS_PER_PAGE],
&PaginationPsts,
Thr.Enabled[For_FIRST_MSG],
Thr.Subject,
Thr.NumUnreadPosts ? The_ClassFormBold[Gbl.Prefs.Theme] :
The_ClassForm[Gbl.Prefs.Theme],
Thr.NumUnreadPosts ? The_ClassFormInBoxBold[Gbl.Prefs.Theme] :
The_ClassFormInBox[Gbl.Prefs.Theme],
true);
fprintf (Gbl.F.Out,"</td>");
@ -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\" />"
"</td>"
"</tr>",
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)
"</textarea>"
"</td>"
"</tr>",
The_ClassForm[Gbl.Prefs.Theme],Txt_MSG_Content);
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_MSG_Content);
Tbl_EndTable ();

14
swad_game.c
View File

@ -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)
"<label for=\"ScopeGame\" class=\"%s\">%s:</label>"
"</td>"
"<td class=\"LEFT_MIDDLE\">",
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\" />"
"</td>"
"</tr>",
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)
"<td class=\"LEFT_TOP\">"
"<textarea id=\"Txt\" name=\"Txt\""
" cols=\"60\" rows=\"10\">",
The_ClassForm[Gbl.Prefs.Theme],
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Description);
if (!ItsANewGame)
fprintf (Gbl.F.Out,"%s",Txt);
@ -1856,7 +1856,7 @@ void Gam_RequestCreatOrEditGame (void)
"<td class=\"RIGHT_TOP %s\">%s:"
"</td>"
"<td class=\"DAT LEFT_MIDDLE\">",
The_ClassForm[Gbl.Prefs.Theme],
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Users);
Rol_WriteSelectorRoles (1 << Rol_STD |
1 << Rol_NET |
@ -1979,7 +1979,7 @@ static void Gam_SetDefaultAndAllowedScope (struct Game *Game)
static void Gam_ShowLstGrpsToEditGame (long GamCod)
{
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;
@ -1995,7 +1995,7 @@ static void Gam_ShowLstGrpsToEditGame (long GamCod)
"%s:"
"</td>"
"<td class=\"LEFT_TOP\">",
The_ClassForm[Gbl.Prefs.Theme],
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Groups);
Box_StartBoxTable ("95%",NULL,NULL,
NULL,Box_NOT_CLOSABLE,0);

8
swad_group.c
View File

@ -356,7 +356,7 @@ void Grp_ShowFormToSelectSeveralGroups (Act_Action_t NextAction,
Grp_WhichGroups_t GroupsSelectableByStdsOrNETs)
{
extern const char *Hlp_USERS_Groups;
extern const char *The_ClassFormBold[The_NUM_THEMES];
extern const char *The_ClassFormInBoxBold[The_NUM_THEMES];
extern const char *Txt_Groups;
extern const char *Txt_Update_users;
unsigned NumGrpTyp;
@ -404,7 +404,7 @@ void Grp_ShowFormToSelectSeveralGroups (Act_Action_t NextAction,
fprintf (Gbl.F.Out,"<div class=\"CENTER_MIDDLE\""
" style=\"padding-top:12px;\">");
Frm_LinkFormSubmitAnimated (Txt_Update_users,
The_ClassFormBold[Gbl.Prefs.Theme],
The_ClassFormInBoxBold[Gbl.Prefs.Theme],
"CopyMessageToHiddenFields()");
Ico_PutCalculateIconWithText (Txt_Update_users);
fprintf (Gbl.F.Out,"</div>");
@ -423,7 +423,7 @@ void Grp_ShowFormToSelectSeveralGroups (Act_Action_t NextAction,
static void Grp_PutCheckboxAllGrps (Grp_WhichGroups_t GroupsSelectableByStdsOrNETs)
{
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *Txt_All_groups;
bool ICanSelUnselGroup;
@ -461,7 +461,7 @@ static void Grp_PutCheckboxAllGrps (Grp_WhichGroups_t GroupsSelectableByStdsOrNE
"&nbsp;%s"
"</label>"
"</div>",
The_ClassForm[Gbl.Prefs.Theme],
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_All_groups);
}

12
swad_hierarchy.c
View File

@ -91,7 +91,7 @@ void Hie_SeePending (void)
void Hie_WriteMenuHierarchy (void)
{
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *Txt_Country;
extern const char *Txt_Institution;
extern const char *Txt_Centre;
@ -108,7 +108,7 @@ void Hie_WriteMenuHierarchy (void)
"<label for=\"cty\" class=\"%s\">%s:</label>"
"</td>"
"<td class=\"LEFT_MIDDLE\">",
The_ClassForm[Gbl.Prefs.Theme],Txt_Country);
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Country);
Cty_WriteSelectorOfCountry ();
fprintf (Gbl.F.Out,"</td>"
"</tr>");
@ -122,7 +122,7 @@ void Hie_WriteMenuHierarchy (void)
"<label for=\"ins\" class=\"%s\">%s:</label>"
"</td>"
"<td class=\"LEFT_MIDDLE\">",
The_ClassForm[Gbl.Prefs.Theme],Txt_Institution);
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Institution);
Ins_WriteSelectorOfInstitution ();
fprintf (Gbl.F.Out,"</td>"
"</tr>");
@ -136,7 +136,7 @@ void Hie_WriteMenuHierarchy (void)
"<label for=\"ctr\" class=\"%s\">%s:</label>"
"</td>"
"<td class=\"LEFT_MIDDLE\">",
The_ClassForm[Gbl.Prefs.Theme],Txt_Centre);
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Centre);
Ctr_WriteSelectorOfCentre ();
fprintf (Gbl.F.Out,"</td>"
"</tr>");
@ -150,7 +150,7 @@ void Hie_WriteMenuHierarchy (void)
"<label for=\"deg\" class=\"%s\">%s:</label>"
"</td>"
"<td class=\"LEFT_MIDDLE\">",
The_ClassForm[Gbl.Prefs.Theme],Txt_Degree);
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Degree);
Deg_WriteSelectorOfDegree ();
fprintf (Gbl.F.Out,"</td>"
"</tr>");
@ -164,7 +164,7 @@ void Hie_WriteMenuHierarchy (void)
"<label for=\"crs\" class=\"%s\">%s:</label>"
"</td>"
"<td class=\"LEFT_MIDDLE\">",
The_ClassForm[Gbl.Prefs.Theme],Txt_Course);
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Course);
Crs_WriteSelectorOfCourse ();
fprintf (Gbl.F.Out,"</td>"
"</tr>");

10
swad_indicator.c
View File

@ -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)
"<label for=\"ScopeInd\" class=\"%s\">%s:</label>"
"</td>"
"<td class=\"LEFT_MIDDLE\">",
The_ClassForm[Gbl.Prefs.Theme],Txt_Scope);
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Scope);
Sco_PutSelectorScope ("ScopeInd",true);
fprintf (Gbl.F.Out,"</td>"
"</tr>");
@ -136,7 +136,7 @@ void Ind_ReqIndicatorsCourses (void)
"<label for=\"OthDegTypCod\" class=\"%s\">%s:</label>"
"</td>"
"<td class=\"DAT LEFT_MIDDLE\">",
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)
"</td>"
"<td class=\"LEFT_MIDDLE\">",
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:"
"</td>"
"<td class=\"LEFT_TOP\">",
The_ClassForm[Gbl.Prefs.Theme],
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_No_of_indicators);
Ind_ShowNumCoursesWithIndicators (NumCrssWithIndicatorYes,NumCrss,true);
fprintf (Gbl.F.Out,"</td>"

20
swad_info.c
View File

@ -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,"<li>");
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"
"</a>",
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,"<a href=\"%s\" target=\"_blank\" class=\"%s\">",
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,"</a>");
@ -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,"\">"
"<label for=\"InfoSrc%u\" class=\"%s\">%s</label>",
(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,"<span class=\"DAT\"><br />(%s)</span>",
@ -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)
"<input type=\"file\" name=\"%s\" />"
"</label>"
"</div>",
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:&nbsp;"
"<input type=\"url\" name=\"InfoSrcURL\""
" size=\"50\" maxlength=\"256\" value=\"",
The_ClassForm[Gbl.Prefs.Theme],Txt_URL);
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_URL);
if ((FileURL = fopen (PathFile,"rb")) == NULL)
fprintf (Gbl.F.Out,"http://");
else

28
swad_institution.c
View File

@ -299,7 +299,7 @@ void Ins_PrintConfiguration (void)
static void Ins_Configuration (bool PrintView)
{
extern const char *Hlp_INSTITUTION_Information;
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *Txt_Country;
extern const char *Txt_Institution;
extern const char *Txt_Short_name;
@ -349,7 +349,7 @@ static void Ins_Configuration (bool PrintView)
"<label for=\"OthCtyCod\" class=\"%s\">%s:</label>"
"</td>"
"<td class=\"DAT LEFT_MIDDLE\">",
The_ClassForm[Gbl.Prefs.Theme],
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Country);
if (!PrintView &&
@ -391,7 +391,7 @@ static void Ins_Configuration (bool PrintView)
"<label for=\"FullName\" class=\"%s\">%s:</label>"
"</td>"
"<td class=\"DAT_N LEFT_MIDDLE\">",
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)
"<label for=\"ShortName\" class=\"%s\">%s:</label>"
"</td>"
"<td class=\"DAT_N LEFT_MIDDLE\">",
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)
"<label for=\"WWW\" class=\"%s\">%s:</label>"
"</td>"
"<td class=\"DAT LEFT_MIDDLE\">",
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)
"</a>"
"</td>"
"</tr>",
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:"
"</td>"
"<td class=\"LEFT_MIDDLE\">",
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,"</td>"
@ -523,7 +523,7 @@ static void Ins_Configuration (bool PrintView)
"%u"
"</td>"
"</tr>",
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:"
"</td>"
"<td class=\"LEFT_MIDDLE\">",
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"
"</td>"
"</tr>",
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"
"</td>"
"</tr>",
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"
"</td>"
"</tr>",
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"
"</td>"
"</tr>",
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));

12
swad_layout.c
View File

@ -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,"</a>");
@ -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,"</a>");
@ -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,
"<label>",
Checked ? "CHECKBOX_CHECKED" :
"CHECKBOX_UNCHECKED",
The_ClassFormBold[Gbl.Prefs.Theme],
The_ClassFormOutBoxBold[Gbl.Prefs.Theme],
Title);
/****** Checkbox and text *****/

4
swad_logo.c
View File

@ -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)
"<input type=\"file\" name=\"%s\""
" onchange=\"document.getElementById('%s').submit();\" />"
"</label>",
The_ClassForm[Gbl.Prefs.Theme],
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_File_with_the_logo,
Fil_NAME_OF_PARAM_FILENAME_ORG,
Gbl.Form.Id);

12
swad_mail.c
View File

@ -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,"</a>"
@ -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,
"</label>"
"</td>"
"<td class=\"REC_C2_BOT LEFT_TOP USR_ID\">",
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:"
"</label>",
NumEmails - 1,
The_ClassForm[Gbl.Prefs.Theme],
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Other_emails);
fprintf (Gbl.F.Out,"</td>"
"<td class=\"REC_C2_BOT LEFT_TOP DAT\">");
@ -1358,7 +1358,7 @@ static void Mai_ShowFormChangeUsrEmail (const struct UsrData *UsrDat,bool ItsMe,
"<label for=\"NewEmail\" class=\"%s\">%s:</label>"
"</td>"
"<td class=\"REC_C2_BOT LEFT_TOP DAT\">",
The_ClassForm[Gbl.Prefs.Theme],
The_ClassFormInBox[Gbl.Prefs.Theme],
NumEmails ? Txt_New_email : // A new email
Txt_Email); // The first email
if (ItsMe)

6
swad_mark.c
View File

@ -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,"<td class=\"%s RIGHT_TOP COLOR%u\">",
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,"<td class=\"%s RIGHT_TOP COLOR%u\">",
The_ClassFormNoWrap[Gbl.Prefs.Theme],
The_ClassFormInBoxNoWrap[Gbl.Prefs.Theme],
Gbl.RowEvenOdd);
if (Gbl.CurrentCrs.Grps.GrpCod > 0) // Group zone
{

33
swad_message.c
View File

@ -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:"
"</td>"
"<td class=\"LEFT_TOP\">",
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_
"<td class=\"LEFT_MIDDLE\">"
"<textarea id=\"MsgSubject\" name=\"Subject\""
" class=\"MSG_SUBJECT\" rows=\"2\">",
The_ClassForm[Gbl.Prefs.Theme],
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_MSG_Subject);
/* If message is a reply ==> get original message */
@ -568,7 +568,7 @@ static void Msg_WriteFormSubjectAndContentMsgToUsrs (char Content[Cns_MAX_BYTES_
"<td class=\"LEFT_MIDDLE\">"
"<textarea id=\"MsgContent\" name=\"Content\""
" class=\"MSG_CONTENT\" rows=\"20\">",
The_ClassForm[Gbl.Prefs.Theme],Txt_MSG_Content);
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_MSG_Content);
/* Start textarea with a '\n', that will be not visible in textarea.
When Content is "\nLorem ipsum" (a white line before "Lorem ipsum"),
@ -600,7 +600,7 @@ static void Msg_WriteFormSubjectAndContentMsgToUsrs (char Content[Cns_MAX_BYTES_
"<td class=\"LEFT_MIDDLE\">"
"<textarea id=\"MsgContent\" name=\"Content\""
" class=\"MSG_CONTENT\" rows=\"20\">",
The_ClassForm[Gbl.Prefs.Theme],
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_MSG_Content);
/* Start textarea with a '\n', that will be not visible in textarea.
@ -1661,7 +1661,7 @@ static void Msg_ShowSentOrReceivedMessages (void)
extern const char *Hlp_MESSAGES_Received_filter;
extern const char *Hlp_MESSAGES_Sent;
extern const char *Hlp_MESSAGES_Sent_filter;
extern const char *The_ClassFormBold[The_NUM_THEMES];
extern const char *The_ClassFormInBoxBold[The_NUM_THEMES];
extern const char *Txt_Filter;
extern const char *Txt_Update_messages;
char FilterFromToSubquery[Msg_MAX_BYTES_MESSAGES_QUERY + 1];
@ -1744,8 +1744,8 @@ static void Msg_ShowSentOrReceivedMessages (void)
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Frm_LinkFormSubmitAnimated (Txt_Update_messages,
The_ClassFormBold[Gbl.Prefs.Theme],
NULL);
The_ClassFormInBoxBold[Gbl.Prefs.Theme],
NULL);
Ico_PutCalculateIconWithText (Txt_Update_messages);
fprintf (Gbl.F.Out,"</div>");
@ -2572,7 +2572,7 @@ void Msg_GetDistinctCoursesInMyMessages (void)
void Msg_ShowFormSelectCourseSentOrRecMsgs (void)
{
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *Txt_Messages_received_from_A_COURSE;
extern const char *Txt_Messages_sent_from_A_COURSE;
extern const char *Txt_any_course;
@ -2587,7 +2587,7 @@ void Msg_ShowFormSelectCourseSentOrRecMsgs (void)
fprintf (Gbl.F.Out,"<label class=\"%s\">%s&nbsp;"
"<select name=\"FilterCrsCod\">"
"<option value=\"\"",
The_ClassForm[Gbl.Prefs.Theme],
The_ClassFormInBox[Gbl.Prefs.Theme],
TxtSelector[Gbl.Msg.TypeOfMessages]);
if (Gbl.Msg.FilterCrsCod < 0)
fprintf (Gbl.F.Out," selected=\"selected\"");
@ -2613,7 +2613,7 @@ void Msg_ShowFormSelectCourseSentOrRecMsgs (void)
void Msg_ShowFormToFilterMsgs (void)
{
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *Txt_MSG_From;
extern const char *Txt_MSG_To;
extern const char *Txt_MSG_Content;
@ -2635,7 +2635,7 @@ void Msg_ShowFormToFilterMsgs (void)
" size=\"20\" maxlength=\"%u\" value=\"%s\" />"
"</label>"
"</td>",
The_ClassForm[Gbl.Prefs.Theme],
The_ClassFormInBox[Gbl.Prefs.Theme],
TxtFromTo[Gbl.Msg.TypeOfMessages],
Usr_MAX_CHARS_FIRSTNAME_OR_SURNAME * 3,Gbl.Msg.FilterFromTo);
@ -2648,7 +2648,7 @@ void Msg_ShowFormToFilterMsgs (void)
"</label>"
"</td>"
"</tr>",
The_ClassForm[Gbl.Prefs.Theme],
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_MSG_Content,
Msg_MAX_CHARS_FILTER_CONTENT,Gbl.Msg.FilterContent);
@ -2662,14 +2662,14 @@ void Msg_ShowFormToFilterMsgs (void)
static void Msg_ShowFormToShowOnlyUnreadMessages (void)
{
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *Txt_only_unread_messages;
/***** Put checkbox to select whether to show only unread (received) messages *****/
fprintf (Gbl.F.Out,"<label class=\"%s\">"
"<input type=\"checkbox\" name=\"OnlyUnreadMsgs\""
" value=\"Y\"",
The_ClassForm[Gbl.Prefs.Theme]);
The_ClassFormInBox[Gbl.Prefs.Theme]);
if (Gbl.Msg.ShowOnlyUnreadMsgs)
fprintf (Gbl.F.Out," checked=\"checked\"");
fprintf (Gbl.F.Out," />"
@ -3288,7 +3288,6 @@ static void Msg_WriteFormToReply (long MsgCod,long CrsCod,
bool FromThisCrs,bool Replied,
const struct UsrData *UsrDat)
{
extern const char *The_ClassFormBold[The_NUM_THEMES];
extern const char *Txt_Reply;
extern const char *Txt_Reply_again;
extern const char *Txt_Go_to_course_and_reply;

4
swad_network.c
View File

@ -271,7 +271,7 @@ static void Net_ShowAWebOrSocialNet (const char *URL,
void Net_ShowFormMyWebsAndSocialNets (void)
{
extern const char *Hlp_PROFILE_Webs;
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *Txt_Webs_social_networks;
extern const char *Txt_Save_changes;
MYSQL_RES *mysql_res;
@ -342,7 +342,7 @@ void Net_ShowFormMyWebsAndSocialNets (void)
"</td>"
"</tr>",
(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],

8
swad_nickname.c
View File

@ -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
"</label>"
"</td>"
"<td class=\"REC_C2_BOT LEFT_TOP USR_ID\">",
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
"</label>"
"</td>",
NumNicks - 1,
The_ClassForm[Gbl.Prefs.Theme],
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Other_nicknames);
fprintf (Gbl.F.Out,"<td class=\"REC_C2_BOT LEFT_TOP DAT\">");
@ -373,7 +373,7 @@ static void Nck_ShowFormChangeUsrNickname (const struct UsrData *UsrDat,bool Its
"</label>"
"</td>"
"<td class=\"REC_C2_BOT LEFT_TOP DAT\">",
The_ClassForm[Gbl.Prefs.Theme],
The_ClassFormInBox[Gbl.Prefs.Theme],
NumNicks ? Txt_New_nickname : // A new nickname
Txt_Nickname); // The first nickname
if (ItsMe)

4
swad_notification.c
View File

@ -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)
"</td>"
"<td class=\"CENTER_MIDDLE\">"
"<input type=\"checkbox\" name=\"%s\" value=\"Y\"",
The_ClassForm[Gbl.Prefs.Theme],
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_NOTIFY_EVENTS_PLURAL[NotifyEvent],
Ntf_ParamNotifMeAboutNotifyEvents[NotifyEvent]);
if ((Gbl.Usrs.Me.UsrDat.Prefs.NotifNtfEvents & (1 << NotifyEvent)))

24
swad_password.c
View File

@ -275,7 +275,7 @@ static void Pwd_PutLinkToSendNewPasswdParams (void)
void Pwd_ShowFormSendNewPwd (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_If_you_have_forgotten_your_password_;
extern const char *Txt_Forgotten_password;
extern const char *Txt_nick_email_or_ID;
@ -298,7 +298,7 @@ void Pwd_ShowFormSendNewPwd (void)
" size=\"8\" maxlength=\"%u\" value=\"%s\""
" required=\"required\" />"
"</label>",
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\" />"
"</td>"
"</tr>",
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)
"<td class=\"LEFT_MIDDLE\">"
"<input type=\"password\" id=\"Passwd\" name=\"Paswd\""
" size=\"18\" maxlength=\"%u\" placeholder=\"",
The_ClassForm[Gbl.Prefs.Theme],
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Password,
Pwd_MAX_CHARS_PLAIN_PASSWORD);
@ -783,7 +783,7 @@ void Pwd_PutFormToGetNewPasswordOnce (void)
void Pwd_PutFormToGetNewPasswordTwice (void)
{
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *Txt_New_password;
extern const char *Txt_HELP_password;
extern const char *Txt_Retype_new_password;
@ -798,7 +798,7 @@ void Pwd_PutFormToGetNewPasswordTwice (void)
"<input type=\"password\" id=\"Paswd1\" name=\"Paswd1\""
" size=\"18\" maxlength=\"%u\""
" placeholder=\"",
The_ClassForm[Gbl.Prefs.Theme],
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_New_password,
Pwd_MAX_CHARS_PLAIN_PASSWORD);
@ -821,7 +821,7 @@ void Pwd_PutFormToGetNewPasswordTwice (void)
"<input type=\"password\" id=\"Paswd2\" name=\"Paswd2\""
" size=\"18\" maxlength=\"%u\""
" placeholder=\"",
The_ClassForm[Gbl.Prefs.Theme],
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Retype_new_password,
Pwd_MAX_CHARS_PLAIN_PASSWORD);
@ -896,7 +896,7 @@ void Pwd_ShowFormChgOtherUsrPwd (void)
void Pwd_AskForConfirmationOnDangerousAction (void)
{
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *Txt_I_understand_that_this_action_can_not_be_undone;
extern const char *Txt_For_security_enter_your_password;
@ -913,9 +913,9 @@ void Pwd_AskForConfirmationOnDangerousAction (void)
" autocomplete=\"off\" required=\"required\" />"
"</label>"
"</div>",
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);
}

22
swad_photo.c
View File

@ -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)
"<input type=\"file\" name=\"%s\" accept=\"image/*\""
" onchange=\"document.getElementById('%s').submit();\" />"
"</label>",
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,"<div class=\"ZOOM_TXT_LINE\">"
"<span class=\"DAT_N_BOLD\">%u</span>"
"<span class=\"DAT_SMALL\">&nbsp;%s&nbsp;&nbsp;</span>"
"<span class=\"DAT_SMALL\">&nbsp;%s&nbsp;</span>"
"<span class=\"DAT_N_BOLD\">%u</span>"
"<span class=\"DAT_SMALL\">&nbsp;%s</span>"
"</div>",
@ -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)
"<label for=\"AvgType\" class=\"%s\">%s:</label>"
"</td>"
"<td class=\"LEFT_MIDDLE\">",
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)
"<label for=\"PhotoSize\" class=\"%s\">%s:</label>"
"</td>"
"<td class=\"LEFT_MIDDLE\">",
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)
"<label for=\"Order\" class=\"%s\">%s:</label>"
"</td>"
"<td class=\"LEFT_MIDDLE\">",
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);

4
swad_privacy.c
View File

@ -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:"
"</td>"
"<td class=\"LEFT_TOP\">",
The_ClassForm[Gbl.Prefs.Theme],TxtLabel);
The_ClassFormInBox[Gbl.Prefs.Theme],TxtLabel);
/***** Form with list of options *****/
if (Action != ActUnk)

29
swad_profile.c
View File

@ -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)
"<input type=\"text\" name=\"usr\""
" size=\"18\" maxlength=\"%u\" value=\"@%s\" />"
"</label>",
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,"</li>");
/***** 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,"</li>");
/***** 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,"</li>");
/***** 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,"</li>");
@ -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,"</li>");
}
@ -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</a>",Rank);
Frm_EndForm ();
}

22
swad_project.c
View File

@ -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,"<a href=\"\" title=\"%s\" class=\"%s\""
" onclick=\"toggleProject('%u');return false;\" />",
Text,The_ClassForm[Gbl.Prefs.Theme],
Text,The_ClassFormInBox[Gbl.Prefs.Theme],
UniqueId);
Ico_PutIconTextLink (Icon,Text);
fprintf (Gbl.F.Out,"</a>");
@ -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\" />"
"</td>"
"</tr>",
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)
"</td>"
"<td class=\"LEFT_MIDDLE\">",
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)
"</td>"
"<td class=\"LEFT_MIDDLE\">"
"<select name=\"Preassigned\">",
The_ClassForm[Gbl.Prefs.Theme],
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Preassigned_QUESTION);
fprintf (Gbl.F.Out,"<option value=\"Y\"");
@ -3026,7 +3026,7 @@ static void Prj_PutFormProject (struct Project *Prj,bool ItsANewProject)
" min=\"0\" value=\"%u\" />"
"</td>"
"</tr>",
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)
"</td>"
"<td class=\"LEFT_MIDDLE\">"
"<select name=\"Proposal\">",
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\" />"
"</td>"
"</tr>",
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,"<tr>"
"<td class=\"RIGHT_TOP\">"
@ -3112,7 +3112,7 @@ static void Prj_EditOneProjectTxtArea (const char *Id,
"</textarea>"
"</td>"
"</tr>",
Id,The_ClassForm[Gbl.Prefs.Theme],Label,
Id,The_ClassFormInBox[Gbl.Prefs.Theme],Label,
Id,Id,
NumRows,
TxtField);

20
swad_record.c
View File

@ -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,"</a>"
"<label class=\"%s\">"
"(<select name=\"RecsPerPag\">",
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,"<tr>"
"<td class=\"REC_C1_BOT %s RIGHT_TOP COLOR%u\">"
"%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;

6
swad_search.c
View File

@ -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,"<div class=\"CENTER_MIDDLE\">"
"<label class=\"%s\">%s:&nbsp;",
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,"<label class=\"%s\">"
" %s&nbsp;",
The_ClassForm[Gbl.Prefs.Theme],Txt_SEARCH_X_in_Y);
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_SEARCH_X_in_Y);
fprintf (Gbl.F.Out,"<select name=\"WhatToSearch\" style=\"width:186px;\">");
for (WhatToSearch = (Sch_WhatToSearch_t) 0;
WhatToSearch < Sch_NUM_WHAT_TO_SEARCH;

12
swad_social.c
View File

@ -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 (<span id=\"view_new_posts_count\">0</span>)"
"</a>"
"</div>",
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)
"&nbsp;%s"
"</a>"
"</div>",
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,"<img src=\"%s/%s\""
" alt=\"%s\" title=\"%s\""

28
swad_statistic.c
View File

@ -286,7 +286,7 @@ void Sta_RemoveOldEntriesRecentLog (void)
void Sta_AskShowCrsHits (void)
{
extern const char *Hlp_ANALYTICS_Visits_visits_to_course;
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *Txt_Statistics_of_visits_to_the_course_X;
extern const char *Txt_Users;
extern const char *Txt_Show;
@ -379,8 +379,8 @@ void Sta_AskShowCrsHits (void)
"</td>"
"<td colspan=\"2\" class=\"%s LEFT_TOP\">"
"<table>",
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,"<tr>"
"<td class=\"RIGHT_MIDDLE %s\">%s:</td>"
"<td colspan=\"2\" class=\"LEFT_MIDDLE\">",
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,"<label class=\"%s\">&nbsp;%s&nbsp;"
"<select id=\"GroupedBy\" name=\"GroupedBy\">",
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)
"</td>"
"<td colspan=\"2\" class=\"LEFT_MIDDLE\">"
"<select id=\"Role\" name=\"Role\">",
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)
"<label for=\"ScopeSta\" class=\"%s\">%s:</label>"
"</td>"
"<td colspan=\"2\" class=\"LEFT_MIDDLE\">",
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)
"<label for=\"CountType\" class=\"%s\">%s:</label>"
"</td>"
"<td colspan=\"2\" class=\"LEFT_MIDDLE\">",
The_ClassForm[Gbl.Prefs.Theme],Txt_Show);
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Show);
Sta_WriteSelectorCountType ();
/***** Type of statistic *****/
fprintf (Gbl.F.Out,"<label class=\"%s\">&nbsp;%s&nbsp;",
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)
"<td colspan=\"2\" class=\"LEFT_MIDDLE\">"
"<select id=\"StatAct\" name=\"StatAct\""
" style=\"width:375px;\">",
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,"<label class=\"%s\">%s:&nbsp;"
"<select name=\"ColorType\""
" onchange=\"document.getElementById('%s').submit();\">",
The_ClassForm[Gbl.Prefs.Theme],
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_Color_of_the_graphic,
Gbl.Form.Id);
for (ColorType = (Sta_ColorType_t) 0;

24
swad_survey.c
View File

@ -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)
"<label for=\"ScopeSvy\" class=\"%s\">%s:</label>"
"</td>"
"<td class=\"LEFT_MIDDLE\">",
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\" />"
"</td>"
"</tr>",
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)
"<td class=\"LEFT_TOP\">"
"<textarea id=\"Txt\" name=\"Txt\""
" cols=\"60\" rows=\"10\">",
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)
"<td class=\"RIGHT_TOP %s\">%s:"
"</td>"
"<td class=\"DAT LEFT_MIDDLE\">",
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:"
"</td>"
"<td class=\"LEFT_TOP\">",
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,
"</textarea>"
"</td>"
"</tr>",
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:"
"</td>"
"<td class=\"%s LEFT_TOP\">",
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,
"<td class=\"RIGHT_TOP\">"
"<label for=\"AnsStr%u\" class=\"%s\">%u)</label>"
"</td>",
NumAns,The_ClassForm[Gbl.Prefs.Theme],NumAns + 1);
NumAns,The_ClassFormInBox[Gbl.Prefs.Theme],NumAns + 1);
/* Answer text */
fprintf (Gbl.F.Out,"<td class=\"RIGHT_TOP\">"

74
swad_test.c
View File

@ -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)
"<input type=\"number\""
" id=\"NumQst\" name=\"NumQst\""
" min=\"%u\" max=\"%u\" value=\"%u\"",
The_ClassForm[Gbl.Prefs.Theme],Txt_No_of_questions,
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_No_of_questions,
Gbl.Test.Config.Min,
Gbl.Test.Config.Max,
Gbl.Test.Config.Def);
@ -425,7 +425,7 @@ static void Tst_PutFormToViewResultsOfUsersTests (Act_Action_t Action)
void Tst_ShowNewTest (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_No_questions_found_matching_your_search_criteria;
extern const char *Txt_Test;
extern const char *Txt_Allow_teachers_to_consult_this_test;
@ -480,7 +480,7 @@ void Tst_ShowNewTest (void)
"<label class=\"%s\">"
"<input type=\"checkbox\" name=\"Save\""
" value=\"Y\"",
The_ClassForm[Gbl.Prefs.Theme]);
The_ClassFormInBox[Gbl.Prefs.Theme]);
if (Gbl.Test.AllowTeachers)
fprintf (Gbl.F.Out," checked=\"checked\"");
fprintf (Gbl.F.Out," />"
@ -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,"<label class=\"%s\">"
"<input type=\"radio\" name=\"%s\" value=\"%u\"",
The_ClassForm[Gbl.Prefs.Theme],
The_ClassFormInBox[Gbl.Prefs.Theme],
ParamUploadImg.Action,Img_ACTION_NO_IMAGE);
if (OptionsDisabled)
fprintf (Gbl.F.Out," disabled=\"disabled\"");
@ -1146,7 +1146,7 @@ static void Tst_PutFormToEditQstImage (struct Image *Image,int NumImgInForm,
fprintf (Gbl.F.Out,"<label class=\"%s\">"
"<input type=\"radio\" name=\"%s\" value=\"%u\""
" checked=\"checked\"",
The_ClassForm[Gbl.Prefs.Theme],
The_ClassFormInBox[Gbl.Prefs.Theme],
ParamUploadImg.Action,Img_ACTION_KEEP_IMAGE);
if (OptionsDisabled)
fprintf (Gbl.F.Out," disabled=\"disabled\"");
@ -1161,7 +1161,7 @@ static void Tst_PutFormToEditQstImage (struct Image *Image,int NumImgInForm,
fprintf (Gbl.F.Out,"<label class=\"%s\">"
"<input type=\"radio\" id=\"chg_img_%u\" name=\"%s\""
" value=\"%u\"",
The_ClassForm[Gbl.Prefs.Theme],
The_ClassFormInBox[Gbl.Prefs.Theme],
UniqueId,ParamUploadImg.Action,
Img_ACTION_CHANGE_IMAGE); // Replace existing image by new image
if (OptionsDisabled)
@ -1693,7 +1693,7 @@ static unsigned long Tst_GetEnabledTagsFromThisCrs (MYSQL_RES **mysql_res)
static void Tst_ShowFormSelTags (unsigned long NumRows,MYSQL_RES *mysql_res,
bool ShowOnlyEnabledTags,unsigned NumCols)
{
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *Txt_Tags;
extern const char *Txt_All_tags;
extern const char *Txt_Tag_not_allowed;
@ -1709,7 +1709,7 @@ static void Tst_ShowFormSelTags (unsigned long NumRows,MYSQL_RES *mysql_res,
"<td class=\"RIGHT_TOP %s\">"
"%s:"
"</td>",
The_ClassForm[Gbl.Prefs.Theme],Txt_Tags);
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Tags);
/***** Select all tags *****/
fprintf (Gbl.F.Out,"<td");
@ -1723,7 +1723,7 @@ static void Tst_ShowFormSelTags (unsigned long NumRows,MYSQL_RES *mysql_res,
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE\">"
"<label class=\"%s\">"
"<input type=\"checkbox\" name=\"AllTags\" value=\"Y\"",
The_ClassForm[Gbl.Prefs.Theme]);
The_ClassFormInBox[Gbl.Prefs.Theme]);
if (Gbl.Test.Tags.All)
fprintf (Gbl.F.Out," checked=\"checked\"");
fprintf (Gbl.F.Out," onclick=\"togglecheckChildren(this,'ChkTag');\" />"
@ -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:"
"</td>"
"<td class=\"LEFT_BOTTOM\">",
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:"
"</td>"
"<td class=\"LEFT_BOTTOM\">",
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\" />"
"</td>"
"</tr>",
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:"
"</td>"
"<td class=\"LEFT_BOTTOM\">",
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)
"<td class=\"RIGHT_TOP %s\">"
"%s:"
"</td>",
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,"<td");
@ -2333,7 +2333,7 @@ static void Tst_ShowFormAnswerTypes (unsigned NumCols)
"<td class=\"LEFT_MIDDLE\">"
"<label class=\"%s\">"
"<input type=\"checkbox\" name=\"AllAnsTypes\" value=\"Y\"",
The_ClassForm[Gbl.Prefs.Theme]);
The_ClassFormInBox[Gbl.Prefs.Theme]);
if (Gbl.Test.AllAnsTypes)
fprintf (Gbl.F.Out," checked=\"checked\"");
fprintf (Gbl.F.Out," onclick=\"togglecheckChildren(this,'AnswerType');\" />"
@ -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:"
"</td>"
"<td class=\"LEFT_TOP\">",
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"
"</textarea><br />",
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,"<label class=\"%s\">"
"%s (%s):<br />"
"<textarea name=\"Feedback\" class=\"STEM\" rows=\"2\">",
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:"
"</td>"
"<td class=\"%s LEFT_TOP\">",
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:&nbsp;"
"<input type=\"text\" name=\"AnsInt\""
" size=\"11\" maxlength=\"11\" value=\"%ld\"",
The_ClassForm[Gbl.Prefs.Theme],Txt_Answers,
The_ClassForm[Gbl.Prefs.Theme],Txt_Integer_number,
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Answers,
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Integer_number,
Gbl.Test.Answer.Integer);
if (Gbl.Test.AnswerType != Tst_ANS_INT)
fprintf (Gbl.F.Out," disabled=\"disabled\"");
@ -5178,7 +5178,7 @@ static void Tst_PutFormEditOneQst (char Stem[Cns_MAX_BYTES_TEXT + 1],
"<td class=\"LEFT_TOP\">"
"<label class=\"%s\">"
"<input type=\"checkbox\" name=\"Shuffle\" value=\"Y\"",
The_ClassForm[Gbl.Prefs.Theme]);
The_ClassFormInBox[Gbl.Prefs.Theme]);
if (Gbl.Test.Shuffle)
fprintf (Gbl.F.Out," checked=\"checked\"");
if (Gbl.Test.AnswerType != Tst_ANS_UNIQUE_CHOICE &&
@ -5243,7 +5243,7 @@ static void Tst_PutFormEditOneQst (char Stem[Cns_MAX_BYTES_TEXT + 1],
/***** Center column: letter of the answer and expand / contract icon *****/
fprintf (Gbl.F.Out,"<td class=\"%s TEST_EDI_ANS_CENTER_COL COLOR%u\">"
"%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,"<label class=\"%s\">%s (%s):<br />"
"<textarea name=\"FbStr%u\" class=\"ANS_STR\" rows=\"2\"",
The_ClassForm[Gbl.Prefs.Theme],Txt_Feedback,Txt_optional,
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Feedback,Txt_optional,
NumOpt);
if (OptionsDisabled)
fprintf (Gbl.F.Out," disabled=\"disabled\"");
@ -5351,13 +5351,13 @@ static void Tst_PutFormEditOneQst (char Stem[Cns_MAX_BYTES_TEXT + 1],
static void Tst_PutFloatInputField (const char *Label,const char *Field,
double Value)
{
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *The_ClassFormInBox[The_NUM_THEMES];
fprintf (Gbl.F.Out,"<label class=\"%s\">%s&nbsp;"
"<input type=\"text\" name=\"%s\""
" size=\"11\" maxlength=\"%u\""
" value=\"%lg\"",
The_ClassForm[Gbl.Prefs.Theme],Label,
The_ClassFormInBox[Gbl.Prefs.Theme],Label,
Field,
Tst_MAX_BYTES_FLOAT_ANSWER,
Value);
@ -5373,11 +5373,11 @@ static void Tst_PutFloatInputField (const char *Label,const char *Field,
static void Tst_PutTFInputField (const char *Label,char Value)
{
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *The_ClassFormInBox[The_NUM_THEMES];
fprintf (Gbl.F.Out,"<label class=\"%s\">"
"<input type=\"radio\" name=\"AnsTF\" value=\"%c\"",
The_ClassForm[Gbl.Prefs.Theme],Value);
The_ClassFormInBox[Gbl.Prefs.Theme],Value);
if (Gbl.Test.Answer.TF == Value)
fprintf (Gbl.F.Out," checked=\"checked\"");
if (Gbl.Test.AnswerType != Tst_ANS_TRUE_FALSE)
@ -7457,7 +7457,7 @@ static unsigned Tst_GetNumCoursesWithPluggableTstQuestions (Sco_Scope_t Scope,Ts
void Tst_SelUsrsToSeeUsrsTestResults (void)
{
extern const char *Hlp_ASSESSMENT_Tests_test_results;
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *Txt_Test_results;
extern const char *Txt_Users;
extern const char *Txt_View_test_results;
@ -7507,8 +7507,8 @@ void Tst_SelUsrsToSeeUsrsTestResults (void)
"%s:"
"</td>"
"<td colspan=\"2\" class=\"%s LEFT_TOP\">",
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);

8
swad_test_import.c
View File

@ -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)
"<input type=\"file\" name=\"%s\" accept=\".xml\""
" onchange=\"document.getElementById('%s').submit();\" />"
"</label>",
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,"<a href=\"%s/%s/%s/test.xml\" class=\"%s\" target=\"_blank\">",
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,"</a>");

66
swad_theme.c
View File

@ -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",
};
/*****************************************************************************/

32
swad_user.c
View File

@ -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,"<label class=\"%s\">%s:&nbsp;",
The_ClassForm[Gbl.Prefs.Theme],Txt_Role);
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Role);
Rol_PutFormToChangeMyRole (NULL);
fprintf (Gbl.F.Out,"</label>");
}
@ -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,"<img src=\"%s/%s\""
@ -6110,7 +6110,7 @@ static void Usr_PutCheckboxToSelectUser (Rol_Role_t Role,
static void Usr_PutCheckboxListWithPhotos (void)
{
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *Txt_Display_photos;
Par_PutHiddenParamChar ("WithPhotosExists",'Y');
@ -6119,7 +6119,7 @@ static void Usr_PutCheckboxListWithPhotos (void)
fprintf (Gbl.F.Out,"<label class=\"%s\">"
"<input type=\"checkbox\" name=\"WithPhotos\""
" value=\"Y\"",
The_ClassForm[Gbl.Prefs.Theme]);
The_ClassFormInBox[Gbl.Prefs.Theme]);
if (Gbl.Usrs.Listing.WithPhotos)
fprintf (Gbl.F.Out," checked=\"checked\"");
fprintf (Gbl.F.Out," onclick=\"document.getElementById('%s').submit();\" />"
@ -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,"<label class=\"%s\">%s:&nbsp;",
The_ClassForm[Gbl.Prefs.Theme],Txt_Scope);
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Scope);
Sco_PutSelectorScope ("ScopeUsr",true);
fprintf (Gbl.F.Out,"</label>");
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,"<label class=\"%s\">%s:&nbsp;",
The_ClassForm[Gbl.Prefs.Theme],Txt_Scope);
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Scope);
Sco_PutSelectorScope ("ScopeUsr",true);
fprintf (Gbl.F.Out,"</label>");
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,"<label class=\"%s\">%s:&nbsp;",
The_ClassForm[Gbl.Prefs.Theme],Txt_Scope);
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Scope);
Sco_PutSelectorScope ("ScopeUsr",true);
fprintf (Gbl.F.Out,"</label>");
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,"<label class=\"%s\">%s:&nbsp;",
The_ClassForm[Gbl.Prefs.Theme],Txt_Scope);
The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Scope);
Sco_PutSelectorScope ("ScopeUsr",true);
fprintf (Gbl.F.Out,"</label>");
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,"<label class=\"%s\">"
"<select name=\"ColsClassPhoto\""
" onchange=\"document.getElementById('%s').submit();\">",
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;

10
swad_zip.c
View File

@ -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,"<img src=\"%s/download.svg\""
" alt=\"%s\" title=\"%s\""
" class=\"ICO16x16\" />"
@ -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,
"<a href=\"%s\" class=\"DAT\" title=\"%s\" target=\"_blank\">%s</a>"
"</td>"
"</tr>",
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,
"</td>"
"<td class=\"DAT LEFT_MIDDLE\">"
"%s",
The_ClassForm[Gbl.Prefs.Theme],
The_ClassFormInBox[Gbl.Prefs.Theme],
Txt_File_size,
FileSizeStr);
if (UncompressedSize)