From b367e033b90676e1bf0f88a63bc994f9c673e49f Mon Sep 17 00:00:00 2001 From: Edmar Moretti Date: Wed, 27 Sep 2017 21:22:44 -0300 Subject: [PATCH] Ajustes no CSS dos mapas para melhorar o tamanho dos ícones em diferentes resoluções de monitor --- css/default.css | 21 ++++++++++++++++++--- css/geral.css | 4 ++-- css/i3geo7.css | 2 ++ css/i3geo7.css.php | 2 ++ css/i3geo_ferramentas7.css | 4 ++-- ferramentas/editorgm/editorgm_compacto.js | 0 ferramentas/editorol/editorol_compacto.js | 0 interface/gm.phtml | 1527 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- interface/gmdebug.phtml | 167 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------ interface/googlemaps_noite.phtml | 1509 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- interface/ol.htm | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------- interface/openlayersdebug.htm | 32 ++++++++++++++++---------------- interface/osm.htm | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------- interface/osmdebug.htm | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------- js/compactados/ajuda_compacto.js | 0 js/compactados/analise_compacto.js | 0 js/compactados/arvoredecamadas_compacto.js | 0 js/compactados/arvoredetemas_compacto.js | 0 js/compactados/base64_compacto.js | 0 js/compactados/busca_compacto.js | 0 js/compactados/caixaDeFerramentas_compacto.js | 0 js/compactados/calculo_compacto.js | 0 js/compactados/catalogoDir_compacto.js | 0 js/compactados/catalogoEstrelas_compacto.js | 0 js/compactados/catalogoInde_compacto.js | 0 js/compactados/catalogoMapas_compacto.js | 0 js/compactados/catalogoMenus_compacto.js | 0 js/compactados/catalogoMetaestat_compacto.js | 0 js/compactados/catalogoOgc_compacto.js | 0 js/compactados/catalogoRegioes_compacto.js | 0 js/compactados/catalogoSistemas_compacto.js | 0 js/compactados/configura_compacto.js | 0 js/compactados/coordenadas_compacto.js | 0 js/compactados/desenho_compacto.js | 0 js/compactados/dicionario_ajuda_compacto.js | 0 js/compactados/dicionario_compacto.js | 0 js/compactados/editor_compacto.js | 0 js/compactados/eventos_compacto.js | 0 js/compactados/guias_compacto.js | 0 js/compactados/idioma_compacto.js | 0 js/compactados/ini_i3geo_compacto.js | 0 js/compactados/interface_compacto.js | 0 js/compactados/janela_compacto.js | 0 js/compactados/legenda_compacto.js | 0 js/compactados/login_compacto.js | 0 js/compactados/mapa_compacto.js | 0 js/compactados/maparef_compacto.js | 0 js/compactados/marcador_compacto.js | 0 js/compactados/mustache.js | 0 js/compactados/navega_compacto.js | 0 js/compactados/php_compacto.js | 0 js/compactados/plugini3geo_compacto.js | 0 js/compactados/proj4js.js | 0 js/compactados/social_compacto.js | 0 js/compactados/tema_compacto.js | 0 js/compactados/util_compacto.js | 0 js/compactados/wicket.js | 0 js/i3geo_tudo_compacto7.js.php | 0 pacotes/cpaint/cpaint2_compacto.inc.js | 0 pacotes/mobileesp/mdetect_compacto.js | 0 pacotes/yui290/build/carousel/carousel_compacto.js | 0 pacotes/yui290/build/container/container_compacto.js | 0 pacotes/yui290/build/container/container_core_compacto.js | 0 pacotes/yui290/build/resize/resize_compacto.js | 0 pacotes/yui290/build/treeview/treeview_compacto.js | 0 pacotes/yui290/build/utilities/utilities_compacto.js | 0 66 files changed, 1868 insertions(+), 1637 deletions(-) mode change 100755 => 100644 css/i3geo7.css.php mode change 100755 => 100644 ferramentas/editorgm/editorgm_compacto.js mode change 100755 => 100644 ferramentas/editorol/editorol_compacto.js mode change 100755 => 100644 js/compactados/ajuda_compacto.js mode change 100755 => 100644 js/compactados/analise_compacto.js mode change 100755 => 100644 js/compactados/arvoredecamadas_compacto.js mode change 100755 => 100644 js/compactados/arvoredetemas_compacto.js mode change 100755 => 100644 js/compactados/base64_compacto.js mode change 100755 => 100644 js/compactados/busca_compacto.js mode change 100755 => 100644 js/compactados/caixaDeFerramentas_compacto.js mode change 100755 => 100644 js/compactados/calculo_compacto.js mode change 100755 => 100644 js/compactados/catalogoDir_compacto.js mode change 100755 => 100644 js/compactados/catalogoEstrelas_compacto.js mode change 100755 => 100644 js/compactados/catalogoInde_compacto.js mode change 100755 => 100644 js/compactados/catalogoMapas_compacto.js mode change 100755 => 100644 js/compactados/catalogoMenus_compacto.js mode change 100755 => 100644 js/compactados/catalogoMetaestat_compacto.js mode change 100755 => 100644 js/compactados/catalogoOgc_compacto.js mode change 100755 => 100644 js/compactados/catalogoRegioes_compacto.js mode change 100755 => 100644 js/compactados/catalogoSistemas_compacto.js mode change 100755 => 100644 js/compactados/configura_compacto.js mode change 100755 => 100644 js/compactados/coordenadas_compacto.js mode change 100755 => 100644 js/compactados/desenho_compacto.js mode change 100755 => 100644 js/compactados/dicionario_ajuda_compacto.js mode change 100755 => 100644 js/compactados/dicionario_compacto.js mode change 100755 => 100644 js/compactados/editor_compacto.js mode change 100755 => 100644 js/compactados/eventos_compacto.js mode change 100755 => 100644 js/compactados/guias_compacto.js mode change 100755 => 100644 js/compactados/idioma_compacto.js mode change 100755 => 100644 js/compactados/ini_i3geo_compacto.js mode change 100755 => 100644 js/compactados/interface_compacto.js mode change 100755 => 100644 js/compactados/janela_compacto.js mode change 100755 => 100644 js/compactados/legenda_compacto.js mode change 100755 => 100644 js/compactados/login_compacto.js mode change 100755 => 100644 js/compactados/mapa_compacto.js mode change 100755 => 100644 js/compactados/maparef_compacto.js mode change 100755 => 100644 js/compactados/marcador_compacto.js mode change 100755 => 100644 js/compactados/mustache.js mode change 100755 => 100644 js/compactados/navega_compacto.js mode change 100755 => 100644 js/compactados/php_compacto.js mode change 100755 => 100644 js/compactados/plugini3geo_compacto.js mode change 100755 => 100644 js/compactados/proj4js.js mode change 100755 => 100644 js/compactados/social_compacto.js mode change 100755 => 100644 js/compactados/tema_compacto.js mode change 100755 => 100644 js/compactados/util_compacto.js mode change 100755 => 100644 js/compactados/wicket.js mode change 100755 => 100644 js/i3geo_tudo_compacto7.js.php mode change 100755 => 100644 pacotes/cpaint/cpaint2_compacto.inc.js mode change 100755 => 100644 pacotes/mobileesp/mdetect_compacto.js mode change 100755 => 100644 pacotes/yui290/build/carousel/carousel_compacto.js mode change 100755 => 100644 pacotes/yui290/build/container/container_compacto.js mode change 100755 => 100644 pacotes/yui290/build/container/container_core_compacto.js mode change 100755 => 100644 pacotes/yui290/build/resize/resize_compacto.js mode change 100755 => 100644 pacotes/yui290/build/treeview/treeview_compacto.js mode change 100755 => 100644 pacotes/yui290/build/utilities/utilities_compacto.js diff --git a/css/default.css b/css/default.css index 2d342af..48f0ca5 100755 --- a/css/default.css +++ b/css/default.css @@ -214,12 +214,24 @@ hr { border: solid 1px gray; box-shadow: 0px 1px 3px lightgray; cursor: pointer; - width: 40px; - height: 40px; background-color: rgba(0,60,136,.5); margin: 0px; } +.iconesGuiaMovel { + font-size: 1.8rem; + right:0px; + border-radius:4px; + padding:2px; + cursor: pointer; + position: absolute; + top: 5px; + width: auto; + z-index: 5000; + background-color: rgba(255,255,255,.4); + display: inline-grid; +} + #i3GEOguiaMovel { position: absolute; display: block; @@ -299,7 +311,7 @@ hr { } /*utilizado para nao sobrepor com o icone de fechar guias, que e fixed*/ .separadorCabecalhoGuias{ - height: 40px; + height: 10px; } @@ -436,16 +448,19 @@ no caso do OL3 .ol-zoom { top: 2.8em; + font-size: 1.8rem; } .ol-i3GEOcontrols { top: 2.8em; left: 3.5em; width: auto; + font-size: 1.8rem; } .ol-touch .ol-zoomslider, .ol-zoomslider { top: 8.2em; + font-size: 1.8rem; } .ol-scale-line { diff --git a/css/geral.css b/css/geral.css index af5ba6d..dcd02dd 100755 --- a/css/geral.css +++ b/css/geral.css @@ -623,7 +623,7 @@ caption { span { font-family: Verdana, Arial, Helvetica, sans-serif; } - +/* body { background-color: black; font-family: Verdana, Arial, Helvetica, sans-serif; @@ -631,7 +631,7 @@ body { margin: 0px; z-index: 1000; } - +*/ A { text-align: left; font-size: 11pt; diff --git a/css/i3geo7.css b/css/i3geo7.css index 5ffd4fb..d6b7330 100755 --- a/css/i3geo7.css +++ b/css/i3geo7.css @@ -837,6 +837,7 @@ position: relative; span { font-family: Verdana, Arial, Helvetica, sans-serif; } +/* body { background-color: black; font-family: Verdana, Arial, Helvetica, sans-serif; @@ -844,6 +845,7 @@ font-size: 12px; margin: 0px; z-index: 1000; } +*/ A { text-align: left; font-size: 11pt; diff --git a/css/i3geo7.css.php b/css/i3geo7.css.php old mode 100755 new mode 100644 index c8602db..85cbe5d --- a/css/i3geo7.css.php +++ b/css/i3geo7.css.php @@ -837,6 +837,7 @@ position: relative; span { font-family: Verdana, Arial, Helvetica, sans-serif; } +/* body { background-color: black; font-family: Verdana, Arial, Helvetica, sans-serif; @@ -844,6 +845,7 @@ font-size: 12px; margin: 0px; z-index: 1000; } +*/ A { text-align: left; font-size: 11pt; diff --git a/css/i3geo_ferramentas7.css b/css/i3geo_ferramentas7.css index c9422bd..e9b0943 100755 --- a/css/i3geo_ferramentas7.css +++ b/css/i3geo_ferramentas7.css @@ -927,7 +927,7 @@ caption { span { font-family: Verdana, Arial, Helvetica, sans-serif; } - +/* body { background-color: black; font-family: Verdana, Arial, Helvetica, sans-serif; @@ -935,7 +935,7 @@ body { margin: 0px; z-index: 1000; } - +*/ A { text-align: left; font-size: 11pt; diff --git a/ferramentas/editorgm/editorgm_compacto.js b/ferramentas/editorgm/editorgm_compacto.js old mode 100755 new mode 100644 index e69de29..e69de29 --- a/ferramentas/editorgm/editorgm_compacto.js +++ b/ferramentas/editorgm/editorgm_compacto.js diff --git a/ferramentas/editorol/editorol_compacto.js b/ferramentas/editorol/editorol_compacto.js old mode 100755 new mode 100644 index 575a5a9..575a5a9 --- a/ferramentas/editorol/editorol_compacto.js +++ b/ferramentas/editorol/editorol_compacto.js diff --git a/interface/gm.phtml b/interface/gm.phtml index c2f8300..8d4179b 100755 --- a/interface/gm.phtml +++ b/interface/gm.phtml @@ -7,15 +7,15 @@ include("../ms_configura.php"); + content="width=device-width, initial-scale=1, maximum-scale=1.0, user-scalable=0"> i3GEO - GM + src="https://maps.google.com/maps/api/js?libraries=drawing,geometry&key="> - + @@ -26,10 +26,10 @@ include("../ms_configura.php"); .ol-attribution.ol-uncollapsible { - height: 2.1em; - right: 24px; - background: none; - margin-bottom: 15px; + height: 2.1em; + right: 24px; + background: none; + margin-bottom: 15px; } .ol-i3GEOcontrols { @@ -39,769 +39,792 @@ include("../ms_configura.php"); } .escalanumerica { - margin-left: 112px; - bottom:40px; + margin-left: 112px; + bottom:40px; } .localizarxy { - bottom:5px; + bottom:5px; } - + - - -
-
- - + + +
+
- - - -
- - -
- - -
- - -
- -
- -
-
-
-
- -
-
-
-
- -
i3Geo
- -
- -
- -
- -
- -
- -
- -
- -
- -
- -
- - -
- -
-
- -
- -
- - - -
-
- - - - - - + - + } + }, + //configuracoes especificas para a interface GoogleMaps + googleMaps : { + //opcoes de inicializacao do mapa conforme definido na API do GoogleMaps + MapOptions : { + //estilo que sera utilizado no mapa + //pode ser um desses: roadmap, satellite, hybrid, terrain, Red, Countries, Night, Blue, Greyscale, No roads, Mixed, Chilled + //ver i3GEO.Interface.googleMaps.ESTILOS + mapTypeId : "roadmap", + scaleControl : true, + mapTypeControl : true, + mapTypeControlOptions: { + position : google.maps.ControlPosition.LEFT_BOTTOM + }, + zoomControl:true, + zoomControlOptions: { + style : google.maps.ZoomControlStyle.SMALL, + position : google.maps.ControlPosition.LEFT_CENTER + }, + streetViewControl : true, + streetViewControlOptions: { + position : google.maps.ControlPosition.LEFT_CENTER + } + } + } + }; + // + //inicia o mapa + //Veja tambem config.php + // + //O primeiro parametro permite alterar o mapa, inserindo camadas e outras definicoes que afetam o corpo do mapa + //O segundo parametro inclui configuracoes que afetam o funcionamento da interface que controla a visualizacao do mapa + // + i3GEO.init(parametrosMapa,config); + })(); + diff --git a/interface/gmdebug.phtml b/interface/gmdebug.phtml index c5682ed..e115a64 100755 --- a/interface/gmdebug.phtml +++ b/interface/gmdebug.phtml @@ -15,7 +15,7 @@ include("../ms_configura.php"); - + @@ -61,10 +61,7 @@ include("../ms_configura.php"); -->
- - +