From da5bcb3977ec5e5789cd748477e7119f2a409ccb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Tue, 19 Nov 2019 11:03:05 +0100 Subject: [PATCH] Version19.72.2 --- swad_changelog.h | 3 ++- swad_course.c | 28 ++++++++++++++-------------- swad_file_browser.c | 18 +++++++++--------- swad_message.c | 4 ++-- swad_notification.c | 4 ++-- 5 files changed, 29 insertions(+), 28 deletions(-) diff --git a/swad_changelog.h b/swad_changelog.h index b3dae9703..0d16cbc2a 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.72.1 (2019-11-18)" +#define Log_PLATFORM_VERSION "SWAD 19.72.2 (2019-11-18)" #define CSS_FILE "swad19.71.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.72.2: Nov 18, 2019 Fixed bugs related to buttons. (247024 lines) Version 19.72.1: Nov 18, 2019 Fixed bugs related to buttons. (247023 lines) Version 19.72: Nov 17, 2019 Converted animated links to buttons. (247014 lines) Version 19.71.3: Nov 17, 2019 Converting links to buttons. (247013 lines) diff --git a/swad_course.c b/swad_course.c index 41aaac785..37acb5487 100644 --- a/swad_course.c +++ b/swad_course.c @@ -3109,8 +3109,8 @@ static void Crs_WriteRowCrsData (unsigned NumCrs,MYSQL_ROW row,bool WriteColumnA long CrsCod; unsigned NumTchs; unsigned NumStds; - const char *Style; - const char *StyleNoBR; + const char *ClassTxt; + const char *ClassLink; const char *BgColor; bool Accepted; static unsigned RowEvenOdd = 1; @@ -3142,13 +3142,13 @@ static void Crs_WriteRowCrsData (unsigned NumCrs,MYSQL_ROW row,bool WriteColumnA NumStds = Usr_GetNumUsrsInCrs (Rol_STD,CrsCod); if (NumTchs + NumStds) { - Style = "BT_LINK DAT_N"; - StyleNoBR = "BT_LINK DAT_NOBR_N"; + ClassTxt = "DAT_N"; + ClassLink = "BT_LINK LT DAT_N"; } else { - Style = "BT_LINK DAT"; - StyleNoBR = "BT_LINK DAT_NOBR"; + ClassTxt = "DAT"; + ClassLink = "BT_LINK LT DAT"; } BgColor = (CrsCod == Gbl.Hierarchy.Crs.CrsCod) ? "LIGHT_BLUE" : Gbl.ColorRows[RowEvenOdd]; @@ -3170,19 +3170,19 @@ static void Crs_WriteRowCrsData (unsigned NumCrs,MYSQL_ROW row,bool WriteColumnA } /***** Write number of course in this search *****/ - HTM_TD_Begin ("class=\"%s RT %s\"",StyleNoBR,BgColor); + HTM_TD_Begin ("class=\"%s RT %s\"",ClassTxt,BgColor); HTM_Unsigned (NumCrs); HTM_TD_End (); /***** Write degree logo, degree short name (row[2]) and centre short name (row[6]) *****/ - HTM_TD_Begin ("class=\"%s LT %s\"",StyleNoBR,BgColor); + HTM_TD_Begin ("class=\"LT %s\"",BgColor); Frm_StartFormGoTo (ActSeeDegInf); Deg_PutParamDegCod (Deg.DegCod); snprintf (Gbl.Title,sizeof (Gbl.Title), Txt_Go_to_X, row[2]); - HTM_BUTTON_Begin (Gbl.Title,StyleNoBR,NULL); + HTM_BUTTON_Begin (Gbl.Title,ClassLink,NULL); Log_DrawLogo (Hie_DEG,Deg.DegCod,Deg.ShrtName,20,"CT",true); HTM_TxtF (" %s (%s)",row[2],row[6]); HTM_BUTTON_End (); @@ -3190,30 +3190,30 @@ static void Crs_WriteRowCrsData (unsigned NumCrs,MYSQL_ROW row,bool WriteColumnA HTM_TD_End (); /***** Write year (row[4]) *****/ - HTM_TD_Begin ("class=\"%s CT %s\"",Style,BgColor); + HTM_TD_Begin ("class=\"%s CT %s\"",ClassTxt,BgColor); HTM_Txt (Txt_YEAR_OF_DEGREE[Deg_ConvStrToYear (row[4])]); HTM_TD_End (); /***** Write course full name (row[5]) *****/ - HTM_TD_Begin ("class=\"%s LT %s\"",Style,BgColor); + HTM_TD_Begin ("class=\"LT %s\"",BgColor); Frm_StartFormGoTo (ActSeeCrsInf); Crs_PutParamCrsCod (CrsCod); snprintf (Gbl.Title,sizeof (Gbl.Title), Txt_Go_to_X, row[5]); - HTM_BUTTON_Begin (Gbl.Title,Style,NULL); + HTM_BUTTON_Begin (Gbl.Title,ClassLink,NULL); HTM_Txt (row[5]); HTM_BUTTON_End (); Frm_EndForm (); HTM_TD_End (); /***** Write number of teachers in course *****/ - HTM_TD_Begin ("class=\"%s RT %s\"",Style,BgColor); + HTM_TD_Begin ("class=\"%s RT %s\"",ClassTxt,BgColor); HTM_Unsigned (NumTchs); HTM_TD_End (); /***** Write number of students in course *****/ - HTM_TD_Begin ("class=\"%s RT %s\"",Style,BgColor); + HTM_TD_Begin ("class=\"%s RT %s\"",ClassTxt,BgColor); HTM_Unsigned (NumStds); HTM_TD_End (); diff --git a/swad_file_browser.c b/swad_file_browser.c index af79b75b6..e14ad0711 100644 --- a/swad_file_browser.c +++ b/swad_file_browser.c @@ -11919,12 +11919,12 @@ static void Brw_WriteRowDocData (unsigned long *NumDocsNotHidden,MYSQL_ROW row) HTM_TR_Begin (NULL); /***** Write number of document in this search *****/ - HTM_TD_Begin ("class=\"DAT RT %s\"",BgColor); + HTM_TD_Begin ("class=\"RT DAT %s\"",BgColor); HTM_UnsignedLong (++(*NumDocsNotHidden)); HTM_TD_End (); /***** Write institution logo, institution short name *****/ - HTM_TD_Begin ("class=\"DAT LT %s\"",BgColor); + HTM_TD_Begin ("class=\"LT %s\"",BgColor); if (InsCod > 0) { Frm_StartFormGoTo (ActSeeInsInf); @@ -11932,7 +11932,7 @@ static void Brw_WriteRowDocData (unsigned long *NumDocsNotHidden,MYSQL_ROW row) snprintf (Gbl.Title,sizeof (Gbl.Title), Txt_Go_to_X, InsShortName); - HTM_BUTTON_Begin (Gbl.Title,"BT_LINK DAT",NULL); + HTM_BUTTON_Begin (Gbl.Title,"BT_LINK LT DAT",NULL); Log_DrawLogo (Hie_INS,InsCod,InsShortName,20,"BT_LINK LT",true); HTM_TxtF (" %s",InsShortName); HTM_BUTTON_End (); @@ -11941,7 +11941,7 @@ static void Brw_WriteRowDocData (unsigned long *NumDocsNotHidden,MYSQL_ROW row) HTM_TD_End (); /***** Write centre logo, centre short name *****/ - HTM_TD_Begin ("class=\"DAT LT %s\"",BgColor); + HTM_TD_Begin ("class=\"LT %s\"",BgColor); if (CtrCod > 0) { Frm_StartFormGoTo (ActSeeCtrInf); @@ -11949,7 +11949,7 @@ static void Brw_WriteRowDocData (unsigned long *NumDocsNotHidden,MYSQL_ROW row) snprintf (Gbl.Title,sizeof (Gbl.Title), Txt_Go_to_X, CtrShortName); - HTM_BUTTON_Begin (Gbl.Title,"BT_LINK DAT",NULL); + HTM_BUTTON_Begin (Gbl.Title,"BT_LINK LT DAT",NULL); Log_DrawLogo (Hie_CTR,CtrCod,CtrShortName,20,"LT",true); HTM_TxtF (" %s",CtrShortName); HTM_BUTTON_End (); @@ -11958,7 +11958,7 @@ static void Brw_WriteRowDocData (unsigned long *NumDocsNotHidden,MYSQL_ROW row) HTM_TD_End (); /***** Write degree logo, degree short name *****/ - HTM_TD_Begin ("class=\"DAT LT %s\"",BgColor); + HTM_TD_Begin ("class=\"LT %s\"",BgColor); if (DegCod > 0) { Frm_StartFormGoTo (ActSeeDegInf); @@ -11966,7 +11966,7 @@ static void Brw_WriteRowDocData (unsigned long *NumDocsNotHidden,MYSQL_ROW row) snprintf (Gbl.Title,sizeof (Gbl.Title), Txt_Go_to_X, DegShortName); - HTM_BUTTON_Begin (Gbl.Title,"BT_LINK DAT",NULL); + HTM_BUTTON_Begin (Gbl.Title,"BT_LINK LT DAT",NULL); Log_DrawLogo (Hie_DEG,DegCod,DegShortName,20,"LT",true); HTM_TxtF (" %s",DegShortName); HTM_BUTTON_End (); @@ -11975,7 +11975,7 @@ static void Brw_WriteRowDocData (unsigned long *NumDocsNotHidden,MYSQL_ROW row) HTM_TD_End (); /***** Write course short name *****/ - HTM_TD_Begin ("class=\"DAT LT %s\"",BgColor); + HTM_TD_Begin ("class=\"LT %s\"",BgColor); if (CrsCod > 0) { Frm_StartFormGoTo (ActSeeCrsInf); @@ -12085,7 +12085,7 @@ static void Brw_WriteRowDocData (unsigned long *NumDocsNotHidden,MYSQL_ROW row) FileMetadata.FilCod); /* File or folder icon */ - HTM_BUTTON_Begin (FileNameToShow,"BT_LINK DAT_N",NULL); + HTM_BUTTON_Begin (FileNameToShow,"BT_LINK LT DAT_N",NULL); if (FileMetadata.FilFolLnk.Type == Brw_IS_FOLDER) /* Icon with folder */ Ico_PutIcon ("folder-yellow.png",Txt_Folder,"CONTEXT_ICO_16x16"); diff --git a/swad_message.c b/swad_message.c index c9f5b0cc4..b4c607d75 100644 --- a/swad_message.c +++ b/swad_message.c @@ -3159,8 +3159,8 @@ static void Msg_WriteSentOrReceivedMsgSubject (long MsgCod,const char *Subject,b Msg_PutHiddenParamsOneMsg (); HTM_BUTTON_Begin (Expanded ? Txt_Hide_message : Txt_See_message, - Open ? "BT_LINK MSG_TIT" : - "BT_LINK MSG_TIT_NEW", + Open ? "BT_LINK LT MSG_TIT" : + "BT_LINK LT MSG_TIT_NEW", NULL); /***** Write subject *****/ diff --git a/swad_notification.c b/swad_notification.c index 111f064ed..49c59720f 100644 --- a/swad_notification.c +++ b/swad_notification.c @@ -459,7 +459,7 @@ void Ntf_ShowMyNotifications (void) { ClassBackground = "MSG_TIT_BG"; ClassText = "MSG_TIT"; - ClassLink = "BT_LINK MSG_TIT"; + ClassLink = "BT_LINK LT MSG_TIT"; ClassAuthorBg = "MSG_AUT_BG"; PutLink = true; } @@ -467,7 +467,7 @@ void Ntf_ShowMyNotifications (void) { ClassBackground = "MSG_TIT_BG_NEW"; ClassText = "MSG_TIT_NEW"; - ClassLink = "BT_LINK MSG_TIT_NEW"; + ClassLink = "BT_LINK LT MSG_TIT_NEW"; ClassAuthorBg = "MSG_AUT_BG_NEW"; PutLink = true; }