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

This commit is contained in:
Antonio Cañas Vargas 2015-12-30 18:36:10 +01:00
parent 9d610ded0d
commit 20e795fa21
5 changed files with 36 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
swad_action.c
View File

@ -4426,6 +4426,23 @@ void Act_LinkFormSubmitAnimated (const char *Title,const char *LinkStyle)
/***************** Adjust current action when no user's logged ***************/
/*****************************************************************************/
void Act_PutLinkToUpdateAction (Act_Action_t Action)
{
extern const char *The_ClassFormBold[The_NUM_THEMES];
extern const char *Txt_Update;
Act_FormStart (Action);
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Act_LinkFormSubmitAnimated (Txt_Update,The_ClassFormBold[Gbl.Prefs.Theme]);
Lay_PutCalculateIconWithText (Txt_Update,Txt_Update);
fprintf (Gbl.F.Out,"</div>");
Act_FormEnd ();
}
/*****************************************************************************/
/***************** Adjust current action when no user's logged ***************/
/*****************************************************************************/
void Act_AdjustActionWhenNoUsrLogged (void)
{
if (Gbl.CurrentCrs.Crs.CrsCod > 0) // Course selected

1
swad_action.h
View File

@ -1416,6 +1416,7 @@ void Act_FormEnd (void);
void Act_LinkFormSubmit (const char *Title,const char *LinkStyle);
void Act_LinkFormSubmitId (const char *Title,const char *LinkStyle,const char *Id);
void Act_LinkFormSubmitAnimated (const char *Title,const char *LinkStyle);
void Act_PutLinkToUpdateAction (Act_Action_t Action);
void Act_AdjustActionWhenNoUsrLogged (void);
void Act_AdjustCurrentAction (void);

3
swad_changelog.h
View File

@ -116,13 +116,14 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 15.84.2 (2015-12-30)"
#define Log_PLATFORM_VERSION "SWAD 15.84.3 (2015-12-30)"
#define CSS_FILE "swad15.84.2.css"
#define JS_FILE "swad15.77.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.84.3: Dec 30, 2015 Form to update timeline. (189444 lines)
Version 15.84.2: Dec 30, 2015 Help about editor in new social post. (189422 lines)
Version 15.84.1: Dec 30, 2015 Request confirmation before removing a social post. (189419 lines)
Version 15.84: Dec 30, 2015 Remove social post. (189316 lines)

2
swad_enrollment.c
View File

@ -2249,8 +2249,8 @@ void Enr_ShowEnrollmentRequests (void)
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Act_LinkFormSubmitAnimated (Txt_Update,The_ClassFormBold[Gbl.Prefs.Theme]);
Lay_PutCalculateIconWithText (Txt_Update,Txt_Update);
Act_FormEnd ();
fprintf (Gbl.F.Out,"</div>");
Act_FormEnd ();
/***** Build query *****/
switch (Gbl.Scope.Current)

21
swad_social.c
View File

@ -120,7 +120,7 @@ extern struct Globals Gbl;
/***************************** Private prototypes ****************************/
/*****************************************************************************/
static unsigned long Soc_ShowTimeline (const char *Query);
static unsigned long Soc_ShowTimeline (const char *Query,Act_Action_t UpdateAction);
static Soc_SocialEvent_t Soc_GetSocialEventFromDB (const char *Str);
static void Soc_WriteSocialEvent (const struct SocialEvent *Soc,
struct UsrData *UsrDat,
@ -158,7 +158,7 @@ void Soc_ShowUsrTimeline (long UsrCod)
UsrCod);
/***** Show timeline *****/
Soc_ShowTimeline (Query);
Soc_ShowTimeline (Query,ActUnk);
}
/*****************************************************************************/
@ -191,15 +191,16 @@ void Soc_ShowFollowingTimeline (void)
Gbl.Usrs.Me.UsrDat.UsrCod);
/***** Show timeline *****/
if (!Soc_ShowTimeline (Query))
if (!Soc_ShowTimeline (Query,ActSeeSocAct))
Lay_ShowAlert (Lay_INFO,"No hay actividad p&uacute;blica."); // Need translation!!!
}
/*****************************************************************************/
/*********************** Show social activity (timeline) *********************/
/*****************************************************************************/
// UpdateAction == ActUnk ==> no form to update is displayed
static unsigned long Soc_ShowTimeline (const char *Query)
static unsigned long Soc_ShowTimeline (const char *Query,Act_Action_t UpdateAction)
{
extern const char *Txt_Public_activity;
MYSQL_RES *mysql_res;
@ -218,8 +219,14 @@ static unsigned long Soc_ShowTimeline (const char *Query)
/***** Initialize structure with user's data *****/
Usr_UsrDataConstructor (&UsrDat);
/***** List start *****/
/***** Start frame *****/
Lay_StartRoundFrame ("560px",Txt_Public_activity);
/***** Form to update timeline *****/
if (UpdateAction != ActUnk)
Act_PutLinkToUpdateAction (UpdateAction);
/***** Start list *****/
fprintf (Gbl.F.Out,"<ul class=\"LIST_LEFT\">");
/***** List events one by one *****/
@ -235,8 +242,10 @@ static unsigned long Soc_ShowTimeline (const char *Query)
Soc_WriteSocialEvent (&Soc,&UsrDat,true);
}
/***** List end *****/
/***** End list *****/
fprintf (Gbl.F.Out,"</ul>");
/***** End frame *****/
Lay_EndRoundFrame ();
/***** Free memory used for user's data *****/