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

Version 15.104.3

Browse Source
This commit is contained in:
Antonio Cañas Vargas 2016-01-09 20:11:44 +01:00
parent ccb777a372
commit d3b0118f84
4 changed files with 54 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
css/swad15.102.css
View File

@ -1668,13 +1668,21 @@ a:hover img.CENTRE_PHOTO_SHOW
.LOG_R {font-family:"Arial Narrow","Nimbus Sans L","DejaVu LGC Sans Condensed",sans-serif; color:red; font-size:11pt;}
/******************************** Social activity ****************************/
#view_new_posts_container
{
display:table-cell;
height:50px;
text-align:center;
vertical-align:middle;
}
#recent_timeline
{
display:none;
}
.SOCIAL_PUB
{
border-bottom:1px solid silver;
width:536px;
border-top:1px solid silver;
}
.SOCIAL_LEFT_PHOTO
{

3
swad_changelog.h
View File

@ -118,13 +118,14 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 15.104.2 (2016-01-09)"
#define Log_PLATFORM_VERSION "SWAD 15.104.3 (2016-01-09)"
#define CSS_FILE "swad15.102.css"
#define JS_FILE "swad15.104.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.104.3: Jan 09, 2016 Changes in layout of social timeline. (191784 lines)
Version 15.104.2: Jan 09, 2016 Refresh recent social timeline via AJAX. (191769 lines)
Version 15.104.1: Jan 09, 2016 Refresh recent social timeline via AJAX. (191727 lines)
Version 15.104: Jan 09, 2016 Refresh recent social timeline via AJAX. Not finished. (191720 lines)

58
swad_social.c
View File

@ -178,14 +178,13 @@ extern struct Globals Gbl;
/***************************** Private prototypes ****************************/
/*****************************************************************************/
static void Soc_ShowTimeline (const char *Query,Act_Action_t UpdateAction,
const char *Title);
static void Soc_ShowTimeline (const char *Query,const char *Title);
static void Soc_GetDataOfSocialPublishingFromRow (MYSQL_ROW row,struct SocialPublishing *SocPub);
static void Soc_PutLinkToViewRecentPublishings (void);
static void Soc_WriteSocialNote (const struct SocialPublishing *SocPub,
const struct SocialNote *SocNot,
bool ShowAlone,
bool LastInList);
bool ViewTopLine);
static void Soc_WriteDateTime (time_t TimeUTC);
static void Soc_GetAndWriteSocialPost (long PstCod);
static void Soc_PutFormGoToAction (const struct SocialNote *SocNot);
@ -264,7 +263,7 @@ void Soc_ShowTimelineUsr (void)
/***** Show timeline *****/
sprintf (Gbl.Title,Txt_Public_activity_OF_A_USER,Gbl.Usrs.Other.UsrDat.FirstName);
Soc_ShowTimeline (Query,ActSeePubPrf,Gbl.Title);
Soc_ShowTimeline (Query,Gbl.Title);
}
/*****************************************************************************/
@ -308,7 +307,7 @@ void Soc_ShowTimelineGbl (void)
" ORDER BY PubCod DESC");
/***** Show timeline *****/
Soc_ShowTimeline (Query,ActSeeSocTmlGbl,Txt_Public_activity);
Soc_ShowTimeline (Query,Txt_Public_activity);
/***** Drop temporary table with publishing codes *****/
sprintf (Query,"DROP TEMPORARY TABLE IF EXISTS pub_cods");
@ -322,7 +321,7 @@ void Soc_ShowTimelineGbl (void)
void Soc_GetAndShowRecentTimelineGbl (void)
{
fprintf (Gbl.F.Out,"<li>PID = %lu; Time = %s</li>",
fprintf (Gbl.F.Out,"<li class=\"SOCIAL_PUB\">PID = %lu; Time = %s</li>",
(unsigned long) Gbl.PID,Gbl.Now.YYYYMMDDHHMMSS);
}
@ -330,11 +329,8 @@ void Soc_GetAndShowRecentTimelineGbl (void)
/*********************** Show social activity (timeline) *********************/
/*****************************************************************************/
static void Soc_ShowTimeline (const char *Query,Act_Action_t UpdateAction,
const char *Title)
static void Soc_ShowTimeline (const char *Query,const char *Title)
{
extern const char *The_ClassFormBold[The_NUM_THEMES];
extern const char *Txt_Update;
extern const char *Txt_No_public_activity;
MYSQL_RES *mysql_res;
MYSQL_ROW row;
@ -352,20 +348,6 @@ static void Soc_ShowTimeline (const char *Query,Act_Action_t UpdateAction,
/***** Start frame *****/
Lay_StartRoundFrame (Soc_WIDTH_TIMELINE,Title);
/***** Form to update timeline *****/
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
if (Gbl.Usrs.Other.UsrDat.UsrCod > 0)
{
Act_FormStartAnchor (UpdateAction,"timeline");
Usr_PutParamOtherUsrCodEncrypted ();
}
else
Act_FormStart (UpdateAction);
Act_LinkFormSubmitAnimated (Txt_Update,The_ClassFormBold[Gbl.Prefs.Theme]);
Lay_PutCalculateIconWithText (Txt_Update,Txt_Update);
Act_FormEnd ();
fprintf (Gbl.F.Out,"</div>");
/***** Form to write a new post *****/
if (Gbl.Usrs.Other.UsrDat.UsrCod <= 0 || // Global timeline
Gbl.Usrs.Other.UsrDat.UsrCod == Gbl.Usrs.Me.UsrDat.UsrCod) // It's me
@ -390,7 +372,7 @@ static void Soc_ShowTimeline (const char *Query,Act_Action_t UpdateAction,
Soc_GetDataOfSocialNoteByCod (&SocNot);
/* Write social note */
Soc_WriteSocialNote (&SocPub,&SocNot,false,NumPub == NumPublishings - 1);
Soc_WriteSocialNote (&SocPub,&SocNot,false,true);
}
fprintf (Gbl.F.Out,"</ul>");
@ -405,22 +387,26 @@ static void Soc_ShowTimeline (const char *Query,Act_Action_t UpdateAction,
}
/*****************************************************************************/
/****** Put an icon to toggle on/off the form to comment a social note *******/
/***************** Put link to view new publishings in timeline **************/
/*****************************************************************************/
static void Soc_PutLinkToViewRecentPublishings (void)
{
extern const char *The_ClassForm[The_NUM_THEMES];
extern const char *The_ClassFormBold[The_NUM_THEMES];
extern const char *Txt_See_new_activity;
/***** Link to toggle on/off the form to comment a social note *****/
// div is hidden. When new posts arrive to the client via AJAX, div is shown
fprintf (Gbl.F.Out,"<div id=\"view_new_posts_container\""
" class=\"SOCIAL_PUB VERY_LIGHT_BLUE\""
" style=\"display:none;\">"
"<a href=\"\" class=\"%s\""
" onclick=\"moveRecentTimelineToTimeline();return false;\" />"
"<span id=\"view_new_posts_count\">0</span> nuevos elementos" // Need translation
"</a>"
"%s (<span id=\"view_new_posts_count\">0</span>)"
"</a>"
"</div>",
The_ClassForm[Gbl.Prefs.Theme]);
The_ClassFormBold[Gbl.Prefs.Theme],
Txt_See_new_activity);
}
/*****************************************************************************/
@ -430,7 +416,7 @@ static void Soc_PutLinkToViewRecentPublishings (void)
static void Soc_WriteSocialNote (const struct SocialPublishing *SocPub,
const struct SocialNote *SocNot,
bool ShowAlone, // Social note is shown alone, not in a list
bool LastInList) // Social note is shown in a list and it's the last one
bool ViewTopLine) // Separate with a top line from previous social note
{
extern const char *Txt_Forum;
extern const char *Txt_Course;
@ -458,7 +444,7 @@ static void Soc_WriteSocialNote (const struct SocialPublishing *SocPub,
/***** Start list item *****/
fprintf (Gbl.F.Out,"<li");
if (!(ShowAlone || LastInList))
if (!ShowAlone && ViewTopLine)
fprintf (Gbl.F.Out," class=\"SOCIAL_PUB\"");
fprintf (Gbl.F.Out,">");
@ -1104,7 +1090,7 @@ static void Soc_PutHiddenFormToWriteNewPost (void)
/***** Start list *****/
fprintf (Gbl.F.Out,"<ul class=\"LIST_LEFT\">"
"<li class=\"SOCIAL_PUB\">");
"<li>");
/***** Left: write author's photo *****/
fprintf (Gbl.F.Out,"<div class=\"SOCIAL_LEFT_PHOTO\">");
@ -1803,7 +1789,7 @@ static void Soc_ShareSocialNote (void)
Lay_ShowAlert (Lay_SUCCESS,Txt_SOCIAL_PUBLISHING_Shared);
/***** Show the social note just shared *****/
Soc_WriteSocialNote (&SocPub,&SocNot,true,true);
Soc_WriteSocialNote (&SocPub,&SocNot,true,false);
}
}
@ -1882,7 +1868,7 @@ static void Soc_UnshareSocialPublishing (void)
/***** Show the social note corresponding
to the publishing just unshared *****/
Soc_WriteSocialNote (&SocPub,&SocNot,true,true);
Soc_WriteSocialNote (&SocPub,&SocNot,true,false);
}
}
@ -1970,7 +1956,7 @@ static void Soc_RequestRemovalSocialNote (void)
Lay_ShowAlert (Lay_WARNING,Txt_Do_you_really_want_to_remove_the_following_comment);
/* Show social note */
Soc_WriteSocialNote (&SocPub,&SocNot,true,true);
Soc_WriteSocialNote (&SocPub,&SocNot,true,false);
/***** Form to ask for confirmation to remove this social post *****/
/* Start form */

21
swad_text.c
View File

@ -33851,6 +33851,27 @@ const char *Txt_See_messages_received =
"Veja mensagens recebidas";
#endif
const char *Txt_See_new_activity =
#if L==1
"Veure nova activitat";
#elif L==2
"Siehe neue Aktivit&auml;t";
#elif L==3
"See new activity";
#elif L==4
"Ver nueva actividad";
#elif L==5
"Voir nouvelle activit&eacute;";
#elif L==6
"Ver nueva actividad"; // Okoteve traducción
#elif L==7
"Vedere nuova attivit&agrave;";
#elif L==8
"Zobacz now&aogon; aktywno&sacute;&cacute;";
#elif L==9
"Veja nova atividade";
#endif
const char *Txt_See_notifications =
#if L==1
"Ver notificaciones"; // Necessita traduccio