mirror of https://github.com/acanas/swad-core.git
Version 23.48.2: Nov 26, 2023 Responsive design in program.
This commit is contained in:
parent
aaa1574379
commit
80d9469763
|
@ -1764,44 +1764,93 @@ a:hover img.CENTER_PHOTO_SHOW
|
|||
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;
|
||||
|
@ -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)
|
File diff suppressed because it is too large
Load Diff
|
@ -450,8 +450,7 @@ 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,
|
||||
Box_BoxBegin (NULL,Txt_ID,
|
||||
Acc_PutLinkToRemoveMyAccount,NULL,
|
||||
Hlp_PROFILE_Account,Box_NOT_CLOSABLE);
|
||||
|
||||
|
@ -460,7 +459,6 @@ void ID_ShowFormChangeMyID (bool IShouldFillInID)
|
|||
|
||||
/***** End box *****/
|
||||
Box_BoxEnd ();
|
||||
HTM_DIV_End ();
|
||||
|
||||
/***** End section *****/
|
||||
HTM_SECTION_End ();
|
||||
|
@ -479,8 +477,7 @@ void ID_ShowFormChangeOtherUsrID (void)
|
|||
HTM_SECTION_Begin (ID_ID_SECTION_ID);
|
||||
|
||||
/***** Begin box *****/
|
||||
HTM_DIV_Begin ("class=\"REC_CONT\"");
|
||||
Box_BoxBegin ("100%",Txt_ID,
|
||||
Box_BoxBegin (NULL,Txt_ID,
|
||||
NULL,NULL,
|
||||
Hlp_PROFILE_Account,Box_NOT_CLOSABLE);
|
||||
|
||||
|
@ -490,7 +487,6 @@ void ID_ShowFormChangeOtherUsrID (void)
|
|||
|
||||
/***** End box *****/
|
||||
Box_BoxEnd ();
|
||||
HTM_DIV_End ();
|
||||
|
||||
/***** End section *****/
|
||||
HTM_SECTION_End ();
|
||||
|
|
|
@ -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 *****/
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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 */
|
||||
|
|
|
@ -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 *****/
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
|
@ -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 ();
|
||||
|
|
|
@ -1025,7 +1025,6 @@ 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);
|
||||
|
@ -1037,7 +1036,6 @@ void Mai_ShowFormChangeMyEmail (bool IMustFillInEmail,bool IShouldConfirmEmail)
|
|||
|
||||
/***** End box *****/
|
||||
Box_BoxEnd ();
|
||||
HTM_DIV_End ();
|
||||
|
||||
/***** End section *****/
|
||||
HTM_SECTION_End ();
|
||||
|
@ -1056,7 +1054,6 @@ 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);
|
||||
|
@ -1068,7 +1065,6 @@ void Mai_ShowFormChangeOtherUsrEmail (void)
|
|||
|
||||
/***** End box *****/
|
||||
Box_BoxEnd ();
|
||||
HTM_DIV_End ();
|
||||
|
||||
/***** End section *****/
|
||||
HTM_SECTION_End ();
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -211,8 +211,7 @@ 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,
|
||||
Box_BoxBegin (NULL,Txt_Nickname,
|
||||
Acc_PutLinkToRemoveMyAccount,NULL,
|
||||
Hlp_PROFILE_Account,Box_NOT_CLOSABLE);
|
||||
|
||||
|
@ -327,7 +326,6 @@ static void Nck_ShowFormChangeUsrNickname (Usr_MeOrOther_t MeOrOther,
|
|||
|
||||
/***** End table and box *****/
|
||||
Box_BoxTableEnd ();
|
||||
HTM_DIV_End ();
|
||||
|
||||
/***** End section *****/
|
||||
HTM_SECTION_End ();
|
||||
|
|
|
@ -588,8 +588,7 @@ void Pwd_ShowFormChgMyPwd (void)
|
|||
Frm_BeginFormAnchor (ActChgMyPwd,Pwd_PASSWORD_SECTION_ID);
|
||||
|
||||
/***** Begin box *****/
|
||||
HTM_DIV_Begin ("class=\"REC_CONT\"");
|
||||
Box_BoxBegin ("100%",Txt_Password,
|
||||
Box_BoxBegin (NULL,Txt_Password,
|
||||
NULL,NULL,
|
||||
Hlp_PROFILE_Password,Box_NOT_CLOSABLE);
|
||||
|
||||
|
@ -641,7 +640,6 @@ void Pwd_ShowFormChgMyPwd (void)
|
|||
Box_BoxTableWithButtonEnd (Btn_CONFIRM_BUTTON,
|
||||
IHaveAPasswordInDB ? Txt_Change_password :
|
||||
Txt_Set_password);
|
||||
HTM_DIV_End ();
|
||||
|
||||
/***** End form *****/
|
||||
Frm_EndForm ();
|
||||
|
|
|
@ -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 (" %s",Deg.FullName);
|
||||
}
|
||||
|
|
|
@ -2092,8 +2092,7 @@ 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,
|
||||
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);
|
||||
|
@ -2279,7 +2278,6 @@ void Rec_ShowSharedUsrRecord (Rec_SharedRecordViewType_t TypeOfView,
|
|||
|
||||
/***** End table and box *****/
|
||||
Box_BoxTableEnd ();
|
||||
HTM_DIV_End ();
|
||||
}
|
||||
|
||||
/*****************************************************************************/
|
||||
|
@ -2689,7 +2687,6 @@ 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\"",
|
||||
|
@ -2699,7 +2696,6 @@ static void Rec_ShowEmail (struct Usr_Data *UsrDat)
|
|||
}
|
||||
else
|
||||
HTM_Txt ("********");
|
||||
HTM_DIV_End ();
|
||||
}
|
||||
HTM_TD_End ();
|
||||
|
||||
|
@ -3881,8 +3877,7 @@ 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%",
|
||||
Box_BoxTableBegin (NULL,
|
||||
IAmATeacher ? Txt_Institution_center_and_department :
|
||||
Txt_HIERARCHY_SINGUL_Abc[Hie_INS],
|
||||
NULL,NULL,
|
||||
|
@ -4100,7 +4095,6 @@ static void Rec_ShowFormMyInsCtrDpt (bool IAmATeacher)
|
|||
|
||||
/***** End table and box *****/
|
||||
Box_BoxTableEnd ();
|
||||
HTM_DIV_End ();
|
||||
|
||||
/***** End section *****/
|
||||
HTM_SECTION_End ();
|
||||
|
|
|
@ -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 ();
|
||||
|
|
Loading…
Reference in New Issue