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

Version 16.48.2

Browse Source
This commit is contained in:
Antonio Cañas Vargas 2016-11-07 12:48:40 +01:00
parent a7a3a46ffc
commit 90ab734ecb
4 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
swad_calendar.c
View File

@ -59,7 +59,7 @@ const bool Cal_DayIsValidAsFirstDayOfWeek[7] =
/***************************** Private prototypes ****************************/ /***************************** Private prototypes ****************************/
/*****************************************************************************/ /*****************************************************************************/
static void Cal_ShowFormToSelFirstDayOfWeek (Act_Action_t Action,const char *ClassIcon); static void Cal_PutIconsFirstDayOfWeek (void);
static unsigned Cal_GetParamFirstDayOfWeek (void); static unsigned Cal_GetParamFirstDayOfWeek (void);
@ -73,33 +73,34 @@ void Cal_PutIconsToSelectFirstDayOfWeek (void)
{ {
extern const char *Txt_Calendar; extern const char *Txt_Calendar;
Lay_StartRoundFrameTable (NULL,0,Txt_Calendar); Lay_StartRoundFrame (NULL,Txt_Calendar,Cal_PutIconsFirstDayOfWeek);
Cal_ShowFormToSelFirstDayOfWeek (ActChg1stDay,"ICON40x40"); Cal_ShowFormToSelFirstDayOfWeek (ActChg1stDay,"ICON40x40B");
Lay_EndRoundFrameTable (); Lay_EndRoundFrame ();
}
/*****************************************************************************/
/*********** Put contextual icons in first-day-of-week preference ************/
/*****************************************************************************/
static void Cal_PutIconsFirstDayOfWeek (void)
{
/***** Put icon to show a figure *****/
Gbl.Stat.FigureType = Sta_FIRST_DAY_OF_WEEK;
Sta_PutIconToShowFigure ();
} }
/*****************************************************************************/ /*****************************************************************************/
/************** Show form to select the first day of the week ****************/ /************** Show form to select the first day of the week ****************/
/*****************************************************************************/ /*****************************************************************************/
void Cal_ShowIntegratedFormToSelFirstDayOfWeek (Act_Action_t Action) void Cal_ShowFormToSelFirstDayOfWeek (Act_Action_t Action,const char *ClassIcon)
{
fprintf (Gbl.F.Out,"<table class=\"CELLS_PAD_2\" style=\"margin:0 auto;\">");
Cal_ShowFormToSelFirstDayOfWeek (Action,"ICON25x25");
fprintf (Gbl.F.Out,"</table>");
}
/*****************************************************************************/
/******** Show form in calendar to select the first day of the week **********/
/*****************************************************************************/
static void Cal_ShowFormToSelFirstDayOfWeek (Act_Action_t Action,const char *ClassIcon)
{ {
extern const char *Txt_First_day_of_the_week; extern const char *Txt_First_day_of_the_week;
extern const char *Txt_DAYS_SMALL[7]; extern const char *Txt_DAYS_SMALL[7];
unsigned FirstDayOfWeek; unsigned FirstDayOfWeek;
fprintf (Gbl.F.Out,"<tr>"); fprintf (Gbl.F.Out,"<table class=\"CELLS_PAD_2\" style=\"margin:0 auto;\">"
"<tr>");
for (FirstDayOfWeek = 0; // Monday for (FirstDayOfWeek = 0; // Monday
FirstDayOfWeek <= 6; // Sunday FirstDayOfWeek <= 6; // Sunday
FirstDayOfWeek++) FirstDayOfWeek++)
@ -121,7 +122,8 @@ static void Cal_ShowFormToSelFirstDayOfWeek (Act_Action_t Action,const char *Cla
Act_FormEnd (); Act_FormEnd ();
fprintf (Gbl.F.Out,"</td>"); fprintf (Gbl.F.Out,"</td>");
} }
fprintf (Gbl.F.Out,"</tr>"); fprintf (Gbl.F.Out,"</tr>"
"</table>");
} }
/*****************************************************************************/ /*****************************************************************************/
@ -249,7 +251,7 @@ void Cal_DrawCalendar (void)
/***** Draw several months *****/ /***** Draw several months *****/
/* Show form to change first day of week */ /* Show form to change first day of week */
if (!PrintView) if (!PrintView)
Cal_ShowIntegratedFormToSelFirstDayOfWeek (ActChgCal1stDay); Cal_ShowFormToSelFirstDayOfWeek (ActChgCal1stDay,"ICON25x25");
/* JavaScript will write HTML here */ /* JavaScript will write HTML here */
fprintf (Gbl.F.Out,"<div id=\"calendar\">" fprintf (Gbl.F.Out,"<div id=\"calendar\">"

2
swad_calendar.h
View File

@ -44,7 +44,7 @@
/*****************************************************************************/ /*****************************************************************************/
void Cal_PutIconsToSelectFirstDayOfWeek (void); void Cal_PutIconsToSelectFirstDayOfWeek (void);
void Cal_ShowIntegratedFormToSelFirstDayOfWeek (Act_Action_t Action); void Cal_ShowFormToSelFirstDayOfWeek (Act_Action_t Action,const char *ClassIcon);
void Cal_ChangeFirstDayOfWeek (void); void Cal_ChangeFirstDayOfWeek (void);
void Cal_DrawCurrentMonth (void); void Cal_DrawCurrentMonth (void);

3
swad_changelog.h
View File

@ -156,13 +156,14 @@
/****************************** Public constants *****************************/ /****************************** Public constants *****************************/
/*****************************************************************************/ /*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 16.48.1 (2016-11-07)" #define Log_PLATFORM_VERSION "SWAD 16.48.2 (2016-11-07)"
#define CSS_FILE "swad16.32.1.css" #define CSS_FILE "swad16.32.1.css"
#define JS_FILE "swad16.46.1.js" #define JS_FILE "swad16.46.1.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 16.48.2: Nov 07, 2016 Icon in preferences-first-day-of-week to show figure (statistics). (206433 lines)
Version 16.48.1: Nov 07, 2016 Icon in preferences-language to show figure (statistics). (206429 lines) Version 16.48.1: Nov 07, 2016 Icon in preferences-language to show figure (statistics). (206429 lines)
Version 16.48: Nov 07, 2016 Icon in messages to show figure (statistics). Version 16.48: Nov 07, 2016 Icon in messages to show figure (statistics).
Code refactoring in messages. (206418 lines) Code refactoring in messages. (206418 lines)

5
swad_timetable.c
View File

@ -275,8 +275,9 @@ void TT_ShowClassTimeTable (void)
ActSeeMyTT); ActSeeMyTT);
/***** Show form to change first day of week *****/ /***** Show form to change first day of week *****/
Cal_ShowIntegratedFormToSelFirstDayOfWeek (Gbl.TimeTable.Type == TT_COURSE_TIMETABLE ? ActChgCrsTT1stDay : Cal_ShowFormToSelFirstDayOfWeek (Gbl.TimeTable.Type == TT_COURSE_TIMETABLE ? ActChgCrsTT1stDay :
ActChgMyTT1stDay); ActChgMyTT1stDay,
"ICON25x25");
} }
/***** Show the time table *****/ /***** Show the time table *****/