Download as
Browse Code »

Commit 443974a2f7ebf0a2423f5c15f4a02c72f35b470b

Authored by Edmar Moretti
1 parent 5e4a272a
Exists in master and in 7 other branches composer, doc-root, docker, guia, licenca, readme, unmaintened

$1

Showing 9 changed files with 128 additions and 131 deletions   Show diff stats
admin/admin.db
View file @443974a
No preview for this file type
admin/php/classe_metaestat.php
  Diff comments   View file @443974a
... ... @@ -475,7 +475,8 @@ class Metaestat{
475 475 //sql para o mapserver
476 476 $sqlgeo = str_replace("__SQLDADOS__",$sqlDadosMedidaVariavel,$sqlIntermediario);
477 477 $colunasComGeo = $colunasSemGeo;
478   - $colunasComGeo[] = "/*SG*/st_setsrid(".$colunageo.",".$dadosgeo["srid"].") as ".$colunageo." /*SG*/";
  478 + //$colunasComGeo[] = "/*SG*/st_setsrid(".$colunageo.",".$dadosgeo["srid"].") as ".$colunageo." /*SG*/";
  479 + $colunasComGeo[] = "/*SG*/".$colunageo." as ".$colunageo." /*SG*/";
479 480 $sqlgeo = str_replace("__COLUNASSEMGEO__",implode(",",$colunasComGeo),$sqlgeo);
480 481 $sqlgeo = $colunageo." from /*SE*/(".$sqlgeo.")/*SE*/ as foo using unique ".$dadosgeo["identificador"]." using srid=".$dadosgeo["srid"];
481 482  
... ...
classesjs/classe_util.js
  Diff comments   View file @443974a
... ... @@ -229,8 +229,7 @@ i3GEO.util = {
229 229 var keys,key = "";
230 230 keys = [];
231 231 for(key in obj){
232   - if(obj[key])
233   - {keys.push(key);}
  232 + keys.push(key);
234 233 }
235 234 return keys;
236 235 },
... ...
ferramentas/preferencias/dicionario.js
  Diff comments   View file @443974a
... ... @@ -12,5 +12,5 @@ i3GEOF.preferencias.dicionario = {
12 12 es:"",
13 13 it:""
14 14 }]
15   -
  15 +
16 16 };
... ...
ferramentas/preferencias/index.js
  Diff comments   View file @443974a
... ... @@ -41,6 +41,36 @@ Classe: i3GEOF.preferencias
41 41  
42 42 */
43 43 i3GEOF.preferencias = {
  44 + lista:[
  45 + {
  46 + titulo: "Barra de botões",
  47 + props: [
  48 + {
  49 + titulo: "Número máximo de botões",
  50 + tipo: "numero",
  51 + elemento: "i3GEO.barraDeBotoes.MAXBOTOES"
  52 + },{
  53 + titulo: "Mostra a barra",
  54 + tipo: "boolean",
  55 + elemento: "i3GEO.barraDeBotoes.ATIVA"
  56 + },{
  57 + titulo: "Deslocamento vertical",
  58 + tipo: "numero",
  59 + elemento: "i3GEO.barraDeBotoes.OFFSET"
  60 + },{
  61 + titulo: "Posição",
  62 + tipo: "select",
  63 + elemento: "i3GEO.barraDeBotoes.POSICAO",
  64 + opcoes: ["bottom","top"]
  65 + },{
  66 + titulo: "Botões",
  67 + tipo: "multiselect",
  68 + elemento: "i3GEO.barraDeBotoes.INCLUIBOTAO",
  69 + opcoes: i3GEO.barraDeBotoes.INCLUIBOTAO
  70 + }
  71 + ]
  72 + }
  73 + ],
44 74 /*
45 75 Variavel: aguarde
46 76  
... ... @@ -95,8 +125,6 @@ i3GEOF.preferencias = {
95 125 i3GEOF.preferencias.carrega();
96 126 }
97 127 catch(erro){i3GEO.janela.tempoMsg(erro);}
98   - if(i3GEO.Interface.ATUAL !== "padrao")
99   - {i3GEO.janela.tempoMsg($trad(1,i3GEOF.preferencias.dicionario));}
100 128 },
101 129 /*
102 130 Function: html
... ... @@ -108,7 +136,57 @@ i3GEOF.preferencias = {
108 136 String com o código html
109 137 */
110 138 html:function(){
111   - return "";
  139 + var lista = i3GEOF.preferencias.lista,
  140 + n = lista.length,
  141 + i = 0,
  142 + ins = "",
  143 + nj = 0,
  144 + j = 0,
  145 + props,
  146 + estilo = "margin-left:10px;cursor:default;width:250px",
  147 + nk = 0,
  148 + k =0,
  149 + valores,nomes;
  150 + for(i=0;i<n;i++){
  151 + ins += "<p onclick='javascript:i3GEOF.preferencias.expande("+i+")' class=paragrafo style=cursor:pointer;color:navy ><b>"+lista[i].titulo+"</b><p>";
  152 + ins += "<div style=display:none id='listaPref"+i+"'>";
  153 + props = lista[i].props;
  154 + nj = props.length;
  155 + for(j=0;j<nj;j++){
  156 + ins += "<p class=paragrafo >"+props[j].titulo+"</p>";
  157 + if(props[j].tipo === "numero" || props[j].tipo === "texto"){
  158 + ins += "<input type=text value='' id='"+props[j].elemento+"' style='"+estilo+"' /><br><br>";
  159 + }
  160 + if(props[j].tipo === "boolean" || props[j].tipo === "select"){
  161 + if(props[j].tipo === "boolean"){
  162 + valores = [1,0];
  163 + nomes = ["true","false"];
  164 + }
  165 + else{
  166 + valores = props[j].opcoes;
  167 + nomes = props[j].opcoes;
  168 + }
  169 + nk = valores.length;
  170 + ins += "<select id='"+props[j].elemento+"' style='"+estilo+"' >";
  171 + ins += "<option value='' >---</option>";
  172 + for(k=0;k<nk;k++){
  173 + ins += "<option value='"+valores[k]+"' >"+nomes[k]+"</option>";
  174 + }
  175 + ins += "</select><br><br>";
  176 + }
  177 + if(props[j].tipo === "multiselect"){
  178 + valores = i3GEO.util.listaChaves(props[j].opcoes);
  179 + nk = valores.length;
  180 + ins += "<select multiple size=5 id='"+props[j].elemento+"' style='"+estilo+"' >";
  181 + for(k=0;k<nk;k++){
  182 + ins += "<option value='"+valores[k]+"' >"+valores[k]+"</option>";
  183 + }
  184 + ins += "</select><br><br>";
  185 + }
  186 + }
  187 + ins += "</div>";
  188 + }
  189 + return ins;
112 190 },
113 191 /*
114 192 Function: iniciaJanelaFlutuante
... ... @@ -125,7 +203,7 @@ i3GEOF.preferencias = {
125 203 titulo = $trad("x86")+" <a class=ajuda_usuario target=_blank href='" + i3GEO.configura.locaplic + "/ajuda_usuario.php?idcategoria=1&idajuda=3' >&nbsp;&nbsp;&nbsp;</a>";
126 204 janela = i3GEO.janela.cria(
127 205 "400px",
128   - "500px",
  206 + "300px",
129 207 "",
130 208 "",
131 209 "",
... ... @@ -147,13 +225,22 @@ i3GEOF.preferencias = {
147 225 i3GEOF.preferencias.aguarde = $i("i3GEOF.preferencias_imagemCabecalho").style;
148 226 i3GEOF.preferencias.inicia(divid);
149 227 },
  228 + expande: function(id){
  229 + var s = $i("listaPref"+id).style;
  230 + if(s.display === "block"){
  231 + s.display = "none";
  232 + }
  233 + else{
  234 + s.display = "block";
  235 + }
  236 + },
150 237 limpa: function(){
151   -
  238 +
152 239 },
153 240 salva: function(){
154   -
155   - }
  241 +
  242 + },
156 243 carrega: function(){
157   -
  244 +
158 245 }
159 246 };
... ...
init/index.php
  Diff comments   View file @443974a
... ... @@ -179,11 +179,11 @@ botoesIni.push({
179 179 "titulo":$trad(14,g_traducao_init)
180 180 },{
181 181 "img":"accessories-dictionary.png",
182   - "href":"../documentacao/manual-i3geo-4_7-pt.pdf",
  182 + "href":"../documentacao/manual-i3geo-5_0-pt.pdf",
183 183 "titulo":$trad(15,g_traducao_init)
184 184 },{
185 185 "img":"accessories-dictionary.png",
186   - "href":"../documentacao/manual-admin-i3geo-4_7-pt.pdf",
  186 + "href":"../documentacao/manual-admin-i3geo-5_0-pt.pdf",
187 187 "titulo":$trad(21,g_traducao_init)
188 188 },{
189 189 "img":"accessories-dictionary.png",
... ...
interface/black_gm.phtml
  Diff comments   View file @443974a
... ... @@ -132,7 +132,7 @@ i3GEO.gadgets.PARAMETROS.mostraMenuSuspenso.finaliza = &#39;if($i(&quot;omenudataInterfac
132 132 i3GEO.cria();
133 133 i3GEO.configura.mapaRefDisplay = "none";
134 134 i3GEO.barraDeBotoes.TIPO = "olhodepeixe";
135   -i3GEO.barraDeBotoes.OFFSET = 11;
  135 +i3GEO.barraDeBotoes.OFFSET = 12;
136 136 i3GEO.configura.oMenuData["submenus"]["janelas"] = [];
137 137 i3GEO.ajuda.ATIVAJANELA = false;
138 138 i3GEO.idioma.IDSELETOR = "seletorIdiomas";
... ...
interface/black_ol.htm
  Diff comments   View file @443974a
... ... @@ -109,70 +109,25 @@
109 109 i3GEO.Interface.ATUAL = "openlayers";
110 110 i3GEO.Interface.IDCORPO = "contemImg";
111 111 i3GEO.Interface.openlayers.TILES = true;
112   -
113 112 i3GEO.configura.oMenuData.submenus["interface"] = [
114   - {
115   - id : "omenudataInterface0a",
116   - text : '<span style=color:gray;text-decoration:underline; ><b>'
117   - + $trad("d27") + '</b></span>',
118   - url : "#"
119   - },
120   - {
121   - id : "omenudataInterface2",
122   - text : "OpenLayers",
123   - url : "javascript:window.location = i3GEO.configura.locaplic+'/interface/black_ol.htm?'+i3GEO.configura.sid"
124   - },
125   - {
126   - id : "omenudataInterface2a",
127   - text : "OpenLayers OSM",
128   - url : "javascript:window.location = i3GEO.configura.locaplic+'/interface/black_osm.htm?'+i3GEO.configura.sid"
129   - },
130   - {
131   - id : "omenudataInterface4",
132   - text : "Google Maps",
133   - url : "javascript:window.location = i3GEO.configura.locaplic+'/interface/black_gm.phtml?'+i3GEO.configura.sid"
134   - },
135   - {
136   - id : "omenudataInterface5",
137   - text : "Google Earth",
138   - url : "javascript:window.location = i3GEO.configura.locaplic+'/interface/googleearth.phtml?'+i3GEO.configura.sid"
139   - },
140   - {
141   - id : "omenudataInterface0b",
142   - text : '<span style=color:gray;text-decoration:underline; ><b>'
143   - + $trad("u27") + '</b></span>',
144   - url : "#"
145   - },
146   - {
147   - id : "omenudataInterface6",
148   - text : $trad("u21"),
149   - url : "javascript:var w = window.open(i3GEO.configura.locaplic+'/geradordelinks.htm')"
150   - },
151   - {
152   - id : "omenudataInterface7",
153   - text : "Servi&ccedil;os WMS",
154   - url : "javascript:var w = window.open(i3GEO.configura.locaplic+'/ogc.htm')"
155   - },
156   - {
157   - id : "omenudataInterface8",
158   - text : "Hiperb&oacute;lica",
159   - url : "javascript:var w = window.open(i3GEO.configura.locaplic+'/hiperbolica.html')"
160   - },
161   - {
162   - id : "omenudataInterface9",
163   - text : "Download de dados",
164   - url : "javascript:var w = window.open(i3GEO.configura.locaplic+'/datadownload.htm')"
165   - }, {
166   - id : "omenudataInterface11",
167   - text : $trad("p20"),
168   - url : "javascript:i3GEO.mapa.dialogo.telaRemota()"
169   - } ];
  113 + { id:"omenudataInterface0a",text: '<span style=color:gray;text-decoration:underline; ><b>'+$trad("d27")+'</b></span>',url: "#"},
  114 + { id:"omenudataInterface2",text: "OpenLayers", url: "javascript:window.location = i3GEO.configura.locaplic+'/interface/black_ol.htm?'+i3GEO.configura.sid" },
  115 + { id:"omenudataInterface2a",text: "OpenLayers OSM", url: "javascript:window.location = i3GEO.configura.locaplic+'/interface/black_osm.htm?'+i3GEO.configura.sid" },
  116 + { id:"omenudataInterface4",text: "Google Maps", url: "javascript:window.location = i3GEO.configura.locaplic+'/interface/black_gm.phtml?'+i3GEO.configura.sid" },
  117 + { id:"omenudataInterface5",text: "Google Earth", url: "javascript:window.location = i3GEO.configura.locaplic+'/interface/googleearth.phtml?'+i3GEO.configura.sid" },
  118 + { id:"omenudataInterface0b",text: '<span style=color:gray;text-decoration:underline; ><b>'+$trad("u27")+'</b></span>',url: "#"},
  119 + { id:"omenudataInterface6",text: $trad("u21"), url: "javascript:var w = window.open(i3GEO.configura.locaplic+'/geradordelinks.htm')" },
  120 + { id:"omenudataInterface7",text: "Servi&ccedil;os WMS", url: "javascript:var w = window.open(i3GEO.configura.locaplic+'/ogc.htm')" },
  121 + { id:"omenudataInterface8",text: "Hiperb&oacute;lica", url: "javascript:var w = window.open(i3GEO.configura.locaplic+'/hiperbolica.html')" },
  122 + { id:"omenudataInterface9",text: "Download de dados", url: "javascript:var w = window.open(i3GEO.configura.locaplic+'/datadownload.htm')" },
  123 + { id:"omenudataInterface11",text: $trad("p20"), url: "javascript:i3GEO.mapa.dialogo.telaRemota()" }
  124 + ];
170 125  
171 126 i3GEO.gadgets.PARAMETROS.mostraMenuSuspenso.finaliza = 'if($i("omenudataInterface1")){i3GEOoMenuBar.getMenuItem("omenudataInterface1").cfg.setProperty("text", " ");}';
172 127 i3GEO.cria();
173 128 i3GEO.configura.mapaRefDisplay = "none";
174 129 i3GEO.barraDeBotoes.TIPO = "olhodepeixe";
175   - i3GEO.barraDeBotoes.OFFSET = 11;
  130 + i3GEO.barraDeBotoes.OFFSET = 12;
176 131 i3GEO.configura.oMenuData["submenus"]["janelas"] = [];
177 132 i3GEO.ajuda.ATIVAJANELA = false;
178 133 i3GEO.idioma.IDSELETOR = "seletorIdiomas";
... ...
interface/black_osm.htm
  Diff comments   View file @443974a
... ... @@ -110,69 +110,24 @@
110 110 i3GEO.Interface.IDCORPO = "contemImg";
111 111 i3GEO.Interface.openlayers.TILES = true;
112 112 i3GEO.gadgets.PARAMETROS.mostraMenuSuspenso.finaliza = 'if($i("omenudataInterface1")){i3GEOoMenuBar.getMenuItem("omenudataInterface1").cfg.setProperty("text", " ");}';
113   -
114 113 i3GEO.configura.oMenuData.submenus["interface"] = [
115   - {
116   - id : "omenudataInterface0a",
117   - text : '<span style=color:gray;text-decoration:underline; ><b>'
118   - + $trad("d27") + '</b></span>',
119   - url : "#"
120   - },
121   - {
122   - id : "omenudataInterface2",
123   - text : "OpenLayers",
124   - url : "javascript:window.location = i3GEO.configura.locaplic+'/interface/black_ol.htm?'+i3GEO.configura.sid"
125   - },
126   - {
127   - id : "omenudataInterface2a",
128   - text : "OpenLayers OSM",
129   - url : "javascript:window.location = i3GEO.configura.locaplic+'/interface/black_osm.htm?'+i3GEO.configura.sid"
130   - },
131   - {
132   - id : "omenudataInterface4",
133   - text : "Google Maps",
134   - url : "javascript:window.location = i3GEO.configura.locaplic+'/interface/black_gm.phtml?'+i3GEO.configura.sid"
135   - },
136   - {
137   - id : "omenudataInterface5",
138   - text : "Google Earth",
139   - url : "javascript:window.location = i3GEO.configura.locaplic+'/interface/googleearth.phtml?'+i3GEO.configura.sid"
140   - },
141   - {
142   - id : "omenudataInterface0b",
143   - text : '<span style=color:gray;text-decoration:underline; ><b>'
144   - + $trad("u27") + '</b></span>',
145   - url : "#"
146   - },
147   - {
148   - id : "omenudataInterface6",
149   - text : $trad("u21"),
150   - url : "javascript:var w = window.open(i3GEO.configura.locaplic+'/geradordelinks.htm')"
151   - },
152   - {
153   - id : "omenudataInterface7",
154   - text : "Servi&ccedil;os WMS",
155   - url : "javascript:var w = window.open(i3GEO.configura.locaplic+'/ogc.htm')"
156   - },
157   - {
158   - id : "omenudataInterface8",
159   - text : "Hiperb&oacute;lica",
160   - url : "javascript:var w = window.open(i3GEO.configura.locaplic+'/hiperbolica.html')"
161   - },
162   - {
163   - id : "omenudataInterface9",
164   - text : "Download de dados",
165   - url : "javascript:var w = window.open(i3GEO.configura.locaplic+'/datadownload.htm')"
166   - }, {
167   - id : "omenudataInterface11",
168   - text : $trad("p20"),
169   - url : "javascript:i3GEO.mapa.dialogo.telaRemota()"
170   - } ];
  114 + { id:"omenudataInterface0a",text: '<span style=color:gray;text-decoration:underline; ><b>'+$trad("d27")+'</b></span>',url: "#"},
  115 + { id:"omenudataInterface2",text: "OpenLayers", url: "javascript:window.location = i3GEO.configura.locaplic+'/interface/black_ol.htm?'+i3GEO.configura.sid" },
  116 + { id:"omenudataInterface2a",text: "OpenLayers OSM", url: "javascript:window.location = i3GEO.configura.locaplic+'/interface/black_osm.htm?'+i3GEO.configura.sid" },
  117 + { id:"omenudataInterface4",text: "Google Maps", url: "javascript:window.location = i3GEO.configura.locaplic+'/interface/black_gm.phtml?'+i3GEO.configura.sid" },
  118 + { id:"omenudataInterface5",text: "Google Earth", url: "javascript:window.location = i3GEO.configura.locaplic+'/interface/googleearth.phtml?'+i3GEO.configura.sid" },
  119 + { id:"omenudataInterface0b",text: '<span style=color:gray;text-decoration:underline; ><b>'+$trad("u27")+'</b></span>',url: "#"},
  120 + { id:"omenudataInterface6",text: $trad("u21"), url: "javascript:var w = window.open(i3GEO.configura.locaplic+'/geradordelinks.htm')" },
  121 + { id:"omenudataInterface7",text: "Servi&ccedil;os WMS", url: "javascript:var w = window.open(i3GEO.configura.locaplic+'/ogc.htm')" },
  122 + { id:"omenudataInterface8",text: "Hiperb&oacute;lica", url: "javascript:var w = window.open(i3GEO.configura.locaplic+'/hiperbolica.html')" },
  123 + { id:"omenudataInterface9",text: "Download de dados", url: "javascript:var w = window.open(i3GEO.configura.locaplic+'/datadownload.htm')" },
  124 + { id:"omenudataInterface11",text: $trad("p20"), url: "javascript:i3GEO.mapa.dialogo.telaRemota()" }
  125 + ];
171 126  
172 127 i3GEO.cria();
173 128 i3GEO.configura.mapaRefDisplay = "none";
174 129 i3GEO.barraDeBotoes.TIPO = "olhodepeixe";
175   - i3GEO.barraDeBotoes.OFFSET = 11;
  130 + i3GEO.barraDeBotoes.OFFSET = 12;
176 131 i3GEO.configura.oMenuData["submenus"]["janelas"] = [];
177 132 i3GEO.ajuda.ATIVAJANELA = false;
178 133 i3GEO.idioma.IDSELETOR = "seletorIdiomas";
... ...