From 9da4d58f5ea24f4dd4f5e156e0cb12f11298aebb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Wed, 20 Nov 2019 11:04:54 +0100 Subject: [PATCH] Version19.74.2 --- swad_changelog.h | 3 ++- swad_course.c | 36 ++++++++++++++++++------------------ swad_file_browser.c | 6 +++--- swad_follow.c | 12 ++++++------ swad_forum.c | 2 +- swad_game.c | 12 ++++++------ swad_info.c | 2 +- swad_menu.c | 5 +++-- swad_message.c | 8 ++++---- swad_record.c | 6 +++--- swad_survey.c | 6 +++--- swad_tab.c | 6 +++--- swad_timeline.c | 34 +++++++--------------------------- swad_user.c | 6 +++--- 14 files changed, 63 insertions(+), 81 deletions(-) diff --git a/swad_changelog.h b/swad_changelog.h index 21c8485c2..1ecde0777 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -488,13 +488,14 @@ enscript -2 --landscape --color --file-align=2 --highlight --line-numbers -o - * En OpenSWAD: ps2pdf source.ps destination.pdf */ -#define Log_PLATFORM_VERSION "SWAD 19.74.1 (2019-11-20)" +#define Log_PLATFORM_VERSION "SWAD 19.74.2 (2019-11-20)" #define CSS_FILE "swad19.74.1.css" #define JS_FILE "swad19.70.js" /* // TODO: Hacer un nuevo rol en los TFG: tutor externo (profesor de áreas no vinculadas con el centro, profesionales de empresas, etc.) // TODO: Impedir la creación y edición de proyectos si no son editables. + Version 19.74.2: Nov 20, 2019 Changes in layout of timeline. (247006 lines) Version 19.74.1: Nov 20, 2019 Fixed bug in CSS related to buttons. (247020 lines) Version 19.74: Nov 20, 2019 Changes in CSS. Changes in layout of timeline. (247031 lines) diff --git a/swad_course.c b/swad_course.c index 6442aca1d..ee15a7c4b 100644 --- a/swad_course.c +++ b/swad_course.c @@ -568,9 +568,9 @@ static void Crs_WriteListMyCoursesToSelectOne (void) Frm_StartForm (ActMyCrs); Cty_PutParamCtyCod (-1L); HTM_BUTTON_SUBMIT_Begin (Txt_System, - Highlight ? ClassHighlight : - ClassNormal, - NULL); + Highlight ? ClassHighlight : + ClassNormal, + NULL); Ico_PutIcon ("sitemap.svg",Txt_System,"ICO16x16"); HTM_TxtF (" %s",Txt_System); HTM_BUTTON_End (); @@ -601,9 +601,9 @@ static void Crs_WriteListMyCoursesToSelectOne (void) Frm_StartForm (ActMyCrs); Cty_PutParamCtyCod (Cty.CtyCod); HTM_BUTTON_SUBMIT_Begin (Act_GetActionTextFromDB (Act_GetActCod (ActSeeCtyInf),ActTxt), - Highlight ? ClassHighlight : - ClassNormal, - NULL); + Highlight ? ClassHighlight : + ClassNormal, + NULL); Cty_DrawCountryMap (&Cty,"ICO16x16"); HTM_TxtF (" %s",Cty.Name[Gbl.Prefs.Language]); HTM_BUTTON_End (); @@ -635,9 +635,9 @@ static void Crs_WriteListMyCoursesToSelectOne (void) Frm_StartForm (ActMyCrs); Ins_PutParamInsCod (Ins.InsCod); HTM_BUTTON_SUBMIT_Begin (Act_GetActionTextFromDB (Act_GetActCod (ActSeeInsInf),ActTxt), - Highlight ? ClassHighlight : - ClassNormal, - NULL); + Highlight ? ClassHighlight : + ClassNormal, + NULL); Log_DrawLogo (Hie_INS,Ins.InsCod,Ins.ShrtName,16,NULL,true); HTM_TxtF (" %s",Ins.ShrtName); HTM_BUTTON_End (); @@ -669,9 +669,9 @@ static void Crs_WriteListMyCoursesToSelectOne (void) Frm_StartForm (ActMyCrs); Ctr_PutParamCtrCod (Ctr.CtrCod); HTM_BUTTON_SUBMIT_Begin (Act_GetActionTextFromDB (Act_GetActCod (ActSeeCtrInf),ActTxt), - Highlight ? ClassHighlight : - ClassNormal, - NULL); + Highlight ? ClassHighlight : + ClassNormal, + NULL); Log_DrawLogo (Hie_CTR,Ctr.CtrCod,Ctr.ShrtName,16,NULL,true); HTM_TxtF (" %s",Ctr.ShrtName); HTM_BUTTON_End (); @@ -703,9 +703,9 @@ static void Crs_WriteListMyCoursesToSelectOne (void) Frm_StartForm (ActMyCrs); Deg_PutParamDegCod (Deg.DegCod); HTM_BUTTON_SUBMIT_Begin (Act_GetActionTextFromDB (Act_GetActCod (ActSeeDegInf),ActTxt), - Highlight ? ClassHighlight : - ClassNormal, - NULL); + Highlight ? ClassHighlight : + ClassNormal, + NULL); Log_DrawLogo (Hie_DEG,Deg.DegCod,Deg.ShrtName,16,NULL,true); HTM_TxtF (" %s",Deg.ShrtName); HTM_BUTTON_End (); @@ -740,9 +740,9 @@ static void Crs_WriteListMyCoursesToSelectOne (void) Txt_Go_to_X, Crs.ShrtName); HTM_BUTTON_SUBMIT_Begin (Gbl.Title, - Highlight ? ClassHighlight : - ClassNormal, - NULL); + Highlight ? ClassHighlight : + ClassNormal, + NULL); Ico_PutIcon ("list-ol.svg",Crs.FullName,"ICO16x16"); HTM_TxtF (" %s",Crs.ShrtName); HTM_BUTTON_End (); diff --git a/swad_file_browser.c b/swad_file_browser.c index efb9d1c58..ba8076b0c 100644 --- a/swad_file_browser.c +++ b/swad_file_browser.c @@ -6312,9 +6312,9 @@ static void Brw_WriteFileName (unsigned Level,bool IsPublic) if (asprintf (&Class,"BT_LINK FILENAME %s",Gbl.FileBrowser.TxtStyle) < 0) Lay_NotEnoughMemoryExit (); HTM_BUTTON_SUBMIT_Begin ((Gbl.FileBrowser.Type == Brw_SHOW_MRK_CRS || - Gbl.FileBrowser.Type == Brw_SHOW_MRK_GRP) ? Txt_Check_marks_in_the_file : - Txt_Download, - Class,NULL); + Gbl.FileBrowser.Type == Brw_SHOW_MRK_GRP) ? Txt_Check_marks_in_the_file : + Txt_Download, + Class,NULL); HTM_Txt (FileNameToShow); HTM_BUTTON_End (); free (Class); diff --git a/swad_follow.c b/swad_follow.c index 822bb246b..49c992311 100644 --- a/swad_follow.c +++ b/swad_follow.c @@ -597,9 +597,9 @@ static void Fol_ShowNumberOfFollowingOrFollowers (const struct UsrData *UsrDat, Frm_StartFormAnchor (Action,Fol_FOLLOW_SECTION_ID); Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod); HTM_BUTTON_SUBMIT_Begin (Title, - (Gbl.Action.Act == Action) ? "BT_LINK FOLLOW_NUM_B" : - "BT_LINK FOLLOW_NUM", - NULL); + (Gbl.Action.Act == Action) ? "BT_LINK FOLLOW_NUM_B" : + "BT_LINK FOLLOW_NUM", + NULL); } else HTM_SPAN_Begin ("class=\"%s\"",(Gbl.Action.Act == Action) ? "FOLLOW_NUM_B" : @@ -623,9 +623,9 @@ static void Fol_ShowNumberOfFollowingOrFollowers (const struct UsrData *UsrDat, Frm_StartFormAnchor (Action,Fol_FOLLOW_SECTION_ID); Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod); HTM_BUTTON_SUBMIT_Begin (Title, - (Gbl.Action.Act == Action) ? The_ClassFormLinkOutBoxBold[Gbl.Prefs.Theme] : - The_ClassFormLinkOutBox [Gbl.Prefs.Theme], - NULL); + (Gbl.Action.Act == Action) ? The_ClassFormLinkOutBoxBold[Gbl.Prefs.Theme] : + The_ClassFormLinkOutBox [Gbl.Prefs.Theme], + NULL); } HTM_Txt (Title); if (NumUsrs) diff --git a/swad_forum.c b/swad_forum.c index 66d79769d..24b75edb3 100644 --- a/swad_forum.c +++ b/swad_forum.c @@ -2066,7 +2066,7 @@ static void For_WriteLinkToForum (struct Forum *Forum, -1L, -1L); HTM_BUTTON_SUBMIT_Begin (Act_GetActionTextFromDB (Act_GetActCod (For_ActionsSeeFor[Forum->Type]),ActTxt), - Class,NULL); + Class,NULL); For_SetForumName (Forum,ForumName,Gbl.Prefs.Language,true); switch (Forum->Type) { diff --git a/swad_game.c b/swad_game.c index 4330cdd91..166e445b7 100644 --- a/swad_game.c +++ b/swad_game.c @@ -450,9 +450,9 @@ void Gam_ShowOneGame (long GamCod, Frm_StartForm (ActSeeGam); Gam_PutParams (); HTM_BUTTON_SUBMIT_Begin (Txt_View_game, - Game.Hidden ? "BT_LINK ASG_TITLE_LIGHT": - "BT_LINK ASG_TITLE", - NULL); + Game.Hidden ? "BT_LINK ASG_TITLE_LIGHT": + "BT_LINK ASG_TITLE", + NULL); HTM_Txt (Game.Title); HTM_BUTTON_End (); Frm_EndForm (); @@ -476,9 +476,9 @@ void Gam_ShowOneGame (long GamCod, Frm_StartForm (ActSeeGam); Gam_PutParams (); HTM_BUTTON_SUBMIT_Begin (Txt_Matches, - Game.Hidden ? "BT_LINK ASG_TITLE_LIGHT" : - "BT_LINK ASG_TITLE", - NULL); + Game.Hidden ? "BT_LINK ASG_TITLE_LIGHT" : + "BT_LINK ASG_TITLE", + NULL); if (ShowOnlyThisGame) HTM_TxtF ("%s: ",Txt_Matches); HTM_Unsigned (Game.NumMchs); diff --git a/swad_info.c b/swad_info.c index 39b59e417..ae7cbcd15 100644 --- a/swad_info.c +++ b/swad_info.c @@ -612,7 +612,7 @@ void Inf_WriteMsgYouMustReadInfo (void) HTM_LI_Begin (NULL); Frm_StartForm (Inf_ActionsSeeInfo[InfoType]); HTM_BUTTON_SUBMIT_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_menu.c b/swad_menu.c index 1e664e261..968a311f8 100644 --- a/swad_menu.c +++ b/swad_menu.c @@ -362,8 +362,9 @@ void Mnu_WriteMenuThisTab (void) /***** Begin form and link *****/ Frm_StartForm (NumAct); HTM_BUTTON_SUBMIT_Begin (Title, - IsTheSelectedAction ? "BT_LINK MENU_OPT_ON" : - "BT_LINK MENU_OPT_OFF",NULL); + IsTheSelectedAction ? "BT_LINK MENU_OPT_ON" : + "BT_LINK MENU_OPT_OFF", + NULL); /***** Icon and text *****/ HTM_DIV_Begin ("class=\"MENU_ICO\" style=\"background-image:url('%s/%s');\"", diff --git a/swad_message.c b/swad_message.c index 2d8b70591..f75aa91b8 100644 --- a/swad_message.c +++ b/swad_message.c @@ -3158,10 +3158,10 @@ static void Msg_WriteSentOrReceivedMsgSubject (long MsgCod,const char *Subject,b Gbl.Msg.MsgCod = MsgCod; // Message to be contracted/expanded Msg_PutHiddenParamsOneMsg (); HTM_BUTTON_SUBMIT_Begin (Expanded ? Txt_Hide_message : - Txt_See_message, - Open ? "BT_LINK LT MSG_TIT" : - "BT_LINK LT MSG_TIT_NEW", - NULL); + Txt_See_message, + Open ? "BT_LINK LT MSG_TIT" : + "BT_LINK LT MSG_TIT_NEW", + NULL); /***** Write subject *****/ if (Subject[0]) diff --git a/swad_record.c b/swad_record.c index 06ee2506c..4d743b0b7 100644 --- a/swad_record.c +++ b/swad_record.c @@ -2793,9 +2793,9 @@ static void Rec_ShowNickname (struct UsrData *UsrDat,bool PutFormLinks) Frm_StartForm (ActSeeOthPubPrf); Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod); HTM_BUTTON_SUBMIT_Begin (ItsMe ? Txt_My_public_profile : - Txt_Another_user_s_profile, - "BT_LINK REC_NICK", - NULL); + Txt_Another_user_s_profile, + "BT_LINK REC_NICK", + NULL); } HTM_TxtF ("@%s",UsrDat->Nickname); if (PutFormLinks) diff --git a/swad_survey.c b/swad_survey.c index 9acf9059a..27f58c71e 100644 --- a/swad_survey.c +++ b/swad_survey.c @@ -529,9 +529,9 @@ static void Svy_ShowOneSurvey (long SvyCod,struct SurveyQuestion *SvyQst, Grp_PutParamWhichGrps (); Pag_PutHiddenParamPagNum (Pag_SURVEYS,Gbl.Svys.CurrentPage); HTM_BUTTON_SUBMIT_Begin (Txt_View_survey, - Svy.Status.Visible ? "BT_LINK ASG_TITLE" : - "BT_LINK ASG_TITLE_LIGHT", - NULL); + Svy.Status.Visible ? "BT_LINK ASG_TITLE" : + "BT_LINK ASG_TITLE_LIGHT", + NULL); HTM_Txt (Svy.Title); HTM_BUTTON_End (); Frm_EndForm (); diff --git a/swad_tab.c b/swad_tab.c index 296ee60e4..8e662d3c9 100644 --- a/swad_tab.c +++ b/swad_tab.c @@ -134,9 +134,9 @@ void Tab_DrawTabs (void) Frm_StartForm (ActMnu); Par_PutHiddenParamUnsigned (NULL,"NxtTab",(unsigned) NumTab); HTM_BUTTON_SUBMIT_Begin (Txt_TABS_TXT[NumTab], - NumTab == Gbl.Action.Tab ? "BT_LINK" : - "BT_LINK", - NULL); + NumTab == Gbl.Action.Tab ? "BT_LINK" : + "BT_LINK", + NULL); HTM_IMG (Gbl.Prefs.URLIconSet,Tab_GetIcon (NumTab),Txt_TABS_TXT[NumTab], "class=\"TAB_ICO\""); HTM_DIV_Begin ("class=\"TAB_TXT %s\"", diff --git a/swad_timeline.c b/swad_timeline.c index 416aa996c..22d72fd93 100644 --- a/swad_timeline.c +++ b/swad_timeline.c @@ -1737,8 +1737,8 @@ static void TL_WriteTopMessage (TL_TopMessage_t TopMessage,long UsrCod) Frm_StartFormUnique (ActSeeOthPubPrf); Usr_PutParamUsrCodEncrypted (UsrDat.EncryptedUsrCod); HTM_BUTTON_SUBMIT_Begin (ItsMe ? Txt_My_public_profile : - Txt_Another_user_s_profile, - "BT_LINK TL_TOP_PUBLISHER",NULL); + Txt_Another_user_s_profile, + "BT_LINK TL_TOP_PUBLISHER",NULL); HTM_Txt (UsrDat.FullName); HTM_BUTTON_End (); Frm_EndForm (); @@ -1768,8 +1768,9 @@ static void TL_WriteAuthorNote (const struct UsrData *UsrDat) Frm_StartFormUnique (ActSeeOthPubPrf); Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod); HTM_BUTTON_SUBMIT_Begin (ItsMe ? Txt_My_public_profile : - Txt_Another_user_s_profile, - "BT_LINK TL_RIGHT_AUTHOR TL_RIGHT_AUTHOR_WIDTH DAT_N_BOLD",NULL); + Txt_Another_user_s_profile, + "BT_LINK TL_RIGHT_AUTHOR TL_RIGHT_AUTHOR_WIDTH DAT_N_BOLD", + NULL); HTM_Txt (UsrDat->FullName); HTM_BUTTON_End (); Frm_EndForm (); @@ -3049,36 +3050,15 @@ static void TL_WriteAuthorComment (struct UsrData *UsrDat) extern const char *Txt_Another_user_s_profile; bool ItsMe = Usr_ItsMe (UsrDat->UsrCod); - /***** Start container *****/ - HTM_DIV_Begin ("class=\"TL_COM_AUTHOR TL_COMM_AUTHOR_WIDTH\""); - /***** Show user's name inside form to go to user's public profile *****/ Frm_StartFormUnique (ActSeeOthPubPrf); Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod); HTM_BUTTON_SUBMIT_Begin (ItsMe ? Txt_My_public_profile : - Txt_Another_user_s_profile, - "BT_LINK DAT_BOLD",NULL); + Txt_Another_user_s_profile, + "BT_LINK TL_COM_AUTHOR TL_COMM_AUTHOR_WIDTH DAT_BOLD",NULL); HTM_Txt (UsrDat->FullName); HTM_BUTTON_End (); Frm_EndForm (); - - /***** Separator *****/ - HTM_SPAN_Begin ("class=\"DAT_LIGHT\""); - HTM_NBSP (); - HTM_SPAN_End (); - - /***** Show user's nickname inside form to go to user's public profile *****/ - Frm_StartFormUnique (ActSeeOthPubPrf); - Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod); - HTM_BUTTON_SUBMIT_Begin (ItsMe ? Txt_My_public_profile : - Txt_Another_user_s_profile, - "BT_LINK DAT_LIGHT",NULL); - HTM_TxtF ("@%s",UsrDat->Nickname); - HTM_BUTTON_End (); - Frm_EndForm (); - - /***** End container *****/ - HTM_DIV_End (); } /*****************************************************************************/ diff --git a/swad_user.c b/swad_user.c index 7808dedd8..46c1b2570 100644 --- a/swad_user.c +++ b/swad_user.c @@ -6304,9 +6304,9 @@ static void Usr_FormToSelectUsrListType (void (*FuncParams) (void), /***** Link and image *****/ HTM_BUTTON_SUBMIT_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],Txt_USR_LIST_TYPES[ListType],"ICO20x20"); HTM_TxtF (" %s",Txt_USR_LIST_TYPES[ListType]); HTM_BUTTON_End ();