Version19.70.4

This commit is contained in:
Antonio Cañas Vargas 2019-11-18 09:53:50 +01:00
parent fa5d390276
commit 121eb7d4c2
6 changed files with 15 additions and 19 deletions

View File

@ -1520,6 +1520,7 @@ a:hover /* Default ==> underlined */
border:none; border:none;
padding:0; padding:0;
font:inherit; font:inherit;
text-align:left;
} }
.BT_LINK:hover .BT_LINK:hover
{ {

View File

@ -1026,12 +1026,6 @@ void Ban_WriteMenuWithBanners (void)
Par_PutHiddenParamString (NULL,"URL",Gbl.Banners.Lst[NumBan].WWW); Par_PutHiddenParamString (NULL,"URL",Gbl.Banners.Lst[NumBan].WWW);
HTM_INPUT_IMAGE (Cfg_URL_BANNER_PUBLIC,Gbl.Banners.Lst[NumBan].Img, HTM_INPUT_IMAGE (Cfg_URL_BANNER_PUBLIC,Gbl.Banners.Lst[NumBan].Img,
Gbl.Banners.Lst[NumBan].FullName,"BANNER"); Gbl.Banners.Lst[NumBan].FullName,"BANNER");
/*
HTM_BUTTON_Begin (Gbl.Banners.Lst[NumBan].FullName,"BT_LINK BANNER",NULL);
HTM_IMG (Cfg_URL_BANNER_PUBLIC,Gbl.Banners.Lst[NumBan].Img,Gbl.Banners.Lst[NumBan].FullName,
"class=\"BANNER\"");
HTM_BUTTON_End ();
*/
Frm_EndForm (); Frm_EndForm ();
HTM_DIV_End (); HTM_DIV_End ();
} }

View File

@ -210,7 +210,7 @@ void Ctr_SeeCtrWithPendingDegs (void)
HTM_TD_Begin ("class=\"LM %s\"",BgColor); HTM_TD_Begin ("class=\"LM %s\"",BgColor);
Ctr_DrawCentreLogoAndNameWithLink (&Ctr,ActSeeDeg, Ctr_DrawCentreLogoAndNameWithLink (&Ctr,ActSeeDeg,
"DAT_NOBR","CM"); "BT_LINK DAT_NOBR","CM");
HTM_TD_End (); HTM_TD_End ();
/* Number of pending degrees (row[1]) */ /* Number of pending degrees (row[1]) */
@ -249,14 +249,14 @@ void Ctr_DrawCentreLogoAndNameWithLink (struct Centre *Ctr,Act_Action_t Action,
snprintf (Gbl.Title,sizeof (Gbl.Title), snprintf (Gbl.Title,sizeof (Gbl.Title),
Txt_Go_to_X, Txt_Go_to_X,
Ctr->FullName); Ctr->FullName);
Frm_LinkFormSubmit (Gbl.Title,ClassLink,NULL); HTM_BUTTON_Begin (Gbl.Title,ClassLink,NULL);
/***** Centre logo and name *****/ /***** Centre logo and name *****/
Log_DrawLogo (Hie_CTR,Ctr->CtrCod,Ctr->ShrtName,16,ClassLogo,true); Log_DrawLogo (Hie_CTR,Ctr->CtrCod,Ctr->ShrtName,16,ClassLogo,true);
HTM_TxtF (" %s",Ctr->FullName); HTM_TxtF (" %s",Ctr->FullName);
/***** End link *****/ /***** End link *****/
Frm_LinkFormEnd (); HTM_BUTTON_End ();
/***** End form *****/ /***** End form *****/
Frm_EndForm (); Frm_EndForm ();
@ -645,9 +645,9 @@ static void Ctr_Configuration (bool PrintView)
snprintf (Gbl.Title,sizeof (Gbl.Title), snprintf (Gbl.Title,sizeof (Gbl.Title),
Txt_Degrees_of_CENTRE_X, Txt_Degrees_of_CENTRE_X,
Gbl.Hierarchy.Ctr.ShrtName); Gbl.Hierarchy.Ctr.ShrtName);
Frm_LinkFormSubmit (Gbl.Title,"DAT",NULL); HTM_BUTTON_Begin (Gbl.Title,"BT_LINK DAT",NULL);
HTM_Unsigned (Deg_GetNumDegsInCtr (Gbl.Hierarchy.Ctr.CtrCod)); HTM_Unsigned (Deg_GetNumDegsInCtr (Gbl.Hierarchy.Ctr.CtrCod));
Frm_LinkFormEnd (); HTM_BUTTON_End ();
Frm_EndForm (); Frm_EndForm ();
HTM_TD_End (); HTM_TD_End ();
@ -886,12 +886,12 @@ static void Ctr_ListOneCentreForSeeing (struct Centre *Ctr,unsigned NumCtr)
if (Ctr->Status & Ctr_STATUS_BIT_PENDING) if (Ctr->Status & Ctr_STATUS_BIT_PENDING)
{ {
TxtClassNormal = "DAT_LIGHT"; TxtClassNormal = "DAT_LIGHT";
TxtClassStrong = "DAT_LIGHT"; TxtClassStrong = "BT_LINK DAT_LIGHT";
} }
else else
{ {
TxtClassNormal = "DAT"; TxtClassNormal = "DAT";
TxtClassStrong = "DAT_N"; TxtClassStrong = "BT_LINK DAT_N";
} }
BgColor = (Ctr->CtrCod == Gbl.Hierarchy.Ctr.CtrCod) ? "LIGHT_BLUE" : BgColor = (Ctr->CtrCod == Gbl.Hierarchy.Ctr.CtrCod) ? "LIGHT_BLUE" :
Gbl.ColorRows[Gbl.RowEvenOdd]; Gbl.ColorRows[Gbl.RowEvenOdd];
@ -2586,7 +2586,7 @@ static void Ctr_PutHeadCentresForSeeing (bool OrderSelectable)
{ {
Frm_StartForm (ActSeeCtr); Frm_StartForm (ActSeeCtr);
Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order); Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order);
Frm_LinkFormSubmit (Txt_CENTRES_HELP_ORDER[Order],"TIT_TBL",NULL); HTM_BUTTON_Begin (Txt_CENTRES_HELP_ORDER[Order],"BT_LINK TIT_TBL",NULL);
if (Order == Gbl.Hierarchy.Ins.Ctrs.SelectedOrder) if (Order == Gbl.Hierarchy.Ins.Ctrs.SelectedOrder)
HTM_U_Begin (); HTM_U_Begin ();
} }
@ -2595,7 +2595,7 @@ static void Ctr_PutHeadCentresForSeeing (bool OrderSelectable)
{ {
if (Order == Gbl.Hierarchy.Ins.Ctrs.SelectedOrder) if (Order == Gbl.Hierarchy.Ins.Ctrs.SelectedOrder)
HTM_U_End (); HTM_U_End ();
Frm_LinkFormEnd (); HTM_BUTTON_End ();
Frm_EndForm (); Frm_EndForm ();
} }
HTM_TH_End (); HTM_TH_End ();

View File

@ -488,14 +488,15 @@ enscript -2 --landscape --color --file-align=2 --highlight --line-numbers -o - *
En OpenSWAD: En OpenSWAD:
ps2pdf source.ps destination.pdf ps2pdf source.ps destination.pdf
*/ */
#define Log_PLATFORM_VERSION "SWAD 19.70.3 (2019-11-17)" #define Log_PLATFORM_VERSION "SWAD 19.70.4 (2019-11-17)"
#define CSS_FILE "swad19.70.css" #define CSS_FILE "swad19.70.css"
#define JS_FILE "swad19.70.js" #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: 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. // TODO: Impedir la creación y edición de proyectos si no son editables.
Version 19.70.3: Nov 17, 2019 Converting links to buttons. (? lines) Version 19.70.4: Nov 17, 2019 Converting links to buttons. (? lines)
Version 19.70.3: Nov 17, 2019 Converting links to buttons. (247067 lines)
Version 19.70.2: Nov 17, 2019 Converting links to buttons. (247062 lines) Version 19.70.2: Nov 17, 2019 Converting links to buttons. (247062 lines)
Version 19.70.1: Nov 17, 2019 Converting links to buttons. Version 19.70.1: Nov 17, 2019 Converting links to buttons.
Fixed bug in agenda. (247061 lines) Fixed bug in agenda. (247061 lines)

View File

@ -2495,7 +2495,7 @@ void Hie_GetAndWriteInsCtrDegAdminBy (long UsrCod,unsigned ColSpan)
/* Write centre logo and name */ /* Write centre logo and name */
Ctr_DrawCentreLogoAndNameWithLink (&Ctr,ActSeeCtrInf, Ctr_DrawCentreLogoAndNameWithLink (&Ctr,ActSeeCtrInf,
"DAT_SMALL_NOBR","LT"); "BT_LINK DAT_SMALL_NOBR","LT");
} }
break; break;
case Hie_DEG: // Degree case Hie_DEG: // Degree

View File

@ -3594,7 +3594,7 @@ static void Sta_WriteCentre (long CtrCod)
/***** Form to go to centre *****/ /***** Form to go to centre *****/
Ctr_DrawCentreLogoAndNameWithLink (&Ctr,ActSeeCtrInf, Ctr_DrawCentreLogoAndNameWithLink (&Ctr,ActSeeCtrInf,
"LOG","CT"); "BT_LINK LOG","CT");
} }
else // Hit with no centre selected else // Hit with no centre selected
{ {