Download as
Browse Code »

Commit 388d24fd033428799ae242954b53140d136d2b46

Authored by Murilo Caixêta
2 parents 02cc18bf aed13b46
Exists in master and in 7 other branches composer, doc-root, docker, guia, licenca, readme, unmaintened

Merge branch 'master' of softwarepublico.gov.br:i3geo/i3geo

Showing 65 changed files with 35 additions and 8 deletions   Show diff stats
css/i3geo7.css.php 100644 → 100755
  Diff comments   View file @388d24f
ferramentas/editorgm/editorgm_compacto.js 100644 → 100755
  Diff comments   View file @388d24f
ferramentas/editorol/editorol_compacto.js 100644 → 100755
  Diff comments   View file @388d24f
interface/carto_ol.htm
  Diff comments   View file @388d24f
@@ -253,7 +253,7 @@ @@ -253,7 +253,7 @@
253 no programa interface/config.php 253 no programa interface/config.php
254 --> 254 -->
255 <div class="list-group condensed"> 255 <div class="list-group condensed">
256 - <label>Camadas de fundo</label> 256 + <label>{{{camadasDeFundo}}}</label>
257 <a data-target="#collapseFundo" class="btn btn-sm btn-primary pull-right" style="margin-top: 0px;padding-top: 0px;padding-bottom: 0px;" type="button" data-toggle="collapse" > 257 <a data-target="#collapseFundo" class="btn btn-sm btn-primary pull-right" style="margin-top: 0px;padding-top: 0px;padding-bottom: 0px;" type="button" data-toggle="collapse" >
258 <span class="caret"></span> 258 <span class="caret"></span>
259 </a> 259 </a>
interface/config.php
  Diff comments   View file @388d24f
@@ -118,6 +118,28 @@ i3GEO.janela.ativaAlerta(); @@ -118,6 +118,28 @@ i3GEO.janela.ativaAlerta();
118 }) ] 118 }) ]
119 }) 119 })
120 }); 120 });
  121 + /*
  122 + var esus = new ol.layer.Tile(
  123 + {
  124 + title : "ESUS Gestor",
  125 + visible : true,
  126 + isBaseLayer : true,
  127 + name : "osm",
  128 + source : new ol.source.TileWMS(
  129 + {
  130 + url : "http://192.168.1.112/mapcache/wms",
  131 + params : {
  132 + 'layers' : "osm",
  133 + 'srs' : "EPSG:4326",
  134 + 'format' : "image/png"
  135 + },
  136 + attributions : [ new ol.Attribution(
  137 + {
  138 + html : '&copy; </a>'
  139 + }) ]
  140 + })
  141 + });
  142 + */
121 i3GEO.Interface.openlayers.LAYERSADICIONAIS = [ eng, oce, ims, wsm, 143 i3GEO.Interface.openlayers.LAYERSADICIONAIS = [ eng, oce, ims, wsm,
122 bra, tms ]; 144 bra, tms ];
123 } 145 }
interface/gm.phtml
  Diff comments   View file @388d24f
@@ -265,7 +265,7 @@ include(&quot;../ms_configura.php&quot;); @@ -265,7 +265,7 @@ include(&quot;../ms_configura.php&quot;);
265 no programa interface/config.php 265 no programa interface/config.php
266 --> 266 -->
267 <div class="list-group condensed"> 267 <div class="list-group condensed">
268 - <label>Camadas de fundo</label> 268 + <label>{{{camadasDeFundo}}}</label>
269 <a data-target="#collapseFundo" class="btn btn-sm btn-primary pull-right" style="margin-top: 0px;padding-top: 0px;padding-bottom: 0px;" type="button" data-toggle="collapse" > 269 <a data-target="#collapseFundo" class="btn btn-sm btn-primary pull-right" style="margin-top: 0px;padding-top: 0px;padding-bottom: 0px;" type="button" data-toggle="collapse" >
270 <span class="caret"></span> 270 <span class="caret"></span>
271 </a> 271 </a>
interface/gmdebug.phtml
  Diff comments   View file @388d24f
@@ -265,7 +265,7 @@ include(&quot;../ms_configura.php&quot;); @@ -265,7 +265,7 @@ include(&quot;../ms_configura.php&quot;);
265 no programa interface/config.php 265 no programa interface/config.php
266 --> 266 -->
267 <div class="list-group condensed"> 267 <div class="list-group condensed">
268 - <label>Camadas de fundo</label> 268 + <label>{{{camadasDeFundo}}}</label>
269 <a data-target="#collapseFundo" class="btn btn-sm btn-primary pull-right" style="margin-top: 0px;padding-top: 0px;padding-bottom: 0px;" type="button" data-toggle="collapse" > 269 <a data-target="#collapseFundo" class="btn btn-sm btn-primary pull-right" style="margin-top: 0px;padding-top: 0px;padding-bottom: 0px;" type="button" data-toggle="collapse" >
270 <span class="caret"></span> 270 <span class="caret"></span>
271 </a> 271 </a>
interface/googlemaps_noite.phtml
  Diff comments   View file @388d24f
@@ -265,7 +265,7 @@ include(&quot;../ms_configura.php&quot;); @@ -265,7 +265,7 @@ include(&quot;../ms_configura.php&quot;);
265 no programa interface/config.php 265 no programa interface/config.php
266 --> 266 -->
267 <div class="list-group condensed"> 267 <div class="list-group condensed">
268 - <label>Camadas de fundo</label> 268 + <label>{{{camadasDeFundo}}}</label>
269 <a data-target="#collapseFundo" class="btn btn-sm btn-primary pull-right" style="margin-top: 0px;padding-top: 0px;padding-bottom: 0px;" type="button" data-toggle="collapse" > 269 <a data-target="#collapseFundo" class="btn btn-sm btn-primary pull-right" style="margin-top: 0px;padding-top: 0px;padding-bottom: 0px;" type="button" data-toggle="collapse" >
270 <span class="caret"></span> 270 <span class="caret"></span>
271 </a> 271 </a>
interface/ol.htm
  Diff comments   View file @388d24f
@@ -251,7 +251,7 @@ @@ -251,7 +251,7 @@
251 no programa interface/config.php 251 no programa interface/config.php
252 --> 252 -->
253 <div class="list-group condensed"> 253 <div class="list-group condensed">
254 - <label>Camadas de fundo</label> 254 + <label>{{{camadasDeFundo}}}</label>
255 <a data-target="#collapseFundo" class="btn btn-sm btn-primary pull-right" style="margin-top: 0px;padding-top: 0px;padding-bottom: 0px;" type="button" data-toggle="collapse" > 255 <a data-target="#collapseFundo" class="btn btn-sm btn-primary pull-right" style="margin-top: 0px;padding-top: 0px;padding-bottom: 0px;" type="button" data-toggle="collapse" >
256 <span class="caret"></span> 256 <span class="caret"></span>
257 </a> 257 </a>
interface/openlayersdebug.htm
  Diff comments   View file @388d24f
@@ -251,7 +251,7 @@ @@ -251,7 +251,7 @@
251 no programa interface/config.php 251 no programa interface/config.php
252 --> 252 -->
253 <div class="list-group condensed"> 253 <div class="list-group condensed">
254 - <label>Camadas de fundo</label> 254 + <label>{{{camadasDeFundo}}}</label>
255 <a data-target="#collapseFundo" class="btn btn-sm btn-primary pull-right" style="margin-top: 0px;padding-top: 0px;padding-bottom: 0px;" type="button" data-toggle="collapse" > 255 <a data-target="#collapseFundo" class="btn btn-sm btn-primary pull-right" style="margin-top: 0px;padding-top: 0px;padding-bottom: 0px;" type="button" data-toggle="collapse" >
256 <span class="caret"></span> 256 <span class="caret"></span>
257 </a> 257 </a>
interface/osm.htm
  Diff comments   View file @388d24f
@@ -251,7 +251,7 @@ @@ -251,7 +251,7 @@
251 no programa interface/config.php 251 no programa interface/config.php
252 --> 252 -->
253 <div class="list-group condensed"> 253 <div class="list-group condensed">
254 - <label>Camadas de fundo</label> 254 + <label>{{{camadasDeFundo}}}</label>
255 <a data-target="#collapseFundo" class="btn btn-sm btn-primary pull-right" style="margin-top: 0px;padding-top: 0px;padding-bottom: 0px;" type="button" data-toggle="collapse" > 255 <a data-target="#collapseFundo" class="btn btn-sm btn-primary pull-right" style="margin-top: 0px;padding-top: 0px;padding-bottom: 0px;" type="button" data-toggle="collapse" >
256 <span class="caret"></span> 256 <span class="caret"></span>
257 </a> 257 </a>
interface/osmdebug.htm
  Diff comments   View file @388d24f
@@ -251,7 +251,7 @@ @@ -251,7 +251,7 @@
251 no programa interface/config.php 251 no programa interface/config.php
252 --> 252 -->
253 <div class="list-group condensed"> 253 <div class="list-group condensed">
254 - <label>Camadas de fundo</label> 254 + <label>{{{camadasDeFundo}}}</label>
255 <a data-target="#collapseFundo" class="btn btn-sm btn-primary pull-right" style="margin-top: 0px;padding-top: 0px;padding-bottom: 0px;" type="button" data-toggle="collapse" > 255 <a data-target="#collapseFundo" class="btn btn-sm btn-primary pull-right" style="margin-top: 0px;padding-top: 0px;padding-bottom: 0px;" type="button" data-toggle="collapse" >
256 <span class="caret"></span> 256 <span class="caret"></span>
257 </a> 257 </a>
js/compactados/ajuda_compacto.js 100644 → 100755
  Diff comments   View file @388d24f
js/compactados/analise_compacto.js 100644 → 100755
  Diff comments   View file @388d24f
js/compactados/arvoredecamadas_compacto.js 100644 → 100755
  Diff comments   View file @388d24f
js/compactados/arvoredetemas_compacto.js 100644 → 100755
  Diff comments   View file @388d24f
js/compactados/base64_compacto.js 100644 → 100755
  Diff comments   View file @388d24f
js/compactados/busca_compacto.js 100644 → 100755
  Diff comments   View file @388d24f
js/compactados/caixaDeFerramentas_compacto.js 100644 → 100755
  Diff comments   View file @388d24f
js/compactados/calculo_compacto.js 100644 → 100755
  Diff comments   View file @388d24f
js/compactados/catalogoDir_compacto.js 100644 → 100755
  Diff comments   View file @388d24f
js/compactados/catalogoEstrelas_compacto.js 100644 → 100755
  Diff comments   View file @388d24f
js/compactados/catalogoInde_compacto.js 100644 → 100755
  Diff comments   View file @388d24f
js/compactados/catalogoMapas_compacto.js 100644 → 100755
  Diff comments   View file @388d24f
js/compactados/catalogoMenus_compacto.js 100644 → 100755
  Diff comments   View file @388d24f
js/compactados/catalogoMetaestat_compacto.js 100644 → 100755
  Diff comments   View file @388d24f
js/compactados/catalogoOgc_compacto.js 100644 → 100755
  Diff comments   View file @388d24f
js/compactados/catalogoRegioes_compacto.js 100644 → 100755
  Diff comments   View file @388d24f
js/compactados/catalogoSistemas_compacto.js 100644 → 100755
  Diff comments   View file @388d24f
js/compactados/configura_compacto.js 100644 → 100755
  Diff comments   View file @388d24f
js/compactados/coordenadas_compacto.js 100644 → 100755
  Diff comments   View file @388d24f
js/compactados/desenho_compacto.js 100644 → 100755
  Diff comments   View file @388d24f
js/compactados/dicionario_ajuda_compacto.js 100644 → 100755
  Diff comments   View file @388d24f
js/compactados/dicionario_compacto.js 100644 → 100755
  Diff comments   View file @388d24f
js/compactados/editor_compacto.js 100644 → 100755
  Diff comments   View file @388d24f
js/compactados/eventos_compacto.js 100644 → 100755
  Diff comments   View file @388d24f
js/compactados/guias_compacto.js 100644 → 100755
  Diff comments   View file @388d24f
js/compactados/idioma_compacto.js 100644 → 100755
  Diff comments   View file @388d24f
js/compactados/ini_i3geo_compacto.js 100644 → 100755
  Diff comments   View file @388d24f
js/compactados/interface_compacto.js 100644 → 100755
  Diff comments   View file @388d24f
js/compactados/janela_compacto.js 100644 → 100755
  Diff comments   View file @388d24f
js/compactados/legenda_compacto.js 100644 → 100755
  Diff comments   View file @388d24f
js/compactados/login_compacto.js 100644 → 100755
  Diff comments   View file @388d24f
js/compactados/mapa_compacto.js 100644 → 100755
  Diff comments   View file @388d24f
js/compactados/maparef_compacto.js 100644 → 100755
  Diff comments   View file @388d24f
js/compactados/marcador_compacto.js 100644 → 100755
  Diff comments   View file @388d24f
js/compactados/mustache.js 100644 → 100755
  Diff comments   View file @388d24f
js/compactados/navega_compacto.js 100644 → 100755
  Diff comments   View file @388d24f
js/compactados/php_compacto.js 100644 → 100755
  Diff comments   View file @388d24f
js/compactados/plugini3geo_compacto.js 100644 → 100755
  Diff comments   View file @388d24f
js/compactados/proj4js.js 100644 → 100755
  Diff comments   View file @388d24f
js/compactados/social_compacto.js 100644 → 100755
  Diff comments   View file @388d24f
js/compactados/tema_compacto.js 100644 → 100755
  Diff comments   View file @388d24f
js/compactados/util_compacto.js 100644 → 100755
  Diff comments   View file @388d24f
js/compactados/wicket.js 100644 → 100755
  Diff comments   View file @388d24f
js/dicionario.js
  Diff comments   View file @388d24f
@@ -2983,5 +2983,10 @@ g_traducao = @@ -2983,5 +2983,10 @@ g_traducao =
2983 pt : "Essa op&ccedil;&atilde;o pode n&atilde;o funcionar corretamente devido a vers&atilde;o do sistema (Mapserver)", 2983 pt : "Essa op&ccedil;&atilde;o pode n&atilde;o funcionar corretamente devido a vers&atilde;o do sistema (Mapserver)",
2984 en : "", 2984 en : "",
2985 es : "" 2985 es : ""
  2986 + }],
  2987 + "camadasDeFundo" : [{
  2988 + pt : "Camadas de fundo",
  2989 + en : "",
  2990 + es : ""
2986 }] 2991 }]
2987 }; 2992 };
2988 \ No newline at end of file 2993 \ No newline at end of file
js/i3geo_tudo_compacto7.js.php 100644 → 100755
  Diff comments   View file @388d24f
pacotes/cpaint/cpaint2_compacto.inc.js 100644 → 100755
  Diff comments   View file @388d24f
pacotes/mobileesp/mdetect_compacto.js 100644 → 100755
  Diff comments   View file @388d24f
pacotes/yui290/build/carousel/carousel_compacto.js 100644 → 100755
  Diff comments   View file @388d24f
pacotes/yui290/build/container/container_compacto.js 100644 → 100755
  Diff comments   View file @388d24f
pacotes/yui290/build/container/container_core_compacto.js 100644 → 100755
  Diff comments   View file @388d24f
pacotes/yui290/build/resize/resize_compacto.js 100644 → 100755
  Diff comments   View file @388d24f
pacotes/yui290/build/treeview/treeview_compacto.js 100644 → 100755
  Diff comments   View file @388d24f
pacotes/yui290/build/utilities/utilities_compacto.js 100644 → 100755
  Diff comments   View file @388d24f