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.107.2

This commit is contained in:
Antonio Cañas Vargas 2016-01-11 00:27:04 +01:00
parent 942cdc551c
commit e3e7467775
5 changed files with 51 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
css/swad15.105.css → css/swad15.107.2.css
View File

@ -1678,7 +1678,15 @@ a:hover img.CENTRE_PHOTO_SHOW
#new_timeline_list
{
display:none;
margin:0;
padding:0;
}
#old_timeline_list
{
margin:0;
padding:0;
}
.SOCIAL_PUB
{
width:536px;

6
js/swad15.107.1.js → js/swad15.107.2.js
View File

@ -488,7 +488,7 @@ function readNewTimelineData() {
}
}
if (delay >= 5000) // If refresh slower than 1 time each 5 seconds, do refresh; else abort
if (delay >= 10000) // If refresh slower than 1 time each 10 seconds, do refresh; else abort
setTimeout('refreshNewTimeline()',delay);
}
}
@ -519,6 +519,10 @@ function readOldTimelineData() {
// Process mathematics; see http://docs.mathjax.org/en/latest/advanced/typeset.html
MathJax.Hub.Queue(["Typeset",MathJax.Hub,timeline]);
}
if (countOldTimeline < 10) // Set to Soc_MAX_OLD_PUBS_TO_GET_AND_SHOW
// No more old publishings
document.getElementById("view_old_posts_container").style.display = 'none';
}
}
}

8
swad_changelog.h
View File

@ -123,13 +123,15 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 15.107.1 (2016-01-10)"
#define CSS_FILE "swad15.105.css"
#define JS_FILE "swad15.107.1.js"
#define Log_PLATFORM_VERSION "SWAD 15.107.2 (2016-01-11)"
#define CSS_FILE "swad15.107.2.css"
#define JS_FILE "swad15.107.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.107.2: Jan 11, 2016 Hide link to see old publishings when oldest publishing is reached.
Some constants related to social timeline changed. (192159 lines)
Version 15.107.1: Jan 10, 2016 Id of dates in timeline must be unique.
Changes in JavaScript to render dates and mathenatics. (192137 lines)
Version 15.107: Jan 10, 2016 Get older publishings from social timeline. (192112 lines)

2
swad_config.h
View File

@ -493,7 +493,7 @@
#define Cfg_TIME_TO_REFRESH_LAST_CLICKS ((time_t)( 500UL)) // Refresh period of last clicks in miliseconds
#define Cfg_TIME_TO_REFRESH_SOCIAL_TIMELINE ((time_t)( 5UL*1000UL)) // Refresh period of social timeline in miliseconds
#define Cfg_TIME_TO_REFRESH_SOCIAL_TIMELINE ((time_t)( 30UL*1000UL)) // Refresh period of social timeline in miliseconds
#define Cfg_TIME_TO_CHANGE_BANNER ((time_t)( 5UL*60UL)) // After these seconds, change banner
#define Cfg_NUMBER_OF_BANNERS 1 // Number of banners to show simultaneously

53
swad_social.c
View File

@ -52,8 +52,13 @@
#define Soc_WIDTH_TIMELINE "560px"
#define Soc_MAX_NUM_SHARERS_SHOWN 10 // Maximum number of users shown who have share a social note
#define Soc_MAX_BYTES_SUMMARY 100
#define Soc_MAX_RECENT_PUBS_TO_GET 5 // Max. number of recent publishings shown before refreshing
#define Soc_MAX_OLD_PUBS_TO_GET 5 // Max. number of publishings got everytime I want to see older publishings
// Number of recent publishings got and shown the first time, before refreshing
#define Soc_MAX_RECENT_PUBS_TO_SHOW 50 // Publishings to show
#define Soc_MAX_RECENT_PUBS_TO_GET (Soc_MAX_RECENT_PUBS_TO_SHOW+1) // Publishings to get
// Number of old publishings got and shown when I want to see old publishings
#define Soc_MAX_OLD_PUBS_TO_GET_AND_SHOW 10 // If you change this number, set also this constant to the new value in JavaScript
typedef enum
{
@ -381,7 +386,7 @@ static void Soc_BuildQueryToGetTimelineGbl (Soc_WhatToGetFromTimeline_t WhatToGe
FirstPubCod = Soc_GetPubCodFromSession ("FirstPubCod");
if (FirstPubCod > 0)
sprintf (SubQueryRangePubs,"PubCod<'%ld' AND ",FirstPubCod);
sprintf (SubQueryLimit," LIMIT %u",Soc_MAX_OLD_PUBS_TO_GET);
sprintf (SubQueryLimit," LIMIT %u",Soc_MAX_OLD_PUBS_TO_GET_AND_SHOW);
break;
}
@ -500,16 +505,17 @@ static void Soc_ShowTimeline (const char *Query,const char *Title)
extern const char *Txt_No_public_activity;
MYSQL_RES *mysql_res;
MYSQL_ROW row;
unsigned long NumPublishings;
unsigned long NumPubsGot;
unsigned long NumPubsToShow;
unsigned long NumPub;
struct SocialPublishing SocPub;
struct SocialNote SocNot;
/***** Get timeline from database *****/
NumPublishings = DB_QuerySELECT (Query,&mysql_res,"can not get timeline");
NumPubsGot = DB_QuerySELECT (Query,&mysql_res,"can not get timeline");
/***** List my timeline *****/
if (NumPublishings) // Publishings found in timeline
if (NumPubsGot) // Publishings found in timeline
{
/***** Start frame *****/
Lay_StartRoundFrame (Soc_WIDTH_TIMELINE,Title);
@ -525,10 +531,12 @@ static void Soc_ShowTimeline (const char *Query,const char *Title)
/***** Hidden list where insert new publishings via AJAX *****/
fprintf (Gbl.F.Out,"<ul id=\"new_timeline_list\"></ul>");
/***** List with the publishings in timeline *****/
/***** List recent publishings in timeline *****/
fprintf (Gbl.F.Out,"<ul id=\"timeline_list\" class=\"LIST_LEFT\">");
NumPubsToShow = (NumPubsGot <= Soc_MAX_RECENT_PUBS_TO_SHOW) ? NumPubsGot :
Soc_MAX_RECENT_PUBS_TO_SHOW;
for (NumPub = 0;
NumPub < NumPublishings;
NumPub < NumPubsToShow;
NumPub++)
{
/* Get data of social publishing */
@ -547,11 +555,14 @@ static void Soc_ShowTimeline (const char *Query,const char *Title)
/***** Store first publishing code into session *****/
Soc_UpdateFirstPubCodIntoSession (SocPub.PubCod);
/***** Link to view old publishings via AJAX *****/
Soc_PutLinkToViewOldPublishings ();
if (NumPubsGot > Soc_MAX_RECENT_PUBS_TO_SHOW)
{
/***** Link to view old publishings via AJAX *****/
Soc_PutLinkToViewOldPublishings ();
/***** Hidden list where insert old publishings via AJAX *****/
fprintf (Gbl.F.Out,"<ul id=\"old_timeline_list\"></ul>");
/***** Hidden list where insert old publishings via AJAX *****/
fprintf (Gbl.F.Out,"<ul id=\"old_timeline_list\"></ul>");
}
/***** End frame *****/
Lay_EndRoundFrame ();
@ -572,17 +583,17 @@ static void Soc_ShowNewPubsInTimeline (const char *Query)
{
MYSQL_RES *mysql_res;
MYSQL_ROW row;
unsigned long NumPublishings;
unsigned long NumPubsGot;
unsigned long NumPub;
struct SocialPublishing SocPub;
struct SocialNote SocNot;
/***** Get new publishings timeline from database *****/
NumPublishings = DB_QuerySELECT (Query,&mysql_res,"can not get timeline");
NumPubsGot = DB_QuerySELECT (Query,&mysql_res,"can not get timeline");
/***** List new timeline *****/
/***** List new publishings timeline *****/
for (NumPub = 0;
NumPub < NumPublishings;
NumPub < NumPubsGot;
NumPub++)
{
/* Get data of social publishing */
@ -610,19 +621,19 @@ static void Soc_ShowOldPubsInTimeline (const char *Query)
{
MYSQL_RES *mysql_res;
MYSQL_ROW row;
unsigned long NumPublishings;
unsigned long NumPubsGot;
unsigned long NumPub;
struct SocialPublishing SocPub;
struct SocialNote SocNot;
/***** Get old publishings timeline from database *****/
NumPublishings = DB_QuerySELECT (Query,&mysql_res,"can not get timeline");
NumPubsGot = DB_QuerySELECT (Query,&mysql_res,"can not get timeline");
if (NumPublishings)
if (NumPubsGot)
{
/***** List old timeline *****/
/***** List old publishings in timeline *****/
for (NumPub = 0;
NumPub < NumPublishings;
NumPub < NumPubsGot;
NumPub++)
{
/* Get data of social publishing */