Marown/swad-core
Marown
/
swad-core
mirror of https://github.com/acanas/swad-core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Version 18.24

This commit is contained in:
Antonio Cañas Vargas 2018-12-29 11:59:47 +01:00
parent 6df30d9aed
commit 9b9568ec90
6 changed files with 118 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
icon/bell.svg
View File

@ -1 +1 @@
<svg aria-hidden="true" data-prefix="fas" data-icon="bell" class="svg-inline--fa fa-bell fa-w-14" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path fill="currentColor" d="M224 512c35.32 0 63.97-28.65 63.97-64H160.03c0 35.35 28.65 64 63.97 64zm215.39-149.71c-19.32-20.76-55.47-51.99-55.47-154.29 0-77.7-54.48-139.9-127.94-155.16V32c0-17.67-14.32-32-31.98-32s-31.98 14.33-31.98 32v20.84C118.56 68.1 64.08 130.3 64.08 208c0 102.3-36.15 133.53-55.47 154.29-6 6.45-8.66 14.16-8.61 21.71.11 16.4 12.98 32 32.1 32h383.8c19.12 0 32-15.6 32.1-32 .05-7.55-2.61-15.27-8.61-21.71z"></path></svg> <svg aria-hidden="true" data-prefix="fas" data-icon="bell" class="svg-inline--fa fa-bell fa-w-14" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path fill="#404040" d="M224 512c35.32 0 63.97-28.65 63.97-64H160.03c0 35.35 28.65 64 63.97 64zm215.39-149.71c-19.32-20.76-55.47-51.99-55.47-154.29 0-77.7-54.48-139.9-127.94-155.16V32c0-17.67-14.32-32-31.98-32s-31.98 14.33-31.98 32v20.84C118.56 68.1 64.08 130.3 64.08 208c0 102.3-36.15 133.53-55.47 154.29-6 6.45-8.66 14.16-8.61 21.71.11 16.4 12.98 32 32.1 32h383.8c19.12 0 32-15.6 32.1-32 .05-7.55-2.61-15.27-8.61-21.71z"></path></svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 607 B

After

Width:  |  Height:  |  Size: 603 B

72
swad_action.c
View File

@ -183,39 +183,39 @@ Institution:
75. ActInsReqSch Request search in institution tab 75. ActInsReqSch Request search in institution tab
76. ActSeeInsInf Show information on the current institution 76. ActSeeInsInf Show information on the current institution
77. ActSeeCtr List centres 77. ActSeeCtr List centres
78. ActSeeDpt List departments 78. ActSeePlc List places
79. ActSeeCalIns Show the academic calendar 79. ActSeeDpt List departments
80. ActSeeCalIns Show the academic calendar
80. ActInsSch Search for courses, teachers, documents... 81. ActInsSch Search for courses, teachers, documents...
81. ActPrnInsInf Print information on the current institution 82. ActPrnInsInf Print information on the current institution
82. ActChgInsCtyCfg Change country of institution in institution configuration 83. ActChgInsCtyCfg Change country of institution in institution configuration
83. ActRenInsShoCfg Change short name of institution in institution configuration 84. ActRenInsShoCfg Change short name of institution in institution configuration
84. ActRenInsFulCfg Change full name of institution in institution configuration 85. ActRenInsFulCfg Change full name of institution in institution configuration
85. ActChgInsWWWCfg Change web of institution in institution configuration 86. ActChgInsWWWCfg Change web of institution in institution configuration
86. ActReqInsLog Show form to send the logo of the current institution 87. ActReqInsLog Show form to send the logo of the current institution
87. ActRecInsLog Receive and store the logo of the current institution 88. ActRecInsLog Receive and store the logo of the current institution
88. ActRemInsLog Remove the logo of the current institution 89. ActRemInsLog Remove the logo of the current institution
89. ActEdiCtr Edit centres 90. ActEdiCtr Edit centres
90. ActReqCtr Request the creation of a request for a new centre (a teacher makes the petition to an administrator) 91. ActReqCtr Request the creation of a request for a new centre (a teacher makes the petition to an administrator)
91. ActNewCtr Request the creation of a centre 92. ActNewCtr Request the creation of a centre
92. ActRemCtr Remove centre 93. ActRemCtr Remove centre
93. ActChgCtrPlc Request change of the place of a centre 94. ActChgCtrPlc Request change of the place of a centre
94. ActRenCtrSho Change short name centre 95. ActRenCtrSho Change short name centre
95. ActRenCtrFul Change full name centre 96. ActRenCtrFul Change full name centre
96. ActChgCtrWWW Change web of centre 97. ActChgCtrWWW Change web of centre
97. ActChgCtrSta Request change of status of a centre 98. ActChgCtrSta Request change of status of a centre
98. ActEdiDpt Edit departments 99. ActEdiDpt Edit departments
99. ActNewDpt Request the creation of a department 100. ActNewDpt Request the creation of a department
100. ActRemDpt Remove department 101. ActRemDpt Remove department
101. ActChgDptIns Request change of the institution of a department 102. ActChgDptIns Request change of the institution of a department
102. ActRenDptSho Change short name department 103. ActRenDptSho Change short name department
103. ActRenDptFul Change full name department 104. ActRenDptFul Change full name department
104. ActChgDptWWW Change web of department 105. ActChgDptWWW Change web of department
105. ActSeePlc List places
106. ActEdiPlc Edit places 106. ActEdiPlc Edit places
107. ActNewPlc Request the creation of a place 107. ActNewPlc Request the creation of a place
108. ActRemPlc Remove a place 108. ActRemPlc Remove a place
@ -1702,8 +1702,9 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] =
/* ActInsReqSch */{1177, 0,TabIns,ActInsReqSch , 0, 0, 0, 0,0x3C7, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Sch_ReqInsSearch ,"search64x64.gif" }, /* ActInsReqSch */{1177, 0,TabIns,ActInsReqSch , 0, 0, 0, 0,0x3C7, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Sch_ReqInsSearch ,"search64x64.gif" },
/* ActSeeInsInf */{1153, 1,TabIns,ActSeeInsInf , 0, 0, 0, 0,0x3C7, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Ins_ShowConfiguration ,"info64x64.gif" }, /* ActSeeInsInf */{1153, 1,TabIns,ActSeeInsInf , 0, 0, 0, 0,0x3C7, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Ins_ShowConfiguration ,"info64x64.gif" },
/* ActSeeCtr */{ 676, 2,TabIns,ActSeeCtr , 0, 0, 0, 0,0x3C7, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Ctr_ShowCtrsOfCurrentIns ,"house64x64.gif" }, /* ActSeeCtr */{ 676, 2,TabIns,ActSeeCtr , 0, 0, 0, 0,0x3C7, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Ctr_ShowCtrsOfCurrentIns ,"house64x64.gif" },
/* ActSeeDpt */{ 675, 3,TabIns,ActSeeDpt , 0, 0, 0, 0,0x3C7, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Dpt_SeeDepts ,"houseteachers64x64.gif"}, /* ActSeePlc */{ 703, 3,TabIns,ActSeePlc , 0, 0, 0, 0,0x3C7, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Plc_SeePlaces ,"mapmarker64x64.png" },
/* ActSeeCalIns */{1628, 4,TabIns,ActSeeCalIns , 0, 0, 0, 0,0x3C7, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Cal_DrawCalendarIns ,"calendar64x64.png" }, /* ActSeeDpt */{ 675, 4,TabIns,ActSeeDpt , 0, 0, 0, 0,0x3C7, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Dpt_SeeDepts ,"houseteachers64x64.gif"},
/* ActSeeCalIns */{1628, 5,TabIns,ActSeeCalIns , 0, 0, 0, 0,0x3C7, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Cal_DrawCalendarIns ,"calendar64x64.png" },
// Actions not in menu: // Actions not in menu:
/* ActInsSch */{1182,-1,TabUnk,ActInsReqSch , 0, 0, 0, 0,0x3C7, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Sch_GetParamsSearch ,Sch_InsSearch ,NULL}, /* ActInsSch */{1182,-1,TabUnk,ActInsReqSch , 0, 0, 0, 0,0x3C7, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,Sch_GetParamsSearch ,Sch_InsSearch ,NULL},
@ -1727,12 +1728,11 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] =
/* ActChgCtrWWW */{ 683,-1,TabUnk,ActSeeCtr , 0, 0, 0, 0,0x3C6, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Ctr_ChangeCtrWWW ,NULL}, /* ActChgCtrWWW */{ 683,-1,TabUnk,ActSeeCtr , 0, 0, 0, 0,0x3C6, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Ctr_ChangeCtrWWW ,NULL},
/* ActChgCtrSta */{1209,-1,TabUnk,ActSeeCtr , 0, 0, 0, 0,0x300, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Ctr_ChangeCtrStatus ,NULL}, /* ActChgCtrSta */{1209,-1,TabUnk,ActSeeCtr , 0, 0, 0, 0,0x300, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Ctr_ChangeCtrStatus ,NULL},
/* ActSeePlc */{ 703,-1,TabUnk,ActSeeCtr , 0, 0, 0, 0,0x3C7, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Plc_SeePlaces ,NULL}, /* ActEdiPlc */{ 704,-1,TabUnk,ActSeePlc , 0, 0, 0, 0,0x200, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Plc_EditPlaces ,NULL},
/* ActEdiPlc */{ 704,-1,TabUnk,ActSeeCtr , 0, 0, 0, 0,0x200, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Plc_EditPlaces ,NULL}, /* ActNewPlc */{ 705,-1,TabUnk,ActSeePlc , 0, 0, 0, 0,0x200, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Plc_RecFormNewPlace ,NULL},
/* ActNewPlc */{ 705,-1,TabUnk,ActSeeCtr , 0, 0, 0, 0,0x200, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Plc_RecFormNewPlace ,NULL}, /* ActRemPlc */{ 776,-1,TabUnk,ActSeePlc , 0, 0, 0, 0,0x200, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Plc_RemovePlace ,NULL},
/* ActRemPlc */{ 776,-1,TabUnk,ActSeeCtr , 0, 0, 0, 0,0x200, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Plc_RemovePlace ,NULL}, /* ActRenPlcSho */{ 894,-1,TabUnk,ActSeePlc , 0, 0, 0, 0,0x200, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Plc_RenamePlaceShort ,NULL},
/* ActRenPlcSho */{ 894,-1,TabUnk,ActSeeCtr , 0, 0, 0, 0,0x200, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Plc_RenamePlaceShort ,NULL}, /* ActRenPlcFul */{ 895,-1,TabUnk,ActSeePlc , 0, 0, 0, 0,0x200, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Plc_RenamePlaceFull ,NULL},
/* ActRenPlcFul */{ 895,-1,TabUnk,ActSeeCtr , 0, 0, 0, 0,0x200, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Plc_RenamePlaceFull ,NULL},
/* ActEdiDpt */{ 677,-1,TabUnk,ActSeeDpt , 0, 0, 0, 0,0x200, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Dpt_EditDepartments ,NULL}, /* ActEdiDpt */{ 677,-1,TabUnk,ActSeeDpt , 0, 0, 0, 0,0x200, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Dpt_EditDepartments ,NULL},
/* ActNewDpt */{ 687,-1,TabUnk,ActSeeDpt , 0, 0, 0, 0,0x200, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Dpt_RecFormNewDpt ,NULL}, /* ActNewDpt */{ 687,-1,TabUnk,ActSeeDpt , 0, 0, 0, 0,0x200, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Dpt_RecFormNewDpt ,NULL},

42
swad_action.h
View File

@ -173,31 +173,31 @@ typedef signed int Act_Action_t; // Must be a signed type, because -1 is used to
#define ActInsReqSch (ActChgCalCty1stDay + 1) #define ActInsReqSch (ActChgCalCty1stDay + 1)
#define ActSeeInsInf (ActChgCalCty1stDay + 2) #define ActSeeInsInf (ActChgCalCty1stDay + 2)
#define ActSeeCtr (ActChgCalCty1stDay + 3) #define ActSeeCtr (ActChgCalCty1stDay + 3)
#define ActSeeDpt (ActChgCalCty1stDay + 4) #define ActSeePlc (ActChgCalCty1stDay + 4)
#define ActSeeCalIns (ActChgCalCty1stDay + 5) #define ActSeeDpt (ActChgCalCty1stDay + 5)
#define ActSeeCalIns (ActChgCalCty1stDay + 6)
// Secondary actions // Secondary actions
#define ActInsSch (ActChgCalCty1stDay + 6) #define ActInsSch (ActChgCalCty1stDay + 7)
#define ActPrnInsInf (ActChgCalCty1stDay + 7) #define ActPrnInsInf (ActChgCalCty1stDay + 8)
#define ActChgInsCtyCfg (ActChgCalCty1stDay + 8) #define ActChgInsCtyCfg (ActChgCalCty1stDay + 9)
#define ActRenInsShoCfg (ActChgCalCty1stDay + 9) #define ActRenInsShoCfg (ActChgCalCty1stDay + 10)
#define ActRenInsFulCfg (ActChgCalCty1stDay + 10) #define ActRenInsFulCfg (ActChgCalCty1stDay + 11)
#define ActChgInsWWWCfg (ActChgCalCty1stDay + 11) #define ActChgInsWWWCfg (ActChgCalCty1stDay + 12)
#define ActReqInsLog (ActChgCalCty1stDay + 12) #define ActReqInsLog (ActChgCalCty1stDay + 13)
#define ActRecInsLog (ActChgCalCty1stDay + 13) #define ActRecInsLog (ActChgCalCty1stDay + 14)
#define ActRemInsLog (ActChgCalCty1stDay + 14) #define ActRemInsLog (ActChgCalCty1stDay + 15)
#define ActEdiCtr (ActChgCalCty1stDay + 15) #define ActEdiCtr (ActChgCalCty1stDay + 16)
#define ActReqCtr (ActChgCalCty1stDay + 16) #define ActReqCtr (ActChgCalCty1stDay + 17)
#define ActNewCtr (ActChgCalCty1stDay + 17) #define ActNewCtr (ActChgCalCty1stDay + 18)
#define ActRemCtr (ActChgCalCty1stDay + 18) #define ActRemCtr (ActChgCalCty1stDay + 19)
#define ActChgCtrPlc (ActChgCalCty1stDay + 19) #define ActChgCtrPlc (ActChgCalCty1stDay + 20)
#define ActRenCtrSho (ActChgCalCty1stDay + 20) #define ActRenCtrSho (ActChgCalCty1stDay + 21)
#define ActRenCtrFul (ActChgCalCty1stDay + 21) #define ActRenCtrFul (ActChgCalCty1stDay + 22)
#define ActChgCtrWWW (ActChgCalCty1stDay + 22) #define ActChgCtrWWW (ActChgCalCty1stDay + 23)
#define ActChgCtrSta (ActChgCalCty1stDay + 23) #define ActChgCtrSta (ActChgCalCty1stDay + 24)
#define ActSeePlc (ActChgCalCty1stDay + 24)
#define ActEdiPlc (ActChgCalCty1stDay + 25) #define ActEdiPlc (ActChgCalCty1stDay + 25)
#define ActNewPlc (ActChgCalCty1stDay + 26) #define ActNewPlc (ActChgCalCty1stDay + 26)
#define ActRemPlc (ActChgCalCty1stDay + 27) #define ActRemPlc (ActChgCalCty1stDay + 27)

3
swad_changelog.h
View File

@ -364,10 +364,11 @@ En OpenSWAD:
ps2pdf source.ps destination.pdf ps2pdf source.ps destination.pdf
*/ */
#define Log_PLATFORM_VERSION "SWAD 18.23 (2018-12-27)" #define Log_PLATFORM_VERSION "SWAD 18.24 (2018-12-29)"
#define CSS_FILE "swad18.22.css" #define CSS_FILE "swad18.22.css"
#define JS_FILE "swad17.17.1.js" #define JS_FILE "swad17.17.1.js"
/* /*
Version 18.24: Dec 29, 2018 Option for view/edit places is separated from centres. (? lines)
Version 18.23: Dec 27, 2018 Changes in directories for icon sets. Version 18.23: Dec 27, 2018 Changes in directories for icon sets.
Bell icon changed to SVG. (237192 lines) Bell icon changed to SVG. (237192 lines)
cd /var/www/html/swad/icon/iconset/ cd /var/www/html/swad/icon/iconset/

6
swad_menu.c
View File

@ -124,9 +124,9 @@ const Act_Action_t Mnu_MenuActions[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB
ActInsReqSch, // 0 ActInsReqSch, // 0
ActSeeInsInf, // 1 ActSeeInsInf, // 1
ActSeeCtr, // 2 ActSeeCtr, // 2
ActSeeDpt, // 3 ActSeePlc, // 3
ActSeeCalIns, // 4 ActSeeDpt, // 4
0, // 5 ActSeeCalIns, // 5
0, // 6 0, // 6
0, // 7 0, // 7
0, // 8 0, // 8

61
swad_text.c
View File

@ -17763,7 +17763,28 @@ const char *Txt_MENU_TITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] =
"Centros" "Centros"
#endif #endif
, ,
// 3: ActSeeDpt // 3: ActSeePlc
#if L==1 // ca
"Llocs"
#elif L==2 // de
"Standorte"
#elif L==3 // en
"Places"
#elif L==4 // es
"Lugares"
#elif L==5 // fr
"Emplacements"
#elif L==6 // gn
"Tenda"
#elif L==7 // it
"Localit&grave;"
#elif L==8 // pl
"Miejsca"
#elif L==9 // pt
"Localiza&ccedil;oes"
#endif
,
// 4: ActSeeDpt
#if L==1 // ca #if L==1 // ca
"Departaments" "Departaments"
#elif L==2 // de #elif L==2 // de
@ -17784,7 +17805,7 @@ const char *Txt_MENU_TITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] =
"Departamentos" "Departamentos"
#endif #endif
, ,
// 4: ActSeeCalIns // 5: ActSeeCalIns
#if L==1 // ca #if L==1 // ca
"Calendari" "Calendari"
#elif L==2 // de #elif L==2 // de
@ -17805,7 +17826,6 @@ const char *Txt_MENU_TITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] =
"Calend&aacute;rio" "Calend&aacute;rio"
#endif #endif
, ,
NULL, // 5
NULL, // 6 NULL, // 6
NULL, // 7 NULL, // 7
NULL, // 8 NULL, // 8
@ -19710,7 +19730,37 @@ const char *Txt_MENU_SUBTITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] =
"Centros" "Centros"
#endif #endif
, ,
// 3: ActSeeDpt // 3: ActSeePlc
#if L==1 // ca
"Llocs o seus de la instituci&oacute;"
" on s'ubica cada un dels centres."
#elif L==2 // de
"Standorte oder Hauptsitze der Institution,"
" an der sich jedes Zentrum befindet."
#elif L==3 // en
"Places or headquarters of the institution"
" where each of the centres is located."
#elif L==4 // es
"Lugares o sedes de la instituci&oacute;n"
" donde se ubica cada uno de los centros."
#elif L==5 // fr
"Emplacements ou si&egrave;ges de l'institution"
" o&ugrave; est situ&eacute; chacun des centres."
#elif L==6 // gn
"Lugares o sedes de la instituci&oacute;n"
" donde se ubica cada uno de los centros."
#elif L==7 // it
"Localit&grave; o sede dell'istituzione"
" in cui si trova ciascun centro."
#elif L==8 // pl
"Miejsca lub siedziba instytucji,"
" w kt&oacute;rej znajduje si&eogon; ka&zdot;dy z o&sacute;rodk&oacute;w."
#elif L==9 // pt
"Localiza&ccedil;oes ou sede da institui&ccedil;&atilde;o"
" onde cada um dos centros est&aacute; localizado."
#endif
,
// 4: ActSeeDpt
#if L==1 // ca #if L==1 // ca
"Llista de tots els departaments d'aquesta instituci&oacute;" "Llista de tots els departaments d'aquesta instituci&oacute;"
#elif L==2 // de #elif L==2 // de
@ -19731,7 +19781,7 @@ const char *Txt_MENU_SUBTITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] =
"Departamentos" "Departamentos"
#endif #endif
, ,
// 4: ActSeeCalIns // 5: ActSeeCalIns
#if L==1 // ca #if L==1 // ca
"Calendari acad&egrave;mic" "Calendari acad&egrave;mic"
#elif L==2 // de #elif L==2 // de
@ -19752,7 +19802,6 @@ const char *Txt_MENU_SUBTITLE[Tab_NUM_TABS][Act_MAX_OPTIONS_IN_MENU_PER_TAB] =
"Calend&aacute;rio" "Calend&aacute;rio"
#endif #endif
, ,
NULL, // 5
NULL, // 6 NULL, // 6
NULL, // 7 NULL, // 7
NULL, // 8 NULL, // 8