diff --git a/css/default.css b/css/default.css
index feaa594..19978be 100755
--- a/css/default.css
+++ b/css/default.css
@@ -937,11 +937,11 @@ td {
max-width: 100%;
font-weight: unset;
}
-
+/*
.bd table tr:first-of-type td {
padding: 5px;
}
-
+*/
.bd td {
border: 0px solid #89afd4;
padding: 0px;
diff --git a/css/i3geo7.css.php b/css/i3geo7.css.php
old mode 100644
new mode 100755
index bec61fe..bec61fe
--- a/css/i3geo7.css.php
+++ b/css/i3geo7.css.php
diff --git a/ferramentas/editorgm/editorgm_compacto.js b/ferramentas/editorgm/editorgm_compacto.js
old mode 100644
new mode 100755
index cc66aa6..cc66aa6
--- 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 100644
new mode 100755
index 8df1c51..8df1c51
--- a/ferramentas/editorol/editorol_compacto.js
+++ b/ferramentas/editorol/editorol_compacto.js
diff --git a/ferramentas/tipoimagem/index.js b/ferramentas/tipoimagem/index.js
index 5a93b63..ba2765f 100755
--- a/ferramentas/tipoimagem/index.js
+++ b/ferramentas/tipoimagem/index.js
@@ -32,34 +32,34 @@ Você deve ter recebido uma cópia da Licença Pública G
GNU junto com este programa; se não, escreva para a
Free Software Foundation, Inc., no endereço
59 Temple Street, Suite 330, Boston, MA 02111-1307 USA.
-*/
+ */
if(typeof(i3GEOF) === 'undefined'){
var i3GEOF = {};
}
/*
Classe: i3GEOF.tipoimagem
-*/
+ */
i3GEOF.tipoimagem = {
- /*
+ /*
Variavel: aguarde
Estilo do objeto DOM com a imagem de aguarde existente no cabeçalho da janela.
- */
- aguarde: "",
- /**
- * Template no formato mustache. E preenchido na carga do javascript com o programa dependencias.php
- */
- MUSTACHE : "",
- /**
- * Susbtitutos para o template
- */
- mustacheHash : function() {
- var dicionario = i3GEO.idioma.objetoIdioma(i3GEOF.tipoimagem.dicionario);
- dicionario["locaplic"] = i3GEO.configura.locaplic;
- dicionario["asp"] = '"';
- return dicionario;
- },
- /*
+ */
+ aguarde: "",
+ /**
+ * Template no formato mustache. E preenchido na carga do javascript com o programa dependencias.php
+ */
+ MUSTACHE : "",
+ /**
+ * Susbtitutos para o template
+ */
+ mustacheHash : function() {
+ var dicionario = i3GEO.idioma.objetoIdioma(i3GEOF.tipoimagem.dicionario);
+ dicionario["locaplic"] = i3GEO.configura.locaplic;
+ dicionario["asp"] = '"';
+ return dicionario;
+ },
+ /*
Function: inicia
Inicia a ferramenta. É chamado por criaJanelaFlutuante
@@ -67,26 +67,28 @@ i3GEOF.tipoimagem = {
Parametro:
iddiv {String} - id do div que receberá o conteudo HTML da ferramenta
- */
- inicia: function(iddiv){
- if(i3GEOF.tipoimagem.MUSTACHE == ""){
- $.get(i3GEO.configura.locaplic + "/ferramentas/tipoimagem/template_mst.html", function(template) {
- i3GEOF.tipoimagem.MUSTACHE = template;
- i3GEOF.tipoimagem.inicia(iddiv);
- });
- return;
- }
+ */
+ inicia: function(iddiv){
+ if(i3GEOF.tipoimagem.MUSTACHE == ""){
+ $.get(i3GEO.configura.locaplic + "/ferramentas/tipoimagem/template_mst.html", function(template) {
+ i3GEOF.tipoimagem.MUSTACHE = template;
+ i3GEOF.tipoimagem.inicia(iddiv);
+ });
+ return;
+ }
var f;
$i(iddiv).innerHTML += i3GEOF.tipoimagem.html();
-
- f = i3GEO.configura.tipoimagem;
- if(f == 'nenhum'){
- f = "";
- }
- $i("i3GEOFtipoImagemListaDeFiltros").value = f;
- },
- /*
+ if(i3GEO.configura.tipoimagem != "nenhum"){
+ var aplica = i3GEO.configura.tipoimagem.split(" ");
+ $( "#tipoimagemForm input" ).each(function( index ) {
+ if(jQuery.inArray($( this ).prop("name"), aplica) !== -1){
+ $( this ).prop("checked",true);
+ }
+ });
+ }
+ },
+ /*
Function: html
Gera o código html para apresentação das opções da ferramenta
@@ -94,72 +96,67 @@ i3GEOF.tipoimagem = {
Retorno:
String com o código html
- */
- html:function() {
- var ins = Mustache.render(i3GEOF.tipoimagem.MUSTACHE, i3GEOF.tipoimagem.mustacheHash());
- return ins;
- },
- /*
+ */
+ html:function() {
+ var ins = Mustache.render(i3GEOF.tipoimagem.MUSTACHE, i3GEOF.tipoimagem.mustacheHash());
+ return ins;
+ },
+ /*
Function: iniciaJanelaFlutuante
Cria a janela flutuante para controle da ferramenta.
- */
- iniciaJanelaFlutuante: function(){
- var janela,divid,titulo,cabecalho,minimiza;
- if ($i("i3GEOF.tipoimagem")) {
- return;
- }
- cabecalho = function(){};
- minimiza = function(){
- i3GEO.janela.minimiza("i3GEOF.tipoimagem",200);
- };
- //cria a janela flutuante
- titulo = "" + $trad("p2") + "";
- janela = i3GEO.janela.cria(
- "310px",
- "260px",
- "",
- "",
- "",
- titulo,
- "i3GEOF.tipoimagem",
- false,
- "hd",
- cabecalho,
- minimiza,
- "",
- true,
- "",
- "",
- "",
- "",
- "1"
- );
- divid = janela[2].id;
- $i("i3GEOF.tipoimagem_corpo").style.backgroundColor = "white";
- $i("i3GEOF.tipoimagem_corpo").style.textAlign = "left";
- i3GEOF.tipoimagem.aguarde = $i("i3GEOF.tipoimagem_imagemCabecalho").style;
- i3GEOF.tipoimagem.inicia(divid);
- },
- /*
+ */
+ iniciaJanelaFlutuante: function(){
+ var janela,divid,titulo,cabecalho,minimiza;
+ if ($i("i3GEOF.tipoimagem")) {
+ return;
+ }
+ cabecalho = function(){};
+ minimiza = function(){
+ i3GEO.janela.minimiza("i3GEOF.tipoimagem",200);
+ };
+ //cria a janela flutuante
+ titulo = "" + $trad("p2") + "";
+ janela = i3GEO.janela.cria(
+ "310px",
+ "260px",
+ "",
+ "",
+ "",
+ titulo,
+ "i3GEOF.tipoimagem",
+ false,
+ "hd",
+ cabecalho,
+ minimiza,
+ "",
+ true,
+ "",
+ "",
+ "",
+ "",
+ "1"
+ );
+ divid = janela[2].id;
+ $i("i3GEOF.tipoimagem_corpo").style.backgroundColor = "white";
+ i3GEOF.tipoimagem.aguarde = $i("i3GEOF.tipoimagem_imagemCabecalho").style;
+ i3GEOF.tipoimagem.inicia(divid);
+ },
+ /*
Function: aplicar
Aplica o filtro de imagem escolhido
- */
- aplicar: function(){
- var filtro = $i("i3GEOFtipoImagemListaDeFiltros").value;
- if(filtro == "")
- {filtro = 'nenhum';}
- i3GEO.configura.tipoimagem = filtro;
- i3GEO.Interface.alteraParametroLayers("TIPOIMAGEM",filtro);
- i3GEO.Interface.openlayers.atualizaMapa();
- },
- /*
- Function: adicionar
-
- Adiciona um filtro na lista de filtros que serão aplicados
- */
- adicionar: function(filtro){
- $i("i3GEOFtipoImagemListaDeFiltros").value = $i("i3GEOFtipoImagemListaDeFiltros").value+" "+filtro;
- }
+ */
+ aplicar: function(){
+ var f = [];
+ $( "#tipoimagemForm input:checked" ).each(function( index ) {
+ f.push($( this ).prop("name"));
+ });
+ if(f.length == 0){
+ f = ["nenhum"];
+ }
+ i3GEO.configura.tipoimagem = f.join(" ");
+ i3GEO.Interface.alteraParametroLayers("TIPOIMAGEM",f.join(" "));
+ i3GEO.Interface.openlayers.atualizaMapa();
+ }
};
\ No newline at end of file
diff --git a/ferramentas/tipoimagem/template_mst.html b/ferramentas/tipoimagem/template_mst.html
index 9218739..7af0321 100755
--- a/ferramentas/tipoimagem/template_mst.html
+++ b/ferramentas/tipoimagem/template_mst.html
@@ -1,104 +1,153 @@
{{{selecionaFiltro}}}
-
-
-
-
-
-
-
-
+
\ No newline at end of file
diff --git a/js/compactados/ajuda_compacto.js b/js/compactados/ajuda_compacto.js
old mode 100644
new mode 100755
index 8e4086f..8e4086f
--- a/js/compactados/ajuda_compacto.js
+++ b/js/compactados/ajuda_compacto.js
diff --git a/js/compactados/analise_compacto.js b/js/compactados/analise_compacto.js
old mode 100644
new mode 100755
index a3ab166..a3ab166
--- a/js/compactados/analise_compacto.js
+++ b/js/compactados/analise_compacto.js
diff --git a/js/compactados/arvoredecamadas_compacto.js b/js/compactados/arvoredecamadas_compacto.js
old mode 100644
new mode 100755
index f0f9fe2..f0f9fe2
--- a/js/compactados/arvoredecamadas_compacto.js
+++ b/js/compactados/arvoredecamadas_compacto.js
diff --git a/js/compactados/arvoredetemas_compacto.js b/js/compactados/arvoredetemas_compacto.js
old mode 100644
new mode 100755
index 192e851..192e851
--- a/js/compactados/arvoredetemas_compacto.js
+++ b/js/compactados/arvoredetemas_compacto.js
diff --git a/js/compactados/base64_compacto.js b/js/compactados/base64_compacto.js
old mode 100644
new mode 100755
index 9ff1f1a..9ff1f1a
--- a/js/compactados/base64_compacto.js
+++ b/js/compactados/base64_compacto.js
diff --git a/js/compactados/busca_compacto.js b/js/compactados/busca_compacto.js
old mode 100644
new mode 100755
index 380c4a5..380c4a5
--- a/js/compactados/busca_compacto.js
+++ b/js/compactados/busca_compacto.js
diff --git a/js/compactados/caixaDeFerramentas_compacto.js b/js/compactados/caixaDeFerramentas_compacto.js
old mode 100644
new mode 100755
index 33f12c4..33f12c4
--- a/js/compactados/caixaDeFerramentas_compacto.js
+++ b/js/compactados/caixaDeFerramentas_compacto.js
diff --git a/js/compactados/calculo_compacto.js b/js/compactados/calculo_compacto.js
old mode 100644
new mode 100755
index 32b90de..32b90de
--- a/js/compactados/calculo_compacto.js
+++ b/js/compactados/calculo_compacto.js
diff --git a/js/compactados/catalogoDir_compacto.js b/js/compactados/catalogoDir_compacto.js
old mode 100644
new mode 100755
index f414552..f414552
--- a/js/compactados/catalogoDir_compacto.js
+++ b/js/compactados/catalogoDir_compacto.js
diff --git a/js/compactados/catalogoEstrelas_compacto.js b/js/compactados/catalogoEstrelas_compacto.js
old mode 100644
new mode 100755
index 7d8e059..7d8e059
--- a/js/compactados/catalogoEstrelas_compacto.js
+++ b/js/compactados/catalogoEstrelas_compacto.js
diff --git a/js/compactados/catalogoInde_compacto.js b/js/compactados/catalogoInde_compacto.js
old mode 100644
new mode 100755
index 5ee129b..5ee129b
--- a/js/compactados/catalogoInde_compacto.js
+++ b/js/compactados/catalogoInde_compacto.js
diff --git a/js/compactados/catalogoMapas_compacto.js b/js/compactados/catalogoMapas_compacto.js
old mode 100644
new mode 100755
index 670e4ce..670e4ce
--- a/js/compactados/catalogoMapas_compacto.js
+++ b/js/compactados/catalogoMapas_compacto.js
diff --git a/js/compactados/catalogoMenus_compacto.js b/js/compactados/catalogoMenus_compacto.js
old mode 100644
new mode 100755
index 7014248..7014248
--- a/js/compactados/catalogoMenus_compacto.js
+++ b/js/compactados/catalogoMenus_compacto.js
diff --git a/js/compactados/catalogoMetaestat_compacto.js b/js/compactados/catalogoMetaestat_compacto.js
old mode 100644
new mode 100755
index 2787ab5..2787ab5
--- a/js/compactados/catalogoMetaestat_compacto.js
+++ b/js/compactados/catalogoMetaestat_compacto.js
diff --git a/js/compactados/catalogoOgc_compacto.js b/js/compactados/catalogoOgc_compacto.js
old mode 100644
new mode 100755
index ffce5a9..ffce5a9
--- a/js/compactados/catalogoOgc_compacto.js
+++ b/js/compactados/catalogoOgc_compacto.js
diff --git a/js/compactados/catalogoRegioes_compacto.js b/js/compactados/catalogoRegioes_compacto.js
old mode 100644
new mode 100755
index 404db8e..404db8e
--- a/js/compactados/catalogoRegioes_compacto.js
+++ b/js/compactados/catalogoRegioes_compacto.js
diff --git a/js/compactados/catalogoSistemas_compacto.js b/js/compactados/catalogoSistemas_compacto.js
old mode 100644
new mode 100755
index 9245cfc..9245cfc
--- a/js/compactados/catalogoSistemas_compacto.js
+++ b/js/compactados/catalogoSistemas_compacto.js
diff --git a/js/compactados/configura_compacto.js b/js/compactados/configura_compacto.js
old mode 100644
new mode 100755
index e3d6fe5..e3d6fe5
--- a/js/compactados/configura_compacto.js
+++ b/js/compactados/configura_compacto.js
diff --git a/js/compactados/coordenadas_compacto.js b/js/compactados/coordenadas_compacto.js
old mode 100644
new mode 100755
index 404bf09..404bf09
--- a/js/compactados/coordenadas_compacto.js
+++ b/js/compactados/coordenadas_compacto.js
diff --git a/js/compactados/desenho_compacto.js b/js/compactados/desenho_compacto.js
old mode 100644
new mode 100755
index 5f8b91a..5f8b91a
--- a/js/compactados/desenho_compacto.js
+++ b/js/compactados/desenho_compacto.js
diff --git a/js/compactados/dicionario_ajuda_compacto.js b/js/compactados/dicionario_ajuda_compacto.js
old mode 100644
new mode 100755
index e69de29..e69de29
--- a/js/compactados/dicionario_ajuda_compacto.js
+++ b/js/compactados/dicionario_ajuda_compacto.js
diff --git a/js/compactados/dicionario_compacto.js b/js/compactados/dicionario_compacto.js
old mode 100644
new mode 100755
index 1f8931a..1f8931a
--- a/js/compactados/dicionario_compacto.js
+++ b/js/compactados/dicionario_compacto.js
diff --git a/js/compactados/editor_compacto.js b/js/compactados/editor_compacto.js
old mode 100644
new mode 100755
index c77bc37..c77bc37
--- a/js/compactados/editor_compacto.js
+++ b/js/compactados/editor_compacto.js
diff --git a/js/compactados/eventos_compacto.js b/js/compactados/eventos_compacto.js
old mode 100644
new mode 100755
index cda2a72..cda2a72
--- a/js/compactados/eventos_compacto.js
+++ b/js/compactados/eventos_compacto.js
diff --git a/js/compactados/guias_compacto.js b/js/compactados/guias_compacto.js
old mode 100644
new mode 100755
index d0c1361..d0c1361
--- a/js/compactados/guias_compacto.js
+++ b/js/compactados/guias_compacto.js
diff --git a/js/compactados/idioma_compacto.js b/js/compactados/idioma_compacto.js
old mode 100644
new mode 100755
index 50f94a7..50f94a7
--- a/js/compactados/idioma_compacto.js
+++ b/js/compactados/idioma_compacto.js
diff --git a/js/compactados/ini_i3geo_compacto.js b/js/compactados/ini_i3geo_compacto.js
old mode 100644
new mode 100755
index 9bab14a..9bab14a
--- a/js/compactados/ini_i3geo_compacto.js
+++ b/js/compactados/ini_i3geo_compacto.js
diff --git a/js/compactados/interface_compacto.js b/js/compactados/interface_compacto.js
old mode 100644
new mode 100755
index 9eb415a..9eb415a
--- a/js/compactados/interface_compacto.js
+++ b/js/compactados/interface_compacto.js
diff --git a/js/compactados/janela_compacto.js b/js/compactados/janela_compacto.js
old mode 100644
new mode 100755
index cc79de3..cc79de3
--- a/js/compactados/janela_compacto.js
+++ b/js/compactados/janela_compacto.js
diff --git a/js/compactados/legenda_compacto.js b/js/compactados/legenda_compacto.js
old mode 100644
new mode 100755
index 864b4a9..864b4a9
--- a/js/compactados/legenda_compacto.js
+++ b/js/compactados/legenda_compacto.js
diff --git a/js/compactados/login_compacto.js b/js/compactados/login_compacto.js
old mode 100644
new mode 100755
index 6d4d052..6d4d052
--- a/js/compactados/login_compacto.js
+++ b/js/compactados/login_compacto.js
diff --git a/js/compactados/mapa_compacto.js b/js/compactados/mapa_compacto.js
old mode 100644
new mode 100755
index 589292f..589292f
--- a/js/compactados/mapa_compacto.js
+++ b/js/compactados/mapa_compacto.js
diff --git a/js/compactados/maparef_compacto.js b/js/compactados/maparef_compacto.js
old mode 100644
new mode 100755
index e99060c..e99060c
--- a/js/compactados/maparef_compacto.js
+++ b/js/compactados/maparef_compacto.js
diff --git a/js/compactados/marcador_compacto.js b/js/compactados/marcador_compacto.js
old mode 100644
new mode 100755
index 64fd288..64fd288
--- a/js/compactados/marcador_compacto.js
+++ b/js/compactados/marcador_compacto.js
diff --git a/js/compactados/mustache.js b/js/compactados/mustache.js
old mode 100644
new mode 100755
index 7473a81..7473a81
--- a/js/compactados/mustache.js
+++ b/js/compactados/mustache.js
diff --git a/js/compactados/navega_compacto.js b/js/compactados/navega_compacto.js
old mode 100644
new mode 100755
index 30c3799..30c3799
--- a/js/compactados/navega_compacto.js
+++ b/js/compactados/navega_compacto.js
diff --git a/js/compactados/php_compacto.js b/js/compactados/php_compacto.js
old mode 100644
new mode 100755
index 5514e62..5514e62
--- a/js/compactados/php_compacto.js
+++ b/js/compactados/php_compacto.js
diff --git a/js/compactados/plugini3geo_compacto.js b/js/compactados/plugini3geo_compacto.js
old mode 100644
new mode 100755
index 85e2916..85e2916
--- a/js/compactados/plugini3geo_compacto.js
+++ b/js/compactados/plugini3geo_compacto.js
diff --git a/js/compactados/proj4js.js b/js/compactados/proj4js.js
old mode 100644
new mode 100755
index 9bdc4ce..9bdc4ce
--- a/js/compactados/proj4js.js
+++ b/js/compactados/proj4js.js
diff --git a/js/compactados/social_compacto.js b/js/compactados/social_compacto.js
old mode 100644
new mode 100755
index 8aa672a..8aa672a
--- a/js/compactados/social_compacto.js
+++ b/js/compactados/social_compacto.js
diff --git a/js/compactados/tema_compacto.js b/js/compactados/tema_compacto.js
old mode 100644
new mode 100755
index e02bc59..e02bc59
--- a/js/compactados/tema_compacto.js
+++ b/js/compactados/tema_compacto.js
diff --git a/js/compactados/util_compacto.js b/js/compactados/util_compacto.js
old mode 100644
new mode 100755
index 41ac34d..41ac34d
--- a/js/compactados/util_compacto.js
+++ b/js/compactados/util_compacto.js
diff --git a/js/compactados/wicket.js b/js/compactados/wicket.js
old mode 100644
new mode 100755
index e0e5f3b..e0e5f3b
--- a/js/compactados/wicket.js
+++ b/js/compactados/wicket.js
diff --git a/js/i3geo_tudo_compacto7.js.php b/js/i3geo_tudo_compacto7.js.php
old mode 100644
new mode 100755
index 066fbfb..066fbfb
--- a/js/i3geo_tudo_compacto7.js.php
+++ b/js/i3geo_tudo_compacto7.js.php
diff --git a/pacotes/cpaint/cpaint2_compacto.inc.js b/pacotes/cpaint/cpaint2_compacto.inc.js
old mode 100644
new mode 100755
index 1179423..1179423
--- a/pacotes/cpaint/cpaint2_compacto.inc.js
+++ b/pacotes/cpaint/cpaint2_compacto.inc.js
diff --git a/pacotes/mobileesp/mdetect_compacto.js b/pacotes/mobileesp/mdetect_compacto.js
old mode 100644
new mode 100755
index 9ab0db5..9ab0db5
--- a/pacotes/mobileesp/mdetect_compacto.js
+++ b/pacotes/mobileesp/mdetect_compacto.js
diff --git a/pacotes/yui290/build/carousel/carousel_compacto.js b/pacotes/yui290/build/carousel/carousel_compacto.js
old mode 100644
new mode 100755
index 2111cd6..2111cd6
--- a/pacotes/yui290/build/carousel/carousel_compacto.js
+++ b/pacotes/yui290/build/carousel/carousel_compacto.js
diff --git a/pacotes/yui290/build/container/container_compacto.js b/pacotes/yui290/build/container/container_compacto.js
old mode 100644
new mode 100755
index aa7fb0c..aa7fb0c
--- a/pacotes/yui290/build/container/container_compacto.js
+++ b/pacotes/yui290/build/container/container_compacto.js
diff --git a/pacotes/yui290/build/container/container_core_compacto.js b/pacotes/yui290/build/container/container_core_compacto.js
old mode 100644
new mode 100755
index f2c2d3c..f2c2d3c
--- a/pacotes/yui290/build/container/container_core_compacto.js
+++ b/pacotes/yui290/build/container/container_core_compacto.js
diff --git a/pacotes/yui290/build/resize/resize_compacto.js b/pacotes/yui290/build/resize/resize_compacto.js
old mode 100644
new mode 100755
index 335f70f..335f70f
--- a/pacotes/yui290/build/resize/resize_compacto.js
+++ b/pacotes/yui290/build/resize/resize_compacto.js
diff --git a/pacotes/yui290/build/treeview/treeview_compacto.js b/pacotes/yui290/build/treeview/treeview_compacto.js
old mode 100644
new mode 100755
index 6ff4374..6ff4374
--- a/pacotes/yui290/build/treeview/treeview_compacto.js
+++ b/pacotes/yui290/build/treeview/treeview_compacto.js
diff --git a/pacotes/yui290/build/utilities/utilities_compacto.js b/pacotes/yui290/build/utilities/utilities_compacto.js
old mode 100644
new mode 100755
index 7a1455c..7a1455c
--- a/pacotes/yui290/build/utilities/utilities_compacto.js
+++ b/pacotes/yui290/build/utilities/utilities_compacto.js
--
libgit2 0.21.2