From 1f641fd14ac4600a0be27a318b06e3f0d34d4f73 Mon Sep 17 00:00:00 2001 From: Edmar Moretti Date: Thu, 5 May 2011 19:47:09 +0000 Subject: [PATCH] --- classesjs/classe_barradebotoes.js | 7 +++++-- classesjs/classe_coordenadas.js | 14 +++++++------- classesjs/classe_gadgets.js | 2 +- css/geral.css | 2 +- interface/openlayers_t.htm | 2 +- 5 files changed, 15 insertions(+), 12 deletions(-) diff --git a/classesjs/classe_barradebotoes.js b/classesjs/classe_barradebotoes.js index a0a8c92..edb58d8 100644 --- a/classesjs/classe_barradebotoes.js +++ b/classesjs/classe_barradebotoes.js @@ -564,8 +564,11 @@ i3GEO.barraDeBotoes = { */ inicializaBarra:function(idconteudo,idconteudonovo,barraZoom,x,y,onde){ if(typeof(console) !== 'undefined'){console.info("i3GEO.barraDeBotoes.inicializaBarra()");} - if(this.TEMPLATEBOTAO === "") + if(this.TEMPLATEBOTAO === "" && i3GEO.Interface.TABLET === false) {this.TEMPLATEBOTAO = "
";} + if(this.TEMPLATEBOTAO === "" && i3GEO.Interface.TABLET === true) + {this.TEMPLATEBOTAO = "
";} + var ticone,tipo,mostra,i,temp,elementos,e,wj,recuo,novoel,alturadisponivel,n,chaves,re,estilo, numerobotoes = 0, nelementos = 0, @@ -706,7 +709,7 @@ i3GEO.barraDeBotoes = { } YAHOO.namespace("janelaBotoes.xp"); if(i3GEO.barraDeBotoes.ORIENTACAO === "horizontal"){ - YAHOO.janelaBotoes.xp.panel = new YAHOO.widget.Panel(idconteudonovo, {zIndex:20000,width:i3GEO.barraDeBotoes.HORIZONTALW, fixedcenter: false, constraintoviewport: false, underlay:"none", close:i3GEO.barraDeBotoes.PERMITEFECHAR, visible:true, draggable:i3GEO.barraDeBotoes.PERMITEDESLOCAR, modal:false,iframe:false } ); + YAHOO.janelaBotoes.xp.panel = new YAHOO.widget.Panel(idconteudonovo, {zIndex:20000,height:40,width:i3GEO.barraDeBotoes.HORIZONTALW, fixedcenter: false, constraintoviewport: false, underlay:"none", close:i3GEO.barraDeBotoes.PERMITEFECHAR, visible:true, draggable:i3GEO.barraDeBotoes.PERMITEDESLOCAR, modal:false,iframe:false } ); } else{ if(this.AUTOALTURA === false || barraZoom === true || (elementos.length > numerobotoes)) diff --git a/classesjs/classe_coordenadas.js b/classesjs/classe_coordenadas.js index ba1b68e..774ebd0 100644 --- a/classesjs/classe_coordenadas.js +++ b/classesjs/classe_coordenadas.js @@ -364,12 +364,12 @@ i3GEO.coordenadas = { */ criaMascaraDMS: function(prefixo,titulo,caixa){ var ins = '' + - '' + - '' + - '' + - '' + - '' + - '' + + '' + + '' + + '' + + '' + + '' + + '' + '', temp = 'var '+prefixo+'xxx = i3GEO.calculo.dms2dd($i(\''+prefixo+'xg\').value,$i(\''+prefixo+'xm\').value,$i(\''+prefixo+'xs\').value);' + 'var '+prefixo+'yyy = i3GEO.calculo.dms2dd($i(\''+prefixo+'yg\').value,$i(\''+prefixo+'ym\').value,$i(\''+prefixo+'ys\').value);' + @@ -592,7 +592,7 @@ i3GEO.coordenadas = { // if(onde === "") {onde = i3GEO.coordenadas.config[tipos[0]].idhtml;} - caixa = ""; // //cria a caixa de seleção // diff --git a/classesjs/classe_gadgets.js b/classesjs/classe_gadgets.js index 7745459..2875911 100644 --- a/classesjs/classe_gadgets.js +++ b/classesjs/classe_gadgets.js @@ -237,7 +237,7 @@ i3GEO.gadgets = { }; if(!$i("i3geo_escalanum")){ i = $inputText(id,"100","i3geo_escalanum",$trad("d10"),"9",parseInt(i3GEO.parametros.mapscale,10)); - ins = "
'+titulo+' X: '+$inputText('','315',prefixo+'xg','grau','3','-00')+' '+$inputText('','',prefixo+'xm','minuto','2','00')+' '+$inputText('','',prefixo+'xs','segundo','5','00.00')+' Y:'+$inputText('','',prefixo+'yg','grau','3','-00')+' '+$inputText('','',prefixo+'ym','minuto','2','00')+' '+titulo+' X:'+$inputText('','',prefixo+'xg','grau','3','-00')+''+$inputText('','',prefixo+'xm','minuto','2','00')+''+$inputText('','',prefixo+'xs','segundo','5','00.00')+'Y:'+$inputText('','',prefixo+'yg','grau','3','-00')+''+$inputText('','',prefixo+'ym','minuto','2','00')+''+$inputText('','',prefixo+'ys','segundo','5','00.00')+'
1:"+i; + ins = "
"+i; temp = 'var nova = document.getElementById("i3geo_escalanum").value;'; temp += 'i3GEO.navega.aplicaEscala(i3GEO.configura.locaplic,i3GEO.configura.sid,nova);'; ins += "
"; diff --git a/css/geral.css b/css/geral.css index bfed5c0..b25f72a 100644 --- a/css/geral.css +++ b/css/geral.css @@ -70,7 +70,7 @@ select .inputsb {font-family: Verdana, Arial, Helvetica, sans-serif;font-size: 10px;color: #2F4632;background-color: #FFFFFF;padding: 0;border: 0px solid gray;text-align: center;cursor: text;} .legendatemas -{cursor:pointer;text-align:left;background-color:none;vertical-align: top;border: 0px solid gray;margin:0;padding:0;font-family: Verdana, Arial, Helvetica, sans-serif;} +{cursor:pointer;text-align:left;background-color:transparent;vertical-align: top;border: 0px solid gray;margin:0;padding:0;font-family: Verdana, Arial, Helvetica, sans-serif;} .legendatemas td {text-align:left;background-color:#ffffff;vertical-align: top;padding: 0;font-family: Verdana, Arial, Helvetica, sans-serif;z-index:1000;position:relative;} .legendatemas input diff --git a/interface/openlayers_t.htm b/interface/openlayers_t.htm index 6c586ae..4f139c5 100644 --- a/interface/openlayers_t.htm +++ b/interface/openlayers_t.htm @@ -169,7 +169,7 @@ i3GEO.barraDeBotoes.AUTO = true; i3GEO.barraDeBotoes.COMPORTAMENTO = "laranja"; i3GEO.barraDeBotoes.ORIENTACAO = "horizontal"; i3GEO.barraDeBotoes.AJUDA = false; -i3GEO.barraDeBotoes.HORIZONTALW = 360; +i3GEO.barraDeBotoes.HORIZONTALW = 380; i3GEO.Interface.BARRABOTOESLEFT = 5; i3GEO.Interface.BARRABOTOESTOP = 0; -- libgit2 0.21.2