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 14.121

This commit is contained in:
Antonio Cañas Vargas 2015-07-27 21:25:45 +02:00
parent f9b025dafc
commit 40b8837329
47 changed files with 542 additions and 507 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
css/swad_desktop.css
View File

@ -731,10 +731,14 @@ a:hover img.CENTRE_PHOTO_SHOW
.YELLOW_MENU_ON {color:#BD4815; font-size:10pt; font-weight:bold; line-height:110%;}
/********************************* Form fonts ********************************/
.WHITE_FORM {color:#4D88A1; font-size:11pt; text-align:right; vertical-align:middle;}
.GREY_FORM {color:#4D88A1; font-size:11pt; text-align:right; vertical-align:middle;}
.BLUE_FORM {color:#4D88A1; font-size:11pt; text-align:right; vertical-align:middle;}
.YELLOW_FORM {color:#7C4D2A; font-size:11pt; text-align:right; vertical-align:middle;}
.WHITE_FORM {color:#4D88A1; font-size:11pt;}
.GREY_FORM {color:#4D88A1; font-size:11pt;}
.BLUE_FORM {color:#4D88A1; font-size:11pt;}
.YELLOW_FORM {color:#7C4D2A; font-size:11pt;}
.CENTER_MIDDLE {text-align:center; vertical-align:middle;}
.RIGHT_MIDDLE {text-align:right; vertical-align:middle;}
.RIGHT_TOP {text-align:right; vertical-align:top;}
.WHITE_FORM_NOWRAP {color:#4D88A1; font-size:11pt; white-space:nowrap;}
.GREY_FORM_NOWRAP {color:#4D88A1; font-size:11pt; white-space:nowrap;}

12
css/swad_mobile.css
View File

@ -542,10 +542,14 @@ a:hover img.CENTRE_PHOTO_SHOW
.YELLOW_MENU_ON {color:#FF4301; font-size:20pt; font-weight:bold; line-height:110%;}
/********************************* Form fonts ********************************/
.WHITE_FORM {color:#4D88A1; font-size:16pt; text-align:right; vertical-align:middle;}
.GREY_FORM {color:#4D88A1; font-size:16pt; text-align:right; vertical-align:middle;}
.BLUE_FORM {color:#4D88A1; font-size:16pt; text-align:right; vertical-align:middle;}
.YELLOW_FORM {color:#FF4301; font-size:16pt; text-align:right; vertical-align:middle;}
.WHITE_FORM {color:#4D88A1; font-size:16pt;}
.GREY_FORM {color:#4D88A1; font-size:16pt;}
.BLUE_FORM {color:#4D88A1; font-size:16pt;}
.YELLOW_FORM {color:#FF4301; font-size:16pt;}
.CENTER_MIDDLE {text-align:center; vertical-align:middle;}
.RIGHT_MIDDLE {text-align:right; vertical-align:middle;}
.RIGHT_TOP {text-align:right; vertical-align:top;}
.WHITE_FORM_NOWRAP {color:#4D88A1; font-size:16pt; white-space:nowrap;}
.GREY_FORM_NOWRAP {color:#4D88A1; font-size:16pt; white-space:nowrap;}

10
swad_ID.c
View File

@ -416,7 +416,7 @@ void ID_ShowFormOthIDs (void)
void ID_ShowFormChangeUsrID (const struct UsrData *UsrDat,bool ItsMe)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *Txt_ID;
extern const char *Txt_ID_X_confirmed;
extern const char *Txt_Another_ID;
@ -432,12 +432,12 @@ void ID_ShowFormChangeUsrID (const struct UsrData *UsrDat,bool ItsMe)
{
if (NumID == 0)
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"vertical-align:top;\">"
"<td class=\"%s RIGHT_TOP\">"
"%s:"
"</td>"
"<td colspan=\"2\" style=\"text-align:left;"
" vertical-align:top;\">",
The_ClassFormul[Gbl.Prefs.Theme],Txt_ID);
The_ClassForm[Gbl.Prefs.Theme],Txt_ID);
else // NumID >= 1
fprintf (Gbl.F.Out,"<br />");
@ -487,12 +487,12 @@ void ID_ShowFormChangeUsrID (const struct UsrData *UsrDat,bool ItsMe)
if (UsrDat->IDs.Num < ID_MAX_IDS_PER_USER)
{
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\">"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td style=\"text-align:left;"
" vertical-align:middle;\">",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassForm[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_QR.c
View File

@ -72,7 +72,7 @@ static void QR_ImageQRCode (const char *QRString);
void QR_PutLinkToPrintQRCode (struct UsrData *UsrDat,bool PrintText)
{
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *The_ClassFormBold[The_NUM_THEMES];
extern const char *Txt_QR_code;
char NicknameWithArroba[Nck_MAX_BYTES_NICKNAME_WITH_ARROBA+1];
@ -80,7 +80,7 @@ void QR_PutLinkToPrintQRCode (struct UsrData *UsrDat,bool PrintText)
Act_FormStart (ActPrnUsrQR);
sprintf (NicknameWithArroba,"@%s",UsrDat->Nickname);
Par_PutHiddenParamString ("QRString",NicknameWithArroba);
Act_LinkFormSubmit (Txt_QR_code,The_ClassFormulB[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (Txt_QR_code,The_ClassFormBold[Gbl.Prefs.Theme]);
Lay_PutIconWithText ("qr",Txt_QR_code,PrintText ? Txt_QR_code :
NULL);
Act_FormEnd ();

18
swad_account.c
View File

@ -112,7 +112,7 @@ void Acc_ShowFormAccount (void)
static void Acc_ShowFormRequestNewAccountWithParams (const char *NewNicknameWithoutArroba,
const char *NewEmail)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *Txt_Log_in;
extern const char *Txt_Nickname;
extern const char *Txt_HELP_nickname;
@ -138,16 +138,16 @@ static void Acc_ShowFormRequestNewAccountWithParams (const char *NewNicknameWith
else
NewNicknameWithArroba[0] = '\0';
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\">"
"%s: "
"</td>"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td style=\"text-align:left;\">"
"<input type=\"text\" name=\"NewNick\""
" size=\"25\" maxlength=\"%u\""
" placeholder=\"%s\" value=\"%s\" />"
"</td>"
"</tr>",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassForm[Gbl.Prefs.Theme],
Txt_Nickname,
1+Nck_MAX_LENGTH_NICKNAME_WITHOUT_ARROBA,
Txt_HELP_nickname,
@ -155,16 +155,16 @@ static void Acc_ShowFormRequestNewAccountWithParams (const char *NewNicknameWith
/***** E-mail *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\">"
"%s: "
"</td>"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td style=\"text-align:left;\">"
"<input type=\"text\" name=\"NewEmail\""
" size=\"25\" maxlength=\"%u\""
" placeholder=\"%s\" value=\"%s\" />"
"</td>"
"</tr>",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassForm[Gbl.Prefs.Theme],
Txt_Email,
Usr_MAX_BYTES_USR_EMAIL,
Txt_HELP_email,

8
swad_action.c
View File

@ -4322,12 +4322,12 @@ void Act_LinkFormSubmitAnimated (const char *Title,const char *LinkStyle)
void Act_PutContextualLink (Act_Action_t NextAction,void (*FuncParams) (),
const char *Icon,const char *Title)
{
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *The_ClassFormBold[The_NUM_THEMES];
Act_FormStart (NextAction);
if (FuncParams)
FuncParams ();
Act_LinkFormSubmit (Title,The_ClassFormulB[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (Title,The_ClassFormBold[Gbl.Prefs.Theme]);
Lay_PutIconWithText (Icon,Title,Title);
Act_FormEnd ();
}
@ -4694,7 +4694,7 @@ void Act_ShowMyMFUActions (void)
void Act_WriteBigMFUActions (struct Act_ListMFUActions *ListMFUActions)
{
extern const char *The_ClassFormulNB[The_NUM_THEMES];
extern const char *The_ClassFormNoWrap[The_NUM_THEMES];
extern const char *Txt_Frequent_actions;
extern const char *Txt_TABS_FULL_TXT[Tab_NUM_TABS];
extern const char *Txt_MENU_TITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB];
@ -4729,7 +4729,7 @@ void Act_WriteBigMFUActions (struct Act_ListMFUActions *ListMFUActions)
"<td style=\"text-align:left;"
" vertical-align:middle; padding-left:2px;\">");
Act_FormStart (Action);
Act_LinkFormSubmit (TabMenuStr,The_ClassFormulNB[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (TabMenuStr,The_ClassFormNoWrap[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"<img src=\"%s/%s/%s64x64.gif\""
" alt=\"%s\" title=\"%s\""
" class=\"ICON32x32\" style=\"margin:4px;\" />",

20
swad_announcement.c
View File

@ -199,7 +199,7 @@ void Ann_ShowMyAnnouncementsNotMarkedAsSeen (void)
static void Ann_ShowAnnouncement (long AnnCod,const char *Subject,const char *Content,
unsigned Roles,bool ShowAllAnnouncements)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *Txt_Users;
extern const char *Txt_ROLES_PLURAL_abc[Rol_NUM_ROLES][Usr_NUM_SEXS];
extern const char *Txt_Remove;
@ -243,7 +243,7 @@ static void Ann_ShowAnnouncement (long AnnCod,const char *Subject,const char *Co
/* Form to remove announcement */
Act_FormStart (ActRemAnn);
Ann_PutHiddenParamAnnCod (AnnCod);
Act_LinkFormSubmit (Txt_Remove,The_ClassFormul[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (Txt_Remove,The_ClassForm[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"<img src=\"%s/delon16x16.gif\""
" alt=\"%s\" title=\"%s\""
" class=\"ICON16x16\" />"
@ -259,7 +259,7 @@ static void Ann_ShowAnnouncement (long AnnCod,const char *Subject,const char *Co
/* Form to mark announcement as seen */
Act_FormStart (ActAnnSee);
Ann_PutHiddenParamAnnCod (AnnCod);
Act_LinkFormSubmit (Txt_Do_not_show_again,The_ClassFormul[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (Txt_Do_not_show_again,The_ClassForm[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"<img src=\"%s/delon16x16.gif\""
" alt=\"%s\" title=\"%s\""
" class=\"ICON16x16\" />"
@ -309,7 +309,7 @@ static long Ann_GetParamAnnCod (void)
void Ann_ShowFormAnnouncement (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *Txt_New_announcement;
extern const char *Txt_MSG_Subject;
extern const char *Txt_MSG_Message;
@ -324,7 +324,7 @@ void Ann_ShowFormAnnouncement (void)
/***** Message subject and body *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"vertical-align:top;\">"
"<td class=\"%s RIGHT_TOP\">"
"%s: "
"</td>"
"<td style=\"text-align:left;\">"
@ -333,7 +333,7 @@ void Ann_ShowFormAnnouncement (void)
"</td>"
"</tr>"
"<tr>"
"<td class=\"%s\" style=\"vertical-align:top;\">"
"<td class=\"%s RIGHT_TOP\">"
"%s: "
"</td>"
"<td style=\"text-align:left;\">"
@ -341,19 +341,19 @@ void Ann_ShowFormAnnouncement (void)
"</textarea>"
"</td>"
"</tr>",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassForm[Gbl.Prefs.Theme],
Txt_MSG_Subject,
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassForm[Gbl.Prefs.Theme],
Txt_MSG_Message);
/***** Users' roles who can view the announcement *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"TIT_TBL\""
" style=\"text-align:right; vertical-align:top;\">"
"<td class=\"%s RIGHT_TOP\">"
"%s: "
"</td>"
"<td class=\"DAT\""
" style=\"text-align:left; vertical-align:middle;\">",
The_ClassForm[Gbl.Prefs.Theme],
Txt_Users);
Rol_WriteSelectorRoles (1 << Rol_STUDENT |
1 << Rol_TEACHER);

27
swad_assignment.c
View File

@ -1047,7 +1047,7 @@ static bool Asg_CheckIfSimilarAssignmentExists (const char *Field,const char *Va
void Asg_RequestCreatOrEditAsg (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *Txt_New_assignment;
extern const char *Txt_Edit_assignment;
extern const char *Txt_Start_date;
@ -1127,14 +1127,14 @@ void Asg_RequestCreatOrEditAsg (void)
/***** Assignment title *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\">"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td style=\"text-align:left;\">"
"<input type=\"text\" name=\"Title\" size=\"45\" maxlength=\"%u\" value=\"%s\" />"
"</td>"
"</tr>",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassForm[Gbl.Prefs.Theme],
Txt_Title,
Asg_MAX_LENGTH_ASSIGNMENT_TITLE,Asg.Title);
@ -1144,14 +1144,14 @@ void Asg_RequestCreatOrEditAsg (void)
StartOrEndTime++)
{
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\">"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td style=\"text-align:left;\">"
"<table class=\"CELLS_PAD_2\">"
"<tr>"
"<td style=\"text-align:left;\">",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassForm[Gbl.Prefs.Theme],
Dates[StartOrEndTime]);
/* Date */
@ -1180,28 +1180,27 @@ void Asg_RequestCreatOrEditAsg (void)
/***** Send work? *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\">"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td class=\"%s\" style=\"text-align:left;\">"
"<td class=\"DAT\" style=\"text-align:left;\">"
"%s: "
"<input type=\"text\" name=\"Folder\" size=\"%u\" maxlength=\"%u\" value=\"%s\" />"
"</td>"
"</tr>",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassForm[Gbl.Prefs.Theme],
Txt_Upload_files_QUESTION,
The_ClassFormul[Gbl.Prefs.Theme],
Txt_Folder,
Asg_MAX_LENGTH_FOLDER,Asg_MAX_LENGTH_FOLDER,Asg.Folder);
/***** Assignment text *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"vertical-align:top;\">"
"<td class=\"%s RIGHT_TOP\">"
"%s:"
"</td>"
"<td style=\"text-align:left; vertical-align:top;\">"
"<textarea name=\"Txt\" cols=\"60\" rows=\"10\">",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassForm[Gbl.Prefs.Theme],
Txt_Description);
if (!ItsANewAssignment)
fprintf (Gbl.F.Out,"%s",Txt);
@ -1229,7 +1228,7 @@ void Asg_RequestCreatOrEditAsg (void)
static void Asg_ShowLstGrpsToEditAssignment (long AsgCod)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *Txt_Groups;
extern const char *Txt_The_whole_course;
unsigned NumGrpTyp;
@ -1241,11 +1240,11 @@ static void Asg_ShowLstGrpsToEditAssignment (long AsgCod)
{
/***** Start table *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"vertical-align:top;\">"
"<td class=\"%s RIGHT_TOP\">"
"%s:"
"</td>"
"<td style=\"text-align:left; vertical-align:top;\">",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassForm[Gbl.Prefs.Theme],
Txt_Groups);
Lay_StartRoundFrameTable ("100%",0,NULL);

4
swad_attendance.c
View File

@ -2935,7 +2935,7 @@ static void Att_PutButtonToShowDetails (void)
static void Att_ListEventsToSelect (void)
{
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *The_ClassFormBold[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];
@ -3024,7 +3024,7 @@ static void Att_ListEventsToSelect (void)
{
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"4\" style=\"text-align:center;\">");
Act_LinkFormSubmitAnimated (Txt_Update_attendance_according_to_selected_events,The_ClassFormulB[Gbl.Prefs.Theme]);
Act_LinkFormSubmitAnimated (Txt_Update_attendance_according_to_selected_events,The_ClassFormBold[Gbl.Prefs.Theme]);
Lay_PutCalculateIconWithText (Txt_Update_attendance_according_to_selected_events,Txt_Update_attendance);
fprintf (Gbl.F.Out,"</td>"
"</tr>");

42
swad_centre.c
View File

@ -236,7 +236,7 @@ void Ctr_PrintConfiguration (void)
static void Ctr_Configuration (bool PrintView)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *Txt_Degrees;
extern const char *Txt_Print;
extern const char *Txt_Centre;
@ -365,12 +365,12 @@ static void Ctr_Configuration (bool PrintView)
/***** Centre full name *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\">"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td class=\"DAT_N\""
" style=\"text-align:left; vertical-align:middle;\">",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassForm[Gbl.Prefs.Theme],
Txt_Centre);
if (PutLink)
fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\" class=\"DAT_N\">",
@ -383,7 +383,7 @@ static void Ctr_Configuration (bool PrintView)
/***** Centre short name *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\">"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td class=\"DAT\""
@ -391,7 +391,7 @@ static void Ctr_Configuration (bool PrintView)
"%s"
"</td>"
"</tr>",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassForm[Gbl.Prefs.Theme],
Txt_Short_name,
Gbl.CurrentCtr.Ctr.ShortName);
@ -399,13 +399,13 @@ static void Ctr_Configuration (bool PrintView)
if (Gbl.CurrentCtr.Ctr.WWW[0])
{
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\">"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td class=\"DAT\""
" style=\"text-align:left; vertical-align:middle;\">"
"<a href=\"%s\" target=\"_blank\" class=\"DAT\">",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassForm[Gbl.Prefs.Theme],
Txt_Web,
Gbl.CurrentCtr.Ctr.WWW);
Str_LimitLengthHTMLStr (Gbl.CurrentCtr.Ctr.WWW,20);
@ -418,7 +418,7 @@ static void Ctr_Configuration (bool PrintView)
/***** Shortcut to the centre *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\">"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td class=\"DAT\""
@ -428,7 +428,7 @@ static void Ctr_Configuration (bool PrintView)
"</a>"
"</td>"
"</tr>",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassForm[Gbl.Prefs.Theme],
Txt_Shortcut,
Cfg_HTTPS_URL_SWAD_CGI,Txt_STR_LANG_ID[Gbl.Prefs.Language],Gbl.CurrentCtr.Ctr.CtrCod,
Cfg_HTTPS_URL_SWAD_CGI,Txt_STR_LANG_ID[Gbl.Prefs.Language],Gbl.CurrentCtr.Ctr.CtrCod);
@ -437,12 +437,12 @@ static void Ctr_Configuration (bool PrintView)
{
/***** QR code with link to the centre *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\">"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td class=\"DAT\" style=\"text-align:left;"
" vertical-align:middle;\">",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassForm[Gbl.Prefs.Theme],
Txt_QR_code);
QR_LinkTo (200,"ctr",Gbl.CurrentCtr.Ctr.CtrCod);
fprintf (Gbl.F.Out,"</td>"
@ -452,7 +452,7 @@ static void Ctr_Configuration (bool PrintView)
{
/***** Number of degrees *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\">"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td class=\"DAT\" style=\"text-align:left;"
@ -460,13 +460,13 @@ static void Ctr_Configuration (bool PrintView)
"%u"
"</td>"
"</tr>",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassForm[Gbl.Prefs.Theme],
Txt_Degrees,
Deg_GetNumDegsInCtr (Gbl.CurrentCtr.Ctr.CtrCod));
/***** Number of courses *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\">"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td class=\"DAT\" style=\"text-align:left;"
@ -474,13 +474,13 @@ static void Ctr_Configuration (bool PrintView)
"%u"
"</td>"
"</tr>",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassForm[Gbl.Prefs.Theme],
Txt_Courses,
Crs_GetNumCrssInCtr (Gbl.CurrentCtr.Ctr.CtrCod));
/***** Number of teachers *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\">"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td class=\"DAT\" style=\"text-align:left;"
@ -488,13 +488,13 @@ static void Ctr_Configuration (bool PrintView)
"%u"
"</td>"
"</tr>",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassForm[Gbl.Prefs.Theme],
Txt_ROLES_PLURAL_Abc[Rol_TEACHER][Usr_SEX_UNKNOWN],
Usr_GetNumUsrsInCrssOfCtr (Rol_TEACHER,Gbl.CurrentCtr.Ctr.CtrCod));
/***** Number of students *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\">"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td class=\"DAT\" style=\"text-align:left;"
@ -502,7 +502,7 @@ static void Ctr_Configuration (bool PrintView)
"%u"
"</td>"
"</tr>",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassForm[Gbl.Prefs.Theme],
Txt_ROLES_PLURAL_Abc[Rol_STUDENT][Usr_SEX_UNKNOWN],
Usr_GetNumUsrsInCrssOfCtr (Rol_STUDENT,Gbl.CurrentCtr.Ctr.CtrCod));
}
@ -1827,7 +1827,7 @@ static void Ctr_PutFormToChangeCtrPhoto (bool PhotoExists)
void Ctr_RequestPhoto (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *Txt_Photo;
extern const char *Txt_You_can_send_a_file_with_an_image_in_jpg_format_and_size_X_Y;
extern const char *Txt_File_with_the_photo;
@ -1854,7 +1854,7 @@ void Ctr_RequestPhoto (void)
"<input type=\"file\" name=\"%s\" size=\"40\" maxlength=\"100\" value=\"\" />"
"</td>"
"</tr>",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassForm[Gbl.Prefs.Theme],
Txt_File_with_the_photo,
Fil_NAME_OF_PARAM_FILENAME_ORG);

3
swad_changelog.h
View File

@ -103,11 +103,12 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 14.120.9 (2015/07/27)"
#define Log_PLATFORM_VERSION "SWAD 14.121 (2015/07/27)"
// Number of lines (includes comments but not blank lines) has been got with the following command:
// nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*.h sql/swad*.sql | tail -1
/*
Version 14.121: Jul 27, 2015 Changes in CSS of forms. (184890 lines)
Version 14.120.9: Jul 27, 2015 Changes in CSS of forms. (184855 lines)
Version 14.120.8: Jul 26, 2015 Changes in CSS of assignments. (184881 lines)
Version 14.120.7: Jul 26, 2015 Changes in CSS of forms.

4
swad_chat.c
View File

@ -301,13 +301,13 @@ void Cht_ShowListOfChatRoomsWithUsrs (void)
static void Cht_WriteLinkToChat1 (const char *RoomCode,const char *RoomShortName,const char *RoomFullName,
unsigned Level,bool IsLastItemInLevel[1+Cht_CHAT_MAX_LEVELS])
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassForm[The_NUM_THEMES];
fprintf (Gbl.F.Out,"<li style=\"height:20px;\">");
Lay_IndentDependingOnLevel (Level,IsLastItemInLevel);
Act_FormStart (ActCht);
Cht_WriteParamsRoomCodeAndNames (RoomCode,RoomShortName,RoomFullName);
Act_LinkFormSubmit (RoomFullName,The_ClassFormul[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (RoomFullName,The_ClassForm[Gbl.Prefs.Theme]);
}
static void Cht_WriteLinkToChat2 (const char *RoomCode,const char *RoomFullName)

4
swad_connected.c
View File

@ -70,7 +70,7 @@ static void Con_ShowConnectedUsrsCurrentLocationOneByOneOnMainZone (Rol_Role_t R
void Con_ShowConnectedUsrs (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *Txt_Scope;
extern const char *Txt_MONTHS_SMALL_SHORT[12];
extern const char *Txt_Connected_users;
@ -98,7 +98,7 @@ void Con_ShowConnectedUsrs (void)
fprintf (Gbl.F.Out,"<label class=\"%s\">"
"%s:&nbsp;"
"</label>",
The_ClassFormul[Gbl.Prefs.Theme],Txt_Scope);
The_ClassForm[Gbl.Prefs.Theme],Txt_Scope);
Sco_SetScopesForListingStudents ();
Sco_GetScope ();
Sco_PutSelectorScope (true);

38
swad_country.c
View File

@ -216,7 +216,7 @@ void Cty_PrintConfiguration (void)
static void Cty_Configuration (bool PrintView)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *Txt_Institutions;
extern const char *Txt_Print;
extern const char *Txt_Country;
@ -314,12 +314,12 @@ static void Cty_Configuration (bool PrintView)
/***** Country name (an link to WWW if exists) *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\">"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td class=\"DAT_N\""
" style=\"text-align:left; vertical-align:middle;\">",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassForm[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\">",
@ -332,7 +332,7 @@ static void Cty_Configuration (bool PrintView)
/***** Link to the country inside platform *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\">"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td class=\"DAT\""
@ -341,7 +341,7 @@ static void Cty_Configuration (bool PrintView)
"%s/%s?cty=%ld</a>"
"</td>"
"</tr>",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassForm[Gbl.Prefs.Theme],
Txt_Shortcut,
Cfg_HTTPS_URL_SWAD_CGI,Txt_STR_LANG_ID[Gbl.Prefs.Language],Gbl.CurrentCty.Cty.CtyCod,
Cfg_HTTPS_URL_SWAD_CGI,Txt_STR_LANG_ID[Gbl.Prefs.Language],Gbl.CurrentCty.Cty.CtyCod);
@ -350,12 +350,12 @@ static void Cty_Configuration (bool PrintView)
{
/***** QR code with link to the country *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\">"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td class=\"DAT\" style=\"text-align:left;"
" vertical-align:middle;\">",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassForm[Gbl.Prefs.Theme],
Txt_QR_code);
QR_LinkTo (200,"cty",Gbl.CurrentCty.Cty.CtyCod);
fprintf (Gbl.F.Out,"</td>"
@ -365,7 +365,7 @@ static void Cty_Configuration (bool PrintView)
{
/***** Number of institutions *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\">"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td class=\"DAT\" style=\"text-align:left;"
@ -373,13 +373,13 @@ static void Cty_Configuration (bool PrintView)
"%u"
"</td>"
"</tr>",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassForm[Gbl.Prefs.Theme],
Txt_Institutions,
Ins_GetNumInssInCty (Gbl.CurrentCty.Cty.CtyCod));
/***** Number of centres *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\">"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td class=\"DAT\" style=\"text-align:left;"
@ -387,13 +387,13 @@ static void Cty_Configuration (bool PrintView)
"%u"
"</td>"
"</tr>",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassForm[Gbl.Prefs.Theme],
Txt_Centres,
Ctr_GetNumCtrsInCty (Gbl.CurrentCty.Cty.CtyCod));
/***** Number of degrees *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\">"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td class=\"DAT\" style=\"text-align:left;"
@ -401,13 +401,13 @@ static void Cty_Configuration (bool PrintView)
"%u"
"</td>"
"</tr>",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassForm[Gbl.Prefs.Theme],
Txt_Degrees,
Deg_GetNumDegsInCty (Gbl.CurrentCty.Cty.CtyCod));
/***** Number of courses *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\">"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td class=\"DAT\" style=\"text-align:left;"
@ -415,13 +415,13 @@ static void Cty_Configuration (bool PrintView)
"%u"
"</td>"
"</tr>",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassForm[Gbl.Prefs.Theme],
Txt_Courses,
Crs_GetNumCrssInCty (Gbl.CurrentCty.Cty.CtyCod));
/***** Number of teachers *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\">"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td class=\"DAT\" style=\"text-align:left;"
@ -429,13 +429,13 @@ static void Cty_Configuration (bool PrintView)
"%u"
"</td>"
"</tr>",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassForm[Gbl.Prefs.Theme],
Txt_ROLES_PLURAL_Abc[Rol_TEACHER][Usr_SEX_UNKNOWN],
Usr_GetNumUsrsInCrssOfCty (Rol_TEACHER,Gbl.CurrentCty.Cty.CtyCod));
/***** Number of students *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\">"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td class=\"DAT\" style=\"text-align:left;"
@ -443,7 +443,7 @@ static void Cty_Configuration (bool PrintView)
"%u"
"</td>"
"</tr>",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassForm[Gbl.Prefs.Theme],
Txt_ROLES_PLURAL_Abc[Rol_STUDENT][Usr_SEX_UNKNOWN],
Usr_GetNumUsrsInCrssOfCty (Rol_STUDENT,Gbl.CurrentCty.Cty.CtyCod));
}

76
swad_course.c
View File

@ -135,7 +135,7 @@ void Crs_PrintConfiguration (void)
static void Crs_Configuration (bool PrintView)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *Txt_This_course_fulfills_X_out_of_Y_indicators_;
extern const char *Txt_TABS_FULL_TXT[Tab_NUM_TABS];
extern const char *Txt_MENU_TITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB];
@ -226,7 +226,7 @@ static void Crs_Configuration (bool PrintView)
/***** Course full name *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\">"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td class=\"DAT_N\""
@ -234,13 +234,13 @@ static void Crs_Configuration (bool PrintView)
"%s"
"</td>"
"</tr>",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassForm[Gbl.Prefs.Theme],
Txt_Course,
Gbl.CurrentCrs.Crs.FullName);
/***** Course short name *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\">"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td class=\"DAT\""
@ -248,18 +248,18 @@ static void Crs_Configuration (bool PrintView)
"%s"
"</td>"
"</tr>",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassForm[Gbl.Prefs.Theme],
Txt_Short_name,
Gbl.CurrentCrs.Crs.ShortName);
/***** Course year *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\">"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td class=\"DAT\""
" style=\"text-align:left; vertical-align:middle;\">",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassForm[Gbl.Prefs.Theme],
Txt_Year_OF_A_DEGREE);
if (IsForm)
{
@ -282,12 +282,12 @@ static void Crs_Configuration (bool PrintView)
/***** Course semester *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\">"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td class=\"DAT\""
" style=\"text-align:left; vertical-align:middle;\">",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassForm[Gbl.Prefs.Theme],
Txt_Semester);
if (IsForm)
{
@ -311,12 +311,12 @@ static void Crs_Configuration (bool PrintView)
{
/***** Institutional code of the course *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\">"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td class=\"DAT\""
" style=\"text-align:left; vertical-align:middle;\">",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassForm[Gbl.Prefs.Theme],
Txt_Institutional_code);
if (IsForm)
fprintf (Gbl.F.Out,"<input type=\"text\" name=\"InsCrsCod\" size=\"%u\" maxlength=\"%u\" value=\"%s\" />",
@ -330,21 +330,21 @@ static void Crs_Configuration (bool PrintView)
/***** Internal code of the course *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\">"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td class=\"DAT\" style=\"text-align:left; vertical-align:middle;\">"
"%ld"
"</td>"
"</tr>",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassForm[Gbl.Prefs.Theme],
Txt_Internal_code,
Gbl.CurrentCrs.Crs.CrsCod);
}
/***** Link to the course *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\">"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td class=\"DAT\""
@ -353,7 +353,7 @@ static void Crs_Configuration (bool PrintView)
"%s/%s?crs=%ld</a>"
"</td>"
"</tr>",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassForm[Gbl.Prefs.Theme],
Txt_Shortcut,
Cfg_HTTPS_URL_SWAD_CGI,Txt_STR_LANG_ID[Gbl.Prefs.Language],Gbl.CurrentCrs.Crs.CrsCod,
Cfg_HTTPS_URL_SWAD_CGI,Txt_STR_LANG_ID[Gbl.Prefs.Language],Gbl.CurrentCrs.Crs.CrsCod);
@ -362,12 +362,12 @@ static void Crs_Configuration (bool PrintView)
{
/***** QR code with link to the course *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\">"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td class=\"DAT\""
" style=\"text-align:left; vertical-align:middle;\">",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassForm[Gbl.Prefs.Theme],
Txt_QR_code);
QR_LinkTo (200,"crs",Gbl.CurrentCrs.Crs.CrsCod);
fprintf (Gbl.F.Out,"</td>"
@ -381,7 +381,7 @@ static void Crs_Configuration (bool PrintView)
/***** Number of teachers *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\">"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td class=\"DAT\""
@ -389,12 +389,12 @@ static void Crs_Configuration (bool PrintView)
"%u"
"</td>"
"</tr>",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassForm[Gbl.Prefs.Theme],
Txt_ROLES_PLURAL_Abc[Rol_TEACHER][Usr_SEX_UNKNOWN],Gbl.CurrentCrs.Crs.NumTchs);
/***** Number of students *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\">"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td class=\"DAT\""
@ -402,12 +402,12 @@ static void Crs_Configuration (bool PrintView)
"%u"
"</td>"
"</tr>",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassForm[Gbl.Prefs.Theme],
Txt_ROLES_PLURAL_Abc[Rol_STUDENT][Usr_SEX_UNKNOWN],Gbl.CurrentCrs.Crs.NumStds);
/***** Indicators *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\">"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td class=\"DAT\""
@ -420,7 +420,7 @@ static void Crs_Configuration (bool PrintView)
"</a>"
"</td>"
"</tr>",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassForm[Gbl.Prefs.Theme],
Txt_Indicators,
Cfg_HTTPS_URL_SWAD_CGI,Gbl.CurrentCrs.Crs.CrsCod,Act_Actions[ActReqStaCrs].ActCod,
Indicators.CountIndicators,Txt_of_PART_OF_A_TOTAL,Ind_NUM_INDICATORS,
@ -448,18 +448,18 @@ static void Crs_Configuration (bool PrintView)
static void Crs_PutFormToConfigLogIn (bool IsForm)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *Txt_Students_authentication;
extern const char *Txt_STUDENTS_must_enter_through_X;
extern const char *Txt_STUDENTS_may_enter_directly;
/***** Can students enter directly? *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\">"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td style=\"text-align:left; vertical-align:middle;\">",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassForm[Gbl.Prefs.Theme],
Txt_Students_authentication);
fprintf (Gbl.F.Out,"<input type=\"radio\" name=\"AllowDirectLogIn\" value=\"N\"");
@ -542,7 +542,7 @@ void Crs_ChangeCourseConfig (void)
static void Crs_WriteListMyCoursesToSelectOne (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *Txt_My_courses;
extern const char *Txt_System;
extern const char *Txt_Go_to_X;
@ -581,7 +581,7 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
Act_FormGoToStart (ActMnu);
Par_PutHiddenParamUnsigned ("NxtTab",(unsigned) TabSys);
Act_LinkFormSubmit (Txt_System,
The_ClassFormul[Gbl.Prefs.Theme]);
The_ClassForm[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"<img src=\"%s/sys16x16.gif\""
" alt=\"%s\" title=\"%s\""
" style=\"width:16px; height:16px;"
@ -620,7 +620,7 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
Act_FormStart (ActSeeCtyInf);
Cty_PutParamCtyCod (Cty.CtyCod);
Act_LinkFormSubmit (Act_GetActionTextFromDB (Act_Actions[ActSeeCtyInf].ActCod,ActTxt),
The_ClassFormul[Gbl.Prefs.Theme]);
The_ClassForm[Gbl.Prefs.Theme]);
/* Country map */
fprintf (Gbl.F.Out,"<img src=\"%s/%s/%s/%s.png\""
" alt=\"%s\" title=\"%s\""
@ -664,7 +664,7 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
Act_FormStart (ActSeeInsInf);
Ins_PutParamInsCod (Ins.InsCod);
Act_LinkFormSubmit (Act_GetActionTextFromDB (Act_Actions[ActSeeInsInf].ActCod,ActTxt),
The_ClassFormul[Gbl.Prefs.Theme]);
The_ClassForm[Gbl.Prefs.Theme]);
Log_DrawLogo (Sco_SCOPE_INS,Ins.InsCod,Ins.ShortName,
16,NULL,true);
Highlight = (Gbl.CurrentCtr.Ctr.CtrCod <= 0 &&
@ -702,7 +702,7 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
Act_FormStart (ActSeeCtrInf);
Ctr_PutParamCtrCod (Ctr.CtrCod);
Act_LinkFormSubmit (Act_GetActionTextFromDB (Act_Actions[ActSeeCtrInf].ActCod,ActTxt),
The_ClassFormul[Gbl.Prefs.Theme]);
The_ClassForm[Gbl.Prefs.Theme]);
Log_DrawLogo (Sco_SCOPE_CTR,Ctr.CtrCod,Ctr.ShortName,
16,NULL,true);
Highlight = (Gbl.CurrentDeg.Deg.DegCod <= 0 &&
@ -740,7 +740,7 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
Act_FormStart (ActSeeDegInf);
Deg_PutParamDegCod (Deg.DegCod);
Act_LinkFormSubmit (Act_GetActionTextFromDB (Act_Actions[ActSeeDegInf].ActCod,ActTxt),
The_ClassFormul[Gbl.Prefs.Theme]);
The_ClassForm[Gbl.Prefs.Theme]);
Log_DrawLogo (Sco_SCOPE_DEG,Deg.DegCod,Deg.ShortName,
16,NULL,true);
Highlight = (Gbl.CurrentCrs.Crs.CrsCod <= 0 &&
@ -779,7 +779,7 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
Crs_PutParamCrsCod (Crs.CrsCod);
sprintf (Gbl.Title,Txt_Go_to_X,Crs.ShortName);
Act_LinkFormSubmit (Gbl.Title,
The_ClassFormul[Gbl.Prefs.Theme]);
The_ClassForm[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"<img src=\"%s/dot16x16.gif\""
" alt=\"%s\" title=\"%s\""
" class=\"ICON16x16\""
@ -2990,14 +2990,14 @@ void Crs_ContEditAfterChgCrs (void)
static void Crs_PutLinkToGoToCrs (struct Course *Crs)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *Txt_Go_to_X;
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
Act_FormGoToStart (ActSeeCrsInf);
Crs_PutParamCrsCod (Crs->CrsCod);
sprintf (Gbl.Title,Txt_Go_to_X,Crs->ShortName);
Act_LinkFormSubmit (Gbl.Title,The_ClassFormul[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (Gbl.Title,The_ClassForm[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s</a>",Gbl.Title);
Act_FormEnd ();
fprintf (Gbl.F.Out,"</div>");
@ -3444,7 +3444,7 @@ void Crs_UpdateCrsLast (void)
void Crs_AskRemoveOldCrss (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassForm[The_NUM_THEMES];
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;
extern const char *Txt_Eliminate;
@ -3455,7 +3455,7 @@ void Crs_AskRemoveOldCrss (void)
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
Act_FormStart (ActRemOldCrs);
fprintf (Gbl.F.Out,"<span class=\"%s\">%s </span>",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassForm[Gbl.Prefs.Theme],
Txt_Eliminate_all_courses_whithout_users_PART_1_OF_2);
fprintf (Gbl.F.Out,"<select name=\"Months\">");
for (i = Crs_MIN_MONTHS_WITHOUT_ACCESS_TO_REMOVE_OLD_CRSS;
@ -3469,7 +3469,7 @@ void Crs_AskRemoveOldCrss (void)
}
fprintf (Gbl.F.Out,"</select>"
"<span class=\"%s\"> ",
The_ClassFormul[Gbl.Prefs.Theme]);
The_ClassForm[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,Txt_Eliminate_all_courses_whithout_users_PART_2_OF_2,
Cfg_PLATFORM_SHORT_NAME);
fprintf (Gbl.F.Out,"</span>");

10
swad_date.c
View File

@ -222,17 +222,17 @@ void Dat_ConvDateToDateStr (struct Date *Date,char *DateStr)
void Dat_WriteFormIniEndDates (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *Txt_Start_date;
extern const char *Txt_End_date;
extern const char *Txt_Yesterday;
extern const char *Txt_Today;
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\">"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassForm[Gbl.Prefs.Theme],
Txt_Start_date);
fprintf (Gbl.F.Out,"<td style=\"text-align:left;\">");
Dat_WriteFormDate (Cfg_LOG_START_YEAR,Gbl.Now.Date.Year,"StartDay","StartMonth","StartYear",
@ -242,10 +242,10 @@ void Dat_WriteFormIniEndDates (void)
"</tr>");
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\">"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassForm[Gbl.Prefs.Theme],
Txt_End_date);
fprintf (Gbl.F.Out,"<td style=\"text-align:left;\">");
Dat_WriteFormDate (Cfg_LOG_START_YEAR,Gbl.Now.Date.Year,"EndDay","EndMonth","EndYear",

56
swad_degree.c
View File

@ -287,7 +287,7 @@ void Deg_PrintConfiguration (void)
static void Deg_Configuration (bool PrintView)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *Txt_Courses;
extern const char *Txt_Print;
extern const char *Txt_Degree;
@ -343,12 +343,12 @@ static void Deg_Configuration (bool PrintView)
/***** Degree full name *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\">"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td class=\"DAT_N\""
" style=\"text-align:left; vertical-align:middle;\">",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassForm[Gbl.Prefs.Theme],
Txt_Degree);
if (PutLink)
fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\""
@ -364,7 +364,7 @@ static void Deg_Configuration (bool PrintView)
/***** Degree short name *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\">"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td class=\"DAT\""
@ -372,7 +372,7 @@ static void Deg_Configuration (bool PrintView)
"%s"
"</td>"
"</tr>",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassForm[Gbl.Prefs.Theme],
Txt_Short_name,
Gbl.CurrentDeg.Deg.ShortName);
@ -380,13 +380,13 @@ static void Deg_Configuration (bool PrintView)
if (Gbl.CurrentDeg.Deg.WWW[0])
{
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\">"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td class=\"DAT\""
" style=\"text-align:left; vertical-align:middle;\">"
"<a href=\"%s\" target=\"_blank\" class=\"DAT\">",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassForm[Gbl.Prefs.Theme],
Txt_Web,
Gbl.CurrentDeg.Deg.WWW);
Str_LimitLengthHTMLStr (Gbl.CurrentDeg.Deg.WWW,20);
@ -399,7 +399,7 @@ static void Deg_Configuration (bool PrintView)
/***** Shortcut to the degree *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\">"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td class=\"DAT\" style=\"text-align:left;"
@ -409,7 +409,7 @@ static void Deg_Configuration (bool PrintView)
"</a>"
"</td>"
"</tr>",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassForm[Gbl.Prefs.Theme],
Txt_Shortcut,
Cfg_HTTPS_URL_SWAD_CGI,Txt_STR_LANG_ID[Gbl.Prefs.Language],Gbl.CurrentDeg.Deg.DegCod,
Cfg_HTTPS_URL_SWAD_CGI,Txt_STR_LANG_ID[Gbl.Prefs.Language],Gbl.CurrentDeg.Deg.DegCod);
@ -418,12 +418,12 @@ static void Deg_Configuration (bool PrintView)
{
/***** QR code with link to the degree *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\">"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td class=\"DAT\" style=\"text-align:left;"
" vertical-align:middle;\">",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassForm[Gbl.Prefs.Theme],
Txt_QR_code);
QR_LinkTo (200,"deg",Gbl.CurrentDeg.Deg.DegCod);
fprintf (Gbl.F.Out,"</td>"
@ -433,7 +433,7 @@ static void Deg_Configuration (bool PrintView)
{
/***** Number of courses *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\">"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td class=\"DAT\" style=\"text-align:left;"
@ -441,12 +441,12 @@ static void Deg_Configuration (bool PrintView)
"%u"
"</td>"
"</tr>",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassForm[Gbl.Prefs.Theme],
Txt_Courses,Gbl.CurrentDeg.Deg.NumCourses);
/***** Number of teachers *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\">"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td class=\"DAT\" style=\"text-align:left;"
@ -454,13 +454,13 @@ static void Deg_Configuration (bool PrintView)
"%u"
"</td>"
"</tr>",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassForm[Gbl.Prefs.Theme],
Txt_ROLES_PLURAL_Abc[Rol_TEACHER][Usr_SEX_UNKNOWN],
Usr_GetNumUsrsInCrssOfDeg (Rol_TEACHER,Gbl.CurrentDeg.Deg.DegCod));
/***** Number of students *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\">"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td class=\"DAT\" style=\"text-align:left;"
@ -468,7 +468,7 @@ static void Deg_Configuration (bool PrintView)
"%u"
"</td>"
"</tr>",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassForm[Gbl.Prefs.Theme],
Txt_ROLES_PLURAL_Abc[Rol_STUDENT][Usr_SEX_UNKNOWN],
Usr_GetNumUsrsInCrssOfDeg (Rol_STUDENT,Gbl.CurrentDeg.Deg.DegCod));
}
@ -484,7 +484,7 @@ static void Deg_Configuration (bool PrintView)
void Deg_WriteMenuAllCourses (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *Txt_Country;
extern const char *Txt_Institution;
extern const char *Txt_Centre;
@ -498,11 +498,11 @@ void Deg_WriteMenuAllCourses (void)
/***** Write a 1st selector
with all the countries *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\">"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td style=\"text-align:left;\">",
The_ClassFormul[Gbl.Prefs.Theme],Txt_Country);
The_ClassForm[Gbl.Prefs.Theme],Txt_Country);
Cty_WriteSelectorOfCountry ();
fprintf (Gbl.F.Out,"</td>"
"</tr>");
@ -512,11 +512,11 @@ void Deg_WriteMenuAllCourses (void)
/***** Write a 2nd selector
with the institutions of selected country *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\">"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td style=\"text-align:left;\">",
The_ClassFormul[Gbl.Prefs.Theme],Txt_Institution);
The_ClassForm[Gbl.Prefs.Theme],Txt_Institution);
Ins_WriteSelectorOfInstitution ();
fprintf (Gbl.F.Out,"</td>"
"</tr>");
@ -526,11 +526,11 @@ void Deg_WriteMenuAllCourses (void)
/***** Write a 3rd selector
with all the centres of selected institution *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\">"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td style=\"text-align:left;\">",
The_ClassFormul[Gbl.Prefs.Theme],Txt_Centre);
The_ClassForm[Gbl.Prefs.Theme],Txt_Centre);
Ctr_WriteSelectorOfCentre ();
fprintf (Gbl.F.Out,"</td>"
"</tr>");
@ -540,11 +540,11 @@ void Deg_WriteMenuAllCourses (void)
/***** Write a 4th selector
with all the degrees of selected centre *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\">"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td style=\"text-align:left;\">",
The_ClassFormul[Gbl.Prefs.Theme],Txt_Degree);
The_ClassForm[Gbl.Prefs.Theme],Txt_Degree);
Deg_WriteSelectorOfDegree ();
fprintf (Gbl.F.Out,"</td>"
"</tr>");
@ -554,11 +554,11 @@ void Deg_WriteMenuAllCourses (void)
/***** Write a 5th selector
with all the courses of selected degree *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\">"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td style=\"text-align:left;\">",
The_ClassFormul[Gbl.Prefs.Theme],Txt_Course);
The_ClassForm[Gbl.Prefs.Theme],Txt_Course);
Crs_WriteSelectorOfCourse ();
fprintf (Gbl.F.Out,"</td>"
"</tr>");

44
swad_enrollment.c
View File

@ -248,18 +248,18 @@ void Enr_RegisterUsrInCurrentCrs (struct UsrData *UsrDat,Rol_Role_t NewRole,
void Enr_WriteFormToReqAnotherUsrID (Act_Action_t NextAction)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *Txt_nick_email_or_ID;
extern const char *Txt_Continue;
/***** Form to request user's ID, @nickname or e-mail address *****/
Act_FormStart (NextAction);
fprintf (Gbl.F.Out,"<label class=\"%s\">"
fprintf (Gbl.F.Out,"<label class=\"%s RIGHT_MIDDLE\">"
"%s:&nbsp;"
"</label>"
"<input type=\"text\" name=\"OtherUsrIDNickOrEMail\""
" size=\"20\" maxlength=\"%u\" />",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassForm[Gbl.Prefs.Theme],
Txt_nick_email_or_ID,
Usr_MAX_BYTES_USR_LOGIN);
@ -632,7 +632,7 @@ static void Enr_PutLinkToRemOldUsrs (void)
void Enr_AskRemoveOldUsrs (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *Txt_Eliminate_all_users_who_are_not_enrolled_on_any_courses_PART_1_OF_2;
extern const char *Txt_Eliminate_all_users_who_are_not_enrolled_on_any_courses_PART_2_OF_2;
extern const char *Txt_Eliminate;
@ -643,7 +643,7 @@ void Enr_AskRemoveOldUsrs (void)
fprintf (Gbl.F.Out,"<div style=\"text-align:center;\">");
Act_FormStart (ActRemOldUsr);
fprintf (Gbl.F.Out,"<span class=\"%s\">%s </span>",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassForm[Gbl.Prefs.Theme],
Txt_Eliminate_all_users_who_are_not_enrolled_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;
@ -657,7 +657,7 @@ void Enr_AskRemoveOldUsrs (void)
}
fprintf (Gbl.F.Out,"</select>"
"<span class=\"%s\"> ",
The_ClassFormul[Gbl.Prefs.Theme]);
The_ClassForm[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,Txt_Eliminate_all_users_who_are_not_enrolled_on_any_courses_PART_2_OF_2,
Cfg_PLATFORM_SHORT_NAME);
fprintf (Gbl.F.Out,"</span>");
@ -754,18 +754,18 @@ void Enr_RemoveOldUsrs (void)
static void Enr_PutAreaToEnterUsrsIDs (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *Txt_List_of_nicks_emails_or_IDs;
/***** Start of text area *****/
fprintf (Gbl.F.Out,"<table style=\"margin:0 auto;\">"
"<tr>"
"<td class=\"%s\" style=\"vertical-align:top;\">"
"<td class=\"%s RIGHT_TOP\">"
"%s:&nbsp;"
"</td>"
"<td style=\"text-align:left;\">"
"<textarea name=\"UsrsIDs\" cols=\"72\" rows=\"10\">",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassForm[Gbl.Prefs.Theme],
Txt_List_of_nicks_emails_or_IDs);
/***** End of text area *****/
@ -782,7 +782,7 @@ static void Enr_PutAreaToEnterUsrsIDs (void)
bool Enr_PutActionsRegRemOneUsr (bool ItsMe)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassForm[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_the_course_X;
@ -836,7 +836,7 @@ bool Enr_PutActionsRegRemOneUsr (bool ItsMe)
/***** Start list of options *****/
fprintf (Gbl.F.Out,"<div style=\"display:inline-block; margin:0 auto;\">"
"<ul class=\"LIST_LEFT %s\">",
The_ClassFormul[Gbl.Prefs.Theme]);
The_ClassForm[Gbl.Prefs.Theme]);
/***** Register user in course / Modify user's data *****/
if (Gbl.CurrentCrs.Crs.CrsCod > 0 &&
@ -1043,6 +1043,7 @@ bool Enr_PutActionsRegRemOneUsr (bool ItsMe)
static void Enr_PutActionsRegRemSeveralUsrs (void)
{
extern const char *The_ClassForm[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;
@ -1050,8 +1051,9 @@ static void Enr_PutActionsRegRemSeveralUsrs (void)
extern const char *Txt_Eliminate_from_the_platform_the_users_indicated_in_step_1;
/***** Start list of options *****/
fprintf (Gbl.F.Out,"<div style=\"display:inline-block; margin:0 auto;\">"
"<ul class=\"LIST_LEFT\">");
fprintf (Gbl.F.Out,"<div style=\"display:inline-block; margin:10px auto;\">"
"<ul class=\"LIST_LEFT %s\">",
The_ClassForm[Gbl.Prefs.Theme]);
/***** Register / remove users listed or not listed *****/
if (Gbl.CurrentCrs.Crs.CrsCod > 0) // Course selected
@ -2074,8 +2076,8 @@ void Enr_RejectSignUp (void)
void Enr_ShowEnrollmentRequests (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *The_ClassFormBold[The_NUM_THEMES];
extern const char *Txt_Scope;
extern const char *Txt_Users;
extern const char *Txt_Update;
@ -2112,11 +2114,12 @@ void Enr_ShowEnrollmentRequests (void)
/* Scope (whole platform, current centre, current degree or current course) */
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\">"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td style=\"text-align:left; vertical-align:middle;\">",
The_ClassFormul[Gbl.Prefs.Theme],Txt_Scope);
The_ClassForm[Gbl.Prefs.Theme],
Txt_Scope);
Gbl.Scope.Allowed = 1 << Sco_SCOPE_SYS |
1 << Sco_SCOPE_CTY |
1 << Sco_SCOPE_INS |
@ -2131,12 +2134,13 @@ void Enr_ShowEnrollmentRequests (void)
/* Users' roles in listing */
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"vertical-align:top;\">"
"<td class=\"%s RIGHT_TOP\">"
"%s:"
"</td>"
"<td class=\"DAT\""
" style=\"text-align:left; vertical-align:middle;\">",
The_ClassFormul[Gbl.Prefs.Theme],Txt_Users);
The_ClassForm[Gbl.Prefs.Theme],
Txt_Users);
Rol_GetSelectedRoles (&Roles);
if (!Roles)
/* Set default roles */
@ -2160,7 +2164,7 @@ void Enr_ShowEnrollmentRequests (void)
/* Send button */
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Act_LinkFormSubmitAnimated (Txt_Update,The_ClassFormulB[Gbl.Prefs.Theme]);
Act_LinkFormSubmitAnimated (Txt_Update,The_ClassFormBold[Gbl.Prefs.Theme]);
Lay_PutCalculateIconWithText (Txt_Update,Txt_Update);
Act_FormEnd ();
fprintf (Gbl.F.Out,"</div>");

66
swad_exam.c
View File

@ -712,7 +712,7 @@ static void Exa_GetDataExamAnnouncementFromDB (long ExaCod)
static void Exa_ShowExamAnnouncement (long ExaCod,Exa_tTypeViewExamAnnouncement_t TypeViewExamAnnouncement)
{
extern const char *Txt_YEAR_OF_DEGREE[1+Deg_MAX_YEARS_PER_DEGREE];
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *Txt_Remove;
extern const char *Txt_Edit;
extern const char *Txt_Print;
@ -757,7 +757,7 @@ static void Exa_ShowExamAnnouncement (long ExaCod,Exa_tTypeViewExamAnnouncement_
StyleNormal = "CONV_IMPR";
break;
case Exa_FORM_VIEW:
StyleForm = The_ClassFormul[Gbl.Prefs.Theme];
StyleForm = The_ClassForm[Gbl.Prefs.Theme];
break;
}
@ -855,12 +855,13 @@ static void Exa_ShowExamAnnouncement (long ExaCod,Exa_tTypeViewExamAnnouncement_
/***** Name of the course *****/
fprintf (Gbl.F.Out,"<tr>" \
"<td class=\"%s\" style=\"vertical-align:top;\">"
"<td class=\"%s RIGHT_TOP\">"
"%s:"
"</td>" \
"<td class=\"%s\""
" style=\"text-align:left; vertical-align:top;\">",
StyleForm,Txt_EXAM_ANNOUNCEMENT_Course,
StyleForm,
Txt_EXAM_ANNOUNCEMENT_Course,
StyleNormal);
if (TypeViewExamAnnouncement == Exa_FORM_VIEW)
{
@ -875,12 +876,13 @@ static void Exa_ShowExamAnnouncement (long ExaCod,Exa_tTypeViewExamAnnouncement_
/***** Year (optional, 1º, 2º, 3º, 4º, 5º...) *****/
fprintf (Gbl.F.Out,"<tr>" \
"<td class=\"%s\" style=\"vertical-align:top;\">"
"<td class=\"%s RIGHT_TOP\">"
"%s:"
"</td>" \
"<td class=\"%s\""
" style=\"text-align:left; vertical-align:top;\">",
StyleForm,Txt_EXAM_ANNOUNCEMENT_Year,
StyleForm,
Txt_EXAM_ANNOUNCEMENT_Year,
StyleNormal);
if (TypeViewExamAnnouncement == Exa_FORM_VIEW)
{
@ -903,12 +905,13 @@ static void Exa_ShowExamAnnouncement (long ExaCod,Exa_tTypeViewExamAnnouncement_
/***** Exam session *****/
fprintf (Gbl.F.Out,"<tr>" \
"<td class=\"%s\" style=\"vertical-align:top;\">"
"<td class=\"%s RIGHT_TOP\">"
"%s:"
"</td>" \
"<td class=\"%s\""
" style=\"text-align:left; vertical-align:top;\">",
StyleForm,Txt_EXAM_ANNOUNCEMENT_Session,
StyleForm,
Txt_EXAM_ANNOUNCEMENT_Session,
StyleNormal);
if (TypeViewExamAnnouncement == Exa_FORM_VIEW)
fprintf (Gbl.F.Out,"<input type=\"text\" name=\"ExamSession\""
@ -921,10 +924,11 @@ static void Exa_ShowExamAnnouncement (long ExaCod,Exa_tTypeViewExamAnnouncement_
/***** Date of the exam *****/
fprintf (Gbl.F.Out,"<tr>" \
"<td class=\"%s\" style=\"vertical-align:top;\">"
"<td class=\"%s RIGHT_TOP\">"
"%s:"
"</td>",
StyleForm,Txt_EXAM_ANNOUNCEMENT_Exam_date);
StyleForm,
Txt_EXAM_ANNOUNCEMENT_Exam_date);
if (TypeViewExamAnnouncement == Exa_FORM_VIEW)
{
fprintf (Gbl.F.Out,"<td style=\"text-align:left;\">");
@ -949,12 +953,13 @@ static void Exa_ShowExamAnnouncement (long ExaCod,Exa_tTypeViewExamAnnouncement_
/***** Start time *****/
fprintf (Gbl.F.Out,"<tr>" \
"<td class=\"%s\" style=\"vertical-align:top;\">"
"<td class=\"%s RIGHT_TOP\">"
"%s:"
"</td>" \
"<td class=\"%s\""
" style=\"text-align:left; vertical-align:top;\">",
StyleForm,Txt_EXAM_ANNOUNCEMENT_Start_time,
StyleForm,
Txt_EXAM_ANNOUNCEMENT_Start_time,
StyleNormal);
if (TypeViewExamAnnouncement == Exa_FORM_VIEW)
{
@ -995,12 +1000,13 @@ static void Exa_ShowExamAnnouncement (long ExaCod,Exa_tTypeViewExamAnnouncement_
/***** Approximate duration of the exam *****/
fprintf (Gbl.F.Out,"<tr>" \
"<td class=\"%s\" style=\"vertical-align:top;\">"
"<td class=\"%s RIGHT_TOP\">"
"%s:"
"</td>" \
"<td class=\"%s\""
" style=\"text-align:left; vertical-align:top;\">",
StyleForm,Txt_EXAM_ANNOUNCEMENT_Approximate_duration,
StyleForm,
Txt_EXAM_ANNOUNCEMENT_Approximate_duration,
StyleNormal);
if (TypeViewExamAnnouncement == Exa_FORM_VIEW)
{
@ -1058,12 +1064,13 @@ static void Exa_ShowExamAnnouncement (long ExaCod,Exa_tTypeViewExamAnnouncement_
/***** Place where the exam will be made *****/
fprintf (Gbl.F.Out,"<tr>" \
"<td class=\"%s\" style=\"vertical-align:top;\">"
"<td class=\"%s RIGHT_TOP\">"
"%s:"
"</td>" \
"<td class=\"%s\""
" style=\"text-align:left; vertical-align:top;\">",
StyleForm,Txt_EXAM_ANNOUNCEMENT_Place_of_exam,
StyleForm,
Txt_EXAM_ANNOUNCEMENT_Place_of_exam,
StyleNormal);
if (TypeViewExamAnnouncement == Exa_FORM_VIEW)
fprintf (Gbl.F.Out,"<textarea name=\"Place\" cols=\"40\" rows=\"4\">%s</textarea>",
@ -1079,12 +1086,13 @@ static void Exa_ShowExamAnnouncement (long ExaCod,Exa_tTypeViewExamAnnouncement_
/***** Exam mode *****/
fprintf (Gbl.F.Out,"<tr>" \
"<td class=\"%s\" style=\"vertical-align:top;\">"
"<td class=\"%s RIGHT_TOP\">"
"%s:"
"</td>" \
"<td class=\"%s\""
" style=\"text-align:left; vertical-align:top;\">",
StyleForm,Txt_EXAM_ANNOUNCEMENT_Mode,
StyleForm,
Txt_EXAM_ANNOUNCEMENT_Mode,
StyleNormal);
if (TypeViewExamAnnouncement == Exa_FORM_VIEW)
fprintf (Gbl.F.Out,"<textarea name=\"ExamMode\" cols=\"40\" rows=\"2\">%s</textarea>",
@ -1100,12 +1108,13 @@ static void Exa_ShowExamAnnouncement (long ExaCod,Exa_tTypeViewExamAnnouncement_
/***** Structure of the exam *****/
fprintf (Gbl.F.Out,"<tr>" \
"<td class=\"%s\" style=\"vertical-align:top;\">"
"<td class=\"%s RIGHT_TOP\">"
"%s:"
"</td>" \
"<td class=\"%s\""
" style=\"text-align:left; vertical-align:top;\">",
StyleForm,Txt_EXAM_ANNOUNCEMENT_Structure_of_the_exam,
StyleForm,
Txt_EXAM_ANNOUNCEMENT_Structure_of_the_exam,
StyleNormal);
if (TypeViewExamAnnouncement == Exa_FORM_VIEW)
fprintf (Gbl.F.Out,"<textarea name=\"Structure\" cols=\"40\" rows=\"8\">%s</textarea>",
@ -1121,12 +1130,13 @@ static void Exa_ShowExamAnnouncement (long ExaCod,Exa_tTypeViewExamAnnouncement_
/***** Documentation required *****/
fprintf (Gbl.F.Out,"<tr>" \
"<td class=\"%s\" style=\"vertical-align:top;\">"
"<td class=\"%s RIGHT_TOP\">"
"%s:"
"</td>" \
"<td class=\"%s\""
" style=\"text-align:left; vertical-align:top;\">",
StyleForm,Txt_EXAM_ANNOUNCEMENT_Documentation_required,
StyleForm,
Txt_EXAM_ANNOUNCEMENT_Documentation_required,
StyleNormal);
if (TypeViewExamAnnouncement == Exa_FORM_VIEW)
fprintf (Gbl.F.Out,"<textarea name=\"DocRequired\" cols=\"40\" rows=\"2\">%s</textarea>",
@ -1142,12 +1152,13 @@ static void Exa_ShowExamAnnouncement (long ExaCod,Exa_tTypeViewExamAnnouncement_
/***** Material required *****/
fprintf (Gbl.F.Out,"<tr>" \
"<td class=\"%s\" style=\"vertical-align:top;\">"
"<td class=\"%s RIGHT_TOP\">"
"%s:"
"</td>" \
"<td class=\"%s\""
" style=\"text-align:left; vertical-align:top;\">",
StyleForm,Txt_EXAM_ANNOUNCEMENT_Material_required,
StyleForm,
Txt_EXAM_ANNOUNCEMENT_Material_required,
StyleNormal);
if (TypeViewExamAnnouncement == Exa_FORM_VIEW)
fprintf (Gbl.F.Out,"<textarea name=\"MatRequired\" cols=\"40\" rows=\"4\">%s</textarea>",
@ -1163,12 +1174,13 @@ static void Exa_ShowExamAnnouncement (long ExaCod,Exa_tTypeViewExamAnnouncement_
/***** Material allowed *****/
fprintf (Gbl.F.Out,"<tr>" \
"<td class=\"%s\" style=\"vertical-align:top;\">"
"<td class=\"%s RIGHT_TOP\">"
"%s:"
"</td>" \
"<td class=\"%s\""
" style=\"text-align:left; vertical-align:top;\">",
StyleForm,Txt_EXAM_ANNOUNCEMENT_Material_allowed,
StyleForm,
Txt_EXAM_ANNOUNCEMENT_Material_allowed,
StyleNormal);
if (TypeViewExamAnnouncement == Exa_FORM_VIEW)
fprintf (Gbl.F.Out,"<textarea name=\"MatAllowed\" cols=\"40\" rows=\"4\">%s</textarea>",
@ -1184,7 +1196,7 @@ static void Exa_ShowExamAnnouncement (long ExaCod,Exa_tTypeViewExamAnnouncement_
/***** Other information to students *****/
fprintf (Gbl.F.Out,"<tr>" \
"<td class=\"%s\" style=\"vertical-align:top;\">"
"<td class=\"%s RIGHT_TOP\">"
"%s:"
"</td>" \
"<td class=\"%s\""

58
swad_file_browser.c
View File

@ -4308,12 +4308,12 @@ static void Brw_PutFormToShowOrAdminParams (void)
static void Brw_WriteFormFullTree (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *Txt_Show_all_files;
/***** Start form depending on type of tree *****/
fprintf (Gbl.F.Out,"<div class=\"%s\" style=\"text-align:center;\">",
The_ClassFormul[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"<div class=\"%s CENTER_MIDDLE\">",
The_ClassForm[Gbl.Prefs.Theme]);
Act_FormStart (Brw_ActSeeAdm[Gbl.FileBrowser.Type]);
switch (Gbl.FileBrowser.Type)
{
@ -5029,7 +5029,7 @@ static void Brw_PutIconRemoveFile (Brw_FileType_t FileType,
Act_FormEnd ();
}
else
Lay_PutIconRemovalNotAllowed ();
Lay_PutIconBRemovalNotAllowed ();
fprintf (Gbl.F.Out,"</td>");
}
@ -5073,7 +5073,7 @@ static void Brw_PutIconRemoveDir (const char *PathInTree,const char *FileName,co
Act_FormEnd ();
}
else
Lay_PutIconRemovalNotAllowed ();
Lay_PutIconBRemovalNotAllowed ();
fprintf (Gbl.F.Out,"</td>");
}
@ -7639,7 +7639,7 @@ void Brw_ShowFormFileBrowser (void)
static void Brw_PutFormToCreateAFolder (const char *FileNameToShow)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassForm[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;
@ -7675,7 +7675,7 @@ static void Brw_PutFormToCreateAFolder (const char *FileNameToShow)
"</label>"
"<input type=\"text\" name=\"NewFolderName\""
" size=\"32\" maxlength=\"40\" value=\"\" />",
The_ClassFormul[Gbl.Prefs.Theme],Txt_Folder);
The_ClassForm[Gbl.Prefs.Theme],Txt_Folder);
/* Button to send and end frame *****/
Lay_EndRoundFrameWithButton (Lay_CREATE_BUTTON,Txt_Create_folder);
@ -7872,7 +7872,7 @@ static void Brw_PutFormToPasteAFileOrFolder (const char *FileNameToShow)
static void Brw_PutFormToCreateALink (const char *FileNameToShow)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassForm[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;
@ -7917,7 +7917,7 @@ static void Brw_PutFormToCreateALink (const char *FileNameToShow)
" size=\"40\" maxlength=\"%u\" value=\"\" />"
"</td>"
"</tr>",
The_ClassFormul[Gbl.Prefs.Theme],Txt_URL,
The_ClassForm[Gbl.Prefs.Theme],Txt_URL,
PATH_MAX);
/***** Link name *****/
@ -7931,7 +7931,7 @@ static void Brw_PutFormToCreateALink (const char *FileNameToShow)
"</td>"
"</tr>"
"</table>",
The_ClassFormul[Gbl.Prefs.Theme],Txt_Save_as,Txt_optional);
The_ClassForm[Gbl.Prefs.Theme],Txt_Save_as,Txt_optional);
/***** Send button and end frame *****/
Lay_EndRoundFrameWithButton (Lay_CREATE_BUTTON,Txt_Create_link);
@ -8726,7 +8726,7 @@ bool Brw_CheckIfFileOrFolderIsHidden (struct FileMetadata *FileMetadata)
void Brw_ShowFileMetadata (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassForm[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;
@ -8903,24 +8903,24 @@ void Brw_ShowFileMetadata (void)
/***** Filename *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\">"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td class=\"DAT\" style=\"text-align:left;"
" vertical-align:middle;\">",
The_ClassFormul[Gbl.Prefs.Theme],Txt_Filename);
The_ClassForm[Gbl.Prefs.Theme],Txt_Filename);
Brw_WriteSmallLinkToDownloadFile (URL,FileMetadata.FileType,FileNameToShow);
fprintf (Gbl.F.Out,"</td>"
"</tr>");
/***** Publisher's data *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\">"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td class=\"DAT\" style=\"text-align:left;"
" vertical-align:middle;\">",
The_ClassFormul[Gbl.Prefs.Theme],Txt_Uploaded_by);
The_ClassForm[Gbl.Prefs.Theme],Txt_Uploaded_by);
if (FileHasPublisher)
{
/* Show photo */
@ -8945,24 +8945,24 @@ void Brw_ShowFileMetadata (void)
/***** Write the file size *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\">"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td class=\"DAT\" style=\"text-align:left;"
" vertical-align:middle;\">",
The_ClassFormul[Gbl.Prefs.Theme],Txt_File_size);
The_ClassForm[Gbl.Prefs.Theme],Txt_File_size);
Str_WriteSizeInBytesFull ((double) FileMetadata.Size);
fprintf (Gbl.F.Out,"</td>"
"</tr>");
/***** Write the date *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\">"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td class=\"DAT\" style=\"text-align:left;"
" vertical-align:middle;\">",
The_ClassFormul[Gbl.Prefs.Theme],Txt_Date_of_creation);
The_ClassForm[Gbl.Prefs.Theme],Txt_Date_of_creation);
Dat_GetLocalTimeFromClock (&(FileMetadata.Time));
Dat_WriteDateTimeFromtblock ();
fprintf (Gbl.F.Out,"</td>"
@ -8970,12 +8970,12 @@ void Brw_ShowFileMetadata (void)
/***** Private or public? *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\">"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td class=\"DAT\" style=\"text-align:left;"
" vertical-align:middle;\">",
The_ClassFormul[Gbl.Prefs.Theme],Txt_Availability);
The_ClassForm[Gbl.Prefs.Theme],Txt_Availability);
if (ICanChangePublic) // I can change file to public
{
fprintf (Gbl.F.Out,"<select name=\"PublicFile\">");
@ -9001,12 +9001,12 @@ void Brw_ShowFileMetadata (void)
/***** License *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\">"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td class=\"DAT\" style=\"text-align:left;"
" vertical-align:middle;\">",
The_ClassFormul[Gbl.Prefs.Theme],Txt_License);
The_ClassForm[Gbl.Prefs.Theme],Txt_License);
if (ICanChangeLicense) // I can edit file properties
{
fprintf (Gbl.F.Out,"<select name=\"License\">");
@ -9030,7 +9030,7 @@ void Brw_ShowFileMetadata (void)
/***** Write my number of views *****/
if (Gbl.Usrs.Me.Logged)
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\">"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td class=\"DAT\" style=\"text-align:left;"
@ -9038,12 +9038,12 @@ void Brw_ShowFileMetadata (void)
"%u"
"</td>"
"</tr>",
The_ClassFormul[Gbl.Prefs.Theme],Txt_My_views,
The_ClassForm[Gbl.Prefs.Theme],Txt_My_views,
FileMetadata.NumMyViews);
/***** Write number of identificated views *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\">"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td class=\"DAT\" style=\"text-align:left;"
@ -9051,7 +9051,7 @@ void Brw_ShowFileMetadata (void)
"%u (%u %s)"
"</td>"
"</tr>",
The_ClassFormul[Gbl.Prefs.Theme],Txt_Identified_views,
The_ClassForm[Gbl.Prefs.Theme],Txt_Identified_views,
FileMetadata.NumViewsFromLoggedUsrs,
FileMetadata.NumLoggedUsrs,
(FileMetadata.NumLoggedUsrs == 1) ? Txt_user[Usr_SEX_UNKNOWN] :
@ -9059,7 +9059,7 @@ void Brw_ShowFileMetadata (void)
/***** Write number of public views *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\">"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td class=\"DAT\" style=\"text-align:left;"
@ -9067,7 +9067,7 @@ void Brw_ShowFileMetadata (void)
"%u"
"</td>"
"</tr>",
The_ClassFormul[Gbl.Prefs.Theme],Txt_Public_views,
The_ClassForm[Gbl.Prefs.Theme],Txt_Public_views,
FileMetadata.NumPublicViews);
/***** End frame *****/

14
swad_follow.c
View File

@ -127,8 +127,8 @@ static void Fol_ShowNumberOfFollowingOrFollowers (const struct UsrData *UsrDat,
Act_Action_t Action,
const char *Title)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *The_ClassFormBold[The_NUM_THEMES];
fprintf (Gbl.F.Out,"<td style=\"min-width:100px;"
@ -155,17 +155,17 @@ static void Fol_ShowNumberOfFollowingOrFollowers (const struct UsrData *UsrDat,
fprintf (Gbl.F.Out,"</div>");
/* Text */
fprintf (Gbl.F.Out,"<div class=\"%s\" style=\"text-align:center;\">",
(Gbl.CurrentAct == Action) ? The_ClassFormulB[Gbl.Prefs.Theme] :
The_ClassFormul[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"<div class=\"%s CENTER_MIDDLE\">",
(Gbl.CurrentAct == Action) ? The_ClassFormBold[Gbl.Prefs.Theme] :
The_ClassForm[Gbl.Prefs.Theme]);
if (NumUsrs)
{
/* Form to list followed users */
Act_FormStart (Action);
Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
Act_LinkFormSubmit (Title,
(Gbl.CurrentAct == Action) ? The_ClassFormulB[Gbl.Prefs.Theme] :
The_ClassFormul[Gbl.Prefs.Theme]);
(Gbl.CurrentAct == Action) ? The_ClassFormBold[Gbl.Prefs.Theme] :
The_ClassForm[Gbl.Prefs.Theme]);
}
fprintf (Gbl.F.Out,"%s",Title);
if (NumUsrs)

30
swad_forum.c
View File

@ -1782,13 +1782,13 @@ static void For_PutFormWhichForums (void)
static void For_WriteLinkToTopLevelOfForums (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *Txt_Forums;
fprintf (Gbl.F.Out,"<li style=\"height:20px;\">");
Act_FormStart (ActSeeFor);
For_PutAllHiddenParamsForum ();
Act_LinkFormSubmit (Txt_Forums,The_ClassFormul[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (Txt_Forums,The_ClassForm[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"<img src=\"%s/forum16x16.gif\""
" alt=\"%s\" title=\"%s\""
" class=\"ICON16x16\" style=\"vertical-align:middle;\" />"
@ -2108,8 +2108,8 @@ void For_SetForumName (For_ForumType_t ForumType,
static void For_WriteLinkToForum (For_ForumType_t ForumType,Act_Action_t NextAct,const char *Icon,const char *ForumName,bool ShowNumOfPosts,
unsigned Level,bool IsLastItemInLevel[1+For_FORUM_MAX_LEVELS])
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *The_ClassFormBold[The_NUM_THEMES];
extern const char *Txt_Copy_not_allowed;
extern const char *Txt_Paste_thread;
unsigned NumThrs;
@ -2121,8 +2121,8 @@ static void For_WriteLinkToForum (For_ForumType_t ForumType,Act_Action_t NextAct
/***** Get number of threads and number of posts *****/
NumThrs = For_GetNumThrsInForum (ForumType);
NumThrsWithNewPosts = For_GetNumThrsWithNewPstsInForum (ForumType,NumThrs);
Style = (NumThrsWithNewPosts ? The_ClassFormulB[Gbl.Prefs.Theme] :
The_ClassFormul[Gbl.Prefs.Theme]);
Style = (NumThrsWithNewPosts ? The_ClassFormBold[Gbl.Prefs.Theme] :
The_ClassForm[Gbl.Prefs.Theme]);
/***** Start row *****/
fprintf (Gbl.F.Out,"<li style=\"height:20px;\">");
@ -3206,8 +3206,8 @@ unsigned For_GetNumPstsInForum (For_ForumType_t ForumType)
void For_ListForumThrs (long ThrCods[Pag_ITEMS_PER_PAGE],struct Pagination *PaginationThrs)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *The_ClassFormBold[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;
@ -3332,8 +3332,8 @@ void For_ListForumThrs (long ThrCods[Pag_ITEMS_PER_PAGE],struct Pagination *Pagi
Pag_WriteLinksToPages (Pag_POSTS_FORUM,Thr.ThrCod,&PaginationPsts,
Thr.Enabled[For_FIRST_MSG],
Thr.Subject,
Thr.NumUnreadPosts ? The_ClassFormulB[Gbl.Prefs.Theme] :
The_ClassFormul[Gbl.Prefs.Theme],
Thr.NumUnreadPosts ? The_ClassFormBold[Gbl.Prefs.Theme] :
The_ClassForm[Gbl.Prefs.Theme],
true);
fprintf (Gbl.F.Out,"</td>");
@ -3687,7 +3687,7 @@ void For_ShowForumLevel2 (long ThrCod)
static void For_WriteFormForumPst (bool IsReply,long ThrCod,const char *Subject)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *Txt_New_message;
extern const char *Txt_New_thread;
extern const char *Txt_MSG_Subject;
@ -3708,12 +3708,12 @@ static void For_WriteFormForumPst (bool IsReply,long ThrCod,const char *Subject)
Lay_StartRoundFrameTable (NULL,2,IsReply ? Txt_New_message :
Txt_New_thread);
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"vertical-align:top;\">"
"<td class=\"%s RIGHT_TOP\">"
"%s: "
"</td>"
"<td style=\"text-align:left;\">"
"<textarea name=\"Subject\" cols=\"72\" rows=\"2\">",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassForm[Gbl.Prefs.Theme],
Txt_MSG_Subject);
if (IsReply) // If writing a reply to a message of an existing thread
fprintf (Gbl.F.Out,"%s",Subject);
@ -3721,7 +3721,7 @@ static void For_WriteFormForumPst (bool IsReply,long ThrCod,const char *Subject)
"</td>"
"</tr>"
"<tr>"
"<td class=\"%s\" style=\"vertical-align:top;\">"
"<td class=\"%s RIGHT_TOP\">"
"%s: "
"</td>"
"<td style=\"text-align:left;\">"
@ -3729,7 +3729,7 @@ static void For_WriteFormForumPst (bool IsReply,long ThrCod,const char *Subject)
"</textarea>"
"</td>"
"</tr>",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassForm[Gbl.Prefs.Theme],
Txt_MSG_Message);
/***** Help for text editor *****/

11
swad_group.c
View File

@ -226,8 +226,8 @@ static void Grp_EditGroups (void)
static void Grp_ShowFormSeveralGrps (Act_Action_t NextAction)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *The_ClassFormBold[The_NUM_THEMES];
extern const char *Txt_Groups;
extern const char *Txt_All_groups;
extern const char *Txt_Update_students;
@ -251,10 +251,9 @@ static void Grp_ShowFormSeveralGrps (Act_Action_t NextAction)
/***** Select all groups *****/
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"6\" class=\"%s\""
" style=\"text-align:center;\">"
"<td colspan=\"6\" class=\"%s CENTER_MIDDLE\">"
"<input type=\"checkbox\" id=\"AllGroups\" name=\"AllGroups\" value=\"Y\"",
The_ClassFormul[Gbl.Prefs.Theme]);
The_ClassForm[Gbl.Prefs.Theme]);
if (Gbl.Usrs.ClassPhoto.AllGroups)
fprintf (Gbl.F.Out," checked=\"checked\"");
fprintf (Gbl.F.Out," onclick=\"togglecheckChildren(this,'GrpCods')\" />"
@ -280,7 +279,7 @@ static void Grp_ShowFormSeveralGrps (Act_Action_t NextAction)
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"6\" style=\"padding-top:10px;"
" text-align:center;\">");
Act_LinkFormSubmitAnimated (Txt_Update_students_according_to_selected_groups,The_ClassFormulB[Gbl.Prefs.Theme]);
Act_LinkFormSubmitAnimated (Txt_Update_students_according_to_selected_groups,The_ClassFormBold[Gbl.Prefs.Theme]);
Lay_PutCalculateIconWithText (Txt_Update_students_according_to_selected_groups,Txt_Update_students);
fprintf (Gbl.F.Out,"</td>"
"</tr>");

28
swad_indicator.c
View File

@ -74,8 +74,8 @@ static unsigned long Ind_GetNumFilesOfCrsFileZoneFromDB (Brw_FileBrowser_t FileB
void Ind_ReqIndicatorsCourses (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *The_ClassFormBold[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;
@ -101,11 +101,11 @@ void Ind_ReqIndicatorsCourses (void)
fprintf (Gbl.F.Out,"<table class=\"CELLS_PAD_2\" style=\"margin:0 auto;\">"
"<tr>"
"<td class=\"%s\">"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td style=\"text-align:left; vertical-align:middle;\">",
The_ClassFormul[Gbl.Prefs.Theme],Txt_Scope);
The_ClassForm[Gbl.Prefs.Theme],Txt_Scope);
Gbl.Scope.Allowed = 1 << Sco_SCOPE_SYS |
1 << Sco_SCOPE_CTY |
1 << Sco_SCOPE_INS |
@ -120,12 +120,12 @@ void Ind_ReqIndicatorsCourses (void)
/* Compute stats for a type of degree */
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"vertical-align:top;\">"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td class=\"DAT\""
" style=\"text-align:left; vertical-align:top;\">",
The_ClassFormul[Gbl.Prefs.Theme],Txt_Types_of_degree);
" style=\"text-align:left; vertical-align:middle;\">",
The_ClassForm[Gbl.Prefs.Theme],Txt_Types_of_degree);
Deg_WriteSelectorDegTypes ();
fprintf (Gbl.F.Out," (");
fprintf (Gbl.F.Out,Txt_only_if_the_scope_is_X,
@ -135,11 +135,11 @@ void Ind_ReqIndicatorsCourses (void)
/* Compute stats for courses with teachers belonging to any department or to a particular departament? */
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"vertical-align:top;\">"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td style=\"text-align:left; vertical-align:top;\">",
The_ClassFormul[Gbl.Prefs.Theme],Txt_Department);
"<td style=\"text-align:left; vertical-align:middle;\">",
The_ClassForm[Gbl.Prefs.Theme],Txt_Department);
Dpt_WriteSelectorDepartment (-1L);
fprintf (Gbl.F.Out,"</td>"
"</tr>");
@ -147,12 +147,12 @@ void Ind_ReqIndicatorsCourses (void)
/* Show only courses with a numer of indicators */
Gbl.Stat.NumIndicators = Ind_GetParamNumIndicators ();
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"vertical-align:top;\">"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td style=\"text-align:left; vertical-align:top;\">"
"<td style=\"text-align:left; vertical-align:middle;\">"
"<select name=\"Indicators\">",
The_ClassFormul[Gbl.Prefs.Theme],Txt_No_of_indicators);
The_ClassForm[Gbl.Prefs.Theme],Txt_No_of_indicators);
fprintf (Gbl.F.Out,"<option value=\"-1\"");
if (Gbl.Stat.NumIndicators < 0)
fprintf (Gbl.F.Out," selected=\"selected\"");
@ -173,7 +173,7 @@ void Ind_ReqIndicatorsCourses (void)
/* Send button */
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"2\" style=\"text-align:center;\">");
Act_LinkFormSubmitAnimated (Txt_Update_indicators,The_ClassFormulB[Gbl.Prefs.Theme]);
Act_LinkFormSubmitAnimated (Txt_Update_indicators,The_ClassFormBold[Gbl.Prefs.Theme]);
Lay_PutCalculateIconWithText (Txt_Update_indicators,Txt_Update_indicators);
fprintf (Gbl.F.Out,"</td>"
"</tr>"

24
swad_info.c
View File

@ -425,11 +425,11 @@ static void Inf_PutFormToEditInfo (Inf_InfoType_t InfoType)
static void Inf_PutFormToForceStdsToReadInfo (Inf_InfoType_t InfoType,bool MustBeRead)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *Txt_Force_students_to_read_this_information;
fprintf (Gbl.F.Out,"<div class=\"%s\" style=\"text-align:center;\">",
The_ClassFormul[Gbl.Prefs.Theme]);
The_ClassFormRightMiddle[Gbl.Prefs.Theme]);
Act_FormStart (Inf_ActionsChangeForceReadInfo[InfoType]);
fprintf (Gbl.F.Out,"<input type=\"checkbox\"");
if (MustBeRead)
@ -449,12 +449,12 @@ static void Inf_PutFormToForceStdsToReadInfo (Inf_InfoType_t InfoType,bool MustB
static void Inf_PutFormToConfirmIHaveReadInfo (Inf_InfoType_t InfoType)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *Txt_I_have_read_this_information;
bool IHaveRead = Inf_CheckIfIHaveReadInfo (InfoType);
fprintf (Gbl.F.Out,"<div class=\"%s\" style=\"text-align:center;\">",
The_ClassFormul[Gbl.Prefs.Theme]);
The_ClassFormRightMiddle[Gbl.Prefs.Theme]);
Act_FormStart (Inf_ActionsIHaveReadInfo[InfoType]);
fprintf (Gbl.F.Out,"<input type=\"checkbox\"");
if (IHaveRead)
@ -536,7 +536,7 @@ bool Inf_GetIfIMustReadAnyCrsInfoInThisCrs (void)
void Inf_WriteMsgYouMustReadInfo (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *Txt_You_should_read_the_following_information_on_the_course_X;
Inf_InfoType_t InfoType;
@ -557,7 +557,7 @@ void Inf_WriteMsgYouMustReadInfo (void)
{
fprintf (Gbl.F.Out,"<li>");
Act_FormStart (Inf_ActionsSeeInfo[InfoType]);
Act_LinkFormSubmit (Act_GetTitleAction (Inf_ActionsSeeInfo[InfoType]),The_ClassFormul[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (Act_GetTitleAction (Inf_ActionsSeeInfo[InfoType]),The_ClassFormRightMiddle[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s"
"</a>",
Act_GetTitleAction (Inf_ActionsSeeInfo[InfoType]));
@ -868,7 +868,7 @@ void Inf_WriteURLIntoTxtBuffer (Inf_InfoType_t InfoType,char TxtBuffer[Cns_MAX_B
static void Inf_ShowPage (Inf_InfoType_t InfoType,const char *URL)
{
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *The_ClassFormBold[The_NUM_THEMES];
extern const char *Txt_View_in_a_new_window;
extern const char *Txt_INFO_TITLE[Inf_NUM_INFO_TYPES];
@ -877,7 +877,7 @@ static void Inf_ShowPage (Inf_InfoType_t InfoType,const char *URL)
/***** Link to view in a new window *****/
fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\" class=\"%s\">",
URL,The_ClassFormulB[Gbl.Prefs.Theme]);
URL,The_ClassFormBold[Gbl.Prefs.Theme]);
Lay_PutIconWithText ("fullscreen",
Txt_View_in_a_new_window,
Txt_View_in_a_new_window);
@ -1046,7 +1046,7 @@ void Inf_FormToEnterRichTextEditor (Inf_InfoSrc_t InfoSrc,Inf_InfoType_t InfoTyp
void Inf_FormToSendPage (Inf_InfoSrc_t InfoSrc,Inf_InfoType_t InfoType)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *Txt_File;
extern const char *Txt_Upload_file;
@ -1064,7 +1064,7 @@ void Inf_FormToSendPage (Inf_InfoSrc_t InfoSrc,Inf_InfoType_t InfoType)
"</td>"
"</tr>"
"</table>",
The_ClassFormul[Gbl.Prefs.Theme],Txt_File,
The_ClassFormRightMiddle[Gbl.Prefs.Theme],Txt_File,
Fil_NAME_OF_PARAM_FILENAME_ORG);
/***** Send button *****/
@ -1080,7 +1080,7 @@ void Inf_FormToSendPage (Inf_InfoSrc_t InfoSrc,Inf_InfoType_t InfoType)
void Inf_FormToSendURL (Inf_InfoSrc_t InfoSrc,Inf_InfoType_t InfoType)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *Txt_URL;
extern const char *Txt_Send_URL;
FILE *FileURL;
@ -1096,7 +1096,7 @@ void Inf_FormToSendURL (Inf_InfoSrc_t InfoSrc,Inf_InfoType_t InfoType)
"</td>"
"<td style=\"text-align:left;\">"
"<input type=\"text\" name=\"InfoSrcURL\" size=\"50\" maxlength=\"256\" value=\"",
The_ClassFormul[Gbl.Prefs.Theme],Txt_URL);
The_ClassFormRightMiddle[Gbl.Prefs.Theme],Txt_URL);
if ((FileURL = fopen (Gbl.CurrentCrs.Info.Links[InfoType].PathRelFileURL,"rb")) == NULL)
fprintf (Gbl.F.Out,"http://");
else

24
swad_institution.c
View File

@ -225,7 +225,7 @@ void Ins_PrintConfiguration (void)
static void Ins_Configuration (bool PrintView)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *Txt_Centres;
extern const char *Txt_Print;
extern const char *Txt_Institution;
@ -287,7 +287,7 @@ static void Ins_Configuration (bool PrintView)
"</td>"
"<td class=\"DAT_N\" style=\"text-align:left;"
" vertical-align:middle;\">",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassFormRightMiddle[Gbl.Prefs.Theme],
Txt_Institution);
if (PutLink)
fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\""
@ -311,7 +311,7 @@ static void Ins_Configuration (bool PrintView)
"%s"
"</td>"
"</tr>",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassFormRightMiddle[Gbl.Prefs.Theme],
Txt_Short_name,
Gbl.CurrentIns.Ins.ShortName);
@ -325,7 +325,7 @@ static void Ins_Configuration (bool PrintView)
"<td class=\"DAT\""
" style=\"text-align:left; vertical-align:middle;\">"
"<a href=\"%s\" target=\"_blank\" class=\"DAT\">",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassFormRightMiddle[Gbl.Prefs.Theme],
Txt_Web,
Gbl.CurrentIns.Ins.WWW);
Str_LimitLengthHTMLStr (Gbl.CurrentIns.Ins.WWW,20);
@ -348,7 +348,7 @@ static void Ins_Configuration (bool PrintView)
"</a>"
"</td>"
"</tr>",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassFormRightMiddle[Gbl.Prefs.Theme],
Txt_Shortcut,
Cfg_HTTPS_URL_SWAD_CGI,Txt_STR_LANG_ID[Gbl.Prefs.Language],Gbl.CurrentIns.Ins.InsCod,
Cfg_HTTPS_URL_SWAD_CGI,Txt_STR_LANG_ID[Gbl.Prefs.Language],Gbl.CurrentIns.Ins.InsCod);
@ -362,7 +362,7 @@ static void Ins_Configuration (bool PrintView)
"</td>"
"<td class=\"DAT\" style=\"text-align:left;"
" vertical-align:middle;\">",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassFormRightMiddle[Gbl.Prefs.Theme],
Txt_QR_code);
QR_LinkTo (200,"ins",Gbl.CurrentIns.Ins.InsCod);
fprintf (Gbl.F.Out,"</td>"
@ -380,7 +380,7 @@ static void Ins_Configuration (bool PrintView)
"%u"
"</td>"
"</tr>",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassFormRightMiddle[Gbl.Prefs.Theme],
Txt_Centres,
Ctr_GetNumCtrsInIns (Gbl.CurrentIns.Ins.InsCod));
@ -394,7 +394,7 @@ static void Ins_Configuration (bool PrintView)
"%u"
"</td>"
"</tr>",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassFormRightMiddle[Gbl.Prefs.Theme],
Txt_Degrees,
Deg_GetNumDegsInIns (Gbl.CurrentIns.Ins.InsCod));
@ -408,7 +408,7 @@ static void Ins_Configuration (bool PrintView)
"%u"
"</td>"
"</tr>",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassFormRightMiddle[Gbl.Prefs.Theme],
Txt_Courses,
Crs_GetNumCrssInIns (Gbl.CurrentIns.Ins.InsCod));
@ -422,7 +422,7 @@ static void Ins_Configuration (bool PrintView)
"%u"
"</td>"
"</tr>",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassFormRightMiddle[Gbl.Prefs.Theme],
Txt_Departments,
Dpt_GetNumDepartmentsInInstitution (Gbl.CurrentIns.Ins.InsCod));
@ -436,7 +436,7 @@ static void Ins_Configuration (bool PrintView)
"%u"
"</td>"
"</tr>",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassFormRightMiddle[Gbl.Prefs.Theme],
Txt_ROLES_PLURAL_Abc[Rol_TEACHER][Usr_SEX_UNKNOWN],
Usr_GetNumUsrsInCrssOfIns (Rol_TEACHER,Gbl.CurrentIns.Ins.InsCod));
@ -450,7 +450,7 @@ static void Ins_Configuration (bool PrintView)
"%u"
"</td>"
"</tr>",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassFormRightMiddle[Gbl.Prefs.Theme],
Txt_ROLES_PLURAL_Abc[Rol_STUDENT][Usr_SEX_UNKNOWN],
Usr_GetNumUsrsInCrssOfIns (Rol_STUDENT,Gbl.CurrentIns.Ins.InsCod));
}

8
swad_logo.c
View File

@ -229,7 +229,7 @@ void Log_PutFormToChangeLogo (Sco_Scope_t Scope)
void Log_RequestLogo (Sco_Scope_t Scope)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormRightMiddle[The_NUM_THEMES];
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;
extern const char *Txt_File_with_the_logo;
@ -296,7 +296,7 @@ void Log_RequestLogo (Sco_Scope_t Scope)
"</label>"
"<input type=\"file\" name=\"%s\""
" size=\"40\" maxlength=\"100\" value=\"\" />",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassFormRightMiddle[Gbl.Prefs.Theme],
Txt_File_with_the_logo,
Fil_NAME_OF_PARAM_FILENAME_ORG);
@ -313,12 +313,12 @@ void Log_RequestLogo (Sco_Scope_t Scope)
static void Log_PutLinkToRemoveLogo (Act_Action_t Action)
{
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *The_ClassFormBold[The_NUM_THEMES];
extern const char *Txt_Remove_logo;
/***** Link for removing the photo *****/
Act_FormStart (Action);
Act_LinkFormSubmit (Txt_Remove_logo,The_ClassFormulB[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (Txt_Remove_logo,The_ClassFormBold[Gbl.Prefs.Theme]);
Lay_PutIconWithText ("delon",Txt_Remove_logo,Txt_Remove_logo);
Act_FormEnd ();
}

8
swad_mail.c
View File

@ -912,7 +912,7 @@ long Mai_GetUsrCodFromEmail (const char *Email)
void Mai_ShowFormChangeUsrEmail (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *Txt_Current_email;
extern const char *Txt_Other_emails;
extern const char *Txt_Email_X_confirmed;
@ -953,7 +953,7 @@ void Mai_ShowFormChangeUsrEmail (void)
"%s:"
"</td>"
"<td",
The_ClassFormul[Gbl.Prefs.Theme],Txt_Current_email);
The_ClassFormRightMiddle[Gbl.Prefs.Theme],Txt_Current_email);
if (Confirmed)
fprintf (Gbl.F.Out," colspan=\"2\"");
fprintf (Gbl.F.Out," style=\"text-align:left;"
@ -967,7 +967,7 @@ void Mai_ShowFormChangeUsrEmail (void)
" style=\"vertical-align:top;\">"
"%s:",
NumEmails - 1,
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassFormRightMiddle[Gbl.Prefs.Theme],
Txt_Other_emails);
fprintf (Gbl.F.Out,"</td>"
"<td style=\"text-align:left;"
@ -1027,7 +1027,7 @@ void Mai_ShowFormChangeUsrEmail (void)
"%s:"
"</td>"
"<td style=\"text-align:left; vertical-align:middle;\">",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassFormRightMiddle[Gbl.Prefs.Theme],
NumEmails ? Txt_New_email : // A new e-mail
Txt_Email); // The first e-mail
Act_FormStart (ActChgMai);

6
swad_mark.c
View File

@ -106,7 +106,7 @@ void Mrk_GetAndWriteNumRowsHeaderAndFooter (Brw_FileType_t FileType,
const char *PathInTree,
const char *FileName)
{
extern const char *The_ClassFormulNB[The_NUM_THEMES];
extern const char *The_ClassFormNoWrap[The_NUM_THEMES];
extern const char *Txt_TABLE_Header;
extern const char *Txt_TABLE_Footer;
struct MarksProperties Marks;
@ -124,7 +124,7 @@ void Mrk_GetAndWriteNumRowsHeaderAndFooter (Brw_FileType_t FileType,
/***** Write the number of rows of header *****/
fprintf (Gbl.F.Out,"<td class=\"%s\" style=\"text-align:right;"
" vertical-align:top; background-color:%s;\">",
The_ClassFormulNB[Gbl.Prefs.Theme],
The_ClassFormNoWrap[Gbl.Prefs.Theme],
Gbl.ColorRows[Gbl.RowEvenOdd]);
if (Gbl.CurrentCrs.Grps.GrpCod > 0) // Group zone
@ -151,7 +151,7 @@ void Mrk_GetAndWriteNumRowsHeaderAndFooter (Brw_FileType_t FileType,
/***** Write the number of rows of footer *****/
fprintf (Gbl.F.Out,"<td class=\"%s\" style=\"text-align:right;"
" vertical-align:top; background-color:%s;\">",
The_ClassFormulNB[Gbl.Prefs.Theme],
The_ClassFormNoWrap[Gbl.Prefs.Theme],
Gbl.ColorRows[Gbl.RowEvenOdd]);
if (Gbl.CurrentCrs.Grps.GrpCod > 0) // Group zone

38
swad_message.c
View File

@ -126,7 +126,7 @@ static bool Msg_CheckIfUsrIsBanned (long FromUsrCod,long ToUsrCod);
void Msg_ListEMails (void)
{
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *The_ClassFormBold[The_NUM_THEMES];
extern const char *Txt_Students_who_have_accepted_and_who_have_e_mail;
extern const char *Txt_X_students_who_have_e_mail;
extern const char *Txt_X_students_who_have_accepted_and_who_have_e_mail;
@ -224,7 +224,7 @@ void Msg_ListEMails (void)
Gbl.Usrs.Me.UsrDat.Email,
Gbl.CurrentCrs.Crs.FullName,Gbl.Usrs.Me.UsrDat.Email,StrAddresses,
Txt_Create_e_mail_message,
The_ClassFormulB[Gbl.Prefs.Theme]);
The_ClassFormBold[Gbl.Prefs.Theme]);
Lay_PutIconWithText ("editnewmsg",Txt_Create_e_mail_message,Txt_Create_e_mail_message);
fprintf (Gbl.F.Out,"</div>");
}
@ -257,7 +257,7 @@ void Msg_FormMsgUsrs (void)
static void Msg_PutFormMsgUsrs (const char *Content)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *Txt_New_message;
extern const char *Txt_MSG_To;
extern const char *Txt_Send_message;
@ -324,7 +324,7 @@ static void Msg_PutFormMsgUsrs (const char *Content)
"</td>"
"<td style=\"text-align:left;\">"
"<table>",
The_ClassFormul[Gbl.Prefs.Theme],Txt_MSG_To);
The_ClassFormRightMiddle[Gbl.Prefs.Theme],Txt_MSG_To);
/* Teachers */
Usr_ListUsersToSelect (Rol_TEACHER);
@ -424,7 +424,7 @@ void Msg_WriteFormUsrsIDsOrNicksOtherRecipients (bool IsReply)
static void Msg_WriteFormSubjectAndContentMsgToUsrs (const char *Content)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *Txt_MSG_Subject;
extern const char *Txt_MSG_Message;
extern const char *Txt_Original_message;
@ -443,7 +443,7 @@ static void Msg_WriteFormSubjectAndContentMsgToUsrs (const char *Content)
"</td>"
"<td style=\"text-align:left;\">"
"<textarea name=\"Subject\" cols=\"72\" rows=\"2\">",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassFormRightMiddle[Gbl.Prefs.Theme],
Txt_MSG_Subject);
/***** If message is a reply ==> get original message *****/
@ -474,7 +474,7 @@ static void Msg_WriteFormSubjectAndContentMsgToUsrs (const char *Content)
"</td>"
"<td style=\"text-align:left;\">"
"<textarea name=\"Content\" cols=\"72\" rows=\"20\">",
The_ClassFormul[Gbl.Prefs.Theme],Txt_MSG_Message);
The_ClassFormRightMiddle[Gbl.Prefs.Theme],Txt_MSG_Message);
fprintf (Gbl.F.Out,"\n\n\n\n\n----- %s -----\n",
Txt_Original_message);
@ -500,7 +500,7 @@ static void Msg_WriteFormSubjectAndContentMsgToUsrs (const char *Content)
"</td>"
"<td style=\"text-align:left;\">"
"<textarea name=\"Content\" cols=\"72\" rows=\"20\">%s",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassFormRightMiddle[Gbl.Prefs.Theme],
Txt_MSG_Message,
Content);
}
@ -1523,7 +1523,7 @@ void Msg_ShowRecMsgs (void)
static void Msg_ShowSentOrReceivedMessages (Msg_TypeOfMessages_t TypeOfMessages)
{
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *The_ClassFormBold[The_NUM_THEMES];
extern const char *Txt_Update_messages;
extern const char *Txt_Messages_received;
extern const char *Txt_Messages_sent;
@ -1561,7 +1561,7 @@ static void Msg_ShowSentOrReceivedMessages (Msg_TypeOfMessages_t TypeOfMessages)
}
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Act_LinkFormSubmitAnimated (Txt_Update_messages,The_ClassFormulB[Gbl.Prefs.Theme]);
Act_LinkFormSubmitAnimated (Txt_Update_messages,The_ClassFormBold[Gbl.Prefs.Theme]);
Lay_PutCalculateIconWithText (Txt_Update_messages,Txt_Update_messages);
fprintf (Gbl.F.Out,"</div>");
@ -2271,7 +2271,7 @@ void Msg_GetDistinctCoursesInMyMessages (Msg_TypeOfMessages_t TypeOfMessages)
void Msg_ShowFormSelectCourseSentOrRecMsgs (Msg_TypeOfMessages_t TypeOfMessages)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormRightMiddle[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;
@ -2282,7 +2282,7 @@ void Msg_ShowFormSelectCourseSentOrRecMsgs (Msg_TypeOfMessages_t TypeOfMessages)
fprintf (Gbl.F.Out,"<span class=\"%s\">%s </span>"
"<select name=\"FilterCrsCod\">"
"<option value=\"\"",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassFormRightMiddle[Gbl.Prefs.Theme],
TypeOfMessages == Msg_MESSAGES_RECEIVED ? Txt_Messages_received_from_A_COURSE :
Txt_Messages_sent_from_A_COURSE);
if (Gbl.Msg.FilterCrsCod < 0)
@ -2309,7 +2309,7 @@ void Msg_ShowFormSelectCourseSentOrRecMsgs (Msg_TypeOfMessages_t TypeOfMessages)
void Msg_ShowFormToFilterMsgs (Msg_TypeOfMessages_t TypeOfMessages)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *Txt_MSG_From;
extern const char *Txt_MSG_To;
extern const char *Txt_MSG_Message;
@ -2326,7 +2326,7 @@ void Msg_ShowFormToFilterMsgs (Msg_TypeOfMessages_t TypeOfMessages)
"<input type=\"text\" name=\"FilterFromTo\" size=\"40\" maxlength=\"%u\" value=\"%s\" />"
"</td>"
"</tr>",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassFormRightMiddle[Gbl.Prefs.Theme],
TypeOfMessages == Msg_MESSAGES_RECEIVED ? Txt_MSG_From :
Txt_MSG_To,
Usr_MAX_LENGTH_USR_NAME_OR_SURNAME*3,Gbl.Msg.FilterFromTo);
@ -2340,7 +2340,7 @@ void Msg_ShowFormToFilterMsgs (Msg_TypeOfMessages_t TypeOfMessages)
"<input type=\"text\" name=\"FilterContent\" size=\"40\" maxlength=\"%u\" value=\"%s\" />"
"</td>"
"</tr>",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassFormRightMiddle[Gbl.Prefs.Theme],
Txt_MSG_Message,
Msg_MAX_LENGTH_FILTER_CONTENT,Gbl.Msg.FilterContent);
@ -2354,13 +2354,13 @@ void Msg_ShowFormToFilterMsgs (Msg_TypeOfMessages_t TypeOfMessages)
static void Msg_ShowFormToShowOnlyUnreadMessages (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *Txt_Show_only_unread_messages;
/***** Put checkbox to select whether to show only unread (received) messages *****/
fprintf (Gbl.F.Out,"<div class=\"%s\" style=\"text-align:center;\">"
"<input type=\"checkbox\" name=\"OnlyUnreadMsgs\" value=\"Y\"",
The_ClassFormul[Gbl.Prefs.Theme]);
The_ClassFormRightMiddle[Gbl.Prefs.Theme]);
if (Gbl.Msg.ShowOnlyUnreadMsgs)
fprintf (Gbl.F.Out," checked=\"checked\"");
fprintf (Gbl.F.Out," /> %s</div>",
@ -2955,7 +2955,7 @@ static void Msg_WriteFormToReply (long MsgCod,long CrsCod,const char *Subject,
bool FromThisCrs,bool Replied,
const char EncryptedUsrCod[Cry_LENGTH_ENCRYPTED_STR_SHA256_BASE64+1])
{
extern const char *The_ClassFormulB[The_NUM_THEMES];
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;
@ -2983,7 +2983,7 @@ static void Msg_WriteFormToReply (long MsgCod,long CrsCod,const char *Subject,
Txt_Reply) :
(Replied ? Txt_Go_to_course_and_reply_again :
Txt_Go_to_course_and_reply),
The_ClassFormulB[Gbl.Prefs.Theme]);
The_ClassFormBold[Gbl.Prefs.Theme]);
Lay_PutIconWithText ("reply",Replied ? Txt_Reply_again :
Txt_Reply,
Replied ? Txt_Reply_again :

4
swad_network.c
View File

@ -219,12 +219,12 @@ static void Net_ShowAWebOrSocialNet (const char *URL,
void Net_ShowFormMyWebsAndSocialNets (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *Txt_Webs_social_networks;
char Query[256];
MYSQL_RES *mysql_res;
MYSQL_ROW row;
const char *ClassForm = The_ClassFormul[Gbl.Prefs.Theme];
const char *ClassForm = The_ClassFormRightMiddle[Gbl.Prefs.Theme];
Net_WebsAndSocialNetworks_t NumURL;
char URL[Cns_MAX_BYTES_URL+1];

8
swad_nickname.c
View File

@ -178,7 +178,7 @@ long Nck_GetUsrCodFromNickname (const char *Nickname)
void Nck_ShowFormChangeUsrNickname (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *Txt_Current_nickname;
extern const char *Txt_Other_nicknames;
extern const char *Txt_Use_this_nickname;
@ -215,7 +215,7 @@ void Nck_ShowFormChangeUsrNickname (void)
"</td>"
"<td colspan=\"2\" style=\"text-align:left;"
" vertical-align:middle;\">",
The_ClassFormul[Gbl.Prefs.Theme],Txt_Current_nickname);
The_ClassFormRightMiddle[Gbl.Prefs.Theme],Txt_Current_nickname);
else // NumNick >= 2
{
fprintf (Gbl.F.Out,"<tr>");
@ -224,7 +224,7 @@ void Nck_ShowFormChangeUsrNickname (void)
" style=\"vertical-align:top;\">"
"%s:",
NumNicks - 1,
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassFormRightMiddle[Gbl.Prefs.Theme],
Txt_Other_nicknames);
fprintf (Gbl.F.Out,"</td>"
"<td style=\"text-align:left;"
@ -271,7 +271,7 @@ void Nck_ShowFormChangeUsrNickname (void)
"%s:"
"</td>"
"<td style=\"text-align:left; vertical-align:middle;\">",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassFormRightMiddle[Gbl.Prefs.Theme],
NumNicks ? Txt_New_nickname : // A new nickname
Txt_Nickname); // The first nickname
Act_FormStart (ActChgNic);

10
swad_notice.c
View File

@ -83,7 +83,7 @@ static long Not_GetParamNotCod (void);
void Not_ShowFormNotice (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *Txt_The_notice_you_enter_here_will_appear_as_a_yellow_note_;
extern const char *Txt_New_notice;
extern const char *Txt_MSG_Message;
@ -108,7 +108,7 @@ void Not_ShowFormNotice (void)
"<textarea name=\"Content\" cols=\"30\" rows=\"10\"></textarea>"
"</td>"
"</tr>",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassFormRightMiddle[Gbl.Prefs.Theme],
Txt_MSG_Message);
/***** Button to create notice and end frame *****/
@ -470,7 +470,7 @@ static void Not_DrawANotice (Not_Listing_t TypeNoticesListing,
long UsrCod,
Not_Status_t NoticeStatus)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *Txt_NOTICE_Active_SINGULAR;
extern const char *Txt_NOTICE_Active_Mark_as_obsolete;
extern const char *Txt_NOTICE_Obsolete_SINGULAR;
@ -568,7 +568,7 @@ static void Not_DrawANotice (Not_Listing_t TypeNoticesListing,
/* Form to view full notice */
Act_FormStart (ActShoNot);
Not_PutHiddenParamNotCod (NotCod);
Act_LinkFormSubmit (Txt_See_full_notice,The_ClassFormul[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (Txt_See_full_notice,The_ClassFormRightMiddle[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"<img src=\"%s/ellipsis32x32.gif\""
" alt=\"%s\" title=\"%s\""
" class=\"ICON32x32\" />"
@ -598,7 +598,7 @@ static void Not_DrawANotice (Not_Listing_t TypeNoticesListing,
/* Form to delete notice */
Act_FormStart (ActRemNot);
Not_PutHiddenParamNotCod (NotCod);
Act_LinkFormSubmit (Txt_Remove,The_ClassFormul[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (Txt_Remove,The_ClassFormRightMiddle[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"<img src=\"%s/delon16x16.gif\""
" alt=\"%s\" title=\"%s\""
" class=\"ICON16x16\" />"

12
swad_notification.c
View File

@ -590,12 +590,12 @@ void Ntf_ShowMyNotifications (void)
static void Ntf_WriteFormAllNotifications (bool AllNotifications)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *Txt_Show_all_notifications;
/***** Start form *****/
fprintf (Gbl.F.Out,"<div class=\"%s\">",
The_ClassFormul[Gbl.Prefs.Theme]);
The_ClassFormRightMiddle[Gbl.Prefs.Theme]);
Act_FormStart (ActSeeNtf);
/***** End form *****/
@ -1646,11 +1646,11 @@ static void Ntf_PutLinkToChangePrefs (void)
static void Ntf_PutLinkToMarkAllNotifAsSeen (void)
{
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *The_ClassFormBold[The_NUM_THEMES];
extern const char *Txt_Mark_all_notifications_as_read;
Act_FormStart (ActMrkNtfSee);
Act_LinkFormSubmit (Txt_Mark_all_notifications_as_read,The_ClassFormulB[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (Txt_Mark_all_notifications_as_read,The_ClassFormBold[Gbl.Prefs.Theme]);
Lay_PutIconWithText ("visible_on",Txt_Mark_all_notifications_as_read,Txt_Mark_all_notifications_as_read);
Act_FormEnd ();
}
@ -1680,7 +1680,7 @@ void Ntf_MarkAllNotifAsSeen (void)
void Ntf_PutFormChangeNotifSentByEMail (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *Txt_Save_changes;
extern const char *Txt_Notifications;
extern const char *Txt_Create_BR_notification;
@ -1716,7 +1716,7 @@ void Ntf_PutFormChangeNotifSentByEMail (void)
"</td>"
"<td style=\"text-align:center;\">"
"<input type=\"checkbox\" name=\"%s\" value=\"Y\"",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassFormRightMiddle[Gbl.Prefs.Theme],
Txt_NOTIFY_EVENTS_PLURAL[NotifyEvent],
Ntf_ParamNotifMeAboutNotifyEvents[NotifyEvent]);
if ((Gbl.Usrs.Me.UsrDat.Prefs.NotifNtfEvents & (1 << NotifyEvent)))

20
swad_password.c
View File

@ -232,7 +232,7 @@ static void Pwd_PutLinkToSendNewPasswdParams (void)
void Pwd_ShowFormSendNewPwd (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *Txt_If_you_have_forgotten_your_password_;
extern const char *Txt_Password;
extern const char *Txt_nick_email_or_ID;
@ -253,7 +253,7 @@ void Pwd_ShowFormSendNewPwd (void)
"</label>"
"<input type=\"text\" name=\"UsrId\""
" size=\"8\" maxlength=\"%u\" value=\"%s\" />",
The_ClassFormul[Gbl.Prefs.Theme],Txt_nick_email_or_ID,
The_ClassFormRightMiddle[Gbl.Prefs.Theme],Txt_nick_email_or_ID,
Usr_MAX_LENGTH_USR_LOGIN,Gbl.Usrs.Me.UsrIdLogin);
/***** Send button and end table *****/
@ -659,7 +659,7 @@ bool Pwd_FastCheckIfPasswordSeemsGood (const char *PlainPassword)
void Pwd_ShowFormChgPwd (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormRightMiddle[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_;
@ -695,7 +695,7 @@ void Pwd_ShowFormChgPwd (void)
" size=\"25\" maxlength=\"%u\" autocomplete=\"off\" />"
"</td>"
"</tr>",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassFormRightMiddle[Gbl.Prefs.Theme],
Txt_Current_password,
Pwd_MAX_LENGTH_PLAIN_PASSWORD);
@ -726,7 +726,7 @@ void Pwd_ShowFormChgPwd (void)
void Pwd_PutFormToGetNewPasswordTwice (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *Txt_New_password;
extern const char *Txt_Password;
extern const char *Txt_HELP_password;
@ -752,12 +752,12 @@ void Pwd_PutFormToGetNewPasswordTwice (void)
" size=\"25\" maxlength=\"%u\" placeholder=\"%s\" />"
"</td>"
"</tr>",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassFormRightMiddle[Gbl.Prefs.Theme],
Gbl.Usrs.Me.Logged? Txt_New_password : // Changing my password
Txt_Password, // Creating new account
Pwd_MAX_LENGTH_PLAIN_PASSWORD,
Gbl.Message,
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassFormRightMiddle[Gbl.Prefs.Theme],
Gbl.Usrs.Me.Logged ? Txt_Retype_new_password : // Changing my password
Txt_Retype_password, // Creating new account
Pwd_MAX_LENGTH_PLAIN_PASSWORD,
@ -867,7 +867,7 @@ bool Pwd_CheckIfICanChangeOtherUsrPassword (long UsrCod)
void Pwd_AskForConfirmationOnDangerousAction (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *Txt_I_understand_that_this_action_may_have_serious_consequences_and_can_not_be_undone;
extern const char *Txt_For_security_enter_your_password;
@ -878,9 +878,9 @@ void Pwd_AskForConfirmationOnDangerousAction (void)
"<input type=\"password\" name=\"OthUsrPwd\""
" size=\"16\" maxlength=\"%u\" autocomplete=\"off\" />"
"</div>",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassFormRightMiddle[Gbl.Prefs.Theme],
Txt_I_understand_that_this_action_may_have_serious_consequences_and_can_not_be_undone,
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassFormRightMiddle[Gbl.Prefs.Theme],
Txt_For_security_enter_your_password,
Pwd_MAX_LENGTH_PLAIN_PASSWORD);
}

20
swad_photo.c
View File

@ -240,7 +240,7 @@ void Pho_ReqUsrPhoto (struct UsrData *UsrDat)
void Pho_ReqPhoto (const struct UsrData *UsrDat,bool PhotoExists,const char *PhotoURL)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *Txt_Photo;
extern const char *Txt_You_can_send_a_file_with_an_image_in_jpg_format_;
extern const char *Txt_File_with_the_photo;
@ -293,7 +293,7 @@ void Pho_ReqPhoto (const struct UsrData *UsrDat,bool PhotoExists,const char *Pho
" size=\"40\" maxlength=\"100\" value=\"%ld.jpg\" />"
"</td>"
"</tr>",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassFormRightMiddle[Gbl.Prefs.Theme],
Txt_File_with_the_photo,
Fil_NAME_OF_PARAM_FILENAME_ORG,
UsrDat->UsrCod);
@ -1511,7 +1511,7 @@ void Pho_ShowOrPrintPhotoDegree (Pho_AvgPhotoSeeOrPrint_t SeeOrPrint)
static void Pho_PutSelectorForTypeOfAvg (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormRightMiddle[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;
@ -1521,7 +1521,7 @@ static void Pho_PutSelectorForTypeOfAvg (void)
"%s:"
"</td>"
"<td style=\"text-align:left; vertical-align:middle;\">",
The_ClassFormul[Gbl.Prefs.Theme],Txt_Average_type);
The_ClassFormRightMiddle[Gbl.Prefs.Theme],Txt_Average_type);
Act_FormStart (ActSeePhoDeg);
Pho_PutHiddenParamPhotoSize ();
Pho_PutHiddenParamOrderDegrees ();
@ -1580,7 +1580,7 @@ static Pho_AvgPhotoTypeOfAverage_t Pho_GetPhotoAvgTypeFromForm (void)
static void Pho_PutSelectorForHowComputePhotoSize (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormRightMiddle[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;
@ -1590,7 +1590,7 @@ static void Pho_PutSelectorForHowComputePhotoSize (void)
"%s:"
"</td>"
"<td style=\"text-align:left; vertical-align:middle;\">",
The_ClassFormul[Gbl.Prefs.Theme],Txt_Size_of_photos);
The_ClassFormRightMiddle[Gbl.Prefs.Theme],Txt_Size_of_photos);
Act_FormStart (ActSeePhoDeg);
Pho_PutHiddenParamTypeOfAvg ();
Pho_PutHiddenParamOrderDegrees ();
@ -1649,7 +1649,7 @@ static Pho_HowComputePhotoSize_t Pho_GetHowComputePhotoSizeFromForm (void)
static void Pho_PutSelectorForHowOrderDegrees (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormRightMiddle[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;
@ -1659,7 +1659,7 @@ static void Pho_PutSelectorForHowOrderDegrees (void)
"%s:"
"</td>"
"<td style=\"text-align:left; vertical-align:middle;\">",
The_ClassFormul[Gbl.Prefs.Theme],Txt_Sort_degrees_by);
The_ClassFormRightMiddle[Gbl.Prefs.Theme],Txt_Sort_degrees_by);
Act_FormStart (ActSeePhoDeg);
Pho_PutHiddenParamTypeOfAvg ();
Pho_PutHiddenParamPhotoSize ();
@ -1742,7 +1742,7 @@ static void Pho_PutLinkToPrintViewOfDegreeStatsParams (void)
static void Pho_PutLinkToCalculateDegreeStats (void)
{
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *The_ClassFormBold[The_NUM_THEMES];
extern const char *Txt_Calculate_average_photo_of_a_degree;
extern const char *Txt_Calculate_average_photo_of_THE_DEGREE_X;
extern const char *Txt_unknown_TIME;
@ -1771,7 +1771,7 @@ static void Pho_PutLinkToCalculateDegreeStats (void)
Usr_PutParamUsrListType (Gbl.Usrs.Me.ListType);
Usr_PutParamColsClassPhoto ();
Usr_PutParamListWithPhotos ();
Act_LinkFormSubmitAnimated (Txt_Calculate_average_photo_of_a_degree,The_ClassFormulB[Gbl.Prefs.Theme]);
Act_LinkFormSubmitAnimated (Txt_Calculate_average_photo_of_a_degree,The_ClassFormBold[Gbl.Prefs.Theme]);
Lay_PutCalculateIconWithText (Txt_Calculate_average_photo_of_a_degree,Txt_Calculate_average_photo_of_THE_DEGREE_X);
/***** Put selector with all the degrees *****/

20
swad_profile.c
View File

@ -135,7 +135,7 @@ void Prf_RequestUserProfile (void)
static void Prf_RequestUserProfileWithDefaultNickname (const char *DefaultNickname)
{
extern const char *Txt_View_public_profile;
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *Txt_Nickname;
extern const char *Txt_Continue;
@ -151,7 +151,7 @@ static void Prf_RequestUserProfileWithDefaultNickname (const char *DefaultNickna
"</label>"
"<input type=\"text\" name=\"usr\""
" size=\"20\" maxlength=\"%u\" value=\"@%s\" />",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassFormRightMiddle[Gbl.Prefs.Theme],
Txt_Nickname,
Nck_MAX_BYTES_NICKNAME_WITH_ARROBA,
DefaultNickname);
@ -293,7 +293,7 @@ void Prf_ChangeProfileVisibility (void)
static void Prf_ShowDetailsUserProfile (const struct UsrData *UsrDat)
{
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *The_ClassFormBold[The_NUM_THEMES];
extern const char *Txt_ROLES_SINGUL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS];
extern const char *Txt_teachers_ABBREVIATION;
extern const char *Txt_students_ABBREVIATION;
@ -444,7 +444,7 @@ static void Prf_ShowDetailsUserProfile (const struct UsrData *UsrDat)
/***** Button to fetch and store first click time *****/
Act_FormStart (ActCal1stClkTim);
Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
Act_LinkFormSubmitAnimated (Txt_Calculate,The_ClassFormulB[Gbl.Prefs.Theme]);
Act_LinkFormSubmitAnimated (Txt_Calculate,The_ClassFormBold[Gbl.Prefs.Theme]);
Lay_PutCalculateIconWithText (Txt_Calculate,Txt_Calculate);
Act_FormEnd ();
}
@ -488,7 +488,7 @@ static void Prf_ShowDetailsUserProfile (const struct UsrData *UsrDat)
/***** Button to fetch and store number of clicks *****/
Act_FormStart (ActCalNumClk);
Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
Act_LinkFormSubmitAnimated (Txt_Calculate,The_ClassFormulB[Gbl.Prefs.Theme]);
Act_LinkFormSubmitAnimated (Txt_Calculate,The_ClassFormBold[Gbl.Prefs.Theme]);
Lay_PutCalculateIconWithText (Txt_Calculate,Txt_Calculate);
Act_FormEnd ();
}
@ -527,7 +527,7 @@ static void Prf_ShowDetailsUserProfile (const struct UsrData *UsrDat)
/***** Button to fetch and store number of file views *****/
Act_FormStart (ActCalNumFilVie);
Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
Act_LinkFormSubmitAnimated (Txt_Calculate,The_ClassFormulB[Gbl.Prefs.Theme]);
Act_LinkFormSubmitAnimated (Txt_Calculate,The_ClassFormBold[Gbl.Prefs.Theme]);
Lay_PutCalculateIconWithText (Txt_Calculate,Txt_Calculate);
Act_FormEnd ();
}
@ -566,7 +566,7 @@ static void Prf_ShowDetailsUserProfile (const struct UsrData *UsrDat)
/***** Button to fetch and store number of forum posts *****/
Act_FormStart (ActCalNumForPst);
Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
Act_LinkFormSubmitAnimated (Txt_Calculate,The_ClassFormulB[Gbl.Prefs.Theme]);
Act_LinkFormSubmitAnimated (Txt_Calculate,The_ClassFormBold[Gbl.Prefs.Theme]);
Lay_PutCalculateIconWithText (Txt_Calculate,Txt_Calculate);
Act_FormEnd ();
}
@ -605,7 +605,7 @@ static void Prf_ShowDetailsUserProfile (const struct UsrData *UsrDat)
/***** Button to fetch and store number of messages sent *****/
Act_FormStart (ActCalNumMsgSnt);
Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
Act_LinkFormSubmitAnimated (Txt_Calculate,The_ClassFormulB[Gbl.Prefs.Theme]);
Act_LinkFormSubmitAnimated (Txt_Calculate,The_ClassFormBold[Gbl.Prefs.Theme]);
Lay_PutCalculateIconWithText (Txt_Calculate,Txt_Calculate);
Act_FormEnd ();
}
@ -754,7 +754,7 @@ static unsigned long Prf_GetNumUsrsWithNumClicksPerDay (void)
static void Prf_ShowRanking (unsigned long Rank,unsigned long NumUsrs)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *Txt_of_PART_OF_A_TOTAL;
/***** Part of a total and end container *****/
@ -765,7 +765,7 @@ static void Prf_ShowRanking (unsigned long Rank,unsigned long NumUsrs)
Act_FormStart (ActSeeUseGbl);
Sco_PutParamScope (Sco_SCOPE_SYS);
Par_PutHiddenParamUnsigned ("UseStatType",(unsigned) Sta_USERS_RANKING);
Act_LinkFormSubmit (Gbl.Title,The_ClassFormul[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (Gbl.Title,The_ClassFormRightMiddle[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"#%lu</a>",Rank);
Act_FormEnd ();
}

28
swad_record.c
View File

@ -1284,17 +1284,17 @@ void Rec_ListRecordsTchsCrs (void)
void Rec_ShowLinkToPrintPreviewOfRecords (void)
{
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormBold[The_NUM_THEMES];
extern const char *The_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *Txt_Print;
extern const char *Txt_record_cards_per_page;
unsigned i;
Act_LinkFormSubmit (Txt_Print,The_ClassFormulB[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (Txt_Print,The_ClassFormBold[Gbl.Prefs.Theme]);
Lay_PutIconWithText ("print",Txt_Print,Txt_Print);
fprintf (Gbl.F.Out,"<span class=\"%s\">(</span>"
"<select name=\"RecsPerPag\">",
The_ClassFormul[Gbl.Prefs.Theme]);
The_ClassFormRightMiddle[Gbl.Prefs.Theme]);
for (i = 1;
i <= 10;
@ -1307,7 +1307,7 @@ void Rec_ShowLinkToPrintPreviewOfRecords (void)
}
fprintf (Gbl.F.Out,"</select>"
"<span class=\"%s\"> %s)</span>",
The_ClassFormul[Gbl.Prefs.Theme],Txt_record_cards_per_page);
The_ClassFormRightMiddle[Gbl.Prefs.Theme],Txt_record_cards_per_page);
}
/*****************************************************************************/
@ -1329,7 +1329,7 @@ static void Rec_GetParamRecordsPerPage (void)
static void Rec_WriteFormShowOfficeHours (bool ShowOfficeHours,const char *ListUsrCods)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *Txt_Show_office_hours;
/***** Start form *****/
@ -1353,7 +1353,7 @@ static void Rec_WriteFormShowOfficeHours (bool ShowOfficeHours,const char *ListU
Gbl.Prefs.IconsURL,
Txt_Show_office_hours,
Txt_Show_office_hours,
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassFormRightMiddle[Gbl.Prefs.Theme],
Txt_Show_office_hours);
Act_FormEnd ();
}
@ -1439,7 +1439,7 @@ void Rec_UpdateAndShowOtherCrsRecord (void)
void Rec_ShowCrsRecord (Rec_RecordViewType_t TypeOfView,struct UsrData *UsrDat)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *Txt_You_dont_have_permission_to_perform_this_action;
extern const char *Txt_RECORD_FIELD_VISIBILITY_RECORD[Rec_NUM_TYPES_VISIBILITY];
extern const char *Txt_Save;
@ -1575,7 +1575,7 @@ void Rec_ShowCrsRecord (Rec_RecordViewType_t TypeOfView,struct UsrData *UsrDat)
" text-align:left; vertical-align:top;"
" background-color:%s;\">"
"%s:",
ICanEdit ? The_ClassFormul[Gbl.Prefs.Theme] :
ICanEdit ? The_ClassFormRightMiddle[Gbl.Prefs.Theme] :
"DAT_REC_SMALL",
Col1Width,Gbl.ColorRows[Gbl.RowEvenOdd],
Gbl.CurrentCrs.Records.LstFields.Lst[NumField].Name);
@ -1942,7 +1942,7 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
struct UsrData *UsrDat)
{
extern const char *Usr_StringsSexDB[Usr_NUM_SEXS];
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *Txt_Edit_my_personal_data;
extern const char *Txt_Edit;
extern const char *Txt_View_record_for_this_course;
@ -2063,7 +2063,7 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
struct Department Dpt;
ClassHead = "HEAD_REC";
ClassForm = The_ClassFormul[Gbl.Prefs.Theme];
ClassForm = The_ClassFormRightMiddle[Gbl.Prefs.Theme];
ClassData = "DAT_REC";
switch (TypeOfView)
{
@ -2073,7 +2073,7 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
case Rec_FORM_NEW_RECORD_OTHER_NEW_USR:
case Rec_FORM_MODIFY_RECORD_OTHER_EXISTING_USR:
ClassHead = "HEAD_REC";
ClassForm = The_ClassFormul[Gbl.Prefs.Theme];
ClassForm = The_ClassFormRightMiddle[Gbl.Prefs.Theme];
ClassData = "DAT_REC";
break;
case Rec_MY_COMMON_RECORD_CHECK:
@ -3303,7 +3303,7 @@ static void Rec_PutLinkToChangeMySocialNetworks (void)
void Rec_ShowFormMyInsCtrDpt (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *Txt_Please_fill_in_your_institution;
extern const char *Txt_Please_fill_in_your_centre_and_department;
extern const char *Txt_Institution_centre_and_department;
@ -3316,7 +3316,7 @@ void Rec_ShowFormMyInsCtrDpt (void)
extern const char *Txt_Another_department;
extern const char *Txt_Office;
extern const char *Txt_Phone;
const char *ClassForm = The_ClassFormul[Gbl.Prefs.Theme];
const char *ClassForm = The_ClassFormRightMiddle[Gbl.Prefs.Theme];
unsigned NumCty;
unsigned NumIns;
unsigned NumCtr;

4
swad_role.c
View File

@ -396,12 +396,12 @@ void Rol_GetSelectedRoles (unsigned *Roles)
void Rol_PutAllRolesRegRemUsrsCrs (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormRightMiddle[The_NUM_THEMES];
/***** Students or teachers *****/
fprintf (Gbl.F.Out,"<div style=\"display:inline-block; margin:10px auto;\">"
"<ul class=\"LIST_LEFT %s\">",
The_ClassFormul[Gbl.Prefs.Theme]);
The_ClassFormRightMiddle[Gbl.Prefs.Theme]);
Rol_PutOneRoleRegRemUsrsCrs (Rol_STUDENT,true);
Rol_PutOneRoleRegRemUsrsCrs (Rol_TEACHER,false);
fprintf (Gbl.F.Out,"</ul>"

4
swad_search.c
View File

@ -201,7 +201,7 @@ void Sch_ReqCrsSearch (void)
static void Sch_PutFormToSearchWithWhatToSearchAndScope (Act_Action_t Action,Sco_Scope_t DefaultScope)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *Txt_Scope;
extern const char *Txt_All;
extern const char *Txt_Institutions;
@ -237,7 +237,7 @@ static void Sch_PutFormToSearchWithWhatToSearchAndScope (Act_Action_t Action,Sco
/***** Scope (whole platform, current centre, current degree or current course) *****/
fprintf (Gbl.F.Out,"<div class=\"%s\" style=\"text-align:center;\">"
"%s: ",
The_ClassFormul[Gbl.Prefs.Theme],Txt_Scope);
The_ClassFormRightMiddle[Gbl.Prefs.Theme],Txt_Scope);
Gbl.Scope.Allowed = 1 << Sco_SCOPE_SYS |
1 << Sco_SCOPE_CTY |
1 << Sco_SCOPE_INS |

40
swad_statistic.c
View File

@ -379,11 +379,11 @@ void Sta_RemoveOldEntriesRecentLog (void)
static void Sta_PutFormToRequestAccessesCrs (void)
{
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *The_ClassFormBold[The_NUM_THEMES];
extern const char *Txt_Visits_to_course;
Act_FormStart (ActReqAccCrs);
Act_LinkFormSubmit (Txt_Visits_to_course,The_ClassFormulB[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (Txt_Visits_to_course,The_ClassFormBold[Gbl.Prefs.Theme]);
Lay_PutIconWithText ("stats",Txt_Visits_to_course,Txt_Visits_to_course);
Act_FormEnd ();
}
@ -394,7 +394,7 @@ static void Sta_PutFormToRequestAccessesCrs (void)
void Sta_AskSeeCrsAccesses (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *Txt_distributed_by;
extern const char *Txt_STAT_CLICK_STAT_TYPES[Sta_NUM_TYPES_CLICK_STATS];
extern const char *Txt_results_per_page;
@ -464,7 +464,7 @@ void Sta_AskSeeCrsAccesses (void)
"</td>"
"<td class=\"DAT\""
" style=\"text-align:left; vertical-align:top;\">",
The_ClassFormul[Gbl.Prefs.Theme],Txt_distributed_by);
The_ClassFormRightMiddle[Gbl.Prefs.Theme],Txt_distributed_by);
if ((Gbl.Stat.ClicksStatType < Sta_ACC_CRS_PER_USR ||
Gbl.Stat.ClicksStatType > Sta_ACC_CRS_PER_ACTION) &&
Gbl.Stat.ClicksStatType != Sta_ACC_CRS_LISTING)
@ -487,7 +487,7 @@ void Sta_AskSeeCrsAccesses (void)
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"2\" class=\"%s\">"
"<input type=\"radio\" name=\"ClickStatType\" value=\"%u\"",
The_ClassFormul[Gbl.Prefs.Theme],(unsigned) Sta_ACC_CRS_LISTING);
The_ClassFormRightMiddle[Gbl.Prefs.Theme],(unsigned) Sta_ACC_CRS_LISTING);
if (Gbl.Stat.ClicksStatType == Sta_ACC_CRS_LISTING)
fprintf (Gbl.F.Out," checked=\"checked\"");
fprintf (Gbl.F.Out," onclick=\"enableRowsPage()\" />%s",
@ -541,7 +541,7 @@ void Sta_AskSeeCrsAccesses (void)
void Sta_AskSeeGblAccesses (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *Txt_Users;
extern const char *Txt_ROLE_STATS[Sta_NUM_ROLES_STAT];
extern const char *Txt_Scope;
@ -575,7 +575,7 @@ void Sta_AskSeeGblAccesses (void)
"</td>"
"<td style=\"text-align:left; vertical-align:middle;\">"
"<select name=\"Role\">",
The_ClassFormul[Gbl.Prefs.Theme],Txt_Users);
The_ClassFormRightMiddle[Gbl.Prefs.Theme],Txt_Users);
for (RoleStat = (Sta_Role_t) 0;
RoleStat < Sta_NUM_ROLES_STAT;
RoleStat++)
@ -598,7 +598,7 @@ void Sta_AskSeeGblAccesses (void)
"%s:"
"</td>"
"<td style=\"text-align:left; vertical-align:middle;\">",
The_ClassFormul[Gbl.Prefs.Theme],Txt_Scope);
The_ClassFormRightMiddle[Gbl.Prefs.Theme],Txt_Scope);
Gbl.Scope.Allowed = 1 << Sco_SCOPE_SYS |
1 << Sco_SCOPE_CTY |
1 << Sco_SCOPE_INS |
@ -621,7 +621,7 @@ void Sta_AskSeeGblAccesses (void)
"</td>"
"<td class=\"DAT\""
" style=\"text-align:left; vertical-align:top;\">",
The_ClassFormul[Gbl.Prefs.Theme],Txt_distributed_by);
The_ClassFormRightMiddle[Gbl.Prefs.Theme],Txt_distributed_by);
if (Gbl.Stat.ClicksStatType < Sta_ACC_GBL_PER_DAYS ||
Gbl.Stat.ClicksStatType > Sta_ACC_GBL_PER_COURSE)
Gbl.Stat.ClicksStatType = Sta_ACC_GBL_PER_DAYS;
@ -653,7 +653,7 @@ void Sta_AskSeeGblAccesses (void)
static void Sta_WriteSelectorCountType (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *Txt_Show;
extern const char *Txt_STAT_TYPE_COUNT_SMALL[Sta_NUM_STAT_COUNT_TYPES];
Sta_CountType_t StatCountType;
@ -665,7 +665,7 @@ static void Sta_WriteSelectorCountType (void)
"</td>"
"<td style=\"text-align:left; vertical-align:top;\">"
"<select name=\"CountType\" id=\"CountType\">",
The_ClassFormul[Gbl.Prefs.Theme],Txt_Show);
The_ClassFormRightMiddle[Gbl.Prefs.Theme],Txt_Show);
for (StatCountType = (Sta_CountType_t) 0;
StatCountType < Sta_NUM_STAT_COUNT_TYPES;
StatCountType++)
@ -686,7 +686,7 @@ static void Sta_WriteSelectorCountType (void)
static void Sta_WriteSelectorAction (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *Txt_Action;
extern const char *Txt_TABS_SHORT_TXT[Tab_NUM_TABS];
Act_Action_t NumAction;
@ -698,7 +698,7 @@ static void Sta_WriteSelectorAction (void)
"</td>"
"<td style=\"text-align:left; vertical-align:top;\">"
"<select name=\"StatAct\" id=\"StatAct\" style=\"width:300px;\">",
The_ClassFormul[Gbl.Prefs.Theme],Txt_Action);
The_ClassFormRightMiddle[Gbl.Prefs.Theme],Txt_Action);
for (NumAction = (Act_Action_t) 0;
NumAction < Act_NUM_ACTIONS;
NumAction++)
@ -2011,7 +2011,7 @@ static void Sta_ShowNumAccessesPerDays (unsigned long NumRows,MYSQL_RES *mysql_r
static void Sta_ShowDistrAccessesPerDaysAndHour (unsigned long NumRows,MYSQL_RES *mysql_res)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormRightMiddle[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;
@ -2034,7 +2034,7 @@ static void Sta_ShowDistrAccessesPerDaysAndHour (unsigned long NumRows,MYSQL_RES
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"26\" class=\"%s\""
" style=\"text-align:center;\">",
The_ClassFormul[Gbl.Prefs.Theme]);
The_ClassFormRightMiddle[Gbl.Prefs.Theme]);
Act_FormStart (Gbl.CurrentAct);
Sta_WriteParamsDatesSeeAccesses ();
@ -3594,7 +3594,7 @@ static void Sta_WriteSelectedRangeOfDates (unsigned NumDays)
void Sta_ReqUseOfPlatform (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *Txt_Scope;
extern const char *Txt_Statistic;
extern const char *Txt_STAT_USE_STAT_TYPES[Sta_NUM_TYPES_USE_STATS];
@ -3609,7 +3609,7 @@ void Sta_ReqUseOfPlatform (void)
/***** Compute stats for anywhere, degree or course? *****/
fprintf (Gbl.F.Out,"<div class=\"%s\" style=\"text-align:center;\">"
"%s: ",
The_ClassFormul[Gbl.Prefs.Theme],Txt_Scope);
The_ClassFormRightMiddle[Gbl.Prefs.Theme],Txt_Scope);
Gbl.Scope.Allowed = 1 << Sco_SCOPE_SYS |
1 << Sco_SCOPE_CTY |
1 << Sco_SCOPE_INS |
@ -4803,7 +4803,7 @@ static void Sta_GetAndShowInssOrderedByNumUsrsWhoClaimToBelongToThem (void)
static void Sta_GetAndShowInss (const char *Query,const char *TxtFigure)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *Txt_Institution;
MYSQL_RES *mysql_res;
MYSQL_ROW row;
@ -4856,12 +4856,12 @@ static void Sta_GetAndShowInss (const char *Query,const char *TxtFigure)
/***** Write link to institution *****/
fprintf (Gbl.F.Out,"<td class=\"%s\" style=\"text-align:left;\">",
The_ClassFormul[Gbl.Prefs.Theme]);
The_ClassFormRightMiddle[Gbl.Prefs.Theme]);
/* Icon and name of this institution */
Act_FormStart (ActSeeInsInf);
Ins_PutParamInsCod (Ins.InsCod);
Act_LinkFormSubmit (Ins.ShortName,The_ClassFormul[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (Ins.ShortName,The_ClassFormRightMiddle[Gbl.Prefs.Theme]);
Log_DrawLogo (Sco_SCOPE_INS,Ins.InsCod,Ins.ShortName,
32,NULL,true);
fprintf (Gbl.F.Out,"&nbsp;%s</a>",Ins.FullName);

30
swad_survey.c
View File

@ -1492,7 +1492,7 @@ static bool Svy_CheckIfSimilarSurveyExists (struct Survey *Svy)
void Svy_RequestCreatOrEditSvy (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *Txt_New_survey;
extern const char *Txt_Scope;
extern const char *Txt_Edit_survey;
@ -1590,7 +1590,7 @@ void Svy_RequestCreatOrEditSvy (void)
"%s:"
"</td>"
"<td style=\"text-align:left; vertical-align:middle;\">",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassFormRightMiddle[Gbl.Prefs.Theme],
Txt_Scope);
if (!Svy_SetDefaultAndAllowedForEdition ())
Lay_ShowErrorAndExit ("You don't have permission to edit surveys here.");
@ -1608,7 +1608,7 @@ void Svy_RequestCreatOrEditSvy (void)
"<input type=\"text\" name=\"Title\" size=\"45\" maxlength=\"%u\" value=\"%s\" />"
"</td>"
"</tr>",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassFormRightMiddle[Gbl.Prefs.Theme],
Txt_Title,
Svy_MAX_LENGTH_SURVEY_TITLE,Svy.Title);
@ -1625,7 +1625,7 @@ void Svy_RequestCreatOrEditSvy (void)
"<table class=\"CELLS_PAD_2\">"
"<tr>"
"<td style=\"text-align:left;\">",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassFormRightMiddle[Gbl.Prefs.Theme],
Dates[StartOrEndTime]);
Dat_WriteFormDate (Gbl.Now.Date.Year-1,
Gbl.Now.Date.Year+1,
@ -1654,7 +1654,7 @@ void Svy_RequestCreatOrEditSvy (void)
"</td>"
"<td style=\"text-align:left; vertical-align:top;\">"
"<textarea name=\"Txt\" cols=\"60\" rows=\"10\">",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassFormRightMiddle[Gbl.Prefs.Theme],
Txt_Description);
if (!ItsANewSurvey)
fprintf (Gbl.F.Out,"%s",Txt);
@ -1669,7 +1669,7 @@ void Svy_RequestCreatOrEditSvy (void)
"</td>"
"<td class=\"DAT\""
" style=\"text-align:left; vertical-align:middle;\">",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassFormRightMiddle[Gbl.Prefs.Theme],
Txt_Users);
Rol_WriteSelectorRoles (Svy.Roles);
fprintf (Gbl.F.Out,"</td>"
@ -1740,7 +1740,7 @@ static bool Svy_SetDefaultAndAllowedForEdition (void)
static void Svy_ShowLstGrpsToEditSurvey (long SvyCod)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *Txt_Groups;
extern const char *Txt_The_whole_course;
unsigned NumGrpTyp;
@ -1756,7 +1756,7 @@ static void Svy_ShowLstGrpsToEditSurvey (long SvyCod)
"%s:"
"</td>"
"<td style=\"text-align:left; vertical-align:top;\">",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassFormRightMiddle[Gbl.Prefs.Theme],
Txt_Groups);
Lay_StartRoundFrameTable ("95%",0,NULL);
@ -2362,7 +2362,7 @@ void Svy_RequestEditQuestion (void)
static void Svy_ShowFormEditOneQst (long SvyCod,struct SurveyQuestion *SvyQst,char *Txt)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *Txt_Question;
extern const char *Txt_New_question;
extern const char *Txt_Stem;
@ -2451,7 +2451,7 @@ static void Svy_ShowFormEditOneQst (long SvyCod,struct SurveyQuestion *SvyQst,ch
"</textarea>"
"</td>"
"</tr>",
The_ClassFormul[Gbl.Prefs.Theme],Txt_Stem,
The_ClassFormRightMiddle[Gbl.Prefs.Theme],Txt_Stem,
Txt);
/***** Type of answer *****/
@ -2459,11 +2459,11 @@ static void Svy_ShowFormEditOneQst (long SvyCod,struct SurveyQuestion *SvyQst,ch
"<td class=\"%s\" style=\"vertical-align:top;\">"
"%s:"
"</td>",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassFormRightMiddle[Gbl.Prefs.Theme],
Txt_Type);
fprintf (Gbl.F.Out,"<td class=\"%s\" style=\"text-align:left;"
" vertical-align:top;\">",
The_ClassFormul[Gbl.Prefs.Theme]);
The_ClassFormRightMiddle[Gbl.Prefs.Theme]);
for (AnsType = (Svy_AnswerType_t) 0;
AnsType < Svy_NUM_ANS_TYPES;
AnsType++)
@ -2493,7 +2493,7 @@ static void Svy_ShowFormEditOneQst (long SvyCod,struct SurveyQuestion *SvyQst,ch
"<td class=\"%s\" style=\"vertical-align:top;\">"
"%u)"
"</td>",
The_ClassFormul[Gbl.Prefs.Theme],NumAns+1);
The_ClassFormRightMiddle[Gbl.Prefs.Theme],NumAns+1);
/* Answer text */
fprintf (Gbl.F.Out,"<td style=\"text-align:right; vertical-align:top;\">"
@ -2918,7 +2918,7 @@ static unsigned Svy_GetNextQuestionIndexInSvy (long SvyCod)
static void Svy_ListSvyQuestions (struct Survey *Svy,struct SurveyQuestion *SvyQst)
{
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *The_ClassFormBold[The_NUM_THEMES];
extern const char *Txt_Questions;
extern const char *Txt_No_INDEX;
extern const char *Txt_Type;
@ -3077,7 +3077,7 @@ static void Svy_ListSvyQuestions (struct Survey *Svy,struct SurveyQuestion *SvyQ
Svy_PutHiddenParamSvyOrderType ();
Grp_PutParamWhichGrps ();
Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage);
Act_LinkFormSubmit (Txt_New_question,The_ClassFormulB[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (Txt_New_question,The_ClassFormBold[Gbl.Prefs.Theme]);
Lay_PutIconWithText ("new",Txt_New_question,Txt_New_question);
Act_FormEnd ();
fprintf (Gbl.F.Out,"</td>"

58
swad_test.c
View File

@ -241,7 +241,7 @@ static void Tst_GetExamQuestionsFromDB (long TstCod);
void Tst_ShowFormAskTst (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *Txt_No_of_questions;
extern const char *Txt_Generate_exam;
extern const char *Txt_No_test_questions_in_X;
@ -284,7 +284,7 @@ void Tst_ShowFormAskTst (void)
"%s:&nbsp;"
"</label>"
"<input type=\"text\" name=\"NumQst\" size=\"3\" maxlength=\"3\" value=\"%u\"",
The_ClassFormul[Gbl.Prefs.Theme],Txt_No_of_questions,
The_ClassFormRightMiddle[Gbl.Prefs.Theme],Txt_No_of_questions,
Gbl.Test.Config.Def);
if (Gbl.Test.Config.Min == Gbl.Test.Config.Max)
fprintf (Gbl.F.Out," disabled=\"disabled\"");
@ -349,7 +349,7 @@ static void Tst_PutFormToConfigure (void)
void Tst_ShowNewTestExam (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *Txt_No_questions_found_matching_your_search_criteria;
extern const char *Txt_Allow_teachers_to_consult_this_exam;
extern const char *Txt_Done_assess_exam;
@ -397,7 +397,7 @@ void Tst_ShowNewTestExam (void)
/* Exam will be saved? */
fprintf (Gbl.F.Out,"<div class=\"%s\" style=\"text-align:center;\">"
"<input type=\"checkbox\" name=\"Save\" value=\"Y\"",
The_ClassFormul[Gbl.Prefs.Theme]);
The_ClassFormRightMiddle[Gbl.Prefs.Theme]);
if (Gbl.Test.AllowTeachers)
fprintf (Gbl.F.Out," checked=\"checked\"");
fprintf (Gbl.F.Out," />%s"
@ -1147,12 +1147,12 @@ void Tst_ShowFormAskEditTsts (void)
static void Tst_PutFormToCreateNewTstQst (void)
{
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *The_ClassFormBold[The_NUM_THEMES];
extern const char *Txt_New_question;
/***** Put form to create a new test question *****/
Act_FormStart (ActEdiOneTstQst);
Act_LinkFormSubmit (Txt_New_question,The_ClassFormulB[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (Txt_New_question,The_ClassFormBold[Gbl.Prefs.Theme]);
Lay_PutIconWithText ("new",Txt_New_question,Txt_New_question);
Act_FormEnd ();
}
@ -1378,7 +1378,7 @@ static unsigned long Tst_GetEnabledTagsFromThisCrs (MYSQL_RES **mysql_res)
static void Tst_ShowFormSelTags (unsigned long NumRows,MYSQL_RES *mysql_res,bool ShowOnlyEnabledTags)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *Txt_Tags;
extern const char *Txt_All_tags;
extern const char *Txt_Tag_not_allowed;
@ -1398,7 +1398,7 @@ static void Tst_ShowFormSelTags (unsigned long NumRows,MYSQL_RES *mysql_res,bool
fprintf (Gbl.F.Out,"<td></td>");
fprintf (Gbl.F.Out,"<td class=\"%s\" style=\"text-align:left;\">"
"<input type=\"checkbox\" name=\"AllTags\" value=\"Y\"",
The_ClassFormul[Gbl.Prefs.Theme]);
The_ClassFormRightMiddle[Gbl.Prefs.Theme]);
if (Gbl.Test.AllTags)
fprintf (Gbl.F.Out," checked=\"checked\"");
fprintf (Gbl.F.Out," onclick=\"togglecheckChildren(this,'ChkTag')\" />"
@ -1569,7 +1569,7 @@ static void Tst_PutIconDisable (long TagCod,const char *TagTxt)
static void Tst_ShowFormConfigTst (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *Txt_Configure_tests;
extern const char *Txt_Plugins;
extern const char *Txt_TST_PLUGGABLE[Tst_NUM_OPTIONS_PLUGGABLE];
@ -1597,7 +1597,7 @@ static void Tst_ShowFormConfigTst (void)
"%s:"
"</td>"
"<td style=\"text-align:left;\">",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassFormRightMiddle[Gbl.Prefs.Theme],
Txt_Plugins);
for (Pluggable = Tst_PLUGGABLE_NO;
Pluggable <= Tst_PLUGGABLE_YES;
@ -1620,7 +1620,7 @@ static void Tst_ShowFormConfigTst (void)
"</td>"
"<td style=\"text-align:left;\">"
"<table style=\"border-spacing:2px;\">",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassFormRightMiddle[Gbl.Prefs.Theme],
Txt_No_of_questions);
/* Minimum number of questions in a test exam */
@ -1668,7 +1668,7 @@ static void Tst_ShowFormConfigTst (void)
"<input type=\"text\" name=\"MinTimeNxtTstPerQst\" size=\"7\" maxlength=\"7\" value=\"%lu\" />"
"</td>"
"</tr>",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassFormRightMiddle[Gbl.Prefs.Theme],
Txt_Minimum_time_seconds_per_question_between_two_tests,
Gbl.Test.Config.MinTimeNxtTstPerQst);
@ -1678,7 +1678,7 @@ static void Tst_ShowFormConfigTst (void)
"%s:"
"</td>"
"<td style=\"text-align:left;\">",
The_ClassFormul[Gbl.Prefs.Theme],Txt_Feedback_to_students);
The_ClassFormRightMiddle[Gbl.Prefs.Theme],Txt_Feedback_to_students);
for (FeedbTyp = (Tst_Feedback_t) 0;
FeedbTyp < Tst_NUM_TYPES_FEEDBACK;
FeedbTyp++)
@ -1988,7 +1988,7 @@ static void Tst_CheckAndCorrectNumbersQst (void)
static void Tst_ShowFormAnswerTypes (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormRightMiddle[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];
@ -2003,7 +2003,7 @@ static void Tst_ShowFormAnswerTypes (void)
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"text-align:left;\">"
"<input type=\"checkbox\" name=\"AllAnsTypes\" value=\"Y\"",
The_ClassFormul[Gbl.Prefs.Theme]);
The_ClassFormRightMiddle[Gbl.Prefs.Theme]);
if (Gbl.Test.AllAnsTypes)
fprintf (Gbl.F.Out," checked=\"checked\"");
fprintf (Gbl.F.Out," onclick=\"togglecheckChildren(this,'AnswerType')\" />"
@ -4078,7 +4078,7 @@ void Tst_ShowFormEditOneQst (void)
static void Tst_PutFormEditOneQst (char *Stem,char *Feedback)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *Txt_Question_code_X;
extern const char *Txt_New_question;
extern const char *Txt_Tags;
@ -4243,7 +4243,7 @@ static void Tst_PutFormEditOneQst (char *Stem,char *Feedback)
"</td>"
"<td style=\"text-align:left; vertical-align:top;\">"
"<table>",
The_ClassFormul[Gbl.Prefs.Theme],Txt_Tags);
The_ClassFormRightMiddle[Gbl.Prefs.Theme],Txt_Tags);
for (NumTag = 0;
NumTag < Tst_MAX_TAGS_PER_QUESTION;
NumTag++)
@ -4308,7 +4308,7 @@ static void Tst_PutFormEditOneQst (char *Stem,char *Feedback)
"</textarea>"
"</td>"
"</tr>",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassFormRightMiddle[Gbl.Prefs.Theme],
Txt_Stem,
Stem);
@ -4319,7 +4319,7 @@ static void Tst_PutFormEditOneQst (char *Stem,char *Feedback)
"</td>"
"<td style=\"text-align:left; vertical-align:top;\">"
"<textarea name=\"Feedback\" cols=\"70\" rows=\"8\">",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassFormRightMiddle[Gbl.Prefs.Theme],
Txt_Feedback);
if (Feedback)
if (Feedback[0])
@ -4335,9 +4335,9 @@ static void Tst_PutFormEditOneQst (char *Stem,char *Feedback)
"</td>"
"<td class=\"%s\" style=\"text-align:left;"
" vertical-align:top;\">",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassFormRightMiddle[Gbl.Prefs.Theme],
Txt_Type,
The_ClassFormul[Gbl.Prefs.Theme]);
The_ClassFormRightMiddle[Gbl.Prefs.Theme]);
for (AnsType = (Tst_AnswerType_t) 0;
AnsType < Tst_NUM_ANS_TYPES;
AnsType++)
@ -4362,8 +4362,8 @@ static void Tst_PutFormEditOneQst (char *Stem,char *Feedback)
" vertical-align:top;\">"
"%s: "
"<input type=\"text\" name=\"AnsInt\" size=\"11\" maxlength=\"11\" value=\"%ld\"",
The_ClassFormul[Gbl.Prefs.Theme],Txt_Answers,
The_ClassFormul[Gbl.Prefs.Theme],Txt_Integer_number,
The_ClassFormRightMiddle[Gbl.Prefs.Theme],Txt_Answers,
The_ClassFormRightMiddle[Gbl.Prefs.Theme],Txt_Integer_number,
Gbl.Test.Answer.Integer);
if (Gbl.Test.AnswerType != Tst_ANS_INT)
fprintf (Gbl.F.Out," disabled=\"disabled\"");
@ -4377,7 +4377,7 @@ static void Tst_PutFormEditOneQst (char *Stem,char *Feedback)
" vertical-align:top;\">"
"%s "
"<input type=\"text\" name=\"AnsFloatMin\" size=\"11\" maxlength=\"%u\" value=\"%lg\"",
The_ClassFormul[Gbl.Prefs.Theme],Txt_Real_number_between_A_and_B_1,
The_ClassFormRightMiddle[Gbl.Prefs.Theme],Txt_Real_number_between_A_and_B_1,
Tst_MAX_BYTES_FLOAT_ANSWER,Gbl.Test.Answer.FloatingPoint[0]);
if (Gbl.Test.AnswerType != Tst_ANS_FLOAT)
fprintf (Gbl.F.Out," disabled=\"disabled\"");
@ -4398,7 +4398,7 @@ static void Tst_PutFormEditOneQst (char *Stem,char *Feedback)
"<td class=\"%s\" style=\"text-align:left;"
" vertical-align:top;\">"
"<input type=\"radio\" name=\"AnsTF\" value=\"T\"",
The_ClassFormul[Gbl.Prefs.Theme]);
The_ClassFormRightMiddle[Gbl.Prefs.Theme]);
if (Gbl.Test.Answer.TF == 'T')
fprintf (Gbl.F.Out," checked=\"checked\"");
if (Gbl.Test.AnswerType != Tst_ANS_TRUE_FALSE)
@ -4422,7 +4422,7 @@ static void Tst_PutFormEditOneQst (char *Stem,char *Feedback)
"<td class=\"%s\" style=\"text-align:left;"
" vertical-align:top;\">"
"<input type=\"checkbox\" name=\"Shuffle\" value=\"Y\"",
The_ClassFormul[Gbl.Prefs.Theme]);
The_ClassFormRightMiddle[Gbl.Prefs.Theme]);
if (Shuffle)
fprintf (Gbl.F.Out," checked=\"checked\"");
if (Gbl.Test.AnswerType != Tst_ANS_UNIQUE_CHOICE &&
@ -4446,8 +4446,8 @@ static void Tst_PutFormEditOneQst (char *Stem,char *Feedback)
"%s"
"</td>"
"</tr>",
The_ClassFormul[Gbl.Prefs.Theme],Txt_Answer,
The_ClassFormul[Gbl.Prefs.Theme],Txt_Feedback);
The_ClassFormRightMiddle[Gbl.Prefs.Theme],Txt_Answer,
The_ClassFormRightMiddle[Gbl.Prefs.Theme],Txt_Feedback);
OptionsDisabled = Gbl.Test.AnswerType != Tst_ANS_UNIQUE_CHOICE &&
Gbl.Test.AnswerType != Tst_ANS_MULTIPLE_CHOICE &&
Gbl.Test.AnswerType != Tst_ANS_TEXT;
@ -4460,7 +4460,7 @@ static void Tst_PutFormEditOneQst (char *Stem,char *Feedback)
"<td class=\"%s\" style=\"text-align:left;"
" vertical-align:top;\">"
"<input type=\"radio\" name=\"AnsUni\" value=\"%u\"",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassFormRightMiddle[Gbl.Prefs.Theme],
NumOpt);
if (Gbl.Test.AnswerType != Tst_ANS_UNIQUE_CHOICE)
fprintf (Gbl.F.Out," disabled=\"disabled\"");

16
swad_test_import.c
View File

@ -81,7 +81,7 @@ static void TsI_WriteRowImportedQst (struct XMLElement *StemElem,
void TsI_PutFormToExportQuestions (void)
{
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *The_ClassFormBold[The_NUM_THEMES];
extern const char *Txt_Export_questions_to_XML_file;
extern const char *Txt_Export_questions;
@ -96,7 +96,7 @@ void TsI_PutFormToExportQuestions (void)
Par_PutHiddenParamChar ("CreateXML",'Y');
/***** Put a link to create a file with questions *****/
Act_LinkFormSubmit (Txt_Export_questions_to_XML_file,The_ClassFormulB[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (Txt_Export_questions_to_XML_file,The_ClassFormBold[Gbl.Prefs.Theme]);
Lay_PutIconWithText ("export",Txt_Export_questions_to_XML_file,Txt_Export_questions);
Act_FormEnd ();
}
@ -107,7 +107,7 @@ void TsI_PutFormToExportQuestions (void)
void TsI_PutFormToImportQuestions (void)
{
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *The_ClassFormBold[The_NUM_THEMES];
extern const char *Txt_Import_questions_from_XML_file;
extern const char *Txt_Import_questions;
@ -115,7 +115,7 @@ void TsI_PutFormToImportQuestions (void)
Act_FormStart (ActReqImpTstQst);
/***** Put a link to create a file with questions *****/
Act_LinkFormSubmit (Txt_Import_questions_from_XML_file,The_ClassFormulB[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (Txt_Import_questions_from_XML_file,The_ClassFormBold[Gbl.Prefs.Theme]);
Lay_PutIconWithText ("import",Txt_Import_questions_from_XML_file,Txt_Import_questions);
Act_FormEnd ();
}
@ -126,7 +126,7 @@ void TsI_PutFormToImportQuestions (void)
void TsI_ShowFormImportQstsFromXML (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *Txt_You_need_an_XML_file_containing_a_list_of_questions_to_import;
extern const char *Txt_Upload_file;
extern const char *Txt_XML_file;
@ -149,7 +149,7 @@ void TsI_ShowFormImportQstsFromXML (void)
"</tr>"
"<tr>"
"<td colspan=\"2\" style=\"text-align:center;\">",
The_ClassFormul[Gbl.Prefs.Theme],
The_ClassFormRightMiddle[Gbl.Prefs.Theme],
Txt_XML_file,
Fil_NAME_OF_PARAM_FILENAME_ORG);
Lay_PutCreateButton (Txt_Upload_file);
@ -166,7 +166,7 @@ void TsI_ShowFormImportQstsFromXML (void)
void TsI_CreateXML (unsigned long NumRows,MYSQL_RES *mysql_res)
{
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *The_ClassFormBold[The_NUM_THEMES];
extern const char *Tst_StrAnswerTypesXML[Tst_NUM_ANS_TYPES];
extern const char *Txt_NEW_LINE;
extern const char *Txt_XML_file;
@ -263,7 +263,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_HTTPS_URL_SWAD_PUBLIC,Cfg_FOLDER_FILE_BROWSER_TMP,
Gbl.FileBrowser.TmpPubDir,
The_ClassFormulB[Gbl.Prefs.Theme]);
The_ClassFormBold[Gbl.Prefs.Theme]);
Lay_PutIconWithText ("file",Txt_XML_file,Txt_XML_file);
}

22
swad_theme.c
View File

@ -200,23 +200,35 @@ const char *The_ClassTitle[The_NUM_THEMES] =
"YELLOW_TITLE",
};
const char *The_ClassFormul[The_NUM_THEMES] =
const char *The_ClassForm[The_NUM_THEMES] =
{
"WHITE_FORM",
"GREY_FORM",
"BLUE_FORM",
"YELLOW_FORM",
};
const char *The_ClassFormulNB[The_NUM_THEMES] =
const char *The_ClassFormRightMiddle[The_NUM_THEMES] =
{
"WHITE_FORM RIGHT_MIDDLE",
"GREY_FORM RIGHT_MIDDLE",
"BLUE_FORM RIGHT_MIDDLE",
"YELLOW_FORM RIGHT_MIDDLE",
};
const char *The_ClassFormRightTop[The_NUM_THEMES] =
{
"WHITE_FORM RIGHT_TOP",
"GREY_FORM RIGHT_TOP",
"BLUE_FORM RIGHT_TOP",
"YELLOW_FORM RIGHT_TOP",
};
const char *The_ClassFormNoWrap[The_NUM_THEMES] =
{
"WHITE_FORM_NOWRAP",
"GREY_FORM_NOWRAP",
"BLUE_FORM_NOWRAP",
"YELLOW_FORM_NOWRAP",
};
const char *The_ClassFormulB[The_NUM_THEMES] =
const char *The_ClassFormBold[The_NUM_THEMES] =
{
"WHITE_FORM_BOLD",
"GREY_FORM_BOLD",

36
swad_user.c
View File

@ -1339,7 +1339,7 @@ void Usr_Logout (void)
void Usr_WriteFormLogin (void)
{
extern const char *The_ClassFormulB[The_NUM_THEMES];
extern const char *The_ClassFormBold[The_NUM_THEMES];
extern const char *Txt_New_on_PLATFORM_Sign_up;
extern const char *Txt_Enter_from_X;
extern const char *Txt_Log_in;
@ -1361,7 +1361,7 @@ void Usr_WriteFormLogin (void)
{
fprintf (Gbl.F.Out,"<a href=\"%s\" class=\"%s\">",
Cfg_EXTERNAL_LOGIN_URL,
The_ClassFormulB[Gbl.Prefs.Theme]);
The_ClassFormBold[Gbl.Prefs.Theme]);
sprintf (Gbl.Title,Txt_Enter_from_X,
Cfg_EXTERNAL_LOGIN_SERVICE_SHORT_NAME);
Lay_PutIconWithText ("login",Gbl.Title,Gbl.Title);
@ -2468,7 +2468,7 @@ void Usr_WarningWhenDegreeTypeDoesntAllowDirectLogin (void)
void Usr_ShowFormsLogoutAndRole (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *Txt_Log_out;
extern const char *Txt_You_are_LOGGED_as_X;
extern const char *Txt_logged[Usr_NUM_SEXS];
@ -2491,7 +2491,7 @@ void Usr_ShowFormsLogoutAndRole (void)
{
fprintf (Gbl.F.Out,"<div class=\"%s\" style=\"text-align:center;\">"
"%s: ",
The_ClassFormul[Gbl.Prefs.Theme],Txt_Role);
The_ClassFormRightMiddle[Gbl.Prefs.Theme],Txt_Role);
Rol_PutFormToChangeMyRole (false);
fprintf (Gbl.F.Out,"</div>");
}
@ -4789,7 +4789,7 @@ void Usr_ShowFormsToSelectUsrListType (Act_Action_t NextAction)
static void Usr_FormToSelectUsrListType (Act_Action_t NextAction,Usr_ShowUsrsType_t ListType)
{
extern const char *The_ClassFormulNB[The_NUM_THEMES];
extern const char *The_ClassFormNoWrap[The_NUM_THEMES];
extern const char *Txt_USR_LIST_TYPES[Usr_NUM_USR_LIST_TYPES];
Act_FormStart (NextAction);
@ -4797,7 +4797,7 @@ static void Usr_FormToSelectUsrListType (Act_Action_t NextAction,Usr_ShowUsrsTyp
Usr_PutParamListWithPhotos ();
Usr_PutParamUsrListType (ListType);
Usr_PutExtraParamsUsrList (NextAction);
Act_LinkFormSubmit (Txt_USR_LIST_TYPES[ListType],The_ClassFormulNB[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (Txt_USR_LIST_TYPES[ListType],The_ClassFormNoWrap[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"<img src=\"%s/%s16x16.gif\""
" alt=\"%s\" title=\"%s\""
" class=\"ICON16x16\" />"
@ -4974,7 +4974,7 @@ void Usr_PutCheckboxToSelectUser (Rol_Role_t Role,const char *EncryptedUsrCod,bo
void Usr_PutCheckboxListWithPhotos (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *Txt_Display_photos;
Par_PutHiddenParamChar ("WithPhotosExists",'Y');
@ -4986,7 +4986,7 @@ void Usr_PutCheckboxListWithPhotos (void)
fprintf (Gbl.F.Out," onclick=\"javascript:document.getElementById('%s').submit();\" />"
"<span class=\"%s\">%s</span>",
Gbl.FormId,
The_ClassFormul[Gbl.Prefs.Theme],Txt_Display_photos);
The_ClassFormRightMiddle[Gbl.Prefs.Theme],Txt_Display_photos);
}
/*****************************************************************************/
@ -5856,7 +5856,7 @@ unsigned Usr_ListUsrsFound (Rol_Role_t Role,const char *UsrQuery)
void Usr_ListDataAdms (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS];
extern const char *Txt_No_INDEX;
extern const char *Txt_Photo;
@ -5901,7 +5901,7 @@ void Usr_ListDataAdms (void)
/***** Form to select range of administrators *****/
fprintf (Gbl.F.Out,"<div class=\"%s\" style=\"text-align:center;\">"
"%s: ",
The_ClassFormul[Gbl.Prefs.Theme],Txt_Scope);
The_ClassFormRightMiddle[Gbl.Prefs.Theme],Txt_Scope);
Act_FormStart (ActLstAdm);
Sco_PutSelectorScope (true);
Usr_PutParamListWithPhotos ();
@ -6307,7 +6307,7 @@ static void Usr_UpdateMyPrefAboutListWithPhotosPhotoInDB (void)
void Usr_SeeGuests (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *Txt_Scope;
extern const char *Txt_Print;
extern const char *Txt_Show_all_data;
@ -6330,7 +6330,7 @@ void Usr_SeeGuests (void)
case Rol_SYS_ADM:
/***** Form to select range of guests *****/
fprintf (Gbl.F.Out,"<div class=\"%s\" style=\"text-align:center;\">",
The_ClassFormul[Gbl.Prefs.Theme]);
The_ClassFormRightMiddle[Gbl.Prefs.Theme]);
Act_FormStart (ActLstInv);
Usr_PutParamUsrListType (Gbl.Usrs.Me.ListType);
Usr_PutParamColsClassPhoto ();
@ -6444,7 +6444,7 @@ static void Usr_PutLinkToShowTchsAllDataParams (void)
void Usr_SeeStudents (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *Txt_Scope;
extern const char *Txt_Print;
extern const char *Txt_Show_all_data;
@ -6487,7 +6487,7 @@ void Usr_SeeStudents (void)
case Rol_SYS_ADM:
/***** Form to select range of students *****/
fprintf (Gbl.F.Out,"<div class=\"%s\" style=\"text-align:center;\">",
The_ClassFormul[Gbl.Prefs.Theme]);
The_ClassFormRightMiddle[Gbl.Prefs.Theme]);
Act_FormStart (ActLstStd);
Usr_PutParamUsrListType (Gbl.Usrs.Me.ListType);
Usr_PutParamColsClassPhoto ();
@ -6606,7 +6606,7 @@ void Usr_SeeStudents (void)
void Usr_SeeTeachers (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *Txt_Scope;
extern const char *Txt_Print;
extern const char *Txt_Show_all_data;
@ -6633,7 +6633,7 @@ void Usr_SeeTeachers (void)
/***** Form to select scope *****/
fprintf (Gbl.F.Out,"<div class=\"%s\" style=\"text-align:center;\">",
The_ClassFormul[Gbl.Prefs.Theme]);
The_ClassFormRightMiddle[Gbl.Prefs.Theme]);
Act_FormStart (ActLstTch);
Usr_PutParamUsrListType (Gbl.Usrs.Me.ListType);
Usr_PutParamColsClassPhoto ();
@ -7063,7 +7063,7 @@ static void Usr_DrawClassPhoto (Usr_ClassPhotoType_t ClassPhotoType,
void Usr_PutSelectorNumColsClassPhoto (void)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *Txt_columns;
unsigned Cols;
@ -7086,7 +7086,7 @@ void Usr_PutSelectorNumColsClassPhoto (void)
/***** End selector *****/
fprintf (Gbl.F.Out,"</select>"
"<span class=\"%s\">%s</span>",
The_ClassFormul[Gbl.Prefs.Theme],Txt_columns);
The_ClassFormRightMiddle[Gbl.Prefs.Theme],Txt_columns);
}
/*****************************************************************************/

10
swad_zip.c
View File

@ -307,7 +307,7 @@ void ZIP_CreateDirCompressionUsr (struct UsrData *UsrDat)
void ZIP_PutButtonToDownloadZIPOfAFolder (const char *PathInTree,const char *FileName)
{
extern const char *The_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *Txt_Create_ZIP_file;
Act_FormStart (ZIP_ActZIPFolder[Gbl.FileBrowser.Type]);
@ -329,7 +329,7 @@ void ZIP_PutButtonToDownloadZIPOfAFolder (const char *PathInTree,const char *Fil
break;
}
Brw_ParamListFiles (Brw_IS_FOLDER,PathInTree,FileName);
Act_LinkFormSubmit (Txt_Create_ZIP_file,The_ClassFormul[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (Txt_Create_ZIP_file,The_ClassFormRightMiddle[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"<img src=\"%s/download16x16.gif\""
" alt=\"%s\" title=\"%s\""
" class=\"ICON16x16B\" />"
@ -553,7 +553,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_ClassFormul[The_NUM_THEMES];
extern const char *The_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *Txt_ZIP_file;
extern const char *Txt_Download;
extern const char *Txt_Filename;
@ -603,7 +603,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_ClassFormul[Gbl.Prefs.Theme],Txt_Filename,
The_ClassFormRightMiddle[Gbl.Prefs.Theme],Txt_Filename,
URL,FileName,FileName);
/***** Write the file size *****/
@ -613,7 +613,7 @@ static void ZIP_ShowLinkToDownloadZIP (const char *FileName,const char *URL,
"</td>"
"<td class=\"DAT\" style=\"text-align:left;"
" vertical-align:middle;\">",
The_ClassFormul[Gbl.Prefs.Theme],Txt_File_size);
The_ClassFormRightMiddle[Gbl.Prefs.Theme],Txt_File_size);
Str_WriteSizeInBytesFull ((double) FileSize);
if (UncompressedSize)
{