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 23.48.2: Nov 26, 2023 Responsive design in program.

This commit is contained in:
acanas 2023-11-27 08:56:16 +01:00
parent aaa1574379
commit 80d9469763
18 changed files with 6034 additions and 711 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

238
css/swad23.48.css → css/swad23.48.1.css
View File

@ -1764,44 +1764,93 @@ a:hover img.CENTER_PHOTO_SHOW
vertical-align:top;
}
.PRG_MAIN
{
text-align:left;
vertical-align:top;
}
/******************************* Record card *********************************/
@media only screen and (max-width: 480px)
{ /* For mobile-phones */
.PRG_MAIN
{
box-sizing:border-box;
max-width:100px;
overflow:hidden;
text-overflow:ellipsis;
text-align:left;
vertical-align:top;
}
.PRG_DATE
{
box-sizing:border-box;
max-width:80px;
overflow:hidden;
text-overflow:ellipsis;
}
}
@media only screen and (min-width: 480px) and (max-width: 600px)
{ /* For mobile-phones */
.PRG_MAIN
{
box-sizing:border-box;
max-width:244px;
overflow:hidden;
text-overflow:ellipsis;
text-align:left;
vertical-align:top;
}
.PRG_DATE
{
box-sizing:border-box;
max-width:132px;
overflow:hidden;
text-overflow:ellipsis;
}
}
@media only screen and (min-width: 600px)
{ /* For desktop */
.PRG_MAIN
{
text-align:left;
vertical-align:top;
}
.PRG_DATE
{
box-sizing:border-box;
max-width:132px;
overflow:hidden;
text-overflow:ellipsis;
}
}
.PRG_TIT_1_WHITE,
.PRG_TIT_1_GREY,
.PRG_TIT_1_PURPLE,
.PRG_TIT_1_BLUE,
.PRG_TIT_1_YELLOW,
.PRG_TIT_1_PINK {color:#4d88a1; font-size:20pt; font-weight:bold;}
.PRG_TIT_1_DARK {color:#afc4cc; font-size:20pt; font-weight:bold;}
.PRG_TIT_1_PINK {color:#4d88a1; font-size:16pt; font-weight:bold;}
.PRG_TIT_1_DARK {color:#afc4cc; font-size:16pt; font-weight:bold;}
.PRG_TIT_2_WHITE,
.PRG_TIT_2_GREY,
.PRG_TIT_2_PURPLE,
.PRG_TIT_2_BLUE,
.PRG_TIT_2_YELLOW,
.PRG_TIT_2_PINK {color:#4d88a1; font-size:18pt; font-weight:bold;}
.PRG_TIT_2_DARK {color:#afc4cc; font-size:18pt; font-weight:bold;}
.PRG_TIT_2_PINK {color:#4d88a1; font-size:15pt; font-weight:bold;}
.PRG_TIT_2_DARK {color:#afc4cc; font-size:15pt; font-weight:bold;}
.PRG_TIT_3_WHITE,
.PRG_TIT_3_GREY,
.PRG_TIT_3_PURPLE,
.PRG_TIT_3_BLUE,
.PRG_TIT_3_YELLOW,
.PRG_TIT_3_PINK {color:#4d88a1; font-size:16pt; font-weight:bold;}
.PRG_TIT_3_DARK {color:#afc4cc; font-size:16pt; font-weight:bold;}
.PRG_TIT_3_PINK {color:#4d88a1; font-size:14pt; font-weight:bold;}
.PRG_TIT_3_DARK {color:#afc4cc; font-size:14pt; font-weight:bold;}
.PRG_TIT_4_WHITE,
.PRG_TIT_4_GREY,
.PRG_TIT_4_PURPLE,
.PRG_TIT_4_BLUE,
.PRG_TIT_4_YELLOW,
.PRG_TIT_4_PINK {color:#4d88a1; font-size:14pt; font-weight:bold;}
.PRG_TIT_4_DARK {color:#afc4cc; font-size:14pt; font-weight:bold;}
.PRG_TIT_4_PINK {color:#4d88a1; font-size:13pt; font-weight:bold;}
.PRG_TIT_4_DARK {color:#afc4cc; font-size:13pt; font-weight:bold;}
.PRG_TIT_5_WHITE,
.PRG_TIT_5_GREY,
@ -1819,12 +1868,6 @@ a:hover img.CENTER_PHOTO_SHOW
.PRG_TXT_PINK {color:#202020; font-size:12pt; line-height:1.5;}
.PRG_TXT_DARK {color:#e0e0e0; font-size:12pt; line-height:1.5;}
.PRG_DATE
{
box-sizing:border-box;
width:70px;
}
.PRG_HIDDEN
{
opacity:0.33;
@ -2543,13 +2586,13 @@ table.CELLS_PAD_10 > tbody > tr > td {padding:10px;}
/********************************* Form fonts ********************************/
/* Inside white box */
.FORM_IN_WHITE {color:#4d88a1; font-size:12pt;}
.FORM_IN_GREY {color:#4d88a1; font-size:12pt;}
.FORM_IN_PURPLE {color:#4d88a1; font-size:12pt;}
.FORM_IN_BLUE {color:#4d88a1; font-size:12pt;}
.FORM_IN_YELLOW {color:#7c4d2a; font-size:12pt;}
.FORM_IN_PINK {color:#4d88a1; font-size:12pt;}
.FORM_IN_DARK {color:#afc4cc; font-size:12pt;}
.FORM_IN_WHITE {color:#4d88a1; font-size:12pt; white-space:nowrap;}
.FORM_IN_GREY {color:#4d88a1; font-size:12pt; white-space:nowrap;}
.FORM_IN_PURPLE {color:#4d88a1; font-size:12pt; white-space:nowrap;}
.FORM_IN_BLUE {color:#4d88a1; font-size:12pt; white-space:nowrap;}
.FORM_IN_YELLOW {color:#7c4d2a; font-size:12pt; white-space:nowrap;}
.FORM_IN_PINK {color:#4d88a1; font-size:12pt; white-space:nowrap;}
.FORM_IN_DARK {color:#afc4cc; font-size:12pt; white-space:nowrap;}
/* Outside white box */
.FORM_OUT_WHITE {color:#4d88a1; font-size:12pt;}
@ -2979,12 +3022,6 @@ table.CELLS_PAD_10 > tbody > tr > td {padding:10px;}
/******************************* Record card *********************************/
@media only screen and (max-width: 480px)
{ /* For mobile-phones */
.REC_CONT
{
box-sizing: border-box;
width:300px;
margin:0 auto;
}
.REC_HEAD
{
font-family:Georgia,"DejaVu LGC Serif","Bitstream Vera Serif",serif;
@ -2994,19 +3031,18 @@ table.CELLS_PAD_10 > tbody > tr > td {padding:10px;}
.REC_NAME
{
box-sizing:border-box;
max-width:168px;
max-width:160px;
white-space:nowrap;
overflow:hidden;
text-overflow:ellipsis;
color:#808080;
font-size:12pt;
font-weight:bold;
background-color:orange;
}
.REC_NICK
{
color:#808080;
font-size:10pt;
font-size:12pt;
font-weight:bold;
}
@ -3016,69 +3052,60 @@ table.CELLS_PAD_10 > tbody > tr > td {padding:10px;}
width:32px;
padding-top:8px !important;
vertical-align:top;
background-color:red;
}
.REC_C2_TOP
{
box-sizing:border-box;
width:168px;
width:160px;
height:36px;
padding-top:8px !important;
background-color:yellow;
}
.REC_C3_TOP
{
box-sizing:border-box;
width:80px;
background-color:green;
}
.REC_C1_MID
{
box-sizing:border-box;
width:32px;
background-color:red;
}
.REC_C2_MID
{
box-sizing:border-box;
width:168px;
background-color:yellow;
width:160px;
}
.REC_C3_MID
{
box-sizing:border-box;
width:80px;
background-color:green;
}
.REC_C1_BOT
{
box-sizing:border-box;
width:130px;
background-color:red;
width:120px;
max-width:120px;
overflow:hidden;
text-overflow:ellipsis;
}
.REC_C2_BOT
{
box-sizing:border-box;
width:138px;
background-color:yellow;
width:148px;
max-width:148px;
overflow:hidden;
text-overflow:ellipsis;
}
.REC_C2_BOT_INPUT
{
box-sizing:border-box;
width:134px;
background-color:green;
width:144px;
}
}
@media only screen and (min-width: 480px) and (max-width: 600px)
{ /* For mobile-phones */
.REC_CONT
{
box-sizing: border-box;
width:460px;
margin:0 auto;
}
.REC_HEAD
{
font-family:Georgia,"DejaVu LGC Serif","Bitstream Vera Serif",serif;
@ -3088,91 +3115,81 @@ table.CELLS_PAD_10 > tbody > tr > td {padding:10px;}
.REC_NAME
{
box-sizing:border-box;
max-width:264px;
max-width:260px;
white-space:nowrap;
overflow:hidden;
text-overflow:ellipsis;
color:#808080;
font-size:16pt;
font-weight:bold;
background-color:orange;
}
.REC_NICK
{
color:#808080;
font-size:12pt;
font-size:13pt;
font-weight:bold;
}
.REC_C1_TOP
{
box-sizing:border-box;
width:52px;
width:50px;
padding-top:8px !important;
vertical-align:top;
background-color:red;
}
.REC_C2_TOP
{
box-sizing:border-box;
width:264px;
height:56px;
width:260px;
height:54px;
padding-top:8px !important;
background-color:yellow;
}
.REC_C3_TOP
{
box-sizing:border-box;
width:124px;
background-color:green;
width:120px;
}
.REC_C1_MID
{
box-sizing:border-box;
width:52px;
background-color:red;
width:50px;
}
.REC_C2_MID
{
box-sizing:border-box;
width:264px;
background-color:yellow;
width:260px;
}
.REC_C3_MID
{
box-sizing:border-box;
width:124px;
background-color:green;
width:120px;
}
.REC_C1_BOT
{
box-sizing:border-box;
width:150px;
background-color:red;
max-width:150px;
overflow:hidden;
text-overflow:ellipsis;
}
.REC_C2_BOT
{
box-sizing:border-box;
width:278px;
background-color:yellow;
width:280px;
max-width:280px;
overflow:hidden;
text-overflow:ellipsis;
}
.REC_C2_BOT_INPUT
{
box-sizing:border-box;
width:274px;
background-color:green;
width:276px;
}
}
@media only screen and (min-width: 600px)
{ /* For desktop */
.REC_CONT
{
box-sizing: border-box;
width:560px;
margin:0 auto;
}
.REC_HEAD
{
font-family:Georgia,"DejaVu LGC Serif","Bitstream Vera Serif",serif;
@ -3189,7 +3206,6 @@ table.CELLS_PAD_10 > tbody > tr > td {padding:10px;}
color:#808080;
font-size:20pt;
font-weight:bold;
background-color:orange;
}
.REC_NICK
{
@ -3204,7 +3220,6 @@ table.CELLS_PAD_10 > tbody > tr > td {padding:10px;}
width:64px;
padding-top:8px !important;
vertical-align:top;
background-color:red;
}
.REC_C2_TOP
{
@ -3212,51 +3227,49 @@ table.CELLS_PAD_10 > tbody > tr > td {padding:10px;}
width:316px;
height:68px;
padding-top:8px !important;
background-color:yellow;
}
.REC_C3_TOP
{
box-sizing:border-box;
width:160px;
background-color:green;
}
.REC_C1_MID
{
box-sizing:border-box;
width:64px;
background-color:red;
}
.REC_C2_MID
{
box-sizing:border-box;
width:316px;
background-color:yellow;
}
.REC_C3_MID
{
box-sizing:border-box;
width:160px;
background-color:green;
}
.REC_C1_BOT
{
box-sizing:border-box;
width:170px;
background-color:red;
max-width:170px;
overflow:hidden;
text-overflow:ellipsis;
}
.REC_C2_BOT
{
box-sizing:border-box;
width:358px;
background-color:yellow;
width:366px;
max-width:366px;
overflow:hidden;
text-overflow:ellipsis;
}
.REC_C2_BOT_INPUT
{
box-sizing:border-box;
width:354px;
background-color:green;
width:362px;
}
}
@ -3277,14 +3290,6 @@ table.CELLS_PAD_10 > tbody > tr > td {padding:10px;}
{
margin:0 auto;
}
.REC_EMAIL
{
box-sizing:border-box;
max-width:358px;
white-space:nowrap;
overflow:hidden;
text-overflow:ellipsis;
}
.REC_FIELDNAME
{
width:200px;
@ -4488,29 +4493,29 @@ legend {font-size:12pt;}
@media only screen and (max-width: 590px)
{ /* For mobile-phones (maximum width visible on Moto G4 vertical) */
.Tml_WIDTH {width:276px;} /* 556-280 */
.Tml_RIGHT_WIDTH {width:220px;} /* 500-280 */
.Tml_WIDTH {width:276px;} /* 556-280 */
.Tml_RIGHT_WIDTH {width:220px;} /* 500-280 */
.Tml_RIGHT_AUTHOR_WIDTH {width: 60px;} /* 340-280 */
.Tml_COM_WIDTH {width:180px;} /* 460-280 */
.Tml_COM_WIDTH {width:180px;} /* 460-280 */
.Tml_COM_AUTHOR_WIDTH {width: 20px;} /* 300-280 */
.Tml_MED_INPUT_WIDTH {width:120px;} /* 400-280 */
.TmlNot_FOOT_WIDTH {width:220px;} /* 500-280 */
.TmlNot_FOOT_WIDTH {width:220px;} /* 500-280 */
.Tml_COMM_FOOT_WIDTH {width:180px;} /* 460-280 */
.Tml_FAV_NOT_WIDTH {width:100px;} /* (480-280)/2 */
.Tml_SHA_NOT_WIDTH {width:100px;} /* (480-280)/2 */
.Tml_FAV_COM_WIDTH {width:160px;} /* 440-280 */
.Tml_FAV_NOT_WIDTH {width:100px;} /* (480-280)/2 */
.Tml_SHA_NOT_WIDTH {width:100px;} /* (480-280)/2 */
.Tml_FAV_COM_WIDTH {width:160px;} /* 440-280 */
}
@media only screen and (min-width: 590px)
{ /* For tablets and desktop (maximum width visible on Moto G4 horizontal) */
.Tml_WIDTH {width:556px;}
.Tml_RIGHT_WIDTH {width:500px;}
.Tml_WIDTH {width:556px;}
.Tml_RIGHT_WIDTH {width:500px;}
.Tml_RIGHT_AUTHOR_WIDTH {width:340px;}
.Tml_COM_WIDTH {width:460px;}
.Tml_COM_WIDTH {width:460px;}
.Tml_COM_AUTHOR_WIDTH {width:300px;}
.Tml_MED_INPUT_WIDTH {width:400px;}
.Tml_FAV_NOT_WIDTH {width:240px;}
.Tml_SHA_NOT_WIDTH {width:240px;}
.Tml_FAV_COM_WIDTH {width:440px;}
.Tml_FAV_NOT_WIDTH {width:240px;}
.Tml_SHA_NOT_WIDTH {width:240px;}
.Tml_FAV_COM_WIDTH {width:440px;}
}
.Tml_NEW_PUB_WHITE,
@ -5260,8 +5265,9 @@ button.PAG_DARK:hover, .PAG_CUR_DARK {background-color:#707070;}
display:inline-block;
text-align:left;
vertical-align:middle;
max-width:120px;
max-width:130px;
overflow:hidden;
text-overflow:ellipsis;
}
}
@media only screen and (min-width: 800px)

5363
css/swad23.48.2.css Normal file
View File

File diff suppressed because it is too large Load Diff

34
swad_ID.c
View File

@ -450,17 +450,15 @@ void ID_ShowFormChangeMyID (bool IShouldFillInID)
HTM_SECTION_Begin (ID_ID_SECTION_ID);
/***** Begin box *****/
HTM_DIV_Begin ("class=\"REC_CONT\"");
Box_BoxBegin ("100%",Txt_ID,
Acc_PutLinkToRemoveMyAccount,NULL,
Hlp_PROFILE_Account,Box_NOT_CLOSABLE);
Box_BoxBegin (NULL,Txt_ID,
Acc_PutLinkToRemoveMyAccount,NULL,
Hlp_PROFILE_Account,Box_NOT_CLOSABLE);
/***** Show form to change ID *****/
ID_ShowFormChangeUsrID (Usr_ME,IShouldFillInID);
/***** Show form to change ID *****/
ID_ShowFormChangeUsrID (Usr_ME,IShouldFillInID);
/***** End box *****/
Box_BoxEnd ();
HTM_DIV_End ();
/***** End box *****/
Box_BoxEnd ();
/***** End section *****/
HTM_SECTION_End ();
@ -479,18 +477,16 @@ void ID_ShowFormChangeOtherUsrID (void)
HTM_SECTION_Begin (ID_ID_SECTION_ID);
/***** Begin box *****/
HTM_DIV_Begin ("class=\"REC_CONT\"");
Box_BoxBegin ("100%",Txt_ID,
NULL,NULL,
Hlp_PROFILE_Account,Box_NOT_CLOSABLE);
Box_BoxBegin (NULL,Txt_ID,
NULL,NULL,
Hlp_PROFILE_Account,Box_NOT_CLOSABLE);
/***** Show form to change ID *****/
ID_ShowFormChangeUsrID (Usr_OTHER,
false); // IShouldFillInID
/***** Show form to change ID *****/
ID_ShowFormChangeUsrID (Usr_OTHER,
false); // IShouldFillInID
/***** End box *****/
Box_BoxEnd ();
HTM_DIV_End ();
/***** End box *****/
Box_BoxEnd ();
/***** End section *****/
HTM_SECTION_End ();

9
swad_center.c
View File

@ -197,8 +197,7 @@ void Ctr_DrawCenterLogoAndNameWithLink (struct Hie_Node *Ctr,Act_Action_t Action
Str_FreeGoToTitle ();
/***** Center logo and name *****/
Lgo_DrawLogo (Hie_CTR,Ctr->HieCod,Ctr->ShrtName,
"ICO16x16",ClassLogo);
Lgo_DrawLogo (Hie_CTR,Ctr->HieCod,Ctr->ShrtName,"ICO16x16",ClassLogo);
HTM_TxtF (" %s",Ctr->FullName);
/***** End link *****/
@ -792,8 +791,7 @@ static void Ctr_ListCentersForEdition (const struct Plc_Places *Places)
/* Center logo */
HTM_TD_Begin ("title=\"%s\" class=\"HIE_LOGO\"",Ctr->FullName);
Lgo_DrawLogo (Hie_CTR,Ctr->HieCod,Ctr->ShrtName,
"ICO20x20",NULL);
Lgo_DrawLogo (Hie_CTR,Ctr->HieCod,Ctr->ShrtName,"ICO20x20",NULL);
HTM_TD_End ();
/* Place */
@ -1252,8 +1250,7 @@ static void Ctr_PutFormToCreateCenter (const struct Plc_Places *Places)
/***** Center logo *****/
HTM_TD_Begin ("title=\"%s\" class=\"HIE_LOGO\"",Ctr_EditingCtr->FullName);
Lgo_DrawLogo (Hie_CTR,-1L,"",
"ICO20x20",NULL);
Lgo_DrawLogo (Hie_CTR,-1L,"","ICO20x20",NULL);
HTM_TD_End ();
/***** Place *****/

6
swad_changelog.h
View File

@ -633,10 +633,12 @@ Me sale este error, no s
"can npt create received message (duplicated entry '243218-2160773' for key 'UsrCod_MsgCod')
*/
#define Log_PLATFORM_VERSION "SWAD 23.48 (2023-11-23)"
#define CSS_FILE "swad23.48.css"
#define Log_PLATFORM_VERSION "SWAD 23.48.2 (2023-11-26)"
#define CSS_FILE "swad23.48.2.css"
#define JS_FILE "swad23.47.3.js"
/*
Version 23.48.2: Nov 26, 2023 Responsive design in program. (335738 lines)
Version 23.48.1: Nov 26, 2023 Responsive design in record cards. (335693 lines)
Version 23.48: Nov 23, 2023 Responsive design in record cards. (335777 lines)
Version 23.47.4: Nov 08, 2023 Fixed bug in program resources. (335581 lines)
Version 23.47.3: Nov 08, 2023 Changes in infinite scroll in timeline. (335581 lines)

3
swad_chat.c
View File

@ -191,8 +191,7 @@ void Cht_ShowListOfAvailableChatRooms (void)
Txt_HIERARCHY_SINGUL_Abc[Hie_DEG],Deg.ShrtName);
Cht_WriteLinkToChat1 (ThisRoomCode,ThisRoomShrtName,
ThisRoomFullName,1,IsLastItemInLevel);
Lgo_DrawLogo (Hie_DEG,Deg.HieCod,Deg.ShrtName,
"ICO16x16",NULL);
Lgo_DrawLogo (Hie_DEG,Deg.HieCod,Deg.ShrtName,"ICO16x16",NULL);
Cht_WriteLinkToChat2 (ThisRoomCode,ThisRoomFullName);
/* Get my courses in this degree from database */

9
swad_degree.c
View File

@ -203,8 +203,7 @@ void Deg_DrawDegreeLogoAndNameWithLink (struct Hie_Node *Deg,Act_Action_t Action
Str_FreeGoToTitle ();
/***** Degree logo and name *****/
Lgo_DrawLogo (Hie_DEG,Deg->HieCod,Deg->ShrtName,
"ICO20x20",ClassLogo);
Lgo_DrawLogo (Hie_DEG,Deg->HieCod,Deg->ShrtName,"ICO20x20",ClassLogo);
HTM_TxtF (" %s",Deg->FullName);
/***** End link *****/
@ -376,8 +375,7 @@ static void Deg_ListDegreesForEdition (const struct DegTyp_DegTypes *DegTypes)
/* Degree logo */
HTM_TD_Begin ("title=\"%s\" class=\"HIE_LOGO\"",Deg->FullName);
Lgo_DrawLogo (Hie_DEG,Deg->HieCod,Deg->ShrtName,
"ICO20x20",NULL);
Lgo_DrawLogo (Hie_DEG,Deg->HieCod,Deg->ShrtName,"ICO20x20",NULL);
HTM_TD_End ();
/* Degree short name and full name */
@ -529,8 +527,7 @@ static void Deg_PutFormToCreateDegree (const struct DegTyp_DegTypes *DegTypes)
/***** Degree logo *****/
HTM_TD_Begin ("title=\"%s\" class=\"HIE_LOGO\"",Deg_EditingDeg->FullName);
Lgo_DrawLogo (Hie_DEG,-1L,"",
"ICO20x20",NULL);
Lgo_DrawLogo (Hie_DEG,-1L,"","ICO20x20",NULL);
HTM_TD_End ();
/***** Degree short name and full name *****/

9
swad_forum.c
View File

@ -1782,18 +1782,15 @@ static void For_WriteLinkToForum (const struct For_Forums *Forums,
break;
case For_FORUM_INSTIT_USRS:
case For_FORUM_INSTIT_TCHS:
Lgo_DrawLogo (Hie_INS,Forum->HieCod,ForumName,
"ICO16x16",NULL);
Lgo_DrawLogo (Hie_INS,Forum->HieCod,ForumName,"ICO16x16",NULL);
break;
case For_FORUM_CENTER_USRS:
case For_FORUM_CENTER_TCHS:
Lgo_DrawLogo (Hie_CTR,Forum->HieCod,ForumName,
"ICO16x16",NULL);
Lgo_DrawLogo (Hie_CTR,Forum->HieCod,ForumName,"ICO16x16",NULL);
break;
case For_FORUM_DEGREE_USRS:
case For_FORUM_DEGREE_TCHS:
Lgo_DrawLogo (Hie_DEG,Forum->HieCod,ForumName,
"ICO16x16",NULL);
Lgo_DrawLogo (Hie_DEG,Forum->HieCod,ForumName,"ICO16x16",NULL);
break;
case For_FORUM_COURSE_USRS:
case For_FORUM_COURSE_TCHS:

30
swad_institution.c
View File

@ -206,7 +206,7 @@ void Ins_SeeInsWithPendingCtrs (void)
/********************** Draw institution logo with link **********************/
/*****************************************************************************/
void Ins_DrawInstitutionLogoWithLink (struct Hie_Node *Ins,unsigned Size)
void Ins_DrawInstitutionLogoWithLink (struct Hie_Node *Ins,const char *IconClass)
{
Hie_PutLink_t PutLink = Frm_CheckIfInside () ? Hie_DONT_PUT_LINK : // Don't put link to institution if already inside a form
Hie_PUT_LINK;
@ -217,10 +217,7 @@ void Ins_DrawInstitutionLogoWithLink (struct Hie_Node *Ins,unsigned Size)
ParCod_PutPar (ParCod_Ins,Ins->HieCod);
HTM_BUTTON_Submit_Begin (Ins->FullName,"class=\"BT_LINK\"");
}
Lgo_DrawLogo (Hie_INS,
Ins->HieCod,
Ins->FullName,
Size,NULL);
Lgo_DrawLogo (Hie_INS,Ins->HieCod,Ins->FullName,IconClass,NULL);
if (PutLink == Hie_PUT_LINK)
{
HTM_BUTTON_End ();
@ -245,10 +242,7 @@ void Ins_DrawInstitLogoAndNameWithLink (struct Hie_Node *Ins,Act_Action_t Action
Str_FreeGoToTitle ();
/***** Institution logo and name *****/
Lgo_DrawLogo (Hie_INS,
Ins->HieCod,
Ins->ShrtName,
16,ClassLogo);
Lgo_DrawLogo (Hie_INS,Ins->HieCod,Ins->ShrtName,"ICO16x16",ClassLogo);
HTM_TxtF (" %s",Ins->FullName);
/***** End link *****/
@ -942,10 +936,7 @@ static void Ins_ListInstitutionsForEdition (void)
/* Institution logo */
HTM_TD_Begin ("title=\"%s\" class=\"HIE_LOGO\"",Ins->FullName);
Lgo_DrawLogo (Hie_INS,
Ins->HieCod,
Ins->ShrtName,
20,NULL);
Lgo_DrawLogo (Hie_INS,Ins->HieCod,Ins->ShrtName,"ICO20x20",NULL);
HTM_TD_End ();
/* Institution short name and full name */
@ -1353,10 +1344,7 @@ static void Ins_PutFormToCreateInstitution (void)
/***** Institution logo *****/
HTM_TD_Begin ("title=\"%s\" class=\"HIE_LOGO\"",Ins_EditingIns->FullName);
Lgo_DrawLogo (Hie_INS,
-1L,
"",
20,NULL);
Lgo_DrawLogo (Hie_INS,-1L,"","ICO20x20",NULL);
HTM_TD_End ();
/***** Institution short name and full name *****/
@ -1860,7 +1848,7 @@ static void Ins_ShowInss (MYSQL_RES **mysql_res,unsigned NumInss,
/***** Write link to institution *****/
HTM_TD_Begin ("class=\"CM FORM_IN_%s\"",
The_GetSuffix ());
Ins_DrawInstitutionLogoWithLink (&Ins,40);
Ins_DrawInstitutionLogoWithLink (&Ins,"ICO40x40");
HTM_BR ();
HTM_Unsigned (NumberThisRow);
HTM_TD_End ();
@ -1907,10 +1895,8 @@ static void Ins_ShowInss (MYSQL_RES **mysql_res,unsigned NumInss,
"class=\"LM BT_LINK\"");
if (Gbl.Usrs.Listing.WithPhotos)
{
Lgo_DrawLogo (Hie_INS,
Ins.HieCod,
Ins.ShrtName,
40,NULL);
Lgo_DrawLogo (Hie_INS,Ins.HieCod,Ins.ShrtName,
"ICO40x40",NULL);
HTM_NBSP ();
}
HTM_Txt (Ins.FullName);

2
swad_institution.h
View File

@ -39,7 +39,7 @@
void Ins_SeeInsWithPendingCtrs (void);
void Ins_DrawInstitutionLogoWithLink (struct Hie_Node *Ins,unsigned Size);
void Ins_DrawInstitutionLogoWithLink (struct Hie_Node *Ins,const char *IconClass);
void Ins_DrawInstitLogoAndNameWithLink (struct Hie_Node *Ins,Act_Action_t Action,
const char *ClassLogo);

8
swad_layout.c
View File

@ -1512,9 +1512,7 @@ void Lay_WriteHeaderClassPhoto (Vie_ViewType_t ViewType)
{
if (ViewType == Vie_VIEW)
HTM_A_Begin ("href=\"%s\" target=\"_blank\"",Hie[Hie_INS].WWW);
Lgo_DrawLogo (Hie_INS,
Hie[Hie_INS].HieCod,
Hie[Hie_INS].ShrtName,
Lgo_DrawLogo (Hie_INS,Hie[Hie_INS].HieCod,Hie[Hie_INS].ShrtName,
"ICO40x40",NULL);
if (ViewType == Vie_VIEW)
HTM_A_End ();
@ -1566,9 +1564,7 @@ void Lay_WriteHeaderClassPhoto (Vie_ViewType_t ViewType)
HTM_A_Begin ("href=\"%s\" target=\"_blank\""
" class=\"CLASSPHOTO_TITLE CLASSPHOTO_%s\"",
Hie[Hie_DEG].WWW,The_GetSuffix ());
Lgo_DrawLogo (Hie_DEG,
Hie[Hie_DEG].HieCod,
Hie[Hie_DEG].ShrtName,
Lgo_DrawLogo (Hie_DEG,Hie[Hie_DEG].HieCod,Hie[Hie_DEG].ShrtName,
"ICO40x40",NULL);
if (ViewType == Vie_VIEW)
HTM_A_End ();

40
swad_mail.c
View File

@ -1025,19 +1025,17 @@ void Mai_ShowFormChangeMyEmail (bool IMustFillInEmail,bool IShouldConfirmEmail)
HTM_SECTION_Begin (Mai_EMAIL_SECTION_ID);
/***** Begin box *****/
HTM_DIV_Begin ("class=\"REC_CONT\"");
Box_BoxBegin ("100%",Txt_Email,
Acc_PutLinkToRemoveMyAccount,NULL,
Hlp_PROFILE_Account,Box_NOT_CLOSABLE);
Box_BoxBegin ("100%",Txt_Email,
Acc_PutLinkToRemoveMyAccount,NULL,
Hlp_PROFILE_Account,Box_NOT_CLOSABLE);
/***** Show form to change email *****/
Mai_ShowFormChangeUsrEmail (Usr_ME,
IMustFillInEmail,
IShouldConfirmEmail);
/***** Show form to change email *****/
Mai_ShowFormChangeUsrEmail (Usr_ME,
IMustFillInEmail,
IShouldConfirmEmail);
/***** End box *****/
Box_BoxEnd ();
HTM_DIV_End ();
/***** End box *****/
Box_BoxEnd ();
/***** End section *****/
HTM_SECTION_End ();
@ -1056,19 +1054,17 @@ void Mai_ShowFormChangeOtherUsrEmail (void)
HTM_SECTION_Begin (Mai_EMAIL_SECTION_ID);
/***** Begin box *****/
HTM_DIV_Begin ("class=\"REC_CONT\"");
Box_BoxBegin ("100%",Txt_Email,
NULL,NULL,
Hlp_PROFILE_Account,Box_NOT_CLOSABLE);
Box_BoxBegin ("100%",Txt_Email,
NULL,NULL,
Hlp_PROFILE_Account,Box_NOT_CLOSABLE);
/***** Show form to change email *****/
Mai_ShowFormChangeUsrEmail (Usr_OTHER,
false, // IMustFillInEmail
false); // IShouldConfirmEmail
/***** Show form to change email *****/
Mai_ShowFormChangeUsrEmail (Usr_OTHER,
false, // IMustFillInEmail
false); // IShouldConfirmEmail
/***** End box *****/
Box_BoxEnd ();
HTM_DIV_End ();
/***** End box *****/
Box_BoxEnd ();
/***** End section *****/
HTM_SECTION_End ();

2
swad_network.c
View File

@ -212,7 +212,7 @@ void Net_ShowFormMyWebsAndSocialNets (void)
Frm_BeginFormAnchor (ActChgMyNet,Net_MY_WEBS_ID);
/***** Begin table *****/
HTM_TABLE_BeginWidePadding (2);
HTM_TABLE_BeginPadding (2);
/***** List webs and social networks *****/
for (NumURL = (Net_WebsAndSocialNetworks_t) 0;

190
swad_nickname.c
View File

@ -211,123 +211,121 @@ static void Nck_ShowFormChangeUsrNickname (Usr_MeOrOther_t MeOrOther,
NumNicks = Nck_DB_GetUsrNicknames (&mysql_res,UsrDat[MeOrOther]->UsrCod);
/***** Begin box *****/
HTM_DIV_Begin ("class=\"REC_CONT\"");
Box_BoxBegin ("100%",Txt_Nickname,
Acc_PutLinkToRemoveMyAccount,NULL,
Hlp_PROFILE_Account,Box_NOT_CLOSABLE);
Box_BoxBegin (NULL,Txt_Nickname,
Acc_PutLinkToRemoveMyAccount,NULL,
Hlp_PROFILE_Account,Box_NOT_CLOSABLE);
/***** Show possible alerts *****/
Ale_ShowAlerts (Nck_NICKNAME_SECTION_ID);
/***** Show possible alerts *****/
Ale_ShowAlerts (Nck_NICKNAME_SECTION_ID);
/***** Help message *****/
if (IMustFillNickname)
Ale_ShowAlert (Ale_WARNING,Txt_Before_going_to_any_other_option_you_must_fill_your_nickname);
/***** Help message *****/
if (IMustFillNickname)
Ale_ShowAlert (Ale_WARNING,Txt_Before_going_to_any_other_option_you_must_fill_your_nickname);
/***** Begin table *****/
HTM_TABLE_BeginWidePadding (2);
/***** Begin table *****/
HTM_TABLE_BeginWidePadding (2);
/***** List nicknames *****/
for (NumNick = 1;
NumNick <= NumNicks;
NumNick++)
/***** List nicknames *****/
for (NumNick = 1;
NumNick <= NumNicks;
NumNick++)
{
/* Get nickname */
row = mysql_fetch_row (mysql_res);
if (NumNick == 1)
{
/* Get nickname */
row = mysql_fetch_row (mysql_res);
/* The first nickname is the current one */
HTM_TR_Begin (NULL);
if (NumNick == 1)
/* Label */
Frm_LabelColumn ("REC_C1_BOT RT",NULL,Txt_Current_nickname);
/* Data */
HTM_TD_Begin ("class=\"REC_C2_BOT LT DAT_STRONG_%s\"",
The_GetSuffix ());
}
else // NumNick >= 2
{
if (NumNick == 2)
{
/* The first nickname is the current one */
HTM_TR_Begin (NULL);
/* Label */
Frm_LabelColumn ("REC_C1_BOT RT",NULL,Txt_Current_nickname);
Frm_LabelColumn ("REC_C1_BOT RT",NULL,Txt_Other_nicknames);
/* Data */
HTM_TD_Begin ("class=\"REC_C2_BOT LT DAT_STRONG_%s\"",
HTM_TD_Begin ("class=\"REC_C2_BOT LT DAT_%s\"",
The_GetSuffix ());
}
else // NumNick >= 2
{
if (NumNick == 2)
{
HTM_TR_Begin (NULL);
/* Label */
Frm_LabelColumn ("REC_C1_BOT RT",NULL,Txt_Other_nicknames);
/* Data */
HTM_TD_Begin ("class=\"REC_C2_BOT LT DAT_%s\"",
The_GetSuffix ());
}
/* Form to remove old nickname */
Ico_PutContextualIconToRemove (ActNck[MeOrOther].Remove,Nck_NICKNAME_SECTION_ID,
FuncParsRemove[MeOrOther],row[0]);
}
/* Nickname */
HTM_TxtF ("@%s",row[0]);
/* Link to QR code */
if (NumNick == 1 && UsrDat[MeOrOther]->Nickname[0])
QR_PutLinkToPrintQRCode (ActPrnUsrQR,
Usr_PutParOtherUsrCodEncrypted,UsrDat[MeOrOther]->EnUsrCod);
/* Form to change the nickname */
if (NumNick > 1)
{
HTM_BR ();
Frm_BeginFormAnchor (ActNck[MeOrOther].Change,Nck_NICKNAME_SECTION_ID);
if (MeOrOther == Usr_OTHER)
Usr_PutParUsrCodEncrypted (Gbl.Usrs.Other.UsrDat.EnUsrCod);
snprintf (NickWithArr,sizeof (NickWithArr),"@%s",row[0]);
Par_PutParString (NULL,"NewNick",NickWithArr); // Nickname
Btn_PutConfirmButtonInline (Txt_Use_this_nickname);
Frm_EndForm ();
}
if (NumNick == 1 ||
NumNick == NumNicks)
{
HTM_TD_End ();
HTM_TR_End ();
}
else
HTM_BR ();
/* Form to remove old nickname */
Ico_PutContextualIconToRemove (ActNck[MeOrOther].Remove,Nck_NICKNAME_SECTION_ID,
FuncParsRemove[MeOrOther],row[0]);
}
/***** Form to enter new nickname *****/
HTM_TR_Begin (NULL);
/* Nickname */
HTM_TxtF ("@%s",row[0]);
/* Label */
Frm_LabelColumn ("REC_C1_BOT RT","NewNick",
NumNicks ? Txt_New_nickname : // A new nickname
Txt_Nickname); // The first nickname
/* Link to QR code */
if (NumNick == 1 && UsrDat[MeOrOther]->Nickname[0])
QR_PutLinkToPrintQRCode (ActPrnUsrQR,
Usr_PutParOtherUsrCodEncrypted,UsrDat[MeOrOther]->EnUsrCod);
/* Data */
HTM_TD_Begin ("class=\"REC_C2_BOT LT DAT_%s\"",
The_GetSuffix ());
Frm_BeginFormAnchor (ActNck[MeOrOther].Change,Nck_NICKNAME_SECTION_ID);
if (MeOrOther == Usr_OTHER)
Usr_PutParUsrCodEncrypted (Gbl.Usrs.Other.UsrDat.EnUsrCod);
snprintf (NickWithArr,sizeof (NickWithArr),"@%s",
UsrDat[MeOrOther]->Nickname);
HTM_INPUT_TEXT ("NewNick",1 + Nck_MAX_CHARS_NICK_WITHOUT_ARROBA,
NickWithArr,HTM_DONT_SUBMIT_ON_CHANGE,
"id=\"NewNick\" class=\"INPUT_%s\""
" size=\"16\"",
The_GetSuffix ());
HTM_BR ();
Btn_PutCreateButtonInline (NumNicks ? Txt_Change_nickname : // I already have a nickname
Txt_Save_changes); // I have no nickname yet);
Frm_EndForm ();
HTM_TD_End ();
/* Form to change the nickname */
if (NumNick > 1)
{
HTM_BR ();
Frm_BeginFormAnchor (ActNck[MeOrOther].Change,Nck_NICKNAME_SECTION_ID);
if (MeOrOther == Usr_OTHER)
Usr_PutParUsrCodEncrypted (Gbl.Usrs.Other.UsrDat.EnUsrCod);
snprintf (NickWithArr,sizeof (NickWithArr),"@%s",row[0]);
Par_PutParString (NULL,"NewNick",NickWithArr); // Nickname
Btn_PutConfirmButtonInline (Txt_Use_this_nickname);
Frm_EndForm ();
}
HTM_TR_End ();
if (NumNick == 1 ||
NumNick == NumNicks)
{
HTM_TD_End ();
HTM_TR_End ();
}
else
HTM_BR ();
}
/***** End table and box *****/
Box_BoxTableEnd ();
HTM_DIV_End ();
/***** Form to enter new nickname *****/
HTM_TR_Begin (NULL);
/* Label */
Frm_LabelColumn ("REC_C1_BOT RT","NewNick",
NumNicks ? Txt_New_nickname : // A new nickname
Txt_Nickname); // The first nickname
/* Data */
HTM_TD_Begin ("class=\"REC_C2_BOT LT DAT_%s\"",
The_GetSuffix ());
Frm_BeginFormAnchor (ActNck[MeOrOther].Change,Nck_NICKNAME_SECTION_ID);
if (MeOrOther == Usr_OTHER)
Usr_PutParUsrCodEncrypted (Gbl.Usrs.Other.UsrDat.EnUsrCod);
snprintf (NickWithArr,sizeof (NickWithArr),"@%s",
UsrDat[MeOrOther]->Nickname);
HTM_INPUT_TEXT ("NewNick",1 + Nck_MAX_CHARS_NICK_WITHOUT_ARROBA,
NickWithArr,HTM_DONT_SUBMIT_ON_CHANGE,
"id=\"NewNick\" class=\"INPUT_%s\""
" size=\"16\"",
The_GetSuffix ());
HTM_BR ();
Btn_PutCreateButtonInline (NumNicks ? Txt_Change_nickname : // I already have a nickname
Txt_Save_changes); // I have no nickname yet);
Frm_EndForm ();
HTM_TD_End ();
HTM_TR_End ();
/***** End table and box *****/
Box_BoxTableEnd ();
/***** End section *****/
HTM_SECTION_End ();

88
swad_password.c
View File

@ -588,60 +588,58 @@ void Pwd_ShowFormChgMyPwd (void)
Frm_BeginFormAnchor (ActChgMyPwd,Pwd_PASSWORD_SECTION_ID);
/***** Begin box *****/
HTM_DIV_Begin ("class=\"REC_CONT\"");
Box_BoxBegin ("100%",Txt_Password,
NULL,NULL,
Hlp_PROFILE_Password,Box_NOT_CLOSABLE);
Box_BoxBegin (NULL,Txt_Password,
NULL,NULL,
Hlp_PROFILE_Password,Box_NOT_CLOSABLE);
/***** Show possible alerts *****/
Ale_ShowAlerts (Pwd_PASSWORD_SECTION_ID);
/***** Show possible alerts *****/
Ale_ShowAlerts (Pwd_PASSWORD_SECTION_ID);
/***** Help message *****/
if (!IHaveAPasswordInDB) // If I don't have a password in database...
Ale_ShowAlert (Ale_WARNING,Txt_Before_going_to_any_other_option_you_must_create_your_password);
else if (Gbl.Usrs.Me.LoginPlainPassword[0])
{
if (!Pwd_FastCheckIfPasswordSeemsGood (Gbl.Usrs.Me.LoginPlainPassword))
Ale_ShowAlert (Ale_WARNING,Txt_Your_password_is_not_secure_enough);
}
/***** Help message *****/
if (!IHaveAPasswordInDB) // If I don't have a password in database...
Ale_ShowAlert (Ale_WARNING,Txt_Before_going_to_any_other_option_you_must_create_your_password);
else if (Gbl.Usrs.Me.LoginPlainPassword[0])
{
if (!Pwd_FastCheckIfPasswordSeemsGood (Gbl.Usrs.Me.LoginPlainPassword))
Ale_ShowAlert (Ale_WARNING,Txt_Your_password_is_not_secure_enough);
}
/***** Begin table *****/
HTM_TABLE_BeginWidePadding (2);
/***** Begin table *****/
HTM_TABLE_BeginWidePadding (2);
/***** Current password *****/
if (IHaveAPasswordInDB) // If I have a password in database...
{
HTM_TR_Begin (NULL);
/* Label */
Frm_LabelColumn ("REC_C1_BOT RM","UsrPwd",Txt_Current_password);
/* Data */
HTM_TD_Begin ("class=\"REC_C2_BOT LM\"");
HTM_INPUT_PASSWORD ("UsrPwd",NULL,"off",true,
"id=\"UsrPwd\" class=\"INPUT_%s\"",
The_GetSuffix ());
HTM_TD_End ();
HTM_TR_End ();
}
/***** Help message *****/
/***** Current password *****/
if (IHaveAPasswordInDB) // If I have a password in database...
{
HTM_TR_Begin (NULL);
HTM_TD_Begin ("colspan=\"2\"");
Ale_ShowAlert (Ale_INFO,Txt_Your_password_must_be_at_least_X_characters_and_can_not_contain_spaces_,
Pwd_MIN_CHARS_PLAIN_PASSWORD);
/* Label */
Frm_LabelColumn ("REC_C1_BOT RM","UsrPwd",Txt_Current_password);
/* Data */
HTM_TD_Begin ("class=\"REC_C2_BOT LM\"");
HTM_INPUT_PASSWORD ("UsrPwd",NULL,"off",true,
"id=\"UsrPwd\" class=\"INPUT_%s\"",
The_GetSuffix ());
HTM_TD_End ();
HTM_TR_End ();
}
/***** New password *****/
Pwd_PutFormToGetNewPasswordTwice ();
/***** Help message *****/
HTM_TR_Begin (NULL);
HTM_TD_Begin ("colspan=\"2\"");
Ale_ShowAlert (Ale_INFO,Txt_Your_password_must_be_at_least_X_characters_and_can_not_contain_spaces_,
Pwd_MIN_CHARS_PLAIN_PASSWORD);
HTM_TD_End ();
HTM_TR_End ();
/***** End table, send button and end box *****/
Box_BoxTableWithButtonEnd (Btn_CONFIRM_BUTTON,
IHaveAPasswordInDB ? Txt_Change_password :
Txt_Set_password);
HTM_DIV_End ();
/***** New password *****/
Pwd_PutFormToGetNewPasswordTwice ();
/***** End table, send button and end box *****/
Box_BoxTableWithButtonEnd (Btn_CONFIRM_BUTTON,
IHaveAPasswordInDB ? Txt_Change_password :
Txt_Set_password);
/***** End form *****/
Frm_EndForm ();

4
swad_photo.c
View File

@ -2262,9 +2262,7 @@ static void Pho_ShowOrPrintListDegrees (struct Pho_DegPhotos *DegPhotos,
Deg_DrawDegreeLogoAndNameWithLink (&Deg,ActSeeDegInf,"CT");
else // Pho_DEGREES_PRINT
{
Lgo_DrawLogo (Hie_DEG,
Deg.HieCod,
Deg.ShrtName,
Lgo_DrawLogo (Hie_DEG,Deg.HieCod,Deg.ShrtName,
"ICO20x20","CT");
HTM_TxtF ("&nbsp;%s",Deg.FullName);
}

706
swad_record.c
View File

@ -2092,194 +2092,192 @@ void Rec_ShowSharedUsrRecord (Rec_SharedRecordViewType_t TypeOfView,
/***** Begin box and table *****/
Rec_Record.UsrDat = UsrDat;
Rec_Record.TypeOfView = TypeOfView;
HTM_DIV_Begin ("class=\"REC_CONT\"");
Box_BoxTableBegin ("100%",NULL,
TypeOfView == Rec_SHA_OTHER_NEW_USR_FORM ? NULL : // New user ==> don't put icons
Rec_PutIconsCommands,NULL,
Rec_RecordHelp[TypeOfView],Box_NOT_CLOSABLE,2);
Box_BoxTableBegin (NULL,NULL,
TypeOfView == Rec_SHA_OTHER_NEW_USR_FORM ? NULL : // New user ==> don't put icons
Rec_PutIconsCommands,NULL,
Rec_RecordHelp[TypeOfView],Box_NOT_CLOSABLE,2);
/***** Institution and user's photo *****/
/***** Institution and user's photo *****/
HTM_TR_Begin (NULL);
Rec_ShowInstitutionInHead (&Ins,PutFormLinks);
Rec_ShowPhoto (UsrDat);
HTM_TR_End ();
/***** Full name *****/
HTM_TR_Begin (NULL);
Rec_ShowFullName (UsrDat);
HTM_TR_End ();
/***** User's nickname *****/
HTM_TR_Begin (NULL);
Rec_ShowNickname (UsrDat,PutFormLinks);
HTM_TR_End ();
/***** User's country, web and social networks *****/
HTM_TR_Begin (NULL);
Rec_ShowCountryInHead (UsrDat,ShowData);
Rec_ShowWebsAndSocialNets (UsrDat,TypeOfView);
HTM_TR_End ();
if (ShowIDRows ||
ShowAddressRows ||
ShowTeacherRows)
{
HTM_TR_Begin (NULL);
Rec_ShowInstitutionInHead (&Ins,PutFormLinks);
Rec_ShowPhoto (UsrDat);
HTM_TR_End ();
/***** Full name *****/
HTM_TR_Begin (NULL);
Rec_ShowFullName (UsrDat);
HTM_TR_End ();
/***** User's nickname *****/
HTM_TR_Begin (NULL);
Rec_ShowNickname (UsrDat,PutFormLinks);
HTM_TR_End ();
/***** User's country, web and social networks *****/
HTM_TR_Begin (NULL);
Rec_ShowCountryInHead (UsrDat,ShowData);
Rec_ShowWebsAndSocialNets (UsrDat,TypeOfView);
HTM_TR_End ();
if (ShowIDRows ||
ShowAddressRows ||
ShowTeacherRows)
{
HTM_TR_Begin (NULL);
HTM_TD_Begin ("colspan=\"3\"");
/***** Show email and user's IDs *****/
if (ShowIDRows)
{
HTM_TABLE_BeginWidePadding (2);
/* Show email */
Rec_ShowEmail (UsrDat);
/* Show user's IDs */
Rec_ShowUsrIDs (UsrDat,Anchor);
HTM_TABLE_End ();
}
/***** Begin form *****/
switch (TypeOfView)
{
case Rec_SHA_SIGN_UP_IN_CRS_FORM:
Frm_BeginForm (ActSignUp);
break;
case Rec_SHA_MY_RECORD_FORM:
Frm_BeginForm (ActChgMyData);
break;
case Rec_SHA_OTHER_EXISTING_USR_FORM:
switch (Gbl.Action.Act)
{
case ActReqMdfStd:
NextAction = ActUpdStd;
break;
case ActReqMdfNET:
NextAction = ActUpdNET;
break;
case ActReqMdfTch:
NextAction = ActUpdTch;
break;
default:
NextAction = ActUpdOth;
break;
}
Frm_BeginForm (NextAction);
Usr_PutParUsrCodEncrypted (UsrDat->EnUsrCod); // Existing user
break;
case Rec_SHA_OTHER_NEW_USR_FORM:
switch (Gbl.Action.Act)
{
case ActReqMdfStd:
NextAction = ActCreStd;
break;
case ActReqMdfNET:
NextAction = ActCreNET;
break;
case ActReqMdfTch:
NextAction = ActCreTch;
break;
default:
NextAction = ActCreOth;
break;
}
Frm_BeginForm (NextAction);
ID_PutParOtherUsrIDPlain (); // New user
break;
default:
break;
}
HTM_TD_Begin ("colspan=\"3\"");
/***** Show email and user's IDs *****/
if (ShowIDRows)
{
HTM_TABLE_BeginWidePadding (2);
if (ShowIDRows)
{
/***** Role or sex *****/
Rec_ShowRole (UsrDat,TypeOfView);
/* Show email */
Rec_ShowEmail (UsrDat);
/***** Name *****/
Rec_ShowSurname1 (UsrDat,ViewType);
Rec_ShowSurname2 (UsrDat,ViewType);
Rec_ShowFirstName (UsrDat,ViewType);
/***** Country *****/
if (CountryForm)
Rec_ShowCountry (UsrDat,ViewType);
}
/***** Address rows *****/
if (ShowAddressRows)
{
/***** Date of birth *****/
Rec_ShowDateOfBirth (UsrDat,ShowData,ViewType);
/***** Phones *****/
Rec_ShowPhone (UsrDat,ShowData,ViewType,0);
Rec_ShowPhone (UsrDat,ShowData,ViewType,1);
/***** User's comments *****/
Rec_ShowComments (UsrDat,ShowData,ViewType);
}
/***** Teacher's rows *****/
if (ShowTeacherRows)
Rec_ShowTeacherRows (UsrDat,&Ins,ShowData);
/* Show user's IDs */
Rec_ShowUsrIDs (UsrDat,Anchor);
HTM_TABLE_End ();
}
/***** Button and end form *****/
switch (TypeOfView)
/***** Begin form *****/
switch (TypeOfView)
{
case Rec_SHA_SIGN_UP_IN_CRS_FORM:
Frm_BeginForm (ActSignUp);
break;
case Rec_SHA_MY_RECORD_FORM:
Frm_BeginForm (ActChgMyData);
break;
case Rec_SHA_OTHER_EXISTING_USR_FORM:
switch (Gbl.Action.Act)
{
case ActReqMdfStd:
NextAction = ActUpdStd;
break;
case ActReqMdfNET:
NextAction = ActUpdNET;
break;
case ActReqMdfTch:
NextAction = ActUpdTch;
break;
default:
NextAction = ActUpdOth;
break;
}
Frm_BeginForm (NextAction);
Usr_PutParUsrCodEncrypted (UsrDat->EnUsrCod); // Existing user
break;
case Rec_SHA_OTHER_NEW_USR_FORM:
switch (Gbl.Action.Act)
{
case ActReqMdfStd:
NextAction = ActCreStd;
break;
case ActReqMdfNET:
NextAction = ActCreNET;
break;
case ActReqMdfTch:
NextAction = ActCreTch;
break;
default:
NextAction = ActCreOth;
break;
}
Frm_BeginForm (NextAction);
ID_PutParOtherUsrIDPlain (); // New user
break;
default:
break;
}
HTM_TABLE_BeginWidePadding (2);
if (ShowIDRows)
{
case Rec_SHA_SIGN_UP_IN_CRS_FORM:
Btn_PutConfirmButton (Txt_Sign_up);
Frm_EndForm ();
break;
case Rec_SHA_MY_RECORD_FORM:
Btn_PutConfirmButton (Txt_Save_changes);
Frm_EndForm ();
break;
case Rec_SHA_OTHER_NEW_USR_FORM:
if (Gbl.Crs.Grps.NumGrps) // This course has groups?
Grp_ShowLstGrpsToChgOtherUsrsGrps (UsrDat->UsrCod);
Btn_PutConfirmButton (Txt_Register);
Frm_EndForm ();
break;
case Rec_SHA_OTHER_EXISTING_USR_FORM:
/***** Show list of groups to register/remove me/user *****/
if (Gbl.Crs.Grps.NumGrps) // This course has groups?
switch (MeOrOther)
{
case Usr_ME:
// Don't show groups if I don't belong to course
if (Gbl.Usrs.Me.IBelongToCurrent[Hie_CRS])
Grp_ShowLstGrpsToChgMyGrps ();
break;
case Usr_OTHER:
default:
Grp_ShowLstGrpsToChgOtherUsrsGrps (UsrDat->UsrCod);
break;
}
/***** Role or sex *****/
Rec_ShowRole (UsrDat,TypeOfView);
/***** Which action, register or removing? *****/
if (Enr_PutActionsRegRemOneUsr (MeOrOther))
Btn_PutConfirmButton (Txt_Confirm);
/***** Name *****/
Rec_ShowSurname1 (UsrDat,ViewType);
Rec_ShowSurname2 (UsrDat,ViewType);
Rec_ShowFirstName (UsrDat,ViewType);
Frm_EndForm ();
break;
default:
break;
/***** Country *****/
if (CountryForm)
Rec_ShowCountry (UsrDat,ViewType);
}
HTM_TD_End ();
HTM_TR_End ();
}
/***** Address rows *****/
if (ShowAddressRows)
{
/***** Date of birth *****/
Rec_ShowDateOfBirth (UsrDat,ShowData,ViewType);
/***** End table and box *****/
Box_BoxTableEnd ();
HTM_DIV_End ();
/***** Phones *****/
Rec_ShowPhone (UsrDat,ShowData,ViewType,0);
Rec_ShowPhone (UsrDat,ShowData,ViewType,1);
/***** User's comments *****/
Rec_ShowComments (UsrDat,ShowData,ViewType);
}
/***** Teacher's rows *****/
if (ShowTeacherRows)
Rec_ShowTeacherRows (UsrDat,&Ins,ShowData);
HTM_TABLE_End ();
/***** Button and end form *****/
switch (TypeOfView)
{
case Rec_SHA_SIGN_UP_IN_CRS_FORM:
Btn_PutConfirmButton (Txt_Sign_up);
Frm_EndForm ();
break;
case Rec_SHA_MY_RECORD_FORM:
Btn_PutConfirmButton (Txt_Save_changes);
Frm_EndForm ();
break;
case Rec_SHA_OTHER_NEW_USR_FORM:
if (Gbl.Crs.Grps.NumGrps) // This course has groups?
Grp_ShowLstGrpsToChgOtherUsrsGrps (UsrDat->UsrCod);
Btn_PutConfirmButton (Txt_Register);
Frm_EndForm ();
break;
case Rec_SHA_OTHER_EXISTING_USR_FORM:
/***** Show list of groups to register/remove me/user *****/
if (Gbl.Crs.Grps.NumGrps) // This course has groups?
switch (MeOrOther)
{
case Usr_ME:
// Don't show groups if I don't belong to course
if (Gbl.Usrs.Me.IBelongToCurrent[Hie_CRS])
Grp_ShowLstGrpsToChgMyGrps ();
break;
case Usr_OTHER:
default:
Grp_ShowLstGrpsToChgOtherUsrsGrps (UsrDat->UsrCod);
break;
}
/***** Which action, register or removing? *****/
if (Enr_PutActionsRegRemOneUsr (MeOrOther))
Btn_PutConfirmButton (Txt_Confirm);
Frm_EndForm ();
break;
default:
break;
}
HTM_TD_End ();
HTM_TR_End ();
}
/***** End table and box *****/
Box_BoxTableEnd ();
}
/*****************************************************************************/
@ -2689,17 +2687,15 @@ static void Rec_ShowEmail (struct Usr_Data *UsrDat)
The_GetSuffix ());
if (UsrDat->Email[0])
{
HTM_DIV_Begin ("class=\"REC_EMAIL\""); // Limited width
if (Mai_ICanSeeOtherUsrEmail (UsrDat))
{
HTM_A_Begin ("href=\"mailto:%s\" class=\"DAT_STRONG_%s\"",
UsrDat->Email,The_GetSuffix ());
HTM_Txt (UsrDat->Email);
HTM_A_End ();
}
else
HTM_Txt ("********");
HTM_DIV_End ();
if (Mai_ICanSeeOtherUsrEmail (UsrDat))
{
HTM_A_Begin ("href=\"mailto:%s\" class=\"DAT_STRONG_%s\"",
UsrDat->Email,The_GetSuffix ());
HTM_Txt (UsrDat->Email);
HTM_A_End ();
}
else
HTM_Txt ("********");
}
HTM_TD_End ();
@ -3881,226 +3877,224 @@ static void Rec_ShowFormMyInsCtrDpt (bool IAmATeacher)
HTM_SECTION_Begin (Rec_MY_INS_CTR_DPT_ID);
/***** Begin box and table *****/
HTM_DIV_Begin ("class=\"REC_CONT\"");
Box_BoxTableBegin ("100%",
IAmATeacher ? Txt_Institution_center_and_department :
Txt_HIERARCHY_SINGUL_Abc[Hie_INS],
NULL,NULL,
Hlp_PROFILE_Institution,Box_NOT_CLOSABLE,2);
Box_BoxTableBegin (NULL,
IAmATeacher ? Txt_Institution_center_and_department :
Txt_HIERARCHY_SINGUL_Abc[Hie_INS],
NULL,NULL,
Hlp_PROFILE_Institution,Box_NOT_CLOSABLE,2);
/***** Country *****/
/***** Country *****/
HTM_TR_Begin (NULL);
/* Label */
if (asprintf (&Label,"%s*",Txt_HIERARCHY_SINGUL_Abc[Hie_CTY]) < 0)
Err_NotEnoughMemoryExit ();
Frm_LabelColumn ("REC_C1_BOT RM","InsCtyCod",Label);
free (Label);
/* Data */
HTM_TD_Begin ("class=\"REC_C2_BOT LM\"");
/* Begin form to select the country of my institution */
Frm_BeginFormAnchor (ActChgCtyMyIns,Rec_MY_INS_CTR_DPT_ID);
HTM_SELECT_Begin (HTM_SUBMIT_ON_CHANGE,NULL,
"id=\"InsCtyCod\" name=\"OthCtyCod\""
" class=\"REC_C2_BOT_INPUT INPUT_%s\"",
The_GetSuffix ());
HTM_OPTION (HTM_Type_STRING,"-1",
Gbl.Usrs.Me.UsrDat.InsCtyCod <= 0 ? HTM_OPTION_SELECTED :
HTM_OPTION_UNSELECTED,
HTM_OPTION_DISABLED,
NULL);
for (NumCty = 0;
NumCty < Gbl.Hierarchy.List[Hie_SYS].Num;
NumCty++)
{
Cty = &Gbl.Hierarchy.List[Hie_SYS].Lst[NumCty];
HTM_OPTION (HTM_Type_LONG,&Cty->HieCod,
Cty->HieCod == Gbl.Usrs.Me.UsrDat.InsCtyCod ? HTM_OPTION_SELECTED :
HTM_OPTION_UNSELECTED,
HTM_OPTION_ENABLED,
"%s",Cty->FullName);
}
HTM_SELECT_End ();
Frm_EndForm ();
HTM_TD_End ();
HTM_TR_End ();
/***** Institution *****/
HTM_TR_Begin (NULL);
/* Label */
if (asprintf (&Label,"%s*",Txt_HIERARCHY_SINGUL_Abc[Hie_INS]) < 0)
Err_NotEnoughMemoryExit ();
Frm_LabelColumn ("REC_C1_BOT RM",Par_CodeStr[ParCod_OthIns],Label);
free (Label);
/* Data */
HTM_TD_Begin ("class=\"REC_C2_BOT LM\"");
/* Get list of institutions in this country */
Hie_FreeList (Hie_CTY);
if (Gbl.Usrs.Me.UsrDat.InsCtyCod > 0)
Ins_GetBasicListOfInstitutions (Gbl.Usrs.Me.UsrDat.InsCtyCod);
/* Begin form to select institution */
Frm_BeginFormAnchor (ActChgMyIns,Rec_MY_INS_CTR_DPT_ID);
HTM_SELECT_Begin (HTM_SUBMIT_ON_CHANGE,NULL,
"id=\"OthInsCod\" name=\"OthInsCod\""
" class=\"REC_C2_BOT_INPUT INPUT_%s\"",
The_GetSuffix ());
HTM_OPTION (HTM_Type_STRING,"-1",
Gbl.Usrs.Me.UsrDat.InsCod < 0 ? HTM_OPTION_SELECTED :
HTM_OPTION_UNSELECTED,
HTM_OPTION_DISABLED,
NULL);
HTM_OPTION (HTM_Type_STRING,"0",
Gbl.Usrs.Me.UsrDat.InsCod == 0 ? HTM_OPTION_SELECTED :
HTM_OPTION_UNSELECTED,
HTM_OPTION_ENABLED,
"%s",Txt_Another_institution);
for (NumIns = 0;
NumIns < Gbl.Hierarchy.List[Hie_CTY].Num;
NumIns++)
{
Ins = &Gbl.Hierarchy.List[Hie_CTY].Lst[NumIns];
HTM_OPTION (HTM_Type_LONG,&Ins->HieCod,
Ins->HieCod == Gbl.Usrs.Me.UsrDat.InsCod ? HTM_OPTION_SELECTED :
HTM_OPTION_UNSELECTED,
HTM_OPTION_ENABLED,
"%s",Ins->FullName);
}
HTM_SELECT_End ();
Frm_EndForm ();
HTM_TD_End ();
HTM_TR_End ();
if (IAmATeacher)
{
/***** Center *****/
HTM_TR_Begin (NULL);
/* Label */
if (asprintf (&Label,"%s*",Txt_HIERARCHY_SINGUL_Abc[Hie_CTY]) < 0)
if (asprintf (&Label,"%s*",Txt_HIERARCHY_SINGUL_Abc[Hie_CTR]) < 0)
Err_NotEnoughMemoryExit ();
Frm_LabelColumn ("REC_C1_BOT RM","InsCtyCod",Label);
Frm_LabelColumn ("REC_C1_BOT RM",Par_CodeStr[ParCod_OthCtr],Label);
free (Label);
/* Data */
HTM_TD_Begin ("class=\"REC_C2_BOT LM\"");
/* Begin form to select the country of my institution */
Frm_BeginFormAnchor (ActChgCtyMyIns,Rec_MY_INS_CTR_DPT_ID);
/* Get list of centers in this institution */
Hie_FreeList (Hie_INS);
if (Gbl.Usrs.Me.UsrDat.InsCod > 0)
Ctr_GetBasicListOfCenters (Gbl.Usrs.Me.UsrDat.InsCod);
/* Begin form to select center */
Frm_BeginFormAnchor (ActChgMyCtr,Rec_MY_INS_CTR_DPT_ID);
HTM_SELECT_Begin (HTM_SUBMIT_ON_CHANGE,NULL,
"id=\"InsCtyCod\" name=\"OthCtyCod\""
"id=\"OthCtrCod\" name=\"OthCtrCod\""
" class=\"REC_C2_BOT_INPUT INPUT_%s\"",
The_GetSuffix ());
HTM_OPTION (HTM_Type_STRING,"-1",
Gbl.Usrs.Me.UsrDat.InsCtyCod <= 0 ? HTM_OPTION_SELECTED :
Gbl.Usrs.Me.UsrDat.Tch.CtrCod < 0 ? HTM_OPTION_SELECTED :
HTM_OPTION_UNSELECTED,
HTM_OPTION_DISABLED,
NULL);
for (NumCty = 0;
NumCty < Gbl.Hierarchy.List[Hie_SYS].Num;
NumCty++)
HTM_OPTION (HTM_Type_STRING,"0",
Gbl.Usrs.Me.UsrDat.Tch.CtrCod == 0 ? HTM_OPTION_SELECTED :
HTM_OPTION_UNSELECTED,
HTM_OPTION_ENABLED,
Txt_Another_center);
for (NumCtr = 0;
NumCtr < Gbl.Hierarchy.List[Hie_SYS].Num;
NumCtr++)
{
Cty = &Gbl.Hierarchy.List[Hie_SYS].Lst[NumCty];
HTM_OPTION (HTM_Type_LONG,&Cty->HieCod,
Cty->HieCod == Gbl.Usrs.Me.UsrDat.InsCtyCod ? HTM_OPTION_SELECTED :
HTM_OPTION_UNSELECTED,
Ctr = &Gbl.Hierarchy.List[Hie_SYS].Lst[NumCtr];
HTM_OPTION (HTM_Type_LONG,&Ctr->HieCod,
Ctr->HieCod == Gbl.Usrs.Me.UsrDat.Tch.CtrCod ? HTM_OPTION_SELECTED :
HTM_OPTION_UNSELECTED,
HTM_OPTION_ENABLED,
"%s",Cty->FullName);
Ctr->FullName);
}
HTM_SELECT_End ();
Frm_EndForm ();
HTM_TD_End ();
HTM_TR_End ();
/***** Institution *****/
/***** Department *****/
HTM_TR_Begin (NULL);
/* Label */
if (asprintf (&Label,"%s*",Txt_HIERARCHY_SINGUL_Abc[Hie_INS]) < 0)
if (asprintf (&Label,"%s*",Txt_Department) < 0)
Err_NotEnoughMemoryExit ();
Frm_LabelColumn ("REC_C1_BOT RM",Par_CodeStr[ParCod_OthIns],Label);
Frm_LabelColumn ("REC_C1_BOT RM",Par_CodeStr[ParCod_Dpt],Label);
free (Label);
/* Data */
HTM_TD_Begin ("class=\"REC_C2_BOT LM\"");
/* Get list of institutions in this country */
Hie_FreeList (Hie_CTY);
if (Gbl.Usrs.Me.UsrDat.InsCtyCod > 0)
Ins_GetBasicListOfInstitutions (Gbl.Usrs.Me.UsrDat.InsCtyCod);
/* Begin form to select institution */
Frm_BeginFormAnchor (ActChgMyIns,Rec_MY_INS_CTR_DPT_ID);
HTM_SELECT_Begin (HTM_SUBMIT_ON_CHANGE,NULL,
"id=\"OthInsCod\" name=\"OthInsCod\""
" class=\"REC_C2_BOT_INPUT INPUT_%s\"",
The_GetSuffix ());
HTM_OPTION (HTM_Type_STRING,"-1",
Gbl.Usrs.Me.UsrDat.InsCod < 0 ? HTM_OPTION_SELECTED :
HTM_OPTION_UNSELECTED,
HTM_OPTION_DISABLED,
NULL);
HTM_OPTION (HTM_Type_STRING,"0",
Gbl.Usrs.Me.UsrDat.InsCod == 0 ? HTM_OPTION_SELECTED :
HTM_OPTION_UNSELECTED,
HTM_OPTION_ENABLED,
"%s",Txt_Another_institution);
for (NumIns = 0;
NumIns < Gbl.Hierarchy.List[Hie_CTY].Num;
NumIns++)
{
Ins = &Gbl.Hierarchy.List[Hie_CTY].Lst[NumIns];
HTM_OPTION (HTM_Type_LONG,&Ins->HieCod,
Ins->HieCod == Gbl.Usrs.Me.UsrDat.InsCod ? HTM_OPTION_SELECTED :
HTM_OPTION_UNSELECTED,
HTM_OPTION_ENABLED,
"%s",Ins->FullName);
}
HTM_SELECT_End ();
Frm_BeginFormAnchor (ActChgMyDpt,Rec_MY_INS_CTR_DPT_ID);
if (asprintf (&SelectClass,"REC_C2_BOT_INPUT INPUT_%s",
The_GetSuffix ()) < 0)
Err_NotEnoughMemoryExit ();
Dpt_WriteSelectorDepartment (Gbl.Usrs.Me.UsrDat.InsCod, // Departments in my institution
Gbl.Usrs.Me.UsrDat.Tch.DptCod, // Selected department
Par_CodeStr[ParCod_Dpt], // Parameter name
SelectClass, // Selector class
-1L, // First option
"", // Text when no department selected
HTM_SUBMIT_ON_CHANGE);
free (SelectClass);
Frm_EndForm ();
HTM_TD_End ();
HTM_TR_End ();
if (IAmATeacher)
{
/***** Center *****/
HTM_TR_Begin (NULL);
/***** Office *****/
HTM_TR_Begin (NULL);
/* Label */
if (asprintf (&Label,"%s*",Txt_HIERARCHY_SINGUL_Abc[Hie_CTR]) < 0)
Err_NotEnoughMemoryExit ();
Frm_LabelColumn ("REC_C1_BOT RM",Par_CodeStr[ParCod_OthCtr],Label);
free (Label);
/* Label */
Frm_LabelColumn ("REC_C1_BOT RM","Office",Txt_Office);
/* Data */
HTM_TD_Begin ("class=\"REC_C2_BOT LM\"");
/* Data */
HTM_TD_Begin ("class=\"REC_C2_BOT LM\"");
Frm_BeginFormAnchor (ActChgMyOff,Rec_MY_INS_CTR_DPT_ID);
HTM_INPUT_TEXT ("Office",Usr_MAX_CHARS_ADDRESS,Gbl.Usrs.Me.UsrDat.Tch.Office,
HTM_SUBMIT_ON_CHANGE,
"id=\"Office\""
" class=\"REC_C2_BOT_INPUT INPUT_%s\"",
The_GetSuffix ());
Frm_EndForm ();
HTM_TD_End ();
/* Get list of centers in this institution */
Hie_FreeList (Hie_INS);
if (Gbl.Usrs.Me.UsrDat.InsCod > 0)
Ctr_GetBasicListOfCenters (Gbl.Usrs.Me.UsrDat.InsCod);
HTM_TR_End ();
/* Begin form to select center */
Frm_BeginFormAnchor (ActChgMyCtr,Rec_MY_INS_CTR_DPT_ID);
HTM_SELECT_Begin (HTM_SUBMIT_ON_CHANGE,NULL,
"id=\"OthCtrCod\" name=\"OthCtrCod\""
" class=\"REC_C2_BOT_INPUT INPUT_%s\"",
The_GetSuffix ());
HTM_OPTION (HTM_Type_STRING,"-1",
Gbl.Usrs.Me.UsrDat.Tch.CtrCod < 0 ? HTM_OPTION_SELECTED :
HTM_OPTION_UNSELECTED,
HTM_OPTION_DISABLED,
NULL);
HTM_OPTION (HTM_Type_STRING,"0",
Gbl.Usrs.Me.UsrDat.Tch.CtrCod == 0 ? HTM_OPTION_SELECTED :
HTM_OPTION_UNSELECTED,
HTM_OPTION_ENABLED,
Txt_Another_center);
for (NumCtr = 0;
NumCtr < Gbl.Hierarchy.List[Hie_SYS].Num;
NumCtr++)
{
Ctr = &Gbl.Hierarchy.List[Hie_SYS].Lst[NumCtr];
HTM_OPTION (HTM_Type_LONG,&Ctr->HieCod,
Ctr->HieCod == Gbl.Usrs.Me.UsrDat.Tch.CtrCod ? HTM_OPTION_SELECTED :
HTM_OPTION_UNSELECTED,
HTM_OPTION_ENABLED,
Ctr->FullName);
}
HTM_SELECT_End ();
Frm_EndForm ();
HTM_TD_End ();
/***** Office phone *****/
HTM_TR_Begin (NULL);
HTM_TR_End ();
/* Label */
Frm_LabelColumn ("REC_C1_BOT RM","OfficePhone",Txt_Phone);
/***** Department *****/
HTM_TR_Begin (NULL);
/* Data */
HTM_TD_Begin ("class=\"REC_C2_BOT LM\"");
Frm_BeginFormAnchor (ActChgMyOffPho,Rec_MY_INS_CTR_DPT_ID);
HTM_INPUT_TEL ("OfficePhone",Gbl.Usrs.Me.UsrDat.Tch.OfficePhone,
HTM_SUBMIT_ON_CHANGE,
"id=\"OfficePhone\""
" class=\"REC_C2_BOT_INPUT INPUT_%s\"",
The_GetSuffix ());
Frm_EndForm ();
HTM_TD_End ();
/* Label */
if (asprintf (&Label,"%s*",Txt_Department) < 0)
Err_NotEnoughMemoryExit ();
Frm_LabelColumn ("REC_C1_BOT RM",Par_CodeStr[ParCod_Dpt],Label);
free (Label);
HTM_TR_End ();
}
/* Data */
HTM_TD_Begin ("class=\"REC_C2_BOT LM\"");
Frm_BeginFormAnchor (ActChgMyDpt,Rec_MY_INS_CTR_DPT_ID);
if (asprintf (&SelectClass,"REC_C2_BOT_INPUT INPUT_%s",
The_GetSuffix ()) < 0)
Err_NotEnoughMemoryExit ();
Dpt_WriteSelectorDepartment (Gbl.Usrs.Me.UsrDat.InsCod, // Departments in my institution
Gbl.Usrs.Me.UsrDat.Tch.DptCod, // Selected department
Par_CodeStr[ParCod_Dpt], // Parameter name
SelectClass, // Selector class
-1L, // First option
"", // Text when no department selected
HTM_SUBMIT_ON_CHANGE);
free (SelectClass);
Frm_EndForm ();
HTM_TD_End ();
HTM_TR_End ();
/***** Office *****/
HTM_TR_Begin (NULL);
/* Label */
Frm_LabelColumn ("REC_C1_BOT RM","Office",Txt_Office);
/* Data */
HTM_TD_Begin ("class=\"REC_C2_BOT LM\"");
Frm_BeginFormAnchor (ActChgMyOff,Rec_MY_INS_CTR_DPT_ID);
HTM_INPUT_TEXT ("Office",Usr_MAX_CHARS_ADDRESS,Gbl.Usrs.Me.UsrDat.Tch.Office,
HTM_SUBMIT_ON_CHANGE,
"id=\"Office\""
" class=\"REC_C2_BOT_INPUT INPUT_%s\"",
The_GetSuffix ());
Frm_EndForm ();
HTM_TD_End ();
HTM_TR_End ();
/***** Office phone *****/
HTM_TR_Begin (NULL);
/* Label */
Frm_LabelColumn ("REC_C1_BOT RM","OfficePhone",Txt_Phone);
/* Data */
HTM_TD_Begin ("class=\"REC_C2_BOT LM\"");
Frm_BeginFormAnchor (ActChgMyOffPho,Rec_MY_INS_CTR_DPT_ID);
HTM_INPUT_TEL ("OfficePhone",Gbl.Usrs.Me.UsrDat.Tch.OfficePhone,
HTM_SUBMIT_ON_CHANGE,
"id=\"OfficePhone\""
" class=\"REC_C2_BOT_INPUT INPUT_%s\"",
The_GetSuffix ());
Frm_EndForm ();
HTM_TD_End ();
HTM_TR_End ();
}
/***** End table and box *****/
Box_BoxTableEnd ();
HTM_DIV_End ();
/***** End table and box *****/
Box_BoxTableEnd ();
/***** End section *****/
HTM_SECTION_End ();

4
swad_user.c
View File

@ -2253,7 +2253,7 @@ void Usr_WriteRowUsrMainData (unsigned NumUsr,struct Usr_Data *UsrDat,
Usr_WriteMainUsrDataExceptUsrID (UsrDat,BgColor);
HTM_TD_Begin ("class=\"LM %s\"",BgColor);
Ins_DrawInstitutionLogoWithLink (&Ins,25);
Ins_DrawInstitutionLogoWithLink (&Ins,"ICO25x25");
HTM_TD_End ();
/***** End row *****/
@ -2592,7 +2592,7 @@ static void Usr_WriteRowAdmData (unsigned NumUsr,struct Usr_Data *UsrDat)
Usr_WriteMainUsrDataExceptUsrID (UsrDat,The_GetColorRows ());
HTM_TD_Begin ("class=\"LM %s\"",The_GetColorRows ());
Ins_DrawInstitutionLogoWithLink (&Ins,25);
Ins_DrawInstitutionLogoWithLink (&Ins,"ICO25x25");
HTM_TD_End ();
HTM_TR_End ();