diff --git a/css/swad16.147.css b/css/swad16.147.css index 16b8a8e9a..95ffa608a 100644 --- a/css/swad16.147.css +++ b/css/swad16.147.css @@ -1794,10 +1794,10 @@ a:hover img.CENTRE_PHOTO_SHOW { display:block; width:186px; + margin:0 auto; white-space:nowrap; overflow:hidden; text-overflow:ellipsis; - margin:0 auto; } .NO_BR {white-space:nowrap;} @@ -2419,6 +2419,16 @@ a:hover img.CENTRE_PHOTO_SHOW text-overflow:ellipsis; } +/**************************** Enrollment requests ****************************/ +.REQUESTER_NAME + { + box-sizing:border-box; + max-width:100px; + white-space:nowrap; + overflow:hidden; + text-overflow:ellipsis; + } + /******************************** Social activity ****************************/ #view_new_posts_container,#view_old_posts_container { diff --git a/swad_changelog.h b/swad_changelog.h index b9537638d..28e8279aa 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -197,13 +197,15 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 16.147.3 (2017-03-04)" +#define Log_PLATFORM_VERSION "SWAD 16.147.4 (2017-03-04)" #define CSS_FILE "swad16.147.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.147.4: Mar 05, 2017 Changes in layout of enrollment requesters. + Code refactoring writing user's name. (216345 lines) Version 16.147.3: Mar 05, 2017 Changes in layout of followed users, users to follow and connected users. (216365 lines) Version 16.147.2: Mar 05, 2017 Changes in layout of notice author. (216316 lines) Version 16.147.1: Mar 05, 2017 Changes in layout of notice author. (216300 lines) diff --git a/swad_connected.c b/swad_connected.c index 4dfa1481f..b9a601584 100644 --- a/swad_connected.c +++ b/swad_connected.c @@ -990,11 +990,9 @@ static void Con_WriteRowConnectedUsrOnRightColumn (Rol_Role_t Role) // the list of connected users // is dynamically updated via AJAX Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod); - fprintf (Gbl.F.Out,"
"); // To limit width + fprintf (Gbl.F.Out,"
"); // Limited width Act_LinkFormSubmitUnique (Txt_View_record_for_this_course,Font); - fprintf (Gbl.F.Out,"%s
%s",UsrDat->FirstName,UsrDat->Surname1); - if (UsrDat->Surname2[0]) - fprintf (Gbl.F.Out," %s",UsrDat->Surname2); + Usr_WriteFirstNameBRSurnames (UsrDat); fprintf (Gbl.F.Out,"" "
"); Act_FormEnd (); @@ -1185,12 +1183,10 @@ static void Con_ShowConnectedUsrsCurrentLocationOneByOneOnMainZone (Rol_Role_t R ActSeeRecOneTch); Usr_PutParamUsrCodEncrypted (UsrDat.EncryptedUsrCod); } - fprintf (Gbl.F.Out,"
"); // To limit width + fprintf (Gbl.F.Out,"
"); // Limited width if (PutLinkToRecord) Act_LinkFormSubmit (UsrDat.FullName,Font,NULL); - fprintf (Gbl.F.Out,"%s
%s",UsrDat.FirstName,UsrDat.Surname1); - if (UsrDat.Surname2[0]) - fprintf (Gbl.F.Out," %s",UsrDat.Surname2); + Usr_WriteFirstNameBRSurnames (&UsrDat); if (PutLinkToRecord) fprintf (Gbl.F.Out,""); fprintf (Gbl.F.Out,"
"); diff --git a/swad_enrollment.c b/swad_enrollment.c index 2278ace32..69059dacf 100644 --- a/swad_enrollment.c +++ b/swad_enrollment.c @@ -2769,9 +2769,11 @@ static void Enr_ShowEnrollmentRequestsGivenRoles (unsigned RolesSelected) fprintf (Gbl.F.Out,""); /***** User name *****/ - fprintf (Gbl.F.Out,""); - Usr_RestrictLengthAndWriteName (&UsrDat,20); - fprintf (Gbl.F.Out,""); + fprintf (Gbl.F.Out,"" + "
"); // Limited width + Usr_WriteFirstNameBRSurnames (&UsrDat); + fprintf (Gbl.F.Out,"
" + ""); /***** Requested role (row[3]) *****/ fprintf (Gbl.F.Out,"" diff --git a/swad_follow.c b/swad_follow.c index 3feb2d7ca..e333ebf76 100644 --- a/swad_follow.c +++ b/swad_follow.c @@ -838,11 +838,9 @@ static void Fol_ShowFollowedOrFollower (struct UsrData *UsrDat) /* Put form to go to public profile */ Act_FormStart (ActSeeOthPubPrf); Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod); - fprintf (Gbl.F.Out,"
"); // To limit width + fprintf (Gbl.F.Out,"
"); // Limited width Act_LinkFormSubmit (Txt_Another_user_s_profile,"DAT",NULL); - fprintf (Gbl.F.Out,"%s
%s",UsrDat->FirstName,UsrDat->Surname1); - if (UsrDat->Surname2[0]) - fprintf (Gbl.F.Out," %s",UsrDat->Surname2); + Usr_WriteFirstNameBRSurnames (UsrDat); fprintf (Gbl.F.Out,"" "
"); Act_FormEnd (); @@ -899,11 +897,9 @@ static void Fol_WriteRowUsrToFollowOnRightColumn (struct UsrData *UsrDat) /* Put form to go to public profile */ Act_FormStart (ActSeeOthPubPrf); Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod); - fprintf (Gbl.F.Out,"
"); // To limit width + fprintf (Gbl.F.Out,"
"); // Limited width Act_LinkFormSubmit (Txt_Another_user_s_profile,"CON_CRS",NULL); - fprintf (Gbl.F.Out,"%s
%s",UsrDat->FirstName,UsrDat->Surname1); - if (UsrDat->Surname2[0]) - fprintf (Gbl.F.Out," %s",UsrDat->Surname2); + Usr_WriteFirstNameBRSurnames (UsrDat); fprintf (Gbl.F.Out,"" "
"); Act_FormEnd (); diff --git a/swad_message.c b/swad_message.c index 408358436..918092f90 100644 --- a/swad_message.c +++ b/swad_message.c @@ -3142,11 +3142,8 @@ void Msg_WriteMsgAuthor (struct UsrData *UsrDat, if (BgColor) fprintf (Gbl.F.Out," %s",BgColor); fprintf (Gbl.F.Out,"\">" - "
" - "%s
%s", - Style,UsrDat->FirstName,UsrDat->Surname1); - if (UsrDat->Surname2[0]) - fprintf (Gbl.F.Out,"%s",UsrDat->Surname2); + "
"); // Limited width + Usr_WriteFirstNameBRSurnames (UsrDat); fprintf (Gbl.F.Out,"
"); } else diff --git a/swad_notice.c b/swad_notice.c index 4c25836e0..9c702aade 100644 --- a/swad_notice.c +++ b/swad_notice.c @@ -727,16 +727,12 @@ static void Not_DrawANotice (Not_Listing_t TypeNoticesListing, TextClass[Status],Content); /***** Write the author *****/ - fprintf (Gbl.F.Out,"
", + fprintf (Gbl.F.Out,"
", // Limited width AuthorClass[Status]); Usr_UsrDataConstructor (&UsrDat); UsrDat.UsrCod = UsrCod; if (Usr_ChkUsrCodAndGetAllUsrDataFromUsrCod (&UsrDat)) // Get from the database the data of the autor - { - fprintf (Gbl.F.Out,"%s
%s",UsrDat.FirstName,UsrDat.Surname1); - if (UsrDat.Surname2[0]) - fprintf (Gbl.F.Out," %s",UsrDat.Surname2); - } + Usr_WriteFirstNameBRSurnames (&UsrDat); Usr_UsrDataDestructor (&UsrDat); fprintf (Gbl.F.Out,"
"); diff --git a/swad_photo.c b/swad_photo.c index 37caccb00..3445cda7d 100644 --- a/swad_photo.c +++ b/swad_photo.c @@ -1143,11 +1143,8 @@ void Pho_ShowUsrPhoto (const struct UsrData *UsrDat,const char *PhotoURL, IdCaption); /* First name and surnames */ - fprintf (Gbl.F.Out,"
" - "%s
%s", - UsrDat->FirstName,UsrDat->Surname1); - if (UsrDat->Surname2[0]) - fprintf (Gbl.F.Out," %s",UsrDat->Surname2); + fprintf (Gbl.F.Out,"
"); // Limited width + Usr_WriteFirstNameBRSurnames (UsrDat); fprintf (Gbl.F.Out,"
"); /* Institution full name and institution country */ diff --git a/swad_profile.c b/swad_profile.c index fdfbb1018..246b41714 100644 --- a/swad_profile.c +++ b/swad_profile.c @@ -1552,11 +1552,9 @@ void Prf_ShowUsrInRanking (struct UsrData *UsrDat,unsigned Rank) { Act_FormStart (ActSeeOthPubPrf); Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod); - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
"); // Limited width Act_LinkFormSubmit (Txt_Another_user_s_profile,"DAT_SMALL",NULL); - fprintf (Gbl.F.Out,"%s
%s",UsrDat->FirstName,UsrDat->Surname1); - if (UsrDat->Surname2[0]) - fprintf (Gbl.F.Out," %s",UsrDat->Surname2); + Usr_WriteFirstNameBRSurnames (UsrDat); fprintf (Gbl.F.Out,"" "
"); Act_FormEnd (); diff --git a/swad_user.c b/swad_user.c index 0d2b4301b..d85f50e92 100644 --- a/swad_user.c +++ b/swad_user.c @@ -740,32 +740,17 @@ void Usr_BuildFullName (struct UsrData *UsrDat) } /*****************************************************************************/ -/******** Restrict length of firstname and surnames and write then ***********/ +/********* Write user name in two lines. 1: first name, 2: surnames **********/ /*****************************************************************************/ -void Usr_RestrictLengthAndWriteName (const struct UsrData *UsrDat,unsigned MaxChars) +void Usr_WriteFirstNameBRSurnames (const struct UsrData *UsrDat) { - char FirstName[Usr_MAX_BYTES_NAME + 1]; - char Surnames[Usr_MAX_BYTES_SURNAMES + 1]; + /***** Write first name and surname 1 *****/ + fprintf (Gbl.F.Out,"%s
%s",UsrDat->FirstName,UsrDat->Surname1); - /***** Restrict length of firstname and surnames *****/ - Str_Copy (FirstName,UsrDat->FirstName, - Usr_MAX_BYTES_NAME); - Str_LimitLengthHTMLStr (FirstName,MaxChars); - - Str_Copy (Surnames,UsrDat->Surname1, - Usr_MAX_BYTES_SURNAMES); + /***** Write surname2 if exists *****/ if (UsrDat->Surname2[0]) - { - Str_Concat (Surnames," ", - Usr_MAX_BYTES_SURNAMES); - Str_Concat (Surnames,UsrDat->Surname2, - Usr_MAX_BYTES_SURNAMES); - } - Str_LimitLengthHTMLStr (Surnames,MaxChars); - - /***** Write shorted firstname, then return, then shorted surnames *****/ - fprintf (Gbl.F.Out,"%s
%s",FirstName,Surnames); + fprintf (Gbl.F.Out," %s",UsrDat->Surname2); } /*****************************************************************************/ diff --git a/swad_user.h b/swad_user.h index 79a2fe6b2..2f2c056b4 100644 --- a/swad_user.h +++ b/swad_user.h @@ -231,7 +231,7 @@ void Usr_GetUsrDataFromUsrCod (struct UsrData *UsrDat); void Usr_BuildFullName (struct UsrData *UsrDat); -void Usr_RestrictLengthAndWriteName (const struct UsrData *UsrDat,unsigned MaxChars); +void Usr_WriteFirstNameBRSurnames (const struct UsrData *UsrDat); bool Usr_CheckIfUsrIsAdm (long UsrCod,Sco_Scope_t Scope,long Cod); bool Usr_CheckIfUsrIsSuperuser (long UsrCod);