From cd646c25e76a552e97e29ada8be08fb07db2d04b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Fri, 3 Mar 2017 21:34:25 +0100 Subject: [PATCH] Version 16.146.1 --- css/swad16.146.css | 20 +++++++++++++++++--- swad_assignment.c | 23 ++++------------------- swad_attendance.c | 4 ++-- swad_changelog.h | 3 ++- swad_file_browser.c | 6 +++--- swad_forum.c | 8 ++++---- swad_message.c | 20 ++++++++++---------- swad_survey.c | 4 ++-- swad_test.c | 2 +- 9 files changed, 45 insertions(+), 45 deletions(-) diff --git a/css/swad16.146.css b/css/swad16.146.css index 4e3d72c36..e55f4553b 100644 --- a/css/swad16.146.css +++ b/css/swad16.146.css @@ -2279,6 +2279,23 @@ a:hover img.CENTRE_PHOTO_SHOW 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 ****************************/ #view_new_posts_container,#view_old_posts_container { @@ -2603,9 +2620,6 @@ a:hover img.CENTRE_PHOTO_SHOW color:#AFC4CC; 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 { background-image:-webkit-linear-gradient(#eaf3f6 0,#eaf3f6 80%,white 100%); /* Safari */ diff --git a/swad_assignment.c b/swad_assignment.c index 918986f1a..297c32a68 100644 --- a/swad_assignment.c +++ b/swad_assignment.c @@ -434,8 +434,6 @@ static void Asg_WriteAsgAuthor (struct Assignment *Asg) { bool ShowPhoto = false; char PhotoURL[PATH_MAX + 1]; - char FirstName[Usr_MAX_BYTES_NAME + 1]; - char Surnames[Usr_MAX_BYTES_SURNAMES + 1]; struct UsrData UsrDat; /***** Initialize structure with user's data *****/ @@ -452,23 +450,10 @@ static void Asg_WriteAsgAuthor (struct Assignment *Asg) "PHOTO15x20",Pho_ZOOM,false); /***** Write name *****/ - Str_Copy (FirstName,UsrDat.FirstName, - Usr_MAX_BYTES_NAME); - Str_Copy (Surnames,UsrDat.Surname1, - Usr_MAX_BYTES_SURNAMES); - 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,"%s %s", - Asg->Hidden ? "MSG_AUT_LIGHT" : - "MSG_AUT", - FirstName,Surnames); + fprintf (Gbl.F.Out,"
%s
", + Asg->Hidden ? "AUTHOR_TXT_LIGHT" : + "AUTHOR_TXT", + UsrDat.FullName); /***** Free memory used for user's data *****/ Usr_UsrDataDestructor (&UsrDat); diff --git a/swad_attendance.c b/swad_attendance.c index 48217b72d..9d30e1293 100644 --- a/swad_attendance.c +++ b/swad_attendance.c @@ -506,8 +506,8 @@ static void Att_WriteAttEventAuthor (struct AttendanceEvent *Att) Str_LimitLengthHTMLStr (FirstName,8); Str_LimitLengthHTMLStr (Surnames,8); fprintf (Gbl.F.Out,"%s %s", - Att->Hidden ? "MSG_AUT_LIGHT" : - "MSG_AUT", + Att->Hidden ? "AUTHOR_TXT_LIGHT" : + "AUTHOR_TXT", FirstName,Surnames); /***** Free memory used for user's data *****/ diff --git a/swad_changelog.h b/swad_changelog.h index 3568c01f5..db0266295 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -197,13 +197,14 @@ /****************************** 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 JS_FILE "swad16.144.js" // 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 /* + 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.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) diff --git a/swad_file_browser.c b/swad_file_browser.c index f8efe2d66..72bfac6ec 100644 --- a/swad_file_browser.c +++ b/swad_file_browser.c @@ -3393,7 +3393,7 @@ static void Brw_ShowDataOwnerAsgWrk (struct UsrData *UsrDat) fprintf (Gbl.F.Out,""); /***** Start form to send a message to this user *****/ - fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,""); Act_FormStart (UsrDat->RoleInCurrentCrsDB == Rol_STUDENT ? ActSeeRecOneStd : ActSeeRecOneTch); Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod); @@ -3403,7 +3403,7 @@ static void Brw_ShowDataOwnerAsgWrk (struct UsrData *UsrDat) /***** Show user's name *****/ fprintf (Gbl.F.Out,"
"); - 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); if (UsrDat->Surname2[0]) fprintf (Gbl.F.Out," %s",UsrDat->Surname2); @@ -3416,7 +3416,7 @@ static void Brw_ShowDataOwnerAsgWrk (struct UsrData *UsrDat) { fprintf (Gbl.F.Out,"
" "", + " class=\"AUTHOR_TXT\">", UsrDat->Email); Str_LimitLengthHTMLStr (UsrDat->Email,25); fprintf (Gbl.F.Out,"%s",UsrDat->Email); diff --git a/swad_forum.c b/swad_forum.c index ccb7c3a2c..8e0cd7b83 100644 --- a/swad_forum.c +++ b/swad_forum.c @@ -1313,7 +1313,7 @@ static void For_ShowAForumPost (struct ForumThread *Thr,unsigned PstNum,long Pst /* Write author */ fprintf (Gbl.F.Out,""); 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,""); if (Enabled) { @@ -1464,7 +1464,7 @@ static void For_WriteNumberOfPosts (For_ForumType_t ForumType,long UsrCod) unsigned NumPsts; /***** Star table cell *****/ - fprintf (Gbl.F.Out,""); /***** 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 *****/ Thr.ThrCod = ThrCods[NumThrInScreen]; For_GetThrData (&Thr); - Style = (Thr.NumUnreadPosts ? "MSG_AUT_NEW" : - "MSG_AUT"); + Style = (Thr.NumUnreadPosts ? "AUTHOR_TXT_NEW" : + "AUTHOR_TXT"); BgColor = (Thr.ThrCod == ThreadInMyClipboard) ? "LIGHT_GREEN" : Gbl.ColorRows[Gbl.RowEvenOdd]; diff --git a/swad_message.c b/swad_message.c index edb6183b5..306e6de58 100644 --- a/swad_message.c +++ b/swad_message.c @@ -3191,7 +3191,7 @@ bool Msg_WriteCrsOrgMsg (long CrsCod) { ThereIsOrgCrs = true; if ((FromThisCrs = (CrsCod == Gbl.CurrentCrs.Crs.CrsCod))) // Message sent from current course - fprintf (Gbl.F.Out,"
" + fprintf (Gbl.F.Out,"
" "(%s)" "
", Txt_from_this_course); @@ -3200,10 +3200,10 @@ bool Msg_WriteCrsOrgMsg (long CrsCod) /* Write course, including link */ Act_FormGoToStart (ActSeeCrsInf); Crs_PutParamCrsCod (Crs.CrsCod); - fprintf (Gbl.F.Out,"
" + fprintf (Gbl.F.Out,"
" "("); 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)" "
", 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 - fprintf (Gbl.F.Out,"
" + fprintf (Gbl.F.Out,"
" "(%s)" "
", Txt_no_course_of_origin); @@ -3300,7 +3300,7 @@ static void Msg_WriteMsgFrom (struct UsrData *UsrDat,bool Deleted) /***** Write user's name *****/ fprintf (Gbl.F.Out,"" - ""); + ""); if (UsrDat->UsrCod > 0) { fprintf (Gbl.F.Out,"%s",UsrDat->FullName); @@ -3448,8 +3448,8 @@ static void Msg_WriteMsgTo (long MsgCod) /* Write user's name */ fprintf (Gbl.F.Out,"" "", - OpenByDst ? "MSG_AUT" : - "MSG_AUT_NEW"); + OpenByDst ? "AUTHOR_TXT" : + "AUTHOR_TXT_NEW"); if (UsrValid) fprintf (Gbl.F.Out,"%s",UsrDat.FullName); else @@ -3462,7 +3462,7 @@ static void Msg_WriteMsgTo (long MsgCod) if ((NumRecipientsUnknown = NumRecipientsTotal - NumRecipientsKnown)) /***** Start form to show all the users *****/ fprintf (Gbl.F.Out,"" - "" + "" "[%u %s]" "" "", @@ -3476,13 +3476,13 @@ static void Msg_WriteMsgTo (long MsgCod) { /***** Start form to show all the users *****/ fprintf (Gbl.F.Out,"" - ""); + ""); Act_FormStart (ActionSee[Gbl.Msg.TypeOfMessages]); Msg_PutHiddenParamsMsgsFilters (); Pag_PutHiddenParamPagNum (Gbl.Pag.CurrentPage); Msg_PutHiddenParamMsgCod (MsgCod); 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, NumRecipientsKnown - NumRecipientsToShow); fprintf (Gbl.F.Out,""); diff --git a/swad_survey.c b/swad_survey.c index c3e4fdb77..e03c0e344 100644 --- a/swad_survey.c +++ b/swad_survey.c @@ -699,8 +699,8 @@ static void Svy_WriteAuthor (struct Survey *Svy) Str_LimitLengthHTMLStr (FirstName,8); Str_LimitLengthHTMLStr (Surnames,8); fprintf (Gbl.F.Out,"%s %s", - Svy->Status.Visible ? "MSG_AUT" : - "MSG_AUT_LIGHT", + Svy->Status.Visible ? "AUTHOR_TXT" : + "AUTHOR_TXT_LIGHT", FirstName,Surnames); /***** Free memory used for user's data *****/ diff --git a/swad_test.c b/swad_test.c index b4ccfb332..4134f045c 100644 --- a/swad_test.c +++ b/swad_test.c @@ -7484,7 +7484,7 @@ static void Tst_ShowDataUsr (struct UsrData *UsrDat,unsigned NumTestResults) Act_FormStart (UsrDat->RoleInCurrentCrsDB == Rol_STUDENT ? ActSeeRecOneStd : ActSeeRecOneTch); Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod); - Act_LinkFormSubmit (UsrDat->FullName,"MSG_AUT",NULL); + Act_LinkFormSubmit (UsrDat->FullName,"AUTHOR_TXT",NULL); /***** Show user's ID *****/ ID_WriteUsrIDs (UsrDat);