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

This commit is contained in:
Antonio Cañas Vargas 2016-03-18 21:40:26 +01:00
parent 7750972792
commit 1d7ff7b9e7
2 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
swad_calendar.c
View File

@ -63,6 +63,8 @@ static void Cal_ShowFormToSelFirstDayOfWeek (Act_Action_t Action,const char *Cla
static unsigned Cal_GetParamFirstDayOfWeek (void);
static void Cal_PutIconToPrintCalendar (void);
/*****************************************************************************/
/************** Put icons to select the first day of the week ****************/
/*****************************************************************************/
@ -231,7 +233,6 @@ void Cal_DrawCurrentMonth (void)
*/
void Cal_DrawCalendar (void)
{
extern const char *Txt_Print;
extern const char *Txt_STR_LANG_ID[1+Txt_NUM_LANGUAGES];
char Params[256+256+Ses_LENGTH_SESSION_ID+256];
bool PrintView = (Gbl.Action.Act == ActPrnCal);
@ -247,15 +248,9 @@ void Cal_DrawCalendar (void)
Exa_CreateListOfExamAnnouncements ();
/***** Start of table and title *****/
if (!PrintView)
{
/* Link to print view */
fprintf (Gbl.F.Out,"<div class=\"CONTEXT_MENU\">");
Lay_PutContextualLink (ActPrnCal,NULL,"print64x64.png",
Txt_Print,Txt_Print);
fprintf (Gbl.F.Out,"</div>");
}
Lay_StartRoundFrameTable (NULL,0,NULL);
Lay_StartRoundFrame (NULL,NULL,PrintView ? NULL :
Cal_PutIconToPrintCalendar);
fprintf (Gbl.F.Out,"<table class=\"FRAME_TABLE\">");
Lay_WriteHeaderClassPhoto (1,PrintView,false,
Gbl.CurrentIns.Ins.InsCod,
Gbl.CurrentDeg.Deg.DegCod,
@ -293,11 +288,24 @@ void Cal_DrawCalendar (void)
Params);
fprintf (Gbl.F.Out,"</td>"
"</tr>");
"</tr>"
"</table>");
/***** Free list of dates of exam announcements *****/
Exa_FreeListExamAnnouncements ();
/***** End frame *****/
Lay_EndRoundFrameTable ();
Lay_EndRoundFrame ();
}
/*****************************************************************************/
/************************ Draw an academic calendar **************************/
/*****************************************************************************/
static void Cal_PutIconToPrintCalendar (void)
{
extern const char *Txt_Print;
Lay_PutContextualLink (ActPrnCal,NULL,"print64x64.png",Txt_Print,NULL);
}

3
swad_changelog.h
View File

@ -134,13 +134,14 @@
/****************************** Public constants *****************************/
/*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 15.150.9 (2016-03-18)"
#define Log_PLATFORM_VERSION "SWAD 15.150.10 (2016-03-18)"
#define CSS_FILE "swad15.150.2.css"
#define JS_FILE "swad15.131.3.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.150.10:Mar 18, 2016 Icon to print calendar integrated in frame. (195961 lines)
Version 15.150.9: Mar 18, 2016 Icons to print/show-all students/teachers integrated in frame. (195957 lines)
Version 15.150.8: Mar 18, 2016 Icons to print/show-all guests integrated in frame. (195967 lines)
Version 15.150.7: Mar 18, 2016 Icon to print degree configuration integrated in frame. (195970 lines)