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: Nov 23, 2023 Responsive design in record cards.

This commit is contained in:
acanas 2023-11-24 14:37:55 +01:00
parent 58b5572072
commit aaa1574379
27 changed files with 1175 additions and 971 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

433
css/swad23.47.3.css → css/swad23.48.css
View File

@ -444,6 +444,11 @@ a:hover /* Default ==> underlined */
max-width:28px;
overflow:hidden;
}
#my_courses
{
width:100px;
margin:1px;
}
}
@media only screen and (min-width: 480px) and (max-width: 800px)
{ /* For mobile-phones */
@ -461,6 +466,11 @@ a:hover /* Default ==> underlined */
max-width:60px;
overflow:hidden;
}
#my_courses
{
width:130px;
margin:1px;
}
}
@media only screen and (min-width: 800px) and (max-width: 1024px)
{ /* For tablets */
@ -478,6 +488,11 @@ a:hover /* Default ==> underlined */
max-width:100px;
overflow:hidden;
}
#my_courses
{
width:130px;
margin:1px;
}
}
@media only screen and (min-width: 1024px)
{ /* For desktop */
@ -495,6 +510,11 @@ a:hover /* Default ==> underlined */
max-width:150px;
overflow:hidden;
}
#my_courses
{
width:130px;
margin:1px;
}
}
.BC_SEMIOFF {opacity:0.7;}
@ -616,11 +636,6 @@ a:hover /* Default ==> underlined */
.MAIN_TITLE_YELLOW {color:white;}
.MAIN_TITLE_PINK {color:white;}
.MAIN_TITLE_DARK {color:#f7f6f5;}
#my_courses
{
width:130px;
margin:1px;
}
/******************************** Search *************************************/
.WHAT_TO_SEARCH {width:186px;}
@ -2045,23 +2060,25 @@ a:hover img.CENTER_PHOTO_SHOW
.ALERT_TXT_DARK {color:white;}
/*********************************** Icons ***********************************/
.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;}
.ICO25x25 {width:25px; height:25px; vertical-align:middle;}
.ICO40x40 {width:40px; height:40px; vertical-align:middle;}
.ICO64x64 {width:64px; height:64px; vertical-align:middle;}
.ICO {width:100%; 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;}
.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;}
.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;}
.ICO160x160 {width:160px; height:160px; vertical-align:middle;}
.BANNER {width:150px; height:50px;}
.BANNER_SMALL {width:75px; height:25px;}
.ICO_DARKRED {color:#660000;}
@ -2404,6 +2421,9 @@ table.CELLS_PAD_10 > tbody > tr > td {padding:10px;}
.PHOTOR60x80 {width: 60px; height: 80px; border-radius:3px; vertical-align:middle;}
.PHOTOR186x248 {width:186px; height:248px; border-radius:4px;}
.PHOTO_REC {width:100%; border-radius:4px;
max-width: 100%; height: auto;}
.IMG_USR
{
box-sizing:border-box;
@ -2957,6 +2977,289 @@ table.CELLS_PAD_10 > tbody > tr > td {padding:10px;}
.USR_ID_NC_DARK {color:#f98a8a}
/******************************* 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;
color:#808080;
font-size:10pt;
}
.REC_NAME
{
box-sizing:border-box;
max-width:168px;
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-weight:bold;
}
.REC_C1_TOP
{
box-sizing:border-box;
width:32px;
padding-top:8px !important;
vertical-align:top;
background-color:red;
}
.REC_C2_TOP
{
box-sizing:border-box;
width:168px;
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;
}
.REC_C3_MID
{
box-sizing:border-box;
width:80px;
background-color:green;
}
.REC_C1_BOT
{
box-sizing:border-box;
width:130px;
background-color:red;
}
.REC_C2_BOT
{
box-sizing:border-box;
width:138px;
background-color:yellow;
}
.REC_C2_BOT_INPUT
{
box-sizing:border-box;
width:134px;
background-color:green;
}
}
@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;
color:#808080;
font-size:11pt;
}
.REC_NAME
{
box-sizing:border-box;
max-width:264px;
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-weight:bold;
}
.REC_C1_TOP
{
box-sizing:border-box;
width:52px;
padding-top:8px !important;
vertical-align:top;
background-color:red;
}
.REC_C2_TOP
{
box-sizing:border-box;
width:264px;
height:56px;
padding-top:8px !important;
background-color:yellow;
}
.REC_C3_TOP
{
box-sizing:border-box;
width:124px;
background-color:green;
}
.REC_C1_MID
{
box-sizing:border-box;
width:52px;
background-color:red;
}
.REC_C2_MID
{
box-sizing:border-box;
width:264px;
background-color:yellow;
}
.REC_C3_MID
{
box-sizing:border-box;
width:124px;
background-color:green;
}
.REC_C1_BOT
{
box-sizing:border-box;
width:150px;
background-color:red;
}
.REC_C2_BOT
{
box-sizing:border-box;
width:278px;
background-color:yellow;
}
.REC_C2_BOT_INPUT
{
box-sizing:border-box;
width:274px;
background-color:green;
}
}
@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;
color:#808080;
font-size:12pt;
}
.REC_NAME
{
box-sizing:border-box;
max-width:316px;
white-space:nowrap;
overflow:hidden;
text-overflow:ellipsis;
color:#808080;
font-size:20pt;
font-weight:bold;
background-color:orange;
}
.REC_NICK
{
color:#808080;
font-size:15pt;
font-weight:bold;
}
.REC_C1_TOP
{
box-sizing:border-box;
width:64px;
padding-top:8px !important;
vertical-align:top;
background-color:red;
}
.REC_C2_TOP
{
box-sizing:border-box;
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;
}
.REC_C2_BOT
{
box-sizing:border-box;
width:358px;
background-color:yellow;
}
.REC_C2_BOT_INPUT
{
box-sizing:border-box;
width:354px;
background-color:green;
}
}
.REC_USR
{
display:block;
@ -2970,84 +3273,8 @@ table.CELLS_PAD_10 > tbody > tr > td {padding:10px;}
vertical-align:top;
}
.REC_C1_TOP
{
box-sizing:border-box;
width:68px;
padding-top:8px !important;
vertical-align:top;
}
.REC_C2_TOP
{
box-sizing:border-box;
width:278px;
height:68px;
padding-top:8px !important;
}
.REC_C3_TOP
{
box-sizing:border-box;
width:190px;
}
.REC_C1_MID
{
box-sizing:border-box;
width:68px;
}
.REC_C2_MID
{
box-sizing:border-box;
width:278px;
}
.REC_C3_MID
{
box-sizing:border-box;
width:190px;
}
.REC_C1_BOT
{
box-sizing:border-box;
width:170px;
}
.REC_C2_BOT
{
box-sizing:border-box;
width:362px;
}
.REC_C2_BOT_INPUT
{
box-sizing:border-box;
width:358px;
}
.REC_HEAD
{
font-family:Georgia,"DejaVu LGC Serif","Bitstream Vera Serif",serif;
color:#808080;
font-size:12pt;
}
.REC_NAME
{
box-sizing:border-box;
max-width:274px;
white-space:nowrap;
overflow:hidden;
text-overflow:ellipsis;
color:#808080;
font-size:20pt;
font-weight:bold;
}
.REC_NICK
{
color:#808080;
font-size:15pt;
font-weight:bold;
}
.REC_WEBS
{
width:180px;
margin:0 auto;
}
.REC_EMAIL
@ -4796,20 +5023,16 @@ button.PAG_DARK:hover, .PAG_CUR_DARK {background-color:#707070;}
}
/***************************** Public user's profile *************************/
.PRF_FIG_LEFT_CONT
.PRF_FIG_CONT
{
display:inline-block;
box-sizing:border-box;
width:50%;
padding-right:10px;
text-align:right;
vertical-align:top;
margin:4px auto 6px auto;
text-align:center;
}
.PRF_FIG_RIGHT_CONT
.PRF_FIG_LEFT_RIGHT
{
display:inline-block;
box-sizing:border-box;
width:50%;
width:280px;
padding-left:10px;
text-align:left;
vertical-align:top;

38
swad_ID.c
View File

@ -445,22 +445,22 @@ void ID_ShowFormChangeMyID (bool IShouldFillInID)
{
extern const char *Hlp_PROFILE_Account;
extern const char *Txt_ID;
char StrRecordWidth[Cns_MAX_DECIMAL_DIGITS_UINT + 2 + 1];
/***** Begin section *****/
HTM_SECTION_Begin (ID_ID_SECTION_ID);
/***** Begin box *****/
snprintf (StrRecordWidth,sizeof (StrRecordWidth),"%upx",Rec_RECORD_WIDTH);
Box_BoxBegin (StrRecordWidth,Txt_ID,
Acc_PutLinkToRemoveMyAccount,NULL,
Hlp_PROFILE_Account,Box_NOT_CLOSABLE);
HTM_DIV_Begin ("class=\"REC_CONT\"");
Box_BoxBegin ("100%",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 ();
/***** End box *****/
Box_BoxEnd ();
HTM_DIV_End ();
/***** End section *****/
HTM_SECTION_End ();
@ -474,23 +474,23 @@ void ID_ShowFormChangeOtherUsrID (void)
{
extern const char *Hlp_PROFILE_Account;
extern const char *Txt_ID;
char StrRecordWidth[Cns_MAX_DECIMAL_DIGITS_UINT + 2 + 1];
/***** Begin section *****/
HTM_SECTION_Begin (ID_ID_SECTION_ID);
/***** Begin box *****/
snprintf (StrRecordWidth,sizeof (StrRecordWidth),"%upx",Rec_RECORD_WIDTH);
Box_BoxBegin (StrRecordWidth,Txt_ID,
NULL,NULL,
Hlp_PROFILE_Account,Box_NOT_CLOSABLE);
HTM_DIV_Begin ("class=\"REC_CONT\"");
Box_BoxBegin ("100%",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 ();
/***** End box *****/
Box_BoxEnd ();
HTM_DIV_End ();
/***** End section *****/
HTM_SECTION_End ();

18
swad_browser.c
View File

@ -9332,10 +9332,8 @@ static void Brw_WriteRowDocData (unsigned *NumDocsNotHidden,MYSQL_ROW row)
HTM_BUTTON_Submit_Begin (Str_BuildGoToTitle (InsShortName),
"class=\"LT BT_LINK\"");
Str_FreeGoToTitle ();
Lgo_DrawLogo (Hie_INS,
InsCod,
InsShortName,
20,"BT_LINK LT");
Lgo_DrawLogo (Hie_INS,InsCod,InsShortName,
"ICO20x20","LT BT_LINK");
HTM_TxtF (" %s",InsShortName);
HTM_BUTTON_End ();
Frm_EndForm ();
@ -9352,10 +9350,8 @@ static void Brw_WriteRowDocData (unsigned *NumDocsNotHidden,MYSQL_ROW row)
HTM_BUTTON_Submit_Begin (Str_BuildGoToTitle (CtrShortName),
"class=\"LT BT_LINK\"");
Str_FreeGoToTitle ();
Lgo_DrawLogo (Hie_CTR,
CtrCod,
CtrShortName,
20,"LT");
Lgo_DrawLogo (Hie_CTR,CtrCod,CtrShortName,
"ICO20x20","LT");
HTM_TxtF (" %s",CtrShortName);
HTM_BUTTON_End ();
Frm_EndForm ();
@ -9372,10 +9368,8 @@ static void Brw_WriteRowDocData (unsigned *NumDocsNotHidden,MYSQL_ROW row)
HTM_BUTTON_Submit_Begin (Str_BuildGoToTitle (DegShortName),
"class=\"LT BT_LINK\"");
Str_FreeGoToTitle ();
Lgo_DrawLogo (Hie_DEG,
DegCod,
DegShortName,
20,"LT");
Lgo_DrawLogo (Hie_DEG,DegCod,DegShortName,
"ICO20x20","LT");
HTM_TxtF (" %s",DegShortName);
HTM_BUTTON_End ();
Frm_EndForm ();

2
swad_call_for_exam.c
View File

@ -955,7 +955,7 @@ static void Cfe_ShowCallForExam (struct Cfe_CallsForExams *CallsForExams,
Lgo_DrawLogo (Hie_INS,
Gbl.Hierarchy.Node[Hie_INS].HieCod,
Gbl.Hierarchy.Node[Hie_INS].FullName,
64,NULL);
"ICO64x64",NULL);
HTM_BR ();
HTM_Txt (Gbl.Hierarchy.Node[Hie_INS].FullName);
if (TypeViewCallForExam == Cfe_NORMAL_VIEW)

20
swad_center.c
View File

@ -193,14 +193,12 @@ void Ctr_DrawCenterLogoAndNameWithLink (struct Hie_Node *Ctr,Act_Action_t Action
/***** Link to action *****/
HTM_BUTTON_Submit_Begin (Str_BuildGoToTitle (Ctr->FullName),
"class=\"BT_LINK LT\"");
"class=\"LT BT_LINK\"");
Str_FreeGoToTitle ();
/***** Center logo and name *****/
Lgo_DrawLogo (Hie_CTR,
Ctr->HieCod,
Ctr->ShrtName,
16,ClassLogo);
Lgo_DrawLogo (Hie_CTR,Ctr->HieCod,Ctr->ShrtName,
"ICO16x16",ClassLogo);
HTM_TxtF (" %s",Ctr->FullName);
/***** End link *****/
@ -794,10 +792,8 @@ 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,
20,NULL);
Lgo_DrawLogo (Hie_CTR,Ctr->HieCod,Ctr->ShrtName,
"ICO20x20",NULL);
HTM_TD_End ();
/* Place */
@ -1256,10 +1252,8 @@ 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,
"",
20,NULL);
Lgo_DrawLogo (Hie_CTR,-1L,"",
"ICO20x20",NULL);
HTM_TD_End ();
/***** Place *****/

2
swad_center_config.c
View File

@ -583,7 +583,7 @@ static void CtrCfg_Institution (Vie_ViewType_t ViewType,Frm_PutForm_t PutForm)
Lgo_DrawLogo (Hie_INS,
Gbl.Hierarchy.Node[Hie_INS].HieCod,
Gbl.Hierarchy.Node[Hie_INS].ShrtName,
20,"LM");
"ICO20x20","LM");
HTM_NBSP ();
HTM_Txt (Gbl.Hierarchy.Node[Hie_INS].FullName);

5
swad_changelog.h
View File

@ -633,10 +633,11 @@ 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.47.4 (2023-11-09)"
#define CSS_FILE "swad23.47.3.css"
#define Log_PLATFORM_VERSION "SWAD 23.48 (2023-11-23)"
#define CSS_FILE "swad23.48.css"
#define JS_FILE "swad23.47.3.js"
/*
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)
Version 23.47.2: Nov 08, 2023 Changes in infinite scroll in timeline. (335566 lines)

6
swad_chat.c
View File

@ -191,10 +191,8 @@ 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,
16,NULL);
Lgo_DrawLogo (Hie_DEG,Deg.HieCod,Deg.ShrtName,
"ICO16x16",NULL);
Cht_WriteLinkToChat2 (ThisRoomCode,ThisRoomFullName);
/* Get my courses in this degree from database */

14
swad_course.c
View File

@ -267,7 +267,7 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
Lgo_DrawLogo (Hie_INS,
Hie[Hie_INS].HieCod,
Hie[Hie_INS].ShrtName,
16,NULL);
"ICO16x16",NULL);
HTM_TxtF (" %s",Hie[Hie_INS].ShrtName);
HTM_BUTTON_End ();
Frm_EndForm ();
@ -304,7 +304,7 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
Lgo_DrawLogo (Hie_CTR,
Hie[Hie_CTR].HieCod,
Hie[Hie_CTR].ShrtName,
16,NULL);
"ICO16x16",NULL);
HTM_TxtF (" %s",Hie[Hie_CTR].ShrtName);
HTM_BUTTON_End ();
Frm_EndForm ();
@ -341,7 +341,7 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
Lgo_DrawLogo (Hie_DEG,
Hie[Hie_DEG].HieCod,
Hie[Hie_DEG].ShrtName,
16,NULL);
"ICO16x16",NULL);
HTM_TxtF (" %s",Hie[Hie_DEG].ShrtName);
HTM_BUTTON_End ();
Frm_EndForm ();
@ -382,7 +382,7 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
Lgo_DrawLogo (Hie_CRS,
Hie[Hie_CRS].HieCod,
Hie[Hie_CRS].ShrtName,
16,NULL);
"ICO16x16",NULL);
HTM_DIV_Begin ("class=\"MY_CRS_TXT\"");
HTM_TxtF (" %s",Hie[Hie_CRS].ShrtName);
HTM_DIV_End ();
@ -2175,10 +2175,8 @@ static void Crs_WriteRowCrsData (unsigned NumCrs,MYSQL_ROW row,bool WriteColumnA
HTM_BUTTON_Submit_Begin (Str_BuildGoToTitle (row[2]),
"class=\"LT BT_LINK\"");
Str_FreeGoToTitle ();
Lgo_DrawLogo (Hie_DEG,
Deg.HieCod,
Deg.ShrtName,
20,"CT");
Lgo_DrawLogo (Hie_DEG,Deg.HieCod,Deg.ShrtName,
"ICO20x20","CT");
HTM_TxtF (" %s (%s)",row[2],row[6]);
HTM_BUTTON_End ();
Frm_EndForm ();

2
swad_course_config.c
View File

@ -238,7 +238,7 @@ static void CrsCfg_Degree (Vie_ViewType_t ViewType,Frm_PutForm_t PutForm)
Lgo_DrawLogo (Hie_DEG,
Gbl.Hierarchy.Node[Hie_DEG].HieCod,
Gbl.Hierarchy.Node[Hie_DEG].ShrtName,
20,"LM");
"ICO20x20","LM");
HTM_NBSP ();
HTM_Txt (Gbl.Hierarchy.Node[Hie_DEG].FullName);
if (ViewType == Vie_VIEW)

157
swad_date.c
View File

@ -1004,93 +1004,86 @@ void Dat_WriteFormDate (unsigned FirstYear,unsigned LastYear,
unsigned Day;
unsigned NumDaysSelectedMonth;
/***** Begin table *****/
HTM_TABLE_Begin (NULL);
HTM_TR_Begin (NULL);
if (asprintf (&FuncOnChange,"adjustDateForm('%s');",Id) < 0)
Err_NotEnoughMemoryExit ();
if (asprintf (&FuncOnChange,"adjustDateForm('%s');",Id) < 0)
Err_NotEnoughMemoryExit ();
/***** Year *****/
HTM_TD_Begin ("class=\"CM\"");
HTM_SELECT_Begin (SubmitOnChange,FuncOnChange,
"id=\"%sYear\" name=\"%sYear\""
" class=\"INPUT_%s\"%s",
Id,Id,
The_GetSuffix (),
Disabled ? " disabled=\"disabled\"" :
"");
HTM_OPTION (HTM_Type_STRING,"0",
HTM_OPTION_UNSELECTED,
HTM_OPTION_ENABLED,
"-");
for (Year = FirstYear;
Year <= LastYear;
Year++)
HTM_OPTION (HTM_Type_UNSIGNED,&Year,
Year == DateSelected->Year ? HTM_OPTION_SELECTED :
HTM_OPTION_UNSELECTED,
HTM_OPTION_ENABLED,
"%u",Year);
HTM_SELECT_End ();
HTM_TD_End ();
/***** Year *****/
// HTM_TD_Begin ("class=\"CM\"");
HTM_SELECT_Begin (SubmitOnChange,FuncOnChange,
"id=\"%sYear\" name=\"%sYear\""
" class=\"INPUT_%s\"%s",
Id,Id,
The_GetSuffix (),
Disabled ? " disabled=\"disabled\"" :
"");
HTM_OPTION (HTM_Type_STRING,"0",
HTM_OPTION_UNSELECTED,
HTM_OPTION_ENABLED,
"-");
for (Year = FirstYear;
Year <= LastYear;
Year++)
HTM_OPTION (HTM_Type_UNSIGNED,&Year,
Year == DateSelected->Year ? HTM_OPTION_SELECTED :
HTM_OPTION_UNSELECTED,
HTM_OPTION_ENABLED,
"%u",Year);
HTM_SELECT_End ();
// HTM_TD_End ();
/***** Month *****/
HTM_TD_Begin ("class=\"CM\"");
HTM_SELECT_Begin (SubmitOnChange,FuncOnChange,
"id=\"%sMonth\" name=\"%sMonth\""
" class=\"INPUT_%s\"%s",
Id,Id,
The_GetSuffix (),
Disabled ? " disabled=\"disabled\"" :
"");
HTM_OPTION (HTM_Type_STRING,"0",
HTM_OPTION_UNSELECTED,
HTM_OPTION_ENABLED,
"-");
for (Month = 1;
Month <= 12;
Month++)
HTM_OPTION (HTM_Type_UNSIGNED,&Month,
Month == DateSelected->Month ? HTM_OPTION_SELECTED :
HTM_OPTION_UNSELECTED,
HTM_OPTION_ENABLED,
"%s",Txt_MONTHS_SMALL[Month - 1]);
HTM_SELECT_End ();
HTM_TD_End ();
/***** Month *****/
// HTM_TD_Begin ("class=\"CM\"");
HTM_SELECT_Begin (SubmitOnChange,FuncOnChange,
"id=\"%sMonth\" name=\"%sMonth\""
" class=\"INPUT_%s\"%s",
Id,Id,
The_GetSuffix (),
Disabled ? " disabled=\"disabled\"" :
"");
HTM_OPTION (HTM_Type_STRING,"0",
HTM_OPTION_UNSELECTED,
HTM_OPTION_ENABLED,
"-");
for (Month = 1;
Month <= 12;
Month++)
HTM_OPTION (HTM_Type_UNSIGNED,&Month,
Month == DateSelected->Month ? HTM_OPTION_SELECTED :
HTM_OPTION_UNSELECTED,
HTM_OPTION_ENABLED,
"%s",Txt_MONTHS_SMALL[Month - 1]);
HTM_SELECT_End ();
// HTM_TD_End ();
free (FuncOnChange);
free (FuncOnChange);
/***** Day *****/
HTM_TD_Begin ("class=\"CM\"");
HTM_SELECT_Begin (SubmitOnChange,NULL,
"id=\"%sDay\" name=\"%sDay\""
" class=\"INPUT_%s\"%s",
Id,Id,
The_GetSuffix (),
Disabled ? " disabled=\"disabled\"" :
"");
HTM_OPTION (HTM_Type_STRING,"0",
HTM_OPTION_UNSELECTED,
HTM_OPTION_ENABLED,
"-");
NumDaysSelectedMonth = (DateSelected->Month == 0) ? 31 :
((DateSelected->Month == 2) ? Dat_GetNumDaysFebruary (DateSelected->Year) :
Dat_NumDaysMonth[DateSelected->Month]);
for (Day = 1;
Day <= NumDaysSelectedMonth;
Day++)
HTM_OPTION (HTM_Type_UNSIGNED,&Day,
Day == DateSelected->Day ? HTM_OPTION_SELECTED :
HTM_OPTION_UNSELECTED,
HTM_OPTION_ENABLED,
"%u",Day);
HTM_SELECT_End ();
HTM_TD_End ();
/***** End table *****/
HTM_TR_End ();
HTM_TABLE_End ();
/***** Day *****/
// HTM_TD_Begin ("class=\"CM\"");
HTM_SELECT_Begin (SubmitOnChange,NULL,
"id=\"%sDay\" name=\"%sDay\""
" class=\"INPUT_%s\"%s",
Id,Id,
The_GetSuffix (),
Disabled ? " disabled=\"disabled\"" :
"");
HTM_OPTION (HTM_Type_STRING,"0",
HTM_OPTION_UNSELECTED,
HTM_OPTION_ENABLED,
"-");
NumDaysSelectedMonth = (DateSelected->Month == 0) ? 31 :
((DateSelected->Month == 2) ? Dat_GetNumDaysFebruary (DateSelected->Year) :
Dat_NumDaysMonth[DateSelected->Month]);
for (Day = 1;
Day <= NumDaysSelectedMonth;
Day++)
HTM_OPTION (HTM_Type_UNSIGNED,&Day,
Day == DateSelected->Day ? HTM_OPTION_SELECTED :
HTM_OPTION_UNSELECTED,
HTM_OPTION_ENABLED,
"%u",Day);
HTM_SELECT_End ();
// HTM_TD_End ();
}
/*****************************************************************************/

18
swad_degree.c
View File

@ -203,10 +203,8 @@ 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,
16,ClassLogo);
Lgo_DrawLogo (Hie_DEG,Deg->HieCod,Deg->ShrtName,
"ICO20x20",ClassLogo);
HTM_TxtF ("&nbsp;%s",Deg->FullName);
/***** End link *****/
@ -378,10 +376,8 @@ 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
,20,NULL);
Lgo_DrawLogo (Hie_DEG,Deg->HieCod,Deg->ShrtName,
"ICO20x20",NULL);
HTM_TD_End ();
/* Degree short name and full name */
@ -533,10 +529,8 @@ 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,
"",
20,NULL);
Lgo_DrawLogo (Hie_DEG,-1L,"",
"ICO20x20",NULL);
HTM_TD_End ();
/***** Degree short name and full name *****/

2
swad_degree_config.c
View File

@ -232,7 +232,7 @@ static void DegCfg_Center (Vie_ViewType_t ViewType,Frm_PutForm_t PutForm)
Lgo_DrawLogo (Hie_CTR,
Gbl.Hierarchy.Node[Hie_CTR].HieCod,
Gbl.Hierarchy.Node[Hie_CTR].ShrtName,
20,"LM");
"ICO20x20","LM");
HTM_NBSP ();
HTM_Txt (Gbl.Hierarchy.Node[Hie_CTR].FullName);
if (ViewType == Vie_VIEW)

18
swad_forum.c
View File

@ -1782,24 +1782,18 @@ 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,
16,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,
16,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,
16,NULL);
Lgo_DrawLogo (Hie_DEG,Forum->HieCod,ForumName,
"ICO16x16",NULL);
break;
case For_FORUM_COURSE_USRS:
case For_FORUM_COURSE_TCHS:

2
swad_hierarchy.c
View File

@ -456,7 +456,7 @@ static void Hie_DrawLogo (void)
Lgo_DrawLogo (LogoScope[Gbl.Hierarchy.Level],
*LogoCode[Gbl.Hierarchy.Level],
Gbl.Hierarchy.Node[Gbl.Hierarchy.Level].ShrtName,
40,"TOP_LOGO");
"ICO40x40","TOP_LOGO");
break;
}
}

2
swad_hierarchy_config.c
View File

@ -70,7 +70,7 @@ void HieCfg_Title (Hie_PutLink_t PutLink,Hie_Level_t Level)
Lgo_DrawLogo (LevelLogo,
Gbl.Hierarchy.Node[LevelLogo].HieCod,
Gbl.Hierarchy.Node[LevelLogo].ShrtName,
64,NULL);
"ICO64x64",NULL);
HTM_BR ();
HTM_Txt (Gbl.Hierarchy.Node[Level].FullName);

4
swad_layout.c
View File

@ -1515,7 +1515,7 @@ void Lay_WriteHeaderClassPhoto (Vie_ViewType_t ViewType)
Lgo_DrawLogo (Hie_INS,
Hie[Hie_INS].HieCod,
Hie[Hie_INS].ShrtName,
40,NULL);
"ICO40x40",NULL);
if (ViewType == Vie_VIEW)
HTM_A_End ();
}
@ -1569,7 +1569,7 @@ void Lay_WriteHeaderClassPhoto (Vie_ViewType_t ViewType)
Lgo_DrawLogo (Hie_DEG,
Hie[Hie_DEG].HieCod,
Hie[Hie_DEG].ShrtName,
40,NULL);
"ICO40x40",NULL);
if (ViewType == Vie_VIEW)
HTM_A_End ();
}

16
swad_logo.c
View File

@ -74,10 +74,8 @@ static void Lgo_PutIconToRemoveLogo (Act_Action_t ActionRem);
/***************** Draw institution, center or degree logo *******************/
/*****************************************************************************/
void Lgo_DrawLogo (Hie_Level_t Level,
long HieCod,
const char *AltText,
unsigned Size,const char *Class)
void Lgo_DrawLogo (Hie_Level_t Level,long HieCod,const char *AltText,
const char *IconClass,const char *Class)
{
static const char *HieIcon[Hie_NUM_LEVELS] =
{
@ -171,9 +169,8 @@ void Lgo_DrawLogo (Hie_Level_t Level,
Err_NotEnoughMemoryExit ();
HTM_IMG (URL,Icon,AltText,
"class=\"ICO%ux%u"
"%s%s\"",
Size,Size,
"class=\"%s%s%s\"",
IconClass,
ClassNotEmpty ? " " :
"",
ClassNotEmpty ? Class :
@ -183,9 +180,8 @@ void Lgo_DrawLogo (Hie_Level_t Level,
}
else
HTM_IMG (Cfg_URL_ICON_PUBLIC,HieIcon[Level],AltText,
"class=\"ICO%ux%u ICO_%s_%s"
"%s%s\"",
Size,Size,
"class=\"%s ICO_%s_%s%s%s\"",
IconClass,
Ico_GetPreffix (Ico_BLACK),The_GetSuffix (),
ClassNotEmpty ? " " :
"",

6
swad_logo.h
View File

@ -27,10 +27,8 @@
/***************************** Public prototypes *****************************/
/*****************************************************************************/
void Lgo_DrawLogo (Hie_Level_t Level,
long HieCod,
const char *AltText,
unsigned Size,const char *Class);
void Lgo_DrawLogo (Hie_Level_t Level,long HieCod,const char *AltText,
const char *IconClass,const char *Class);
void Lgo_PutIconToChangeLogo (Hie_Level_t Level);
void Lgo_RequestLogo (Hie_Level_t Level);
void Lgo_ReceiveLogo (Hie_Level_t Level);

44
swad_mail.c
View File

@ -1020,24 +1020,24 @@ void Mai_ShowFormChangeMyEmail (bool IMustFillInEmail,bool IShouldConfirmEmail)
{
extern const char *Hlp_PROFILE_Account;
extern const char *Txt_Email;
char StrRecordWidth[Cns_MAX_DECIMAL_DIGITS_UINT + 2 + 1];
/***** Begin section *****/
HTM_SECTION_Begin (Mai_EMAIL_SECTION_ID);
/***** Begin box *****/
snprintf (StrRecordWidth,sizeof (StrRecordWidth),"%upx",Rec_RECORD_WIDTH);
Box_BoxBegin (StrRecordWidth,Txt_Email,
Acc_PutLinkToRemoveMyAccount,NULL,
Hlp_PROFILE_Account,Box_NOT_CLOSABLE);
HTM_DIV_Begin ("class=\"REC_CONT\"");
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 ();
/***** End box *****/
Box_BoxEnd ();
HTM_DIV_End ();
/***** End section *****/
HTM_SECTION_End ();
@ -1051,24 +1051,24 @@ void Mai_ShowFormChangeOtherUsrEmail (void)
{
extern const char *Hlp_PROFILE_Account;
extern const char *Txt_Email;
char StrRecordWidth[Cns_MAX_DECIMAL_DIGITS_UINT + 2 + 1];
/***** Begin section *****/
HTM_SECTION_Begin (Mai_EMAIL_SECTION_ID);
/***** Begin box *****/
snprintf (StrRecordWidth,sizeof (StrRecordWidth),"%upx",Rec_RECORD_WIDTH);
Box_BoxBegin (StrRecordWidth,Txt_Email,
NULL,NULL,
Hlp_PROFILE_Account,Box_NOT_CLOSABLE);
HTM_DIV_Begin ("class=\"REC_CONT\"");
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 ();
/***** End box *****/
Box_BoxEnd ();
HTM_DIV_End ();
/***** End section *****/
HTM_SECTION_End ();

90
swad_network.c
View File

@ -197,68 +197,68 @@ void Net_ShowFormMyWebsAndSocialNets (void)
extern const char *Txt_Save_changes;
Net_WebsAndSocialNetworks_t NumURL;
char URL[Cns_MAX_BYTES_WWW + 1];
char StrRecordWidth[Cns_MAX_DECIMAL_DIGITS_UINT + 2 + 1];
char StrName[32];
/***** Begin section *****/
HTM_SECTION_Begin (Net_MY_WEBS_ID);
/***** Begin box *****/
snprintf (StrRecordWidth,sizeof (StrRecordWidth),"%upx",Rec_RECORD_WIDTH);
Box_BoxBegin (StrRecordWidth,Txt_Webs_social_networks,
Net_PutIconsWebsSocialNetworks,NULL,
Hlp_PROFILE_Webs,Box_NOT_CLOSABLE);
HTM_DIV_Begin ("class=\"REC_CONT\"");
Box_BoxBegin ("100%",Txt_Webs_social_networks,
Net_PutIconsWebsSocialNetworks,NULL,
Hlp_PROFILE_Webs,Box_NOT_CLOSABLE);
/***** Begin form *****/
Frm_BeginFormAnchor (ActChgMyNet,Net_MY_WEBS_ID);
/***** Begin form *****/
Frm_BeginFormAnchor (ActChgMyNet,Net_MY_WEBS_ID);
/***** Begin table *****/
HTM_TABLE_BeginPadding (2);
/***** Begin table *****/
HTM_TABLE_BeginWidePadding (2);
/***** List webs and social networks *****/
for (NumURL = (Net_WebsAndSocialNetworks_t) 0;
NumURL <= (Net_WebsAndSocialNetworks_t) (Net_NUM_WEBS_AND_SOCIAL_NETWORKS - 1);
NumURL++)
{
/***** Get user's web / social network from database *****/
Net_DB_GetURL (Gbl.Usrs.Me.UsrDat.UsrCod,NumURL,URL);
/***** List webs and social networks *****/
for (NumURL = (Net_WebsAndSocialNetworks_t) 0;
NumURL <= (Net_WebsAndSocialNetworks_t) (Net_NUM_WEBS_AND_SOCIAL_NETWORKS - 1);
NumURL++)
{
/***** Get user's web / social network from database *****/
Net_DB_GetURL (Gbl.Usrs.Me.UsrDat.UsrCod,NumURL,URL);
/***** Row for this web / social network *****/
snprintf (StrName,sizeof (StrName),"URL%u",(unsigned) NumURL);
HTM_TR_Begin (NULL);
/***** Row for this web / social network *****/
snprintf (StrName,sizeof (StrName),"URL%u",(unsigned) NumURL);
HTM_TR_Begin (NULL);
HTM_TD_Begin ("class=\"REC_C1_BOT LM\"");
HTM_LABEL_Begin ("for=\"%s\" class=\"FORM_IN_%s\"",
StrName,The_GetSuffix ());
Ico_PutIcon (Net_WebsAndSocialNetworksIcons[NumURL],Ico_BLACK,
Net_WebsAndSocialNetworksTitle[NumURL],
"CONTEXT_OPT CONTEXT_ICO16x16");
HTM_TxtF ("&nbsp;%s:",Net_WebsAndSocialNetworksTitle[NumURL]);
HTM_LABEL_End ();
HTM_TD_End ();
HTM_TD_Begin ("class=\"REC_C1_BOT LM\"");
HTM_LABEL_Begin ("for=\"%s\" class=\"FORM_IN_%s\"",
StrName,The_GetSuffix ());
Ico_PutIcon (Net_WebsAndSocialNetworksIcons[NumURL],Ico_BLACK,
Net_WebsAndSocialNetworksTitle[NumURL],
"CONTEXT_OPT CONTEXT_ICO16x16");
HTM_TxtF ("&nbsp;%s:",Net_WebsAndSocialNetworksTitle[NumURL]);
HTM_LABEL_End ();
HTM_TD_End ();
HTM_TD_Begin ("class=\"REC_C2_BOT LM\"");
HTM_INPUT_URL (StrName,URL,HTM_DONT_SUBMIT_ON_CHANGE,
"id=\"%s\""
" class=\"REC_C2_BOT_INPUT INPUT_%s\"",
StrName,
The_GetSuffix ());
HTM_TD_End ();
HTM_TD_Begin ("class=\"REC_C2_BOT LM\"");
HTM_INPUT_URL (StrName,URL,HTM_DONT_SUBMIT_ON_CHANGE,
"id=\"%s\""
" class=\"REC_C2_BOT_INPUT INPUT_%s\"",
StrName,
The_GetSuffix ());
HTM_TD_End ();
HTM_TR_End ();
}
HTM_TR_End ();
}
/***** End table *****/
HTM_TABLE_End ();
/***** End table *****/
HTM_TABLE_End ();
/***** Confirm button *****/
Btn_PutConfirmButton (Txt_Save_changes);
/***** Confirm button *****/
Btn_PutConfirmButton (Txt_Save_changes);
/***** End form *****/
Frm_EndForm ();
/***** End form *****/
Frm_EndForm ();
/***** End box *****/
Box_BoxEnd ();
/***** End box *****/
Box_BoxEnd ();
HTM_DIV_End ();
/***** End section *****/
HTM_SECTION_End ();

195
swad_nickname.c
View File

@ -179,7 +179,6 @@ static void Nck_ShowFormChangeUsrNickname (Usr_MeOrOther_t MeOrOther,
};
MYSQL_RES *mysql_res;
MYSQL_ROW row;
char StrRecordWidth[Cns_MAX_DECIMAL_DIGITS_UINT + 2 + 1];
unsigned NumNicks;
unsigned NumNick;
char NickWithArr[Nck_MAX_BYTES_NICK_WITH_ARROBA + 1];
@ -212,121 +211,123 @@ static void Nck_ShowFormChangeUsrNickname (Usr_MeOrOther_t MeOrOther,
NumNicks = Nck_DB_GetUsrNicknames (&mysql_res,UsrDat[MeOrOther]->UsrCod);
/***** Begin box *****/
snprintf (StrRecordWidth,sizeof (StrRecordWidth),"%upx",Rec_RECORD_WIDTH);
Box_BoxBegin (StrRecordWidth,Txt_Nickname,
Acc_PutLinkToRemoveMyAccount,NULL,
Hlp_PROFILE_Account,Box_NOT_CLOSABLE);
HTM_DIV_Begin ("class=\"REC_CONT\"");
Box_BoxBegin ("100%",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++)
{
/* Get nickname */
row = mysql_fetch_row (mysql_res);
if (NumNick == 1)
/***** List nicknames *****/
for (NumNick = 1;
NumNick <= NumNicks;
NumNick++)
{
/* The first nickname is the current one */
HTM_TR_Begin (NULL);
/* Get nickname */
row = mysql_fetch_row (mysql_res);
/* Label */
Frm_LabelColumn ("REC_C1_BOT RT",NULL,Txt_Current_nickname);
/* Data */
HTM_TD_Begin ("class=\"REC_C2_BOT LT USR_ID\"");
}
else // NumNick >= 2
{
if (NumNick == 2)
if (NumNick == 1)
{
/* The first nickname is the current one */
HTM_TR_Begin (NULL);
/* Label */
Frm_LabelColumn ("REC_C1_BOT RT",NULL,Txt_Other_nicknames);
Frm_LabelColumn ("REC_C1_BOT RT",NULL,Txt_Current_nickname);
/* Data */
HTM_TD_Begin ("class=\"REC_C2_BOT LT DAT_%s\"",
The_GetSuffix ());
HTM_TD_Begin ("class=\"REC_C2_BOT LT DAT_STRONG_%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]);
}
/* Form to remove old nickname */
Ico_PutContextualIconToRemove (ActNck[MeOrOther].Remove,Nck_NICKNAME_SECTION_ID,
FuncParsRemove[MeOrOther],row[0]);
}
/* Nickname */
HTM_TxtF ("@%s",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);
/* 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 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 ());
/* Form to change the nickname */
if (NumNick > 1)
{
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 ();
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 ();
/***** 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 ();
HTM_DIV_End ();
/***** End section *****/
HTM_SECTION_End ();

90
swad_password.c
View File

@ -579,7 +579,6 @@ void Pwd_ShowFormChgMyPwd (void)
extern const char *Txt_Current_password;
extern const char *Txt_Change_password;
extern const char *Txt_Set_password;
char StrRecordWidth[Cns_MAX_DECIMAL_DIGITS_UINT + 2 + 1];
bool IHaveAPasswordInDB = (bool) Gbl.Usrs.Me.UsrDat.Password[0];
/***** Begin section *****/
@ -589,59 +588,60 @@ void Pwd_ShowFormChgMyPwd (void)
Frm_BeginFormAnchor (ActChgMyPwd,Pwd_PASSWORD_SECTION_ID);
/***** Begin box *****/
snprintf (StrRecordWidth,sizeof (StrRecordWidth),"%upx",Rec_RECORD_WIDTH);
Box_BoxBegin (StrRecordWidth,Txt_Password,
NULL,NULL,
Hlp_PROFILE_Password,Box_NOT_CLOSABLE);
HTM_DIV_Begin ("class=\"REC_CONT\"");
Box_BoxBegin ("100%",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...
{
/***** 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 *****/
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_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 ();
}
/***** 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 ();
/***** New password *****/
Pwd_PutFormToGetNewPasswordTwice ();
/***** New password *****/
Pwd_PutFormToGetNewPasswordTwice ();
/***** End table, send button and end box *****/
Box_BoxTableWithButtonEnd (Btn_CONFIRM_BUTTON,
IHaveAPasswordInDB ? Txt_Change_password :
Txt_Set_password);
/***** End table, send button and end box *****/
Box_BoxTableWithButtonEnd (Btn_CONFIRM_BUTTON,
IHaveAPasswordInDB ? Txt_Change_password :
Txt_Set_password);
HTM_DIV_End ();
/***** End form *****/
Frm_EndForm ();

2
swad_photo.c
View File

@ -2265,7 +2265,7 @@ static void Pho_ShowOrPrintListDegrees (struct Pho_DegPhotos *DegPhotos,
Lgo_DrawLogo (Hie_DEG,
Deg.HieCod,
Deg.ShrtName,
20,"CT");
"ICO20x20","CT");
HTM_TxtF ("&nbsp;%s",Deg.FullName);
}
HTM_TD_End ();

91
swad_profile.c
View File

@ -387,56 +387,61 @@ void Prf_ShowDetailsUserProfile (const struct Usr_Data *UsrDat)
/***** Get figures *****/
Prf_GetUsrFigures (UsrDat->UsrCod,&UsrFigures);
/***** Left list *****/
/* Begin left list */
HTM_DIV_Begin ("class=\"PRF_FIG_LEFT_CONT\"");
HTM_UL_Begin ("class=\"PRF_FIG_UL DAT_STRONG_%s NOWRAP\"",
The_GetSuffix ());
/***** Container *****/
HTM_DIV_Begin ("class=\"PRF_FIG_CONT\"");
/* Time since first click */
Prf_ShowTimeSinceFirstClick (UsrDat,&UsrFigures);
/* Number of courses in which the user has a role */
for (Role = Rol_TCH;
Role >= Rol_STD;
Role--)
Prf_ShowNumCrssWithRole (UsrDat,Role);
/* Number of files currently published */
Prf_ShowNumFilesCurrentlyPublished (UsrDat);
/* End left list */
HTM_UL_End ();
HTM_DIV_End ();
/***** Right list *****/
HTM_DIV_Begin ("class=\"PRF_FIG_RIGHT_CONT\"");
UsrIsBannedFromRanking = Prf_DB_CheckIfUsrBanned (UsrDat->UsrCod);
if (!UsrIsBannedFromRanking)
{
/* Begin right list */
/***** Left list *****/
/* Begin left list */
HTM_DIV_Begin ("class=\"PRF_FIG_LEFT_RIGHT\"");
HTM_UL_Begin ("class=\"PRF_FIG_UL DAT_STRONG_%s NOWRAP\"",
The_GetSuffix ());
The_GetSuffix ());
/* Number of clicks */
Prf_ShowNumClicks (UsrDat,&UsrFigures);
/* Time since first click */
Prf_ShowTimeSinceFirstClick (UsrDat,&UsrFigures);
/* Number of file views */
Prf_ShowNumFileViews (UsrDat,&UsrFigures);
/* Number of courses in which the user has a role */
for (Role = Rol_TCH;
Role >= Rol_STD;
Role--)
Prf_ShowNumCrssWithRole (UsrDat,Role);
/* Number of timeline publications */
Prf_ShowNumTimelinePubs (UsrDat,&UsrFigures);
/* Number of files currently published */
Prf_ShowNumFilesCurrentlyPublished (UsrDat);
/* Number of posts in forums */
Prf_ShowNumForumPosts (UsrDat,&UsrFigures);
/* Number of messages sent */
Prf_ShowNumMessagesSent (UsrDat,&UsrFigures);
/* End right list */
/* End left list */
HTM_UL_End ();
}
HTM_DIV_End ();
/***** Right list *****/
HTM_DIV_Begin ("class=\"PRF_FIG_LEFT_RIGHT\"");
UsrIsBannedFromRanking = Prf_DB_CheckIfUsrBanned (UsrDat->UsrCod);
if (!UsrIsBannedFromRanking)
{
/* Begin right list */
HTM_UL_Begin ("class=\"PRF_FIG_UL DAT_STRONG_%s NOWRAP\"",
The_GetSuffix ());
/* Number of clicks */
Prf_ShowNumClicks (UsrDat,&UsrFigures);
/* Number of file views */
Prf_ShowNumFileViews (UsrDat,&UsrFigures);
/* Number of timeline publications */
Prf_ShowNumTimelinePubs (UsrDat,&UsrFigures);
/* Number of posts in forums */
Prf_ShowNumForumPosts (UsrDat,&UsrFigures);
/* Number of messages sent */
Prf_ShowNumMessagesSent (UsrDat,&UsrFigures);
/* End right list */
HTM_UL_End ();
}
HTM_DIV_End ();
HTM_DIV_End ();
}

867
swad_record.c
View File

File diff suppressed because it is too large Load Diff

2
swad_record.h
View File

@ -35,8 +35,6 @@
/***************************** Public constants ******************************/
/*****************************************************************************/
#define Rec_RECORD_WIDTH 560
#define Rec_MAX_CHARS_NAME_FIELD (128 - 1) // 127
#define Rec_MAX_BYTES_NAME_FIELD ((Rec_MAX_CHARS_NAME_FIELD + 1) * Str_MAX_BYTES_PER_CHAR - 1) // 2047