Version 14.52.1

This commit is contained in:
Antonio Cañas Vargas 2015-01-02 14:21:26 +01:00
parent bc48634239
commit 6b071d820d
3 changed files with 43 additions and 8 deletions

View File

@ -35,11 +35,12 @@
/****************************** Public constants *****************************/ /****************************** 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: // 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 // 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.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.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) Version 14.51.1 :Jan 02, 2014 Changes in layout and titles of some options. (172963 lines)

View File

@ -306,6 +306,7 @@ void Dat_DrawCalendar (void)
void Dat_DrawMonth (unsigned RealYear,unsigned RealMonth, void Dat_DrawMonth (unsigned RealYear,unsigned RealMonth,
bool DrawingCalendar,bool PutLinkToEvents,bool PrintView) bool DrawingCalendar,bool PutLinkToEvents,bool PrintView)
{ {
extern const char *Txt_Show_calendar;
extern const char *Txt_DAYS_CAPS[7]; extern const char *Txt_DAYS_CAPS[7];
extern const char *Txt_MONTHS_CAPS[12]; extern const char *Txt_MONTHS_CAPS[12];
extern const char *Txt_Exam_of_X; extern const char *Txt_Exam_of_X;
@ -323,6 +324,7 @@ void Dat_DrawMonth (unsigned RealYear,unsigned RealMonth,
unsigned NumExamAnnouncement; // Number of exam announcement unsigned NumExamAnnouncement; // Number of exam announcement
int ResultOfCmpStartDate; int ResultOfCmpStartDate;
bool ContinueSearching; bool ContinueSearching;
bool PutLinkToCalendar = !DrawingCalendar && Gbl.CurrentCrs.Crs.CrsCod > 0;
bool ThisDayHasEvent = false; bool ThisDayHasEvent = false;
bool IsToday; bool IsToday;
@ -353,15 +355,25 @@ void Dat_DrawMonth (unsigned RealYear,unsigned RealMonth,
} }
/***** Start of month *****/ /***** Start of month *****/
fprintf (Gbl.F.Out,"<div class=\"MONTH_CONTAINER\">" fprintf (Gbl.F.Out,"<div class=\"MONTH_CONTAINER\">");
"<div class=\"MONTH\">"
"%s %u" /***** Month name *****/
"</div>" fprintf (Gbl.F.Out,"<div class=\"MONTH\">");
"<table class=\"MONTH_TABLE_DAYS\">", if (PutLinkToCalendar)
{
Act_FormStart (ActSeeCal);
Act_LinkFormSubmit (Txt_Show_calendar,"MONTH");
}
fprintf (Gbl.F.Out,"%s %u",
Txt_MONTHS_CAPS[RealMonth-1],RealYear); Txt_MONTHS_CAPS[RealMonth-1],RealYear);
if (PutLinkToCalendar)
fprintf (Gbl.F.Out,"</a>"
"</form>");
fprintf (Gbl.F.Out,"</div>");
/***** Month head: first letter for each day of week *****/ /***** Month head: first letter for each day of week *****/
fprintf (Gbl.F.Out,"<tr>"); fprintf (Gbl.F.Out,"<table class=\"MONTH_TABLE_DAYS\">"
"<tr>");
for (DayOfWeek = 0; for (DayOfWeek = 0;
DayOfWeek < 7; DayOfWeek < 7;
DayOfWeek++) DayOfWeek++)
@ -489,7 +501,8 @@ void Dat_DrawMonth (unsigned RealYear,unsigned RealMonth,
/* If day has an exam announcement */ /* If day has an exam announcement */
if (PutLinkToEvents && ThisDayHasEvent) if (PutLinkToEvents && ThisDayHasEvent)
fprintf (Gbl.F.Out,"</a></td>" fprintf (Gbl.F.Out,"</a>"
"</td>"
"</tr>" "</tr>"
"</table>" "</table>"
"</form>"); "</form>");

View File

@ -33256,6 +33256,27 @@ const char *Txt_Show_anyway =
"Mostrar de qualquer maneira"; "Mostrar de qualquer maneira";
#endif #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&zdot; kalendarz";
#elif L==8
"Mostrar calend&aacute;rio";
#endif
const char *Txt_Show_left_column = const char *Txt_Show_left_column =
#if L==0 #if L==0
"Mostrar columna izquierda"; // Necessita traduccio "Mostrar columna izquierda"; // Necessita traduccio