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

Version 21.75: Dec 26, 2021 Code refactoring related to links.

This commit is contained in:
acanas 2021-12-26 22:39:16 +01:00
parent 30ba85fef0
commit 6349c7daf4
53 changed files with 287 additions and 284 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swad_ID.c
View File

@ -424,7 +424,8 @@ static void ID_PutLinkToConfirmID (struct UsrData *UsrDat,unsigned NumID,
Par_PutHiddenParamString (NULL,"UsrID",UsrDat->IDs.List[NumID].ID); Par_PutHiddenParamString (NULL,"UsrID",UsrDat->IDs.List[NumID].ID);
/***** Put link *****/ /***** 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); Ico_PutIconTextLink ("check.svg",Ico_BLACK,Txt_Confirm_ID);
HTM_BUTTON_End (); HTM_BUTTON_End ();

4
swad_MFU.c
View File

@ -219,7 +219,9 @@ void MFU_WriteBigMFUActions (struct MFU_ListMFUActions *ListMFUActions)
/* Icon and text */ /* Icon and text */
HTM_LI_Begin ("class=\"ICO_HIGHLIGHT\""); HTM_LI_Begin ("class=\"ICO_HIGHLIGHT\"");
Frm_BeginForm (Action); 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, HTM_IMG (Gbl.Prefs.URLIconSet,Act_GetIcon (Action),MenuStr,
"class=\"%s\"", "class=\"%s\"",
Ico_ClassColor[Ico_BLACK][Gbl.Prefs.Theme]); Ico_ClassColor[Ico_BLACK][Gbl.Prefs.Theme]);

8
swad_account.c
View File

@ -444,10 +444,10 @@ void Acc_ShowFormGoToRequestNewAccount (void)
Hlp_PROFILE_SignUp,Box_NOT_CLOSABLE); Hlp_PROFILE_SignUp,Box_NOT_CLOSABLE);
Str_FreeStrings (); Str_FreeStrings ();
/***** Button to go to request the creation of a new account *****/ /***** Button to go to request the creation of a new account *****/
Frm_BeginForm (ActFrmMyAcc); Frm_BeginForm (ActFrmMyAcc);
Btn_PutCreateButton (Txt_Create_account); Btn_PutCreateButton (Txt_Create_account);
Frm_EndForm (); Frm_EndForm ();
/***** End box *****/ /***** End box *****/
Box_BoxEnd (); Box_BoxEnd ();

5
swad_agenda.c
View File

@ -630,7 +630,7 @@ static void Agd_WriteHeaderListEvents (const struct Agd_Agenda *Agenda,
Order <= Dat_END_TIME; Order <= Dat_END_TIME;
Order++) Order++)
{ {
HTM_TH_Begin (1,1,"LM"); HTM_TH_Begin (1,1,"TIT_TBL LM");
switch (AgendaType) switch (AgendaType)
{ {
case Agd_MY_AGENDA_TODAY: case Agd_MY_AGENDA_TODAY:
@ -652,7 +652,8 @@ static void Agd_WriteHeaderListEvents (const struct Agd_Agenda *Agenda,
Agenda->CurrentPage, Agenda->CurrentPage,
-1L); -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) if (Order == Agenda->SelectedOrder)
HTM_U_Begin (); HTM_U_Begin ();

5
swad_assignment.c
View File

@ -229,7 +229,7 @@ static void Asg_PutHeadForSeeing (struct Asg_Assignments *Assignments,
Order++) Order++)
{ {
/* Begin head cell */ /* Begin head cell */
HTM_TH_Begin (1,1,"LM"); HTM_TH_Begin (1,1,"TIT_TBL LM");
if (!PrintView) if (!PrintView)
{ {
@ -241,7 +241,8 @@ static void Asg_PutHeadForSeeing (struct Asg_Assignments *Assignments,
Dat_PutHiddenParamOrder (Order); Dat_PutHiddenParamOrder (Order);
/* Begin link to select 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) if (Order == Assignments->SelectedOrder)
HTM_U_Begin (); HTM_U_Begin ();
} }

31
swad_attendance.c
View File

@ -124,8 +124,7 @@ static void Att_WriteRowUsrToCallTheRoll (unsigned NumUsr,
struct UsrData *UsrDat, struct UsrData *UsrDat,
struct Att_Event *Event); struct Att_Event *Event);
static void Att_PutLinkAttEvent (struct Att_Event *AttEvent, static void Att_PutLinkAttEvent (struct Att_Event *AttEvent,
const char *Title,const char *Txt, const char *Title,const char *Txt);
const char *Class);
static void Att_PutParamsCodGrps (long AttCod); static void Att_PutParamsCodGrps (long AttCod);
static unsigned Att_GetNumUsrsFromAListWhoAreInAttEvent (long AttCod, static unsigned Att_GetNumUsrsFromAListWhoAreInAttEvent (long AttCod,
long LstSelectedUsrCods[], long LstSelectedUsrCods[],
@ -262,7 +261,7 @@ static void Att_ShowAllAttEvents (struct Att_Events *Events)
Order <= Dat_END_TIME; Order <= Dat_END_TIME;
Order++) Order++)
{ {
HTM_TH_Begin (1,1,"LM"); HTM_TH_Begin (1,1,"TIT_TBL LM");
Frm_BeginForm (ActSeeAtt); Frm_BeginForm (ActSeeAtt);
WhichGroups = Grp_GetParamWhichGroups (); WhichGroups = Grp_GetParamWhichGroups ();
@ -270,7 +269,8 @@ static void Att_ShowAllAttEvents (struct Att_Events *Events)
Pag_PutHiddenParamPagNum (Pag_ATT_EVENTS,Events->CurrentPage); Pag_PutHiddenParamPagNum (Pag_ATT_EVENTS,Events->CurrentPage);
Dat_PutHiddenParamOrder (Order); 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) if (Order == Events->SelectedOrder)
HTM_U_Begin (); HTM_U_Begin ();
@ -515,13 +515,16 @@ static void Att_ShowOneAttEvent (struct Att_Events *Events,
/* Attendance event title */ /* Attendance event title */
if (ShowOnlyThisAttEventComplete) if (ShowOnlyThisAttEventComplete)
HTM_TD_Begin ("class=\"LT\""); HTM_TD_Begin ("class=\"%s LT\"",
Event->Hidden ? "ASG_TITLE_LIGHT" :
"ASG_TITLE");
else 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); HTM_ARTICLE_Begin (Anchor);
Att_PutLinkAttEvent (Event,Txt_View_event,Event->Title, Att_PutLinkAttEvent (Event,Txt_View_event,Event->Title);
Event->Hidden ? "BT_LINK LT ASG_TITLE_LIGHT" :
"BT_LINK LT ASG_TITLE");
HTM_ARTICLE_End (); HTM_ARTICLE_End ();
HTM_TD_End (); HTM_TD_End ();
@ -1840,8 +1843,7 @@ static void Att_WriteRowUsrToCallTheRoll (unsigned NumUsr,
/*****************************************************************************/ /*****************************************************************************/
static void Att_PutLinkAttEvent (struct Att_Event *AttEvent, static void Att_PutLinkAttEvent (struct Att_Event *AttEvent,
const char *Title,const char *Txt, const char *Title,const char *Txt)
const char *Class)
{ {
/***** Begin form *****/ /***** Begin form *****/
Frm_BeginForm (ActSeeOneAtt); Frm_BeginForm (ActSeeOneAtt);
@ -1849,7 +1851,7 @@ static void Att_PutLinkAttEvent (struct Att_Event *AttEvent,
Att_PutParamsCodGrps (AttEvent->AttCod); Att_PutParamsCodGrps (AttEvent->AttCod);
/***** Link to view attendance event *****/ /***** Link to view attendance event *****/
HTM_BUTTON_OnSubmit_Begin (Title,Class,NULL); HTM_BUTTON_OnSubmit_Begin (Title,"BT_LINK",NULL);
HTM_Txt (Txt); HTM_Txt (Txt);
HTM_BUTTON_End (); HTM_BUTTON_End ();
@ -2923,12 +2925,11 @@ static void Att_WriteTableHeadSeveralAttEvents (const struct Att_Events *Events)
Att_GetDataOfAttEventByCodAndCheckCrs (&Events->Lst[NumAttEvent]); Att_GetDataOfAttEventByCodAndCheckCrs (&Events->Lst[NumAttEvent]);
/***** Put link to this attendance event *****/ /***** 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); snprintf (StrNumAttEvent,sizeof (StrNumAttEvent),"%u",NumAttEvent + 1);
Att_PutLinkAttEvent (&Events->Lst[NumAttEvent], Att_PutLinkAttEvent (&Events->Lst[NumAttEvent],
Events->Lst[NumAttEvent].Title, Events->Lst[NumAttEvent].Title,
StrNumAttEvent, StrNumAttEvent);
"BT_LINK TIT_TBL");
HTM_TH_End (); HTM_TH_End ();
} }

14
swad_browser.c
View File

@ -3260,7 +3260,8 @@ static void Brw_ShowDataOwnerAsgWrk (struct UsrData *UsrDat)
/***** Show user's name *****/ /***** Show user's name *****/
HTM_BR (); 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); HTM_Txt (UsrDat->Surname1);
if (UsrDat->Surname2[0]) if (UsrDat->Surname2[0])
HTM_TxtF ("&nbsp;%s",UsrDat->Surname2); HTM_TxtF ("&nbsp;%s",UsrDat->Surname2);
@ -8507,7 +8508,8 @@ static void Brw_WriteBigLinkToDownloadFile (const char *URL,
Brw_PutImplicitParamsFileBrowser (&Gbl.FileBrowser.FilFolLnk); Brw_PutImplicitParamsFileBrowser (&Gbl.FileBrowser.FilFolLnk);
/* Begin link */ /* 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, Brw_PutIconFile (FileMetadata->FilFolLnk.Type,FileMetadata->FilFolLnk.Name,
"ICO40x40",false); "ICO40x40",false);
@ -9957,7 +9959,7 @@ static void Brw_WriteRowDocData (unsigned *NumDocsNotHidden,MYSQL_ROW row)
Frm_BeginFormGoTo (ActSeeInsInf); Frm_BeginFormGoTo (ActSeeInsInf);
Deg_PutParamDegCod (InsCod); Deg_PutParamDegCod (InsCod);
HTM_BUTTON_OnSubmit_Begin (Str_BuildGoToMsg (InsShortName), HTM_BUTTON_OnSubmit_Begin (Str_BuildGoToMsg (InsShortName),
"BT_LINK LT",NULL); "BT_LINK",NULL);
Str_FreeStrings (); Str_FreeStrings ();
Lgo_DrawLogo (HieLvl_INS,InsCod,InsShortName,20,"BT_LINK LT",true); Lgo_DrawLogo (HieLvl_INS,InsCod,InsShortName,20,"BT_LINK LT",true);
HTM_TxtF ("&nbsp;%s",InsShortName); HTM_TxtF ("&nbsp;%s",InsShortName);
@ -9973,7 +9975,7 @@ static void Brw_WriteRowDocData (unsigned *NumDocsNotHidden,MYSQL_ROW row)
Frm_BeginFormGoTo (ActSeeCtrInf); Frm_BeginFormGoTo (ActSeeCtrInf);
Deg_PutParamDegCod (CtrCod); Deg_PutParamDegCod (CtrCod);
HTM_BUTTON_OnSubmit_Begin (Str_BuildGoToMsg (CtrShortName), HTM_BUTTON_OnSubmit_Begin (Str_BuildGoToMsg (CtrShortName),
"BT_LINK LT",NULL); "BT_LINK",NULL);
Str_FreeStrings (); Str_FreeStrings ();
Lgo_DrawLogo (HieLvl_CTR,CtrCod,CtrShortName,20,"LT",true); Lgo_DrawLogo (HieLvl_CTR,CtrCod,CtrShortName,20,"LT",true);
HTM_TxtF ("&nbsp;%s",CtrShortName); HTM_TxtF ("&nbsp;%s",CtrShortName);
@ -9989,7 +9991,7 @@ static void Brw_WriteRowDocData (unsigned *NumDocsNotHidden,MYSQL_ROW row)
Frm_BeginFormGoTo (ActSeeDegInf); Frm_BeginFormGoTo (ActSeeDegInf);
Deg_PutParamDegCod (DegCod); Deg_PutParamDegCod (DegCod);
HTM_BUTTON_OnSubmit_Begin (Str_BuildGoToMsg (DegShortName), HTM_BUTTON_OnSubmit_Begin (Str_BuildGoToMsg (DegShortName),
"BT_LINK LT",NULL); "BT_LINK",NULL);
Str_FreeStrings (); Str_FreeStrings ();
Lgo_DrawLogo (HieLvl_DEG,DegCod,DegShortName,20,"LT",true); Lgo_DrawLogo (HieLvl_DEG,DegCod,DegShortName,20,"LT",true);
HTM_TxtF ("&nbsp;%s",DegShortName); HTM_TxtF ("&nbsp;%s",DegShortName);
@ -10110,7 +10112,7 @@ static void Brw_WriteRowDocData (unsigned *NumDocsNotHidden,MYSQL_ROW row)
FileMetadata.FilCod); FileMetadata.FilCod);
/* File or folder icon */ /* 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) if (FileMetadata.FilFolLnk.Type == Brw_IS_FOLDER)
/* Icon with folder */ /* Icon with folder */
Ico_PutIcon ("folder-yellow.png",Ico_UNCHANGED, Ico_PutIcon ("folder-yellow.png",Ico_UNCHANGED,

3
swad_building.c
View File

@ -129,7 +129,8 @@ void Bld_SeeBuildings (void)
HTM_TH_Begin (1,1,"TIT_TBL LM"); HTM_TH_Begin (1,1,"TIT_TBL LM");
Frm_BeginForm (ActSeeBld); Frm_BeginForm (ActSeeBld);
Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order); 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) if (Order == Buildings.SelectedOrder)
HTM_U_Begin (); HTM_U_Begin ();
HTM_Txt (Txt_BUILDINGS_ORDER[Order]); HTM_Txt (Txt_BUILDINGS_ORDER[Order]);

12
swad_center.c
View File

@ -153,9 +153,8 @@ void Ctr_SeeCtrWithPendingDegs (void)
/* Center logo and full name */ /* Center logo and full name */
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"%s LM %s\"",The_ClassDat[Gbl.Prefs.Theme],BgColor); HTM_TD_Begin ("class=\"%s NOWRAP LM %s\"",The_ClassDat[Gbl.Prefs.Theme],BgColor);
Ctr_DrawCenterLogoAndNameWithLink (&Ctr,ActSeeDeg, Ctr_DrawCenterLogoAndNameWithLink (&Ctr,ActSeeDeg,"CM");
"BT_LINK NOWRAP","CM");
HTM_TD_End (); HTM_TD_End ();
/* Number of pending degrees (row[1]) */ /* 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, void Ctr_DrawCenterLogoAndNameWithLink (struct Ctr_Center *Ctr,Act_Action_t Action,
const char *ClassLink,const char *ClassLogo) const char *ClassLogo)
{ {
/***** Begin form *****/ /***** Begin form *****/
Frm_BeginFormGoTo (Action); Frm_BeginFormGoTo (Action);
Ctr_PutParamCtrCod (Ctr->CtrCod); Ctr_PutParamCtrCod (Ctr->CtrCod);
/***** Link to action *****/ /***** 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 (); Str_FreeStrings ();
/***** Center logo and name *****/ /***** Center logo and name *****/
@ -364,8 +363,7 @@ static void Ctr_ListOneCenterForSeeing (struct Ctr_Center *Ctr,unsigned NumCtr)
/***** Center logo and name *****/ /***** Center logo and name *****/
HTM_TD_Begin ("class=\"%s LM %s\"",TxtClassStrong,BgColor); HTM_TD_Begin ("class=\"%s LM %s\"",TxtClassStrong,BgColor);
Ctr_DrawCenterLogoAndNameWithLink (Ctr,ActSeeDeg, Ctr_DrawCenterLogoAndNameWithLink (Ctr,ActSeeDeg,"CM");
"BT_LINK LT","CM");
HTM_TD_End (); HTM_TD_End ();
/***** Number of users who claim to belong to this center *****/ /***** Number of users who claim to belong to this center *****/

2
swad_center.h
View File

@ -81,7 +81,7 @@ struct ListCenters
void Ctr_SeeCtrWithPendingDegs (void); void Ctr_SeeCtrWithPendingDegs (void);
void Ctr_DrawCenterLogoAndNameWithLink (struct Ctr_Center *Ctr,Act_Action_t Action, 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_ShowCtrsOfCurrentIns (void);
void Ctr_EditCenters (void); void Ctr_EditCenters (void);

4
swad_center_config.c
View File

@ -567,7 +567,7 @@ static void CtrCfg_Institution (bool PrintView,bool PutForm)
Txt_Institution); Txt_Institution);
/* Data */ /* 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) if (PutForm)
{ {
/* Get list of institutions of the current country */ /* Get list of institutions of the current country */
@ -598,7 +598,7 @@ static void CtrCfg_Institution (bool PrintView,bool PutForm)
Frm_BeginFormGoTo (ActSeeInsInf); Frm_BeginFormGoTo (ActSeeInsInf);
Ins_PutParamInsCod (Gbl.Hierarchy.Ins.InsCod); Ins_PutParamInsCod (Gbl.Hierarchy.Ins.InsCod);
HTM_BUTTON_OnSubmit_Begin (Str_BuildGoToMsg (Gbl.Hierarchy.Ins.ShrtName), HTM_BUTTON_OnSubmit_Begin (Str_BuildGoToMsg (Gbl.Hierarchy.Ins.ShrtName),
"BT_LINK LT",NULL); "BT_LINK",NULL);
Str_FreeStrings (); Str_FreeStrings ();
} }

3
swad_changelog.h
View File

@ -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. 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 CSS_FILE "swad21.74.css"
#define JS_FILE "swad21.67.4.js" #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. Version 21.74: Dec 26, 2021 Working on design of dark theme.
Code refactoring related to links. (322483 lines) Code refactoring related to links. (322483 lines)
Version 21.73.1: Dec 23, 2021 Changes in notice/announcement colors. (322516 lines) Version 21.73.1: Dec 23, 2021 Changes in notice/announcement colors. (322516 lines)

3
swad_chat.c
View File

@ -316,7 +316,8 @@ static void Cht_WriteLinkToChat1 (const char *RoomCode,const char *RoomShrtName,
Cht_WriteParamsRoomCodeAndNames (RoomCode,RoomShrtName,RoomFullName); Cht_WriteParamsRoomCodeAndNames (RoomCode,RoomShrtName,RoomFullName);
/* Begin button */ /* 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) static void Cht_WriteLinkToChat2 (const char *RoomCode,const char *RoomFullName)

9
swad_connected.c
View File

@ -328,8 +328,8 @@ void Con_ShowConnectedUsrsBelongingToCurrentCrs (void)
/***** Number of connected users who belong to course *****/ /***** Number of connected users who belong to course *****/
/* Link to view more details about connected users */ /* Link to view more details about connected users */
Frm_BeginFormUnique (ActLstCon); // Must be unique because Frm_BeginFormUnique (ActLstCon); // Must be unique because
// the list of connected users // the list of connected users
// is dynamically updated via AJAX // is dynamically updated via AJAX
HTM_BUTTON_OnSubmit_Begin (Txt_Connected_users,"BT_LINK CONNECTED_TXT",NULL); HTM_BUTTON_OnSubmit_Begin (Txt_Connected_users,"BT_LINK CONNECTED_TXT",NULL);
Str_Copy (CourseName,Gbl.Hierarchy.Crs.ShrtName,sizeof (CourseName) - 1); Str_Copy (CourseName,Gbl.Hierarchy.Crs.ShrtName,sizeof (CourseName) - 1);
Con_GetNumConnectedWithARoleBelongingToCurrentScope (Rol_UNK,&Usrs); 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_DIV_Begin ("class=\"CON_NAME_NARROW\""); // Limited width
HTM_BUTTON_OnSubmit_Begin (Txt_View_record_for_this_course, HTM_BUTTON_OnSubmit_Begin (Txt_View_record_for_this_course,
"BT_LINK",NULL); "BT_LINK LT",NULL);
Usr_WriteFirstNameBRSurnames (UsrDat); Usr_WriteFirstNameBRSurnames (UsrDat);
HTM_BUTTON_End (); HTM_BUTTON_End ();
HTM_DIV_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 HTM_DIV_Begin ("class=\"CON_NAME_WIDE\""); // Limited width
if (PutLinkToRecord) if (PutLinkToRecord)
HTM_BUTTON_OnSubmit_Begin (UsrDat.FullName,"BT_LINK",NULL); HTM_BUTTON_OnSubmit_Begin (UsrDat.FullName,
"BT_LINK",NULL);
Usr_WriteFirstNameBRSurnames (&UsrDat); Usr_WriteFirstNameBRSurnames (&UsrDat);
if (PutLinkToRecord) if (PutLinkToRecord)
HTM_BUTTON_End (); HTM_BUTTON_End ();

56
swad_country.c
View File

@ -158,8 +158,7 @@ void Cty_SeeCtyWithPendingInss (void)
The_ClassDat[Gbl.Prefs.Theme],BgColor); The_ClassDat[Gbl.Prefs.Theme],BgColor);
Cty_DrawCountryMapAndNameWithLink (&Cty,ActSeeIns, Cty_DrawCountryMapAndNameWithLink (&Cty,ActSeeIns,
"COUNTRY_SMALL", "COUNTRY_SMALL",
"COUNTRY_MAP_SMALL", "COUNTRY_MAP_SMALL");
"BT_LINK");
HTM_TD_End (); HTM_TD_End ();
/* Number of pending institutions (row[1]) */ /* Number of pending institutions (row[1]) */
@ -361,24 +360,25 @@ static void Cty_PutHeadCountriesForSeeing (bool OrderSelectable)
Order <= Cty_ORDER_BY_NUM_USRS; Order <= Cty_ORDER_BY_NUM_USRS;
Order++) Order++)
{ {
HTM_TH_Begin (1,1,Order == Cty_ORDER_BY_COUNTRY ? "LM" : HTM_TH_Begin (1,1,Order == Cty_ORDER_BY_COUNTRY ? "TIT_TBL LM" :
"RM"); "TIT_TBL RM");
if (OrderSelectable) if (OrderSelectable)
{ {
Frm_BeginForm (ActSeeCty); Frm_BeginForm (ActSeeCty);
Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order); Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order);
HTM_BUTTON_OnSubmit_Begin (Txt_COUNTRIES_HELP_ORDER[Order],"BT_LINK TIT_TBL",NULL); HTM_BUTTON_OnSubmit_Begin (Txt_COUNTRIES_HELP_ORDER[Order],
if (Order == Gbl.Hierarchy.Ctys.SelectedOrder) "BT_LINK",NULL);
HTM_U_Begin (); if (Order == Gbl.Hierarchy.Ctys.SelectedOrder)
} HTM_U_Begin ();
HTM_Txt (Txt_COUNTRIES_ORDER[Order]); }
if (OrderSelectable) HTM_Txt (Txt_COUNTRIES_ORDER[Order]);
{ if (OrderSelectable)
if (Order == Gbl.Hierarchy.Ctys.SelectedOrder) {
HTM_U_End (); if (Order == Gbl.Hierarchy.Ctys.SelectedOrder)
HTM_BUTTON_End (); HTM_U_End ();
Frm_EndForm (); HTM_BUTTON_End ();
} Frm_EndForm ();
}
HTM_TH_End (); HTM_TH_End ();
} }
@ -421,8 +421,7 @@ static void Cty_ListOneCountryForSeeing (struct Cty_Countr *Cty,unsigned NumCty)
The_ClassDatStrong[Gbl.Prefs.Theme],BgColor); The_ClassDatStrong[Gbl.Prefs.Theme],BgColor);
Cty_DrawCountryMapAndNameWithLink (Cty,ActSeeIns, Cty_DrawCountryMapAndNameWithLink (Cty,ActSeeIns,
"COUNTRY_SMALL", "COUNTRY_SMALL",
"COUNTRY_MAP_SMALL", "COUNTRY_MAP_SMALL");
"BT_LINK");
HTM_TD_End (); HTM_TD_End ();
/***** Number of users who claim to belong to this country *****/ /***** 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, void Cty_DrawCountryMapAndNameWithLink (struct Cty_Countr *Cty,Act_Action_t Action,
const char *ClassContainer, const char *ClassContainer,
const char *ClassMap, const char *ClassMap)
const char *ClassLink)
{ {
char CountryName[Cty_MAX_BYTES_NAME + 1]; 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 *****/ /***** Link to action *****/
HTM_BUTTON_OnSubmit_Begin (Str_BuildGoToMsg (Cty->Name[Gbl.Prefs.Language]), HTM_BUTTON_OnSubmit_Begin (Str_BuildGoToMsg (Cty->Name[Gbl.Prefs.Language]),
ClassLink,NULL); "BT_LINK",NULL);
Str_FreeStrings (); Str_FreeStrings ();
/***** Draw country map *****/ /***** Draw country map *****/
@ -907,11 +905,10 @@ void Cty_WriteSelectorOfCountry (void)
/*****************************************************************************/ /*****************************************************************************/
// If ClassLink == NULL ==> do not put link // 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]; char CtyName[Cty_MAX_BYTES_NAME + 1];
bool PutForm = ClassLink && bool PutForm = !Gbl.Form.Inside && // Only if not inside another form
!Gbl.Form.Inside && // Only if not inside another form
Act_GetBrowserTab (Gbl.Action.Act) == Act_BRW_1ST_TAB; // Only in main browser tab Act_GetBrowserTab (Gbl.Action.Act) == Act_BRW_1ST_TAB; // Only in main browser tab
/***** Get country name *****/ /***** Get country name *****/
@ -922,7 +919,8 @@ void Cty_WriteCountryName (long CtyCod,const char *ClassLink)
/***** Write country name with link to country information *****/ /***** Write country name with link to country information *****/
Frm_BeginForm (ActSeeCtyInf); Frm_BeginForm (ActSeeCtyInf);
Cty_PutParamCtyCod (CtyCod); 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_Txt (CtyName);
HTM_BUTTON_End (); HTM_BUTTON_End ();
Frm_EndForm (); Frm_EndForm ();

5
swad_country.h
View File

@ -87,8 +87,7 @@ bool Cty_CheckIfICanEditCountries (void);
void Cty_DrawCountryMapAndNameWithLink (struct Cty_Countr *Cty,Act_Action_t Action, void Cty_DrawCountryMapAndNameWithLink (struct Cty_Countr *Cty,Act_Action_t Action,
const char *ClassContainer, const char *ClassContainer,
const char *ClassMap, const char *ClassMap);
const char *ClassLink);
void Cty_DrawCountryMap (struct Cty_Countr *Cty,const char *Class); void Cty_DrawCountryMap (struct Cty_Countr *Cty,const char *Class);
bool Cty_CheckIfCountryPhotoExists (struct Cty_Countr *Cty); bool Cty_CheckIfCountryPhotoExists (struct Cty_Countr *Cty);
@ -99,7 +98,7 @@ void Cty_GetBasicListOfCountries (void);
void Cty_GetFullListOfCountries (void); void Cty_GetFullListOfCountries (void);
void Cty_FreeListCountries (void); void Cty_FreeListCountries (void);
void Cty_WriteSelectorOfCountry (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); bool Cty_GetDataOfCountryByCod (struct Cty_Countr *Cty);
void Cty_FlushCacheCountryName (void); void Cty_FlushCacheCountryName (void);
void Cty_GetCountryName (long CtyCod,Lan_Language_t Language, void Cty_GetCountryName (long CtyCod,Lan_Language_t Language,

6
swad_country_config.c
View File

@ -371,12 +371,12 @@ static void CtyCfg_Platform (bool PrintView)
Frm_LabelColumn ("RT",NULL,Txt_Platform); Frm_LabelColumn ("RT",NULL,Txt_Platform);
/* Data */ /* 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) if (!PrintView)
{ {
Frm_BeginFormGoTo (ActSeeSysInf); Frm_BeginFormGoTo (ActSeeSysInf);
HTM_BUTTON_OnSubmit_Begin (Str_BuildGoToMsg (Cfg_PLATFORM_SHORT_NAME), HTM_BUTTON_OnSubmit_Begin (Str_BuildGoToMsg (Cfg_PLATFORM_SHORT_NAME),
"BT_LINK LT",NULL); "BT_LINK",NULL);
Str_FreeStrings (); Str_FreeStrings ();
} }
Ico_PutIcon ("swad64x64.png",Ico_UNCHANGED,Cfg_PLATFORM_FULL_NAME,"ICO20x20"); 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); Frm_LabelColumn ("RT",NULL,Txt_Institutions);
/* Data */ /* 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); Frm_BeginFormGoTo (ActSeeIns);
Cty_PutParamCtyCod (Gbl.Hierarchy.Cty.CtyCod); Cty_PutParamCtyCod (Gbl.Hierarchy.Cty.CtyCod);
HTM_BUTTON_OnSubmit_Begin (Str_BuildString (Txt_Institutions_of_COUNTRY_X, HTM_BUTTON_OnSubmit_Begin (Str_BuildString (Txt_Institutions_of_COUNTRY_X,

31
swad_course.c
View File

@ -193,10 +193,7 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
ClassNormal); ClassNormal);
Frm_BeginForm (ActMyCrs); Frm_BeginForm (ActMyCrs);
Cty_PutParamCtyCod (-1L); Cty_PutParamCtyCod (-1L);
HTM_BUTTON_OnSubmit_Begin (Txt_System, HTM_BUTTON_OnSubmit_Begin (Txt_System,"BT_LINK",NULL);
Highlight ? ClassHighlight :
ClassNormal,
NULL);
Ico_PutIcon ("sitemap.svg",Ico_BLACK,Txt_System,"ICO16x16"); Ico_PutIcon ("sitemap.svg",Ico_BLACK,Txt_System,"ICO16x16");
HTM_TxtF ("&nbsp;%s",Txt_System); HTM_TxtF ("&nbsp;%s",Txt_System);
HTM_BUTTON_End (); HTM_BUTTON_End ();
@ -227,9 +224,7 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
Frm_BeginForm (ActMyCrs); Frm_BeginForm (ActMyCrs);
Cty_PutParamCtyCod (Hie.Cty.CtyCod); Cty_PutParamCtyCod (Hie.Cty.CtyCod);
HTM_BUTTON_OnSubmit_Begin (Act_GetActionText (ActSeeCtyInf), HTM_BUTTON_OnSubmit_Begin (Act_GetActionText (ActSeeCtyInf),
Highlight ? ClassHighlight : "BT_LINK",NULL);
ClassNormal,
NULL);
Cty_DrawCountryMap (&Hie.Cty,"ICO16x16"); Cty_DrawCountryMap (&Hie.Cty,"ICO16x16");
HTM_TxtF ("&nbsp;%s",Hie.Cty.Name[Gbl.Prefs.Language]); HTM_TxtF ("&nbsp;%s",Hie.Cty.Name[Gbl.Prefs.Language]);
HTM_BUTTON_End (); HTM_BUTTON_End ();
@ -262,9 +257,7 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
Frm_BeginForm (ActMyCrs); Frm_BeginForm (ActMyCrs);
Ins_PutParamInsCod (Hie.Ins.InsCod); Ins_PutParamInsCod (Hie.Ins.InsCod);
HTM_BUTTON_OnSubmit_Begin (Act_GetActionText (ActSeeInsInf), HTM_BUTTON_OnSubmit_Begin (Act_GetActionText (ActSeeInsInf),
Highlight ? ClassHighlight : "BT_LINK",NULL);
ClassNormal,
NULL);
Lgo_DrawLogo (HieLvl_INS,Hie.Ins.InsCod,Hie.Ins.ShrtName,16,NULL,true); Lgo_DrawLogo (HieLvl_INS,Hie.Ins.InsCod,Hie.Ins.ShrtName,16,NULL,true);
HTM_TxtF ("&nbsp;%s",Hie.Ins.ShrtName); HTM_TxtF ("&nbsp;%s",Hie.Ins.ShrtName);
HTM_BUTTON_End (); HTM_BUTTON_End ();
@ -297,9 +290,7 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
Frm_BeginForm (ActMyCrs); Frm_BeginForm (ActMyCrs);
Ctr_PutParamCtrCod (Hie.Ctr.CtrCod); Ctr_PutParamCtrCod (Hie.Ctr.CtrCod);
HTM_BUTTON_OnSubmit_Begin (Act_GetActionText (ActSeeCtrInf), HTM_BUTTON_OnSubmit_Begin (Act_GetActionText (ActSeeCtrInf),
Highlight ? ClassHighlight : "BT_LINK",NULL);
ClassNormal,
NULL);
Lgo_DrawLogo (HieLvl_CTR,Hie.Ctr.CtrCod,Hie.Ctr.ShrtName,16,NULL,true); Lgo_DrawLogo (HieLvl_CTR,Hie.Ctr.CtrCod,Hie.Ctr.ShrtName,16,NULL,true);
HTM_TxtF ("&nbsp;%s",Hie.Ctr.ShrtName); HTM_TxtF ("&nbsp;%s",Hie.Ctr.ShrtName);
HTM_BUTTON_End (); HTM_BUTTON_End ();
@ -332,9 +323,7 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
Frm_BeginForm (ActMyCrs); Frm_BeginForm (ActMyCrs);
Deg_PutParamDegCod (Hie.Deg.DegCod); Deg_PutParamDegCod (Hie.Deg.DegCod);
HTM_BUTTON_OnSubmit_Begin (Act_GetActionText (ActSeeDegInf), HTM_BUTTON_OnSubmit_Begin (Act_GetActionText (ActSeeDegInf),
Highlight ? ClassHighlight : "BT_LINK",NULL);
ClassNormal,
NULL);
Lgo_DrawLogo (HieLvl_DEG,Hie.Deg.DegCod,Hie.Deg.ShrtName,16,NULL,true); Lgo_DrawLogo (HieLvl_DEG,Hie.Deg.DegCod,Hie.Deg.ShrtName,16,NULL,true);
HTM_TxtF ("&nbsp;%s",Hie.Deg.ShrtName); HTM_TxtF ("&nbsp;%s",Hie.Deg.ShrtName);
HTM_BUTTON_End (); HTM_BUTTON_End ();
@ -367,9 +356,7 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
Frm_BeginForm (ActMyCrs); Frm_BeginForm (ActMyCrs);
Crs_PutParamCrsCod (Hie.Crs.CrsCod); Crs_PutParamCrsCod (Hie.Crs.CrsCod);
HTM_BUTTON_OnSubmit_Begin (Str_BuildGoToMsg (Hie.Crs.ShrtName), HTM_BUTTON_OnSubmit_Begin (Str_BuildGoToMsg (Hie.Crs.ShrtName),
Highlight ? ClassHighlight : "BT_LINK",NULL);
ClassNormal,
NULL);
Str_FreeStrings (); Str_FreeStrings ();
Ico_PutIcon ("chalkboard-teacher.svg",Ico_BLACK,Hie.Crs.FullName,"ICO16x16"); Ico_PutIcon ("chalkboard-teacher.svg",Ico_BLACK,Hie.Crs.FullName,"ICO16x16");
HTM_TxtF ("&nbsp;%s",Hie.Crs.ShrtName); HTM_TxtF ("&nbsp;%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); HTM_TD_Begin ("class=\"%s LT %s\"",ClassTxt,BgColor);
Frm_BeginFormGoTo (ActSeeDegInf); Frm_BeginFormGoTo (ActSeeDegInf);
Deg_PutParamDegCod (Deg.DegCod); 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 (); Str_FreeStrings ();
Lgo_DrawLogo (HieLvl_DEG,Deg.DegCod,Deg.ShrtName,20,"CT",true); Lgo_DrawLogo (HieLvl_DEG,Deg.DegCod,Deg.ShrtName,20,"CT",true);
HTM_TxtF ("&nbsp;%s&nbsp;(%s)",row[2],row[6]); HTM_TxtF ("&nbsp;%s&nbsp;(%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); HTM_TD_Begin ("class=\"%s LT %s\"",ClassTxt,BgColor);
Frm_BeginFormGoTo (ActSeeCrsInf); Frm_BeginFormGoTo (ActSeeCrsInf);
Crs_PutParamCrsCod (CrsCod); 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 (); Str_FreeStrings ();
HTM_Txt (row[5]); HTM_Txt (row[5]);
HTM_BUTTON_End (); HTM_BUTTON_End ();

4
swad_course_config.c
View File

@ -221,7 +221,7 @@ static void CrsCfg_Degree (bool PrintView,bool PutForm)
Txt_Degree); Txt_Degree);
/* Data */ /* 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) if (PutForm)
{ {
/* Get list of degrees of the current center */ /* Get list of degrees of the current center */
@ -252,7 +252,7 @@ static void CrsCfg_Degree (bool PrintView,bool PutForm)
Frm_BeginFormGoTo (ActSeeDegInf); Frm_BeginFormGoTo (ActSeeDegInf);
Deg_PutParamDegCod (Gbl.Hierarchy.Deg.DegCod); Deg_PutParamDegCod (Gbl.Hierarchy.Deg.DegCod);
HTM_BUTTON_OnSubmit_Begin (Str_BuildGoToMsg (Gbl.Hierarchy.Deg.ShrtName), HTM_BUTTON_OnSubmit_Begin (Str_BuildGoToMsg (Gbl.Hierarchy.Deg.ShrtName),
"BT_LINK LT",NULL); "BT_LINK",NULL);
Str_FreeStrings (); Str_FreeStrings ();
} }
Lgo_DrawLogo (HieLvl_DEG,Gbl.Hierarchy.Deg.DegCod,Gbl.Hierarchy.Deg.ShrtName, Lgo_DrawLogo (HieLvl_DEG,Gbl.Hierarchy.Deg.DegCod,Gbl.Hierarchy.Deg.ShrtName,

6
swad_date.c
View File

@ -338,7 +338,8 @@ void Dat_ShowClientLocalTime (void)
/* Month with link to calendar */ /* Month with link to calendar */
HTM_DIV_Begin ("id=\"current_month\""); HTM_DIV_Begin ("id=\"current_month\"");
Frm_BeginForm (ActSeeCal); 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\""); HTM_SPAN_Begin ("id=\"current_month_txt\"");
// JavaScript will write HTML here // JavaScript will write HTML here
HTM_SPAN_End (); HTM_SPAN_End ();
@ -351,7 +352,8 @@ void Dat_ShowClientLocalTime (void)
if (Gbl.Usrs.Me.Logged) if (Gbl.Usrs.Me.Logged)
{ {
Frm_BeginForm (ActSeeMyAgd); 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\""); HTM_SPAN_Begin ("id=\"current_day_txt\"");
// JavaScript will write HTML here // JavaScript will write HTML here

13
swad_degree.c
View File

@ -158,10 +158,9 @@ void Deg_SeeDegWithPendingCrss (void)
HTM_TR_Begin (NULL); HTM_TR_Begin (NULL);
/* Degree logo and full name */ /* 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); The_ClassDat[Gbl.Prefs.Theme],BgColor);
Deg_DrawDegreeLogoAndNameWithLink (&Deg,ActSeeCrs, Deg_DrawDegreeLogoAndNameWithLink (&Deg,ActSeeCrs,"CM");
"BT_LINK NOWRAP","CM");
HTM_TD_End (); HTM_TD_End ();
/* Number of pending courses (row[1]) */ /* 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, void Deg_DrawDegreeLogoAndNameWithLink (struct Deg_Degree *Deg,Act_Action_t Action,
const char *ClassLink,const char *ClassLogo) const char *ClassLogo)
{ {
/***** Begin form *****/ /***** Begin form *****/
Frm_BeginFormGoTo (Action); Frm_BeginFormGoTo (Action);
Deg_PutParamDegCod (Deg->DegCod); Deg_PutParamDegCod (Deg->DegCod);
/***** Link to action *****/ /***** 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 (); Str_FreeStrings ();
/***** Degree logo and name *****/ /***** Degree logo and name *****/
@ -844,8 +844,7 @@ static void Deg_ListOneDegreeForSeeing (struct Deg_Degree *Deg,unsigned NumDeg)
/***** Degree logo and name *****/ /***** Degree logo and name *****/
HTM_TD_Begin ("class=\"%s LM %s\"",TxtClassStrong,BgColor); HTM_TD_Begin ("class=\"%s LM %s\"",TxtClassStrong,BgColor);
Deg_DrawDegreeLogoAndNameWithLink (Deg,ActSeeCrs, Deg_DrawDegreeLogoAndNameWithLink (Deg,ActSeeCrs,"CM");
"BT_LINK","CM");
HTM_TD_End (); HTM_TD_End ();
/***** Type of degree *****/ /***** Type of degree *****/

2
swad_degree.h
View File

@ -72,7 +72,7 @@ struct ListDegrees
void Deg_SeeDegWithPendingCrss (void); void Deg_SeeDegWithPendingCrss (void);
void Deg_DrawDegreeLogoAndNameWithLink (struct Deg_Degree *Deg,Act_Action_t Action, void Deg_DrawDegreeLogoAndNameWithLink (struct Deg_Degree *Deg,Act_Action_t Action,
const char *ClassLink,const char *ClassLogo); const char *ClassLogo);
void Deg_WriteSelectorOfDegree (void); void Deg_WriteSelectorOfDegree (void);

6
swad_degree_config.c
View File

@ -243,9 +243,7 @@ static void DegCfg_Center (bool PrintView,bool PutForm)
Frm_BeginFormGoTo (ActSeeCtrInf); Frm_BeginFormGoTo (ActSeeCtrInf);
Ctr_PutParamCtrCod (Gbl.Hierarchy.Ctr.CtrCod); Ctr_PutParamCtrCod (Gbl.Hierarchy.Ctr.CtrCod);
HTM_BUTTON_OnSubmit_Begin (Str_BuildGoToMsg (Gbl.Hierarchy.Ctr.ShrtName), HTM_BUTTON_OnSubmit_Begin (Str_BuildGoToMsg (Gbl.Hierarchy.Ctr.ShrtName),
Str_BuildString ("BT_LINK LT %s", "BT_LINK",NULL);
The_ClassDat[Gbl.Prefs.Theme]),
NULL);
Str_FreeStrings (); Str_FreeStrings ();
} }
Lgo_DrawLogo (HieLvl_CTR,Gbl.Hierarchy.Ctr.CtrCod,Gbl.Hierarchy.Ctr.ShrtName, Lgo_DrawLogo (HieLvl_CTR,Gbl.Hierarchy.Ctr.CtrCod,Gbl.Hierarchy.Ctr.ShrtName,
@ -333,7 +331,7 @@ static void DegCfg_NumCrss (void)
Frm_BeginFormGoTo (ActSeeCrs); Frm_BeginFormGoTo (ActSeeCrs);
Deg_PutParamDegCod (Gbl.Hierarchy.Deg.DegCod); Deg_PutParamDegCod (Gbl.Hierarchy.Deg.DegCod);
HTM_BUTTON_OnSubmit_Begin (Str_BuildString (Txt_Courses_of_DEGREE_X, HTM_BUTTON_OnSubmit_Begin (Str_BuildString (Txt_Courses_of_DEGREE_X,
Gbl.Hierarchy.Deg.ShrtName), Gbl.Hierarchy.Deg.ShrtName),
"BT_LINK",NULL); "BT_LINK",NULL);
Str_FreeStrings (); Str_FreeStrings ();
HTM_Unsigned (Crs_GetCachedNumCrssInDeg (Gbl.Hierarchy.Deg.DegCod)); HTM_Unsigned (Crs_GetCachedNumCrssInDeg (Gbl.Hierarchy.Deg.DegCod));

6
swad_degree_type.c
View File

@ -528,8 +528,8 @@ static void DegTyp_PutHeadDegreeTypesForSeeing (Act_Action_t NextAction,
Order <= DegTyp_ORDER_BY_NUM_DEGREES; Order <= DegTyp_ORDER_BY_NUM_DEGREES;
Order++) Order++)
{ {
HTM_TH_Begin (1,1,Order == DegTyp_ORDER_BY_DEGREE_TYPE ? "LM" : HTM_TH_Begin (1,1,Order == DegTyp_ORDER_BY_DEGREE_TYPE ? "TIT_TBL LM" :
"RM"); "TIT_TBL RM");
/* Begin form to change order */ /* Begin form to change order */
Frm_BeginForm (NextAction); Frm_BeginForm (NextAction);
@ -543,7 +543,7 @@ static void DegTyp_PutHeadDegreeTypesForSeeing (Act_Action_t NextAction,
/* Link with the head of this column */ /* Link with the head of this column */
HTM_BUTTON_OnSubmit_Begin (Txt_DEGREE_TYPES_HELP_ORDER[Order], HTM_BUTTON_OnSubmit_Begin (Txt_DEGREE_TYPES_HELP_ORDER[Order],
"BT_LINK TIT_TBL",NULL); "BT_LINK",NULL);
if (Order == SelectedOrder) if (Order == SelectedOrder)
HTM_U_Begin (); HTM_U_Begin ();
HTM_Txt (Txt_DEGREE_TYPES_ORDER[Order]); HTM_Txt (Txt_DEGREE_TYPES_ORDER[Order]);

6
swad_department.c
View File

@ -141,13 +141,13 @@ void Dpt_SeeDepts (void)
Order <= Dpt_ORDER_BY_NUM_TCHS; Order <= Dpt_ORDER_BY_NUM_TCHS;
Order++) Order++)
{ {
HTM_TH_Begin (1,1,Order == Dpt_ORDER_BY_NUM_TCHS ? "RM" : HTM_TH_Begin (1,1,Order == Dpt_ORDER_BY_NUM_TCHS ? "TIT_TBL RM" :
"LM"); "TIT_TBL LM");
Frm_BeginForm (ActSeeDpt); Frm_BeginForm (ActSeeDpt);
Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order); Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order);
HTM_BUTTON_OnSubmit_Begin (Txt_DEPARTMENTS_HELP_ORDER[Order], HTM_BUTTON_OnSubmit_Begin (Txt_DEPARTMENTS_HELP_ORDER[Order],
"BT_LINK TIT_TBL",NULL); "BT_LINK",NULL);
if (Order == Departments.SelectedOrder) if (Order == Departments.SelectedOrder)
HTM_U_Begin (); HTM_U_Begin ();
HTM_Txt (Txt_DEPARTMENTS_ORDER[Order]); HTM_Txt (Txt_DEPARTMENTS_ORDER[Order]);

32
swad_exam.c
View File

@ -254,14 +254,14 @@ static void Exa_ListAllExams (struct Exa_Exams *Exams)
Order <= (Exa_Order_t) (Exa_NUM_ORDERS - 1); Order <= (Exa_Order_t) (Exa_NUM_ORDERS - 1);
Order++) Order++)
{ {
HTM_TH_Begin (1,1,"LM"); HTM_TH_Begin (1,1,"TIT_TBL LM");
/* Form to change order */ /* Form to change order */
Frm_BeginForm (ActSeeAllExa); Frm_BeginForm (ActSeeAllExa);
Pag_PutHiddenParamPagNum (Pag_EXAMS,Exams->CurrentPage); Pag_PutHiddenParamPagNum (Pag_EXAMS,Exams->CurrentPage);
Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order); Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order);
HTM_BUTTON_OnSubmit_Begin (Txt_EXAMS_ORDER_HELP[Order], HTM_BUTTON_OnSubmit_Begin (Txt_EXAMS_ORDER_HELP[Order],
"BT_LINK TIT_TBL",NULL); "BT_LINK",NULL);
if (Order == Exams->SelectedOrder) if (Order == Exams->SelectedOrder)
HTM_U_Begin (); HTM_U_Begin ();
HTM_Txt (Txt_EXAMS_ORDER[Order]); HTM_Txt (Txt_EXAMS_ORDER[Order]);
@ -541,19 +541,21 @@ static void Exa_ShowOneExam (struct Exa_Exams *Exams,
/***** Exam title and main data *****/ /***** Exam title and main data *****/
if (ShowOnlyThisExam) if (ShowOnlyThisExam)
HTM_TD_Begin ("class=\"LT\""); HTM_TD_Begin ("class=\"%s LT\"",
Exam->Hidden ? "ASG_TITLE_LIGHT":
"ASG_TITLE");
else 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 */ /* Exam title */
Exams->ExaCod = Exam->ExaCod; Exams->ExaCod = Exam->ExaCod;
HTM_ARTICLE_Begin (Anchor); HTM_ARTICLE_Begin (Anchor);
Frm_BeginForm (ActSeeExa); Frm_BeginForm (ActSeeExa);
Exa_PutParams (Exams); Exa_PutParams (Exams);
HTM_BUTTON_OnSubmit_Begin (Txt_View_exam, HTM_BUTTON_OnSubmit_Begin (Txt_View_exam,"BT_LINK",NULL);
Exam->Hidden ? "BT_LINK LT ASG_TITLE_LIGHT":
"BT_LINK LT ASG_TITLE",
NULL);
HTM_Txt (Exam->Title); HTM_Txt (Exam->Title);
HTM_BUTTON_End (); HTM_BUTTON_End ();
Frm_EndForm (); Frm_EndForm ();
@ -574,17 +576,19 @@ static void Exa_ShowOneExam (struct Exa_Exams *Exams,
/***** Number of sessions in exam *****/ /***** Number of sessions in exam *****/
if (ShowOnlyThisExam) if (ShowOnlyThisExam)
HTM_TD_Begin ("class=\"RT\""); HTM_TD_Begin ("class=\"%s RT\"",
Exam->Hidden ? "ASG_TITLE_LIGHT":
"ASG_TITLE");
else 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; Exams->ExaCod = Exam->ExaCod;
Frm_BeginForm (ActSeeExa); Frm_BeginForm (ActSeeExa);
Exa_PutParams (Exams); Exa_PutParams (Exams);
HTM_BUTTON_OnSubmit_Begin (Txt_Sessions, HTM_BUTTON_OnSubmit_Begin (Txt_Sessions,"BT_LINK",NULL);
Exam->Hidden ? "BT_LINK LT ASG_TITLE_LIGHT" :
"BT_LINK LT ASG_TITLE",
NULL);
if (ShowOnlyThisExam) if (ShowOnlyThisExam)
HTM_TxtColonNBSP (Txt_Sessions); HTM_TxtColonNBSP (Txt_Sessions);
HTM_Unsigned (Exam->NumSess); HTM_Unsigned (Exam->NumSess);

16
swad_exam_session.c
View File

@ -516,7 +516,10 @@ static void ExaSes_ListOneOrMoreSessionsTitleGrps (struct Exa_Exams *Exams,
extern const char *Txt_Play; extern const char *Txt_Play;
extern const char *Txt_Resume; 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 *****/ /***** Session title *****/
HTM_ARTICLE_Begin (Anchor); HTM_ARTICLE_Begin (Anchor);
@ -527,20 +530,13 @@ static void ExaSes_ListOneOrMoreSessionsTitleGrps (struct Exa_Exams *Exams,
ExaSes_PutParamSesCod (Session->SesCod); ExaSes_PutParamSesCod (Session->SesCod);
HTM_BUTTON_OnSubmit_Begin (Gbl.Usrs.Me.Role.Logged == Rol_STD ? Txt_Play : HTM_BUTTON_OnSubmit_Begin (Gbl.Usrs.Me.Role.Logged == Rol_STD ? Txt_Play :
Txt_Resume, Txt_Resume,
Session->Hidden ? "BT_LINK ASG_TITLE_LIGHT": "BT_LINK",NULL);
"BT_LINK ASG_TITLE",
NULL);
HTM_Txt (Session->Title); HTM_Txt (Session->Title);
HTM_BUTTON_End (); HTM_BUTTON_End ();
Frm_EndForm (); Frm_EndForm ();
} }
else else
{ HTM_Txt (Session->Title);
HTM_SPAN_Begin ("class=\"%s\"",Session->Hidden ? "ASG_TITLE_LIGHT":
"ASG_TITLE");
HTM_Txt (Session->Title);
HTM_SPAN_End ();
}
HTM_ARTICLE_End (); HTM_ARTICLE_End ();
/***** Groups whose students can answer this exam session *****/ /***** Groups whose students can answer this exam session *****/

3
swad_figure.c
View File

@ -1179,7 +1179,6 @@ static void Fig_ShowInss (MYSQL_RES **mysql_res,unsigned NumInss,
const char *TxtFigure) const char *TxtFigure)
{ {
extern const char *The_ClassFormInBox[The_NUM_THEMES]; 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 *The_ClassDat[The_NUM_THEMES];
extern const char *Txt_Institution; extern const char *Txt_Institution;
unsigned NumIns; unsigned NumIns;
@ -1256,7 +1255,7 @@ static void Fig_ShowInss (MYSQL_RES **mysql_res,unsigned NumInss,
/* Icon and name of this institution */ /* Icon and name of this institution */
Frm_BeginForm (ActSeeInsInf); Frm_BeginForm (ActSeeInsInf);
Ins_PutParamInsCod (Ins.InsCod); 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) if (Gbl.Usrs.Listing.WithPhotos)
{ {
Lgo_DrawLogo (HieLvl_INS,Ins.InsCod,Ins.ShrtName, Lgo_DrawLogo (HieLvl_INS,Ins.InsCod,Ins.ShrtName,

32
swad_follow.c
View File

@ -196,12 +196,11 @@ void Fol_SuggestUsrsToFollowMainZoneOnRightColumn (void)
&mysql_res))) &mysql_res)))
{ {
/***** Begin container *****/ /***** Begin container *****/
HTM_DIV_Begin ("class=\"CONNECTED\""); HTM_DIV_Begin ("class=\"CONNECTED CONNECTED_TXT\"");
/***** Title with link to suggest more users to follow *****/ /***** Title with link to suggest more users to follow *****/
Frm_BeginForm (ActSeeSocPrf); Frm_BeginForm (ActSeeSocPrf);
HTM_BUTTON_OnSubmit_Begin (Txt_Who_to_follow, HTM_BUTTON_OnSubmit_Begin (Txt_Who_to_follow,"BT_LINK",NULL);
"BT_LINK CONNECTED_TXT",NULL);
HTM_Txt (Txt_Who_to_follow); HTM_Txt (Txt_Who_to_follow);
HTM_BUTTON_End (); HTM_BUTTON_End ();
Frm_EndForm (); 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_ClassFormOutBox[The_NUM_THEMES];
extern const char *The_ClassFormOutBoxBold[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 *****/ /***** 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 *****/ /***** Number *****/
if (NumUsrs) if (NumUsrs)
@ -402,22 +401,14 @@ static void Fol_ShowNumberOfFollowingOrFollowers (const struct UsrData *UsrDat,
/* Form to list users */ /* Form to list users */
Frm_BeginFormAnchor (Action,Fol_FOLLOW_SECTION_ID); Frm_BeginFormAnchor (Action,Fol_FOLLOW_SECTION_ID);
Usr_PutParamUsrCodEncrypted (UsrDat->EnUsrCod); Usr_PutParamUsrCodEncrypted (UsrDat->EnUsrCod);
HTM_BUTTON_OnSubmit_Begin (Title, HTM_BUTTON_OnSubmit_Begin (Title,"BT_LINK",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" :
"FOLLOW_NUM");
HTM_Unsigned (NumUsrs); HTM_Unsigned (NumUsrs);
if (NumUsrs) if (NumUsrs)
{ {
HTM_BUTTON_End (); HTM_BUTTON_End ();
Frm_EndForm (); Frm_EndForm ();
} }
else
HTM_SPAN_End ();
/***** Text *****/ /***** Text *****/
HTM_DIV_Begin ("class=\"%s\"", HTM_DIV_Begin ("class=\"%s\"",
@ -428,10 +419,7 @@ static void Fol_ShowNumberOfFollowingOrFollowers (const struct UsrData *UsrDat,
/* Form to list users */ /* Form to list users */
Frm_BeginFormAnchor (Action,Fol_FOLLOW_SECTION_ID); Frm_BeginFormAnchor (Action,Fol_FOLLOW_SECTION_ID);
Usr_PutParamUsrCodEncrypted (UsrDat->EnUsrCod); Usr_PutParamUsrCodEncrypted (UsrDat->EnUsrCod);
HTM_BUTTON_OnSubmit_Begin (Title, HTM_BUTTON_OnSubmit_Begin (Title,"BT_LINK",NULL);
(Gbl.Action.Act == Action) ? The_ClassFormLinkOutBoxBold[Gbl.Prefs.Theme] :
The_ClassFormLinkOutBox [Gbl.Prefs.Theme],
NULL);
} }
HTM_Txt (Title); HTM_Txt (Title);
if (NumUsrs) if (NumUsrs)
@ -643,7 +631,7 @@ static void Fol_ShowFollowedOrFollower (struct UsrData *UsrDat)
HTM_DIV_Begin ("class=\"FOLLOW_USR_NAME %s LT\"", // Limited width HTM_DIV_Begin ("class=\"FOLLOW_USR_NAME %s LT\"", // Limited width
The_ClassDat[Gbl.Prefs.Theme]); The_ClassDat[Gbl.Prefs.Theme]);
HTM_BUTTON_OnSubmit_Begin (Txt_Another_user_s_profile, HTM_BUTTON_OnSubmit_Begin (Txt_Another_user_s_profile,
"BT_LINK",NULL); "BT_LINK LT",NULL);
Usr_WriteFirstNameBRSurnames (UsrDat); Usr_WriteFirstNameBRSurnames (UsrDat);
HTM_BUTTON_End (); HTM_BUTTON_End ();
HTM_DIV_End (); HTM_DIV_End ();
@ -703,9 +691,9 @@ static void Fol_WriteRowUsrToFollowOnRightColumn (struct UsrData *UsrDat)
/* Put form to go to public profile */ /* Put form to go to public profile */
Frm_BeginForm (ActSeeOthPubPrf); Frm_BeginForm (ActSeeOthPubPrf);
Usr_PutParamUsrCodEncrypted (UsrDat->EnUsrCod); 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, HTM_BUTTON_OnSubmit_Begin (Txt_Another_user_s_profile,
"BT_LINK CON_CRS",NULL); "BT_LINK LT",NULL);
Usr_WriteFirstNameBRSurnames (UsrDat); Usr_WriteFirstNameBRSurnames (UsrDat);
HTM_BUTTON_End (); HTM_BUTTON_End ();
HTM_DIV_End (); HTM_DIV_End ();

6
swad_forum.c
View File

@ -1730,7 +1730,7 @@ static void For_WriteLinkToForum (const struct For_Forums *Forums,
-1L); -1L);
HTM_BUTTON_OnSubmit_Begin (Act_GetActionText (For_ActionsSeeFor[Forum->Type]), HTM_BUTTON_OnSubmit_Begin (Act_GetActionText (For_ActionsSeeFor[Forum->Type]),
Class,NULL); Class,NULL);
For_SetForumName (Forum,ForumName,Gbl.Prefs.Language,true); For_SetForumName (Forum,ForumName,Gbl.Prefs.Language,true);
switch (Forum->Type) switch (Forum->Type)
@ -2051,7 +2051,7 @@ static void For_ShowForumThreadsHighlightingOneThread (struct For_Forums *Forums
Order <= Dat_END_TIME; Order <= Dat_END_TIME;
Order++) Order++)
{ {
HTM_TH_Begin (1,2,"CM"); HTM_TH_Begin (1,2,"TIT_TBL CM");
Frm_BeginFormAnchor (For_ActionsSeeFor[Forums->Forum.Type], Frm_BeginFormAnchor (For_ActionsSeeFor[Forums->Forum.Type],
For_FORUM_THREADS_SECTION_ID); For_FORUM_THREADS_SECTION_ID);
@ -2063,7 +2063,7 @@ static void For_ShowForumThreadsHighlightingOneThread (struct For_Forums *Forums
-1L, -1L,
-1L); -1L);
HTM_BUTTON_OnSubmit_Begin (Txt_FORUM_THREAD_HELP_ORDER[Order], HTM_BUTTON_OnSubmit_Begin (Txt_FORUM_THREAD_HELP_ORDER[Order],
"BT_LINK TIT_TBL",NULL); "BT_LINK",NULL);
if (Order == Forums->ThreadsOrder) if (Order == Forums->ThreadsOrder)
HTM_U_Begin (); HTM_U_Begin ();
HTM_Txt (Txt_FORUM_THREAD_ORDER[Order]); HTM_Txt (Txt_FORUM_THREAD_ORDER[Order]);

32
swad_game.c
View File

@ -276,7 +276,7 @@ static void Gam_ListAllGames (struct Gam_Games *Games)
Order <= (Gam_Order_t) (Gam_NUM_ORDERS - 1); Order <= (Gam_Order_t) (Gam_NUM_ORDERS - 1);
Order++) Order++)
{ {
HTM_TH_Begin (1,1,"LM"); HTM_TH_Begin (1,1,"TIT_TBL LM");
/* Form to change order */ /* Form to change order */
Frm_BeginForm (ActSeeAllGam); Frm_BeginForm (ActSeeAllGam);
@ -284,7 +284,7 @@ static void Gam_ListAllGames (struct Gam_Games *Games)
Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order); Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order);
HTM_BUTTON_OnSubmit_Begin (Txt_GAMES_ORDER_HELP[Order], HTM_BUTTON_OnSubmit_Begin (Txt_GAMES_ORDER_HELP[Order],
"BT_LINK TIT_TBL",NULL); "BT_LINK",NULL);
if (Order == Games->SelectedOrder) if (Order == Games->SelectedOrder)
HTM_U_Begin (); HTM_U_Begin ();
HTM_Txt (Txt_GAMES_ORDER[Order]); HTM_Txt (Txt_GAMES_ORDER[Order]);
@ -592,19 +592,21 @@ static void Gam_ShowOneGame (struct Gam_Games *Games,
/***** Game title and main data *****/ /***** Game title and main data *****/
if (ShowOnlyThisGame) if (ShowOnlyThisGame)
HTM_TD_Begin ("class=\"LT\""); HTM_TD_Begin ("class=\"%s LT\"",
Game->Hidden ? "ASG_TITLE_LIGHT":
"ASG_TITLE");
else 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 */ /* Game title */
Games->GamCod = Game->GamCod; Games->GamCod = Game->GamCod;
HTM_ARTICLE_Begin (Anchor); HTM_ARTICLE_Begin (Anchor);
Frm_BeginForm (ActSeeGam); Frm_BeginForm (ActSeeGam);
Gam_PutParams (Games); Gam_PutParams (Games);
HTM_BUTTON_OnSubmit_Begin (Txt_View_game, HTM_BUTTON_OnSubmit_Begin (Txt_View_game,"BT_LINK",NULL);
Game->Hidden ? "BT_LINK LT ASG_TITLE_LIGHT":
"BT_LINK LT ASG_TITLE",
NULL);
HTM_Txt (Game->Title); HTM_Txt (Game->Title);
HTM_BUTTON_End (); HTM_BUTTON_End ();
Frm_EndForm (); Frm_EndForm ();
@ -625,17 +627,19 @@ static void Gam_ShowOneGame (struct Gam_Games *Games,
/***** Number of matches in game *****/ /***** Number of matches in game *****/
if (ShowOnlyThisGame) if (ShowOnlyThisGame)
HTM_TD_Begin ("class=\"RT\""); HTM_TD_Begin ("class=\"%s RT\"",
Game->Hidden ? "ASG_TITLE_LIGHT":
"ASG_TITLE");
else 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; Games->GamCod = Game->GamCod;
Frm_BeginForm (ActSeeGam); Frm_BeginForm (ActSeeGam);
Gam_PutParams (Games); Gam_PutParams (Games);
HTM_BUTTON_OnSubmit_Begin (Txt_Matches, HTM_BUTTON_OnSubmit_Begin (Txt_Matches,"BT_LINK",NULL);
Game->Hidden ? "BT_LINK LT ASG_TITLE_LIGHT" :
"BT_LINK LT ASG_TITLE",
NULL);
if (ShowOnlyThisGame) if (ShowOnlyThisGame)
HTM_TxtColonNBSP (Txt_Matches); HTM_TxtColonNBSP (Txt_Matches);
HTM_Unsigned (Game->NumMchs); HTM_Unsigned (Game->NumMchs);

18
swad_hierarchy.c
View File

@ -685,39 +685,33 @@ void Hie_GetAndWriteInsCtrDegAdminBy (long UsrCod,unsigned ColSpan)
HTM_TxtF ("&nbsp;%s",Txt_all_degrees); HTM_TxtF ("&nbsp;%s",Txt_all_degrees);
break; break;
case HieLvl_INS: // Institution case HieLvl_INS: // Institution
Hie.Ins.InsCod = Str_ConvertStrCodToLongCod (row[1]); if ((Hie.Ins.InsCod = Str_ConvertStrCodToLongCod (row[1])) > 0)
if (Hie.Ins.InsCod > 0)
{ {
/* Get data of institution */ /* Get data of institution */
Ins_GetDataOfInstitByCod (&Hie.Ins); Ins_GetDataOfInstitByCod (&Hie.Ins);
/* Write institution logo and name */ /* Write institution logo and name */
Ins_DrawInstitutionLogoAndNameWithLink (&Hie.Ins,ActSeeInsInf, Ins_DrawInstitLogoAndNameWithLink (&Hie.Ins,ActSeeInsInf,"LT");
"BT_LINK DAT_SMALL_NOBR","LT");
} }
break; break;
case HieLvl_CTR: // Center case HieLvl_CTR: // Center
Hie.Ctr.CtrCod = Str_ConvertStrCodToLongCod (row[1]); if ((Hie.Ctr.CtrCod = Str_ConvertStrCodToLongCod (row[1])) > 0)
if (Hie.Ctr.CtrCod > 0)
{ {
/* Get data of center */ /* Get data of center */
Ctr_GetDataOfCenterByCod (&Hie.Ctr); Ctr_GetDataOfCenterByCod (&Hie.Ctr);
/* Write center logo and name */ /* Write center logo and name */
Ctr_DrawCenterLogoAndNameWithLink (&Hie.Ctr,ActSeeCtrInf, Ctr_DrawCenterLogoAndNameWithLink (&Hie.Ctr,ActSeeCtrInf,"LT");
"BT_LINK DAT_SMALL_NOBR","LT");
} }
break; break;
case HieLvl_DEG: // Degree case HieLvl_DEG: // Degree
Hie.Deg.DegCod = Str_ConvertStrCodToLongCod (row[1]); if ((Hie.Deg.DegCod = Str_ConvertStrCodToLongCod (row[1])) > 0)
if (Hie.Deg.DegCod > 0)
{ {
/* Get data of degree */ /* Get data of degree */
Deg_GetDataOfDegreeByCod (&Hie.Deg); Deg_GetDataOfDegreeByCod (&Hie.Deg);
/* Write degree logo and name */ /* Write degree logo and name */
Deg_DrawDegreeLogoAndNameWithLink (&Hie.Deg,ActSeeDegInf, Deg_DrawDegreeLogoAndNameWithLink (&Hie.Deg,ActSeeDegInf,"LT");
"BT_LINK DAT_SMALL_NOBR","LT");
} }
break; break;
default: // There are no administrators in other scopes default: // There are no administrators in other scopes

3
swad_hierarchy_config.c
View File

@ -268,8 +268,7 @@ void HieCfg_NumCtrs (unsigned NumCtrs,bool PutForm)
Ins_PutParamInsCod (Gbl.Hierarchy.Ins.InsCod); Ins_PutParamInsCod (Gbl.Hierarchy.Ins.InsCod);
HTM_BUTTON_OnSubmit_Begin (Str_BuildString (Txt_Centers_of_INSTITUTION_X, HTM_BUTTON_OnSubmit_Begin (Str_BuildString (Txt_Centers_of_INSTITUTION_X,
Gbl.Hierarchy.Ins.ShrtName), Gbl.Hierarchy.Ins.ShrtName),
"BT_LINK", "BT_LINK",NULL);
NULL);
Str_FreeStrings (); Str_FreeStrings ();
} }
HTM_Unsigned (NumCtrs); HTM_Unsigned (NumCtrs);

51
swad_icon.c
View File

@ -25,11 +25,14 @@
/********************************* Headers ***********************************/ /********************************* Headers ***********************************/
/*****************************************************************************/ /*****************************************************************************/
#define _GNU_SOURCE // For asprintf
#include <stdio.h> // For asprintf
#include <string.h> #include <string.h>
#include "swad_box.h" #include "swad_box.h"
#include "swad_config.h" #include "swad_config.h"
#include "swad_database.h" #include "swad_database.h"
#include "swad_error.h"
#include "swad_figure.h" #include "swad_figure.h"
#include "swad_form.h" #include "swad_form.h"
#include "swad_global.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) void Ico_PutDivIcon (const char *DivClass,const char *Icon,Ico_Color_t Color,const char *Title)
{ {
char *Class;
HTM_DIV_Begin ("class=\"%s\"",DivClass); HTM_DIV_Begin ("class=\"%s\"",DivClass);
Ico_PutIcon (Icon,Color,Title,
Str_BuildString ("CONTEXT_ICO_16x16 %s", if (asprintf (&Class,"CONTEXT_ICO_16x16 %s",
Ico_ClassColor[Color][Gbl.Prefs.Theme])); Ico_ClassColor[Color][Gbl.Prefs.Theme]) < 0)
Str_FreeStrings (); Err_NotEnoughMemoryExit ();
Ico_PutIcon (Icon,Color,Title,Class);
free (Class);
HTM_DIV_End (); 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) void Ico_PutIconLink (const char *Icon,Ico_Color_t Color,const char *Title)
{ {
HTM_INPUT_IMAGE (Cfg_URL_ICON_PUBLIC,Icon,Title, char *Class;
Str_BuildString ("CONTEXT_OPT ICO_HIGHLIGHT CONTEXT_ICO_16x16 %s",
Ico_ClassColor[Color][Gbl.Prefs.Theme])); if (asprintf (&Class,"CONTEXT_OPT ICO_HIGHLIGHT CONTEXT_ICO_16x16 %s",
Str_FreeStrings (); 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) void Ico_PutIconTextLink (const char *Icon,Ico_Color_t Color,const char *Text)
{ {
char *Class;
/***** Print icon and optional text *****/ /***** Print icon and optional text *****/
HTM_DIV_Begin ("class=\"CONTEXT_OPT ICO_HIGHLIGHT\""); HTM_DIV_Begin ("class=\"CONTEXT_OPT ICO_HIGHLIGHT\"");
Ico_PutIcon (Icon,Color,Text,
Str_BuildString ("CONTEXT_ICO_x16 %s", if (asprintf (&Class,"CONTEXT_ICO_x16 %s",
Ico_ClassColor[Color][Gbl.Prefs.Theme])); Ico_ClassColor[Color][Gbl.Prefs.Theme]) < 0)
Str_FreeStrings (); Err_NotEnoughMemoryExit ();
Ico_PutIcon (Icon,Color,Text,Class);
free (Class);
HTM_TxtF ("&nbsp;%s",Text); HTM_TxtF ("&nbsp;%s",Text);
HTM_DIV_End (); 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) void Ico_PutSettingIconLink (const char *Icon,Ico_Color_t Color,const char *Title)
{ {
HTM_INPUT_IMAGE (Cfg_URL_ICON_PUBLIC,Icon,Title, char *Class;
Str_BuildString ("ICO_HIGHLIGHT ICOx20 %s",
Ico_ClassColor[Color][Gbl.Prefs.Theme])); if (asprintf (&Class,"ICO_HIGHLIGHT ICOx20 %s",
Str_FreeStrings (); Ico_ClassColor[Color][Gbl.Prefs.Theme]) < 0)
HTM_INPUT_IMAGE (Cfg_URL_ICON_PUBLIC,Icon,Title,Class);
free (Class);
} }
/*****************************************************************************/ /*****************************************************************************/

2
swad_info.c
View File

@ -540,7 +540,7 @@ void Inf_WriteMsgYouMustReadInfo (void)
HTM_LI_Begin (NULL); HTM_LI_Begin (NULL);
Frm_BeginForm (Inf_ActionsSeeInfo[InfoType]); Frm_BeginForm (Inf_ActionsSeeInfo[InfoType]);
HTM_BUTTON_OnSubmit_Begin (Act_GetTitleAction (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_Txt (Act_GetTitleAction (Inf_ActionsSeeInfo[InfoType]));
HTM_BUTTON_End (); HTM_BUTTON_End ();
Frm_EndForm (); Frm_EndForm ();

15
swad_institution.c
View File

@ -166,9 +166,8 @@ void Ins_SeeInsWithPendingCtrs (void)
/* Institution logo and name */ /* Institution logo and name */
HTM_TR_Begin ("%s",The_ClassDat[Gbl.Prefs.Theme]); HTM_TR_Begin ("%s",The_ClassDat[Gbl.Prefs.Theme]);
HTM_TD_Begin ("class=\"LM %s\"",BgColor); HTM_TD_Begin ("class=\"NOWRAP LM %s\"",BgColor);
Ins_DrawInstitutionLogoAndNameWithLink (&Ins,ActSeeCtr, Ins_DrawInstitLogoAndNameWithLink (&Ins,ActSeeCtr,"CM");
"BT_LINK NOWRAP","CM");
HTM_TD_End (); HTM_TD_End ();
/* Number of pending centers (row[1]) */ /* 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 *****************/ /****************** Draw institution logo and name with link *****************/
/*****************************************************************************/ /*****************************************************************************/
void Ins_DrawInstitutionLogoAndNameWithLink (struct Ins_Instit *Ins,Act_Action_t Action, void Ins_DrawInstitLogoAndNameWithLink (struct Ins_Instit *Ins,Act_Action_t Action,
const char *ClassLink,const char *ClassLogo) const char *ClassLogo)
{ {
/***** Begin form *****/ /***** Begin form *****/
Frm_BeginFormGoTo (Action); Frm_BeginFormGoTo (Action);
Ins_PutParamInsCod (Ins->InsCod); Ins_PutParamInsCod (Ins->InsCod);
/***** Link to action *****/ /***** 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 (); Str_FreeStrings ();
/***** Institution logo and name *****/ /***** Institution logo and name *****/
@ -390,8 +390,7 @@ static void Ins_ListOneInstitutionForSeeing (struct Ins_Instit *Ins,unsigned Num
/***** Institution logo and name *****/ /***** Institution logo and name *****/
HTM_TD_Begin ("class=\"LM %s\"",BgColor); HTM_TD_Begin ("class=\"LM %s\"",BgColor);
Ins_DrawInstitutionLogoAndNameWithLink (Ins,ActSeeCtr, Ins_DrawInstitLogoAndNameWithLink (Ins,ActSeeCtr,"CM");
"BT_LINK","CM");
HTM_TD_End (); HTM_TD_End ();
/***** Number of users who claim to belong to this institution *****/ /***** Number of users who claim to belong to this institution *****/

4
swad_institution.h
View File

@ -75,8 +75,8 @@ struct ListInstits
void Ins_SeeInsWithPendingCtrs (void); void Ins_SeeInsWithPendingCtrs (void);
void Ins_DrawInstitutionLogoWithLink (struct Ins_Instit *Ins,unsigned Size); void Ins_DrawInstitutionLogoWithLink (struct Ins_Instit *Ins,unsigned Size);
void Ins_DrawInstitutionLogoAndNameWithLink (struct Ins_Instit *Ins,Act_Action_t Action, void Ins_DrawInstitLogoAndNameWithLink (struct Ins_Instit *Ins,Act_Action_t Action,
const char *ClassLink,const char *ClassLogo); const char *ClassLogo);
void Ins_ShowInssOfCurrentCty (void); void Ins_ShowInssOfCurrentCty (void);
void Ins_EditInstitutions (void); void Ins_EditInstitutions (void);

4
swad_institution_config.c
View File

@ -319,7 +319,7 @@ static void InsCfg_Country (bool PrintView,bool PutForm)
Txt_Country); Txt_Country);
/* Data */ /* 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) if (PutForm)
{ {
/* Put form to select country */ /* Put form to select country */
@ -344,7 +344,7 @@ static void InsCfg_Country (bool PrintView,bool PutForm)
Frm_BeginFormGoTo (ActSeeCtyInf); Frm_BeginFormGoTo (ActSeeCtyInf);
Cty_PutParamCtyCod (Gbl.Hierarchy.Cty.CtyCod); Cty_PutParamCtyCod (Gbl.Hierarchy.Cty.CtyCod);
HTM_BUTTON_OnSubmit_Begin (Str_BuildGoToMsg (Gbl.Hierarchy.Cty.Name[Gbl.Prefs.Language]), HTM_BUTTON_OnSubmit_Begin (Str_BuildGoToMsg (Gbl.Hierarchy.Cty.Name[Gbl.Prefs.Language]),
"BT_LINK LT",NULL); "BT_LINK",NULL);
Str_FreeStrings (); Str_FreeStrings ();
} }
Cty_DrawCountryMap (&Gbl.Hierarchy.Cty,"COUNTRY_MAP_TINY"); Cty_DrawCountryMap (&Gbl.Hierarchy.Cty,"COUNTRY_MAP_TINY");

8
swad_layout.c
View File

@ -1013,7 +1013,9 @@ static void Lay_WritePageTopHeading (void)
HTM_DIV_End (); // head_row_1_logo_big HTM_DIV_End (); // head_row_1_logo_big
HTM_DIV_Begin ("id=\"head_row_1_tagline\""); 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_Txt (Txt_TAGLINE_BR);
HTM_BUTTON_End (); HTM_BUTTON_End ();
HTM_DIV_End (); // head_row_1_tagline HTM_DIV_End (); // head_row_1_tagline
@ -1222,7 +1224,9 @@ void Lay_PutContextualLinkIconText (Act_Action_t NextAction,const char *Anchor,
FuncParams (Args); FuncParams (Args);
/***** Put icon and text with link *****/ /***** 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); Ico_PutIconTextLink (Icon,Color,Text);
HTM_BUTTON_End (); HTM_BUTTON_End ();

2
swad_match.c
View File

@ -3335,7 +3335,7 @@ static void Mch_PutBigButtonClose (void)
/***** Put icon with link *****/ /***** Put icon with link *****/
HTM_DIV_Begin ("class=\"MCH_BIGBUTTON_CONT\""); HTM_DIV_Begin ("class=\"MCH_BIGBUTTON_CONT\"");
HTM_BUTTON_OnClick_Begin (Txt_Close,"BT_LINK MCH_BUTTON_ON ICO_DARKRED", HTM_BUTTON_OnClick_Begin (Txt_Close,"BT_LINK MCH_BUTTON_ON ICO_DARKRED",
"window.close();"); "window.close();");
HTM_TxtF ("<i class=\"%s\"></i>",Mch_ICON_CLOSE); HTM_TxtF ("<i class=\"%s\"></i>",Mch_ICON_CLOSE);
HTM_BUTTON_End (); HTM_BUTTON_End ();
HTM_DIV_End (); HTM_DIV_End ();

9
swad_menu.c
View File

@ -255,16 +255,15 @@ void Mnu_WriteMenuThisTab (void)
Title = Act_GetSubtitleAction (NumAct); Title = Act_GetSubtitleAction (NumAct);
/***** Begin option *****/ /***** 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 *****/ /***** Begin form *****/
Frm_BeginForm (NumAct); Frm_BeginForm (NumAct);
/***** Begin link *****/ /***** Begin link *****/
HTM_BUTTON_OnSubmit_Begin (Title, HTM_BUTTON_OnSubmit_Begin (Title,"BT_LINK",NULL);
IsTheSelectedAction ? "BT_LINK MENU_OPT_ON" :
"BT_LINK MENU_OPT_OFF",
NULL);
/***** Icon and text *****/ /***** Icon and text *****/
HTM_DIV_Begin ("class=\"MENU_ICO_TXT\""); HTM_DIV_Begin ("class=\"MENU_ICO_TXT\"");

10
swad_message.c
View File

@ -2267,8 +2267,8 @@ static void Msg_WriteSentOrReceivedMsgSubject (struct Msg_Messages *Messages,
extern const char *Txt_no_subject; extern const char *Txt_no_subject;
/***** Begin cell *****/ /***** Begin cell *****/
HTM_TD_Begin ("class=\"%s LT\"",Open ? "MSG_TIT_BG" : HTM_TD_Begin ("class=\"%s LT\"",Open ? "MSG_TIT MSG_TIT_BG" :
"MSG_TIT_BG_NEW"); "MSG_TIT_NEW MSG_TIT_BG_NEW");
/***** Begin form to expand/contract the message *****/ /***** Begin form to expand/contract the message *****/
Frm_BeginForm (Messages->TypeOfMessages == Msg_RECEIVED ? (Expanded ? ActConRcvMsg : 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 : HTM_BUTTON_OnSubmit_Begin (Expanded ? Txt_Hide_message :
Txt_See_message, Txt_See_message,
Open ? "BT_LINK LT MSG_TIT" : "BT_LINK",NULL);
"BT_LINK LT MSG_TIT_NEW",
NULL);
/***** Write subject *****/ /***** Write subject *****/
if (Subject[0]) if (Subject[0])
@ -2407,7 +2405,7 @@ static bool Msg_WriteCrsOrgMsg (long CrsCod)
HTM_DIV_Begin ("class=\"AUTHOR_TXT\""); HTM_DIV_Begin ("class=\"AUTHOR_TXT\"");
HTM_Txt ("("); HTM_Txt ("(");
HTM_BUTTON_OnSubmit_Begin (Str_BuildGoToMsg (Crs.FullName), HTM_BUTTON_OnSubmit_Begin (Str_BuildGoToMsg (Crs.FullName),
"BT_LINK AUTHOR_TXT",NULL); "BT_LINK",NULL);
Str_FreeStrings (); Str_FreeStrings ();
HTM_Txt (Crs.ShrtName); HTM_Txt (Crs.ShrtName);
HTM_BUTTON_End (); HTM_BUTTON_End ();

4
swad_notice.c
View File

@ -624,14 +624,14 @@ static void Not_DrawANotice (Not_Listing_t TypeNoticesListing,
/* Write the date */ /* Write the date */
UniqueId++; UniqueId++;
HTM_DIV_Begin ("class=\"NOTICE_DATE %s\"", HTM_DIV_Begin ("class=\"NOTICE_DATE %s RT\"",
The_ClassNoticeDateColor[Gbl.Prefs.Theme]); The_ClassNoticeDateColor[Gbl.Prefs.Theme]);
if (TypeNoticesListing == Not_LIST_BRIEF_NOTICES) if (TypeNoticesListing == Not_LIST_BRIEF_NOTICES)
{ {
/* Form to view full notice */ /* Form to view full notice */
Frm_BeginFormAnchor (ActSeeOneNot,Anchor); Frm_BeginFormAnchor (ActSeeOneNot,Anchor);
Not_PutHiddenParamNotCod (NotCod); 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) if (asprintf (&Id,"not_date_%u",UniqueId) < 0)
Err_NotEnoughMemoryExit (); Err_NotEnoughMemoryExit ();

12
swad_notification.c
View File

@ -498,7 +498,8 @@ void Ntf_ShowMyNotifications (void)
if (PutLink) if (PutLink)
{ {
PutLink = Ntf_StartFormGoToAction (NotifyEvent,Hie.Crs.CrsCod,&UsrDat,Cod,&Forums); 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_Txt (Txt_NOTIFY_EVENTS_SINGULAR[NotifyEvent]);
HTM_BUTTON_End (); HTM_BUTTON_End ();
Frm_EndForm (); Frm_EndForm ();
@ -525,7 +526,8 @@ void Ntf_ShowMyNotifications (void)
PutLink = Ntf_StartFormGoToAction (NotifyEvent,Hie.Crs.CrsCod,&UsrDat,Cod,&Forums); PutLink = Ntf_StartFormGoToAction (NotifyEvent,Hie.Crs.CrsCod,&UsrDat,Cod,&Forums);
if (PutLink) 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 else
HTM_SPAN_Begin ("class=\"%s\"",ClassText); HTM_SPAN_Begin ("class=\"%s\"",ClassText);
HTM_TxtF ("%s:&nbsp;%s",Txt_Forum,ForumName); HTM_TxtF ("%s:&nbsp;%s",Txt_Forum,ForumName);
@ -543,7 +545,8 @@ void Ntf_ShowMyNotifications (void)
PutLink = Ntf_StartFormGoToAction (NotifyEvent,Hie.Crs.CrsCod,&UsrDat,Cod,&Forums); PutLink = Ntf_StartFormGoToAction (NotifyEvent,Hie.Crs.CrsCod,&UsrDat,Cod,&Forums);
if (PutLink) 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 else
HTM_SPAN_Begin ("class=\"%s\"",ClassText); HTM_SPAN_Begin ("class=\"%s\"",ClassText);
@ -1640,7 +1643,8 @@ void Ntf_WriteNumberOfNewNtfs (void)
Frm_BeginFormId (ActSeeNewNtf,"form_ntf"); Frm_BeginFormId (ActSeeNewNtf,"form_ntf");
/***** Begin link *****/ /***** 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 *****/ /***** Number of unseen notifications *****/
HTM_SPAN_Begin ("id=\"notif_all\""); HTM_SPAN_Begin ("id=\"notif_all\"");

3
swad_photo.c
View File

@ -2256,8 +2256,7 @@ static void Pho_ShowOrPrintListDegrees (struct Pho_DegPhotos *DegPhotos,
The_ClassDat[Gbl.Prefs.Theme], The_ClassDat[Gbl.Prefs.Theme],
Gbl.ColorRows[Gbl.RowEvenOdd]); Gbl.ColorRows[Gbl.RowEvenOdd]);
if (SeeOrPrint == Pho_DEGREES_SEE) if (SeeOrPrint == Pho_DEGREES_SEE)
Deg_DrawDegreeLogoAndNameWithLink (&Deg,ActSeeDegInf, Deg_DrawDegreeLogoAndNameWithLink (&Deg,ActSeeDegInf,"CT");
"BT_LINK","CT");
else // Pho_DEGREES_PRINT else // Pho_DEGREES_PRINT
{ {
Lgo_DrawLogo (HieLvl_DEG,Deg.DegCod,Deg.ShrtName,20,"CT",true); Lgo_DrawLogo (HieLvl_DEG,Deg.DegCod,Deg.ShrtName,20,"CT",true);

12
swad_profile.c
View File

@ -858,7 +858,8 @@ static void Prf_ShowRanking (unsigned Rank,unsigned NumUsrs)
if (asprintf (&Title,"#%u %s %u", if (asprintf (&Title,"#%u %s %u",
Rank,Txt_of_PART_OF_A_TOTAL,NumUsrs) < 0) Rank,Txt_of_PART_OF_A_TOTAL,NumUsrs) < 0)
Err_NotEnoughMemoryExit (); 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); free (Title);
HTM_TxtF ("#%u",Rank); HTM_TxtF ("#%u",Rank);
HTM_BUTTON_End (); HTM_BUTTON_End ();
@ -1328,15 +1329,16 @@ static void Prf_ShowUsrInRanking (struct UsrData *UsrDat,unsigned Rank,bool ItsM
HTM_TD_End (); HTM_TD_End ();
/***** Put form to go to public profile *****/ /***** 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) if (Visible)
{ {
Frm_BeginForm (ActSeeOthPubPrf); Frm_BeginForm (ActSeeOthPubPrf);
Usr_PutParamUsrCodEncrypted (UsrDat->EnUsrCod); Usr_PutParamUsrCodEncrypted (UsrDat->EnUsrCod);
HTM_BUTTON_OnSubmit_Begin (Txt_Another_user_s_profile, HTM_BUTTON_OnSubmit_Begin (Txt_Another_user_s_profile,
ItsMe ? "BT_LINK DAT_SMALL_N" : "BT_LINK",NULL);
"BT_LINK DAT_SMALL",
NULL); // Limited width
Usr_WriteFirstNameBRSurnames (UsrDat); Usr_WriteFirstNameBRSurnames (UsrDat);
HTM_BUTTON_End (); HTM_BUTTON_End ();
Frm_EndForm (); Frm_EndForm ();

3
swad_project.c
View File

@ -1380,7 +1380,8 @@ static void Prj_ShowOneProject (struct Prj_Projects *Projects,
{ {
Frm_BeginForm (ActAdmDocPrj); Frm_BeginForm (ActAdmDocPrj);
Prj_PutCurrentParams (Projects); 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_Txt (Prj->Title);
HTM_BUTTON_End (); HTM_BUTTON_End ();
Frm_EndForm (); Frm_EndForm ();

6
swad_record.c
View File

@ -1396,7 +1396,9 @@ static void Rec_ShowLinkToPrintPreviewOfRecords (void)
extern const char *Txt_record_cards_per_page; extern const char *Txt_record_cards_per_page;
unsigned i; 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); Ico_PutIconTextLink ("print.svg",Ico_BLACK,Txt_Print);
HTM_BUTTON_End (); HTM_BUTTON_End ();
@ -2689,7 +2691,7 @@ static void Rec_ShowCountryInHead (struct UsrData *UsrDat,bool ShowData)
The_ClassDatStrong[Gbl.Prefs.Theme]); The_ClassDatStrong[Gbl.Prefs.Theme]);
if (ShowData && UsrDat->CtyCod > 0) if (ShowData && UsrDat->CtyCod > 0)
/* Link to see country information */ /* 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 (); HTM_TD_End ();
} }

12
swad_statistic.c
View File

@ -2936,8 +2936,7 @@ static void Sta_WriteCountry (long CtyCod)
/***** Form to go to country *****/ /***** Form to go to country *****/
Cty_DrawCountryMapAndNameWithLink (&Cty,ActSeeCtyInf, Cty_DrawCountryMapAndNameWithLink (&Cty,ActSeeCtyInf,
"COUNTRY_TINY", "COUNTRY_TINY",
"COUNTRY_MAP_TINY", "COUNTRY_MAP_TINY");
"BT_LINK");
} }
else // Hit with no country selected else // Hit with no country selected
/***** 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); HTM_TD_Begin ("class=\"LOG LM\" title=\"%s\"",Ins.FullName);
/***** Form to go to institution *****/ /***** Form to go to institution *****/
Ins_DrawInstitutionLogoAndNameWithLink (&Ins,ActSeeInsInf, Ins_DrawInstitLogoAndNameWithLink (&Ins,ActSeeInsInf,"CT");
"BT_LINK","CT");
} }
else // Hit with no institution selected 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); HTM_TD_Begin ("class=\"LOG LM\" title=\"%s\"",Ctr.FullName);
/***** Form to go to center *****/ /***** Form to go to center *****/
Ctr_DrawCenterLogoAndNameWithLink (&Ctr,ActSeeCtrInf, Ctr_DrawCenterLogoAndNameWithLink (&Ctr,ActSeeCtrInf,"CT");
"BT_LINK","CT");
} }
else // Hit with no center selected 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); HTM_TD_Begin ("class=\"LOG LM\" title=\"%s\"",Deg.FullName);
/***** Form to go to degree *****/ /***** Form to go to degree *****/
Deg_DrawDegreeLogoAndNameWithLink (&Deg,ActSeeDegInf, Deg_DrawDegreeLogoAndNameWithLink (&Deg,ActSeeDegInf,"CT");
"BT_LINK","CT");
} }
else // Hit with no degree selected else // Hit with no degree selected
{ {

9
swad_survey.c
View File

@ -527,7 +527,9 @@ static void Svy_ShowOneSurvey (struct Svy_Surveys *Surveys,
/* Survey title */ /* Survey title */
if (ShowOnlyThisSvyComplete) if (ShowOnlyThisSvyComplete)
HTM_TD_Begin ("class=\"LT\""); HTM_TD_Begin ("class=\"%s LT\"",
Svy.Status.Visible ? "ASG_TITLE" :
"ASG_TITLE_LIGHT");
else else
HTM_TD_Begin ("class=\"LT %s\"",Gbl.ColorRows[Gbl.RowEvenOdd]); HTM_TD_Begin ("class=\"LT %s\"",Gbl.ColorRows[Gbl.RowEvenOdd]);
HTM_ARTICLE_Begin (Anchor); HTM_ARTICLE_Begin (Anchor);
@ -537,10 +539,7 @@ static void Svy_ShowOneSurvey (struct Svy_Surveys *Surveys,
WhichGroups = Grp_GetParamWhichGroups (); WhichGroups = Grp_GetParamWhichGroups ();
Grp_PutParamWhichGroups (&WhichGroups); Grp_PutParamWhichGroups (&WhichGroups);
Pag_PutHiddenParamPagNum (Pag_SURVEYS,Surveys->CurrentPage); Pag_PutHiddenParamPagNum (Pag_SURVEYS,Surveys->CurrentPage);
HTM_BUTTON_OnSubmit_Begin (Txt_View_survey, HTM_BUTTON_OnSubmit_Begin (Txt_View_survey,"BT_LINK",NULL);
Svy.Status.Visible ? "BT_LINK ASG_TITLE" :
"BT_LINK ASG_TITLE_LIGHT",
NULL);
HTM_Txt (Svy.Title); HTM_Txt (Svy.Title);
HTM_BUTTON_End (); HTM_BUTTON_End ();
Frm_EndForm (); Frm_EndForm ();

4
swad_timeline_form.c
View File

@ -344,7 +344,9 @@ void Tml_Frm_FormToShowHiddenComms (long NotCod,
free (OnSubmit); free (OnSubmit);
/* Put icon and text with link to show the first hidden comments */ /* 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, Ico_PutIconTextLink ("angle-up.svg",Ico_BLACK,
Str_BuildString (Txt_See_the_previous_X_COMMENTS, Str_BuildString (Txt_See_the_previous_X_COMMENTS,
NumInitialComms)); NumInitialComms));

6
swad_timeline_note.c
View File

@ -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\""); 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 *****/ /***** 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 *****/ /***** Show action made *****/
HTM_TxtF (" %s:",Txt_TIMELINE_NOTE_TOP_MESSAGES[TopMessage]); HTM_TxtF (" %s:",Txt_TIMELINE_NOTE_TOP_MESSAGES[TopMessage]);
@ -354,8 +354,8 @@ void Tml_Not_WriteAuthorName (const struct UsrData *UsrDat,
/* Author's name */ /* Author's name */
HTM_BUTTON_OnSubmit_Begin (Usr_ItsMe (UsrDat->UsrCod) ? Txt_My_public_profile : HTM_BUTTON_OnSubmit_Begin (Usr_ItsMe (UsrDat->UsrCod) ? Txt_My_public_profile :
Txt_Another_user_s_profile, Txt_Another_user_s_profile,
Class,NULL); Class,NULL);
HTM_Txt (UsrDat->FullName); HTM_Txt (UsrDat->FullName);
HTM_BUTTON_End (); HTM_BUTTON_End ();

6
swad_user.c
View File

@ -3647,9 +3647,9 @@ static void Set_FormToSelectUsrListType (void (*FuncParams) (void *Args),void *A
/***** Link and image *****/ /***** Link and image *****/
HTM_BUTTON_OnSubmit_Begin (Txt_USR_LIST_TYPES[ListType], HTM_BUTTON_OnSubmit_Begin (Txt_USR_LIST_TYPES[ListType],
The_ClassFormLinkInBoxNoWrap[Gbl.Prefs.Theme], The_ClassFormLinkInBoxNoWrap[Gbl.Prefs.Theme],
Gbl.Action.Act == ActReqMsgUsr ? "CopyMessageToHiddenFields();" : Gbl.Action.Act == ActReqMsgUsr ? "CopyMessageToHiddenFields();" :
NULL); NULL);
Ico_PutIcon (Usr_IconsClassPhotoOrList[ListType],Ico_BLACK, Ico_PutIcon (Usr_IconsClassPhotoOrList[ListType],Ico_BLACK,
Txt_USR_LIST_TYPES[ListType],"ICO20x20"); Txt_USR_LIST_TYPES[ListType],"ICO20x20");
HTM_TxtF ("&nbsp;%s",Txt_USR_LIST_TYPES[ListType]); HTM_TxtF ("&nbsp;%s",Txt_USR_LIST_TYPES[ListType]);