Marown/swad-core
Marown
/
swad-core
mirror of https://github.com/acanas/swad-core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Version19.70.6

This commit is contained in:
Antonio Cañas Vargas 2019-11-18 11:23:48 +01:00
parent ea5db6ba53
commit 893808367a
15 changed files with 144 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swad_changelog.h
View File

@ -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.70.5 (2019-11-17)"
#define Log_PLATFORM_VERSION "SWAD 19.70.6 (2019-11-17)"
#define CSS_FILE "swad19.70.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.70.6: Nov 17, 2019 Converting links to buttons. (247093 lines)
Version 19.70.5: Nov 17, 2019 Converting links to buttons. (247064 lines)
Version 19.70.4: Nov 17, 2019 Converting links to buttons. (247063 lines)
Version 19.70.3: Nov 17, 2019 Converting links to buttons. (247067 lines)

4
swad_classroom.c
View File

@ -124,13 +124,13 @@ void Cla_SeeClassrooms (void)
HTM_TH_Begin (1,1,"LM");
Frm_StartForm (ActSeeCla);
Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order);
Frm_LinkFormSubmit (Txt_CLASSROOMS_HELP_ORDER[Order],"TIT_TBL",NULL);
HTM_BUTTON_Begin (Txt_CLASSROOMS_HELP_ORDER[Order],"BT_LINK TIT_TBL",NULL);
if (Order == Gbl.Classrooms.SelectedOrder)
HTM_U_Begin ();
HTM_Txt (Txt_CLASSROOMS_ORDER[Order]);
if (Order == Gbl.Classrooms.SelectedOrder)
HTM_U_End ();
Frm_LinkFormEnd ();
HTM_BUTTON_End ();
Frm_EndForm ();
HTM_TH_End ();
}

8
swad_connected.c
View File

@ -1035,8 +1035,8 @@ static void Con_ShowConnectedUsrsCurrentLocationOneByOneOnMainZone (Rol_Role_t R
HTM_TD_End ();
/***** Write full name and link *****/
Font = (ThisCrs ? "CON_NAME_WIDE CON_CRS" :
"CON_NAME_WIDE CON_NO_CRS");
Font = (ThisCrs ? "BT_LINK CON_NAME_WIDE CON_CRS" :
"BT_LINK CON_NAME_WIDE CON_NO_CRS");
HTM_TD_Begin ("class=\"%s COLOR%u\"",Font,Gbl.RowEvenOdd);
if (PutLinkToRecord)
{
@ -1057,10 +1057,10 @@ static void Con_ShowConnectedUsrsCurrentLocationOneByOneOnMainZone (Rol_Role_t R
HTM_DIV_Begin ("class=\"CON_NAME_WIDE\""); // Limited width
if (PutLinkToRecord)
Frm_LinkFormSubmit (UsrDat.FullName,Font,NULL);
HTM_BUTTON_Begin (UsrDat.FullName,Font,NULL);
Usr_WriteFirstNameBRSurnames (&UsrDat);
if (PutLinkToRecord)
Frm_LinkFormEnd ();
HTM_BUTTON_End ();
HTM_DIV_End ();
if (PutLinkToRecord)

22
swad_country.c
View File

@ -185,7 +185,7 @@ void Cty_SeeCtyWithPendingInss (void)
Cty_DrawCountryMapAndNameWithLink (&Cty,ActSeeIns,
"COUNTRY_SMALL",
"COUNTRY_MAP_SMALL",
"DAT");
"BT_LINK DAT");
HTM_TD_End ();
/* Number of pending institutions (row[1]) */
@ -402,9 +402,9 @@ static void Cty_Configuration (bool PrintView)
snprintf (Gbl.Title,sizeof (Gbl.Title),
Txt_Institutions_of_COUNTRY_X,
Gbl.Hierarchy.Cty.Name[Gbl.Prefs.Language]);
Frm_LinkFormSubmit (Gbl.Title,"DAT",NULL);
HTM_BUTTON_Begin (Gbl.Title,"BT_LINK DAT",NULL);
HTM_Unsigned (Ins_GetNumInssInCty (Gbl.Hierarchy.Cty.CtyCod));
Frm_LinkFormEnd ();
HTM_BUTTON_End ();
Frm_EndForm ();
HTM_TD_End ();
@ -664,7 +664,7 @@ static void Cty_PutHeadCountriesForSeeing (bool OrderSelectable)
{
Frm_StartForm (ActSeeCty);
Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order);
Frm_LinkFormSubmit (Txt_COUNTRIES_HELP_ORDER[Order],"TIT_TBL",NULL);
HTM_BUTTON_Begin (Txt_COUNTRIES_HELP_ORDER[Order],"BT_LINK TIT_TBL",NULL);
if (Order == Gbl.Hierarchy.Sys.Ctys.SelectedOrder)
HTM_U_Begin ();
}
@ -673,7 +673,7 @@ static void Cty_PutHeadCountriesForSeeing (bool OrderSelectable)
{
if (Order == Gbl.Hierarchy.Sys.Ctys.SelectedOrder)
HTM_U_End ();
Frm_LinkFormEnd ();
HTM_BUTTON_End ();
Frm_EndForm ();
}
HTM_TH_End ();
@ -715,7 +715,7 @@ static void Cty_ListOneCountryForSeeing (struct Country *Cty,unsigned NumCty)
Cty_DrawCountryMapAndNameWithLink (Cty,ActSeeIns,
"COUNTRY_SMALL",
"COUNTRY_MAP_SMALL",
"DAT_N");
"BT_LINK DAT_N");
HTM_TD_End ();
/* Write stats of this country */
@ -817,7 +817,7 @@ void Cty_DrawCountryMapAndNameWithLink (struct Country *Cty,Act_Action_t Action,
snprintf (Gbl.Title,sizeof (Gbl.Title),
Txt_Go_to_X,
Cty->Name[Gbl.Prefs.Language]);
Frm_LinkFormSubmit (Gbl.Title,ClassLink,NULL);
HTM_BUTTON_Begin (Gbl.Title,ClassLink,NULL);
/***** Draw country map *****/
Cty_DrawCountryMap (Cty,ClassMap);
@ -829,7 +829,7 @@ void Cty_DrawCountryMapAndNameWithLink (struct Country *Cty,Act_Action_t Action,
HTM_TxtF ("(%s)",Cty->Alpha2);
/***** End link *****/
Frm_LinkFormEnd ();
HTM_BUTTON_End ();
/***** End form *****/
HTM_DIV_End ();
@ -1289,10 +1289,10 @@ void Cty_WriteCountryName (long CtyCod,const char *ClassLink)
/***** Write country name with link to country information *****/
Frm_StartForm (ActSeeCtyInf);
Cty_PutParamCtyCod (CtyCod);
Frm_LinkFormSubmit (Act_GetActionTextFromDB (Act_GetActCod (ActSeeCtyInf),ActTxt),
ClassLink,NULL);
HTM_BUTTON_Begin (Act_GetActionTextFromDB (Act_GetActCod (ActSeeCtyInf),ActTxt),
ClassLink,NULL);
HTM_Txt (CtyName);
Frm_LinkFormEnd ();
HTM_BUTTON_End ();
Frm_EndForm ();
}
else

108
swad_course.c
View File

@ -460,11 +460,12 @@ static void Crs_Configuration (bool PrintView)
"%u %s %u",
Indicators.NumIndicators,
Txt_of_PART_OF_A_TOTAL,Ind_NUM_INDICATORS);
Frm_LinkFormSubmit (Gbl.Title,"DAT",NULL);
HTM_BUTTON_Begin (Gbl.Title,"BT_LINK DAT",NULL);
HTM_TxtF ("%s ",Gbl.Title);
Ico_PutIcon ((Indicators.NumIndicators == Ind_NUM_INDICATORS) ? "check-circle.svg" :
"exclamation-triangle.svg",
Gbl.Title,"ICO16x16");
HTM_BUTTON_End ();
Frm_EndForm ();
HTM_TD_End ();
@ -518,8 +519,8 @@ static void Crs_ShowNumUsrsInCrs (Rol_Role_t Role)
static void Crs_WriteListMyCoursesToSelectOne (void)
{
extern const char *Hlp_PROFILE_Courses;
extern const char *The_ClassFormInBox[The_NUM_THEMES];
extern const char *The_ClassFormInBoxBold[The_NUM_THEMES];
extern const char *The_ClassFormLink[The_NUM_THEMES];
extern const char *The_ClassFormLinkBold[The_NUM_THEMES];
extern const char *Txt_My_courses;
extern const char *Txt_System;
extern const char *Txt_Go_to_X;
@ -550,10 +551,10 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
const char *ClassNormal;
char ClassHighlight[64];
ClassNormal = The_ClassFormInBox[Gbl.Prefs.Theme];
ClassNormal = The_ClassFormLink[Gbl.Prefs.Theme];
snprintf (ClassHighlight,sizeof (ClassHighlight),
"%s LIGHT_BLUE",
The_ClassFormInBoxBold[Gbl.Prefs.Theme]);
The_ClassFormLinkBold[Gbl.Prefs.Theme]);
/***** Begin box *****/
Box_BoxBegin (NULL,Txt_My_courses,Crs_PutIconToSearchCourses,
@ -566,13 +567,13 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
ClassNormal);
Frm_StartForm (ActMyCrs);
Cty_PutParamCtyCod (-1L);
Frm_LinkFormSubmit (Txt_System,
Highlight ? ClassHighlight :
ClassNormal,
NULL);
HTM_BUTTON_Begin (Txt_System,
Highlight ? ClassHighlight :
ClassNormal,
NULL);
Ico_PutIcon ("sitemap.svg",Txt_System,"ICO16x16");
HTM_TxtF (" %s",Txt_System);
Frm_LinkFormEnd ();
HTM_BUTTON_End ();
Frm_EndForm ();
HTM_LI_End ();
@ -599,12 +600,13 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
Lay_IndentDependingOnLevel (1,IsLastItemInLevel);
Frm_StartForm (ActMyCrs);
Cty_PutParamCtyCod (Cty.CtyCod);
Frm_LinkFormSubmit (Act_GetActionTextFromDB (Act_GetActCod (ActSeeCtyInf),ActTxt),
Highlight ? ClassHighlight :
ClassNormal,NULL);
HTM_BUTTON_Begin (Act_GetActionTextFromDB (Act_GetActCod (ActSeeCtyInf),ActTxt),
Highlight ? ClassHighlight :
ClassNormal,
NULL);
Cty_DrawCountryMap (&Cty,"ICO16x16");
HTM_TxtF (" %s",Cty.Name[Gbl.Prefs.Language]);
Frm_LinkFormEnd ();
HTM_BUTTON_End ();
Frm_EndForm ();
HTM_LI_End ();
@ -632,12 +634,13 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
Lay_IndentDependingOnLevel (2,IsLastItemInLevel);
Frm_StartForm (ActMyCrs);
Ins_PutParamInsCod (Ins.InsCod);
Frm_LinkFormSubmit (Act_GetActionTextFromDB (Act_GetActCod (ActSeeInsInf),ActTxt),
Highlight ? ClassHighlight :
ClassNormal,NULL);
HTM_BUTTON_Begin (Act_GetActionTextFromDB (Act_GetActCod (ActSeeInsInf),ActTxt),
Highlight ? ClassHighlight :
ClassNormal,
NULL);
Log_DrawLogo (Hie_INS,Ins.InsCod,Ins.ShrtName,16,NULL,true);
HTM_TxtF (" %s",Ins.FullName);
Frm_LinkFormEnd ();
HTM_TxtF (" %s",Ins.ShrtName);
HTM_BUTTON_End ();
Frm_EndForm ();
HTM_LI_End ();
@ -665,12 +668,13 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
Lay_IndentDependingOnLevel (3,IsLastItemInLevel);
Frm_StartForm (ActMyCrs);
Ctr_PutParamCtrCod (Ctr.CtrCod);
Frm_LinkFormSubmit (Act_GetActionTextFromDB (Act_GetActCod (ActSeeCtrInf),ActTxt),
Highlight ? ClassHighlight :
ClassNormal,NULL);
HTM_BUTTON_Begin (Act_GetActionTextFromDB (Act_GetActCod (ActSeeCtrInf),ActTxt),
Highlight ? ClassHighlight :
ClassNormal,
NULL);
Log_DrawLogo (Hie_CTR,Ctr.CtrCod,Ctr.ShrtName,16,NULL,true);
HTM_TxtF (" %s",Ctr.FullName);
Frm_LinkFormEnd ();
HTM_TxtF (" %s",Ctr.ShrtName);
HTM_BUTTON_End ();
Frm_EndForm ();
HTM_LI_End ();
@ -698,12 +702,13 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
Lay_IndentDependingOnLevel (4,IsLastItemInLevel);
Frm_StartForm (ActMyCrs);
Deg_PutParamDegCod (Deg.DegCod);
Frm_LinkFormSubmit (Act_GetActionTextFromDB (Act_GetActCod (ActSeeDegInf),ActTxt),
Highlight ? ClassHighlight :
ClassNormal,NULL);
HTM_BUTTON_Begin (Act_GetActionTextFromDB (Act_GetActCod (ActSeeDegInf),ActTxt),
Highlight ? ClassHighlight :
ClassNormal,
NULL);
Log_DrawLogo (Hie_DEG,Deg.DegCod,Deg.ShrtName,16,NULL,true);
HTM_TxtF (" %s",Deg.FullName);
Frm_LinkFormEnd ();
HTM_TxtF (" %s",Deg.ShrtName);
HTM_BUTTON_End ();
Frm_EndForm ();
HTM_LI_End ();
@ -734,12 +739,13 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
snprintf (Gbl.Title,sizeof (Gbl.Title),
Txt_Go_to_X,
Crs.ShrtName);
Frm_LinkFormSubmit (Gbl.Title,
Highlight ? ClassHighlight :
ClassNormal,NULL);
HTM_BUTTON_Begin (Gbl.Title,
Highlight ? ClassHighlight :
ClassNormal,
NULL);
Ico_PutIcon ("list-ol.svg",Crs.FullName,"ICO16x16");
HTM_TxtF (" %s",Crs.FullName);
Frm_LinkFormEnd ();
HTM_TxtF (" %s",Crs.ShrtName);
HTM_BUTTON_End ();
Frm_EndForm ();
/***** Put link to register students *****/
@ -1216,12 +1222,12 @@ static bool Crs_ListCoursesOfAYearForSeeing (unsigned Year)
if (Crs->Status & Crs_STATUS_BIT_PENDING)
{
TxtClassNormal = "DAT_LIGHT";
TxtClassStrong = "DAT_LIGHT";
TxtClassStrong = "BT_LINK DAT_LIGHT";
}
else
{
TxtClassNormal = "DAT";
TxtClassStrong = "DAT_N";
TxtClassStrong = "BT_LINK DAT_N";
}
/* Check if this course is one of my courses */
@ -1256,9 +1262,9 @@ static bool Crs_ListCoursesOfAYearForSeeing (unsigned Year)
snprintf (Gbl.Title,sizeof (Gbl.Title),
Txt_Go_to_X,
Crs->FullName);
Frm_LinkFormSubmit (Gbl.Title,TxtClassStrong,NULL);
HTM_BUTTON_Begin (Gbl.Title,TxtClassStrong,NULL);
HTM_Txt (Crs->FullName);
Frm_LinkFormEnd ();
HTM_BUTTON_End ();
Frm_EndForm ();
HTM_TD_End ();
@ -2871,10 +2877,14 @@ void Crs_PutIconToSelectMyCoursesInBreadcrumb (void)
Frm_StartForm (ActMyCrs);
/***** Put icon with link *****/
Frm_LinkFormSubmit (Txt_My_courses,NULL,NULL);
HTM_INPUT_IMAGE (Gbl.Prefs.URLTheme,"sitemap.svg",Txt_My_courses,
"BC_ICON ICO_HIGHLIGHT");
/*
HTM_BUTTON_Begin (Txt_My_courses,NULL,NULL);
HTM_IMG (Gbl.Prefs.URLTheme,"sitemap.svg",Txt_My_courses,
"class=\"BC_ICON ICO_HIGHLIGHT\"");
Frm_LinkFormEnd ();
HTM_BUTTON_End ();
*/
/***** End form *****/
Frm_EndForm ();
@ -3132,13 +3142,13 @@ static void Crs_WriteRowCrsData (unsigned NumCrs,MYSQL_ROW row,bool WriteColumnA
NumStds = Usr_GetNumUsrsInCrs (Rol_STD,CrsCod);
if (NumTchs + NumStds)
{
Style = "DAT_N";
StyleNoBR = "DAT_NOBR_N";
Style = "BT_LINK DAT_N";
StyleNoBR = "BT_LINK DAT_NOBR_N";
}
else
{
Style = "DAT";
StyleNoBR = "DAT_NOBR";
Style = "BT_LINK DAT";
StyleNoBR = "BT_LINK DAT_NOBR";
}
BgColor = (CrsCod == Gbl.Hierarchy.Crs.CrsCod) ? "LIGHT_BLUE" :
Gbl.ColorRows[RowEvenOdd];
@ -3172,10 +3182,10 @@ static void Crs_WriteRowCrsData (unsigned NumCrs,MYSQL_ROW row,bool WriteColumnA
snprintf (Gbl.Title,sizeof (Gbl.Title),
Txt_Go_to_X,
row[2]);
Frm_LinkFormSubmit (Gbl.Title,StyleNoBR,NULL);
HTM_BUTTON_Begin (Gbl.Title,StyleNoBR,NULL);
Log_DrawLogo (Hie_DEG,Deg.DegCod,Deg.ShrtName,20,"CT",true);
HTM_TxtF (" %s (%s)",row[2],row[6]);
Frm_LinkFormEnd ();
HTM_BUTTON_End ();
Frm_EndForm ();
HTM_TD_End ();
@ -3190,10 +3200,10 @@ static void Crs_WriteRowCrsData (unsigned NumCrs,MYSQL_ROW row,bool WriteColumnA
Crs_PutParamCrsCod (CrsCod);
snprintf (Gbl.Title,sizeof (Gbl.Title),
Txt_Go_to_X,
row[6]);
Frm_LinkFormSubmit (Gbl.Title,Style,NULL);
row[5]);
HTM_BUTTON_Begin (Gbl.Title,Style,NULL);
HTM_Txt (row[5]);
Frm_LinkFormEnd ();
HTM_BUTTON_End ();
Frm_EndForm ();
HTM_TD_End ();

8
swad_date.c
View File

@ -317,11 +317,11 @@ void Dat_ShowClientLocalTime (void)
/* Month with link to calendar */
HTM_DIV_Begin ("id=\"current_month\"");
Frm_StartForm (ActSeeCal);
Frm_LinkFormSubmit (Txt_Show_calendar,"CURRENT_MONTH",NULL);
HTM_BUTTON_Begin (Txt_Show_calendar,"BT_LINK CURRENT_MONTH",NULL);
HTM_SPAN_Begin ("id=\"current_month_txt\"");
// JavaScript will write HTML here
HTM_SPAN_End ();
Frm_LinkFormEnd ();
HTM_BUTTON_End ();
Frm_EndForm ();
HTM_DIV_End ();
@ -330,14 +330,14 @@ void Dat_ShowClientLocalTime (void)
if (Gbl.Usrs.Me.Logged)
{
Frm_StartForm (ActSeeMyAgd);
Frm_LinkFormSubmit (Txt_Show_agenda,"CURRENT_DAY",NULL);
HTM_BUTTON_Begin (Txt_Show_agenda,"BT_LINK CURRENT_DAY",NULL);
}
HTM_SPAN_Begin ("id=\"current_day_txt\"");
// JavaScript will write HTML here
HTM_SPAN_End ();
if (Gbl.Usrs.Me.Logged)
{
Frm_LinkFormEnd ();
HTM_BUTTON_End ();
Frm_EndForm ();
}
HTM_DIV_End ();

16
swad_degree.c
View File

@ -213,7 +213,7 @@ void Deg_SeeDegWithPendingCrss (void)
/* Degree logo and full name */
HTM_TD_Begin ("class=\"LM %s\"",BgColor);
Deg_DrawDegreeLogoAndNameWithLink (&Deg,ActSeeCrs,
"DAT_NOBR","CM");
"BT_LINK DAT_NOBR","CM");
HTM_TD_End ();
/* Number of pending courses (row[1]) */
@ -253,14 +253,14 @@ void Deg_DrawDegreeLogoAndNameWithLink (struct Degree *Deg,Act_Action_t Action,
snprintf (Gbl.Title,sizeof (Gbl.Title),
Txt_Go_to_X,
Deg->FullName);
Frm_LinkFormSubmit (Gbl.Title,ClassLink,NULL);
HTM_BUTTON_Begin (Gbl.Title,ClassLink,NULL);
/***** Degree logo and name *****/
Log_DrawLogo (Hie_DEG,Deg->DegCod,Deg->ShrtName,16,ClassLogo,true);
HTM_TxtF (" %s",Deg->FullName);
/***** End link *****/
Frm_LinkFormEnd ();
HTM_BUTTON_End ();
/***** End form *****/
Frm_EndForm ();
@ -514,9 +514,9 @@ static void Deg_Configuration (bool PrintView)
snprintf (Gbl.Title,sizeof (Gbl.Title),
Txt_Courses_of_DEGREE_X,
Gbl.Hierarchy.Deg.ShrtName);
Frm_LinkFormSubmit (Gbl.Title,"DAT",NULL);
HTM_BUTTON_Begin (Gbl.Title,"BT_LINK DAT",NULL);
HTM_Unsigned (Crs_GetNumCrssInDeg (Gbl.Hierarchy.Deg.DegCod));
Frm_LinkFormEnd ();
HTM_BUTTON_End ();
Frm_EndForm ();
HTM_TD_End ();
@ -1207,12 +1207,12 @@ static void Deg_ListOneDegreeForSeeing (struct Degree *Deg,unsigned NumDeg)
if (Deg->Status & Deg_STATUS_BIT_PENDING)
{
TxtClassNormal = "DAT_LIGHT";
TxtClassStrong = "DAT_LIGHT";
TxtClassStrong = "BT_LINK DAT_LIGHT";
}
else
{
TxtClassNormal = "DAT";
TxtClassStrong = "DAT_N";
TxtClassStrong = "BT_LINK DAT_N";
}
BgColor = (Deg->DegCod == Gbl.Hierarchy.Deg.DegCod) ? "LIGHT_BLUE" :
Gbl.ColorRows[Gbl.RowEvenOdd];
@ -2507,7 +2507,7 @@ void Hie_GetAndWriteInsCtrDegAdminBy (long UsrCod,unsigned ColSpan)
/* Write degree logo and name */
Deg_DrawDegreeLogoAndNameWithLink (&Deg,ActSeeDegInf,
"DAT_SMALL_NOBR","LT");
"BT_LINK DAT_SMALL_NOBR","LT");
}
break;
default: // There are no administrators in other scopes

4
swad_degree_type.c
View File

@ -516,13 +516,13 @@ static void DT_PutHeadDegreeTypesForSeeing (Act_Action_t NextAction,DT_Order_t S
Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order);
/* Link with the head of this column */
Frm_LinkFormSubmit (Txt_DEGREE_TYPES_HELP_ORDER[Order],"TIT_TBL",NULL);
HTM_BUTTON_Begin (Txt_DEGREE_TYPES_HELP_ORDER[Order],"BT_LINK TIT_TBL",NULL);
if (Order == SelectedOrder)
HTM_U_Begin ();
HTM_Txt (Txt_DEGREE_TYPES_ORDER[Order]);
if (Order == SelectedOrder)
HTM_U_End ();
Frm_LinkFormEnd ();
HTM_BUTTON_End ();
/* End form */
Frm_EndForm ();

4
swad_department.c
View File

@ -129,13 +129,13 @@ void Dpt_SeeDepts (void)
Frm_StartForm (ActSeeDpt);
Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order);
Frm_LinkFormSubmit (Txt_DEPARTMENTS_HELP_ORDER[Order],"TIT_TBL",NULL);
HTM_BUTTON_Begin (Txt_DEPARTMENTS_HELP_ORDER[Order],"BT_LINK TIT_TBL",NULL);
if (Order == Gbl.Dpts.SelectedOrder)
HTM_U_Begin ();
HTM_Txt (Txt_DEPARTMENTS_ORDER[Order]);
if (Order == Gbl.Dpts.SelectedOrder)
HTM_U_End ();
Frm_LinkFormEnd ();
HTM_BUTTON_End ();
Frm_EndForm ();
HTM_TH_End ();

4
swad_enrolment.c
View File

@ -2839,10 +2839,10 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected)
snprintf (Gbl.Title,sizeof (Gbl.Title),
Txt_Go_to_X,
Crs.FullName);
Frm_LinkFormSubmit (Gbl.Title,"DAT",NULL);
HTM_BUTTON_Begin (Gbl.Title,"BT_LINK DAT",NULL);
HTM_TxtF ("%s > %s",Deg.ShrtName,Crs.ShrtName);
Frm_LinkFormEnd ();
Frm_EndForm ();
HTM_BUTTON_End ();
HTM_TD_End ();
/***** Number of teachers in the course *****/

5
swad_figure.c
View File

@ -1394,6 +1394,7 @@ 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_ClassFormLink[The_NUM_THEMES];
extern const char *Txt_Institution;
unsigned NumIns;
unsigned NumOrder;
@ -1475,7 +1476,7 @@ static void Fig_ShowInss (MYSQL_RES **mysql_res,unsigned NumInss,
/* Icon and name of this institution */
Frm_StartForm (ActSeeInsInf);
Ins_PutParamInsCod (Ins.InsCod);
Frm_LinkFormSubmit (Ins.ShrtName,The_ClassFormInBox[Gbl.Prefs.Theme],NULL);
HTM_BUTTON_Begin (Ins.ShrtName,The_ClassFormLink[Gbl.Prefs.Theme],NULL);
if (Gbl.Usrs.Listing.WithPhotos)
{
Log_DrawLogo (Hie_INS,Ins.InsCod,Ins.ShrtName,
@ -1483,7 +1484,7 @@ static void Fig_ShowInss (MYSQL_RES **mysql_res,unsigned NumInss,
HTM_NBSP ();
}
HTM_Txt (Ins.FullName);
Frm_LinkFormEnd ();
HTM_BUTTON_End ();
Frm_EndForm ();
HTM_TD_End ();

60
swad_file_browser.c
View File

@ -3393,13 +3393,13 @@ static void Brw_ShowDataOwnerAsgWrk (struct UsrData *UsrDat)
/***** Show user's name *****/
HTM_BR ();
Frm_LinkFormSubmit (Txt_View_record_for_this_course,"AUTHOR_TXT",NULL);
HTM_BUTTON_Begin (Txt_View_record_for_this_course,"BT_LINK AUTHOR_TXT",NULL);
HTM_Txt (UsrDat->Surname1);
if (UsrDat->Surname2[0])
HTM_TxtF (" %s",UsrDat->Surname2);
if (UsrDat->FirstName[0])
HTM_TxtF (", %s",UsrDat->FirstName);
Frm_LinkFormEnd ();
HTM_BUTTON_End ();
/***** Show user's email *****/
if (UsrDat->Email[0])
@ -6135,6 +6135,7 @@ static void Brw_PutIconFileWithLinkToViewMetadata (unsigned Size,
struct FileMetadata *FileMetadata)
{
extern const char *Txt_View_data;
char *Class;
/***** Begin form *****/
Frm_StartForm (Brw_ActReqDatFile[Gbl.FileBrowser.Type]);
@ -6144,13 +6145,16 @@ static void Brw_PutIconFileWithLinkToViewMetadata (unsigned Size,
FileMetadata->FilCod);
/***** Name and link of the file or folder *****/
Frm_LinkFormSubmit (Txt_View_data,Gbl.FileBrowser.TxtStyle,NULL);
if (asprintf (&Class,"BT_LINK %s",Gbl.FileBrowser.TxtStyle) < 0)
Lay_NotEnoughMemoryExit ();
HTM_BUTTON_Begin (Txt_View_data,Class,NULL);
free (Class);
/***** Icon depending on the file extension *****/
Brw_PutIconFile (Size,FileMetadata->FilFolLnk.Type,FileMetadata->FilFolLnk.Name);
/***** End link and form *****/
Frm_LinkFormEnd ();
HTM_BUTTON_End ();
Frm_EndForm ();
}
@ -6232,6 +6236,7 @@ static void Brw_WriteFileName (unsigned Level,bool IsPublic)
extern const char *Txt_Download;
extern const char *Txt_Public_open_educational_resource_OER_for_everyone;
char FileNameToShow[NAME_MAX + 1];
char *Class;
/***** Get the name of the file to show *****/
Brw_GetFileNameToShowDependingOnLevel (Gbl.FileBrowser.Type,
@ -6308,12 +6313,15 @@ static void Brw_WriteFileName (unsigned Level,bool IsPublic)
Brw_PutImplicitParamsFileBrowser ();
/* Link to the form and to the file */
Frm_LinkFormSubmit ((Gbl.FileBrowser.Type == Brw_SHOW_MRK_CRS ||
Gbl.FileBrowser.Type == Brw_SHOW_MRK_GRP) ? Txt_Check_marks_in_the_file :
Txt_Download,
Gbl.FileBrowser.TxtStyle,NULL);
if (asprintf (&Class,"BT_LINK %s",Gbl.FileBrowser.TxtStyle) < 0)
Lay_NotEnoughMemoryExit ();
HTM_BUTTON_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);
free (Class);
HTM_Txt (FileNameToShow);
Frm_LinkFormEnd ();
HTM_BUTTON_End ();
Frm_EndForm ();
/* Put icon to make public/private file */
@ -10020,13 +10028,13 @@ static void Brw_WriteBigLinkToDownloadFile (const char *URL,
Brw_PutImplicitParamsFileBrowser ();
/* Link begin */
Frm_LinkFormSubmit (Txt_Check_marks_in_the_file,"FILENAME_TXT",NULL);
HTM_BUTTON_Begin (Txt_Check_marks_in_the_file,"BT_LINK FILENAME_TXT",NULL);
Brw_PutIconFile (32,FileMetadata->FilFolLnk.Type,FileMetadata->FilFolLnk.Name);
/* Name of the file of marks, link end and form end */
HTM_TxtF ("&nbsp;%s&nbsp;",FileNameToShow);
Ico_PutIcon ("grades32x32.gif",Txt_Check_marks_in_the_file,"ICO40x40");
Frm_LinkFormEnd ();
HTM_BUTTON_End ();
Frm_EndForm ();
}
else
@ -10069,13 +10077,13 @@ static void Brw_WriteSmallLinkToDownloadFile (const char *URL,
Brw_PutImplicitParamsFileBrowser ();
/* Link begin */
Frm_LinkFormSubmit (Txt_Check_marks_in_the_file,"DAT",NULL);
HTM_BUTTON_Begin (Txt_Check_marks_in_the_file,"BT_LINK DAT",NULL);
/* Name of the file of marks */
HTM_Txt (FileNameToShow);
/* Link end and form end */
Frm_LinkFormEnd ();
HTM_BUTTON_End ();
Frm_EndForm ();
}
else
@ -11924,10 +11932,10 @@ static void Brw_WriteRowDocData (unsigned long *NumDocsNotHidden,MYSQL_ROW row)
snprintf (Gbl.Title,sizeof (Gbl.Title),
Txt_Go_to_X,
InsShortName);
Frm_LinkFormSubmit (Gbl.Title,"DAT",NULL);
Log_DrawLogo (Hie_INS,InsCod,InsShortName,20,"CT",true);
HTM_BUTTON_Begin (Gbl.Title,"BT_LINK DAT",NULL);
Log_DrawLogo (Hie_INS,InsCod,InsShortName,20,"BT_LINK LT",true);
HTM_TxtF ("&nbsp;%s",InsShortName);
Frm_LinkFormEnd ();
HTM_BUTTON_End ();
Frm_EndForm ();
}
HTM_TD_End ();
@ -11941,10 +11949,10 @@ static void Brw_WriteRowDocData (unsigned long *NumDocsNotHidden,MYSQL_ROW row)
snprintf (Gbl.Title,sizeof (Gbl.Title),
Txt_Go_to_X,
CtrShortName);
Frm_LinkFormSubmit (Gbl.Title,"DAT",NULL);
Log_DrawLogo (Hie_CTR,CtrCod,CtrShortName,20,"CT",true);
HTM_BUTTON_Begin (Gbl.Title,"BT_LINK DAT",NULL);
Log_DrawLogo (Hie_CTR,CtrCod,CtrShortName,20,"LT",true);
HTM_TxtF ("&nbsp;%s",CtrShortName);
Frm_LinkFormEnd ();
HTM_BUTTON_End ();
Frm_EndForm ();
}
HTM_TD_End ();
@ -11958,10 +11966,10 @@ static void Brw_WriteRowDocData (unsigned long *NumDocsNotHidden,MYSQL_ROW row)
snprintf (Gbl.Title,sizeof (Gbl.Title),
Txt_Go_to_X,
DegShortName);
Frm_LinkFormSubmit (Gbl.Title,"DAT",NULL);
Log_DrawLogo (Hie_DEG,DegCod,DegShortName,20,"CT",true);
HTM_BUTTON_Begin (Gbl.Title,"BT_LINK DAT",NULL);
Log_DrawLogo (Hie_DEG,DegCod,DegShortName,20,"LT",true);
HTM_TxtF ("&nbsp;%s",DegShortName);
Frm_LinkFormEnd ();
HTM_BUTTON_End ();
Frm_EndForm ();
}
HTM_TD_End ();
@ -11975,9 +11983,9 @@ static void Brw_WriteRowDocData (unsigned long *NumDocsNotHidden,MYSQL_ROW row)
snprintf (Gbl.Title,sizeof (Gbl.Title),
Txt_Go_to_X,
CrsShortName);
Frm_LinkFormSubmit (Gbl.Title,"DAT",NULL);
HTM_BUTTON_Begin (Gbl.Title,"BT_LINK DAT",NULL);
HTM_Txt (CrsShortName);
Frm_LinkFormEnd ();
HTM_BUTTON_End ();
Frm_EndForm ();
}
HTM_TD_End ();
@ -12077,7 +12085,7 @@ static void Brw_WriteRowDocData (unsigned long *NumDocsNotHidden,MYSQL_ROW row)
FileMetadata.FilCod);
/* File or folder icon */
Frm_LinkFormSubmit (FileNameToShow,"DAT_N",NULL);
HTM_BUTTON_Begin (FileNameToShow,"BT_LINK DAT_N",NULL);
if (FileMetadata.FilFolLnk.Type == Brw_IS_FOLDER)
/* Icon with folder */
Ico_PutIcon ("folder-yellow.png",Txt_Folder,"CONTEXT_ICO_16x16");
@ -12085,7 +12093,7 @@ static void Brw_WriteRowDocData (unsigned long *NumDocsNotHidden,MYSQL_ROW row)
/* Icon with file type or link */
Brw_PutIconFile (16,FileMetadata.FilFolLnk.Type,FileMetadata.FilFolLnk.Name);
HTM_TxtF ("&nbsp;%s",FileNameToShow);
Frm_LinkFormEnd ();
HTM_BUTTON_End ();
/* End form */
Frm_EndForm ();

2
swad_record.c
View File

@ -2817,7 +2817,7 @@ static void Rec_ShowCountryInHead (struct UsrData *UsrDat,bool ShowData)
if (ShowData && UsrDat->CtyCod > 0)
/* Link to see country information */
Cty_WriteCountryName (UsrDat->CtyCod,
"REC_DAT_BOLD"); // Put link to country
"BT_LINK REC_DAT_BOLD"); // Put link to country
HTM_TD_End ();
}

2
swad_statistic.c
View File

@ -3413,7 +3413,7 @@ static void Sta_WriteCountry (long CtyCod)
Cty_DrawCountryMapAndNameWithLink (&Cty,ActSeeCtyInf,
"COUNTRY_TINY",
"COUNTRY_MAP_TINY",
"LOG");
"BT_LINK LOG");
}
else // Hit with no country selected
/***** No country selected *****/

9
swad_theme.c
View File

@ -239,6 +239,15 @@ const char *The_ClassFormLink[The_NUM_THEMES] =
"BT_LINK FORM_IN_YELLOW",
"BT_LINK FORM_IN_PINK",
};
const char *The_ClassFormLinkBold[The_NUM_THEMES] =
{
"BT_LINK FORM_IN_WHITE BOLD",
"BT_LINK FORM_IN_GREY BOLD",
"BT_LINK FORM_IN_PURPLE BOLD",
"BT_LINK FORM_IN_BLUE BOLD",
"BT_LINK FORM_IN_YELLOW BOLD",
"BT_LINK FORM_IN_PINK BOLD",
};
const char *The_ClassFormOutBox[The_NUM_THEMES] =
{