Marown/swad-core
Marown/swad-core
1
0
Fork 0
mirror of https://github.com/acanas/swad-core.git synced 2024-06-20 07:25:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Version 15.101.2

Browse Source
This commit is contained in:
Antonio Cañas Vargas 2016-01-07 16:45:35 +01:00
parent e9e39ddc26
commit acd7b5290e
3 changed files with 69 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
css/swad15.100.2.css → css/swad15.101.2.css
View File

@ -1743,6 +1743,31 @@ a:hover img.CENTRE_PHOTO_SHOW
{
padding-top:10px;
}
.SOCIAL_COMMENT_PHOTO
{
display:inline-block;
box-sizing:border-box;
width:50px;
height:80px;
padding:10px 0;
text-align:left;
vertical-align:top;
}
.SOCIAL_COMMENT_RIGHT_CONTAINER
{
display:inline-block;
box-sizing:border-box;
width:410px;
padding:10px 0;
}
.SOCIAL_COMMENT_RIGHT_AUTHOR
{
display:inline-block;
box-sizing:border-box;
width:230px;
text-align:left;
vertical-align:top;
}
/*********************************** Messages ********************************/
.MSG_TO_ONE_RCP

5
swad_changelog.h
View File

@ -124,13 +124,14 @@ En definitiva, se estar
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 15.101.1 (2016-01-07)"
#define CSS_FILE "swad15.100.2.css"
#define Log_PLATFORM_VERSION "SWAD 15.101.2 (2016-01-07)"
#define CSS_FILE "swad15.101.2.css"
#define JS_FILE "swad15.100.2.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 15.101.2: Jan 07, 2016 Show social comments in social notes. (191229 lines)
Version 15.101.1: Jan 07, 2016 Show social comments in social notes. Not finished. (191181 lines)
Version 15.101: Jan 07, 2016 Store social comment in database. (191091 lines)
16 changes necessary in database:

55
swad_social.c
View File

@ -150,6 +150,8 @@ static void Soc_FormSocialPost (void);
static void Soc_ReceiveSocialPost (void);
static void Soc_PutFormToCommentSocialNote (long NotCod);
static void Soc_WriteCommentsInSocialNote (long NotCod);
static void Soc_WriteCommentDate (time_t TimeUTC);
static void Soc_PutHiddenFormToSendCommentToASocialNote (long NotCod);
static void Soc_PutDisabledIconShare (unsigned NumShared);
static void Soc_PutFormToShareSocialNote (long NotCod);
@ -1193,7 +1195,7 @@ static void Soc_WriteCommentsInSocialNote (long NotCod)
/***** Get comments of this social note from database *****/
sprintf (Query,"SELECT social_comments.ComCod,social_comments.UsrCod,"
"UNIX_TIMESTAMP(social_comments.TimePublish),"
"UNIX_TIMESTAMP(social_comments.TimeComment),"
"social_comments_content.Content"
" FROM social_comments,social_comments_content"
" WHERE social_comments.NotCod='%ld'"
@ -1224,42 +1226,40 @@ static void Soc_WriteCommentsInSocialNote (long NotCod)
/* Get (from) user code (row[1]) */
UsrDat.UsrCod = Str_ConvertStrCodToLongCod (row[1]);
Usr_ChkUsrCodAndGetAllUsrDataFromUsrCod (&UsrDat);
if (Gbl.Usrs.Me.Logged)
IAmTheAuthor = (UsrDat.UsrCod == Gbl.Usrs.Me.UsrDat.UsrCod);
/* Get time of the note (row[2]) */
DateTimeUTC = Dat_GetUNIXTimeFromStr (row[2]);
/* Get content (row[3]) */
strncpy (Content,row[0],Cns_MAX_BYTES_LONG_TEXT);
strncpy (Content,row[3],Cns_MAX_BYTES_LONG_TEXT);
Content[Cns_MAX_BYTES_LONG_TEXT] = '\0';
fprintf (Gbl.F.Out,"<li>");
/***** Get author data *****/
Usr_ChkUsrCodAndGetAllUsrDataFromUsrCod (&UsrDat);
if (Gbl.Usrs.Me.Logged)
IAmTheAuthor = (UsrDat.UsrCod == Gbl.Usrs.Me.UsrDat.UsrCod);
/***** Left: write author's photo *****/
fprintf (Gbl.F.Out,"<div class=\"SOCIAL_LEFT_PHOTO\">");
fprintf (Gbl.F.Out,"<div class=\"SOCIAL_COMMENT_PHOTO\">");
ShowPhoto = Pho_ShowUsrPhotoIsAllowed (&UsrDat,PhotoURL);
Pho_ShowUsrPhoto (&UsrDat,ShowPhoto ? PhotoURL :
NULL,
"PHOTO60x80",Pho_ZOOM);
"PHOTO45x60",Pho_ZOOM);
fprintf (Gbl.F.Out,"</div>");
/***** Right: author's name, time, summary and buttons *****/
fprintf (Gbl.F.Out,"<div class=\"SOCIAL_RIGHT_CONTAINER\">");
fprintf (Gbl.F.Out,"<div class=\"SOCIAL_COMMENT_RIGHT_CONTAINER\">");
/* Write author's full name and nickname */
Str_LimitLengthHTMLStr (UsrDat.FullName,20);
fprintf (Gbl.F.Out,"<div class=\"SOCIAL_RIGHT_AUTHOR\">"
"<span class=\"DAT_N_BOLD\">%s</span>"
Str_LimitLengthHTMLStr (UsrDat.FullName,12);
fprintf (Gbl.F.Out,"<div class=\"SOCIAL_COMMENT_RIGHT_AUTHOR\">"
"<span class=\"DAT_BOLD\">%s</span>"
"<span class=\"DAT_LIGHT\"> @%s</span>"
"</div>",
UsrDat.FullName,UsrDat.Nickname);
/* Write date and time */
Soc_WriteNoteDate (DateTimeUTC);
Soc_WriteCommentDate (DateTimeUTC);
/* Write content of the comment */
fprintf (Gbl.F.Out,"<div class=\"DAT\">");
@ -1280,6 +1280,33 @@ static void Soc_WriteCommentsInSocialNote (long NotCod)
DB_FreeMySQLResult (&mysql_res);
}
/*****************************************************************************/
/********* Write the date of creation of a comment to a social note **********/
/*****************************************************************************/
// TimeUTC holds UTC date and time in UNIX format (seconds since 1970)
static void Soc_WriteCommentDate (time_t TimeUTC)
{
extern const char *Txt_Today;
static unsigned UniqueId = 0;
UniqueId++;
/***** Start cell *****/
fprintf (Gbl.F.Out,"<div id=\"date_comment_%u\" class=\"SOCIAL_RIGHT_TIME DAT_LIGHT\""
" style=\"display:inline-block;\">",
UniqueId);
/***** Write date and time *****/
fprintf (Gbl.F.Out,"<script type=\"text/javascript\">"
"writeLocalDateTimeFromUTC('date_comment_%u',%ld,'&nbsp;','%s');"
"</script>",
UniqueId,(long) TimeUTC,Txt_Today);
/***** End cell *****/
fprintf (Gbl.F.Out,"</div>");
}
/*****************************************************************************/
/******************* Form to comment a social publishing *********************/
/*****************************************************************************/