mirror of
https://github.com/acanas/swad-core.git
synced 2024-06-08 09:45:26 +02:00
Version 16.146.1
This commit is contained in:
parent
8292282fb2
commit
cd646c25e7
|
@ -2279,6 +2279,23 @@ a:hover img.CENTRE_PHOTO_SHOW
|
||||||
font-size:12pt;
|
font-size:12pt;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**************** Author of assignments, messages, surveys... ****************/
|
||||||
|
.AUTHOR
|
||||||
|
{
|
||||||
|
display:inline-block;
|
||||||
|
box-sizing:border-box;
|
||||||
|
max-width:100px;
|
||||||
|
height:20px;
|
||||||
|
text-align:left;
|
||||||
|
vertical-align:middle;
|
||||||
|
white-space:nowrap;
|
||||||
|
overflow:hidden;
|
||||||
|
text-overflow:ellipsis;
|
||||||
|
}
|
||||||
|
.AUTHOR_TXT {color:#4D88A1; font-size:11pt;}
|
||||||
|
.AUTHOR_TXT_LIGHT {color:#AFC4CC; font-size:11pt;}
|
||||||
|
.AUTHOR_TXT_NEW {color:#4D88A1; font-size:11pt; font-weight:bold;}
|
||||||
|
|
||||||
/******************************** Social activity ****************************/
|
/******************************** Social activity ****************************/
|
||||||
#view_new_posts_container,#view_old_posts_container
|
#view_new_posts_container,#view_old_posts_container
|
||||||
{
|
{
|
||||||
|
@ -2603,9 +2620,6 @@ a:hover img.CENTRE_PHOTO_SHOW
|
||||||
color:#AFC4CC;
|
color:#AFC4CC;
|
||||||
font-size:13pt;
|
font-size:13pt;
|
||||||
}
|
}
|
||||||
.MSG_AUT {color:#4D88A1; font-size:11pt;}
|
|
||||||
.MSG_AUT_LIGHT {color:#AFC4CC; font-size:11pt;}
|
|
||||||
.MSG_AUT_NEW {color:#4D88A1; font-size:11pt; font-weight:bold;}
|
|
||||||
.MSG_AUT_BG
|
.MSG_AUT_BG
|
||||||
{
|
{
|
||||||
background-image:-webkit-linear-gradient(#eaf3f6 0,#eaf3f6 80%,white 100%); /* Safari */
|
background-image:-webkit-linear-gradient(#eaf3f6 0,#eaf3f6 80%,white 100%); /* Safari */
|
||||||
|
|
|
@ -434,8 +434,6 @@ static void Asg_WriteAsgAuthor (struct Assignment *Asg)
|
||||||
{
|
{
|
||||||
bool ShowPhoto = false;
|
bool ShowPhoto = false;
|
||||||
char PhotoURL[PATH_MAX + 1];
|
char PhotoURL[PATH_MAX + 1];
|
||||||
char FirstName[Usr_MAX_BYTES_NAME + 1];
|
|
||||||
char Surnames[Usr_MAX_BYTES_SURNAMES + 1];
|
|
||||||
struct UsrData UsrDat;
|
struct UsrData UsrDat;
|
||||||
|
|
||||||
/***** Initialize structure with user's data *****/
|
/***** Initialize structure with user's data *****/
|
||||||
|
@ -452,23 +450,10 @@ static void Asg_WriteAsgAuthor (struct Assignment *Asg)
|
||||||
"PHOTO15x20",Pho_ZOOM,false);
|
"PHOTO15x20",Pho_ZOOM,false);
|
||||||
|
|
||||||
/***** Write name *****/
|
/***** Write name *****/
|
||||||
Str_Copy (FirstName,UsrDat.FirstName,
|
fprintf (Gbl.F.Out,"<div class=\"AUTHOR %s\">%s</div>",
|
||||||
Usr_MAX_BYTES_NAME);
|
Asg->Hidden ? "AUTHOR_TXT_LIGHT" :
|
||||||
Str_Copy (Surnames,UsrDat.Surname1,
|
"AUTHOR_TXT",
|
||||||
Usr_MAX_BYTES_SURNAMES);
|
UsrDat.FullName);
|
||||||
if (UsrDat.Surname2[0])
|
|
||||||
{
|
|
||||||
Str_Concat (Surnames," ",
|
|
||||||
Usr_MAX_BYTES_SURNAMES);
|
|
||||||
Str_Concat (Surnames,UsrDat.Surname2,
|
|
||||||
Usr_MAX_BYTES_SURNAMES);
|
|
||||||
}
|
|
||||||
Str_LimitLengthHTMLStr (FirstName,8);
|
|
||||||
Str_LimitLengthHTMLStr (Surnames,8);
|
|
||||||
fprintf (Gbl.F.Out,"<span class=\"%s\">%s %s</span>",
|
|
||||||
Asg->Hidden ? "MSG_AUT_LIGHT" :
|
|
||||||
"MSG_AUT",
|
|
||||||
FirstName,Surnames);
|
|
||||||
|
|
||||||
/***** Free memory used for user's data *****/
|
/***** Free memory used for user's data *****/
|
||||||
Usr_UsrDataDestructor (&UsrDat);
|
Usr_UsrDataDestructor (&UsrDat);
|
||||||
|
|
|
@ -506,8 +506,8 @@ static void Att_WriteAttEventAuthor (struct AttendanceEvent *Att)
|
||||||
Str_LimitLengthHTMLStr (FirstName,8);
|
Str_LimitLengthHTMLStr (FirstName,8);
|
||||||
Str_LimitLengthHTMLStr (Surnames,8);
|
Str_LimitLengthHTMLStr (Surnames,8);
|
||||||
fprintf (Gbl.F.Out,"<span class=\"%s\">%s %s</span>",
|
fprintf (Gbl.F.Out,"<span class=\"%s\">%s %s</span>",
|
||||||
Att->Hidden ? "MSG_AUT_LIGHT" :
|
Att->Hidden ? "AUTHOR_TXT_LIGHT" :
|
||||||
"MSG_AUT",
|
"AUTHOR_TXT",
|
||||||
FirstName,Surnames);
|
FirstName,Surnames);
|
||||||
|
|
||||||
/***** Free memory used for user's data *****/
|
/***** Free memory used for user's data *****/
|
||||||
|
|
|
@ -197,13 +197,14 @@
|
||||||
/****************************** Public constants *****************************/
|
/****************************** Public constants *****************************/
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
|
||||||
#define Log_PLATFORM_VERSION "SWAD 16.146 (2017-03-03)"
|
#define Log_PLATFORM_VERSION "SWAD 16.146.1 (2017-03-03)"
|
||||||
#define CSS_FILE "swad16.146.css"
|
#define CSS_FILE "swad16.146.css"
|
||||||
#define JS_FILE "swad16.144.js"
|
#define JS_FILE "swad16.144.js"
|
||||||
|
|
||||||
// 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 16.146.1: Mar 02, 2017 Changes in layout of assigments. (216350 lines)
|
||||||
Version 16.146: Mar 02, 2017 Changes in layout of class photos. (216351 lines)
|
Version 16.146: Mar 02, 2017 Changes in layout of class photos. (216351 lines)
|
||||||
Version 16.145.2: Mar 02, 2017 Some help URLs translated to spanish. (216338 lines)
|
Version 16.145.2: Mar 02, 2017 Some help URLs translated to spanish. (216338 lines)
|
||||||
Version 16.145.1: Mar 02, 2017 Changes in several help URLs. (216337 lines)
|
Version 16.145.1: Mar 02, 2017 Changes in several help URLs. (216337 lines)
|
||||||
|
|
|
@ -3393,7 +3393,7 @@ static void Brw_ShowDataOwnerAsgWrk (struct UsrData *UsrDat)
|
||||||
fprintf (Gbl.F.Out,"</td>");
|
fprintf (Gbl.F.Out,"</td>");
|
||||||
|
|
||||||
/***** Start form to send a message to this user *****/
|
/***** Start form to send a message to this user *****/
|
||||||
fprintf (Gbl.F.Out,"<td class=\"MSG_AUT LEFT_TOP\" style=\"width:180px;\">");
|
fprintf (Gbl.F.Out,"<td class=\"AUTHOR_TXT LEFT_TOP\" style=\"width:180px;\">");
|
||||||
Act_FormStart (UsrDat->RoleInCurrentCrsDB == Rol_STUDENT ? ActSeeRecOneStd :
|
Act_FormStart (UsrDat->RoleInCurrentCrsDB == Rol_STUDENT ? ActSeeRecOneStd :
|
||||||
ActSeeRecOneTch);
|
ActSeeRecOneTch);
|
||||||
Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
|
Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
|
||||||
|
@ -3403,7 +3403,7 @@ static void Brw_ShowDataOwnerAsgWrk (struct UsrData *UsrDat)
|
||||||
|
|
||||||
/***** Show user's name *****/
|
/***** Show user's name *****/
|
||||||
fprintf (Gbl.F.Out,"<br />");
|
fprintf (Gbl.F.Out,"<br />");
|
||||||
Act_LinkFormSubmit (Txt_View_record_for_this_course,"MSG_AUT",NULL);
|
Act_LinkFormSubmit (Txt_View_record_for_this_course,"AUTHOR_TXT",NULL);
|
||||||
fprintf (Gbl.F.Out,"%s",UsrDat->Surname1);
|
fprintf (Gbl.F.Out,"%s",UsrDat->Surname1);
|
||||||
if (UsrDat->Surname2[0])
|
if (UsrDat->Surname2[0])
|
||||||
fprintf (Gbl.F.Out," %s",UsrDat->Surname2);
|
fprintf (Gbl.F.Out," %s",UsrDat->Surname2);
|
||||||
|
@ -3416,7 +3416,7 @@ static void Brw_ShowDataOwnerAsgWrk (struct UsrData *UsrDat)
|
||||||
{
|
{
|
||||||
fprintf (Gbl.F.Out,"<br />"
|
fprintf (Gbl.F.Out,"<br />"
|
||||||
"<a href=\"mailto:%s\" target=\"_blank\""
|
"<a href=\"mailto:%s\" target=\"_blank\""
|
||||||
" class=\"MSG_AUT\">",
|
" class=\"AUTHOR_TXT\">",
|
||||||
UsrDat->Email);
|
UsrDat->Email);
|
||||||
Str_LimitLengthHTMLStr (UsrDat->Email,25);
|
Str_LimitLengthHTMLStr (UsrDat->Email,25);
|
||||||
fprintf (Gbl.F.Out,"%s</a>",UsrDat->Email);
|
fprintf (Gbl.F.Out,"%s</a>",UsrDat->Email);
|
||||||
|
|
|
@ -1313,7 +1313,7 @@ static void For_ShowAForumPost (struct ForumThread *Thr,unsigned PstNum,long Pst
|
||||||
/* Write author */
|
/* Write author */
|
||||||
fprintf (Gbl.F.Out,"<tr>");
|
fprintf (Gbl.F.Out,"<tr>");
|
||||||
Usr_ChkUsrCodAndGetAllUsrDataFromUsrCod (&UsrDat);
|
Usr_ChkUsrCodAndGetAllUsrDataFromUsrCod (&UsrDat);
|
||||||
Msg_WriteMsgAuthor (&UsrDat,125,16,"MSG_AUT",Enabled,NULL);
|
Msg_WriteMsgAuthor (&UsrDat,125,16,"AUTHOR_TXT",Enabled,NULL);
|
||||||
fprintf (Gbl.F.Out,"</tr>");
|
fprintf (Gbl.F.Out,"</tr>");
|
||||||
if (Enabled)
|
if (Enabled)
|
||||||
{
|
{
|
||||||
|
@ -1464,7 +1464,7 @@ static void For_WriteNumberOfPosts (For_ForumType_t ForumType,long UsrCod)
|
||||||
unsigned NumPsts;
|
unsigned NumPsts;
|
||||||
|
|
||||||
/***** Star table cell *****/
|
/***** Star table cell *****/
|
||||||
fprintf (Gbl.F.Out,"<td colspan=\"2\" class=\"MSG_AUT CENTER_TOP\""
|
fprintf (Gbl.F.Out,"<td colspan=\"2\" class=\"AUTHOR_TXT CENTER_TOP\""
|
||||||
" style=\"width:150px;\">");
|
" style=\"width:150px;\">");
|
||||||
|
|
||||||
/***** Get number of posts from database *****/
|
/***** Get number of posts from database *****/
|
||||||
|
@ -3417,8 +3417,8 @@ void For_ListForumThrs (long ThrCods[Pag_ITEMS_PER_PAGE],struct Pagination *Pagi
|
||||||
/***** Get the data of this thread *****/
|
/***** Get the data of this thread *****/
|
||||||
Thr.ThrCod = ThrCods[NumThrInScreen];
|
Thr.ThrCod = ThrCods[NumThrInScreen];
|
||||||
For_GetThrData (&Thr);
|
For_GetThrData (&Thr);
|
||||||
Style = (Thr.NumUnreadPosts ? "MSG_AUT_NEW" :
|
Style = (Thr.NumUnreadPosts ? "AUTHOR_TXT_NEW" :
|
||||||
"MSG_AUT");
|
"AUTHOR_TXT");
|
||||||
BgColor = (Thr.ThrCod == ThreadInMyClipboard) ? "LIGHT_GREEN" :
|
BgColor = (Thr.ThrCod == ThreadInMyClipboard) ? "LIGHT_GREEN" :
|
||||||
Gbl.ColorRows[Gbl.RowEvenOdd];
|
Gbl.ColorRows[Gbl.RowEvenOdd];
|
||||||
|
|
||||||
|
|
|
@ -3191,7 +3191,7 @@ bool Msg_WriteCrsOrgMsg (long CrsCod)
|
||||||
{
|
{
|
||||||
ThereIsOrgCrs = true;
|
ThereIsOrgCrs = true;
|
||||||
if ((FromThisCrs = (CrsCod == Gbl.CurrentCrs.Crs.CrsCod))) // Message sent from current course
|
if ((FromThisCrs = (CrsCod == Gbl.CurrentCrs.Crs.CrsCod))) // Message sent from current course
|
||||||
fprintf (Gbl.F.Out,"<div class=\"MSG_AUT\">"
|
fprintf (Gbl.F.Out,"<div class=\"AUTHOR_TXT\">"
|
||||||
"(%s)"
|
"(%s)"
|
||||||
"</div>",
|
"</div>",
|
||||||
Txt_from_this_course);
|
Txt_from_this_course);
|
||||||
|
@ -3200,10 +3200,10 @@ bool Msg_WriteCrsOrgMsg (long CrsCod)
|
||||||
/* Write course, including link */
|
/* Write course, including link */
|
||||||
Act_FormGoToStart (ActSeeCrsInf);
|
Act_FormGoToStart (ActSeeCrsInf);
|
||||||
Crs_PutParamCrsCod (Crs.CrsCod);
|
Crs_PutParamCrsCod (Crs.CrsCod);
|
||||||
fprintf (Gbl.F.Out,"<div class=\"MSG_AUT\">"
|
fprintf (Gbl.F.Out,"<div class=\"AUTHOR_TXT\">"
|
||||||
"(");
|
"(");
|
||||||
sprintf (Gbl.Title,Txt_Go_to_X,Crs.FullName);
|
sprintf (Gbl.Title,Txt_Go_to_X,Crs.FullName);
|
||||||
Act_LinkFormSubmit (Gbl.Title,"MSG_AUT",NULL);
|
Act_LinkFormSubmit (Gbl.Title,"AUTHOR_TXT",NULL);
|
||||||
fprintf (Gbl.F.Out,"%s</a>)"
|
fprintf (Gbl.F.Out,"%s</a>)"
|
||||||
"</div>",
|
"</div>",
|
||||||
Crs.ShrtName);
|
Crs.ShrtName);
|
||||||
|
@ -3212,7 +3212,7 @@ bool Msg_WriteCrsOrgMsg (long CrsCod)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (!ThereIsOrgCrs) // It's an old message without origin source specified, or is a message sent from none course
|
if (!ThereIsOrgCrs) // It's an old message without origin source specified, or is a message sent from none course
|
||||||
fprintf (Gbl.F.Out,"<div class=\"MSG_AUT\">"
|
fprintf (Gbl.F.Out,"<div class=\"AUTHOR_TXT\">"
|
||||||
"(%s)"
|
"(%s)"
|
||||||
"</div>",
|
"</div>",
|
||||||
Txt_no_course_of_origin);
|
Txt_no_course_of_origin);
|
||||||
|
@ -3300,7 +3300,7 @@ static void Msg_WriteMsgFrom (struct UsrData *UsrDat,bool Deleted)
|
||||||
|
|
||||||
/***** Write user's name *****/
|
/***** Write user's name *****/
|
||||||
fprintf (Gbl.F.Out,"</td>"
|
fprintf (Gbl.F.Out,"</td>"
|
||||||
"<td class=\"MSG_AUT LEFT_MIDDLE\">");
|
"<td class=\"AUTHOR_TXT LEFT_MIDDLE\">");
|
||||||
if (UsrDat->UsrCod > 0)
|
if (UsrDat->UsrCod > 0)
|
||||||
{
|
{
|
||||||
fprintf (Gbl.F.Out,"%s",UsrDat->FullName);
|
fprintf (Gbl.F.Out,"%s",UsrDat->FullName);
|
||||||
|
@ -3448,8 +3448,8 @@ static void Msg_WriteMsgTo (long MsgCod)
|
||||||
/* Write user's name */
|
/* Write user's name */
|
||||||
fprintf (Gbl.F.Out,"</td>"
|
fprintf (Gbl.F.Out,"</td>"
|
||||||
"<td class=\"%s LEFT_MIDDLE\">",
|
"<td class=\"%s LEFT_MIDDLE\">",
|
||||||
OpenByDst ? "MSG_AUT" :
|
OpenByDst ? "AUTHOR_TXT" :
|
||||||
"MSG_AUT_NEW");
|
"AUTHOR_TXT_NEW");
|
||||||
if (UsrValid)
|
if (UsrValid)
|
||||||
fprintf (Gbl.F.Out,"%s",UsrDat.FullName);
|
fprintf (Gbl.F.Out,"%s",UsrDat.FullName);
|
||||||
else
|
else
|
||||||
|
@ -3462,7 +3462,7 @@ static void Msg_WriteMsgTo (long MsgCod)
|
||||||
if ((NumRecipientsUnknown = NumRecipientsTotal - NumRecipientsKnown))
|
if ((NumRecipientsUnknown = NumRecipientsTotal - NumRecipientsKnown))
|
||||||
/***** Start form to show all the users *****/
|
/***** Start form to show all the users *****/
|
||||||
fprintf (Gbl.F.Out,"<tr>"
|
fprintf (Gbl.F.Out,"<tr>"
|
||||||
"<td colspan=\"3\" class=\"MSG_AUT LEFT_MIDDLE\">"
|
"<td colspan=\"3\" class=\"AUTHOR_TXT LEFT_MIDDLE\">"
|
||||||
"[%u %s]"
|
"[%u %s]"
|
||||||
"</td>"
|
"</td>"
|
||||||
"</tr>",
|
"</tr>",
|
||||||
|
@ -3476,13 +3476,13 @@ static void Msg_WriteMsgTo (long MsgCod)
|
||||||
{
|
{
|
||||||
/***** Start form to show all the users *****/
|
/***** Start form to show all the users *****/
|
||||||
fprintf (Gbl.F.Out,"<tr>"
|
fprintf (Gbl.F.Out,"<tr>"
|
||||||
"<td colspan=\"3\" class=\"MSG_AUT LEFT_MIDDLE\">");
|
"<td colspan=\"3\" class=\"AUTHOR_TXT LEFT_MIDDLE\">");
|
||||||
Act_FormStart (ActionSee[Gbl.Msg.TypeOfMessages]);
|
Act_FormStart (ActionSee[Gbl.Msg.TypeOfMessages]);
|
||||||
Msg_PutHiddenParamsMsgsFilters ();
|
Msg_PutHiddenParamsMsgsFilters ();
|
||||||
Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage);
|
Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage);
|
||||||
Msg_PutHiddenParamMsgCod (MsgCod);
|
Msg_PutHiddenParamMsgCod (MsgCod);
|
||||||
Par_PutHiddenParamChar ("SeeAllRcpts",'Y');
|
Par_PutHiddenParamChar ("SeeAllRcpts",'Y');
|
||||||
Act_LinkFormSubmit (Txt_View_all_recipients,"MSG_AUT",NULL);
|
Act_LinkFormSubmit (Txt_View_all_recipients,"AUTHOR_TXT",NULL);
|
||||||
fprintf (Gbl.F.Out,Txt_and_X_other_recipients,
|
fprintf (Gbl.F.Out,Txt_and_X_other_recipients,
|
||||||
NumRecipientsKnown - NumRecipientsToShow);
|
NumRecipientsKnown - NumRecipientsToShow);
|
||||||
fprintf (Gbl.F.Out,"</a>");
|
fprintf (Gbl.F.Out,"</a>");
|
||||||
|
|
|
@ -699,8 +699,8 @@ static void Svy_WriteAuthor (struct Survey *Svy)
|
||||||
Str_LimitLengthHTMLStr (FirstName,8);
|
Str_LimitLengthHTMLStr (FirstName,8);
|
||||||
Str_LimitLengthHTMLStr (Surnames,8);
|
Str_LimitLengthHTMLStr (Surnames,8);
|
||||||
fprintf (Gbl.F.Out,"<span class=\"%s\">%s %s</span>",
|
fprintf (Gbl.F.Out,"<span class=\"%s\">%s %s</span>",
|
||||||
Svy->Status.Visible ? "MSG_AUT" :
|
Svy->Status.Visible ? "AUTHOR_TXT" :
|
||||||
"MSG_AUT_LIGHT",
|
"AUTHOR_TXT_LIGHT",
|
||||||
FirstName,Surnames);
|
FirstName,Surnames);
|
||||||
|
|
||||||
/***** Free memory used for user's data *****/
|
/***** Free memory used for user's data *****/
|
||||||
|
|
|
@ -7484,7 +7484,7 @@ static void Tst_ShowDataUsr (struct UsrData *UsrDat,unsigned NumTestResults)
|
||||||
Act_FormStart (UsrDat->RoleInCurrentCrsDB == Rol_STUDENT ? ActSeeRecOneStd :
|
Act_FormStart (UsrDat->RoleInCurrentCrsDB == Rol_STUDENT ? ActSeeRecOneStd :
|
||||||
ActSeeRecOneTch);
|
ActSeeRecOneTch);
|
||||||
Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
|
Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod);
|
||||||
Act_LinkFormSubmit (UsrDat->FullName,"MSG_AUT",NULL);
|
Act_LinkFormSubmit (UsrDat->FullName,"AUTHOR_TXT",NULL);
|
||||||
|
|
||||||
/***** Show user's ID *****/
|
/***** Show user's ID *****/
|
||||||
ID_WriteUsrIDs (UsrDat);
|
ID_WriteUsrIDs (UsrDat);
|
||||||
|
|
Loading…
Reference in New Issue
Block a user