diff --git a/css/swad18.54.css b/css/swad18.55.css similarity index 98% rename from css/swad18.54.css rename to css/swad18.55.css index 0e36e490..99ff86bc 100644 --- a/css/swad18.54.css +++ b/css/swad18.55.css @@ -2024,33 +2024,24 @@ a:hover img.CENTRE_PHOTO_SHOW } /********************************* Form fonts ********************************/ -.FORM_WHITE {color:#4D88A1; font-size:13pt;} -.FORM_GREY {color:#4D88A1; font-size:13pt;} -.FORM_PURPLE {color:#4D88A1; font-size:13pt;} -.FORM_BLUE {color:#4D88A1; font-size:13pt;} -.FORM_YELLOW {color:#7C4D2A; font-size:13pt;} -.FORM_PINK {color:#4D88A1; font-size:13pt;} +/* Inside white box */ +.FORM_IN_WHITE {color:#4d88a1; font-size:13pt;} +.FORM_IN_GREY {color:#4d88a1; font-size:13pt;} +.FORM_IN_PURPLE {color:#4d88a1; font-size:13pt;} +.FORM_IN_BLUE {color:#4d88a1; font-size:13pt;} +.FORM_IN_YELLOW {color:#7c4d2a; font-size:13pt;} +.FORM_IN_PINK {color:#4d88a1; font-size:13pt;} -.FORM_DARK_WHITE {color:#365E6E; font-size:13pt;} -.FORM_DARK_GREY {color:#365E6E; font-size:13pt;} -.FORM_DARK_PURPLE {color:#365E6E; font-size:13pt;} -.FORM_DARK_BLUE {color:#365E6E; font-size:13pt;} -.FORM_DARK_YELLOW {color:#4A2E19; font-size:13pt;} -.FORM_DARK_PINK {color:#365E6E; font-size:13pt;} +/* Outside white box */ +.FORM_OUT_WHITE {color:#4d88a1; font-size:13pt;} +.FORM_OUT_GREY {color:#4d88a1; font-size:13pt;} +.FORM_OUT_PURPLE {color:#573c4d; font-size:13pt;} +.FORM_OUT_BLUE {color:#4d88a1; font-size:13pt;} +.FORM_OUT_YELLOW {color:#7c4d2a; font-size:13pt;} +.FORM_OUT_PINK {color:#63474e; font-size:13pt;} -.FORM_NOWRAP_WHITE {color:#4D88A1; font-size:13pt; white-space:nowrap;} -.FORM_NOWRAP_GREY {color:#4D88A1; font-size:13pt; white-space:nowrap;} -.FORM_NOWRAP_PURPLE {color:#4D88A1; font-size:13pt; white-space:nowrap;} -.FORM_NOWRAP_BLUE {color:#4D88A1; font-size:13pt; white-space:nowrap;} -.FORM_NOWRAP_YELLOW {color:#7C4D2A; font-size:13pt; white-space:nowrap;} -.FORM_NOWRAP_PINK {color:#4D88A1; font-size:13pt; white-space:nowrap;} - -.FORM_BOLD_WHITE {color:#4D88a1; font-size:13pt; font-weight:bold;} -.FORM_BOLD_GREY {color:#4D88a1; font-size:13pt; font-weight:bold;} -.FORM_BOLD_PURPLE {color:#573c4d; font-size:13pt; font-weight:bold;} -.FORM_BOLD_BLUE {color:#4D88a1; font-size:13pt; font-weight:bold;} -.FORM_BOLD_YELLOW {color:#7c4d2a; font-size:13pt; font-weight:bold;} -.FORM_BOLD_PINK {color:#63474e; font-size:13pt; font-weight:bold;} +.BOLD {font-weight:bold;} +.NOWRAP {white-space:nowrap;} /****************************** Placing of objects ***************************/ .LEFT_TOP {text-align:left; vertical-align:top;} diff --git a/swad_ID.c b/swad_ID.c index 8a952bfd..726d3e57 100644 --- a/swad_ID.c +++ b/swad_ID.c @@ -455,7 +455,7 @@ bool ID_ICanSeeOtherUsrIDs (const struct UsrData *UsrDat) static void ID_PutLinkToConfirmID (struct UsrData *UsrDat,unsigned NumID, const char *Anchor) { - extern const char *The_ClassFormBold[The_NUM_THEMES]; + extern const char *The_ClassFormOutBoxBold[The_NUM_THEMES]; extern const char *Txt_Confirm_ID; Act_Action_t NextAction; @@ -496,7 +496,7 @@ static void ID_PutLinkToConfirmID (struct UsrData *UsrDat,unsigned NumID, UsrDat->IDs.List[NumID].ID); /***** Put link *****/ - Frm_LinkFormSubmit (Txt_Confirm_ID,The_ClassFormBold[Gbl.Prefs.Theme],NULL); + Frm_LinkFormSubmit (Txt_Confirm_ID,The_ClassFormOutBoxBold[Gbl.Prefs.Theme],NULL); Ico_PutIconTextLink ("check.svg", Txt_Confirm_ID); fprintf (Gbl.F.Out,""); @@ -577,7 +577,7 @@ static void ID_ShowFormChangeUsrID (const struct UsrData *UsrDat, bool ItsMe,bool IShouldFillInID) { extern const char *Hlp_PROFILE_Account; - extern const char *The_ClassForm[The_NUM_THEMES]; + extern const char *The_ClassFormInBox[The_NUM_THEMES]; extern const char *Txt_Please_fill_in_your_ID; extern const char *Txt_ID_X_confirmed; extern const char *Txt_ID_X_not_confirmed; @@ -612,7 +612,7 @@ static void ID_ShowFormChangeUsrID (const struct UsrData *UsrDat, "" "" "", - The_ClassForm[Gbl.Prefs.Theme],Txt_ID); + The_ClassFormInBox[Gbl.Prefs.Theme],Txt_ID); else // NumID >= 1 fprintf (Gbl.F.Out,"
"); @@ -684,7 +684,7 @@ static void ID_ShowFormChangeUsrID (const struct UsrData *UsrDat, "" "" "", - The_ClassForm[Gbl.Prefs.Theme], + The_ClassFormInBox[Gbl.Prefs.Theme], UsrDat->IDs.Num ? Txt_Another_ID : // A new user's ID Txt_ID); // The first user's ID if (ItsMe) diff --git a/swad_MFU.c b/swad_MFU.c index 37894531..d09fdfde 100644 --- a/swad_MFU.c +++ b/swad_MFU.c @@ -206,7 +206,7 @@ void MFU_ShowMyMFUActions (void) void MFU_WriteBigMFUActions (struct MFU_ListMFUActions *ListMFUActions) { extern const char *Hlp_ANALYTICS_Frequent; - extern const char *The_ClassFormNoWrap[The_NUM_THEMES]; + extern const char *The_ClassFormInBoxNoWrap[The_NUM_THEMES]; extern const char *Txt_My_frequent_actions; extern const char *Txt_TABS_TXT[Tab_NUM_TABS]; unsigned NumAct; @@ -243,7 +243,7 @@ void MFU_WriteBigMFUActions (struct MFU_ListMFUActions *ListMFUActions) /* Icon and text */ fprintf (Gbl.F.Out,"
  • "); Frm_StartForm (Action); - Frm_LinkFormSubmit (TabMenuStr,The_ClassFormNoWrap[Gbl.Prefs.Theme],NULL); + Frm_LinkFormSubmit (TabMenuStr,The_ClassFormInBoxNoWrap[Gbl.Prefs.Theme],NULL); fprintf (Gbl.F.Out,"\"%s\"", Gbl.Prefs.URLIconSet, Act_GetIcon (Action), diff --git a/swad_account.c b/swad_account.c index 1d0b352c..85ff8b2a 100644 --- a/swad_account.c +++ b/swad_account.c @@ -135,7 +135,7 @@ void Acc_ShowFormMyAccount (void) static void Acc_ShowFormCheckIfIHaveAccount (const char *Title) { extern const char *Hlp_PROFILE_SignUp; - extern const char *The_ClassForm[The_NUM_THEMES]; + extern const char *The_ClassFormInBox[The_NUM_THEMES]; extern const char *Txt_If_you_think_you_may_have_been_registered_; extern const char *Txt_ID; extern const char *Txt_Check; @@ -155,7 +155,7 @@ static void Acc_ShowFormCheckIfIHaveAccount (const char *Title) " size=\"18\" maxlength=\"%u\" value=\"\"" " required=\"required\" />" "", - The_ClassForm[Gbl.Prefs.Theme],Txt_ID, + The_ClassFormInBox[Gbl.Prefs.Theme],Txt_ID, ID_MAX_CHARS_USR_ID); Btn_PutConfirmButton (Txt_Check); Frm_EndForm (); @@ -326,7 +326,7 @@ static void Acc_ShowFormRequestNewAccountWithParams (const char *NewNicknameWith const char *NewEmail) { extern const char *Hlp_PROFILE_SignUp; - extern const char *The_ClassForm[The_NUM_THEMES]; + extern const char *The_ClassFormInBox[The_NUM_THEMES]; extern const char *Txt_Create_account; extern const char *Txt_Nickname; extern const char *Txt_HELP_nickname; @@ -359,7 +359,7 @@ static void Acc_ShowFormRequestNewAccountWithParams (const char *NewNicknameWith " required=\"required\" />" "" "", - The_ClassForm[Gbl.Prefs.Theme], + The_ClassFormInBox[Gbl.Prefs.Theme], Txt_Nickname, 1 + Nck_MAX_CHARS_NICKNAME_WITHOUT_ARROBA, Txt_HELP_nickname, @@ -377,7 +377,7 @@ static void Acc_ShowFormRequestNewAccountWithParams (const char *NewNicknameWith " required=\"required\" />" "" "", - The_ClassForm[Gbl.Prefs.Theme], + The_ClassFormInBox[Gbl.Prefs.Theme], Txt_Email, Cns_MAX_CHARS_EMAIL_ADDRESS, Txt_HELP_email, diff --git a/swad_agenda.c b/swad_agenda.c index c2915748..4d66a78c 100644 --- a/swad_agenda.c +++ b/swad_agenda.c @@ -1444,7 +1444,7 @@ void Agd_RequestCreatOrEditEvent (void) { extern const char *Hlp_PROFILE_Agenda_new_event; extern const char *Hlp_PROFILE_Agenda_edit_event; - extern const char *The_ClassForm[The_NUM_THEMES]; + extern const char *The_ClassFormInBox[The_NUM_THEMES]; extern const char *Txt_New_event; extern const char *Txt_Edit_event; extern const char *Txt_Location; @@ -1515,7 +1515,7 @@ void Agd_RequestCreatOrEditEvent (void) " required=\"required\" />" "" "", - The_ClassForm[Gbl.Prefs.Theme], + The_ClassFormInBox[Gbl.Prefs.Theme], Txt_Event, Agd_MAX_CHARS_EVENT,AgdEvent.Event); @@ -1530,7 +1530,7 @@ void Agd_RequestCreatOrEditEvent (void) " required=\"required\" />" "" "", - The_ClassForm[Gbl.Prefs.Theme], + The_ClassFormInBox[Gbl.Prefs.Theme], Txt_Location, Agd_MAX_CHARS_LOCATION,AgdEvent.Location); @@ -1546,7 +1546,7 @@ void Agd_RequestCreatOrEditEvent (void) "" "" "" "", - Field,The_ClassForm[Gbl.Prefs.Theme],Label, + Field,The_ClassFormInBox[Gbl.Prefs.Theme],Label, Field,Field,Rows); } diff --git a/swad_assignment.c b/swad_assignment.c index 8e5b25ee..e6902d69 100644 --- a/swad_assignment.c +++ b/swad_assignment.c @@ -1073,7 +1073,7 @@ void Asg_RequestCreatOrEditAsg (void) { extern const char *Hlp_ASSESSMENT_Assignments_new_assignment; extern const char *Hlp_ASSESSMENT_Assignments_edit_assignment; - extern const char *The_ClassForm[The_NUM_THEMES]; + extern const char *The_ClassFormInBox[The_NUM_THEMES]; extern const char *Txt_New_assignment; extern const char *Txt_Edit_assignment; extern const char *Txt_Title; @@ -1152,7 +1152,7 @@ void Asg_RequestCreatOrEditAsg (void) " required=\"required\" />" "" "", - The_ClassForm[Gbl.Prefs.Theme],Txt_Title, + The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Title, Asg_MAX_CHARS_ASSIGNMENT_TITLE,Asg.Title); /***** Assignment start and end dates *****/ @@ -1170,7 +1170,7 @@ void Asg_RequestCreatOrEditAsg (void) "" "" "", - The_ClassForm[Gbl.Prefs.Theme], + The_ClassFormInBox[Gbl.Prefs.Theme], Txt_Upload_files_QUESTION, Txt_Folder, Brw_MAX_CHARS_FOLDER,Asg.Folder); @@ -1183,7 +1183,7 @@ void Asg_RequestCreatOrEditAsg (void) "" "" @@ -1213,7 +1213,7 @@ void Asg_RequestCreatOrEditAsg (void) static void Asg_ShowLstGrpsToEditAssignment (long AsgCod) { extern const char *Hlp_USERS_Groups; - extern const char *The_ClassForm[The_NUM_THEMES]; + extern const char *The_ClassFormInBox[The_NUM_THEMES]; extern const char *Txt_Groups; extern const char *Txt_The_whole_course; unsigned NumGrpTyp; @@ -1229,7 +1229,7 @@ static void Asg_ShowLstGrpsToEditAssignment (long AsgCod) "%s:" "" "", - The_ClassForm[Gbl.Prefs.Theme], + The_ClassFormInBox[Gbl.Prefs.Theme], Txt_Groups); Box_StartBoxTable ("100%",NULL,NULL, Hlp_USERS_Groups,Box_NOT_CLOSABLE,0); diff --git a/swad_attendance.c b/swad_attendance.c index 9dfb329f..f9ed8c59 100644 --- a/swad_attendance.c +++ b/swad_attendance.c @@ -1033,7 +1033,7 @@ void Att_RequestCreatOrEditAttEvent (void) { extern const char *Hlp_USERS_Attendance_new_event; extern const char *Hlp_USERS_Attendance_edit_event; - extern const char *The_ClassForm[The_NUM_THEMES]; + extern const char *The_ClassFormInBox[The_NUM_THEMES]; extern const char *Txt_New_event; extern const char *Txt_Edit_event; extern const char *Txt_Teachers_comment; @@ -1113,7 +1113,7 @@ void Att_RequestCreatOrEditAttEvent (void) " required=\"required\" />" "" "", - The_ClassForm[Gbl.Prefs.Theme],Txt_Title, + The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Title, Att_MAX_CHARS_ATTENDANCE_EVENT_TITLE,Att.Title); /***** Assignment start and end dates *****/ @@ -1126,7 +1126,7 @@ void Att_RequestCreatOrEditAttEvent (void) "" "" "" @@ -1182,7 +1182,7 @@ void Att_RequestCreatOrEditAttEvent (void) static void Att_ShowLstGrpsToEditAttEvent (long AttCod) { - extern const char *The_ClassForm[The_NUM_THEMES]; + extern const char *The_ClassFormInBox[The_NUM_THEMES]; extern const char *Txt_Groups; extern const char *Txt_The_whole_course; unsigned NumGrpTyp; @@ -1198,7 +1198,7 @@ static void Att_ShowLstGrpsToEditAttEvent (long AttCod) "%s:" "" "", - The_ClassForm[Gbl.Prefs.Theme],Txt_Groups); + The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Groups); Box_StartBoxTable ("100%",NULL,NULL, NULL,Box_NOT_CLOSABLE,0); @@ -3149,7 +3149,7 @@ static void Att_PutButtonToShowDetails (void) static void Att_ListEventsToSelect (Att_TypeOfView_t TypeOfView) { - extern const char *The_ClassFormBold[The_NUM_THEMES]; + extern const char *The_ClassFormInBoxBold[The_NUM_THEMES]; extern const char *Txt_Events; extern const char *Txt_Event; extern const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS]; @@ -3250,8 +3250,8 @@ static void Att_ListEventsToSelect (Att_TypeOfView_t TypeOfView) fprintf (Gbl.F.Out,"" ""); Frm_LinkFormSubmitAnimated (Txt_Update_attendance, - The_ClassFormBold[Gbl.Prefs.Theme], - NULL); + The_ClassFormInBoxBold[Gbl.Prefs.Theme], + NULL); Ico_PutCalculateIconWithText (Txt_Update_attendance); fprintf (Gbl.F.Out,"" ""); diff --git a/swad_centre.c b/swad_centre.c index 8c31dee8..4d578d18 100644 --- a/swad_centre.c +++ b/swad_centre.c @@ -286,7 +286,7 @@ void Ctr_PrintConfiguration (void) static void Ctr_Configuration (bool PrintView) { extern const char *Hlp_CENTRE_Information; - extern const char *The_ClassForm[The_NUM_THEMES]; + extern const char *The_ClassFormInBox[The_NUM_THEMES]; extern const char *Txt_Institution; extern const char *Txt_Centre; extern const char *Txt_Short_name; @@ -404,7 +404,7 @@ static void Ctr_Configuration (bool PrintView) "" "" "", - The_ClassForm[Gbl.Prefs.Theme], + The_ClassFormInBox[Gbl.Prefs.Theme], Txt_Institution); if (!PrintView && @@ -446,7 +446,7 @@ static void Ctr_Configuration (bool PrintView) "" "" "", - The_ClassForm[Gbl.Prefs.Theme], + The_ClassFormInBox[Gbl.Prefs.Theme], Txt_Centre); if (!PrintView && Gbl.Usrs.Me.Role.Logged >= Rol_INS_ADM) @@ -475,7 +475,7 @@ static void Ctr_Configuration (bool PrintView) "" "" "", - The_ClassForm[Gbl.Prefs.Theme], + The_ClassFormInBox[Gbl.Prefs.Theme], Txt_Short_name); if (!PrintView && Gbl.Usrs.Me.Role.Logged >= Rol_INS_ADM) @@ -506,7 +506,7 @@ static void Ctr_Configuration (bool PrintView) "%s:" "" "", - The_ClassForm[Gbl.Prefs.Theme], + The_ClassFormInBox[Gbl.Prefs.Theme], Txt_Place); if (!PrintView && Gbl.Usrs.Me.Role.Logged >= Rol_CTR_ADM) @@ -551,7 +551,7 @@ static void Ctr_Configuration (bool PrintView) "" "" "", - The_ClassForm[Gbl.Prefs.Theme], + The_ClassFormInBox[Gbl.Prefs.Theme], Txt_Web); if (!PrintView && Gbl.Usrs.Me.Role.Logged >= Rol_CTR_ADM) @@ -591,7 +591,7 @@ static void Ctr_Configuration (bool PrintView) "" "" "", - The_ClassForm[Gbl.Prefs.Theme], + The_ClassFormInBox[Gbl.Prefs.Theme], Txt_Shortcut, Cfg_URL_SWAD_CGI, Lan_STR_LANG_ID[Gbl.Prefs.Language], @@ -608,7 +608,7 @@ static void Ctr_Configuration (bool PrintView) "%s:" "" "", - The_ClassForm[Gbl.Prefs.Theme], + The_ClassFormInBox[Gbl.Prefs.Theme], Txt_QR_code); QR_LinkTo (250,"ctr",Gbl.CurrentCtr.Ctr.CtrCod); fprintf (Gbl.F.Out,"" @@ -625,7 +625,7 @@ static void Ctr_Configuration (bool PrintView) "%u" "" "", - The_ClassForm[Gbl.Prefs.Theme], + The_ClassFormInBox[Gbl.Prefs.Theme], Txt_Users_of_the_centre, Usr_GetNumUsrsWhoClaimToBelongToCtr (Gbl.CurrentCtr.Ctr.CtrCod)); @@ -635,7 +635,7 @@ static void Ctr_Configuration (bool PrintView) "%s:" "" "", - The_ClassForm[Gbl.Prefs.Theme], + The_ClassFormInBox[Gbl.Prefs.Theme], Txt_Degrees); /* Form to go to see degrees of this centre */ @@ -661,7 +661,7 @@ static void Ctr_Configuration (bool PrintView) "%u" "" "", - The_ClassForm[Gbl.Prefs.Theme], + The_ClassFormInBox[Gbl.Prefs.Theme], Txt_Courses, Crs_GetNumCrssInCtr (Gbl.CurrentCtr.Ctr.CtrCod)); @@ -735,7 +735,7 @@ static void Ctr_PutIconToChangePhoto (void) static void Ctr_ShowNumUsrsInCrssOfCtr (Rol_Role_t Role) { - extern const char *The_ClassForm[The_NUM_THEMES]; + extern const char *The_ClassFormInBox[The_NUM_THEMES]; extern const char *Txt_Users_in_courses; extern const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS]; @@ -747,7 +747,7 @@ static void Ctr_ShowNumUsrsInCrssOfCtr (Rol_Role_t Role) "%u" "" "", - The_ClassForm[Gbl.Prefs.Theme], + The_ClassFormInBox[Gbl.Prefs.Theme], (Role == Rol_UNK) ? Txt_Users_in_courses : Txt_ROLES_PLURAL_Abc[Role][Usr_SEX_UNKNOWN], Usr_GetNumUsrsInCrssOfCtr (Role,Gbl.CurrentCtr.Ctr.CtrCod)); @@ -2298,7 +2298,7 @@ void Ctr_RemoveLogo (void) void Ctr_RequestPhoto (void) { - extern const char *The_ClassForm[The_NUM_THEMES]; + extern const char *The_ClassFormInBox[The_NUM_THEMES]; extern const char *Txt_Photo; extern const char *Txt_Recommended_aspect_ratio; extern const char *Txt_Recommended_resolution; @@ -2328,7 +2328,7 @@ void Ctr_RequestPhoto (void) "" "", - The_ClassForm[Gbl.Prefs.Theme], + The_ClassFormInBox[Gbl.Prefs.Theme], Txt_File_with_the_photo, Fil_NAME_OF_PARAM_FILENAME_ORG, Gbl.Form.Id); diff --git a/swad_changelog.h b/swad_changelog.h index 719f31dc..1dbd8ded 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -429,10 +429,11 @@ En OpenSWAD: ps2pdf source.ps destination.pdf */ -#define Log_PLATFORM_VERSION "SWAD 18.54.1 (2019-02-21)" -#define CSS_FILE "swad18.54.css" +#define Log_PLATFORM_VERSION "SWAD 18.55 (2019-02-21)" +#define CSS_FILE "swad18.55.css" #define JS_FILE "swad18.51.js" /* + Version 18.55: Feb 22, 2019 Changes in CSS styles related to forms. (237585 lines) Version 18.54.1: Feb 22, 2019 Following and followers shown in photo zoom. (237586 lines) Version 18.54: Feb 21, 2019 Selection of users scope in timeline is made with icons. (237534 lines) Version 18.53: Feb 21, 2019 Last selection of users scope in timeline is saved in database. (237538 lines) diff --git a/swad_chat.c b/swad_chat.c index 19f9567b..65d0d148 100644 --- a/swad_chat.c +++ b/swad_chat.c @@ -326,13 +326,13 @@ void Cht_ShowListOfChatRoomsWithUsrs (void) static void Cht_WriteLinkToChat1 (const char *RoomCode,const char *RoomShrtName,const char *RoomFullName, unsigned Level,bool IsLastItemInLevel[1 + Cht_CHAT_MAX_LEVELS]) { - extern const char *The_ClassForm[The_NUM_THEMES]; + extern const char *The_ClassFormInBox[The_NUM_THEMES]; fprintf (Gbl.F.Out,"
  • "); Lay_IndentDependingOnLevel (Level,IsLastItemInLevel); Frm_StartForm (ActCht); Cht_WriteParamsRoomCodeAndNames (RoomCode,RoomShrtName,RoomFullName); - Frm_LinkFormSubmit (RoomFullName,The_ClassForm[Gbl.Prefs.Theme],NULL); + Frm_LinkFormSubmit (RoomFullName,The_ClassFormInBox[Gbl.Prefs.Theme],NULL); } static void Cht_WriteLinkToChat2 (const char *RoomCode,const char *RoomFullName) diff --git a/swad_connected.c b/swad_connected.c index 5357b690..f7fdc98a 100644 --- a/swad_connected.c +++ b/swad_connected.c @@ -127,13 +127,11 @@ void Con_ShowConnectedUsrs (void) static void Con_PutIconToUpdateConnected (void) { - extern const char *The_ClassFormBold[The_NUM_THEMES]; extern const char *Txt_Update; Frm_StartForm (ActLstCon); Sco_PutParamScope ("ScopeCon",Gbl.Scope.Current); - Frm_LinkFormSubmitAnimated (Txt_Update,The_ClassFormBold[Gbl.Prefs.Theme], - NULL); + Frm_LinkFormSubmitAnimated (Txt_Update,NULL,NULL); Ico_PutCalculateIcon (Txt_Update); Frm_EndForm (); } diff --git a/swad_country.c b/swad_country.c index 0ba890c1..a457d56e 100644 --- a/swad_country.c +++ b/swad_country.c @@ -231,7 +231,7 @@ void Cty_PrintConfiguration (void) static void Cty_Configuration (bool PrintView) { extern const char *Hlp_COUNTRY_Information; - extern const char *The_ClassForm[The_NUM_THEMES]; + extern const char *The_ClassFormInBox[The_NUM_THEMES]; extern const char *Txt_Country; extern const char *Txt_Shortcut; extern const char *Lan_STR_LANG_ID[1 + Lan_NUM_LANGUAGES]; @@ -318,7 +318,7 @@ static void Cty_Configuration (bool PrintView) "%s:" "" "", - The_ClassForm[Gbl.Prefs.Theme], + The_ClassFormInBox[Gbl.Prefs.Theme], Txt_Country); if (!PrintView && Gbl.CurrentCty.Cty.WWW[Gbl.Prefs.Language][0]) fprintf (Gbl.F.Out,"", @@ -339,7 +339,7 @@ static void Cty_Configuration (bool PrintView) "%s/%s?cty=%ld" "" "", - The_ClassForm[Gbl.Prefs.Theme], + The_ClassFormInBox[Gbl.Prefs.Theme], Txt_Shortcut, Cfg_URL_SWAD_CGI, Lan_STR_LANG_ID[Gbl.Prefs.Language], @@ -356,7 +356,7 @@ static void Cty_Configuration (bool PrintView) "%s:" "" "", - The_ClassForm[Gbl.Prefs.Theme], + The_ClassFormInBox[Gbl.Prefs.Theme], Txt_QR_code); QR_LinkTo (250,"cty",Gbl.CurrentCty.Cty.CtyCod); fprintf (Gbl.F.Out,"" @@ -373,7 +373,7 @@ static void Cty_Configuration (bool PrintView) "%u" "" "", - The_ClassForm[Gbl.Prefs.Theme], + The_ClassFormInBox[Gbl.Prefs.Theme], Txt_Users_of_the_country, Usr_GetNumUsrsWhoClaimToBelongToCty (Gbl.CurrentCty.Cty.CtyCod)); @@ -383,7 +383,7 @@ static void Cty_Configuration (bool PrintView) "%s:" "" "", - The_ClassForm[Gbl.Prefs.Theme], + The_ClassFormInBox[Gbl.Prefs.Theme], Txt_Institutions); /* Form to go to see institutions of this country */ @@ -409,7 +409,7 @@ static void Cty_Configuration (bool PrintView) "%u" "" "", - The_ClassForm[Gbl.Prefs.Theme], + The_ClassFormInBox[Gbl.Prefs.Theme], Txt_Centres, Ctr_GetNumCtrsInCty (Gbl.CurrentCty.Cty.CtyCod)); @@ -422,7 +422,7 @@ static void Cty_Configuration (bool PrintView) "%u" "" "", - The_ClassForm[Gbl.Prefs.Theme], + The_ClassFormInBox[Gbl.Prefs.Theme], Txt_Degrees, Deg_GetNumDegsInCty (Gbl.CurrentCty.Cty.CtyCod)); @@ -435,7 +435,7 @@ static void Cty_Configuration (bool PrintView) "%u" "" "", - The_ClassForm[Gbl.Prefs.Theme], + The_ClassFormInBox[Gbl.Prefs.Theme], Txt_Courses, Crs_GetNumCrssInCty (Gbl.CurrentCty.Cty.CtyCod)); @@ -469,7 +469,7 @@ static void Cty_PutIconToPrint (void) static void Cty_ShowNumUsrsInCrssOfCty (Rol_Role_t Role) { - extern const char *The_ClassForm[The_NUM_THEMES]; + extern const char *The_ClassFormInBox[The_NUM_THEMES]; extern const char *Txt_Users_in_courses; extern const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS]; @@ -481,7 +481,7 @@ static void Cty_ShowNumUsrsInCrssOfCty (Rol_Role_t Role) "%u" "" "", - The_ClassForm[Gbl.Prefs.Theme], + The_ClassFormInBox[Gbl.Prefs.Theme], (Role == Rol_UNK) ? Txt_Users_in_courses : Txt_ROLES_PLURAL_Abc[Role][Usr_SEX_UNKNOWN], Usr_GetNumUsrsInCrssOfCty (Role,Gbl.CurrentCty.Cty.CtyCod)); diff --git a/swad_course.c b/swad_course.c index 8a1dfba5..825d3e5b 100644 --- a/swad_course.c +++ b/swad_course.c @@ -166,7 +166,7 @@ void Crs_PrintConfiguration (void) static void Crs_Configuration (bool PrintView) { extern const char *Hlp_COURSE_Information; - extern const char *The_ClassForm[The_NUM_THEMES]; + extern const char *The_ClassFormInBox[The_NUM_THEMES]; extern const char *Txt_Degree; extern const char *Txt_Course; extern const char *Txt_Short_name; @@ -232,7 +232,7 @@ static void Crs_Configuration (bool PrintView) "" "" "", - The_ClassForm[Gbl.Prefs.Theme], + The_ClassFormInBox[Gbl.Prefs.Theme], Txt_Degree); if (!PrintView && @@ -274,7 +274,7 @@ static void Crs_Configuration (bool PrintView) "" "" "", - The_ClassForm[Gbl.Prefs.Theme], + The_ClassFormInBox[Gbl.Prefs.Theme], Txt_Course); if (!PrintView && Gbl.Usrs.Me.Role.Logged >= Rol_DEG_ADM) @@ -303,7 +303,7 @@ static void Crs_Configuration (bool PrintView) "" "" "", - The_ClassForm[Gbl.Prefs.Theme], + The_ClassFormInBox[Gbl.Prefs.Theme], Txt_Short_name); if (!PrintView && Gbl.Usrs.Me.Role.Logged >= Rol_DEG_ADM) @@ -332,7 +332,7 @@ static void Crs_Configuration (bool PrintView) "" "" "", - The_ClassForm[Gbl.Prefs.Theme], + The_ClassFormInBox[Gbl.Prefs.Theme], Txt_Year_OF_A_DEGREE); if (IsForm) { @@ -366,7 +366,7 @@ static void Crs_Configuration (bool PrintView) "" "" "", - The_ClassForm[Gbl.Prefs.Theme], + The_ClassFormInBox[Gbl.Prefs.Theme], Txt_Institutional_code); if (IsForm) { @@ -395,7 +395,7 @@ static void Crs_Configuration (bool PrintView) "%ld" "" "", - The_ClassForm[Gbl.Prefs.Theme], + The_ClassFormInBox[Gbl.Prefs.Theme], Txt_Internal_code, Gbl.CurrentCrs.Crs.CrsCod); } @@ -410,7 +410,7 @@ static void Crs_Configuration (bool PrintView) "%s/%s?crs=%ld" "" "", - The_ClassForm[Gbl.Prefs.Theme], + The_ClassFormInBox[Gbl.Prefs.Theme], Txt_Shortcut, Cfg_URL_SWAD_CGI, Lan_STR_LANG_ID[Gbl.Prefs.Language], @@ -427,7 +427,7 @@ static void Crs_Configuration (bool PrintView) "%s:" "" "", - The_ClassForm[Gbl.Prefs.Theme], + The_ClassFormInBox[Gbl.Prefs.Theme], Txt_QR_code); QR_LinkTo (250,"crs",Gbl.CurrentCrs.Crs.CrsCod); fprintf (Gbl.F.Out,"" @@ -449,7 +449,7 @@ static void Crs_Configuration (bool PrintView) "%s:" "" "", - The_ClassForm[Gbl.Prefs.Theme], + The_ClassFormInBox[Gbl.Prefs.Theme], Txt_Indicators); Frm_StartForm (ActReqStaCrs); snprintf (Gbl.Title,sizeof (Gbl.Title), @@ -492,7 +492,7 @@ static void Crs_PutIconToPrint (void) static void Crs_ShowNumUsrsInCrs (Rol_Role_t Role) { - extern const char *The_ClassForm[The_NUM_THEMES]; + extern const char *The_ClassFormInBox[The_NUM_THEMES]; extern const char *Txt_ROLES_PLURAL_Abc[Rol_NUM_ROLES][Usr_NUM_SEXS]; fprintf (Gbl.F.Out,"" @@ -503,7 +503,7 @@ static void Crs_ShowNumUsrsInCrs (Rol_Role_t Role) "%u" "" "", - The_ClassForm[Gbl.Prefs.Theme], + The_ClassFormInBox[Gbl.Prefs.Theme], Txt_ROLES_PLURAL_Abc[Role][Usr_SEX_UNKNOWN], Gbl.CurrentCrs.Crs.NumUsrs[Role]); } @@ -517,8 +517,8 @@ static void Crs_ShowNumUsrsInCrs (Rol_Role_t Role) static void Crs_WriteListMyCoursesToSelectOne (void) { extern const char *Hlp_PROFILE_Courses; - extern const char *The_ClassForm[The_NUM_THEMES]; - extern const char *The_ClassFormDark[The_NUM_THEMES]; + extern const char *The_ClassFormInBox[The_NUM_THEMES]; + extern const char *The_ClassFormInBoxBold[The_NUM_THEMES]; extern const char *Txt_My_courses; extern const char *Txt_System; extern const char *Txt_Go_to_X; @@ -549,10 +549,10 @@ static void Crs_WriteListMyCoursesToSelectOne (void) const char *ClassNormal; char ClassHighlight[64]; - ClassNormal = The_ClassForm[Gbl.Prefs.Theme]; + ClassNormal = The_ClassFormInBox[Gbl.Prefs.Theme]; snprintf (ClassHighlight,sizeof (ClassHighlight), "%s LIGHT_BLUE", - The_ClassFormDark[Gbl.Prefs.Theme]); + The_ClassFormInBoxBold[Gbl.Prefs.Theme]); /***** Start box *****/ Box_StartBox (NULL,Txt_My_courses,Crs_PutIconToSearchCourses, @@ -3379,7 +3379,7 @@ void Crs_PutLinkToRemoveOldCrss (void) void Crs_AskRemoveOldCrss (void) { extern const char *Hlp_SYSTEM_Hierarchy_eliminate_old_courses; - extern const char *The_ClassForm[The_NUM_THEMES]; + extern const char *The_ClassFormInBox[The_NUM_THEMES]; extern const char *Txt_Eliminate_old_courses; extern const char *Txt_Eliminate_all_courses_whithout_users_PART_1_OF_2; extern const char *Txt_Eliminate_all_courses_whithout_users_PART_2_OF_2; @@ -3397,7 +3397,7 @@ void Crs_AskRemoveOldCrss (void) /***** Form to request number of months without clicks *****/ fprintf (Gbl.F.Out,"" "" "", - The_ClassForm[Gbl.Prefs.Theme],Txt_Availability); + The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Availability); if (ICanChangePublic) // I can change file to public { fprintf (Gbl.F.Out,""); @@ -9905,7 +9905,7 @@ void Brw_ShowFileMetadata (void) "%u" "" "", - The_ClassForm[Gbl.Prefs.Theme],Txt_My_views, + The_ClassFormInBox[Gbl.Prefs.Theme],Txt_My_views, FileMetadata.NumMyViews); /***** Write number of identificated views *****/ @@ -9917,7 +9917,7 @@ void Brw_ShowFileMetadata (void) "%u (%u %s)" "" "", - The_ClassForm[Gbl.Prefs.Theme],Txt_Identified_views, + The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Identified_views, FileMetadata.NumViewsFromLoggedUsrs, FileMetadata.NumLoggedUsrs, (FileMetadata.NumLoggedUsrs == 1) ? Txt_user[Usr_SEX_UNKNOWN] : @@ -9932,7 +9932,7 @@ void Brw_ShowFileMetadata (void) "%u" "" "", - The_ClassForm[Gbl.Prefs.Theme],Txt_Public_views, + The_ClassFormInBox[Gbl.Prefs.Theme],Txt_Public_views, FileMetadata.NumPublicViews); /***** End box *****/ @@ -12419,7 +12419,7 @@ static void Brw_PutLinkToAskRemOldFiles (void) void Brw_AskRemoveOldFiles (void) { - extern const char *The_ClassForm[The_NUM_THEMES]; + extern const char *The_ClassFormInBox[The_NUM_THEMES]; extern const char *Txt_Remove_old_files; extern const char *Txt_Remove_files_older_than_PART_1_OF_2; extern const char *Txt_Remove_files_older_than_PART_2_OF_2; @@ -12439,7 +12439,7 @@ void Brw_AskRemoveOldFiles (void) /***** Form to request number of months (to remove files older) *****/ fprintf (Gbl.F.Out,"