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

Murilo Caixêta
2 parents 02cc18bf aed13b46
Showing 65 changed files with 35 additions and 8 deletions Show diff stats
css/i3geo7.css.php
ferramentas/editorgm/editorgm_compacto.js
ferramentas/editorol/editorol_compacto.js
interface/carto_ol.htm
interface/config.php
interface/gm.phtml
interface/gmdebug.phtml
interface/googlemaps_noite.phtml
interface/ol.htm
interface/openlayersdebug.htm
interface/osm.htm
interface/osmdebug.htm
js/compactados/ajuda_compacto.js
js/compactados/analise_compacto.js
js/compactados/arvoredecamadas_compacto.js
js/compactados/arvoredetemas_compacto.js
js/compactados/base64_compacto.js
js/compactados/busca_compacto.js
js/compactados/caixaDeFerramentas_compacto.js
js/compactados/calculo_compacto.js
@@ -253,7 +253,7 @@
 					no programa interface/config.php
 					-->
 					<div class="list-group condensed">
-						<label>Camadas de fundo</label>
+						<label>{{{camadasDeFundo}}}</label>
 						<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" >
 	  						<span class="caret"></span>
 						</a>
@@ -118,6 +118,28 @@ i3GEO.janela.ativaAlerta();
 										}) ]
 							})
 				});
+       /*
+       var esus = new ol.layer.Tile(
+				{
+					title : "ESUS Gestor",
+					visible : true,
+					isBaseLayer : true,
+					name : "osm",
+					source : new ol.source.TileWMS(
+							{
+								url : "http://192.168.1.112/mapcache/wms",
+								params : {
+									'layers' : "osm",
+									'srs' : "EPSG:4326",
+									'format' : "image/png"
+								},
+                                attributions : [ new ol.Attribution(
+                                        {
+                                            html : '&copy; </a>'
+                                        }) ]
+							})
+				});
+         */
 		i3GEO.Interface.openlayers.LAYERSADICIONAIS = [ eng, oce, ims, wsm,
 		                                                bra, tms ];
 	}
@@ -265,7 +265,7 @@ include(&quot;../ms_configura.php&quot;);
                     no programa interface/config.php
                     -->
                     <div class="list-group condensed">
-                        <label>Camadas de fundo</label>
+                        <label>{{{camadasDeFundo}}}</label>
                         <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" >
                             <span class="caret"></span>
                         </a>
@@ -265,7 +265,7 @@ include(&quot;../ms_configura.php&quot;);
 					no programa interface/config.php
 					-->
 					<div class="list-group condensed">
-						<label>Camadas de fundo</label>
+						<label>{{{camadasDeFundo}}}</label>
 						<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" >
 	  						<span class="caret"></span>
 						</a>
@@ -265,7 +265,7 @@ include(&quot;../ms_configura.php&quot;);
                     no programa interface/config.php
                     -->
                     <div class="list-group condensed">
-                        <label>Camadas de fundo</label>
+                        <label>{{{camadasDeFundo}}}</label>
                         <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" >
                             <span class="caret"></span>
                         </a>
@@ -251,7 +251,7 @@
 					no programa interface/config.php
 					-->
 					<div class="list-group condensed">
-						<label>Camadas de fundo</label>
+						<label>{{{camadasDeFundo}}}</label>
 						<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" >
 	  						<span class="caret"></span>
 						</a>
@@ -251,7 +251,7 @@
 					no programa interface/config.php
 					-->
 					<div class="list-group condensed">
-						<label>Camadas de fundo</label>
+						<label>{{{camadasDeFundo}}}</label>
 						<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" >
 	  						<span class="caret"></span>
 						</a>
@@ -251,7 +251,7 @@
 					no programa interface/config.php
 					-->
 					<div class="list-group condensed">
-						<label>Camadas de fundo</label>
+						<label>{{{camadasDeFundo}}}</label>
 						<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" >
 	  						<span class="caret"></span>
 						</a>
@@ -251,7 +251,7 @@
 					no programa interface/config.php
 					-->
 					<div class="list-group condensed">
-						<label>Camadas de fundo</label>
+						<label>{{{camadasDeFundo}}}</label>
 						<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" >
 	  						<span class="caret"></span>
 						</a>
@@ -2983,5 +2983,10 @@ g_traducao =
 			pt : "Essa op&ccedil;&atilde;o pode n&atilde;o funcionar corretamente devido a vers&atilde;o do sistema (Mapserver)",
 			en : "",
 			es : ""
+		}],
+		"camadasDeFundo" : [{
+			pt : "Camadas de fundo",
+			en : "",
+			es : ""
 		}]
 	};
 \ No newline at end of file
...	...	@@ -253,7 +253,7 @@
253	253	no programa interface/config.php
254	254	-->
255	255	<div class="list-group condensed">
256		- <label>Camadas de fundo</label>
	256	+ <label>{{{camadasDeFundo}}}</label>
257	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	258	<span class="caret"></span>
259	259	</a>
...	...
...	...	@@ -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 : '© </a>'
	139	+ }) ]
	140	+ })
	141	+ });
	142	+ */
121	143	i3GEO.Interface.openlayers.LAYERSADICIONAIS = [ eng, oce, ims, wsm,
122	144	bra, tms ];
123	145	}
...	...
...	...	@@ -265,7 +265,7 @@ include("../ms_configura.php");
265	265	no programa interface/config.php
266	266	-->
267	267	<div class="list-group condensed">
268		- <label>Camadas de fundo</label>
	268	+ <label>{{{camadasDeFundo}}}</label>
269	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	270	<span class="caret"></span>
271	271	</a>
...	...
...	...	@@ -251,7 +251,7 @@
251	251	no programa interface/config.php
252	252	-->
253	253	<div class="list-group condensed">
254		- <label>Camadas de fundo</label>
	254	+ <label>{{{camadasDeFundo}}}</label>
255	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	256	<span class="caret"></span>
257	257	</a>
...	...
...	...	@@ -2983,5 +2983,10 @@ g_traducao =
2983	2983	pt : "Essa opção pode não funcionar corretamente devido a versão do sistema (Mapserver)",
2984	2984	en : "",
2985	2985	es : ""
	2986	+ }],
	2987	+ "camadasDeFundo" : [{
	2988	+ pt : "Camadas de fundo",
	2989	+ en : "",
	2990	+ es : ""
2986	2991	}]
2987	2992	};
2988	2993	\ No newline at end of file
...	...