From 994e511c6132f401e4a1da0524a7158bc782e1dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Tue, 14 Jan 2020 14:16:14 +0100 Subject: [PATCH] Version19.118 --- css/{swad19.115.css => swad19.118.css} | 130 +++++++++++++++---------- swad_centre_config.c | 8 +- swad_changelog.h | 8 +- swad_country_config.c | 4 +- swad_course_config.c | 2 +- swad_degree_config.c | 2 +- swad_institution_config.c | 4 +- swad_system_config.c | 4 +- 8 files changed, 93 insertions(+), 69 deletions(-) rename css/{swad19.115.css => swad19.118.css} (98%) diff --git a/css/swad19.115.css b/css/swad19.118.css similarity index 98% rename from css/swad19.115.css rename to css/swad19.118.css index b955a961..93a3e9f5 100644 --- a/css/swad19.115.css +++ b/css/swad19.118.css @@ -1317,6 +1317,83 @@ a:hover /* Default ==> underlined */ width:480px; } +@media only screen and (max-width: 590px) + { /* For mobile-phones (maximum width visible on Moto G4 vertical) */ + .HIE_CFG_WIDTH {width:280px;} + .COUNTRY_MAP_SHOW, .COUNTRY_MAP_PRINT + { + box-sizing:border-box; + width:260px; + height:260px; + margin:10px; + } + .CENTRE_PHOTO_WIDTH {width:260px;} + #AttributionArea + { + box-sizing:border-box; + width:260px; + } + } +@media only screen and (min-width: 590px) + { /* For tablets and desktop (maximum width visible on Moto G4 horizontal) */ + .HIE_CFG_WIDTH {width:480px;} + .COUNTRY_MAP_SHOW, .COUNTRY_MAP_PRINT + { + box-sizing:border-box; + width:360px; + height:360px; + margin:10px; + } + .COUNTRY_MAP_WIDTH, .CENTRE_PHOTO_WIDTH {width:460px;} + #AttributionArea + { + box-sizing:border-box; + width:460px; + } + } + +.HIE_CFG_LEFT, .HIE_CFG_RIGHT + { + display:inline-block; + margin:0 6px; + vertical-align:top; + } + +#sys_mapid, #cty_mapid, #ins_mapid, #ctr_mapid + { + width:100%; + height:460px; + margin:9px auto; + } +.CENTRE_PHOTO_SHOW + { + box-sizing:border-box; + padding:2px; + margin:9px auto; + border:solid 1px #EEE; + } +a:hover img.CENTRE_PHOTO_SHOW + { + border:solid 1px #CCC; + box-shadow:1px 1px 6px #999; + } +.CENTRE_PHOTO_PRINT + { + box-sizing:border-box; + padding:2px; + margin:9px auto; + border:solid 1px #EEE; + box-shadow:1px 1px 6px #999; + } +.ATTRIBUTION + { + box-sizing:border-box; + margin-bottom:15px; + color:#A0A0A0; + font-size:8pt; + text-align:center; + } + /*********************************** Places **********************************/ .PLC_SEL { @@ -1962,13 +2039,6 @@ table.CELLS_PAD_10 > tbody > tr > td {padding:10px;} height:20px; vertical-align:middle; } -.COUNTRY_MAP_SHOW, .COUNTRY_MAP_PRINT - { - box-sizing:border-box; - width:320px; - height:320px; - margin:10px; - } /******************* Web of institution, centre, degree **********************/ .EXTERNAL_WWW_SHORT @@ -1988,52 +2058,6 @@ table.CELLS_PAD_10 > tbody > tr > td {padding:10px;} text-overflow:ellipsis; } -/****************************** Photo of centre ******************************/ -.CENTRE_PHOTO_SHOW - { - box-sizing:border-box; - width:460px; - padding:2px; - margin:9px auto; - border:solid 1px #EEE; - } -a:hover img.CENTRE_PHOTO_SHOW - { - border:solid 1px #CCC; - box-shadow:1px 1px 6px #999; - } -.CENTRE_PHOTO_PRINT - { - box-sizing:border-box; - width:460px; - padding:2px; - margin:9px auto; - border:solid 1px #EEE; - box-shadow:1px 1px 6px #999; - } - -#sys_mapid, #cty_mapid, #ins_mapid, #ctr_mapid - { - width:460px; - height:460px; - margin:9px auto; - } - -/**************** Attribution (author and license) of images *****************/ -#AttributionArea - { - box-sizing:border-box; - width:460px; - } -.ATTRIBUTION - { - box-sizing:border-box; - margin-bottom:15px; - color:#A0A0A0; - font-size:8pt; - text-align:center; - } - /******************************* User's photo ********************************/ .PHOTO12x16 {width: 12px; height: 16px; border-radius:1px; vertical-align:middle; margin-top:-2px;} .PHOTO15x20 {width: 15px; height: 20px; border-radius:2px; vertical-align:middle;} diff --git a/swad_centre_config.c b/swad_centre_config.c index 78553d12..04c4fb79 100644 --- a/swad_centre_config.c +++ b/swad_centre_config.c @@ -165,7 +165,7 @@ static void CtrCfg_Configuration (bool PrintView) CtrCfg_Title (PutLink); /**************************** Left part ***********************************/ - HTM_DIV_Begin ("class=\"HIE_CFG_LEFT\""); + HTM_DIV_Begin ("class=\"HIE_CFG_LEFT HIE_CFG_WIDTH\""); /***** Begin table *****/ HTM_TABLE_BeginWidePadding (2); @@ -234,7 +234,7 @@ static void CtrCfg_Configuration (bool PrintView) if (MapIsAvailable || PhotoExists) { - HTM_DIV_Begin ("class=\"HIE_CFG_RIGHT\""); + HTM_DIV_Begin ("class=\"HIE_CFG_RIGHT HIE_CFG_WIDTH\""); /***** Centre map *****/ if (MapIsAvailable) @@ -465,8 +465,8 @@ static void CtrCfg_Photo (bool PrintView,bool PutForm,bool PutLink, (unsigned) Gbl.Hierarchy.Ctr.CtrCod) < 0) Lay_NotEnoughMemoryExit (); HTM_IMG (URL,Icon,Gbl.Hierarchy.Ctr.FullName, - "class=\"%s\"",PrintView ? "CENTRE_PHOTO_PRINT" : - "CENTRE_PHOTO_SHOW"); + "class=\"%s\"",PrintView ? "CENTRE_PHOTO_PRINT CENTRE_PHOTO_WIDTH" : + "CENTRE_PHOTO_SHOW CENTRE_PHOTO_WIDTH"); free (Icon); free (URL); if (PutLink) diff --git a/swad_changelog.h b/swad_changelog.h index f4b75a37..b49d005e 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -494,16 +494,16 @@ enscript -2 --landscape --color --file-align=2 --highlight --line-numbers -o - * En OpenSWAD: ps2pdf source.ps destination.pdf */ -#define Log_PLATFORM_VERSION "SWAD 19.117 (2020-01-14)" -#define CSS_FILE "swad19.115.css" +#define Log_PLATFORM_VERSION "SWAD 19.118 (2020-01-14)" +#define CSS_FILE "swad19.118.css" #define JS_FILE "swad19.91.1.js" /* // TODO: Hacer un nuevo rol en los TFG: tutor externo (profesor de áreas no vinculadas con el centro, profesionales de empresas, etc.) // TODO: Impedir la creación y edición de proyectos si no son editables. // TODO: No se puede entrar con DNI '1' suponiendo que no tenga password ¿por qué? -// TODO: Mapas más estrechos en móvil - Version 19.117: Jan 14, 2020 Column map moved in countries, institutions and centres. (? lines) + Version 19.118: Jan 14, 2020 Responsive maps. (278546 lines) + Version 19.117: Jan 14, 2020 Column map moved in countries, institutions and centres. (278523 lines) Version 19.116.3: Jan 14, 2020 Form to go to country map in statistics. (278547 lines) Version 19.116.2: Jan 14, 2020 Form to go to institution map in statistics. (278529 lines) Version 19.116.1: Jan 14, 2020 Form to go to centre map in statistics. (278518 lines) diff --git a/swad_country_config.c b/swad_country_config.c index 528e5471..d3332a59 100644 --- a/swad_country_config.c +++ b/swad_country_config.c @@ -132,7 +132,7 @@ static void CtyCfg_Configuration (bool PrintView) CtyCfg_Title (PutLink); /**************************** Left part ***********************************/ - HTM_DIV_Begin ("class=\"HIE_CFG_LEFT\""); + HTM_DIV_Begin ("class=\"HIE_CFG_LEFT HIE_CFG_WIDTH\""); /***** Begin table *****/ HTM_TABLE_BeginWidePadding (2); @@ -184,7 +184,7 @@ static void CtyCfg_Configuration (bool PrintView) if (MapIsAvailable || MapImageExists) { - HTM_DIV_Begin ("class=\"HIE_CFG_RIGHT\""); + HTM_DIV_Begin ("class=\"HIE_CFG_RIGHT HIE_CFG_WIDTH\""); /***** Country map *****/ if (MapIsAvailable) diff --git a/swad_course_config.c b/swad_course_config.c index c050d610..9946b7b6 100644 --- a/swad_course_config.c +++ b/swad_course_config.c @@ -123,7 +123,7 @@ void CrsCfg_Configuration (bool PrintView) CrsCfg_Title (PutLink); /**************************** Left part ***********************************/ - HTM_DIV_Begin ("class=\"HIE_CFG_LEFT\""); + HTM_DIV_Begin ("class=\"HIE_CFG_LEFT HIE_CFG_WIDTH\""); /***** Begin table *****/ HTM_TABLE_BeginWidePadding (2); diff --git a/swad_degree_config.c b/swad_degree_config.c index be6724c7..e38ce36d 100644 --- a/swad_degree_config.c +++ b/swad_degree_config.c @@ -127,7 +127,7 @@ static void DegCfg_Configuration (bool PrintView) DegCfg_Title (PutLink); /**************************** Left part ***********************************/ - HTM_DIV_Begin ("class=\"HIE_CFG_LEFT\""); + HTM_DIV_Begin ("class=\"HIE_CFG_LEFT HIE_CFG_WIDTH\""); /***** Begin table *****/ HTM_TABLE_BeginWidePadding (2); diff --git a/swad_institution_config.c b/swad_institution_config.c index 583971ba..fa93c54a 100644 --- a/swad_institution_config.c +++ b/swad_institution_config.c @@ -138,7 +138,7 @@ static void InsCfg_Configuration (bool PrintView) InsCfg_Title (PutLink); /**************************** Left part ***********************************/ - HTM_DIV_Begin ("class=\"HIE_CFG_LEFT\""); + HTM_DIV_Begin ("class=\"HIE_CFG_LEFT HIE_CFG_WIDTH\""); /***** Begin table *****/ HTM_TABLE_BeginWidePadding (2); @@ -191,7 +191,7 @@ static void InsCfg_Configuration (bool PrintView) if (MapIsAvailable) { - HTM_DIV_Begin ("class=\"HIE_CFG_RIGHT\""); + HTM_DIV_Begin ("class=\"HIE_CFG_RIGHT HIE_CFG_WIDTH\""); /***** Institution map *****/ InsCfg_Map (); diff --git a/swad_system_config.c b/swad_system_config.c index bdcc078f..79395855 100644 --- a/swad_system_config.c +++ b/swad_system_config.c @@ -118,7 +118,7 @@ static void SysCfg_Configuration (bool PrintView) Hlp_SYSTEM_Information,Box_NOT_CLOSABLE); /**************************** Left part ***********************************/ - HTM_DIV_Begin ("class=\"HIE_CFG_LEFT\""); + HTM_DIV_Begin ("class=\"HIE_CFG_LEFT HIE_CFG_WIDTH\""); /***** Begin table *****/ HTM_TABLE_BeginWidePadding (2); @@ -164,7 +164,7 @@ static void SysCfg_Configuration (bool PrintView) if (MapIsAvailable) { - HTM_DIV_Begin ("class=\"HIE_CFG_RIGHT\""); + HTM_DIV_Begin ("class=\"HIE_CFG_RIGHT HIE_CFG_WIDTH\""); /***** Country map *****/ SysCfg_Map ();