mirror of https://github.com/acanas/swad-core.git
Version19.70.7
This commit is contained in:
parent
893808367a
commit
78da00d17c
|
@ -1731,13 +1731,20 @@ a:hover /* Default ==> underlined */
|
|||
}
|
||||
|
||||
/*********************************** Icons ***********************************/
|
||||
.ICOx16 { height:16px; vertical-align:middle;}
|
||||
.ICOx16 { height:16px; vertical-align:middle;}
|
||||
.ICO16x16 {width:16px; height:16px; vertical-align:middle;}
|
||||
.ICO20x20 {width:20px; height:20px; vertical-align:middle;}
|
||||
.ICOx20 { height:20px; vertical-align:middle; margin:0 auto;}
|
||||
.ICOx20 { height:20px; vertical-align:middle; margin:0 auto;}
|
||||
.ICO25x25 {width:25px; height:25px; vertical-align:middle;}
|
||||
.ICO40x40 {width:40px; height:40px; vertical-align:middle;}
|
||||
.ICO64x64 {width:64px; height:64px; vertical-align:middle;}
|
||||
|
||||
.ICO80x40 {width:80px; height:40px; vertical-align:middle;}
|
||||
.ICO140x40 {width:140px; height:40px; vertical-align:middle;}
|
||||
.ICO212x40 {width:212px; height:40px; vertical-align:middle;}
|
||||
.ICO220x40 {width:220px; height:40px; vertical-align:middle;}
|
||||
.ICO265x40 {width:265px; height:40px; vertical-align:middle;}
|
||||
|
||||
.ICO160x160 {width:160px; height:160px; vertical-align:middle;}
|
||||
.BANNER {width:150px; height:50px;}
|
||||
.BANNER_SMALL {width:75px; height:25px;}
|
||||
|
|
|
@ -455,7 +455,7 @@ bool ID_ICanSeeOtherUsrIDs (const struct UsrData *UsrDat)
|
|||
static void ID_PutLinkToConfirmID (struct UsrData *UsrDat,unsigned NumID,
|
||||
const char *Anchor)
|
||||
{
|
||||
extern const char *The_ClassFormOutBoxBold[The_NUM_THEMES];
|
||||
extern const char *The_ClassFormLinkOutBoxBold[The_NUM_THEMES];
|
||||
extern const char *Txt_Confirm_ID;
|
||||
Act_Action_t NextAction;
|
||||
|
||||
|
@ -493,10 +493,9 @@ static void ID_PutLinkToConfirmID (struct UsrData *UsrDat,unsigned NumID,
|
|||
Par_PutHiddenParamString (NULL,"UsrID",UsrDat->IDs.List[NumID].ID);
|
||||
|
||||
/***** Put link *****/
|
||||
Frm_LinkFormSubmit (Txt_Confirm_ID,The_ClassFormOutBoxBold[Gbl.Prefs.Theme],NULL);
|
||||
Ico_PutIconTextLink ("check.svg",
|
||||
Txt_Confirm_ID);
|
||||
Frm_LinkFormEnd ();
|
||||
HTM_BUTTON_Begin (Txt_Confirm_ID,The_ClassFormLinkOutBoxBold[Gbl.Prefs.Theme],NULL);
|
||||
Ico_PutIconTextLink ("check.svg",Txt_Confirm_ID);
|
||||
HTM_BUTTON_End ();
|
||||
|
||||
/***** End form *****/
|
||||
Frm_EndForm ();
|
||||
|
|
|
@ -488,13 +488,14 @@ enscript -2 --landscape --color --file-align=2 --highlight --line-numbers -o - *
|
|||
En OpenSWAD:
|
||||
ps2pdf source.ps destination.pdf
|
||||
*/
|
||||
#define Log_PLATFORM_VERSION "SWAD 19.70.6 (2019-11-17)"
|
||||
#define Log_PLATFORM_VERSION "SWAD 19.70.7 (2019-11-17)"
|
||||
#define CSS_FILE "swad19.70.css"
|
||||
#define JS_FILE "swad19.70.js"
|
||||
/*
|
||||
// TODO: Hacer un nuevo rol en los TFG: tutor externo (profesor de áreas no vinculadas con el centro, profesionales de empresas, etc.)
|
||||
// TODO: Impedir la creación y edición de proyectos si no son editables.
|
||||
|
||||
Version 19.70.7: Nov 17, 2019 Converting links to buttons. (247095 lines)
|
||||
Version 19.70.6: Nov 17, 2019 Converting links to buttons. (247093 lines)
|
||||
Version 19.70.5: Nov 17, 2019 Converting links to buttons. (247064 lines)
|
||||
Version 19.70.4: Nov 17, 2019 Converting links to buttons. (247063 lines)
|
||||
|
|
|
@ -304,14 +304,14 @@ void Cht_ShowListOfChatRoomsWithUsrs (void)
|
|||
static void Cht_WriteLinkToChat1 (const char *RoomCode,const char *RoomShrtName,const char *RoomFullName,
|
||||
unsigned Level,bool IsLastItemInLevel[1 + Cht_CHAT_MAX_LEVELS])
|
||||
{
|
||||
extern const char *The_ClassFormLink[The_NUM_THEMES];
|
||||
extern const char *The_ClassFormLinkInBox[The_NUM_THEMES];
|
||||
|
||||
HTM_LI_Begin (NULL);
|
||||
Lay_IndentDependingOnLevel (Level,IsLastItemInLevel);
|
||||
Frm_StartForm (ActCht);
|
||||
Cht_WriteParamsRoomCodeAndNames (RoomCode,RoomShrtName,RoomFullName);
|
||||
|
||||
HTM_BUTTON_Begin (RoomFullName,The_ClassFormLink[Gbl.Prefs.Theme],NULL);
|
||||
HTM_BUTTON_Begin (RoomFullName,The_ClassFormLinkInBox[Gbl.Prefs.Theme],NULL);
|
||||
}
|
||||
|
||||
static void Cht_WriteLinkToChat2 (const char *RoomCode,const char *RoomFullName)
|
||||
|
|
|
@ -59,11 +59,9 @@
|
|||
#define Cfg_PATH_SWAD_PRIVATE "/var/www/swad" // Main private directory for SWAD private data
|
||||
|
||||
#define Cfg_PLATFORM_LOGO_SMALL_FILENAME "swad64x64.png" // Logo displayed in the top of the page
|
||||
#define Cfg_PLATFORM_LOGO_SMALL_WIDTH 40
|
||||
#define Cfg_PLATFORM_LOGO_SMALL_HEIGHT 40
|
||||
#define Cfg_PLATFORM_LOGO_SMALL_CLASS "ICO40x40"
|
||||
#define Cfg_PLATFORM_LOGO_BIG_FILENAME "swad140x40.png"
|
||||
#define Cfg_PLATFORM_LOGO_BIG_WIDTH 140
|
||||
#define Cfg_PLATFORM_LOGO_BIG_HEIGHT 40
|
||||
#define Cfg_PLATFORM_LOGO_BIG_CLASS "ICO140x40"
|
||||
|
||||
#define Cfg_PLATFORM_RESPONSIBLE_NAME "Antonio Cañas Vargas" // Main responsible for the platform
|
||||
#define Cfg_PLATFORM_RESPONSIBLE_EMAIL "webmaster@openswad.org" // Main responsible for the platform
|
||||
|
@ -100,11 +98,9 @@
|
|||
#define Cfg_PATH_SWAD_PRIVATE "/var/www/swad" // Main private directory for SWAD private data
|
||||
|
||||
#define Cfg_PLATFORM_LOGO_SMALL_FILENAME "swad64x64.png" // Logo displayed in the top of the page
|
||||
#define Cfg_PLATFORM_LOGO_SMALL_WIDTH 40
|
||||
#define Cfg_PLATFORM_LOGO_SMALL_HEIGHT 40
|
||||
#define Cfg_PLATFORM_LOGO_SMALL_CLASS "ICO40x40"
|
||||
#define Cfg_PLATFORM_LOGO_BIG_FILENAME "openswad220x40.png"
|
||||
#define Cfg_PLATFORM_LOGO_BIG_WIDTH 220
|
||||
#define Cfg_PLATFORM_LOGO_BIG_HEIGHT 40
|
||||
#define Cfg_PLATFORM_LOGO_BIG_CLASS "ICO220x40"
|
||||
|
||||
#define Cfg_PLATFORM_RESPONSIBLE_NAME "Antonio Cañas Vargas" // Main responsible for the platform
|
||||
#define Cfg_PLATFORM_RESPONSIBLE_EMAIL "webmaster@openswad.org" // Main responsible for the platform
|
||||
|
@ -162,11 +158,9 @@
|
|||
#define Cfg_PATH_SWAD_PRIVATE "/var/www/swad" // Main private directory for SWAD private data
|
||||
|
||||
#define Cfg_PLATFORM_LOGO_SMALL_FILENAME "swad-ugr160x80.png" // Logo displayed in the top of the page
|
||||
#define Cfg_PLATFORM_LOGO_SMALL_WIDTH 80
|
||||
#define Cfg_PLATFORM_LOGO_SMALL_HEIGHT 40
|
||||
#define Cfg_PLATFORM_LOGO_SMALL_CLASS "ICO80x40"
|
||||
#define Cfg_PLATFORM_LOGO_BIG_FILENAME "swad-ugr530x80.png"
|
||||
#define Cfg_PLATFORM_LOGO_BIG_WIDTH 265
|
||||
#define Cfg_PLATFORM_LOGO_BIG_HEIGHT 40
|
||||
#define Cfg_PLATFORM_LOGO_BIG_CLASS "ICO265x40"
|
||||
|
||||
#define Cfg_PLATFORM_RESPONSIBLE_NAME "UGR" // Main responsible for the platform
|
||||
#define Cfg_PLATFORM_RESPONSIBLE_EMAIL "swad@ugr.es" // Main responsible for the platform
|
||||
|
@ -221,11 +215,9 @@
|
|||
#define Cfg_PATH_SWAD_PRIVATE "/var/www/swad" // Main private directory for SWAD private data
|
||||
|
||||
#define Cfg_PLATFORM_LOGO_SMALL_FILENAME "swad64x64.png" // Logo displayed in the top of the page
|
||||
#define Cfg_PLATFORM_LOGO_SMALL_WIDTH 40
|
||||
#define Cfg_PLATFORM_LOGO_SMALL_HEIGHT 40
|
||||
#define Cfg_PLATFORM_LOGO_SMALL_CLASS "ICO40x40"
|
||||
#define Cfg_PLATFORM_LOGO_BIG_FILENAME "SWADberry212x40.png"
|
||||
#define Cfg_PLATFORM_LOGO_BIG_WIDTH 212
|
||||
#define Cfg_PLATFORM_LOGO_BIG_HEIGHT 40
|
||||
#define Cfg_PLATFORM_LOGO_BIG_CLASS "ICO212x40"
|
||||
|
||||
#define Cfg_PLATFORM_RESPONSIBLE_NAME "ATC - UGR" // Main responsible for the platform
|
||||
#define Cfg_PLATFORM_RESPONSIBLE_EMAIL "swad@ugr.es" // Main responsible for the platform
|
||||
|
|
|
@ -519,8 +519,8 @@ static void Crs_ShowNumUsrsInCrs (Rol_Role_t Role)
|
|||
static void Crs_WriteListMyCoursesToSelectOne (void)
|
||||
{
|
||||
extern const char *Hlp_PROFILE_Courses;
|
||||
extern const char *The_ClassFormLink[The_NUM_THEMES];
|
||||
extern const char *The_ClassFormLinkBold[The_NUM_THEMES];
|
||||
extern const char *The_ClassFormLinkInBox[The_NUM_THEMES];
|
||||
extern const char *The_ClassFormLinkInBoxBold[The_NUM_THEMES];
|
||||
extern const char *Txt_My_courses;
|
||||
extern const char *Txt_System;
|
||||
extern const char *Txt_Go_to_X;
|
||||
|
@ -551,10 +551,10 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
|
|||
const char *ClassNormal;
|
||||
char ClassHighlight[64];
|
||||
|
||||
ClassNormal = The_ClassFormLink[Gbl.Prefs.Theme];
|
||||
ClassNormal = The_ClassFormLinkInBox[Gbl.Prefs.Theme];
|
||||
snprintf (ClassHighlight,sizeof (ClassHighlight),
|
||||
"%s LIGHT_BLUE",
|
||||
The_ClassFormLinkBold[Gbl.Prefs.Theme]);
|
||||
The_ClassFormLinkInBoxBold[Gbl.Prefs.Theme]);
|
||||
|
||||
/***** Begin box *****/
|
||||
Box_BoxBegin (NULL,Txt_My_courses,Crs_PutIconToSearchCourses,
|
||||
|
|
|
@ -2483,7 +2483,7 @@ void Hie_GetAndWriteInsCtrDegAdminBy (long UsrCod,unsigned ColSpan)
|
|||
|
||||
/* Write institution logo and name */
|
||||
Ins_DrawInstitutionLogoAndNameWithLink (&Ins,ActSeeInsInf,
|
||||
"DAT_SMALL_NOBR","LT");
|
||||
"BT_LINK DAT_SMALL_NOBR","LT");
|
||||
}
|
||||
break;
|
||||
case Hie_CTR: // Centre
|
||||
|
|
|
@ -1394,7 +1394,7 @@ static void Fig_ShowInss (MYSQL_RES **mysql_res,unsigned NumInss,
|
|||
const char *TxtFigure)
|
||||
{
|
||||
extern const char *The_ClassFormInBox[The_NUM_THEMES];
|
||||
extern const char *The_ClassFormLink[The_NUM_THEMES];
|
||||
extern const char *The_ClassFormLinkInBox[The_NUM_THEMES];
|
||||
extern const char *Txt_Institution;
|
||||
unsigned NumIns;
|
||||
unsigned NumOrder;
|
||||
|
@ -1476,7 +1476,7 @@ static void Fig_ShowInss (MYSQL_RES **mysql_res,unsigned NumInss,
|
|||
/* Icon and name of this institution */
|
||||
Frm_StartForm (ActSeeInsInf);
|
||||
Ins_PutParamInsCod (Ins.InsCod);
|
||||
HTM_BUTTON_Begin (Ins.ShrtName,The_ClassFormLink[Gbl.Prefs.Theme],NULL);
|
||||
HTM_BUTTON_Begin (Ins.ShrtName,The_ClassFormLinkInBox[Gbl.Prefs.Theme],NULL);
|
||||
if (Gbl.Usrs.Listing.WithPhotos)
|
||||
{
|
||||
Log_DrawLogo (Hie_INS,Ins.InsCod,Ins.ShrtName,
|
||||
|
|
|
@ -213,9 +213,9 @@ void Fol_SuggestUsrsToFollowMainZoneOnRightColumn (void)
|
|||
|
||||
/***** Title with link to suggest more users to follow *****/
|
||||
Frm_StartForm (ActSeeSocPrf);
|
||||
Frm_LinkFormSubmit (Txt_Who_to_follow,"CONNECTED_TXT",NULL);
|
||||
HTM_BUTTON_Begin (Txt_Who_to_follow,"BT_LINK CONNECTED_TXT",NULL);
|
||||
HTM_Txt (Txt_Who_to_follow);
|
||||
Frm_LinkFormEnd ();
|
||||
HTM_BUTTON_End ();
|
||||
Frm_EndForm ();
|
||||
|
||||
/***** Begin table *****/
|
||||
|
@ -552,28 +552,16 @@ void Fol_ShowFollowingAndFollowers (const struct UsrData *UsrDat,
|
|||
if (Gbl.Usrs.Me.Logged && // Logged
|
||||
!ItsMe) // Not me!
|
||||
{
|
||||
if (IFollowUsr) // I follow this user
|
||||
{
|
||||
Frm_StartForm (ActUnfUsr);
|
||||
Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
|
||||
Frm_LinkFormSubmit (Txt_Following_unfollow,"REC_DAT_BOLD",NULL);
|
||||
HTM_DIV_Begin ("class=\"ICO_HIGHLIGHT\" style=\"display:inline;\"");
|
||||
Ico_PutIcon ("user-check.svg",Txt_Following_unfollow,"ICO40x40");
|
||||
HTM_DIV_End ();
|
||||
Frm_LinkFormEnd ();
|
||||
Frm_EndForm ();
|
||||
}
|
||||
else // I do not follow this user
|
||||
{
|
||||
Frm_StartForm (ActFolUsr);
|
||||
Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
|
||||
Frm_LinkFormSubmit (Txt_Follow,"REC_DAT_BOLD",NULL);
|
||||
HTM_DIV_Begin ("class=\"ICO_HIGHLIGHT\" style=\"display:inline;\"");
|
||||
Ico_PutIcon ("user-plus.svg",Txt_Follow,"ICO40x40");
|
||||
HTM_DIV_End ();
|
||||
Frm_LinkFormEnd ();
|
||||
Frm_EndForm ();
|
||||
}
|
||||
Frm_StartForm (IFollowUsr ? ActUnfUsr :
|
||||
ActFolUsr);
|
||||
Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
|
||||
HTM_INPUT_IMAGE (Cfg_URL_ICON_PUBLIC,
|
||||
IFollowUsr ? "user-check.svg" :
|
||||
"user-plus.svg",
|
||||
IFollowUsr ? Txt_Following_unfollow :
|
||||
Txt_Follow,
|
||||
"ICO_HIGHLIGHT ICO40x40");
|
||||
Frm_EndForm ();
|
||||
}
|
||||
HTM_DIV_End ();
|
||||
|
||||
|
@ -596,6 +584,8 @@ static void Fol_ShowNumberOfFollowingOrFollowers (const struct UsrData *UsrDat,
|
|||
{
|
||||
extern const char *The_ClassFormOutBox[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];
|
||||
|
||||
/***** Start container *****/
|
||||
HTM_DIV_Begin ("class=\"FOLLOW_BOX\"");
|
||||
|
@ -606,9 +596,10 @@ static void Fol_ShowNumberOfFollowingOrFollowers (const struct UsrData *UsrDat,
|
|||
/* Form to list users */
|
||||
Frm_StartFormAnchor (Action,Fol_FOLLOW_SECTION_ID);
|
||||
Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
|
||||
Frm_LinkFormSubmit (Title,
|
||||
(Gbl.Action.Act == Action) ? "FOLLOW_NUM_B" :
|
||||
"FOLLOW_NUM",NULL);
|
||||
HTM_BUTTON_Begin (Title,
|
||||
(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" :
|
||||
|
@ -616,7 +607,7 @@ static void Fol_ShowNumberOfFollowingOrFollowers (const struct UsrData *UsrDat,
|
|||
HTM_Unsigned (NumUsrs);
|
||||
if (NumUsrs)
|
||||
{
|
||||
Frm_LinkFormEnd ();
|
||||
HTM_BUTTON_End ();
|
||||
Frm_EndForm ();
|
||||
}
|
||||
else
|
||||
|
@ -631,15 +622,15 @@ static void Fol_ShowNumberOfFollowingOrFollowers (const struct UsrData *UsrDat,
|
|||
/* Form to list users */
|
||||
Frm_StartFormAnchor (Action,Fol_FOLLOW_SECTION_ID);
|
||||
Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
|
||||
Frm_LinkFormSubmit (Title,
|
||||
(Gbl.Action.Act == Action) ? The_ClassFormOutBoxBold[Gbl.Prefs.Theme] :
|
||||
The_ClassFormOutBox [Gbl.Prefs.Theme],
|
||||
NULL);
|
||||
HTM_BUTTON_Begin (Title,
|
||||
(Gbl.Action.Act == Action) ? The_ClassFormLinkOutBoxBold[Gbl.Prefs.Theme] :
|
||||
The_ClassFormLinkOutBox [Gbl.Prefs.Theme],
|
||||
NULL);
|
||||
}
|
||||
HTM_Txt (Title);
|
||||
if (NumUsrs)
|
||||
{
|
||||
Frm_LinkFormEnd ();
|
||||
HTM_BUTTON_End ();
|
||||
Frm_EndForm ();
|
||||
}
|
||||
HTM_DIV_End ();
|
||||
|
@ -851,9 +842,9 @@ static void Fol_ShowFollowedOrFollower (struct UsrData *UsrDat)
|
|||
Frm_StartForm (ActSeeOthPubPrf);
|
||||
Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
|
||||
HTM_DIV_Begin ("class=\"FOLLOW_USR_NAME\""); // Limited width
|
||||
Frm_LinkFormSubmit (Txt_Another_user_s_profile,"DAT",NULL);
|
||||
HTM_BUTTON_Begin (Txt_Another_user_s_profile,"BT_LINK DAT",NULL);
|
||||
Usr_WriteFirstNameBRSurnames (UsrDat);
|
||||
Frm_LinkFormEnd ();
|
||||
HTM_BUTTON_End ();
|
||||
HTM_DIV_End ();
|
||||
Frm_EndForm ();
|
||||
}
|
||||
|
@ -908,9 +899,9 @@ static void Fol_WriteRowUsrToFollowOnRightColumn (struct UsrData *UsrDat)
|
|||
Frm_StartForm (ActSeeOthPubPrf);
|
||||
Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
|
||||
HTM_DIV_Begin ("class=\"CON_NAME_FOLLOW\""); // Limited width
|
||||
Frm_LinkFormSubmit (Txt_Another_user_s_profile,"CON_CRS",NULL);
|
||||
HTM_BUTTON_Begin (Txt_Another_user_s_profile,"BT_LINK CON_CRS",NULL);
|
||||
Usr_WriteFirstNameBRSurnames (UsrDat);
|
||||
Frm_LinkFormEnd ();
|
||||
HTM_BUTTON_End ();
|
||||
HTM_DIV_End ();
|
||||
Frm_EndForm ();
|
||||
}
|
||||
|
@ -951,7 +942,7 @@ static void Fol_PutInactiveIconToFollowUnfollow (void)
|
|||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
/*********************** Put icon to unfollow another user *********************/
|
||||
/*********************** Put icon to follow another user *********************/
|
||||
/*****************************************************************************/
|
||||
|
||||
static void Fol_PutIconToFollow (struct UsrData *UsrDat)
|
||||
|
@ -961,11 +952,8 @@ static void Fol_PutIconToFollow (struct UsrData *UsrDat)
|
|||
/***** Form to unfollow *****/
|
||||
Frm_StartForm (ActFolUsr);
|
||||
Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
|
||||
Frm_LinkFormSubmit (Txt_Follow,NULL,NULL);
|
||||
HTM_DIV_Begin ("class=\"FOLLOW_USR_ICO ICO_HIGHLIGHT\"");
|
||||
Ico_PutIcon ("user-plus.svg",Txt_Follow,"ICO16x16");
|
||||
HTM_DIV_End ();
|
||||
Frm_LinkFormEnd ();
|
||||
HTM_INPUT_IMAGE (Cfg_URL_ICON_PUBLIC,"user-plus.svg",
|
||||
Txt_Follow,"FOLLOW_USR_ICO ICO_HIGHLIGHT ICO16x16");
|
||||
Frm_EndForm ();
|
||||
}
|
||||
|
||||
|
@ -980,11 +968,8 @@ static void Fol_PutIconToUnfollow (struct UsrData *UsrDat)
|
|||
/* Form to follow */
|
||||
Frm_StartForm (ActUnfUsr);
|
||||
Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
|
||||
Frm_LinkFormSubmit (Txt_Unfollow,NULL,NULL);
|
||||
HTM_DIV_Begin ("class=\"FOLLOW_USR_ICO ICO_HIGHLIGHT\"");
|
||||
Ico_PutIcon ("user-check.svg",Txt_Unfollow,"ICO16x16");
|
||||
HTM_DIV_End ();
|
||||
Frm_LinkFormEnd ();
|
||||
HTM_INPUT_IMAGE (Cfg_URL_ICON_PUBLIC,"user-check.svg",
|
||||
Txt_Unfollow,"FOLLOW_USR_ICO ICO_HIGHLIGHT ICO16x16");
|
||||
Frm_EndForm ();
|
||||
}
|
||||
|
||||
|
|
18
swad_forum.c
18
swad_forum.c
|
@ -2013,21 +2013,21 @@ static void For_WriteLinkToForum (struct Forum *Forum,
|
|||
unsigned Level,
|
||||
bool IsLastItemInLevel[1 + For_FORUM_MAX_LEVELS])
|
||||
{
|
||||
extern const char *The_ClassFormInBox[The_NUM_THEMES];
|
||||
extern const char *The_ClassFormInBoxBold[The_NUM_THEMES];
|
||||
extern const char *The_ClassFormLinkInBox[The_NUM_THEMES];
|
||||
extern const char *The_ClassFormLinkInBoxBold[The_NUM_THEMES];
|
||||
extern const char *Txt_Copy_not_allowed;
|
||||
unsigned NumThrs;
|
||||
unsigned NumThrsWithNewPosts;
|
||||
unsigned NumPosts;
|
||||
char ActTxt[Act_MAX_BYTES_ACTION_TXT + 1];
|
||||
const char *Style;
|
||||
const char *Class;
|
||||
char ForumName[For_MAX_BYTES_FORUM_NAME + 1];
|
||||
|
||||
/***** Get number of threads and number of posts *****/
|
||||
NumThrs = For_GetNumThrsInForum (Forum);
|
||||
NumThrsWithNewPosts = For_GetNumThrsWithNewPstsInForum (Forum,NumThrs);
|
||||
Style = (NumThrsWithNewPosts ? The_ClassFormInBoxBold[Gbl.Prefs.Theme] :
|
||||
The_ClassFormInBox[Gbl.Prefs.Theme]);
|
||||
Class = (NumThrsWithNewPosts ? The_ClassFormLinkInBoxBold[Gbl.Prefs.Theme] :
|
||||
The_ClassFormLinkInBox[Gbl.Prefs.Theme]);
|
||||
|
||||
/***** Start row *****/
|
||||
HTM_LI_Begin (Highlight ? "class=\"LIGHT_BLUE\"" :
|
||||
|
@ -2068,8 +2068,8 @@ static void For_WriteLinkToForum (struct Forum *Forum,
|
|||
Forum->Location,
|
||||
-1L,
|
||||
-1L);
|
||||
Frm_LinkFormSubmit (Act_GetActionTextFromDB (Act_GetActCod (For_ActionsSeeFor[Forum->Type]),ActTxt),
|
||||
Style,NULL);
|
||||
HTM_BUTTON_Begin (Act_GetActionTextFromDB (Act_GetActCod (For_ActionsSeeFor[Forum->Type]),ActTxt),
|
||||
Class,NULL);
|
||||
For_SetForumName (Forum,ForumName,Gbl.Prefs.Language,true);
|
||||
switch (Forum->Type)
|
||||
{
|
||||
|
@ -2544,13 +2544,13 @@ static void For_ShowForumThreadsHighlightingOneThread (long ThrCodHighlighted,
|
|||
Gbl.Forum.ForumSelected.Location,
|
||||
-1L,
|
||||
-1L);
|
||||
Frm_LinkFormSubmit (Txt_FORUM_THREAD_HELP_ORDER[Order],"TIT_TBL",NULL);
|
||||
HTM_BUTTON_Begin (Txt_FORUM_THREAD_HELP_ORDER[Order],"BT_LINK TIT_TBL",NULL);
|
||||
if (Order == Gbl.Forum.ThreadsOrder)
|
||||
HTM_U_Begin ();
|
||||
HTM_Txt (Txt_FORUM_THREAD_ORDER[Order]);
|
||||
if (Order == Gbl.Forum.ThreadsOrder)
|
||||
HTM_U_End ();
|
||||
Frm_LinkFormEnd ();
|
||||
HTM_BUTTON_End ();
|
||||
Frm_EndForm ();
|
||||
|
||||
HTM_TH_End ();
|
||||
|
|
22
swad_game.c
22
swad_game.c
|
@ -224,13 +224,13 @@ static void Gam_ListAllGames (void)
|
|||
Frm_StartForm (ActSeeAllGam);
|
||||
Pag_PutHiddenParamPagNum (Pag_GAMES,Gbl.Games.CurrentPage);
|
||||
Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order);
|
||||
Frm_LinkFormSubmit (Txt_GAMES_ORDER_HELP[Order],"TIT_TBL",NULL);
|
||||
HTM_BUTTON_Begin (Txt_GAMES_ORDER_HELP[Order],"BT_LINK TIT_TBL",NULL);
|
||||
if (Order == Gbl.Games.SelectedOrder)
|
||||
HTM_U_Begin ();
|
||||
HTM_Txt (Txt_GAMES_ORDER[Order]);
|
||||
if (Order == Gbl.Games.SelectedOrder)
|
||||
HTM_U_End ();
|
||||
Frm_LinkFormEnd ();
|
||||
HTM_BUTTON_End ();
|
||||
Frm_EndForm ();
|
||||
|
||||
HTM_TH_End ();
|
||||
|
@ -449,11 +449,12 @@ void Gam_ShowOneGame (long GamCod,
|
|||
HTM_ARTICLE_Begin (Anchor);
|
||||
Frm_StartForm (ActSeeGam);
|
||||
Gam_PutParams ();
|
||||
Frm_LinkFormSubmit (Txt_View_game,
|
||||
Game.Hidden ? "ASG_TITLE_LIGHT":
|
||||
"ASG_TITLE",NULL);
|
||||
HTM_BUTTON_Begin (Txt_View_game,
|
||||
Game.Hidden ? "BT_LINK ASG_TITLE_LIGHT":
|
||||
"BT_LINK ASG_TITLE",
|
||||
NULL);
|
||||
HTM_Txt (Game.Title);
|
||||
Frm_LinkFormEnd ();
|
||||
HTM_BUTTON_End ();
|
||||
Frm_EndForm ();
|
||||
HTM_ARTICLE_End ();
|
||||
|
||||
|
@ -474,13 +475,14 @@ void Gam_ShowOneGame (long GamCod,
|
|||
Gam_SetParamCurrentGamCod (GamCod); // Used to pass parameter
|
||||
Frm_StartForm (ActSeeGam);
|
||||
Gam_PutParams ();
|
||||
Frm_LinkFormSubmit (Txt_Matches,
|
||||
Game.Hidden ? "ASG_TITLE_LIGHT" :
|
||||
"ASG_TITLE",NULL);
|
||||
HTM_BUTTON_Begin (Txt_Matches,
|
||||
Game.Hidden ? "BT_LINK ASG_TITLE_LIGHT" :
|
||||
"BT_LINK ASG_TITLE",
|
||||
NULL);
|
||||
if (ShowOnlyThisGame)
|
||||
HTM_TxtF ("%s: ",Txt_Matches);
|
||||
HTM_Unsigned (Game.NumMchs);
|
||||
Frm_LinkFormEnd ();
|
||||
HTM_BUTTON_End ();
|
||||
Frm_EndForm ();
|
||||
|
||||
HTM_TD_End ();
|
||||
|
|
|
@ -25,7 +25,8 @@
|
|||
/********************************* Headers ***********************************/
|
||||
/*****************************************************************************/
|
||||
|
||||
#include <stdio.h> // For fprintf, etc.
|
||||
#define _GNU_SOURCE // For asprintf
|
||||
#include <stdio.h> // For fprintf, asprintf, etc.
|
||||
#include <string.h> // For string functions
|
||||
|
||||
#include "swad_config.h"
|
||||
|
@ -209,6 +210,11 @@ void Hie_WriteHierarchyInBreadcrumb (void)
|
|||
extern const char *Txt_Centre;
|
||||
extern const char *Txt_Degree;
|
||||
const char *ClassTxt = The_ClassBreadcrumb[Gbl.Prefs.Theme];
|
||||
char *ClassLink;
|
||||
|
||||
/***** Create CSS class of links *****/
|
||||
if (asprintf (&ClassLink,"BT_LINK %s",ClassTxt) < 0)
|
||||
Lay_NotEnoughMemoryExit ();
|
||||
|
||||
/***** Form to go to the system *****/
|
||||
HTM_DIV_Begin ("class=\"BC %s\"",ClassTxt);
|
||||
|
@ -216,9 +222,9 @@ void Hie_WriteHierarchyInBreadcrumb (void)
|
|||
|
||||
Frm_StartFormGoTo (ActMnu);
|
||||
Par_PutHiddenParamUnsigned (NULL,"NxtTab",(unsigned) TabSys);
|
||||
Frm_LinkFormSubmit (Txt_System,ClassTxt,NULL);
|
||||
HTM_BUTTON_Begin (Txt_System,ClassLink,NULL);
|
||||
HTM_Txt (Txt_System);
|
||||
Frm_LinkFormEnd ();
|
||||
HTM_BUTTON_End ();
|
||||
Frm_EndForm ();
|
||||
|
||||
HTM_DIV_End ();
|
||||
|
@ -233,9 +239,9 @@ void Hie_WriteHierarchyInBreadcrumb (void)
|
|||
/***** Form to go to see institutions of this country *****/
|
||||
Frm_StartFormGoTo (ActSeeIns);
|
||||
Cty_PutParamCtyCod (Gbl.Hierarchy.Cty.CtyCod);
|
||||
Frm_LinkFormSubmit (Gbl.Hierarchy.Cty.Name[Gbl.Prefs.Language],ClassTxt,NULL);
|
||||
HTM_BUTTON_Begin (Gbl.Hierarchy.Cty.Name[Gbl.Prefs.Language],ClassLink,NULL);
|
||||
HTM_Txt (Gbl.Hierarchy.Cty.Name[Gbl.Prefs.Language]);
|
||||
Frm_LinkFormEnd ();
|
||||
HTM_BUTTON_End ();
|
||||
Frm_EndForm ();
|
||||
|
||||
HTM_DIV_End ();
|
||||
|
@ -249,9 +255,9 @@ void Hie_WriteHierarchyInBreadcrumb (void)
|
|||
|
||||
/***** Form to go to select countries *****/
|
||||
Frm_StartFormGoTo (ActSeeCty);
|
||||
Frm_LinkFormSubmit (Txt_Country,ClassTxt,NULL);
|
||||
HTM_BUTTON_Begin (Txt_Country,ClassLink,NULL);
|
||||
HTM_Txt (Txt_Country);
|
||||
Frm_LinkFormEnd ();
|
||||
HTM_BUTTON_End ();
|
||||
Frm_EndForm ();
|
||||
|
||||
HTM_DIV_End ();
|
||||
|
@ -267,9 +273,9 @@ void Hie_WriteHierarchyInBreadcrumb (void)
|
|||
/***** Form to see centres of this institution *****/
|
||||
Frm_StartFormGoTo (ActSeeCtr);
|
||||
Ins_PutParamInsCod (Gbl.Hierarchy.Ins.InsCod);
|
||||
Frm_LinkFormSubmit (Gbl.Hierarchy.Ins.FullName,ClassTxt,NULL);
|
||||
HTM_BUTTON_Begin (Gbl.Hierarchy.Ins.FullName,ClassLink,NULL);
|
||||
HTM_Txt (Gbl.Hierarchy.Ins.ShrtName);
|
||||
Frm_LinkFormEnd ();
|
||||
HTM_BUTTON_End ();
|
||||
Frm_EndForm ();
|
||||
|
||||
HTM_DIV_End ();
|
||||
|
@ -283,9 +289,9 @@ void Hie_WriteHierarchyInBreadcrumb (void)
|
|||
|
||||
/***** Form to go to select institutions *****/
|
||||
Frm_StartFormGoTo (ActSeeIns);
|
||||
Frm_LinkFormSubmit (Txt_Institution,ClassTxt,NULL);
|
||||
HTM_BUTTON_Begin (Txt_Institution,ClassLink,NULL);
|
||||
HTM_Txt (Txt_Institution);
|
||||
Frm_LinkFormEnd ();
|
||||
HTM_BUTTON_End ();
|
||||
Frm_EndForm ();
|
||||
|
||||
HTM_DIV_End ();
|
||||
|
@ -313,9 +319,9 @@ void Hie_WriteHierarchyInBreadcrumb (void)
|
|||
/***** Form to see degrees of this centre *****/
|
||||
Frm_StartFormGoTo (ActSeeDeg);
|
||||
Ctr_PutParamCtrCod (Gbl.Hierarchy.Ctr.CtrCod);
|
||||
Frm_LinkFormSubmit (Gbl.Hierarchy.Ctr.FullName,ClassTxt,NULL);
|
||||
HTM_BUTTON_Begin (Gbl.Hierarchy.Ctr.FullName,ClassLink,NULL);
|
||||
HTM_Txt (Gbl.Hierarchy.Ctr.ShrtName);
|
||||
Frm_LinkFormEnd ();
|
||||
HTM_BUTTON_End ();
|
||||
Frm_EndForm ();
|
||||
|
||||
HTM_DIV_End ();
|
||||
|
@ -329,9 +335,9 @@ void Hie_WriteHierarchyInBreadcrumb (void)
|
|||
|
||||
/***** Form to go to select centres *****/
|
||||
Frm_StartFormGoTo (ActSeeCtr);
|
||||
Frm_LinkFormSubmit (Txt_Centre,ClassTxt,NULL);
|
||||
HTM_BUTTON_Begin (Txt_Centre,ClassLink,NULL);
|
||||
HTM_Txt (Txt_Centre);
|
||||
Frm_LinkFormEnd ();
|
||||
HTM_BUTTON_End ();
|
||||
Frm_EndForm ();
|
||||
|
||||
HTM_DIV_End ();
|
||||
|
@ -359,9 +365,9 @@ void Hie_WriteHierarchyInBreadcrumb (void)
|
|||
/***** Form to go to see courses of this degree *****/
|
||||
Frm_StartFormGoTo (ActSeeCrs);
|
||||
Deg_PutParamDegCod (Gbl.Hierarchy.Deg.DegCod);
|
||||
Frm_LinkFormSubmit (Gbl.Hierarchy.Deg.FullName,ClassTxt,NULL);
|
||||
HTM_BUTTON_Begin (Gbl.Hierarchy.Deg.FullName,ClassLink,NULL);
|
||||
HTM_Txt (Gbl.Hierarchy.Deg.ShrtName);
|
||||
Frm_LinkFormEnd ();
|
||||
HTM_BUTTON_End ();
|
||||
Frm_EndForm ();
|
||||
|
||||
HTM_DIV_End ();
|
||||
|
@ -375,9 +381,9 @@ void Hie_WriteHierarchyInBreadcrumb (void)
|
|||
|
||||
/***** Form to go to select degrees *****/
|
||||
Frm_StartFormGoTo (ActSeeDeg);
|
||||
Frm_LinkFormSubmit (Txt_Degree,ClassTxt,NULL);
|
||||
HTM_BUTTON_Begin (Txt_Degree,ClassLink,NULL);
|
||||
HTM_Txt (Txt_Degree);
|
||||
Frm_LinkFormEnd ();
|
||||
HTM_BUTTON_End ();
|
||||
Frm_EndForm ();
|
||||
|
||||
HTM_DIV_End ();
|
||||
|
@ -405,6 +411,9 @@ void Hie_WriteHierarchyInBreadcrumb (void)
|
|||
HTM_Txt (" > ");
|
||||
|
||||
HTM_DIV_End ();
|
||||
|
||||
/***** Free memory used for CSS class of links *****/
|
||||
free (ClassLink);
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
|
|
@ -125,13 +125,13 @@ void Hld_SeeHolidays (void)
|
|||
|
||||
Frm_StartForm (ActSeeHld);
|
||||
Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order);
|
||||
Frm_LinkFormSubmit (Txt_HOLIDAYS_HELP_ORDER[Order],"TIT_TBL",NULL);
|
||||
HTM_BUTTON_Begin (Txt_HOLIDAYS_HELP_ORDER[Order],"BT_LINK TIT_TBL",NULL);
|
||||
if (Order == Gbl.Hlds.SelectedOrder)
|
||||
HTM_U_Begin ();
|
||||
HTM_Txt (Txt_HOLIDAYS_ORDER[Order]);
|
||||
if (Order == Gbl.Hlds.SelectedOrder)
|
||||
HTM_U_End ();
|
||||
Frm_LinkFormEnd ();
|
||||
HTM_BUTTON_End ();
|
||||
Frm_EndForm ();
|
||||
|
||||
HTM_TH_End ();
|
||||
|
|
|
@ -589,7 +589,7 @@ bool Inf_GetIfIMustReadAnyCrsInfoInThisCrs (void)
|
|||
|
||||
void Inf_WriteMsgYouMustReadInfo (void)
|
||||
{
|
||||
extern const char *The_ClassFormInBox[The_NUM_THEMES];
|
||||
extern const char *The_ClassFormLinkInBox[The_NUM_THEMES];
|
||||
extern const char *Txt_Required_reading;
|
||||
extern const char *Txt_You_should_read_the_following_information;
|
||||
Inf_InfoType_t InfoType;
|
||||
|
@ -611,10 +611,10 @@ void Inf_WriteMsgYouMustReadInfo (void)
|
|||
{
|
||||
HTM_LI_Begin (NULL);
|
||||
Frm_StartForm (Inf_ActionsSeeInfo[InfoType]);
|
||||
Frm_LinkFormSubmit (Act_GetTitleAction (Inf_ActionsSeeInfo[InfoType]),
|
||||
The_ClassFormInBox[Gbl.Prefs.Theme],NULL);
|
||||
HTM_BUTTON_Begin (Act_GetTitleAction (Inf_ActionsSeeInfo[InfoType]),
|
||||
The_ClassFormLinkInBox[Gbl.Prefs.Theme],NULL);
|
||||
HTM_Txt (Act_GetTitleAction (Inf_ActionsSeeInfo[InfoType]));
|
||||
Frm_LinkFormEnd ();
|
||||
HTM_BUTTON_End ();
|
||||
Frm_EndForm ();
|
||||
HTM_LI_End ();
|
||||
}
|
||||
|
|
|
@ -200,7 +200,7 @@ void Ins_SeeInsWithPendingCtrs (void)
|
|||
HTM_TR_Begin (NULL);
|
||||
HTM_TD_Begin ("class=\"LM %s\"",BgColor);
|
||||
Ins_DrawInstitutionLogoAndNameWithLink (&Ins,ActSeeCtr,
|
||||
"DAT_NOBR","CM");
|
||||
"BT_LINK DAT_NOBR","CM");
|
||||
HTM_TD_End ();
|
||||
|
||||
/* Number of pending centres (row[1]) */
|
||||
|
@ -235,13 +235,13 @@ void Ins_DrawInstitutionLogoWithLink (struct Instit *Ins,unsigned Size)
|
|||
{
|
||||
Frm_StartForm (ActSeeInsInf);
|
||||
Ins_PutParamInsCod (Ins->InsCod);
|
||||
Frm_LinkFormSubmit (Ins->FullName,NULL,NULL);
|
||||
HTM_BUTTON_Begin (Ins->FullName,"BT_LINK",NULL);
|
||||
}
|
||||
Log_DrawLogo (Hie_INS,Ins->InsCod,Ins->FullName,
|
||||
Size,NULL,true);
|
||||
if (PutLink)
|
||||
{
|
||||
Frm_LinkFormEnd ();
|
||||
HTM_BUTTON_End ();
|
||||
Frm_EndForm ();
|
||||
}
|
||||
}
|
||||
|
@ -263,14 +263,14 @@ void Ins_DrawInstitutionLogoAndNameWithLink (struct Instit *Ins,Act_Action_t Act
|
|||
snprintf (Gbl.Title,sizeof (Gbl.Title),
|
||||
Txt_Go_to_X,
|
||||
Ins->FullName);
|
||||
Frm_LinkFormSubmit (Gbl.Title,ClassLink,NULL);
|
||||
HTM_BUTTON_Begin (Gbl.Title,ClassLink,NULL);
|
||||
|
||||
/***** Institution logo and name *****/
|
||||
Log_DrawLogo (Hie_INS,Ins->InsCod,Ins->ShrtName,16,ClassLogo,true);
|
||||
HTM_TxtF (" %s",Ins->FullName);
|
||||
|
||||
/***** End link *****/
|
||||
Frm_LinkFormEnd ();
|
||||
HTM_BUTTON_End ();
|
||||
|
||||
/***** End form *****/
|
||||
Frm_EndForm ();
|
||||
|
@ -541,9 +541,9 @@ static void Ins_Configuration (bool PrintView)
|
|||
snprintf (Gbl.Title,sizeof (Gbl.Title),
|
||||
Txt_Centres_of_INSTITUTION_X,
|
||||
Gbl.Hierarchy.Ins.ShrtName);
|
||||
Frm_LinkFormSubmit (Gbl.Title,"DAT",NULL);
|
||||
HTM_BUTTON_Begin (Gbl.Title,"BT_LINK DAT",NULL);
|
||||
HTM_Unsigned (Ctr_GetNumCtrsInIns (Gbl.Hierarchy.Ins.InsCod));
|
||||
Frm_LinkFormEnd ();
|
||||
HTM_BUTTON_End ();
|
||||
Frm_EndForm ();
|
||||
HTM_TD_End ();
|
||||
|
||||
|
@ -766,12 +766,12 @@ static void Ins_ListOneInstitutionForSeeing (struct Instit *Ins,unsigned NumIns)
|
|||
if (Ins->Status & Ins_STATUS_BIT_PENDING)
|
||||
{
|
||||
TxtClassNormal = "DAT_LIGHT";
|
||||
TxtClassStrong = "DAT_LIGHT";
|
||||
TxtClassStrong = "BT_LINK DAT_LIGHT";
|
||||
}
|
||||
else
|
||||
{
|
||||
TxtClassNormal = "DAT";
|
||||
TxtClassStrong = "DAT_N";
|
||||
TxtClassStrong = "BT_LINK DAT_N";
|
||||
}
|
||||
BgColor = (Ins->InsCod == Gbl.Hierarchy.Ins.InsCod) ? "LIGHT_BLUE" :
|
||||
Gbl.ColorRows[Gbl.RowEvenOdd];
|
||||
|
@ -859,7 +859,7 @@ static void Ins_PutHeadInstitutionsForSeeing (bool OrderSelectable)
|
|||
{
|
||||
Frm_StartForm (ActSeeIns);
|
||||
Par_PutHiddenParamUnsigned (NULL,"Order",(unsigned) Order);
|
||||
Frm_LinkFormSubmit (Txt_INSTITUTIONS_HELP_ORDER[Order],"TIT_TBL",NULL);
|
||||
HTM_BUTTON_Begin (Txt_INSTITUTIONS_HELP_ORDER[Order],"BT_LINK TIT_TBL",NULL);
|
||||
if (Order == Gbl.Hierarchy.Cty.Inss.SelectedOrder)
|
||||
HTM_U_Begin ();
|
||||
}
|
||||
|
@ -868,7 +868,7 @@ static void Ins_PutHeadInstitutionsForSeeing (bool OrderSelectable)
|
|||
{
|
||||
if (Order == Gbl.Hierarchy.Cty.Inss.SelectedOrder)
|
||||
HTM_U_End ();
|
||||
Frm_LinkFormEnd ();
|
||||
HTM_BUTTON_End ();
|
||||
Frm_EndForm ();
|
||||
}
|
||||
HTM_TH_End ();
|
||||
|
|
|
@ -878,7 +878,6 @@ static void Lay_WriteScriptCustomDropzone (void)
|
|||
static void Lay_WritePageTopHeading (void)
|
||||
{
|
||||
extern const char *The_ClassTagline[The_NUM_THEMES];
|
||||
extern const char *Txt_System;
|
||||
extern const char *Txt_TAGLINE;
|
||||
extern const char *Txt_TAGLINE_BR;
|
||||
const char *ClassHeadRow1[The_NUM_THEMES] =
|
||||
|
@ -915,25 +914,19 @@ static void Lay_WritePageTopHeading (void)
|
|||
Par_PutHiddenParamUnsigned (NULL,"NxtTab",(unsigned) TabSys);
|
||||
|
||||
HTM_DIV_Begin ("id=\"head_row_1_logo_small\"");
|
||||
Frm_LinkFormSubmit (Txt_System,NULL,NULL);
|
||||
HTM_IMG (Cfg_URL_ICON_PUBLIC,Cfg_PLATFORM_LOGO_SMALL_FILENAME,Cfg_PLATFORM_SHORT_NAME,
|
||||
"class=\"CM\" style=\"width:%upx; height:%upx;\"",
|
||||
Cfg_PLATFORM_LOGO_SMALL_WIDTH,Cfg_PLATFORM_LOGO_SMALL_HEIGHT);
|
||||
Frm_LinkFormEnd ();
|
||||
HTM_INPUT_IMAGE (Cfg_URL_ICON_PUBLIC,Cfg_PLATFORM_LOGO_SMALL_FILENAME,
|
||||
Cfg_PLATFORM_SHORT_NAME,Cfg_PLATFORM_LOGO_SMALL_CLASS);
|
||||
HTM_DIV_End (); // head_row_1_logo_small
|
||||
|
||||
HTM_DIV_Begin ("id=\"head_row_1_logo_big\"");
|
||||
Frm_LinkFormSubmit (Txt_System,NULL,NULL);
|
||||
HTM_IMG (Cfg_URL_ICON_PUBLIC,Cfg_PLATFORM_LOGO_BIG_FILENAME,Cfg_PLATFORM_SHORT_NAME,
|
||||
"class=\"CM\" style=\"width:%upx; height:%upx;\"",
|
||||
Cfg_PLATFORM_LOGO_BIG_WIDTH,Cfg_PLATFORM_LOGO_BIG_HEIGHT);
|
||||
Frm_LinkFormEnd ();
|
||||
HTM_INPUT_IMAGE (Cfg_URL_ICON_PUBLIC,Cfg_PLATFORM_LOGO_BIG_FILENAME,
|
||||
Cfg_PLATFORM_SHORT_NAME,Cfg_PLATFORM_LOGO_BIG_CLASS);
|
||||
HTM_DIV_End (); // head_row_1_logo_big
|
||||
|
||||
HTM_DIV_Begin ("id=\"head_row_1_tagline\"");
|
||||
Frm_LinkFormSubmit (Txt_TAGLINE,The_ClassTagline[Gbl.Prefs.Theme],NULL);
|
||||
HTM_BUTTON_Begin (Txt_TAGLINE,The_ClassTagline[Gbl.Prefs.Theme],NULL);
|
||||
HTM_Txt (Txt_TAGLINE_BR);
|
||||
Frm_LinkFormEnd ();
|
||||
HTM_BUTTON_End ();
|
||||
HTM_DIV_End (); // head_row_1_tagline
|
||||
|
||||
/* End form to go to home page */
|
||||
|
@ -1172,7 +1165,7 @@ void Lay_PutContextualLinkIconText (Act_Action_t NextAction,const char *Anchor,
|
|||
const char *Icon,
|
||||
const char *Text)
|
||||
{
|
||||
extern const char *The_ClassFormOutBoxBold[The_NUM_THEMES];
|
||||
extern const char *The_ClassFormLinkOutBoxBold[The_NUM_THEMES];
|
||||
|
||||
/***** Separator *****/
|
||||
HTM_Txt (" "); // This space is necessary to enable
|
||||
|
@ -1184,9 +1177,9 @@ void Lay_PutContextualLinkIconText (Act_Action_t NextAction,const char *Anchor,
|
|||
FuncParams ();
|
||||
|
||||
/***** Put icon and text with link *****/
|
||||
Frm_LinkFormSubmit (Text,The_ClassFormOutBoxBold[Gbl.Prefs.Theme],NULL);
|
||||
HTM_BUTTON_Begin (Text,The_ClassFormLinkOutBoxBold[Gbl.Prefs.Theme],NULL);
|
||||
Ico_PutIconTextLink (Icon,Text);
|
||||
Frm_LinkFormEnd ();
|
||||
HTM_BUTTON_End ();
|
||||
|
||||
/***** End form *****/
|
||||
Frm_EndForm ();
|
||||
|
@ -1206,7 +1199,7 @@ void Lay_PutContextualLinkIconTextOnSubmit (Act_Action_t NextAction,const char *
|
|||
const char *Text,
|
||||
const char *OnSubmit)
|
||||
{
|
||||
extern const char *The_ClassFormOutBoxBold[The_NUM_THEMES];
|
||||
extern const char *The_ClassFormLinkOutBoxBold[The_NUM_THEMES];
|
||||
|
||||
/***** Separator *****/
|
||||
HTM_Txt (" "); // This space is necessary to enable
|
||||
|
@ -1218,9 +1211,9 @@ void Lay_PutContextualLinkIconTextOnSubmit (Act_Action_t NextAction,const char *
|
|||
FuncParams ();
|
||||
|
||||
/***** Put icon with link *****/
|
||||
Frm_LinkFormSubmit (Text,The_ClassFormOutBoxBold[Gbl.Prefs.Theme],OnSubmit);
|
||||
HTM_BUTTON_Begin (Text,The_ClassFormLinkOutBoxBold[Gbl.Prefs.Theme],OnSubmit);
|
||||
Ico_PutIconTextLink (Icon,Text);
|
||||
Frm_LinkFormEnd ();
|
||||
HTM_BUTTON_End ();
|
||||
|
||||
/***** End form *****/
|
||||
Frm_EndForm ();
|
||||
|
|
|
@ -3502,7 +3502,7 @@ static void Sta_WriteInstitution (long InsCod)
|
|||
|
||||
/***** Form to go to institution *****/
|
||||
Ins_DrawInstitutionLogoAndNameWithLink (&Ins,ActSeeInsInf,
|
||||
"LOG","CT");
|
||||
"BT_LINK LOG","CT");
|
||||
}
|
||||
else // Hit with no institution selected
|
||||
{
|
||||
|
|
63
swad_theme.c
63
swad_theme.c
|
@ -92,12 +92,12 @@ const char *The_TabOffBgColors[The_NUM_THEMES] =
|
|||
|
||||
const char *The_ClassTagline[The_NUM_THEMES] =
|
||||
{
|
||||
"TAGLINE_WHITE",
|
||||
"TAGLINE_GREY",
|
||||
"TAGLINE_PURPLE",
|
||||
"TAGLINE_BLUE",
|
||||
"TAGLINE_YELLOW",
|
||||
"TAGLINE_PINK",
|
||||
"BT_LINK TAGLINE_WHITE",
|
||||
"BT_LINK TAGLINE_GREY",
|
||||
"BT_LINK TAGLINE_PURPLE",
|
||||
"BT_LINK TAGLINE_BLUE",
|
||||
"BT_LINK TAGLINE_YELLOW",
|
||||
"BT_LINK TAGLINE_PINK",
|
||||
};
|
||||
|
||||
const char *The_ClassNotif[The_NUM_THEMES] =
|
||||
|
@ -200,6 +200,15 @@ const char *The_ClassTitle[The_NUM_THEMES] =
|
|||
"TITLE_PINK",
|
||||
};
|
||||
|
||||
const char *The_ClassFormLinkInBox[The_NUM_THEMES] =
|
||||
{
|
||||
"BT_LINK FORM_IN_WHITE",
|
||||
"BT_LINK FORM_IN_GREY",
|
||||
"BT_LINK FORM_IN_PURPLE",
|
||||
"BT_LINK FORM_IN_BLUE",
|
||||
"BT_LINK FORM_IN_YELLOW",
|
||||
"BT_LINK FORM_IN_PINK",
|
||||
};
|
||||
const char *The_ClassFormInBox[The_NUM_THEMES] =
|
||||
{
|
||||
"FORM_IN_WHITE",
|
||||
|
@ -210,6 +219,15 @@ const char *The_ClassFormInBox[The_NUM_THEMES] =
|
|||
"FORM_IN_PINK",
|
||||
};
|
||||
|
||||
const char *The_ClassFormLinkInBoxBold[The_NUM_THEMES] =
|
||||
{
|
||||
"BT_LINK FORM_IN_WHITE BOLD",
|
||||
"BT_LINK FORM_IN_GREY BOLD",
|
||||
"BT_LINK FORM_IN_PURPLE BOLD",
|
||||
"BT_LINK FORM_IN_BLUE BOLD",
|
||||
"BT_LINK FORM_IN_YELLOW BOLD",
|
||||
"BT_LINK FORM_IN_PINK BOLD",
|
||||
};
|
||||
const char *The_ClassFormInBoxBold[The_NUM_THEMES] =
|
||||
{
|
||||
"FORM_IN_WHITE BOLD",
|
||||
|
@ -230,23 +248,14 @@ const char *The_ClassFormInBoxNoWrap[The_NUM_THEMES] =
|
|||
"FORM_IN_PINK NOWRAP",
|
||||
};
|
||||
|
||||
const char *The_ClassFormLink[The_NUM_THEMES] =
|
||||
const char *The_ClassFormLinkOutBox[The_NUM_THEMES] =
|
||||
{
|
||||
"BT_LINK FORM_IN_WHITE",
|
||||
"BT_LINK FORM_IN_GREY",
|
||||
"BT_LINK FORM_IN_PURPLE",
|
||||
"BT_LINK FORM_IN_BLUE",
|
||||
"BT_LINK FORM_IN_YELLOW",
|
||||
"BT_LINK FORM_IN_PINK",
|
||||
};
|
||||
const char *The_ClassFormLinkBold[The_NUM_THEMES] =
|
||||
{
|
||||
"BT_LINK FORM_IN_WHITE BOLD",
|
||||
"BT_LINK FORM_IN_GREY BOLD",
|
||||
"BT_LINK FORM_IN_PURPLE BOLD",
|
||||
"BT_LINK FORM_IN_BLUE BOLD",
|
||||
"BT_LINK FORM_IN_YELLOW BOLD",
|
||||
"BT_LINK FORM_IN_PINK BOLD",
|
||||
"BT_LINK FORM_OUT_WHITE",
|
||||
"BT_LINK FORM_OUT_GREY",
|
||||
"BT_LINK FORM_OUT_PURPLE",
|
||||
"BT_LINK FORM_OUT_BLUE",
|
||||
"BT_LINK FORM_OUT_YELLOW",
|
||||
"BT_LINK FORM_OUT_PINK",
|
||||
};
|
||||
|
||||
const char *The_ClassFormOutBox[The_NUM_THEMES] =
|
||||
|
@ -259,6 +268,16 @@ const char *The_ClassFormOutBox[The_NUM_THEMES] =
|
|||
"FORM_OUT_PINK",
|
||||
};
|
||||
|
||||
const char *The_ClassFormLinkOutBoxBold[The_NUM_THEMES] =
|
||||
{
|
||||
"BT_LINK FORM_OUT_WHITE BOLD",
|
||||
"BT_LINK FORM_OUT_GREY BOLD",
|
||||
"BT_LINK FORM_OUT_PURPLE BOLD",
|
||||
"BT_LINK FORM_OUT_BLUE BOLD",
|
||||
"BT_LINK FORM_OUT_YELLOW BOLD",
|
||||
"BT_LINK FORM_OUT_PINK BOLD",
|
||||
};
|
||||
|
||||
const char *The_ClassFormOutBoxBold[The_NUM_THEMES] =
|
||||
{
|
||||
"FORM_OUT_WHITE BOLD",
|
||||
|
|
|
@ -2720,7 +2720,7 @@ static void TL_FormToShowHiddenComments (Act_Action_t ActionGbl,Act_Action_t Act
|
|||
char IdComments[Frm_MAX_BYTES_ID + 1],
|
||||
unsigned NumInitialComments)
|
||||
{
|
||||
extern const char *The_ClassFormLink[The_NUM_THEMES];
|
||||
extern const char *The_ClassFormLinkInBox[The_NUM_THEMES];
|
||||
extern const char *Txt_See_the_previous_X_COMMENTS;
|
||||
char *OnSubmit;
|
||||
|
||||
|
@ -2765,7 +2765,7 @@ static void TL_FormToShowHiddenComments (Act_Action_t ActionGbl,Act_Action_t Act
|
|||
snprintf (Gbl.Title,sizeof (Gbl.Title),
|
||||
Txt_See_the_previous_X_COMMENTS,
|
||||
NumInitialComments);
|
||||
HTM_BUTTON_Begin (NULL,The_ClassFormLink[Gbl.Prefs.Theme],NULL);
|
||||
HTM_BUTTON_Begin (NULL,The_ClassFormLinkInBox[Gbl.Prefs.Theme],NULL);
|
||||
Ico_PutIconTextLink ("angle-up.svg",Gbl.Title);
|
||||
HTM_BUTTON_End ();
|
||||
|
||||
|
|
Loading…
Reference in New Issue