From 6349c7daf409123dc148642e58280c7047b73b84 Mon Sep 17 00:00:00 2001 From: acanas Date: Sun, 26 Dec 2021 22:39:16 +0100 Subject: [PATCH] Version 21.75: Dec 26, 2021 Code refactoring related to links. --- swad_ID.c | 3 ++- swad_MFU.c | 4 ++- swad_account.c | 8 +++--- swad_agenda.c | 5 ++-- swad_assignment.c | 5 ++-- swad_attendance.c | 31 +++++++++++----------- swad_browser.c | 14 +++++----- swad_building.c | 3 ++- swad_center.c | 12 ++++----- swad_center.h | 2 +- swad_center_config.c | 4 +-- swad_changelog.h | 3 ++- swad_chat.c | 3 ++- swad_connected.c | 9 ++++--- swad_country.c | 56 +++++++++++++++++++-------------------- swad_country.h | 5 ++-- swad_country_config.c | 6 ++--- swad_course.c | 31 +++++++--------------- swad_course_config.c | 4 +-- swad_date.c | 6 +++-- swad_degree.c | 13 +++++---- swad_degree.h | 2 +- swad_degree_config.c | 6 ++--- swad_degree_type.c | 6 ++--- swad_department.c | 6 ++--- swad_exam.c | 32 ++++++++++++---------- swad_exam_session.c | 16 +++++------ swad_figure.c | 3 +-- swad_follow.c | 32 +++++++--------------- swad_forum.c | 6 ++--- swad_game.c | 32 ++++++++++++---------- swad_hierarchy.c | 18 +++++-------- swad_hierarchy_config.c | 3 +-- swad_icon.c | 51 ++++++++++++++++++++++++----------- swad_info.c | 2 +- swad_institution.c | 15 +++++------ swad_institution.h | 4 +-- swad_institution_config.c | 4 +-- swad_layout.c | 8 ++++-- swad_match.c | 2 +- swad_menu.c | 9 +++---- swad_message.c | 10 +++---- swad_notice.c | 4 +-- swad_notification.c | 12 ++++++--- swad_photo.c | 3 +-- swad_profile.c | 12 +++++---- swad_project.c | 3 ++- swad_record.c | 6 +++-- swad_statistic.c | 12 +++------ swad_survey.c | 9 +++---- swad_timeline_form.c | 4 ++- swad_timeline_note.c | 6 ++--- swad_user.c | 6 ++--- 53 files changed, 287 insertions(+), 284 deletions(-) diff --git a/swad_ID.c b/swad_ID.c index ed347efb..37da1af9 100644 --- a/swad_ID.c +++ b/swad_ID.c @@ -424,7 +424,8 @@ static void ID_PutLinkToConfirmID (struct UsrData *UsrDat,unsigned NumID, Par_PutHiddenParamString (NULL,"UsrID",UsrDat->IDs.List[NumID].ID); /***** Put link *****/ - HTM_BUTTON_OnSubmit_Begin (Txt_Confirm_ID,The_ClassFormLinkOutBoxBold[Gbl.Prefs.Theme],NULL); + HTM_BUTTON_OnSubmit_Begin (Txt_Confirm_ID, + The_ClassFormLinkOutBoxBold[Gbl.Prefs.Theme],NULL); Ico_PutIconTextLink ("check.svg",Ico_BLACK,Txt_Confirm_ID); HTM_BUTTON_End (); diff --git a/swad_MFU.c b/swad_MFU.c index 2638d58e..7f508d4b 100644 --- a/swad_MFU.c +++ b/swad_MFU.c @@ -219,7 +219,9 @@ void MFU_WriteBigMFUActions (struct MFU_ListMFUActions *ListMFUActions) /* Icon and text */ HTM_LI_Begin ("class=\"ICO_HIGHLIGHT\""); Frm_BeginForm (Action); - HTM_BUTTON_OnSubmit_Begin (TabMenuStr,The_ClassFormLinkInBoxNoWrap[Gbl.Prefs.Theme],NULL); + HTM_BUTTON_OnSubmit_Begin (TabMenuStr, + The_ClassFormLinkInBoxNoWrap[Gbl.Prefs.Theme], + NULL); HTM_IMG (Gbl.Prefs.URLIconSet,Act_GetIcon (Action),MenuStr, "class=\"%s\"", Ico_ClassColor[Ico_BLACK][Gbl.Prefs.Theme]); diff --git a/swad_account.c b/swad_account.c index 7f39ce13..219c2051 100644 --- a/swad_account.c +++ b/swad_account.c @@ -444,10 +444,10 @@ void Acc_ShowFormGoToRequestNewAccount (void) Hlp_PROFILE_SignUp,Box_NOT_CLOSABLE); Str_FreeStrings (); - /***** Button to go to request the creation of a new account *****/ - Frm_BeginForm (ActFrmMyAcc); - Btn_PutCreateButton (Txt_Create_account); - Frm_EndForm (); + /***** Button to go to request the creation of a new account *****/ + Frm_BeginForm (ActFrmMyAcc); + Btn_PutCreateButton (Txt_Create_account); + Frm_EndForm (); /***** End box *****/ Box_BoxEnd (); diff --git a/swad_agenda.c b/swad_agenda.c index b20913b7..e39e6991 100644 --- a/swad_agenda.c +++ b/swad_agenda.c @@ -630,7 +630,7 @@ static void Agd_WriteHeaderListEvents (const struct Agd_Agenda *Agenda, Order <= Dat_END_TIME; Order++) { - HTM_TH_Begin (1,1,"LM"); + HTM_TH_Begin (1,1,"TIT_TBL LM"); switch (AgendaType) { case Agd_MY_AGENDA_TODAY: @@ -652,7 +652,8 @@ static void Agd_WriteHeaderListEvents (const struct Agd_Agenda *Agenda, Agenda->CurrentPage, -1L); - HTM_BUTTON_OnSubmit_Begin (Txt_START_END_TIME_HELP[Order],"BT_LINK TIT_TBL",NULL); + HTM_BUTTON_OnSubmit_Begin (Txt_START_END_TIME_HELP[Order], + "BT_LINK",NULL); if (Order == Agenda->SelectedOrder) HTM_U_Begin (); diff --git a/swad_assignment.c b/swad_assignment.c index 383e2fc4..7766c5d4 100644 --- a/swad_assignment.c +++ b/swad_assignment.c @@ -229,7 +229,7 @@ static void Asg_PutHeadForSeeing (struct Asg_Assignments *Assignments, Order++) { /* Begin head cell */ - HTM_TH_Begin (1,1,"LM"); + HTM_TH_Begin (1,1,"TIT_TBL LM"); if (!PrintView) { @@ -241,7 +241,8 @@ static void Asg_PutHeadForSeeing (struct Asg_Assignments *Assignments, Dat_PutHiddenParamOrder (Order); /* Begin link to select order */ - HTM_BUTTON_OnSubmit_Begin (Txt_START_END_TIME_HELP[Order],"BT_LINK TIT_TBL",NULL); + HTM_BUTTON_OnSubmit_Begin (Txt_START_END_TIME_HELP[Order], + "BT_LINK",NULL); if (Order == Assignments->SelectedOrder) HTM_U_Begin (); } diff --git a/swad_attendance.c b/swad_attendance.c index 8b06cd98..d3d948dd 100644 --- a/swad_attendance.c +++ b/swad_attendance.c @@ -124,8 +124,7 @@ static void Att_WriteRowUsrToCallTheRoll (unsigned NumUsr, struct UsrData *UsrDat, struct Att_Event *Event); static void Att_PutLinkAttEvent (struct Att_Event *AttEvent, - const char *Title,const char *Txt, - const char *Class); + const char *Title,const char *Txt); static void Att_PutParamsCodGrps (long AttCod); static unsigned Att_GetNumUsrsFromAListWhoAreInAttEvent (long AttCod, long LstSelectedUsrCods[], @@ -262,7 +261,7 @@ static void Att_ShowAllAttEvents (struct Att_Events *Events) Order <= Dat_END_TIME; Order++) { - HTM_TH_Begin (1,1,"LM"); + HTM_TH_Begin (1,1,"TIT_TBL LM"); Frm_BeginForm (ActSeeAtt); WhichGroups = Grp_GetParamWhichGroups (); @@ -270,7 +269,8 @@ static void Att_ShowAllAttEvents (struct Att_Events *Events) Pag_PutHiddenParamPagNum (Pag_ATT_EVENTS,Events->CurrentPage); Dat_PutHiddenParamOrder (Order); - HTM_BUTTON_OnSubmit_Begin (Txt_START_END_TIME_HELP[Order],"BT_LINK TIT_TBL",NULL); + HTM_BUTTON_OnSubmit_Begin (Txt_START_END_TIME_HELP[Order], + "BT_LINK",NULL); if (Order == Events->SelectedOrder) HTM_U_Begin (); @@ -515,13 +515,16 @@ static void Att_ShowOneAttEvent (struct Att_Events *Events, /* Attendance event title */ if (ShowOnlyThisAttEventComplete) - HTM_TD_Begin ("class=\"LT\""); + HTM_TD_Begin ("class=\"%s LT\"", + Event->Hidden ? "ASG_TITLE_LIGHT" : + "ASG_TITLE"); else - HTM_TD_Begin ("class=\"LT %s\"",Gbl.ColorRows[Gbl.RowEvenOdd]); + HTM_TD_Begin ("class=\"%s LT %s\"", + Event->Hidden ? "ASG_TITLE_LIGHT" : + "ASG_TITLE", + Gbl.ColorRows[Gbl.RowEvenOdd]); HTM_ARTICLE_Begin (Anchor); - Att_PutLinkAttEvent (Event,Txt_View_event,Event->Title, - Event->Hidden ? "BT_LINK LT ASG_TITLE_LIGHT" : - "BT_LINK LT ASG_TITLE"); + Att_PutLinkAttEvent (Event,Txt_View_event,Event->Title); HTM_ARTICLE_End (); HTM_TD_End (); @@ -1840,8 +1843,7 @@ static void Att_WriteRowUsrToCallTheRoll (unsigned NumUsr, /*****************************************************************************/ static void Att_PutLinkAttEvent (struct Att_Event *AttEvent, - const char *Title,const char *Txt, - const char *Class) + const char *Title,const char *Txt) { /***** Begin form *****/ Frm_BeginForm (ActSeeOneAtt); @@ -1849,7 +1851,7 @@ static void Att_PutLinkAttEvent (struct Att_Event *AttEvent, Att_PutParamsCodGrps (AttEvent->AttCod); /***** Link to view attendance event *****/ - HTM_BUTTON_OnSubmit_Begin (Title,Class,NULL); + HTM_BUTTON_OnSubmit_Begin (Title,"BT_LINK",NULL); HTM_Txt (Txt); HTM_BUTTON_End (); @@ -2923,12 +2925,11 @@ static void Att_WriteTableHeadSeveralAttEvents (const struct Att_Events *Events) Att_GetDataOfAttEventByCodAndCheckCrs (&Events->Lst[NumAttEvent]); /***** Put link to this attendance event *****/ - HTM_TH_Begin (1,1,"CM"); + HTM_TH_Begin (1,1,"TIT_TBL CM"); snprintf (StrNumAttEvent,sizeof (StrNumAttEvent),"%u",NumAttEvent + 1); Att_PutLinkAttEvent (&Events->Lst[NumAttEvent], Events->Lst[NumAttEvent].Title, - StrNumAttEvent, - "BT_LINK TIT_TBL"); + StrNumAttEvent); HTM_TH_End (); } diff --git a/swad_browser.c b/swad_browser.c index 1f1e3292..8474c056 100644 --- a/swad_browser.c +++ b/swad_browser.c @@ -3260,7 +3260,8 @@ static void Brw_ShowDataOwnerAsgWrk (struct UsrData *UsrDat) /***** Show user's name *****/ HTM_BR (); - HTM_BUTTON_OnSubmit_Begin (Txt_View_record_for_this_course,"BT_LINK",NULL); + HTM_BUTTON_OnSubmit_Begin (Txt_View_record_for_this_course, + "BT_LINK",NULL); HTM_Txt (UsrDat->Surname1); if (UsrDat->Surname2[0]) HTM_TxtF (" %s",UsrDat->Surname2); @@ -8507,7 +8508,8 @@ static void Brw_WriteBigLinkToDownloadFile (const char *URL, Brw_PutImplicitParamsFileBrowser (&Gbl.FileBrowser.FilFolLnk); /* Begin link */ - HTM_BUTTON_OnSubmit_Begin (Txt_Check_marks_in_the_file,"BT_LINK FILENAME_TXT",NULL); + HTM_BUTTON_OnSubmit_Begin (Txt_Check_marks_in_the_file, + "BT_LINK",NULL); Brw_PutIconFile (FileMetadata->FilFolLnk.Type,FileMetadata->FilFolLnk.Name, "ICO40x40",false); @@ -9957,7 +9959,7 @@ static void Brw_WriteRowDocData (unsigned *NumDocsNotHidden,MYSQL_ROW row) Frm_BeginFormGoTo (ActSeeInsInf); Deg_PutParamDegCod (InsCod); HTM_BUTTON_OnSubmit_Begin (Str_BuildGoToMsg (InsShortName), - "BT_LINK LT",NULL); + "BT_LINK",NULL); Str_FreeStrings (); Lgo_DrawLogo (HieLvl_INS,InsCod,InsShortName,20,"BT_LINK LT",true); HTM_TxtF (" %s",InsShortName); @@ -9973,7 +9975,7 @@ static void Brw_WriteRowDocData (unsigned *NumDocsNotHidden,MYSQL_ROW row) Frm_BeginFormGoTo (ActSeeCtrInf); Deg_PutParamDegCod (CtrCod); HTM_BUTTON_OnSubmit_Begin (Str_BuildGoToMsg (CtrShortName), - "BT_LINK LT",NULL); + "BT_LINK",NULL); Str_FreeStrings (); Lgo_DrawLogo (HieLvl_CTR,CtrCod,CtrShortName,20,"LT",true); HTM_TxtF (" %s",CtrShortName); @@ -9989,7 +9991,7 @@ static void Brw_WriteRowDocData (unsigned *NumDocsNotHidden,MYSQL_ROW row) Frm_BeginFormGoTo (ActSeeDegInf); Deg_PutParamDegCod (DegCod); HTM_BUTTON_OnSubmit_Begin (Str_BuildGoToMsg (DegShortName), - "BT_LINK LT",NULL); + "BT_LINK",NULL); Str_FreeStrings (); Lgo_DrawLogo (HieLvl_DEG,DegCod,DegShortName,20,"LT",true); HTM_TxtF (" %s",DegShortName); @@ -10110,7 +10112,7 @@ static void Brw_WriteRowDocData (unsigned *NumDocsNotHidden,MYSQL_ROW row) FileMetadata.FilCod); /* File or folder icon */ - HTM_BUTTON_OnSubmit_Begin (FileNameToShow,"BT_LINK LT",NULL); + HTM_BUTTON_OnSubmit_Begin (FileNameToShow,"BT_LINK",NULL); if (FileMetadata.FilFolLnk.Type == Brw_IS_FOLDER) /* Icon with folder */ Ico_PutIcon ("folder-yellow.png",Ico_UNCHANGED, diff --git a/swad_building.c b/swad_building.c index 5de48ed7..70e887a8 100644 --- a/swad_building.c +++ b/swad_building.c @@ -129,7 +129,8 @@ void Bld_SeeBuildings (void) HTM_TH_Begin (1,1,"TIT_TBL LM"); Frm_BeginForm (ActSeeBld); Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order); - HTM_BUTTON_OnSubmit_Begin (Txt_BUILDINGS_HELP_ORDER[Order],"BT_LINK",NULL); + HTM_BUTTON_OnSubmit_Begin (Txt_BUILDINGS_HELP_ORDER[Order], + "BT_LINK",NULL); if (Order == Buildings.SelectedOrder) HTM_U_Begin (); HTM_Txt (Txt_BUILDINGS_ORDER[Order]); diff --git a/swad_center.c b/swad_center.c index 1d64f74e..a627e307 100644 --- a/swad_center.c +++ b/swad_center.c @@ -153,9 +153,8 @@ void Ctr_SeeCtrWithPendingDegs (void) /* Center logo and full name */ HTM_TR_Begin (NULL); - HTM_TD_Begin ("class=\"%s LM %s\"",The_ClassDat[Gbl.Prefs.Theme],BgColor); - Ctr_DrawCenterLogoAndNameWithLink (&Ctr,ActSeeDeg, - "BT_LINK NOWRAP","CM"); + HTM_TD_Begin ("class=\"%s NOWRAP LM %s\"",The_ClassDat[Gbl.Prefs.Theme],BgColor); + Ctr_DrawCenterLogoAndNameWithLink (&Ctr,ActSeeDeg,"CM"); HTM_TD_End (); /* Number of pending degrees (row[1]) */ @@ -182,14 +181,14 @@ void Ctr_SeeCtrWithPendingDegs (void) /*****************************************************************************/ void Ctr_DrawCenterLogoAndNameWithLink (struct Ctr_Center *Ctr,Act_Action_t Action, - const char *ClassLink,const char *ClassLogo) + const char *ClassLogo) { /***** Begin form *****/ Frm_BeginFormGoTo (Action); Ctr_PutParamCtrCod (Ctr->CtrCod); /***** Link to action *****/ - HTM_BUTTON_OnSubmit_Begin (Str_BuildGoToMsg (Ctr->FullName),ClassLink,NULL); + HTM_BUTTON_OnSubmit_Begin (Str_BuildGoToMsg (Ctr->FullName),"BT_LINK",NULL); Str_FreeStrings (); /***** Center logo and name *****/ @@ -364,8 +363,7 @@ static void Ctr_ListOneCenterForSeeing (struct Ctr_Center *Ctr,unsigned NumCtr) /***** Center logo and name *****/ HTM_TD_Begin ("class=\"%s LM %s\"",TxtClassStrong,BgColor); - Ctr_DrawCenterLogoAndNameWithLink (Ctr,ActSeeDeg, - "BT_LINK LT","CM"); + Ctr_DrawCenterLogoAndNameWithLink (Ctr,ActSeeDeg,"CM"); HTM_TD_End (); /***** Number of users who claim to belong to this center *****/ diff --git a/swad_center.h b/swad_center.h index bf380b6d..9864fbb4 100644 --- a/swad_center.h +++ b/swad_center.h @@ -81,7 +81,7 @@ struct ListCenters void Ctr_SeeCtrWithPendingDegs (void); void Ctr_DrawCenterLogoAndNameWithLink (struct Ctr_Center *Ctr,Act_Action_t Action, - const char *ClassLink,const char *ClassLogo); + const char *ClassLogo); void Ctr_ShowCtrsOfCurrentIns (void); void Ctr_EditCenters (void); diff --git a/swad_center_config.c b/swad_center_config.c index 6bfe0b9b..497579c9 100644 --- a/swad_center_config.c +++ b/swad_center_config.c @@ -567,7 +567,7 @@ static void CtrCfg_Institution (bool PrintView,bool PutForm) Txt_Institution); /* Data */ - HTM_TD_Begin ("class=\"%s LB\"",The_ClassDat[Gbl.Prefs.Theme]); + HTM_TD_Begin ("class=\"%s LT\"",The_ClassDat[Gbl.Prefs.Theme]); if (PutForm) { /* Get list of institutions of the current country */ @@ -598,7 +598,7 @@ static void CtrCfg_Institution (bool PrintView,bool PutForm) Frm_BeginFormGoTo (ActSeeInsInf); Ins_PutParamInsCod (Gbl.Hierarchy.Ins.InsCod); HTM_BUTTON_OnSubmit_Begin (Str_BuildGoToMsg (Gbl.Hierarchy.Ins.ShrtName), - "BT_LINK LT",NULL); + "BT_LINK",NULL); Str_FreeStrings (); } diff --git a/swad_changelog.h b/swad_changelog.h index f578b019..3dc92a18 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -602,10 +602,11 @@ TODO: FIX BUG, URGENT! En las fechas como par TODO: En las encuestas, que los estudiantes no puedan ver los resultados hasta que no finalice el plazo. */ -#define Log_PLATFORM_VERSION "SWAD 21.74 (2021-12-26)" +#define Log_PLATFORM_VERSION "SWAD 21.75 (2021-12-26)" #define CSS_FILE "swad21.74.css" #define JS_FILE "swad21.67.4.js" /* + Version 21.75: Dec 26, 2021 Code refactoring related to links. (322477 lines) Version 21.74: Dec 26, 2021 Working on design of dark theme. Code refactoring related to links. (322483 lines) Version 21.73.1: Dec 23, 2021 Changes in notice/announcement colors. (322516 lines) diff --git a/swad_chat.c b/swad_chat.c index f6b3e0d8..b6c1cc20 100644 --- a/swad_chat.c +++ b/swad_chat.c @@ -316,7 +316,8 @@ static void Cht_WriteLinkToChat1 (const char *RoomCode,const char *RoomShrtName, Cht_WriteParamsRoomCodeAndNames (RoomCode,RoomShrtName,RoomFullName); /* Begin button */ - HTM_BUTTON_OnSubmit_Begin (RoomFullName,The_ClassFormLinkInBox[Gbl.Prefs.Theme],NULL); + HTM_BUTTON_OnSubmit_Begin (RoomFullName, + The_ClassFormLinkInBox[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 ef8c2c52..c86016bf 100644 --- a/swad_connected.c +++ b/swad_connected.c @@ -328,8 +328,8 @@ void Con_ShowConnectedUsrsBelongingToCurrentCrs (void) /***** Number of connected users who belong to course *****/ /* Link to view more details about connected users */ Frm_BeginFormUnique (ActLstCon); // Must be unique because - // the list of connected users - // is dynamically updated via AJAX + // the list of connected users + // is dynamically updated via AJAX HTM_BUTTON_OnSubmit_Begin (Txt_Connected_users,"BT_LINK CONNECTED_TXT",NULL); Str_Copy (CourseName,Gbl.Hierarchy.Crs.ShrtName,sizeof (CourseName) - 1); Con_GetNumConnectedWithARoleBelongingToCurrentScope (Rol_UNK,&Usrs); @@ -612,7 +612,7 @@ static void Con_WriteRowConnectedUsrOnRightColumn (Rol_Role_t Role) HTM_DIV_Begin ("class=\"CON_NAME_NARROW\""); // Limited width HTM_BUTTON_OnSubmit_Begin (Txt_View_record_for_this_course, - "BT_LINK",NULL); + "BT_LINK LT",NULL); Usr_WriteFirstNameBRSurnames (UsrDat); HTM_BUTTON_End (); HTM_DIV_End (); @@ -723,7 +723,8 @@ static void Con_ShowConnectedUsrsCurrentLocationOneByOneOnMainZone (Rol_Role_t R HTM_DIV_Begin ("class=\"CON_NAME_WIDE\""); // Limited width if (PutLinkToRecord) - HTM_BUTTON_OnSubmit_Begin (UsrDat.FullName,"BT_LINK",NULL); + HTM_BUTTON_OnSubmit_Begin (UsrDat.FullName, + "BT_LINK",NULL); Usr_WriteFirstNameBRSurnames (&UsrDat); if (PutLinkToRecord) HTM_BUTTON_End (); diff --git a/swad_country.c b/swad_country.c index 7016cbfd..29723bc4 100644 --- a/swad_country.c +++ b/swad_country.c @@ -158,8 +158,7 @@ void Cty_SeeCtyWithPendingInss (void) The_ClassDat[Gbl.Prefs.Theme],BgColor); Cty_DrawCountryMapAndNameWithLink (&Cty,ActSeeIns, "COUNTRY_SMALL", - "COUNTRY_MAP_SMALL", - "BT_LINK"); + "COUNTRY_MAP_SMALL"); HTM_TD_End (); /* Number of pending institutions (row[1]) */ @@ -361,24 +360,25 @@ static void Cty_PutHeadCountriesForSeeing (bool OrderSelectable) Order <= Cty_ORDER_BY_NUM_USRS; Order++) { - HTM_TH_Begin (1,1,Order == Cty_ORDER_BY_COUNTRY ? "LM" : - "RM"); - if (OrderSelectable) - { - Frm_BeginForm (ActSeeCty); - Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order); - HTM_BUTTON_OnSubmit_Begin (Txt_COUNTRIES_HELP_ORDER[Order],"BT_LINK TIT_TBL",NULL); - if (Order == Gbl.Hierarchy.Ctys.SelectedOrder) - HTM_U_Begin (); - } - HTM_Txt (Txt_COUNTRIES_ORDER[Order]); - if (OrderSelectable) - { - if (Order == Gbl.Hierarchy.Ctys.SelectedOrder) - HTM_U_End (); - HTM_BUTTON_End (); - Frm_EndForm (); - } + HTM_TH_Begin (1,1,Order == Cty_ORDER_BY_COUNTRY ? "TIT_TBL LM" : + "TIT_TBL RM"); + if (OrderSelectable) + { + Frm_BeginForm (ActSeeCty); + Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order); + HTM_BUTTON_OnSubmit_Begin (Txt_COUNTRIES_HELP_ORDER[Order], + "BT_LINK",NULL); + if (Order == Gbl.Hierarchy.Ctys.SelectedOrder) + HTM_U_Begin (); + } + HTM_Txt (Txt_COUNTRIES_ORDER[Order]); + if (OrderSelectable) + { + if (Order == Gbl.Hierarchy.Ctys.SelectedOrder) + HTM_U_End (); + HTM_BUTTON_End (); + Frm_EndForm (); + } HTM_TH_End (); } @@ -421,8 +421,7 @@ static void Cty_ListOneCountryForSeeing (struct Cty_Countr *Cty,unsigned NumCty) The_ClassDatStrong[Gbl.Prefs.Theme],BgColor); Cty_DrawCountryMapAndNameWithLink (Cty,ActSeeIns, "COUNTRY_SMALL", - "COUNTRY_MAP_SMALL", - "BT_LINK"); + "COUNTRY_MAP_SMALL"); HTM_TD_End (); /***** Number of users who claim to belong to this country *****/ @@ -502,8 +501,7 @@ static void Cty_PutIconToEditCountries (void) void Cty_DrawCountryMapAndNameWithLink (struct Cty_Countr *Cty,Act_Action_t Action, const char *ClassContainer, - const char *ClassMap, - const char *ClassLink) + const char *ClassMap) { char CountryName[Cty_MAX_BYTES_NAME + 1]; @@ -516,7 +514,7 @@ void Cty_DrawCountryMapAndNameWithLink (struct Cty_Countr *Cty,Act_Action_t Acti /***** Link to action *****/ HTM_BUTTON_OnSubmit_Begin (Str_BuildGoToMsg (Cty->Name[Gbl.Prefs.Language]), - ClassLink,NULL); + "BT_LINK",NULL); Str_FreeStrings (); /***** Draw country map *****/ @@ -907,11 +905,10 @@ void Cty_WriteSelectorOfCountry (void) /*****************************************************************************/ // If ClassLink == NULL ==> do not put link -void Cty_WriteCountryName (long CtyCod,const char *ClassLink) +void Cty_WriteCountryName (long CtyCod) { char CtyName[Cty_MAX_BYTES_NAME + 1]; - bool PutForm = ClassLink && - !Gbl.Form.Inside && // Only if not inside another form + bool PutForm = !Gbl.Form.Inside && // Only if not inside another form Act_GetBrowserTab (Gbl.Action.Act) == Act_BRW_1ST_TAB; // Only in main browser tab /***** Get country name *****/ @@ -922,7 +919,8 @@ void Cty_WriteCountryName (long CtyCod,const char *ClassLink) /***** Write country name with link to country information *****/ Frm_BeginForm (ActSeeCtyInf); Cty_PutParamCtyCod (CtyCod); - HTM_BUTTON_OnSubmit_Begin (Act_GetActionText (ActSeeCtyInf),ClassLink,NULL); + HTM_BUTTON_OnSubmit_Begin (Act_GetActionText (ActSeeCtyInf), + "BT_LINK",NULL); HTM_Txt (CtyName); HTM_BUTTON_End (); Frm_EndForm (); diff --git a/swad_country.h b/swad_country.h index 71720a4e..db61ffb8 100644 --- a/swad_country.h +++ b/swad_country.h @@ -87,8 +87,7 @@ bool Cty_CheckIfICanEditCountries (void); void Cty_DrawCountryMapAndNameWithLink (struct Cty_Countr *Cty,Act_Action_t Action, const char *ClassContainer, - const char *ClassMap, - const char *ClassLink); + const char *ClassMap); void Cty_DrawCountryMap (struct Cty_Countr *Cty,const char *Class); bool Cty_CheckIfCountryPhotoExists (struct Cty_Countr *Cty); @@ -99,7 +98,7 @@ void Cty_GetBasicListOfCountries (void); void Cty_GetFullListOfCountries (void); void Cty_FreeListCountries (void); void Cty_WriteSelectorOfCountry (void); -void Cty_WriteCountryName (long CtyCod,const char *ClassLink); +void Cty_WriteCountryName (long CtyCod); bool Cty_GetDataOfCountryByCod (struct Cty_Countr *Cty); void Cty_FlushCacheCountryName (void); void Cty_GetCountryName (long CtyCod,Lan_Language_t Language, diff --git a/swad_country_config.c b/swad_country_config.c index f3414da4..b6444186 100644 --- a/swad_country_config.c +++ b/swad_country_config.c @@ -371,12 +371,12 @@ static void CtyCfg_Platform (bool PrintView) Frm_LabelColumn ("RT",NULL,Txt_Platform); /* Data */ - HTM_TD_Begin ("class=\"%s LB\"",The_ClassDat[Gbl.Prefs.Theme]); + HTM_TD_Begin ("class=\"%s LT\"",The_ClassDat[Gbl.Prefs.Theme]); if (!PrintView) { Frm_BeginFormGoTo (ActSeeSysInf); HTM_BUTTON_OnSubmit_Begin (Str_BuildGoToMsg (Cfg_PLATFORM_SHORT_NAME), - "BT_LINK LT",NULL); + "BT_LINK",NULL); Str_FreeStrings (); } Ico_PutIcon ("swad64x64.png",Ico_UNCHANGED,Cfg_PLATFORM_FULL_NAME,"ICO20x20"); @@ -479,7 +479,7 @@ static void CtyCfg_NumInss (void) Frm_LabelColumn ("RT",NULL,Txt_Institutions); /* Data */ - HTM_TD_Begin ("class=\"%s LB\"",The_ClassDat[Gbl.Prefs.Theme]); + HTM_TD_Begin ("class=\"%s LT\"",The_ClassDat[Gbl.Prefs.Theme]); Frm_BeginFormGoTo (ActSeeIns); Cty_PutParamCtyCod (Gbl.Hierarchy.Cty.CtyCod); HTM_BUTTON_OnSubmit_Begin (Str_BuildString (Txt_Institutions_of_COUNTRY_X, diff --git a/swad_course.c b/swad_course.c index 926a3158..480b2207 100644 --- a/swad_course.c +++ b/swad_course.c @@ -193,10 +193,7 @@ static void Crs_WriteListMyCoursesToSelectOne (void) ClassNormal); Frm_BeginForm (ActMyCrs); Cty_PutParamCtyCod (-1L); - HTM_BUTTON_OnSubmit_Begin (Txt_System, - Highlight ? ClassHighlight : - ClassNormal, - NULL); + HTM_BUTTON_OnSubmit_Begin (Txt_System,"BT_LINK",NULL); Ico_PutIcon ("sitemap.svg",Ico_BLACK,Txt_System,"ICO16x16"); HTM_TxtF (" %s",Txt_System); HTM_BUTTON_End (); @@ -227,9 +224,7 @@ static void Crs_WriteListMyCoursesToSelectOne (void) Frm_BeginForm (ActMyCrs); Cty_PutParamCtyCod (Hie.Cty.CtyCod); HTM_BUTTON_OnSubmit_Begin (Act_GetActionText (ActSeeCtyInf), - Highlight ? ClassHighlight : - ClassNormal, - NULL); + "BT_LINK",NULL); Cty_DrawCountryMap (&Hie.Cty,"ICO16x16"); HTM_TxtF (" %s",Hie.Cty.Name[Gbl.Prefs.Language]); HTM_BUTTON_End (); @@ -262,9 +257,7 @@ static void Crs_WriteListMyCoursesToSelectOne (void) Frm_BeginForm (ActMyCrs); Ins_PutParamInsCod (Hie.Ins.InsCod); HTM_BUTTON_OnSubmit_Begin (Act_GetActionText (ActSeeInsInf), - Highlight ? ClassHighlight : - ClassNormal, - NULL); + "BT_LINK",NULL); Lgo_DrawLogo (HieLvl_INS,Hie.Ins.InsCod,Hie.Ins.ShrtName,16,NULL,true); HTM_TxtF (" %s",Hie.Ins.ShrtName); HTM_BUTTON_End (); @@ -297,9 +290,7 @@ static void Crs_WriteListMyCoursesToSelectOne (void) Frm_BeginForm (ActMyCrs); Ctr_PutParamCtrCod (Hie.Ctr.CtrCod); HTM_BUTTON_OnSubmit_Begin (Act_GetActionText (ActSeeCtrInf), - Highlight ? ClassHighlight : - ClassNormal, - NULL); + "BT_LINK",NULL); Lgo_DrawLogo (HieLvl_CTR,Hie.Ctr.CtrCod,Hie.Ctr.ShrtName,16,NULL,true); HTM_TxtF (" %s",Hie.Ctr.ShrtName); HTM_BUTTON_End (); @@ -332,9 +323,7 @@ static void Crs_WriteListMyCoursesToSelectOne (void) Frm_BeginForm (ActMyCrs); Deg_PutParamDegCod (Hie.Deg.DegCod); HTM_BUTTON_OnSubmit_Begin (Act_GetActionText (ActSeeDegInf), - Highlight ? ClassHighlight : - ClassNormal, - NULL); + "BT_LINK",NULL); Lgo_DrawLogo (HieLvl_DEG,Hie.Deg.DegCod,Hie.Deg.ShrtName,16,NULL,true); HTM_TxtF (" %s",Hie.Deg.ShrtName); HTM_BUTTON_End (); @@ -367,9 +356,7 @@ static void Crs_WriteListMyCoursesToSelectOne (void) Frm_BeginForm (ActMyCrs); Crs_PutParamCrsCod (Hie.Crs.CrsCod); HTM_BUTTON_OnSubmit_Begin (Str_BuildGoToMsg (Hie.Crs.ShrtName), - Highlight ? ClassHighlight : - ClassNormal, - NULL); + "BT_LINK",NULL); Str_FreeStrings (); Ico_PutIcon ("chalkboard-teacher.svg",Ico_BLACK,Hie.Crs.FullName,"ICO16x16"); HTM_TxtF (" %s",Hie.Crs.ShrtName); @@ -2478,7 +2465,8 @@ static void Crs_WriteRowCrsData (unsigned NumCrs,MYSQL_ROW row,bool WriteColumnA HTM_TD_Begin ("class=\"%s LT %s\"",ClassTxt,BgColor); Frm_BeginFormGoTo (ActSeeDegInf); Deg_PutParamDegCod (Deg.DegCod); - HTM_BUTTON_OnSubmit_Begin (Str_BuildGoToMsg (row[2]),"BT_LINK",NULL); + HTM_BUTTON_OnSubmit_Begin (Str_BuildGoToMsg (row[2]), + "BT_LINK",NULL); Str_FreeStrings (); Lgo_DrawLogo (HieLvl_DEG,Deg.DegCod,Deg.ShrtName,20,"CT",true); HTM_TxtF (" %s (%s)",row[2],row[6]); @@ -2495,7 +2483,8 @@ static void Crs_WriteRowCrsData (unsigned NumCrs,MYSQL_ROW row,bool WriteColumnA HTM_TD_Begin ("class=\"%s LT %s\"",ClassTxt,BgColor); Frm_BeginFormGoTo (ActSeeCrsInf); Crs_PutParamCrsCod (CrsCod); - HTM_BUTTON_OnSubmit_Begin (Str_BuildGoToMsg (row[5]),"BT_LINK",NULL); + HTM_BUTTON_OnSubmit_Begin (Str_BuildGoToMsg (row[5]), + "BT_LINK",NULL); Str_FreeStrings (); HTM_Txt (row[5]); HTM_BUTTON_End (); diff --git a/swad_course_config.c b/swad_course_config.c index eb2bf8a6..3baec058 100644 --- a/swad_course_config.c +++ b/swad_course_config.c @@ -221,7 +221,7 @@ static void CrsCfg_Degree (bool PrintView,bool PutForm) Txt_Degree); /* Data */ - HTM_TD_Begin ("class=\"%s LB\"",The_ClassDat[Gbl.Prefs.Theme]); + HTM_TD_Begin ("class=\"%s LT\"",The_ClassDat[Gbl.Prefs.Theme]); if (PutForm) { /* Get list of degrees of the current center */ @@ -252,7 +252,7 @@ static void CrsCfg_Degree (bool PrintView,bool PutForm) Frm_BeginFormGoTo (ActSeeDegInf); Deg_PutParamDegCod (Gbl.Hierarchy.Deg.DegCod); HTM_BUTTON_OnSubmit_Begin (Str_BuildGoToMsg (Gbl.Hierarchy.Deg.ShrtName), - "BT_LINK LT",NULL); + "BT_LINK",NULL); Str_FreeStrings (); } Lgo_DrawLogo (HieLvl_DEG,Gbl.Hierarchy.Deg.DegCod,Gbl.Hierarchy.Deg.ShrtName, diff --git a/swad_date.c b/swad_date.c index 9840d8a5..eeb26d4b 100644 --- a/swad_date.c +++ b/swad_date.c @@ -338,7 +338,8 @@ void Dat_ShowClientLocalTime (void) /* Month with link to calendar */ HTM_DIV_Begin ("id=\"current_month\""); Frm_BeginForm (ActSeeCal); - HTM_BUTTON_OnSubmit_Begin (Txt_Show_calendar,"BT_LINK CURRENT_MONTH",NULL); + HTM_BUTTON_OnSubmit_Begin (Txt_Show_calendar, + "BT_LINK CURRENT_MONTH",NULL); HTM_SPAN_Begin ("id=\"current_month_txt\""); // JavaScript will write HTML here HTM_SPAN_End (); @@ -351,7 +352,8 @@ void Dat_ShowClientLocalTime (void) if (Gbl.Usrs.Me.Logged) { Frm_BeginForm (ActSeeMyAgd); - HTM_BUTTON_OnSubmit_Begin (Txt_Show_agenda,"BT_LINK CURRENT_DAY",NULL); + HTM_BUTTON_OnSubmit_Begin (Txt_Show_agenda, + "BT_LINK CURRENT_DAY",NULL); } HTM_SPAN_Begin ("id=\"current_day_txt\""); // JavaScript will write HTML here diff --git a/swad_degree.c b/swad_degree.c index a8fbe734..20c49bd7 100644 --- a/swad_degree.c +++ b/swad_degree.c @@ -158,10 +158,9 @@ void Deg_SeeDegWithPendingCrss (void) HTM_TR_Begin (NULL); /* Degree logo and full name */ - HTM_TD_Begin ("class=\"%s LM %s\"", + HTM_TD_Begin ("class=\"%s NOWRAP LM %s\"", The_ClassDat[Gbl.Prefs.Theme],BgColor); - Deg_DrawDegreeLogoAndNameWithLink (&Deg,ActSeeCrs, - "BT_LINK NOWRAP","CM"); + Deg_DrawDegreeLogoAndNameWithLink (&Deg,ActSeeCrs,"CM"); HTM_TD_End (); /* Number of pending courses (row[1]) */ @@ -189,14 +188,15 @@ void Deg_SeeDegWithPendingCrss (void) /*****************************************************************************/ void Deg_DrawDegreeLogoAndNameWithLink (struct Deg_Degree *Deg,Act_Action_t Action, - const char *ClassLink,const char *ClassLogo) + const char *ClassLogo) { /***** Begin form *****/ Frm_BeginFormGoTo (Action); Deg_PutParamDegCod (Deg->DegCod); /***** Link to action *****/ - HTM_BUTTON_OnSubmit_Begin (Str_BuildGoToMsg (Deg->FullName),ClassLink,NULL); + HTM_BUTTON_OnSubmit_Begin (Str_BuildGoToMsg (Deg->FullName), + "BT_LINK",NULL); Str_FreeStrings (); /***** Degree logo and name *****/ @@ -844,8 +844,7 @@ static void Deg_ListOneDegreeForSeeing (struct Deg_Degree *Deg,unsigned NumDeg) /***** Degree logo and name *****/ HTM_TD_Begin ("class=\"%s LM %s\"",TxtClassStrong,BgColor); - Deg_DrawDegreeLogoAndNameWithLink (Deg,ActSeeCrs, - "BT_LINK","CM"); + Deg_DrawDegreeLogoAndNameWithLink (Deg,ActSeeCrs,"CM"); HTM_TD_End (); /***** Type of degree *****/ diff --git a/swad_degree.h b/swad_degree.h index 00f0b70c..aa9d35a5 100644 --- a/swad_degree.h +++ b/swad_degree.h @@ -72,7 +72,7 @@ struct ListDegrees void Deg_SeeDegWithPendingCrss (void); void Deg_DrawDegreeLogoAndNameWithLink (struct Deg_Degree *Deg,Act_Action_t Action, - const char *ClassLink,const char *ClassLogo); + const char *ClassLogo); void Deg_WriteSelectorOfDegree (void); diff --git a/swad_degree_config.c b/swad_degree_config.c index 27886732..707eec06 100644 --- a/swad_degree_config.c +++ b/swad_degree_config.c @@ -243,9 +243,7 @@ static void DegCfg_Center (bool PrintView,bool PutForm) Frm_BeginFormGoTo (ActSeeCtrInf); Ctr_PutParamCtrCod (Gbl.Hierarchy.Ctr.CtrCod); HTM_BUTTON_OnSubmit_Begin (Str_BuildGoToMsg (Gbl.Hierarchy.Ctr.ShrtName), - Str_BuildString ("BT_LINK LT %s", - The_ClassDat[Gbl.Prefs.Theme]), - NULL); + "BT_LINK",NULL); Str_FreeStrings (); } Lgo_DrawLogo (HieLvl_CTR,Gbl.Hierarchy.Ctr.CtrCod,Gbl.Hierarchy.Ctr.ShrtName, @@ -333,7 +331,7 @@ static void DegCfg_NumCrss (void) Frm_BeginFormGoTo (ActSeeCrs); Deg_PutParamDegCod (Gbl.Hierarchy.Deg.DegCod); HTM_BUTTON_OnSubmit_Begin (Str_BuildString (Txt_Courses_of_DEGREE_X, - Gbl.Hierarchy.Deg.ShrtName), + Gbl.Hierarchy.Deg.ShrtName), "BT_LINK",NULL); Str_FreeStrings (); HTM_Unsigned (Crs_GetCachedNumCrssInDeg (Gbl.Hierarchy.Deg.DegCod)); diff --git a/swad_degree_type.c b/swad_degree_type.c index 53ef51c7..256d526d 100644 --- a/swad_degree_type.c +++ b/swad_degree_type.c @@ -528,8 +528,8 @@ static void DegTyp_PutHeadDegreeTypesForSeeing (Act_Action_t NextAction, Order <= DegTyp_ORDER_BY_NUM_DEGREES; Order++) { - HTM_TH_Begin (1,1,Order == DegTyp_ORDER_BY_DEGREE_TYPE ? "LM" : - "RM"); + HTM_TH_Begin (1,1,Order == DegTyp_ORDER_BY_DEGREE_TYPE ? "TIT_TBL LM" : + "TIT_TBL RM"); /* Begin form to change order */ Frm_BeginForm (NextAction); @@ -543,7 +543,7 @@ static void DegTyp_PutHeadDegreeTypesForSeeing (Act_Action_t NextAction, /* Link with the head of this column */ HTM_BUTTON_OnSubmit_Begin (Txt_DEGREE_TYPES_HELP_ORDER[Order], - "BT_LINK TIT_TBL",NULL); + "BT_LINK",NULL); if (Order == SelectedOrder) HTM_U_Begin (); HTM_Txt (Txt_DEGREE_TYPES_ORDER[Order]); diff --git a/swad_department.c b/swad_department.c index 1b68edfb..c71d3003 100644 --- a/swad_department.c +++ b/swad_department.c @@ -141,13 +141,13 @@ void Dpt_SeeDepts (void) Order <= Dpt_ORDER_BY_NUM_TCHS; Order++) { - HTM_TH_Begin (1,1,Order == Dpt_ORDER_BY_NUM_TCHS ? "RM" : - "LM"); + HTM_TH_Begin (1,1,Order == Dpt_ORDER_BY_NUM_TCHS ? "TIT_TBL RM" : + "TIT_TBL LM"); Frm_BeginForm (ActSeeDpt); Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order); HTM_BUTTON_OnSubmit_Begin (Txt_DEPARTMENTS_HELP_ORDER[Order], - "BT_LINK TIT_TBL",NULL); + "BT_LINK",NULL); if (Order == Departments.SelectedOrder) HTM_U_Begin (); HTM_Txt (Txt_DEPARTMENTS_ORDER[Order]); diff --git a/swad_exam.c b/swad_exam.c index c72a6603..a8162c89 100644 --- a/swad_exam.c +++ b/swad_exam.c @@ -254,14 +254,14 @@ static void Exa_ListAllExams (struct Exa_Exams *Exams) Order <= (Exa_Order_t) (Exa_NUM_ORDERS - 1); Order++) { - HTM_TH_Begin (1,1,"LM"); + HTM_TH_Begin (1,1,"TIT_TBL LM"); /* Form to change order */ Frm_BeginForm (ActSeeAllExa); Pag_PutHiddenParamPagNum (Pag_EXAMS,Exams->CurrentPage); Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order); HTM_BUTTON_OnSubmit_Begin (Txt_EXAMS_ORDER_HELP[Order], - "BT_LINK TIT_TBL",NULL); + "BT_LINK",NULL); if (Order == Exams->SelectedOrder) HTM_U_Begin (); HTM_Txt (Txt_EXAMS_ORDER[Order]); @@ -541,19 +541,21 @@ static void Exa_ShowOneExam (struct Exa_Exams *Exams, /***** Exam title and main data *****/ if (ShowOnlyThisExam) - HTM_TD_Begin ("class=\"LT\""); + HTM_TD_Begin ("class=\"%s LT\"", + Exam->Hidden ? "ASG_TITLE_LIGHT": + "ASG_TITLE"); else - HTM_TD_Begin ("class=\"LT %s\"",Gbl.ColorRows[Gbl.RowEvenOdd]); + HTM_TD_Begin ("class=\"%s LT %s\"", + Exam->Hidden ? "ASG_TITLE_LIGHT": + "ASG_TITLE", + Gbl.ColorRows[Gbl.RowEvenOdd]); /* Exam title */ Exams->ExaCod = Exam->ExaCod; HTM_ARTICLE_Begin (Anchor); Frm_BeginForm (ActSeeExa); Exa_PutParams (Exams); - HTM_BUTTON_OnSubmit_Begin (Txt_View_exam, - Exam->Hidden ? "BT_LINK LT ASG_TITLE_LIGHT": - "BT_LINK LT ASG_TITLE", - NULL); + HTM_BUTTON_OnSubmit_Begin (Txt_View_exam,"BT_LINK",NULL); HTM_Txt (Exam->Title); HTM_BUTTON_End (); Frm_EndForm (); @@ -574,17 +576,19 @@ static void Exa_ShowOneExam (struct Exa_Exams *Exams, /***** Number of sessions in exam *****/ if (ShowOnlyThisExam) - HTM_TD_Begin ("class=\"RT\""); + HTM_TD_Begin ("class=\"%s RT\"", + Exam->Hidden ? "ASG_TITLE_LIGHT": + "ASG_TITLE"); else - HTM_TD_Begin ("class=\"RT %s\"",Gbl.ColorRows[Gbl.RowEvenOdd]); + HTM_TD_Begin ("class=\"%s RT %s\"", + Exam->Hidden ? "ASG_TITLE_LIGHT": + "ASG_TITLE", + Gbl.ColorRows[Gbl.RowEvenOdd]); Exams->ExaCod = Exam->ExaCod; Frm_BeginForm (ActSeeExa); Exa_PutParams (Exams); - HTM_BUTTON_OnSubmit_Begin (Txt_Sessions, - Exam->Hidden ? "BT_LINK LT ASG_TITLE_LIGHT" : - "BT_LINK LT ASG_TITLE", - NULL); + HTM_BUTTON_OnSubmit_Begin (Txt_Sessions,"BT_LINK",NULL); if (ShowOnlyThisExam) HTM_TxtColonNBSP (Txt_Sessions); HTM_Unsigned (Exam->NumSess); diff --git a/swad_exam_session.c b/swad_exam_session.c index 0ffdc937..7ea92f6e 100644 --- a/swad_exam_session.c +++ b/swad_exam_session.c @@ -516,7 +516,10 @@ static void ExaSes_ListOneOrMoreSessionsTitleGrps (struct Exa_Exams *Exams, extern const char *Txt_Play; extern const char *Txt_Resume; - HTM_TD_Begin ("class=\"LT %s\"",Gbl.ColorRows[Gbl.RowEvenOdd]); + HTM_TD_Begin ("class=\"%s LT %s\"", + Session->Hidden ? "ASG_TITLE_LIGHT": + "ASG_TITLE", + Gbl.ColorRows[Gbl.RowEvenOdd]); /***** Session title *****/ HTM_ARTICLE_Begin (Anchor); @@ -527,20 +530,13 @@ static void ExaSes_ListOneOrMoreSessionsTitleGrps (struct Exa_Exams *Exams, ExaSes_PutParamSesCod (Session->SesCod); HTM_BUTTON_OnSubmit_Begin (Gbl.Usrs.Me.Role.Logged == Rol_STD ? Txt_Play : Txt_Resume, - Session->Hidden ? "BT_LINK ASG_TITLE_LIGHT": - "BT_LINK ASG_TITLE", - NULL); + "BT_LINK",NULL); HTM_Txt (Session->Title); HTM_BUTTON_End (); Frm_EndForm (); } else - { - HTM_SPAN_Begin ("class=\"%s\"",Session->Hidden ? "ASG_TITLE_LIGHT": - "ASG_TITLE"); - HTM_Txt (Session->Title); - HTM_SPAN_End (); - } + HTM_Txt (Session->Title); HTM_ARTICLE_End (); /***** Groups whose students can answer this exam session *****/ diff --git a/swad_figure.c b/swad_figure.c index 7a44354a..6ea3ef56 100644 --- a/swad_figure.c +++ b/swad_figure.c @@ -1179,7 +1179,6 @@ static void Fig_ShowInss (MYSQL_RES **mysql_res,unsigned NumInss, const char *TxtFigure) { extern const char *The_ClassFormInBox[The_NUM_THEMES]; - extern const char *The_ClassFormLinkInBox[The_NUM_THEMES]; extern const char *The_ClassDat[The_NUM_THEMES]; extern const char *Txt_Institution; unsigned NumIns; @@ -1256,7 +1255,7 @@ static void Fig_ShowInss (MYSQL_RES **mysql_res,unsigned NumInss, /* Icon and name of this institution */ Frm_BeginForm (ActSeeInsInf); Ins_PutParamInsCod (Ins.InsCod); - HTM_BUTTON_OnSubmit_Begin (Ins.ShrtName,The_ClassFormLinkInBox[Gbl.Prefs.Theme],NULL); + HTM_BUTTON_OnSubmit_Begin (Ins.ShrtName,"BT_LINK",NULL); if (Gbl.Usrs.Listing.WithPhotos) { Lgo_DrawLogo (HieLvl_INS,Ins.InsCod,Ins.ShrtName, diff --git a/swad_follow.c b/swad_follow.c index 95ce9a91..e431dac0 100644 --- a/swad_follow.c +++ b/swad_follow.c @@ -196,12 +196,11 @@ void Fol_SuggestUsrsToFollowMainZoneOnRightColumn (void) &mysql_res))) { /***** Begin container *****/ - HTM_DIV_Begin ("class=\"CONNECTED\""); + HTM_DIV_Begin ("class=\"CONNECTED CONNECTED_TXT\""); /***** Title with link to suggest more users to follow *****/ Frm_BeginForm (ActSeeSocPrf); - HTM_BUTTON_OnSubmit_Begin (Txt_Who_to_follow, - "BT_LINK CONNECTED_TXT",NULL); + HTM_BUTTON_OnSubmit_Begin (Txt_Who_to_follow,"BT_LINK",NULL); HTM_Txt (Txt_Who_to_follow); HTM_BUTTON_End (); Frm_EndForm (); @@ -390,11 +389,11 @@ static void Fol_ShowNumberOfFollowingOrFollowers (const struct UsrData *UsrDat, { extern const char *The_ClassFormOutBox[The_NUM_THEMES]; extern const char *The_ClassFormOutBoxBold[The_NUM_THEMES]; - extern const char *The_ClassFormLinkOutBox[The_NUM_THEMES]; - extern const char *The_ClassFormLinkOutBoxBold[The_NUM_THEMES]; /***** Begin container *****/ - HTM_DIV_Begin ("class=\"FOLLOW_BOX\""); + HTM_DIV_Begin ("class=\"FOLLOW_BOX %s\"", + (Gbl.Action.Act == Action) ? "FOLLOW_NUM_B" : + "FOLLOW_NUM"); /***** Number *****/ if (NumUsrs) @@ -402,22 +401,14 @@ static void Fol_ShowNumberOfFollowingOrFollowers (const struct UsrData *UsrDat, /* Form to list users */ Frm_BeginFormAnchor (Action,Fol_FOLLOW_SECTION_ID); Usr_PutParamUsrCodEncrypted (UsrDat->EnUsrCod); - HTM_BUTTON_OnSubmit_Begin (Title, - (Gbl.Action.Act == Action) ? "BT_LINK FOLLOW_NUM_B" : - "BT_LINK FOLLOW_NUM", - NULL); + HTM_BUTTON_OnSubmit_Begin (Title,"BT_LINK",NULL); } - else - HTM_SPAN_Begin ("class=\"%s\"",(Gbl.Action.Act == Action) ? "FOLLOW_NUM_B" : - "FOLLOW_NUM"); HTM_Unsigned (NumUsrs); if (NumUsrs) { HTM_BUTTON_End (); Frm_EndForm (); } - else - HTM_SPAN_End (); /***** Text *****/ HTM_DIV_Begin ("class=\"%s\"", @@ -428,10 +419,7 @@ static void Fol_ShowNumberOfFollowingOrFollowers (const struct UsrData *UsrDat, /* Form to list users */ Frm_BeginFormAnchor (Action,Fol_FOLLOW_SECTION_ID); Usr_PutParamUsrCodEncrypted (UsrDat->EnUsrCod); - HTM_BUTTON_OnSubmit_Begin (Title, - (Gbl.Action.Act == Action) ? The_ClassFormLinkOutBoxBold[Gbl.Prefs.Theme] : - The_ClassFormLinkOutBox [Gbl.Prefs.Theme], - NULL); + HTM_BUTTON_OnSubmit_Begin (Title,"BT_LINK",NULL); } HTM_Txt (Title); if (NumUsrs) @@ -643,7 +631,7 @@ static void Fol_ShowFollowedOrFollower (struct UsrData *UsrDat) HTM_DIV_Begin ("class=\"FOLLOW_USR_NAME %s LT\"", // Limited width The_ClassDat[Gbl.Prefs.Theme]); HTM_BUTTON_OnSubmit_Begin (Txt_Another_user_s_profile, - "BT_LINK",NULL); + "BT_LINK LT",NULL); Usr_WriteFirstNameBRSurnames (UsrDat); HTM_BUTTON_End (); HTM_DIV_End (); @@ -703,9 +691,9 @@ static void Fol_WriteRowUsrToFollowOnRightColumn (struct UsrData *UsrDat) /* Put form to go to public profile */ Frm_BeginForm (ActSeeOthPubPrf); Usr_PutParamUsrCodEncrypted (UsrDat->EnUsrCod); - HTM_DIV_Begin ("class=\"CON_NAME_FOLLOW\""); // Limited width + HTM_DIV_Begin ("class=\"CON_NAME_FOLLOW CON_CRS LT\""); // Limited width HTM_BUTTON_OnSubmit_Begin (Txt_Another_user_s_profile, - "BT_LINK CON_CRS",NULL); + "BT_LINK LT",NULL); Usr_WriteFirstNameBRSurnames (UsrDat); HTM_BUTTON_End (); HTM_DIV_End (); diff --git a/swad_forum.c b/swad_forum.c index ad429958..06663ad6 100644 --- a/swad_forum.c +++ b/swad_forum.c @@ -1730,7 +1730,7 @@ static void For_WriteLinkToForum (const struct For_Forums *Forums, -1L); HTM_BUTTON_OnSubmit_Begin (Act_GetActionText (For_ActionsSeeFor[Forum->Type]), - Class,NULL); + Class,NULL); For_SetForumName (Forum,ForumName,Gbl.Prefs.Language,true); switch (Forum->Type) @@ -2051,7 +2051,7 @@ static void For_ShowForumThreadsHighlightingOneThread (struct For_Forums *Forums Order <= Dat_END_TIME; Order++) { - HTM_TH_Begin (1,2,"CM"); + HTM_TH_Begin (1,2,"TIT_TBL CM"); Frm_BeginFormAnchor (For_ActionsSeeFor[Forums->Forum.Type], For_FORUM_THREADS_SECTION_ID); @@ -2063,7 +2063,7 @@ static void For_ShowForumThreadsHighlightingOneThread (struct For_Forums *Forums -1L, -1L); HTM_BUTTON_OnSubmit_Begin (Txt_FORUM_THREAD_HELP_ORDER[Order], - "BT_LINK TIT_TBL",NULL); + "BT_LINK",NULL); if (Order == Forums->ThreadsOrder) HTM_U_Begin (); HTM_Txt (Txt_FORUM_THREAD_ORDER[Order]); diff --git a/swad_game.c b/swad_game.c index f1479fdd..04811361 100644 --- a/swad_game.c +++ b/swad_game.c @@ -276,7 +276,7 @@ static void Gam_ListAllGames (struct Gam_Games *Games) Order <= (Gam_Order_t) (Gam_NUM_ORDERS - 1); Order++) { - HTM_TH_Begin (1,1,"LM"); + HTM_TH_Begin (1,1,"TIT_TBL LM"); /* Form to change order */ Frm_BeginForm (ActSeeAllGam); @@ -284,7 +284,7 @@ static void Gam_ListAllGames (struct Gam_Games *Games) Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order); HTM_BUTTON_OnSubmit_Begin (Txt_GAMES_ORDER_HELP[Order], - "BT_LINK TIT_TBL",NULL); + "BT_LINK",NULL); if (Order == Games->SelectedOrder) HTM_U_Begin (); HTM_Txt (Txt_GAMES_ORDER[Order]); @@ -592,19 +592,21 @@ static void Gam_ShowOneGame (struct Gam_Games *Games, /***** Game title and main data *****/ if (ShowOnlyThisGame) - HTM_TD_Begin ("class=\"LT\""); + HTM_TD_Begin ("class=\"%s LT\"", + Game->Hidden ? "ASG_TITLE_LIGHT": + "ASG_TITLE"); else - HTM_TD_Begin ("class=\"LT %s\"",Gbl.ColorRows[Gbl.RowEvenOdd]); + HTM_TD_Begin ("class=\"%s LT %s\"", + Game->Hidden ? "ASG_TITLE_LIGHT": + "ASG_TITLE", + Gbl.ColorRows[Gbl.RowEvenOdd]); /* Game title */ Games->GamCod = Game->GamCod; HTM_ARTICLE_Begin (Anchor); Frm_BeginForm (ActSeeGam); Gam_PutParams (Games); - HTM_BUTTON_OnSubmit_Begin (Txt_View_game, - Game->Hidden ? "BT_LINK LT ASG_TITLE_LIGHT": - "BT_LINK LT ASG_TITLE", - NULL); + HTM_BUTTON_OnSubmit_Begin (Txt_View_game,"BT_LINK",NULL); HTM_Txt (Game->Title); HTM_BUTTON_End (); Frm_EndForm (); @@ -625,17 +627,19 @@ static void Gam_ShowOneGame (struct Gam_Games *Games, /***** Number of matches in game *****/ if (ShowOnlyThisGame) - HTM_TD_Begin ("class=\"RT\""); + HTM_TD_Begin ("class=\"%s RT\"", + Game->Hidden ? "ASG_TITLE_LIGHT": + "ASG_TITLE"); else - HTM_TD_Begin ("class=\"RT %s\"",Gbl.ColorRows[Gbl.RowEvenOdd]); + HTM_TD_Begin ("class=\"%s RT %s\"", + Game->Hidden ? "ASG_TITLE_LIGHT": + "ASG_TITLE", + Gbl.ColorRows[Gbl.RowEvenOdd]); Games->GamCod = Game->GamCod; Frm_BeginForm (ActSeeGam); Gam_PutParams (Games); - HTM_BUTTON_OnSubmit_Begin (Txt_Matches, - Game->Hidden ? "BT_LINK LT ASG_TITLE_LIGHT" : - "BT_LINK LT ASG_TITLE", - NULL); + HTM_BUTTON_OnSubmit_Begin (Txt_Matches,"BT_LINK",NULL); if (ShowOnlyThisGame) HTM_TxtColonNBSP (Txt_Matches); HTM_Unsigned (Game->NumMchs); diff --git a/swad_hierarchy.c b/swad_hierarchy.c index ba5959f1..52dc5ce7 100644 --- a/swad_hierarchy.c +++ b/swad_hierarchy.c @@ -685,39 +685,33 @@ void Hie_GetAndWriteInsCtrDegAdminBy (long UsrCod,unsigned ColSpan) HTM_TxtF (" %s",Txt_all_degrees); break; case HieLvl_INS: // Institution - Hie.Ins.InsCod = Str_ConvertStrCodToLongCod (row[1]); - if (Hie.Ins.InsCod > 0) + if ((Hie.Ins.InsCod = Str_ConvertStrCodToLongCod (row[1])) > 0) { /* Get data of institution */ Ins_GetDataOfInstitByCod (&Hie.Ins); /* Write institution logo and name */ - Ins_DrawInstitutionLogoAndNameWithLink (&Hie.Ins,ActSeeInsInf, - "BT_LINK DAT_SMALL_NOBR","LT"); + Ins_DrawInstitLogoAndNameWithLink (&Hie.Ins,ActSeeInsInf,"LT"); } break; case HieLvl_CTR: // Center - Hie.Ctr.CtrCod = Str_ConvertStrCodToLongCod (row[1]); - if (Hie.Ctr.CtrCod > 0) + if ((Hie.Ctr.CtrCod = Str_ConvertStrCodToLongCod (row[1])) > 0) { /* Get data of center */ Ctr_GetDataOfCenterByCod (&Hie.Ctr); /* Write center logo and name */ - Ctr_DrawCenterLogoAndNameWithLink (&Hie.Ctr,ActSeeCtrInf, - "BT_LINK DAT_SMALL_NOBR","LT"); + Ctr_DrawCenterLogoAndNameWithLink (&Hie.Ctr,ActSeeCtrInf,"LT"); } break; case HieLvl_DEG: // Degree - Hie.Deg.DegCod = Str_ConvertStrCodToLongCod (row[1]); - if (Hie.Deg.DegCod > 0) + if ((Hie.Deg.DegCod = Str_ConvertStrCodToLongCod (row[1])) > 0) { /* Get data of degree */ Deg_GetDataOfDegreeByCod (&Hie.Deg); /* Write degree logo and name */ - Deg_DrawDegreeLogoAndNameWithLink (&Hie.Deg,ActSeeDegInf, - "BT_LINK DAT_SMALL_NOBR","LT"); + Deg_DrawDegreeLogoAndNameWithLink (&Hie.Deg,ActSeeDegInf,"LT"); } break; default: // There are no administrators in other scopes diff --git a/swad_hierarchy_config.c b/swad_hierarchy_config.c index 1cbcc2d8..f5630b8f 100644 --- a/swad_hierarchy_config.c +++ b/swad_hierarchy_config.c @@ -268,8 +268,7 @@ void HieCfg_NumCtrs (unsigned NumCtrs,bool PutForm) Ins_PutParamInsCod (Gbl.Hierarchy.Ins.InsCod); HTM_BUTTON_OnSubmit_Begin (Str_BuildString (Txt_Centers_of_INSTITUTION_X, Gbl.Hierarchy.Ins.ShrtName), - "BT_LINK", - NULL); + "BT_LINK",NULL); Str_FreeStrings (); } HTM_Unsigned (NumCtrs); diff --git a/swad_icon.c b/swad_icon.c index 2c3a1e2b..7eed99f1 100644 --- a/swad_icon.c +++ b/swad_icon.c @@ -25,11 +25,14 @@ /********************************* Headers ***********************************/ /*****************************************************************************/ +#define _GNU_SOURCE // For asprintf +#include // For asprintf #include #include "swad_box.h" #include "swad_config.h" #include "swad_database.h" +#include "swad_error.h" #include "swad_figure.h" #include "swad_form.h" #include "swad_global.h" @@ -430,11 +433,16 @@ void Ico_PutContextualIconToZIP (Act_Action_t NextAction, void Ico_PutDivIcon (const char *DivClass,const char *Icon,Ico_Color_t Color,const char *Title) { + char *Class; + HTM_DIV_Begin ("class=\"%s\"",DivClass); - Ico_PutIcon (Icon,Color,Title, - Str_BuildString ("CONTEXT_ICO_16x16 %s", - Ico_ClassColor[Color][Gbl.Prefs.Theme])); - Str_FreeStrings (); + + if (asprintf (&Class,"CONTEXT_ICO_16x16 %s", + Ico_ClassColor[Color][Gbl.Prefs.Theme]) < 0) + Err_NotEnoughMemoryExit (); + Ico_PutIcon (Icon,Color,Title,Class); + free (Class); + HTM_DIV_End (); } @@ -444,10 +452,13 @@ void Ico_PutDivIcon (const char *DivClass,const char *Icon,Ico_Color_t Color,con void Ico_PutIconLink (const char *Icon,Ico_Color_t Color,const char *Title) { - HTM_INPUT_IMAGE (Cfg_URL_ICON_PUBLIC,Icon,Title, - Str_BuildString ("CONTEXT_OPT ICO_HIGHLIGHT CONTEXT_ICO_16x16 %s", - Ico_ClassColor[Color][Gbl.Prefs.Theme])); - Str_FreeStrings (); + char *Class; + + if (asprintf (&Class,"CONTEXT_OPT ICO_HIGHLIGHT CONTEXT_ICO_16x16 %s", + Ico_ClassColor[Color][Gbl.Prefs.Theme]) < 0) + Err_NotEnoughMemoryExit (); + HTM_INPUT_IMAGE (Cfg_URL_ICON_PUBLIC,Icon,Title,Class); + free (Class); } /*****************************************************************************/ @@ -456,13 +467,19 @@ void Ico_PutIconLink (const char *Icon,Ico_Color_t Color,const char *Title) void Ico_PutIconTextLink (const char *Icon,Ico_Color_t Color,const char *Text) { + char *Class; + /***** Print icon and optional text *****/ HTM_DIV_Begin ("class=\"CONTEXT_OPT ICO_HIGHLIGHT\""); - Ico_PutIcon (Icon,Color,Text, - Str_BuildString ("CONTEXT_ICO_x16 %s", - Ico_ClassColor[Color][Gbl.Prefs.Theme])); - Str_FreeStrings (); + + if (asprintf (&Class,"CONTEXT_ICO_x16 %s", + Ico_ClassColor[Color][Gbl.Prefs.Theme]) < 0) + Err_NotEnoughMemoryExit (); + Ico_PutIcon (Icon,Color,Text,Class); + free (Class); + HTM_TxtF (" %s",Text); + HTM_DIV_End (); } @@ -472,10 +489,12 @@ void Ico_PutIconTextLink (const char *Icon,Ico_Color_t Color,const char *Text) void Ico_PutSettingIconLink (const char *Icon,Ico_Color_t Color,const char *Title) { - HTM_INPUT_IMAGE (Cfg_URL_ICON_PUBLIC,Icon,Title, - Str_BuildString ("ICO_HIGHLIGHT ICOx20 %s", - Ico_ClassColor[Color][Gbl.Prefs.Theme])); - Str_FreeStrings (); + char *Class; + + if (asprintf (&Class,"ICO_HIGHLIGHT ICOx20 %s", + Ico_ClassColor[Color][Gbl.Prefs.Theme]) < 0) + HTM_INPUT_IMAGE (Cfg_URL_ICON_PUBLIC,Icon,Title,Class); + free (Class); } /*****************************************************************************/ diff --git a/swad_info.c b/swad_info.c index e5b692ce..8178824c 100644 --- a/swad_info.c +++ b/swad_info.c @@ -540,7 +540,7 @@ void Inf_WriteMsgYouMustReadInfo (void) HTM_LI_Begin (NULL); Frm_BeginForm (Inf_ActionsSeeInfo[InfoType]); HTM_BUTTON_OnSubmit_Begin (Act_GetTitleAction (Inf_ActionsSeeInfo[InfoType]), - The_ClassFormLinkInBox[Gbl.Prefs.Theme],NULL); + The_ClassFormLinkInBox[Gbl.Prefs.Theme],NULL); HTM_Txt (Act_GetTitleAction (Inf_ActionsSeeInfo[InfoType])); HTM_BUTTON_End (); Frm_EndForm (); diff --git a/swad_institution.c b/swad_institution.c index 48dff77e..e3d03191 100644 --- a/swad_institution.c +++ b/swad_institution.c @@ -166,9 +166,8 @@ void Ins_SeeInsWithPendingCtrs (void) /* Institution logo and name */ HTM_TR_Begin ("%s",The_ClassDat[Gbl.Prefs.Theme]); - HTM_TD_Begin ("class=\"LM %s\"",BgColor); - Ins_DrawInstitutionLogoAndNameWithLink (&Ins,ActSeeCtr, - "BT_LINK NOWRAP","CM"); + HTM_TD_Begin ("class=\"NOWRAP LM %s\"",BgColor); + Ins_DrawInstitLogoAndNameWithLink (&Ins,ActSeeCtr,"CM"); HTM_TD_End (); /* Number of pending centers (row[1]) */ @@ -219,15 +218,16 @@ void Ins_DrawInstitutionLogoWithLink (struct Ins_Instit *Ins,unsigned Size) /****************** Draw institution logo and name with link *****************/ /*****************************************************************************/ -void Ins_DrawInstitutionLogoAndNameWithLink (struct Ins_Instit *Ins,Act_Action_t Action, - const char *ClassLink,const char *ClassLogo) +void Ins_DrawInstitLogoAndNameWithLink (struct Ins_Instit *Ins,Act_Action_t Action, + const char *ClassLogo) { /***** Begin form *****/ Frm_BeginFormGoTo (Action); Ins_PutParamInsCod (Ins->InsCod); /***** Link to action *****/ - HTM_BUTTON_OnSubmit_Begin (Str_BuildGoToMsg (Ins->FullName),ClassLink,NULL); + HTM_BUTTON_OnSubmit_Begin (Str_BuildGoToMsg (Ins->FullName), + "BT_LINK",NULL); Str_FreeStrings (); /***** Institution logo and name *****/ @@ -390,8 +390,7 @@ static void Ins_ListOneInstitutionForSeeing (struct Ins_Instit *Ins,unsigned Num /***** Institution logo and name *****/ HTM_TD_Begin ("class=\"LM %s\"",BgColor); - Ins_DrawInstitutionLogoAndNameWithLink (Ins,ActSeeCtr, - "BT_LINK","CM"); + Ins_DrawInstitLogoAndNameWithLink (Ins,ActSeeCtr,"CM"); HTM_TD_End (); /***** Number of users who claim to belong to this institution *****/ diff --git a/swad_institution.h b/swad_institution.h index cb14608e..cf987bd3 100644 --- a/swad_institution.h +++ b/swad_institution.h @@ -75,8 +75,8 @@ struct ListInstits void Ins_SeeInsWithPendingCtrs (void); void Ins_DrawInstitutionLogoWithLink (struct Ins_Instit *Ins,unsigned Size); -void Ins_DrawInstitutionLogoAndNameWithLink (struct Ins_Instit *Ins,Act_Action_t Action, - const char *ClassLink,const char *ClassLogo); +void Ins_DrawInstitLogoAndNameWithLink (struct Ins_Instit *Ins,Act_Action_t Action, + const char *ClassLogo); void Ins_ShowInssOfCurrentCty (void); void Ins_EditInstitutions (void); diff --git a/swad_institution_config.c b/swad_institution_config.c index ab152302..3655d03f 100644 --- a/swad_institution_config.c +++ b/swad_institution_config.c @@ -319,7 +319,7 @@ static void InsCfg_Country (bool PrintView,bool PutForm) Txt_Country); /* Data */ - HTM_TD_Begin ("class=\"%s LB\"",The_ClassDat[Gbl.Prefs.Theme]); + HTM_TD_Begin ("class=\"%s LT\"",The_ClassDat[Gbl.Prefs.Theme]); if (PutForm) { /* Put form to select country */ @@ -344,7 +344,7 @@ static void InsCfg_Country (bool PrintView,bool PutForm) Frm_BeginFormGoTo (ActSeeCtyInf); Cty_PutParamCtyCod (Gbl.Hierarchy.Cty.CtyCod); HTM_BUTTON_OnSubmit_Begin (Str_BuildGoToMsg (Gbl.Hierarchy.Cty.Name[Gbl.Prefs.Language]), - "BT_LINK LT",NULL); + "BT_LINK",NULL); Str_FreeStrings (); } Cty_DrawCountryMap (&Gbl.Hierarchy.Cty,"COUNTRY_MAP_TINY"); diff --git a/swad_layout.c b/swad_layout.c index 15678f58..2e060253 100644 --- a/swad_layout.c +++ b/swad_layout.c @@ -1013,7 +1013,9 @@ static void Lay_WritePageTopHeading (void) HTM_DIV_End (); // head_row_1_logo_big HTM_DIV_Begin ("id=\"head_row_1_tagline\""); - HTM_BUTTON_OnSubmit_Begin (Txt_TAGLINE,The_ClassTagline[Gbl.Prefs.Theme],NULL); + HTM_BUTTON_OnSubmit_Begin (Txt_TAGLINE, + The_ClassTagline[Gbl.Prefs.Theme], + NULL); HTM_Txt (Txt_TAGLINE_BR); HTM_BUTTON_End (); HTM_DIV_End (); // head_row_1_tagline @@ -1222,7 +1224,9 @@ void Lay_PutContextualLinkIconText (Act_Action_t NextAction,const char *Anchor, FuncParams (Args); /***** Put icon and text with link *****/ - HTM_BUTTON_OnSubmit_Begin (Text,The_ClassFormLinkOutBoxBold[Gbl.Prefs.Theme],OnSubmit); + HTM_BUTTON_OnSubmit_Begin (Text, + The_ClassFormLinkOutBoxBold[Gbl.Prefs.Theme], + OnSubmit); Ico_PutIconTextLink (Icon,Color,Text); HTM_BUTTON_End (); diff --git a/swad_match.c b/swad_match.c index 189dc6e3..5d9adc94 100644 --- a/swad_match.c +++ b/swad_match.c @@ -3335,7 +3335,7 @@ static void Mch_PutBigButtonClose (void) /***** Put icon with link *****/ HTM_DIV_Begin ("class=\"MCH_BIGBUTTON_CONT\""); HTM_BUTTON_OnClick_Begin (Txt_Close,"BT_LINK MCH_BUTTON_ON ICO_DARKRED", - "window.close();"); + "window.close();"); HTM_TxtF ("",Mch_ICON_CLOSE); HTM_BUTTON_End (); HTM_DIV_End (); diff --git a/swad_menu.c b/swad_menu.c index fd2745ef..3d8325df 100644 --- a/swad_menu.c +++ b/swad_menu.c @@ -255,16 +255,15 @@ void Mnu_WriteMenuThisTab (void) Title = Act_GetSubtitleAction (NumAct); /***** Begin option *****/ - HTM_LI_Begin ("class=\"MENU_LIST_ITEM\""); + HTM_LI_Begin ("class=\"MENU_LIST_ITEM %s\"", + IsTheSelectedAction ? "MENU_OPT_ON" : + "MENU_OPT_OFF"); /***** Begin form *****/ Frm_BeginForm (NumAct); /***** Begin link *****/ - HTM_BUTTON_OnSubmit_Begin (Title, - IsTheSelectedAction ? "BT_LINK MENU_OPT_ON" : - "BT_LINK MENU_OPT_OFF", - NULL); + HTM_BUTTON_OnSubmit_Begin (Title,"BT_LINK",NULL); /***** Icon and text *****/ HTM_DIV_Begin ("class=\"MENU_ICO_TXT\""); diff --git a/swad_message.c b/swad_message.c index c76a5b14..e2141d87 100644 --- a/swad_message.c +++ b/swad_message.c @@ -2267,8 +2267,8 @@ static void Msg_WriteSentOrReceivedMsgSubject (struct Msg_Messages *Messages, extern const char *Txt_no_subject; /***** Begin cell *****/ - HTM_TD_Begin ("class=\"%s LT\"",Open ? "MSG_TIT_BG" : - "MSG_TIT_BG_NEW"); + HTM_TD_Begin ("class=\"%s LT\"",Open ? "MSG_TIT MSG_TIT_BG" : + "MSG_TIT_NEW MSG_TIT_BG_NEW"); /***** Begin form to expand/contract the message *****/ Frm_BeginForm (Messages->TypeOfMessages == Msg_RECEIVED ? (Expanded ? ActConRcvMsg : @@ -2280,9 +2280,7 @@ static void Msg_WriteSentOrReceivedMsgSubject (struct Msg_Messages *Messages, HTM_BUTTON_OnSubmit_Begin (Expanded ? Txt_Hide_message : Txt_See_message, - Open ? "BT_LINK LT MSG_TIT" : - "BT_LINK LT MSG_TIT_NEW", - NULL); + "BT_LINK",NULL); /***** Write subject *****/ if (Subject[0]) @@ -2407,7 +2405,7 @@ static bool Msg_WriteCrsOrgMsg (long CrsCod) HTM_DIV_Begin ("class=\"AUTHOR_TXT\""); HTM_Txt ("("); HTM_BUTTON_OnSubmit_Begin (Str_BuildGoToMsg (Crs.FullName), - "BT_LINK AUTHOR_TXT",NULL); + "BT_LINK",NULL); Str_FreeStrings (); HTM_Txt (Crs.ShrtName); HTM_BUTTON_End (); diff --git a/swad_notice.c b/swad_notice.c index 63c35099..7707ba10 100644 --- a/swad_notice.c +++ b/swad_notice.c @@ -624,14 +624,14 @@ static void Not_DrawANotice (Not_Listing_t TypeNoticesListing, /* Write the date */ UniqueId++; - HTM_DIV_Begin ("class=\"NOTICE_DATE %s\"", + HTM_DIV_Begin ("class=\"NOTICE_DATE %s RT\"", The_ClassNoticeDateColor[Gbl.Prefs.Theme]); if (TypeNoticesListing == Not_LIST_BRIEF_NOTICES) { /* Form to view full notice */ Frm_BeginFormAnchor (ActSeeOneNot,Anchor); Not_PutHiddenParamNotCod (NotCod); - HTM_BUTTON_OnSubmit_Begin (Txt_See_full_notice,"BT_LINK RT",NULL); + HTM_BUTTON_OnSubmit_Begin (Txt_See_full_notice,"BT_LINK",NULL); } if (asprintf (&Id,"not_date_%u",UniqueId) < 0) Err_NotEnoughMemoryExit (); diff --git a/swad_notification.c b/swad_notification.c index 5a5bca68..694441dc 100644 --- a/swad_notification.c +++ b/swad_notification.c @@ -498,7 +498,8 @@ void Ntf_ShowMyNotifications (void) if (PutLink) { PutLink = Ntf_StartFormGoToAction (NotifyEvent,Hie.Crs.CrsCod,&UsrDat,Cod,&Forums); - HTM_BUTTON_OnSubmit_Begin (Txt_NOTIFY_EVENTS_SINGULAR[NotifyEvent],ClassLink,NULL); + HTM_BUTTON_OnSubmit_Begin (Txt_NOTIFY_EVENTS_SINGULAR[NotifyEvent], + ClassLink,NULL); HTM_Txt (Txt_NOTIFY_EVENTS_SINGULAR[NotifyEvent]); HTM_BUTTON_End (); Frm_EndForm (); @@ -525,7 +526,8 @@ void Ntf_ShowMyNotifications (void) PutLink = Ntf_StartFormGoToAction (NotifyEvent,Hie.Crs.CrsCod,&UsrDat,Cod,&Forums); if (PutLink) - HTM_BUTTON_OnSubmit_Begin (Txt_NOTIFY_EVENTS_SINGULAR[NotifyEvent],ClassLink,NULL); + HTM_BUTTON_OnSubmit_Begin (Txt_NOTIFY_EVENTS_SINGULAR[NotifyEvent], + ClassLink,NULL); else HTM_SPAN_Begin ("class=\"%s\"",ClassText); HTM_TxtF ("%s: %s",Txt_Forum,ForumName); @@ -543,7 +545,8 @@ void Ntf_ShowMyNotifications (void) PutLink = Ntf_StartFormGoToAction (NotifyEvent,Hie.Crs.CrsCod,&UsrDat,Cod,&Forums); if (PutLink) - HTM_BUTTON_OnSubmit_Begin (Txt_NOTIFY_EVENTS_SINGULAR[NotifyEvent],ClassLink,NULL); + HTM_BUTTON_OnSubmit_Begin (Txt_NOTIFY_EVENTS_SINGULAR[NotifyEvent], + ClassLink,NULL); else HTM_SPAN_Begin ("class=\"%s\"",ClassText); @@ -1640,7 +1643,8 @@ void Ntf_WriteNumberOfNewNtfs (void) Frm_BeginFormId (ActSeeNewNtf,"form_ntf"); /***** Begin link *****/ - HTM_BUTTON_OnSubmit_Begin (Txt_See_notifications,The_ClassNotif[Gbl.Prefs.Theme],NULL); + HTM_BUTTON_OnSubmit_Begin (Txt_See_notifications, + The_ClassNotif[Gbl.Prefs.Theme],NULL); /***** Number of unseen notifications *****/ HTM_SPAN_Begin ("id=\"notif_all\""); diff --git a/swad_photo.c b/swad_photo.c index 8dc86387..c6b18796 100644 --- a/swad_photo.c +++ b/swad_photo.c @@ -2256,8 +2256,7 @@ static void Pho_ShowOrPrintListDegrees (struct Pho_DegPhotos *DegPhotos, The_ClassDat[Gbl.Prefs.Theme], Gbl.ColorRows[Gbl.RowEvenOdd]); if (SeeOrPrint == Pho_DEGREES_SEE) - Deg_DrawDegreeLogoAndNameWithLink (&Deg,ActSeeDegInf, - "BT_LINK","CT"); + Deg_DrawDegreeLogoAndNameWithLink (&Deg,ActSeeDegInf,"CT"); else // Pho_DEGREES_PRINT { Lgo_DrawLogo (HieLvl_DEG,Deg.DegCod,Deg.ShrtName,20,"CT",true); diff --git a/swad_profile.c b/swad_profile.c index e1a6bffb..0c08fd4b 100644 --- a/swad_profile.c +++ b/swad_profile.c @@ -858,7 +858,8 @@ static void Prf_ShowRanking (unsigned Rank,unsigned NumUsrs) if (asprintf (&Title,"#%u %s %u", Rank,Txt_of_PART_OF_A_TOTAL,NumUsrs) < 0) Err_NotEnoughMemoryExit (); - HTM_BUTTON_OnSubmit_Begin (Title,The_ClassFormLinkOutBox[Gbl.Prefs.Theme],NULL); + HTM_BUTTON_OnSubmit_Begin (Title,The_ClassFormLinkOutBox[Gbl.Prefs.Theme], + NULL); free (Title); HTM_TxtF ("#%u",Rank); HTM_BUTTON_End (); @@ -1328,15 +1329,16 @@ static void Prf_ShowUsrInRanking (struct UsrData *UsrDat,unsigned Rank,bool ItsM HTM_TD_End (); /***** Put form to go to public profile *****/ - HTM_TD_Begin ("class=\"RANK_USR %s\"",Gbl.ColorRows[Gbl.RowEvenOdd]); + HTM_TD_Begin ("class=\"RANK_USR %s %s\"", // Limited width + ItsMe ? "DAT_SMALL_N" : + "DAT_SMALL", + Gbl.ColorRows[Gbl.RowEvenOdd]); if (Visible) { Frm_BeginForm (ActSeeOthPubPrf); Usr_PutParamUsrCodEncrypted (UsrDat->EnUsrCod); HTM_BUTTON_OnSubmit_Begin (Txt_Another_user_s_profile, - ItsMe ? "BT_LINK DAT_SMALL_N" : - "BT_LINK DAT_SMALL", - NULL); // Limited width + "BT_LINK",NULL); Usr_WriteFirstNameBRSurnames (UsrDat); HTM_BUTTON_End (); Frm_EndForm (); diff --git a/swad_project.c b/swad_project.c index b275a82a..2b310e1d 100644 --- a/swad_project.c +++ b/swad_project.c @@ -1380,7 +1380,8 @@ static void Prj_ShowOneProject (struct Prj_Projects *Projects, { Frm_BeginForm (ActAdmDocPrj); Prj_PutCurrentParams (Projects); - HTM_BUTTON_OnSubmit_Begin (Txt_Project_files,"BT_LINK",NULL); + HTM_BUTTON_OnSubmit_Begin (Txt_Project_files, + "BT_LINK",NULL); HTM_Txt (Prj->Title); HTM_BUTTON_End (); Frm_EndForm (); diff --git a/swad_record.c b/swad_record.c index d54a722a..d8c53a9c 100644 --- a/swad_record.c +++ b/swad_record.c @@ -1396,7 +1396,9 @@ static void Rec_ShowLinkToPrintPreviewOfRecords (void) extern const char *Txt_record_cards_per_page; unsigned i; - HTM_BUTTON_OnSubmit_Begin (Txt_Print,The_ClassFormLinkOutBoxBold[Gbl.Prefs.Theme],NULL); + HTM_BUTTON_OnSubmit_Begin (Txt_Print, + The_ClassFormLinkOutBoxBold[Gbl.Prefs.Theme], + NULL); Ico_PutIconTextLink ("print.svg",Ico_BLACK,Txt_Print); HTM_BUTTON_End (); @@ -2689,7 +2691,7 @@ static void Rec_ShowCountryInHead (struct UsrData *UsrDat,bool ShowData) The_ClassDatStrong[Gbl.Prefs.Theme]); if (ShowData && UsrDat->CtyCod > 0) /* Link to see country information */ - Cty_WriteCountryName (UsrDat->CtyCod,"BT_LINK"); // Put link to country + Cty_WriteCountryName (UsrDat->CtyCod); // Put link to country HTM_TD_End (); } diff --git a/swad_statistic.c b/swad_statistic.c index 9d728161..9d6741f5 100644 --- a/swad_statistic.c +++ b/swad_statistic.c @@ -2936,8 +2936,7 @@ static void Sta_WriteCountry (long CtyCod) /***** Form to go to country *****/ Cty_DrawCountryMapAndNameWithLink (&Cty,ActSeeCtyInf, "COUNTRY_TINY", - "COUNTRY_MAP_TINY", - "BT_LINK"); + "COUNTRY_MAP_TINY"); } else // Hit with no country selected /***** No country selected *****/ @@ -3024,8 +3023,7 @@ static void Sta_WriteInstit (long InsCod) HTM_TD_Begin ("class=\"LOG LM\" title=\"%s\"",Ins.FullName); /***** Form to go to institution *****/ - Ins_DrawInstitutionLogoAndNameWithLink (&Ins,ActSeeInsInf, - "BT_LINK","CT"); + Ins_DrawInstitLogoAndNameWithLink (&Ins,ActSeeInsInf,"CT"); } else // Hit with no institution selected { @@ -3115,8 +3113,7 @@ static void Sta_WriteCenter (long CtrCod) HTM_TD_Begin ("class=\"LOG LM\" title=\"%s\"",Ctr.FullName); /***** Form to go to center *****/ - Ctr_DrawCenterLogoAndNameWithLink (&Ctr,ActSeeCtrInf, - "BT_LINK","CT"); + Ctr_DrawCenterLogoAndNameWithLink (&Ctr,ActSeeCtrInf,"CT"); } else // Hit with no center selected { @@ -3206,8 +3203,7 @@ static void Sta_WriteDegree (long DegCod) HTM_TD_Begin ("class=\"LOG LM\" title=\"%s\"",Deg.FullName); /***** Form to go to degree *****/ - Deg_DrawDegreeLogoAndNameWithLink (&Deg,ActSeeDegInf, - "BT_LINK","CT"); + Deg_DrawDegreeLogoAndNameWithLink (&Deg,ActSeeDegInf,"CT"); } else // Hit with no degree selected { diff --git a/swad_survey.c b/swad_survey.c index 40cdb0ae..6ad0bb28 100644 --- a/swad_survey.c +++ b/swad_survey.c @@ -527,7 +527,9 @@ static void Svy_ShowOneSurvey (struct Svy_Surveys *Surveys, /* Survey title */ if (ShowOnlyThisSvyComplete) - HTM_TD_Begin ("class=\"LT\""); + HTM_TD_Begin ("class=\"%s LT\"", + Svy.Status.Visible ? "ASG_TITLE" : + "ASG_TITLE_LIGHT"); else HTM_TD_Begin ("class=\"LT %s\"",Gbl.ColorRows[Gbl.RowEvenOdd]); HTM_ARTICLE_Begin (Anchor); @@ -537,10 +539,7 @@ static void Svy_ShowOneSurvey (struct Svy_Surveys *Surveys, WhichGroups = Grp_GetParamWhichGroups (); Grp_PutParamWhichGroups (&WhichGroups); Pag_PutHiddenParamPagNum (Pag_SURVEYS,Surveys->CurrentPage); - HTM_BUTTON_OnSubmit_Begin (Txt_View_survey, - Svy.Status.Visible ? "BT_LINK ASG_TITLE" : - "BT_LINK ASG_TITLE_LIGHT", - NULL); + HTM_BUTTON_OnSubmit_Begin (Txt_View_survey,"BT_LINK",NULL); HTM_Txt (Svy.Title); HTM_BUTTON_End (); Frm_EndForm (); diff --git a/swad_timeline_form.c b/swad_timeline_form.c index 65b0328c..ab437300 100644 --- a/swad_timeline_form.c +++ b/swad_timeline_form.c @@ -344,7 +344,9 @@ void Tml_Frm_FormToShowHiddenComms (long NotCod, free (OnSubmit); /* Put icon and text with link to show the first hidden comments */ - HTM_BUTTON_OnSubmit_Begin (NULL,The_ClassFormLinkInBox[Gbl.Prefs.Theme],NULL); + HTM_BUTTON_OnSubmit_Begin (NULL, + The_ClassFormLinkInBox[Gbl.Prefs.Theme], + NULL); Ico_PutIconTextLink ("angle-up.svg",Ico_BLACK, Str_BuildString (Txt_See_the_previous_X_COMMENTS, NumInitialComms)); diff --git a/swad_timeline_note.c b/swad_timeline_note.c index fbdd4e85..e211ca70 100644 --- a/swad_timeline_note.c +++ b/swad_timeline_note.c @@ -241,7 +241,7 @@ static void Tml_Not_WriteTopMessage (Tml_TopMessage_t TopMessage,long PublisherC HTM_DIV_Begin ("class=\"Tml_TOP_CONT Tml_TOP_PUBLISHER Tml_WIDTH\""); /***** Show publisher's name inside form to go to user's public profile *****/ - Tml_Not_WriteAuthorName (&PublisherDat,"BT_LINK Tml_TOP_PUBLISHER"); + Tml_Not_WriteAuthorName (&PublisherDat,"BT_LINK"); /***** Show action made *****/ HTM_TxtF (" %s:",Txt_TIMELINE_NOTE_TOP_MESSAGES[TopMessage]); @@ -354,8 +354,8 @@ void Tml_Not_WriteAuthorName (const struct UsrData *UsrDat, /* Author's name */ HTM_BUTTON_OnSubmit_Begin (Usr_ItsMe (UsrDat->UsrCod) ? Txt_My_public_profile : - Txt_Another_user_s_profile, - Class,NULL); + Txt_Another_user_s_profile, + Class,NULL); HTM_Txt (UsrDat->FullName); HTM_BUTTON_End (); diff --git a/swad_user.c b/swad_user.c index f609d40b..6c8a6d98 100644 --- a/swad_user.c +++ b/swad_user.c @@ -3647,9 +3647,9 @@ static void Set_FormToSelectUsrListType (void (*FuncParams) (void *Args),void *A /***** Link and image *****/ HTM_BUTTON_OnSubmit_Begin (Txt_USR_LIST_TYPES[ListType], - The_ClassFormLinkInBoxNoWrap[Gbl.Prefs.Theme], - Gbl.Action.Act == ActReqMsgUsr ? "CopyMessageToHiddenFields();" : - NULL); + The_ClassFormLinkInBoxNoWrap[Gbl.Prefs.Theme], + Gbl.Action.Act == ActReqMsgUsr ? "CopyMessageToHiddenFields();" : + NULL); Ico_PutIcon (Usr_IconsClassPhotoOrList[ListType],Ico_BLACK, Txt_USR_LIST_TYPES[ListType],"ICO20x20"); HTM_TxtF (" %s",Txt_USR_LIST_TYPES[ListType]);