mirror of https://github.com/acanas/swad-core.git
Version 16.168
This commit is contained in:
Antonio Cañas Vargas
parent
213f51d576
commit
e56d6388d9
|
|
@ -179,7 +179,6 @@ Institution:
|
|||
83. ActSeeInsInf Show information on the current institution
|
||||
84. ActSeeCtr List centres
|
||||
85. ActSeeDpt List departments
|
||||
86. ActSeePlc List places
|
||||
88. ActSeeCalIns Show the academic calendar
|
||||
|
||||
89. ActInsSch Search for courses, teachers, documents...
|
||||
|
|
@ -211,6 +210,7 @@ Institution:
|
|||
112. ActRenDptFul Change full name department
|
||||
113. ActChgDptWWW Change web of department
|
||||
|
||||
86. ActSeePlc List places
|
||||
114. ActEdiPlc Edit places
|
||||
115. ActNewPlc Request the creation of a place
|
||||
116. ActRemPlc Remove a place
|
||||
|
|
@ -1604,8 +1604,7 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] =
|
|||
/* ActSeeInsInf */{1153, 1,TabIns,ActSeeInsInf , 0, 0, 0, 0,0x1FF, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Ins_ShowConfiguration ,"info64x64.gif" },
|
||||
/* 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" },
|
||||
/* ActSeeCalIns */{1628, 6,TabIns,ActSeeCalIns , 0, 0, 0, 0,0x1FF, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Cal_DrawCalendarIns ,"calendar64x64.png" },
|
||||
/* ActSeeCalIns */{1628, 4,TabIns,ActSeeCalIns , 0, 0, 0, 0,0x1FF, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Cal_DrawCalendarIns ,"calendar64x64.png" },
|
||||
|
||||
// Actions not in menu:
|
||||
/* ActInsSch */{1182,-1,TabUnk,ActInsReqSch , 0, 0, 0, 0,0x1FF, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,Sch_GetParamsSearch ,Sch_InsSearch ,NULL},
|
||||
|
|
@ -1629,6 +1628,13 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] =
|
|||
/* ActChgCtrWWW */{ 683,-1,TabUnk,ActSeeCtr , 0, 0, 0, 0,0x1FE, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Ctr_ChangeCtrWWW ,NULL},
|
||||
/* ActChgCtrSta */{1209,-1,TabUnk,ActSeeCtr , 0, 0, 0, 0,0x180, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Ctr_ChangeCtrStatus ,NULL},
|
||||
|
||||
/* ActSeePlc */{ 703,-1,TabUnk,ActSeeCtr , 0, 0, 0, 0,0x1FF, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Plc_SeePlaces ,NULL},
|
||||
/* ActEdiPlc */{ 704,-1,TabUnk,ActSeeCtr , 0, 0, 0, 0,0x100, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Plc_EditPlaces ,NULL},
|
||||
/* ActNewPlc */{ 705,-1,TabUnk,ActSeeCtr , 0, 0, 0, 0,0x100, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Plc_RecFormNewPlace ,NULL},
|
||||
/* ActRemPlc */{ 776,-1,TabUnk,ActSeeCtr , 0, 0, 0, 0,0x100, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Plc_RemovePlace ,NULL},
|
||||
/* ActRenPlcSho */{ 894,-1,TabUnk,ActSeeCtr , 0, 0, 0, 0,0x100, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Plc_RenamePlaceShort ,NULL},
|
||||
/* ActRenPlcFul */{ 895,-1,TabUnk,ActSeeCtr , 0, 0, 0, 0,0x100, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Plc_RenamePlaceFull ,NULL},
|
||||
|
||||
/* ActEdiDpt */{ 677,-1,TabUnk,ActSeeDpt , 0, 0, 0, 0,0x100, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Dpt_EditDepartments ,NULL},
|
||||
/* ActNewDpt */{ 687,-1,TabUnk,ActSeeDpt , 0, 0, 0, 0,0x100, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Dpt_RecFormNewDpt ,NULL},
|
||||
/* ActRemDpt */{ 690,-1,TabUnk,ActSeeDpt , 0, 0, 0, 0,0x100, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Dpt_RemoveDepartment ,NULL},
|
||||
|
|
@ -1637,12 +1643,6 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] =
|
|||
/* ActRenDptFul */{ 689,-1,TabUnk,ActSeeDpt , 0, 0, 0, 0,0x100, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Dpt_RenameDepartFull ,NULL},
|
||||
/* ActChgDptWWW */{ 691,-1,TabUnk,ActSeeDpt , 0, 0, 0, 0,0x100, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Dpt_ChangeDptWWW ,NULL},
|
||||
|
||||
/* ActEdiPlc */{ 704,-1,TabUnk,ActSeePlc , 0, 0, 0, 0,0x100, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Plc_EditPlaces ,NULL},
|
||||
/* ActNewPlc */{ 705,-1,TabUnk,ActSeePlc , 0, 0, 0, 0,0x100, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Plc_RecFormNewPlace ,NULL},
|
||||
/* ActRemPlc */{ 776,-1,TabUnk,ActSeePlc , 0, 0, 0, 0,0x100, 0, 0,Act_CONT_NORM,Act_THIS_WINDOW,NULL ,Plc_RemovePlace ,NULL},
|
||||
/* 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},
|
||||
|
||||
/* 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,Hld_RecFormNewHoliday1 ,Hld_RecFormNewHoliday2 ,NULL},
|
||||
|
|
|
|||
|
|
@ -178,43 +178,43 @@ typedef signed int Act_Action_t; // Must be a signed type, because -1 is used to
|
|||
#define ActSeeInsInf (ActChgCalCty1stDay + 2)
|
||||
#define ActSeeCtr (ActChgCalCty1stDay + 3)
|
||||
#define ActSeeDpt (ActChgCalCty1stDay + 4)
|
||||
#define ActSeePlc (ActChgCalCty1stDay + 5)
|
||||
#define ActSeeCalIns (ActChgCalCty1stDay + 6)
|
||||
#define ActSeeCalIns (ActChgCalCty1stDay + 5)
|
||||
|
||||
// Secondary actions
|
||||
#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 ActInsSch (ActChgCalCty1stDay + 6)
|
||||
#define ActPrnInsInf (ActChgCalCty1stDay + 7)
|
||||
#define ActChgInsCtyCfg (ActChgCalCty1stDay + 8)
|
||||
#define ActRenInsShoCfg (ActChgCalCty1stDay + 9)
|
||||
#define ActRenInsFulCfg (ActChgCalCty1stDay + 10)
|
||||
#define ActChgInsWWWCfg (ActChgCalCty1stDay + 11)
|
||||
#define ActReqInsLog (ActChgCalCty1stDay + 12)
|
||||
#define ActRecInsLog (ActChgCalCty1stDay + 13)
|
||||
#define ActRemInsLog (ActChgCalCty1stDay + 14)
|
||||
|
||||
#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 ActEdiCtr (ActChgCalCty1stDay + 15)
|
||||
#define ActReqCtr (ActChgCalCty1stDay + 16)
|
||||
#define ActNewCtr (ActChgCalCty1stDay + 17)
|
||||
#define ActRemCtr (ActChgCalCty1stDay + 18)
|
||||
#define ActChgCtrPlc (ActChgCalCty1stDay + 19)
|
||||
#define ActRenCtrSho (ActChgCalCty1stDay + 20)
|
||||
#define ActRenCtrFul (ActChgCalCty1stDay + 21)
|
||||
#define ActChgCtrWWW (ActChgCalCty1stDay + 22)
|
||||
#define ActChgCtrSta (ActChgCalCty1stDay + 23)
|
||||
|
||||
#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 ActSeePlc (ActChgCalCty1stDay + 24)
|
||||
#define ActEdiPlc (ActChgCalCty1stDay + 25)
|
||||
#define ActNewPlc (ActChgCalCty1stDay + 26)
|
||||
#define ActRemPlc (ActChgCalCty1stDay + 27)
|
||||
#define ActRenPlcSho (ActChgCalCty1stDay + 28)
|
||||
#define ActRenPlcFul (ActChgCalCty1stDay + 29)
|
||||
|
||||
#define ActEdiPlc (ActChgCalCty1stDay + 32)
|
||||
#define ActNewPlc (ActChgCalCty1stDay + 33)
|
||||
#define ActRemPlc (ActChgCalCty1stDay + 34)
|
||||
#define ActRenPlcSho (ActChgCalCty1stDay + 35)
|
||||
#define ActRenPlcFul (ActChgCalCty1stDay + 36)
|
||||
#define ActEdiDpt (ActChgCalCty1stDay + 30)
|
||||
#define ActNewDpt (ActChgCalCty1stDay + 31)
|
||||
#define ActRemDpt (ActChgCalCty1stDay + 32)
|
||||
#define ActChgDptIns (ActChgCalCty1stDay + 33)
|
||||
#define ActRenDptSho (ActChgCalCty1stDay + 34)
|
||||
#define ActRenDptFul (ActChgCalCty1stDay + 35)
|
||||
#define ActChgDptWWW (ActChgCalCty1stDay + 36)
|
||||
|
||||
#define ActSeeHld (ActChgCalCty1stDay + 37)
|
||||
#define ActEdiHld (ActChgCalCty1stDay + 38)
|
||||
|
|
|
|||
|
|
@ -211,13 +211,14 @@
|
|||
/****************************** Public constants *****************************/
|
||||
/*****************************************************************************/
|
||||
|
||||
#define Log_PLATFORM_VERSION "SWAD 16.167.16 (2017-03-26)"
|
||||
#define Log_PLATFORM_VERSION "SWAD 16.168 (2017-03-26)"
|
||||
#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.168: Mar 26, 2017 Action to view places removed from main menu. (217679 lines)
|
||||
Version 16.167.16:Mar 26, 2017 Link to view places in centres. (217718 lines)
|
||||
Version 16.167.15:Mar 26, 2017 Code refactoring in enrollment. (217694 lines)
|
||||
Version 16.167.14:Mar 26, 2017 Code refactoring in follow/unfollow. (217691 lines)
|
||||
|
|
|
|||
|
|
@ -119,8 +119,8 @@ const Act_Action_t Mnu_MenuActions[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB
|
|||
ActSeeInsInf, // 1
|
||||
ActSeeCtr, // 2
|
||||
ActSeeDpt, // 3
|
||||
ActSeePlc, // 4
|
||||
ActSeeCalIns, // 5
|
||||
ActSeeCalIns, // 4
|
||||
0, // 5
|
||||
0, // 6
|
||||
0, // 7
|
||||
0, // 8
|
||||
|
|
|
|||
48
swad_text.c
48
swad_text.c
|
|
@ -18467,28 +18467,7 @@ const char *Txt_MENU_TITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] =
|
|||
"Departamentos"
|
||||
#endif
|
||||
,
|
||||
// 4: ActSeePlc
|
||||
#if L==1
|
||||
"Llocs"
|
||||
#elif L==2
|
||||
"Standorte"
|
||||
#elif L==3
|
||||
"Places"
|
||||
#elif L==4
|
||||
"Lugares"
|
||||
#elif L==5
|
||||
"Emplacements"
|
||||
#elif L==6
|
||||
"Tenda"
|
||||
#elif L==7
|
||||
"Località"
|
||||
#elif L==8
|
||||
"Miejsca"
|
||||
#elif L==9
|
||||
"Localizaçoes"
|
||||
#endif
|
||||
,
|
||||
// 5: ActSeeCalIns
|
||||
// 4: 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, // 5
|
||||
NULL, // 6
|
||||
NULL, // 7
|
||||
NULL, // 8
|
||||
|
|
@ -20440,28 +20420,7 @@ const char *Txt_MENU_SUBTITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] =
|
|||
"Departamentos"
|
||||
#endif
|
||||
,
|
||||
// 4: ActSeePlc
|
||||
#if L==1
|
||||
"Llista d'emplaçaments d'aquesta institució"
|
||||
#elif L==2
|
||||
"Standorte"
|
||||
#elif L==3
|
||||
"List of places of this institution"
|
||||
#elif L==4
|
||||
"Lista de emplazamientos de esta institución"
|
||||
#elif L==5
|
||||
"Emplacements"
|
||||
#elif L==6
|
||||
"Lista de emplazamientos de esta institución"// Okoteve traducción
|
||||
#elif L==7
|
||||
"Località"
|
||||
#elif L==8
|
||||
"Miejsca"
|
||||
#elif L==9
|
||||
"Localizaçoes"
|
||||
#endif
|
||||
,
|
||||
// 5: ActSeeCalIns
|
||||
// 4: ActSeeCalIns
|
||||
#if L==1
|
||||
"Calendari acadèmic"
|
||||
#elif L==2
|
||||
|
|
@ -20482,6 +20441,7 @@ const char *Txt_MENU_SUBTITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] =
|
|||
"Calendário"
|
||||
#endif
|
||||
,
|
||||
NULL, // 5
|
||||
NULL, // 6
|
||||
NULL, // 7
|
||||
NULL, // 8
|
||||
|
|
|
|||
Loading…
Reference in New Issue