diff --git a/css/swad18.67.css b/css/swad18.68.3.css similarity index 98% rename from css/swad18.67.css rename to css/swad18.68.3.css index 9d0947a70..96b47402e 100644 --- a/css/swad18.67.css +++ b/css/swad18.68.3.css @@ -1179,40 +1179,68 @@ a:hover /* Default ==> underlined */ .CON_USR_NARROW_TIT { max-width:136px; + text-align:center; + vertical-align:middle; white-space:nowrap; overflow:hidden; text-overflow:ellipsis; - text-align:center; - vertical-align:middle; } -.CON_USR_NARROW + +/* Connected to the current course? */ +.CON_NO_CRS {color:#B8D070; font-size:11pt; line-height:110%; white-space:nowrap;} +.CON_CRS {color:#398000; font-size:11pt; line-height:110%; white-space:nowrap;} + +/* 1st. column */ +.CON_PHOTO { - width:68px; - text-align:left; - vertical-align:middle; - } -.CON_USR_WIDE - { - width:360px; + width:22px; text-align:left; vertical-align:middle; } + +/* 2nd. column */ .CON_NAME_NARROW { - max-width:68px; + width:66px; + text-align:left; + vertical-align:middle; + white-space:nowrap; + overflow:hidden; + text-overflow:ellipsis; + } +.CON_NAME_FOLLOW + { + width:90px; + text-align:left; + vertical-align:middle; white-space:nowrap; overflow:hidden; text-overflow:ellipsis; } .CON_NAME_WIDE { - max-width:360px; + width:360px; + text-align:left; + vertical-align:middle; white-space:nowrap; overflow:hidden; text-overflow:ellipsis; } -.CON_NO_CRS {color:#B8D070; font-size:11pt; line-height:110%; white-space:nowrap;} -.CON_CRS {color:#398000; font-size:11pt; line-height:110%; white-space:nowrap;} + +/* 3rd. column */ +.CON_SINCE + { + width:48px; + text-align:right; + vertical-align:middle; + white-space:nowrap; + overflow:hidden; + } +.CON_ICON_FOLLOW + { + width:24px; + vertical-align:middle; + } /*************************** Most frequent actions ***************************/ #MFU_actions @@ -1925,15 +1953,15 @@ a:hover img.CENTRE_PHOTO_SHOW } /******************************* User's photo ********************************/ -.PHOTO12x16 {width: 12px; height: 16px; border-radius:1px; vertical-align:middle; margin-top:-2px;} -.PHOTO15x20 {width: 15px; height: 20px; border-radius:2px; vertical-align:middle;} +.PHOTO12x16 {width: 12px; height: 16px; border-radius:1px; vertical-align:middle; margin-top:-2px;} +.PHOTO15x20 {width: 15px; height: 20px; border-radius:2px; vertical-align:middle;} .PHOTO15x20B {width: 15px; height: 20px; border-radius:2px; display:block; margin:0 auto;} -.PHOTO18x24 {width: 18px; height: 24px; border-radius:2px; vertical-align:middle;} -.PHOTO21x28 {width: 21px; height: 28px; border-radius:2px; vertical-align:middle;} -.PHOTO30x40 {width: 30px; height: 40px; border-radius:2px; vertical-align:middle;} -.PHOTO42x56 {width: 42px; height: 56px; border-radius:3px; vertical-align:middle;} -.PHOTO45x60 {width: 45px; height: 60px; border-radius:3px; vertical-align:middle;} -.PHOTO60x80 {width: 60px; height: 80px; border-radius:3px; vertical-align:middle;} +.PHOTO18x24 {width: 18px; height: 24px; border-radius:2px; vertical-align:middle;} +.PHOTO21x28 {width: 21px; height: 28px; border-radius:2px; vertical-align:middle;} +.PHOTO30x40 {width: 30px; height: 40px; border-radius:2px; vertical-align:middle;} +.PHOTO42x56 {width: 42px; height: 56px; border-radius:3px; vertical-align:middle;} +.PHOTO45x60 {width: 45px; height: 60px; border-radius:3px; vertical-align:middle;} +.PHOTO60x80 {width: 60px; height: 80px; border-radius:3px; vertical-align:middle;} .PHOTO186x248 {width:186px; height:248px; border-radius:8px; vertical-align:middle;} .IMG_USR { @@ -3014,6 +3042,7 @@ a:hover img.CENTRE_PHOTO_SHOW padding:5px 0; color:#202020; font-size:13pt; + line-height:1.4; } .TL_EXPAND_COMMENTS { @@ -3132,7 +3161,12 @@ a:hover img.CENTRE_PHOTO_SHOW box-sizing:border-box; width:480px; } -.MSG_TXT {color:#202020; font-size:13pt;} +.MSG_TXT + { + color:#202020; + font-size:13pt; + line-height:1.4; + } .MSG_TIT {color:#4D88A1; font-size:13pt;} .MSG_TIT_NEW {color:#4D88A1; font-size:13pt; font-weight:bold;} .MSG_TIT_REM {color:#AFC4CC; font-size:13pt;} diff --git a/swad_changelog.h b/swad_changelog.h index b227c16fd..0cd284d30 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -447,11 +447,17 @@ En OpenSWAD: ps2pdf source.ps destination.pdf */ -#define Log_PLATFORM_VERSION "SWAD 18.68.1 (2019-03-08)" -#define CSS_FILE "swad18.67.css" +#define Log_PLATFORM_VERSION "SWAD 18.68.3 (2019-03-08)" +#define CSS_FILE "swad18.68.3.css" #define JS_FILE "swad18.64.js" /* - Version 18.68.1: Mar 08, 2019 A teacher can register students in groups, even if he/she doesn't belong to them. (238910 lines) + * Mostrar "En un tipo de grupo de adscripción única no es posible apuntar estudiantes a más de un grupo" + * también cuando se intenta hacer con un usuario único desde su ficha + * + Version 18.68.3: Mar 08, 2019 Changes in styles of connected users. + Increased line height in timeline, forums and messages. (238945 lines) + Version 18.68.2: Mar 08, 2019 Register several students in groups, even if he/she doesn't belong to them. (? lines) + Version 18.68.1: Mar 08, 2019 A teacher can register a student in groups, even if he/she doesn't belong to them. (238910 lines) Version 18.68: Mar 07, 2019 Photo is zoomed even in record card. Teachers record cards are only visible inside courses. Fixed bug in notifications. (238918 lines) diff --git a/swad_connected.c b/swad_connected.c index f7fdc98a6..b283e6a06 100644 --- a/swad_connected.c +++ b/swad_connected.c @@ -788,8 +788,7 @@ static void Con_WriteRowConnectedUsrOnRightColumn (Rol_Role_t Role) extern const char *Txt_View_record_for_this_course; bool ShowPhoto; char PhotoURL[PATH_MAX + 1]; - const char *Font = (Gbl.Usrs.Connected.Lst[Gbl.Usrs.Connected.NumUsr].ThisCrs ? "CON_CRS" : - "CON_NO_CRS"); + const char *Font; long UsrCod; bool ItsMe; struct UsrData *UsrDat; @@ -815,8 +814,7 @@ static void Con_WriteRowConnectedUsrOnRightColumn (Rol_Role_t Role) /***** Show photo *****/ fprintf (Gbl.F.Out,"" - "", + "", Gbl.RowEvenOdd); ShowPhoto = Pho_ShowingUsrPhotoIsAllowed (UsrDat,PhotoURL); Pho_ShowUsrPhoto (UsrDat,ShowPhoto ? PhotoURL : @@ -825,7 +823,9 @@ static void Con_WriteRowConnectedUsrOnRightColumn (Rol_Role_t Role) fprintf (Gbl.F.Out,""); /***** Write full name and link *****/ - fprintf (Gbl.F.Out,"", + Font = (Gbl.Usrs.Connected.Lst[Gbl.Usrs.Connected.NumUsr].ThisCrs ? "CON_NAME_NARROW CON_CRS" : + "CON_NAME_NARROW CON_NO_CRS"); + fprintf (Gbl.F.Out,"", Font,Gbl.RowEvenOdd); // The form must be unique because // the list of connected users @@ -848,13 +848,15 @@ static void Con_WriteRowConnectedUsrOnRightColumn (Rol_Role_t Role) Frm_LinkFormSubmitUnique (Txt_View_record_for_this_course,Font); Usr_WriteFirstNameBRSurnames (UsrDat); fprintf (Gbl.F.Out,"" - ""); + ""); Frm_EndForm (); fprintf (Gbl.F.Out,""); /***** Write time from last access *****/ - fprintf (Gbl.F.Out,"", + Font = (Gbl.Usrs.Connected.Lst[Gbl.Usrs.Connected.NumUsr].ThisCrs ? "CON_SINCE CON_CRS" : + "CON_SINCE CON_NO_CRS"); + + fprintf (Gbl.F.Out,"", Font,Gbl.RowEvenOdd); fprintf (Gbl.F.Out,"
", @@ -1024,8 +1026,6 @@ static void Con_ShowConnectedUsrsCurrentLocationOneByOneOnMainZone (Rol_Role_t R { /* Get course code (row[1]) */ ThisCrs = (Str_ConvertStrCodToLongCod (row[1]) == Gbl.CurrentCrs.Crs.CrsCod); - Font = (ThisCrs ? "CON_CRS" : - "CON_NO_CRS"); /* Compute time from last access */ if (sscanf (row[2],"%ld",&TimeDiff) != 1) @@ -1033,8 +1033,7 @@ static void Con_ShowConnectedUsrsCurrentLocationOneByOneOnMainZone (Rol_Role_t R /***** Show photo *****/ fprintf (Gbl.F.Out,"" - "", + "", Gbl.RowEvenOdd); ShowPhoto = Pho_ShowingUsrPhotoIsAllowed (&UsrDat,PhotoURL); Pho_ShowUsrPhoto (&UsrDat,ShowPhoto ? PhotoURL : @@ -1043,7 +1042,9 @@ static void Con_ShowConnectedUsrsCurrentLocationOneByOneOnMainZone (Rol_Role_t R fprintf (Gbl.F.Out,""); /***** Write full name and link *****/ - fprintf (Gbl.F.Out,"", + Font = (ThisCrs ? "CON_NAME_WIDE CON_CRS" : + "CON_NAME_WIDE CON_NO_CRS"); + fprintf (Gbl.F.Out,"", Font,Gbl.RowEvenOdd); if (PutLinkToRecord) { @@ -1073,8 +1074,9 @@ static void Con_ShowConnectedUsrsCurrentLocationOneByOneOnMainZone (Rol_Role_t R fprintf (Gbl.F.Out,""); /***** Write time from last access *****/ - fprintf (Gbl.F.Out,"", + Font = (ThisCrs ? "CON_SINCE CON_CRS" : + "CON_SINCE CON_NO_CRS"); + fprintf (Gbl.F.Out,"", Font,Gbl.RowEvenOdd); Dat_WriteHoursMinutesSecondsFromSeconds (TimeDiff); fprintf (Gbl.F.Out,"" diff --git a/swad_follow.c b/swad_follow.c index be66c29b1..1dea0f396 100644 --- a/swad_follow.c +++ b/swad_follow.c @@ -891,8 +891,7 @@ static void Fol_WriteRowUsrToFollowOnRightColumn (struct UsrData *UsrDat) /***** Show user's photo *****/ fprintf (Gbl.F.Out,"" - "", + "", Gbl.RowEvenOdd); if (Visible) { @@ -904,14 +903,14 @@ static void Fol_WriteRowUsrToFollowOnRightColumn (struct UsrData *UsrDat) fprintf (Gbl.F.Out,""); /***** User's name *****/ - fprintf (Gbl.F.Out,"", + fprintf (Gbl.F.Out,"", Gbl.RowEvenOdd); if (Visible) { /* Put form to go to public profile */ Frm_StartForm (ActSeeOthPubPrf); Usr_PutParamUsrCodEncrypted (UsrDat->EncryptedUsrCod); - fprintf (Gbl.F.Out,"
"); // Limited width + fprintf (Gbl.F.Out,"
"); // Limited width Frm_LinkFormSubmit (Txt_Another_user_s_profile,"CON_CRS",NULL); Usr_WriteFirstNameBRSurnames (UsrDat); fprintf (Gbl.F.Out,"" @@ -921,8 +920,7 @@ static void Fol_WriteRowUsrToFollowOnRightColumn (struct UsrData *UsrDat) fprintf (Gbl.F.Out,""); /***** Icon to follow *****/ - fprintf (Gbl.F.Out,"", + fprintf (Gbl.F.Out,"", Gbl.RowEvenOdd); if (!Gbl.Usrs.Me.Logged || // Not logged ItsMe) // It's me