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.122

This commit is contained in:
Antonio Cañas Vargas 2015-07-28 00:16:09 +02:00
parent 40b8837329
commit a6a3098fb2
25 changed files with 356 additions and 352 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
css/swad_desktop.css
View File

@ -736,10 +736,6 @@ a:hover img.CENTRE_PHOTO_SHOW
.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;}
.BLUE_FORM_NOWRAP {color:#4D88A1; font-size:11pt; white-space:nowrap;}
@ -750,6 +746,17 @@ a:hover img.CENTRE_PHOTO_SHOW
.BLUE_FORM_BOLD {color:#4D88A1; font-size:11pt; font-weight:bold;}
.YELLOW_FORM_BOLD {color:#7C4D2A; font-size:11pt; font-weight:bold;}
/****************************** Placing of objects ***************************/
.LEFT_TOP {text-align:left; vertical-align:top;}
.LEFT_MIDDLE {text-align:left; vertical-align:middle;}
.LEFT_BOTTOM {text-align:left; vertical-align:bottom;}
.CENTER_TOP {text-align:center; vertical-align:top;}
.CENTER_MIDDLE {text-align:center; vertical-align:middle;}
.CENTER_BOTTOM {text-align:center; vertical-align:bottom;}
.RIGHT_TOP {text-align:right; vertical-align:top;}
.RIGHT_MIDDLE {text-align:right; vertical-align:middle;}
.RIGHT_BOTTOM {text-align:right; vertical-align:bottom;}
/********************************* Course info *******************************/
#crs_info
{

15
css/swad_mobile.css
View File

@ -547,10 +547,6 @@ a:hover img.CENTRE_PHOTO_SHOW
.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;}
.BLUE_FORM_NOWRAP {color:#4D88A1; font-size:16pt; white-space:nowrap;}
@ -561,6 +557,17 @@ a:hover img.CENTRE_PHOTO_SHOW
.BLUE_FORM_BOLD {color:#4D88A1; font-size:16pt; font-weight:bold;}
.YELLOW_FORM_BOLD {color:#FF4301; font-size:16pt; font-weight:bold;}
/****************************** Placing of objects ***************************/
.LEFT_TOP {text-align:left; vertical-align:top;}
.LEFT_MIDDLE {text-align:left; vertical-align:middle;}
.LEFT_BOTTOM {text-align:left; vertical-align:bottom;}
.CENTER_TOP {text-align:center; vertical-align:top;}
.CENTER_MIDDLE {text-align:center; vertical-align:middle;}
.CENTER_BOTTOM {text-align:center; vertical-align:bottom;}
.RIGHT_TOP {text-align:right; vertical-align:top;}
.RIGHT_MIDDLE {text-align:right; vertical-align:middle;}
.RIGHT_BOTTOM {text-align:right; vertical-align:bottom;}
/********************************* Course info *******************************/
#crs_info
{

3
swad_changelog.h
View File

@ -103,11 +103,12 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 14.121 (2015/07/27)"
#define Log_PLATFORM_VERSION "SWAD 14.122 (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.122: Jul 27, 2015 Changes in CSS of forms. (184892 lines)
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)

29
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_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *The_ClassForm[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_ClassFormRightMiddle[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"<div class=\"%s CENTER_MIDDLE\">",
The_ClassForm[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_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *The_ClassForm[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_ClassFormRightMiddle[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"<div class=\"%s CENTER_MIDDLE\">",
The_ClassForm[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_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *Txt_You_should_read_the_following_information_on_the_course_X;
Inf_InfoType_t InfoType;
@ -557,7 +557,8 @@ void Inf_WriteMsgYouMustReadInfo (void)
{
fprintf (Gbl.F.Out,"<li>");
Act_FormStart (Inf_ActionsSeeInfo[InfoType]);
Act_LinkFormSubmit (Act_GetTitleAction (Inf_ActionsSeeInfo[InfoType]),The_ClassFormRightMiddle[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (Act_GetTitleAction (Inf_ActionsSeeInfo[InfoType]),
The_ClassForm[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"%s"
"</a>",
Act_GetTitleAction (Inf_ActionsSeeInfo[InfoType]));
@ -1046,7 +1047,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_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *Txt_File;
extern const char *Txt_Upload_file;
@ -1056,7 +1057,7 @@ void Inf_FormToSendPage (Inf_InfoSrc_t InfoSrc,Inf_InfoType_t InfoType)
/***** File *****/
fprintf (Gbl.F.Out,"<table style=\"margin-left:auto; margin-right:auto;\">"
"<tr>"
"<td class=\"%s\">"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td style=\"text-align:left;\">"
@ -1064,7 +1065,7 @@ void Inf_FormToSendPage (Inf_InfoSrc_t InfoSrc,Inf_InfoType_t InfoType)
"</td>"
"</tr>"
"</table>",
The_ClassFormRightMiddle[Gbl.Prefs.Theme],Txt_File,
The_ClassForm[Gbl.Prefs.Theme],Txt_File,
Fil_NAME_OF_PARAM_FILENAME_ORG);
/***** Send button *****/
@ -1080,7 +1081,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_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *Txt_URL;
extern const char *Txt_Send_URL;
FILE *FileURL;
@ -1091,12 +1092,12 @@ void Inf_FormToSendURL (Inf_InfoSrc_t InfoSrc,Inf_InfoType_t InfoType)
/***** Link *****/
fprintf (Gbl.F.Out,"<table style=\"margin-left:auto; margin-right:auto;\">"
"<tr>"
"<td class=\"%s\">"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td style=\"text-align:left;\">"
"<input type=\"text\" name=\"InfoSrcURL\" size=\"50\" maxlength=\"256\" value=\"",
The_ClassFormRightMiddle[Gbl.Prefs.Theme],Txt_URL);
The_ClassForm[Gbl.Prefs.Theme],Txt_URL);
if ((FileURL = fopen (Gbl.CurrentCrs.Info.Links[InfoType].PathRelFileURL,"rb")) == NULL)
fprintf (Gbl.F.Out,"http://");
else

46
swad_institution.c
View File

@ -225,7 +225,7 @@ void Ins_PrintConfiguration (void)
static void Ins_Configuration (bool PrintView)
{
extern const char *The_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *Txt_Centres;
extern const char *Txt_Print;
extern const char *Txt_Institution;
@ -282,12 +282,12 @@ static void Ins_Configuration (bool PrintView)
/***** Institution 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_ClassFormRightMiddle[Gbl.Prefs.Theme],
The_ClassForm[Gbl.Prefs.Theme],
Txt_Institution);
if (PutLink)
fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\""
@ -303,7 +303,7 @@ static void Ins_Configuration (bool PrintView)
/***** Institution short name *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\">"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td class=\"DAT\" style=\"text-align:left;"
@ -311,7 +311,7 @@ static void Ins_Configuration (bool PrintView)
"%s"
"</td>"
"</tr>",
The_ClassFormRightMiddle[Gbl.Prefs.Theme],
The_ClassForm[Gbl.Prefs.Theme],
Txt_Short_name,
Gbl.CurrentIns.Ins.ShortName);
@ -319,13 +319,13 @@ static void Ins_Configuration (bool PrintView)
if (Gbl.CurrentIns.Ins.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_ClassFormRightMiddle[Gbl.Prefs.Theme],
The_ClassForm[Gbl.Prefs.Theme],
Txt_Web,
Gbl.CurrentIns.Ins.WWW);
Str_LimitLengthHTMLStr (Gbl.CurrentIns.Ins.WWW,20);
@ -338,7 +338,7 @@ static void Ins_Configuration (bool PrintView)
/***** Shortcut to the institution *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\">"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td class=\"DAT\" style=\"text-align:left;"
@ -348,7 +348,7 @@ static void Ins_Configuration (bool PrintView)
"</a>"
"</td>"
"</tr>",
The_ClassFormRightMiddle[Gbl.Prefs.Theme],
The_ClassForm[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);
@ -357,12 +357,12 @@ static void Ins_Configuration (bool PrintView)
{
/***** QR code with link to the institution *****/
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_ClassFormRightMiddle[Gbl.Prefs.Theme],
The_ClassForm[Gbl.Prefs.Theme],
Txt_QR_code);
QR_LinkTo (200,"ins",Gbl.CurrentIns.Ins.InsCod);
fprintf (Gbl.F.Out,"</td>"
@ -372,7 +372,7 @@ static void Ins_Configuration (bool PrintView)
{
/***** 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;"
@ -380,13 +380,13 @@ static void Ins_Configuration (bool PrintView)
"%u"
"</td>"
"</tr>",
The_ClassFormRightMiddle[Gbl.Prefs.Theme],
The_ClassForm[Gbl.Prefs.Theme],
Txt_Centres,
Ctr_GetNumCtrsInIns (Gbl.CurrentIns.Ins.InsCod));
/***** 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;"
@ -394,13 +394,13 @@ static void Ins_Configuration (bool PrintView)
"%u"
"</td>"
"</tr>",
The_ClassFormRightMiddle[Gbl.Prefs.Theme],
The_ClassForm[Gbl.Prefs.Theme],
Txt_Degrees,
Deg_GetNumDegsInIns (Gbl.CurrentIns.Ins.InsCod));
/***** 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;"
@ -408,13 +408,13 @@ static void Ins_Configuration (bool PrintView)
"%u"
"</td>"
"</tr>",
The_ClassFormRightMiddle[Gbl.Prefs.Theme],
The_ClassForm[Gbl.Prefs.Theme],
Txt_Courses,
Crs_GetNumCrssInIns (Gbl.CurrentIns.Ins.InsCod));
/***** Number of departments *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\">"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td class=\"DAT\" style=\"text-align:left;"
@ -422,13 +422,13 @@ static void Ins_Configuration (bool PrintView)
"%u"
"</td>"
"</tr>",
The_ClassFormRightMiddle[Gbl.Prefs.Theme],
The_ClassForm[Gbl.Prefs.Theme],
Txt_Departments,
Dpt_GetNumDepartmentsInInstitution (Gbl.CurrentIns.Ins.InsCod));
/***** 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;"
@ -436,13 +436,13 @@ static void Ins_Configuration (bool PrintView)
"%u"
"</td>"
"</tr>",
The_ClassFormRightMiddle[Gbl.Prefs.Theme],
The_ClassForm[Gbl.Prefs.Theme],
Txt_ROLES_PLURAL_Abc[Rol_TEACHER][Usr_SEX_UNKNOWN],
Usr_GetNumUsrsInCrssOfIns (Rol_TEACHER,Gbl.CurrentIns.Ins.InsCod));
/***** 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;"
@ -450,7 +450,7 @@ static void Ins_Configuration (bool PrintView)
"%u"
"</td>"
"</tr>",
The_ClassFormRightMiddle[Gbl.Prefs.Theme],
The_ClassForm[Gbl.Prefs.Theme],
Txt_ROLES_PLURAL_Abc[Rol_STUDENT][Usr_SEX_UNKNOWN],
Usr_GetNumUsrsInCrssOfIns (Rol_STUDENT,Gbl.CurrentIns.Ins.InsCod));
}

4
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_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *The_ClassForm[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_ClassFormRightMiddle[Gbl.Prefs.Theme],
The_ClassForm[Gbl.Prefs.Theme],
Txt_File_with_the_logo,
Fil_NAME_OF_PARAM_FILENAME_ORG);

15
swad_mail.c
View File

@ -912,7 +912,7 @@ long Mai_GetUsrCodFromEmail (const char *Email)
void Mai_ShowFormChangeUsrEmail (void)
{
extern const char *The_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *Txt_Current_email;
extern const char *Txt_Other_emails;
extern const char *Txt_Email_X_confirmed;
@ -949,11 +949,11 @@ void Mai_ShowFormChangeUsrEmail (void)
{
/* The first mail is the current one */
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\">"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td",
The_ClassFormRightMiddle[Gbl.Prefs.Theme],Txt_Current_email);
The_ClassForm[Gbl.Prefs.Theme],Txt_Current_email);
if (Confirmed)
fprintf (Gbl.F.Out," colspan=\"2\"");
fprintf (Gbl.F.Out," style=\"text-align:left;"
@ -963,11 +963,10 @@ void Mai_ShowFormChangeUsrEmail (void)
{
fprintf (Gbl.F.Out,"<tr>");
if (NumEmail == 2)
fprintf (Gbl.F.Out,"<td rowspan=\"%u\" class=\"%s\""
" style=\"vertical-align:top;\">"
fprintf (Gbl.F.Out,"<td rowspan=\"%u\" class=\"%s RIGHT_TOP\">"
"%s:",
NumEmails - 1,
The_ClassFormRightMiddle[Gbl.Prefs.Theme],
The_ClassForm[Gbl.Prefs.Theme],
Txt_Other_emails);
fprintf (Gbl.F.Out,"</td>"
"<td style=\"text-align:left;"
@ -1023,11 +1022,11 @@ void Mai_ShowFormChangeUsrEmail (void)
/***** Form to enter new e-mail *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\">"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td style=\"text-align:left; vertical-align:middle;\">",
The_ClassFormRightMiddle[Gbl.Prefs.Theme],
The_ClassForm[Gbl.Prefs.Theme],
NumEmails ? Txt_New_email : // A new e-mail
Txt_Email); // The first e-mail
Act_FormStart (ActChgMai);

40
swad_message.c
View File

@ -257,7 +257,7 @@ void Msg_FormMsgUsrs (void)
static void Msg_PutFormMsgUsrs (const char *Content)
{
extern const char *The_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *Txt_New_message;
extern const char *Txt_MSG_To;
extern const char *Txt_Send_message;
@ -319,12 +319,12 @@ static void Msg_PutFormMsgUsrs (const char *Content)
/***** Draw lists of users with the recipients *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"vertical-align:top;\">"
"<td class=\"%s RIGHT_TOP\">"
"%s:"
"</td>"
"<td style=\"text-align:left;\">"
"<table>",
The_ClassFormRightMiddle[Gbl.Prefs.Theme],Txt_MSG_To);
The_ClassForm[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_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *Txt_MSG_Subject;
extern const char *Txt_MSG_Message;
extern const char *Txt_Original_message;
@ -438,12 +438,12 @@ static void Msg_WriteFormSubjectAndContentMsgToUsrs (const char *Content)
/***** Subject of new message *****/
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_ClassFormRightMiddle[Gbl.Prefs.Theme],
The_ClassForm[Gbl.Prefs.Theme],
Txt_MSG_Subject);
/***** If message is a reply ==> get original message *****/
@ -469,12 +469,12 @@ static void Msg_WriteFormSubjectAndContentMsgToUsrs (const char *Content)
/***** Content of new message *****/
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=\"Content\" cols=\"72\" rows=\"20\">",
The_ClassFormRightMiddle[Gbl.Prefs.Theme],Txt_MSG_Message);
The_ClassForm[Gbl.Prefs.Theme],Txt_MSG_Message);
fprintf (Gbl.F.Out,"\n\n\n\n\n----- %s -----\n",
Txt_Original_message);
@ -495,12 +495,12 @@ static void Msg_WriteFormSubjectAndContentMsgToUsrs (const char *Content)
/***** Content of new message *****/
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=\"Content\" cols=\"72\" rows=\"20\">%s",
The_ClassFormRightMiddle[Gbl.Prefs.Theme],
The_ClassForm[Gbl.Prefs.Theme],
Txt_MSG_Message,
Content);
}
@ -2271,7 +2271,7 @@ void Msg_GetDistinctCoursesInMyMessages (Msg_TypeOfMessages_t TypeOfMessages)
void Msg_ShowFormSelectCourseSentOrRecMsgs (Msg_TypeOfMessages_t TypeOfMessages)
{
extern const char *The_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *The_ClassForm[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_ClassFormRightMiddle[Gbl.Prefs.Theme],
The_ClassForm[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_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *Txt_MSG_From;
extern const char *Txt_MSG_To;
extern const char *Txt_MSG_Message;
@ -2319,28 +2319,28 @@ void Msg_ShowFormToFilterMsgs (Msg_TypeOfMessages_t TypeOfMessages)
/***** Authors/recipients of the message *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\">"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:&nbsp;"
"</td>"
"<td style=\"text-align:left;\">"
"<input type=\"text\" name=\"FilterFromTo\" size=\"40\" maxlength=\"%u\" value=\"%s\" />"
"</td>"
"</tr>",
The_ClassFormRightMiddle[Gbl.Prefs.Theme],
The_ClassForm[Gbl.Prefs.Theme],
TypeOfMessages == Msg_MESSAGES_RECEIVED ? Txt_MSG_From :
Txt_MSG_To,
Usr_MAX_LENGTH_USR_NAME_OR_SURNAME*3,Gbl.Msg.FilterFromTo);
/***** Authors/recipients of the message *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\">"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:&nbsp;"
"</td>"
"<td style=\"text-align:left;\">"
"<input type=\"text\" name=\"FilterContent\" size=\"40\" maxlength=\"%u\" value=\"%s\" />"
"</td>"
"</tr>",
The_ClassFormRightMiddle[Gbl.Prefs.Theme],
The_ClassForm[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_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *The_ClassForm[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;\">"
fprintf (Gbl.F.Out,"<div class=\"%s CENTER_MIDDLE\">"
"<input type=\"checkbox\" name=\"OnlyUnreadMsgs\" value=\"Y\"",
The_ClassFormRightMiddle[Gbl.Prefs.Theme]);
The_ClassForm[Gbl.Prefs.Theme]);
if (Gbl.Msg.ShowOnlyUnreadMsgs)
fprintf (Gbl.F.Out," checked=\"checked\"");
fprintf (Gbl.F.Out," /> %s</div>",

7
swad_network.c
View File

@ -219,12 +219,11 @@ static void Net_ShowAWebOrSocialNet (const char *URL,
void Net_ShowFormMyWebsAndSocialNets (void)
{
extern const char *The_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *Txt_Webs_social_networks;
char Query[256];
MYSQL_RES *mysql_res;
MYSQL_ROW row;
const char *ClassForm = The_ClassFormRightMiddle[Gbl.Prefs.Theme];
Net_WebsAndSocialNetworks_t NumURL;
char URL[Cns_MAX_BYTES_URL+1];
@ -259,14 +258,14 @@ void Net_ShowFormMyWebsAndSocialNets (void)
/***** Row for this web / social network *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"text-align:left;\">"
"<td class=\"%s LEFT_MIDDLE\">"
"<img src=\"%s/%s16x16.gif\""
" alt=\"%s\" title=\"%s\""
" style=\"width:16px; height:16px;"
" margin-right:10px; vertical-align:middle;\" />"
"%s:</td>"
"<td style=\"width:%upx; text-align:left;\">",
ClassForm,
The_ClassForm[Gbl.Prefs.Theme],
Gbl.Prefs.IconsURL,Net_WebsAndSocialNetworksDB[NumURL],
Net_TitleWebsAndSocialNetworks[NumURL],
Net_TitleWebsAndSocialNetworks[NumURL],

15
swad_nickname.c
View File

@ -178,7 +178,7 @@ long Nck_GetUsrCodFromNickname (const char *Nickname)
void Nck_ShowFormChangeUsrNickname (void)
{
extern const char *The_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *Txt_Current_nickname;
extern const char *Txt_Other_nicknames;
extern const char *Txt_Use_this_nickname;
@ -210,21 +210,20 @@ void Nck_ShowFormChangeUsrNickname (void)
if (NumNick == 1)
/* The first nickname is the current one */
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\">"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td colspan=\"2\" style=\"text-align:left;"
" vertical-align:middle;\">",
The_ClassFormRightMiddle[Gbl.Prefs.Theme],Txt_Current_nickname);
The_ClassForm[Gbl.Prefs.Theme],Txt_Current_nickname);
else // NumNick >= 2
{
fprintf (Gbl.F.Out,"<tr>");
if (NumNick == 2)
fprintf (Gbl.F.Out,"<td rowspan=\"%u\" class=\"%s\""
" style=\"vertical-align:top;\">"
fprintf (Gbl.F.Out,"<td rowspan=\"%u\" class=\"%s RIGHT_TOP\">"
"%s:",
NumNicks - 1,
The_ClassFormRightMiddle[Gbl.Prefs.Theme],
The_ClassForm[Gbl.Prefs.Theme],
Txt_Other_nicknames);
fprintf (Gbl.F.Out,"</td>"
"<td style=\"text-align:left;"
@ -267,11 +266,11 @@ void Nck_ShowFormChangeUsrNickname (void)
/***** Form to enter new nickname *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\">"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td style=\"text-align:left; vertical-align:middle;\">",
The_ClassFormRightMiddle[Gbl.Prefs.Theme],
The_ClassForm[Gbl.Prefs.Theme],
NumNicks ? Txt_New_nickname : // A new nickname
Txt_Nickname); // The first nickname
Act_FormStart (ActChgNic);

12
swad_notice.c
View File

@ -83,7 +83,7 @@ static long Not_GetParamNotCod (void);
void Not_ShowFormNotice (void)
{
extern const char *The_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *The_ClassForm[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;
@ -101,14 +101,14 @@ void Not_ShowFormNotice (void)
/***** Message 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;\">"
"<textarea name=\"Content\" cols=\"30\" rows=\"10\"></textarea>"
"</td>"
"</tr>",
The_ClassFormRightMiddle[Gbl.Prefs.Theme],
The_ClassForm[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_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *The_ClassForm[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_ClassFormRightMiddle[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (Txt_See_full_notice,The_ClassForm[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_ClassFormRightMiddle[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\" />"

12
swad_notification.c
View File

@ -590,12 +590,12 @@ void Ntf_ShowMyNotifications (void)
static void Ntf_WriteFormAllNotifications (bool AllNotifications)
{
extern const char *The_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *Txt_Show_all_notifications;
/***** Start form *****/
fprintf (Gbl.F.Out,"<div class=\"%s\">",
The_ClassFormRightMiddle[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"<div class=\"%s CENTER_MIDDLE\">",
The_ClassForm[Gbl.Prefs.Theme]);
Act_FormStart (ActSeeNtf);
/***** End form *****/
@ -1680,7 +1680,7 @@ void Ntf_MarkAllNotifAsSeen (void)
void Ntf_PutFormChangeNotifSentByEMail (void)
{
extern const char *The_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *Txt_Save_changes;
extern const char *Txt_Notifications;
extern const char *Txt_Create_BR_notification;
@ -1711,12 +1711,12 @@ void Ntf_PutFormChangeNotifSentByEMail (void)
NotifyEvent++) // O is reserved for Ntf_EVENT_UNKNOWN
{
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\">"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td style=\"text-align:center;\">"
"<input type=\"checkbox\" name=\"%s\" value=\"Y\"",
The_ClassFormRightMiddle[Gbl.Prefs.Theme],
The_ClassForm[Gbl.Prefs.Theme],
Txt_NOTIFY_EVENTS_PLURAL[NotifyEvent],
Ntf_ParamNotifMeAboutNotifyEvents[NotifyEvent]);
if ((Gbl.Usrs.Me.UsrDat.Prefs.NotifNtfEvents & (1 << NotifyEvent)))

26
swad_password.c
View File

@ -232,7 +232,7 @@ static void Pwd_PutLinkToSendNewPasswdParams (void)
void Pwd_ShowFormSendNewPwd (void)
{
extern const char *The_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *The_ClassForm[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_ClassFormRightMiddle[Gbl.Prefs.Theme],Txt_nick_email_or_ID,
The_ClassForm[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_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *The_ClassForm[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_;
@ -687,7 +687,7 @@ void Pwd_ShowFormChgPwd (void)
/* Current password */
if (IHaveAPasswordInDB) // If I have a password in database...
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\">"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s: "
"</td>"
"<td style=\"text-align:left;\">"
@ -695,7 +695,7 @@ void Pwd_ShowFormChgPwd (void)
" size=\"25\" maxlength=\"%u\" autocomplete=\"off\" />"
"</td>"
"</tr>",
The_ClassFormRightMiddle[Gbl.Prefs.Theme],
The_ClassForm[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_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *Txt_New_password;
extern const char *Txt_Password;
extern const char *Txt_HELP_password;
@ -735,7 +735,7 @@ void Pwd_PutFormToGetNewPasswordTwice (void)
sprintf (Gbl.Message,Txt_HELP_password,Pwd_MIN_LENGTH_PLAIN_PASSWORD);
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\">"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s: "
"</td>"
"<td style=\"text-align:left;\">"
@ -744,7 +744,7 @@ void Pwd_PutFormToGetNewPasswordTwice (void)
"</td>"
"</tr>"
"<tr>"
"<td class=\"%s\">"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s: "
"</td>"
"<td style=\"text-align:left;\">"
@ -752,12 +752,12 @@ void Pwd_PutFormToGetNewPasswordTwice (void)
" size=\"25\" maxlength=\"%u\" placeholder=\"%s\" />"
"</td>"
"</tr>",
The_ClassFormRightMiddle[Gbl.Prefs.Theme],
The_ClassForm[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_ClassFormRightMiddle[Gbl.Prefs.Theme],
The_ClassForm[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_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *The_ClassForm[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_ClassFormRightMiddle[Gbl.Prefs.Theme],
The_ClassForm[Gbl.Prefs.Theme],
Txt_I_understand_that_this_action_may_have_serious_consequences_and_can_not_be_undone,
The_ClassFormRightMiddle[Gbl.Prefs.Theme],
The_ClassForm[Gbl.Prefs.Theme],
Txt_For_security_enter_your_password,
Pwd_MAX_LENGTH_PLAIN_PASSWORD);
}

24
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_ClassFormRightMiddle[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_;
extern const char *Txt_File_with_the_photo;
@ -285,7 +285,7 @@ void Pho_ReqPhoto (const struct UsrData *UsrDat,bool PhotoExists,const char *Pho
/***** Form to upload photo *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\">"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td style=\"text-align:left;\">"
@ -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_ClassFormRightMiddle[Gbl.Prefs.Theme],
The_ClassForm[Gbl.Prefs.Theme],
Txt_File_with_the_photo,
Fil_NAME_OF_PARAM_FILENAME_ORG,
UsrDat->UsrCod);
@ -1511,17 +1511,17 @@ void Pho_ShowOrPrintPhotoDegree (Pho_AvgPhotoSeeOrPrint_t SeeOrPrint)
static void Pho_PutSelectorForTypeOfAvg (void)
{
extern const char *The_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *The_ClassForm[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;
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\">"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td style=\"text-align:left; vertical-align:middle;\">",
The_ClassFormRightMiddle[Gbl.Prefs.Theme],Txt_Average_type);
The_ClassForm[Gbl.Prefs.Theme],Txt_Average_type);
Act_FormStart (ActSeePhoDeg);
Pho_PutHiddenParamPhotoSize ();
Pho_PutHiddenParamOrderDegrees ();
@ -1580,17 +1580,17 @@ static Pho_AvgPhotoTypeOfAverage_t Pho_GetPhotoAvgTypeFromForm (void)
static void Pho_PutSelectorForHowComputePhotoSize (void)
{
extern const char *The_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *The_ClassForm[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;
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\">"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td style=\"text-align:left; vertical-align:middle;\">",
The_ClassFormRightMiddle[Gbl.Prefs.Theme],Txt_Size_of_photos);
The_ClassForm[Gbl.Prefs.Theme],Txt_Size_of_photos);
Act_FormStart (ActSeePhoDeg);
Pho_PutHiddenParamTypeOfAvg ();
Pho_PutHiddenParamOrderDegrees ();
@ -1649,17 +1649,17 @@ static Pho_HowComputePhotoSize_t Pho_GetHowComputePhotoSizeFromForm (void)
static void Pho_PutSelectorForHowOrderDegrees (void)
{
extern const char *The_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *The_ClassForm[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;
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\">"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td style=\"text-align:left; vertical-align:middle;\">",
The_ClassFormRightMiddle[Gbl.Prefs.Theme],Txt_Sort_degrees_by);
The_ClassForm[Gbl.Prefs.Theme],Txt_Sort_degrees_by);
Act_FormStart (ActSeePhoDeg);
Pho_PutHiddenParamTypeOfAvg ();
Pho_PutHiddenParamPhotoSize ();

8
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_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *The_ClassForm[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_ClassFormRightMiddle[Gbl.Prefs.Theme],
The_ClassForm[Gbl.Prefs.Theme],
Txt_Nickname,
Nck_MAX_BYTES_NICKNAME_WITH_ARROBA,
DefaultNickname);
@ -754,7 +754,7 @@ static unsigned long Prf_GetNumUsrsWithNumClicksPerDay (void)
static void Prf_ShowRanking (unsigned long Rank,unsigned long NumUsrs)
{
extern const char *The_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *The_ClassForm[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_ClassFormRightMiddle[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (Gbl.Title,The_ClassForm[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"#%lu</a>",Rank);
Act_FormEnd ();
}

141
swad_record.c
View File

@ -1285,7 +1285,7 @@ void Rec_ListRecordsTchsCrs (void)
void Rec_ShowLinkToPrintPreviewOfRecords (void)
{
extern const char *The_ClassFormBold[The_NUM_THEMES];
extern const char *The_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *Txt_Print;
extern const char *Txt_record_cards_per_page;
unsigned i;
@ -1294,7 +1294,7 @@ void Rec_ShowLinkToPrintPreviewOfRecords (void)
Lay_PutIconWithText ("print",Txt_Print,Txt_Print);
fprintf (Gbl.F.Out,"<span class=\"%s\">(</span>"
"<select name=\"RecsPerPag\">",
The_ClassFormRightMiddle[Gbl.Prefs.Theme]);
The_ClassForm[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_ClassFormRightMiddle[Gbl.Prefs.Theme],Txt_record_cards_per_page);
The_ClassForm[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_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *The_ClassForm[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_ClassFormRightMiddle[Gbl.Prefs.Theme],
The_ClassForm[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_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *The_ClassForm[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;
@ -1571,11 +1571,10 @@ void Rec_ShowCrsRecord (Rec_RecordViewType_t TypeOfView,struct UsrData *UsrDat)
/* Name of the field */
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"width:%upx;"
" text-align:left; vertical-align:top;"
" background-color:%s;\">"
"<td class=\"%s LEFT_TOP\""
" style=\"width:%upx; background-color:%s;\">"
"%s:",
ICanEdit ? The_ClassFormRightMiddle[Gbl.Prefs.Theme] :
ICanEdit ? The_ClassForm[Gbl.Prefs.Theme] :
"DAT_REC_SMALL",
Col1Width,Gbl.ColorRows[Gbl.RowEvenOdd],
Gbl.CurrentCrs.Records.LstFields.Lst[NumField].Name);
@ -1942,7 +1941,7 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
struct UsrData *UsrDat)
{
extern const char *Usr_StringsSexDB[Usr_NUM_SEXS];
extern const char *The_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *The_ClassForm[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 +2062,7 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
struct Department Dpt;
ClassHead = "HEAD_REC";
ClassForm = The_ClassFormRightMiddle[Gbl.Prefs.Theme];
ClassForm = The_ClassForm[Gbl.Prefs.Theme];
ClassData = "DAT_REC";
switch (TypeOfView)
{
@ -2073,7 +2072,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_ClassFormRightMiddle[Gbl.Prefs.Theme];
ClassForm = The_ClassForm[Gbl.Prefs.Theme];
ClassData = "DAT_REC";
break;
case Rec_MY_COMMON_RECORD_CHECK:
@ -2482,8 +2481,8 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
{
/***** User's e-mail *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\""
" style=\"width:%upx; text-align:right;\">"
"<td class=\"%s RIGHT_MIDDLE\""
" style=\"width:%upx;\">"
"%s:"
"</td>"
"<td class=\"%s\""
@ -2508,12 +2507,12 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
/***** User's ID *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\""
" style=\"width:%upx; text-align:right;\">"
"<td class=\"%s RIGHT_TOP\""
" style=\"width:%upx;\">"
"%s:"
"</td>"
"<td class=\"%s\""
" style=\"width:%upx; text-align:left;\">",
"<td class=\"%s LEFT_TOP\""
" style=\"width:%upx;\">",
ClassForm,Rec_C1_BOTTOM_WIDE,Txt_ID,
ClassData,Rec_C2_BOTTOM_WIDE);
ID_WriteUsrIDs (UsrDat,ShowID);
@ -2524,8 +2523,8 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
if (RoleForm)
{
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\""
" style=\"width:%upx; text-align:right;\">"
"<td class=\"%s RIGHT_MIDDLE\""
" style=\"width:%upx;\">"
"%s:</td>"
"<td class=\"%s\""
" style=\"width:%upx; text-align:left;\">",
@ -2632,8 +2631,8 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
else if (SexForm)
{
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\""
" style=\"width:%upx; text-align:right;\">"
"<td class=\"%s RIGHT_MIDDLE\""
" style=\"width:%upx;\">"
"%s*:</td>"
"<td class=\"%s\""
" style=\"width:%upx; text-align:left;\">",
@ -2662,8 +2661,8 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
}
else // RoleForm == false, SexForm == false
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\""
" style=\"width:%upx; text-align:right;\">"
"<td class=\"%s RIGHT_MIDDLE\""
" style=\"width:%upx;\">"
"%s:"
"</td>"
"<td class=\"%s\""
@ -2681,8 +2680,8 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
/***** Name *****/
/* Surname 1 */
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\""
" style=\"width:%upx; text-align:right;\">"
"<td class=\"%s RIGHT_MIDDLE\""
" style=\"width:%upx;\">"
"%s",
ClassForm,Rec_C1_BOTTOM_WIDE,Txt_Surname_1);
if (TypeOfView == Rec_FORM_MY_COMMON_RECORD)
@ -2704,8 +2703,8 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
/* Surname 2 */
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\""
" style=\"width:%upx; text-align:right;\">"
"<td class=\"%s RIGHT_MIDDLE\""
" style=\"width:%upx;\">"
"%s:"
"</td>"
"<td class=\"%s\""
@ -2727,8 +2726,8 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
/* First name */
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\""
" style=\"width:%upx; text-align:right;\">"
"<td class=\"%s RIGHT_MIDDLE\""
" style=\"width:%upx;\">"
"%s",
ClassForm,Rec_C1_BOTTOM_WIDE,Txt_First_name);
if (TypeOfView == Rec_FORM_MY_COMMON_RECORD)
@ -2759,8 +2758,8 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
}
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\""
" style=\"width:%upx; text-align:right;\">"
"<td class=\"%s RIGHT_MIDDLE\""
" style=\"width:%upx;\">"
"%s",
ClassForm,Rec_C1_BOTTOM_WIDE,Txt_Country);
if (TypeOfView == Rec_FORM_MY_COMMON_RECORD)
@ -2801,8 +2800,8 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
{
/* Origin place */
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\""
" style=\"width:%upx; text-align:right;\">"
"<td class=\"%s RIGHT_MIDDLE\""
" style=\"width:%upx;\">"
"%s:"
"</td>"
"<td class=\"%s\""
@ -2825,8 +2824,8 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
/* Date of birth */
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\""
" style=\"width:%upx; text-align:right;\">"
"<td class=\"%s RIGHT_MIDDLE\""
" style=\"width:%upx;\">"
"%s:"
"</td>"
"<td class=\"%s\""
@ -2849,8 +2848,8 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
/* Local address */
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\""
" style=\"width:%upx; text-align:right;\">"
"<td class=\"%s RIGHT_MIDDLE\""
" style=\"width:%upx;\">"
"%s:"
"</td>"
"<td class=\"%s\""
@ -2873,8 +2872,8 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
/* Local phone */
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\""
" style=\"width:%upx; text-align:right;\">"
"<td class=\"%s RIGHT_MIDDLE\""
" style=\"width:%upx;\">"
"%s:"
"</td>"
"<td class=\"%s\""
@ -2897,8 +2896,8 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
/* Family address */
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\""
" style=\"width:%upx; text-align:right;\">"
"<td class=\"%s RIGHT_MIDDLE\""
" style=\"width:%upx;\">"
"%s:"
"</td>"
"<td class=\"%s\""
@ -2921,8 +2920,8 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
/* Family phone */
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\""
" style=\"width:%upx; text-align:right;\">"
"<td class=\"%s RIGHT_MIDDLE\""
" style=\"width:%upx;\">"
"%s:"
"</td>"
"<td class=\"%s\""
@ -2945,8 +2944,8 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
/* Common comments for all the courses */
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"width:%upx;"
" text-align:right; vertical-align:top;\">"
"<td class=\"%s RIGHT_TOP\""
" style=\"width:%upx;\">"
"%s:"
"</td>"
"<td class=\"%s\" style=\"width:%upx;"
@ -2976,8 +2975,8 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
{
/* Institution */
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\""
" style=\"width:%upx; text-align:right;\">"
"<td class=\"%s RIGHT_MIDDLE\""
" style=\"width:%upx;\">"
"%s:"
"</td>"
"<td class=\"%s\""
@ -3001,8 +3000,8 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
/* Centre */
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\""
" style=\"width:%upx; text-align:right;\">"
"<td class=\"%s RIGHT_MIDDLE\""
" style=\"width:%upx;\">"
"%s:"
"</td>"
"<td class=\"%s\""
@ -3028,8 +3027,8 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
/* Department */
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\""
" style=\"width:%upx; text-align:right;\">"
"<td class=\"%s RIGHT_MIDDLE\""
" style=\"width:%upx;\">"
"%s:"
"</td>"
"<td class=\"%s\""
@ -3055,8 +3054,8 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
/* Office */
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\""
" style=\"width:%upx; text-align:right;\">"
"<td class=\"%s RIGHT_MIDDLE\""
" style=\"width:%upx;\">"
"%s:"
"</td>"
"<td class=\"%s\""
@ -3070,8 +3069,8 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
/* Phone */
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\""
" style=\"width:%upx; text-align:right;\">"
"<td class=\"%s RIGHT_MIDDLE\""
" style=\"width:%upx;\">"
"%s:"
"</td>"
"<td class=\"%s\""
@ -3303,7 +3302,7 @@ static void Rec_PutLinkToChangeMySocialNetworks (void)
void Rec_ShowFormMyInsCtrDpt (void)
{
extern const char *The_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *The_ClassForm[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 +3315,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_ClassFormRightMiddle[Gbl.Prefs.Theme];
const char *ClassForm = The_ClassForm[Gbl.Prefs.Theme];
unsigned NumCty;
unsigned NumIns;
unsigned NumCtr;
@ -3339,7 +3338,9 @@ void Rec_ShowFormMyInsCtrDpt (void)
/***** Country *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\">%s:</td>"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td style=\"width:%upx; text-align:left;\">",
ClassForm,Txt_Country_of_institution,
COL2_WIDTH);
@ -3378,7 +3379,9 @@ void Rec_ShowFormMyInsCtrDpt (void)
/***** Institution *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\">%s:</td>"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td style=\"width:%upx; text-align:left;\">",
ClassForm,Txt_Institution,
COL2_WIDTH);
@ -3422,7 +3425,9 @@ void Rec_ShowFormMyInsCtrDpt (void)
{
/***** Centre *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\">%s:</td>"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td style=\"width:%upx; text-align:left;\">",
ClassForm,Txt_Centre,
COL2_WIDTH);
@ -3464,7 +3469,9 @@ void Rec_ShowFormMyInsCtrDpt (void)
/***** Department *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\">%s:</td>"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td style=\"width:%upx; text-align:left;\">",
ClassForm,Txt_Department,
COL2_WIDTH);
@ -3506,7 +3513,9 @@ void Rec_ShowFormMyInsCtrDpt (void)
/***** Office *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\">%s:</td>"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td style=\"width:%upx; text-align:left;\">",
ClassForm,Txt_Office,
COL2_WIDTH);
@ -3523,7 +3532,9 @@ void Rec_ShowFormMyInsCtrDpt (void)
/***** Phone *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\">%s:</td>"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td style=\"width:%upx; text-align:left;\">",
ClassForm,Txt_Phone,
COL2_WIDTH);

4
swad_role.c
View File

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

6
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_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *Txt_Scope;
extern const char *Txt_All;
extern const char *Txt_Institutions;
@ -235,9 +235,9 @@ static void Sch_PutFormToSearchWithWhatToSearchAndScope (Act_Action_t Action,Sco
Lay_StartRoundFrame (NULL,Txt_Search);
/***** Scope (whole platform, current centre, current degree or current course) *****/
fprintf (Gbl.F.Out,"<div class=\"%s\" style=\"text-align:center;\">"
fprintf (Gbl.F.Out,"<div class=\"%s CENTER_MIDDLE\">"
"%s: ",
The_ClassFormRightMiddle[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 |

57
swad_statistic.c
View File

@ -394,7 +394,7 @@ static void Sta_PutFormToRequestAccessesCrs (void)
void Sta_AskSeeCrsAccesses (void)
{
extern const char *The_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *The_ClassForm[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;
@ -459,12 +459,12 @@ void Sta_AskSeeCrsAccesses (void)
/***** Type of statistic *****/
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:top;\">",
The_ClassFormRightMiddle[Gbl.Prefs.Theme],Txt_distributed_by);
The_ClassForm[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)
@ -485,9 +485,9 @@ void Sta_AskSeeCrsAccesses (void)
/* Listing of clicks to this course */
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"2\" class=\"%s\">"
"<td colspan=\"2\" class=\"%s CENTER_MIDDLE\">"
"<input type=\"radio\" name=\"ClickStatType\" value=\"%u\"",
The_ClassFormRightMiddle[Gbl.Prefs.Theme],(unsigned) Sta_ACC_CRS_LISTING);
The_ClassForm[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_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *Txt_Users;
extern const char *Txt_ROLE_STATS[Sta_NUM_ROLES_STAT];
extern const char *Txt_Scope;
@ -570,12 +570,12 @@ void Sta_AskSeeGblAccesses (void)
/***** Users' roles whose accesses we want to see *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\">"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td style=\"text-align:left; vertical-align:middle;\">"
"<select name=\"Role\">",
The_ClassFormRightMiddle[Gbl.Prefs.Theme],Txt_Users);
The_ClassForm[Gbl.Prefs.Theme],Txt_Users);
for (RoleStat = (Sta_Role_t) 0;
RoleStat < Sta_NUM_ROLES_STAT;
RoleStat++)
@ -594,11 +594,11 @@ void Sta_AskSeeGblAccesses (void)
/***** Clicks made from anywhere, 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_ClassFormRightMiddle[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 |
@ -616,12 +616,12 @@ void Sta_AskSeeGblAccesses (void)
/***** Type of statistic *****/
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:top;\">",
The_ClassFormRightMiddle[Gbl.Prefs.Theme],Txt_distributed_by);
The_ClassForm[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,19 +653,19 @@ void Sta_AskSeeGblAccesses (void)
static void Sta_WriteSelectorCountType (void)
{
extern const char *The_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *The_ClassForm[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;
/**** Count type *****/
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;\">"
"<select name=\"CountType\" id=\"CountType\">",
The_ClassFormRightMiddle[Gbl.Prefs.Theme],Txt_Show);
The_ClassForm[Gbl.Prefs.Theme],Txt_Show);
for (StatCountType = (Sta_CountType_t) 0;
StatCountType < Sta_NUM_STAT_COUNT_TYPES;
StatCountType++)
@ -686,19 +686,19 @@ static void Sta_WriteSelectorCountType (void)
static void Sta_WriteSelectorAction (void)
{
extern const char *The_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *Txt_Action;
extern const char *Txt_TABS_SHORT_TXT[Tab_NUM_TABS];
Act_Action_t NumAction;
char ActTxt[Act_MAX_LENGTH_ACTION_TXT+1];
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;\">"
"<select name=\"StatAct\" id=\"StatAct\" style=\"width:300px;\">",
The_ClassFormRightMiddle[Gbl.Prefs.Theme],Txt_Action);
The_ClassForm[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_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *The_ClassForm[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;
@ -2032,9 +2032,8 @@ static void Sta_ShowDistrAccessesPerDaysAndHour (unsigned long NumRows,MYSQL_RES
/***** Put a selector for the type of color *****/
fprintf (Gbl.F.Out,"<tr>"
"<td colspan=\"26\" class=\"%s\""
" style=\"text-align:center;\">",
The_ClassFormRightMiddle[Gbl.Prefs.Theme]);
"<td colspan=\"26\" class=\"%s CENTER_MIDDLE\">",
The_ClassForm[Gbl.Prefs.Theme]);
Act_FormStart (Gbl.CurrentAct);
Sta_WriteParamsDatesSeeAccesses ();
@ -3594,7 +3593,7 @@ static void Sta_WriteSelectedRangeOfDates (unsigned NumDays)
void Sta_ReqUseOfPlatform (void)
{
extern const char *The_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *The_ClassForm[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];
@ -3607,9 +3606,9 @@ void Sta_ReqUseOfPlatform (void)
Act_FormStart (ActSeeUseGbl);
/***** Compute stats for anywhere, degree or course? *****/
fprintf (Gbl.F.Out,"<div class=\"%s\" style=\"text-align:center;\">"
fprintf (Gbl.F.Out,"<div class=\"%s CENTER_MIDDLE\">"
"%s: ",
The_ClassFormRightMiddle[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 |
@ -4803,7 +4802,7 @@ static void Sta_GetAndShowInssOrderedByNumUsrsWhoClaimToBelongToThem (void)
static void Sta_GetAndShowInss (const char *Query,const char *TxtFigure)
{
extern const char *The_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *Txt_Institution;
MYSQL_RES *mysql_res;
MYSQL_ROW row;
@ -4855,13 +4854,13 @@ static void Sta_GetAndShowInss (const char *Query,const char *TxtFigure)
NumOrder);
/***** Write link to institution *****/
fprintf (Gbl.F.Out,"<td class=\"%s\" style=\"text-align:left;\">",
The_ClassFormRightMiddle[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"<td class=\"%s LEFT_MIDDLE\">",
The_ClassForm[Gbl.Prefs.Theme]);
/* Icon and name of this institution */
Act_FormStart (ActSeeInsInf);
Ins_PutParamInsCod (Ins.InsCod);
Act_LinkFormSubmit (Ins.ShortName,The_ClassFormRightMiddle[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (Ins.ShortName,The_ClassForm[Gbl.Prefs.Theme]);
Log_DrawLogo (Sco_SCOPE_INS,Ins.InsCod,Ins.ShortName,
32,NULL,true);
fprintf (Gbl.F.Out,"&nbsp;%s</a>",Ins.FullName);

51
swad_survey.c
View File

@ -1492,7 +1492,7 @@ static bool Svy_CheckIfSimilarSurveyExists (struct Survey *Svy)
void Svy_RequestCreatOrEditSvy (void)
{
extern const char *The_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *Txt_New_survey;
extern const char *Txt_Scope;
extern const char *Txt_Edit_survey;
@ -1586,11 +1586,11 @@ void Svy_RequestCreatOrEditSvy (void)
/***** Survey for anywhere, degree or 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_ClassFormRightMiddle[Gbl.Prefs.Theme],
The_ClassForm[Gbl.Prefs.Theme],
Txt_Scope);
if (!Svy_SetDefaultAndAllowedForEdition ())
Lay_ShowErrorAndExit ("You don't have permission to edit surveys here.");
@ -1601,14 +1601,14 @@ void Svy_RequestCreatOrEditSvy (void)
/***** Survey 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_ClassFormRightMiddle[Gbl.Prefs.Theme],
The_ClassForm[Gbl.Prefs.Theme],
Txt_Title,
Svy_MAX_LENGTH_SURVEY_TITLE,Svy.Title);
@ -1618,14 +1618,14 @@ void Svy_RequestCreatOrEditSvy (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_ClassFormRightMiddle[Gbl.Prefs.Theme],
The_ClassForm[Gbl.Prefs.Theme],
Dates[StartOrEndTime]);
Dat_WriteFormDate (Gbl.Now.Date.Year-1,
Gbl.Now.Date.Year+1,
@ -1649,12 +1649,12 @@ void Svy_RequestCreatOrEditSvy (void)
/***** Survey 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_ClassFormRightMiddle[Gbl.Prefs.Theme],
The_ClassForm[Gbl.Prefs.Theme],
Txt_Description);
if (!ItsANewSurvey)
fprintf (Gbl.F.Out,"%s",Txt);
@ -1664,12 +1664,12 @@ void Svy_RequestCreatOrEditSvy (void)
/***** Users' roles who can answer the survey *****/
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_ClassFormRightMiddle[Gbl.Prefs.Theme],
The_ClassForm[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_ClassFormRightMiddle[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;
@ -1752,11 +1752,11 @@ static void Svy_ShowLstGrpsToEditSurvey (long SvyCod)
{
/***** 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_ClassFormRightMiddle[Gbl.Prefs.Theme],
The_ClassForm[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_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *Txt_Question;
extern const char *Txt_New_question;
extern const char *Txt_Stem;
@ -2442,7 +2442,7 @@ static void Svy_ShowFormEditOneQst (long SvyCod,struct SurveyQuestion *SvyQst,ch
/***** Stem *****/
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;\">"
@ -2451,19 +2451,18 @@ static void Svy_ShowFormEditOneQst (long SvyCod,struct SurveyQuestion *SvyQst,ch
"</textarea>"
"</td>"
"</tr>",
The_ClassFormRightMiddle[Gbl.Prefs.Theme],Txt_Stem,
The_ClassForm[Gbl.Prefs.Theme],Txt_Stem,
Txt);
/***** Type of answer *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"vertical-align:top;\">"
"<td class=\"%s RIGHT_TOP\">"
"%s:"
"</td>",
The_ClassFormRightMiddle[Gbl.Prefs.Theme],
Txt_Type);
fprintf (Gbl.F.Out,"<td class=\"%s\" style=\"text-align:left;"
" vertical-align:top;\">",
The_ClassFormRightMiddle[Gbl.Prefs.Theme]);
"</td>"
"<td class=\"%s LEFT_TOP\">",
The_ClassForm[Gbl.Prefs.Theme],
Txt_Type,
The_ClassForm[Gbl.Prefs.Theme]);
for (AnsType = (Svy_AnswerType_t) 0;
AnsType < Svy_NUM_ANS_TYPES;
AnsType++)
@ -2490,10 +2489,10 @@ static void Svy_ShowFormEditOneQst (long SvyCod,struct SurveyQuestion *SvyQst,ch
{
/* Label with the number of the answer */
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"vertical-align:top;\">"
"<td class=\"%s RIGHT_TOP\">"
"%u)"
"</td>",
The_ClassFormRightMiddle[Gbl.Prefs.Theme],NumAns+1);
The_ClassForm[Gbl.Prefs.Theme],NumAns+1);
/* Answer text */
fprintf (Gbl.F.Out,"<td style=\"text-align:right; vertical-align:top;\">"

104
swad_test.c
View File

@ -241,7 +241,7 @@ static void Tst_GetExamQuestionsFromDB (long TstCod);
void Tst_ShowFormAskTst (void)
{
extern const char *The_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *The_ClassForm[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_ClassFormRightMiddle[Gbl.Prefs.Theme],Txt_No_of_questions,
The_ClassForm[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_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *The_ClassForm[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;
@ -395,9 +395,9 @@ void Tst_ShowNewTestExam (void)
Tst_WriteTestFoot ();
/* Exam will be saved? */
fprintf (Gbl.F.Out,"<div class=\"%s\" style=\"text-align:center;\">"
fprintf (Gbl.F.Out,"<div class=\"%s CENTER_MIDDLE\">"
"<input type=\"checkbox\" name=\"Save\" value=\"Y\"",
The_ClassFormRightMiddle[Gbl.Prefs.Theme]);
The_ClassForm[Gbl.Prefs.Theme]);
if (Gbl.Test.AllowTeachers)
fprintf (Gbl.F.Out," checked=\"checked\"");
fprintf (Gbl.F.Out," />%s"
@ -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_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *Txt_Tags;
extern const char *Txt_All_tags;
extern const char *Txt_Tag_not_allowed;
@ -1396,9 +1396,9 @@ static void Tst_ShowFormSelTags (unsigned long NumRows,MYSQL_RES *mysql_res,bool
fprintf (Gbl.F.Out,"<tr>");
if (!ShowOnlyEnabledTags)
fprintf (Gbl.F.Out,"<td></td>");
fprintf (Gbl.F.Out,"<td class=\"%s\" style=\"text-align:left;\">"
fprintf (Gbl.F.Out,"<td class=\"%s LEFT_MIDDLE\">"
"<input type=\"checkbox\" name=\"AllTags\" value=\"Y\"",
The_ClassFormRightMiddle[Gbl.Prefs.Theme]);
The_ClassForm[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_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *Txt_Configure_tests;
extern const char *Txt_Plugins;
extern const char *Txt_TST_PLUGGABLE[Tst_NUM_OPTIONS_PLUGGABLE];
@ -1593,11 +1593,11 @@ static void Tst_ShowFormConfigTst (void)
/***** Tests are visible from plugins? *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"vertical-align:top;\">"
"<td class=\"%s RIGHT_TOP\">"
"%s:"
"</td>"
"<td style=\"text-align:left;\">",
The_ClassFormRightMiddle[Gbl.Prefs.Theme],
The_ClassForm[Gbl.Prefs.Theme],
Txt_Plugins);
for (Pluggable = Tst_PLUGGABLE_NO;
Pluggable <= Tst_PLUGGABLE_YES;
@ -1615,12 +1615,12 @@ static void Tst_ShowFormConfigTst (void)
/***** Number of questions *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"vertical-align:top;\">"
"<td class=\"%s RIGHT_TOP\">"
"%s:"
"</td>"
"<td style=\"text-align:left;\">"
"<table style=\"border-spacing:2px;\">",
The_ClassFormRightMiddle[Gbl.Prefs.Theme],
The_ClassForm[Gbl.Prefs.Theme],
Txt_No_of_questions);
/* Minimum number of questions in a test exam */
@ -1661,24 +1661,24 @@ static void Tst_ShowFormConfigTst (void)
/***** Minimum time between test exams per question *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\">"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td style=\"text-align:left; vertical-align:bottom;\">"
"<input type=\"text\" name=\"MinTimeNxtTstPerQst\" size=\"7\" maxlength=\"7\" value=\"%lu\" />"
"</td>"
"</tr>",
The_ClassFormRightMiddle[Gbl.Prefs.Theme],
The_ClassForm[Gbl.Prefs.Theme],
Txt_Minimum_time_seconds_per_question_between_two_tests,
Gbl.Test.Config.MinTimeNxtTstPerQst);
/***** Feedback to students *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"vertical-align:top;\">"
"<td class=\"%s RIGHT_TOP\">"
"%s:"
"</td>"
"<td style=\"text-align:left;\">",
The_ClassFormRightMiddle[Gbl.Prefs.Theme],Txt_Feedback_to_students);
The_ClassForm[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_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *The_ClassForm[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];
@ -2001,9 +2001,9 @@ static void Tst_ShowFormAnswerTypes (void)
/***** Select all types of answers *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"text-align:left;\">"
"<td class=\"%s LEFT_MIDDLE\">"
"<input type=\"checkbox\" name=\"AllAnsTypes\" value=\"Y\"",
The_ClassFormRightMiddle[Gbl.Prefs.Theme]);
The_ClassForm[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_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *Txt_Question_code_X;
extern const char *Txt_New_question;
extern const char *Txt_Tags;
@ -4238,12 +4238,12 @@ static void Tst_PutFormEditOneQst (char *Stem,char *Feedback)
/***** Write the tags *****/
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;\">"
"<table>",
The_ClassFormRightMiddle[Gbl.Prefs.Theme],Txt_Tags);
The_ClassForm[Gbl.Prefs.Theme],Txt_Tags);
for (NumTag = 0;
NumTag < Tst_MAX_TAGS_PER_QUESTION;
NumTag++)
@ -4299,7 +4299,7 @@ static void Tst_PutFormEditOneQst (char *Stem,char *Feedback)
/***** Stem *****/
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;\">"
@ -4308,18 +4308,18 @@ static void Tst_PutFormEditOneQst (char *Stem,char *Feedback)
"</textarea>"
"</td>"
"</tr>",
The_ClassFormRightMiddle[Gbl.Prefs.Theme],
The_ClassForm[Gbl.Prefs.Theme],
Txt_Stem,
Stem);
/***** Feedback *****/
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=\"Feedback\" cols=\"70\" rows=\"8\">",
The_ClassFormRightMiddle[Gbl.Prefs.Theme],
The_ClassForm[Gbl.Prefs.Theme],
Txt_Feedback);
if (Feedback)
if (Feedback[0])
@ -4330,14 +4330,13 @@ static void Tst_PutFormEditOneQst (char *Stem,char *Feedback)
/***** Type of answer *****/
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;\">",
The_ClassFormRightMiddle[Gbl.Prefs.Theme],
"<td class=\"%s LEFT_TOP\">",
The_ClassForm[Gbl.Prefs.Theme],
Txt_Type,
The_ClassFormRightMiddle[Gbl.Prefs.Theme]);
The_ClassForm[Gbl.Prefs.Theme]);
for (AnsType = (Tst_AnswerType_t) 0;
AnsType < Tst_NUM_ANS_TYPES;
AnsType++)
@ -4355,15 +4354,14 @@ static void Tst_PutFormEditOneQst (char *Stem,char *Feedback)
/***** Answers *****/
/* Integer answer */
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;\">"
"<td class=\"%s LEFT_TOP\">"
"%s: "
"<input type=\"text\" name=\"AnsInt\" size=\"11\" maxlength=\"11\" value=\"%ld\"",
The_ClassFormRightMiddle[Gbl.Prefs.Theme],Txt_Answers,
The_ClassFormRightMiddle[Gbl.Prefs.Theme],Txt_Integer_number,
The_ClassForm[Gbl.Prefs.Theme],Txt_Answers,
The_ClassForm[Gbl.Prefs.Theme],Txt_Integer_number,
Gbl.Test.Answer.Integer);
if (Gbl.Test.AnswerType != Tst_ANS_INT)
fprintf (Gbl.F.Out," disabled=\"disabled\"");
@ -4373,11 +4371,10 @@ static void Tst_PutFormEditOneQst (char *Stem,char *Feedback)
/* Floating point answer */
fprintf (Gbl.F.Out,"<tr>"
"<td></td>"
"<td class=\"%s\" style=\"text-align:left;"
" vertical-align:top;\">"
"<td class=\"%s LEFT_TOP\">"
"%s "
"<input type=\"text\" name=\"AnsFloatMin\" size=\"11\" maxlength=\"%u\" value=\"%lg\"",
The_ClassFormRightMiddle[Gbl.Prefs.Theme],Txt_Real_number_between_A_and_B_1,
The_ClassForm[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\"");
@ -4392,13 +4389,12 @@ static void Tst_PutFormEditOneQst (char *Stem,char *Feedback)
/* T/F answer */
fprintf (Gbl.F.Out,"<tr>"
"<td></td>"
"<td style=\"text-align:left; vertical-align:top;\">"
"<td class=\"LEFT_TOP\">"
"<table>"
"<tr>"
"<td class=\"%s\" style=\"text-align:left;"
" vertical-align:top;\">"
"<td class=\"%s LEFT_TOP\">"
"<input type=\"radio\" name=\"AnsTF\" value=\"T\"",
The_ClassFormRightMiddle[Gbl.Prefs.Theme]);
The_ClassForm[Gbl.Prefs.Theme]);
if (Gbl.Test.Answer.TF == 'T')
fprintf (Gbl.F.Out," checked=\"checked\"");
if (Gbl.Test.AnswerType != Tst_ANS_TRUE_FALSE)
@ -4419,10 +4415,9 @@ static void Tst_PutFormEditOneQst (char *Stem,char *Feedback)
/* Questions can be shuffled? */
fprintf (Gbl.F.Out,"<tr>"
"<td></td>"
"<td class=\"%s\" style=\"text-align:left;"
" vertical-align:top;\">"
"<td class=\"%s LEFT_TOP\">"
"<input type=\"checkbox\" name=\"Shuffle\" value=\"Y\"",
The_ClassFormRightMiddle[Gbl.Prefs.Theme]);
The_ClassForm[Gbl.Prefs.Theme]);
if (Shuffle)
fprintf (Gbl.F.Out," checked=\"checked\"");
if (Gbl.Test.AnswerType != Tst_ANS_UNIQUE_CHOICE &&
@ -4435,19 +4430,19 @@ static void Tst_PutFormEditOneQst (char *Stem,char *Feedback)
/* Simple or multiple choice answers */
fprintf (Gbl.F.Out,"<tr>"
"<td></td>"
"<td style=\"text-align:left; vertical-align:top;\">"
"<td class=\"LEFT_TOP\">"
"<table>"
"<tr>"
"<td></td>"
"<td class=\"%s\" style=\"text-align:left;\">"
"<td class=\"%s LEFT_MIDDLE\">"
"%s"
"</td>"
"<td class=\"%s\" style=\"text-align:left;\">"
"<td class=\"%s LEFT_MIDDLE\">"
"%s"
"</td>"
"</tr>",
The_ClassFormRightMiddle[Gbl.Prefs.Theme],Txt_Answer,
The_ClassFormRightMiddle[Gbl.Prefs.Theme],Txt_Feedback);
The_ClassForm[Gbl.Prefs.Theme],Txt_Answer,
The_ClassForm[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;
@ -4457,10 +4452,9 @@ static void Tst_PutFormEditOneQst (char *Stem,char *Feedback)
{
/* Selectors and label with the letter of the answer */
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\" style=\"text-align:left;"
" vertical-align:top;\">"
"<td class=\"%s LEFT_TOP\">"
"<input type=\"radio\" name=\"AnsUni\" value=\"%u\"",
The_ClassFormRightMiddle[Gbl.Prefs.Theme],
The_ClassForm[Gbl.Prefs.Theme],
NumOpt);
if (Gbl.Test.AnswerType != Tst_ANS_UNIQUE_CHOICE)
fprintf (Gbl.F.Out," disabled=\"disabled\"");

6
swad_test_import.c
View File

@ -126,7 +126,7 @@ void TsI_PutFormToImportQuestions (void)
void TsI_ShowFormImportQstsFromXML (void)
{
extern const char *The_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *The_ClassForm[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;
@ -140,7 +140,7 @@ void TsI_ShowFormImportQstsFromXML (void)
Act_FormStart (ActImpTstQst);
fprintf (Gbl.F.Out,"<table style=\"margin:0 auto;\">"
"<tr>"
"<td class=\"%s\">"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td style=\"text-align:left;\">"
@ -149,7 +149,7 @@ void TsI_ShowFormImportQstsFromXML (void)
"</tr>"
"<tr>"
"<td colspan=\"2\" style=\"text-align:center;\">",
The_ClassFormRightMiddle[Gbl.Prefs.Theme],
The_ClassForm[Gbl.Prefs.Theme],
Txt_XML_file,
Fil_NAME_OF_PARAM_FILENAME_ORG);
Lay_PutCreateButton (Txt_Upload_file);

16
swad_theme.c
View File

@ -207,20 +207,7 @@ const char *The_ClassForm[The_NUM_THEMES] =
"BLUE_FORM",
"YELLOW_FORM",
};
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",
@ -228,6 +215,7 @@ const char *The_ClassFormNoWrap[The_NUM_THEMES] =
"BLUE_FORM_NOWRAP",
"YELLOW_FORM_NOWRAP",
};
const char *The_ClassFormBold[The_NUM_THEMES] =
{
"WHITE_FORM_BOLD",

38
swad_user.c
View File

@ -2468,7 +2468,7 @@ void Usr_WarningWhenDegreeTypeDoesntAllowDirectLogin (void)
void Usr_ShowFormsLogoutAndRole (void)
{
extern const char *The_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *The_ClassForm[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];
@ -2489,9 +2489,9 @@ void Usr_ShowFormsLogoutAndRole (void)
/***** Put a form to change my role *****/
if (Rol_GetNumAvailableRoles () > 1)
{
fprintf (Gbl.F.Out,"<div class=\"%s\" style=\"text-align:center;\">"
fprintf (Gbl.F.Out,"<div class=\"%s CENTER_MIDDLE\">"
"%s: ",
The_ClassFormRightMiddle[Gbl.Prefs.Theme],Txt_Role);
The_ClassForm[Gbl.Prefs.Theme],Txt_Role);
Rol_PutFormToChangeMyRole (false);
fprintf (Gbl.F.Out,"</div>");
}
@ -4974,7 +4974,7 @@ void Usr_PutCheckboxToSelectUser (Rol_Role_t Role,const char *EncryptedUsrCod,bo
void Usr_PutCheckboxListWithPhotos (void)
{
extern const char *The_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *The_ClassForm[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_ClassFormRightMiddle[Gbl.Prefs.Theme],Txt_Display_photos);
The_ClassForm[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_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *The_ClassForm[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;
@ -5899,9 +5899,9 @@ void Usr_ListDataAdms (void)
Sco_GetScope ();
/***** Form to select range of administrators *****/
fprintf (Gbl.F.Out,"<div class=\"%s\" style=\"text-align:center;\">"
fprintf (Gbl.F.Out,"<div class=\"%s CENTER_MIDDLE\">"
"%s: ",
The_ClassFormRightMiddle[Gbl.Prefs.Theme],Txt_Scope);
The_ClassForm[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_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *Txt_Scope;
extern const char *Txt_Print;
extern const char *Txt_Show_all_data;
@ -6329,8 +6329,8 @@ void Usr_SeeGuests (void)
case Rol_INS_ADM:
case Rol_SYS_ADM:
/***** Form to select range of guests *****/
fprintf (Gbl.F.Out,"<div class=\"%s\" style=\"text-align:center;\">",
The_ClassFormRightMiddle[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"<div class=\"%s CENTER_MIDDLE\">",
The_ClassForm[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_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *Txt_Scope;
extern const char *Txt_Print;
extern const char *Txt_Show_all_data;
@ -6486,8 +6486,8 @@ void Usr_SeeStudents (void)
case Rol_DEG_ADM:
case Rol_SYS_ADM:
/***** Form to select range of students *****/
fprintf (Gbl.F.Out,"<div class=\"%s\" style=\"text-align:center;\">",
The_ClassFormRightMiddle[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"<div class=\"%s CENTER_MIDDLE\">",
The_ClassForm[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_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *Txt_Scope;
extern const char *Txt_Print;
extern const char *Txt_Show_all_data;
@ -6632,8 +6632,8 @@ void Usr_SeeTeachers (void)
ICanViewRecords = (Gbl.Scope.Current == Sco_SCOPE_CRS);
/***** Form to select scope *****/
fprintf (Gbl.F.Out,"<div class=\"%s\" style=\"text-align:center;\">",
The_ClassFormRightMiddle[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out,"<div class=\"%s CENTER_MIDDLE\">",
The_ClassForm[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_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *The_ClassForm[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_ClassFormRightMiddle[Gbl.Prefs.Theme],Txt_columns);
The_ClassForm[Gbl.Prefs.Theme],Txt_columns);
}
/*****************************************************************************/

14
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_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *The_ClassForm[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_ClassFormRightMiddle[Gbl.Prefs.Theme]);
Act_LinkFormSubmit (Txt_Create_ZIP_file,The_ClassForm[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_ClassFormRightMiddle[The_NUM_THEMES];
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *Txt_ZIP_file;
extern const char *Txt_Download;
extern const char *Txt_Filename;
@ -595,7 +595,7 @@ static void ZIP_ShowLinkToDownloadZIP (const char *FileName,const char *URL,
/***** Filename *****/
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"%s\">"
"<td class=\"%s RIGHT_MIDDLE\">"
"%s:"
"</td>"
"<td class=\"DAT\" style=\"text-align:left;"
@ -603,17 +603,17 @@ static void ZIP_ShowLinkToDownloadZIP (const char *FileName,const char *URL,
"<a href=\"%s\" class=\"DAT\" title=\"%s\" target=\"_blank\">%s</a>"
"</td>"
"</tr>",
The_ClassFormRightMiddle[Gbl.Prefs.Theme],Txt_Filename,
The_ClassForm[Gbl.Prefs.Theme],Txt_Filename,
URL,FileName,FileName);
/***** 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_ClassFormRightMiddle[Gbl.Prefs.Theme],Txt_File_size);
The_ClassForm[Gbl.Prefs.Theme],Txt_File_size);
Str_WriteSizeInBytesFull ((double) FileSize);
if (UncompressedSize)
{