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 *****************************/ /****************************** 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 CSS_FILE "swad15.121.7.css"
#define JS_FILE "swad15.121.7.js" #define JS_FILE "swad15.121.7.js"
// Number of lines (includes comments but not blank lines) has been got with the following command: // 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 // 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.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.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. 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 long Soc_ReceiveSocialPost (void);
static void Soc_PutIconToToggleCommentSocialNote (const char UniqueId[Soc_MAX_LENGTH_ID], static void Soc_PutIconToToggleCommentSocialNote (const char UniqueId[Soc_MAX_LENGTH_ID]);
bool PutText);
static void Soc_PutIconCommentDisabled (void); static void Soc_PutIconCommentDisabled (void);
static void Soc_PutHiddenFormToWriteNewCommentToSocialNote (long NotCod, static void Soc_PutHiddenFormToWriteNewCommentToSocialNote (long NotCod,
const char IdNewComment[Soc_MAX_LENGTH_ID]); 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 if (SocNot->Unavailable) // Unavailable social notes can not be commented
Soc_PutIconCommentDisabled (); Soc_PutIconCommentDisabled ();
else else
Soc_PutIconToToggleCommentSocialNote (IdNewComment,false); Soc_PutIconToToggleCommentSocialNote (IdNewComment);
fprintf (Gbl.F.Out,"</div>"); 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 *******/ /****** 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], static void Soc_PutIconToToggleCommentSocialNote (const char UniqueId[Soc_MAX_LENGTH_ID])
bool PutText)
{ {
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *Txt_Comment; extern const char *Txt_Comment;
/***** Link to toggle on/off the form to comment a social note *****/ /***** Link to toggle on/off the form to comment a social note *****/
fprintf (Gbl.F.Out,"<div class=\"SOCIAL_ICON_COMMENT ICON_HIGHLIGHT\">" fprintf (Gbl.F.Out,"<div class=\"SOCIAL_ICON_COMMENT ICON_HIGHLIGHT\">"
"<a href=\"\""); "<a href=\"\""
if (PutText) " onclick=\"toggleDisplay('%s');return false;\" />"
fprintf (Gbl.F.Out," class=\"%s\"",The_ClassForm[Gbl.Prefs.Theme]); "<img src=\"%s/write64x64.gif\""
fprintf (Gbl.F.Out," onclick=\"toggleDisplay('%s');return false;\" />" " alt=\"%s\" title=\"%s\""
"<img src=\"%s/write64x64.gif\"" " class=\"ICON20x20\" />"
" alt=\"%s\" title=\"%s\"" "</a>"
" class=\"ICON20x20\" />", "</div>",
UniqueId, UniqueId,
Gbl.Prefs.IconsURL, Gbl.Prefs.IconsURL,
Txt_Comment, Txt_Comment,Txt_Comment);
Txt_Comment);
if (PutText)
fprintf (Gbl.F.Out,"&nbsp;%s",Txt_Comment);
fprintf (Gbl.F.Out,"</a>"
"</div>");
} }
/*****************************************************************************/ /*****************************************************************************/
@ -2034,7 +2026,6 @@ static void Soc_PutIconToToggleCommentSocialNote (const char UniqueId[Soc_MAX_LE
static void Soc_PutIconCommentDisabled (void) static void Soc_PutIconCommentDisabled (void)
{ {
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *Txt_Comment; extern const char *Txt_Comment;
/***** Disabled icon to comment a social note *****/ /***** Disabled icon to comment a social note *****/