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.90: Apr 01, 2022 Working on design of dark theme.

This commit is contained in:
acanas 2022-04-01 01:06:44 +02:00
parent 9caedfa8c1
commit 8850c2f8e1
68 changed files with 392 additions and 494 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
swad_HTML.c
View File

@ -1470,22 +1470,7 @@ void HTM_INPUT_CHECKBOX (const char *Name,HTM_SubmitOnChange_t SubmitOnChange,
/********************************** Buttons **********************************/
/*****************************************************************************/
void HTM_BUTTON_OnMouseDown_Begin (const char *Title,const char *Class)
{
HTM_Txt ("<button type=\"submit\"");
if (Title)
if (Title[0])
HTM_TxtF (" title=\"%s\"",Title);
if (Class)
if (Class[0])
HTM_TxtF (" class=\"%s\"",Class);
HTM_TxtF (" onmousedown=\"document.getElementById('%s').submit();return false;\">",
Gbl.Form.Id);
HTM_BUTTON_NestingLevel++;
}
void HTM_BUTTON_OnSubmit_Begin (const char *Title,const char *OnSubmit,
const char *fmt,...)
void HTM_BUTTON_Submit_Begin (const char *Title,const char *fmt,...)
{
va_list ap;
int NumBytesPrinted;
@ -1512,27 +1497,43 @@ void HTM_BUTTON_OnSubmit_Begin (const char *Title,const char *OnSubmit,
free (Attr);
}
}
/*
if (OnSubmit) // JavaScript function to be called before submitting the form
if (OnSubmit[0])
HTM_TxtF (" onsubmit=\"%s;\"",OnSubmit);
HTM_TxtF (" onsubmit=\"%s;\"",OnSubmit); */
HTM_Txt (">");
HTM_BUTTON_NestingLevel++;
}
void HTM_BUTTON_OnClick_Begin (const char *Title,const char *Class,const char *OnClick)
void HTM_BUTTON_Begin (const char *Title,const char *fmt,...)
{
va_list ap;
int NumBytesPrinted;
char *Attr;
HTM_Txt ("<button type=\"button\"");
if (Title)
if (Title[0])
HTM_TxtF (" title=\"%s\"",Title);
if (Class)
if (Class[0])
HTM_TxtF (" class=\"%s\"",Class);
if (OnClick) // JavaScript function to be called when clicking the button
if (OnClick[0])
HTM_TxtF (" onclick=\"%s;\"",OnClick);
if (fmt)
{
if (fmt[0])
{
va_start (ap,fmt);
NumBytesPrinted = vasprintf (&Attr,fmt,ap);
va_end (ap);
if (NumBytesPrinted < 0) // -1 if no memory or any other error
Err_NotEnoughMemoryExit ();
/***** Print attributes *****/
HTM_SPTxt (Attr);
free (Attr);
}
}
HTM_Txt (">");
HTM_BUTTON_NestingLevel++;

6
swad_HTML.h
View File

@ -163,10 +163,8 @@ void HTM_INPUT_RADIO (const char *Name,bool SubmitOnClick,
void HTM_INPUT_CHECKBOX (const char *Name,HTM_SubmitOnChange_t SubmitOnChange,
const char *fmt,...);
void HTM_BUTTON_OnMouseDown_Begin (const char *Title,const char *Class);
void HTM_BUTTON_OnSubmit_Begin (const char *Title,const char *OnSubmit,
const char *fmt,...);
void HTM_BUTTON_OnClick_Begin (const char *Title,const char *Class,const char *OnClick);
void HTM_BUTTON_Submit_Begin (const char *Title,const char *fmt,...);
void HTM_BUTTON_Begin (const char *Title,const char *fmt,...);
void HTM_BUTTON_End (void);
void HTM_TEXTAREA_Begin (const char *fmt,...);

7
swad_ID.c
View File

@ -389,7 +389,7 @@ bool ID_ICanSeeOtherUsrIDs (const struct UsrData *UsrDat)
static void ID_PutLinkToConfirmID (struct UsrData *UsrDat,unsigned NumID,
const char *Anchor)
{
extern const char *The_ClassFormLinkOutBoxBold[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Confirm_ID;
static const Act_Action_t NextAction[Rol_NUM_ROLES] =
{
@ -426,8 +426,9 @@ static void ID_PutLinkToConfirmID (struct UsrData *UsrDat,unsigned NumID,
Par_PutHiddenParamString (NULL,"UsrID",UsrDat->IDs.List[NumID].ID);
/***** Put link *****/
HTM_BUTTON_OnSubmit_Begin (Txt_Confirm_ID,NULL,
"class=\"%s\"",The_ClassFormLinkOutBoxBold[Gbl.Prefs.Theme]);
HTM_BUTTON_Submit_Begin (Txt_Confirm_ID,
"class=\"BT_LINK FORM_OUT_%s BOLD\"",
The_Colors[Gbl.Prefs.Theme]);
Ico_PutIconTextLink ("check.svg",Ico_BLACK,Txt_Confirm_ID);
HTM_BUTTON_End ();

14
swad_MFU.c
View File

@ -181,7 +181,7 @@ void MFU_WriteBigMFUActions (struct MFU_ListMFUActions *ListMFUActions)
{
extern const char *Hlp_ANALYTICS_Frequent;
extern const char *Ico_ClassColor[Ico_NUM_COLORS][The_NUM_THEMES];
extern const char *The_ClassFormLinkInBoxNoWrap[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_My_frequent_actions;
extern const char *Txt_TABS_TXT[Tab_NUM_TABS];
unsigned NumAct;
@ -219,9 +219,9 @@ void MFU_WriteBigMFUActions (struct MFU_ListMFUActions *ListMFUActions)
/* Icon and text */
HTM_LI_Begin ("class=\"ICO_HIGHLIGHT\"");
Frm_BeginForm (Action);
HTM_BUTTON_OnSubmit_Begin (TabMenuStr,
NULL,
"class=\"%s\"",The_ClassFormLinkInBoxNoWrap[Gbl.Prefs.Theme]);
HTM_BUTTON_Submit_Begin (TabMenuStr,
"class=\"BT_LINK FORM_IN_%s NOWRAP\"",
The_Colors[Gbl.Prefs.Theme]);
HTM_IMG (Gbl.Prefs.URLIconSet,Act_GetIcon (Action),MenuStr,
"class=\"%s\"",
Ico_ClassColor[Ico_BLACK][Gbl.Prefs.Theme]);
@ -265,8 +265,7 @@ void MFU_WriteSmallMFUActions (struct MFU_ListMFUActions *ListMFUActions)
The_Colors[Gbl.Prefs.Theme]);
Frm_BeginForm (ActMFUAct);
HTM_BUTTON_OnSubmit_Begin (Txt_My_frequent_actions,NULL,
"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (Txt_My_frequent_actions,"class=\"BT_LINK\"");
HTM_TxtF ("%s",Txt_Frequent_ACTIONS);
HTM_BUTTON_End ();
Frm_EndForm ();
@ -291,8 +290,7 @@ void MFU_WriteSmallMFUActions (struct MFU_ListMFUActions *ListMFUActions)
/* Icon and text */
HTM_LI_Begin ("class=\"ICO_HIGHLIGHT\"");
Frm_BeginForm (Action);
HTM_BUTTON_OnSubmit_Begin (TabMenuStr,NULL,
"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (TabMenuStr,"class=\"BT_LINK\"");
HTM_IMG (Gbl.Prefs.URLIconSet,Act_GetIcon (Action),MenuStr,
"class=\"%s\"",
Ico_ClassColor[Ico_BLACK][Gbl.Prefs.Theme]);

4
swad_agenda.c
View File

@ -663,8 +663,8 @@ static void Agd_WriteHeaderListEvents (const struct Agd_Agenda *Agenda,
Agenda->CurrentPage,
-1L);
HTM_BUTTON_OnSubmit_Begin (Txt_START_END_TIME_HELP[Order],NULL,
"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (Txt_START_END_TIME_HELP[Order],
"class=\"BT_LINK\"");
if (Order == Agenda->SelectedOrder)
HTM_U_Begin ();

4
swad_assignment.c
View File

@ -241,8 +241,8 @@ static void Asg_PutHeadForSeeing (struct Asg_Assignments *Assignments,
Dat_PutHiddenParamOrder (Order);
/* Begin link to select order */
HTM_BUTTON_OnSubmit_Begin (Txt_START_END_TIME_HELP[Order],NULL,
"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (Txt_START_END_TIME_HELP[Order],
"class=\"BT_LINK\"");
if (Order == Assignments->SelectedOrder)
HTM_U_Begin ();
}

12
swad_attendance.c
View File

@ -269,8 +269,8 @@ static void Att_ShowAllAttEvents (struct Att_Events *Events)
Pag_PutHiddenParamPagNum (Pag_ATT_EVENTS,Events->CurrentPage);
Dat_PutHiddenParamOrder (Order);
HTM_BUTTON_OnSubmit_Begin (Txt_START_END_TIME_HELP[Order],NULL,
"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (Txt_START_END_TIME_HELP[Order],
"class=\"BT_LINK\"");
if (Order == Events->SelectedOrder)
HTM_U_Begin ();
@ -1864,7 +1864,7 @@ static void Att_PutLinkAttEvent (struct Att_Event *AttEvent,
Att_PutParamsCodGrps (AttEvent->AttCod);
/***** Link to view attendance event *****/
HTM_BUTTON_OnSubmit_Begin (Title,NULL,"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (Title,"class=\"BT_LINK\"");
HTM_Txt (Txt);
HTM_BUTTON_End ();
@ -2664,7 +2664,6 @@ static void Att_PutButtonToShowDetails (const struct Att_Events *Events)
static void Att_ListEventsToSelect (const struct Att_Events *Events,
Att_TypeOfView_t TypeOfView)
{
extern const char *The_ClassFormLinkInBoxBold[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Events;
extern const char *Txt_Event;
@ -2782,8 +2781,9 @@ static void Att_ListEventsToSelect (const struct Att_Events *Events,
if (NormalView)
{
HTM_DIV_Begin ("class=\"UPD\"");
HTM_BUTTON_OnSubmit_Begin (Txt_Update_attendance,NULL,
"class=\"%s\"",The_ClassFormLinkInBoxBold[Gbl.Prefs.Theme]);
HTM_BUTTON_Submit_Begin (Txt_Update_attendance,
"class=\"BT_LINK FORM_IN_%s BOLD\"",
The_Colors[Gbl.Prefs.Theme]);
Ico_PutIconTextLink ("recycle.svg",Ico_BLACK,Txt_Update_attendance);
HTM_BUTTON_End ();
HTM_DIV_End ();

38
swad_browser.c
View File

@ -3278,8 +3278,8 @@ static void Brw_ShowDataOwnerAsgWrk (struct UsrData *UsrDat)
/***** Show user's name *****/
HTM_BR ();
HTM_BUTTON_OnSubmit_Begin (Txt_View_record_for_this_course,NULL,
"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (Txt_View_record_for_this_course,
"class=\"BT_LINK\"");
HTM_Txt (UsrDat->Surname1);
if (UsrDat->Surname2[0])
HTM_TxtF ("&nbsp;%s",UsrDat->Surname2);
@ -5315,10 +5315,10 @@ static void Brw_WriteFileName (unsigned Level,bool IsPublic)
Brw_PutImplicitParamsFileBrowser (&Gbl.FileBrowser.FilFolLnk);
/* Link to the form and to the file */
HTM_BUTTON_OnSubmit_Begin ((Gbl.FileBrowser.Type == Brw_SHOW_MRK_CRS ||
Gbl.FileBrowser.Type == Brw_SHOW_MRK_GRP) ? Txt_Check_marks_in_the_file :
Txt_Download,
NULL,"class=\"BT_LINK FILENAME\"");
HTM_BUTTON_Submit_Begin ((Gbl.FileBrowser.Type == Brw_SHOW_MRK_CRS ||
Gbl.FileBrowser.Type == Brw_SHOW_MRK_GRP) ? Txt_Check_marks_in_the_file :
Txt_Download,
"class=\"BT_LINK FILENAME\"");
HTM_Txt (FileNameToShow);
HTM_BUTTON_End ();
@ -8545,8 +8545,8 @@ static void Brw_WriteBigLinkToDownloadFile (const char *URL,
Brw_PutImplicitParamsFileBrowser (&Gbl.FileBrowser.FilFolLnk);
/* Begin link */
HTM_BUTTON_OnSubmit_Begin (Txt_Check_marks_in_the_file,NULL,
"class=\"%s\"",ClassFilename[Gbl.Prefs.Theme]);
HTM_BUTTON_Submit_Begin (Txt_Check_marks_in_the_file,
"class=\"%s\"",ClassFilename[Gbl.Prefs.Theme]);
if (FileMetadata->FilFolLnk.Type == Brw_IS_FILE)
Brw_PutIconFile (FileMetadata->FilFolLnk.Name,
@ -8610,8 +8610,8 @@ static void Brw_WriteSmallLinkToDownloadFile (const char *URL,
Brw_PutImplicitParamsFileBrowser (&Gbl.FileBrowser.FilFolLnk);
/* Begin link */
HTM_BUTTON_OnSubmit_Begin (Txt_Check_marks_in_the_file,NULL,
"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (Txt_Check_marks_in_the_file,
"class=\"BT_LINK\"");
/* Name of the file of marks */
HTM_Txt (FileNameToShow);
@ -10004,8 +10004,8 @@ static void Brw_WriteRowDocData (unsigned *NumDocsNotHidden,MYSQL_ROW row)
{
Frm_BeginFormGoTo (ActSeeInsInf);
Deg_PutParamDegCod (InsCod);
HTM_BUTTON_OnSubmit_Begin (Str_BuildGoToTitle (InsShortName),NULL,
"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (Str_BuildGoToTitle (InsShortName),
"class=\"BT_LINK\"");
Str_FreeGoToTitle ();
Lgo_DrawLogo (HieLvl_INS,InsCod,InsShortName,20,"BT_LINK LT",true);
HTM_TxtF ("&nbsp;%s",InsShortName);
@ -10021,8 +10021,8 @@ static void Brw_WriteRowDocData (unsigned *NumDocsNotHidden,MYSQL_ROW row)
{
Frm_BeginFormGoTo (ActSeeCtrInf);
Deg_PutParamDegCod (CtrCod);
HTM_BUTTON_OnSubmit_Begin (Str_BuildGoToTitle (CtrShortName),NULL,
"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (Str_BuildGoToTitle (CtrShortName),
"class=\"BT_LINK\"");
Str_FreeGoToTitle ();
Lgo_DrawLogo (HieLvl_CTR,CtrCod,CtrShortName,20,"LT",true);
HTM_TxtF ("&nbsp;%s",CtrShortName);
@ -10038,8 +10038,8 @@ static void Brw_WriteRowDocData (unsigned *NumDocsNotHidden,MYSQL_ROW row)
{
Frm_BeginFormGoTo (ActSeeDegInf);
Deg_PutParamDegCod (DegCod);
HTM_BUTTON_OnSubmit_Begin (Str_BuildGoToTitle (DegShortName),NULL,
"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (Str_BuildGoToTitle (DegShortName),
"class=\"BT_LINK\"");
Str_FreeGoToTitle ();
Lgo_DrawLogo (HieLvl_DEG,DegCod,DegShortName,20,"LT",true);
HTM_TxtF ("&nbsp;%s",DegShortName);
@ -10055,8 +10055,8 @@ static void Brw_WriteRowDocData (unsigned *NumDocsNotHidden,MYSQL_ROW row)
{
Frm_BeginFormGoTo (ActSeeCrsInf);
Crs_PutParamCrsCod (CrsCod);
HTM_BUTTON_OnSubmit_Begin (Str_BuildGoToTitle (CrsShortName),NULL,
"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (Str_BuildGoToTitle (CrsShortName),
"class=\"BT_LINK\"");
Str_FreeGoToTitle ();
HTM_Txt (CrsShortName);
HTM_BUTTON_End ();
@ -10161,7 +10161,7 @@ static void Brw_WriteRowDocData (unsigned *NumDocsNotHidden,MYSQL_ROW row)
FileMetadata.FilCod);
/* File or folder icon */
HTM_BUTTON_OnSubmit_Begin (FileNameToShow,NULL,"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (FileNameToShow,"class=\"BT_LINK\"");
switch (FileMetadata.FilFolLnk.Type)
{
case Brw_IS_FILE:

4
swad_building.c
View File

@ -128,8 +128,8 @@ void Bld_SeeBuildings (void)
HTM_TH_Begin (HTM_HEAD_LEFT);
Frm_BeginForm (ActSeeBld);
Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order);
HTM_BUTTON_OnSubmit_Begin (Txt_BUILDINGS_HELP_ORDER[Order],NULL,
"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (Txt_BUILDINGS_HELP_ORDER[Order],
"class=\"BT_LINK\"");
if (Order == Buildings.SelectedOrder)
HTM_U_Begin ();
HTM_Txt (Txt_BUILDINGS_ORDER[Order]);

12
swad_button.c
View File

@ -68,7 +68,7 @@ void Btn_PutButtonInline (Btn_Button_t Button,const char *TxtButton)
void Btn_PutCreateButton (const char *TxtButton)
{
HTM_DIV_Begin ("class=\"CM\"");
HTM_BUTTON_OnSubmit_Begin (NULL,NULL,"class=\"BT_SUBMIT BT_CREATE\"");
HTM_BUTTON_Submit_Begin (NULL,"class=\"BT_SUBMIT BT_CREATE\"");
HTM_Txt (TxtButton);
HTM_BUTTON_End ();
HTM_DIV_End ();
@ -76,7 +76,7 @@ void Btn_PutCreateButton (const char *TxtButton)
void Btn_PutCreateButtonInline (const char *TxtButton)
{
HTM_BUTTON_OnSubmit_Begin (NULL,NULL,"class=\"BT_SUBMIT_INLINE BT_CREATE\"");
HTM_BUTTON_Submit_Begin (NULL,"class=\"BT_SUBMIT_INLINE BT_CREATE\"");
HTM_Txt (TxtButton);
HTM_BUTTON_End ();
}
@ -84,7 +84,7 @@ void Btn_PutCreateButtonInline (const char *TxtButton)
void Btn_PutConfirmButton (const char *TxtButton)
{
HTM_DIV_Begin ("class=\"CM\"");
HTM_BUTTON_OnSubmit_Begin (NULL,NULL,"class=\"BT_SUBMIT BT_CONFIRM\"");
HTM_BUTTON_Submit_Begin (NULL,"class=\"BT_SUBMIT BT_CONFIRM\"");
HTM_Txt (TxtButton);
HTM_BUTTON_End ();
HTM_DIV_End ();
@ -92,7 +92,7 @@ void Btn_PutConfirmButton (const char *TxtButton)
void Btn_PutConfirmButtonInline (const char *TxtButton)
{
HTM_BUTTON_OnSubmit_Begin (NULL,NULL,"class=\"BT_SUBMIT_INLINE BT_CONFIRM\"");
HTM_BUTTON_Submit_Begin (NULL,"class=\"BT_SUBMIT_INLINE BT_CONFIRM\"");
HTM_Txt (TxtButton);
HTM_BUTTON_End ();
}
@ -100,7 +100,7 @@ void Btn_PutConfirmButtonInline (const char *TxtButton)
void Btn_PutRemoveButton (const char *TxtButton)
{
HTM_DIV_Begin ("class=\"CM\"");
HTM_BUTTON_OnSubmit_Begin (NULL,NULL,"class=\"BT_SUBMIT BT_REMOVE\"");
HTM_BUTTON_Submit_Begin (NULL,"class=\"BT_SUBMIT BT_REMOVE\"");
HTM_Txt (TxtButton);
HTM_BUTTON_End ();
HTM_DIV_End ();
@ -108,7 +108,7 @@ void Btn_PutRemoveButton (const char *TxtButton)
void Btn_PutRemoveButtonInline (const char *TxtButton)
{
HTM_BUTTON_OnSubmit_Begin (NULL,NULL,"class=\"BT_SUBMIT_INLINE BT_REMOVE\"");
HTM_BUTTON_Submit_Begin (NULL,"class=\"BT_SUBMIT_INLINE BT_REMOVE\"");
HTM_Txt (TxtButton);
HTM_BUTTON_End ();
}

8
swad_center.c
View File

@ -190,8 +190,8 @@ void Ctr_DrawCenterLogoAndNameWithLink (struct Ctr_Center *Ctr,Act_Action_t Acti
Ctr_PutParamCtrCod (Ctr->CtrCod);
/***** Link to action *****/
HTM_BUTTON_OnSubmit_Begin (Str_BuildGoToTitle (Ctr->FullName),NULL,
"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (Str_BuildGoToTitle (Ctr->FullName),
"class=\"BT_LINK\"");
Str_FreeGoToTitle ();
/***** Center logo and name *****/
@ -1451,8 +1451,8 @@ static void Ctr_PutHeadCentersForSeeing (bool OrderSelectable)
{
Frm_BeginForm (ActSeeCtr);
Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order);
HTM_BUTTON_OnSubmit_Begin (Txt_CENTERS_HELP_ORDER[Order],NULL,
"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (Txt_CENTERS_HELP_ORDER[Order],
"class=\"BT_LINK\"");
if (Order == Gbl.Hierarchy.Ctrs.SelectedOrder)
HTM_U_Begin ();
}

6
swad_center_config.c
View File

@ -597,8 +597,8 @@ static void CtrCfg_Institution (bool PrintView,bool PutForm)
{
Frm_BeginFormGoTo (ActSeeInsInf);
Ins_PutParamInsCod (Gbl.Hierarchy.Ins.InsCod);
HTM_BUTTON_OnSubmit_Begin (Str_BuildGoToTitle (Gbl.Hierarchy.Ins.ShrtName),NULL,
"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (Str_BuildGoToTitle (Gbl.Hierarchy.Ins.ShrtName),
"class=\"BT_LINK\"");
Str_FreeGoToTitle ();
}
@ -776,7 +776,7 @@ static void CtrCfg_NumDegs (void)
Ctr_PutParamCtrCod (Gbl.Hierarchy.Ctr.CtrCod);
if (asprintf (&Title,Txt_Degrees_of_CENTER_X,Gbl.Hierarchy.Ctr.ShrtName) < 0)
Err_NotEnoughMemoryExit ();
HTM_BUTTON_OnSubmit_Begin (Title,NULL,"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (Title,"class=\"BT_LINK\"");
free (Title);
HTM_Unsigned (Deg_GetCachedNumDegsInCtr (Gbl.Hierarchy.Ctr.CtrCod));
HTM_BUTTON_End ();

4
swad_changelog.h
View File

@ -606,10 +606,12 @@ TODO: Fix bug: error al enviar un mensaje a dos recipientes, error on duplicate
TODO: Attach pdf files in multimedia.
*/
#define Log_PLATFORM_VERSION "SWAD 21.88 (2022-03-31)"
#define Log_PLATFORM_VERSION "SWAD 21.90 (2022-04-01)"
#define CSS_FILE "swad21.86.7.css"
#define JS_FILE "swad21.78.2.js"
/*
Version 21.90: Apr 01, 2022 Working on design of dark theme. (323707 lines)
Version 21.89: Mar 31, 2022 Working on design of dark theme. (323736 lines)
Version 21.88: Mar 31, 2022 Working on design of dark theme. (323802 lines)
Version 21.87.1: Mar 30, 2022 Working on design of dark theme. (323786 lines)
Version 21.87: Mar 30, 2022 Working on design of dark theme. (323833 lines)

6
swad_chat.c
View File

@ -316,9 +316,9 @@ static void Cht_WriteLinkToChat1 (const char *RoomCode,const char *RoomShrtName,
Cht_WriteParamsRoomCodeAndNames (RoomCode,RoomShrtName,RoomFullName);
/* Begin button */
HTM_BUTTON_OnSubmit_Begin (RoomFullName,NULL,
"class=\"BT_LINK FORM_IN_%s\"",
The_Colors[Gbl.Prefs.Theme]);
HTM_BUTTON_Submit_Begin (RoomFullName,
"class=\"BT_LINK FORM_IN_%s\"",
The_Colors[Gbl.Prefs.Theme]);
}
static void Cht_WriteLinkToChat2 (const char *RoomCode,const char *RoomFullName)

14
swad_connected.c
View File

@ -181,8 +181,7 @@ void Con_ShowGlobalConnectedUsrs (void)
Frm_BeginFormUnique (ActLstCon); // Must be unique because
// the list of connected users
// is dynamically updated via AJAX
HTM_BUTTON_OnSubmit_Begin (Txt_Connected_users,NULL,
"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (Txt_Connected_users,"class=\"BT_LINK\"");
/* Write total number of sessions */
HTM_TxtF ("%u&nbsp;%s",Gbl.Session.NumSessions,
@ -336,8 +335,7 @@ void Con_ShowConnectedUsrsBelongingToCurrentCrs (void)
Frm_BeginFormUnique (ActLstCon); // Must be unique because
// the list of connected users
// is dynamically updated via AJAX
HTM_BUTTON_OnSubmit_Begin (Txt_Connected_users,NULL,
"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (Txt_Connected_users,"class=\"BT_LINK\"");
Str_Copy (CourseName,Gbl.Hierarchy.Crs.ShrtName,sizeof (CourseName) - 1);
Con_GetNumConnectedWithARoleBelongingToCurrentScope (Rol_UNK,&Usrs);
HTM_TxtF ("%u %s %s",Usrs.NumUsrs,Txt_from,CourseName);
@ -620,8 +618,8 @@ static void Con_WriteRowConnectedUsrOnRightColumn (Rol_Role_t Role)
Usr_PutParamUsrCodEncrypted (UsrDat->EnUsrCod);
HTM_DIV_Begin ("class=\"CON_NAME_NARROW\""); // Limited width
HTM_BUTTON_OnSubmit_Begin (Txt_View_record_for_this_course,NULL,
"class=\"BT_LINK LT\"");
HTM_BUTTON_Submit_Begin (Txt_View_record_for_this_course,
"class=\"BT_LINK LT\"");
Usr_WriteFirstNameBRSurnames (UsrDat);
HTM_BUTTON_End ();
HTM_DIV_End ();
@ -730,8 +728,8 @@ static void Con_ShowConnectedUsrsCurrentLocationOneByOneOnMainZone (Rol_Role_t R
}
if (PutLinkToRecord)
HTM_BUTTON_OnSubmit_Begin (UsrDat.FullName,NULL,
"class=\"BT_LINK LT\"");
HTM_BUTTON_Submit_Begin (UsrDat.FullName,
"class=\"BT_LINK LT\"");
Usr_WriteFirstNameBRSurnames (&UsrDat);
if (PutLinkToRecord)
HTM_BUTTON_End ();

12
swad_country.c
View File

@ -369,8 +369,8 @@ static void Cty_PutHeadCountriesForSeeing (bool OrderSelectable)
{
Frm_BeginForm (ActSeeCty);
Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order);
HTM_BUTTON_OnSubmit_Begin (Txt_COUNTRIES_HELP_ORDER[Order],NULL,
"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (Txt_COUNTRIES_HELP_ORDER[Order],
"class=\"BT_LINK\"");
if (Order == Gbl.Hierarchy.Ctys.SelectedOrder)
HTM_U_Begin ();
}
@ -520,8 +520,8 @@ void Cty_DrawCountryMapAndNameWithLink (struct Cty_Countr *Cty,Act_Action_t Acti
HTM_DIV_Begin ("class=\"%s\"",ClassContainer);
/***** Link to action *****/
HTM_BUTTON_OnSubmit_Begin (Str_BuildGoToTitle (Cty->Name[Gbl.Prefs.Language]),NULL,
"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (Str_BuildGoToTitle (Cty->Name[Gbl.Prefs.Language]),
"class=\"BT_LINK\"");
Str_FreeGoToTitle ();
/***** Draw country map *****/
@ -925,8 +925,8 @@ void Cty_WriteCountryName (long CtyCod)
/***** Write country name with link to country information *****/
Frm_BeginForm (ActSeeCtyInf);
Cty_PutParamCtyCod (CtyCod);
HTM_BUTTON_OnSubmit_Begin (Act_GetActionText (ActSeeCtyInf),NULL,
"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (Act_GetActionText (ActSeeCtyInf),
"class=\"BT_LINK\"");
HTM_Txt (CtyName);
HTM_BUTTON_End ();
Frm_EndForm ();

6
swad_country_config.c
View File

@ -375,8 +375,8 @@ static void CtyCfg_Platform (bool PrintView)
if (!PrintView)
{
Frm_BeginFormGoTo (ActSeeSysInf);
HTM_BUTTON_OnSubmit_Begin (Str_BuildGoToTitle (Cfg_PLATFORM_SHORT_NAME),NULL,
"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (Str_BuildGoToTitle (Cfg_PLATFORM_SHORT_NAME),
"class=\"BT_LINK\"");
Str_FreeGoToTitle ();
}
Ico_PutIcon ("swad64x64.png",Ico_UNCHANGED,Cfg_PLATFORM_FULL_NAME,"ICO20x20");
@ -486,7 +486,7 @@ static void CtyCfg_NumInss (void)
if (asprintf (&Title,Txt_Institutions_of_COUNTRY_X,
Gbl.Hierarchy.Cty.Name[Gbl.Prefs.Language]) < 0)
Err_NotEnoughMemoryExit ();
HTM_BUTTON_OnSubmit_Begin (Title,NULL,"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (Title,"class=\"BT_LINK\"");
free (Title);
HTM_Unsigned (Ins_GetCachedNumInssInCty (Gbl.Hierarchy.Cty.CtyCod));
HTM_BUTTON_End ();

46
swad_course.c
View File

@ -147,8 +147,7 @@ void Crs_ShowIntroduction (void)
static void Crs_WriteListMyCoursesToSelectOne (void)
{
extern const char *Hlp_PROFILE_Courses;
extern const char *The_ClassFormLinkInBox[The_NUM_THEMES];
extern const char *The_ClassFormLinkInBoxBold[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_My_courses;
extern const char *Txt_System;
struct Hie_Hierarchy Hie;
@ -170,12 +169,13 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
unsigned NumDegs;
unsigned NumCrs;
unsigned NumCrss;
const char *ClassNormal;
char ClassNormal[64];
char ClassHighlight[64];
ClassNormal = The_ClassFormLinkInBox[Gbl.Prefs.Theme];
snprintf (ClassHighlight,sizeof (ClassHighlight),"%s BG_HIGHLIGHT",
The_ClassFormLinkInBoxBold[Gbl.Prefs.Theme]);
snprintf (ClassNormal,sizeof (ClassNormal),"BT_LINK FORM_IN_%s",
The_Colors[Gbl.Prefs.Theme]);
snprintf (ClassHighlight,sizeof (ClassHighlight),"BT_LINK FORM_IN_%s BOLD BG_HIGHLIGHT",
The_Colors[Gbl.Prefs.Theme]);
/***** Begin box *****/
Box_BoxBegin (NULL,Txt_My_courses,
@ -191,7 +191,7 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
ClassNormal);
Frm_BeginForm (ActMyCrs);
Cty_PutParamCtyCod (-1L);
HTM_BUTTON_OnSubmit_Begin (Txt_System,NULL,"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (Txt_System,"class=\"BT_LINK\"");
Ico_PutIcon ("sitemap.svg",Ico_BLACK,Txt_System,"ICO16x16");
HTM_TxtF ("&nbsp;%s",Txt_System);
HTM_BUTTON_End ();
@ -221,8 +221,8 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
Lay_IndentDependingOnLevel (1,IsLastItemInLevel);
Frm_BeginForm (ActMyCrs);
Cty_PutParamCtyCod (Hie.Cty.CtyCod);
HTM_BUTTON_OnSubmit_Begin (Act_GetActionText (ActSeeCtyInf),NULL,
"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (Act_GetActionText (ActSeeCtyInf),
"class=\"BT_LINK\"");
Cty_DrawCountryMap (&Hie.Cty,"ICO16x16");
HTM_TxtF ("&nbsp;%s",Hie.Cty.Name[Gbl.Prefs.Language]);
HTM_BUTTON_End ();
@ -254,8 +254,8 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
Lay_IndentDependingOnLevel (2,IsLastItemInLevel);
Frm_BeginForm (ActMyCrs);
Ins_PutParamInsCod (Hie.Ins.InsCod);
HTM_BUTTON_OnSubmit_Begin (Act_GetActionText (ActSeeInsInf),NULL,
"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (Act_GetActionText (ActSeeInsInf),
"class=\"BT_LINK\"");
Lgo_DrawLogo (HieLvl_INS,Hie.Ins.InsCod,Hie.Ins.ShrtName,16,NULL,true);
HTM_TxtF ("&nbsp;%s",Hie.Ins.ShrtName);
HTM_BUTTON_End ();
@ -287,8 +287,8 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
Lay_IndentDependingOnLevel (3,IsLastItemInLevel);
Frm_BeginForm (ActMyCrs);
Ctr_PutParamCtrCod (Hie.Ctr.CtrCod);
HTM_BUTTON_OnSubmit_Begin (Act_GetActionText (ActSeeCtrInf),NULL,
"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (Act_GetActionText (ActSeeCtrInf),
"class=\"BT_LINK\"");
Lgo_DrawLogo (HieLvl_CTR,Hie.Ctr.CtrCod,Hie.Ctr.ShrtName,16,NULL,true);
HTM_TxtF ("&nbsp;%s",Hie.Ctr.ShrtName);
HTM_BUTTON_End ();
@ -320,8 +320,8 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
Lay_IndentDependingOnLevel (4,IsLastItemInLevel);
Frm_BeginForm (ActMyCrs);
Deg_PutParamDegCod (Hie.Deg.DegCod);
HTM_BUTTON_OnSubmit_Begin (Act_GetActionText (ActSeeDegInf),NULL,
"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (Act_GetActionText (ActSeeDegInf),
"class=\"BT_LINK\"");
Lgo_DrawLogo (HieLvl_DEG,Hie.Deg.DegCod,Hie.Deg.ShrtName,16,NULL,true);
HTM_TxtF ("&nbsp;%s",Hie.Deg.ShrtName);
HTM_BUTTON_End ();
@ -353,8 +353,8 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
Lay_IndentDependingOnLevel (5,IsLastItemInLevel);
Frm_BeginForm (ActMyCrs);
Crs_PutParamCrsCod (Hie.Crs.CrsCod);
HTM_BUTTON_OnSubmit_Begin (Str_BuildGoToTitle (Hie.Crs.ShrtName),NULL,
"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (Str_BuildGoToTitle (Hie.Crs.ShrtName),
"class=\"BT_LINK\"");
Str_FreeGoToTitle ();
Ico_PutIcon ("chalkboard-teacher.svg",Ico_BLACK,Hie.Crs.FullName,"ICO16x16");
HTM_TxtF ("&nbsp;%s",Hie.Crs.ShrtName);
@ -994,8 +994,8 @@ static bool Crs_ListCoursesOfAYearForSeeing (unsigned Year)
TxtClassStrong,The_Colors[Gbl.Prefs.Theme],BgColor);
Frm_BeginFormGoTo (ActSeeCrsInf);
Crs_PutParamCrsCod (Crs->CrsCod);
HTM_BUTTON_OnSubmit_Begin (Str_BuildGoToTitle (Crs->FullName),NULL,
"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (Str_BuildGoToTitle (Crs->FullName),
"class=\"BT_LINK\"");
Str_FreeGoToTitle ();
HTM_Txt (Crs->FullName);
HTM_BUTTON_End ();
@ -2470,8 +2470,8 @@ static void Crs_WriteRowCrsData (unsigned NumCrs,MYSQL_ROW row,bool WriteColumnA
ClassTxt,The_Colors[Gbl.Prefs.Theme],BgColor);
Frm_BeginFormGoTo (ActSeeDegInf);
Deg_PutParamDegCod (Deg.DegCod);
HTM_BUTTON_OnSubmit_Begin (Str_BuildGoToTitle (row[2]),NULL,
"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (Str_BuildGoToTitle (row[2]),
"class=\"BT_LINK\"");
Str_FreeGoToTitle ();
Lgo_DrawLogo (HieLvl_DEG,Deg.DegCod,Deg.ShrtName,20,"CT",true);
HTM_TxtF ("&nbsp;%s&nbsp;(%s)",row[2],row[6]);
@ -2490,8 +2490,8 @@ static void Crs_WriteRowCrsData (unsigned NumCrs,MYSQL_ROW row,bool WriteColumnA
ClassTxt,The_Colors[Gbl.Prefs.Theme],BgColor);
Frm_BeginFormGoTo (ActSeeCrsInf);
Crs_PutParamCrsCod (CrsCod);
HTM_BUTTON_OnSubmit_Begin (Str_BuildGoToTitle (row[5]),NULL,
"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (Str_BuildGoToTitle (row[5]),
"class=\"BT_LINK\"");
Str_FreeGoToTitle ();
HTM_Txt (row[5]);
HTM_BUTTON_End ();

6
swad_course_config.c
View File

@ -250,8 +250,8 @@ static void CrsCfg_Degree (bool PrintView,bool PutForm)
{
Frm_BeginFormGoTo (ActSeeDegInf);
Deg_PutParamDegCod (Gbl.Hierarchy.Deg.DegCod);
HTM_BUTTON_OnSubmit_Begin (Str_BuildGoToTitle (Gbl.Hierarchy.Deg.ShrtName),NULL,
"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (Str_BuildGoToTitle (Gbl.Hierarchy.Deg.ShrtName),
"class=\"BT_LINK\"");
Str_FreeGoToTitle ();
}
Lgo_DrawLogo (HieLvl_DEG,Gbl.Hierarchy.Deg.DegCod,Gbl.Hierarchy.Deg.ShrtName,
@ -445,7 +445,7 @@ static void CrsCfg_Indicators (void)
IndicatorsCrs.NumIndicators,
Txt_of_PART_OF_A_TOTAL,Ind_NUM_INDICATORS) < 0)
Err_NotEnoughMemoryExit ();
HTM_BUTTON_OnSubmit_Begin (Title,NULL,"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (Title,"class=\"BT_LINK\"");
HTM_TxtF ("%s&nbsp;",Title);
if (IndicatorsCrs.NumIndicators == Ind_NUM_INDICATORS)
Ico_PutIcon ("check-circle.svg",Ico_GREEN,

8
swad_date.c
View File

@ -339,8 +339,8 @@ void Dat_ShowClientLocalTime (void)
/* Month with link to calendar */
HTM_DIV_Begin ("id=\"current_month\"");
Frm_BeginForm (ActSeeCal);
HTM_BUTTON_OnSubmit_Begin (Txt_Show_calendar,NULL,
"class=\"BT_LINK CURRENT_MONTH\"");
HTM_BUTTON_Submit_Begin (Txt_Show_calendar,
"class=\"BT_LINK CURRENT_MONTH\"");
HTM_SPAN_Begin ("id=\"current_month_txt\"");
// JavaScript will write HTML here
HTM_SPAN_End ();
@ -353,8 +353,8 @@ void Dat_ShowClientLocalTime (void)
if (Gbl.Usrs.Me.Logged)
{
Frm_BeginForm (ActSeeMyAgd);
HTM_BUTTON_OnSubmit_Begin (Txt_Show_agenda,NULL,
"class=\"BT_LINK CURRENT_DAY\"");
HTM_BUTTON_Submit_Begin (Txt_Show_agenda,
"class=\"BT_LINK CURRENT_DAY\"");
}
HTM_SPAN_Begin ("id=\"current_day_txt\"");
// JavaScript will write HTML here

4
swad_degree.c
View File

@ -194,8 +194,8 @@ void Deg_DrawDegreeLogoAndNameWithLink (struct Deg_Degree *Deg,Act_Action_t Acti
Deg_PutParamDegCod (Deg->DegCod);
/***** Link to action *****/
HTM_BUTTON_OnSubmit_Begin (Str_BuildGoToTitle (Deg->FullName),NULL,
"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (Str_BuildGoToTitle (Deg->FullName),
"class=\"BT_LINK\"");
Str_FreeGoToTitle ();
/***** Degree logo and name *****/

6
swad_degree_config.c
View File

@ -244,8 +244,8 @@ static void DegCfg_Center (bool PrintView,bool PutForm)
{
Frm_BeginFormGoTo (ActSeeCtrInf);
Ctr_PutParamCtrCod (Gbl.Hierarchy.Ctr.CtrCod);
HTM_BUTTON_OnSubmit_Begin (Str_BuildGoToTitle (Gbl.Hierarchy.Ctr.ShrtName),NULL,
"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (Str_BuildGoToTitle (Gbl.Hierarchy.Ctr.ShrtName),
"class=\"BT_LINK\"");
Str_FreeGoToTitle ();
}
Lgo_DrawLogo (HieLvl_CTR,Gbl.Hierarchy.Ctr.CtrCod,Gbl.Hierarchy.Ctr.ShrtName,
@ -335,7 +335,7 @@ static void DegCfg_NumCrss (void)
Deg_PutParamDegCod (Gbl.Hierarchy.Deg.DegCod);
if (asprintf (&Title,Txt_Courses_of_DEGREE_X,Gbl.Hierarchy.Deg.ShrtName) < 0)
Err_NotEnoughMemoryExit ();
HTM_BUTTON_OnSubmit_Begin (Title,NULL,"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (Title,"class=\"BT_LINK\"");
free (Title);
HTM_Unsigned (Crs_GetCachedNumCrssInDeg (Gbl.Hierarchy.Deg.DegCod));
HTM_BUTTON_End ();

4
swad_degree_type.c
View File

@ -550,8 +550,8 @@ static void DegTyp_PutHeadDegreeTypesForSeeing (Act_Action_t NextAction,
Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order);
/* Link with the head of this column */
HTM_BUTTON_OnSubmit_Begin (Txt_DEGREE_TYPES_HELP_ORDER[Order],NULL,
"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (Txt_DEGREE_TYPES_HELP_ORDER[Order],
"class=\"BT_LINK\"");
if (Order == SelectedOrder)
HTM_U_Begin ();
HTM_Txt (Txt_DEGREE_TYPES_ORDER[Order]);

4
swad_department.c
View File

@ -150,8 +150,8 @@ void Dpt_SeeDepts (void)
Frm_BeginForm (ActSeeDpt);
Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order);
HTM_BUTTON_OnSubmit_Begin (Txt_DEPARTMENTS_HELP_ORDER[Order],NULL,
"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (Txt_DEPARTMENTS_HELP_ORDER[Order],
"class=\"BT_LINK\"");
if (Order == Departments.SelectedOrder)
HTM_U_Begin ();
HTM_Txt (Txt_DEPARTMENTS_ORDER[Order]);

4
swad_enrolment.c
View File

@ -2232,8 +2232,8 @@ static void Enr_ShowEnrolmentRequestsGivenRoles (unsigned RolesSelected)
Frm_BeginFormGoTo (ActSeeCrsInf);
Crs_PutParamCrsCod (Crs.CrsCod);
HTM_BUTTON_OnSubmit_Begin (Str_BuildGoToTitle (Crs.FullName),NULL,
"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (Str_BuildGoToTitle (Crs.FullName),
"class=\"BT_LINK\"");
Str_FreeGoToTitle ();
HTM_TxtF ("%s &gt; %s",Deg.ShrtName,Crs.ShrtName);
HTM_BUTTON_End ();

8
swad_exam.c
View File

@ -260,8 +260,8 @@ static void Exa_ListAllExams (struct Exa_Exams *Exams)
Frm_BeginForm (ActSeeAllExa);
Pag_PutHiddenParamPagNum (Pag_EXAMS,Exams->CurrentPage);
Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order);
HTM_BUTTON_OnSubmit_Begin (Txt_EXAMS_ORDER_HELP[Order],NULL,
"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (Txt_EXAMS_ORDER_HELP[Order],
"class=\"BT_LINK\"");
if (Order == Exams->SelectedOrder)
HTM_U_Begin ();
HTM_Txt (Txt_EXAMS_ORDER[Order]);
@ -554,7 +554,7 @@ static void Exa_ShowOneExam (struct Exa_Exams *Exams,
HTM_ARTICLE_Begin (Anchor);
Frm_BeginForm (ActSeeExa);
Exa_PutParams (Exams);
HTM_BUTTON_OnSubmit_Begin (Txt_View_exam,NULL,"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (Txt_View_exam,"class=\"BT_LINK\"");
HTM_Txt (Exam->Title);
HTM_BUTTON_End ();
Frm_EndForm ();
@ -587,7 +587,7 @@ static void Exa_ShowOneExam (struct Exa_Exams *Exams,
Exams->ExaCod = Exam->ExaCod;
Frm_BeginForm (ActSeeExa);
Exa_PutParams (Exams);
HTM_BUTTON_OnSubmit_Begin (Txt_Sessions,NULL,"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (Txt_Sessions,"class=\"BT_LINK\"");
if (ShowOnlyThisExam)
HTM_TxtColonNBSP (Txt_Sessions);
HTM_Unsigned (Exam->NumSess);

6
swad_exam_result.c
View File

@ -579,7 +579,6 @@ static void ExaRes_ShowResultsEnd (void)
static void ExaRes_ListExamsToSelect (struct Exa_Exams *Exams)
{
extern const char *The_ClassFormLinkInBoxBold[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Exams;
extern const char *Txt_Exam;
@ -656,8 +655,9 @@ static void ExaRes_ListExamsToSelect (struct Exa_Exams *Exams)
/***** Put link to refresh *****/
HTM_DIV_Begin ("class=\"UPD\"");
HTM_BUTTON_OnSubmit_Begin (Txt_Update_results,NULL,
"class=\"%s\"",The_ClassFormLinkInBoxBold[Gbl.Prefs.Theme]);
HTM_BUTTON_Submit_Begin (Txt_Update_results,
"class=\"BT_LINK FORM_IN_%s BOLD\"",
The_Colors[Gbl.Prefs.Theme]);
Ico_PutIconTextLink ("recycle.svg",Ico_BLACK,Txt_Update_results);
HTM_BUTTON_End ();
HTM_DIV_End ();

7
swad_exam_session.c
View File

@ -526,10 +526,9 @@ static void ExaSes_ListOneOrMoreSessionsTitleGrps (struct Exa_Exams *Exams,
Frm_BeginForm (ActSeeExaPrn);
Exa_PutParams (Exams);
ExaSes_PutParamSesCod (Session->SesCod);
HTM_BUTTON_OnSubmit_Begin (Gbl.Usrs.Me.Role.Logged == Rol_STD ? Txt_Play :
Txt_Resume,
NULL,
"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (Gbl.Usrs.Me.Role.Logged == Rol_STD ? Txt_Play :
Txt_Resume,
"class=\"BT_LINK\"");
HTM_Txt (Session->Title);
HTM_BUTTON_End ();
Frm_EndForm ();

24
swad_follow.c
View File

@ -204,7 +204,7 @@ void Fol_SuggestUsrsToFollowMainZoneOnRightColumn (void)
/***** Title with link to suggest more users to follow *****/
Frm_BeginForm (ActSeeSocPrf);
HTM_BUTTON_OnSubmit_Begin (Txt_Who_to_follow,NULL,"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (Txt_Who_to_follow,"class=\"BT_LINK\"");
HTM_Txt (Txt_Who_to_follow);
HTM_BUTTON_End ();
Frm_EndForm ();
@ -391,8 +391,7 @@ static void Fol_ShowNumberOfFollowingOrFollowers (const struct UsrData *UsrDat,
Act_Action_t Action,
const char *Title)
{
extern const char *The_ClassFormOutBox[The_NUM_THEMES];
extern const char *The_ClassFormOutBoxBold[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
/***** Begin container *****/
HTM_DIV_Begin ("class=\"FOLLOW_BOX %s\"",
@ -405,7 +404,7 @@ static void Fol_ShowNumberOfFollowingOrFollowers (const struct UsrData *UsrDat,
/* Form to list users */
Frm_BeginFormAnchor (Action,Fol_FOLLOW_SECTION_ID);
Usr_PutParamUsrCodEncrypted (UsrDat->EnUsrCod);
HTM_BUTTON_OnSubmit_Begin (Title,NULL,"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (Title,"class=\"BT_LINK\"");
}
HTM_Unsigned (NumUsrs);
if (NumUsrs)
@ -415,15 +414,16 @@ static void Fol_ShowNumberOfFollowingOrFollowers (const struct UsrData *UsrDat,
}
/***** Text *****/
HTM_DIV_Begin ("class=\"%s\"",
(Gbl.Action.Act == Action) ? The_ClassFormOutBoxBold[Gbl.Prefs.Theme] :
The_ClassFormOutBox [Gbl.Prefs.Theme]);
HTM_DIV_Begin ("class=\"FORM_OUT_%s%s\"",
The_Colors[Gbl.Prefs.Theme],
(Gbl.Action.Act == Action) ? " BOLD" :
"");
if (NumUsrs)
{
/* Form to list users */
Frm_BeginFormAnchor (Action,Fol_FOLLOW_SECTION_ID);
Usr_PutParamUsrCodEncrypted (UsrDat->EnUsrCod);
HTM_BUTTON_OnSubmit_Begin (Title,NULL,"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (Title,"class=\"BT_LINK\"");
}
HTM_Txt (Title);
if (NumUsrs)
@ -634,8 +634,8 @@ static void Fol_ShowFollowedOrFollower (struct UsrData *UsrDat)
Usr_PutParamUsrCodEncrypted (UsrDat->EnUsrCod);
HTM_DIV_Begin ("class=\"LT FOLLOW_USR_NAME DAT_%s\"", // Limited width
The_Colors[Gbl.Prefs.Theme]);
HTM_BUTTON_OnSubmit_Begin (Txt_Another_user_s_profile,NULL,
"class=\"BT_LINK LT\"");
HTM_BUTTON_Submit_Begin (Txt_Another_user_s_profile,
"class=\"BT_LINK LT\"");
Usr_WriteFirstNameBRSurnames (UsrDat);
HTM_BUTTON_End ();
HTM_DIV_End ();
@ -696,8 +696,8 @@ static void Fol_WriteRowUsrToFollowOnRightColumn (struct UsrData *UsrDat)
Frm_BeginForm (ActSeeOthPubPrf);
Usr_PutParamUsrCodEncrypted (UsrDat->EnUsrCod);
HTM_DIV_Begin ("class=\"CON_NAME_FOLLOW CON_CRS LT\""); // Limited width
HTM_BUTTON_OnSubmit_Begin (Txt_Another_user_s_profile,NULL,
"class=\"BT_LINK LT\"");
HTM_BUTTON_Submit_Begin (Txt_Another_user_s_profile,
"class=\"BT_LINK LT\"");
Usr_WriteFirstNameBRSurnames (UsrDat);
HTM_BUTTON_End ();
HTM_DIV_End ();

15
swad_forum.c
View File

@ -1745,10 +1745,10 @@ static void For_WriteLinkToForum (const struct For_Forums *Forums,
-1L,
-1L);
HTM_BUTTON_OnSubmit_Begin (Act_GetActionText (For_ActionsSeeFor[Forum->Type]),NULL,
NumThrsWithNewPosts ? "class=\"BT_LINK FORM_IN_%s BOLD\"" :
"class=\"BT_LINK FORM_IN_%s\"",
The_Colors[Gbl.Prefs.Theme]);
HTM_BUTTON_Submit_Begin (Act_GetActionText (For_ActionsSeeFor[Forum->Type]),
NumThrsWithNewPosts ? "class=\"BT_LINK FORM_IN_%s BOLD\"" :
"class=\"BT_LINK FORM_IN_%s\"",
The_Colors[Gbl.Prefs.Theme]);
For_SetForumName (Forum,ForumName,Gbl.Prefs.Language,true);
switch (Forum->Type)
@ -2080,8 +2080,8 @@ static void For_ShowForumThreadsHighlightingOneThread (struct For_Forums *Forums
Forums->Forum.Location,
-1L,
-1L);
HTM_BUTTON_OnSubmit_Begin (Txt_FORUM_THREAD_HELP_ORDER[Order],NULL,
"BT_LINK");
HTM_BUTTON_Submit_Begin (Txt_FORUM_THREAD_HELP_ORDER[Order],
"BT_LINK");
if (Order == Forums->ThreadsOrder)
HTM_U_Begin ();
HTM_Txt (Txt_FORUM_THREAD_ORDER[Order]);
@ -2159,7 +2159,6 @@ static void For_ListForumThrs (struct For_Forums *Forums,
struct Pagination *PaginationThrs)
{
extern const char *The_Colors[The_NUM_THEMES];
extern const char *The_ClassFormInBoxBold[The_NUM_THEMES];
extern const char *Txt_Thread_with_posts_from_you;
extern const char *Txt_There_are_new_posts;
extern const char *Txt_No_new_posts;
@ -2268,7 +2267,7 @@ static void For_ListForumThrs (struct For_Forums *Forums,
Forums,Thr.ThrCod,
Thr.Enabled[Dat_STR_TIME],
Thr.Subject,
Thr.NumUnreadPosts ? The_ClassFormInBoxBold[Gbl.Prefs.Theme] : // !!!!!!!!!!!!!!!!!!!!!!
Thr.NumUnreadPosts ? "BOLD FORM_IN" :
"FORM_IN",
true);
HTM_TD_End ();

8
swad_game.c
View File

@ -283,8 +283,8 @@ static void Gam_ListAllGames (struct Gam_Games *Games)
Pag_PutHiddenParamPagNum (Pag_GAMES,Games->CurrentPage);
Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order);
HTM_BUTTON_OnSubmit_Begin (Txt_GAMES_ORDER_HELP[Order],NULL,
"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (Txt_GAMES_ORDER_HELP[Order],
"class=\"BT_LINK\"");
if (Order == Games->SelectedOrder)
HTM_U_Begin ();
HTM_Txt (Txt_GAMES_ORDER[Order]);
@ -605,7 +605,7 @@ static void Gam_ShowOneGame (struct Gam_Games *Games,
HTM_ARTICLE_Begin (Anchor);
Frm_BeginForm (ActSeeGam);
Gam_PutParams (Games);
HTM_BUTTON_OnSubmit_Begin (Txt_View_game,NULL,"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (Txt_View_game,"class=\"BT_LINK\"");
HTM_Txt (Game->Title);
HTM_BUTTON_End ();
Frm_EndForm ();
@ -638,7 +638,7 @@ static void Gam_ShowOneGame (struct Gam_Games *Games,
Games->GamCod = Game->GamCod;
Frm_BeginForm (ActSeeGam);
Gam_PutParams (Games);
HTM_BUTTON_OnSubmit_Begin (Txt_Matches,NULL,"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (Txt_Matches,"class=\"BT_LINK\"");
if (ShowOnlyThisGame)
HTM_TxtColonNBSP (Txt_Matches);
HTM_Unsigned (Game->NumMchs);

11
swad_group.c
View File

@ -357,7 +357,7 @@ void Grp_ShowFormToSelectSeveralGroups (void (*FuncParams) (void *Args),void *Ar
Grp_WhichGroups_t GroupsSelectableByStdsOrNETs)
{
extern const char *Hlp_USERS_Groups;
extern const char *The_ClassFormLinkInBoxBold[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Groups;
extern const char *Txt_Update_users;
unsigned NumGrpTyp;
@ -409,10 +409,11 @@ void Grp_ShowFormToSelectSeveralGroups (void (*FuncParams) (void *Args),void *Ar
/***** Submit button *****/
HTM_DIV_Begin ("class=\"UPD\"");
HTM_BUTTON_OnSubmit_Begin (Txt_Update_users,
Gbl.Action.Act == ActReqMsgUsr ? "CopyMessageToHiddenFields();" :
NULL,
"class=\"%s\"",The_ClassFormLinkInBoxBold[Gbl.Prefs.Theme]);
HTM_BUTTON_Submit_Begin (Txt_Update_users,
"class=\"BT_LINK FORM_IN_%s BOLD\"%s",
The_Colors[Gbl.Prefs.Theme],
Gbl.Action.Act == ActReqMsgUsr ? " onsubmit=\"CopyMessageToHiddenFields();\"" :
"");
Ico_PutIconTextLink ("recycle.svg",Ico_BLACK,Txt_Update_users);
HTM_BUTTON_End ();
HTM_DIV_End ();

26
swad_hierarchy.c
View File

@ -210,7 +210,7 @@ void Hie_WriteHierarchyInBreadcrumb (void)
Frm_BeginFormGoTo (ActMnu);
Par_PutHiddenParamUnsigned (NULL,"NxtTab",(unsigned) TabSys);
HTM_BUTTON_OnSubmit_Begin (Txt_System,NULL,"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (Txt_System,"class=\"BT_LINK\"");
HTM_Txt (Txt_System);
HTM_BUTTON_End ();
Frm_EndForm ();
@ -227,8 +227,8 @@ void Hie_WriteHierarchyInBreadcrumb (void)
/***** Form to go to see institutions of this country *****/
Frm_BeginFormGoTo (ActSeeIns);
Cty_PutParamCtyCod (Gbl.Hierarchy.Cty.CtyCod);
HTM_BUTTON_OnSubmit_Begin (Gbl.Hierarchy.Cty.Name[Gbl.Prefs.Language],NULL,
"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (Gbl.Hierarchy.Cty.Name[Gbl.Prefs.Language],
"class=\"BT_LINK\"");
HTM_Txt (Gbl.Hierarchy.Cty.Name[Gbl.Prefs.Language]);
HTM_BUTTON_End ();
Frm_EndForm ();
@ -244,7 +244,7 @@ void Hie_WriteHierarchyInBreadcrumb (void)
/***** Form to go to select countries *****/
Frm_BeginFormGoTo (ActSeeCty);
HTM_BUTTON_OnSubmit_Begin (Txt_Country,NULL,"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (Txt_Country,"class=\"BT_LINK\"");
HTM_Txt (Txt_Country);
HTM_BUTTON_End ();
Frm_EndForm ();
@ -262,8 +262,8 @@ void Hie_WriteHierarchyInBreadcrumb (void)
/***** Form to see centers of this institution *****/
Frm_BeginFormGoTo (ActSeeCtr);
Ins_PutParamInsCod (Gbl.Hierarchy.Ins.InsCod);
HTM_BUTTON_OnSubmit_Begin (Gbl.Hierarchy.Ins.FullName,NULL,
"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (Gbl.Hierarchy.Ins.FullName,
"class=\"BT_LINK\"");
HTM_Txt (Gbl.Hierarchy.Ins.ShrtName);
HTM_BUTTON_End ();
Frm_EndForm ();
@ -279,7 +279,7 @@ void Hie_WriteHierarchyInBreadcrumb (void)
/***** Form to go to select institutions *****/
Frm_BeginFormGoTo (ActSeeIns);
HTM_BUTTON_OnSubmit_Begin (Txt_Institution,NULL,"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (Txt_Institution,"class=\"BT_LINK\"");
HTM_Txt (Txt_Institution);
HTM_BUTTON_End ();
Frm_EndForm ();
@ -309,8 +309,8 @@ void Hie_WriteHierarchyInBreadcrumb (void)
/***** Form to see degrees of this center *****/
Frm_BeginFormGoTo (ActSeeDeg);
Ctr_PutParamCtrCod (Gbl.Hierarchy.Ctr.CtrCod);
HTM_BUTTON_OnSubmit_Begin (Gbl.Hierarchy.Ctr.FullName,NULL,
"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (Gbl.Hierarchy.Ctr.FullName,
"class=\"BT_LINK\"");
HTM_Txt (Gbl.Hierarchy.Ctr.ShrtName);
HTM_BUTTON_End ();
Frm_EndForm ();
@ -326,7 +326,7 @@ void Hie_WriteHierarchyInBreadcrumb (void)
/***** Form to go to select centers *****/
Frm_BeginFormGoTo (ActSeeCtr);
HTM_BUTTON_OnSubmit_Begin (Txt_Center,NULL,"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (Txt_Center,"class=\"BT_LINK\"");
HTM_Txt (Txt_Center);
HTM_BUTTON_End ();
Frm_EndForm ();
@ -356,8 +356,8 @@ void Hie_WriteHierarchyInBreadcrumb (void)
/***** Form to go to see courses of this degree *****/
Frm_BeginFormGoTo (ActSeeCrs);
Deg_PutParamDegCod (Gbl.Hierarchy.Deg.DegCod);
HTM_BUTTON_OnSubmit_Begin (Gbl.Hierarchy.Deg.FullName,NULL,
"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (Gbl.Hierarchy.Deg.FullName,
"class=\"BT_LINK\"");
HTM_Txt (Gbl.Hierarchy.Deg.ShrtName);
HTM_BUTTON_End ();
Frm_EndForm ();
@ -373,7 +373,7 @@ void Hie_WriteHierarchyInBreadcrumb (void)
/***** Form to go to select degrees *****/
Frm_BeginFormGoTo (ActSeeDeg);
HTM_BUTTON_OnSubmit_Begin (Txt_Degree,NULL,"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (Txt_Degree,"class=\"BT_LINK\"");
HTM_Txt (Txt_Degree);
HTM_BUTTON_End ();
Frm_EndForm ();

2
swad_hierarchy_config.c
View File

@ -273,7 +273,7 @@ void HieCfg_NumCtrs (unsigned NumCtrs,bool PutForm)
if (asprintf (&Title,Txt_Centers_of_INSTITUTION_X,
Gbl.Hierarchy.Ins.ShrtName) < 0)
Err_NotEnoughMemoryExit ();
HTM_BUTTON_OnSubmit_Begin (Title,NULL,"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (Title,"class=\"BT_LINK\"");
free (Title);
}
HTM_Unsigned (NumCtrs);

4
swad_holiday.c
View File

@ -137,8 +137,8 @@ void Hld_SeeHolidays (void)
HTM_TH_Begin (HTM_HEAD_LEFT);
Frm_BeginForm (ActSeeHld);
Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order);
HTM_BUTTON_OnSubmit_Begin (Txt_HOLIDAYS_HELP_ORDER[Order],NULL,
"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (Txt_HOLIDAYS_HELP_ORDER[Order],
"class=\"BT_LINK\"");
if (Order == Holidays.SelectedOrder)
HTM_U_Begin ();
HTM_Txt (Txt_HOLIDAYS_ORDER[Order]);

12
swad_info.c
View File

@ -539,9 +539,9 @@ void Inf_WriteMsgYouMustReadInfo (void)
{
HTM_LI_Begin (NULL);
Frm_BeginForm (Inf_ActionsSeeInfo[InfoType]);
HTM_BUTTON_OnSubmit_Begin (Act_GetTitleAction (Inf_ActionsSeeInfo[InfoType]),NULL,
"class=\"BT_LINK FORM_IN_%s\"",
The_Colors[Gbl.Prefs.Theme]);
HTM_BUTTON_Submit_Begin (Act_GetTitleAction (Inf_ActionsSeeInfo[InfoType]),
"class=\"BT_LINK FORM_IN_%s\"",
The_Colors[Gbl.Prefs.Theme]);
HTM_Txt (Act_GetTitleAction (Inf_ActionsSeeInfo[InfoType]));
HTM_BUTTON_End ();
Frm_EndForm ();
@ -821,7 +821,7 @@ void Inf_WriteURLIntoTxtBuffer (char TxtBuffer[Cns_MAX_BYTES_WWW + 1])
static void Inf_ShowPage (const char *URL)
{
extern const char *The_ClassFormOutBoxBold[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_View_in_a_new_window;
extern const char *Txt_INFO_TITLE[Inf_NUM_TYPES];
bool ICanEdit = (Gbl.Usrs.Me.Role.Logged == Rol_TCH ||
@ -849,8 +849,8 @@ static void Inf_ShowPage (const char *URL)
Help[Gbl.Crs.Info.Type],Box_NOT_CLOSABLE);
/***** Link to view in a new window *****/
HTM_A_Begin ("href=\"%s\" target=\"_blank\" class=\"%s\"",
URL,The_ClassFormOutBoxBold[Gbl.Prefs.Theme]);
HTM_A_Begin ("href=\"%s\" target=\"_blank\" class=\"FORM_OUT_%s BOLD\"",
URL,The_Colors[Gbl.Prefs.Theme]);
Ico_PutIconTextLink ("expand-arrows-alt.svg",Ico_BLACK,
Txt_View_in_a_new_window);
HTM_A_End ();

13
swad_institution.c
View File

@ -213,7 +213,7 @@ void Ins_DrawInstitutionLogoWithLink (struct Ins_Instit *Ins,unsigned Size)
{
Frm_BeginForm (ActSeeInsInf);
Ins_PutParamInsCod (Ins->InsCod);
HTM_BUTTON_OnSubmit_Begin (Ins->FullName,NULL,"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (Ins->FullName,"class=\"BT_LINK\"");
}
Lgo_DrawLogo (HieLvl_INS,Ins->InsCod,Ins->FullName,
Size,NULL,true);
@ -236,8 +236,8 @@ void Ins_DrawInstitLogoAndNameWithLink (struct Ins_Instit *Ins,Act_Action_t Acti
Ins_PutParamInsCod (Ins->InsCod);
/***** Link to action *****/
HTM_BUTTON_OnSubmit_Begin (Str_BuildGoToTitle (Ins->FullName),NULL,
"class=\"BT_LINK LT\"");
HTM_BUTTON_Submit_Begin (Str_BuildGoToTitle (Ins->FullName),
"class=\"BT_LINK LT\"");
Str_FreeGoToTitle ();
/***** Institution logo and name *****/
@ -484,8 +484,8 @@ static void Ins_PutHeadInstitutionsForSeeing (bool OrderSelectable)
{
Frm_BeginForm (ActSeeIns);
Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order);
HTM_BUTTON_OnSubmit_Begin (Txt_INSTITUTIONS_HELP_ORDER[Order],NULL,
"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (Txt_INSTITUTIONS_HELP_ORDER[Order],
"class=\"BT_LINK\"");
if (Order == Gbl.Hierarchy.Inss.SelectedOrder)
HTM_U_Begin ();
}
@ -2352,7 +2352,8 @@ static void Ins_ShowInss (MYSQL_RES **mysql_res,unsigned NumInss,
/* Icon and name of this institution */
Frm_BeginForm (ActSeeInsInf);
Ins_PutParamInsCod (Ins.InsCod);
HTM_BUTTON_OnSubmit_Begin (Ins.ShrtName,NULL,"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (Ins.ShrtName,
"class=\"BT_LINK\"");
if (Gbl.Usrs.Listing.WithPhotos)
{
Lgo_DrawLogo (HieLvl_INS,Ins.InsCod,Ins.ShrtName,

4
swad_institution_config.c
View File

@ -342,8 +342,8 @@ static void InsCfg_Country (bool PrintView,bool PutForm)
{
Frm_BeginFormGoTo (ActSeeCtyInf);
Cty_PutParamCtyCod (Gbl.Hierarchy.Cty.CtyCod);
HTM_BUTTON_OnSubmit_Begin (Str_BuildGoToTitle (Gbl.Hierarchy.Cty.Name[Gbl.Prefs.Language]),NULL,
"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (Str_BuildGoToTitle (Gbl.Hierarchy.Cty.Name[Gbl.Prefs.Language]),
"class=\"BT_LINK\"");
Str_FreeGoToTitle ();
}
Cty_DrawCountryMap (&Gbl.Hierarchy.Cty,"COUNTRY_MAP_TINY");

20
swad_layout.c
View File

@ -1019,7 +1019,7 @@ static void Lay_WritePageTopHeading (void)
HTM_DIV_Begin ("id=\"head_row_1_tagline\" class=\"TAGLINE_%s\"",
The_Colors[Gbl.Prefs.Theme]);
HTM_BUTTON_OnSubmit_Begin (Txt_TAGLINE,NULL,"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (Txt_TAGLINE,"class=\"BT_LINK\"");
HTM_Txt (Txt_TAGLINE_BR);
HTM_BUTTON_End ();
HTM_DIV_End (); // head_row_1_tagline
@ -1218,7 +1218,7 @@ void Lay_PutContextualLinkIconText (Act_Action_t NextAction,const char *Anchor,
const char *Icon,Ico_Color_t Color,
const char *Text,const char *OnSubmit)
{
extern const char *The_ClassFormLinkOutBoxBold[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
/***** Separator *****/
HTM_Txt (" "); // This space is necessary to enable
@ -1230,8 +1230,14 @@ void Lay_PutContextualLinkIconText (Act_Action_t NextAction,const char *Anchor,
FuncParams (Args);
/***** Put icon and text with link *****/
HTM_BUTTON_OnSubmit_Begin (Text,OnSubmit,
"class=\"%s\"",The_ClassFormLinkOutBoxBold[Gbl.Prefs.Theme]);
if (OnSubmit)
HTM_BUTTON_Submit_Begin (Text,
"class=\"BT_LINK FORM_OUT_%s BOLD\" onsubmit=\"%s;\"",
The_Colors[Gbl.Prefs.Theme],OnSubmit);
else
HTM_BUTTON_Submit_Begin (Text,
"class=\"BT_LINK FORM_OUT_%s BOLD\"",
The_Colors[Gbl.Prefs.Theme]);
Ico_PutIconTextLink (Icon,Color,Text);
HTM_BUTTON_End ();
@ -1253,7 +1259,7 @@ void Lay_PutContextualCheckbox (Act_Action_t NextAction,
bool Checked,bool Disabled,
const char *Title,const char *Text)
{
extern const char *The_ClassFormOutBoxBold[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
/***** Separator *****/
if (Text)
@ -1266,10 +1272,10 @@ void Lay_PutContextualCheckbox (Act_Action_t NextAction,
FuncParams ();
/***** Begin container *****/
HTM_DIV_Begin ("class=\"CONTEXT_OPT %s %s\" title=\"%s\"",
HTM_DIV_Begin ("class=\"CONTEXT_OPT %s FORM_OUT_%s BOLD\" title=\"%s\"",
Checked ? "CHECKBOX_CHECKED" :
"CHECKBOX_UNCHECKED",
The_ClassFormOutBoxBold[Gbl.Prefs.Theme],
The_Colors[Gbl.Prefs.Theme],
Title);
/***** Begin label *****/

2
swad_link.c
View File

@ -161,7 +161,7 @@ void Lnk_WriteMenuWithInstitutionalLinks (void)
The_Colors[Gbl.Prefs.Theme]);
Frm_BeginForm (ActSeeLnk);
HTM_BUTTON_OnSubmit_Begin (Txt_Links,NULL,"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (Txt_Links,"class=\"BT_LINK\"");
HTM_TxtF ("%s",Txt_Links);
HTM_BUTTON_End ();
Frm_EndForm ();

9
swad_mail.c
View File

@ -136,8 +136,8 @@ void Mai_SeeMailDomains (void)
Frm_BeginForm (ActSeeMai);
Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order);
HTM_BUTTON_OnSubmit_Begin (Txt_EMAIL_DOMAIN_HELP_ORDER[Order],NULL,
"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (Txt_EMAIL_DOMAIN_HELP_ORDER[Order],
"class=\"BT_LINK\"");
if (Order == Gbl.Mails.SelectedOrder)
HTM_U_Begin ();
HTM_Txt (Txt_EMAIL_DOMAIN_ORDER[Order]);
@ -804,7 +804,6 @@ static void Mai_ListEmails (__attribute__((unused)) void *Args)
{
extern const char *Hlp_COMMUNICATION_Email;
extern const char *The_Colors[The_NUM_THEMES];
extern const char *The_ClassFormOutBoxBold[The_NUM_THEMES];
extern const char *Txt_Email_addresses;
extern const char *Txt_X_users_who_have_email;
extern const char *Txt_X_users_who_have_accepted_and_who_have_email;
@ -893,13 +892,13 @@ static void Mai_ListEmails (__attribute__((unused)) void *Args)
/* Open the client email program */
HTM_A_Begin ("href=\"mailto:%s?subject=%s&cc=%s&bcc=%s\""
" title=\"%s\" class=\"%s\"",
" title=\"%s\" class=\"FORM_OUT_%s BOLD\"",
Gbl.Usrs.Me.UsrDat.Email,
Gbl.Hierarchy.Crs.FullName,
Gbl.Usrs.Me.UsrDat.Email,
StrAddresses,
Txt_Create_email_message,
The_ClassFormOutBoxBold[Gbl.Prefs.Theme]);
The_Colors[Gbl.Prefs.Theme]);
Ico_PutIconTextLink ("marker.svg",Ico_BLACK,
Txt_Create_email_message);
HTM_A_End ();

10
swad_mark.c
View File

@ -84,7 +84,7 @@ static bool Mrk_GetUsrMarks (FILE *FileUsrMarks,struct UsrData *UsrDat,
void Mrk_GetAndWriteNumRowsHeaderAndFooter (void)
{
extern const char *The_ClassFormInBoxNoWrap[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_TABLE_Header;
extern const char *Txt_TABLE_Footer;
struct Mrk_Properties Marks;
@ -98,8 +98,8 @@ void Mrk_GetAndWriteNumRowsHeaderAndFooter (void)
Mrk_GetNumRowsHeaderAndFooter (&Marks);
/***** Write the number of rows of header *****/
HTM_TD_Begin ("class=\"%s RT %s\"",
The_ClassFormInBoxNoWrap[Gbl.Prefs.Theme],
HTM_TD_Begin ("class=\"RT FORM_IN_%s NOWRAP %s\"",
The_Colors[Gbl.Prefs.Theme],
The_GetColorRows ());
Frm_BeginForm (Gbl.Crs.Grps.GrpCod > 0 ? ActChgNumRowHeaGrp : // Group zone
ActChgNumRowHeaCrs); // Course zone
@ -116,8 +116,8 @@ void Mrk_GetAndWriteNumRowsHeaderAndFooter (void)
HTM_TD_End ();
/***** Write the number of rows of footer *****/
HTM_TD_Begin ("class=\"%s RT %s\"",
The_ClassFormInBoxNoWrap[Gbl.Prefs.Theme],
HTM_TD_Begin ("class=\"RT FORM_IN_%s NOWRAP %s\"",
The_Colors[Gbl.Prefs.Theme],
The_GetColorRows ());
Frm_BeginForm (Gbl.Crs.Grps.GrpCod > 0 ? ActChgNumRowFooGrp : // Group zone
ActChgNumRowFooCrs); // Course zone

69
swad_match.c
View File

@ -637,10 +637,9 @@ static void Mch_ListOneOrMoreMatchesTitleGrps (const struct Mch_Match *Match,
ActResMch);
Mch_PutParamMchCod (Match->MchCod);
HTM_BUTTON_OnSubmit_Begin (Gbl.Usrs.Me.Role.Logged == Rol_STD ? Txt_Play :
Txt_Resume,
NULL,
"class=\"BT_LINK LT ASG_TITLE\"");
HTM_BUTTON_Submit_Begin (Gbl.Usrs.Me.Role.Logged == Rol_STD ? Txt_Play :
Txt_Resume,
"class=\"BT_LINK LT ASG_TITLE\"");
HTM_Txt (Match->Title);
HTM_BUTTON_End ();
@ -2324,7 +2323,7 @@ static void Mch_PutCountdownAndHourglassIcon (struct Mch_Match *Match)
/***** Write countdown and put hourglass icon *****/
HTM_DIV_Begin ("class=\"MCH_SHOW_HOURGLASS\"");
HTM_DIV_Begin ("class=\"MCH_BIGBUTTON_CONT\"");
HTM_BUTTON_OnClick_Begin (Txt_Countdown,Class,NULL);
HTM_BUTTON_Begin (Txt_Countdown,"class=\"%s\"",Class);
/* Countdown */
if (Match->Status.Countdown > 0)
@ -2385,11 +2384,10 @@ static void Mch_PutFormCountdown (struct Mch_Match *Match,long Seconds,const cha
/***** Put icon *****/
HTM_DIV_Begin ("class=\"MCH_SMALLBUTTON_CONT %s\"",Color);
HTM_BUTTON_OnSubmit_Begin (PutForm ? Txt_Countdown :
NULL,
NULL,
PutForm ? "class=\"BT_LINK MCH_BUTTON_ON\"" :
"class=\"BT_LINK_OFF MCH_BUTTON_HIDDEN\"");
HTM_BUTTON_Submit_Begin (PutForm ? Txt_Countdown :
NULL,
PutForm ? "class=\"BT_LINK MCH_BUTTON_ON\"" :
"class=\"BT_LINK_OFF MCH_BUTTON_HIDDEN\"");
HTM_NBSP ();
if (Seconds >= 0)
@ -2700,8 +2698,8 @@ static void Mch_PutCheckboxResult (const struct Mch_Match *Match)
Mch_PutParamMchCod (Match->MchCod); // Current match being played
/***** Put icon with link *****/
HTM_BUTTON_OnSubmit_Begin (Txt_View_results,NULL,
"class=\"BT_LINK ICO_HIGHLIGHT\"");
HTM_BUTTON_Submit_Begin (Txt_View_results,
"class=\"BT_LINK ICO_HIGHLIGHT\"");
HTM_TxtF ("<i class=\"%s\"></i>",
Match->Status.ShowQstResults ? "fas fa-toggle-on" :
"fas fa-toggle-off");
@ -2725,7 +2723,6 @@ static void Mch_PutIfAnswered (const struct Mch_Match *Match,bool Answered)
extern const char *Txt_View_my_answer;
extern const char *Txt_MATCH_QUESTION_Answered;
extern const char *Txt_MATCH_QUESTION_Unanswered;
char *Class;
/***** Begin container *****/
HTM_DIV_Begin ("class=\"MCH_SHOW_ANSWERED\"");
@ -2739,11 +2736,11 @@ static void Mch_PutIfAnswered (const struct Mch_Match *Match,bool Answered)
Frm_BeginForm (ActSeeMchAnsQstStd);
Mch_PutParamMchCod (Match->MchCod); // Current match being played
if (asprintf (&Class,"BT_LINK DAT_SMALL_GREEN_%s",
The_Colors[Gbl.Prefs.Theme]) < 0) // Background
Err_NotEnoughMemoryExit ();
HTM_BUTTON_OnMouseDown_Begin (Txt_View_my_answer,Class);
free (Class);
HTM_BUTTON_Submit_Begin (Txt_View_my_answer,
"class=\"BT_LINK DAT_SMALL_GREEN_%s\""
" onmousedown=\"document.getElementById('%s').submit();return false;\"",
The_Colors[Gbl.Prefs.Theme],
Gbl.Form.Id);
HTM_TxtF ("<i class=\"%s\"></i>","fas fa-check-circle");
HTM_TxtF ("&nbsp;%s",Txt_MATCH_QUESTION_Answered);
HTM_BUTTON_End ();
@ -2788,8 +2785,10 @@ static void Mch_PutIconToRemoveMyAnswer (const struct Mch_Match *Match)
/***** Put icon with link *****/
HTM_DIV_Begin ("class=\"MCH_BIGBUTTON_CONT\"");
HTM_BUTTON_OnMouseDown_Begin (Txt_Delete_my_answer,
"BT_LINK MCH_BUTTON_ON ICO_DARKRED");
HTM_BUTTON_Submit_Begin (Txt_Delete_my_answer,
"BT_LINK MCH_BUTTON_ON ICO_DARKRED\""
" onmousedown=\"document.getElementById('%s').submit();return false;\"",
Gbl.Form.Id);
HTM_Txt ("<i class=\"fas fa-trash\"></i>");
HTM_BUTTON_End ();
HTM_DIV_End ();
@ -3015,7 +3014,6 @@ static void Mch_ShowQuestionAndAnswersStd (const struct Mch_Match *Match,
{
unsigned NumOptions;
unsigned NumOpt;
char *Class;
/***** Get number of options in this question *****/
NumOptions = Qst_DB_GetNumAnswersQst (Match->Status.QstCod);
@ -3043,16 +3041,16 @@ static void Mch_ShowQuestionAndAnswersStd (const struct Mch_Match *Match,
Gam_PutParamQstInd (Match->Status.QstInd); // Current question index shown
Mch_PutParamNumOpt (NumOpt); // Number of button
if (asprintf (&Class,"MCH_STD_BUTTON%s BT_%c",
UsrAnswer->NumOpt == (int) NumOpt && // Student's answer
Update == Mch_CHANGE_STATUS_BY_STUDENT ? " MCH_STD_ANSWER_SELECTED" :
"",
'A' + (char) NumOpt) < 0)
Err_NotEnoughMemoryExit ();
HTM_BUTTON_OnMouseDown_Begin (NULL,Class);
HTM_BUTTON_Submit_Begin (NULL,
"class=\"MCH_STD_BUTTON%s BT_%c\""
" onmousedown=\"document.getElementById('%s').submit();return false;\"",
UsrAnswer->NumOpt == (int) NumOpt && // Student's answer
Update == Mch_CHANGE_STATUS_BY_STUDENT ? " MCH_STD_ANSWER_SELECTED" :
"",
'A' + (char) NumOpt,
Gbl.Form.Id);
HTM_TxtF ("%c",'a' + (char) NumOpt);
HTM_BUTTON_End ();
free (Class);
Frm_EndForm ();
@ -3309,8 +3307,8 @@ static void Mch_PutBigButton (Act_Action_t NextAction,const char *Id,
/***** Put icon with link *****/
HTM_DIV_Begin ("class=\"MCH_BIGBUTTON_CONT\"");
HTM_BUTTON_OnSubmit_Begin (Txt,NULL,
"class=\"BT_LINK MCH_BUTTON_ON ICO_BLACK\"");
HTM_BUTTON_Submit_Begin (Txt,
"class=\"BT_LINK MCH_BUTTON_ON ICO_BLACK\"");
HTM_TxtF ("<i class=\"%s\"></i>",Icon);
HTM_BUTTON_End ();
HTM_DIV_End ();
@ -3327,8 +3325,7 @@ static void Mch_PutBigButtonHidden (const char *Icon)
{
/***** Put inactive icon *****/
HTM_DIV_Begin ("class=\"MCH_BIGBUTTON_CONT\"");
HTM_BUTTON_OnClick_Begin (NULL,"BT_LINK_OFF MCH_BUTTON_HIDDEN ICO_BLACK",
NULL);
HTM_BUTTON_Begin (NULL,"class=\"BT_LINK_OFF MCH_BUTTON_HIDDEN ICO_BLACK\"");
HTM_TxtF ("<i class=\"%s\"></i>",Icon);
HTM_BUTTON_End ();
HTM_DIV_End ();
@ -3343,9 +3340,9 @@ static void Mch_PutBigButtonClose (void)
/***** Put icon with link *****/
HTM_DIV_Begin ("class=\"MCH_BIGBUTTON_CONT\"");
HTM_BUTTON_OnClick_Begin (Txt_Close,"BT_LINK MCH_BUTTON_ON ICO_DARKRED",
"window.close();"
"return false;");
HTM_BUTTON_Begin (Txt_Close,
"class=\"BT_LINK MCH_BUTTON_ON ICO_DARKRED\""
" onclick=\"window.close();return false;\"");
HTM_TxtF ("<i class=\"%s\"></i>",Mch_ICON_CLOSE);
HTM_BUTTON_End ();
HTM_DIV_End ();

6
swad_match_result.c
View File

@ -536,7 +536,6 @@ static void MchRes_ShowResultsEnd (void)
static void MchRes_ListGamesToSelect (struct Gam_Games *Games)
{
extern const char *The_ClassFormLinkInBoxBold[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Games;
extern const char *Txt_Game;
@ -612,8 +611,9 @@ static void MchRes_ListGamesToSelect (struct Gam_Games *Games)
/***** Put button to refresh *****/
HTM_DIV_Begin ("class=\"UPD\"");
HTM_BUTTON_OnSubmit_Begin (Txt_Update_results,NULL,
"class=\"%s\"",The_ClassFormLinkInBoxBold[Gbl.Prefs.Theme]);
HTM_BUTTON_Submit_Begin (Txt_Update_results,
"class=\"BT_LINK FORM_IN_%s BOLD\"",
The_Colors[Gbl.Prefs.Theme]);
Ico_PutIconTextLink ("recycle.svg",Ico_BLACK,Txt_Update_results);
HTM_BUTTON_End ();
HTM_DIV_End ();

2
swad_menu.c
View File

@ -268,7 +268,7 @@ void Mnu_WriteMenuThisTab (void)
Frm_BeginForm (NumAct);
/***** Begin link *****/
HTM_BUTTON_OnSubmit_Begin (Title,NULL,"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (Title,"class=\"BT_LINK\"");
/***** Icon and text *****/
HTM_DIV_Begin ("class=\"MENU_ICO_TXT\"");

23
swad_message.c
View File

@ -1435,7 +1435,7 @@ static void Msg_ShowSntOrRcvMessages (struct Msg_Messages *Messages)
extern const char *Hlp_COMMUNICATION_Messages_received_filter;
extern const char *Hlp_COMMUNICATION_Messages_sent;
extern const char *Hlp_COMMUNICATION_Messages_sent_filter;
extern const char *The_ClassFormLinkInBoxBold[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Filter;
extern const char *Txt_Update_messages;
char FilterFromToSubquery[Msg_DB_MAX_BYTES_MESSAGES_QUERY + 1];
@ -1525,9 +1525,9 @@ static void Msg_ShowSntOrRcvMessages (struct Msg_Messages *Messages)
/***** Put button to refresh *****/
HTM_DIV_Begin ("class=\"UPD\"");
HTM_BUTTON_OnSubmit_Begin (Txt_Update_messages,
NULL,
"class=\"%s\"",The_ClassFormLinkInBoxBold[Gbl.Prefs.Theme]);
HTM_BUTTON_Submit_Begin (Txt_Update_messages,
"class=\"BT_LINK FORM_IN_%s BOLD\"",
The_Colors[Gbl.Prefs.Theme]);
Ico_PutIconTextLink ("recycle.svg",Ico_BLACK,Txt_Update_messages);
HTM_BUTTON_End ();
HTM_DIV_End ();
@ -2286,10 +2286,9 @@ static void Msg_WriteSentOrReceivedMsgSubject (struct Msg_Messages *Messages,
Messages->MsgCod = MsgCod; // Message to be contracted/expanded
Msg_PutHiddenParamsOneMsg (Messages);
HTM_BUTTON_OnSubmit_Begin (Expanded ? Txt_Hide_message :
Txt_See_message,
NULL,
"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (Expanded ? Txt_Hide_message :
Txt_See_message,
"class=\"BT_LINK\"");
/***** Write subject *****/
if (Subject[0])
@ -2413,8 +2412,8 @@ static bool Msg_WriteCrsOrgMsg (long CrsCod)
Crs_PutParamCrsCod (Crs.CrsCod);
HTM_DIV_Begin ("class=\"AUTHOR_TXT\"");
HTM_Txt ("(");
HTM_BUTTON_OnSubmit_Begin (Str_BuildGoToTitle (Crs.FullName),NULL,
"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (Str_BuildGoToTitle (Crs.FullName),
"class=\"BT_LINK\"");
Str_FreeGoToTitle ();
HTM_Txt (Crs.ShrtName);
HTM_BUTTON_End ();
@ -2691,8 +2690,8 @@ static void Msg_WriteMsgTo (struct Msg_Messages *Messages,long MsgCod)
Messages->MsgCod = MsgCod; // Message to be expanded with all recipients visible
Msg_PutHiddenParamsOneMsg (Messages);
Par_PutHiddenParamChar ("SeeAllRcpts",'Y');
HTM_BUTTON_OnSubmit_Begin (Txt_View_all_recipients,NULL,
"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (Txt_View_all_recipients,
"class=\"BT_LINK\"");
HTM_TxtF (Txt_and_X_other_recipients,
NumRecipients.Known - NumRecipients.ToShow);
HTM_BUTTON_End ();

4
swad_notice.c
View File

@ -612,8 +612,8 @@ static void Not_DrawANotice (Not_Listing_t TypeNoticesListing,
/* Form to view full notice */
Frm_BeginFormAnchor (ActSeeOneNot,Anchor);
Not_PutHiddenParamNotCod (NotCod);
HTM_BUTTON_OnSubmit_Begin (Txt_See_full_notice,NULL,
"class=\"RT BT_LINK\"");
HTM_BUTTON_Submit_Begin (Txt_See_full_notice,
"class=\"RT BT_LINK\"");
}
if (asprintf (&Id,"not_date_%u",UniqueId) < 0)
Err_NotEnoughMemoryExit ();

14
swad_notification.c
View File

@ -503,8 +503,8 @@ void Ntf_ShowMyNotifications (void)
if (PutLink)
{
PutLink = Ntf_StartFormGoToAction (NotifyEvent,Hie.Crs.CrsCod,&UsrDat,Cod,&Forums);
HTM_BUTTON_OnSubmit_Begin (Txt_NOTIFY_EVENTS_SINGULAR[NotifyEvent],NULL,
"class=\"%s\"",ClassLink);
HTM_BUTTON_Submit_Begin (Txt_NOTIFY_EVENTS_SINGULAR[NotifyEvent],
"class=\"%s\"",ClassLink);
HTM_Txt (Txt_NOTIFY_EVENTS_SINGULAR[NotifyEvent]);
HTM_BUTTON_End ();
Frm_EndForm ();
@ -532,8 +532,8 @@ void Ntf_ShowMyNotifications (void)
PutLink = Ntf_StartFormGoToAction (NotifyEvent,Hie.Crs.CrsCod,&UsrDat,Cod,&Forums);
if (PutLink)
HTM_BUTTON_OnSubmit_Begin (Txt_NOTIFY_EVENTS_SINGULAR[NotifyEvent],NULL,
"class=\"%s\"",ClassLink);
HTM_BUTTON_Submit_Begin (Txt_NOTIFY_EVENTS_SINGULAR[NotifyEvent],
"class=\"%s\"",ClassLink);
else
HTM_SPAN_Begin ("class=\"%s\"",ClassText);
HTM_TxtF ("%s:&nbsp;%s",Txt_Forum,ForumName);
@ -551,8 +551,8 @@ void Ntf_ShowMyNotifications (void)
PutLink = Ntf_StartFormGoToAction (NotifyEvent,Hie.Crs.CrsCod,&UsrDat,Cod,&Forums);
if (PutLink)
HTM_BUTTON_OnSubmit_Begin (Txt_NOTIFY_EVENTS_SINGULAR[NotifyEvent],NULL,
"class=\"%s\"",ClassLink);
HTM_BUTTON_Submit_Begin (Txt_NOTIFY_EVENTS_SINGULAR[NotifyEvent],
"class=\"%s\"",ClassLink);
else
HTM_SPAN_Begin ("class=\"%s\"",ClassText);
@ -1650,7 +1650,7 @@ void Ntf_WriteNumberOfNewNtfs (void)
Frm_BeginFormId (ActSeeNewNtf,"form_ntf");
/***** Begin link *****/
HTM_BUTTON_OnSubmit_Begin (Txt_See_notifications,NULL,"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (Txt_See_notifications,"class=\"BT_LINK\"");
/***** Number of unseen notifications *****/
HTM_SPAN_Begin ("id=\"notif_all\"");

26
swad_pagination.c
View File

@ -268,9 +268,9 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate,
}
if (asprintf (&Title,Txt_Page_X_of_Y,1,Pagination->NumPags) < 0)
Err_NotEnoughMemoryExit ();
HTM_BUTTON_OnSubmit_Begin (Title,NULL,
"class=\"LT BT_LINK %s_%s\"",
ClassTxt,The_Colors[Gbl.Prefs.Theme]);
HTM_BUTTON_Submit_Begin (Title,
"class=\"LT BT_LINK %s_%s\"",
ClassTxt,The_Colors[Gbl.Prefs.Theme]);
free (Title);
}
else
@ -391,8 +391,8 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate,
}
if (asprintf (&Title,Txt_Page_X_of_Y,1,Pagination->NumPags) < 0)
Err_NotEnoughMemoryExit ();
HTM_BUTTON_OnSubmit_Begin (Title,NULL,
"class=\"BT_LINK PAG %s\"",ClassTxt);
HTM_BUTTON_Submit_Begin (Title,
"class=\"BT_LINK PAG %s\"",ClassTxt);
HTM_Unsigned (1);
HTM_BUTTON_End ();
free (Title);
@ -506,8 +506,8 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate,
if (asprintf (&Title,Txt_Page_X_of_Y,
Pagination->LeftPage,Pagination->NumPags) < 0)
Err_NotEnoughMemoryExit ();
HTM_BUTTON_OnSubmit_Begin (Title,NULL,
"class=\"BT_LINK PAG %s\"",ClassTxt);
HTM_BUTTON_Submit_Begin (Title,
"class=\"BT_LINK PAG %s\"",ClassTxt);
HTM_Unsigned (Pagination->LeftPage);
HTM_BUTTON_End ();
free (Title);
@ -629,8 +629,8 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate,
default:
break;
}
HTM_BUTTON_OnSubmit_Begin (Title,NULL,
"class=\"BT_LINK PAG %s\"",ClassTxt);
HTM_BUTTON_Submit_Begin (Title,
"class=\"BT_LINK PAG %s\"",ClassTxt);
HTM_Unsigned (NumPage);
HTM_BUTTON_End ();
Frm_EndForm ();
@ -745,8 +745,8 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate,
if (asprintf (&Title,Txt_Page_X_of_Y,
Pagination->RightPage,Pagination->NumPags) < 0)
Err_NotEnoughMemoryExit ();
HTM_BUTTON_OnSubmit_Begin (Title,NULL,
"class=\"BT_LINK PAG %s\"",ClassTxt);
HTM_BUTTON_Submit_Begin (Title,
"class=\"BT_LINK PAG %s\"",ClassTxt);
HTM_Unsigned (Pagination->RightPage);
HTM_BUTTON_End ();
free (Title);
@ -859,8 +859,8 @@ void Pag_WriteLinksToPages (Pag_WhatPaginate_t WhatPaginate,
if (asprintf (&Title,Txt_Page_X_of_Y,
Pagination->NumPags,Pagination->NumPags) < 0)
Err_NotEnoughMemoryExit ();
HTM_BUTTON_OnSubmit_Begin (Title,NULL,
"class=\"BT_LINK PAG %s\"",ClassTxt);
HTM_BUTTON_Submit_Begin (Title,
"class=\"BT_LINK PAG %s\"",ClassTxt);
HTM_Unsigned (Pagination->NumPags);
HTM_BUTTON_End ();
free (Title);

13
swad_photo.c
View File

@ -1291,7 +1291,7 @@ void Pho_ShowUsrPhoto (const struct UsrData *UsrDat,const char *PhotoURL,
else
Frm_BeginForm (ActSeeOthPubPrf);
Usr_PutParamUsrCodEncrypted (UsrDat->EnUsrCod);
HTM_BUTTON_OnSubmit_Begin (NULL,NULL,"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (NULL,"class=\"BT_LINK\"");
}
/***** Hidden div to pass user's name to Javascript *****/
@ -1998,7 +1998,6 @@ static void Pho_PutLinkToPrintViewOfDegreeStatsParams (void *DegPhotos)
static void Pho_PutLinkToCalculateDegreeStats (const struct Pho_DegPhotos *DegPhotos)
{
extern const char *The_ClassFormLinkInBoxBold[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Calculate_average_photo_of_THE_DEGREE_X;
extern const char *Txt_unknown_TIME;
@ -2030,9 +2029,9 @@ static void Pho_PutLinkToCalculateDegreeStats (const struct Pho_DegPhotos *DegPh
Set_PutParamsPrefsAboutUsrList ();
/***** Put button to refresh *****/
HTM_BUTTON_OnSubmit_Begin (Txt_Calculate_average_photo_of_THE_DEGREE_X,
NULL,
"class=\"%s\"",The_ClassFormLinkInBoxBold[Gbl.Prefs.Theme]);
HTM_BUTTON_Submit_Begin (Txt_Calculate_average_photo_of_THE_DEGREE_X,
"class=\"BT_LINK FORM_IN_%s BOLD\"",
The_Colors[Gbl.Prefs.Theme]);
Ico_PutIconTextLink ("recycle.svg",Ico_BLACK,Txt_Calculate_average_photo_of_THE_DEGREE_X);
HTM_BUTTON_End ();
@ -2391,8 +2390,8 @@ static void Pho_ShowDegreeAvgPhotoAndStat (const struct Deg_Degree *Deg,
{
Frm_BeginFormGoTo (ActSeeDegInf);
Deg_PutParamDegCod (Deg->DegCod);
HTM_BUTTON_OnSubmit_Begin (Str_BuildGoToTitle (Deg->FullName),NULL,
"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (Str_BuildGoToTitle (Deg->FullName),
"class=\"BT_LINK\"");
Str_FreeGoToTitle ();
}

4
swad_place.c
View File

@ -132,8 +132,8 @@ void Plc_SeePlaces (void)
Frm_BeginForm (ActSeePlc);
Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order);
HTM_BUTTON_OnSubmit_Begin (Txt_PLACES_HELP_ORDER[Order],NULL,
"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (Txt_PLACES_HELP_ORDER[Order],
"class=\"BT_LINK\"");
if (Order == Places.SelectedOrder)
HTM_U_Begin ();
HTM_Txt (Txt_PLACES_ORDER[Order]);

18
swad_profile.c
View File

@ -775,16 +775,16 @@ static void Prf_EndListItem (void)
static void Prf_PutLinkCalculateFigures (const char *EncryptedUsrCod)
{
extern const char *The_ClassFormLinkOutBoxBold[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Calculate;
Frm_BeginForm (ActCalFig);
Usr_PutParamUsrCodEncrypted (EncryptedUsrCod);
/***** Put button to refresh *****/
HTM_BUTTON_OnSubmit_Begin (Txt_Calculate,
NULL,
"class=\"%s\"",The_ClassFormLinkOutBoxBold[Gbl.Prefs.Theme]);
HTM_BUTTON_Submit_Begin (Txt_Calculate,
"class=\"BT_LINK FORM_OUT_%s BOLD\"",
The_Colors[Gbl.Prefs.Theme]);
Ico_PutIconTextLink ("recycle.svg",Ico_BLACK,Txt_Calculate);
HTM_BUTTON_End ();
@ -863,9 +863,9 @@ static void Prf_ShowRanking (unsigned Rank,unsigned NumUsrs)
if (asprintf (&Title,"#%u %s %u",
Rank,Txt_of_PART_OF_A_TOTAL,NumUsrs) < 0)
Err_NotEnoughMemoryExit ();
HTM_BUTTON_OnSubmit_Begin (Title,NULL,
"class=\"BT_LINK FORM_OUT_%s\"",
The_Colors[Gbl.Prefs.Theme]);
HTM_BUTTON_Submit_Begin (Title,
"class=\"BT_LINK FORM_OUT_%s\"",
The_Colors[Gbl.Prefs.Theme]);
free (Title);
HTM_TxtF ("#%u",Rank);
HTM_BUTTON_End ();
@ -1350,8 +1350,8 @@ static void Prf_ShowUsrInRanking (struct UsrData *UsrDat,unsigned Rank,bool ItsM
{
Frm_BeginForm (ActSeeOthPubPrf);
Usr_PutParamUsrCodEncrypted (UsrDat->EnUsrCod);
HTM_BUTTON_OnSubmit_Begin (Txt_Another_user_s_profile,NULL,
"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (Txt_Another_user_s_profile,
"class=\"BT_LINK\"");
Usr_WriteFirstNameBRSurnames (UsrDat);
HTM_BUTTON_End ();
Frm_EndForm ();

8
swad_project.c
View File

@ -1009,8 +1009,8 @@ static void Prj_ShowProjectsHead (struct Prj_Projects *Projects,
Order,
Projects->CurrentPage,
-1L);
HTM_BUTTON_OnSubmit_Begin (Txt_PROJECT_ORDER_HELP[Order],NULL,
"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (Txt_PROJECT_ORDER_HELP[Order],
"class=\"BT_LINK\"");
if (Order == Projects->SelectedOrder)
HTM_U_Begin ();
HTM_Txt (Txt_PROJECT_ORDER[Order]);
@ -1383,8 +1383,8 @@ static void Prj_ShowOneProject (struct Prj_Projects *Projects,
{
Frm_BeginForm (ActAdmDocPrj);
Prj_PutCurrentParams (Projects);
HTM_BUTTON_OnSubmit_Begin (Txt_Project_files,NULL,
"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (Txt_Project_files,
"class=\"BT_LINK\"");
HTM_Txt (Prj->Title);
HTM_BUTTON_End ();
Frm_EndForm ();

4
swad_question.c
View File

@ -944,8 +944,8 @@ void Qst_WriteHeadingRowQuestionsForEdition (struct Qst_Questions *Questions)
Frm_BeginForm (ActLstTstQst);
Qst_PutParamsEditQst (Questions);
Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order);
HTM_BUTTON_OnSubmit_Begin (Txt_TST_STR_ORDER_FULL[Order],NULL,
"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (Txt_TST_STR_ORDER_FULL[Order],
"class=\"BT_LINK\"");
if (Order == Questions->SelectedOrder)
HTM_U_Begin ();
}

7
swad_question_import.c
View File

@ -169,7 +169,7 @@ void QstImp_ShowFormImpQstsFromXML (void)
void QstImp_CreateXML (unsigned NumQsts,MYSQL_RES *mysql_res)
{
extern const char *The_ClassFormOutBoxBold[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_NEW_LINE;
extern const char *Txt_XML_file;
char PathPubFile[PATH_MAX + 1];
@ -223,11 +223,12 @@ void QstImp_CreateXML (unsigned NumQsts,MYSQL_RES *mysql_res)
mysql_data_seek (mysql_res,0);
/***** Write the link to XML file *****/
HTM_A_Begin ("href=\"%s/%s/%s/test.xml\" class=\"%s\" target=\"_blank\"",
HTM_A_Begin ("href=\"%s/%s/%s/test.xml\" target=\"_blank\""
" class=\"FORM_OUT_%s BOLD\"",
Cfg_URL_FILE_BROWSER_TMP_PUBLIC,
Gbl.FileBrowser.TmpPubDir.L,
Gbl.FileBrowser.TmpPubDir.R,
The_ClassFormOutBoxBold[Gbl.Prefs.Theme]);
The_Colors[Gbl.Prefs.Theme]);
Ico_PutIconTextLink ("file.svg",Ico_BLACK,Txt_XML_file);
HTM_A_End ();
}

21
swad_record.c
View File

@ -1400,14 +1400,14 @@ static void Rec_ListRecordsTchs (Rec_SharedRecordViewType_t TypeOfView)
static void Rec_ShowLinkToPrintPreviewOfRecords (void)
{
extern const char *The_ClassFormLinkOutBoxBold[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_Print;
extern const char *Txt_record_cards_per_page;
unsigned i;
HTM_BUTTON_OnSubmit_Begin (Txt_Print,NULL,
"class=\"%s\"",The_ClassFormLinkOutBoxBold[Gbl.Prefs.Theme]);
HTM_BUTTON_Submit_Begin (Txt_Print,
"class=\"BT_LINK FORM_OUT_%s BOLD\"",
The_Colors[Gbl.Prefs.Theme]);
Ico_PutIconTextLink ("print.svg",Ico_BLACK,Txt_Print);
HTM_BUTTON_End ();
@ -1415,7 +1415,7 @@ static void Rec_ShowLinkToPrintPreviewOfRecords (void)
HTM_Txt ("(");
HTM_SELECT_Begin (HTM_DONT_SUBMIT_ON_CHANGE,
"name=\"RecsPerPag\"");
for (i = Rec_MIN_RECORDS_PER_PAGE;
for (i = Rec_MIN_RECORDS_PER_PAGE;
i <= Rec_MAX_RECORDS_PER_PAGE;
i++)
HTM_OPTION (HTM_Type_UNSIGNED,&i,
@ -2577,8 +2577,7 @@ static void Rec_ShowInstitutionInHead (struct Ins_Instit *Ins,bool PutFormLinks)
{
Frm_BeginFormGoTo (ActSeeInsInf);
Ins_PutParamInsCod (Ins->InsCod);
HTM_BUTTON_OnSubmit_Begin (Ins->FullName,NULL,
"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (Ins->FullName,"class=\"BT_LINK\"");
}
Lgo_DrawLogo (HieLvl_INS,Ins->InsCod,Ins->ShrtName,
Rec_INSTITUTION_LOGO_SIZE,NULL,true);
@ -2599,8 +2598,7 @@ static void Rec_ShowInstitutionInHead (struct Ins_Instit *Ins,bool PutFormLinks)
{
Frm_BeginFormGoTo (ActSeeInsInf);
Ins_PutParamInsCod (Ins->InsCod);
HTM_BUTTON_OnSubmit_Begin (Ins->FullName,NULL,
"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (Ins->FullName,"class=\"BT_LINK\"");
}
HTM_Txt (Ins->FullName);
if (PutFormLinks)
@ -2678,10 +2676,9 @@ static void Rec_ShowNickname (struct UsrData *UsrDat,bool PutFormLinks)
ItsMe = Usr_ItsMe (UsrDat->UsrCod);
Frm_BeginForm (ActSeeOthPubPrf);
Usr_PutParamUsrCodEncrypted (UsrDat->EnUsrCod);
HTM_BUTTON_OnSubmit_Begin (ItsMe ? Txt_My_public_profile :
Txt_Another_user_s_profile,
NULL,
"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (ItsMe ? Txt_My_public_profile :
Txt_Another_user_s_profile,
"class=\"BT_LINK\"");
}
HTM_TxtF ("@%s",UsrDat->Nickname);
if (PutFormLinks)

4
swad_room.c
View File

@ -185,8 +185,8 @@ void Roo_SeeRooms (void)
HTM_TH_Begin (HTM_HEAD_LEFT);
Frm_BeginForm (ActSeeRoo);
Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order);
HTM_BUTTON_OnSubmit_Begin (Txt_ROOMS_HELP_ORDER[Order],NULL,
"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (Txt_ROOMS_HELP_ORDER[Order],
"class=\"BT_LINK\"");
if (Order == Rooms.SelectedOrder)
HTM_U_Begin ();
HTM_Txt (Txt_ROOMS_ORDER[Order]);

10
swad_statistic.c
View File

@ -1152,8 +1152,7 @@ static void Sta_ShowDetailedAccessesList (const struct Sta_Stats *Stats,
{
if (asprintf (&Title,Txt_Show_previous_X_clicks,Stats->RowsPerPage) < 0)
Err_NotEnoughMemoryExit ();
HTM_BUTTON_OnSubmit_Begin (Title,NULL,
"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (Title,"class=\"BT_LINK\"");
free (Title);
HTM_TxtF ("&lt;%s",Txt_PAGES_Previous);
HTM_BUTTON_End ();
@ -1187,8 +1186,7 @@ static void Sta_ShowDetailedAccessesList (const struct Sta_Stats *Stats,
{
if (asprintf (&Title,Txt_Show_next_X_clicks,Stats->RowsPerPage) < 0)
Err_NotEnoughMemoryExit ();
HTM_BUTTON_OnSubmit_Begin (Title,NULL,
"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (Title,"class=\"BT_LINK\"");
free (Title);
HTM_TxtF ("%s&gt;",Txt_PAGES_Next);
HTM_BUTTON_End ();
@ -3297,8 +3295,8 @@ static void Sta_ShowNumHitsPerCourse (Sta_CountType_t CountType,
{
Frm_BeginFormGoTo (ActSeeCrsInf);
Crs_PutParamCrsCod (Crs.CrsCod);
HTM_BUTTON_OnSubmit_Begin (Str_BuildGoToTitle (Crs.FullName),
NULL,"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (Str_BuildGoToTitle (Crs.FullName),
"class=\"BT_LINK\"");
Str_FreeGoToTitle ();
HTM_Txt (Crs.ShrtName);
HTM_BUTTON_End ();

7
swad_survey.c
View File

@ -257,8 +257,8 @@ static void Svy_ListAllSurveys (struct Svy_Surveys *Surveys)
Grp_PutParamWhichGroups (&WhichGroups);
Pag_PutHiddenParamPagNum (Pag_SURVEYS,Surveys->CurrentPage);
Dat_PutHiddenParamOrder (Order);
HTM_BUTTON_OnSubmit_Begin (Txt_START_END_TIME_HELP[Order],
NULL,"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (Txt_START_END_TIME_HELP[Order],
"class=\"BT_LINK\"");
if (Order == Surveys->SelectedOrder)
HTM_U_Begin ();
HTM_Txt (Txt_START_END_TIME[Order]);
@ -538,8 +538,7 @@ static void Svy_ShowOneSurvey (struct Svy_Surveys *Surveys,
WhichGroups = Grp_GetParamWhichGroups ();
Grp_PutParamWhichGroups (&WhichGroups);
Pag_PutHiddenParamPagNum (Pag_SURVEYS,Surveys->CurrentPage);
HTM_BUTTON_OnSubmit_Begin (Txt_View_survey,NULL,
"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (Txt_View_survey,"class=\"BT_LINK\"");
HTM_Txt (Svy.Title);
HTM_BUTTON_End ();
Frm_EndForm ();

2
swad_system_config.c
View File

@ -311,7 +311,7 @@ static void SysCfg_NumCtys (void)
/* Data */
HTM_TD_Begin ("class=\"LB DAT_%s\"",The_Colors[Gbl.Prefs.Theme]);
Frm_BeginFormGoTo (ActSeeCty);
HTM_BUTTON_OnSubmit_Begin (Txt_Countries,NULL,"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (Txt_Countries,"class=\"BT_LINK\"");
HTM_Unsigned (Cty_GetCachedNumCtysInSys ());
HTM_BUTTON_End ();
Frm_EndForm ();

4
swad_tab.c
View File

@ -119,8 +119,8 @@ void Tab_DrawTabs (void)
Frm_BeginForm (ActMnu);
Par_PutHiddenParamUnsigned (NULL,"NxtTab",(unsigned) NumTab);
HTM_BUTTON_OnSubmit_Begin (Txt_TABS_TXT[NumTab],NULL,
"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (Txt_TABS_TXT[NumTab],
"class=\"BT_LINK\"");
HTM_IMG (Gbl.Prefs.URLIconSet,Tab_GetIcon (NumTab),Txt_TABS_TXT[NumTab],
"class=\"TAB_ICO%s\"",ClassIcoTab[Gbl.Prefs.IconSet][Gbl.Prefs.Theme]);
HTM_DIV_Begin ("class=\"TAB_TXT TAB_%s_TXT_%s\"",

88
swad_theme.c
View File

@ -78,94 +78,6 @@ const char *The_ThemeNames[The_NUM_THEMES] =
[The_THEME_DARK ] = "Dark",
};
const char *The_ClassFormLinkInBox[The_NUM_THEMES] =
{
[The_THEME_WHITE ] = "BT_LINK FORM_IN_WHITE",
[The_THEME_GREY ] = "BT_LINK FORM_IN_GREY",
[The_THEME_PURPLE] = "BT_LINK FORM_IN_PURPLE",
[The_THEME_BLUE ] = "BT_LINK FORM_IN_BLUE",
[The_THEME_YELLOW] = "BT_LINK FORM_IN_YELLOW",
[The_THEME_PINK ] = "BT_LINK FORM_IN_PINK",
[The_THEME_DARK ] = "BT_LINK FORM_IN_DARK",
};
const char *The_ClassFormLinkInBoxBold[The_NUM_THEMES] =
{
[The_THEME_WHITE ] = "BT_LINK FORM_IN_WHITE BOLD",
[The_THEME_GREY ] = "BT_LINK FORM_IN_GREY BOLD",
[The_THEME_PURPLE] = "BT_LINK FORM_IN_PURPLE BOLD",
[The_THEME_BLUE ] = "BT_LINK FORM_IN_BLUE BOLD",
[The_THEME_YELLOW] = "BT_LINK FORM_IN_YELLOW BOLD",
[The_THEME_PINK ] = "BT_LINK FORM_IN_PINK BOLD",
[The_THEME_DARK ] = "BT_LINK FORM_IN_DARK BOLD",
};
const char *The_ClassFormInBoxBold[The_NUM_THEMES] =
{
[The_THEME_WHITE ] = "FORM_IN_WHITE BOLD",
[The_THEME_GREY ] = "FORM_IN_GREY BOLD",
[The_THEME_PURPLE] = "FORM_IN_PURPLE BOLD",
[The_THEME_BLUE ] = "FORM_IN_BLUE BOLD",
[The_THEME_YELLOW] = "FORM_IN_YELLOW BOLD",
[The_THEME_PINK ] = "FORM_IN_PINK BOLD",
[The_THEME_DARK ] = "FORM_IN_DARK BOLD",
};
const char *The_ClassFormLinkInBoxNoWrap[The_NUM_THEMES] =
{
[The_THEME_WHITE ] = "BT_LINK FORM_IN_WHITE NOWRAP",
[The_THEME_GREY ] = "BT_LINK FORM_IN_GREY NOWRAP",
[The_THEME_PURPLE] = "BT_LINK FORM_IN_PURPLE NOWRAP",
[The_THEME_BLUE ] = "BT_LINK FORM_IN_BLUE NOWRAP",
[The_THEME_YELLOW] = "BT_LINK FORM_IN_YELLOW NOWRAP",
[The_THEME_PINK ] = "BT_LINK FORM_IN_PINK NOWRAP",
[The_THEME_DARK ] = "BT_LINK FORM_IN_DARK NOWRAP",
};
const char *The_ClassFormInBoxNoWrap[The_NUM_THEMES] =
{
[The_THEME_WHITE ] = "FORM_IN_WHITE NOWRAP",
[The_THEME_GREY ] = "FORM_IN_GREY NOWRAP",
[The_THEME_PURPLE] = "FORM_IN_PURPLE NOWRAP",
[The_THEME_BLUE ] = "FORM_IN_BLUE NOWRAP",
[The_THEME_YELLOW] = "FORM_IN_YELLOW NOWRAP",
[The_THEME_PINK ] = "FORM_IN_PINK NOWRAP",
[The_THEME_DARK ] = "FORM_IN_DARK NOWRAP",
};
const char *The_ClassFormOutBox[The_NUM_THEMES] =
{
[The_THEME_WHITE ] = "FORM_OUT_WHITE",
[The_THEME_GREY ] = "FORM_OUT_GREY",
[The_THEME_PURPLE] = "FORM_OUT_PURPLE",
[The_THEME_BLUE ] = "FORM_OUT_BLUE",
[The_THEME_YELLOW] = "FORM_OUT_YELLOW",
[The_THEME_PINK ] = "FORM_OUT_PINK",
[The_THEME_DARK ] = "FORM_OUT_DARK",
};
const char *The_ClassFormLinkOutBoxBold[The_NUM_THEMES] =
{
[The_THEME_WHITE ] = "BT_LINK FORM_OUT_WHITE BOLD",
[The_THEME_GREY ] = "BT_LINK FORM_OUT_GREY BOLD",
[The_THEME_PURPLE] = "BT_LINK FORM_OUT_PURPLE BOLD",
[The_THEME_BLUE ] = "BT_LINK FORM_OUT_BLUE BOLD",
[The_THEME_YELLOW] = "BT_LINK FORM_OUT_YELLOW BOLD",
[The_THEME_PINK ] = "BT_LINK FORM_OUT_PINK BOLD",
[The_THEME_DARK ] = "BT_LINK FORM_OUT_DARK BOLD",
};
const char *The_ClassFormOutBoxBold[The_NUM_THEMES] =
{
[The_THEME_WHITE ] = "FORM_OUT_WHITE BOLD",
[The_THEME_GREY ] = "FORM_OUT_GREY BOLD",
[The_THEME_PURPLE] = "FORM_OUT_PURPLE BOLD",
[The_THEME_BLUE ] = "FORM_OUT_BLUE BOLD",
[The_THEME_YELLOW] = "FORM_OUT_YELLOW BOLD",
[The_THEME_PINK ] = "FORM_OUT_PINK BOLD",
[The_THEME_DARK ] = "FORM_OUT_DARK BOLD",
};
const char *The_Colors[The_NUM_THEMES] =
{
[The_THEME_WHITE ] = "WHITE",

24
swad_timeline_comment.c
View File

@ -509,20 +509,15 @@ static void TmlCom_LinkToShowComms (TmlCom_ContractExpand_t ConExp,
static void TmlCom_PutIconToToggleComms (const char *UniqueId,
const char *Icon,const char *Text)
{
extern const char *The_ClassFormLinkInBox[The_NUM_THEMES];
char *OnClick;
/***** Build onclick text *****/
if (asprintf (&OnClick,"toggleComments('%s');return false;",UniqueId) < 0)
Err_NotEnoughMemoryExit ();
extern const char *The_Colors[The_NUM_THEMES];
/***** Link to toggle on/off some divs *****/
HTM_BUTTON_OnClick_Begin (Text,The_ClassFormLinkInBox[Gbl.Prefs.Theme],OnClick);
HTM_BUTTON_Begin (Text,
"class=\"BT_LINK FORM_IN_%s\""
" onclick=\"toggleComments('%s');return false;\"",
The_Colors[Gbl.Prefs.Theme],UniqueId);
Ico_PutIconTextLink (Icon,Ico_BLACK,Text);
HTM_BUTTON_End ();
/***** Free onclick text *****/
free (OnClick);
}
/*****************************************************************************/
@ -630,11 +625,10 @@ static void TmlCom_WriteAuthorName (const struct UsrData *UsrDat) // Author
Usr_PutParamUsrCodEncrypted (UsrDat->EnUsrCod);
/* Author's name */
HTM_BUTTON_OnSubmit_Begin (Usr_ItsMe (UsrDat->UsrCod) ? Txt_My_public_profile :
Txt_Another_user_s_profile,
NULL,
"class=\"Tml_COM_AUTHOR Tml_COM_AUTHOR_WIDTH BT_LINK DAT_%s BOLD\"",
The_Colors[Gbl.Prefs.Theme]);
HTM_BUTTON_Submit_Begin (Usr_ItsMe (UsrDat->UsrCod) ? Txt_My_public_profile :
Txt_Another_user_s_profile,
"class=\"Tml_COM_AUTHOR Tml_COM_AUTHOR_WIDTH BT_LINK DAT_%s BOLD\"",
The_Colors[Gbl.Prefs.Theme]);
HTM_Txt (UsrDat->FullName);
HTM_BUTTON_End ();

6
swad_timeline_form.c
View File

@ -345,9 +345,9 @@ void TmlFrm_FormToShowHiddenComms (long NotCod,
free (OnSubmit);
/* Put icon and text with link to show the first hidden comments */
HTM_BUTTON_OnSubmit_Begin (NULL,NULL,
"class=\"BT_LINK FORM_IN_%s\"",
The_Colors[Gbl.Prefs.Theme]);
HTM_BUTTON_Submit_Begin (NULL,
"class=\"BT_LINK FORM_IN_%s\"",
The_Colors[Gbl.Prefs.Theme]);
if (asprintf (&Text,Txt_See_the_previous_X_COMMENTS,NumInitialComms) < 0)
Err_NotEnoughMemoryExit ();
Ico_PutIconTextLink ("angle-up.svg",Ico_BLACK,Text);

15
swad_timeline_note.c
View File

@ -355,10 +355,9 @@ void TmlNot_WriteAuthorName (const struct UsrData *UsrDat,
Usr_PutParamUsrCodEncrypted (UsrDat->EnUsrCod);
/* Author's name */
HTM_BUTTON_OnSubmit_Begin (Usr_ItsMe (UsrDat->UsrCod) ? Txt_My_public_profile :
Txt_Another_user_s_profile,
NULL,
"class=\"%s\"",Class);
HTM_BUTTON_Submit_Begin (Usr_ItsMe (UsrDat->UsrCod) ? Txt_My_public_profile :
Txt_Another_user_s_profile,
"class=\"%s\"",Class);
HTM_Txt (UsrDat->FullName);
HTM_BUTTON_End ();
@ -543,7 +542,7 @@ static void TmlNot_PutFormGoToAction (const struct TmlNot_Note *Not,
const struct For_Forums *Forums)
{
extern const Act_Action_t For_ActionsSeeFor[For_NUM_TYPES_FORUM];
extern const char *The_ClassFormInBoxBold[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_TIMELINE_NOTE[Tml_NOT_NUM_NOTE_TYPES];
extern const char *Txt_not_available;
char *Anchor = NULL;
@ -689,9 +688,9 @@ static void TmlNot_PutFormGoToAction (const struct TmlNot_Note *Not,
/***** Icon and link to go to action *****/
/* Begin button */
HTM_BUTTON_OnSubmit_Begin (Txt_TIMELINE_NOTE[Not->Type],NULL,
"class=\"BT_LINK %s ICO_HIGHLIGHT\"",
The_ClassFormInBoxBold[Gbl.Prefs.Theme]);
HTM_BUTTON_Submit_Begin (Txt_TIMELINE_NOTE[Not->Type],
"class=\"BT_LINK FORM_IN_WHITE %s ICO_HIGHLIGHT\"",
The_Colors[Gbl.Prefs.Theme]);
/* Icon and text */
Ico_PutIcon (Tml_Icons[Not->Type],Ico_BLACK,

3
swad_timeline_post.c
View File

@ -243,8 +243,7 @@ void TmlPst_PutTextarea (const char *Placeholder,const char *ClassTextArea)
free (ClassInput);
/***** Submit button *****/
HTM_BUTTON_OnSubmit_Begin (NULL,NULL,
"class=\"BT_SUBMIT_INLINE BT_CREATE\"");
HTM_BUTTON_Submit_Begin (NULL,"class=\"BT_SUBMIT_INLINE BT_CREATE\"");
HTM_Txt (Txt_Post);
HTM_BUTTON_End ();

16
swad_timeline_publication.c
View File

@ -458,7 +458,7 @@ Tml_TopMessage_t TmlPub_GetTopMessage (TmlPub_Type_t PubType)
void TmlPub_PutLinkToViewNewPubs (void)
{
extern const char *The_ClassFormInBoxBold[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_See_new_activity;
/***** Link to view (show hidden) new publications *****/
@ -469,9 +469,9 @@ void TmlPub_PutLinkToViewNewPubs (void)
" style=\"display:none;\"");
/* Begin anchor */
HTM_A_Begin ("href=\"\" class=\"%s\""
HTM_A_Begin ("href=\"\" class=\"FORM_IN_%s BOLD\""
" onclick=\"moveNewTimelineToTimeline();return false;\"",
The_ClassFormInBoxBold[Gbl.Prefs.Theme]);
The_Colors[Gbl.Prefs.Theme]);
/* Text */
HTM_TxtF ("%s (",Txt_See_new_activity);
@ -493,7 +493,7 @@ void TmlPub_PutLinkToViewNewPubs (void)
void TmlPub_PutLinkToViewOldPubs (void)
{
extern const char *The_ClassFormLinkInBoxBold[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_See_more;
/***** Begin container *****/
@ -502,10 +502,10 @@ void TmlPub_PutLinkToViewOldPubs (void)
/***** Put button to refresh *****/
HTM_BUTTON_OnClick_Begin (Txt_See_more,
The_ClassFormLinkInBoxBold[Gbl.Prefs.Theme],
"refreshOldTimeline();"
"return false;");
HTM_BUTTON_Begin (Txt_See_more,
"class=\"BT_LINK FORM_IN_%s BOLD\""
" onclick=\"refreshOldTimeline();return false;\"",
The_Colors[Gbl.Prefs.Theme]);
Ico_PutIconTextLink ("recycle.svg",Ico_BLACK,Txt_See_more);
HTM_BUTTON_End ();

17
swad_user.c
View File

@ -1366,7 +1366,7 @@ void Usr_WriteLoggedUsrHead (void)
if (NumAvailableRoles == 1)
{
Frm_BeginForm (ActFrmRolSes);
HTM_BUTTON_OnSubmit_Begin (Txt_Role,NULL,"class=\"BT_LINK\"");
HTM_BUTTON_Submit_Begin (Txt_Role,"class=\"BT_LINK\"");
HTM_Txt (Txt_ROLES_SINGUL_Abc[Gbl.Usrs.Me.Role.Logged][Gbl.Usrs.Me.UsrDat.Sex]);
HTM_BUTTON_End ();
Frm_EndForm ();
@ -3661,7 +3661,7 @@ void Usr_ShowFormsToSelectUsrListType (void (*FuncParams) (void *Args),void *Arg
static void Set_FormToSelectUsrListType (void (*FuncParams) (void *Args),void *Args,
Set_ShowUsrsType_t ListType)
{
extern const char *The_ClassFormLinkInBoxNoWrap[The_NUM_THEMES];
extern const char *The_Colors[The_NUM_THEMES];
extern const char *Txt_USR_LIST_TYPES[Set_NUM_USR_LIST_TYPES];
/***** Begin form *****/
@ -3674,10 +3674,11 @@ static void Set_FormToSelectUsrListType (void (*FuncParams) (void *Args),void *A
FuncParams (Args);
/***** Link and image *****/
HTM_BUTTON_OnSubmit_Begin (Txt_USR_LIST_TYPES[ListType],
Gbl.Action.Act == ActReqMsgUsr ? "CopyMessageToHiddenFields();" :
NULL,
"class=\"%s\"",The_ClassFormLinkInBoxNoWrap[Gbl.Prefs.Theme]);
HTM_BUTTON_Submit_Begin (Txt_USR_LIST_TYPES[ListType],
"class=\"BT_LINK FORM_IN_%s NOWRAP\"%s",
The_Colors[Gbl.Prefs.Theme],
Gbl.Action.Act == ActReqMsgUsr ? " onsubmit=\"CopyMessageToHiddenFields();\"" :
"");
Ico_PutIcon (Usr_IconsClassPhotoOrList[ListType],Ico_BLACK,
Txt_USR_LIST_TYPES[ListType],"ICO20x20");
HTM_TxtF ("&nbsp;%s",Txt_USR_LIST_TYPES[ListType]);
@ -6462,8 +6463,8 @@ void Usr_ShowTableCellWithUsrData (struct UsrData *UsrDat,unsigned NumRows)
/* Begin form to go to user's record card */
Frm_BeginForm (NextAction[UsrDat->Roles.InCurrentCrs]);
Usr_PutParamUsrCodEncrypted (UsrDat->EnUsrCod);
HTM_BUTTON_OnSubmit_Begin (UsrDat->FullName,NULL,
"class=\"BT_LINK AUTHOR_TXT\"");
HTM_BUTTON_Submit_Begin (UsrDat->FullName,
"class=\"BT_LINK AUTHOR_TXT\"");
}
/* User's ID */