diff --git a/css/swad_desktop.css b/css/swad_desktop.css index 274995534..0e5488150 100644 --- a/css/swad_desktop.css +++ b/css/swad_desktop.css @@ -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 { diff --git a/css/swad_mobile.css b/css/swad_mobile.css index 88cd27e1f..63c52e597 100644 --- a/css/swad_mobile.css +++ b/css/swad_mobile.css @@ -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 { diff --git a/swad_changelog.h b/swad_changelog.h index 2c9ddf910..62a48df97 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -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) diff --git a/swad_info.c b/swad_info.c index 20e0cae43..c521ce72a 100644 --- a/swad_info.c +++ b/swad_info.c @@ -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,"
", - The_ClassFormRightMiddle[Gbl.Prefs.Theme]); + fprintf (Gbl.F.Out,"
", + The_ClassForm[Gbl.Prefs.Theme]); Act_FormStart (Inf_ActionsChangeForceReadInfo[InfoType]); fprintf (Gbl.F.Out,"", - The_ClassFormRightMiddle[Gbl.Prefs.Theme]); + fprintf (Gbl.F.Out,"
", + The_ClassForm[Gbl.Prefs.Theme]); Act_FormStart (Inf_ActionsIHaveReadInfo[InfoType]); fprintf (Gbl.F.Out,""); 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" "", 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,"" "" - "" "" "" "
" + "" "%s:" "" @@ -1064,7 +1065,7 @@ void Inf_FormToSendPage (Inf_InfoSrc_t InfoSrc,Inf_InfoType_t InfoType) "
", - 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,"" "" - "" "" "" "", - 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,"" - "" "" - "" "" "", - 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,"" - "" "" @@ -372,7 +372,7 @@ static void Ins_Configuration (bool PrintView) { /***** Number of centres *****/ fprintf (Gbl.F.Out,"" - "" "", - 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,"" - "" "", - 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,"" - "" "", - 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,"" - "" "", - 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,"" - "" "", - 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,"" - "" "", - 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)); } diff --git a/swad_logo.c b/swad_logo.c index 82d82c1ca..54d62edfc 100644 --- a/swad_logo.c +++ b/swad_logo.c @@ -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) "" "", - The_ClassFormRightMiddle[Gbl.Prefs.Theme], + The_ClassForm[Gbl.Prefs.Theme], Txt_File_with_the_logo, Fil_NAME_OF_PARAM_FILENAME_ORG); diff --git a/swad_mail.c b/swad_mail.c index 0c8739f78..f9b96129f 100644 --- a/swad_mail.c +++ b/swad_mail.c @@ -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,"" - "" ""); if (NumEmail == 2) - fprintf (Gbl.F.Out,"" "" "" - "" "
" + "" "%s:" "" "" - "" + "" "%s:" "", - The_ClassFormRightMiddle[Gbl.Prefs.Theme], + The_ClassForm[Gbl.Prefs.Theme], Txt_Institution); if (PutLink) fprintf (Gbl.F.Out,"" - "" + "" "%s:" "" "
" + "" "%s:" "" "", - 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,"
" + "" "%s:" "" "
" + "" "%s:" "", - 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,"
" + "" "%s:" "" "
" + "" "%s:" "" "
" + "" "%s:" "" "
" + "" "%s:" "" "
" + "" "%s:" "" "
" + "" "%s:" "" "
" + "" "%s:" "" + fprintf (Gbl.F.Out,"" "%s:", NumEmails - 1, - The_ClassFormRightMiddle[Gbl.Prefs.Theme], + The_ClassForm[Gbl.Prefs.Theme], Txt_Other_emails); fprintf (Gbl.F.Out,"" - "" + "" "%s:" "", - 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); diff --git a/swad_message.c b/swad_message.c index f80ea3e1f..731029d18 100644 --- a/swad_message.c +++ b/swad_message.c @@ -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,"
" + "" "%s:" "" "", - 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,"" - "" "" "", - 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,"\"%s\"" @@ -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,"\"%s\"" diff --git a/swad_notification.c b/swad_notification.c index 5bf8c86db..65355feeb 100644 --- a/swad_notification.c +++ b/swad_notification.c @@ -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,"
", - The_ClassFormRightMiddle[Gbl.Prefs.Theme]); + fprintf (Gbl.F.Out,"
", + 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,"
" - "" "" - "" "" "", - 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,"" - "" "" "" "" - "" "" "", - 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) "" "", - 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); } diff --git a/swad_photo.c b/swad_photo.c index 74ae538d9..7f95ad070 100644 --- a/swad_photo.c +++ b/swad_photo.c @@ -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,"" - "" "" "", - 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,"" - "" "" - "" "" - "" "" - "" - "" "" - "" - "" "" - "" "" - "" "" - "" "" - "" - "" "" "" "" "" "" "" "" "" "" "" "" "" + "" "" - "" + "" "" - "" + "" "" - "" + "" "" - "" + "" "" - "" + "" "" - "" "" - "" - "" "" - "" "" - "" "" - "" "" - "" "" - "" - "" "" - "" "" "", - 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,"" - "" "
" + "" "%s: " "" "" "
" + "" "%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,"
" + "" "%s: " "" @@ -695,7 +695,7 @@ void Pwd_ShowFormChgPwd (void) " size=\"25\" maxlength=\"%u\" autocomplete=\"off\" />" "
" + "" "%s: " "" @@ -744,7 +744,7 @@ void Pwd_PutFormToGetNewPasswordTwice (void) "
" + "" "%s: " "" @@ -752,12 +752,12 @@ void Pwd_PutFormToGetNewPasswordTwice (void) " size=\"25\" maxlength=\"%u\" placeholder=\"%s\" />" "
" + "" "%s:" "" @@ -293,7 +293,7 @@ void Pho_ReqPhoto (const struct UsrData *UsrDat,bool PhotoExists,const char *Pho " size=\"40\" maxlength=\"100\" value=\"%ld.jpg\" />" "
" + "" "%s:" "", - 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,"
" + "" "%s:" "", - 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,"
" + "" "%s:" "", - 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 (); diff --git a/swad_profile.c b/swad_profile.c index 845dda440..b90d6a721 100644 --- a/swad_profile.c +++ b/swad_profile.c @@ -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 "" "", - 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",Rank); Act_FormEnd (); } diff --git a/swad_record.c b/swad_record.c index c2a5eabe3..adfaf0cfa 100644 --- a/swad_record.c +++ b/swad_record.c @@ -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,"(" "" " %s)", - 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,"
" + "" "%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,"
" + "" "%s:" "" - "" + "" "%s:" "", + "", 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,"
" + "" "%s:", @@ -2632,8 +2631,8 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView, else if (SexForm) { fprintf (Gbl.F.Out,"
" + "" "%s*:", @@ -2662,8 +2661,8 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView, } else // RoleForm == false, SexForm == false fprintf (Gbl.F.Out,"
" + "" "%s:" "" - "" + "" "%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,"
" + "" "%s:" "" - "" + "" "%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,"
" + "" "%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,"
" + "" "%s:" "" - "" + "" "%s:" "" - "" + "" "%s:" "" - "" + "" "%s:" "" - "" + "" "%s:" "" - "" + "" "%s:" "" - "" + "" "%s:" "" - "" + "" "%s:" "" - "" + "" "%s:" "" - "" + "" "%s:" "" - "" + "" "%s:" "" - "" + "" "%s:" "" - "%s:" + "%s:" + "", ClassForm,Txt_Country_of_institution, COL2_WIDTH); @@ -3378,7 +3379,9 @@ void Rec_ShowFormMyInsCtrDpt (void) /***** Institution *****/ fprintf (Gbl.F.Out,"
%s:" + "%s:" + "", ClassForm,Txt_Institution, COL2_WIDTH); @@ -3422,7 +3425,9 @@ void Rec_ShowFormMyInsCtrDpt (void) { /***** Centre *****/ fprintf (Gbl.F.Out,"
%s:" + "%s:" + "", ClassForm,Txt_Centre, COL2_WIDTH); @@ -3464,7 +3469,9 @@ void Rec_ShowFormMyInsCtrDpt (void) /***** Department *****/ fprintf (Gbl.F.Out,"
%s:" + "%s:" + "", ClassForm,Txt_Department, COL2_WIDTH); @@ -3506,7 +3513,9 @@ void Rec_ShowFormMyInsCtrDpt (void) /***** Office *****/ fprintf (Gbl.F.Out,"
%s:" + "%s:" + "", ClassForm,Txt_Office, COL2_WIDTH); @@ -3523,7 +3532,9 @@ void Rec_ShowFormMyInsCtrDpt (void) /***** Phone *****/ fprintf (Gbl.F.Out,"
%s:" + "%s:" + "", ClassForm,Txt_Phone, COL2_WIDTH); diff --git a/swad_role.c b/swad_role.c index d740774be..6246a109b 100644 --- a/swad_role.c +++ b/swad_role.c @@ -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,"
" "
    ", - The_ClassFormRightMiddle[Gbl.Prefs.Theme]); + The_ClassForm[Gbl.Prefs.Theme]); Rol_PutOneRoleRegRemUsrsCrs (Rol_STUDENT,true); Rol_PutOneRoleRegRemUsrsCrs (Rol_TEACHER,false); fprintf (Gbl.F.Out,"
" diff --git a/swad_search.c b/swad_search.c index d93bcf72f..c2e71539c 100644 --- a/swad_search.c +++ b/swad_search.c @@ -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,"
" + fprintf (Gbl.F.Out,"
" "%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 | diff --git a/swad_statistic.c b/swad_statistic.c index 3d20967cf..45d8dc904 100644 --- a/swad_statistic.c +++ b/swad_statistic.c @@ -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,"
" + "" "%s:" "", - 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,"
" + "" "%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,"
" + "" "%s:" "" "
" + "" "%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 | @@ -616,12 +616,12 @@ void Sta_AskSeeGblAccesses (void) /***** Type of statistic *****/ fprintf (Gbl.F.Out,"
" + "" "%s:" "", - 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,"
" + "" "%s:" "" "
" + "" "%s:" "" "
", - The_ClassFormRightMiddle[Gbl.Prefs.Theme]); + "", + 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,"
" + fprintf (Gbl.F.Out,"
" "%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,"
", - The_ClassFormRightMiddle[Gbl.Prefs.Theme]); + fprintf (Gbl.F.Out,"", + 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," %s",Ins.FullName); diff --git a/swad_survey.c b/swad_survey.c index 1a71fd92a..d4662845f 100644 --- a/swad_survey.c +++ b/swad_survey.c @@ -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,"
" + "" "%s:" "", - 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,"
" + "" "%s:" "" "" "
" + "" "%s:" "" "" "" "" - "" "" "", - The_ClassFormRightMiddle[Gbl.Prefs.Theme],Txt_Stem, + The_ClassForm[Gbl.Prefs.Theme],Txt_Stem, Txt); /***** Type of answer *****/ fprintf (Gbl.F.Out,"" - "", - The_ClassFormRightMiddle[Gbl.Prefs.Theme], - Txt_Type); - fprintf (Gbl.F.Out,"" + "" - "", - The_ClassFormRightMiddle[Gbl.Prefs.Theme],NumAns+1); + The_ClassForm[Gbl.Prefs.Theme],NumAns+1); /* Answer text */ fprintf (Gbl.F.Out,""); if (!ShowOnlyEnabledTags) fprintf (Gbl.F.Out,""); - fprintf (Gbl.F.Out,"" - "" "" - "" "
", - 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,"
" + "" "%s:" "" "" "
" + "" "%s:" - "", - The_ClassFormRightMiddle[Gbl.Prefs.Theme]); + "", + 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,"
" + "" "%u)" "" diff --git a/swad_test.c b/swad_test.c index c5f2796f5..f0d9020be 100644 --- a/swad_test.c +++ b/swad_test.c @@ -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: " "" "" + 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,"
" + fprintf (Gbl.F.Out,"" "" @@ -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,"
" + "" "%s:" "", - 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,"
" + "" "%s:" "" "", - 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,"" - "" "" "", - 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,"" - "" "" - "" - "" "
" + "" "%s:" "" "" "
" + "" "%s:" "", - 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,"
" + "" "" @@ -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,"
" + "" "%s:" "" "", - 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,"" - "" "" "", - The_ClassFormRightMiddle[Gbl.Prefs.Theme], + The_ClassForm[Gbl.Prefs.Theme], Txt_Stem, Stem); /***** Feedback *****/ fprintf (Gbl.F.Out,"" - "" "
" + "" "%s:" "" @@ -4308,18 +4308,18 @@ static void Tst_PutFormEditOneQst (char *Stem,char *Feedback) "" "
" + "" "%s:" "" "