From 315bf88cf0449f32ec0c4b99ad1be80acbe8c284 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Tue, 8 Jan 2019 11:44:01 +0100 Subject: [PATCH] Version 18.28.3 --- icon/iconset/awesome/bell.svg | 2 +- icon/iconset/awesome/search.svg | 1 + icon/iconset/nuvola/search.svg | 65 +++++++++++++++++++++++++++++++++ icon/search-white.svg | 1 + icon/search.svg | 1 + swad_action.c | 14 +++---- swad_changelog.h | 23 +++++++++++- swad_classroom.c | 1 + swad_course.c | 2 +- swad_search.c | 4 +- 10 files changed, 101 insertions(+), 13 deletions(-) create mode 100644 icon/iconset/awesome/search.svg create mode 100644 icon/iconset/nuvola/search.svg create mode 100644 icon/search-white.svg create mode 100644 icon/search.svg diff --git a/icon/iconset/awesome/bell.svg b/icon/iconset/awesome/bell.svg index 8b6ff39d6..8e220b3dd 100644 --- a/icon/iconset/awesome/bell.svg +++ b/icon/iconset/awesome/bell.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/icon/iconset/awesome/search.svg b/icon/iconset/awesome/search.svg new file mode 100644 index 000000000..19f96575a --- /dev/null +++ b/icon/iconset/awesome/search.svg @@ -0,0 +1 @@ + diff --git a/icon/iconset/nuvola/search.svg b/icon/iconset/nuvola/search.svg new file mode 100644 index 000000000..887d2520c --- /dev/null +++ b/icon/iconset/nuvola/search.svg @@ -0,0 +1,65 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/icon/search-white.svg b/icon/search-white.svg new file mode 100644 index 000000000..41cb2368b --- /dev/null +++ b/icon/search-white.svg @@ -0,0 +1 @@ + diff --git a/icon/search.svg b/icon/search.svg new file mode 100644 index 000000000..19f96575a --- /dev/null +++ b/icon/search.svg @@ -0,0 +1 @@ + diff --git a/swad_action.c b/swad_action.c index f7f1fea91..81a4d4864 100644 --- a/swad_action.c +++ b/swad_action.c @@ -1630,7 +1630,7 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = // TabSys ****************************************************************** // Actions in menu: - /* ActSysReqSch */{ 627, 0,TabSys,ActSysReqSch , 0, 0, 0, 0, 0, 0,0x3C7,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Sch_ReqSysSearch ,"search64x64.gif" }, + /* ActSysReqSch */{ 627, 0,TabSys,ActSysReqSch , 0, 0, 0, 0, 0, 0,0x3C7,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Sch_ReqSysSearch ,"search.svg" }, /* ActSeeCty */{ 862, 1,TabSys,ActSeeCty , 0, 0, 0, 0, 0, 0,0x3C7,Act_CONT_NORM,Act_BRW_1ST_TAB,Cty_ListCountries1 ,Cty_ListCountries2 ,"earth64x64.gif" }, /* ActSeePen */{1060, 2,TabSys,ActSeePen , 0, 0, 0, 0, 0, 0,0x3C0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Hie_SeePending ,"hierarchy64x64.png" }, /* ActSeeLnk */{ 748, 3,TabSys,ActSeeLnk , 0, 0, 0, 0, 0, 0,0x3C7,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Lnk_SeeLinks ,"link64x64.gif" }, @@ -1684,7 +1684,7 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = // TabCty ****************************************************************** // Actions in menu: - /* ActCtyReqSch */{1176, 0,TabCty,ActCtyReqSch , 0, 0, 0, 0, 0,0x3C7, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Sch_ReqCtySearch ,"search64x64.gif" }, + /* ActCtyReqSch */{1176, 0,TabCty,ActCtyReqSch , 0, 0, 0, 0, 0,0x3C7, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Sch_ReqCtySearch ,"search.svg" }, /* ActSeeCtyInf */{1155, 1,TabCty,ActSeeCtyInf , 0, 0, 0, 0, 0,0x3C7, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Cty_ShowConfiguration ,"info64x64.gif" }, /* ActSeeIns */{ 696, 2,TabCty,ActSeeIns , 0, 0, 0, 0, 0,0x3C7, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Ins_ShowInssOfCurrentCty ,"institution64x64.gif" }, /* ActSeeCalCty */{1625, 3,TabCty,ActSeeCalCty , 0, 0, 0, 0, 0,0x3C7, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Cal_DrawCalendarCty ,"calendar64x64.png" }, @@ -1709,7 +1709,7 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = // TabIns ****************************************************************** // Actions in menu: - /* 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 ,"search.svg" }, /* 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" }, /* ActSeePlc */{ 703, 3,TabIns,ActSeePlc , 0, 0, 0, 0,0x3C7, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Plc_SeePlaces ,"mapmarker64x64.png" }, @@ -1767,7 +1767,7 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = // TabCtr ****************************************************************** // Actions in menu: - /* ActCtrReqSch */{1178, 0,TabCtr,ActCtrReqSch , 0, 0, 0,0x3C7, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Sch_ReqCtrSearch ,"search64x64.gif" }, + /* ActCtrReqSch */{1178, 0,TabCtr,ActCtrReqSch , 0, 0, 0,0x3C7, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Sch_ReqCtrSearch ,"search.svg" }, /* ActSeeCtrInf */{1151, 1,TabCtr,ActSeeCtrInf , 0, 0, 0,0x3C7, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Ctr_ShowConfiguration ,"info64x64.gif" }, /* ActSeeDeg */{1011, 2,TabCtr,ActSeeDeg , 0, 0, 0,0x3C7, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Deg_ShowDegsOfCurrentCtr ,"deg64x64.gif" }, /* ActSeeCla */{1744, 3,TabCtr,ActSeeCla , 0, 0, 0,0x3C7, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Cla_SeeClassrooms ,"classroom.svg" }, @@ -1818,9 +1818,9 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = // TabDeg ****************************************************************** // Actions in menu: - /* ActDegReqSch */{1179, 0,TabDeg,ActDegReqSch , 0, 0,0x3C7, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Sch_ReqDegSearch ,"search64x64.gif" }, + /* ActDegReqSch */{1179, 0,TabDeg,ActDegReqSch , 0, 0,0x3C7, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Sch_ReqDegSearch ,"search.svg" }, /* ActSeeDegInf */{1149, 1,TabDeg,ActSeeDegInf , 0, 0,0x3C7, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Deg_ShowConfiguration ,"info64x64.gif" }, - /* ActSeeCrs */{1009, 2,TabDeg,ActSeeCrs , 0, 0,0x3C7, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Crs_ShowCrssOfCurrentDeg ,"crs64x64.gif"}, + /* ActSeeCrs */{1009, 2,TabDeg,ActSeeCrs , 0, 0,0x3C7, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Crs_ShowCrssOfCurrentDeg ,"crs64x64.gif" }, /* ActSeeCalDeg */{1634, 3,TabDeg,ActSeeCalDeg , 0, 0,0x3C7, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Cal_DrawCalendarDeg ,"calendar64x64.png" }, // Actions not in menu: @@ -1850,7 +1850,7 @@ struct Act_Actions Act_Actions[Act_NUM_ACTIONS] = // TabCrs ****************************************************************** // Actions in menu: - /* ActCrsReqSch */{1180, 0,TabCrs,ActCrsReqSch ,0x3F8,0x3C7, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Sch_ReqCrsSearch ,"search64x64.gif" }, + /* ActCrsReqSch */{1180, 0,TabCrs,ActCrsReqSch ,0x3F8,0x3C7, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Sch_ReqCrsSearch ,"search.svg" }, /* ActSeeCrsInf */{ 847, 1,TabCrs,ActSeeCrsInf ,0x3F8,0x3C7, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Crs_ShowIntroduction ,"info64x64.gif" }, /* ActSeeTchGui */{ 784, 2,TabCrs,ActSeeTchGui ,0x3F8,0x3C7, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Inf_ShowInfo ,"guide64x64.png" }, /* ActSeeSyl */{1242, 3,TabCrs,ActSeeSyl ,0x3F8,0x3C7, 0, 0, 0, 0, 0,Act_CONT_NORM,Act_BRW_1ST_TAB,NULL ,Inf_ShowInfo ,"presentation64x64.gif"}, diff --git a/swad_changelog.h b/swad_changelog.h index e4e3b01d6..761fca4e3 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -343,6 +343,9 @@ Buenos d // TODO: No se puede pulsar sobre la foto de un remitente de un mensaje recibido. +// TODO: Un administrador de centro ahora no tiene permisos para editar horario asignatura, pero le sale el icono de editar +// O le damos permisos o quitamos el icono de editar. Comprobar para admin. de titulaciones. + /*****************************************************************************/ /****************************** Public constants *****************************/ /*****************************************************************************/ @@ -362,10 +365,18 @@ En OpenSWAD: ps2pdf source.ps destination.pdf */ -#define Log_PLATFORM_VERSION "SWAD 18.28.2 (2019-01-07)" +#define Log_PLATFORM_VERSION "SWAD 18.28.3 (2019-01-07)" #define CSS_FILE "swad18.22.css" #define JS_FILE "swad17.17.1.js" /* + Version 18.28.3: Jan 07, 2019 New SVG icon for search. (239242 lines) + Copy the following icons to icon public directory: +sudo cp icon/iconset/awesome/bell.svg /var/www/html/swad/icon/iconset/awesome/ +sudo cp icon/iconset/awesome/search.svg /var/www/html/swad/icon/iconset/awesome/ +sudo cp icon/iconset/nuvola/search.svg /var/www/html/swad/icon/iconset/nuvola/ +sudo cp icon/search.svg /var/www/html/swad/icon/ +sudo cp icon/search-white.svg /var/www/html/swad/icon/ + Version 18.28.2: Jan 07, 2019 Write classrooms in attendance events. (239224 lines) 1 change necessary in database: INSERT INTO actions (ActCod,Language,Obsolete,Txt) VALUES ('1752','es','N','Cambiar aula asignada a un grupo'); @@ -429,8 +440,16 @@ INSERT INTO actions (ActCod,Language,Obsolete,Txt) VALUES ('1746','es','N','Crea INSERT INTO actions (ActCod,Language,Obsolete,Txt) VALUES ('1747','es','N','Eliminar aula'); INSERT INTO actions (ActCod,Language,Obsolete,Txt) VALUES ('1748','es','N','Cambiar nombre breve aula'); INSERT INTO actions (ActCod,Language,Obsolete,Txt) VALUES ('1749','es','N','Cambiar nombre completo aula'); - Copy the following icon to icon public directory: + Copy the following icons to icon public directory: sudo cp classroom.svg /var/www/html/swad/icon/ +sudo cp iconset/awesome/classroom.svg /var/www/html/swad/icon/iconset/awesome/ +sudo cp iconset/awesome/bell.svg /var/www/html/swad/icon/iconset/awesome/ +sudo cp iconset/nuvola/classroom.svg /var/www/html/swad/icon/iconset/nuvola/ +sudo cp iconset/nuvola/bell.svg /var/www/html/swad/icon/iconset/nuvola/ +sudo cp theme/blue/bell.svg /var/www/html/swad/icon/theme/blue/ +sudo cp theme/grey/bell.svg /var/www/html/swad/icon/theme/grey/ +sudo cp theme/yellow/bell.svg /var/www/html/swad/icon/theme/yellow/ +sudo cp theme/white/bell.svg /var/www/html/swad/icon/theme/white/ Version 18.25.1: Dec 30, 2018 Changes in translation related to classrooms. (238498 lines) Version 18.25: Dec 29, 2018 New option and module to view/edit classrooms in a centre. Not finished. (238375 lines) diff --git a/swad_classroom.c b/swad_classroom.c index 5d347ed49..07ee058c5 100644 --- a/swad_classroom.c +++ b/swad_classroom.c @@ -26,6 +26,7 @@ /*****************************************************************************/ #include // For NULL +#include // For calloc, free #include // For string functions #include "swad_box.h" diff --git a/swad_course.c b/swad_course.c index 2b586e514..7684ef90c 100644 --- a/swad_course.c +++ b/swad_course.c @@ -2974,7 +2974,7 @@ static void Crs_PutIconToSearchCourses (void) (Gbl.CurrentCty.Cty.CtyCod > 0 ? ActCtyReqSch : ActSysReqSch)))), NULL,Sch_PutLinkToSearchCoursesParams, - "search64x64.gif", + "search.svg", Txt_Search_courses,NULL, NULL); } diff --git a/swad_search.c b/swad_search.c index b8a0e2c63..c2bbfadc1 100644 --- a/swad_search.c +++ b/swad_search.c @@ -237,7 +237,7 @@ static void Sch_PutFormToSearchWithWhatToSearchAndScope (Act_Action_t Action,Sco ""); /***** Magnifying glass icon *****/ - Sch_PutMagnifyingGlassButton ("search64x64.png"); + Sch_PutMagnifyingGlassButton ("search.svg"); /***** Send button *****/ Btn_PutButton (Btn_CONFIRM_BUTTON,Txt_Search); @@ -296,7 +296,7 @@ void Sch_PutFormToSearchInPageTopHeading (void) Frm_StartForm (ActionSearch); Sco_PutParamScope ("ScopeSch",Sco_SCOPE_SYS); Sch_PutInputStringToSearch ("head_search_text"); - Sch_PutMagnifyingGlassButton ("search-white64x64.png"); + Sch_PutMagnifyingGlassButton ("search-white.svg"); Frm_EndForm (); fprintf (Gbl.F.Out,""); // head_row_1_search }