diff --git a/swad_action.c b/swad_action.c index 562fee198..ead7be5c2 100644 --- a/swad_action.c +++ b/swad_action.c @@ -180,7 +180,6 @@ Institution: 84. ActSeeCtr List centres 85. ActSeeDpt List departments 86. ActSeePlc List places - 87. ActSeeHld List holidays 88. ActSeeCalIns Show the academic calendar 89. ActInsSch Search for courses, teachers, documents... @@ -218,6 +217,7 @@ Institution: 117. ActRenPlcSho Change short name of a place 118. ActRenPlcFul Change full name of a place + 87. ActSeeHld List holidays 119. ActEdiHld Edit holidays 120. ActNewHld Request the creation of a holiday 121. ActRemHld Remove a holiday @@ -1605,7 +1605,6 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = /* ActSeeCtr */{ 676, 2,TabIns,ActSeeCtr , 0, 0, 0, 0,0x1FF, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Ctr_ShowCtrsOfCurrentIns ,"house64x64.gif" }, /* ActSeeDpt */{ 675, 3,TabIns,ActSeeDpt , 0, 0, 0, 0,0x1FF, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Dpt_SeeDepts ,"houseteachers64x64.gif"}, /* ActSeePlc */{ 703, 4,TabIns,ActSeePlc , 0, 0, 0, 0,0x1FF, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Plc_SeePlaces ,"mapmarker64x64.png" }, - /* ActSeeHld */{ 707, 5,TabIns,ActSeeHld , 0, 0, 0, 0,0x1FF, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Hld_SeeHolidays ,"date64x64.gif" }, /* ActSeeCalIns */{1628, 6,TabIns,ActSeeCalIns , 0, 0, 0, 0,0x1FF, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Cal_DrawCalendarIns ,"date64x64.gif" }, // Actions not in menu: @@ -1644,14 +1643,15 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = /* ActRenPlcSho */{ 894,-1,TabUnk,ActSeePlc , 0, 0, 0, 0,0x100, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Plc_RenamePlaceShort ,NULL}, /* ActRenPlcFul */{ 895,-1,TabUnk,ActSeePlc , 0, 0, 0, 0,0x100, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Plc_RenamePlaceFull ,NULL}, - /* ActEdiHld */{ 713,-1,TabUnk,ActSeeHld , 0, 0, 0, 0,0x180, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Hld_EditHolidays ,NULL}, - /* ActNewHld */{ 714,-1,TabUnk,ActSeeHld , 0, 0, 0, 0,0x180, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Hld_RecFormNewHoliday ,NULL}, - /* ActRemHld */{ 716,-1,TabUnk,ActSeeHld , 0, 0, 0, 0,0x180, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Hld_RemoveHoliday ,NULL}, - /* ActChgHldPlc */{ 896,-1,TabUnk,ActSeeHld , 0, 0, 0, 0,0x180, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Hld_ChangeHolidayPlace ,NULL}, - /* ActChgHldTyp */{ 715,-1,TabUnk,ActSeeHld , 0, 0, 0, 0,0x180, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Hld_ChangeHolidayType ,NULL}, - /* ActChgHldStrDat */{ 717,-1,TabUnk,ActSeeHld , 0, 0, 0, 0,0x180, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Hld_ChangeStartDate ,NULL}, - /* ActChgHldEndDat */{ 718,-1,TabUnk,ActSeeHld , 0, 0, 0, 0,0x180, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Hld_ChangeEndDate ,NULL}, - /* ActRenHld */{ 766,-1,TabUnk,ActSeeHld , 0, 0, 0, 0,0x180, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Hld_RenameHoliday ,NULL}, + /* ActSeeHld */{ 707,-1,TabUnk,ActSeeCalIns , 0, 0, 0, 0,0x1FF, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Hld_SeeHolidays ,NULL}, + /* ActEdiHld */{ 713,-1,TabUnk,ActSeeCalIns , 0, 0, 0, 0,0x180, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Hld_EditHolidays ,NULL}, + /* ActNewHld */{ 714,-1,TabUnk,ActSeeCalIns , 0, 0, 0, 0,0x180, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Hld_RecFormNewHoliday ,NULL}, + /* ActRemHld */{ 716,-1,TabUnk,ActSeeCalIns , 0, 0, 0, 0,0x180, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Hld_RemoveHoliday ,NULL}, + /* ActChgHldPlc */{ 896,-1,TabUnk,ActSeeCalIns , 0, 0, 0, 0,0x180, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Hld_ChangeHolidayPlace ,NULL}, + /* ActChgHldTyp */{ 715,-1,TabUnk,ActSeeCalIns , 0, 0, 0, 0,0x180, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Hld_ChangeHolidayType ,NULL}, + /* ActChgHldStrDat */{ 717,-1,TabUnk,ActSeeCalIns , 0, 0, 0, 0,0x180, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Hld_ChangeStartDate ,NULL}, + /* ActChgHldEndDat */{ 718,-1,TabUnk,ActSeeCalIns , 0, 0, 0, 0,0x180, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Hld_ChangeEndDate ,NULL}, + /* ActRenHld */{ 766,-1,TabUnk,ActSeeCalIns , 0, 0, 0, 0,0x180, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Hld_RenameHoliday ,NULL}, /* ActPrnCalIns */{1629,-1,TabUnk,ActSeeCalIns , 0, 0, 0, 0,0x1FF, 0, 0,Act_CONT_NORM,Act_BLNK_WINDOW,NULL ,Cal_PrintCalendar ,NULL}, /* ActChgCalIns1stDay*/{1630,-1,TabUnk,ActSeeCalIns , 0, 0, 0, 0,0x1FF, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,Cal_ChangeFirstDayOfWeek ,Cal_DrawCalendarIns ,NULL}, diff --git a/swad_action.h b/swad_action.h index e2a634bcb..4f38d69d0 100644 --- a/swad_action.h +++ b/swad_action.h @@ -179,44 +179,44 @@ typedef signed int Act_Action_t; // Must be a signed type, because -1 is used to #define ActSeeCtr (ActChgCalCty1stDay + 3) #define ActSeeDpt (ActChgCalCty1stDay + 4) #define ActSeePlc (ActChgCalCty1stDay + 5) -#define ActSeeHld (ActChgCalCty1stDay + 6) -#define ActSeeCalIns (ActChgCalCty1stDay + 7) +#define ActSeeCalIns (ActChgCalCty1stDay + 6) // Secondary actions -#define ActInsSch (ActChgCalCty1stDay + 8) -#define ActPrnInsInf (ActChgCalCty1stDay + 9) -#define ActChgInsCtyCfg (ActChgCalCty1stDay + 10) -#define ActRenInsShoCfg (ActChgCalCty1stDay + 11) -#define ActRenInsFulCfg (ActChgCalCty1stDay + 12) -#define ActChgInsWWWCfg (ActChgCalCty1stDay + 13) -#define ActReqInsLog (ActChgCalCty1stDay + 14) -#define ActRecInsLog (ActChgCalCty1stDay + 15) -#define ActRemInsLog (ActChgCalCty1stDay + 16) +#define ActInsSch (ActChgCalCty1stDay + 7) +#define ActPrnInsInf (ActChgCalCty1stDay + 8) +#define ActChgInsCtyCfg (ActChgCalCty1stDay + 9) +#define ActRenInsShoCfg (ActChgCalCty1stDay + 10) +#define ActRenInsFulCfg (ActChgCalCty1stDay + 11) +#define ActChgInsWWWCfg (ActChgCalCty1stDay + 12) +#define ActReqInsLog (ActChgCalCty1stDay + 13) +#define ActRecInsLog (ActChgCalCty1stDay + 14) +#define ActRemInsLog (ActChgCalCty1stDay + 15) -#define ActEdiCtr (ActChgCalCty1stDay + 17) -#define ActReqCtr (ActChgCalCty1stDay + 18) -#define ActNewCtr (ActChgCalCty1stDay + 19) -#define ActRemCtr (ActChgCalCty1stDay + 20) -#define ActChgCtrPlc (ActChgCalCty1stDay + 21) -#define ActRenCtrSho (ActChgCalCty1stDay + 22) -#define ActRenCtrFul (ActChgCalCty1stDay + 23) -#define ActChgCtrWWW (ActChgCalCty1stDay + 24) -#define ActChgCtrSta (ActChgCalCty1stDay + 25) +#define ActEdiCtr (ActChgCalCty1stDay + 16) +#define ActReqCtr (ActChgCalCty1stDay + 17) +#define ActNewCtr (ActChgCalCty1stDay + 18) +#define ActRemCtr (ActChgCalCty1stDay + 19) +#define ActChgCtrPlc (ActChgCalCty1stDay + 20) +#define ActRenCtrSho (ActChgCalCty1stDay + 21) +#define ActRenCtrFul (ActChgCalCty1stDay + 22) +#define ActChgCtrWWW (ActChgCalCty1stDay + 23) +#define ActChgCtrSta (ActChgCalCty1stDay + 24) -#define ActEdiDpt (ActChgCalCty1stDay + 26) -#define ActNewDpt (ActChgCalCty1stDay + 27) -#define ActRemDpt (ActChgCalCty1stDay + 28) -#define ActChgDptIns (ActChgCalCty1stDay + 29) -#define ActRenDptSho (ActChgCalCty1stDay + 30) -#define ActRenDptFul (ActChgCalCty1stDay + 31) -#define ActChgDptWWW (ActChgCalCty1stDay + 32) +#define ActEdiDpt (ActChgCalCty1stDay + 25) +#define ActNewDpt (ActChgCalCty1stDay + 26) +#define ActRemDpt (ActChgCalCty1stDay + 27) +#define ActChgDptIns (ActChgCalCty1stDay + 28) +#define ActRenDptSho (ActChgCalCty1stDay + 29) +#define ActRenDptFul (ActChgCalCty1stDay + 30) +#define ActChgDptWWW (ActChgCalCty1stDay + 31) -#define ActEdiPlc (ActChgCalCty1stDay + 33) -#define ActNewPlc (ActChgCalCty1stDay + 34) -#define ActRemPlc (ActChgCalCty1stDay + 35) -#define ActRenPlcSho (ActChgCalCty1stDay + 36) -#define ActRenPlcFul (ActChgCalCty1stDay + 37) +#define ActEdiPlc (ActChgCalCty1stDay + 32) +#define ActNewPlc (ActChgCalCty1stDay + 33) +#define ActRemPlc (ActChgCalCty1stDay + 34) +#define ActRenPlcSho (ActChgCalCty1stDay + 35) +#define ActRenPlcFul (ActChgCalCty1stDay + 36) +#define ActSeeHld (ActChgCalCty1stDay + 37) #define ActEdiHld (ActChgCalCty1stDay + 38) #define ActNewHld (ActChgCalCty1stDay + 39) #define ActRemHld (ActChgCalCty1stDay + 40) diff --git a/swad_changelog.h b/swad_changelog.h index 6d4eca7c4..6c66d6ced 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -209,13 +209,14 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 16.166.2 (2017-03-24)" +#define Log_PLATFORM_VERSION "SWAD 16.167 (2017-03-24)" #define CSS_FILE "swad16.166.css" #define JS_FILE "swad16.144.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 16.167: Mar 25, 2017 Holidays removed from main manu. (217589 lines) Version 16.166.2: Mar 25, 2017 Contextual link to edit holidays in calendar. (217628 lines) Version 16.166.1: Mar 25, 2017 Contextual link to holidays in calendar. (217630 lines) Version 16.166: Mar 24, 2017 Changes in layout related with institutional links. diff --git a/swad_menu.c b/swad_menu.c index 8ca5930aa..f391e8a54 100644 --- a/swad_menu.c +++ b/swad_menu.c @@ -120,8 +120,8 @@ const Act_Action_t Mnu_MenuActions[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB ActSeeCtr, // 2 ActSeeDpt, // 3 ActSeePlc, // 4 - ActSeeHld, // 5 - ActSeeCalIns, // 6 + ActSeeCalIns, // 5 + 0, // 6 0, // 7 0, // 8 0, // 9 diff --git a/swad_text.c b/swad_text.c index 0791a97d9..2965e9735 100644 --- a/swad_text.c +++ b/swad_text.c @@ -18467,28 +18467,7 @@ const char *Txt_MENU_TITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = "Localizaçoes" #endif , - // 5: ActSeeHld -#if L==1 - "Festius" -#elif L==2 - "Feiertage" -#elif L==3 - "Holidays" -#elif L==4 - "Festivos" -#elif L==5 - "Fériés" -#elif L==6 - "Arete" -#elif L==7 - "Vacanze" -#elif L==8 - "Noclegi" -#elif L==9 - "Férias" -#endif - , - // 6: ActSeeCalIns + // 5: ActSeeCalIns #if L==1 "Calendari" #elif L==2 @@ -18509,6 +18488,7 @@ const char *Txt_MENU_TITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = "Calendário" #endif , + NULL, // 6 NULL, // 7 NULL, // 8 NULL, // 9 @@ -20460,28 +20440,7 @@ const char *Txt_MENU_SUBTITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = "Localizaçoes" #endif , - // 5: ActSeeHld -#if L==1 - "Dies festius i períodes no lectius d'aquesta institució" -#elif L==2 - "Urlaub und vorlesungsfreie Zeit" -#elif L==3 - "Holidays and non school days of this institution" -#elif L==4 - "Días festivos y períodos no lectivos de esta institución" -#elif L==5 - "Jours fériés et sans école" -#elif L==6 - "Días festivos y períodos no lectivos de esta institución" // Okoteve traducción -#elif L==7 - "Festività e giorni senza lezione" -#elif L==8 - "Noclegi i innych dni zajec szkolnych" -#elif L==9 - "Feriados e dias sem escola" -#endif - , - // 6: ActSeeCalIns + // 5: ActSeeCalIns #if L==1 "Calendari acadèmic" #elif L==2 @@ -20493,7 +20452,7 @@ const char *Txt_MENU_SUBTITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = #elif L==5 "Calendrier" #elif L==6 - "Calendario académico"// Okoteve traducción + "Calendario académico" // Okoteve traducción #elif L==7 "Calendario del corso" #elif L==8 @@ -20502,6 +20461,7 @@ const char *Txt_MENU_SUBTITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] = "Calendário" #endif , + NULL, // 6 NULL, // 7 NULL, // 8 NULL, // 9