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

Version 15.77.2

Browse Source
This commit is contained in:
Antonio Cañas Vargas 2015-12-28 23:46:17 +01:00
parent 1b8da4590f
commit 2b9f7f3788
3 changed files with 38 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
css/swad15.75.css → css/swad15.77.2.css
View File

@ -1666,6 +1666,27 @@ a:hover img.CENTRE_PHOTO_SHOW
.LOG {font-family:"Arial Narrow","Nimbus Sans L","DejaVu LGC Sans Condensed",sans-serif; color:#606060; font-size:11pt;}
.LOG_R {font-family:"Arial Narrow","Nimbus Sans L","DejaVu LGC Sans Condensed",sans-serif; color:red; font-size:11pt;}
/******************************** Social activity ****************************/
.SOCIAL_LEFT_PHOTO
{
display:inline-block;
text-align:left;
vertical-align:top;
width:64px;
height:90px;
}
.SOCIAL_RIGHT_CONTAINER
{
display:inline-block;
}
.SOCIAL_RIGHT_AUTHOR
{
display:inline-block;
width:300px;
text-align:left;
vertical-align:top;
}
/*********************************** Messages ********************************/
.MSG_TO_ONE_RCP
{

5
swad_changelog.h
View File

@ -114,12 +114,13 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 15.77.1 (2015-12-28)"
#define CSS_FILE "swad15.75.css"
#define Log_PLATFORM_VERSION "SWAD 15.77.2 (2015-12-28)"
#define CSS_FILE "swad15.77.2.css"
// 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 15.77.2: Dec 28, 2015 Changes in CSS related to social activity. (188368 lines)
Version 15.77.1: Dec 28, 2015 Insert social event when posting in a global forum. (188342 lines)
Version 15.77: Dec 28, 2015 New table in database for social activity. (188287 lines)
2 changes necessary in database:

22
swad_social.c
View File

@ -185,26 +185,28 @@ void Soc_ShowSocialActivity (void)
/***** Write row for this notification *****/
fprintf (Gbl.F.Out,"<li>");
/* Write author of the event */
fprintf (Gbl.F.Out,"<div style=\"display:inline-block; vertical-align:top; width:64px; height:90px;\">");
/* Left: write author's photo */
fprintf (Gbl.F.Out,"<div class=\"SOCIAL_LEFT_PHOTO\">");
ShowPhoto = Pho_ShowUsrPhotoIsAllowed (&UsrDat,PhotoURL);
Pho_ShowUsrPhoto (&UsrDat,ShowPhoto ? PhotoURL :
NULL,
"PHOTO60x80",Pho_ZOOM);
fprintf (Gbl.F.Out,"</div>");
fprintf (Gbl.F.Out,"<div style=\"display:inline-block;\">");
/* Right: author's name, time and summary */
fprintf (Gbl.F.Out,"<div class=\"SOCIAL_RIGHT_CONTAINER\">");
fprintf (Gbl.F.Out,"<div class=\"DAT LEFT_TOP\""
" style=\"display:inline-block; width:300px;\">"
"<strong>%s</strong> @%s</div>",
/* Write author's full name and nickname */
fprintf (Gbl.F.Out,"<div class=\"SOCIAL_RIGHT_AUTHOR DAT\">"
"<strong>%s</strong> @%s"
"</div>",
UsrDat.FullName,UsrDat.Nickname);
/* Write date and time */
Soc_WriteEventDate (DateTimeUTC);
/* Write event type and location */
fprintf (Gbl.F.Out,"<div class=\"DAT\" style=\"display:block;\">%u: ",
fprintf (Gbl.F.Out,"<div class=\"DAT\">%u: ",
(unsigned) SocialEvent);
if (SocialEvent == Soc_EVENT_FORUM_POST)
@ -221,12 +223,16 @@ void Soc_ShowSocialActivity (void)
fprintf (Gbl.F.Out,"%s: %s",Txt_Country,Cty.Name[Gbl.Prefs.Language]);
fprintf (Gbl.F.Out,"</div>");
/***** Write content of the event *****/
/* Write content of the event */
Soc_GetEventSummary (SocialEvent,Cod,
SummaryStr,Soc_MAX_BYTES_SUMMARY);
fprintf (Gbl.F.Out,"<div class=\"DAT\">%s</div>",SummaryStr);
/* End of right part */
fprintf (Gbl.F.Out,"</div>");
/* End of list element */
fprintf (Gbl.F.Out,"</li>");
}
/***** List end *****/