diff --git a/css/swad_desktop.css b/css/swad_desktop.css index 58d0f2c71..274995534 100644 --- a/css/swad_desktop.css +++ b/css/swad_desktop.css @@ -731,10 +731,14 @@ a:hover img.CENTRE_PHOTO_SHOW .YELLOW_MENU_ON {color:#BD4815; font-size:10pt; font-weight:bold; line-height:110%;} /********************************* Form fonts ********************************/ -.WHITE_FORM {color:#4D88A1; font-size:11pt; text-align:right; vertical-align:middle;} -.GREY_FORM {color:#4D88A1; font-size:11pt; text-align:right; vertical-align:middle;} -.BLUE_FORM {color:#4D88A1; font-size:11pt; text-align:right; vertical-align:middle;} -.YELLOW_FORM {color:#7C4D2A; font-size:11pt; text-align:right; vertical-align:middle;} +.WHITE_FORM {color:#4D88A1; font-size:11pt;} +.GREY_FORM {color:#4D88A1; font-size:11pt;} +.BLUE_FORM {color:#4D88A1; font-size:11pt;} +.YELLOW_FORM {color:#7C4D2A; font-size:11pt;} + +.CENTER_MIDDLE {text-align:center; vertical-align:middle;} +.RIGHT_MIDDLE {text-align:right; vertical-align:middle;} +.RIGHT_TOP {text-align:right; vertical-align:top;} .WHITE_FORM_NOWRAP {color:#4D88A1; font-size:11pt; white-space:nowrap;} .GREY_FORM_NOWRAP {color:#4D88A1; font-size:11pt; white-space:nowrap;} diff --git a/css/swad_mobile.css b/css/swad_mobile.css index da2e6e84d..88cd27e1f 100644 --- a/css/swad_mobile.css +++ b/css/swad_mobile.css @@ -542,10 +542,14 @@ a:hover img.CENTRE_PHOTO_SHOW .YELLOW_MENU_ON {color:#FF4301; font-size:20pt; font-weight:bold; line-height:110%;} /********************************* Form fonts ********************************/ -.WHITE_FORM {color:#4D88A1; font-size:16pt; text-align:right; vertical-align:middle;} -.GREY_FORM {color:#4D88A1; font-size:16pt; text-align:right; vertical-align:middle;} -.BLUE_FORM {color:#4D88A1; font-size:16pt; text-align:right; vertical-align:middle;} -.YELLOW_FORM {color:#FF4301; font-size:16pt; text-align:right; vertical-align:middle;} +.WHITE_FORM {color:#4D88A1; font-size:16pt;} +.GREY_FORM {color:#4D88A1; font-size:16pt;} +.BLUE_FORM {color:#4D88A1; font-size:16pt;} +.YELLOW_FORM {color:#FF4301; font-size:16pt;} + +.CENTER_MIDDLE {text-align:center; vertical-align:middle;} +.RIGHT_MIDDLE {text-align:right; vertical-align:middle;} +.RIGHT_TOP {text-align:right; vertical-align:top;} .WHITE_FORM_NOWRAP {color:#4D88A1; font-size:16pt; white-space:nowrap;} .GREY_FORM_NOWRAP {color:#4D88A1; font-size:16pt; white-space:nowrap;} diff --git a/swad_ID.c b/swad_ID.c index f4034951b..78a169750 100644 --- a/swad_ID.c +++ b/swad_ID.c @@ -416,7 +416,7 @@ void ID_ShowFormOthIDs (void) void ID_ShowFormChangeUsrID (const struct UsrData *UsrDat,bool ItsMe) { - extern const char *The_ClassFormul[The_NUM_THEMES]; + extern const char *The_ClassForm[The_NUM_THEMES]; extern const char *Txt_ID; extern const char *Txt_ID_X_confirmed; extern const char *Txt_Another_ID; @@ -432,12 +432,12 @@ void ID_ShowFormChangeUsrID (const struct UsrData *UsrDat,bool ItsMe) { if (NumID == 0) fprintf (Gbl.F.Out,"" - "" + "" "%s:" "" "", - The_ClassFormul[Gbl.Prefs.Theme],Txt_ID); + The_ClassForm[Gbl.Prefs.Theme],Txt_ID); else // NumID >= 1 fprintf (Gbl.F.Out,"
"); @@ -487,12 +487,12 @@ void ID_ShowFormChangeUsrID (const struct UsrData *UsrDat,bool ItsMe) if (UsrDat->IDs.Num < ID_MAX_IDS_PER_USER) { fprintf (Gbl.F.Out,"" - "" + "" "%s:" "" "", - The_ClassFormul[Gbl.Prefs.Theme], + The_ClassForm[Gbl.Prefs.Theme], UsrDat->IDs.Num ? Txt_Another_ID : // A new user's ID Txt_ID); // The first user's ID if (ItsMe) diff --git a/swad_QR.c b/swad_QR.c index 9ba86dea9..909255f7a 100644 --- a/swad_QR.c +++ b/swad_QR.c @@ -72,7 +72,7 @@ static void QR_ImageQRCode (const char *QRString); void QR_PutLinkToPrintQRCode (struct UsrData *UsrDat,bool PrintText) { - extern const char *The_ClassFormulB[The_NUM_THEMES]; + extern const char *The_ClassFormBold[The_NUM_THEMES]; extern const char *Txt_QR_code; char NicknameWithArroba[Nck_MAX_BYTES_NICKNAME_WITH_ARROBA+1]; @@ -80,7 +80,7 @@ void QR_PutLinkToPrintQRCode (struct UsrData *UsrDat,bool PrintText) Act_FormStart (ActPrnUsrQR); sprintf (NicknameWithArroba,"@%s",UsrDat->Nickname); Par_PutHiddenParamString ("QRString",NicknameWithArroba); - Act_LinkFormSubmit (Txt_QR_code,The_ClassFormulB[Gbl.Prefs.Theme]); + Act_LinkFormSubmit (Txt_QR_code,The_ClassFormBold[Gbl.Prefs.Theme]); Lay_PutIconWithText ("qr",Txt_QR_code,PrintText ? Txt_QR_code : NULL); Act_FormEnd (); diff --git a/swad_account.c b/swad_account.c index 13fa21cc3..59b7e2cf0 100644 --- a/swad_account.c +++ b/swad_account.c @@ -112,7 +112,7 @@ void Acc_ShowFormAccount (void) static void Acc_ShowFormRequestNewAccountWithParams (const char *NewNicknameWithoutArroba, const char *NewEmail) { - extern const char *The_ClassFormul[The_NUM_THEMES]; + extern const char *The_ClassForm[The_NUM_THEMES]; extern const char *Txt_Log_in; extern const char *Txt_Nickname; extern const char *Txt_HELP_nickname; @@ -138,16 +138,16 @@ static void Acc_ShowFormRequestNewAccountWithParams (const char *NewNicknameWith else NewNicknameWithArroba[0] = '\0'; fprintf (Gbl.F.Out,"" - "" - "%s: " - "" + "" + "%s:" + "" "" "" "" "", - The_ClassFormul[Gbl.Prefs.Theme], + The_ClassForm[Gbl.Prefs.Theme], Txt_Nickname, 1+Nck_MAX_LENGTH_NICKNAME_WITHOUT_ARROBA, Txt_HELP_nickname, @@ -155,16 +155,16 @@ static void Acc_ShowFormRequestNewAccountWithParams (const char *NewNicknameWith /***** E-mail *****/ fprintf (Gbl.F.Out,"" - "" - "%s: " - "" + "" + "%s:" + "" "" "" "" "", - The_ClassFormul[Gbl.Prefs.Theme], + The_ClassForm[Gbl.Prefs.Theme], Txt_Email, Usr_MAX_BYTES_USR_EMAIL, Txt_HELP_email, diff --git a/swad_action.c b/swad_action.c index 95cd049c5..ecc391c8a 100644 --- a/swad_action.c +++ b/swad_action.c @@ -4322,12 +4322,12 @@ void Act_LinkFormSubmitAnimated (const char *Title,const char *LinkStyle) void Act_PutContextualLink (Act_Action_t NextAction,void (*FuncParams) (), const char *Icon,const char *Title) { - extern const char *The_ClassFormulB[The_NUM_THEMES]; + extern const char *The_ClassFormBold[The_NUM_THEMES]; Act_FormStart (NextAction); if (FuncParams) FuncParams (); - Act_LinkFormSubmit (Title,The_ClassFormulB[Gbl.Prefs.Theme]); + Act_LinkFormSubmit (Title,The_ClassFormBold[Gbl.Prefs.Theme]); Lay_PutIconWithText (Icon,Title,Title); Act_FormEnd (); } @@ -4694,7 +4694,7 @@ void Act_ShowMyMFUActions (void) void Act_WriteBigMFUActions (struct Act_ListMFUActions *ListMFUActions) { - extern const char *The_ClassFormulNB[The_NUM_THEMES]; + extern const char *The_ClassFormNoWrap[The_NUM_THEMES]; extern const char *Txt_Frequent_actions; extern const char *Txt_TABS_FULL_TXT[Tab_NUM_TABS]; extern const char *Txt_MENU_TITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB]; @@ -4729,7 +4729,7 @@ void Act_WriteBigMFUActions (struct Act_ListMFUActions *ListMFUActions) ""); Act_FormStart (Action); - Act_LinkFormSubmit (TabMenuStr,The_ClassFormulNB[Gbl.Prefs.Theme]); + Act_LinkFormSubmit (TabMenuStr,The_ClassFormNoWrap[Gbl.Prefs.Theme]); fprintf (Gbl.F.Out,"\"%s\"", diff --git a/swad_announcement.c b/swad_announcement.c index 50fa8da35..b46ce71d5 100644 --- a/swad_announcement.c +++ b/swad_announcement.c @@ -199,7 +199,7 @@ void Ann_ShowMyAnnouncementsNotMarkedAsSeen (void) static void Ann_ShowAnnouncement (long AnnCod,const char *Subject,const char *Content, unsigned Roles,bool ShowAllAnnouncements) { - extern const char *The_ClassFormul[The_NUM_THEMES]; + extern const char *The_ClassForm[The_NUM_THEMES]; extern const char *Txt_Users; extern const char *Txt_ROLES_PLURAL_abc[Rol_NUM_ROLES][Usr_NUM_SEXS]; extern const char *Txt_Remove; @@ -243,7 +243,7 @@ static void Ann_ShowAnnouncement (long AnnCod,const char *Subject,const char *Co /* Form to remove announcement */ Act_FormStart (ActRemAnn); Ann_PutHiddenParamAnnCod (AnnCod); - Act_LinkFormSubmit (Txt_Remove,The_ClassFormul[Gbl.Prefs.Theme]); + Act_LinkFormSubmit (Txt_Remove,The_ClassForm[Gbl.Prefs.Theme]); fprintf (Gbl.F.Out,"\"%s\"" @@ -259,7 +259,7 @@ static void Ann_ShowAnnouncement (long AnnCod,const char *Subject,const char *Co /* Form to mark announcement as seen */ Act_FormStart (ActAnnSee); Ann_PutHiddenParamAnnCod (AnnCod); - Act_LinkFormSubmit (Txt_Do_not_show_again,The_ClassFormul[Gbl.Prefs.Theme]); + Act_LinkFormSubmit (Txt_Do_not_show_again,The_ClassForm[Gbl.Prefs.Theme]); fprintf (Gbl.F.Out,"\"%s\"" @@ -309,7 +309,7 @@ static long Ann_GetParamAnnCod (void) void Ann_ShowFormAnnouncement (void) { - extern const char *The_ClassFormul[The_NUM_THEMES]; + extern const char *The_ClassForm[The_NUM_THEMES]; extern const char *Txt_New_announcement; extern const char *Txt_MSG_Subject; extern const char *Txt_MSG_Message; @@ -324,7 +324,7 @@ void Ann_ShowFormAnnouncement (void) /***** Message subject and body *****/ fprintf (Gbl.F.Out,"" - "" + "" "%s: " "" "" @@ -333,7 +333,7 @@ void Ann_ShowFormAnnouncement (void) "" "" "" - "" + "" "%s: " "" "" @@ -341,19 +341,19 @@ void Ann_ShowFormAnnouncement (void) "" "" "", - The_ClassFormul[Gbl.Prefs.Theme], + The_ClassForm[Gbl.Prefs.Theme], Txt_MSG_Subject, - The_ClassFormul[Gbl.Prefs.Theme], + The_ClassForm[Gbl.Prefs.Theme], Txt_MSG_Message); /***** Users' roles who can view the announcement *****/ fprintf (Gbl.F.Out,"" - "" + "" "%s: " "" "", + The_ClassForm[Gbl.Prefs.Theme], Txt_Users); Rol_WriteSelectorRoles (1 << Rol_STUDENT | 1 << Rol_TEACHER); diff --git a/swad_assignment.c b/swad_assignment.c index 0045c56c9..59a918ab1 100644 --- a/swad_assignment.c +++ b/swad_assignment.c @@ -1047,7 +1047,7 @@ static bool Asg_CheckIfSimilarAssignmentExists (const char *Field,const char *Va void Asg_RequestCreatOrEditAsg (void) { - extern const char *The_ClassFormul[The_NUM_THEMES]; + extern const char *The_ClassForm[The_NUM_THEMES]; extern const char *Txt_New_assignment; extern const char *Txt_Edit_assignment; extern const char *Txt_Start_date; @@ -1127,14 +1127,14 @@ void Asg_RequestCreatOrEditAsg (void) /***** Assignment title *****/ fprintf (Gbl.F.Out,"" - "" + "" "%s:" "" "" "" "" "", - The_ClassFormul[Gbl.Prefs.Theme], + The_ClassForm[Gbl.Prefs.Theme], Txt_Title, Asg_MAX_LENGTH_ASSIGNMENT_TITLE,Asg.Title); @@ -1144,14 +1144,14 @@ void Asg_RequestCreatOrEditAsg (void) StartOrEndTime++) { fprintf (Gbl.F.Out,"" - "" + "" "%s:" "" "" "" "" "" - "" - "" "", - The_ClassFormul[Gbl.Prefs.Theme], + The_ClassForm[Gbl.Prefs.Theme], Txt_Upload_files_QUESTION, - The_ClassFormul[Gbl.Prefs.Theme], Txt_Folder, Asg_MAX_LENGTH_FOLDER,Asg_MAX_LENGTH_FOLDER,Asg.Folder); /***** Assignment text *****/ fprintf (Gbl.F.Out,"" - "" "" \ - "" \ "" \ - "" \ "" \ - "" \ "" \ - "" \ "" \ - "" \ "" \ - "" \ ""); } @@ -5073,7 +5073,7 @@ static void Brw_PutIconRemoveDir (const char *PathInTree,const char *FileName,co Act_FormEnd (); } else - Lay_PutIconRemovalNotAllowed (); + Lay_PutIconBRemovalNotAllowed (); fprintf (Gbl.F.Out,""); } @@ -7639,7 +7639,7 @@ void Brw_ShowFormFileBrowser (void) static void Brw_PutFormToCreateAFolder (const char *FileNameToShow) { - extern const char *The_ClassFormul[The_NUM_THEMES]; + extern const char *The_ClassForm[The_NUM_THEMES]; extern const char *Txt_Create_folder; extern const char *Txt_You_can_create_a_new_folder_inside_the_folder_X; extern const char *Txt_Folder; @@ -7675,7 +7675,7 @@ static void Brw_PutFormToCreateAFolder (const char *FileNameToShow) "" "", - The_ClassFormul[Gbl.Prefs.Theme],Txt_Folder); + The_ClassForm[Gbl.Prefs.Theme],Txt_Folder); /* Button to send and end frame *****/ Lay_EndRoundFrameWithButton (Lay_CREATE_BUTTON,Txt_Create_folder); @@ -7872,7 +7872,7 @@ static void Brw_PutFormToPasteAFileOrFolder (const char *FileNameToShow) static void Brw_PutFormToCreateALink (const char *FileNameToShow) { - extern const char *The_ClassFormul[The_NUM_THEMES]; + extern const char *The_ClassForm[The_NUM_THEMES]; extern const char *Txt_Create_link; extern const char *Txt_or_you_can_create_a_new_link_inside_the_folder_X; extern const char *Txt_URL; @@ -7917,7 +7917,7 @@ static void Brw_PutFormToCreateALink (const char *FileNameToShow) " size=\"40\" maxlength=\"%u\" value=\"\" />" "" "", - The_ClassFormul[Gbl.Prefs.Theme],Txt_URL, + The_ClassForm[Gbl.Prefs.Theme],Txt_URL, PATH_MAX); /***** Link name *****/ @@ -7931,7 +7931,7 @@ static void Brw_PutFormToCreateALink (const char *FileNameToShow) "" "" "
", - The_ClassFormul[Gbl.Prefs.Theme], + The_ClassForm[Gbl.Prefs.Theme], Dates[StartOrEndTime]); /* Date */ @@ -1180,28 +1180,27 @@ void Asg_RequestCreatOrEditAsg (void) /***** Send work? *****/ fprintf (Gbl.F.Out,"
" + "" "%s:" "" + "" "%s: " "" "
" + "" "%s:" "" "", @@ -1079,12 +1086,13 @@ static void Exa_ShowExamAnnouncement (long ExaCod,Exa_tTypeViewExamAnnouncement_ /***** Exam mode *****/ fprintf (Gbl.F.Out,"
" + "" "%s:" "", - StyleForm,Txt_EXAM_ANNOUNCEMENT_Mode, + StyleForm, + Txt_EXAM_ANNOUNCEMENT_Mode, StyleNormal); if (TypeViewExamAnnouncement == Exa_FORM_VIEW) fprintf (Gbl.F.Out,"", @@ -1100,12 +1108,13 @@ static void Exa_ShowExamAnnouncement (long ExaCod,Exa_tTypeViewExamAnnouncement_ /***** Structure of the exam *****/ fprintf (Gbl.F.Out,"
" + "" "%s:" "", - StyleForm,Txt_EXAM_ANNOUNCEMENT_Structure_of_the_exam, + StyleForm, + Txt_EXAM_ANNOUNCEMENT_Structure_of_the_exam, StyleNormal); if (TypeViewExamAnnouncement == Exa_FORM_VIEW) fprintf (Gbl.F.Out,"", @@ -1121,12 +1130,13 @@ static void Exa_ShowExamAnnouncement (long ExaCod,Exa_tTypeViewExamAnnouncement_ /***** Documentation required *****/ fprintf (Gbl.F.Out,"
" + "" "%s:" "", - StyleForm,Txt_EXAM_ANNOUNCEMENT_Documentation_required, + StyleForm, + Txt_EXAM_ANNOUNCEMENT_Documentation_required, StyleNormal); if (TypeViewExamAnnouncement == Exa_FORM_VIEW) fprintf (Gbl.F.Out,"", @@ -1142,12 +1152,13 @@ static void Exa_ShowExamAnnouncement (long ExaCod,Exa_tTypeViewExamAnnouncement_ /***** Material required *****/ fprintf (Gbl.F.Out,"
" + "" "%s:" "", - StyleForm,Txt_EXAM_ANNOUNCEMENT_Material_required, + StyleForm, + Txt_EXAM_ANNOUNCEMENT_Material_required, StyleNormal); if (TypeViewExamAnnouncement == Exa_FORM_VIEW) fprintf (Gbl.F.Out,"", @@ -1163,12 +1174,13 @@ static void Exa_ShowExamAnnouncement (long ExaCod,Exa_tTypeViewExamAnnouncement_ /***** Material allowed *****/ fprintf (Gbl.F.Out,"
" + "" "%s:" "", - StyleForm,Txt_EXAM_ANNOUNCEMENT_Material_allowed, + StyleForm, + Txt_EXAM_ANNOUNCEMENT_Material_allowed, StyleNormal); if (TypeViewExamAnnouncement == Exa_FORM_VIEW) fprintf (Gbl.F.Out,"", @@ -1184,7 +1196,7 @@ static void Exa_ShowExamAnnouncement (long ExaCod,Exa_tTypeViewExamAnnouncement_ /***** Other information to students *****/ fprintf (Gbl.F.Out,"
" + "" "%s:" "", - The_ClassFormul[Gbl.Prefs.Theme]); + fprintf (Gbl.F.Out,"
", + The_ClassForm[Gbl.Prefs.Theme]); Act_FormStart (Brw_ActSeeAdm[Gbl.FileBrowser.Type]); switch (Gbl.FileBrowser.Type) { @@ -5029,7 +5029,7 @@ static void Brw_PutIconRemoveFile (Brw_FileType_t FileType, Act_FormEnd (); } else - Lay_PutIconRemovalNotAllowed (); + Lay_PutIconBRemovalNotAllowed (); fprintf (Gbl.F.Out,"
", - The_ClassFormul[Gbl.Prefs.Theme],Txt_Save_as,Txt_optional); + The_ClassForm[Gbl.Prefs.Theme],Txt_Save_as,Txt_optional); /***** Send button and end frame *****/ Lay_EndRoundFrameWithButton (Lay_CREATE_BUTTON,Txt_Create_link); @@ -8726,7 +8726,7 @@ bool Brw_CheckIfFileOrFolderIsHidden (struct FileMetadata *FileMetadata) void Brw_ShowFileMetadata (void) { - extern const char *The_ClassFormul[The_NUM_THEMES]; + extern const char *The_ClassForm[The_NUM_THEMES]; extern const char *Txt_The_file_of_folder_no_longer_exists_or_is_now_hidden; extern const char *Txt_Filename; extern const char *Txt_File_size; @@ -8903,24 +8903,24 @@ void Brw_ShowFileMetadata (void) /***** Filename *****/ fprintf (Gbl.F.Out,"" - "" + "" "%s:" "" "", - The_ClassFormul[Gbl.Prefs.Theme],Txt_Filename); + The_ClassForm[Gbl.Prefs.Theme],Txt_Filename); Brw_WriteSmallLinkToDownloadFile (URL,FileMetadata.FileType,FileNameToShow); fprintf (Gbl.F.Out,"" ""); /***** Publisher's data *****/ fprintf (Gbl.F.Out,"" - "" + "" "%s:" "" "", - The_ClassFormul[Gbl.Prefs.Theme],Txt_Uploaded_by); + The_ClassForm[Gbl.Prefs.Theme],Txt_Uploaded_by); if (FileHasPublisher) { /* Show photo */ @@ -8945,24 +8945,24 @@ void Brw_ShowFileMetadata (void) /***** Write the file size *****/ fprintf (Gbl.F.Out,"" - "" + "" "%s:" "" "", - The_ClassFormul[Gbl.Prefs.Theme],Txt_File_size); + The_ClassForm[Gbl.Prefs.Theme],Txt_File_size); Str_WriteSizeInBytesFull ((double) FileMetadata.Size); fprintf (Gbl.F.Out,"" ""); /***** Write the date *****/ fprintf (Gbl.F.Out,"" - "" + "" "%s:" "" "", - The_ClassFormul[Gbl.Prefs.Theme],Txt_Date_of_creation); + The_ClassForm[Gbl.Prefs.Theme],Txt_Date_of_creation); Dat_GetLocalTimeFromClock (&(FileMetadata.Time)); Dat_WriteDateTimeFromtblock (); fprintf (Gbl.F.Out,"" @@ -8970,12 +8970,12 @@ void Brw_ShowFileMetadata (void) /***** Private or public? *****/ fprintf (Gbl.F.Out,"" - "" + "" "%s:" "" "", - The_ClassFormul[Gbl.Prefs.Theme],Txt_Availability); + The_ClassForm[Gbl.Prefs.Theme],Txt_Availability); if (ICanChangePublic) // I can change file to public { fprintf (Gbl.F.Out,""); @@ -9030,7 +9030,7 @@ void Brw_ShowFileMetadata (void) /***** Write my number of views *****/ if (Gbl.Usrs.Me.Logged) fprintf (Gbl.F.Out,"" - "" + "" "%s:" "" "" "", - The_ClassFormul[Gbl.Prefs.Theme],Txt_My_views, + The_ClassForm[Gbl.Prefs.Theme],Txt_My_views, FileMetadata.NumMyViews); /***** Write number of identificated views *****/ fprintf (Gbl.F.Out,"" - "" + "" "%s:" "" "" "", - The_ClassFormul[Gbl.Prefs.Theme],Txt_Identified_views, + The_ClassForm[Gbl.Prefs.Theme],Txt_Identified_views, FileMetadata.NumViewsFromLoggedUsrs, FileMetadata.NumLoggedUsrs, (FileMetadata.NumLoggedUsrs == 1) ? Txt_user[Usr_SEX_UNKNOWN] : @@ -9059,7 +9059,7 @@ void Brw_ShowFileMetadata (void) /***** Write number of public views *****/ fprintf (Gbl.F.Out,"" - "" + "" "%s:" "" "" "", - The_ClassFormul[Gbl.Prefs.Theme],Txt_Public_views, + The_ClassForm[Gbl.Prefs.Theme],Txt_Public_views, FileMetadata.NumPublicViews); /***** End frame *****/ diff --git a/swad_follow.c b/swad_follow.c index 5aec38173..dda91b1bb 100644 --- a/swad_follow.c +++ b/swad_follow.c @@ -127,8 +127,8 @@ static void Fol_ShowNumberOfFollowingOrFollowers (const struct UsrData *UsrDat, Act_Action_t Action, const char *Title) { - extern const char *The_ClassFormul[The_NUM_THEMES]; - extern const char *The_ClassFormulB[The_NUM_THEMES]; + extern const char *The_ClassForm[The_NUM_THEMES]; + extern const char *The_ClassFormBold[The_NUM_THEMES]; fprintf (Gbl.F.Out,""); /* Text */ - fprintf (Gbl.F.Out,"
", - (Gbl.CurrentAct == Action) ? The_ClassFormulB[Gbl.Prefs.Theme] : - The_ClassFormul[Gbl.Prefs.Theme]); + fprintf (Gbl.F.Out,"
", + (Gbl.CurrentAct == Action) ? The_ClassFormBold[Gbl.Prefs.Theme] : + The_ClassForm[Gbl.Prefs.Theme]); if (NumUsrs) { /* Form to list followed users */ Act_FormStart (Action); Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod); Act_LinkFormSubmit (Title, - (Gbl.CurrentAct == Action) ? The_ClassFormulB[Gbl.Prefs.Theme] : - The_ClassFormul[Gbl.Prefs.Theme]); + (Gbl.CurrentAct == Action) ? The_ClassFormBold[Gbl.Prefs.Theme] : + The_ClassForm[Gbl.Prefs.Theme]); } fprintf (Gbl.F.Out,"%s",Title); if (NumUsrs) diff --git a/swad_forum.c b/swad_forum.c index 3094ea1c7..af93b7950 100644 --- a/swad_forum.c +++ b/swad_forum.c @@ -1782,13 +1782,13 @@ static void For_PutFormWhichForums (void) static void For_WriteLinkToTopLevelOfForums (void) { - extern const char *The_ClassFormul[The_NUM_THEMES]; + extern const char *The_ClassForm[The_NUM_THEMES]; extern const char *Txt_Forums; fprintf (Gbl.F.Out,"
  • "); Act_FormStart (ActSeeFor); For_PutAllHiddenParamsForum (); - Act_LinkFormSubmit (Txt_Forums,The_ClassFormul[Gbl.Prefs.Theme]); + Act_LinkFormSubmit (Txt_Forums,The_ClassForm[Gbl.Prefs.Theme]); fprintf (Gbl.F.Out,"\"%s\"" @@ -2108,8 +2108,8 @@ void For_SetForumName (For_ForumType_t ForumType, static void For_WriteLinkToForum (For_ForumType_t ForumType,Act_Action_t NextAct,const char *Icon,const char *ForumName,bool ShowNumOfPosts, unsigned Level,bool IsLastItemInLevel[1+For_FORUM_MAX_LEVELS]) { - extern const char *The_ClassFormul[The_NUM_THEMES]; - extern const char *The_ClassFormulB[The_NUM_THEMES]; + extern const char *The_ClassForm[The_NUM_THEMES]; + extern const char *The_ClassFormBold[The_NUM_THEMES]; extern const char *Txt_Copy_not_allowed; extern const char *Txt_Paste_thread; unsigned NumThrs; @@ -2121,8 +2121,8 @@ static void For_WriteLinkToForum (For_ForumType_t ForumType,Act_Action_t NextAct /***** Get number of threads and number of posts *****/ NumThrs = For_GetNumThrsInForum (ForumType); NumThrsWithNewPosts = For_GetNumThrsWithNewPstsInForum (ForumType,NumThrs); - Style = (NumThrsWithNewPosts ? The_ClassFormulB[Gbl.Prefs.Theme] : - The_ClassFormul[Gbl.Prefs.Theme]); + Style = (NumThrsWithNewPosts ? The_ClassFormBold[Gbl.Prefs.Theme] : + The_ClassForm[Gbl.Prefs.Theme]); /***** Start row *****/ fprintf (Gbl.F.Out,"
  • "); @@ -3206,8 +3206,8 @@ unsigned For_GetNumPstsInForum (For_ForumType_t ForumType) void For_ListForumThrs (long ThrCods[Pag_ITEMS_PER_PAGE],struct Pagination *PaginationThrs) { - extern const char *The_ClassFormul[The_NUM_THEMES]; - extern const char *The_ClassFormulB[The_NUM_THEMES]; + extern const char *The_ClassForm[The_NUM_THEMES]; + extern const char *The_ClassFormBold[The_NUM_THEMES]; extern const char *Txt_You_have_written_1_post_in_this_thread; extern const char *Txt_You_have_written_X_posts_in_this_thread; extern const char *Txt_Thread_with_posts_from_you; @@ -3332,8 +3332,8 @@ void For_ListForumThrs (long ThrCods[Pag_ITEMS_PER_PAGE],struct Pagination *Pagi Pag_WriteLinksToPages (Pag_POSTS_FORUM,Thr.ThrCod,&PaginationPsts, Thr.Enabled[For_FIRST_MSG], Thr.Subject, - Thr.NumUnreadPosts ? The_ClassFormulB[Gbl.Prefs.Theme] : - The_ClassFormul[Gbl.Prefs.Theme], + Thr.NumUnreadPosts ? The_ClassFormBold[Gbl.Prefs.Theme] : + The_ClassForm[Gbl.Prefs.Theme], true); fprintf (Gbl.F.Out,""); @@ -3687,7 +3687,7 @@ void For_ShowForumLevel2 (long ThrCod) static void For_WriteFormForumPst (bool IsReply,long ThrCod,const char *Subject) { - extern const char *The_ClassFormul[The_NUM_THEMES]; + extern const char *The_ClassForm[The_NUM_THEMES]; extern const char *Txt_New_message; extern const char *Txt_New_thread; extern const char *Txt_MSG_Subject; @@ -3708,12 +3708,12 @@ static void For_WriteFormForumPst (bool IsReply,long ThrCod,const char *Subject) Lay_StartRoundFrameTable (NULL,2,IsReply ? Txt_New_message : Txt_New_thread); fprintf (Gbl.F.Out,"" - "" + "" "%s: " "" "" "" "" "", - The_ClassFormul[Gbl.Prefs.Theme], + The_ClassForm[Gbl.Prefs.Theme], Txt_MSG_Message); /***** Help for text editor *****/ diff --git a/swad_group.c b/swad_group.c index ff4f1c34f..0fb8357ca 100644 --- a/swad_group.c +++ b/swad_group.c @@ -226,8 +226,8 @@ static void Grp_EditGroups (void) static void Grp_ShowFormSeveralGrps (Act_Action_t NextAction) { - extern const char *The_ClassFormul[The_NUM_THEMES]; - extern const char *The_ClassFormulB[The_NUM_THEMES]; + extern const char *The_ClassForm[The_NUM_THEMES]; + extern const char *The_ClassFormBold[The_NUM_THEMES]; extern const char *Txt_Groups; extern const char *Txt_All_groups; extern const char *Txt_Update_students; @@ -251,10 +251,9 @@ static void Grp_ShowFormSeveralGrps (Act_Action_t NextAction) /***** Select all groups *****/ fprintf (Gbl.F.Out,"" - "" + "" "" @@ -280,7 +279,7 @@ static void Grp_ShowFormSeveralGrps (Act_Action_t NextAction) fprintf (Gbl.F.Out,"" ""); - Act_LinkFormSubmitAnimated (Txt_Update_students_according_to_selected_groups,The_ClassFormulB[Gbl.Prefs.Theme]); + Act_LinkFormSubmitAnimated (Txt_Update_students_according_to_selected_groups,The_ClassFormBold[Gbl.Prefs.Theme]); Lay_PutCalculateIconWithText (Txt_Update_students_according_to_selected_groups,Txt_Update_students); fprintf (Gbl.F.Out,"" ""); diff --git a/swad_indicator.c b/swad_indicator.c index b5d6b8999..7b41d9b24 100644 --- a/swad_indicator.c +++ b/swad_indicator.c @@ -74,8 +74,8 @@ static unsigned long Ind_GetNumFilesOfCrsFileZoneFromDB (Brw_FileBrowser_t FileB void Ind_ReqIndicatorsCourses (void) { - extern const char *The_ClassFormul[The_NUM_THEMES]; - extern const char *The_ClassFormulB[The_NUM_THEMES]; + extern const char *The_ClassForm[The_NUM_THEMES]; + extern const char *The_ClassFormBold[The_NUM_THEMES]; extern const char *Txt_Scope; extern const char *Txt_Types_of_degree; extern const char *Txt_only_if_the_scope_is_X; @@ -101,11 +101,11 @@ void Ind_ReqIndicatorsCourses (void) fprintf (Gbl.F.Out,"" "" - "" "" - "" "" - "" - "" ""); @@ -147,12 +147,12 @@ void Ind_ReqIndicatorsCourses (void) /* Show only courses with a numer of indicators */ Gbl.Stat.NumIndicators = Ind_GetParamNumIndicators (); fprintf (Gbl.F.Out,"" - "" - "" "" diff --git a/swad_info.c b/swad_info.c index b1b668959..20e0cae43 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_ClassFormul[The_NUM_THEMES]; + extern const char *The_ClassFormRightMiddle[The_NUM_THEMES]; extern const char *Txt_Force_students_to_read_this_information; fprintf (Gbl.F.Out,"
    ", - The_ClassFormul[Gbl.Prefs.Theme]); + The_ClassFormRightMiddle[Gbl.Prefs.Theme]); Act_FormStart (Inf_ActionsChangeForceReadInfo[InfoType]); fprintf (Gbl.F.Out,"", - The_ClassFormul[Gbl.Prefs.Theme]); + The_ClassFormRightMiddle[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_ClassFormul[Gbl.Prefs.Theme]); + Act_LinkFormSubmit (Act_GetTitleAction (Inf_ActionsSeeInfo[InfoType]),The_ClassFormRightMiddle[Gbl.Prefs.Theme]); fprintf (Gbl.F.Out,"%s" "", Act_GetTitleAction (Inf_ActionsSeeInfo[InfoType])); @@ -868,7 +868,7 @@ void Inf_WriteURLIntoTxtBuffer (Inf_InfoType_t InfoType,char TxtBuffer[Cns_MAX_B static void Inf_ShowPage (Inf_InfoType_t InfoType,const char *URL) { - extern const char *The_ClassFormulB[The_NUM_THEMES]; + extern const char *The_ClassFormBold[The_NUM_THEMES]; extern const char *Txt_View_in_a_new_window; extern const char *Txt_INFO_TITLE[Inf_NUM_INFO_TYPES]; @@ -877,7 +877,7 @@ static void Inf_ShowPage (Inf_InfoType_t InfoType,const char *URL) /***** Link to view in a new window *****/ fprintf (Gbl.F.Out,"", - URL,The_ClassFormulB[Gbl.Prefs.Theme]); + URL,The_ClassFormBold[Gbl.Prefs.Theme]); Lay_PutIconWithText ("fullscreen", Txt_View_in_a_new_window, Txt_View_in_a_new_window); @@ -1046,7 +1046,7 @@ void Inf_FormToEnterRichTextEditor (Inf_InfoSrc_t InfoSrc,Inf_InfoType_t InfoTyp void Inf_FormToSendPage (Inf_InfoSrc_t InfoSrc,Inf_InfoType_t InfoType) { - extern const char *The_ClassFormul[The_NUM_THEMES]; + extern const char *The_ClassFormRightMiddle[The_NUM_THEMES]; extern const char *Txt_File; extern const char *Txt_Upload_file; @@ -1064,7 +1064,7 @@ void Inf_FormToSendPage (Inf_InfoSrc_t InfoSrc,Inf_InfoType_t InfoType) "" "" "
    " + "" "%s:" "", - The_ClassFormul[Gbl.Prefs.Theme],Txt_Scope); + The_ClassForm[Gbl.Prefs.Theme],Txt_Scope); Gbl.Scope.Allowed = 1 << Sco_SCOPE_SYS | 1 << Sco_SCOPE_CTY | 1 << Sco_SCOPE_INS | @@ -120,12 +120,12 @@ void Ind_ReqIndicatorsCourses (void) /* Compute stats for a type of degree */ fprintf (Gbl.F.Out,"
    " + "" "%s:" "", - The_ClassFormul[Gbl.Prefs.Theme],Txt_Types_of_degree); + " style=\"text-align:left; vertical-align:middle;\">", + The_ClassForm[Gbl.Prefs.Theme],Txt_Types_of_degree); Deg_WriteSelectorDegTypes (); fprintf (Gbl.F.Out," ("); fprintf (Gbl.F.Out,Txt_only_if_the_scope_is_X, @@ -135,11 +135,11 @@ void Ind_ReqIndicatorsCourses (void) /* Compute stats for courses with teachers belonging to any department or to a particular departament? */ fprintf (Gbl.F.Out,"
    " + "" "%s:" "", - The_ClassFormul[Gbl.Prefs.Theme],Txt_Department); + "", + The_ClassForm[Gbl.Prefs.Theme],Txt_Department); Dpt_WriteSelectorDepartment (-1L); fprintf (Gbl.F.Out,"
    " + "" "%s:" "" + "" ""); - Act_LinkFormSubmitAnimated (Txt_Update_indicators,The_ClassFormulB[Gbl.Prefs.Theme]); + Act_LinkFormSubmitAnimated (Txt_Update_indicators,The_ClassFormBold[Gbl.Prefs.Theme]); Lay_PutCalculateIconWithText (Txt_Update_indicators,Txt_Update_indicators); fprintf (Gbl.F.Out,"
    ", - The_ClassFormul[Gbl.Prefs.Theme],Txt_File, + The_ClassFormRightMiddle[Gbl.Prefs.Theme],Txt_File, Fil_NAME_OF_PARAM_FILENAME_ORG); /***** Send button *****/ @@ -1080,7 +1080,7 @@ void Inf_FormToSendPage (Inf_InfoSrc_t InfoSrc,Inf_InfoType_t InfoType) void Inf_FormToSendURL (Inf_InfoSrc_t InfoSrc,Inf_InfoType_t InfoType) { - extern const char *The_ClassFormul[The_NUM_THEMES]; + extern const char *The_ClassFormRightMiddle[The_NUM_THEMES]; extern const char *Txt_URL; extern const char *Txt_Send_URL; FILE *FileURL; @@ -1096,7 +1096,7 @@ void Inf_FormToSendURL (Inf_InfoSrc_t InfoSrc,Inf_InfoType_t InfoType) "" "" "" "", - The_ClassFormul[Gbl.Prefs.Theme], + The_ClassFormRightMiddle[Gbl.Prefs.Theme], Txt_Institution); if (PutLink) fprintf (Gbl.F.Out,"" "", - The_ClassFormul[Gbl.Prefs.Theme], + The_ClassFormRightMiddle[Gbl.Prefs.Theme], Txt_Short_name, Gbl.CurrentIns.Ins.ShortName); @@ -325,7 +325,7 @@ static void Ins_Configuration (bool PrintView) "" "", - The_ClassFormul[Gbl.Prefs.Theme], + The_ClassFormRightMiddle[Gbl.Prefs.Theme], Txt_Web, Gbl.CurrentIns.Ins.WWW); Str_LimitLengthHTMLStr (Gbl.CurrentIns.Ins.WWW,20); @@ -348,7 +348,7 @@ static void Ins_Configuration (bool PrintView) "" "" "", - The_ClassFormul[Gbl.Prefs.Theme], + The_ClassFormRightMiddle[Gbl.Prefs.Theme], Txt_Shortcut, Cfg_HTTPS_URL_SWAD_CGI,Txt_STR_LANG_ID[Gbl.Prefs.Language],Gbl.CurrentIns.Ins.InsCod, Cfg_HTTPS_URL_SWAD_CGI,Txt_STR_LANG_ID[Gbl.Prefs.Language],Gbl.CurrentIns.Ins.InsCod); @@ -362,7 +362,7 @@ static void Ins_Configuration (bool PrintView) "" "", - The_ClassFormul[Gbl.Prefs.Theme], + The_ClassFormRightMiddle[Gbl.Prefs.Theme], Txt_QR_code); QR_LinkTo (200,"ins",Gbl.CurrentIns.Ins.InsCod); fprintf (Gbl.F.Out,"" @@ -380,7 +380,7 @@ static void Ins_Configuration (bool PrintView) "%u" "" "", - The_ClassFormul[Gbl.Prefs.Theme], + The_ClassFormRightMiddle[Gbl.Prefs.Theme], Txt_Centres, Ctr_GetNumCtrsInIns (Gbl.CurrentIns.Ins.InsCod)); @@ -394,7 +394,7 @@ static void Ins_Configuration (bool PrintView) "%u" "" "", - The_ClassFormul[Gbl.Prefs.Theme], + The_ClassFormRightMiddle[Gbl.Prefs.Theme], Txt_Degrees, Deg_GetNumDegsInIns (Gbl.CurrentIns.Ins.InsCod)); @@ -408,7 +408,7 @@ static void Ins_Configuration (bool PrintView) "%u" "" "", - The_ClassFormul[Gbl.Prefs.Theme], + The_ClassFormRightMiddle[Gbl.Prefs.Theme], Txt_Courses, Crs_GetNumCrssInIns (Gbl.CurrentIns.Ins.InsCod)); @@ -422,7 +422,7 @@ static void Ins_Configuration (bool PrintView) "%u" "" "", - The_ClassFormul[Gbl.Prefs.Theme], + The_ClassFormRightMiddle[Gbl.Prefs.Theme], Txt_Departments, Dpt_GetNumDepartmentsInInstitution (Gbl.CurrentIns.Ins.InsCod)); @@ -436,7 +436,7 @@ static void Ins_Configuration (bool PrintView) "%u" "" "", - The_ClassFormul[Gbl.Prefs.Theme], + The_ClassFormRightMiddle[Gbl.Prefs.Theme], Txt_ROLES_PLURAL_Abc[Rol_TEACHER][Usr_SEX_UNKNOWN], Usr_GetNumUsrsInCrssOfIns (Rol_TEACHER,Gbl.CurrentIns.Ins.InsCod)); @@ -450,7 +450,7 @@ static void Ins_Configuration (bool PrintView) "%u" "" "", - The_ClassFormul[Gbl.Prefs.Theme], + The_ClassFormRightMiddle[Gbl.Prefs.Theme], Txt_ROLES_PLURAL_Abc[Rol_STUDENT][Usr_SEX_UNKNOWN], Usr_GetNumUsrsInCrssOfIns (Rol_STUDENT,Gbl.CurrentIns.Ins.InsCod)); } diff --git a/swad_logo.c b/swad_logo.c index 63d3cc005..82d82c1ca 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_ClassFormul[The_NUM_THEMES]; + extern const char *The_ClassFormRightMiddle[The_NUM_THEMES]; extern const char *Txt_Logo; extern const char *Txt_You_can_send_a_file_with_an_image_in_png_format_transparent_background_and_size_X_Y; extern const char *Txt_File_with_the_logo; @@ -296,7 +296,7 @@ void Log_RequestLogo (Sco_Scope_t Scope) "" "", - The_ClassFormul[Gbl.Prefs.Theme], + The_ClassFormRightMiddle[Gbl.Prefs.Theme], Txt_File_with_the_logo, Fil_NAME_OF_PARAM_FILENAME_ORG); @@ -313,12 +313,12 @@ void Log_RequestLogo (Sco_Scope_t Scope) static void Log_PutLinkToRemoveLogo (Act_Action_t Action) { - extern const char *The_ClassFormulB[The_NUM_THEMES]; + extern const char *The_ClassFormBold[The_NUM_THEMES]; extern const char *Txt_Remove_logo; /***** Link for removing the photo *****/ Act_FormStart (Action); - Act_LinkFormSubmit (Txt_Remove_logo,The_ClassFormulB[Gbl.Prefs.Theme]); + Act_LinkFormSubmit (Txt_Remove_logo,The_ClassFormBold[Gbl.Prefs.Theme]); Lay_PutIconWithText ("delon",Txt_Remove_logo,Txt_Remove_logo); Act_FormEnd (); } diff --git a/swad_mail.c b/swad_mail.c index 539f93511..0c8739f78 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_ClassFormul[The_NUM_THEMES]; + extern const char *The_ClassFormRightMiddle[The_NUM_THEMES]; extern const char *Txt_Current_email; extern const char *Txt_Other_emails; extern const char *Txt_Email_X_confirmed; @@ -953,7 +953,7 @@ void Mai_ShowFormChangeUsrEmail (void) "%s:" "" "" "%s:", NumEmails - 1, - The_ClassFormul[Gbl.Prefs.Theme], + The_ClassFormRightMiddle[Gbl.Prefs.Theme], Txt_Other_emails); fprintf (Gbl.F.Out,"" "" "", - The_ClassFormul[Gbl.Prefs.Theme], + The_ClassFormRightMiddle[Gbl.Prefs.Theme], NumEmails ? Txt_New_email : // A new e-mail Txt_Email); // The first e-mail Act_FormStart (ActChgMai); diff --git a/swad_mark.c b/swad_mark.c index 85e5f129c..74af76ef2 100644 --- a/swad_mark.c +++ b/swad_mark.c @@ -106,7 +106,7 @@ void Mrk_GetAndWriteNumRowsHeaderAndFooter (Brw_FileType_t FileType, const char *PathInTree, const char *FileName) { - extern const char *The_ClassFormulNB[The_NUM_THEMES]; + extern const char *The_ClassFormNoWrap[The_NUM_THEMES]; extern const char *Txt_TABLE_Header; extern const char *Txt_TABLE_Footer; struct MarksProperties Marks; @@ -124,7 +124,7 @@ void Mrk_GetAndWriteNumRowsHeaderAndFooter (Brw_FileType_t FileType, /***** Write the number of rows of header *****/ fprintf (Gbl.F.Out,"", - The_ClassFormulNB[Gbl.Prefs.Theme], + The_ClassFormNoWrap[Gbl.Prefs.Theme], Gbl.ColorRows[Gbl.RowEvenOdd]); if (Gbl.CurrentCrs.Grps.GrpCod > 0) // Group zone @@ -151,7 +151,7 @@ void Mrk_GetAndWriteNumRowsHeaderAndFooter (Brw_FileType_t FileType, /***** Write the number of rows of footer *****/ fprintf (Gbl.F.Out,"", - The_ClassFormulNB[Gbl.Prefs.Theme], + The_ClassFormNoWrap[Gbl.Prefs.Theme], Gbl.ColorRows[Gbl.RowEvenOdd]); if (Gbl.CurrentCrs.Grps.GrpCod > 0) // Group zone diff --git a/swad_message.c b/swad_message.c index af3fb1b40..f80ea3e1f 100644 --- a/swad_message.c +++ b/swad_message.c @@ -126,7 +126,7 @@ static bool Msg_CheckIfUsrIsBanned (long FromUsrCod,long ToUsrCod); void Msg_ListEMails (void) { - extern const char *The_ClassFormulB[The_NUM_THEMES]; + extern const char *The_ClassFormBold[The_NUM_THEMES]; extern const char *Txt_Students_who_have_accepted_and_who_have_e_mail; extern const char *Txt_X_students_who_have_e_mail; extern const char *Txt_X_students_who_have_accepted_and_who_have_e_mail; @@ -224,7 +224,7 @@ void Msg_ListEMails (void) Gbl.Usrs.Me.UsrDat.Email, Gbl.CurrentCrs.Crs.FullName,Gbl.Usrs.Me.UsrDat.Email,StrAddresses, Txt_Create_e_mail_message, - The_ClassFormulB[Gbl.Prefs.Theme]); + The_ClassFormBold[Gbl.Prefs.Theme]); Lay_PutIconWithText ("editnewmsg",Txt_Create_e_mail_message,Txt_Create_e_mail_message); fprintf (Gbl.F.Out,"
    • "); } @@ -257,7 +257,7 @@ void Msg_FormMsgUsrs (void) static void Msg_PutFormMsgUsrs (const char *Content) { - extern const char *The_ClassFormul[The_NUM_THEMES]; + extern const char *The_ClassFormRightMiddle[The_NUM_THEMES]; extern const char *Txt_New_message; extern const char *Txt_MSG_To; extern const char *Txt_Send_message; @@ -324,7 +324,7 @@ static void Msg_PutFormMsgUsrs (const char *Content) "" "" "", - The_ClassFormul[Gbl.Prefs.Theme],Txt_MSG_To); + The_ClassFormRightMiddle[Gbl.Prefs.Theme],Txt_MSG_To); /* Teachers */ Usr_ListUsersToSelect (Rol_TEACHER); @@ -424,7 +424,7 @@ void Msg_WriteFormUsrsIDsOrNicksOtherRecipients (bool IsReply) static void Msg_WriteFormSubjectAndContentMsgToUsrs (const char *Content) { - extern const char *The_ClassFormul[The_NUM_THEMES]; + extern const char *The_ClassFormRightMiddle[The_NUM_THEMES]; extern const char *Txt_MSG_Subject; extern const char *Txt_MSG_Message; extern const char *Txt_Original_message; @@ -443,7 +443,7 @@ static void Msg_WriteFormSubjectAndContentMsgToUsrs (const char *Content) "" "" "", - The_ClassFormul[Gbl.Prefs.Theme], + The_ClassFormRightMiddle[Gbl.Prefs.Theme], Txt_MSG_Message); /***** Button to create notice and end frame *****/ @@ -470,7 +470,7 @@ static void Not_DrawANotice (Not_Listing_t TypeNoticesListing, long UsrCod, Not_Status_t NoticeStatus) { - extern const char *The_ClassFormul[The_NUM_THEMES]; + extern const char *The_ClassFormRightMiddle[The_NUM_THEMES]; extern const char *Txt_NOTICE_Active_SINGULAR; extern const char *Txt_NOTICE_Active_Mark_as_obsolete; extern const char *Txt_NOTICE_Obsolete_SINGULAR; @@ -568,7 +568,7 @@ static void Not_DrawANotice (Not_Listing_t TypeNoticesListing, /* Form to view full notice */ Act_FormStart (ActShoNot); Not_PutHiddenParamNotCod (NotCod); - Act_LinkFormSubmit (Txt_See_full_notice,The_ClassFormul[Gbl.Prefs.Theme]); + Act_LinkFormSubmit (Txt_See_full_notice,The_ClassFormRightMiddle[Gbl.Prefs.Theme]); fprintf (Gbl.F.Out,"\"%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_ClassFormul[Gbl.Prefs.Theme]); + Act_LinkFormSubmit (Txt_Remove,The_ClassFormRightMiddle[Gbl.Prefs.Theme]); fprintf (Gbl.F.Out,"\"%s\"" diff --git a/swad_notification.c b/swad_notification.c index 4d240d6b0..5bf8c86db 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_ClassFormul[The_NUM_THEMES]; + extern const char *The_ClassFormRightMiddle[The_NUM_THEMES]; extern const char *Txt_Show_all_notifications; /***** Start form *****/ fprintf (Gbl.F.Out,"
    ", - The_ClassFormul[Gbl.Prefs.Theme]); + The_ClassFormRightMiddle[Gbl.Prefs.Theme]); Act_FormStart (ActSeeNtf); /***** End form *****/ @@ -1646,11 +1646,11 @@ static void Ntf_PutLinkToChangePrefs (void) static void Ntf_PutLinkToMarkAllNotifAsSeen (void) { - extern const char *The_ClassFormulB[The_NUM_THEMES]; + extern const char *The_ClassFormBold[The_NUM_THEMES]; extern const char *Txt_Mark_all_notifications_as_read; Act_FormStart (ActMrkNtfSee); - Act_LinkFormSubmit (Txt_Mark_all_notifications_as_read,The_ClassFormulB[Gbl.Prefs.Theme]); + Act_LinkFormSubmit (Txt_Mark_all_notifications_as_read,The_ClassFormBold[Gbl.Prefs.Theme]); Lay_PutIconWithText ("visible_on",Txt_Mark_all_notifications_as_read,Txt_Mark_all_notifications_as_read); Act_FormEnd (); } @@ -1680,7 +1680,7 @@ void Ntf_MarkAllNotifAsSeen (void) void Ntf_PutFormChangeNotifSentByEMail (void) { - extern const char *The_ClassFormul[The_NUM_THEMES]; + extern const char *The_ClassFormRightMiddle[The_NUM_THEMES]; extern const char *Txt_Save_changes; extern const char *Txt_Notifications; extern const char *Txt_Create_BR_notification; @@ -1716,7 +1716,7 @@ void Ntf_PutFormChangeNotifSentByEMail (void) "" "
    " "", - The_ClassFormul[Gbl.Prefs.Theme], + The_ClassFormRightMiddle[Gbl.Prefs.Theme], Txt_Current_password, Pwd_MAX_LENGTH_PLAIN_PASSWORD); @@ -726,7 +726,7 @@ void Pwd_ShowFormChgPwd (void) void Pwd_PutFormToGetNewPasswordTwice (void) { - extern const char *The_ClassFormul[The_NUM_THEMES]; + extern const char *The_ClassFormRightMiddle[The_NUM_THEMES]; extern const char *Txt_New_password; extern const char *Txt_Password; extern const char *Txt_HELP_password; @@ -752,12 +752,12 @@ void Pwd_PutFormToGetNewPasswordTwice (void) " size=\"25\" maxlength=\"%u\" placeholder=\"%s\" />" "" "", - The_ClassFormul[Gbl.Prefs.Theme], + The_ClassFormRightMiddle[Gbl.Prefs.Theme], Gbl.Usrs.Me.Logged? Txt_New_password : // Changing my password Txt_Password, // Creating new account Pwd_MAX_LENGTH_PLAIN_PASSWORD, Gbl.Message, - The_ClassFormul[Gbl.Prefs.Theme], + The_ClassFormRightMiddle[Gbl.Prefs.Theme], Gbl.Usrs.Me.Logged ? Txt_Retype_new_password : // Changing my password Txt_Retype_password, // Creating new account Pwd_MAX_LENGTH_PLAIN_PASSWORD, @@ -867,7 +867,7 @@ bool Pwd_CheckIfICanChangeOtherUsrPassword (long UsrCod) void Pwd_AskForConfirmationOnDangerousAction (void) { - extern const char *The_ClassFormul[The_NUM_THEMES]; + extern const char *The_ClassFormRightMiddle[The_NUM_THEMES]; extern const char *Txt_I_understand_that_this_action_may_have_serious_consequences_and_can_not_be_undone; extern const char *Txt_For_security_enter_your_password; @@ -878,9 +878,9 @@ void Pwd_AskForConfirmationOnDangerousAction (void) "" "", - The_ClassFormul[Gbl.Prefs.Theme], + The_ClassFormRightMiddle[Gbl.Prefs.Theme], Txt_I_understand_that_this_action_may_have_serious_consequences_and_can_not_be_undone, - The_ClassFormul[Gbl.Prefs.Theme], + The_ClassFormRightMiddle[Gbl.Prefs.Theme], Txt_For_security_enter_your_password, Pwd_MAX_LENGTH_PLAIN_PASSWORD); } diff --git a/swad_photo.c b/swad_photo.c index c113206cb..74ae538d9 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_ClassFormul[The_NUM_THEMES]; + extern const char *The_ClassFormRightMiddle[The_NUM_THEMES]; extern const char *Txt_Photo; extern const char *Txt_You_can_send_a_file_with_an_image_in_jpg_format_; extern const char *Txt_File_with_the_photo; @@ -293,7 +293,7 @@ void Pho_ReqPhoto (const struct UsrData *UsrDat,bool PhotoExists,const char *Pho " size=\"40\" maxlength=\"100\" value=\"%ld.jpg\" />" "" "", - The_ClassFormul[Gbl.Prefs.Theme], + The_ClassFormRightMiddle[Gbl.Prefs.Theme], Txt_File_with_the_photo, Fil_NAME_OF_PARAM_FILENAME_ORG, UsrDat->UsrCod); @@ -1511,7 +1511,7 @@ void Pho_ShowOrPrintPhotoDegree (Pho_AvgPhotoSeeOrPrint_t SeeOrPrint) static void Pho_PutSelectorForTypeOfAvg (void) { - extern const char *The_ClassFormul[The_NUM_THEMES]; + extern const char *The_ClassFormRightMiddle[The_NUM_THEMES]; extern const char *Txt_Average_type; extern const char *Txt_AVERAGE_PHOTO_TYPES[Pho_NUM_AVERAGE_PHOTO_TYPES]; Pho_AvgPhotoTypeOfAverage_t TypeOfAvg; @@ -1521,7 +1521,7 @@ static void Pho_PutSelectorForTypeOfAvg (void) "%s:" "" "" "" "" "" "" "" "" "" "" "" "" "" "", - The_ClassFormul[Gbl.Prefs.Theme], + The_ClassFormRightMiddle[Gbl.Prefs.Theme], Txt_Title, Svy_MAX_LENGTH_SURVEY_TITLE,Svy.Title); @@ -1625,7 +1625,7 @@ void Svy_RequestCreatOrEditSvy (void) "
    " "" "
    " "" "", - The_ClassFormul[Gbl.Prefs.Theme],Txt_nick_email_or_ID, + The_ClassFormRightMiddle[Gbl.Prefs.Theme],Txt_nick_email_or_ID, Usr_MAX_LENGTH_USR_LOGIN,Gbl.Usrs.Me.UsrIdLogin); /***** Send button and end table *****/ @@ -659,7 +659,7 @@ bool Pwd_FastCheckIfPasswordSeemsGood (const char *PlainPassword) void Pwd_ShowFormChgPwd (void) { - extern const char *The_ClassFormul[The_NUM_THEMES]; + extern const char *The_ClassFormRightMiddle[The_NUM_THEMES]; extern const char *Txt_Before_going_to_any_other_option_you_must_create_your_password; extern const char *Txt_Your_password_is_not_secure_enough; extern const char *Txt_Your_password_must_be_at_least_X_characters_and_can_not_contain_spaces_; @@ -695,7 +695,7 @@ void Pwd_ShowFormChgPwd (void) " size=\"25\" maxlength=\"%u\" autocomplete=\"off\" />" "
    ", - The_ClassFormul[Gbl.Prefs.Theme],Txt_Average_type); + The_ClassFormRightMiddle[Gbl.Prefs.Theme],Txt_Average_type); Act_FormStart (ActSeePhoDeg); Pho_PutHiddenParamPhotoSize (); Pho_PutHiddenParamOrderDegrees (); @@ -1580,7 +1580,7 @@ static Pho_AvgPhotoTypeOfAverage_t Pho_GetPhotoAvgTypeFromForm (void) static void Pho_PutSelectorForHowComputePhotoSize (void) { - extern const char *The_ClassFormul[The_NUM_THEMES]; + extern const char *The_ClassFormRightMiddle[The_NUM_THEMES]; extern const char *Txt_Size_of_photos; extern const char *Txt_STAT_DEGREE_PHOTO_SIZE[Pho_NUM_HOW_COMPUTE_PHOTO_SIZES]; Pho_HowComputePhotoSize_t PhoSi; @@ -1590,7 +1590,7 @@ static void Pho_PutSelectorForHowComputePhotoSize (void) "%s:" "", - The_ClassFormul[Gbl.Prefs.Theme],Txt_Size_of_photos); + The_ClassFormRightMiddle[Gbl.Prefs.Theme],Txt_Size_of_photos); Act_FormStart (ActSeePhoDeg); Pho_PutHiddenParamTypeOfAvg (); Pho_PutHiddenParamOrderDegrees (); @@ -1649,7 +1649,7 @@ static Pho_HowComputePhotoSize_t Pho_GetHowComputePhotoSizeFromForm (void) static void Pho_PutSelectorForHowOrderDegrees (void) { - extern const char *The_ClassFormul[The_NUM_THEMES]; + extern const char *The_ClassFormRightMiddle[The_NUM_THEMES]; extern const char *Txt_Sort_degrees_by; extern const char *Txt_STAT_DEGREE_PHOTO_ORDER[Pho_NUM_HOW_ORDER_DEGREES]; Pho_HowOrderDegrees_t Order; @@ -1659,7 +1659,7 @@ static void Pho_PutSelectorForHowOrderDegrees (void) "%s:" "", - The_ClassFormul[Gbl.Prefs.Theme],Txt_Sort_degrees_by); + The_ClassFormRightMiddle[Gbl.Prefs.Theme],Txt_Sort_degrees_by); Act_FormStart (ActSeePhoDeg); Pho_PutHiddenParamTypeOfAvg (); Pho_PutHiddenParamPhotoSize (); @@ -1742,7 +1742,7 @@ static void Pho_PutLinkToPrintViewOfDegreeStatsParams (void) static void Pho_PutLinkToCalculateDegreeStats (void) { - extern const char *The_ClassFormulB[The_NUM_THEMES]; + extern const char *The_ClassFormBold[The_NUM_THEMES]; extern const char *Txt_Calculate_average_photo_of_a_degree; extern const char *Txt_Calculate_average_photo_of_THE_DEGREE_X; extern const char *Txt_unknown_TIME; @@ -1771,7 +1771,7 @@ static void Pho_PutLinkToCalculateDegreeStats (void) Usr_PutParamUsrListType (Gbl.Usrs.Me.ListType); Usr_PutParamColsClassPhoto (); Usr_PutParamListWithPhotos (); - Act_LinkFormSubmitAnimated (Txt_Calculate_average_photo_of_a_degree,The_ClassFormulB[Gbl.Prefs.Theme]); + Act_LinkFormSubmitAnimated (Txt_Calculate_average_photo_of_a_degree,The_ClassFormBold[Gbl.Prefs.Theme]); Lay_PutCalculateIconWithText (Txt_Calculate_average_photo_of_a_degree,Txt_Calculate_average_photo_of_THE_DEGREE_X); /***** Put selector with all the degrees *****/ diff --git a/swad_profile.c b/swad_profile.c index 6f0a0eb24..845dda440 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_ClassFormul[The_NUM_THEMES]; + extern const char *The_ClassFormRightMiddle[The_NUM_THEMES]; extern const char *Txt_Nickname; extern const char *Txt_Continue; @@ -151,7 +151,7 @@ static void Prf_RequestUserProfileWithDefaultNickname (const char *DefaultNickna "" "", - The_ClassFormul[Gbl.Prefs.Theme], + The_ClassFormRightMiddle[Gbl.Prefs.Theme], Txt_Nickname, Nck_MAX_BYTES_NICKNAME_WITH_ARROBA, DefaultNickname); @@ -293,7 +293,7 @@ void Prf_ChangeProfileVisibility (void) static void Prf_ShowDetailsUserProfile (const struct UsrData *UsrDat) { - extern const char *The_ClassFormulB[The_NUM_THEMES]; + extern const char *The_ClassFormBold[The_NUM_THEMES]; extern const char *Txt_ROLES_SINGUL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS]; extern const char *Txt_teachers_ABBREVIATION; extern const char *Txt_students_ABBREVIATION; @@ -444,7 +444,7 @@ static void Prf_ShowDetailsUserProfile (const struct UsrData *UsrDat) /***** Button to fetch and store first click time *****/ Act_FormStart (ActCal1stClkTim); Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod); - Act_LinkFormSubmitAnimated (Txt_Calculate,The_ClassFormulB[Gbl.Prefs.Theme]); + Act_LinkFormSubmitAnimated (Txt_Calculate,The_ClassFormBold[Gbl.Prefs.Theme]); Lay_PutCalculateIconWithText (Txt_Calculate,Txt_Calculate); Act_FormEnd (); } @@ -488,7 +488,7 @@ static void Prf_ShowDetailsUserProfile (const struct UsrData *UsrDat) /***** Button to fetch and store number of clicks *****/ Act_FormStart (ActCalNumClk); Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod); - Act_LinkFormSubmitAnimated (Txt_Calculate,The_ClassFormulB[Gbl.Prefs.Theme]); + Act_LinkFormSubmitAnimated (Txt_Calculate,The_ClassFormBold[Gbl.Prefs.Theme]); Lay_PutCalculateIconWithText (Txt_Calculate,Txt_Calculate); Act_FormEnd (); } @@ -527,7 +527,7 @@ static void Prf_ShowDetailsUserProfile (const struct UsrData *UsrDat) /***** Button to fetch and store number of file views *****/ Act_FormStart (ActCalNumFilVie); Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod); - Act_LinkFormSubmitAnimated (Txt_Calculate,The_ClassFormulB[Gbl.Prefs.Theme]); + Act_LinkFormSubmitAnimated (Txt_Calculate,The_ClassFormBold[Gbl.Prefs.Theme]); Lay_PutCalculateIconWithText (Txt_Calculate,Txt_Calculate); Act_FormEnd (); } @@ -566,7 +566,7 @@ static void Prf_ShowDetailsUserProfile (const struct UsrData *UsrDat) /***** Button to fetch and store number of forum posts *****/ Act_FormStart (ActCalNumForPst); Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod); - Act_LinkFormSubmitAnimated (Txt_Calculate,The_ClassFormulB[Gbl.Prefs.Theme]); + Act_LinkFormSubmitAnimated (Txt_Calculate,The_ClassFormBold[Gbl.Prefs.Theme]); Lay_PutCalculateIconWithText (Txt_Calculate,Txt_Calculate); Act_FormEnd (); } @@ -605,7 +605,7 @@ static void Prf_ShowDetailsUserProfile (const struct UsrData *UsrDat) /***** Button to fetch and store number of messages sent *****/ Act_FormStart (ActCalNumMsgSnt); Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod); - Act_LinkFormSubmitAnimated (Txt_Calculate,The_ClassFormulB[Gbl.Prefs.Theme]); + Act_LinkFormSubmitAnimated (Txt_Calculate,The_ClassFormBold[Gbl.Prefs.Theme]); Lay_PutCalculateIconWithText (Txt_Calculate,Txt_Calculate); Act_FormEnd (); } @@ -754,7 +754,7 @@ static unsigned long Prf_GetNumUsrsWithNumClicksPerDay (void) static void Prf_ShowRanking (unsigned long Rank,unsigned long NumUsrs) { - extern const char *The_ClassFormul[The_NUM_THEMES]; + extern const char *The_ClassFormRightMiddle[The_NUM_THEMES]; extern const char *Txt_of_PART_OF_A_TOTAL; /***** Part of a total and end container *****/ @@ -765,7 +765,7 @@ static void Prf_ShowRanking (unsigned long Rank,unsigned long NumUsrs) Act_FormStart (ActSeeUseGbl); Sco_PutParamScope (Sco_SCOPE_SYS); Par_PutHiddenParamUnsigned ("UseStatType",(unsigned) Sta_USERS_RANKING); - Act_LinkFormSubmit (Gbl.Title,The_ClassFormul[Gbl.Prefs.Theme]); + Act_LinkFormSubmit (Gbl.Title,The_ClassFormRightMiddle[Gbl.Prefs.Theme]); fprintf (Gbl.F.Out,"#%lu",Rank); Act_FormEnd (); } diff --git a/swad_record.c b/swad_record.c index f11215fa3..c2a5eabe3 100644 --- a/swad_record.c +++ b/swad_record.c @@ -1284,17 +1284,17 @@ void Rec_ListRecordsTchsCrs (void) void Rec_ShowLinkToPrintPreviewOfRecords (void) { - extern const char *The_ClassFormulB[The_NUM_THEMES]; - extern const char *The_ClassFormul[The_NUM_THEMES]; + extern const char *The_ClassFormBold[The_NUM_THEMES]; + extern const char *The_ClassFormRightMiddle[The_NUM_THEMES]; extern const char *Txt_Print; extern const char *Txt_record_cards_per_page; unsigned i; - Act_LinkFormSubmit (Txt_Print,The_ClassFormulB[Gbl.Prefs.Theme]); + Act_LinkFormSubmit (Txt_Print,The_ClassFormBold[Gbl.Prefs.Theme]); Lay_PutIconWithText ("print",Txt_Print,Txt_Print); fprintf (Gbl.F.Out,"(" "" " %s)", - The_ClassFormul[Gbl.Prefs.Theme],Txt_record_cards_per_page); + The_ClassFormRightMiddle[Gbl.Prefs.Theme],Txt_record_cards_per_page); } /*****************************************************************************/ @@ -1329,7 +1329,7 @@ static void Rec_GetParamRecordsPerPage (void) static void Rec_WriteFormShowOfficeHours (bool ShowOfficeHours,const char *ListUsrCods) { - extern const char *The_ClassFormul[The_NUM_THEMES]; + extern const char *The_ClassFormRightMiddle[The_NUM_THEMES]; extern const char *Txt_Show_office_hours; /***** Start form *****/ @@ -1353,7 +1353,7 @@ static void Rec_WriteFormShowOfficeHours (bool ShowOfficeHours,const char *ListU Gbl.Prefs.IconsURL, Txt_Show_office_hours, Txt_Show_office_hours, - The_ClassFormul[Gbl.Prefs.Theme], + The_ClassFormRightMiddle[Gbl.Prefs.Theme], Txt_Show_office_hours); Act_FormEnd (); } @@ -1439,7 +1439,7 @@ void Rec_UpdateAndShowOtherCrsRecord (void) void Rec_ShowCrsRecord (Rec_RecordViewType_t TypeOfView,struct UsrData *UsrDat) { - extern const char *The_ClassFormul[The_NUM_THEMES]; + extern const char *The_ClassFormRightMiddle[The_NUM_THEMES]; extern const char *Txt_You_dont_have_permission_to_perform_this_action; extern const char *Txt_RECORD_FIELD_VISIBILITY_RECORD[Rec_NUM_TYPES_VISIBILITY]; extern const char *Txt_Save; @@ -1575,7 +1575,7 @@ void Rec_ShowCrsRecord (Rec_RecordViewType_t TypeOfView,struct UsrData *UsrDat) " text-align:left; vertical-align:top;" " background-color:%s;\">" "%s:", - ICanEdit ? The_ClassFormul[Gbl.Prefs.Theme] : + ICanEdit ? The_ClassFormRightMiddle[Gbl.Prefs.Theme] : "DAT_REC_SMALL", Col1Width,Gbl.ColorRows[Gbl.RowEvenOdd], Gbl.CurrentCrs.Records.LstFields.Lst[NumField].Name); @@ -1942,7 +1942,7 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView, struct UsrData *UsrDat) { extern const char *Usr_StringsSexDB[Usr_NUM_SEXS]; - extern const char *The_ClassFormul[The_NUM_THEMES]; + extern const char *The_ClassFormRightMiddle[The_NUM_THEMES]; extern const char *Txt_Edit_my_personal_data; extern const char *Txt_Edit; extern const char *Txt_View_record_for_this_course; @@ -2063,7 +2063,7 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView, struct Department Dpt; ClassHead = "HEAD_REC"; - ClassForm = The_ClassFormul[Gbl.Prefs.Theme]; + ClassForm = The_ClassFormRightMiddle[Gbl.Prefs.Theme]; ClassData = "DAT_REC"; switch (TypeOfView) { @@ -2073,7 +2073,7 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView, case Rec_FORM_NEW_RECORD_OTHER_NEW_USR: case Rec_FORM_MODIFY_RECORD_OTHER_EXISTING_USR: ClassHead = "HEAD_REC"; - ClassForm = The_ClassFormul[Gbl.Prefs.Theme]; + ClassForm = The_ClassFormRightMiddle[Gbl.Prefs.Theme]; ClassData = "DAT_REC"; break; case Rec_MY_COMMON_RECORD_CHECK: @@ -3303,7 +3303,7 @@ static void Rec_PutLinkToChangeMySocialNetworks (void) void Rec_ShowFormMyInsCtrDpt (void) { - extern const char *The_ClassFormul[The_NUM_THEMES]; + extern const char *The_ClassFormRightMiddle[The_NUM_THEMES]; extern const char *Txt_Please_fill_in_your_institution; extern const char *Txt_Please_fill_in_your_centre_and_department; extern const char *Txt_Institution_centre_and_department; @@ -3316,7 +3316,7 @@ void Rec_ShowFormMyInsCtrDpt (void) extern const char *Txt_Another_department; extern const char *Txt_Office; extern const char *Txt_Phone; - const char *ClassForm = The_ClassFormul[Gbl.Prefs.Theme]; + const char *ClassForm = The_ClassFormRightMiddle[Gbl.Prefs.Theme]; unsigned NumCty; unsigned NumIns; unsigned NumCtr; diff --git a/swad_role.c b/swad_role.c index 3d35eaec4..d740774be 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_ClassFormul[The_NUM_THEMES]; + extern const char *The_ClassFormRightMiddle[The_NUM_THEMES]; /***** Students or teachers *****/ fprintf (Gbl.F.Out,"
    " "
      ", - The_ClassFormul[Gbl.Prefs.Theme]); + The_ClassFormRightMiddle[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 4bd138779..d93bcf72f 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_ClassFormul[The_NUM_THEMES]; + extern const char *The_ClassFormRightMiddle[The_NUM_THEMES]; extern const char *Txt_Scope; extern const char *Txt_All; extern const char *Txt_Institutions; @@ -237,7 +237,7 @@ static void Sch_PutFormToSearchWithWhatToSearchAndScope (Act_Action_t Action,Sco /***** Scope (whole platform, current centre, current degree or current course) *****/ fprintf (Gbl.F.Out,"
    " "%s: ", - The_ClassFormul[Gbl.Prefs.Theme],Txt_Scope); + The_ClassFormRightMiddle[Gbl.Prefs.Theme],Txt_Scope); Gbl.Scope.Allowed = 1 << Sco_SCOPE_SYS | 1 << Sco_SCOPE_CTY | 1 << Sco_SCOPE_INS | diff --git a/swad_statistic.c b/swad_statistic.c index 0e135ff03..3d20967cf 100644 --- a/swad_statistic.c +++ b/swad_statistic.c @@ -379,11 +379,11 @@ void Sta_RemoveOldEntriesRecentLog (void) static void Sta_PutFormToRequestAccessesCrs (void) { - extern const char *The_ClassFormulB[The_NUM_THEMES]; + extern const char *The_ClassFormBold[The_NUM_THEMES]; extern const char *Txt_Visits_to_course; Act_FormStart (ActReqAccCrs); - Act_LinkFormSubmit (Txt_Visits_to_course,The_ClassFormulB[Gbl.Prefs.Theme]); + Act_LinkFormSubmit (Txt_Visits_to_course,The_ClassFormBold[Gbl.Prefs.Theme]); Lay_PutIconWithText ("stats",Txt_Visits_to_course,Txt_Visits_to_course); Act_FormEnd (); } @@ -394,7 +394,7 @@ static void Sta_PutFormToRequestAccessesCrs (void) void Sta_AskSeeCrsAccesses (void) { - extern const char *The_ClassFormul[The_NUM_THEMES]; + extern const char *The_ClassFormRightMiddle[The_NUM_THEMES]; extern const char *Txt_distributed_by; extern const char *Txt_STAT_CLICK_STAT_TYPES[Sta_NUM_TYPES_CLICK_STATS]; extern const char *Txt_results_per_page; @@ -464,7 +464,7 @@ void Sta_AskSeeCrsAccesses (void) "
    		", - The_ClassFormul[Gbl.Prefs.Theme],Txt_distributed_by); + The_ClassFormRightMiddle[Gbl.Prefs.Theme],Txt_distributed_by); if ((Gbl.Stat.ClicksStatType < Sta_ACC_CRS_PER_USR || Gbl.Stat.ClicksStatType > Sta_ACC_CRS_PER_ACTION) && Gbl.Stat.ClicksStatType != Sta_ACC_CRS_LISTING) @@ -487,7 +487,7 @@ void Sta_AskSeeCrsAccesses (void) fprintf (Gbl.F.Out,"
    " "%s", @@ -541,7 +541,7 @@ void Sta_AskSeeCrsAccesses (void) void Sta_AskSeeGblAccesses (void) { - extern const char *The_ClassFormul[The_NUM_THEMES]; + extern const char *The_ClassFormRightMiddle[The_NUM_THEMES]; extern const char *Txt_Users; extern const char *Txt_ROLE_STATS[Sta_NUM_ROLES_STAT]; extern const char *Txt_Scope; @@ -575,7 +575,7 @@ void Sta_AskSeeGblAccesses (void) "" "", - The_ClassFormul[Gbl.Prefs.Theme],Txt_Scope); + The_ClassFormRightMiddle[Gbl.Prefs.Theme],Txt_Scope); Gbl.Scope.Allowed = 1 << Sco_SCOPE_SYS | 1 << Sco_SCOPE_CTY | 1 << Sco_SCOPE_INS | @@ -621,7 +621,7 @@ void Sta_AskSeeGblAccesses (void) "", - The_ClassFormul[Gbl.Prefs.Theme],Txt_distributed_by); + The_ClassFormRightMiddle[Gbl.Prefs.Theme],Txt_distributed_by); if (Gbl.Stat.ClicksStatType < Sta_ACC_GBL_PER_DAYS || Gbl.Stat.ClicksStatType > Sta_ACC_GBL_PER_COURSE) Gbl.Stat.ClicksStatType = Sta_ACC_GBL_PER_DAYS; @@ -653,7 +653,7 @@ void Sta_AskSeeGblAccesses (void) static void Sta_WriteSelectorCountType (void) { - extern const char *The_ClassFormul[The_NUM_THEMES]; + extern const char *The_ClassFormRightMiddle[The_NUM_THEMES]; extern const char *Txt_Show; extern const char *Txt_STAT_TYPE_COUNT_SMALL[Sta_NUM_STAT_COUNT_TYPES]; Sta_CountType_t StatCountType; @@ -665,7 +665,7 @@ static void Sta_WriteSelectorCountType (void) "" "" "
    ", - The_ClassFormul[Gbl.Prefs.Theme]); + The_ClassFormRightMiddle[Gbl.Prefs.Theme]); Act_FormStart (Gbl.CurrentAct); Sta_WriteParamsDatesSeeAccesses (); @@ -3594,7 +3594,7 @@ static void Sta_WriteSelectedRangeOfDates (unsigned NumDays) void Sta_ReqUseOfPlatform (void) { - extern const char *The_ClassFormul[The_NUM_THEMES]; + extern const char *The_ClassFormRightMiddle[The_NUM_THEMES]; extern const char *Txt_Scope; extern const char *Txt_Statistic; extern const char *Txt_STAT_USE_STAT_TYPES[Sta_NUM_TYPES_USE_STATS]; @@ -3609,7 +3609,7 @@ void Sta_ReqUseOfPlatform (void) /***** Compute stats for anywhere, degree or course? *****/ fprintf (Gbl.F.Out,"
    " "%s: ", - The_ClassFormul[Gbl.Prefs.Theme],Txt_Scope); + The_ClassFormRightMiddle[Gbl.Prefs.Theme],Txt_Scope); Gbl.Scope.Allowed = 1 << Sco_SCOPE_SYS | 1 << Sco_SCOPE_CTY | 1 << Sco_SCOPE_INS | @@ -4803,7 +4803,7 @@ static void Sta_GetAndShowInssOrderedByNumUsrsWhoClaimToBelongToThem (void) static void Sta_GetAndShowInss (const char *Query,const char *TxtFigure) { - extern const char *The_ClassFormul[The_NUM_THEMES]; + extern const char *The_ClassFormRightMiddle[The_NUM_THEMES]; extern const char *Txt_Institution; MYSQL_RES *mysql_res; MYSQL_ROW row; @@ -4856,12 +4856,12 @@ static void Sta_GetAndShowInss (const char *Query,const char *TxtFigure) /***** Write link to institution *****/ fprintf (Gbl.F.Out,"
    		", - The_ClassFormul[Gbl.Prefs.Theme]); + The_ClassFormRightMiddle[Gbl.Prefs.Theme]); /* Icon and name of this institution */ Act_FormStart (ActSeeInsInf); Ins_PutParamInsCod (Ins.InsCod); - Act_LinkFormSubmit (Ins.ShortName,The_ClassFormul[Gbl.Prefs.Theme]); + Act_LinkFormSubmit (Ins.ShortName,The_ClassFormRightMiddle[Gbl.Prefs.Theme]); Log_DrawLogo (Sco_SCOPE_INS,Ins.InsCod,Ins.ShortName, 32,NULL,true); fprintf (Gbl.F.Out," %s",Ins.FullName); diff --git a/swad_survey.c b/swad_survey.c index 672e5c84a..1a71fd92a 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_ClassFormul[The_NUM_THEMES]; + extern const char *The_ClassFormRightMiddle[The_NUM_THEMES]; extern const char *Txt_New_survey; extern const char *Txt_Scope; extern const char *Txt_Edit_survey; @@ -1590,7 +1590,7 @@ void Svy_RequestCreatOrEditSvy (void) "%s:" "", - The_ClassFormul[Gbl.Prefs.Theme], + The_ClassFormRightMiddle[Gbl.Prefs.Theme], Txt_Scope); if (!Svy_SetDefaultAndAllowedForEdition ()) Lay_ShowErrorAndExit ("You don't have permission to edit surveys here."); @@ -1608,7 +1608,7 @@ void Svy_RequestCreatOrEditSvy (void) "" "
    " "" "" "" "", - The_ClassFormul[Gbl.Prefs.Theme],Txt_Stem, + The_ClassFormRightMiddle[Gbl.Prefs.Theme],Txt_Stem, Txt); /***** Type of answer *****/ @@ -2459,11 +2459,11 @@ static void Svy_ShowFormEditOneQst (long SvyCod,struct SurveyQuestion *SvyQst,ch "", - The_ClassFormul[Gbl.Prefs.Theme], + The_ClassFormRightMiddle[Gbl.Prefs.Theme], Txt_Type); fprintf (Gbl.F.Out,"", - The_ClassFormul[Gbl.Prefs.Theme],NumAns+1); + The_ClassFormRightMiddle[Gbl.Prefs.Theme],NumAns+1); /* Answer text */ fprintf (Gbl.F.Out,"" diff --git a/swad_test.c b/swad_test.c index 2fb86c603..c5f2796f5 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_ClassFormul[The_NUM_THEMES]; + extern const char *The_ClassFormRightMiddle[The_NUM_THEMES]; extern const char *Txt_No_of_questions; extern const char *Txt_Generate_exam; extern const char *Txt_No_test_questions_in_X; @@ -284,7 +284,7 @@ void Tst_ShowFormAskTst (void) "%s: " "" "" "%s" @@ -1147,12 +1147,12 @@ void Tst_ShowFormAskEditTsts (void) static void Tst_PutFormToCreateNewTstQst (void) { - extern const char *The_ClassFormulB[The_NUM_THEMES]; + extern const char *The_ClassFormBold[The_NUM_THEMES]; extern const char *Txt_New_question; /***** Put form to create a new test question *****/ Act_FormStart (ActEdiOneTstQst); - Act_LinkFormSubmit (Txt_New_question,The_ClassFormulB[Gbl.Prefs.Theme]); + Act_LinkFormSubmit (Txt_New_question,The_ClassFormBold[Gbl.Prefs.Theme]); Lay_PutIconWithText ("new",Txt_New_question,Txt_New_question); Act_FormEnd (); } @@ -1378,7 +1378,7 @@ static unsigned long Tst_GetEnabledTagsFromThisCrs (MYSQL_RES **mysql_res) static void Tst_ShowFormSelTags (unsigned long NumRows,MYSQL_RES *mysql_res,bool ShowOnlyEnabledTags) { - extern const char *The_ClassFormul[The_NUM_THEMES]; + extern const char *The_ClassFormRightMiddle[The_NUM_THEMES]; extern const char *Txt_Tags; extern const char *Txt_All_tags; extern const char *Txt_Tag_not_allowed; @@ -1398,7 +1398,7 @@ static void Tst_ShowFormSelTags (unsigned long NumRows,MYSQL_RES *mysql_res,bool fprintf (Gbl.F.Out,""); fprintf (Gbl.F.Out,"" "" "
    ", - The_ClassFormul[Gbl.Prefs.Theme], + The_ClassFormRightMiddle[Gbl.Prefs.Theme], Dates[StartOrEndTime]); Dat_WriteFormDate (Gbl.Now.Date.Year-1, Gbl.Now.Date.Year+1, @@ -1654,7 +1654,7 @@ void Svy_RequestCreatOrEditSvy (void) "" "" "
    " "%s:" "", - The_ClassFormul[Gbl.Prefs.Theme]); + The_ClassFormRightMiddle[Gbl.Prefs.Theme]); for (AnsType = (Svy_AnswerType_t) 0; AnsType < Svy_NUM_ANS_TYPES; AnsType++) @@ -2493,7 +2493,7 @@ static void Svy_ShowFormEditOneQst (long SvyCod,struct SurveyQuestion *SvyQst,ch "" "%u)" "" @@ -2918,7 +2918,7 @@ static unsigned Svy_GetNextQuestionIndexInSvy (long SvyCod) static void Svy_ListSvyQuestions (struct Survey *Svy,struct SurveyQuestion *SvyQst) { - extern const char *The_ClassFormulB[The_NUM_THEMES]; + extern const char *The_ClassFormBold[The_NUM_THEMES]; extern const char *Txt_Questions; extern const char *Txt_No_INDEX; extern const char *Txt_Type; @@ -3077,7 +3077,7 @@ static void Svy_ListSvyQuestions (struct Survey *Svy,struct SurveyQuestion *SvyQ Svy_PutHiddenParamSvyOrderType (); Grp_PutParamWhichGrps (); Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage); - Act_LinkFormSubmit (Txt_New_question,The_ClassFormulB[Gbl.Prefs.Theme]); + Act_LinkFormSubmit (Txt_New_question,The_ClassFormBold[Gbl.Prefs.Theme]); Lay_PutIconWithText ("new",Txt_New_question,Txt_New_question); Act_FormEnd (); fprintf (Gbl.F.Out,"" "" @@ -1569,7 +1569,7 @@ static void Tst_PutIconDisable (long TagCod,const char *TagTxt) static void Tst_ShowFormConfigTst (void) { - extern const char *The_ClassFormul[The_NUM_THEMES]; + extern const char *The_ClassFormRightMiddle[The_NUM_THEMES]; extern const char *Txt_Configure_tests; extern const char *Txt_Plugins; extern const char *Txt_TST_PLUGGABLE[Tst_NUM_OPTIONS_PLUGGABLE]; @@ -1597,7 +1597,7 @@ static void Tst_ShowFormConfigTst (void) "%s:" "", - The_ClassFormul[Gbl.Prefs.Theme], + The_ClassFormRightMiddle[Gbl.Prefs.Theme], Txt_Plugins); for (Pluggable = Tst_PLUGGABLE_NO; Pluggable <= Tst_PLUGGABLE_YES; @@ -1620,7 +1620,7 @@ static void Tst_ShowFormConfigTst (void) "" "", - The_ClassFormul[Gbl.Prefs.Theme], + The_ClassFormRightMiddle[Gbl.Prefs.Theme], Txt_No_of_questions); /* Minimum number of questions in a test exam */ @@ -1668,7 +1668,7 @@ static void Tst_ShowFormConfigTst (void) "" "" "", - The_ClassFormul[Gbl.Prefs.Theme], + The_ClassFormRightMiddle[Gbl.Prefs.Theme], Txt_Minimum_time_seconds_per_question_between_two_tests, Gbl.Test.Config.MinTimeNxtTstPerQst); @@ -1678,7 +1678,7 @@ static void Tst_ShowFormConfigTst (void) "%s:" "" "" "" "
    ", - The_ClassFormul[Gbl.Prefs.Theme],Txt_Feedback_to_students); + The_ClassFormRightMiddle[Gbl.Prefs.Theme],Txt_Feedback_to_students); for (FeedbTyp = (Tst_Feedback_t) 0; FeedbTyp < Tst_NUM_TYPES_FEEDBACK; FeedbTyp++) @@ -1988,7 +1988,7 @@ static void Tst_CheckAndCorrectNumbersQst (void) static void Tst_ShowFormAnswerTypes (void) { - extern const char *The_ClassFormul[The_NUM_THEMES]; + extern const char *The_ClassFormRightMiddle[The_NUM_THEMES]; extern const char *Txt_Types_of_answers; extern const char *Txt_All_types_of_answers; extern const char *Txt_TST_STR_ANSWER_TYPES[Tst_NUM_ANS_TYPES]; @@ -2003,7 +2003,7 @@ static void Tst_ShowFormAnswerTypes (void) fprintf (Gbl.F.Out,"
    " "" @@ -4078,7 +4078,7 @@ void Tst_ShowFormEditOneQst (void) static void Tst_PutFormEditOneQst (char *Stem,char *Feedback) { - extern const char *The_ClassFormul[The_NUM_THEMES]; + extern const char *The_ClassFormRightMiddle[The_NUM_THEMES]; extern const char *Txt_Question_code_X; extern const char *Txt_New_question; extern const char *Txt_Tags; @@ -4243,7 +4243,7 @@ static void Tst_PutFormEditOneQst (char *Stem,char *Feedback) "" "", - The_ClassFormul[Gbl.Prefs.Theme],Txt_Tags); + The_ClassFormRightMiddle[Gbl.Prefs.Theme],Txt_Tags); for (NumTag = 0; NumTag < Tst_MAX_TAGS_PER_QUESTION; NumTag++) @@ -4308,7 +4308,7 @@ static void Tst_PutFormEditOneQst (char *Stem,char *Feedback) "" "" "", - The_ClassFormul[Gbl.Prefs.Theme], + The_ClassFormRightMiddle[Gbl.Prefs.Theme], Txt_Stem, Stem); @@ -4319,7 +4319,7 @@ static void Tst_PutFormEditOneQst (char *Stem,char *Feedback) "" "
    " "