diff --git a/admin/admin.db b/admin/admin.db index a652abe..536c0ad 100644 Binary files a/admin/admin.db and b/admin/admin.db differ diff --git a/admin/php/classe_metaestat.php b/admin/php/classe_metaestat.php index 5bd2704..314785a 100755 --- a/admin/php/classe_metaestat.php +++ b/admin/php/classe_metaestat.php @@ -475,7 +475,8 @@ class Metaestat{ //sql para o mapserver $sqlgeo = str_replace("__SQLDADOS__",$sqlDadosMedidaVariavel,$sqlIntermediario); $colunasComGeo = $colunasSemGeo; - $colunasComGeo[] = "/*SG*/st_setsrid(".$colunageo.",".$dadosgeo["srid"].") as ".$colunageo." /*SG*/"; + //$colunasComGeo[] = "/*SG*/st_setsrid(".$colunageo.",".$dadosgeo["srid"].") as ".$colunageo." /*SG*/"; + $colunasComGeo[] = "/*SG*/".$colunageo." as ".$colunageo." /*SG*/"; $sqlgeo = str_replace("__COLUNASSEMGEO__",implode(",",$colunasComGeo),$sqlgeo); $sqlgeo = $colunageo." from /*SE*/(".$sqlgeo.")/*SE*/ as foo using unique ".$dadosgeo["identificador"]." using srid=".$dadosgeo["srid"]; diff --git a/classesjs/classe_util.js b/classesjs/classe_util.js index 7dd378a..20f0bc3 100644 --- a/classesjs/classe_util.js +++ b/classesjs/classe_util.js @@ -229,8 +229,7 @@ i3GEO.util = { var keys,key = ""; keys = []; for(key in obj){ - if(obj[key]) - {keys.push(key);} + keys.push(key); } return keys; }, diff --git a/ferramentas/preferencias/dicionario.js b/ferramentas/preferencias/dicionario.js index 9e97265..1b5749a 100755 --- a/ferramentas/preferencias/dicionario.js +++ b/ferramentas/preferencias/dicionario.js @@ -12,5 +12,5 @@ i3GEOF.preferencias.dicionario = { es:"", it:"" }] - + }; diff --git a/ferramentas/preferencias/index.js b/ferramentas/preferencias/index.js index 0682122..162e4b1 100755 --- a/ferramentas/preferencias/index.js +++ b/ferramentas/preferencias/index.js @@ -41,6 +41,36 @@ Classe: i3GEOF.preferencias */ i3GEOF.preferencias = { + lista:[ + { + titulo: "Barra de botões", + props: [ + { + titulo: "Número máximo de botões", + tipo: "numero", + elemento: "i3GEO.barraDeBotoes.MAXBOTOES" + },{ + titulo: "Mostra a barra", + tipo: "boolean", + elemento: "i3GEO.barraDeBotoes.ATIVA" + },{ + titulo: "Deslocamento vertical", + tipo: "numero", + elemento: "i3GEO.barraDeBotoes.OFFSET" + },{ + titulo: "Posição", + tipo: "select", + elemento: "i3GEO.barraDeBotoes.POSICAO", + opcoes: ["bottom","top"] + },{ + titulo: "Botões", + tipo: "multiselect", + elemento: "i3GEO.barraDeBotoes.INCLUIBOTAO", + opcoes: i3GEO.barraDeBotoes.INCLUIBOTAO + } + ] + } + ], /* Variavel: aguarde @@ -95,8 +125,6 @@ i3GEOF.preferencias = { i3GEOF.preferencias.carrega(); } catch(erro){i3GEO.janela.tempoMsg(erro);} - if(i3GEO.Interface.ATUAL !== "padrao") - {i3GEO.janela.tempoMsg($trad(1,i3GEOF.preferencias.dicionario));} }, /* Function: html @@ -108,7 +136,57 @@ i3GEOF.preferencias = { String com o código html */ html:function(){ - return ""; + var lista = i3GEOF.preferencias.lista, + n = lista.length, + i = 0, + ins = "", + nj = 0, + j = 0, + props, + estilo = "margin-left:10px;cursor:default;width:250px", + nk = 0, + k =0, + valores,nomes; + for(i=0;i"+lista[i].titulo+"

"; + ins += "

"; + } + return ins; }, /* Function: iniciaJanelaFlutuante @@ -125,7 +203,7 @@ i3GEOF.preferencias = { titulo = $trad("x86")+"    "; janela = i3GEO.janela.cria( "400px", - "500px", + "300px", "", "", "", @@ -147,13 +225,22 @@ i3GEOF.preferencias = { i3GEOF.preferencias.aguarde = $i("i3GEOF.preferencias_imagemCabecalho").style; i3GEOF.preferencias.inicia(divid); }, + expande: function(id){ + var s = $i("listaPref"+id).style; + if(s.display === "block"){ + s.display = "none"; + } + else{ + s.display = "block"; + } + }, limpa: function(){ - + }, salva: function(){ - - } + + }, carrega: function(){ - + } }; diff --git a/init/index.php b/init/index.php index 8408cfe..33d95c5 100755 --- a/init/index.php +++ b/init/index.php @@ -179,11 +179,11 @@ botoesIni.push({ "titulo":$trad(14,g_traducao_init) },{ "img":"accessories-dictionary.png", - "href":"../documentacao/manual-i3geo-4_7-pt.pdf", + "href":"../documentacao/manual-i3geo-5_0-pt.pdf", "titulo":$trad(15,g_traducao_init) },{ "img":"accessories-dictionary.png", - "href":"../documentacao/manual-admin-i3geo-4_7-pt.pdf", + "href":"../documentacao/manual-admin-i3geo-5_0-pt.pdf", "titulo":$trad(21,g_traducao_init) },{ "img":"accessories-dictionary.png", diff --git a/interface/black_gm.phtml b/interface/black_gm.phtml index d592025..631fa8e 100755 --- a/interface/black_gm.phtml +++ b/interface/black_gm.phtml @@ -132,7 +132,7 @@ i3GEO.gadgets.PARAMETROS.mostraMenuSuspenso.finaliza = 'if($i("omenudataInterfac i3GEO.cria(); i3GEO.configura.mapaRefDisplay = "none"; i3GEO.barraDeBotoes.TIPO = "olhodepeixe"; -i3GEO.barraDeBotoes.OFFSET = 11; +i3GEO.barraDeBotoes.OFFSET = 12; i3GEO.configura.oMenuData["submenus"]["janelas"] = []; i3GEO.ajuda.ATIVAJANELA = false; i3GEO.idioma.IDSELETOR = "seletorIdiomas"; diff --git a/interface/black_ol.htm b/interface/black_ol.htm index 061e04f..1772a74 100755 --- a/interface/black_ol.htm +++ b/interface/black_ol.htm @@ -109,70 +109,25 @@ i3GEO.Interface.ATUAL = "openlayers"; i3GEO.Interface.IDCORPO = "contemImg"; i3GEO.Interface.openlayers.TILES = true; - i3GEO.configura.oMenuData.submenus["interface"] = [ - { - id : "omenudataInterface0a", - text : '' - + $trad("d27") + '', - url : "#" - }, - { - id : "omenudataInterface2", - text : "OpenLayers", - url : "javascript:window.location = i3GEO.configura.locaplic+'/interface/black_ol.htm?'+i3GEO.configura.sid" - }, - { - id : "omenudataInterface2a", - text : "OpenLayers OSM", - url : "javascript:window.location = i3GEO.configura.locaplic+'/interface/black_osm.htm?'+i3GEO.configura.sid" - }, - { - id : "omenudataInterface4", - text : "Google Maps", - url : "javascript:window.location = i3GEO.configura.locaplic+'/interface/black_gm.phtml?'+i3GEO.configura.sid" - }, - { - id : "omenudataInterface5", - text : "Google Earth", - url : "javascript:window.location = i3GEO.configura.locaplic+'/interface/googleearth.phtml?'+i3GEO.configura.sid" - }, - { - id : "omenudataInterface0b", - text : '' - + $trad("u27") + '', - url : "#" - }, - { - id : "omenudataInterface6", - text : $trad("u21"), - url : "javascript:var w = window.open(i3GEO.configura.locaplic+'/geradordelinks.htm')" - }, - { - id : "omenudataInterface7", - text : "Serviços WMS", - url : "javascript:var w = window.open(i3GEO.configura.locaplic+'/ogc.htm')" - }, - { - id : "omenudataInterface8", - text : "Hiperbólica", - url : "javascript:var w = window.open(i3GEO.configura.locaplic+'/hiperbolica.html')" - }, - { - id : "omenudataInterface9", - text : "Download de dados", - url : "javascript:var w = window.open(i3GEO.configura.locaplic+'/datadownload.htm')" - }, { - id : "omenudataInterface11", - text : $trad("p20"), - url : "javascript:i3GEO.mapa.dialogo.telaRemota()" - } ]; + { id:"omenudataInterface0a",text: ''+$trad("d27")+'',url: "#"}, + { id:"omenudataInterface2",text: "OpenLayers", url: "javascript:window.location = i3GEO.configura.locaplic+'/interface/black_ol.htm?'+i3GEO.configura.sid" }, + { id:"omenudataInterface2a",text: "OpenLayers OSM", url: "javascript:window.location = i3GEO.configura.locaplic+'/interface/black_osm.htm?'+i3GEO.configura.sid" }, + { id:"omenudataInterface4",text: "Google Maps", url: "javascript:window.location = i3GEO.configura.locaplic+'/interface/black_gm.phtml?'+i3GEO.configura.sid" }, + { id:"omenudataInterface5",text: "Google Earth", url: "javascript:window.location = i3GEO.configura.locaplic+'/interface/googleearth.phtml?'+i3GEO.configura.sid" }, + { id:"omenudataInterface0b",text: ''+$trad("u27")+'',url: "#"}, + { id:"omenudataInterface6",text: $trad("u21"), url: "javascript:var w = window.open(i3GEO.configura.locaplic+'/geradordelinks.htm')" }, + { id:"omenudataInterface7",text: "Serviços WMS", url: "javascript:var w = window.open(i3GEO.configura.locaplic+'/ogc.htm')" }, + { id:"omenudataInterface8",text: "Hiperbólica", url: "javascript:var w = window.open(i3GEO.configura.locaplic+'/hiperbolica.html')" }, + { id:"omenudataInterface9",text: "Download de dados", url: "javascript:var w = window.open(i3GEO.configura.locaplic+'/datadownload.htm')" }, + { id:"omenudataInterface11",text: $trad("p20"), url: "javascript:i3GEO.mapa.dialogo.telaRemota()" } + ]; i3GEO.gadgets.PARAMETROS.mostraMenuSuspenso.finaliza = 'if($i("omenudataInterface1")){i3GEOoMenuBar.getMenuItem("omenudataInterface1").cfg.setProperty("text", " ");}'; i3GEO.cria(); i3GEO.configura.mapaRefDisplay = "none"; i3GEO.barraDeBotoes.TIPO = "olhodepeixe"; - i3GEO.barraDeBotoes.OFFSET = 11; + i3GEO.barraDeBotoes.OFFSET = 12; i3GEO.configura.oMenuData["submenus"]["janelas"] = []; i3GEO.ajuda.ATIVAJANELA = false; i3GEO.idioma.IDSELETOR = "seletorIdiomas"; diff --git a/interface/black_osm.htm b/interface/black_osm.htm index 6710d01..65df19f 100755 --- a/interface/black_osm.htm +++ b/interface/black_osm.htm @@ -110,69 +110,24 @@ i3GEO.Interface.IDCORPO = "contemImg"; i3GEO.Interface.openlayers.TILES = true; i3GEO.gadgets.PARAMETROS.mostraMenuSuspenso.finaliza = 'if($i("omenudataInterface1")){i3GEOoMenuBar.getMenuItem("omenudataInterface1").cfg.setProperty("text", " ");}'; - i3GEO.configura.oMenuData.submenus["interface"] = [ - { - id : "omenudataInterface0a", - text : '' - + $trad("d27") + '', - url : "#" - }, - { - id : "omenudataInterface2", - text : "OpenLayers", - url : "javascript:window.location = i3GEO.configura.locaplic+'/interface/black_ol.htm?'+i3GEO.configura.sid" - }, - { - id : "omenudataInterface2a", - text : "OpenLayers OSM", - url : "javascript:window.location = i3GEO.configura.locaplic+'/interface/black_osm.htm?'+i3GEO.configura.sid" - }, - { - id : "omenudataInterface4", - text : "Google Maps", - url : "javascript:window.location = i3GEO.configura.locaplic+'/interface/black_gm.phtml?'+i3GEO.configura.sid" - }, - { - id : "omenudataInterface5", - text : "Google Earth", - url : "javascript:window.location = i3GEO.configura.locaplic+'/interface/googleearth.phtml?'+i3GEO.configura.sid" - }, - { - id : "omenudataInterface0b", - text : '' - + $trad("u27") + '', - url : "#" - }, - { - id : "omenudataInterface6", - text : $trad("u21"), - url : "javascript:var w = window.open(i3GEO.configura.locaplic+'/geradordelinks.htm')" - }, - { - id : "omenudataInterface7", - text : "Serviços WMS", - url : "javascript:var w = window.open(i3GEO.configura.locaplic+'/ogc.htm')" - }, - { - id : "omenudataInterface8", - text : "Hiperbólica", - url : "javascript:var w = window.open(i3GEO.configura.locaplic+'/hiperbolica.html')" - }, - { - id : "omenudataInterface9", - text : "Download de dados", - url : "javascript:var w = window.open(i3GEO.configura.locaplic+'/datadownload.htm')" - }, { - id : "omenudataInterface11", - text : $trad("p20"), - url : "javascript:i3GEO.mapa.dialogo.telaRemota()" - } ]; + { id:"omenudataInterface0a",text: ''+$trad("d27")+'',url: "#"}, + { id:"omenudataInterface2",text: "OpenLayers", url: "javascript:window.location = i3GEO.configura.locaplic+'/interface/black_ol.htm?'+i3GEO.configura.sid" }, + { id:"omenudataInterface2a",text: "OpenLayers OSM", url: "javascript:window.location = i3GEO.configura.locaplic+'/interface/black_osm.htm?'+i3GEO.configura.sid" }, + { id:"omenudataInterface4",text: "Google Maps", url: "javascript:window.location = i3GEO.configura.locaplic+'/interface/black_gm.phtml?'+i3GEO.configura.sid" }, + { id:"omenudataInterface5",text: "Google Earth", url: "javascript:window.location = i3GEO.configura.locaplic+'/interface/googleearth.phtml?'+i3GEO.configura.sid" }, + { id:"omenudataInterface0b",text: ''+$trad("u27")+'',url: "#"}, + { id:"omenudataInterface6",text: $trad("u21"), url: "javascript:var w = window.open(i3GEO.configura.locaplic+'/geradordelinks.htm')" }, + { id:"omenudataInterface7",text: "Serviços WMS", url: "javascript:var w = window.open(i3GEO.configura.locaplic+'/ogc.htm')" }, + { id:"omenudataInterface8",text: "Hiperbólica", url: "javascript:var w = window.open(i3GEO.configura.locaplic+'/hiperbolica.html')" }, + { id:"omenudataInterface9",text: "Download de dados", url: "javascript:var w = window.open(i3GEO.configura.locaplic+'/datadownload.htm')" }, + { id:"omenudataInterface11",text: $trad("p20"), url: "javascript:i3GEO.mapa.dialogo.telaRemota()" } + ]; i3GEO.cria(); i3GEO.configura.mapaRefDisplay = "none"; i3GEO.barraDeBotoes.TIPO = "olhodepeixe"; - i3GEO.barraDeBotoes.OFFSET = 11; + i3GEO.barraDeBotoes.OFFSET = 12; i3GEO.configura.oMenuData["submenus"]["janelas"] = []; i3GEO.ajuda.ATIVAJANELA = false; i3GEO.idioma.IDSELETOR = "seletorIdiomas"; -- libgit2 0.21.2