From 5c73020e1f69ab04cf458ed16bec9c6c0d0ad989 Mon Sep 17 00:00:00 2001 From: Edmar Moretti Date: Wed, 15 Oct 2014 13:48:29 +0000 Subject: [PATCH] --- classesphp/classe_toponimia.php | 12 ++++++++---- css/geral.css | 13 +++++++++++-- css/i3geo6.css | 12 ++++++++++-- css/i3geo6.css.php | 12 ++++++++++-- ferramentas/etiqueta/exec.php | 6 +++++- ferramentas/etiqueta/index.js | 80 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------- ferramentas/etiqueta/template_mst.html | 2 +- 7 files changed, 110 insertions(+), 27 deletions(-) diff --git a/classesphp/classe_toponimia.php b/classesphp/classe_toponimia.php index 6f1c687..0a5c145 100644 --- a/classesphp/classe_toponimia.php +++ b/classesphp/classe_toponimia.php @@ -314,14 +314,18 @@ $item Lista de Itens separados por vírgula que serão utilizados. if(!$this->layer){return "erro";} $itens = $this->layer->getmetadata("ITENS"); $itens = explode(",",$itens); - $itensdesc = $this->layer->getmetadata("ITENSDESC"); + $itensdesc = mb_convert_encoding($this->layer->getmetadata("ITENSDESC"),"UTF-8","ISO-8859-1"); $itensdesc = explode(",",$itensdesc); + $itenslink = $this->layer->getmetadata("ITENSLINK"); + $itenslink = explode(",",$itenslink); + $tips = $this->layer->getmetadata("TIP"); + $res = array( "itens"=>$itens, - "itensdesc"=>$itensdesc, - "tips"=>explode(",",$tips), - "comb"=>array_combine($itens,$itensdesc) + "itensdesc"=>array_combine($itens,$itensdesc), + "itenslink"=>array_combine($itens,$itenslink), + "tips"=>explode(",",$tips) ); return($res); } diff --git a/css/geral.css b/css/geral.css index c51ed62..7a03fd8 100644 --- a/css/geral.css +++ b/css/geral.css @@ -1033,7 +1033,16 @@ h1 { border-radius: 2px; } -.styled-select select { +.styled-select150 { + width: 150px; + overflow: hidden; + background: #F8F8F8; + border: 1px solid #DDDDDD; + height: 22px; + border-radius: 2px; +} + +.styled-select select, .styled-select150 select { width: 120%; height: 22px; border: 0; @@ -1053,7 +1062,7 @@ h1 { } } -.styled-select input { +.styled-select input, .styled-select150 input { width: 100%; height: 22px; border: 0; diff --git a/css/i3geo6.css b/css/i3geo6.css index 1b3c64d..ca0dd24 100755 --- a/css/i3geo6.css +++ b/css/i3geo6.css @@ -915,7 +915,15 @@ border: 1px solid #DDDDDD; height: 22px; border-radius: 2px; } -.styled-select select { +.styled-select150 { +width: 150px; +overflow: hidden; +background: #F8F8F8; +border: 1px solid #DDDDDD; +height: 22px; +border-radius: 2px; +} +.styled-select select, .styled-select150 select { width: 120%; height: 22px; border: 0; @@ -934,7 +942,7 @@ background: transparent url("../imagens/menuarodwn8_nrm_1.gif") no-repeat scroll background-size: 16px 144px; } } -.styled-select input { +.styled-select input, .styled-select150 input { width: 100%; height: 22px; border: 0; diff --git a/css/i3geo6.css.php b/css/i3geo6.css.php index 3963fb8..e64a7e5 100755 --- a/css/i3geo6.css.php +++ b/css/i3geo6.css.php @@ -915,7 +915,15 @@ border: 1px solid #DDDDDD; height: 22px; border-radius: 2px; } -.styled-select select { +.styled-select150 { +width: 150px; +overflow: hidden; +background: #F8F8F8; +border: 1px solid #DDDDDD; +height: 22px; +border-radius: 2px; +} +.styled-select select, .styled-select150 select { width: 120%; height: 22px; border: 0; @@ -934,7 +942,7 @@ background: transparent url("../imagens/menuarodwn8_nrm_1.gif") no-repeat scroll background-size: 16px 144px; } } -.styled-select input { +.styled-select input, .styled-select150 input { width: 100%; height: 22px; border: 0; diff --git a/ferramentas/etiqueta/exec.php b/ferramentas/etiqueta/exec.php index fb930fc..6beaade 100644 --- a/ferramentas/etiqueta/exec.php +++ b/ferramentas/etiqueta/exec.php @@ -17,10 +17,14 @@ Ativa as etiquetas de um tema. include_once(dirname(__FILE__)."/../../classesphp/classe_toponimia.php"); copiaSeguranca($map_file); $m = new Toponimia($map_file,$tema); - $retorno = $m->ativaEtiquetas($tips); + $m->layer->setmetadata("IDENTIFICA",""); + $m->layer->setmetadata("TIP",$tips); $m->layer->setmetadata("ITENS",$itens); + $m->layer->setmetadata("ITENSDESC",base64_decode($itensdesc)); + $m->layer->setmetadata("ITENSLINK",base64_decode($itenslink)); $m->salva(); $_SESSION["contadorsalva"]++; + $retorno = "ok"; break; /* Valor: REMOVEETIQUETAS diff --git a/ferramentas/etiqueta/index.js b/ferramentas/etiqueta/index.js index e5c71c0..c6a43f4 100644 --- a/ferramentas/etiqueta/index.js +++ b/ferramentas/etiqueta/index.js @@ -116,7 +116,7 @@ i3GEOF.etiqueta = { html:function(){ var ins = ''; ins += '

'+$trad('selecionaItem',i3GEOF.etiqueta.dicionario)+':
'; - ins += '

'; + ins += '
'; ins += '
'; ins += '

'; ins += ''; @@ -143,8 +143,8 @@ i3GEOF.etiqueta = { //cria a janela flutuante titulo = "

------
"+$trad("d7at")+"   "; janela = i3GEO.janela.cria( - "450px", - "175px", + "500px", + "230px", "", "", "", @@ -197,15 +197,16 @@ i3GEOF.etiqueta = { montaListaItens: function(retorno){ var funcao = function(dadosItens){ var ins,i,n,itensatuais,item,ck = '',lista; - lista = dadosItens.data.comb; + lista = dadosItens.data; try{ itensatuais = i3GEO.arvoreDeCamadas.pegaTema(i3GEO.temaAtivo); itensatuais = itensatuais.etiquetas.split(","); ins = []; - ins.push(""); - ins.push(""); + ins.push("
ColunaTipIdentifica
"); + ins.push(""); n = retorno.data.valores.length; for (i=0;i"); ins.push(""); - ins.push(""); - if(lista[item]){ + ins.push(""); + //itens + if(i3GEO.util.in_array(item,lista.itens)){ ck = "checked"; } else{ ck = ""; } - ins.push(""); + ins.push(""); + //alias dos itens + if(lista.itensdesc[item]){ + ck = lista.itensdesc[item]; + } + else{ + ck = ""; + } + ins.push(""); + //links + if(lista.itenslink[item]){ + ck = lista.itenslink[item]; + } + else{ + ck = ""; + } + ins.push(""); + ins.push(""); } - $i("i3GEOetiquetalistai").innerHTML = ins.join(""); ins.push("
ColunaTipIdentificaAliasLink "+item+"
"); + $i("i3GEOetiquetalistai").innerHTML = ins.join(""); + //enable + lista = $i("i3GEOetiquetalistai").getElementsByTagName("input"); + n = lista.length; + for (i=0;i {{{selecionaItem}}}:
-
+

-- libgit2 0.21.2