Marown/swad-core
Marown/swad-core
1
0
Fork 0
mirror of https://github.com/acanas/swad-core.git synced 2024-06-01 06:15:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Version 15.64.3

Browse Source
This commit is contained in:
Antonio Cañas Vargas 2015-12-13 13:53:00 +01:00
parent e0bc66d205
commit 9d2620e3cf
14 changed files with 2057 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1962
css/swad15.64.3.css Normal file
View File

File diff suppressed because it is too large Load Diff

7
swad_centre.c
View File

@ -211,8 +211,7 @@ void Ctr_DrawCentreLogoAndNameWithLink (struct Centre *Ctr,Act_Action_t Action,
Act_LinkFormSubmit (Gbl.Title,ClassLink); Act_LinkFormSubmit (Gbl.Title,ClassLink);
/***** Draw centre logo *****/ /***** Draw centre logo *****/
Log_DrawLogo (Sco_SCOPE_CTR,Ctr->CtrCod,Ctr->ShortName, Log_DrawLogo (Sco_SCOPE_CTR,Ctr->CtrCod,Ctr->ShortName,20,ClassLogo,true);
16,ClassLogo,true);
/***** End link *****/ /***** End link *****/
fprintf (Gbl.F.Out,"&nbsp;%s</a>",Ctr->FullName); fprintf (Gbl.F.Out,"&nbsp;%s</a>",Ctr->FullName);
@ -1278,7 +1277,7 @@ static void Ctr_ListCentresForEdition (void)
fprintf (Gbl.F.Out,"<td title=\"%s\" class=\"LEFT_MIDDLE\"" fprintf (Gbl.F.Out,"<td title=\"%s\" class=\"LEFT_MIDDLE\""
" style=\"width:25px;\">", " style=\"width:25px;\">",
Ctr->FullName); Ctr->FullName);
Log_DrawLogo (Sco_SCOPE_CTR,Ctr->CtrCod,Ctr->ShortName,16,NULL,true); Log_DrawLogo (Sco_SCOPE_CTR,Ctr->CtrCod,Ctr->ShortName,20,NULL,true);
fprintf (Gbl.F.Out,"</td>"); fprintf (Gbl.F.Out,"</td>");
/* Institution */ /* Institution */
@ -2080,7 +2079,7 @@ static void Ctr_PutFormToCreateCentre (void)
/***** Centre logo *****/ /***** Centre logo *****/
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE\" style=\"width:25px;\">"); fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE\" style=\"width:25px;\">");
Log_DrawLogo (Sco_SCOPE_CTR,-1L,"",16,NULL,true); Log_DrawLogo (Sco_SCOPE_CTR,-1L,"",20,NULL,true);
fprintf (Gbl.F.Out,"</td>"); fprintf (Gbl.F.Out,"</td>");
/***** Institution *****/ /***** Institution *****/

5
swad_changelog.h
View File

@ -117,12 +117,13 @@
/****************************** Public constants *****************************/ /****************************** Public constants *****************************/
/*****************************************************************************/ /*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 15.64.2 (2015/12/13)" #define Log_PLATFORM_VERSION "SWAD 15.64.3 (2015/12/13)"
#define CSS_FILE "swad15.64.2.css" #define CSS_FILE "swad15.64.3.css"
// Number of lines (includes comments but not blank lines) has been got with the following command: // Number of lines (includes comments but not blank lines) has been got with the following command:
// nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*.h sql/swad*.sql | tail -1 // nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*.h sql/swad*.sql | tail -1
/* /*
Version 15.64.3: Dec 13, 2015 Changes in layout of records. (186979 lines)
Version 15.64.2: Dec 13, 2015 Changes in some CSS names. (186975 lines) Version 15.64.2: Dec 13, 2015 Changes in some CSS names. (186975 lines)
Version 15.64.1: Dec 12, 2015 Changes in layout of user's public profile. (186980 lines) Version 15.64.1: Dec 12, 2015 Changes in layout of user's public profile. (186980 lines)
Version 15.64: Dec 12, 2015 Changes in layout of user's public profile. Version 15.64: Dec 12, 2015 Changes in layout of user's public profile.

2
swad_chat.c
View File

@ -189,7 +189,7 @@ void Cht_ShowListOfAvailableChatRooms (void)
sprintf (ThisRoomShortName,"%s",Deg.ShortName); sprintf (ThisRoomShortName,"%s",Deg.ShortName);
sprintf (ThisRoomFullName,"%s %s",Txt_Degree,Deg.ShortName); sprintf (ThisRoomFullName,"%s %s",Txt_Degree,Deg.ShortName);
Cht_WriteLinkToChat1 (ThisRoomCode,ThisRoomShortName,ThisRoomFullName,1,IsLastItemInLevel); Cht_WriteLinkToChat1 (ThisRoomCode,ThisRoomShortName,ThisRoomFullName,1,IsLastItemInLevel);
Log_DrawLogo (Sco_SCOPE_DEG,Deg.DegCod,Deg.ShortName,16,NULL,true); Log_DrawLogo (Sco_SCOPE_DEG,Deg.DegCod,Deg.ShortName,20,NULL,true);
Cht_WriteLinkToChat2 (ThisRoomCode,ThisRoomFullName); Cht_WriteLinkToChat2 (ThisRoomCode,ThisRoomFullName);
/* Get my courses in this degree from database */ /* Get my courses in this degree from database */

12
swad_course.c
View File

@ -631,8 +631,7 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
Ins_PutParamInsCod (Ins.InsCod); Ins_PutParamInsCod (Ins.InsCod);
Act_LinkFormSubmit (Act_GetActionTextFromDB (Act_Actions[ActSeeInsInf].ActCod,ActTxt), Act_LinkFormSubmit (Act_GetActionTextFromDB (Act_Actions[ActSeeInsInf].ActCod,ActTxt),
The_ClassForm[Gbl.Prefs.Theme]); The_ClassForm[Gbl.Prefs.Theme]);
Log_DrawLogo (Sco_SCOPE_INS,Ins.InsCod,Ins.ShortName, Log_DrawLogo (Sco_SCOPE_INS,Ins.InsCod,Ins.ShortName,20,NULL,true);
16,NULL,true);
Highlight = (Gbl.CurrentCtr.Ctr.CtrCod <= 0 && Highlight = (Gbl.CurrentCtr.Ctr.CtrCod <= 0 &&
Gbl.CurrentIns.Ins.InsCod == Ins.InsCod); Gbl.CurrentIns.Ins.InsCod == Ins.InsCod);
if (Highlight) if (Highlight)
@ -669,8 +668,7 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
Ctr_PutParamCtrCod (Ctr.CtrCod); Ctr_PutParamCtrCod (Ctr.CtrCod);
Act_LinkFormSubmit (Act_GetActionTextFromDB (Act_Actions[ActSeeCtrInf].ActCod,ActTxt), Act_LinkFormSubmit (Act_GetActionTextFromDB (Act_Actions[ActSeeCtrInf].ActCod,ActTxt),
The_ClassForm[Gbl.Prefs.Theme]); The_ClassForm[Gbl.Prefs.Theme]);
Log_DrawLogo (Sco_SCOPE_CTR,Ctr.CtrCod,Ctr.ShortName, Log_DrawLogo (Sco_SCOPE_CTR,Ctr.CtrCod,Ctr.ShortName,20,NULL,true);
16,NULL,true);
Highlight = (Gbl.CurrentDeg.Deg.DegCod <= 0 && Highlight = (Gbl.CurrentDeg.Deg.DegCod <= 0 &&
Gbl.CurrentCtr.Ctr.CtrCod == Ctr.CtrCod); Gbl.CurrentCtr.Ctr.CtrCod == Ctr.CtrCod);
if (Highlight) if (Highlight)
@ -707,8 +705,7 @@ static void Crs_WriteListMyCoursesToSelectOne (void)
Deg_PutParamDegCod (Deg.DegCod); Deg_PutParamDegCod (Deg.DegCod);
Act_LinkFormSubmit (Act_GetActionTextFromDB (Act_Actions[ActSeeDegInf].ActCod,ActTxt), Act_LinkFormSubmit (Act_GetActionTextFromDB (Act_Actions[ActSeeDegInf].ActCod,ActTxt),
The_ClassForm[Gbl.Prefs.Theme]); The_ClassForm[Gbl.Prefs.Theme]);
Log_DrawLogo (Sco_SCOPE_DEG,Deg.DegCod,Deg.ShortName, Log_DrawLogo (Sco_SCOPE_DEG,Deg.DegCod,Deg.ShortName,20,NULL,true);
16,NULL,true);
Highlight = (Gbl.CurrentCrs.Crs.CrsCod <= 0 && Highlight = (Gbl.CurrentCrs.Crs.CrsCod <= 0 &&
Gbl.CurrentDeg.Deg.DegCod == Deg.DegCod); Gbl.CurrentDeg.Deg.DegCod == Deg.DegCod);
if (Highlight) if (Highlight)
@ -3203,8 +3200,7 @@ static void Crs_WriteRowCrsData (unsigned NumCrs,MYSQL_ROW row,bool WriteColumnA
Deg_PutParamDegCod (Deg.DegCod); Deg_PutParamDegCod (Deg.DegCod);
sprintf (Gbl.Title,Txt_Go_to_X,row[2]); sprintf (Gbl.Title,Txt_Go_to_X,row[2]);
Act_LinkFormSubmit (Gbl.Title,StyleNoBR); Act_LinkFormSubmit (Gbl.Title,StyleNoBR);
Log_DrawLogo (Sco_SCOPE_DEG,Deg.DegCod,Deg.ShortName, Log_DrawLogo (Sco_SCOPE_DEG,Deg.DegCod,Deg.ShortName,20,"CENTER_TOP",true);
16,"CENTER_TOP",true);
fprintf (Gbl.F.Out," %s (%s)" fprintf (Gbl.F.Out," %s (%s)"
"</a>", "</a>",
row[2],row[6]); row[2],row[6]);

13
swad_degree.c
View File

@ -261,8 +261,7 @@ void Deg_DrawDegreeLogoAndNameWithLink (struct Degree *Deg,Act_Action_t Action,
Act_LinkFormSubmit (Gbl.Title,ClassLink); Act_LinkFormSubmit (Gbl.Title,ClassLink);
/***** Draw degree logo *****/ /***** Draw degree logo *****/
Log_DrawLogo (Sco_SCOPE_DEG,Deg->DegCod,Deg->ShortName, Log_DrawLogo (Sco_SCOPE_DEG,Deg->DegCod,Deg->ShortName,20,ClassLogo,true);
16,ClassLogo,true);
/***** End link *****/ /***** End link *****/
fprintf (Gbl.F.Out,"&nbsp;%s</a>",Deg->FullName); fprintf (Gbl.F.Out,"&nbsp;%s</a>",Deg->FullName);
@ -778,13 +777,13 @@ void Deg_WriteBigNameCtyInsCtrDegCrs (void)
{ {
if (Gbl.CurrentDeg.Deg.DegCod > 0) if (Gbl.CurrentDeg.Deg.DegCod > 0)
Log_DrawLogo (Sco_SCOPE_DEG,Gbl.CurrentDeg.Deg.DegCod, Log_DrawLogo (Sco_SCOPE_DEG,Gbl.CurrentDeg.Deg.DegCod,
Gbl.CurrentDeg.Deg.ShortName,32,"TOP_LOGO",false); Gbl.CurrentDeg.Deg.ShortName,40,"TOP_LOGO",false);
else if (Gbl.CurrentCtr.Ctr.CtrCod > 0) else if (Gbl.CurrentCtr.Ctr.CtrCod > 0)
Log_DrawLogo (Sco_SCOPE_CTR,Gbl.CurrentCtr.Ctr.CtrCod, Log_DrawLogo (Sco_SCOPE_CTR,Gbl.CurrentCtr.Ctr.CtrCod,
Gbl.CurrentCtr.Ctr.ShortName,32,"TOP_LOGO",false); Gbl.CurrentCtr.Ctr.ShortName,40,"TOP_LOGO",false);
else if (Gbl.CurrentIns.Ins.InsCod > 0) else if (Gbl.CurrentIns.Ins.InsCod > 0)
Log_DrawLogo (Sco_SCOPE_INS,Gbl.CurrentIns.Ins.InsCod, Log_DrawLogo (Sco_SCOPE_INS,Gbl.CurrentIns.Ins.InsCod,
Gbl.CurrentIns.Ins.ShortName,32,"TOP_LOGO",false); Gbl.CurrentIns.Ins.ShortName,40,"TOP_LOGO",false);
else if (Gbl.CurrentCty.Cty.CtyCod > 0) else if (Gbl.CurrentCty.Cty.CtyCod > 0)
Cty_DrawCountryMap (&Gbl.CurrentCty.Cty,"COUNTRY_MAP_TITLE"); Cty_DrawCountryMap (&Gbl.CurrentCty.Cty,"COUNTRY_MAP_TITLE");
} }
@ -1431,7 +1430,7 @@ static void Deg_ListDegreesForEdition (void)
/* Degree logo */ /* Degree logo */
fprintf (Gbl.F.Out,"<td title=\"%s LEFT_MIDDLE\" style=\"width:25px;\">", fprintf (Gbl.F.Out,"<td title=\"%s LEFT_MIDDLE\" style=\"width:25px;\">",
Deg->FullName); Deg->FullName);
Log_DrawLogo (Sco_SCOPE_DEG,Deg->DegCod,Deg->ShortName,16,NULL,true); Log_DrawLogo (Sco_SCOPE_DEG,Deg->DegCod,Deg->ShortName,20,NULL,true);
fprintf (Gbl.F.Out,"</td>"); fprintf (Gbl.F.Out,"</td>");
/* Centre */ /* Centre */
@ -1799,7 +1798,7 @@ static void Deg_PutFormToCreateDegree (void)
/***** Degree logo *****/ /***** Degree logo *****/
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE\">"); fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE\">");
Log_DrawLogo (Sco_SCOPE_DEG,-1L,"",16,NULL,true); Log_DrawLogo (Sco_SCOPE_DEG,-1L,"",20,NULL,true);
fprintf (Gbl.F.Out,"</td>"); fprintf (Gbl.F.Out,"</td>");
/***** Centre *****/ /***** Centre *****/

9
swad_file_browser.c
View File

@ -11043,8 +11043,7 @@ static void Brw_WriteRowDocData (unsigned *NumDocsNotHidden,MYSQL_ROW row)
Deg_PutParamDegCod (InsCod); Deg_PutParamDegCod (InsCod);
sprintf (Gbl.Title,Txt_Go_to_X,InsShortName); sprintf (Gbl.Title,Txt_Go_to_X,InsShortName);
Act_LinkFormSubmit (Gbl.Title,"DAT"); Act_LinkFormSubmit (Gbl.Title,"DAT");
Log_DrawLogo (Sco_SCOPE_INS,InsCod,InsShortName, Log_DrawLogo (Sco_SCOPE_INS,InsCod,InsShortName,20,"CENTER_TOP",true);
16,"CENTER_TOP",true);
fprintf (Gbl.F.Out,"&nbsp;%s</a>",InsShortName); fprintf (Gbl.F.Out,"&nbsp;%s</a>",InsShortName);
Act_FormEnd (); Act_FormEnd ();
} }
@ -11059,8 +11058,7 @@ static void Brw_WriteRowDocData (unsigned *NumDocsNotHidden,MYSQL_ROW row)
Deg_PutParamDegCod (CtrCod); Deg_PutParamDegCod (CtrCod);
sprintf (Gbl.Title,Txt_Go_to_X,CtrShortName); sprintf (Gbl.Title,Txt_Go_to_X,CtrShortName);
Act_LinkFormSubmit (Gbl.Title,"DAT"); Act_LinkFormSubmit (Gbl.Title,"DAT");
Log_DrawLogo (Sco_SCOPE_CTR,CtrCod,CtrShortName, Log_DrawLogo (Sco_SCOPE_CTR,CtrCod,CtrShortName,20,"CENTER_TOP",true);
16,"CENTER_TOP",true);
fprintf (Gbl.F.Out,"&nbsp;%s</a>",CtrShortName); fprintf (Gbl.F.Out,"&nbsp;%s</a>",CtrShortName);
Act_FormEnd (); Act_FormEnd ();
} }
@ -11075,8 +11073,7 @@ static void Brw_WriteRowDocData (unsigned *NumDocsNotHidden,MYSQL_ROW row)
Deg_PutParamDegCod (DegCod); Deg_PutParamDegCod (DegCod);
sprintf (Gbl.Title,Txt_Go_to_X,DegShortName); sprintf (Gbl.Title,Txt_Go_to_X,DegShortName);
Act_LinkFormSubmit (Gbl.Title,"DAT"); Act_LinkFormSubmit (Gbl.Title,"DAT");
Log_DrawLogo (Sco_SCOPE_DEG,DegCod,DegShortName, Log_DrawLogo (Sco_SCOPE_DEG,DegCod,DegShortName,20,"CENTER_TOP",true);
16,"CENTER_TOP",true);
fprintf (Gbl.F.Out,"&nbsp;%s</a>",DegShortName); fprintf (Gbl.F.Out,"&nbsp;%s</a>",DegShortName);
Act_FormEnd (); Act_FormEnd ();
} }

9
swad_forum.c
View File

@ -2177,18 +2177,15 @@ static void For_WriteLinkToForum (For_ForumType_t ForumType,Act_Action_t NextAct
{ {
case For_FORUM_INSTITUTION_USRS: case For_FORUM_INSTITUTION_USRS:
case For_FORUM_INSTITUTION_TCHS: case For_FORUM_INSTITUTION_TCHS:
Log_DrawLogo (Sco_SCOPE_INS,Gbl.Forum.Ins.InsCod,ForumName, Log_DrawLogo (Sco_SCOPE_INS,Gbl.Forum.Ins.InsCod,ForumName,20,NULL,true);
16,NULL,true);
break; break;
case For_FORUM_CENTRE_USRS: case For_FORUM_CENTRE_USRS:
case For_FORUM_CENTRE_TCHS: case For_FORUM_CENTRE_TCHS:
Log_DrawLogo (Sco_SCOPE_CTR,Gbl.Forum.Ctr.CtrCod,ForumName, Log_DrawLogo (Sco_SCOPE_CTR,Gbl.Forum.Ctr.CtrCod,ForumName,20,NULL,true);
16,NULL,true);
break; break;
case For_FORUM_DEGREE_USRS: case For_FORUM_DEGREE_USRS:
case For_FORUM_DEGREE_TCHS: case For_FORUM_DEGREE_TCHS:
Log_DrawLogo (Sco_SCOPE_DEG,Gbl.Forum.Deg.DegCod,ForumName, Log_DrawLogo (Sco_SCOPE_DEG,Gbl.Forum.Deg.DegCod,ForumName,20,NULL,true);
16,NULL,true);
break; break;
default: default:
fprintf (Gbl.F.Out,"%s",Icon); fprintf (Gbl.F.Out,"%s",Icon);

8
swad_institution.c
View File

@ -201,8 +201,7 @@ void Ins_DrawInstitutionLogoAndNameWithLink (struct Institution *Ins,Act_Action_
Act_LinkFormSubmit (Gbl.Title,ClassLink); Act_LinkFormSubmit (Gbl.Title,ClassLink);
/***** Draw institution logo *****/ /***** Draw institution logo *****/
Log_DrawLogo (Sco_SCOPE_INS,Ins->InsCod,Ins->ShortName, Log_DrawLogo (Sco_SCOPE_INS,Ins->InsCod,Ins->ShortName,20,ClassLogo,true);
16,ClassLogo,true);
/***** End link *****/ /***** End link *****/
fprintf (Gbl.F.Out,"&nbsp;%s</a>",Ins->FullName); fprintf (Gbl.F.Out,"&nbsp;%s</a>",Ins->FullName);
@ -1193,8 +1192,7 @@ static void Ins_ListInstitutionsForEdition (void)
fprintf (Gbl.F.Out,"<td title=\"%s\" class=\"LEFT_MIDDLE\"" fprintf (Gbl.F.Out,"<td title=\"%s\" class=\"LEFT_MIDDLE\""
" style=\"width:25px;\">", " style=\"width:25px;\">",
Ins->FullName); Ins->FullName);
Log_DrawLogo (Sco_SCOPE_INS,Ins->InsCod,Ins->ShortName, Log_DrawLogo (Sco_SCOPE_INS,Ins->InsCod,Ins->ShortName,20,NULL,true);
16,NULL,true);
fprintf (Gbl.F.Out,"</td>"); fprintf (Gbl.F.Out,"</td>");
/* Country */ /* Country */
@ -1835,7 +1833,7 @@ static void Ins_PutFormToCreateInstitution (void)
/***** Institution logo *****/ /***** Institution logo *****/
fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE\" style=\"width:25px;\">"); fprintf (Gbl.F.Out,"<td class=\"LEFT_MIDDLE\" style=\"width:25px;\">");
Log_DrawLogo (Sco_SCOPE_INS,-1L,"",16,NULL,true); Log_DrawLogo (Sco_SCOPE_INS,-1L,"",20,NULL,true);
fprintf (Gbl.F.Out,"</td>"); fprintf (Gbl.F.Out,"</td>");
/***** Country *****/ /***** Country *****/

6
swad_layout.c
View File

@ -1479,8 +1479,7 @@ void Lay_WriteHeaderClassPhoto (unsigned NumColumns,bool PrintView,bool DrawingC
{ {
if (!PrintView) if (!PrintView)
fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\">",Ins.WWW); fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\">",Ins.WWW);
Log_DrawLogo (Sco_SCOPE_INS,Ins.InsCod,Ins.ShortName, Log_DrawLogo (Sco_SCOPE_INS,Ins.InsCod,Ins.ShortName,40,NULL,true);
32,NULL,true);
if (!PrintView) if (!PrintView)
fprintf (Gbl.F.Out,"</a>"); fprintf (Gbl.F.Out,"</a>");
} }
@ -1528,8 +1527,7 @@ void Lay_WriteHeaderClassPhoto (unsigned NumColumns,bool PrintView,bool DrawingC
fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\"" fprintf (Gbl.F.Out,"<a href=\"%s\" target=\"_blank\""
" class=\"TIT_CLASSPHOTO\">", " class=\"TIT_CLASSPHOTO\">",
Deg.WWW); Deg.WWW);
Log_DrawLogo (Sco_SCOPE_DEG,Deg.DegCod,Deg.ShortName, Log_DrawLogo (Sco_SCOPE_DEG,Deg.DegCod,Deg.ShortName,40,NULL,true);
32,NULL,true);
if (!PrintView) if (!PrintView)
fprintf (Gbl.F.Out,"</a>"); fprintf (Gbl.F.Out,"</a>");
} }

3
swad_photo.c
View File

@ -2057,8 +2057,7 @@ static void Pho_ShowOrPrintListDegrees (Pho_AvgPhotoSeeOrPrint_t SeeOrPrint)
"DAT","CENTER_TOP"); "DAT","CENTER_TOP");
else // Pho_DEGREES_PRINT else // Pho_DEGREES_PRINT
{ {
Log_DrawLogo (Sco_SCOPE_DEG,Deg.DegCod,Deg.ShortName, Log_DrawLogo (Sco_SCOPE_DEG,Deg.DegCod,Deg.ShortName,20,"CENTER_TOP",true);
16,"CENTER_TOP",true);
fprintf (Gbl.F.Out,"&nbsp;%s</a>",Deg.FullName); fprintf (Gbl.F.Out,"&nbsp;%s</a>",Deg.FullName);
} }
fprintf (Gbl.F.Out,"</td>"); fprintf (Gbl.F.Out,"</td>");

96
swad_record.c
View File

@ -57,8 +57,8 @@ extern struct Act_Actions Act_Actions[Act_NUM_ACTIONS];
/***************************** Private constants *****************************/ /***************************** Private constants *****************************/
/*****************************************************************************/ /*****************************************************************************/
#define Rec_INSTITUTION_LOGO_SIZE 72 #define Rec_INSTITUTION_LOGO_SIZE 64
#define Rec_DEGREE_LOGO_SIZE 72 #define Rec_DEGREE_LOGO_SIZE 64
#define Rec_SHOW_OFFICE_HOURS_DEFAULT true #define Rec_SHOW_OFFICE_HOURS_DEFAULT true
/*****************************************************************************/ /*****************************************************************************/
@ -1491,8 +1491,8 @@ static void Rec_ShowCrsRecord (Rec_RecordViewType_t TypeOfView,struct UsrData *U
bool ICanEdit; bool ICanEdit;
char Text[Cns_MAX_BYTES_TEXT+1]; char Text[Cns_MAX_BYTES_TEXT+1];
ClassHead = "HEAD_REC"; ClassHead = "REC_HEAD";
ClassData = "DAT_REC"; ClassData = "REC_DAT";
if (Gbl.Usrs.Me.LoggedRole == Rol_STUDENT) // I am a student if (Gbl.Usrs.Me.LoggedRole == Rol_STUDENT) // I am a student
{ {
@ -1531,13 +1531,13 @@ static void Rec_ShowCrsRecord (Rec_RecordViewType_t TypeOfView,struct UsrData *U
break; break;
} }
FrameWidth = 10; FrameWidth = 10;
ClassHead = "HEAD_REC_SMALL"; ClassHead = "REC_HEAD_SMALL";
ClassData = "DAT_REC"; ClassData = "REC_DAT";
break; break;
case Rec_CHECK_MY_COURSE_RECORD_AS_STUDENT: case Rec_CHECK_MY_COURSE_RECORD_AS_STUDENT:
FrameWidth = 10; FrameWidth = 10;
ClassHead = "HEAD_REC_SMALL"; ClassHead = "REC_HEAD_SMALL";
ClassData = "DAT_REC_SMALL_BOLD"; ClassData = "REC_DAT_SMALL_BOLD";
break; break;
case Rec_RECORD_LIST: case Rec_RECORD_LIST:
DataForm = true; DataForm = true;
@ -1545,13 +1545,13 @@ static void Rec_ShowCrsRecord (Rec_RecordViewType_t TypeOfView,struct UsrData *U
Usr_PutHiddenParUsrCodAll (ActRcvRecOthUsr,Gbl.Usrs.Select.All); Usr_PutHiddenParUsrCodAll (ActRcvRecOthUsr,Gbl.Usrs.Select.All);
Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod); Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
FrameWidth = 10; FrameWidth = 10;
ClassHead = "HEAD_REC_SMALL"; ClassHead = "REC_HEAD_SMALL";
ClassData = "DAT_REC_SMALL_BOLD"; ClassData = "REC_DAT_SMALL_BOLD";
break; break;
case Rec_RECORD_PRINT: case Rec_RECORD_PRINT:
FrameWidth = 1; FrameWidth = 1;
ClassHead = "HEAD_REC_SMALL"; ClassHead = "REC_HEAD_SMALL";
ClassData = "DAT_REC_SMALL_BOLD"; ClassData = "REC_DAT_SMALL_BOLD";
break; break;
default: default:
break; break;
@ -1605,7 +1605,7 @@ static void Rec_ShowCrsRecord (Rec_RecordViewType_t TypeOfView,struct UsrData *U
" style=\"width:%upx;\">" " style=\"width:%upx;\">"
"%s:", "%s:",
ICanEdit ? The_ClassForm[Gbl.Prefs.Theme] : ICanEdit ? The_ClassForm[Gbl.Prefs.Theme] :
"DAT_REC_SMALL", "REC_DAT_SMALL",
Gbl.RowEvenOdd,Col1Width, Gbl.RowEvenOdd,Col1Width,
Gbl.CurrentCrs.Records.LstFields.Lst[NumField].Name); Gbl.CurrentCrs.Records.LstFields.Lst[NumField].Name);
if (TypeOfView == Rec_RECORD_LIST) if (TypeOfView == Rec_RECORD_LIST)
@ -1998,6 +1998,7 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
const char *ClassHead; const char *ClassHead;
const char *ClassForm; const char *ClassForm;
const char *ClassData; const char *ClassData;
char Name[Usr_MAX_BYTES_NAME+1]; // To shorten length of FirstName, Surname1, Surname2
char PhotoURL[PATH_MAX+1]; char PhotoURL[PATH_MAX+1];
bool ItsMe = (Gbl.Usrs.Me.UsrDat.UsrCod == UsrDat->UsrCod); bool ItsMe = (Gbl.Usrs.Me.UsrDat.UsrCod == UsrDat->UsrCod);
bool IAmLoggedAsStudent = (Gbl.Usrs.Me.LoggedRole == Rol_STUDENT); // My current role is student bool IAmLoggedAsStudent = (Gbl.Usrs.Me.LoggedRole == Rol_STUDENT); // My current role is student
@ -2070,9 +2071,9 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
struct Centre Ctr; struct Centre Ctr;
struct Department Dpt; struct Department Dpt;
ClassHead = "HEAD_REC"; ClassHead = "REC_HEAD";
ClassForm = The_ClassForm[Gbl.Prefs.Theme]; ClassForm = The_ClassForm[Gbl.Prefs.Theme];
ClassData = "DAT_REC"; ClassData = "REC_DAT";
switch (TypeOfView) switch (TypeOfView)
{ {
case Rec_FORM_SIGN_UP: case Rec_FORM_SIGN_UP:
@ -2080,9 +2081,9 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
case Rec_FORM_MY_COURSE_RECORD_AS_STUDENT: case Rec_FORM_MY_COURSE_RECORD_AS_STUDENT:
case Rec_FORM_NEW_RECORD_OTHER_NEW_USR: case Rec_FORM_NEW_RECORD_OTHER_NEW_USR:
case Rec_FORM_MODIFY_RECORD_OTHER_EXISTING_USR: case Rec_FORM_MODIFY_RECORD_OTHER_EXISTING_USR:
ClassHead = "HEAD_REC"; ClassHead = "REC_HEAD";
ClassForm = The_ClassForm[Gbl.Prefs.Theme]; ClassForm = The_ClassForm[Gbl.Prefs.Theme];
ClassData = "DAT_REC"; ClassData = "REC_DAT";
break; break;
case Rec_MY_COMMON_RECORD_CHECK: case Rec_MY_COMMON_RECORD_CHECK:
case Rec_CHECK_MY_COURSE_RECORD_AS_STUDENT: case Rec_CHECK_MY_COURSE_RECORD_AS_STUDENT:
@ -2090,9 +2091,9 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
case Rec_RECORD_LIST: case Rec_RECORD_LIST:
case Rec_RECORD_PUBLIC: case Rec_RECORD_PUBLIC:
case Rec_RECORD_PRINT: case Rec_RECORD_PRINT:
ClassHead = "HEAD_REC_SMALL"; ClassHead = "REC_HEAD_SMALL";
ClassForm = "DAT_REC_SMALL"; ClassForm = "REC_DAT_SMALL";
ClassData = "DAT_REC_SMALL_BOLD"; ClassData = "REC_DAT_SMALL_BOLD";
break; break;
} }
@ -2185,7 +2186,7 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
if (PutFormLinks && Gbl.Usrs.Me.Logged) if (PutFormLinks && Gbl.Usrs.Me.Logged)
{ {
fprintf (Gbl.F.Out,"<div style=\"width:25px; margin:8px auto;\">"); fprintf (Gbl.F.Out,"<div class=\"REC_SHORTCUTS\">");
/***** Button to edit my record card *****/ /***** Button to edit my record card *****/
if (ItsMe) if (ItsMe)
@ -2401,14 +2402,29 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
/***** Full name *****/ /***** Full name *****/
fprintf (Gbl.F.Out,"<td class=\"REC_NAME LEFT_TOP\"" fprintf (Gbl.F.Out,"<td class=\"REC_NAME LEFT_TOP\""
" style=\"width:%upx;\">" " style=\"width:%upx;\">",
"%s<br />%s<br />%s" TopC2Width);
"</td>"
"</tr>", /* First name */
TopC2Width, strncpy (Name,UsrDat->FirstName,Usr_MAX_BYTES_NAME);
UsrDat->FirstName , Name[Usr_MAX_BYTES_NAME] = '\0';
UsrDat->Surname1, Str_LimitLengthHTMLStr (Name,20);
UsrDat->Surname2); fprintf (Gbl.F.Out,"%s<br />",Name);
/* Surname 1 */
strncpy (Name,UsrDat->Surname1,Usr_MAX_BYTES_NAME);
Name[Usr_MAX_BYTES_NAME] = '\0';
Str_LimitLengthHTMLStr (Name,20);
fprintf (Gbl.F.Out,"%s<br />",Name);
/* Surname 2 */
strncpy (Name,UsrDat->Surname2,Usr_MAX_BYTES_NAME);
Name[Usr_MAX_BYTES_NAME] = '\0';
Str_LimitLengthHTMLStr (Name,20);
fprintf (Gbl.F.Out,"%s",Name);
fprintf (Gbl.F.Out,"</td>"
"</tr>");
/***** User's nickname *****/ /***** User's nickname *****/
fprintf (Gbl.F.Out,"<td class=\"REC_NAME LEFT_BOTTOM\"" fprintf (Gbl.F.Out,"<td class=\"REC_NAME LEFT_BOTTOM\""
@ -2731,7 +2747,7 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
" style=\"width:%upx;\" />", " style=\"width:%upx;\" />",
Usr_MAX_LENGTH_USR_NAME_OR_SURNAME, Usr_MAX_LENGTH_USR_NAME_OR_SURNAME,
UsrDat->Surname1, UsrDat->Surname1,
Rec_C2_BOTTOM_WIDE - 90); Rec_C2_BOTTOM_WIDE - 20);
else if (UsrDat->Surname1[0]) else if (UsrDat->Surname1[0])
fprintf (Gbl.F.Out,"<strong>%s</strong>",UsrDat->Surname1); fprintf (Gbl.F.Out,"<strong>%s</strong>",UsrDat->Surname1);
fprintf (Gbl.F.Out,"</td>" fprintf (Gbl.F.Out,"</td>"
@ -2754,7 +2770,7 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
" style=\"width:%upx;\" />", " style=\"width:%upx;\" />",
Usr_MAX_LENGTH_USR_NAME_OR_SURNAME, Usr_MAX_LENGTH_USR_NAME_OR_SURNAME,
UsrDat->Surname2, UsrDat->Surname2,
Rec_C2_BOTTOM_WIDE - 90); Rec_C2_BOTTOM_WIDE - 20);
else if (UsrDat->Surname2[0]) else if (UsrDat->Surname2[0])
fprintf (Gbl.F.Out,"<strong>%s</strong>", fprintf (Gbl.F.Out,"<strong>%s</strong>",
UsrDat->Surname2); UsrDat->Surname2);
@ -2779,7 +2795,7 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
" style=\"width:%upx;\" />", " style=\"width:%upx;\" />",
Usr_MAX_LENGTH_USR_NAME_OR_SURNAME, Usr_MAX_LENGTH_USR_NAME_OR_SURNAME,
UsrDat->FirstName, UsrDat->FirstName,
Rec_C2_BOTTOM_WIDE - 90); Rec_C2_BOTTOM_WIDE - 20);
else if (UsrDat->FirstName[0]) else if (UsrDat->FirstName[0])
fprintf (Gbl.F.Out,"<strong>%s</strong>",UsrDat->FirstName); fprintf (Gbl.F.Out,"<strong>%s</strong>",UsrDat->FirstName);
fprintf (Gbl.F.Out,"</td>" fprintf (Gbl.F.Out,"</td>"
@ -2812,7 +2828,7 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
" style=\"width:%upx;\">" " style=\"width:%upx;\">"
"<option value=\"-1\">%s</option>" "<option value=\"-1\">%s</option>"
"<option value=\"0\"", "<option value=\"0\"",
Rec_C2_BOTTOM_WIDE - 90, Rec_C2_BOTTOM_WIDE - 20,
Txt_Country); Txt_Country);
if (UsrDat->CtyCod == 0) if (UsrDat->CtyCod == 0)
fprintf (Gbl.F.Out," selected=\"selected\""); fprintf (Gbl.F.Out," selected=\"selected\"");
@ -2854,7 +2870,7 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
" style=\"width:%upx;\" />", " style=\"width:%upx;\" />",
Cns_MAX_LENGTH_STRING, Cns_MAX_LENGTH_STRING,
UsrDat->OriginPlace, UsrDat->OriginPlace,
Rec_C2_BOTTOM_WIDE - 90); Rec_C2_BOTTOM_WIDE - 20);
else if (UsrDat->OriginPlace[0]) else if (UsrDat->OriginPlace[0])
fprintf (Gbl.F.Out,"%s",UsrDat->OriginPlace); fprintf (Gbl.F.Out,"%s",UsrDat->OriginPlace);
} }
@ -2903,7 +2919,7 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
" style=\"width:%upx;\" />", " style=\"width:%upx;\" />",
Cns_MAX_LENGTH_STRING, Cns_MAX_LENGTH_STRING,
UsrDat->LocalAddress, UsrDat->LocalAddress,
Rec_C2_BOTTOM_WIDE - 90); Rec_C2_BOTTOM_WIDE - 20);
else if (UsrDat->LocalAddress[0]) else if (UsrDat->LocalAddress[0])
fprintf (Gbl.F.Out,"%s",UsrDat->LocalAddress); fprintf (Gbl.F.Out,"%s",UsrDat->LocalAddress);
} }
@ -2928,7 +2944,7 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
" style=\"width:%upx;\" />", " style=\"width:%upx;\" />",
Usr_MAX_LENGTH_PHONE, Usr_MAX_LENGTH_PHONE,
UsrDat->LocalPhone, UsrDat->LocalPhone,
Rec_C2_BOTTOM_WIDE - 90); Rec_C2_BOTTOM_WIDE - 20);
else if (UsrDat->LocalPhone[0]) else if (UsrDat->LocalPhone[0])
fprintf (Gbl.F.Out,"%s",UsrDat->LocalPhone); fprintf (Gbl.F.Out,"%s",UsrDat->LocalPhone);
} }
@ -2953,7 +2969,7 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
" style=\"width:%upx;\" />", " style=\"width:%upx;\" />",
Cns_MAX_LENGTH_STRING, Cns_MAX_LENGTH_STRING,
UsrDat->FamilyAddress, UsrDat->FamilyAddress,
Rec_C2_BOTTOM_WIDE - 90); Rec_C2_BOTTOM_WIDE - 20);
else if (UsrDat->FamilyAddress[0]) else if (UsrDat->FamilyAddress[0])
fprintf (Gbl.F.Out,"%s",UsrDat->FamilyAddress); fprintf (Gbl.F.Out,"%s",UsrDat->FamilyAddress);
} }
@ -2978,7 +2994,7 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
" style=\"width:%upx;\" />", " style=\"width:%upx;\" />",
Usr_MAX_LENGTH_PHONE, Usr_MAX_LENGTH_PHONE,
UsrDat->FamilyPhone, UsrDat->FamilyPhone,
Rec_C2_BOTTOM_WIDE - 90); Rec_C2_BOTTOM_WIDE - 20);
else if (UsrDat->FamilyPhone[0]) else if (UsrDat->FamilyPhone[0])
fprintf (Gbl.F.Out,"%s",UsrDat->FamilyPhone); fprintf (Gbl.F.Out,"%s",UsrDat->FamilyPhone);
} }
@ -2997,11 +3013,11 @@ void Rec_ShowSharedUsrRecord (Rec_RecordViewType_t TypeOfView,
if (ShowData) if (ShowData)
{ {
if (DataForm) if (DataForm)
fprintf (Gbl.F.Out,"<textarea name=\"Comments\" rows=\"3\"" fprintf (Gbl.F.Out,"<textarea name=\"Comments\" rows=\"4\""
" style=\"width:%upx;\">" " style=\"width:%upx;\">"
"%s" "%s"
"</textarea>", "</textarea>",
Rec_C2_BOTTOM_WIDE - 90, Rec_C2_BOTTOM_WIDE - 20,
UsrDat->Comments); UsrDat->Comments);
else if (UsrDat->Comments[0]) else if (UsrDat->Comments[0])
{ {

17
swad_record.h
View File

@ -34,17 +34,16 @@
/*****************************************************************************/ /*****************************************************************************/
/***************************** Public constants ******************************/ /***************************** Public constants ******************************/
/*****************************************************************************/ /*****************************************************************************/
#define Rec_RECORD_WIDTH_WIDE 560
#define Rec_RECORD_WIDTH_WIDE 700 #define Rec_C1_TOP_WIDE 68
#define Rec_C1_TOP_WIDE 65 #define Rec_C2_TOP_WIDE 300
#define Rec_C2_TOP_WIDE 442
#define Rec_C3_TOP_WIDE 192 #define Rec_C3_TOP_WIDE 192
#define Rec_C1_BOTTOM_WIDE (200-2) #define Rec_C1_BOTTOM_WIDE (190-2)
#define Rec_C2_BOTTOM_WIDE (500-2) #define Rec_C2_BOTTOM_WIDE (370-2)
#define Rec_RECORD_WIDTH_NARROW 575 #define Rec_RECORD_WIDTH_NARROW 560
#define Rec_C1_TOP_NARROW 65 #define Rec_C1_TOP_NARROW 68
#define Rec_C2_TOP_NARROW 317 #define Rec_C2_TOP_NARROW 300
#define Rec_C3_TOP_NARROW 192 #define Rec_C3_TOP_NARROW 192
#define Rec_MAX_LENGTH_NAME_FIELD 255 #define Rec_MAX_LENGTH_NAME_FIELD 255

4
swad_statistic.c
View File

@ -5048,7 +5048,7 @@ static void Sta_GetAndShowInss (const char *Query,const char *TxtFigure)
Ins_PutParamInsCod (Ins.InsCod); Ins_PutParamInsCod (Ins.InsCod);
Act_LinkFormSubmit (Ins.FullName,The_ClassForm[Gbl.Prefs.Theme]); Act_LinkFormSubmit (Ins.FullName,The_ClassForm[Gbl.Prefs.Theme]);
Log_DrawLogo (Sco_SCOPE_INS,Ins.InsCod,Ins.FullName, Log_DrawLogo (Sco_SCOPE_INS,Ins.InsCod,Ins.FullName,
32,NULL,true); 40,NULL,true);
fprintf (Gbl.F.Out,"<br />%u</a>",NumberThisRow); fprintf (Gbl.F.Out,"<br />%u</a>",NumberThisRow);
Act_FormEnd (); Act_FormEnd ();
@ -5108,7 +5108,7 @@ static void Sta_GetAndShowInss (const char *Query,const char *TxtFigure)
if (Gbl.Usrs.Listing.WithPhotos) if (Gbl.Usrs.Listing.WithPhotos)
{ {
Log_DrawLogo (Sco_SCOPE_INS,Ins.InsCod,Ins.ShortName, Log_DrawLogo (Sco_SCOPE_INS,Ins.InsCod,Ins.ShortName,
32,NULL,true); 40,NULL,true);
fprintf (Gbl.F.Out,"&nbsp;"); fprintf (Gbl.F.Out,"&nbsp;");
} }
fprintf (Gbl.F.Out,"%s</a>",Ins.FullName); fprintf (Gbl.F.Out,"%s</a>",Ins.FullName);