Marown/swad-core
Marown
/
swad-core
mirror of https://github.com/acanas/swad-core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Version 15.121.9

This commit is contained in:
Antonio Cañas Vargas 2016-01-20 19:23:11 +01:00
parent 7ed4a2b739
commit bd7b1383c8
2 changed files with 15 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
swad_changelog.h
View File

@ -123,13 +123,14 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 15.121.8 (2016-01-20)"
#define Log_PLATFORM_VERSION "SWAD 15.121.9 (2016-01-20)"
#define CSS_FILE "swad15.121.7.css"
#define JS_FILE "swad15.121.7.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.121.9: Jan 20, 2016 Code optimization in social comments. (193952 lines)
Version 15.121.8: Jan 20, 2016 Fixed bugs removing favs to social comments. (193960 lines)
Version 15.121.7: Jan 20, 2016 Changes in layout of social timeline. (193955 lines)
Version 15.121.6: Jan 20, 2016 Remove favs when a social comment is removed.

35
swad_social.c
View File

@ -259,8 +259,7 @@ static void Soc_PutTextarea (const char *Placeholder,const char *ClassTextArea);
static long Soc_ReceiveSocialPost (void);
static void Soc_PutIconToToggleCommentSocialNote (const char UniqueId[Soc_MAX_LENGTH_ID],
bool PutText);
static void Soc_PutIconToToggleCommentSocialNote (const char UniqueId[Soc_MAX_LENGTH_ID]);
static void Soc_PutIconCommentDisabled (void);
static void Soc_PutHiddenFormToWriteNewCommentToSocialNote (long NotCod,
const char IdNewComment[Soc_MAX_LENGTH_ID]);
@ -1242,7 +1241,7 @@ static void Soc_WriteSocialNote (const struct SocialNote *SocNot,
if (SocNot->Unavailable) // Unavailable social notes can not be commented
Soc_PutIconCommentDisabled ();
else
Soc_PutIconToToggleCommentSocialNote (IdNewComment,false);
Soc_PutIconToToggleCommentSocialNote (IdNewComment);
fprintf (Gbl.F.Out,"</div>");
@ -2003,29 +2002,22 @@ static long Soc_ReceiveSocialPost (void)
/****** Put an icon to toggle on/off the form to comment a social note *******/
/*****************************************************************************/
static void Soc_PutIconToToggleCommentSocialNote (const char UniqueId[Soc_MAX_LENGTH_ID],
bool PutText)
static void Soc_PutIconToToggleCommentSocialNote (const char UniqueId[Soc_MAX_LENGTH_ID])
{
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *Txt_Comment;
/***** Link to toggle on/off the form to comment a social note *****/
fprintf (Gbl.F.Out,"<div class=\"SOCIAL_ICON_COMMENT ICON_HIGHLIGHT\">"
"<a href=\"\"");
if (PutText)
fprintf (Gbl.F.Out," class=\"%s\"",The_ClassForm[Gbl.Prefs.Theme]);
fprintf (Gbl.F.Out," onclick=\"toggleDisplay('%s');return false;\" />"
"<img src=\"%s/write64x64.gif\""
" alt=\"%s\" title=\"%s\""
" class=\"ICON20x20\" />",
UniqueId,
Gbl.Prefs.IconsURL,
Txt_Comment,
Txt_Comment);
if (PutText)
fprintf (Gbl.F.Out,"&nbsp;%s",Txt_Comment);
fprintf (Gbl.F.Out,"</a>"
"</div>");
"<a href=\"\""
" onclick=\"toggleDisplay('%s');return false;\" />"
"<img src=\"%s/write64x64.gif\""
" alt=\"%s\" title=\"%s\""
" class=\"ICON20x20\" />"
"</a>"
"</div>",
UniqueId,
Gbl.Prefs.IconsURL,
Txt_Comment,Txt_Comment);
}
/*****************************************************************************/
@ -2034,7 +2026,6 @@ static void Soc_PutIconToToggleCommentSocialNote (const char UniqueId[Soc_MAX_LE
static void Soc_PutIconCommentDisabled (void)
{
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *Txt_Comment;
/***** Disabled icon to comment a social note *****/