mirror of
https://github.com/acanas/swad-core.git
synced 2024-06-10 10:45:23 +02:00
Version19.46.6
This commit is contained in:
parent
10e90abfc7
commit
e678096d83
|
@ -708,7 +708,7 @@ void HTM_A_End (void)
|
||||||
/********************************** Images ***********************************/
|
/********************************** Images ***********************************/
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
|
||||||
void HTM_IMG (const char *Path,const char *Icon,const char *Title,
|
void HTM_IMG (const char *URL,const char *Icon,const char *Title,
|
||||||
const char *Class,const char *Style,const char *Id)
|
const char *Class,const char *Style,const char *Id)
|
||||||
{
|
{
|
||||||
fprintf (Gbl.F.Out,"<img");
|
fprintf (Gbl.F.Out,"<img");
|
||||||
|
@ -717,7 +717,7 @@ void HTM_IMG (const char *Path,const char *Icon,const char *Title,
|
||||||
if (Id[0])
|
if (Id[0])
|
||||||
fprintf (Gbl.F.Out," id=\"%s\"",Id);
|
fprintf (Gbl.F.Out," id=\"%s\"",Id);
|
||||||
|
|
||||||
fprintf (Gbl.F.Out," src=\"%s/%s\"",Path,Icon);
|
fprintf (Gbl.F.Out," src=\"%s/%s\"",URL,Icon);
|
||||||
|
|
||||||
if (Title)
|
if (Title)
|
||||||
{
|
{
|
||||||
|
|
|
@ -83,7 +83,7 @@ void HTM_LI_End (void);
|
||||||
void HTM_A_Begin (const char *fmt,...);
|
void HTM_A_Begin (const char *fmt,...);
|
||||||
void HTM_A_End (void);
|
void HTM_A_End (void);
|
||||||
|
|
||||||
void HTM_IMG (const char *Path,const char *Icon,const char *Title,
|
void HTM_IMG (const char *URL,const char *Icon,const char *Title,
|
||||||
const char *Class,const char *Style,const char *Id);
|
const char *Class,const char *Style,const char *Id);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -309,6 +309,8 @@ static void Ctr_Configuration (bool PrintView)
|
||||||
bool PhotoExists;
|
bool PhotoExists;
|
||||||
char *PhotoAttribution = NULL;
|
char *PhotoAttribution = NULL;
|
||||||
bool PutLink;
|
bool PutLink;
|
||||||
|
char URL[Cns_MAX_BYTES_WWW + 1];
|
||||||
|
char Icon[NAME_MAX + 1];
|
||||||
|
|
||||||
/***** Trivial check *****/
|
/***** Trivial check *****/
|
||||||
if (Gbl.Hierarchy.Ctr.CtrCod <= 0) // No centre selected
|
if (Gbl.Hierarchy.Ctr.CtrCod <= 0) // No centre selected
|
||||||
|
@ -357,17 +359,18 @@ static void Ctr_Configuration (bool PrintView)
|
||||||
if (PutLink)
|
if (PutLink)
|
||||||
HTM_A_Begin ("href=\"%s\" target=\"_blank\" class=\"DAT_N\"",
|
HTM_A_Begin ("href=\"%s\" target=\"_blank\" class=\"DAT_N\"",
|
||||||
Gbl.Hierarchy.Ctr.WWW);
|
Gbl.Hierarchy.Ctr.WWW);
|
||||||
fprintf (Gbl.F.Out,"<img src=\"%s/%02u/%u/%u.jpg\""
|
snprintf (URL,sizeof (URL),
|
||||||
" alt=\"%s\" title=\"%s\""
|
"%s/%02u/%u",
|
||||||
" class=\"%s\" />",
|
|
||||||
Cfg_URL_CTR_PUBLIC,
|
Cfg_URL_CTR_PUBLIC,
|
||||||
(unsigned) (Gbl.Hierarchy.Ctr.CtrCod % 100),
|
(unsigned) (Gbl.Hierarchy.Ctr.CtrCod % 100),
|
||||||
(unsigned) Gbl.Hierarchy.Ctr.CtrCod,
|
(unsigned) Gbl.Hierarchy.Ctr.CtrCod);
|
||||||
(unsigned) Gbl.Hierarchy.Ctr.CtrCod,
|
snprintf (Icon,sizeof (Icon),
|
||||||
Gbl.Hierarchy.Ctr.ShrtName,
|
"%u.jpg",
|
||||||
Gbl.Hierarchy.Ctr.FullName,
|
(unsigned) Gbl.Hierarchy.Ctr.CtrCod);
|
||||||
|
HTM_IMG (URL,Icon,Gbl.Hierarchy.Ctr.FullName,
|
||||||
PrintView ? "CENTRE_PHOTO_PRINT" :
|
PrintView ? "CENTRE_PHOTO_PRINT" :
|
||||||
"CENTRE_PHOTO_SHOW");
|
"CENTRE_PHOTO_SHOW",
|
||||||
|
NULL,NULL);
|
||||||
if (PutLink)
|
if (PutLink)
|
||||||
HTM_A_End ();
|
HTM_A_End ();
|
||||||
HTM_DIV_End ();
|
HTM_DIV_End ();
|
||||||
|
|
|
@ -487,7 +487,7 @@ enscript -2 --landscape --color --file-align=2 --highlight --line-numbers -o - *
|
||||||
En OpenSWAD:
|
En OpenSWAD:
|
||||||
ps2pdf source.ps destination.pdf
|
ps2pdf source.ps destination.pdf
|
||||||
*/
|
*/
|
||||||
#define Log_PLATFORM_VERSION "SWAD 19.46.5 (2019-10-29)"
|
#define Log_PLATFORM_VERSION "SWAD 19.46.6 (2019-10-29)"
|
||||||
#define CSS_FILE "swad19.45.css"
|
#define CSS_FILE "swad19.45.css"
|
||||||
#define JS_FILE "swad19.39.js"
|
#define JS_FILE "swad19.39.js"
|
||||||
/*
|
/*
|
||||||
|
@ -495,6 +495,7 @@ ps2pdf source.ps destination.pdf
|
||||||
// TODO: Impedir la creación y edición de proyectos si no son editables.
|
// TODO: Impedir la creación y edición de proyectos si no son editables.
|
||||||
// TODO: Continuar convirtiendo <img a HTM_IMG ()
|
// TODO: Continuar convirtiendo <img a HTM_IMG ()
|
||||||
|
|
||||||
|
Version 19.46.6: Oct 29, 2019 Code refactoring in HTML images. (246226 lines)
|
||||||
Version 19.46.5: Oct 29, 2019 Code refactoring in HTML images. (246223 lines)
|
Version 19.46.5: Oct 29, 2019 Code refactoring in HTML images. (246223 lines)
|
||||||
Version 19.46.4: Oct 28, 2019 Code refactoring in HTML images. (246247 lines)
|
Version 19.46.4: Oct 28, 2019 Code refactoring in HTML images. (246247 lines)
|
||||||
Version 19.46.3: Oct 28, 2019 Code refactoring in HTML images. (246390 lines)
|
Version 19.46.3: Oct 28, 2019 Code refactoring in HTML images. (246390 lines)
|
||||||
|
|
|
@ -895,6 +895,7 @@ static void Lay_WritePageTopHeading (void)
|
||||||
extern const char *Txt_System;
|
extern const char *Txt_System;
|
||||||
extern const char *Txt_TAGLINE;
|
extern const char *Txt_TAGLINE;
|
||||||
extern const char *Txt_TAGLINE_BR;
|
extern const char *Txt_TAGLINE_BR;
|
||||||
|
char Style[64];
|
||||||
const char *ClassHeadRow1[The_NUM_THEMES] =
|
const char *ClassHeadRow1[The_NUM_THEMES] =
|
||||||
{
|
{
|
||||||
"HEAD_ROW_1_WHITE", // The_THEME_WHITE
|
"HEAD_ROW_1_WHITE", // The_THEME_WHITE
|
||||||
|
@ -930,22 +931,20 @@ static void Lay_WritePageTopHeading (void)
|
||||||
|
|
||||||
HTM_DIV_Begin ("id=\"head_row_1_logo_small\"");
|
HTM_DIV_Begin ("id=\"head_row_1_logo_small\"");
|
||||||
Frm_LinkFormSubmit (Txt_System,NULL,NULL);
|
Frm_LinkFormSubmit (Txt_System,NULL,NULL);
|
||||||
fprintf (Gbl.F.Out,"<img src=\"%s/%s\" alt=\"%s\" title=\"%s\""
|
snprintf (Style,sizeof (Style),
|
||||||
" class=\"CM\""
|
"width:%upx; height:%upx;",
|
||||||
" style=\"width:%upx; height:%upx;\" />",
|
|
||||||
Cfg_URL_ICON_PUBLIC,Cfg_PLATFORM_LOGO_SMALL_FILENAME,
|
|
||||||
Cfg_PLATFORM_SHORT_NAME,Cfg_PLATFORM_FULL_NAME,
|
|
||||||
Cfg_PLATFORM_LOGO_SMALL_WIDTH,Cfg_PLATFORM_LOGO_SMALL_HEIGHT);
|
Cfg_PLATFORM_LOGO_SMALL_WIDTH,Cfg_PLATFORM_LOGO_SMALL_HEIGHT);
|
||||||
|
HTM_IMG (Cfg_URL_ICON_PUBLIC,Cfg_PLATFORM_LOGO_SMALL_FILENAME,Cfg_PLATFORM_SHORT_NAME,
|
||||||
|
"CM",Style,NULL);
|
||||||
Frm_LinkFormEnd ();
|
Frm_LinkFormEnd ();
|
||||||
HTM_DIV_End (); // head_row_1_logo_small
|
HTM_DIV_End (); // head_row_1_logo_small
|
||||||
HTM_DIV_Begin ("id=\"head_row_1_logo_big\"");
|
HTM_DIV_Begin ("id=\"head_row_1_logo_big\"");
|
||||||
Frm_LinkFormSubmit (Txt_System,NULL,NULL);
|
Frm_LinkFormSubmit (Txt_System,NULL,NULL);
|
||||||
fprintf (Gbl.F.Out,"<img src=\"%s/%s\" alt=\"%s\" title=\"%s\""
|
snprintf (Style,sizeof (Style),
|
||||||
" class=\"CM\""
|
"width:%upx; height:%upx;",
|
||||||
" style=\"width:%upx; height:%upx;\" />",
|
|
||||||
Cfg_URL_ICON_PUBLIC,Cfg_PLATFORM_LOGO_BIG_FILENAME,
|
|
||||||
Cfg_PLATFORM_SHORT_NAME,Cfg_PLATFORM_FULL_NAME,
|
|
||||||
Cfg_PLATFORM_LOGO_BIG_WIDTH,Cfg_PLATFORM_LOGO_BIG_HEIGHT);
|
Cfg_PLATFORM_LOGO_BIG_WIDTH,Cfg_PLATFORM_LOGO_BIG_HEIGHT);
|
||||||
|
HTM_IMG (Cfg_URL_ICON_PUBLIC,Cfg_PLATFORM_LOGO_BIG_FILENAME,Cfg_PLATFORM_SHORT_NAME,
|
||||||
|
"CM",Style,NULL);
|
||||||
Frm_LinkFormEnd ();
|
Frm_LinkFormEnd ();
|
||||||
HTM_DIV_End (); // head_row_1_logo_big
|
HTM_DIV_End (); // head_row_1_logo_big
|
||||||
HTM_DIV_Begin ("id=\"head_row_1_tagline\"");
|
HTM_DIV_Begin ("id=\"head_row_1_tagline\"");
|
||||||
|
@ -1421,18 +1420,18 @@ static void Lay_WriteAboutZone (void)
|
||||||
{
|
{
|
||||||
extern const char *Txt_About_X;
|
extern const char *Txt_About_X;
|
||||||
extern const char *Txt_Questions_and_problems;
|
extern const char *Txt_Questions_and_problems;
|
||||||
|
char Style[64];
|
||||||
|
|
||||||
/***** Start about zone *****/
|
/***** Start about zone *****/
|
||||||
fprintf (Gbl.F.Out,"<address id=\"about_zone\" class=\"ABOUT\">");
|
fprintf (Gbl.F.Out,"<address id=\"about_zone\" class=\"ABOUT\">");
|
||||||
|
|
||||||
/***** Institution and centre hosting the platform *****/
|
/***** Institution and centre hosting the platform *****/
|
||||||
HTM_A_Begin ("href=\"%s\" class=\"ABOUT\" target=\"_blank\"",Cfg_ABOUT_URL);
|
HTM_A_Begin ("href=\"%s\" class=\"ABOUT\" target=\"_blank\"",Cfg_ABOUT_URL);
|
||||||
fprintf (Gbl.F.Out,"<img src=\"%s/%s\""
|
snprintf (Style,sizeof (Style),
|
||||||
" alt=\"%s\" title=\"%s\""
|
"width:%upx; height:%upx;",
|
||||||
" style=\"width:%upx; height:%upx;\" />",
|
|
||||||
Cfg_URL_ICON_PUBLIC,Cfg_ABOUT_LOGO,
|
|
||||||
Cfg_ABOUT_NAME,Cfg_ABOUT_NAME,
|
|
||||||
Cfg_ABOUT_LOGO_WIDTH,Cfg_ABOUT_LOGO_HEIGHT);
|
Cfg_ABOUT_LOGO_WIDTH,Cfg_ABOUT_LOGO_HEIGHT);
|
||||||
|
HTM_IMG (Cfg_URL_ICON_PUBLIC,Cfg_ABOUT_LOGO,Cfg_ABOUT_NAME,
|
||||||
|
NULL,Style,NULL);
|
||||||
HTM_DIV_Begin (NULL);
|
HTM_DIV_Begin (NULL);
|
||||||
fprintf (Gbl.F.Out,"%s",Cfg_ABOUT_NAME);
|
fprintf (Gbl.F.Out,"%s",Cfg_ABOUT_NAME);
|
||||||
HTM_DIV_End ();
|
HTM_DIV_End ();
|
||||||
|
|
Loading…
Reference in New Issue
Block a user