From 6b071d820df15a74f220e46c1ccff004c43409bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Fri, 2 Jan 2015 14:21:26 +0100 Subject: [PATCH] Version 14.52.1 --- swad_changelog.h | 3 ++- swad_date.c | 27 ++++++++++++++++++++------- swad_text.c | 21 +++++++++++++++++++++ 3 files changed, 43 insertions(+), 8 deletions(-) diff --git a/swad_changelog.h b/swad_changelog.h index 7b655bb54..bc7cd4daa 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -35,11 +35,12 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 14.52 (2015/01/02)" +#define Log_PLATFORM_VERSION "SWAD 14.52.1 (2015/01/02)" // 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 | tail -1 /* + Version 14.52.1 :Jan 02, 2014 Link to calendar in name of month. (173021 lines) Version 14.52 :Jan 02, 2014 Calendar is moved from course tab to assessment tab. (? lines) Version 14.51.2 :Jan 02, 2014 Changes in layout and titles of some options. (172987 lines) Version 14.51.1 :Jan 02, 2014 Changes in layout and titles of some options. (172963 lines) diff --git a/swad_date.c b/swad_date.c index cad82608e..179bc6b43 100644 --- a/swad_date.c +++ b/swad_date.c @@ -306,6 +306,7 @@ void Dat_DrawCalendar (void) void Dat_DrawMonth (unsigned RealYear,unsigned RealMonth, bool DrawingCalendar,bool PutLinkToEvents,bool PrintView) { + extern const char *Txt_Show_calendar; extern const char *Txt_DAYS_CAPS[7]; extern const char *Txt_MONTHS_CAPS[12]; extern const char *Txt_Exam_of_X; @@ -323,6 +324,7 @@ void Dat_DrawMonth (unsigned RealYear,unsigned RealMonth, unsigned NumExamAnnouncement; // Number of exam announcement int ResultOfCmpStartDate; bool ContinueSearching; + bool PutLinkToCalendar = !DrawingCalendar && Gbl.CurrentCrs.Crs.CrsCod > 0; bool ThisDayHasEvent = false; bool IsToday; @@ -353,15 +355,25 @@ void Dat_DrawMonth (unsigned RealYear,unsigned RealMonth, } /***** Start of month *****/ - fprintf (Gbl.F.Out,"
" - "
" - "%s %u" - "
" - "", + fprintf (Gbl.F.Out,"
"); + + /***** Month name *****/ + fprintf (Gbl.F.Out,"
"); + if (PutLinkToCalendar) + { + Act_FormStart (ActSeeCal); + Act_LinkFormSubmit (Txt_Show_calendar,"MONTH"); + } + fprintf (Gbl.F.Out,"%s %u", Txt_MONTHS_CAPS[RealMonth-1],RealYear); + if (PutLinkToCalendar) + fprintf (Gbl.F.Out,"" + ""); + fprintf (Gbl.F.Out,"
"); /***** Month head: first letter for each day of week *****/ - fprintf (Gbl.F.Out,"
"); + fprintf (Gbl.F.Out,"
" + ""); for (DayOfWeek = 0; DayOfWeek < 7; DayOfWeek++) @@ -489,7 +501,8 @@ void Dat_DrawMonth (unsigned RealYear,unsigned RealMonth, /* If day has an exam announcement */ if (PutLinkToEvents && ThisDayHasEvent) - fprintf (Gbl.F.Out,"" + fprintf (Gbl.F.Out,"" + "" "" "
" ""); diff --git a/swad_text.c b/swad_text.c index d4f5ee185..f69b8955d 100644 --- a/swad_text.c +++ b/swad_text.c @@ -33256,6 +33256,27 @@ const char *Txt_Show_anyway = "Mostrar de qualquer maneira"; #endif +const char *Txt_Show_calendar = +#if L==0 + "Mostra calendari"; +#elif L==1 + "Kalender anzeigen"; +#elif L==2 + "Show calendar"; +#elif L==3 + "Ver calendario"; +#elif L==4 + "Afficher calendrier"; +#elif L==5 + "Ver calendario"; // Okoteve traducción +#elif L==6 + "Mostra calendario"; +#elif L==7 + "Pokaż kalendarz"; +#elif L==8 + "Mostrar calendário"; +#endif + const char *Txt_Show_left_column = #if L==0 "Mostrar columna izquierda"; // Necessita traduccio