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

Version 16.167.3

Browse Source
This commit is contained in:
Antonio Cañas Vargas 2017-03-25 22:34:15 +01:00
parent c2af18443b
commit 2ddb854187
4 changed files with 143 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
swad_calendar.c
View File

@ -348,7 +348,7 @@ static void Cal_PutIconToPrintCalendarSys (void)
{ {
extern const char *Txt_Print; extern const char *Txt_Print;
/* Print calendar */ /***** Print calendar *****/
Lay_PutContextualLink (ActPrnCalSys,NULL, Lay_PutContextualLink (ActPrnCalSys,NULL,
"print64x64.png", "print64x64.png",
Txt_Print,NULL, Txt_Print,NULL,
@ -359,7 +359,7 @@ static void Cal_PutIconToPrintCalendarCty (void)
{ {
extern const char *Txt_Print; extern const char *Txt_Print;
/* Print calendar */ /***** Print calendar *****/
Lay_PutContextualLink (ActPrnCalCty,NULL, Lay_PutContextualLink (ActPrnCalCty,NULL,
"print64x64.png", "print64x64.png",
Txt_Print,NULL, Txt_Print,NULL,
@ -371,30 +371,26 @@ static void Cal_PutIconToPrintCalendarIns (void)
extern const char *Txt_Print; extern const char *Txt_Print;
extern const char *Txt_Holidays; extern const char *Txt_Holidays;
/* Print calendar */ /***** Print calendar *****/
Lay_PutContextualLink (ActPrnCalIns,NULL, Lay_PutContextualLink (ActPrnCalIns,NULL,
"print64x64.png", "print64x64.png",
Txt_Print,NULL, Txt_Print,NULL,
NULL); NULL);
/* View / edit holidays */ /***** View holidays *****/
if (Gbl.Hlds.Num) // There are holidays if (Gbl.Hlds.Num || // There are holidays
Gbl.Usrs.Me.LoggedRole >= Rol_INS_ADM) // Institution admin or system admin
Lay_PutContextualLink (ActSeeHld,NULL, Lay_PutContextualLink (ActSeeHld,NULL,
"holiday64x64.png", "holiday64x64.png",
Txt_Holidays,NULL, Txt_Holidays,NULL,
NULL); NULL);
else if (Gbl.Usrs.Me.LoggedRole >= Rol_INS_ADM) // Institution admin or system admin
Lay_PutContextualLink (ActEdiHld,NULL,
"holiday64x64.png",
Txt_Holidays,NULL,
NULL);
} }
static void Cal_PutIconToPrintCalendarCtr (void) static void Cal_PutIconToPrintCalendarCtr (void)
{ {
extern const char *Txt_Print; extern const char *Txt_Print;
/* Print calendar */ /***** Print calendar *****/
Lay_PutContextualLink (ActPrnCalCtr,NULL, Lay_PutContextualLink (ActPrnCalCtr,NULL,
"print64x64.png", "print64x64.png",
Txt_Print,NULL, Txt_Print,NULL,
@ -405,7 +401,7 @@ static void Cal_PutIconToPrintCalendarDeg (void)
{ {
extern const char *Txt_Print; extern const char *Txt_Print;
/* Print calendar */ /***** Print calendar *****/
Lay_PutContextualLink (ActPrnCalDeg,NULL, Lay_PutContextualLink (ActPrnCalDeg,NULL,
"print64x64.png", "print64x64.png",
Txt_Print,NULL, Txt_Print,NULL,
@ -416,7 +412,7 @@ static void Cal_PutIconToPrintCalendarCrs (void)
{ {
extern const char *Txt_Print; extern const char *Txt_Print;
/* Print calendar */ /***** Print calendar *****/
Lay_PutContextualLink (ActPrnCalCrs,NULL, Lay_PutContextualLink (ActPrnCalCrs,NULL,
"print64x64.png", "print64x64.png",
Txt_Print,NULL, Txt_Print,NULL,

3
swad_changelog.h
View File

@ -209,13 +209,14 @@
/****************************** Public constants *****************************/ /****************************** Public constants *****************************/
/*****************************************************************************/ /*****************************************************************************/
#define Log_PLATFORM_VERSION "SWAD 16.167.2 (2017-03-24)" #define Log_PLATFORM_VERSION "SWAD 16.167.3 (2017-03-24)"
#define CSS_FILE "swad16.166.css" #define CSS_FILE "swad16.166.css"
#define JS_FILE "swad16.144.js" #define JS_FILE "swad16.144.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.167.3: Mar 25, 2017 Changes in edition of holidays. (217632 lines)
Version 16.167.2: Mar 25, 2017 Contextual link to holidays is changed to a left-top contextual icon. (217577 lines) Version 16.167.2: Mar 25, 2017 Contextual link to holidays is changed to a left-top contextual icon. (217577 lines)
Version 16.167.1: Mar 25, 2017 Changes in icons related to calendar and holidays. (217595 lines) Version 16.167.1: Mar 25, 2017 Changes in icons related to calendar and holidays. (217595 lines)
Copy the following icons to icon public directory: Copy the following icons to icon public directory:

151
swad_holiday.c
View File

@ -84,6 +84,9 @@ void Hld_SeeHolidays (void)
extern const char *Txt_End_date; extern const char *Txt_End_date;
extern const char *Txt_Holiday; extern const char *Txt_Holiday;
extern const char *Txt_All_places; extern const char *Txt_All_places;
extern const char *Txt_There_are_no_holidays;
extern const char *Txt_Create_another_holiday;
extern const char *Txt_Create_holiday;
Hld_Order_t Order; Hld_Order_t Order;
unsigned NumHld; unsigned NumHld;
@ -96,75 +99,91 @@ void Hld_SeeHolidays (void)
Hld_GetListHolidays (); Hld_GetListHolidays ();
/***** Table head *****/ /***** Table head *****/
Lay_StartRoundFrameTable (NULL,Txt_Holidays, Lay_StartRoundFrame (NULL,Txt_Holidays,
Gbl.Usrs.Me.LoggedRole >= Rol_INS_ADM ? Hld_PutIconToEditHlds : Gbl.Usrs.Me.LoggedRole >= Rol_INS_ADM ? Hld_PutIconToEditHlds :
NULL, NULL,
Hlp_INSTITUTION_Holidays,2); Hlp_INSTITUTION_Holidays);
fprintf (Gbl.F.Out,"<tr>"); if (Gbl.Hlds.Num)
for (Order = Hld_ORDER_BY_PLACE; {
Order <= Hld_ORDER_BY_START_DATE; fprintf (Gbl.F.Out,"<table class=\"FRAME_TBL_MARGIN CELLS_PAD_2\">"
Order++) "<tr>");
{ for (Order = Hld_ORDER_BY_PLACE;
fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\">"); Order <= Hld_ORDER_BY_START_DATE;
Act_FormStart (ActSeeHld); Order++)
Par_PutHiddenParamUnsigned ("Order",(unsigned) Order);
Act_LinkFormSubmit (Txt_HOLIDAYS_HELP_ORDER[Order],"TIT_TBL",NULL);
if (Order == Gbl.Hlds.SelectedOrder)
fprintf (Gbl.F.Out,"<u>");
fprintf (Gbl.F.Out,"%s",Txt_HOLIDAYS_ORDER[Order]);
if (Order == Gbl.Hlds.SelectedOrder)
fprintf (Gbl.F.Out,"</u>");
fprintf (Gbl.F.Out,"</a>");
Act_FormEnd ();
fprintf (Gbl.F.Out,"</th>");
}
fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\">"
"&nbsp;%s&nbsp;"
"</th>"
"<th class=\"LEFT_MIDDLE\">"
"%s"
"</th>"
"</tr>",
Txt_End_date,
Txt_Holiday);
/***** Write all the holidays *****/
for (NumHld = 0;
NumHld < Gbl.Hlds.Num;
NumHld++)
{
/* Write data of this holiday */
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"DAT LEFT_MIDDLE\">"
"%s"
"</td>",
Gbl.Hlds.Lst[NumHld].PlcCod <= 0 ? Txt_All_places :
Gbl.Hlds.Lst[NumHld].PlaceFullName);
fprintf (Gbl.F.Out,"<td class=\"DAT LEFT_MIDDLE\">"
"&nbsp;%04u-%02u-%02u"
"</td>",
Gbl.Hlds.Lst[NumHld].StartDate.Year,
Gbl.Hlds.Lst[NumHld].StartDate.Month,
Gbl.Hlds.Lst[NumHld].StartDate.Day);
fprintf (Gbl.F.Out,"<td class=\"DAT LEFT_MIDDLE\">"
"&nbsp;");
switch (Gbl.Hlds.Lst[NumHld].HldTyp)
{ {
case Hld_HOLIDAY: fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\">");
break; Act_FormStart (ActSeeHld);
case Hld_NON_SCHOOL_PERIOD: Par_PutHiddenParamUnsigned ("Order",(unsigned) Order);
fprintf (Gbl.F.Out,"%04u-%02u-%02u", Act_LinkFormSubmit (Txt_HOLIDAYS_HELP_ORDER[Order],"TIT_TBL",NULL);
Gbl.Hlds.Lst[NumHld].EndDate.Year, if (Order == Gbl.Hlds.SelectedOrder)
Gbl.Hlds.Lst[NumHld].EndDate.Month, fprintf (Gbl.F.Out,"<u>");
Gbl.Hlds.Lst[NumHld].EndDate.Day); fprintf (Gbl.F.Out,"%s",Txt_HOLIDAYS_ORDER[Order]);
break; if (Order == Gbl.Hlds.SelectedOrder)
fprintf (Gbl.F.Out,"</u>");
fprintf (Gbl.F.Out,"</a>");
Act_FormEnd ();
fprintf (Gbl.F.Out,"</th>");
} }
fprintf (Gbl.F.Out,"</td>" fprintf (Gbl.F.Out,"<th class=\"LEFT_MIDDLE\">"
"<td class=\"DAT LEFT_MIDDLE\">" "&nbsp;%s&nbsp;"
"&nbsp;%s" "</th>"
"</td>" "<th class=\"LEFT_MIDDLE\">"
"%s"
"</th>"
"</tr>", "</tr>",
Gbl.Hlds.Lst[NumHld].Name); Txt_End_date,
Txt_Holiday);
/***** Write all the holidays *****/
for (NumHld = 0;
NumHld < Gbl.Hlds.Num;
NumHld++)
{
/* Write data of this holiday */
fprintf (Gbl.F.Out,"<tr>"
"<td class=\"DAT LEFT_MIDDLE\">"
"%s"
"</td>",
Gbl.Hlds.Lst[NumHld].PlcCod <= 0 ? Txt_All_places :
Gbl.Hlds.Lst[NumHld].PlaceFullName);
fprintf (Gbl.F.Out,"<td class=\"DAT LEFT_MIDDLE\">"
"&nbsp;%04u-%02u-%02u"
"</td>",
Gbl.Hlds.Lst[NumHld].StartDate.Year,
Gbl.Hlds.Lst[NumHld].StartDate.Month,
Gbl.Hlds.Lst[NumHld].StartDate.Day);
fprintf (Gbl.F.Out,"<td class=\"DAT LEFT_MIDDLE\">"
"&nbsp;");
switch (Gbl.Hlds.Lst[NumHld].HldTyp)
{
case Hld_HOLIDAY:
break;
case Hld_NON_SCHOOL_PERIOD:
fprintf (Gbl.F.Out,"%04u-%02u-%02u",
Gbl.Hlds.Lst[NumHld].EndDate.Year,
Gbl.Hlds.Lst[NumHld].EndDate.Month,
Gbl.Hlds.Lst[NumHld].EndDate.Day);
break;
}
fprintf (Gbl.F.Out,"</td>"
"<td class=\"DAT LEFT_MIDDLE\">"
"&nbsp;%s"
"</td>"
"</tr>",
Gbl.Hlds.Lst[NumHld].Name);
}
fprintf (Gbl.F.Out,"</table>");
}
else // No holidays created in the current institution
Lay_ShowAlert (Lay_INFO,Txt_There_are_no_holidays);
/***** Button to create centre *****/
if (Gbl.Usrs.Me.LoggedRole >= Rol_INS_ADM) // Institution admin or system admin
{
Act_FormStart (ActEdiHld);
Lay_PutConfirmButton (Gbl.Hlds.Num ? Txt_Create_another_holiday :
Txt_Create_holiday);
Act_FormEnd ();
} }
/***** End table *****/ /***** End table *****/

52
swad_text.c
View File

@ -6155,6 +6155,27 @@ const char *Txt_Create_another_degree =
"Criar uma outra titula&ccedil;&atilde;o"; "Criar uma outra titula&ccedil;&atilde;o";
#endif #endif
const char *Txt_Create_another_holiday =
#if L==1
"Crear una altra festivitat";
#elif L==2
"Erstellen Sie ein anderes Feiertag";
#elif L==3
"Create another holiday";
#elif L==4
"Crear otra festividad";
#elif L==5
"Cr&eacute;er un autre f&ecirc;te";
#elif L==6
"Crear otra festividad"; // Okoteve traducción
#elif L==7
"Crea una altra festivit&agrave;";
#elif L==8
"Tworzenie inny wakacje";
#elif L==9
"Criar uma outra f&eacute;ria";
#endif
const char *Txt_Create_another_institution = const char *Txt_Create_another_institution =
#if L==1 #if L==1
"Crear una altra instituci&oacute;"; "Crear una altra instituci&oacute;";
@ -6451,7 +6472,7 @@ const char *Txt_Create_group =
const char *Txt_Create_holiday = const char *Txt_Create_holiday =
#if L==1 #if L==1
"Crear festividad"; // Necessita traduccio "Crear festivitat";
#elif L==2 #elif L==2
"Feiertag eingeben"; "Feiertag eingeben";
#elif L==3 #elif L==3
@ -46941,21 +46962,42 @@ const char *Txt_There_are_no_email_domains =
#if L==1 #if L==1
"No existen dominios de correo para notificaciones."; // Necessita traduccio "No existen dominios de correo para notificaciones."; // Necessita traduccio
#elif L==2 #elif L==2
"There are no email domains for notifications."; // Need Übersetzung "There are no email domains for notifications."; // Need Übersetzung
#elif L==3 #elif L==3
"There are no email domains for notifications."; "There are no email domains for notifications.";
#elif L==4 #elif L==4
"No existen dominios de correo para notificaciones."; "No existen dominios de correo para notificaciones.";
#elif L==5 #elif L==5
"There are no email domains for notifications."; // Besoin de traduction "There are no email domains for notifications."; // Besoin de traduction
#elif L==6 #elif L==6
"No existen dominios de correo para notificaciones."; // Okoteve traducción "No existen dominios de correo para notificaciones."; // Okoteve traducción
#elif L==7 #elif L==7
"Non ci sono campi mail per le notifiche."; "Non ci sono campi mail per le notifiche.";
#elif L==8 #elif L==8
"There are no email domains for notifications."; // Potrzebujesz tlumaczenie "There are no email domains for notifications."; // Potrzebujesz tlumaczenie
#elif L==9 #elif L==9
"There are no email domains for notifications."; // Necessita de tradução "There are no email domains for notifications."; // Necessita de tradução
#endif
const char *Txt_There_are_no_holidays =
#if L==1
"No existen d&iacute;as festivos."; // Necessita traduccio
#elif L==2
"There are no holidays."; // Need Übersetzung
#elif L==3
"There are no holidays.";
#elif L==4
"No existen d&iacute;as festivos.";
#elif L==5
"There are no holidays."; // Besoin de traduction
#elif L==6
"No existen d&iacute;as festivos."; // Okoteve traducción
#elif L==7
"Non ci sono festivit&agrave;.";
#elif L==8
"There are no holidays."; // Potrzebujesz tlumaczenie
#elif L==9
"There are no holidays."; // Necessita de tradução
#endif #endif
const char *Txt_There_are_no_links = const char *Txt_There_are_no_links =